Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 60409: [PSDK] * Add some missing SP_PROT_TLS* definitions. * Correct SCHANNEL_CRED structure.
by akhaldi＠svn.reactos.org 28 Sep '13

28 Sep '13

Author: akhaldi Date: Sat Sep 28 14:55:32 2013 New Revision: 60409 URL: http://svn.reactos.org/svn/reactos?rev=60409&view=rev Log: [PSDK] * Add some missing SP_PROT_TLS* definitions. * Correct SCHANNEL_CRED structure. Modified: trunk/reactos/include/psdk/schannel.h Modified: trunk/reactos/include/psdk/schannel.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/schannel.h?re… ============================================================================== --- trunk/reactos/include/psdk/schannel.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/schannel.h [iso-8859-1] Sat Sep 28 14:55:32 2013 @@ -27,6 +27,10 @@ #define SCHANNEL_SESSION 3 #define SP_PROT_TLS1_CLIENT 128 +#define SP_PROT_TLS1_1_CLIENT 512 +#define SP_PROT_TLS1_0_CLIENT SP_PROT_TLS1_CLIENT +#define SP_PROT_TLS1_2_CLIENT 2048 + #define SP_PROT_TLS1_SERVER 64 #define SP_PROT_SSL3_CLIENT 32 #define SP_PROT_SSL3_SERVER 16 @@ -39,6 +43,8 @@ #define SP_PROT_SSL3 (SP_PROT_SSL3_CLIENT | SP_PROT_SSL3_SERVER) #define SP_PROT_SSL2 (SP_PROT_SSL2_CLIENT | SP_PROT_SSL2_SERVER) #define SP_PROT_PCT1 (SP_PROT_PCT1_CLIENT | SP_PROT_PCT1_SERVER) + +#define SP_PROT_TLS1_1PLUS_CLIENT (SP_PROT_TLS1_1_CLIENT | SP_PROT_TLS1_2_CLIENT) #define SCH_CRED_NO_SYSTEM_MAPPER 2 #define SCH_CRED_NO_SERVERNAME_CHECK 4 @@ -85,9 +91,9 @@ DWORD grbitEnabledProtocols; DWORD dwMinimumCipherStrength; DWORD dwMaximumCipherStrength; - DWORD dwSessionLength; + DWORD dwSessionLifespan; DWORD dwFlags; - DWORD reserved; + DWORD dwCredFormat; } SCHANNEL_CRED, *PSCHANNEL_CRED; typedef struct _SecPkgCred_SupportedAlgs

1 0

[tfaber] 60408: [NTDLL_APITEST] - Add a test for NtCreateFile with invalid ObjectAttributes. Patch by Aleksandar Andrejevic. CORE-7167
by tfaber＠svn.reactos.org 28 Sep '13

28 Sep '13

Author: tfaber Date: Sat Sep 28 11:39:51 2013 New Revision: 60408 URL: http://svn.reactos.org/svn/reactos?rev=60408&view=rev Log: [NTDLL_APITEST] - Add a test for NtCreateFile with invalid ObjectAttributes. Patch by Aleksandar Andrejevic. CORE-7167 Added: trunk/rostests/apitests/ntdll/NtCreateFile.c (with props) Modified: trunk/rostests/apitests/ntdll/CMakeLists.txt trunk/rostests/apitests/ntdll/testlist.c Modified: trunk/rostests/apitests/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/CMakeLists… ============================================================================== --- trunk/rostests/apitests/ntdll/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/CMakeLists.txt [iso-8859-1] Sat Sep 28 11:39:51 2013 @@ -3,6 +3,7 @@ LdrEnumResources.c NtAllocateVirtualMemory.c NtContinue.c + NtCreateFile.c NtCreateThread.c NtFreeVirtualMemory.c NtMapViewOfSection.c Added: trunk/rostests/apitests/ntdll/NtCreateFile.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/NtCreateFi… ============================================================================== --- trunk/rostests/apitests/ntdll/NtCreateFile.c (added) +++ trunk/rostests/apitests/ntdll/NtCreateFile.c [iso-8859-1] Sat Sep 28 11:39:51 2013 @@ -0,0 +1,34 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: See COPYING in the top level directory + * PURPOSE: Test for NtCreateFile + * PROGRAMMER: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + */ + +#define WIN32_NO_STATUS +#include <wine/test.h> +//#include <ndk/iotypes.h> +#include <ndk/iofuncs.h> +//#include <ndk/obtypes.h> +//#include <ndk/obfuncs.h> + +START_TEST(NtCreateFile) +{ + NTSTATUS Status; + HANDLE FileHandle; + IO_STATUS_BLOCK StatusBlock; + + Status = NtCreateFile(&FileHandle, + FILE_READ_DATA, + (POBJECT_ATTRIBUTES)0xCCCCCCCC, + &StatusBlock, + NULL, + FILE_ATTRIBUTE_NORMAL, + FILE_SHARE_READ, + FILE_OPEN_IF, + FILE_NON_DIRECTORY_FILE, + NULL, + 0); + + ok_hex(Status, STATUS_ACCESS_VIOLATION); +} Propchange: trunk/rostests/apitests/ntdll/NtCreateFile.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/ntdll/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/testlist.c… ============================================================================== --- trunk/rostests/apitests/ntdll/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/testlist.c [iso-8859-1] Sat Sep 28 11:39:51 2013 @@ -6,6 +6,7 @@ extern void func_LdrEnumResources(void); extern void func_NtAllocateVirtualMemory(void); extern void func_NtContinue(void); +extern void func_NtCreateFile(void); extern void func_NtCreateThread(void); extern void func_NtFreeVirtualMemory(void); extern void func_NtMapViewOfSection(void); @@ -31,6 +32,7 @@ { "LdrEnumResources", func_LdrEnumResources }, { "NtAllocateVirtualMemory", func_NtAllocateVirtualMemory }, { "NtContinue", func_NtContinue }, + { "NtCreateFile", func_NtCreateFile }, { "NtCreateThread", func_NtCreateThread }, { "NtFreeVirtualMemory", func_NtFreeVirtualMemory }, { "NtMapViewOfSection", func_NtMapViewOfSection },

1 0

[tfaber] 60407: [NTOS:EX] - Correctly return STATUS_TIMER_RESOLUTION_NOT_SET if the resolution was not changed in NtSetTimerResolution. Patch by Aleksandar Andrejevic. CORE-7387
by tfaber＠svn.reactos.org 28 Sep '13

28 Sep '13

Author: tfaber Date: Sat Sep 28 11:37:08 2013 New Revision: 60407 URL: http://svn.reactos.org/svn/reactos?rev=60407&view=rev Log: [NTOS:EX] - Correctly return STATUS_TIMER_RESOLUTION_NOT_SET if the resolution was not changed in NtSetTimerResolution. Patch by Aleksandar Andrejevic. CORE-7387 Modified: trunk/reactos/ntoskrnl/ex/time.c Modified: trunk/reactos/ntoskrnl/ex/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/time.c?rev=604… ============================================================================== --- trunk/reactos/ntoskrnl/ex/time.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/time.c [iso-8859-1] Sat Sep 28 11:37:08 2013 @@ -527,6 +527,7 @@ IN BOOLEAN SetResolution, OUT PULONG CurrentResolution) { + NTSTATUS Status; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); PEPROCESS Process = PsGetCurrentProcess(); ULONG NewResolution; @@ -551,15 +552,21 @@ NewResolution = ExSetTimerResolution(DesiredResolution, SetResolution); *CurrentResolution = NewResolution; - if (SetResolution) - { - /* Set the flag that the resolution has been changed */ - Process->SetTimerResolution = TRUE; - } - - /* Return success if the process changed its timer resolution */ - if (Process->SetTimerResolution) return STATUS_SUCCESS; - else return STATUS_TIMER_RESOLUTION_NOT_SET; + if (SetResolution || Process->SetTimerResolution) + { + /* The resolution has been changed now or in an earlier call */ + Status = STATUS_SUCCESS; + } + else + { + /* The resolution hasn't been changed */ + Status = STATUS_TIMER_RESOLUTION_NOT_SET; + } + + /* Update the flag */ + Process->SetTimerResolution = SetResolution; + + return Status; } /* EOF */

1 0

[tfaber] 60406: [NTDLL_APITEST] - Test that NtSetTimerResolution appropriately returns STATUS_TIMER_RESOLUTION_NOT_SET. Patch by Aleksandar Andrejevic. CORE-7387
by tfaber＠svn.reactos.org 28 Sep '13

28 Sep '13

Author: tfaber Date: Sat Sep 28 09:55:29 2013 New Revision: 60406 URL: http://svn.reactos.org/svn/reactos?rev=60406&view=rev Log: [NTDLL_APITEST] - Test that NtSetTimerResolution appropriately returns STATUS_TIMER_RESOLUTION_NOT_SET. Patch by Aleksandar Andrejevic. CORE-7387 Modified: trunk/rostests/apitests/ntdll/Timer.c Modified: trunk/rostests/apitests/ntdll/Timer.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/Timer.c?re… ============================================================================== --- trunk/rostests/apitests/ntdll/Timer.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/Timer.c [iso-8859-1] Sat Sep 28 09:55:29 2013 @@ -75,4 +75,12 @@ /* Since we have changed the resolution earlier, it returns STATUS_SUCCESS. */ ok_hex(Status, STATUS_SUCCESS); + + /* Get the current timer resolution again */ + Status = NtSetTimerResolution(0, /* Ignored */ + FALSE, /* Don't change resolution */ + &CurrentResolution); + + /* The resolution is not changed now, so it should return STATUS_TIMER_RESOLUTION_NOT_SET */ + ok_hex(Status, STATUS_TIMER_RESOLUTION_NOT_SET); }

1 0

[tfaber] 60405: [NTDLL_APITEST] - Do not use Zw functions from user mode
by tfaber＠svn.reactos.org 28 Sep '13

28 Sep '13

Author: tfaber Date: Sat Sep 28 09:24:47 2013 New Revision: 60405 URL: http://svn.reactos.org/svn/reactos?rev=60405&view=rev Log: [NTDLL_APITEST] - Do not use Zw functions from user mode Added: trunk/rostests/apitests/ntdll/NtContinue.c - copied, changed from r60399, trunk/rostests/apitests/ntdll/ZwContinue.c trunk/rostests/apitests/ntdll/i386/NtContinue.S - copied unchanged from r60399, trunk/rostests/apitests/ntdll/i386/ZwContinue.S Removed: trunk/rostests/apitests/ntdll/ZwContinue.c trunk/rostests/apitests/ntdll/i386/ZwContinue.S Modified: trunk/rostests/apitests/ntdll/CMakeLists.txt trunk/rostests/apitests/ntdll/RtlGetLengthWithoutTrailingPathSeperators.c trunk/rostests/apitests/ntdll/testlist.c Modified: trunk/rostests/apitests/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/CMakeLists… ============================================================================== --- trunk/rostests/apitests/ntdll/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/CMakeLists.txt [iso-8859-1] Sat Sep 28 09:24:47 2013 @@ -2,6 +2,7 @@ list(APPEND SOURCE LdrEnumResources.c NtAllocateVirtualMemory.c + NtContinue.c NtCreateThread.c NtFreeVirtualMemory.c NtMapViewOfSection.c @@ -21,11 +22,10 @@ RtlInitializeBitMap.c SystemInfo.c Timer.c - ZwContinue.c testlist.c) if(ARCH STREQUAL "i386") - add_asm_files(ntdll_apitest_asm i386/ZwContinue.S) + add_asm_files(ntdll_apitest_asm i386/NtContinue.S) endif() add_executable(ntdll_apitest ${SOURCE} ${ntdll_apitest_asm}) Copied: trunk/rostests/apitests/ntdll/NtContinue.c (from r60399, trunk/rostests/apitests/ntdll/ZwContinue.c) URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/NtContinue… ============================================================================== --- trunk/rostests/apitests/ntdll/ZwContinue.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/NtContinue.c [iso-8859-1] Sat Sep 28 09:24:47 2013 @@ -1,22 +1,22 @@ /* * PROJECT: ReactOS api tests * LICENSE: GPL - See COPYING in the top level directory - * PURPOSE: Test for ZwContinue - * PROGRAMMER: + * PURPOSE: Test for NtContinue + * PROGRAMMER: */ #include <apitest.h> +#include <ndk/kefuncs.h> #include <setjmp.h> #include <time.h> #ifdef _M_IX86 -#define ZWC_SEGMENT_BITS (0xFFFF) -#define ZWC_EFLAGS_BITS (0x3C0CD5) +#define NTC_SEGMENT_BITS (0xFFFF) +#define NTC_EFLAGS_BITS (0x3C0CD5) #endif void continuePoint(void); -LONG NTAPI ZwContinue(IN CONTEXT *, IN BOOLEAN); static jmp_buf jmpbuf; static CONTEXT continueContext; @@ -66,24 +66,24 @@ "ContextFlags=0x%lx\n", pContext->ContextFlags); /* Random data segments */ - ok((pContext->SegGs & ZWC_SEGMENT_BITS) == - (continueContext.SegGs & ZWC_SEGMENT_BITS), + ok((pContext->SegGs & NTC_SEGMENT_BITS) == + (continueContext.SegGs & NTC_SEGMENT_BITS), "SegGs=0x%lx / 0x%lx\n", pContext->SegGs, continueContext.SegGs); - ok((pContext->SegFs & ZWC_SEGMENT_BITS) == - (continueContext.SegFs & ZWC_SEGMENT_BITS), + ok((pContext->SegFs & NTC_SEGMENT_BITS) == + (continueContext.SegFs & NTC_SEGMENT_BITS), "SegFs=0x%lx / 0x%lx\n", pContext->SegFs, continueContext.SegFs); - ok((pContext->SegEs & ZWC_SEGMENT_BITS) == - (continueContext.SegEs & ZWC_SEGMENT_BITS), + ok((pContext->SegEs & NTC_SEGMENT_BITS) == + (continueContext.SegEs & NTC_SEGMENT_BITS), "SegEs=0x%lx / 0x%lx\n", pContext->SegEs, continueContext.SegEs); - ok((pContext->SegDs & ZWC_SEGMENT_BITS) == - (continueContext.SegDs & ZWC_SEGMENT_BITS), + ok((pContext->SegDs & NTC_SEGMENT_BITS) == + (continueContext.SegDs & NTC_SEGMENT_BITS), "SegDs=0x%lx / 0x%lx\n", pContext->SegDs, continueContext.SegDs); /* Integer registers */ - ok(pContext->Edi == continueContext.Edi, + ok(pContext->Edi == continueContext.Edi, "Edi: 0x%lx != 0x%lx\n", pContext->Edi, continueContext.Edi); ok(pContext->Esi == continueContext.Esi, "Esi: 0x%lx != 0x%lx\n", pContext->Esi, continueContext.Esi); @@ -104,16 +104,16 @@ ok(pContext->Esp == continueContext.Esp, "Esp: 0x%lx != 0x%lx\n", pContext->Esp, continueContext.Esp); - ok((pContext->SegCs & ZWC_SEGMENT_BITS) == - (continueContext.SegCs & ZWC_SEGMENT_BITS), + ok((pContext->SegCs & NTC_SEGMENT_BITS) == + (continueContext.SegCs & NTC_SEGMENT_BITS), "SegCs: 0x%lx != 0x%lx\n", pContext->SegCs, continueContext.SegCs); - ok((pContext->EFlags & ZWC_EFLAGS_BITS) == - (continueContext.EFlags & ZWC_EFLAGS_BITS), + ok((pContext->EFlags & NTC_EFLAGS_BITS) == + (continueContext.EFlags & NTC_EFLAGS_BITS), "EFlags: 0x%lx != 0x%lx\n", pContext->EFlags, continueContext.EFlags); - ok((pContext->SegSs & ZWC_SEGMENT_BITS) == - (continueContext.SegSs & ZWC_SEGMENT_BITS), + ok((pContext->SegSs & NTC_SEGMENT_BITS) == + (continueContext.SegSs & NTC_SEGMENT_BITS), "SegSs: 0x%lx != 0x%lx\n", pContext->SegSs, continueContext.SegSs); #endif @@ -121,7 +121,7 @@ longjmp(jmpbuf, 1); } -void Test_ZwContinue() +START_TEST(NtContinue) { initrand(); @@ -158,16 +158,10 @@ /* Can't do a lot about segments */ #endif - ZwContinue(&continueContext, FALSE); + NtContinue(&continueContext, FALSE); ok(0, "should never get here\n"); } /* Second time */ return; } - -START_TEST(ZwContinue) -{ - Test_ZwContinue(); -} - Modified: trunk/rostests/apitests/ntdll/RtlGetLengthWithoutTrailingPathSeperators.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/RtlGetLeng… ============================================================================== --- trunk/rostests/apitests/ntdll/RtlGetLengthWithoutTrailingPathSeperators.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/RtlGetLengthWithoutTrailingPathSeperators.c [iso-8859-1] Sat Sep 28 09:24:47 2013 @@ -104,19 +104,19 @@ &str, pentry->input); len = 0xDEADBEEF; - + StartSeh() res = RtlGetLengthWithoutTrailingPathSeperators(0, &str, &len); EndSeh(STATUS_SUCCESS); - - ok(res == pentry->expected_result, + + ok(res == pentry->expected_result, "Unexpected result 0x%08x (expected 0x%08x) in [%d:%d]\n", res, pentry->expected_result, i, pentry->line); ok(len == pentry->expected_output, - "Unexpected length %d (expected %d) in [%d:%d]\n", + "Unexpected length %d (expected %d) in [%d:%d]\n", len, pentry->expected_output, - i, pentry->line); + i, pentry->line); } // Invalid parameters @@ -127,10 +127,10 @@ res = RtlGetLengthWithoutTrailingPathSeperators(0, NULL, &len); EndSeh(STATUS_SUCCESS); - ok(res == STATUS_INVALID_PARAMETER, + ok(res == STATUS_INVALID_PARAMETER, "Unexpected result 0x%08x (expected STATUS_INVALID_PARAMETER)\n", res); - ok(len == 0, + ok(len == 0, "Unexpected length %08x (expected 0)\n", len); @@ -138,7 +138,7 @@ res = RtlGetLengthWithoutTrailingPathSeperators(0, &str, NULL); EndSeh(STATUS_SUCCESS); - ok(res == STATUS_INVALID_PARAMETER, + ok(res == STATUS_INVALID_PARAMETER, "Unexpected result 0x%08x (expected STATUS_INVALID_PARAMETER)\n", res); @@ -146,7 +146,7 @@ res = RtlGetLengthWithoutTrailingPathSeperators(0, NULL, NULL); EndSeh(STATUS_SUCCESS); - ok(res == STATUS_INVALID_PARAMETER, + ok(res == STATUS_INVALID_PARAMETER, "Unexpected result 0x%08x (expected STATUS_INVALID_PARAMETER)\n", res); @@ -158,11 +158,11 @@ res = RtlGetLengthWithoutTrailingPathSeperators(1<<i, &str, &len); EndSeh(STATUS_SUCCESS); - ok(res == STATUS_INVALID_PARAMETER, + ok(res == STATUS_INVALID_PARAMETER, "Unexpected result 0x%08x (expected STATUS_INVALID_PARAMETER)\n", res); - ok(len == 0, + ok(len == 0, "Unexpected length %08x (expected 0)\n", len); } @@ -173,11 +173,11 @@ res = RtlGetLengthWithoutTrailingPathSeperators(0xFFFFFFFF, &str, &len); EndSeh(STATUS_SUCCESS); - ok(res == STATUS_INVALID_PARAMETER, + ok(res == STATUS_INVALID_PARAMETER, "Unexpected result 0x%08x (expected STATUS_INVALID_PARAMETER)\n", res); - - ok(len == 0, + + ok(len == 0, "Unexpected length %08x (expected 0)\n", len); } Removed: trunk/rostests/apitests/ntdll/ZwContinue.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/ZwContinue… ============================================================================== --- trunk/rostests/apitests/ntdll/ZwContinue.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/ZwContinue.c (removed) @@ -1,173 +0,0 @@ -/* - * PROJECT: ReactOS api tests - * LICENSE: GPL - See COPYING in the top level directory - * PURPOSE: Test for ZwContinue - * PROGRAMMER: - */ - -#include <apitest.h> - -#include <setjmp.h> -#include <time.h> - -#ifdef _M_IX86 -#define ZWC_SEGMENT_BITS (0xFFFF) -#define ZWC_EFLAGS_BITS (0x3C0CD5) -#endif - -void continuePoint(void); -LONG NTAPI ZwContinue(IN CONTEXT *, IN BOOLEAN); - -static jmp_buf jmpbuf; -static CONTEXT continueContext; -static unsigned int nRandBytes; - -static int initrand(void) -{ - unsigned int nRandMax; - unsigned int nRandMaxBits; - time_t tLoc; - - nRandMax = RAND_MAX; - for(nRandMaxBits = 0; nRandMax != 0; nRandMax >>= 1, ++ nRandMaxBits); - nRandBytes = nRandMaxBits / CHAR_BIT; - //assert(nRandBytes != 0); - srand((unsigned)(time(&tLoc) & UINT_MAX)); - return 1; -} - -static void randbytes(void * p, size_t n) -{ - unsigned char * b; - size_t i; - int r = rand(); - - b = (unsigned char *)p; - for(i = 0; i < n; ++ i) - { - if(i % nRandBytes == 0) - r = rand(); - b[i] = (unsigned char)(r & UCHAR_MAX); - r >>= CHAR_BIT; - } -} - -static ULONG randULONG(void) -{ - ULONG n; - randbytes(&n, sizeof(n)); - return n; -} - -void check(CONTEXT * pContext) -{ -#ifdef _M_IX86 - ok(pContext->ContextFlags == CONTEXT_FULL, - "ContextFlags=0x%lx\n", pContext->ContextFlags); - - /* Random data segments */ - ok((pContext->SegGs & ZWC_SEGMENT_BITS) == - (continueContext.SegGs & ZWC_SEGMENT_BITS), - "SegGs=0x%lx / 0x%lx\n", pContext->SegGs, continueContext.SegGs); - - ok((pContext->SegFs & ZWC_SEGMENT_BITS) == - (continueContext.SegFs & ZWC_SEGMENT_BITS), - "SegFs=0x%lx / 0x%lx\n", pContext->SegFs, continueContext.SegFs); - - ok((pContext->SegEs & ZWC_SEGMENT_BITS) == - (continueContext.SegEs & ZWC_SEGMENT_BITS), - "SegEs=0x%lx / 0x%lx\n", pContext->SegEs, continueContext.SegEs); - - ok((pContext->SegDs & ZWC_SEGMENT_BITS) == - (continueContext.SegDs & ZWC_SEGMENT_BITS), - "SegDs=0x%lx / 0x%lx\n", pContext->SegDs, continueContext.SegDs); - - /* Integer registers */ - ok(pContext->Edi == continueContext.Edi, - "Edi: 0x%lx != 0x%lx\n", pContext->Edi, continueContext.Edi); - ok(pContext->Esi == continueContext.Esi, - "Esi: 0x%lx != 0x%lx\n", pContext->Esi, continueContext.Esi); - ok(pContext->Ebx == continueContext.Ebx, - "Ebx: 0x%lx != 0x%lx\n", pContext->Ebx, continueContext.Ebx); - ok(pContext->Edx == continueContext.Edx, - "Edx: 0x%lx != 0x%lx\n", pContext->Edx, continueContext.Edx); - ok(pContext->Ecx == continueContext.Ecx, - "Ecx: 0x%lx != 0x%lx\n", pContext->Ecx, continueContext.Ecx); - ok(pContext->Eax == continueContext.Eax, - "Eax: 0x%lx != 0x%lx\n", pContext->Eax, continueContext.Eax); - - /* Control registers and segments */ - ok(pContext->Ebp == continueContext.Ebp, - "Ebp: 0x%lx != 0x%lx\n", pContext->Ebp, continueContext.Ebp); - ok(pContext->Eip == continueContext.Eip, - "Eip: 0x%lx != 0x%lx\n", pContext->Eip, continueContext.Eip); - ok(pContext->Esp == continueContext.Esp, - "Esp: 0x%lx != 0x%lx\n", pContext->Esp, continueContext.Esp); - - ok((pContext->SegCs & ZWC_SEGMENT_BITS) == - (continueContext.SegCs & ZWC_SEGMENT_BITS), - "SegCs: 0x%lx != 0x%lx\n", pContext->SegCs, continueContext.SegCs); - - ok((pContext->EFlags & ZWC_EFLAGS_BITS) == - (continueContext.EFlags & ZWC_EFLAGS_BITS), - "EFlags: 0x%lx != 0x%lx\n", pContext->EFlags, continueContext.EFlags); - - ok((pContext->SegSs & ZWC_SEGMENT_BITS) == - (continueContext.SegSs & ZWC_SEGMENT_BITS), - "SegSs: 0x%lx != 0x%lx\n", pContext->SegSs, continueContext.SegSs); -#endif - - /* Return where we came from */ - longjmp(jmpbuf, 1); -} - -void Test_ZwContinue() -{ - initrand(); - - /* First time */ - if(setjmp(jmpbuf) == 0) - { - CONTEXT bogus; - - continueContext.ContextFlags = CONTEXT_FULL; - GetThreadContext(GetCurrentThread(), &continueContext); - -#ifdef _M_IX86 - continueContext.ContextFlags = CONTEXT_FULL; - - /* Fill the integer registers with random values */ - continueContext.Edi = randULONG(); - continueContext.Esi = randULONG(); - continueContext.Ebx = randULONG(); - continueContext.Edx = randULONG(); - continueContext.Ecx = randULONG(); - continueContext.Eax = randULONG(); - continueContext.Ebp = randULONG(); - - /* Randomize all the allowed flags (determined experimentally with WinDbg) */ - continueContext.EFlags = randULONG() & 0x3C0CD5; - - /* Randomize the stack pointer as much as possible */ - continueContext.Esp = (ULONG)(((ULONG_PTR)&bogus) & 0xFFFFFFFF) + - sizeof(bogus) - (randULONG() & 0xF) * 4; - - /* continuePoint() is implemented in assembler */ - continueContext.Eip = (ULONG)((ULONG_PTR)continuePoint & 0xFFFFFFF); - - /* Can't do a lot about segments */ -#endif - - ZwContinue(&continueContext, FALSE); - ok(0, "should never get here\n"); - } - - /* Second time */ - return; -} - -START_TEST(ZwContinue) -{ - Test_ZwContinue(); -} - Removed: trunk/rostests/apitests/ntdll/i386/ZwContinue.S URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/i386/ZwCon… ============================================================================== --- trunk/rostests/apitests/ntdll/i386/ZwContinue.S [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/i386/ZwContinue.S (removed) @@ -1,54 +0,0 @@ - -#include <asm.inc> -#include <ks386.inc> - - -// cpu 486 -.code - -EXTERN _check:PROC - -PUBLIC _continuePoint -_continuePoint: - push ss - push 0 - pushfd - push cs - push offset _continuePoint - push ebp - - push eax - push ecx - push edx - push ebx - push esi - push edi - - push ds - push es - push fs - push gs - - // TODO: floating point state - sub esp, 112 - - // Debug registers - sub esp, 24 - - push HEX(00010007) - - // Fill the Esp field - lea eax, [esp + HEX(0CC)] - lea ecx, [esp + HEX(0C4)] - mov [ecx], eax - - // Call the function that will compare the current context with the expected one - cld - push esp - call _check - - // check() must not return - int 3 - -// EOF -END Modified: trunk/rostests/apitests/ntdll/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/testlist.c… ============================================================================== --- trunk/rostests/apitests/ntdll/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/testlist.c [iso-8859-1] Sat Sep 28 09:24:47 2013 @@ -5,6 +5,7 @@ extern void func_LdrEnumResources(void); extern void func_NtAllocateVirtualMemory(void); +extern void func_NtContinue(void); extern void func_NtCreateThread(void); extern void func_NtFreeVirtualMemory(void); extern void func_NtMapViewOfSection(void); @@ -24,12 +25,12 @@ extern void func_RtlGetLongestNtPathLength(void); extern void func_RtlInitializeBitMap(void); extern void func_TimerResolution(void); -extern void func_ZwContinue(void); const struct test winetest_testlist[] = { { "LdrEnumResources", func_LdrEnumResources }, { "NtAllocateVirtualMemory", func_NtAllocateVirtualMemory }, + { "NtContinue", func_NtContinue }, { "NtCreateThread", func_NtCreateThread }, { "NtFreeVirtualMemory", func_NtFreeVirtualMemory }, { "NtMapViewOfSection", func_NtMapViewOfSection }, @@ -49,7 +50,6 @@ { "RtlGetLongestNtPathLength", func_RtlGetLongestNtPathLength }, { "RtlInitializeBitMap", func_RtlInitializeBitMap }, { "TimerResolution", func_TimerResolution }, - { "ZwContinue", func_ZwContinue }, { 0, 0 } };

1 0

[tfaber] 60404: [NTDLL_APITEST] - Add test for RtlGetLengthWithoutTrailingPathSeperators. Patch by David Quintana CORE-7482
by tfaber＠svn.reactos.org 28 Sep '13

28 Sep '13

Author: tfaber Date: Sat Sep 28 09:03:04 2013 New Revision: 60404 URL: http://svn.reactos.org/svn/reactos?rev=60404&view=rev Log: [NTDLL_APITEST] - Add test for RtlGetLengthWithoutTrailingPathSeperators. Patch by David Quintana CORE-7482 Added: trunk/rostests/apitests/ntdll/RtlGetLengthWithoutTrailingPathSeperators.c (with props) Modified: trunk/rostests/apitests/ntdll/CMakeLists.txt trunk/rostests/apitests/ntdll/testlist.c Modified: trunk/rostests/apitests/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/CMakeLists… ============================================================================== --- trunk/rostests/apitests/ntdll/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/CMakeLists.txt [iso-8859-1] Sat Sep 28 09:03:04 2013 @@ -16,6 +16,7 @@ RtlGetFullPathName_U.c RtlGetFullPathName_Ustr.c RtlGetFullPathName_UstrEx.c + RtlGetLengthWithoutTrailingPathSeperators.c RtlGetLongestNtPathLength.c RtlInitializeBitMap.c SystemInfo.c Added: trunk/rostests/apitests/ntdll/RtlGetLengthWithoutTrailingPathSeperators.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/RtlGetLeng… ============================================================================== --- trunk/rostests/apitests/ntdll/RtlGetLengthWithoutTrailingPathSeperators.c (added) +++ trunk/rostests/apitests/ntdll/RtlGetLengthWithoutTrailingPathSeperators.c [iso-8859-1] Sat Sep 28 09:03:04 2013 @@ -0,0 +1,183 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Test for RtlGetLengthWithoutTrailingPathSeperators + * PROGRAMMER: David Quintana <gigaherz(a)gmail.com> + */ + +#define WIN32_NO_STATUS +#include <apitest.h> +#include <ndk/rtlfuncs.h> + +#define MakeTestEntry_Success(str, expect) \ + { str, expect, STATUS_SUCCESS, __LINE__ } + +struct test_data { + PWSTR input; + ULONG expected_output; + NTSTATUS expected_result; + int line; +} test_entries[] = { + + /* NULL in UNICODE_STRING */ + MakeTestEntry_Success( NULL, 0 ), + + /* Length tests */ + MakeTestEntry_Success( L"", 0 ), + MakeTestEntry_Success( L"T", 1 ), + MakeTestEntry_Success( L"Te", 2 ), + MakeTestEntry_Success( L"Tes", 3 ), + MakeTestEntry_Success( L"Test", 4 ), + + /* Separators tests */ + MakeTestEntry_Success( L"\\.", 2 ), + MakeTestEntry_Success( L"\\.", 2 ), + MakeTestEntry_Success( L"\\.\\", 2 ), + MakeTestEntry_Success( L"\\.\\T", 4 ), + MakeTestEntry_Success( L"\\.\\Te", 5 ), + MakeTestEntry_Success( L"\\.\\Tes", 6 ), + MakeTestEntry_Success( L"\\.\\Test", 7 ), + MakeTestEntry_Success( L"\\.\\Test\\", 7 ), + MakeTestEntry_Success( L"\\.\\Test\\s", 9 ), + MakeTestEntry_Success( L"\\.\\T\\est", 8 ), + MakeTestEntry_Success( L"\\.\\T\\e\\st", 9 ), + MakeTestEntry_Success( L"\\.\\T\\e\\s\\t", 10 ), + MakeTestEntry_Success( L"\\.\\T\\e\\s\\t\\", 10 ), + MakeTestEntry_Success( L"\\Tests\\String\\", 13 ), + MakeTestEntry_Success( L"\\.\\Test\\String\\", 14 ), + MakeTestEntry_Success( L"\\.\\Tests\\String\\", 15 ), + MakeTestEntry_Success( L"\\.\\Tests\\String\\s", 17 ), + MakeTestEntry_Success( L"\\.\\Tests\\String\\as", 18 ), + MakeTestEntry_Success( L"\\.\\Tests\\String\\asd", 19 ), + MakeTestEntry_Success( L"\\.\\Tests\\String\\asdf", 20 ), + MakeTestEntry_Success( L"\\Tests\\String\\sdfsdf\\", 20 ), + MakeTestEntry_Success( L"C:\\Tests\\String\\sdfsdf\\", 22 ), + + /* Separator-only tests */ + MakeTestEntry_Success( L"\\", 0 ), + MakeTestEntry_Success( L"/", 0 ), + + /* Mixed separators tests */ + MakeTestEntry_Success( L"/Test/String", 12 ), + MakeTestEntry_Success( L"\\Test/String", 12 ), + MakeTestEntry_Success( L"/Test\\String", 12 ), + MakeTestEntry_Success( L"\\Test/String", 12 ), + MakeTestEntry_Success( L"/Test/String\\", 12 ), + MakeTestEntry_Success( L"\\Test/String\\", 12 ), + MakeTestEntry_Success( L"/Test\\String\\", 12 ), + MakeTestEntry_Success( L"\\Test/String\\", 12 ), + MakeTestEntry_Success( L"/Test/String/", 12 ), + MakeTestEntry_Success( L"\\Test/String/", 12 ), + MakeTestEntry_Success( L"/Test\\String/", 12 ), + MakeTestEntry_Success( L"\\Test/String/", 12 ), + MakeTestEntry_Success( L"\\Test/String/", 12 ), + MakeTestEntry_Success( L"\\Test\\\\String/", 13 ), + + /* Common path formats tests */ + MakeTestEntry_Success( L"Test\\String", 11 ), + MakeTestEntry_Success( L"\\Test\\String", 12 ), + MakeTestEntry_Success( L".\\Test\\String", 13 ), + MakeTestEntry_Success( L"\\.\\Test\\String", 14 ), + MakeTestEntry_Success( L"\\??\\Test\\String", 15 ), + + /* Redundant trailing tests */ + MakeTestEntry_Success( L"\\??\\Test\\String\\", 15 ), + MakeTestEntry_Success( L"\\??\\Test\\String\\\\", 15 ), + MakeTestEntry_Success( L"\\??\\Test\\String\\\\\\\\\\", 15 ), + +}; + +int num_tests = sizeof(test_entries) / sizeof(struct test_data); + +START_TEST(RtlGetLengthWithoutTrailingPathSeperators) +{ + ULONG len; + UNICODE_STRING str; + NTSTATUS res; + int i; + + struct test_data * pentry = test_entries; + + for(i = 0; i < num_tests; i++, pentry++) + { + RtlInitUnicodeString( + &str, pentry->input); + + len = 0xDEADBEEF; + + StartSeh() + res = RtlGetLengthWithoutTrailingPathSeperators(0, &str, &len); + EndSeh(STATUS_SUCCESS); + + ok(res == pentry->expected_result, + "Unexpected result 0x%08x (expected 0x%08x) in [%d:%d]\n", + res, pentry->expected_result, + i, pentry->line); + ok(len == pentry->expected_output, + "Unexpected length %d (expected %d) in [%d:%d]\n", + len, pentry->expected_output, + i, pentry->line); + } + + // Invalid parameters + + len = 0xDEADBEEF; + + StartSeh() + res = RtlGetLengthWithoutTrailingPathSeperators(0, NULL, &len); + EndSeh(STATUS_SUCCESS); + + ok(res == STATUS_INVALID_PARAMETER, + "Unexpected result 0x%08x (expected STATUS_INVALID_PARAMETER)\n", + res); + ok(len == 0, + "Unexpected length %08x (expected 0)\n", + len); + + StartSeh() + res = RtlGetLengthWithoutTrailingPathSeperators(0, &str, NULL); + EndSeh(STATUS_SUCCESS); + + ok(res == STATUS_INVALID_PARAMETER, + "Unexpected result 0x%08x (expected STATUS_INVALID_PARAMETER)\n", + res); + + StartSeh() + res = RtlGetLengthWithoutTrailingPathSeperators(0, NULL, NULL); + EndSeh(STATUS_SUCCESS); + + ok(res == STATUS_INVALID_PARAMETER, + "Unexpected result 0x%08x (expected STATUS_INVALID_PARAMETER)\n", + res); + + for(i = 0; i < 32; i++) + { + len = 0xDEADBEEF; + + StartSeh() + res = RtlGetLengthWithoutTrailingPathSeperators(1<<i, &str, &len); + EndSeh(STATUS_SUCCESS); + + ok(res == STATUS_INVALID_PARAMETER, + "Unexpected result 0x%08x (expected STATUS_INVALID_PARAMETER)\n", + res); + + ok(len == 0, + "Unexpected length %08x (expected 0)\n", + len); + } + + len = 0xDEADBEEF; + + StartSeh() + res = RtlGetLengthWithoutTrailingPathSeperators(0xFFFFFFFF, &str, &len); + EndSeh(STATUS_SUCCESS); + + ok(res == STATUS_INVALID_PARAMETER, + "Unexpected result 0x%08x (expected STATUS_INVALID_PARAMETER)\n", + res); + + ok(len == 0, + "Unexpected length %08x (expected 0)\n", + len); +} Propchange: trunk/rostests/apitests/ntdll/RtlGetLengthWithoutTrailingPathSeperators.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/ntdll/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/testlist.c… ============================================================================== --- trunk/rostests/apitests/ntdll/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/testlist.c [iso-8859-1] Sat Sep 28 09:03:04 2013 @@ -20,6 +20,7 @@ extern void func_RtlGetFullPathName_U(void); extern void func_RtlGetFullPathName_Ustr(void); extern void func_RtlGetFullPathName_UstrEx(void); +extern void func_RtlGetLengthWithoutTrailingPathSeperators(void); extern void func_RtlGetLongestNtPathLength(void); extern void func_RtlInitializeBitMap(void); extern void func_TimerResolution(void); @@ -44,6 +45,7 @@ { "RtlGetFullPathName_U", func_RtlGetFullPathName_U }, { "RtlGetFullPathName_Ustr", func_RtlGetFullPathName_Ustr }, { "RtlGetFullPathName_UstrEx", func_RtlGetFullPathName_UstrEx }, + { "RtlGetLengthWithoutTrailingPathSeperators", func_RtlGetLengthWithoutTrailingPathSeperators }, { "RtlGetLongestNtPathLength", func_RtlGetLongestNtPathLength }, { "RtlInitializeBitMap", func_RtlInitializeBitMap }, { "TimerResolution", func_TimerResolution },

1 0

[tfaber] 60403: [NDK] - Fix RtlGetLengthWithoutTrailingPathSeperators declaration CORE-7482 #comment Hermès, feel free to add back your define thingie.... I just need this to work right now ;)
by tfaber＠svn.reactos.org 28 Sep '13

28 Sep '13

Author: tfaber Date: Sat Sep 28 09:01:31 2013 New Revision: 60403 URL: http://svn.reactos.org/svn/reactos?rev=60403&view=rev Log: [NDK] - Fix RtlGetLengthWithoutTrailingPathSeperators declaration CORE-7482 #comment Hermès, feel free to add back your define thingie.... I just need this to work right now ;) Modified: trunk/reactos/include/ndk/rtlfuncs.h Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] Sat Sep 28 09:01:31 2013 @@ -2728,17 +2728,11 @@ NTSYSAPI NTSTATUS NTAPI -RtlGetLengthWithoutTrailingPathSeparators( - _In_ ULONG Flags, +RtlGetLengthWithoutTrailingPathSeperators( + _Reserved_ ULONG Flags, _In_ PCUNICODE_STRING PathString, _Out_ PULONG Length ); -/* - * NOTE: the export is called RtlGetLengthWithoutTrailingPathSeperators - * (with a 'e' instead of a 'a' in "Seperators"). - */ -#define RtlGetLengthWithoutTrailingPathSeperators \ - RtlGetLengthWithoutTrailingPathSeparators NTSYSAPI ULONG

1 0

[tfaber] 60402: [NTDLL_APITEST] - Add test for NtCreateThread with invalid ThreadContext parameter. Patch by Aleksander Andrejevic. CORE-7252
by tfaber＠svn.reactos.org 28 Sep '13

28 Sep '13

Author: tfaber Date: Sat Sep 28 08:38:33 2013 New Revision: 60402 URL: http://svn.reactos.org/svn/reactos?rev=60402&view=rev Log: [NTDLL_APITEST] - Add test for NtCreateThread with invalid ThreadContext parameter. Patch by Aleksander Andrejevic. CORE-7252 Added: trunk/rostests/apitests/ntdll/NtCreateThread.c (with props) Modified: trunk/rostests/apitests/ntdll/CMakeLists.txt trunk/rostests/apitests/ntdll/testlist.c Modified: trunk/rostests/apitests/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/CMakeLists… ============================================================================== --- trunk/rostests/apitests/ntdll/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/CMakeLists.txt [iso-8859-1] Sat Sep 28 08:38:33 2013 @@ -2,6 +2,7 @@ list(APPEND SOURCE LdrEnumResources.c NtAllocateVirtualMemory.c + NtCreateThread.c NtFreeVirtualMemory.c NtMapViewOfSection.c NtProtectVirtualMemory.c Added: trunk/rostests/apitests/ntdll/NtCreateThread.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/NtCreateTh… ============================================================================== --- trunk/rostests/apitests/ntdll/NtCreateThread.c (added) +++ trunk/rostests/apitests/ntdll/NtCreateThread.c [iso-8859-1] Sat Sep 28 08:38:33 2013 @@ -0,0 +1,33 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: See COPYING in the top level directory + * PURPOSE: Test for NtCreateThread + * PROGRAMMER: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + */ + +#define WIN32_NO_STATUS +#include <wine/test.h> +#include <ndk/pstypes.h> +#include <ndk/psfuncs.h> + +START_TEST(NtCreateThread) +{ + NTSTATUS Status; + INITIAL_TEB InitialTeb; + HANDLE ThreadHandle; + OBJECT_ATTRIBUTES Attributes; + + InitializeObjectAttributes(&Attributes, NULL, 0, NULL, NULL); + ZeroMemory(&InitialTeb, sizeof(INITIAL_TEB)); + + Status = NtCreateThread(&ThreadHandle, + 0, + &Attributes, + NtCurrentProcess(), + NULL, + (PCONTEXT)0x70000000, /* Aligned usermode address */ + &InitialTeb, + FALSE); + + ok_hex(Status, STATUS_ACCESS_VIOLATION); +} Propchange: trunk/rostests/apitests/ntdll/NtCreateThread.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/ntdll/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/testlist.c… ============================================================================== --- trunk/rostests/apitests/ntdll/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/testlist.c [iso-8859-1] Sat Sep 28 08:38:33 2013 @@ -5,6 +5,7 @@ extern void func_LdrEnumResources(void); extern void func_NtAllocateVirtualMemory(void); +extern void func_NtCreateThread(void); extern void func_NtFreeVirtualMemory(void); extern void func_NtMapViewOfSection(void); extern void func_NtProtectVirtualMemory(void); @@ -28,6 +29,7 @@ { { "LdrEnumResources", func_LdrEnumResources }, { "NtAllocateVirtualMemory", func_NtAllocateVirtualMemory }, + { "NtCreateThread", func_NtCreateThread }, { "NtFreeVirtualMemory", func_NtFreeVirtualMemory }, { "NtMapViewOfSection", func_NtMapViewOfSection }, { "NtProtectVirtualMemory", func_NtProtectVirtualMemory },

1 0

[tfaber] 60401: [NTOSKRNL] - Protect against invalid ThreadContext pointer in PspCreateThread. Spotted by Aleksander Andrejevic. CORE-7252 - Fix MSVC warning in HdlspDispatch
by tfaber＠svn.reactos.org 28 Sep '13

28 Sep '13

Author: tfaber Date: Sat Sep 28 08:37:47 2013 New Revision: 60401 URL: http://svn.reactos.org/svn/reactos?rev=60401&view=rev Log: [NTOSKRNL] - Protect against invalid ThreadContext pointer in PspCreateThread. Spotted by Aleksander Andrejevic. CORE-7252 - Fix MSVC warning in HdlspDispatch Modified: trunk/reactos/ntoskrnl/ex/hdlsterm.c trunk/reactos/ntoskrnl/ps/thread.c Modified: trunk/reactos/ntoskrnl/ex/hdlsterm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/hdlsterm.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ex/hdlsterm.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/hdlsterm.c [iso-8859-1] Sat Sep 28 08:37:47 2013 @@ -417,7 +417,7 @@ HeadlessInfo = OutputBuffer; HeadlessInfo->PortType = HeadlessSerialPort; HeadlessInfo->Serial.TerminalAttached = TRUE; - HeadlessInfo->Serial.UsedBiosSettings = HeadlessGlobals->UsedBiosSettings; + HeadlessInfo->Serial.UsedBiosSettings = HeadlessGlobals->UsedBiosSettings != 0; HeadlessInfo->Serial.TerminalBaudRate = HeadlessGlobals->TerminalBaudRate; HeadlessInfo->Serial.TerminalType = HeadlessGlobals->TerminalType; Modified: trunk/reactos/ntoskrnl/ps/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/thread.c?rev=6… ============================================================================== --- trunk/reactos/ntoskrnl/ps/thread.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/thread.c [iso-8859-1] Sat Sep 28 08:37:47 2013 @@ -317,19 +317,30 @@ return Status; } - /* Set the Start Addresses */ - Thread->StartAddress = (PVOID)KeGetContextPc(ThreadContext); - Thread->Win32StartAddress = (PVOID)KeGetContextReturnRegister(ThreadContext); + /* Set the Start Addresses from the untrusted ThreadContext */ + _SEH2_TRY + { + Thread->StartAddress = (PVOID)KeGetContextPc(ThreadContext); + Thread->Win32StartAddress = (PVOID)KeGetContextReturnRegister(ThreadContext); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; /* Let the kernel intialize the Thread */ - Status = KeInitThread(&Thread->Tcb, - NULL, - PspUserThreadStartup, - NULL, - Thread->StartAddress, - ThreadContext, - TebBase, - &Process->Pcb); + if (NT_SUCCESS(Status)) + { + Status = KeInitThread(&Thread->Tcb, + NULL, + PspUserThreadStartup, + NULL, + Thread->StartAddress, + ThreadContext, + TebBase, + &Process->Pcb); + } } else {

1 0

[tfaber] 60400: [NPFS] - Fix x64 build - Some typo and style fixes
by tfaber＠svn.reactos.org 28 Sep '13

28 Sep '13

Author: tfaber Date: Sat Sep 28 06:28:32 2013 New Revision: 60400 URL: http://svn.reactos.org/svn/reactos?rev=60400&view=rev Log: [NPFS] - Fix x64 build - Some typo and style fixes Modified: trunk/reactos/drivers/filesystems/npfs_new/CMakeLists.txt trunk/reactos/drivers/filesystems/npfs_new/create.c trunk/reactos/drivers/filesystems/npfs_new/fsctrl.c trunk/reactos/drivers/filesystems/npfs_new/npfs.h trunk/reactos/drivers/filesystems/npfs_new/strucsup.c trunk/reactos/drivers/filesystems/npfs_new/writesup.c Modified: trunk/reactos/drivers/filesystems/npfs_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/CMakeLists.txt [iso-8859-1] Sat Sep 28 06:28:32 2013 @@ -1,25 +1,25 @@ list(APPEND SOURCE - cleanup.c - close.c - create.c - datasup.c - fileinfo.c - fileobsup.c - flushbuf.c - fsctrl.c - main.c - prefxsup.c - read.c - readsup.c - secursup.c - seinfo.c - statesup.c - strucsup.c - volinfo.c - waitsup.c - write.c - writesup.c) + cleanup.c + close.c + create.c + datasup.c + fileinfo.c + fileobsup.c + flushbuf.c + fsctrl.c + main.c + prefxsup.c + read.c + readsup.c + secursup.c + seinfo.c + statesup.c + strucsup.c + volinfo.c + waitsup.c + write.c + writesup.c) add_library(npfs SHARED ${SOURCE}) set_module_type(npfs kernelmodedriver) Modified: trunk/reactos/drivers/filesystems/npfs_new/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/create.c [iso-8859-1] Sat Sep 28 06:28:32 2013 @@ -75,25 +75,25 @@ IN ACCESS_MASK DesiredAccess, IN PLIST_ENTRY List) { - IO_STATUS_BLOCK Status; + IO_STATUS_BLOCK IoStatus; PNP_ROOT_DCB_FCB Ccb; PAGED_CODE(); - Status.Status = NpCreateRootDcbCcb(&Ccb); - if (NT_SUCCESS(Status.Status)) + IoStatus.Status = NpCreateRootDcbCcb(&Ccb); + if (NT_SUCCESS(IoStatus.Status)) { NpSetFileObject(FileObject, Dcb, Ccb, FALSE); ++Dcb->CurrentInstances; - Status.Information = FILE_OPENED; - Status.Status = STATUS_SUCCESS; + IoStatus.Information = FILE_OPENED; + IoStatus.Status = STATUS_SUCCESS; } else { - Status.Information = 0; - } - - return Status; + IoStatus.Information = 0; + } + + return IoStatus; } IO_STATUS_BLOCK Modified: trunk/reactos/drivers/filesystems/npfs_new/fsctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/fsctrl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/fsctrl.c [iso-8859-1] Sat Sep 28 06:28:32 2013 @@ -211,7 +211,7 @@ PNP_CCB Ccb; PFILE_PIPE_PEEK_BUFFER PeekBuffer; PNP_DATA_QUEUE DataQueue; - ULONG BytesPeeked; + ULONG_PTR BytesPeeked; IO_STATUS_BLOCK IoStatus; NTSTATUS Status; PNP_DATA_QUEUE_ENTRY DataEntry; Modified: trunk/reactos/drivers/filesystems/npfs_new/npfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/npfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/npfs.h [iso-8859-1] Sat Sep 28 06:28:32 2013 @@ -34,7 +34,7 @@ // // Npf* -npfs.sys - Npfs Allocations // NpFc - npfs.sys - CCB, client control block -// NpFf - npts.sys - FCB, file control block +// NpFf - npfs.sys - FCB, file control block // NpFC - npfs.sys - ROOT_DCB CCB // NpFD - npfs.sys - DCB, directory block // NpFg - npfs.sys - Global storage @@ -239,7 +239,9 @@ LIST_ENTRY NotifyList; LIST_ENTRY NotifyList2; LIST_ENTRY FcbList; +#ifndef _WIN64 ULONG Pad; +#endif // // Common Footer @@ -265,6 +267,9 @@ USHORT NamedPipeType; LARGE_INTEGER Timeout; LIST_ENTRY CcbList; +#ifdef _WIN64 + PVOID Pad[2]; +#endif // // Common Footer @@ -436,7 +441,7 @@ IN UCHAR CompletionMode, IN ULONG InQuota, IN ULONG OutQuota, - OUT PNP_CCB* NewCcb); + OUT PNP_CCB *NewCcb); NTSTATUS NTAPI @@ -454,7 +459,7 @@ NTSTATUS NTAPI -NpCreateRootDcbCcb(IN PNP_ROOT_DCB_FCB* NewRootCcb); +NpCreateRootDcbCcb(IN PNP_ROOT_DCB_FCB *NewRootCcb); VOID NTAPI @@ -561,8 +566,8 @@ NODE_TYPE_CODE NTAPI NpDecodeFileObject(IN PFILE_OBJECT FileObject, - OUT PVOID* PrimaryContext OPTIONAL, - OUT PNP_CCB* Ccb, + OUT PVOID *PrimaryContext OPTIONAL, + OUT PNP_CCB *Ccb, OUT PULONG NamedPipeEnd OPTIONAL); PNP_FCB Modified: trunk/reactos/drivers/filesystems/npfs_new/strucsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/strucsup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/strucsup.c [iso-8859-1] Sat Sep 28 06:28:32 2013 @@ -148,7 +148,7 @@ NTSTATUS NTAPI -NpCreateRootDcbCcb(IN PNP_ROOT_DCB_FCB* NewRootCcb) +NpCreateRootDcbCcb(IN PNP_ROOT_DCB_FCB *NewRootCcb) { PNP_ROOT_DCB_FCB RootCcb; PAGED_CODE(); @@ -304,7 +304,7 @@ IN UCHAR CompletionMode, IN ULONG InQuota, IN ULONG OutQuota, - OUT PNP_CCB* NewCcb) + OUT PNP_CCB *NewCcb) { PNP_CCB Ccb; PNP_NONPAGED_CCB CcbNonPaged; Modified: trunk/reactos/drivers/filesystems/npfs_new/writesup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/writesup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/writesup.c [iso-8859-1] Sat Sep 28 06:28:32 2013 @@ -61,7 +61,7 @@ if (IoStack->MajorFunction == IRP_MJ_FILE_SYSTEM_CONTROL && IoStack->Parameters.FileSystemControl.FsControlCode == FSCTL_PIPE_INTERNAL_READ_OVFLOW && - (DataSize < OutBufferSize || MoreProcessing)) + (DataSize < OutBufferSize || MoreProcessing)) { WriteIrp = NpRemoveDataQueueEntry(WriteQueue, TRUE, List); if (WriteIrp) @@ -74,7 +74,7 @@ if (DataEntry->DataEntryType == Unbuffered) { - DataEntry->Irp->Overlay.AllocationSize.QuadPart = 0; + DataEntry->Irp->Overlay.AllocationSize.QuadPart = 0; } BufferSize = *BytesNotWritten; @@ -94,9 +94,9 @@ _SEH2_TRY { - RtlCopyMemory(Buffer, - (PVOID)((ULONG_PTR)OutBuffer + OutBufferSize - *BytesNotWritten), - BufferSize); + RtlCopyMemory(Buffer, + (PVOID)((ULONG_PTR)OutBuffer + OutBufferSize - *BytesNotWritten), + BufferSize); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) {

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs