Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 60709: [NTOSKRNL] Rewrite NtCallbackReturn in C
by tkreuzer＠svn.reactos.org 19 Oct '13

19 Oct '13

Author: tkreuzer Date: Sat Oct 19 18:04:15 2013 New Revision: 60709 URL: http://svn.reactos.org/svn/reactos?rev=60709&view=rev Log: [NTOSKRNL] Rewrite NtCallbackReturn in C Modified: trunk/reactos/ntoskrnl/include/internal/ke.h trunk/reactos/ntoskrnl/ke/i386/usercall.c trunk/reactos/ntoskrnl/ke/i386/usercall_asm.S Modified: trunk/reactos/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] Sat Oct 19 18:04:15 2013 @@ -1050,6 +1050,14 @@ IN PULONG OutputLength ); +DECLSPEC_NORETURN +VOID +FASTCALL +KiCallbackReturn( + IN PVOID Stack, + IN NTSTATUS Status +); + VOID NTAPI KiInitMachineDependent(VOID); Modified: trunk/reactos/ntoskrnl/ke/i386/usercall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/usercall.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/usercall.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/usercall.c [iso-8859-1] Sat Oct 19 18:04:15 2013 @@ -351,5 +351,140 @@ KiServiceExit(CallbackTrapFrame, 0); } +/*++ + * @name NtCallbackReturn + * + * The NtCallbackReturn routine returns to kernel mode after a user-mode + * callback was done through KeUserModeCallback. It uses the callback frame + * which was setup in order to return the information, restores the stack, + * and resumes execution where it was left off. + * + * @param Result + * Pointer to a caller-allocated buffer where the return data + * from the user-mode function is located. + * + * @param ResultLength + * Size of the Output Buffer described above. + * + * @param CallbackStatus + * Status code of the callback operation. + * + * @return Status code of the callback operation. + * + * @remark This call MUST be paired with KeUserModeCallback. + * + *--*/ +NTSTATUS +NTAPI +NtCallbackReturn( + _In_ PVOID Result, + _In_ ULONG ResultLength, + _In_ NTSTATUS CallbackStatus) +{ + PKTHREAD CurrentThread; + PKCALLOUT_FRAME CalloutFrame; + PKTRAP_FRAME CallbackTrapFrame, TrapFrame; + PFX_SAVE_AREA FxSaveArea, CbFxSaveArea; + ULONG Size; + PKPCR Pcr; + PKTSS Tss; + + /* Get the current thread and make sure we have a callback stack */ + CurrentThread = KeGetCurrentThread(); + CalloutFrame = CurrentThread->CallbackStack; + if (CalloutFrame == NULL) + { + return STATUS_NO_CALLBACK_ACTIVE; + } + + /* Get the trap frame */ + CallbackTrapFrame = CurrentThread->TrapFrame; + + /* Restore the exception list */ + Pcr = KeGetPcr(); + Pcr->NtTib.ExceptionList = CallbackTrapFrame->ExceptionList; + + /* Store the results in the callback stack */ + *((PVOID*)CalloutFrame->Result) = Result; + *((ULONG*)CalloutFrame->ResultLength) = ResultLength; + + /* Disable interrupts for NPX save and stack switch */ + _disable(); + + /* Set desination and origin NPX Frames */ + CbFxSaveArea = (PVOID)((ULONG)CurrentThread->InitialStack - sizeof(FX_SAVE_AREA)); + FxSaveArea = (PVOID)(CalloutFrame->InitialStack - sizeof(FX_SAVE_AREA)); + + /* Now copy back NPX State */ + FxSaveArea->U.FnArea.ControlWord = CbFxSaveArea->U.FnArea.ControlWord; + FxSaveArea->U.FnArea.StatusWord = CbFxSaveArea->U.FnArea.StatusWord; + FxSaveArea->U.FnArea.TagWord = CbFxSaveArea->U.FnArea.TagWord; + FxSaveArea->U.FnArea.DataSelector = CbFxSaveArea->U.FnArea.DataSelector; + FxSaveArea->Cr0NpxState = CbFxSaveArea->Cr0NpxState; + + /* Get the previous trap frame */ + TrapFrame = (PKTRAP_FRAME)CalloutFrame->TrapFrame; + + /* Check if we failed in user mode */ + if (CallbackStatus == STATUS_CALLBACK_POP_STACK) + { + /* Check if we came from v86 mode */ + if (CallbackTrapFrame->EFlags & EFLAGS_V86_MASK) + { + Size = sizeof(KTRAP_FRAME) - FIELD_OFFSET(KTRAP_FRAME, SegFs); + } + else + { + Size = FIELD_OFFSET(KTRAP_FRAME, V86Es) - FIELD_OFFSET(KTRAP_FRAME, SegFs); + } + + /* Copy back part of the trap frame */ + RtlCopyMemory(&TrapFrame->SegFs, &CallbackTrapFrame->SegFs, Size); + } + + /* Clear DR7 */ + TrapFrame->Dr7 = 0; + + /* Check if debugging was active */ + if (CurrentThread->Header.DebugActive & 0xFF) + { + /* Copy debug registers data from it */ + TrapFrame->Dr0 = CallbackTrapFrame->Dr0; + TrapFrame->Dr1 = CallbackTrapFrame->Dr1; + TrapFrame->Dr2 = CallbackTrapFrame->Dr2; + TrapFrame->Dr3 = CallbackTrapFrame->Dr3; + TrapFrame->Dr6 = CallbackTrapFrame->Dr6; + TrapFrame->Dr7 = CallbackTrapFrame->Dr7; + } + + /* Get TSS */ + Tss = Pcr->TSS; + + /* Check for V86 mode */ + if (TrapFrame->EFlags & EFLAGS_V86_MASK) + { + /* Set new stack address in TSS (full trap frame) */ + Tss->Esp0 = (ULONG_PTR)(TrapFrame + 1); + } + else + { + /* Set new stack address in TSS (non-V86 trap frame) */ + Tss->Esp0 = (ULONG_PTR)&TrapFrame->V86Es; + } + + /* Get the initial stack and restore it */ + CurrentThread->InitialStack = (PVOID)CalloutFrame->InitialStack; + + /* Restore the trap frame and the previous callback stack */ + CurrentThread->TrapFrame = TrapFrame; + CurrentThread->CallbackStack = (PVOID)CalloutFrame->CallbackStack; + + /* Bring interrupts back */ + _enable(); + + /* Now switch back to the old stack */ + KiCallbackReturn(&CalloutFrame->Edi, CallbackStatus); +} + /* EOF */ 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] Sat Oct 19 18:04:15 2013 @@ -76,184 +76,22 @@ ret 8 -/*++ - * @name NtCallbackReturn - * - * The NtCallbackReturn routine returns to kernel mode after a user-mode - * callback was done through KeUserModeCallback. It uses the callback frame - * which was setup in order to return the information, restores the stack, - * and resumes execution where it was left off. - * - * @param Result - * Pointer to a caller-allocated buffer where the return data - * from the user-mode function is located. - * - * @param ResultLength - * Size of the Output Buffer described above. - * - * @param CallbackStatus - * Status code of the callback operation. - * - * @return Status code of the callback operation. - * - * @remark This call MUST be paired with KeUserModeCallback. - * - *--*/ -PUBLIC _NtCallbackReturn@12 -_NtCallbackReturn@12: - - /* Get the current thread and make sure we have a callback stack */ - mov eax, fs:[KPCR_CURRENT_THREAD] - mov ecx, [eax+KTHREAD_CALLBACK_STACK] - test ecx, ecx - jz NoStack - - /* Get the trap frame */ - mov ebx, [eax+KTHREAD_TRAP_FRAME] - - /* Restore the exception list */ - mov edx, [ebx+KTRAP_FRAME_EXCEPTION_LIST] - mov fs:[KPCR_EXCEPTION_LIST], edx - - /* Get the result, the result length and the status */ - mov edi, [esp+4] - mov esi, [esp+8] - mov ebp, [esp+12] - - /* Store the results in the callback stack */ - mov ebx, [ecx+CBSTACK_RESULT] - mov [ebx], edi - mov ebx, [ecx+CBSTACK_RESULT_LENGTH] - mov [ebx], esi - - /* Get the previous stack */ - mov ebx, [ecx] - - /* Disable interrupts for NPX save and stack switch */ - cli - - /* Get the initial stack and restore it */ - mov esi, [eax+KTHREAD_INITIAL_STACK] - mov [eax+KTHREAD_INITIAL_STACK], ebx - - /* Set desination and origin NPX Frames */ - sub esi, NPX_FRAME_LENGTH - sub ebx, NPX_FRAME_LENGTH - - /* Copy NPX Data */ - mov edx, [esi+FP_CONTROL_WORD] - mov [ebx+FP_CONTROL_WORD], edx - mov edx, [esi+FP_STATUS_WORD] - mov [ebx+FP_STATUS_WORD], edx - mov edx, [esi+FP_TAG_WORD] - mov [ebx+FP_TAG_WORD], edx - mov edx, [esi+FP_DATA_SELECTOR] - mov [ebx+FP_DATA_SELECTOR], edx - mov edx, [esi+FN_CR0_NPX_STATE] - mov [ebx+FN_CR0_NPX_STATE], edx - - /* Check if we failed in user mode */ - cmp ebp, STATUS_CALLBACK_POP_STACK - mov edi, [ecx+CBSTACK_TRAP_FRAME] - jz UserFault - -CheckDebug: - - /* Clear DR7 */ - and dword ptr [edi+KTRAP_FRAME_DR7], 0 - - /* Check if debugging was active */ - test byte ptr [eax+KTHREAD_DEBUG_ACTIVE], HEX(0FF) - jnz RestoreDebug - -RestoreStack: - - /* Get TSS */ - mov edx, fs:[KPCR_TSS] - - /* Restore stack pointer */ - lea esp, [ecx+CBSTACK_CALLBACK_STACK] - - /* Check if we were in V86 mode */ - test dword ptr [edi+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK - jnz V86Ret - sub ebx, 16 - -V86Ret: - /* Restore the ESP in TSS */ - mov [edx+KTSS_ESP0], ebx - - /* Restore the trap frame */ - mov [eax+KTHREAD_TRAP_FRAME], edi - - /* Bring interrupts back */ - sti - - /* Restore the callback stack*/ - pop [eax+KTHREAD_CALLBACK_STACK] + +PUBLIC @KiCallbackReturn@8 +@KiCallbackReturn@8: + + /* Restore the stack */ + mov esp, ecx /* Set status and return */ - mov eax, ebp + mov eax, edx pop edi pop esi pop ebx pop ebp - pop edx - - /* Clean stack and jump back */ - add esp, 8 - jmp edx - -UserFault: - /* Set size to copy */ - mov ecx, (KTRAP_FRAME_V86_ES - KTRAP_FRAME_FS) / 4 - - /* Check if this was V86 mode */ - mov esi, [eax+KTHREAD_TRAP_FRAME] - test dword ptr [esi+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK - - /* Save EDI and load destination */ - mov edx, edi - lea edi, [edi+KTRAP_FRAME_FS] - jz NotV86 - add ecx, 16 / 4 - -NotV86: - /* Set source and copy */ - lea esi, [esi+KTRAP_FRAME_FS] - rep movsd - - /* Restore ECX and ECX */ - mov ecx, [eax+KTHREAD_CALLBACK_STACK] - mov edi, edx - jmp CheckDebug - -RestoreDebug: - /* Get a pointer to thread's trap frame */ - mov esi, [eax+KTHREAD_TRAP_FRAME] - - /* Copy debug registers data from it */ - mov edx, [esi+KTRAP_FRAME_DR0] - mov [edi+KTRAP_FRAME_DR0], edx - mov edx, [esi+KTRAP_FRAME_DR1] - mov [edi+KTRAP_FRAME_DR1], edx - mov edx, [esi+KTRAP_FRAME_DR2] - mov [edi+KTRAP_FRAME_DR2], edx - mov edx, [esi+KTRAP_FRAME_DR3] - mov [edi+KTRAP_FRAME_DR3], edx - mov edx, [esi+KTRAP_FRAME_DR6] - mov [edi+KTRAP_FRAME_DR6], edx - mov edx, [esi+KTRAP_FRAME_DR7] - mov [edi+KTRAP_FRAME_DR7], edx - - /* Jump back */ - jmp RestoreStack - -NoStack: - - /* Return failure */ - mov eax, STATUS_NO_CALLBACK_ACTIVE - ret 12 + + /* Clean stack and return */ + ret 8 /*++ * @name KeSwitchKernelStack

1 0

[aandrejevic] 60708: [FAST486] And add those newly implemented opcodes into the table...
by aandrejevic＠svn.reactos.org 19 Oct '13

19 Oct '13

Author: aandrejevic Date: Sat Oct 19 18:00:19 2013 New Revision: 60708 URL: http://svn.reactos.org/svn/reactos?rev=60708&view=rev Log: [FAST486] And add those newly implemented opcodes into the table... Modified: branches/ntvdm/lib/fast486/extraops.c branches/ntvdm/lib/fast486/extraops.h Modified: branches/ntvdm/lib/fast486/extraops.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/extraops.c?re… ============================================================================== --- branches/ntvdm/lib/fast486/extraops.c [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/extraops.c [iso-8859-1] Sat Oct 19 18:00:19 2013 @@ -182,22 +182,22 @@ Fast486ExtOpcodeConditionalJmp, Fast486ExtOpcodeConditionalJmp, Fast486ExtOpcodeConditionalJmp, - NULL, // TODO: OPCODE 0x90 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x91 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x92 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x93 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x94 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x95 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x96 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x97 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x98 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x99 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x9A NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x9B NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x9C NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x9D NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x9E NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x9F NOT IMPLEMENTED + Fast486ExtOpcodeConditionalSet, + Fast486ExtOpcodeConditionalSet, + Fast486ExtOpcodeConditionalSet, + Fast486ExtOpcodeConditionalSet, + Fast486ExtOpcodeConditionalSet, + Fast486ExtOpcodeConditionalSet, + Fast486ExtOpcodeConditionalSet, + Fast486ExtOpcodeConditionalSet, + Fast486ExtOpcodeConditionalSet, + Fast486ExtOpcodeConditionalSet, + Fast486ExtOpcodeConditionalSet, + Fast486ExtOpcodeConditionalSet, + Fast486ExtOpcodeConditionalSet, + Fast486ExtOpcodeConditionalSet, + Fast486ExtOpcodeConditionalSet, + Fast486ExtOpcodeConditionalSet, NULL, // TODO: OPCODE 0xA0 NOT IMPLEMENTED NULL, // TODO: OPCODE 0xA1 NOT IMPLEMENTED NULL, // Invalid Modified: branches/ntvdm/lib/fast486/extraops.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/extraops.h?re… ============================================================================== --- branches/ntvdm/lib/fast486/extraops.h [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/extraops.h [iso-8859-1] Sat Oct 19 18:00:19 2013 @@ -24,6 +24,7 @@ /* DEFINES ********************************************************************/ FAST486_OPCODE_HANDLER(Fast486ExtOpcodeConditionalJmp); +FAST486_OPCODE_HANDLER(Fast486ExtOpcodeConditionalSet); FAST486_OPCODE_HANDLER(Fast486OpcodeExtended); #endif // _EXTRAOPS_H_

1 0

[tfaber] 60707: [NTDLL_APITEST] - Add test for Rtl MemoryStream functions. Patch by David Quintana. CORE-7492
by tfaber＠svn.reactos.org 19 Oct '13

19 Oct '13

Author: tfaber Date: Sat Oct 19 17:59:29 2013 New Revision: 60707 URL: http://svn.reactos.org/svn/reactos?rev=60707&view=rev Log: [NTDLL_APITEST] - Add test for Rtl MemoryStream functions. Patch by David Quintana. CORE-7492 Added: trunk/rostests/apitests/ntdll/RtlMemoryStream.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 Oct 19 17:59:29 2013 @@ -21,6 +21,7 @@ RtlGetLengthWithoutTrailingPathSeperators.c RtlGetLongestNtPathLength.c RtlInitializeBitMap.c + RtlMemoryStream.c SystemInfo.c Timer.c testlist.c) @@ -30,7 +31,7 @@ endif() add_executable(ntdll_apitest ${SOURCE} ${ntdll_apitest_asm}) -target_link_libraries(ntdll_apitest wine ${PSEH_LIB}) +target_link_libraries(ntdll_apitest wine uuid ${PSEH_LIB}) set_module_type(ntdll_apitest win32cui) add_importlibs(ntdll_apitest msvcrt advapi32 kernel32 ntdll) Added: trunk/rostests/apitests/ntdll/RtlMemoryStream.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/RtlMemoryS… ============================================================================== --- trunk/rostests/apitests/ntdll/RtlMemoryStream.c (added) +++ trunk/rostests/apitests/ntdll/RtlMemoryStream.c [iso-8859-1] Sat Oct 19 17:59:29 2013 @@ -0,0 +1,525 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Test for the Rtl*MemoryStream* series of functions + * PROGRAMMER: David Quintana <gigaherz(a)gmail.com> + */ + +#define COBJMACROS + +#include <apitest.h> +#include <ndk/rtlfuncs.h> +#include <ole2.h> +#include <wtypes.h> + +ULONG finalReleaseCallCount = 0; + +VOID +NTAPI +CustomFinalReleaseMemoryStream(PRTL_MEMORY_STREAM stream) +{ + finalReleaseCallCount++; + trace("FinalRelease CALLED.\n"); +} + +VOID +NTAPI +CustomFinalReleaseOutOfProcessMemoryStream(PRTL_MEMORY_STREAM stream) +{ + finalReleaseCallCount++; + trace("FinalRelease CALLED.\n"); + RtlFinalReleaseOutOfProcessMemoryStream(stream); +} + +BOOL CompareStructsAndSaveForLater(PRTL_MEMORY_STREAM pold, PRTL_MEMORY_STREAM pnew, PSTR at) +{ + BOOL equal = TRUE; + + // Compare + if (pold->Vtbl != pnew->Vtbl) { if (equal) { trace("%s: \n", at); equal = FALSE; } trace("Vtbl changed from %p to %p\n", pold->Vtbl, pnew->Vtbl);} + if (pold->RefCount != pnew->RefCount) { if (equal) { trace("%s: \n", at); equal = FALSE; } trace("RefCount changed from %p to %p\n", pold->RefCount, pnew->RefCount); } + if (pold->Unk1 != pnew->Unk1) { if (equal) { trace("%s: \n", at); equal = FALSE; } trace("Unk1 changed from %p to %p\n", pold->Unk1, pnew->Unk1); } + if (pold->Current != pnew->Current) { if (equal) { trace("%s: \n", at); equal = FALSE; } trace("Current changed from %p to %p\n", pold->Current, pnew->Current); } + if (pold->Start != pnew->Start) { if (equal) { trace("%s: \n", at); equal = FALSE; } trace("Start changed from %p to %p\n", pold->Start, pnew->Start); } + if (pold->End != pnew->End) { if (equal) { trace("%s: \n", at); equal = FALSE; } trace("End changed from %p to %p\n", pold->End, pnew->End); } + if (pold->FinalRelease != pnew->FinalRelease) { if (equal) { trace("%s: \n", at); equal = FALSE; } trace("FinalRelease changed from %p to %p\n", pold->FinalRelease, pnew->FinalRelease); } + if (pold->ProcessHandle != pnew->ProcessHandle) { if (equal) { trace("%s: \n", at); equal = FALSE; } trace("ProcessHandle changed from %p to %p\n", pold->ProcessHandle, pnew->ProcessHandle); } + + // Save + pold->Vtbl = pnew->Vtbl; + pold->RefCount = pnew->RefCount; + pold->Unk1 = pnew->Unk1; + pold->Current = pnew->Current; + pold->Start = pnew->Start; + pold->End = pnew->End; + pold->FinalRelease = pnew->FinalRelease; + pold->ProcessHandle = pnew->ProcessHandle; + + return equal; +} + +void test_InProcess() +{ + LARGE_INTEGER move; + ULARGE_INTEGER size; + HRESULT res; + ULONG i; + + RTL_MEMORY_STREAM stream; + RTL_MEMORY_STREAM previous; + + IStream * istream; + + UCHAR buffer[80]; + UCHAR buffer2[180]; + ULONG bytesRead; + + STATSTG stat; + + finalReleaseCallCount = 0; + + for (i = 0; i < sizeof(buffer2); i++) + { + buffer2[i] = i % UCHAR_MAX; + } + + memset(&stream, 0x90, sizeof(stream)); + memset(&previous, 0x00, sizeof(previous)); + + StartSeh() + RtlInitMemoryStream(NULL); + EndSeh(STATUS_ACCESS_VIOLATION); + + StartSeh() + RtlInitMemoryStream(&stream); + EndSeh(STATUS_SUCCESS); + + CompareStructsAndSaveForLater(&previous, &stream, "After init"); + + ok(stream.RefCount == 0, "RefCount has a wrong value: %d (expected %d).\n", stream.RefCount, 0); + + stream.Current = buffer2; + stream.Start = buffer2; + stream.End = buffer2 + sizeof(buffer2); + stream.FinalRelease = CustomFinalReleaseMemoryStream; + + CompareStructsAndSaveForLater(&previous, &stream, "After assigning"); + + StartSeh() + res = IStream_QueryInterface((struct IStream*)&stream, NULL, NULL); + ok(res == E_INVALIDARG, "QueryInterface to IStream returned wrong hResult: 0x%08x.\n", res); + ok(stream.RefCount == 0, "RefCount has a wrong value: %d (expected %d).\n", stream.RefCount, 2); + EndSeh(STATUS_ACCESS_VIOLATION); + + StartSeh() + res = IStream_QueryInterface((struct IStream*)&stream, &IID_IStream, NULL); + ok(res == E_INVALIDARG, "QueryInterface to IStream returned wrong hResult: 0x%08x.\n", res); + ok(stream.RefCount == 1, "RefCount has a wrong value: %d (expected %d).\n", stream.RefCount, 2); + EndSeh(STATUS_ACCESS_VIOLATION); + + StartSeh() + res = IStream_QueryInterface((struct IStream*)&stream, NULL, (void**)&istream); + ok(res == E_INVALIDARG, "QueryInterface to IStream returned wrong hResult: 0x%08x.\n", res); + ok(stream.RefCount == 1, "RefCount has a wrong value: %d (expected %d).\n", stream.RefCount, 2); + EndSeh(STATUS_ACCESS_VIOLATION); + + StartSeh() + res = IStream_QueryInterface((struct IStream*)&stream, &IID_IStream, (void**)&istream); + ok(res == S_OK, "QueryInterface to IStream returned wrong hResult: 0x%08x.\n", res); + ok(stream.RefCount == 2, "RefCount has a wrong value: %d (expected %d).\n", stream.RefCount, 2); + EndSeh(STATUS_SUCCESS); + + CompareStructsAndSaveForLater(&previous, &stream, "After QueryInterface"); + + StartSeh() + res = IStream_Stat(istream, NULL, 0); + ok(res == STG_E_INVALIDPOINTER, "Stat to IStream returned wrong hResult: 0x%08x.\n", res); + EndSeh(STATUS_SUCCESS); + + StartSeh() + res = IStream_Stat(istream, &stat, STATFLAG_NONAME); + ok(res == S_OK, "Stat to IStream returned wrong hResult: 0x%08x.\n", res); + EndSeh(STATUS_SUCCESS); + + ok(stream.Current == buffer2, + "stream.Current points to the wrong address 0x%p (expected 0x%p)\n", + stream.Current, buffer2); + ok(stream.Start == buffer2, "stream.Start was changed unexpectedly\n"); + ok(stream.End == buffer2 + sizeof(buffer2), "stream.End was changed unexpectedly\n"); + + ok(stat.cbSize.QuadPart == ((PUCHAR)stream.End - (PUCHAR)stream.Start), + "stat.cbSize has the wrong value %lld (expected %d)\n", + stat.cbSize.QuadPart, (PUCHAR)stream.End - (PUCHAR)stream.Start); + + CompareStructsAndSaveForLater(&previous, &stream, "After Stat"); + + StartSeh() + res = IStream_AddRef(istream); + ok(res == 3, "AddRef to IStream returned wrong hResult: %d.\n", res); + EndSeh(STATUS_SUCCESS); + + StartSeh() + res = IStream_AddRef(istream); + ok(res == 4, "AddRef to IStream returned wrong hResult: %d.\n", res); + EndSeh(STATUS_SUCCESS); + + StartSeh() + res = IStream_Release(istream); + ok(res == 3, "Release to IStream returned wrong hResult: %d.\n", res); + EndSeh(STATUS_SUCCESS); + + StartSeh() + res = IStream_AddRef(istream); + ok(res == 4, "AddRef to IStream returned wrong hResult: %d.\n", res); + EndSeh(STATUS_SUCCESS); + + StartSeh() + res = IStream_Release(istream); + ok(res == 3, "Release to IStream returned wrong hResult: %d.\n", res); + EndSeh(STATUS_SUCCESS); + + StartSeh() + res = IStream_Release(istream); + ok(res == 2, "Release to IStream returned wrong hResult: %d.\n", res); + EndSeh(STATUS_SUCCESS); + + CompareStructsAndSaveForLater(&previous, &stream, "After AddRef"); + + StartSeh() + res = IStream_Read(istream, NULL, 0, &bytesRead); + ok(res == S_OK, "Read to IStream returned wrong hResult: 0x%08x.\n", res); + EndSeh(STATUS_SUCCESS); + + StartSeh() + res = IStream_Read(istream, buffer, 40, NULL); + ok(res == S_OK, "Read to IStream returned wrong hResult: 0x%08x.\n", res); + EndSeh(STATUS_ACCESS_VIOLATION); + + StartSeh() + res = IStream_Read(istream, buffer + 40, 39, &bytesRead); + ok(res == S_OK, "Read to IStream returned wrong hResult: 0x%08x.\n", res); + EndSeh(STATUS_SUCCESS); + + if (SUCCEEDED(res)) + { + bytesRead += 40; + for (i = 0; i < bytesRead; i++) + { + ok(buffer[i] == i, "Buffer[%d] contains a wrong number %d (expected %d).\n", i, buffer[i], i); + } + } + + ok(stream.Current == buffer2 + 79, + "stream.Current points to the wrong address 0x%p (expected 0x%p)\n", + stream.Current, buffer2); + ok(stream.Start == buffer2, "stream.Start was changed unexpectedly\n"); + ok(stream.End == buffer2 + sizeof(buffer2), "stream.End was changed unexpectedly\n"); + + CompareStructsAndSaveForLater(&previous, &stream, "After Read 1"); + + size.QuadPart = 0x9090909090909090ull; + + StartSeh() + move.QuadPart = -1; + res = IStream_Seek(istream, move, STREAM_SEEK_END, &size); + ok(res == STG_E_INVALIDPOINTER, "Seek to IStream returned wrong hResult: 0x%08x.\n", res); + ok(size.QuadPart == 0x9090909090909090ull, "Seek modified the new location in an error (0x%08x,0x%08x).\n", size.HighPart, size.LowPart); + EndSeh(STATUS_SUCCESS); + + StartSeh() + move.QuadPart = 0; + res = IStream_Seek(istream, move, STREAM_SEEK_END, &size); + ok(res == S_OK, "Seek to IStream returned wrong hResult: 0x%08x.\n", res); + ok(size.QuadPart == (PUCHAR)stream.End - (PUCHAR)stream.Start, "Seek new location unexpected value: 0x%08x.\n", size.LowPart); + EndSeh(STATUS_SUCCESS); + + size.QuadPart = 0x9090909090909090ull; + + StartSeh() + move.QuadPart = 1; + res = IStream_Seek(istream, move, STREAM_SEEK_END, &size); + ok(res == S_OK, "Seek to IStream returned wrong hResult: 0x%08x.\n", res); + ok(size.QuadPart == (PUCHAR)stream.End - (PUCHAR)stream.Start - 1, "Seek new location unexpected value: 0x%08x.\n", size.LowPart); + EndSeh(STATUS_SUCCESS); + + size.QuadPart = 0x9090909090909090ull; + + StartSeh() + move.QuadPart = 2; + res = IStream_Seek(istream, move, STREAM_SEEK_END, &size); + ok(res == S_OK, "Seek to IStream returned wrong hResult: 0x%08x.\n", res); + ok(size.QuadPart == (PUCHAR)stream.End - (PUCHAR)stream.Start - 2, "Seek new location unexpected value: 0x%08x.\n", size.LowPart); + EndSeh(STATUS_SUCCESS); + + size.QuadPart = 0x9090909090909090ull; + + StartSeh() + move.QuadPart = -20; + res = IStream_Seek(istream, move, STREAM_SEEK_SET, &size); + ok(res == STG_E_INVALIDPOINTER, "Seek to IStream returned wrong hResult: 0x%08x.\n", res); + ok(size.QuadPart == 0x9090909090909090ull, "Seek modified the new location in an error.\n"); + EndSeh(STATUS_SUCCESS); + + StartSeh() + move.QuadPart = 4000; + res = IStream_Seek(istream, move, STREAM_SEEK_SET, &size); + ok(res == STG_E_INVALIDPOINTER, "Seek to IStream returned wrong hResult: 0x%08x.\n", res); + ok(size.QuadPart == 0x9090909090909090ull, "Seek modified the new location in an error.\n"); + EndSeh(STATUS_SUCCESS); + + StartSeh() + move.QuadPart = 0x100000000ull; + res = IStream_Seek(istream, move, STREAM_SEEK_SET, &size); +#ifdef _WIN64 + ok(res == STG_E_INVALIDPOINTER, "Seek to IStream returned wrong hResult: 0x%08x.\n", res); + ok(size.QuadPart == 0x9090909090909090ull, "Seek modified the new location in an error (0x%08x,0x%08x).\n", size.HighPart, size.LowPart); +#else + ok(res == S_OK, "Seek to IStream returned wrong hResult: 0x%08x.\n", res); + ok(size.QuadPart == 0, "Seek new location unexpected value: 0x%08x.\n", size.LowPart); +#endif + EndSeh(STATUS_SUCCESS); + +#ifdef _WIN64 + StartSeh() + move.QuadPart = 0; + res = IStream_Seek(istream, move, STREAM_SEEK_SET, &size); + ok(res == S_OK, "Seek to IStream returned wrong hResult: 0x%08x.\n", res); + ok(size.QuadPart == 0, "Seek new location unexpected value: 0x%08x.\n", size.LowPart); + EndSeh(STATUS_SUCCESS); +#endif + + size.QuadPart = 0x9090909090909090ull; + + StartSeh() + move.QuadPart = -20; + res = IStream_Seek(istream, move, STREAM_SEEK_CUR, &size); + ok(res == STG_E_INVALIDPOINTER, "Seek to IStream returned wrong hResult: 0x%08x.\n", res); + ok(size.QuadPart == 0x9090909090909090ull, "Seek modified the new location in an error (0x%08x,0x%08x).\n", size.HighPart, size.LowPart); + EndSeh(STATUS_SUCCESS); + + StartSeh() + move.QuadPart = 0x100000000ull; + res = IStream_Seek(istream, move, STREAM_SEEK_CUR, &size); +#ifdef _WIN64 + ok(res == STG_E_INVALIDPOINTER, "Seek to IStream returned wrong hResult: 0x%08x.\n", res); + ok(size.QuadPart == 0x9090909090909090ull, "Seek modified the new location in an error (0x%08x,0x%08x).\n", size.HighPart, size.LowPart); +#else + ok(res == S_OK, "Seek to IStream returned wrong hResult: 0x%08x.\n", res); + ok(size.QuadPart == 0, "Seek new location unexpected value: 0x%08x.\n", size.LowPart); +#endif + EndSeh(STATUS_SUCCESS); + + StartSeh() + move.QuadPart = 40; + res = IStream_Seek(istream, move, STREAM_SEEK_SET, &size); + ok(res == S_OK, "Seek to IStream returned wrong hResult: 0x%08x.\n", res); + EndSeh(STATUS_SUCCESS); + + ok(size.QuadPart == 40, + "Seek returned wrong offset %lld (expected %d)\n", + size.QuadPart, 40); + + ok(stream.Current == buffer2 + 40, + "stream.Current points to the wrong address 0x%p (expected 0x%p)\n", + stream.Current, buffer2); + ok(stream.Start == buffer2, "stream.Start was changed unexpectedly\n"); + ok(stream.End == buffer2 + sizeof(buffer2), "stream.End was changed unexpectedly\n"); + + CompareStructsAndSaveForLater(&previous, &stream, "After Seek"); + + res = IStream_Read(istream, buffer, sizeof(buffer), &bytesRead); + + ok(res == S_OK, "Read to IStream returned wrong hResult: 0x%08x.\n", res); + + if (SUCCEEDED(res)) + { + for (i = 0; i < bytesRead; i++) + { + ok(buffer[i] == (i + 40), "Buffer[%d] contains a wrong number %d (expected %d).\n", i, buffer[i], i + 40); + } + } + + ok(stream.Current == buffer2 + 40 + sizeof(buffer), + "stream.Current points to the wrong address 0x%p (expected 0x%p)\n", + stream.Current, buffer2); + ok(stream.Start == buffer2, "stream.Start was changed unexpectedly\n"); + ok(stream.End == buffer2 + sizeof(buffer2), "stream.End was changed unexpectedly\n"); + + CompareStructsAndSaveForLater(&previous, &stream, "After Read 2"); + + res = IStream_Release(istream); + + ok(res == 1, "Release to IStream returned wrong hResult: 0x%08x.\n", res); + + ok(stream.RefCount == 1, "RefCount has a wrong value: %d (expected %d).\n", stream.RefCount, 1); + + res = IStream_Release(istream); + + ok(res == S_OK, "Release to IStream returned wrong hResult: 0x%08x.\n", res); + + ok(stream.RefCount == 0, "RefCount has a wrong value: %d (expected %d).\n", stream.RefCount, 0); + + ok(finalReleaseCallCount == 1, "FinalRelease was called %d times instead of 1.\n", finalReleaseCallCount); +} + +void test_OutOfProcess() +{ + LARGE_INTEGER move; + ULARGE_INTEGER size; + HRESULT res; + HANDLE process; + ULONG i; + + RTL_MEMORY_STREAM stream; + RTL_MEMORY_STREAM previous; + + IStream * istream; + + UCHAR buffer[80]; + UCHAR buffer2[180]; + ULONG bytesRead; + + STATSTG stat; + + finalReleaseCallCount = 0; + + for (i = 0; i < sizeof(buffer2); i++) + { + buffer2[i] = i % UCHAR_MAX; + } + + memset(&stream, 0x90, sizeof(stream)); + memset(&previous, 0x00, sizeof(previous)); + + process = GetCurrentProcess(); + + RtlInitOutOfProcessMemoryStream(&stream); + + ok(stream.FinalRelease == RtlFinalReleaseOutOfProcessMemoryStream, + "stream.FinalRelease unexpected %p != %p.\n", + stream.FinalRelease, RtlFinalReleaseOutOfProcessMemoryStream); + + ok(stream.RefCount == 0, "RefCount has a wrong value: %d (expected %d).\n", stream.RefCount, 0); + + CompareStructsAndSaveForLater(&previous, &stream, "After init"); + + stream.Current = buffer2; + stream.Start = buffer2; + stream.End = buffer2 + sizeof(buffer2); + stream.ProcessHandle = process; + stream.FinalRelease = CustomFinalReleaseOutOfProcessMemoryStream; + + CompareStructsAndSaveForLater(&previous, &stream, "After assigning"); + + res = IStream_QueryInterface((struct IStream*)&stream, &IID_IStream, (void**)&istream); + + ok(res == S_OK, "QueryInterface to IStream returned wrong hResult: 0x%08x.\n", res); + + ok(stream.RefCount == 1, "RefCount has a wrong value: %d (expected %d).\n", stream.RefCount, 1); + + ok(stream.ProcessHandle == process, + "ProcessHandle changed unexpectedly: 0x%08x (expected 0x%p)\n", + stream.ProcessHandle, process); + + CompareStructsAndSaveForLater(&previous, &stream, "After QueryInterface"); + + res = IStream_Stat(istream, &stat, STATFLAG_NONAME); + + ok(res == S_OK, "Stat to IStream returned wrong hResult: 0x%08x.\n", res); + + ok(stream.Current == buffer2, + "stream.Current points to the wrong address 0x%p (expected 0x%p)\n", + stream.Current, buffer2); + ok(stream.Start == buffer2, "stream.Start was changed unexpectedly\n"); + ok(stream.End == buffer2 + sizeof(buffer2), "stream.End was changed unexpectedly\n"); + ok(stream.ProcessHandle == process, + "ProcessHandle changed unexpectedly: 0x%08x (expected 0x%p)\n", + stream.ProcessHandle, process); + + ok(stat.cbSize.QuadPart == ((PUCHAR)stream.End - (PUCHAR)stream.Start), + "stat.cbSize has the wrong value %lld (expected %d)\n", + stat.cbSize.QuadPart, (PUCHAR)stream.End - (PUCHAR)stream.Start); + + CompareStructsAndSaveForLater(&previous, &stream, "After Stat"); + + res = IStream_Read(istream, buffer, sizeof(buffer), &bytesRead); + + ok(res == S_OK, "Read to IStream returned wrong hResult: 0x%08x.\n", res); + + if (SUCCEEDED(res)) + { + for (i = 0; i < bytesRead; i++) + { + ok(buffer[i] == i, "Buffer[%d] contains a wrong number %d (expected %d).\n", i, buffer[i], i); + } + } + + ok(stream.Current == buffer2 + sizeof(buffer), + "stream.Current points to the wrong address 0x%p (expected 0x%p)\n", + stream.Current, buffer2); + ok(stream.Start == buffer2, "stream.Start was changed unexpectedly\n"); + ok(stream.End == buffer2 + sizeof(buffer2), "stream.End was changed unexpectedly\n"); + ok(stream.ProcessHandle == process, + "ProcessHandle changed unexpectedly: 0x%08x (expected 0x%p)\n", + stream.ProcessHandle, process); + + CompareStructsAndSaveForLater(&previous, &stream, "After Read 1"); + + move.QuadPart = 40; + + res = IStream_Seek(istream, move, STREAM_SEEK_SET, &size); + + ok(res == S_OK, "Seek to IStream returned wrong hResult: 0x%08x.\n", res); + + ok(size.QuadPart == 40, + "Seek returned wrong offset %lld (expected %d)\n", + size.QuadPart, 40); + + ok(stream.Current == buffer2 + 40, + "stream.Current points to the wrong address 0x%p (expected 0x%p)\n", + stream.Current, buffer2); + ok(stream.Start == buffer2, "stream.Start was changed unexpectedly\n"); + ok(stream.End == buffer2 + sizeof(buffer2), "stream.End was changed unexpectedly\n"); + ok(stream.ProcessHandle == process, + "ProcessHandle changed unexpectedly: 0x%08x (expected 0x%p)\n", + stream.ProcessHandle, process); + + CompareStructsAndSaveForLater(&previous, &stream, "After Seek"); + + res = IStream_Read(istream, buffer, sizeof(buffer), &bytesRead); + + ok(res == S_OK, "Read to IStream returned wrong hResult: 0x%08x.\n", res); + + if (SUCCEEDED(res)) + { + for (i = 0; i < bytesRead; i++) + { + ok(buffer[i] == (i + 40), "Buffer[%d] contains a wrong number %d (expected %d).\n", i, buffer[i], i + 40); + } + } + + ok(stream.Current == buffer2 + 40 + sizeof(buffer), + "stream.Current points to the wrong address 0x%p (expected 0x%p)\n", + stream.Current, buffer2); + ok(stream.Start == buffer2, "stream.Start was changed unexpectedly\n"); + ok(stream.End == buffer2 + sizeof(buffer2), "stream.End was changed unexpectedly\n"); + ok(stream.ProcessHandle == process, + "ProcessHandle changed unexpectedly: 0x%08x (expected 0x%p)\n", + stream.ProcessHandle, process); + + CompareStructsAndSaveForLater(&previous, &stream, "After Read 2"); + + res = IStream_Release(istream); + + ok(res == S_OK, "Release to IStream returned wrong hResult: 0x%08x.\n", res); + + ok(stream.RefCount == 0, "RefCount has a wrong value: %d (expected %d).\n", stream.RefCount, 0); + + ok(finalReleaseCallCount == 1, "FinalRelease was called %d times instead of 1.\n", finalReleaseCallCount); +} + +START_TEST(RtlMemoryStream) +{ + test_InProcess(); + test_OutOfProcess(); +} Propchange: trunk/rostests/apitests/ntdll/RtlMemoryStream.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 Oct 19 17:59:29 2013 @@ -25,6 +25,7 @@ extern void func_RtlGetLengthWithoutTrailingPathSeperators(void); extern void func_RtlGetLongestNtPathLength(void); extern void func_RtlInitializeBitMap(void); +extern void func_RtlMemoryStream(void); extern void func_TimerResolution(void); const struct test winetest_testlist[] = @@ -51,6 +52,7 @@ { "RtlGetLengthWithoutTrailingPathSeperators", func_RtlGetLengthWithoutTrailingPathSeperators }, { "RtlGetLongestNtPathLength", func_RtlGetLongestNtPathLength }, { "RtlInitializeBitMap", func_RtlInitializeBitMap }, + { "RtlMemoryStream", func_RtlMemoryStream }, { "TimerResolution", func_TimerResolution }, { 0, 0 }

1 0

[aandrejevic] 60706: [FAST486] Implement SETO, SETNO, SETC, SETNC, SETZ, SETNZ, SETBE, SETNBE, SETS, SETNS, SETP SETNP, SETL, SETNL, SETLE and SETNLE.
by aandrejevic＠svn.reactos.org 19 Oct '13

19 Oct '13

Author: aandrejevic Date: Sat Oct 19 17:57:26 2013 New Revision: 60706 URL: http://svn.reactos.org/svn/reactos?rev=60706&view=rev Log: [FAST486] Implement SETO, SETNO, SETC, SETNC, SETZ, SETNZ, SETBE, SETNBE, SETS, SETNS, SETP SETNP, SETL, SETNL, SETLE and SETNLE. Modified: branches/ntvdm/lib/fast486/extraops.c Modified: branches/ntvdm/lib/fast486/extraops.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/extraops.c?re… ============================================================================== --- branches/ntvdm/lib/fast486/extraops.c [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/extraops.c [iso-8859-1] Sat Oct 19 17:57:26 2013 @@ -418,6 +418,96 @@ return TRUE; } +FAST486_OPCODE_HANDLER(Fast486ExtOpcodeConditionalSet) +{ + BOOLEAN Value = FALSE; + BOOLEAN AddressSize = State->SegmentRegs[FAST486_REG_CS].Size; + FAST486_MOD_REG_RM ModRegRm; + + if (State->PrefixFlags & FAST486_PREFIX_ADSIZE) + { + /* The OPSIZE prefix toggles the size */ + AddressSize = !AddressSize; + } + + /* Get the operands */ + if (!Fast486ParseModRegRm(State, AddressSize, &ModRegRm)) + { + /* Exception occurred */ + return FALSE; + } + + /* Make sure this is the right instruction */ + ASSERT((Opcode & 0xF0) == 0x90); + + switch ((Opcode & 0x0F) >> 1) + { + /* SETO / SETNO */ + case 0: + { + Value = State->Flags.Of; + break; + } + + /* SETC / SETNC */ + case 1: + { + Value = State->Flags.Cf; + break; + } + + /* SETZ / SETNZ */ + case 2: + { + Value = State->Flags.Zf; + break; + } + + /* SETBE / SETNBE */ + case 3: + { + Value = State->Flags.Cf || State->Flags.Zf; + break; + } + + /* SETS / SETNS */ + case 4: + { + Value = State->Flags.Sf; + break; + } + + /* SETP / SETNP */ + case 5: + { + Value = State->Flags.Pf; + break; + } + + /* SETL / SETNL */ + case 6: + { + Value = State->Flags.Sf != State->Flags.Of; + break; + } + + /* SETLE / SETNLE */ + case 7: + { + Value = (State->Flags.Sf != State->Flags.Of) || State->Flags.Zf; + break; + } + } + + if (Opcode & 1) + { + /* Invert the result */ + Value = !Value; + } + + /* Write back the result */ + return Fast486WriteModrmByteOperands(State, &ModRegRm, FALSE, Value); +} FAST486_OPCODE_HANDLER(Fast486OpcodeExtended) {

1 0

[tfaber] 60705: [RTL] - Implement Rtl MemoryStream functions. Patch by David Quintana. CORE-7492
by tfaber＠svn.reactos.org 19 Oct '13

19 Oct '13

Author: tfaber Date: Sat Oct 19 17:48:27 2013 New Revision: 60705 URL: http://svn.reactos.org/svn/reactos?rev=60705&view=rev Log: [RTL] - Implement Rtl MemoryStream functions. Patch by David Quintana. CORE-7492 Added: trunk/reactos/lib/rtl/memstream.c (with props) Modified: trunk/reactos/dll/ntdll/CMakeLists.txt trunk/reactos/dll/ntdll/def/ntdll.spec trunk/reactos/include/ndk/rtlfuncs.h trunk/reactos/include/ndk/rtltypes.h trunk/reactos/lib/rtl/CMakeLists.txt Modified: trunk/reactos/dll/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/dll/ntdll/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/CMakeLists.txt [iso-8859-1] Sat Oct 19 17:48:27 2013 @@ -52,6 +52,7 @@ rtl ntdllsys libcntpr + uuid ${PSEH_LIB}) add_pch(ntdll include/ntdll.h) Modified: trunk/reactos/dll/ntdll/def/ntdll.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/def/ntdll.spec?r… ============================================================================== --- trunk/reactos/dll/ntdll/def/ntdll.spec [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/def/ntdll.spec [iso-8859-1] Sat Oct 19 17:48:27 2013 @@ -405,7 +405,7 @@ @ stdcall -arch=x86_64 RtlAddFunctionTable(ptr long long) ;@ stdcall RtlAddMandatoryAce(ptr long long long long ptr) @ stdcall RtlAddRefActivationContext(ptr) -;@ stdcall RtlAddRefMemoryStream +@ stdcall RtlAddRefMemoryStream(ptr) @ stdcall RtlAddVectoredContinueHandler(long ptr) @ stdcall RtlAddVectoredExceptionHandler(long ptr) ;@ stdcall RtlAddressInSectionTable @@ -440,8 +440,8 @@ @ stdcall RtlCheckRegistryKey(long ptr) @ stdcall RtlClearAllBits(ptr) @ stdcall RtlClearBits(ptr long long) -;@ stdcall RtlCloneMemoryStream -;@ stdcall RtlCommitMemoryStream +@ stdcall RtlCloneMemoryStream(ptr ptr) +@ stdcall RtlCommitMemoryStream(ptr long) @ stdcall RtlCompactHeap(long long) @ stdcall RtlCompareMemory(ptr ptr long) @ stdcall RtlCompareMemoryUlong(ptr long long) @@ -464,8 +464,8 @@ @ stdcall RtlCopyLuid(ptr ptr) @ stdcall RtlCopyLuidAndAttributesArray(long ptr ptr) ;@ stdcall RtlCopyMappedMemory -;@ stdcall RtlCopyMemoryStreamTo -;@ stdcall RtlCopyOutOfProcessMemoryStreamTo +@ stdcall RtlCopyMemoryStreamTo(ptr ptr int64 ptr ptr) +@ stdcall RtlCopyOutOfProcessMemoryStreamTo(ptr ptr int64 ptr ptr) RtlCopyMemoryStreamTo ;@ stdcall RtlCopyRangeList ; 5.0 and 5.1 only @ stdcall RtlCopySecurityDescriptor(ptr ptr) @ stdcall RtlCopySid(long ptr ptr) @@ -571,7 +571,7 @@ @ stdcall -arch=win32 -ret64 RtlExtendedMagicDivide(double double long) @ stdcall RtlFillMemory(ptr long long) @ stdcall RtlFillMemoryUlong(ptr long long) -;@ stdcall RtlFinalReleaseOutOfProcessMemoryStream +@ stdcall RtlFinalReleaseOutOfProcessMemoryStream(ptr) @ stdcall RtlFindActivationContextSectionGuid(long ptr long ptr ptr) @ stdcall RtlFindActivationContextSectionString(long ptr long ptr ptr) @ stdcall RtlFindCharInUnicodeString(long ptr ptr ptr) @@ -658,9 +658,9 @@ @ stdcall RtlInitAnsiString(ptr str) @ stdcall RtlInitAnsiStringEx(ptr str) @ stdcall RtlInitCodePageTable(ptr ptr) -;@ stdcall RtlInitMemoryStream +@ stdcall RtlInitMemoryStream(ptr) @ stdcall RtlInitNlsTables(ptr ptr ptr ptr) -;@ stdcall RtlInitOutOfProcessMemoryStream +@ stdcall RtlInitOutOfProcessMemoryStream(ptr) @ stdcall RtlInitString(ptr str) @ stdcall RtlInitUnicodeString(ptr wstr) @ stdcall RtlInitUnicodeStringEx(ptr wstr) @@ -735,7 +735,7 @@ @ stdcall RtlLocalTimeToSystemTime(ptr ptr) @ stdcall RtlLockBootStatusData(ptr) @ stdcall RtlLockHeap(long) -;@ stdcall RtlLockMemoryStreamRegion +@ stdcall RtlLockMemoryStreamRegion(ptr int64 int64 long) ;@ stdcall RtlLogStackBackTrace @ stdcall RtlLookupAtomInAtomTable(ptr wstr ptr) @ stdcall RtlLookupElementGenericTable(ptr ptr) @@ -781,7 +781,7 @@ @ stdcall RtlQueryInformationAcl(ptr ptr long long) @ stdcall RtlQueryInformationActivationContext(long long ptr long ptr long ptr) @ stdcall RtlQueryInformationActiveActivationContext(long ptr long ptr) -;@ stdcall RtlQueryInterfaceMemoryStream +@ stdcall RtlQueryInterfaceMemoryStream(ptr ptr ptr) ;@ stdcall RtlQueryProcessBackTraceInformation @ stdcall RtlQueryProcessDebugInformation(long long ptr) ;@ stdcall RtlQueryProcessHeapInformation @@ -800,14 +800,14 @@ @ stdcall RtlRandom(ptr) @ stdcall RtlRandomEx(ptr) @ stdcall RtlReAllocateHeap(long long ptr long) -;@ stdcall RtlReadMemoryStream -;@ stdcall RtlReadOutOfProcessMemoryStream +@ stdcall RtlReadMemoryStream(ptr ptr long ptr) +@ stdcall RtlReadOutOfProcessMemoryStream(ptr ptr long ptr) @ stdcall RtlRealPredecessor(ptr) @ stdcall RtlRealSuccessor(ptr) @ stdcall RtlRegisterSecureMemoryCacheCallback(ptr) @ stdcall RtlRegisterWait(ptr ptr ptr ptr long long) @ stdcall RtlReleaseActivationContext(ptr) -;@ stdcall RtlReleaseMemoryStream +@ stdcall RtlReleaseMemoryStream(ptr) @ stdcall RtlReleasePebLock() @ stdcall RtlReleasePrivilege(ptr) @ stdcall RtlReleaseRelativeName(ptr) @@ -820,12 +820,12 @@ @ stdcall RtlResetRtlTranslations(ptr) @ stdcall -arch=x86_64 RtlRestoreContext(ptr ptr) @ stdcall RtlRestoreLastWin32Error(long) RtlSetLastWin32Error -;@ stdcall RtlRevertMemoryStream +@ stdcall RtlRevertMemoryStream(ptr) @ stdcall RtlRunDecodeUnicodeString(long ptr) @ stdcall RtlRunEncodeUnicodeString(long ptr) @ stdcall RtlSecondsSince1970ToTime(long ptr) @ stdcall RtlSecondsSince1980ToTime(long ptr) -;@ stdcall RtlSeekMemoryStream +@ stdcall RtlSeekMemoryStream(ptr int64 long ptr) @ stdcall RtlSelfRelativeToAbsoluteSD2(ptr ptr) @ stdcall RtlSelfRelativeToAbsoluteSD(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) @ stdcall RtlSetAllBits(ptr) @@ -844,7 +844,7 @@ @ stdcall RtlSetIoCompletionCallback(long ptr long) @ stdcall RtlSetLastWin32Error(long) @ stdcall RtlSetLastWin32ErrorAndNtStatusFromNtStatus(long) -;@ stdcall RtlSetMemoryStreamSize +@ stdcall RtlSetMemoryStreamSize(ptr int64) @ stdcall RtlSetOwnerSecurityDescriptor(ptr ptr long) @ stdcall RtlSetProcessIsCritical(long ptr long) ;@ stdcall RtlSetProperties ; RtlSetProperties @@ -869,7 +869,7 @@ @ stdcall RtlSleepConditionVariableSRW(ptr ptr ptr long) @ stdcall RtlSplay(ptr) ;@ stdcall RtlStartRXact -;@ stdcall RtlStatMemoryStream +@ stdcall RtlStatMemoryStream(ptr ptr long) @ stdcall RtlStringFromGUID(ptr ptr) @ stdcall RtlSubAuthorityCountSid(ptr) @ stdcall RtlSubAuthoritySid(ptr long) @@ -907,7 +907,7 @@ @ stdcall RtlUniform(ptr) @ stdcall RtlUnlockBootStatusData(ptr) @ stdcall RtlUnlockHeap(long) -;@ stdcall RtlUnlockMemoryStreamRegion +@ stdcall RtlUnlockMemoryStreamRegion(ptr int64 int64 long) @ stdcall -register RtlUnwind(ptr ptr ptr ptr) @ stdcall -arch=x86_64 RtlUnwindEx(long long ptr long ptr) @ stdcall RtlUpcaseUnicodeChar(long) @@ -938,7 +938,7 @@ @ stdcall RtlWow64EnableFsRedirectionEx(long ptr) @ stdcall RtlWakeAllConditionVariable(ptr) @ stdcall RtlWakeConditionVariable(ptr) -;@ stdcall RtlWriteMemoryStream +@ stdcall RtlWriteMemoryStream(ptr ptr long ptr) @ stdcall RtlWriteRegistryValue(long ptr ptr long ptr long) @ stdcall RtlZeroHeap(ptr long) @ stdcall RtlZeroMemory(ptr long) 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 Oct 19 17:48:27 2013 @@ -4152,6 +4152,180 @@ ); #endif +// +// MemoryStream functions +// +#ifdef NTOS_MODE_USER + +NTSYSAPI +VOID +NTAPI +RtlInitMemoryStream( + _Out_ PRTL_MEMORY_STREAM Stream +); + +NTSYSAPI +VOID +NTAPI +RtlInitOutOfProcessMemoryStream( + _Out_ PRTL_MEMORY_STREAM Stream +); + +NTSYSAPI +VOID +NTAPI +RtlFinalReleaseOutOfProcessMemoryStream( + _In_ PRTL_MEMORY_STREAM Stream +); + +NTSYSAPI +HRESULT +NTAPI +RtlQueryInterfaceMemoryStream( + _In_ struct IStream *This, + _In_ REFIID RequestedIid, + _Outptr_ PVOID *ResultObject +); + +NTSYSAPI +ULONG +NTAPI +RtlAddRefMemoryStream( + _In_ struct IStream *This +); + +NTSYSAPI +ULONG +NTAPI +RtlReleaseMemoryStream( + _In_ struct IStream *This +); + +NTSYSAPI +HRESULT +NTAPI +RtlReadMemoryStream( + _In_ struct IStream *This, + _Out_writes_bytes_(Length) PVOID Buffer, + _In_ ULONG Length, + _Out_opt_ PULONG BytesRead +); + +NTSYSAPI +HRESULT +NTAPI +RtlReadOutOfProcessMemoryStream( + _In_ struct IStream *This, + _Out_writes_bytes_(Length) PVOID Buffer, + _In_ ULONG Length, + _Out_opt_ PULONG BytesRead +); + +NTSYSAPI +HRESULT +NTAPI +RtlSeekMemoryStream( + _In_ struct IStream *This, + _In_ LARGE_INTEGER RelativeOffset, + _In_ ULONG Origin, + _Out_opt_ PULARGE_INTEGER ResultOffset +); + +NTSYSAPI +HRESULT +NTAPI +RtlCopyMemoryStreamTo( + _In_ struct IStream *This, + _In_ struct IStream *Target, + _In_ ULARGE_INTEGER Length, + _Out_opt_ PULARGE_INTEGER BytesRead, + _Out_opt_ PULARGE_INTEGER BytesWritten +); + +NTSYSAPI +HRESULT +NTAPI +RtlCopyOutOfProcessMemoryStreamTo( + _In_ struct IStream *This, + _In_ struct IStream *Target, + _In_ ULARGE_INTEGER Length, + _Out_opt_ PULARGE_INTEGER BytesRead, + _Out_opt_ PULARGE_INTEGER BytesWritten +); + +NTSYSAPI +HRESULT +NTAPI +RtlStatMemoryStream( + _In_ struct IStream *This, + _Out_ struct tagSTATSTG *Stats, + _In_ ULONG Flags +); + +// Dummy functions +NTSYSAPI +HRESULT +NTAPI +RtlWriteMemoryStream( + _In_ struct IStream *This, + _In_reads_bytes_(Length) CONST VOID *Buffer, + _In_ ULONG Length, + _Out_opt_ PULONG BytesWritten +); + +NTSYSAPI +HRESULT +NTAPI +RtlSetMemoryStreamSize( + _In_ struct IStream *This, + _In_ ULARGE_INTEGER NewSize +); + +NTSYSAPI +HRESULT +NTAPI +RtlCommitMemoryStream( + _In_ struct IStream *This, + _In_ ULONG CommitFlags +); + +NTSYSAPI +HRESULT +NTAPI +RtlRevertMemoryStream( + _In_ struct IStream *This +); + +NTSYSAPI +HRESULT +NTAPI +RtlLockMemoryStreamRegion( + _In_ struct IStream *This, + _In_ ULARGE_INTEGER Offset, + _In_ ULARGE_INTEGER Length, + _In_ ULONG LockType +); + +NTSYSAPI +HRESULT +NTAPI +RtlUnlockMemoryStreamRegion( + _In_ struct IStream *This, + _In_ ULARGE_INTEGER Offset, + _In_ ULARGE_INTEGER Length, + _In_ ULONG LockType +); + +NTSYSAPI +HRESULT +NTAPI +RtlCloneMemoryStream( + _In_ struct IStream *This, + _Outptr_ struct IStream **ResultStream +); + +#endif // NTOS_MODE_USER + #ifdef __cplusplus } #endif Modified: trunk/reactos/include/ndk/rtltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtltypes.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtltypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtltypes.h [iso-8859-1] Sat Oct 19 17:48:27 2013 @@ -1559,6 +1559,44 @@ #endif /* !NTOS_MODE_USER */ +#ifdef NTOS_MODE_USER + +// +// Memory Stream +// +#ifndef CONST_VTBL +#ifdef CONST_VTABLE +#define CONST_VTBL const +#else +#define CONST_VTBL +#endif +#endif + +struct IStreamVtbl; +struct IStream; +struct tagSTATSTG; + +typedef struct _RTL_MEMORY_STREAM RTL_MEMORY_STREAM, *PRTL_MEMORY_STREAM; + +typedef VOID +(NTAPI *PRTL_MEMORY_STREAM_FINAL_RELEASE_ROUTINE)( + _In_ PRTL_MEMORY_STREAM Stream +); + +struct _RTL_MEMORY_STREAM +{ + CONST_VTBL struct IStreamVtbl *Vtbl; + LONG RefCount; + ULONG Unk1; + PVOID Current; + PVOID Start; + PVOID End; + PRTL_MEMORY_STREAM_FINAL_RELEASE_ROUTINE FinalRelease; + HANDLE ProcessHandle; +}; + +#endif /* NTOS_MODE_USER */ + #ifdef __cplusplus } #endif Modified: trunk/reactos/lib/rtl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/CMakeLists.txt?rev… ============================================================================== --- trunk/reactos/lib/rtl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/CMakeLists.txt [iso-8859-1] Sat Oct 19 17:48:27 2013 @@ -33,6 +33,7 @@ heapuser.c image.c interlck.c + memstream.c message.c largeint.c luid.c Added: trunk/reactos/lib/rtl/memstream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/memstream.c?rev=60… ============================================================================== --- trunk/reactos/lib/rtl/memstream.c (added) +++ trunk/reactos/lib/rtl/memstream.c [iso-8859-1] Sat Oct 19 17:48:27 2013 @@ -0,0 +1,469 @@ +/* COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: lib/rtl/mem.c + * PURPOSE: MemoryStream functions + * PROGRAMMER: David Quintana (gigaherz(a)gmail.com) + */ + +/* INCLUDES *******************************************************************/ + +#define COBJMACROS +#define CONST_VTABLE + +#include <rtl.h> + +#define NDEBUG +#include <debug.h> + +/* VIRTUAL METHOD TABLES ******************************************************/ + +const struct IStreamVtbl RtlMemoryStreamVtbl = +{ + RtlQueryInterfaceMemoryStream, + RtlAddRefMemoryStream, + RtlReleaseMemoryStream, + RtlReadMemoryStream, + RtlWriteMemoryStream, + RtlSeekMemoryStream, + RtlSetMemoryStreamSize, + RtlCopyMemoryStreamTo, + RtlCommitMemoryStream, + RtlRevertMemoryStream, + RtlLockMemoryStreamRegion, + RtlUnlockMemoryStreamRegion, + RtlStatMemoryStream, + RtlCloneMemoryStream, +}; + +const struct IStreamVtbl RtlOutOfProcessMemoryStreamVtbl = +{ + RtlQueryInterfaceMemoryStream, + RtlAddRefMemoryStream, + RtlReleaseMemoryStream, + RtlReadOutOfProcessMemoryStream, + RtlWriteMemoryStream, + RtlSeekMemoryStream, + RtlSetMemoryStreamSize, + RtlCopyMemoryStreamTo, + RtlCommitMemoryStream, + RtlRevertMemoryStream, + RtlLockMemoryStreamRegion, + RtlUnlockMemoryStreamRegion, + RtlStatMemoryStream, + RtlCloneMemoryStream, +}; + +/* FUNCTIONS ******************************************************************/ + +static +PRTL_MEMORY_STREAM +IStream_To_RTL_MEMORY_STREAM( + _In_ IStream *Interface) +{ + if (Interface == NULL) + return NULL; + + return CONTAINING_RECORD(Interface, RTL_MEMORY_STREAM, Vtbl); +} + +/* + * @implemented + */ +VOID +NTAPI +RtlInitMemoryStream( + _Out_ PRTL_MEMORY_STREAM Stream) +{ + RtlZeroMemory(Stream, sizeof(RTL_MEMORY_STREAM)); + Stream->Vtbl = &RtlMemoryStreamVtbl; +} + +/* + * @implemented + */ +VOID +NTAPI +RtlInitOutOfProcessMemoryStream( + _Out_ PRTL_MEMORY_STREAM Stream) +{ + RtlZeroMemory(Stream, sizeof(RTL_MEMORY_STREAM)); + Stream->Vtbl = &RtlOutOfProcessMemoryStreamVtbl; + Stream->FinalRelease = RtlFinalReleaseOutOfProcessMemoryStream; +} + +/* + * @unimplemented + */ +VOID +NTAPI +RtlFinalReleaseOutOfProcessMemoryStream( + _In_ PRTL_MEMORY_STREAM Stream) +{ + UNIMPLEMENTED; +} + +/* + * @implemented + */ +HRESULT +NTAPI +RtlQueryInterfaceMemoryStream( + _In_ IStream *This, + _In_ REFIID RequestedIid, + _Outptr_ PVOID *ResultObject) +{ + if (IsEqualGUID(RequestedIid, &IID_IUnknown) || + IsEqualGUID(RequestedIid, &IID_ISequentialStream) || + IsEqualGUID(RequestedIid, &IID_IStream)) + { + IStream_AddRef(This); + *ResultObject = This; + return S_OK; + } + + *ResultObject = NULL; + return E_NOINTERFACE; +} + +/* + * @implemented + */ +ULONG +NTAPI +RtlAddRefMemoryStream( + _In_ IStream *This) +{ + PRTL_MEMORY_STREAM Stream = IStream_To_RTL_MEMORY_STREAM(This); + + return InterlockedIncrement(&Stream->RefCount); +} + +/* + * @implemented + */ +ULONG +NTAPI +RtlReleaseMemoryStream( + _In_ IStream *This) +{ + PRTL_MEMORY_STREAM Stream = IStream_To_RTL_MEMORY_STREAM(This); + LONG Result; + + Result = InterlockedDecrement(&Stream->RefCount); + + if (Result == 0) + { + if (Stream->FinalRelease) + Stream->FinalRelease(Stream); + } + + return Result; +} + +/* + * @implemented + */ +HRESULT +NTAPI +RtlReadMemoryStream( + _In_ IStream *This, + _Out_writes_bytes_(Length) PVOID Buffer, + _In_ ULONG Length, + _Out_opt_ PULONG BytesRead) +{ + ULONG CopyLength; + PRTL_MEMORY_STREAM Stream = IStream_To_RTL_MEMORY_STREAM(This); + SIZE_T Available = (PUCHAR)Stream->End - (PUCHAR)Stream->Current; + + if (BytesRead) + *BytesRead = 0; + + if (!Length) + return S_OK; + + CopyLength = min(Available, Length); + + RtlMoveMemory(Buffer, Stream->Current, CopyLength); + + Stream->Current = (PUCHAR)Stream->Current + CopyLength; + + *BytesRead = CopyLength; + + return S_OK; +} + +/* + * @implemented + */ +HRESULT +NTAPI +RtlReadOutOfProcessMemoryStream( + _In_ IStream *This, + _Out_writes_bytes_(Length) PVOID Buffer, + _In_ ULONG Length, + _Out_opt_ PULONG BytesRead) +{ + NTSTATUS Status; + ULONG CopyLength; + PRTL_MEMORY_STREAM Stream = IStream_To_RTL_MEMORY_STREAM(This); + SIZE_T Available = (PUCHAR)Stream->End - (PUCHAR)Stream->Current; + + if (BytesRead) + *BytesRead = 0; + + if (!Length) + return S_OK; + + CopyLength = min(Available, Length); + + Status = NtReadVirtualMemory(Stream->ProcessHandle, + Stream->Current, + Buffer, + CopyLength, + BytesRead); + + if (NT_SUCCESS(Status)) + Stream->Current = (PUCHAR)Stream->Current + *BytesRead; + + return HRESULT_FROM_WIN32(RtlNtStatusToDosError(Status)); +} + +/* + * @implemented + */ +HRESULT +NTAPI +RtlSeekMemoryStream( + _In_ IStream *This, + _In_ LARGE_INTEGER RelativeOffset, + _In_ ULONG Origin, + _Out_opt_ PULARGE_INTEGER ResultOffset) +{ + PVOID NewPosition; + PRTL_MEMORY_STREAM Stream = IStream_To_RTL_MEMORY_STREAM(This); + + switch (Origin) + { + case STREAM_SEEK_SET: + NewPosition = (PUCHAR)Stream->Start + RelativeOffset.QuadPart; + break; + + case STREAM_SEEK_CUR: + NewPosition = (PUCHAR)Stream->Current + RelativeOffset.QuadPart; + break; + + case STREAM_SEEK_END: + NewPosition = (PUCHAR)Stream->End - RelativeOffset.QuadPart; + break; + + default: + return E_INVALIDARG; + } + + if (NewPosition < Stream->Start || NewPosition > Stream->End) + return STG_E_INVALIDPOINTER; + + Stream->Current = NewPosition; + + if (ResultOffset) + ResultOffset->QuadPart = (PUCHAR)Stream->Current - (PUCHAR)Stream->Start; + + return S_OK; +} + +/* + * @implemented + */ +HRESULT +NTAPI +RtlCopyMemoryStreamTo( + _In_ IStream *This, + _In_ IStream *Target, + _In_ ULARGE_INTEGER Length, + _Out_opt_ PULARGE_INTEGER BytesRead, + _Out_opt_ PULARGE_INTEGER BytesWritten) +{ + CHAR Buffer[1024]; + ULONGLONG TotalSize; + ULONG Left, Amount; + HRESULT Result; + + if (BytesRead) + BytesRead->QuadPart = 0; + if (BytesWritten) + BytesWritten->QuadPart = 0; + + if (!Target) + return S_OK; + + if (!Length.QuadPart) + return S_OK; + + /* Copy data */ + TotalSize = Length.QuadPart; + while (TotalSize) + { + Left = min(TotalSize, sizeof(Buffer)); + + /* Read */ + Result = IStream_Read(This, Buffer, Left, &Amount); + if (BytesRead) + BytesRead->QuadPart += Amount; + if (FAILED(Result) || Amount == 0) + break; + + Left = Amount; + + /* Write */ + Result = IStream_Write(Target, Buffer, Left, &Amount); + if (BytesWritten) + BytesWritten->QuadPart += Amount; + if (FAILED(Result) || Amount != Left) + break; + + TotalSize -= Left; + } + return Result; +} + +/* + * @implemented + */ +HRESULT +NTAPI +RtlStatMemoryStream( + _In_ IStream *This, + _Out_ STATSTG *Stats, + _In_ ULONG Flags) +{ + PRTL_MEMORY_STREAM Stream = IStream_To_RTL_MEMORY_STREAM(This); + + if (!Stats) + return STG_E_INVALIDPOINTER; + + RtlZeroMemory(Stats, sizeof(STATSTG)); + Stats->type = STGTY_STREAM; + Stats->cbSize.QuadPart = (PUCHAR)Stream->End - (PUCHAR)Stream->Start; + + return S_OK; +} + +/* DUMMY FUNCTIONS ************************************************************/ +/* + * The following functions return E_NOTIMPL in Windows Server 2003. + */ + +/* + * @implemented + */ +HRESULT +NTAPI +RtlWriteMemoryStream( + _In_ IStream *This, + _In_reads_bytes_(Length) CONST VOID *Buffer, + _In_ ULONG Length, + _Out_opt_ PULONG BytesWritten) +{ + UNREFERENCED_PARAMETER(This); + UNREFERENCED_PARAMETER(Buffer); + UNREFERENCED_PARAMETER(Length); + UNREFERENCED_PARAMETER(BytesWritten); + + return E_NOTIMPL; +} + +/* + * @implemented + */ +HRESULT +NTAPI +RtlSetMemoryStreamSize( + _In_ IStream *This, + _In_ ULARGE_INTEGER NewSize) +{ + UNREFERENCED_PARAMETER(This); + UNREFERENCED_PARAMETER(NewSize); + + return E_NOTIMPL; +} + +/* + * @implemented + */ +HRESULT +NTAPI +RtlCommitMemoryStream( + _In_ IStream *This, + _In_ ULONG CommitFlags) +{ + UNREFERENCED_PARAMETER(This); + UNREFERENCED_PARAMETER(CommitFlags); + + return E_NOTIMPL; +} + +/* + * @implemented + */ +HRESULT +NTAPI +RtlRevertMemoryStream( + _In_ IStream *This) +{ + UNREFERENCED_PARAMETER(This); + + return E_NOTIMPL; +} + +/* + * @implemented + */ +HRESULT +NTAPI +RtlLockMemoryStreamRegion( + _In_ IStream *This, + _In_ ULARGE_INTEGER Offset, + _In_ ULARGE_INTEGER Length, + _In_ ULONG LockType) +{ + UNREFERENCED_PARAMETER(This); + UNREFERENCED_PARAMETER(Offset); + UNREFERENCED_PARAMETER(Length); + UNREFERENCED_PARAMETER(LockType); + + return E_NOTIMPL; +} + +/* + * @implemented + */ +HRESULT +NTAPI +RtlUnlockMemoryStreamRegion( + _In_ IStream *This, + _In_ ULARGE_INTEGER Offset, + _In_ ULARGE_INTEGER Length, + _In_ ULONG LockType) +{ + UNREFERENCED_PARAMETER(This); + UNREFERENCED_PARAMETER(Offset); + UNREFERENCED_PARAMETER(Length); + UNREFERENCED_PARAMETER(LockType); + + return E_NOTIMPL; +} + +/* + * @implemented + */ +HRESULT +NTAPI +RtlCloneMemoryStream( + _In_ IStream *This, + _Outptr_ IStream **ResultStream) +{ + UNREFERENCED_PARAMETER(This); + UNREFERENCED_PARAMETER(ResultStream); + + return E_NOTIMPL; +} Propchange: trunk/reactos/lib/rtl/memstream.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[aandrejevic] 60704: [FAST486] Remove TODOs for instructions that don't exist on the 80486.
by aandrejevic＠svn.reactos.org 19 Oct '13

19 Oct '13

Author: aandrejevic Date: Sat Oct 19 17:29:44 2013 New Revision: 60704 URL: http://svn.reactos.org/svn/reactos?rev=60704&view=rev Log: [FAST486] Remove TODOs for instructions that don't exist on the 80486. Modified: branches/ntvdm/lib/fast486/extraops.c Modified: branches/ntvdm/lib/fast486/extraops.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/extraops.c?re… ============================================================================== --- branches/ntvdm/lib/fast486/extraops.c [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/extraops.c [iso-8859-1] Sat Oct 19 17:29:44 2013 @@ -48,124 +48,124 @@ NULL, // TODO: OPCODE 0x07 NOT IMPLEMENTED NULL, // TODO: OPCODE 0x08 NOT IMPLEMENTED NULL, // TODO: OPCODE 0x09 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x0A NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x0B NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x0C NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x0D NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x0E NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x0F NOT IMPLEMENTED + NULL, // Invalid + NULL, // Reserved (UD1) + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid NULL, // TODO: OPCODE 0x10 NOT IMPLEMENTED NULL, // TODO: OPCODE 0x11 NOT IMPLEMENTED NULL, // TODO: OPCODE 0x12 NOT IMPLEMENTED NULL, // TODO: OPCODE 0x13 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x14 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x15 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x16 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x17 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x18 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x19 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x1A NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x1B NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x1C NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x1D NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x1E NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x1F NOT IMPLEMENTED + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid NULL, // TODO: OPCODE 0x20 NOT IMPLEMENTED NULL, // TODO: OPCODE 0x21 NOT IMPLEMENTED NULL, // TODO: OPCODE 0x22 NOT IMPLEMENTED NULL, // TODO: OPCODE 0x23 NOT IMPLEMENTED NULL, // TODO: OPCODE 0x24 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x25 NOT IMPLEMENTED + NULL, // Invalid NULL, // TODO: OPCODE 0x26 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x27 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x28 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x29 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x2A NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x2B NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x2C NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x2D NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x2E NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x2F NOT IMPLEMENTED + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid NULL, // TODO: OPCODE 0x30 NOT IMPLEMENTED NULL, // TODO: OPCODE 0x31 NOT IMPLEMENTED NULL, // TODO: OPCODE 0x32 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x33 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x34 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x35 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x36 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x37 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x38 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x39 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x3A NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x3B NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x3C NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x3D NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x3E NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x3F NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x40 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x41 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x42 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x43 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x44 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x45 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x46 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x47 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x48 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x49 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x4A NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x4B NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x4C NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x4D NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x4E NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x4F NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x50 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x51 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x52 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x53 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x54 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x55 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x56 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x57 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x58 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x59 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x5A NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x5B NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x5C NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x5D NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x5E NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x5F NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x60 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x61 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x62 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x63 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x64 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x65 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x66 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x67 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x68 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x69 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x6A NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x6B NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x6C NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x6D NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x6E NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x6F NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x70 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x71 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x72 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x73 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x74 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x75 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x76 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x77 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x78 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x79 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x7A NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x7B NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x7C NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x7D NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x7E NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x7F NOT IMPLEMENTED + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid Fast486ExtOpcodeConditionalJmp, Fast486ExtOpcodeConditionalJmp, Fast486ExtOpcodeConditionalJmp, @@ -200,12 +200,12 @@ NULL, // TODO: OPCODE 0x9F NOT IMPLEMENTED NULL, // TODO: OPCODE 0xA0 NOT IMPLEMENTED NULL, // TODO: OPCODE 0xA1 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0xA2 NOT IMPLEMENTED + NULL, // Invalid NULL, // TODO: OPCODE 0xA3 NOT IMPLEMENTED NULL, // TODO: OPCODE 0xA4 NOT IMPLEMENTED NULL, // TODO: OPCODE 0xA5 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0xA6 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0xA7 NOT IMPLEMENTED + NULL, // Invalid + NULL, // Invalid NULL, // TODO: OPCODE 0xA8 NOT IMPLEMENTED NULL, // TODO: OPCODE 0xA9 NOT IMPLEMENTED NULL, // TODO: OPCODE 0xAA NOT IMPLEMENTED @@ -232,12 +232,12 @@ NULL, // TODO: OPCODE 0xBF NOT IMPLEMENTED NULL, // TODO: OPCODE 0xC0 NOT IMPLEMENTED NULL, // TODO: OPCODE 0xC1 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0xC2 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0xC3 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0xC4 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0xC5 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0xC6 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0xC7 NOT IMPLEMENTED + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid NULL, // TODO: OPCODE 0xC8 NOT IMPLEMENTED NULL, // TODO: OPCODE 0xC9 NOT IMPLEMENTED NULL, // TODO: OPCODE 0xCA NOT IMPLEMENTED @@ -246,54 +246,54 @@ NULL, // TODO: OPCODE 0xCD NOT IMPLEMENTED NULL, // TODO: OPCODE 0xCE NOT IMPLEMENTED NULL, // TODO: OPCODE 0xCF NOT IMPLEMENTED - NULL, // TODO: OPCODE 0xD0 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0xD1 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0xD2 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0xD3 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0xD4 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0xD5 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0xD6 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0xD7 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0xD8 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0xD9 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0xDA NOT IMPLEMENTED - NULL, // TODO: OPCODE 0xDB NOT IMPLEMENTED - NULL, // TODO: OPCODE 0xDC NOT IMPLEMENTED - NULL, // TODO: OPCODE 0xDD NOT IMPLEMENTED - NULL, // TODO: OPCODE 0xDE NOT IMPLEMENTED - NULL, // TODO: OPCODE 0xDF NOT IMPLEMENTED - NULL, // TODO: OPCODE 0xE0 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0xE1 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0xE2 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0xE3 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0xE4 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0xE5 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0xE6 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0xE7 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0xE8 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0xE9 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0xEA NOT IMPLEMENTED - NULL, // TODO: OPCODE 0xEB NOT IMPLEMENTED - NULL, // TODO: OPCODE 0xEC NOT IMPLEMENTED - NULL, // TODO: OPCODE 0xED NOT IMPLEMENTED - NULL, // TODO: OPCODE 0xEE NOT IMPLEMENTED - NULL, // TODO: OPCODE 0xEF NOT IMPLEMENTED - NULL, // TODO: OPCODE 0xF0 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0xF1 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0xF2 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0xF3 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0xF4 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0xF5 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0xF6 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0xF7 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0xF8 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0xF9 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0xFA NOT IMPLEMENTED - NULL, // TODO: OPCODE 0xFB NOT IMPLEMENTED - NULL, // TODO: OPCODE 0xFC NOT IMPLEMENTED - NULL, // TODO: OPCODE 0xFD NOT IMPLEMENTED - NULL, // TODO: OPCODE 0xFE NOT IMPLEMENTED - NULL, // TODO: OPCODE 0xFF NOT IMPLEMENTED + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid + NULL, // Invalid }; /* PUBLIC FUNCTIONS ***********************************************************/

1 0

[hbelusca] 60703: Bye bye Soft386, welcome Fast486, courtesy Aleksandar Andrejevic. [NTVDM]: Define by default NEW_EMULATOR, i.e. use Fast486 instead of softx86.
by hbelusca＠svn.reactos.org 19 Oct '13

19 Oct '13

Author: hbelusca Date: Sat Oct 19 16:55:51 2013 New Revision: 60703 URL: http://svn.reactos.org/svn/reactos?rev=60703&view=rev Log: Bye bye Soft386, welcome Fast486, courtesy Aleksandar Andrejevic. [NTVDM]: Define by default NEW_EMULATOR, i.e. use Fast486 instead of softx86. Added: branches/ntvdm/include/reactos/libs/fast486/ - copied from r60702, branches/ntvdm/include/reactos/libs/soft386/ branches/ntvdm/include/reactos/libs/fast486/fast486.h - copied, changed from r60702, branches/ntvdm/include/reactos/libs/soft386/soft386.h branches/ntvdm/lib/fast486/ - copied from r60702, branches/ntvdm/lib/soft386/ branches/ntvdm/lib/fast486/fast486.c - copied, changed from r60702, branches/ntvdm/lib/soft386/soft386.c Removed: branches/ntvdm/include/reactos/libs/fast486/soft386.h branches/ntvdm/include/reactos/libs/soft386/ branches/ntvdm/lib/fast486/soft386.c branches/ntvdm/lib/soft386/ Modified: branches/ntvdm/lib/CMakeLists.txt branches/ntvdm/lib/fast486/CMakeLists.txt branches/ntvdm/lib/fast486/common.c branches/ntvdm/lib/fast486/common.h branches/ntvdm/lib/fast486/common.inl branches/ntvdm/lib/fast486/extraops.c branches/ntvdm/lib/fast486/extraops.h branches/ntvdm/lib/fast486/opcodes.c branches/ntvdm/lib/fast486/opcodes.h branches/ntvdm/lib/fast486/opgroups.c branches/ntvdm/lib/fast486/opgroups.h branches/ntvdm/subsystems/ntvdm/CMakeLists.txt branches/ntvdm/subsystems/ntvdm/emulator.c branches/ntvdm/subsystems/ntvdm/emulator.h branches/ntvdm/subsystems/ntvdm/ntvdm.h [This mail would be too long, it was shortened to contain the URLs only.] Copied: branches/ntvdm/include/reactos/libs/fast486/fast486.h (from r60702, branches/ntvdm/include/reactos/libs/soft386/soft386.h) URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/reactos/libs/fast… Removed: branches/ntvdm/include/reactos/libs/fast486/soft386.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/reactos/libs/soft… Modified: branches/ntvdm/lib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/CMakeLists.txt?rev=60… Modified: branches/ntvdm/lib/fast486/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/CMakeLists.tx… Modified: branches/ntvdm/lib/fast486/common.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/common.c?rev=… Modified: branches/ntvdm/lib/fast486/common.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/common.h?rev=… Modified: branches/ntvdm/lib/fast486/common.inl URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/common.inl?re… Modified: branches/ntvdm/lib/fast486/extraops.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/extraops.c?re… Modified: branches/ntvdm/lib/fast486/extraops.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/extraops.h?re… Copied: branches/ntvdm/lib/fast486/fast486.c (from r60702, branches/ntvdm/lib/soft386/soft386.c) URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/fast486.c?p2=… Modified: branches/ntvdm/lib/fast486/opcodes.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/opcodes.c?rev… Modified: branches/ntvdm/lib/fast486/opcodes.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/opcodes.h?rev… Modified: branches/ntvdm/lib/fast486/opgroups.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/opgroups.c?re… Modified: branches/ntvdm/lib/fast486/opgroups.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/opgroups.h?re… Removed: branches/ntvdm/lib/fast486/soft386.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/soft386.c?rev… Modified: branches/ntvdm/subsystems/ntvdm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/CMakeLis… Modified: branches/ntvdm/subsystems/ntvdm/emulator.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/emulator… Modified: branches/ntvdm/subsystems/ntvdm/emulator.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/emulator… Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ntvdm.h?…

1 0

[tkreuzer] 60702: [NTOSKRNL] Fix a typo I introduced in TRAP_DEBUG only code, spotted by Thomas
by tkreuzer＠svn.reactos.org 19 Oct '13

19 Oct '13

Author: tkreuzer Date: Sat Oct 19 11:40:00 2013 New Revision: 60702 URL: http://svn.reactos.org/svn/reactos?rev=60702&view=rev Log: [NTOSKRNL] Fix a typo I introduced in TRAP_DEBUG only code, spotted by Thomas Modified: trunk/reactos/ntoskrnl/include/internal/i386/trap_x.h Modified: trunk/reactos/ntoskrnl/include/internal/i386/trap_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/trap_x.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/trap_x.h [iso-8859-1] Sat Oct 19 11:40:00 2013 @@ -163,7 +163,7 @@ } /* Check DR values */ - if (KiUserTrap(TrapFrame) + if (KiUserTrap(TrapFrame)) { /* Check for active debugging */ if (KeGetCurrentThread()->Header.DebugActive)

1 0

[tkreuzer] 60701: [NTOSKRNL] - Introduce a new and faster way to return to kernel mode from traps by using a ret 8 instruction instead of an iret. - Make use of KiUserTrap where appropriate - Remov...
by tkreuzer＠svn.reactos.org 19 Oct '13

19 Oct '13

Author: tkreuzer Date: Sat Oct 19 11:33:34 2013 New Revision: 60701 URL: http://svn.reactos.org/svn/reactos?rev=60701&view=rev Log: [NTOSKRNL] - Introduce a new and faster way to return to kernel mode from traps by using a ret 8 instruction instead of an iret. - Make use of KiUserTrap where appropriate - Remove some pointless toplevel volatile Modified: trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S trunk/reactos/ntoskrnl/include/internal/i386/ke.h trunk/reactos/ntoskrnl/include/internal/i386/trap_x.h trunk/reactos/ntoskrnl/ke/i386/cpu.c trunk/reactos/ntoskrnl/ke/i386/exp.c trunk/reactos/ntoskrnl/ke/i386/patpge.c trunk/reactos/ntoskrnl/ke/i386/trap.s trunk/reactos/ntoskrnl/ke/i386/traphdlr.c trunk/reactos/ntoskrnl/ke/i386/usercall.c trunk/reactos/ntoskrnl/ke/time.c Modified: trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S [iso-8859-1] Sat Oct 19 11:33:34 2013 @@ -241,6 +241,7 @@ #define KI_EXIT_RET HEX(080) #define KI_EXIT_IRET HEX(100) #define KI_EDITED_FRAME HEX(200) +#define KI_EXIT_RET8 HEX(400) #define KI_RESTORE_VOLATILES (KI_RESTORE_EAX OR KI_RESTORE_ECX_EDX) MACRO(KiTrapExitStub, Name, Flags) @@ -248,15 +249,15 @@ PUBLIC @&Name&@4 @&Name&@4: - if (Flags AND KI_RESTORE_EFLAGS) + if (Flags AND KI_EXIT_RET8) OR (Flags AND KI_EXIT_IRET) + + /* This is the IRET frame */ + OffsetEsp = KTRAP_FRAME_EIP + + elseif (Flags AND KI_RESTORE_EFLAGS) /* We will pop EFlags off the stack */ OffsetEsp = KTRAP_FRAME_EFLAGS - - elseif (Flags AND KI_EXIT_IRET) - - /* This is the IRET frame */ - OffsetEsp = KTRAP_FRAME_EIP else @@ -335,6 +336,13 @@ if (Flags AND KI_RESTORE_EFLAGS) + if (Flags AND KI_EXIT_RET8) + + /* We are at the IRET frame, so push EFLAGS first */ + push dword ptr [esp + 8] + + endif + /* Restore EFLAGS */ popfd @@ -357,6 +365,11 @@ /* Return to kernel mode with a jmp */ jmp edx + elseif (Flags AND KI_EXIT_RET8) + + /* Return to kernel mode with a ret 8 */ + ret 8 + elseif (Flags AND KI_EXIT_RET) /* Return to kernel mode with a ret */ Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/ke.h [iso-8859-1] Sat Oct 19 11:33:34 2013 @@ -383,13 +383,13 @@ ULONG_PTR NTAPI Ki386EnableGlobalPage( - IN volatile ULONG_PTR Context + IN ULONG_PTR Context ); ULONG_PTR NTAPI Ki386EnableTargetLargePage( - IN volatile ULONG_PTR Context + IN ULONG_PTR Context ); BOOLEAN Modified: trunk/reactos/ntoskrnl/include/internal/i386/trap_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/trap_x.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/trap_x.h [iso-8859-1] Sat Oct 19 11:33:34 2013 @@ -163,7 +163,7 @@ } /* Check DR values */ - if (TrapFrame->SegCs & MODE_MASK) + if (KiUserTrap(TrapFrame) { /* Check for active debugging */ if (KeGetCurrentThread()->Header.DebugActive) @@ -244,6 +244,7 @@ DECLSPEC_NORETURN VOID FASTCALL KiEditedTrapReturn(IN PKTRAP_FRAME TrapFrame); DECLSPEC_NORETURN VOID FASTCALL KiTrapReturn(IN PKTRAP_FRAME TrapFrame); DECLSPEC_NORETURN VOID FASTCALL KiTrapReturnNoSegments(IN PKTRAP_FRAME TrapFrame); +DECLSPEC_NORETURN VOID FASTCALL KiTrapReturnNoSegmentsRet8(IN PKTRAP_FRAME TrapFrame); typedef ATTRIB_NORETURN @@ -382,7 +383,7 @@ TrapFrame->Dr7 = 0; /* Check if the frame was from user mode or v86 mode */ - if ((TrapFrame->SegCs & MODE_MASK) || + if (KiUserTrap(TrapFrame) || (TrapFrame->EFlags & EFLAGS_V86_MASK)) { /* Check for active debugging */ @@ -411,7 +412,7 @@ TrapFrame->Dr7 = 0; /* Check if the frame was from user mode or v86 mode */ - if ((TrapFrame->SegCs & MODE_MASK) || + if (KiUserTrap(TrapFrame) || (TrapFrame->EFlags & EFLAGS_V86_MASK)) { /* Check for active debugging */ Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/cpu.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] Sat Oct 19 11:33:34 2013 @@ -1535,7 +1535,7 @@ if (TargetAffinity) { /* Sanity check */ - ASSERT(Prcb == (volatile PKPRCB)KeGetCurrentPrcb()); + ASSERT(Prcb == KeGetCurrentPrcb()); /* FIXME: TODO */ ASSERTMSG("Not yet implemented\n", FALSE); Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/exp.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/exp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/exp.c [iso-8859-1] Sat Oct 19 11:33:34 2013 @@ -137,7 +137,7 @@ KiEspFromTrapFrame(IN PKTRAP_FRAME TrapFrame) { /* Check if this is user-mode or V86 */ - if ((TrapFrame->SegCs & MODE_MASK) || + if (KiUserTrap(TrapFrame) || (TrapFrame->EFlags & EFLAGS_V86_MASK)) { /* Return it directly */ @@ -175,7 +175,7 @@ Previous = KiEspFromTrapFrame(TrapFrame); /* Check if this is user-mode or V86 */ - if ((TrapFrame->SegCs & MODE_MASK) || + if (KiUserTrap(TrapFrame) || (TrapFrame->EFlags & EFLAGS_V86_MASK)) { /* Write it directly */ @@ -225,7 +225,7 @@ /* Just return it */ return TrapFrame->HardwareSegSs; } - else if (TrapFrame->SegCs & MODE_MASK) + else if (KiUserTrap(TrapFrame)) { /* User mode, return the User SS */ return TrapFrame->HardwareSegSs | RPL_MASK; @@ -251,7 +251,7 @@ /* Just write it */ TrapFrame->HardwareSegSs = Ss; } - else if (TrapFrame->SegCs & MODE_MASK) + else if (KiUserTrap(TrapFrame)) { /* Usermode, save the User SS */ TrapFrame->HardwareSegSs = Ss | RPL_MASK; @@ -398,7 +398,7 @@ TrapFrame->V86Fs = Context->SegFs; TrapFrame->V86Gs = Context->SegGs; } - else if (!(TrapFrame->SegCs & MODE_MASK)) + else if (!KiUserTrap(TrapFrame)) { /* For kernel mode, write the standard values */ TrapFrame->SegDs = KGDT_R3_DATA | RPL_MASK; @@ -429,7 +429,7 @@ /* Handle the extended registers */ if (((ContextFlags & CONTEXT_EXTENDED_REGISTERS) == - CONTEXT_EXTENDED_REGISTERS) && (TrapFrame->SegCs & MODE_MASK)) + CONTEXT_EXTENDED_REGISTERS) && KiUserTrap(TrapFrame)) { /* Get the FX Area */ FxSaveArea = (PFX_SAVE_AREA)(TrapFrame + 1); @@ -463,7 +463,7 @@ /* Handle the floating point state */ if (((ContextFlags & CONTEXT_FLOATING_POINT) == - CONTEXT_FLOATING_POINT) && (TrapFrame->SegCs & MODE_MASK)) + CONTEXT_FLOATING_POINT) && KiUserTrap(TrapFrame)) { /* Get the FX Area */ FxSaveArea = (PFX_SAVE_AREA)(TrapFrame + 1); @@ -692,7 +692,7 @@ /* Handle extended registers */ if (((Context->ContextFlags & CONTEXT_EXTENDED_REGISTERS) == - CONTEXT_EXTENDED_REGISTERS) && (TrapFrame->SegCs & MODE_MASK)) + CONTEXT_EXTENDED_REGISTERS) && KiUserTrap(TrapFrame)) { /* Get the FX Save Area */ FxSaveArea = (PFX_SAVE_AREA)(TrapFrame + 1); @@ -712,7 +712,7 @@ /* Handle Floating Point */ if (((Context->ContextFlags & CONTEXT_FLOATING_POINT) == - CONTEXT_FLOATING_POINT) && (TrapFrame->SegCs & MODE_MASK)) + CONTEXT_FLOATING_POINT) && KiUserTrap(TrapFrame)) { /* Get the FX Save Area */ FxSaveArea = (PFX_SAVE_AREA)(TrapFrame + 1); @@ -1045,6 +1045,13 @@ } } _SEH2_END; + + DPRINT("First chance exception in %.16s, ExceptionCode: %lx, ExceptionAddress: %p, P0: %lx, P1: %lx\n", + PsGetCurrentProcess()->ImageFileName, + ExceptionRecord->ExceptionCode, + ExceptionRecord->ExceptionAddress, + ExceptionRecord->ExceptionInformation[0], + ExceptionRecord->ExceptionInformation[1]); } /* Try second chance */ @@ -1060,11 +1067,13 @@ } /* 3rd strike, kill the process */ - DPRINT1("Kill %.16s, ExceptionCode: %lx, ExceptionAddress: %p, BaseAddress: %p\n", + DPRINT1("Kill %.16s, ExceptionCode: %lx, ExceptionAddress: %p, BaseAddress: %p, P0: %lx, P1: %lx\n", PsGetCurrentProcess()->ImageFileName, ExceptionRecord->ExceptionCode, ExceptionRecord->ExceptionAddress, - PsGetCurrentProcess()->SectionBaseAddress); + PsGetCurrentProcess()->SectionBaseAddress, + ExceptionRecord->ExceptionInformation[0], + ExceptionRecord->ExceptionInformation[1]); ZwTerminateProcess(NtCurrentProcess(), ExceptionRecord->ExceptionCode); KeBugCheckEx(KMODE_EXCEPTION_NOT_HANDLED, Modified: trunk/reactos/ntoskrnl/ke/i386/patpge.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/patpge.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/patpge.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/patpge.c [iso-8859-1] Sat Oct 19 11:33:34 2013 @@ -20,9 +20,9 @@ ULONG_PTR NTAPI INIT_FUNCTION -Ki386EnableGlobalPage(IN volatile ULONG_PTR Context) -{ - volatile PLONG Count = (PLONG)Context; +Ki386EnableGlobalPage(IN ULONG_PTR Context) +{ + PLONG Count = (PLONG)Context; ULONG Cr4, Cr3; /* Disable interrupts */ @@ -144,7 +144,7 @@ if (PageTable) *PageTable = (PHARDWARE_PTE)(Pde->PageFrameNumber << PAGE_SHIFT); } - + return TRUE; } @@ -172,7 +172,7 @@ /* Get PTE of VirtualPtr, make it valid, and map PhysicalPtr there */ Pte = &PageTable[(VirtualPtr >> 12) & ((1 << PTE_BITS) - 1)]; Pte->Valid = 1; - Pte->PageFrameNumber = PhysicalPtr.QuadPart >> PAGE_SHIFT; + Pte->PageFrameNumber = (PFN_NUMBER)(PhysicalPtr.QuadPart >> PAGE_SHIFT); return TRUE; } @@ -189,7 +189,7 @@ PhysicalPtr = MmGetPhysicalAddress(VirtualPtr); /* Map its physical address in the page table provided by the caller */ - Pte->PageFrameNumber = PhysicalPtr.QuadPart >> PAGE_SHIFT; + Pte->PageFrameNumber = (PFN_NUMBER)(PhysicalPtr.QuadPart >> PAGE_SHIFT); } BOOLEAN Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/trap.s?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/trap.s [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/trap.s [iso-8859-1] Sat Oct 19 11:33:34 2013 @@ -166,6 +166,7 @@ KiTrapExitStub KiEditedTrapReturn, (KI_RESTORE_VOLATILES OR KI_RESTORE_EFLAGS OR KI_EDITED_FRAME OR KI_EXIT_RET) KiTrapExitStub KiTrapReturn, (KI_RESTORE_VOLATILES OR KI_RESTORE_SEGMENTS OR KI_EXIT_IRET) KiTrapExitStub KiTrapReturnNoSegments, (KI_RESTORE_VOLATILES OR KI_EXIT_IRET) +KiTrapExitStub KiTrapReturnNoSegmentsRet8,(KI_RESTORE_VOLATILES OR KI_RESTORE_EFLAGS OR KI_EXIT_RET8) #ifdef _MSC_VER EXTERN _PsConvertToGuiThread@0:PROC Modified: trunk/reactos/ntoskrnl/ke/i386/traphdlr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/traphdlr.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] Sat Oct 19 11:33:34 2013 @@ -100,7 +100,7 @@ if (__builtin_expect(TrapFrame->Dr7 & ~DR7_RESERVED_MASK, 0)) { /* Check if the frame was from user mode or v86 mode */ - if ((TrapFrame->SegCs & MODE_MASK) || + if (KiUserTrap(TrapFrame) || (TrapFrame->EFlags & EFLAGS_V86_MASK)) { /* Handle debug registers */ @@ -124,13 +124,13 @@ if (TrapFrame->EFlags & EFLAGS_V86_MASK) KiTrapReturnNoSegments(TrapFrame); /* Check for user mode exit */ - if (TrapFrame->SegCs & MODE_MASK) KiTrapReturn(TrapFrame); + if (KiUserTrap(TrapFrame)) KiTrapReturn(TrapFrame); /* Check for edited frame */ if (KiIsFrameEdited(TrapFrame)) KiEditedTrapReturn(TrapFrame); /* Exit the trap to kernel mode */ - KiTrapReturnNoSegments(TrapFrame); + KiTrapReturnNoSegmentsRet8(TrapFrame); } DECLSPEC_NORETURN @@ -152,7 +152,7 @@ KeGetCurrentThread()->PreviousMode = (CCHAR)TrapFrame->PreviousPreviousMode; /* Check for user mode exit */ - if (TrapFrame->SegCs & MODE_MASK) + if (KiUserTrap(TrapFrame)) { /* Check if we were single stepping */ if (TrapFrame->EFlags & EFLAGS_TF) @@ -186,13 +186,13 @@ if (TrapFrame->EFlags & EFLAGS_V86_MASK) KiTrapReturnNoSegments(TrapFrame); /* Check for user mode exit */ - if (TrapFrame->SegCs & MODE_MASK) KiTrapReturn(TrapFrame); + if (KiUserTrap(TrapFrame)) KiTrapReturn(TrapFrame); /* Check for edited frame */ if (KiIsFrameEdited(TrapFrame)) KiEditedTrapReturn(TrapFrame); /* Exit the trap to kernel mode */ - KiTrapReturnNoSegments(TrapFrame); + KiTrapReturnNoSegmentsRet8(TrapFrame); } @@ -1250,10 +1250,10 @@ /* Call the access fault handler */ Status = MmAccessFault(TrapFrame->ErrCode & 1, (PVOID)Cr2, - TrapFrame->SegCs & MODE_MASK, + KiUserTrap(TrapFrame), TrapFrame); if (NT_SUCCESS(Status)) KiEoiHelper(TrapFrame); - + /* Check for syscall fault */ #if 0 if ((TrapFrame->Eip == (ULONG_PTR)CopyParams) || @@ -1541,7 +1541,7 @@ TrapFrame->Dr7 = 0; /* Check if the frame was from user mode */ - if (TrapFrame->SegCs & MODE_MASK) + if (KiUserTrap(TrapFrame)) { /* Check for active debugging */ if (KeGetCurrentThread()->Header.DebugActive & 0xFF) Modified: trunk/reactos/ntoskrnl/ke/i386/usercall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/usercall.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/usercall.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/usercall.c [iso-8859-1] Sat Oct 19 11:33:34 2013 @@ -67,7 +67,7 @@ _SEH2_TRY { /* Sanity check */ - ASSERT((TrapFrame->SegCs & MODE_MASK) != KernelMode); + ASSERT(KiUserTrap(TrapFrame)); /* Get the aligned size */ AlignedEsp = Context.Esp & ~3; @@ -210,7 +210,7 @@ } -/* +/* * Stack layout for KiUserModeCallout: * ---------------------------------- * KCALLOUT_FRAME.ResultLength <= 2nd Parameter to KiCallUserMode Modified: trunk/reactos/ntoskrnl/ke/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/time.c?rev=607… ============================================================================== --- trunk/reactos/ntoskrnl/ke/time.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/time.c [iso-8859-1] Sat Oct 19 11:33:34 2013 @@ -153,7 +153,7 @@ /* Check if we came from user mode */ #ifndef _M_ARM - if ((TrapFrame->SegCs & MODE_MASK) || (TrapFrame->EFlags & EFLAGS_V86_MASK)) + if (KiUserTrap(TrapFrame) || (TrapFrame->EFlags & EFLAGS_V86_MASK)) #else if (TrapFrame->PreviousMode == UserMode) #endif

1 0

[bfreisen] 60700: [PAINT] * Fix number typo introduced in revision 59955
by bfreisen＠svn.reactos.org 19 Oct '13

19 Oct '13

Author: bfreisen Date: Sat Oct 19 10:57:06 2013 New Revision: 60700 URL: http://svn.reactos.org/svn/reactos?rev=60700&view=rev Log: [PAINT] * Fix number typo introduced in revision 59955 Modified: trunk/reactos/base/applications/mspaint/drawing.c Modified: trunk/reactos/base/applications/mspaint/drawing.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/drawing.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/drawing.c [iso-8859-1] Sat Oct 19 10:57:06 2013 @@ -195,7 +195,7 @@ case 10: case 11: { - POINT offsTop[] = {{4, 3}, {2, -2}, {0, 0}, + POINT offsTop[] = {{4, -3}, {2, -2}, {0, 0}, {-3, -3}, {-2, -2}, {-1, 0}}; POINT offsBtm[] = {{-3, 4}, {-2, 2}, {-1, 1}, {4, 4}, {2, 2}, {0, 1}};

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