Ros-diffs

ros-diffs@reactos.org

81390 discussions

[pschweitzer] 64693: [NTFS] Forgot that file...
by pschweitzer＠svn.reactos.org 12 Oct '14

12 Oct '14

Author: pschweitzer Date: Sun Oct 12 11:50:08 2014 New Revision: 64693 URL: http://svn.reactos.org/svn/reactos?rev=64693&view=rev Log: [NTFS] Forgot that file... Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.h Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] Sun Oct 12 11:50:08 2014 @@ -470,6 +470,10 @@ /* close.c */ +NTSTATUS +NtfsCloseFile(PDEVICE_EXTENSION DeviceExt, + PFILE_OBJECT FileObject); + DRIVER_DISPATCH NtfsFsdClose; NTSTATUS NTAPI NtfsFsdClose(PDEVICE_OBJECT DeviceObject,

1 0

[pschweitzer] 64692: [NTFS] On opening, check the file found matches the requested dispositions from the caller
by pschweitzer＠svn.reactos.org 12 Oct '14

12 Oct '14

Author: pschweitzer Date: Sun Oct 12 11:48:42 2014 New Revision: 64692 URL: http://svn.reactos.org/svn/reactos?rev=64692&view=rev Log: [NTFS] On opening, check the file found matches the requested dispositions from the caller Modified: trunk/reactos/drivers/filesystems/ntfs/create.c Modified: trunk/reactos/drivers/filesystems/ntfs/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/create.c [iso-8859-1] Sun Oct 12 11:48:42 2014 @@ -221,6 +221,30 @@ FileObject->FileName.Buffer, &Fcb); + if (NT_SUCCESS(Status)) + { + if (RequestedDisposition == FILE_CREATE) + { + Irp->IoStatus.Information = FILE_EXISTS; + NtfsCloseFile(DeviceExt, FileObject); + return STATUS_OBJECT_NAME_COLLISION; + } + + if (RequestedOptions & FILE_NON_DIRECTORY_FILE && + NtfsFCBIsDirectory(Fcb)) + { + NtfsCloseFile(DeviceExt, FileObject); + return STATUS_FILE_IS_A_DIRECTORY; + } + + if (RequestedOptions & FILE_DIRECTORY_FILE && + !NtfsFCBIsDirectory(Fcb)) + { + NtfsCloseFile(DeviceExt, FileObject); + return STATUS_NOT_A_DIRECTORY; + } + } + /* * If the directory containing the file to open doesn't exist then * fail immediately

1 0

[pschweitzer] 64691: [NTFS] Properly reset FCB & SectionObjectPointer fields from the FileObject on close
by pschweitzer＠svn.reactos.org 12 Oct '14

12 Oct '14

Author: pschweitzer Date: Sun Oct 12 11:43:10 2014 New Revision: 64691 URL: http://svn.reactos.org/svn/reactos?rev=64691&view=rev Log: [NTFS] Properly reset FCB & SectionObjectPointer fields from the FileObject on close Modified: trunk/reactos/drivers/filesystems/ntfs/close.c Modified: trunk/reactos/drivers/filesystems/ntfs/close.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/close.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/close.c [iso-8859-1] Sun Oct 12 11:43:10 2014 @@ -42,12 +42,14 @@ PFILE_OBJECT FileObject) { PNTFS_CCB Ccb; + PNTFS_FCB Fcb; DPRINT("NtfsCloseFile(DeviceExt %p, FileObject %p)\n", DeviceExt, FileObject); Ccb = (PNTFS_CCB)(FileObject->FsContext2); + Fcb = (PNTFS_FCB)(FileObject->FsContext); DPRINT("Ccb %p\n", Ccb); if (Ccb == NULL) @@ -56,13 +58,15 @@ } FileObject->FsContext2 = NULL; + FileObject->FsContext = NULL; + FileObject->SectionObjectPointer = NULL; if (FileObject->FileName.Buffer) { // This a FO, that was created outside from FSD. // Some FO's are created with IoCreateStreamFileObject() insid from FSD. // This FO's don't have a FileName. - NtfsReleaseFCB(DeviceExt, FileObject->FsContext); + NtfsReleaseFCB(DeviceExt, Fcb); } if (Ccb->DirectorySearchPattern)

1 0

[tfaber] 64690: [NTDLL:DBG] - Use NtReadVirtualMemory instead of dereferencing a pointer from a different process in DbgUiConvertStateChangeStructure. CORE-8622 #resolve
by tfaber＠svn.reactos.org 12 Oct '14

12 Oct '14

Author: tfaber Date: Sun Oct 12 11:35:11 2014 New Revision: 64690 URL: http://svn.reactos.org/svn/reactos?rev=64690&view=rev Log: [NTDLL:DBG] - Use NtReadVirtualMemory instead of dereferencing a pointer from a different process in DbgUiConvertStateChangeStructure. CORE-8622 #resolve Modified: trunk/reactos/dll/ntdll/dbg/dbgui.c Modified: trunk/reactos/dll/ntdll/dbg/dbgui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/dbg/dbgui.c?rev=… ============================================================================== --- trunk/reactos/dll/ntdll/dbg/dbgui.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/dbg/dbgui.c [iso-8859-1] Sun Oct 12 11:35:11 2014 @@ -66,6 +66,9 @@ THREAD_BASIC_INFORMATION ThreadBasicInfo; LPDEBUG_EVENT DebugEvent = Win32DebugEvent; HANDLE ThreadHandle; + HANDLE ProcessHandle; + PTEB Teb; + PVOID Pointer; /* Write common data */ DebugEvent->dwProcessId = (DWORD)WaitStateChange-> @@ -256,13 +259,31 @@ NtClose(ThreadHandle); } - /* Check if we got thread information */ + /* If we got thread information, open the process */ if (NT_SUCCESS(Status)) { - /* Save the image name from the TIB */ - DebugEvent->u.LoadDll.lpImageName = - ((PTEB)ThreadBasicInfo.TebBaseAddress)-> - NtTib.ArbitraryUserPointer; + Status = NtOpenProcess(&ProcessHandle, + PROCESS_VM_READ, + &ObjectAttributes, + &WaitStateChange->AppClientId); + } + + if (NT_SUCCESS(Status)) + { + /* Read the image name from the TIB */ + Teb = ThreadBasicInfo.TebBaseAddress; + Status = NtReadVirtualMemory(ProcessHandle, + &Teb->NtTib.ArbitraryUserPointer, + &Pointer, + sizeof(Pointer), + NULL); + NtClose(ProcessHandle); + } + + if (NT_SUCCESS(Status)) + { + /* If everything was successful, set the image name */ + DebugEvent->u.LoadDll.lpImageName = Pointer; } else {

1 0

[tfaber] 64689: [EVENTLOG] - In ElfGetLogHandleEntryByHandle, actually verify the validity of the handle by traversing the log handle list. Fixes crash in advapi32_winetest:eventlog (double close)....
by tfaber＠svn.reactos.org 12 Oct '14

12 Oct '14

Author: tfaber Date: Sun Oct 12 11:23:05 2014 New Revision: 64689 URL: http://svn.reactos.org/svn/reactos?rev=64689&view=rev Log: [EVENTLOG] - In ElfGetLogHandleEntryByHandle, actually verify the validity of the handle by traversing the log handle list. Fixes crash in advapi32_winetest:eventlog (double close). - Minor style improvements to ElfDeleteEventLogHandle CORE-8621 #resolve Modified: trunk/reactos/base/services/eventlog/rpc.c Modified: trunk/reactos/base/services/eventlog/rpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/rpc… ============================================================================== --- trunk/reactos/base/services/eventlog/rpc.c [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/rpc.c [iso-8859-1] Sun Oct 12 11:23:05 2014 @@ -196,31 +196,40 @@ PLOGHANDLE ElfGetLogHandleEntryByHandle(IELF_HANDLE EventLogHandle) { + PLIST_ENTRY CurrentEntry; PLOGHANDLE lpLogHandle; - if (IsListEmpty(&LogHandleListHead)) - { - return NULL; - } - - lpLogHandle = CONTAINING_RECORD((PLOGHANDLE)EventLogHandle, LOGHANDLE, LogHandleListEntry); - - return lpLogHandle; + CurrentEntry = LogHandleListHead.Flink; + while (CurrentEntry != &LogHandleListHead) + { + lpLogHandle = CONTAINING_RECORD(CurrentEntry, + LOGHANDLE, + LogHandleListEntry); + CurrentEntry = CurrentEntry->Flink; + + if (lpLogHandle == EventLogHandle) + return lpLogHandle; + } + + return NULL; } static NTSTATUS -ElfDeleteEventLogHandle(IELF_HANDLE EventLogHandle) -{ - PLOGHANDLE lpLogHandle = (PLOGHANDLE)EventLogHandle; - - if (!ElfGetLogHandleEntryByHandle(lpLogHandle)) +ElfDeleteEventLogHandle(IELF_HANDLE LogHandle) +{ + PLOGHANDLE lpLogHandle; + + lpLogHandle = ElfGetLogHandleEntryByHandle(LogHandle); + if (!lpLogHandle) + { return STATUS_INVALID_HANDLE; + } RemoveEntryList(&lpLogHandle->LogHandleListEntry); LogfClose(lpLogHandle->LogFile, FALSE); - HeapFree(GetProcessHeap(),0,lpLogHandle); + HeapFree(GetProcessHeap(), 0, lpLogHandle); return STATUS_SUCCESS; }

1 0

[tfaber] 64688: [FDEBUG] - Fix build
by tfaber＠svn.reactos.org 12 Oct '14

12 Oct '14

Author: tfaber Date: Sun Oct 12 06:21:22 2014 New Revision: 64688 URL: http://svn.reactos.org/svn/reactos?rev=64688&view=rev Log: [FDEBUG] - Fix build Added: trunk/reactos/boot/freeldr/fdebug/CMakeLists.txt (with props) Modified: trunk/reactos/boot/freeldr/CMakeLists.txt trunk/reactos/boot/freeldr/fdebug/fdebug.c trunk/reactos/boot/freeldr/fdebug/fdebug.rc trunk/reactos/boot/freeldr/fdebug/lang/ro-RO.rc Modified: trunk/reactos/boot/freeldr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/CMakeLists.tx… ============================================================================== --- trunk/reactos/boot/freeldr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/CMakeLists.txt [iso-8859-1] Sun Oct 12 06:21:22 2014 @@ -1,4 +1,5 @@ add_subdirectory(bootsect) +add_subdirectory(fdebug) add_subdirectory(freeldr) add_subdirectory(install) Added: trunk/reactos/boot/freeldr/fdebug/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/CMakeL… ============================================================================== --- trunk/reactos/boot/freeldr/fdebug/CMakeLists.txt (added) +++ trunk/reactos/boot/freeldr/fdebug/CMakeLists.txt [iso-8859-1] Sun Oct 12 06:21:22 2014 @@ -0,0 +1,4 @@ + +add_executable(fdebug fdebug.c rs232.c fdebug.rc) +set_module_type(fdebug win32gui UNICODE) +add_importlibs(fdebug comdlg32 user32 gdi32 msvcrt kernel32) Propchange: trunk/reactos/boot/freeldr/fdebug/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/boot/freeldr/fdebug/fdebug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/fdebug… ============================================================================== --- trunk/reactos/boot/freeldr/fdebug/fdebug.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/fdebug/fdebug.c [iso-8859-1] Sun Oct 12 06:21:22 2014 @@ -99,7 +99,7 @@ wcex.cbSize = sizeof(WNDCLASSEX); wcex.style = CS_HREDRAW | CS_VREDRAW; - wcex.lpfnWndProc = (WNDPROC)WndProc; + wcex.lpfnWndProc = WndProc; wcex.cbClsExtra = 0; wcex.cbWndExtra = 0; wcex.hInstance = hInstance; @@ -283,6 +283,7 @@ break; case WM_PAINT: hdc = BeginPaint(hWnd, &ps); + (void)hdc; // FIXME EndPaint(hWnd, &ps); break; case WM_SIZE: Modified: trunk/reactos/boot/freeldr/fdebug/fdebug.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/fdebug… ============================================================================== --- trunk/reactos/boot/freeldr/fdebug/fdebug.rc [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/fdebug/fdebug.rc [iso-8859-1] Sun Oct 12 06:21:22 2014 @@ -1,4 +1,5 @@ #include <windef.h> +#include <winuser.h> #include "resource.h" @@ -6,26 +7,64 @@ IDI_FDEBUG ICON "fdebug.ico" -#include "lang/bg-BG.rc" -#include "lang/cs-CZ.rc" -#include "lang/de-DE.rc" -#include "lang/el-GR.rc" -#include "lang/en-US.rc" -#include "lang/es-ES.rc" -#include "lang/fr-FR.rc" -#include "lang/hu-HU.rc" -#include "lang/id-ID.rc" -#include "lang/it-IT.rc" -#include "lang/ja-JP.rc" -#include "lang/no-NO.rc" -#include "lang/sk-SK.rc" +#ifdef LANGUAGE_BG_BG + #include "lang/bg-BG.rc" +#endif +#ifdef LANGUAGE_CS_CZ + #include "lang/cs-CZ.rc" +#endif +#ifdef LANGUAGE_DE_DE + #include "lang/de-DE.rc" +#endif +#ifdef LANGUAGE_EL_GR + #include "lang/el-GR.rc" +#endif +#ifdef LANGUAGE_EN_US + #include "lang/en-US.rc" +#endif +#ifdef LANGUAGE_ES_ES + #include "lang/es-ES.rc" +#endif +#ifdef LANGUAGE_FR_FR + #include "lang/fr-FR.rc" +#endif +#ifdef LANGUAGE_HU_HU + #include "lang/hu-HU.rc" +#endif +#ifdef LANGUAGE_ID_ID + #include "lang/id-ID.rc" +#endif +#ifdef LANGUAGE_IT_IT + #include "lang/it-IT.rc" +#endif +#ifdef LANGUAGE_JA_JP + #include "lang/ja-JP.rc" +#endif +#ifdef LANGUAGE_NB_NO + #include "lang/no-NO.rc" +#endif +#ifdef LANGUAGE_SK_SK + #include "lang/sk-SK.rc" +#endif /* UTF-8 */ #pragma code_page(65001) -#include "lang/pl-PL.rc" -#include "lang/ro-RO.rc" -#include "lang/ru-RU.rc" -#include "lang/sq-AL.rc" -#include "lang/tr-TR.rc" -#include "lang/uk-UA.rc" +#ifdef LANGUAGE_PL_PL + #include "lang/pl-PL.rc" +#endif +#ifdef LANGUAGE_RO_RO + #include "lang/ro-RO.rc" +#endif +#ifdef LANGUAGE_RU_RU + #include "lang/ru-RU.rc" +#endif +#ifdef LANGUAGE_SQ_AL + #include "lang/sq-AL.rc" +#endif +#ifdef LANGUAGE_TR_TR + #include "lang/tr-TR.rc" +#endif +#ifdef LANGUAGE_UK_UA + #include "lang/uk-UA.rc" +#endif Modified: trunk/reactos/boot/freeldr/fdebug/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/lang/r… ============================================================================== --- trunk/reactos/boot/freeldr/fdebug/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/fdebug/lang/ro-RO.rc [iso-8859-1] Sun Oct 12 06:21:22 2014 @@ -66,7 +66,7 @@ LTEXT "Numele fiÈierului:", IDC_STATIC, 7, 17, 62, 8 EDITTEXT IDC_CAPTUREFILENAME, 7, 26, 181, 14, ES_AUTOHSCROLL PUSHBUTTON "&CautÄ", IDC_BROWSE, 194, 26, 50, 14 - DEFPUSHBUTTON "Con&firmÄ", 139, 74, 50, 14 + DEFPUSHBUTTON "Con&firmÄ", IDOK, 139, 74, 50, 14 PUSHBUTTON "A&nuleazÄ", IDCANCEL, 194, 74, 50, 14 END

1 0

[hbelusca] 64687: [FAST486] - fastcall'ize some functions, - code formatting.
by hbelusca＠svn.reactos.org 12 Oct '14

12 Oct '14

Author: hbelusca Date: Sun Oct 12 00:10:44 2014 New Revision: 64687 URL: http://svn.reactos.org/svn/reactos?rev=64687&view=rev Log: [FAST486] - fastcall'ize some functions, - code formatting. Modified: trunk/reactos/lib/fast486/common.c trunk/reactos/lib/fast486/common.h trunk/reactos/lib/fast486/common.inl trunk/reactos/lib/fast486/extraops.c trunk/reactos/lib/fast486/extraops.h trunk/reactos/lib/fast486/fast486.c trunk/reactos/lib/fast486/fpu.c trunk/reactos/lib/fast486/opcodes.c trunk/reactos/lib/fast486/opcodes.h trunk/reactos/lib/fast486/opgroups.c trunk/reactos/lib/fast486/opgroups.h Modified: trunk/reactos/lib/fast486/common.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/common.c?rev=6… ============================================================================== --- trunk/reactos/lib/fast486/common.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/common.c [iso-8859-1] Sun Oct 12 00:10:44 2014 @@ -160,9 +160,8 @@ return Fast486WriteLinearMemory(State, LinearAddress, Buffer, Size); } -static -inline -BOOLEAN +static inline BOOLEAN +FASTCALL Fast486GetIntVector(PFAST486_STATE State, UCHAR Number, PFAST486_IDT_ENTRY IdtEntry) @@ -208,14 +207,15 @@ return TRUE; } -static -inline -BOOLEAN +static inline BOOLEAN +FASTCALL Fast486InterruptInternal(PFAST486_STATE State, - USHORT SegmentSelector, - ULONG Offset, - ULONG GateType) -{ + PFAST486_IDT_ENTRY IdtEntry) +{ + USHORT SegmentSelector = IdtEntry->Selector; + ULONG Offset = MAKELONG(IdtEntry->Offset, IdtEntry->OffsetHigh); + ULONG GateType = IdtEntry->Type; + BOOLEAN GateSize = (GateType == FAST486_IDT_INT_GATE_32) || (GateType == FAST486_IDT_TRAP_GATE_32); BOOLEAN Success = FALSE; @@ -355,6 +355,7 @@ } BOOLEAN +FASTCALL Fast486PerformInterrupt(PFAST486_STATE State, UCHAR Number) { @@ -368,10 +369,7 @@ } /* Perform the interrupt */ - if (!Fast486InterruptInternal(State, - IdtEntry.Selector, - MAKELONG(IdtEntry.Offset, IdtEntry.OffsetHigh), - IdtEntry.Type)) + if (!Fast486InterruptInternal(State, &IdtEntry)) { /* Exception occurred */ return FALSE; Modified: trunk/reactos/lib/fast486/common.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/common.h?rev=6… ============================================================================== --- trunk/reactos/lib/fast486/common.h [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/common.h [iso-8859-1] Sun Oct 12 00:10:44 2014 @@ -154,6 +154,7 @@ ); BOOLEAN +FASTCALL Fast486PerformInterrupt ( PFAST486_STATE State, Modified: trunk/reactos/lib/fast486/common.inl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/common.inl?rev… ============================================================================== --- trunk/reactos/lib/fast486/common.inl [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/common.inl [iso-8859-1] Sun Oct 12 00:10:44 2014 @@ -53,6 +53,7 @@ FORCEINLINE INT +FASTCALL Fast486GetCurrentPrivLevel(PFAST486_STATE State) { /* Return the CPL, or 3 if we're in virtual 8086 mode */ @@ -61,6 +62,7 @@ FORCEINLINE ULONG +FASTCALL Fast486GetPageTableEntry(PFAST486_STATE State, ULONG VirtualAddress, BOOLEAN MarkAsDirty) @@ -145,6 +147,7 @@ FORCEINLINE BOOLEAN +FASTCALL Fast486ReadLinearMemory(PFAST486_STATE State, ULONG LinearAddress, PVOID Buffer, @@ -211,6 +214,7 @@ FORCEINLINE BOOLEAN +FASTCALL Fast486WriteLinearMemory(PFAST486_STATE State, ULONG LinearAddress, PVOID Buffer, @@ -279,6 +283,7 @@ FORCEINLINE VOID +FASTCALL Fast486Exception(PFAST486_STATE State, FAST486_EXCEPTIONS ExceptionCode) { @@ -288,6 +293,7 @@ FORCEINLINE BOOLEAN +FASTCALL Fast486StackPush(PFAST486_STATE State, ULONG Value) { @@ -344,6 +350,7 @@ FORCEINLINE BOOLEAN +FASTCALL Fast486StackPop(PFAST486_STATE State, PULONG Value) { @@ -418,6 +425,7 @@ FORCEINLINE BOOLEAN +FASTCALL Fast486LoadSegment(PFAST486_STATE State, FAST486_SEG_REGS Segment, USHORT Selector) @@ -628,6 +636,7 @@ FORCEINLINE BOOLEAN +FASTCALL Fast486FetchByte(PFAST486_STATE State, PUCHAR Data) { @@ -658,6 +667,7 @@ FORCEINLINE BOOLEAN +FASTCALL Fast486FetchWord(PFAST486_STATE State, PUSHORT Data) { @@ -689,6 +699,7 @@ FORCEINLINE BOOLEAN +FASTCALL Fast486FetchDword(PFAST486_STATE State, PULONG Data) { @@ -720,6 +731,7 @@ FORCEINLINE BOOLEAN +FASTCALL Fast486CalculateParity(UCHAR Number) { // See http://graphics.stanford.edu/~seander/bithacks.html#ParityLookupTable too... @@ -728,6 +740,7 @@ FORCEINLINE BOOLEAN +FASTCALL Fast486ParseModRegRm(PFAST486_STATE State, BOOLEAN AddressSize, PFAST486_MOD_REG_RM ModRegRm) @@ -995,6 +1008,7 @@ FORCEINLINE BOOLEAN +FASTCALL Fast486ReadModrmByteOperands(PFAST486_STATE State, PFAST486_MOD_REG_RM ModRegRm, PUCHAR RegValue, @@ -1061,6 +1075,7 @@ FORCEINLINE BOOLEAN +FASTCALL Fast486ReadModrmWordOperands(PFAST486_STATE State, PFAST486_MOD_REG_RM ModRegRm, PUSHORT RegValue, @@ -1109,6 +1124,7 @@ FORCEINLINE BOOLEAN +FASTCALL Fast486ReadModrmDwordOperands(PFAST486_STATE State, PFAST486_MOD_REG_RM ModRegRm, PULONG RegValue, @@ -1157,6 +1173,7 @@ FORCEINLINE BOOLEAN +FASTCALL Fast486WriteModrmByteOperands(PFAST486_STATE State, PFAST486_MOD_REG_RM ModRegRm, BOOLEAN WriteRegister, @@ -1221,6 +1238,7 @@ FORCEINLINE BOOLEAN +FASTCALL Fast486WriteModrmWordOperands(PFAST486_STATE State, PFAST486_MOD_REG_RM ModRegRm, BOOLEAN WriteRegister, @@ -1267,6 +1285,7 @@ FORCEINLINE BOOLEAN +FASTCALL Fast486WriteModrmDwordOperands(PFAST486_STATE State, PFAST486_MOD_REG_RM ModRegRm, BOOLEAN WriteRegister, @@ -1315,7 +1334,9 @@ FORCEINLINE VOID -Fast486FpuNormalize(PFAST486_STATE State, PFAST486_FPU_DATA_REG Data) +FASTCALL +Fast486FpuNormalize(PFAST486_STATE State, + PFAST486_FPU_DATA_REG Data) { UINT LeadingZeros; @@ -1346,6 +1367,7 @@ FORCEINLINE USHORT +FASTCALL Fast486GetValueTag(PFAST486_FPU_DATA_REG Data) { if (FPU_IS_ZERO(Data)) return FPU_TAG_ZERO; @@ -1355,6 +1377,7 @@ FORCEINLINE VOID +FASTCALL Fast486FpuPush(PFAST486_STATE State, PFAST486_FPU_DATA_REG Data) { @@ -1370,6 +1393,7 @@ FORCEINLINE VOID +FASTCALL Fast486FpuPop(PFAST486_STATE State) { if (FPU_GET_TAG(0) != FPU_TAG_EMPTY) Modified: trunk/reactos/lib/fast486/extraops.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/extraops.c?rev… ============================================================================== --- trunk/reactos/lib/fast486/extraops.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/extraops.c [iso-8859-1] Sun Oct 12 00:10:44 2014 @@ -2385,3 +2385,4 @@ } } +/* EOF */ Modified: trunk/reactos/lib/fast486/extraops.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/extraops.h?rev… ============================================================================== --- trunk/reactos/lib/fast486/extraops.h [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/extraops.h [iso-8859-1] Sun Oct 12 00:10:44 2014 @@ -64,4 +64,3 @@ #endif // _EXTRAOPS_H_ /* EOF */ - Modified: trunk/reactos/lib/fast486/fast486.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fast486.c?rev=… ============================================================================== --- trunk/reactos/lib/fast486/fast486.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fast486.c [iso-8859-1] Sun Oct 12 00:10:44 2014 @@ -43,9 +43,7 @@ /* PRIVATE FUNCTIONS **********************************************************/ -static -inline -VOID +static inline VOID NTAPI Fast486ExecutionControl(PFAST486_STATE State, FAST486_EXEC_CMD Command) { Modified: trunk/reactos/lib/fast486/fpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fpu.c?rev=6468… ============================================================================== --- trunk/reactos/lib/fast486/fpu.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fpu.c [iso-8859-1] Sun Oct 12 00:10:44 2014 @@ -32,9 +32,10 @@ /* PRIVATE FUNCTIONS **********************************************************/ -static ULONGLONG UnsignedMult128(ULONGLONG Multiplicand, - ULONGLONG Multiplier, - ULONGLONG *HighProduct) +static ULONGLONG +UnsignedMult128(ULONGLONG Multiplicand, + ULONGLONG Multiplier, + ULONGLONG *HighProduct) { ULONG MultiplicandLow, MultiplicandHigh, MultiplierLow, MultiplierHigh; ULONG IntermediateLow, IntermediateHigh; @@ -63,9 +64,10 @@ return LowProduct; } -static VOID Fast486FpuGetSingleReal(PFAST486_STATE State, - ULONG Value, - PFAST486_FPU_DATA_REG Result) +static VOID +Fast486FpuGetSingleReal(PFAST486_STATE State, + ULONG Value, + PFAST486_FPU_DATA_REG Result) { /* Extract the sign, exponent and mantissa */ Result->Sign = (UCHAR)(Value >> 31); @@ -83,9 +85,10 @@ } } -static VOID Fast486FpuGetDoubleReal(PFAST486_STATE State, - ULONGLONG Value, - PFAST486_FPU_DATA_REG Result) +static VOID +Fast486FpuGetDoubleReal(PFAST486_STATE State, + ULONGLONG Value, + PFAST486_FPU_DATA_REG Result) { /* Extract the sign, exponent and mantissa */ Result->Sign = (UCHAR)(Value >> 63); @@ -103,10 +106,11 @@ } } -static VOID Fast486FpuAdd(PFAST486_STATE State, - PFAST486_FPU_DATA_REG FirstOperand, - PFAST486_FPU_DATA_REG SecondOperand, - PFAST486_FPU_DATA_REG Result) +static VOID +Fast486FpuAdd(PFAST486_STATE State, + PFAST486_FPU_DATA_REG FirstOperand, + PFAST486_FPU_DATA_REG SecondOperand, + PFAST486_FPU_DATA_REG Result) { FAST486_FPU_DATA_REG FirstAdjusted = *FirstOperand; FAST486_FPU_DATA_REG SecondAdjusted = *SecondOperand; @@ -182,10 +186,11 @@ *Result = TempResult; } -static VOID Fast486FpuSubtract(PFAST486_STATE State, - PFAST486_FPU_DATA_REG FirstOperand, - PFAST486_FPU_DATA_REG SecondOperand, - PFAST486_FPU_DATA_REG Result) +static VOID +Fast486FpuSubtract(PFAST486_STATE State, + PFAST486_FPU_DATA_REG FirstOperand, + PFAST486_FPU_DATA_REG SecondOperand, + PFAST486_FPU_DATA_REG Result) { FAST486_FPU_DATA_REG NegativeSecondOperand = *SecondOperand; @@ -196,9 +201,10 @@ Fast486FpuAdd(State, Result, FirstOperand, &NegativeSecondOperand); } -static VOID Fast486FpuCompare(PFAST486_STATE State, - PFAST486_FPU_DATA_REG FirstOperand, - PFAST486_FPU_DATA_REG SecondOperand) +static VOID +Fast486FpuCompare(PFAST486_STATE State, + PFAST486_FPU_DATA_REG FirstOperand, + PFAST486_FPU_DATA_REG SecondOperand) { if (FPU_IS_NAN(FirstOperand) || FPU_IS_NAN(SecondOperand)) { @@ -248,10 +254,11 @@ } } -static VOID Fast486FpuMultiply(PFAST486_STATE State, - PFAST486_FPU_DATA_REG FirstOperand, - PFAST486_FPU_DATA_REG SecondOperand, - PFAST486_FPU_DATA_REG Result) +static VOID +Fast486FpuMultiply(PFAST486_STATE State, + PFAST486_FPU_DATA_REG FirstOperand, + PFAST486_FPU_DATA_REG SecondOperand, + PFAST486_FPU_DATA_REG Result) { FAST486_FPU_DATA_REG TempResult; @@ -273,10 +280,11 @@ *Result = TempResult; } -static VOID Fast486FpuDivide(PFAST486_STATE State, - PFAST486_FPU_DATA_REG FirstOperand, - PFAST486_FPU_DATA_REG SecondOperand, - PFAST486_FPU_DATA_REG Result) +static VOID +Fast486FpuDivide(PFAST486_STATE State, + PFAST486_FPU_DATA_REG FirstOperand, + PFAST486_FPU_DATA_REG SecondOperand, + PFAST486_FPU_DATA_REG Result) { FAST486_FPU_DATA_REG TempResult; Modified: trunk/reactos/lib/fast486/opcodes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/opcodes.c?rev=… ============================================================================== --- trunk/reactos/lib/fast486/opcodes.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/opcodes.c [iso-8859-1] Sun Oct 12 00:10:44 2014 @@ -6314,3 +6314,5 @@ /* Return success */ return TRUE; } + +/* EOF */ Modified: trunk/reactos/lib/fast486/opcodes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/opcodes.h?rev=… ============================================================================== --- trunk/reactos/lib/fast486/opcodes.h [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/opcodes.h [iso-8859-1] Sun Oct 12 00:10:44 2014 @@ -157,3 +157,5 @@ FAST486_OPCODE_HANDLER(Fast486OpcodeOuts); #endif // _OPCODES_H_ + +/* EOF */ Modified: trunk/reactos/lib/fast486/opgroups.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/opgroups.c?rev… ============================================================================== --- trunk/reactos/lib/fast486/opgroups.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/opgroups.c [iso-8859-1] Sun Oct 12 00:10:44 2014 @@ -32,8 +32,8 @@ /* PRIVATE FUNCTIONS **********************************************************/ +static inline -static ULONG Fast486ArithmeticOperation(PFAST486_STATE State, INT Operation, Modified: trunk/reactos/lib/fast486/opgroups.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/opgroups.h?rev… ============================================================================== --- trunk/reactos/lib/fast486/opgroups.h [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/opgroups.h [iso-8859-1] Sun Oct 12 00:10:44 2014 @@ -50,4 +50,3 @@ #endif // _OPGROUPS_H_ /* EOF */ -

1 0

[hbelusca] 64686: [FAST486] - In order to always check for opcode handler being NULL, replace the only NULL handler by a non-NULL one that handles the invalid opcodes. - To quickly retrieve opcode ...
by hbelusca＠svn.reactos.org 11 Oct '14

11 Oct '14

Author: hbelusca Date: Sat Oct 11 23:12:30 2014 New Revision: 64686 URL: http://svn.reactos.org/svn/reactos?rev=64686&view=rev Log: [FAST486] - In order to always check for opcode handler being NULL, replace the only NULL handler by a non-NULL one that handles the invalid opcodes. - To quickly retrieve opcode numbers, add their numbers in regard to their handlers. Modified: trunk/reactos/lib/fast486/fast486.c trunk/reactos/lib/fast486/opcodes.c trunk/reactos/lib/fast486/opcodes.h Modified: trunk/reactos/lib/fast486/fast486.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fast486.c?rev=… ============================================================================== --- trunk/reactos/lib/fast486/fast486.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fast486.c [iso-8859-1] Sat Oct 11 23:12:30 2014 @@ -50,6 +50,7 @@ Fast486ExecutionControl(PFAST486_STATE State, FAST486_EXEC_CMD Command) { UCHAR Opcode; + FAST486_OPCODE_HANDLER_PROC CurrentHandler; INT ProcedureCallCount = 0; /* Main execution loop */ @@ -68,22 +69,12 @@ // TODO: Check for CALL/RET to update ProcedureCallCount. - if (Fast486OpcodeHandlers[Opcode] != NULL) - { - /* Call the opcode handler */ - Fast486OpcodeHandlers[Opcode](State, Opcode); - } - else - { - /* This is not a valid opcode */ - Fast486Exception(State, FAST486_EXCEPTION_UD); - } - - if (Fast486OpcodeHandlers[Opcode] == Fast486OpcodePrefix) - { - /* This is a prefix, go to the next instruction immediately */ - continue; - } + /* Call the opcode handler */ + CurrentHandler = Fast486OpcodeHandlers[Opcode]; + CurrentHandler(State, Opcode); + + /* If this is a prefix, go to the next instruction immediately */ + if (CurrentHandler == Fast486OpcodePrefix) continue; /* A non-prefix opcode has been executed, reset the prefix flags */ State->PrefixFlags = 0; @@ -100,9 +91,8 @@ /* Clear the interrupt status */ State->IntStatus = FAST486_INT_NONE; } - else if (State->Flags.If - && (State->IntAckCallback != NULL) - && (State->IntStatus == FAST486_INT_SIGNAL)) + else if (State->Flags.If && (State->IntStatus == FAST486_INT_SIGNAL) + && (State->IntAckCallback != NULL)) { /* Acknowledge the interrupt to get the number */ State->PendingIntNum = State->IntAckCallback(State); @@ -116,10 +106,10 @@ State->IntStatus = FAST486_INT_EXECUTE; } } - while ((Command == FAST486_CONTINUE) - || (Command == FAST486_STEP_OVER && ProcedureCallCount > 0) - || (Command == FAST486_STEP_OUT && ProcedureCallCount >= 0) - || (Fast486OpcodeHandlers[Opcode] == Fast486OpcodePrefix)); + while ((CurrentHandler == Fast486OpcodePrefix) || + (Command == FAST486_CONTINUE) || + (Command == FAST486_STEP_OVER && ProcedureCallCount > 0) || + (Command == FAST486_STEP_OUT && ProcedureCallCount >= 0)); } /* DEFAULT CALLBACKS **********************************************************/ Modified: trunk/reactos/lib/fast486/opcodes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/opcodes.c?rev=… ============================================================================== --- trunk/reactos/lib/fast486/opcodes.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/opcodes.c [iso-8859-1] Sat Oct 11 23:12:30 2014 @@ -38,70 +38,71 @@ FAST486_OPCODE_HANDLER_PROC Fast486OpcodeHandlers[FAST486_NUM_OPCODE_HANDLERS] = { - Fast486OpcodeAddByteModrm, + Fast486OpcodeAddByteModrm, /* 0x00 - 0x03 */ Fast486OpcodeAddModrm, Fast486OpcodeAddByteModrm, Fast486OpcodeAddModrm, - Fast486OpcodeAddAl, - Fast486OpcodeAddEax, - Fast486OpcodePushEs, - Fast486OpcodePopEs, - Fast486OpcodeOrByteModrm, + Fast486OpcodeAddAl, /* 0x04 */ + Fast486OpcodeAddEax, /* 0x05 */ + Fast486OpcodePushEs, /* 0x06 */ + Fast486OpcodePopEs, /* 0x07 */ + Fast486OpcodeOrByteModrm, /* 0x08 - 0x0B */ Fast486OpcodeOrModrm, Fast486OpcodeOrByteModrm, Fast486OpcodeOrModrm, - Fast486OpcodeOrAl, - Fast486OpcodeOrEax, - Fast486OpcodePushCs, - Fast486OpcodeExtended, - Fast486OpcodeAdcByteModrm, + Fast486OpcodeOrAl, /* 0x0C */ + Fast486OpcodeOrEax, /* 0x0D */ + Fast486OpcodePushCs, /* 0x0E */ + Fast486OpcodeExtended, /* 0x0F */ + Fast486OpcodeAdcByteModrm, /* 0x10 - 0x13 */ Fast486OpcodeAdcModrm, Fast486OpcodeAdcByteModrm, Fast486OpcodeAdcModrm, - Fast486OpcodeAdcAl, - Fast486OpcodeAdcEax, - Fast486OpcodePushSs, - Fast486OpcodePopSs, - Fast486OpcodeSbbByteModrm, + Fast486OpcodeAdcAl, /* 0x14 */ + Fast486OpcodeAdcEax, /* 0x15 */ + Fast486OpcodePushSs, /* 0x16 */ + Fast486OpcodePopSs, /* 0x17 */ + Fast486OpcodeSbbByteModrm, /* 0x18 - 0x1B */ Fast486OpcodeSbbModrm, Fast486OpcodeSbbByteModrm, Fast486OpcodeSbbModrm, - Fast486OpcodeSbbAl, - Fast486OpcodeSbbEax, - Fast486OpcodePushDs, - Fast486OpcodePopDs, - Fast486OpcodeAndByteModrm, + Fast486OpcodeSbbAl, /* 0x1C */ + Fast486OpcodeSbbEax, /* 0x1D */ + Fast486OpcodePushDs, /* 0x1E */ + Fast486OpcodePopDs, /* 0x1F */ + Fast486OpcodeAndByteModrm, /* 0x20 - 0x23 */ Fast486OpcodeAndModrm, Fast486OpcodeAndByteModrm, Fast486OpcodeAndModrm, - Fast486OpcodeAndAl, - Fast486OpcodeAndEax, - Fast486OpcodePrefix, - Fast486OpcodeDaa, - Fast486OpcodeCmpSubByteModrm, + Fast486OpcodeAndAl, /* 0x24 */ + Fast486OpcodeAndEax, /* 0x25 */ + Fast486OpcodePrefix, /* 0x26 */ + Fast486OpcodeDaa, /* 0x27 */ + Fast486OpcodeCmpSubByteModrm, /* 0x28 - 0x2B */ Fast486OpcodeCmpSubModrm, Fast486OpcodeCmpSubByteModrm, Fast486OpcodeCmpSubModrm, - Fast486OpcodeCmpSubAl, - Fast486OpcodeCmpSubEax, - Fast486OpcodePrefix, - Fast486OpcodeDas, - Fast486OpcodeXorByteModrm, + Fast486OpcodeCmpSubAl, /* 0x2C */ + Fast486OpcodeCmpSubEax, /* 0x2D */ + Fast486OpcodePrefix, /* 0x2E */ + Fast486OpcodeDas, /* 0x2F */ + Fast486OpcodeXorByteModrm, /* 0x30 - 0x33 */ Fast486OpcodeXorModrm, Fast486OpcodeXorByteModrm, Fast486OpcodeXorModrm, - Fast486OpcodeXorAl, - Fast486OpcodeXorEax, - Fast486OpcodePrefix, - Fast486OpcodeAaa, - Fast486OpcodeCmpSubByteModrm, + Fast486OpcodeXorAl, /* 0x34 */ + Fast486OpcodeXorEax, /* 0x35 */ + Fast486OpcodePrefix, /* 0x36 */ + Fast486OpcodeAaa, /* 0x37 */ + Fast486OpcodeCmpSubByteModrm, /* 0x38 - 0x3B */ Fast486OpcodeCmpSubModrm, Fast486OpcodeCmpSubByteModrm, Fast486OpcodeCmpSubModrm, - Fast486OpcodeCmpSubAl, - Fast486OpcodeCmpSubEax, - Fast486OpcodePrefix, - Fast486OpcodeAas, + Fast486OpcodeCmpSubAl, /* 0x3C */ + Fast486OpcodeCmpSubEax, /* 0x3D */ + Fast486OpcodePrefix, /* 0x3E */ + Fast486OpcodeAas, /* 0x3F */ + Fast486OpcodeIncrement, /* 0x40 - 0x47 */ Fast486OpcodeIncrement, Fast486OpcodeIncrement, Fast486OpcodeIncrement, @@ -109,7 +110,7 @@ Fast486OpcodeIncrement, Fast486OpcodeIncrement, Fast486OpcodeIncrement, - Fast486OpcodeIncrement, + Fast486OpcodeDecrement, /* 0x48 - 0x4F */ Fast486OpcodeDecrement, Fast486OpcodeDecrement, Fast486OpcodeDecrement, @@ -117,7 +118,7 @@ Fast486OpcodeDecrement, Fast486OpcodeDecrement, Fast486OpcodeDecrement, - Fast486OpcodeDecrement, + Fast486OpcodePushReg, /* 0x50 - 0x57 */ Fast486OpcodePushReg, Fast486OpcodePushReg, Fast486OpcodePushReg, @@ -125,7 +126,7 @@ Fast486OpcodePushReg, Fast486OpcodePushReg, Fast486OpcodePushReg, - Fast486OpcodePushReg, + Fast486OpcodePopReg, /* 0x58 - 0x5F */ Fast486OpcodePopReg, Fast486OpcodePopReg, Fast486OpcodePopReg, @@ -133,23 +134,23 @@ Fast486OpcodePopReg, Fast486OpcodePopReg, Fast486OpcodePopReg, - Fast486OpcodePopReg, - Fast486OpcodePushAll, - Fast486OpcodePopAll, - Fast486OpcodeBound, - Fast486OpcodeArpl, + Fast486OpcodePushAll, /* 0x60 */ + Fast486OpcodePopAll, /* 0x61 */ + Fast486OpcodeBound, /* 0x62 */ + Fast486OpcodeArpl, /* 0x63 */ + Fast486OpcodePrefix, /* 0x64 - 0x67 */ Fast486OpcodePrefix, Fast486OpcodePrefix, Fast486OpcodePrefix, - Fast486OpcodePrefix, - Fast486OpcodePushImm, - Fast486OpcodeImulModrmImm, - Fast486OpcodePushByteImm, - Fast486OpcodeImulModrmImm, - Fast486OpcodeIns, - Fast486OpcodeIns, - Fast486OpcodeOuts, - Fast486OpcodeOuts, + Fast486OpcodePushImm, /* 0x68 */ + Fast486OpcodeImulModrmImm, /* 0x69 */ + Fast486OpcodePushByteImm, /* 0x6A */ + Fast486OpcodeImulModrmImm, /* 0x6B */ + Fast486OpcodeIns, /* 0x6C */ + Fast486OpcodeIns, /* 0x6D */ + Fast486OpcodeOuts, /* 0x6E */ + Fast486OpcodeOuts, /* 0x6F */ + Fast486OpcodeShortConditionalJmp, /* 0x70 - 0x7F */ Fast486OpcodeShortConditionalJmp, Fast486OpcodeShortConditionalJmp, Fast486OpcodeShortConditionalJmp, @@ -165,55 +166,55 @@ Fast486OpcodeShortConditionalJmp, Fast486OpcodeShortConditionalJmp, Fast486OpcodeShortConditionalJmp, - Fast486OpcodeShortConditionalJmp, - Fast486OpcodeGroup8082, - Fast486OpcodeGroup81, - Fast486OpcodeGroup8082, - Fast486OpcodeGroup83, - Fast486OpcodeTestByteModrm, - Fast486OpcodeTestModrm, - Fast486OpcodeXchgByteModrm, - Fast486OpcodeXchgModrm, - Fast486OpcodeMovByteModrm, - Fast486OpcodeMovModrm, - Fast486OpcodeMovByteModrm, - Fast486OpcodeMovModrm, - Fast486OpcodeMovStoreSeg, - Fast486OpcodeLea, - Fast486OpcodeMovLoadSeg, - Fast486OpcodeGroup8F, - Fast486OpcodeNop, + Fast486OpcodeGroup8082, /* 0x80 */ + Fast486OpcodeGroup81, /* 0x81 */ + Fast486OpcodeGroup8082, /* 0x82 */ + Fast486OpcodeGroup83, /* 0x83 */ + Fast486OpcodeTestByteModrm, /* 0x84 */ + Fast486OpcodeTestModrm, /* 0x85 */ + Fast486OpcodeXchgByteModrm, /* 0x86 */ + Fast486OpcodeXchgModrm, /* 0x87 */ + Fast486OpcodeMovByteModrm, /* 0x88 */ + Fast486OpcodeMovModrm, /* 0x89 */ + Fast486OpcodeMovByteModrm, /* 0x8A */ + Fast486OpcodeMovModrm, /* 0x8B */ + Fast486OpcodeMovStoreSeg, /* 0x8C */ + Fast486OpcodeLea, /* 0x8D */ + Fast486OpcodeMovLoadSeg, /* 0x8E */ + Fast486OpcodeGroup8F, /* 0x8F */ + Fast486OpcodeNop, /* 0x90 */ + Fast486OpcodeExchangeEax, /* 0x91 - 0x97 */ Fast486OpcodeExchangeEax, Fast486OpcodeExchangeEax, Fast486OpcodeExchangeEax, Fast486OpcodeExchangeEax, Fast486OpcodeExchangeEax, Fast486OpcodeExchangeEax, - Fast486OpcodeExchangeEax, - Fast486OpcodeCwde, - Fast486OpcodeCdq, - Fast486OpcodeCallAbs, - Fast486OpcodeWait, - Fast486OpcodePushFlags, - Fast486OpcodePopFlags, - Fast486OpcodeSahf, - Fast486OpcodeLahf, - Fast486OpcodeMovAlOffset, - Fast486OpcodeMovEaxOffset, - Fast486OpcodeMovOffsetAl, - Fast486OpcodeMovOffsetEax, - Fast486OpcodeMovs, - Fast486OpcodeMovs, - Fast486OpcodeCmps, - Fast486OpcodeCmps, - Fast486OpcodeTestAl, - Fast486OpcodeTestEax, - Fast486OpcodeStos, - Fast486OpcodeStos, - Fast486OpcodeLods, - Fast486OpcodeLods, - Fast486OpcodeScas, - Fast486OpcodeScas, + Fast486OpcodeCwde, /* 0x98 */ + Fast486OpcodeCdq, /* 0x99 */ + Fast486OpcodeCallAbs, /* 0x9A */ + Fast486OpcodeWait, /* 0x9B */ + Fast486OpcodePushFlags, /* 0x9C */ + Fast486OpcodePopFlags, /* 0x9D */ + Fast486OpcodeSahf, /* 0x9E */ + Fast486OpcodeLahf, /* 0x9F */ + Fast486OpcodeMovAlOffset, /* 0xA0 */ + Fast486OpcodeMovEaxOffset, /* 0xA1 */ + Fast486OpcodeMovOffsetAl, /* 0xA2 */ + Fast486OpcodeMovOffsetEax, /* 0xA3 */ + Fast486OpcodeMovs, /* 0xA4 */ + Fast486OpcodeMovs, /* 0xA5 */ + Fast486OpcodeCmps, /* 0xA6 */ + Fast486OpcodeCmps, /* 0xA7 */ + Fast486OpcodeTestAl, /* 0xA8 */ + Fast486OpcodeTestEax, /* 0xA9 */ + Fast486OpcodeStos, /* 0xAA */ + Fast486OpcodeStos, /* 0xAB */ + Fast486OpcodeLods, /* 0xAC */ + Fast486OpcodeLods, /* 0xAD */ + Fast486OpcodeScas, /* 0xAE */ + Fast486OpcodeScas, /* 0xAF */ + Fast486OpcodeMovByteRegImm, /* 0xB0 - 0xB7 */ Fast486OpcodeMovByteRegImm, Fast486OpcodeMovByteRegImm, Fast486OpcodeMovByteRegImm, @@ -221,7 +222,7 @@ Fast486OpcodeMovByteRegImm, Fast486OpcodeMovByteRegImm, Fast486OpcodeMovByteRegImm, - Fast486OpcodeMovByteRegImm, + Fast486OpcodeMovRegImm, /* 0xB8 - 0xBF */ Fast486OpcodeMovRegImm, Fast486OpcodeMovRegImm, Fast486OpcodeMovRegImm, @@ -229,32 +230,31 @@ Fast486OpcodeMovRegImm, Fast486OpcodeMovRegImm, Fast486OpcodeMovRegImm, - Fast486OpcodeMovRegImm, - Fast486OpcodeGroupC0, - Fast486OpcodeGroupC1, - Fast486OpcodeRet, - Fast486OpcodeRet, - Fast486OpcodeLdsLes, - Fast486OpcodeLdsLes, - Fast486OpcodeGroupC6, - Fast486OpcodeGroupC7, - Fast486OpcodeEnter, - Fast486OpcodeLeave, - Fast486OpcodeRetFar, - Fast486OpcodeRetFar, - Fast486OpcodeInt, - Fast486OpcodeInt, - Fast486OpcodeInt, - Fast486OpcodeIret, - Fast486OpcodeGroupD0, + Fast486OpcodeGroupC0, /* 0xC0 */ + Fast486OpcodeGroupC1, /* 0xC1 */ + Fast486OpcodeRet, /* 0xC2 */ + Fast486OpcodeRet, /* 0xC3 */ + Fast486OpcodeLdsLes, /* 0xC4 */ + Fast486OpcodeLdsLes, /* 0xC5 */ + Fast486OpcodeGroupC6, /* 0xC6 */ + Fast486OpcodeGroupC7, /* 0xC7 */ + Fast486OpcodeEnter, /* 0xC8 */ + Fast486OpcodeLeave, /* 0xC9 */ + Fast486OpcodeRetFar, /* 0xCA */ + Fast486OpcodeRetFar, /* 0xCB */ + Fast486OpcodeInt, /* 0xCC */ + Fast486OpcodeInt, /* 0xCD */ + Fast486OpcodeInt, /* 0xCE */ + Fast486OpcodeIret, /* 0xCF */ + Fast486OpcodeGroupD0, /* 0xD0 - 0xD3 */ Fast486OpcodeGroupD1, Fast486OpcodeGroupD2, Fast486OpcodeGroupD3, - Fast486OpcodeAam, - Fast486OpcodeAad, - Fast486OpcodeSalc, - Fast486OpcodeXlat, - Fast486FpuOpcodeD8DC, + Fast486OpcodeAam, /* 0xD4 */ + Fast486OpcodeAad, /* 0xD5 */ + Fast486OpcodeSalc, /* 0xD6 */ + Fast486OpcodeXlat, /* 0xD7 */ + Fast486FpuOpcodeD8DC, /* 0xD8 - 0xDF */ Fast486FpuOpcodeD9, Fast486FpuOpcodeDA, Fast486FpuOpcodeDB, @@ -262,41 +262,48 @@ Fast486FpuOpcodeDD, Fast486FpuOpcodeDE, Fast486FpuOpcodeDF, + Fast486OpcodeLoop, /* 0xE0 - 0xE2 */ Fast486OpcodeLoop, Fast486OpcodeLoop, - Fast486OpcodeLoop, - Fast486OpcodeJecxz, - Fast486OpcodeInByte, - Fast486OpcodeIn, - Fast486OpcodeOutByte, - Fast486OpcodeOut, - Fast486OpcodeCall, - Fast486OpcodeJmp, - Fast486OpcodeJmpAbs, - Fast486OpcodeShortJump, - Fast486OpcodeInByte, - Fast486OpcodeIn, - Fast486OpcodeOutByte, - Fast486OpcodeOut, - Fast486OpcodePrefix, - NULL, // Invalid - Fast486OpcodePrefix, - Fast486OpcodePrefix, - Fast486OpcodeHalt, - Fast486OpcodeComplCarry, - Fast486OpcodeGroupF6, - Fast486OpcodeGroupF7, - Fast486OpcodeClearCarry, - Fast486OpcodeSetCarry, - Fast486OpcodeClearInt, - Fast486OpcodeSetInt, - Fast486OpcodeClearDir, - Fast486OpcodeSetDir, - Fast486OpcodeGroupFE, - Fast486OpcodeGroupFF, + Fast486OpcodeJecxz, /* 0xE3 */ + Fast486OpcodeInByte, /* 0xE4 */ + Fast486OpcodeIn, /* 0xE5 */ + Fast486OpcodeOutByte, /* 0xE6 */ + Fast486OpcodeOut, /* 0xE7 */ + Fast486OpcodeCall, /* 0xE8 */ + Fast486OpcodeJmp, /* 0xE9 */ + Fast486OpcodeJmpAbs, /* 0xEA */ + Fast486OpcodeShortJump, /* 0xEB */ + Fast486OpcodeInByte, /* 0xEC */ + Fast486OpcodeIn, /* 0xED */ + Fast486OpcodeOutByte, /* 0xEE */ + Fast486OpcodeOut, /* 0xEF */ + Fast486OpcodePrefix, /* 0xF0 */ + Fast486OpcodeInvalid, /* 0xF1 */ // Invalid opcode + Fast486OpcodePrefix, /* 0xF2 */ + Fast486OpcodePrefix, /* 0xF3 */ + Fast486OpcodeHalt, /* 0xF4 */ + Fast486OpcodeComplCarry, /* 0xF5 */ + Fast486OpcodeGroupF6, /* 0xF6 */ + Fast486OpcodeGroupF7, /* 0xF7 */ + Fast486OpcodeClearCarry, /* 0xF8 */ + Fast486OpcodeSetCarry, /* 0xF9 */ + Fast486OpcodeClearInt, /* 0xFA */ + Fast486OpcodeSetInt, /* 0xFB */ + Fast486OpcodeClearDir, /* 0xFC */ + Fast486OpcodeSetDir, /* 0xFD */ + Fast486OpcodeGroupFE, /* 0xFE */ + Fast486OpcodeGroupFF, /* 0xFF */ }; /* PUBLIC FUNCTIONS ***********************************************************/ + +FAST486_OPCODE_HANDLER(Fast486OpcodeInvalid) +{ + /* This is not a valid opcode */ + Fast486Exception(State, FAST486_EXCEPTION_UD); + return FALSE; +} FAST486_OPCODE_HANDLER(Fast486OpcodePrefix) { Modified: trunk/reactos/lib/fast486/opcodes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/opcodes.h?rev=… ============================================================================== --- trunk/reactos/lib/fast486/opcodes.h [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/opcodes.h [iso-8859-1] Sat Oct 11 23:12:30 2014 @@ -36,6 +36,8 @@ extern FAST486_OPCODE_HANDLER_PROC Fast486OpcodeHandlers[FAST486_NUM_OPCODE_HANDLERS]; + +FAST486_OPCODE_HANDLER(Fast486OpcodeInvalid); FAST486_OPCODE_HANDLER(Fast486OpcodePrefix); FAST486_OPCODE_HANDLER(Fast486OpcodeIncrement);

1 0

[tfaber] 64685: [NTOS:KE] - Make fastfail exception noncontinuable CORE-8419
by tfaber＠svn.reactos.org 11 Oct '14

11 Oct '14

Author: tfaber Date: Sat Oct 11 23:07:04 2014 New Revision: 64685 URL: http://svn.reactos.org/svn/reactos?rev=64685&view=rev Log: [NTOS:KE] - Make fastfail exception noncontinuable CORE-8419 Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h trunk/reactos/ntoskrnl/ke/i386/exp.c trunk/reactos/ntoskrnl/ke/i386/traphdlr.c 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 11 23:07:04 2014 @@ -504,6 +504,7 @@ NTAPI KiDispatchExceptionFromTrapFrame( IN NTSTATUS Code, + IN ULONG Flags, IN ULONG_PTR Address, IN ULONG ParameterCount, IN ULONG_PTR Parameter1, @@ -623,7 +624,7 @@ IN PKTRAP_FRAME TrapFrame) { /* Helper for exceptions with no arguments */ - KiDispatchExceptionFromTrapFrame(Code, Address, 0, 0, 0, 0, TrapFrame); + KiDispatchExceptionFromTrapFrame(Code, 0, Address, 0, 0, 0, 0, TrapFrame); } // @@ -638,7 +639,7 @@ IN PKTRAP_FRAME TrapFrame) { /* Helper for exceptions with no arguments */ - KiDispatchExceptionFromTrapFrame(Code, Address, 1, P1, 0, 0, TrapFrame); + KiDispatchExceptionFromTrapFrame(Code, 0, Address, 1, P1, 0, 0, TrapFrame); } // @@ -654,7 +655,7 @@ IN PKTRAP_FRAME TrapFrame) { /* Helper for exceptions with no arguments */ - KiDispatchExceptionFromTrapFrame(Code, Address, 2, P1, P2, 0, TrapFrame); + KiDispatchExceptionFromTrapFrame(Code, 0, Address, 2, P1, P2, 0, TrapFrame); } // 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 11 23:07:04 2014 @@ -1097,6 +1097,7 @@ VOID NTAPI KiDispatchExceptionFromTrapFrame(IN NTSTATUS Code, + IN ULONG Flags, IN ULONG_PTR Address, IN ULONG ParameterCount, IN ULONG_PTR Parameter1, @@ -1108,7 +1109,7 @@ /* Build the exception record */ ExceptionRecord.ExceptionCode = Code; - ExceptionRecord.ExceptionFlags = 0; + ExceptionRecord.ExceptionFlags = Flags; ExceptionRecord.ExceptionRecord = NULL; ExceptionRecord.ExceptionAddress = (PVOID)Address; ExceptionRecord.NumberParameters = ParameterCount; 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 11 23:07:04 2014 @@ -223,6 +223,7 @@ /* Dispatch the exception */ KiDispatchExceptionFromTrapFrame(STATUS_BREAKPOINT, + 0, TrapFrame->Eip - 1, 3, Parameter1, @@ -1311,6 +1312,7 @@ /* Only other choice is an in-page error, with 3 parameters */ KiDispatchExceptionFromTrapFrame(STATUS_IN_PAGE_ERROR, + 0, TrapFrame->Eip, 3, TrapFrame->ErrCode & 2 ? TRUE : FALSE, @@ -1474,10 +1476,14 @@ if (KiUserTrap(TrapFrame)) { /* Dispatch exception to user mode */ - KiDispatchException1Args(STATUS_STACK_BUFFER_OVERRUN, - TrapFrame->Eip, - TrapFrame->Ecx, - TrapFrame); + KiDispatchExceptionFromTrapFrame(STATUS_STACK_BUFFER_OVERRUN, + EXCEPTION_NONCONTINUABLE, + TrapFrame->Eip, + 1, + TrapFrame->Ecx, + 0, + 0, + TrapFrame); } else {

1 0

[akhaldi] 64684: [README.WINE] * Mark extrac32 and expand as synced with Wine 1.7.27. CORE-8540
by akhaldi＠svn.reactos.org 11 Oct '14

11 Oct '14

Author: akhaldi Date: Sat Oct 11 19:43:36 2014 New Revision: 64684 URL: http://svn.reactos.org/svn/reactos?rev=64684&view=rev Log: [README.WINE] * Mark extrac32 and expand as synced with Wine 1.7.27. CORE-8540 Modified: trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Oct 11 19:43:36 2014 @@ -238,14 +238,14 @@ reactos/base/applications/cmdutils/wmic # Synced to Wine-1.7.27 reactos/base/applications/cmdutils/xcopy # Synced to Wine-1.7.27 reactos/base/applications/games/winmine # Forked at Wine-1_3_5 -reactos/base/applications/extrac32 # Synced to Wine-1.7.1 +reactos/base/applications/extrac32 # Synced to Wine-1.7.27 reactos/base/applications/iexplore # Synced to Wine-1.7.27 reactos/base/applications/notepad # Forked at Wine-20041201 reactos/base/applications/regedit # Out of sync reactos/base/applications/winhlp32 # Synced to Wine-1.7.27 reactos/base/applications/wordpad # Synced to Wine-1.7.27 reactos/base/services/rpcss # Synced to Wine-1.7.27 -reactos/base/system/expand # Synced to Wine-1.7.1 +reactos/base/system/expand # Synced to Wine-1.7.27 reactos/base/system/msiexec # Synced to Wine-1.7.27 reactos/modules/rosapps/winfile # Autosync

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