Ros-diffs November 2013

ros-diffs@reactos.org

16 participants
348 discussions

[tkreuzer] 61039: [NTOSKRNL] Implement RtlpCloseHandleCallback, closing the handle table, and use it as callback for ExSweepHandleTable in RtlpDestroyAtomHandleTable. Without a callback ExSweepHand...
by tkreuzer＠svn.reactos.org 18 Nov '13

18 Nov '13

Author: tkreuzer Date: Mon Nov 18 15:21:53 2013 New Revision: 61039 URL: http://svn.reactos.org/svn/reactos?rev=61039&view=rev Log: [NTOSKRNL] Implement RtlpCloseHandleCallback, closing the handle table, and use it as callback for ExSweepHandleTable in RtlpDestroyAtomHandleTable. Without a callback ExSweepHandleTable simply crashes, so obviously we never clean up any atom tables, possibly because the window station is never closed. Modified: trunk/reactos/ntoskrnl/rtl/libsupp.c Modified: trunk/reactos/ntoskrnl/rtl/libsupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/rtl/libsupp.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/rtl/libsupp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/rtl/libsupp.c [iso-8859-1] Mon Nov 18 15:21:53 2013 @@ -535,14 +535,25 @@ return (AtomTable->ExHandleTable != NULL); } +BOOLEAN +NTAPI +RtlpCloseHandleCallback( + IN PHANDLE_TABLE_ENTRY HandleTableEntry, + IN HANDLE Handle, + IN PVOID HandleTable) +{ + /* Destroy and unlock the handle entry */ + return ExDestroyHandle(HandleTable, Handle, HandleTableEntry); +} + VOID RtlpDestroyAtomHandleTable(PRTL_ATOM_TABLE AtomTable) { if (AtomTable->ExHandleTable) { ExSweepHandleTable(AtomTable->ExHandleTable, - NULL, - NULL); + RtlpCloseHandleCallback, + AtomTable->ExHandleTable); ExDestroyHandleTable(AtomTable->ExHandleTable, NULL); AtomTable->ExHandleTable = NULL; }

1 0

[tkreuzer] 61038: [BOOTDATA] Add registry key for winsrv configuration and a a few additional entrys for the VBE driver configuration.
by tkreuzer＠svn.reactos.org 18 Nov '13

18 Nov '13

Author: tkreuzer Date: Mon Nov 18 14:43:28 2013 New Revision: 61038 URL: http://svn.reactos.org/svn/reactos?rev=61038&view=rev Log: [BOOTDATA] Add registry key for winsrv configuration and a a few additional entrys for the VBE driver configuration. Modified: trunk/reactos/boot/bootdata/hivesys.inf Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] Mon Nov 18 14:43:28 2013 @@ -7,6 +7,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control","WaitToKillServiceTimeout",2,"20000" HKLM,"SYSTEM\CurrentControlSet\Control\Biosinfo","InfName",2,"biosinfo.inf" HKLM,"SYSTEM\CurrentControlSet\Control\PnP",,0x00000012 +HKLM,"SYSTEM\CurrentControlSet\Control\Video",,0x00000012 ; Critical Device Database @@ -1875,6 +1876,15 @@ HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.BitsPerPel",0x00010001,8 HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.XResolution",0x00010001,640 HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.YResolution",0x00010001,480 +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.FixedOutput",0x00010001,0 +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.Flags",0x00010001,0 +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.Orientation",0x00010001,0 +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.XPanning",0x00010001,0 +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.YPanning",0x00010001,0 +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","Attach.RelativeX",0x00010001,0 +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","Attach.RelativeY",0x00010001,0 +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","Attach.ToDesktop",0x00010001,1 +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","Attach.PrimaryDevice",0x00010001,1 ; This is not true but it allows to use 3rd party drivers while having the VBE driver installed HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","VgaCompatible",0x00010001,1 @@ -1920,6 +1930,10 @@ ; Debug channels ;HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","DEBUGCHANNEL",0x00020000,"+ole,+rpc" +; Winsrv configuration +HKLM,"SYSTEM\CurrentControlSet\Control\PriorityControl",,0x00000012 +HKLM,"SYSTEM\CurrentControlSet\Control\PriorityControl","Win32PrioritySeparation",0x00010001,0x2 + [AddReg.NTarm] ; RAM Disk class driver HKLM,"SYSTEM\CurrentControlSet\Services\Disk","ErrorControl",0x00010001,0x00000000

1 0

[tkreuzer] 61037: [NTOSKRNL] Implement ObSetHandleAttributes. Rename the ObIsKernelHandle macro to ObpIsKernelHandle to avoid ambiguities (ObIsKernelHandle is a public Vista+ API). Check for NtCurr...
by tkreuzer＠svn.reactos.org 18 Nov '13

18 Nov '13

Author: tkreuzer Date: Mon Nov 18 14:27:01 2013 New Revision: 61037 URL: http://svn.reactos.org/svn/reactos?rev=61037&view=rev Log: [NTOSKRNL] Implement ObSetHandleAttributes. Rename the ObIsKernelHandle macro to ObpIsKernelHandle to avoid ambiguities (ObIsKernelHandle is a public Vista+ API). Check for NtCurrentProcess and NtCurrentThread in ObpIsKernelHandle, since those are always non-kernel handles. Modified: trunk/reactos/ntoskrnl/include/internal/ob.h trunk/reactos/ntoskrnl/ob/obhandle.c trunk/reactos/ntoskrnl/ob/oblife.c trunk/reactos/ntoskrnl/ob/obsecure.c trunk/reactos/ntoskrnl/ob/obwait.c Modified: trunk/reactos/ntoskrnl/include/internal/ob.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ob.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ob.h [iso-8859-1] Mon Nov 18 14:27:01 2013 @@ -61,9 +61,11 @@ #else #define KERNEL_HANDLE_FLAG 0x80000000 #endif -#define ObIsKernelHandle(Handle, ProcessorMode) \ - (((ULONG_PTR)(Handle) & KERNEL_HANDLE_FLAG) && \ - ((ProcessorMode) == KernelMode)) +#define ObpIsKernelHandle(Handle, ProcessorMode) \ + ((((ULONG_PTR)(Handle) & KERNEL_HANDLE_FLAG) == KERNEL_HANDLE_FLAG) && \ + ((ProcessorMode) == KernelMode) && \ + ((Handle) != NtCurrentProcess()) && \ + ((Handle) != NtCurrentThread())) // // Converts to and from a Kernel Handle to a normal handle Modified: trunk/reactos/ntoskrnl/ob/obhandle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obhandle.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obhandle.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/obhandle.c [iso-8859-1] Mon Nov 18 14:27:01 2013 @@ -1714,7 +1714,7 @@ return STATUS_INVALID_HANDLE; /* Check if we're dealing with a kernel handle */ - if (ObIsKernelHandle(Handle, AccessMode)) + if (ObpIsKernelHandle(Handle, AccessMode)) { /* Use the kernel table and convert the handle */ HandleTable = ObpKernelHandleTable; @@ -2490,7 +2490,7 @@ PassedAccessState->SecurityDescriptor = TempBuffer->ObjectCreateInfo.SecurityDescriptor; } - + /* Validate the access mask */ Status = ObpValidateAccessMask(PassedAccessState); if (!NT_SUCCESS(Status)) @@ -3197,8 +3197,52 @@ IN POBJECT_HANDLE_ATTRIBUTE_INFORMATION HandleFlags, IN KPROCESSOR_MODE PreviousMode) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + OBP_SET_HANDLE_ATTRIBUTES_CONTEXT SetHandleAttributesContext; + BOOLEAN Result, AttachedToSystemProcess = FALSE; + PHANDLE_TABLE HandleTable; + KAPC_STATE ApcState; + PAGED_CODE(); + + /* Check if this is a kernel handle */ + if (ObpIsKernelHandle(Handle, PreviousMode)) + { + /* Use the kernel table and convert the handle */ + HandleTable = ObpKernelHandleTable; + Handle = ObKernelHandleToHandle(Handle); + + /* Check if we're not in the system process */ + if (PsGetCurrentProcess() != PsInitialSystemProcess) + { + /* Attach to the system process */ + KeStackAttachProcess(&PsInitialSystemProcess->Pcb, &ApcState); + AttachedToSystemProcess = TRUE; + } + } + else + { + /* Get the current process' handle table */ + HandleTable = PsGetCurrentProcess()->ObjectTable; + } + + /* Initialize the handle attribute context */ + SetHandleAttributesContext.PreviousMode = PreviousMode; + SetHandleAttributesContext.Information = *HandleFlags; + + /* Invoke the ObpSetHandleAttributes callback */ + Result = ExChangeHandle(HandleTable, + Handle, + ObpSetHandleAttributes, + (ULONG_PTR)&SetHandleAttributesContext); + + /* Did we attach to the system process? */ + if (AttachedToSystemProcess) + { + /* Detach from it */ + KeUnstackDetachProcess(&ApcState); + } + + /* Return the result as an NTSTATUS value */ + return Result ? STATUS_SUCCESS : STATUS_ACCESS_DENIED; } /*++ @@ -3364,13 +3408,12 @@ return Status; } -#undef ObIsKernelHandle BOOLEAN NTAPI ObIsKernelHandle(IN HANDLE Handle) { - /* We know we're kernel mode, so just check for the kernel handle flag */ - return (BOOLEAN)(((ULONG_PTR)Handle & KERNEL_HANDLE_FLAG) != 0); + /* Use the inlined version. We know we are in kernel mode. */ + return ObpIsKernelHandle(Handle, KernelMode); } /* EOF */ Modified: trunk/reactos/ntoskrnl/ob/oblife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/oblife.c?rev=6… ============================================================================== --- trunk/reactos/ntoskrnl/ob/oblife.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/oblife.c [iso-8859-1] Mon Nov 18 14:27:01 2013 @@ -1675,14 +1675,14 @@ switch (ObjectInformationClass) { case ObjectHandleFlagInformation: - + /* Validate the length */ if (Length != sizeof(OBJECT_HANDLE_ATTRIBUTE_INFORMATION)) { /* Invalid length */ return STATUS_INFO_LENGTH_MISMATCH; } - + /* Save the previous mode */ Context.PreviousMode = ExGetPreviousMode(); @@ -1714,7 +1714,7 @@ } /* Check if this is a kernel handle */ - if (ObIsKernelHandle(ObjectHandle, Context.PreviousMode)) + if (ObpIsKernelHandle(ObjectHandle, Context.PreviousMode)) { /* Get the actual handle */ ObjectHandle = ObKernelHandleToHandle(ObjectHandle); @@ -1752,9 +1752,9 @@ /* De-attach if we were attached, and return status */ if (AttachedToProcess) KeUnstackDetachProcess(&ApcState); break; - + case ObjectSessionInformation: - + /* Only a system process can do this */ PreviousMode = ExGetPreviousMode(); if (!SeSinglePrivilegeCheck(SeTcbPrivilege, PreviousMode)) @@ -1766,8 +1766,8 @@ else { /* Get the object directory */ - Status = ObReferenceObjectByHandle(ObjectHandle, - 0, + Status = ObReferenceObjectByHandle(ObjectHandle, + 0, ObDirectoryType, PreviousMode, (PVOID*)&Directory, @@ -1781,7 +1781,7 @@ } } break; - + default: /* Unsupported class */ Status = STATUS_INVALID_INFO_CLASS; Modified: trunk/reactos/ntoskrnl/ob/obsecure.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obsecure.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obsecure.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/obsecure.c [iso-8859-1] Mon Nov 18 14:27:01 2013 @@ -62,17 +62,17 @@ EX_FAST_REF FastRef; ULONG Count; PSECURITY_DESCRIPTOR OldSecurityDescriptor; - + /* Get the fast reference and capture it */ FastRef = *(PEX_FAST_REF)SecurityDescriptor; - + /* Don't free again later */ *SecurityDescriptor = NULL; - + /* Get the descriptor and reference count */ OldSecurityDescriptor = ExGetObjectFastReference(FastRef); Count = ExGetCountFastReference(FastRef); - + /* Dereference the descriptor */ ObDereferenceSecurityDescriptor(OldSecurityDescriptor, Count + 1); @@ -162,11 +162,11 @@ OldValue = ExCompareSwapFastReference(FastRef, CachedDescriptor, OldDescriptor); - + /* Get the security descriptor */ SecurityDescriptor = ExGetObjectFastReference(OldValue); Count = ExGetCountFastReference(OldValue); - + /* Make sure the swap worked */ if (SecurityDescriptor == OldDescriptor) { @@ -1010,7 +1010,7 @@ PAGED_CODE(); /* Check if we're dealing with a kernel handle */ - if (ObIsKernelHandle(Handle, ExGetPreviousMode())) + if (ObpIsKernelHandle(Handle, ExGetPreviousMode())) { /* Use the kernel table and convert the handle */ HandleTable = ObpKernelHandleTable; Modified: trunk/reactos/ntoskrnl/ob/obwait.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obwait.c?rev=6… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obwait.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/obwait.c [iso-8859-1] Mon Nov 18 14:27:01 2013 @@ -142,7 +142,7 @@ do { /* Use the right Executive Handle */ - if (ObIsKernelHandle(Handles[i], PreviousMode)) + if (ObpIsKernelHandle(Handles[i], PreviousMode)) { /* Use the System Handle Table and decode */ HandleTable = ObpKernelHandleTable;

1 0

[akhaldi] 61036: [BRANCHES] * audio-bringup: confirmed with the author.
by akhaldi＠svn.reactos.org 18 Nov '13

18 Nov '13

Author: akhaldi Date: Mon Nov 18 12:56:59 2013 New Revision: 61036 URL: http://svn.reactos.org/svn/reactos?rev=61036&view=rev Log: [BRANCHES] * audio-bringup: confirmed with the author. Removed: branches/audio-bringup/

1 0

[tfaber] 61035: [D3DX9_36] - Add missing dependency on d3d_idl_headers - Add missing port.h include (fix MSVC warnings). CORE-7538
by tfaber＠svn.reactos.org 18 Nov '13

18 Nov '13

Author: tfaber Date: Mon Nov 18 10:46:20 2013 New Revision: 61035 URL: http://svn.reactos.org/svn/reactos?rev=61035&view=rev Log: [D3DX9_36] - Add missing dependency on d3d_idl_headers - Add missing port.h include (fix MSVC warnings). CORE-7538 Modified: trunk/reactos/dll/directx/wine/d3dx9_36/CMakeLists.txt trunk/reactos/dll/directx/wine/d3dx9_36/math.c Modified: trunk/reactos/dll/directx/wine/d3dx9_36/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_36/… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dx9_36/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dx9_36/CMakeLists.txt [iso-8859-1] Mon Nov 18 10:46:20 2013 @@ -26,6 +26,7 @@ add_library(d3dx9_36 SHARED ${SOURCE} version.rc) set_module_type(d3dx9_36 win32dll) +add_dependencies(d3dx9_36 d3d_idl_headers) target_link_libraries(d3dx9_36 dxguid wine) add_importlibs(d3dx9_36 d3dcompiler_43 d3dxof user32 ole32 gdi32 msvcrt kernel32 ntdll) add_cd_file(TARGET d3dx9_36 DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/directx/wine/d3dx9_36/math.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_36/… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dx9_36/math.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dx9_36/math.c [iso-8859-1] Mon Nov 18 10:46:20 2013 @@ -25,6 +25,8 @@ #define NONAMELESSUNION #include <config.h> +#include "wine/port.h" + //#include "windef.h" //#include "wingdi.h" #include "d3dx9_36_private.h"

1 0

[hbelusca] 61034: [NTVDM] - Get rid of EmulatorGetRegister and EmulatorSetRegister and replace their calls with the proper definitions. - Get rid of the enums EMULATOR_REG_* and use the FAST486_REG...
by hbelusca＠svn.reactos.org 18 Nov '13

18 Nov '13

Author: hbelusca Date: Mon Nov 18 01:16:19 2013 New Revision: 61034 URL: http://svn.reactos.org/svn/reactos?rev=61034&view=rev Log: [NTVDM] - Get rid of EmulatorGetRegister and EmulatorSetRegister and replace their calls with the proper definitions. - Get rid of the enums EMULATOR_REG_* and use the FAST486_REG_* definitions instead. Modified: branches/ntvdm/subsystems/ntvdm/registers.c branches/ntvdm/subsystems/ntvdm/registers.h Modified: branches/ntvdm/subsystems/ntvdm/registers.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/register… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/registers.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/registers.c [iso-8859-1] Mon Nov 18 01:16:19 2013 @@ -11,53 +11,10 @@ #define NDEBUG #include "emulator.h" - -// TODO: Should be moved to fast486.h -enum -{ - EMULATOR_REG_EAX, - EMULATOR_REG_ECX, - EMULATOR_REG_EDX, - EMULATOR_REG_EBX, - EMULATOR_REG_ESP, - EMULATOR_REG_EBP, - EMULATOR_REG_ESI, - EMULATOR_REG_EDI, - - EMULATOR_REG_ES, - EMULATOR_REG_CS, - EMULATOR_REG_SS, - EMULATOR_REG_DS, - EMULATOR_REG_FS, - EMULATOR_REG_GS -}; +#include "registers.h" /* PUBLIC FUNCTIONS ***********************************************************/ -ULONG EmulatorGetRegister(ULONG Register) -{ - if (Register < EMULATOR_REG_ES) - { - return EmulatorContext.GeneralRegs[Register].Long; - } - else - { - return EmulatorContext.SegmentRegs[Register - EMULATOR_REG_ES].Selector; - } -} - -VOID EmulatorSetRegister(ULONG Register, ULONG Value) -{ - if (Register < EMULATOR_REG_ES) - { - EmulatorContext.GeneralRegs[Register].Long = Value; - } - else - { - Fast486SetSegment(&EmulatorContext, Register - EMULATOR_REG_ES, (USHORT)Value); - } -} - BOOLEAN EmulatorGetFlag(ULONG Flag) { return (EmulatorContext.Flags.Long & Flag) ? TRUE : FALSE; @@ -84,112 +41,112 @@ CDECL getEAX(VOID) { - return EmulatorContext.GeneralRegs[EMULATOR_REG_EAX].Long; + return EmulatorContext.GeneralRegs[FAST486_REG_EAX].Long; } VOID CDECL setEAX(ULONG Value) { - EmulatorContext.GeneralRegs[EMULATOR_REG_EAX].Long = Value; + EmulatorContext.GeneralRegs[FAST486_REG_EAX].Long = Value; } USHORT CDECL getAX(VOID) { - return EmulatorContext.GeneralRegs[EMULATOR_REG_EAX].LowWord; + return EmulatorContext.GeneralRegs[FAST486_REG_EAX].LowWord; } VOID CDECL setAX(USHORT Value) { - EmulatorContext.GeneralRegs[EMULATOR_REG_EAX].LowWord = Value; + EmulatorContext.GeneralRegs[FAST486_REG_EAX].LowWord = Value; } UCHAR CDECL getAH(VOID) { - return EmulatorContext.GeneralRegs[EMULATOR_REG_EAX].HighByte; + return EmulatorContext.GeneralRegs[FAST486_REG_EAX].HighByte; } VOID CDECL setAH(UCHAR Value) { - EmulatorContext.GeneralRegs[EMULATOR_REG_EAX].HighByte = Value; + EmulatorContext.GeneralRegs[FAST486_REG_EAX].HighByte = Value; } UCHAR CDECL getAL(VOID) { - return EmulatorContext.GeneralRegs[EMULATOR_REG_EAX].LowByte; + return EmulatorContext.GeneralRegs[FAST486_REG_EAX].LowByte; } VOID CDECL setAL(UCHAR Value) { - EmulatorContext.GeneralRegs[EMULATOR_REG_EAX].LowByte = Value; + EmulatorContext.GeneralRegs[FAST486_REG_EAX].LowByte = Value; } ULONG CDECL getEBX(VOID) { - return EmulatorContext.GeneralRegs[EMULATOR_REG_EBX].Long; + return EmulatorContext.GeneralRegs[FAST486_REG_EBX].Long; } VOID CDECL setEBX(ULONG Value) { - EmulatorContext.GeneralRegs[EMULATOR_REG_EBX].Long = Value; + EmulatorContext.GeneralRegs[FAST486_REG_EBX].Long = Value; } USHORT CDECL getBX(VOID) { - return EmulatorContext.GeneralRegs[EMULATOR_REG_EBX].LowWord; + return EmulatorContext.GeneralRegs[FAST486_REG_EBX].LowWord; } VOID CDECL setBX(USHORT Value) { - EmulatorContext.GeneralRegs[EMULATOR_REG_EBX].LowWord = Value; + EmulatorContext.GeneralRegs[FAST486_REG_EBX].LowWord = Value; } UCHAR CDECL getBH(VOID) { - return EmulatorContext.GeneralRegs[EMULATOR_REG_EBX].HighByte; + return EmulatorContext.GeneralRegs[FAST486_REG_EBX].HighByte; } VOID CDECL setBH(UCHAR Value) { - EmulatorContext.GeneralRegs[EMULATOR_REG_EBX].HighByte = Value; + EmulatorContext.GeneralRegs[FAST486_REG_EBX].HighByte = Value; } UCHAR CDECL getBL(VOID) { - return EmulatorContext.GeneralRegs[EMULATOR_REG_EBX].LowByte; + return EmulatorContext.GeneralRegs[FAST486_REG_EBX].LowByte; } VOID CDECL setBL(UCHAR Value) { - EmulatorContext.GeneralRegs[EMULATOR_REG_EBX].LowByte = Value; + EmulatorContext.GeneralRegs[FAST486_REG_EBX].LowByte = Value; } @@ -198,56 +155,56 @@ CDECL getECX(VOID) { - return EmulatorContext.GeneralRegs[EMULATOR_REG_ECX].Long; + return EmulatorContext.GeneralRegs[FAST486_REG_ECX].Long; } VOID CDECL setECX(ULONG Value) { - EmulatorContext.GeneralRegs[EMULATOR_REG_ECX].Long = Value; + EmulatorContext.GeneralRegs[FAST486_REG_ECX].Long = Value; } USHORT CDECL getCX(VOID) { - return EmulatorContext.GeneralRegs[EMULATOR_REG_ECX].LowWord; + return EmulatorContext.GeneralRegs[FAST486_REG_ECX].LowWord; } VOID CDECL setCX(USHORT Value) { - EmulatorContext.GeneralRegs[EMULATOR_REG_ECX].LowWord = Value; + EmulatorContext.GeneralRegs[FAST486_REG_ECX].LowWord = Value; } UCHAR CDECL getCH(VOID) { - return EmulatorContext.GeneralRegs[EMULATOR_REG_ECX].HighByte; + return EmulatorContext.GeneralRegs[FAST486_REG_ECX].HighByte; } VOID CDECL setCH(UCHAR Value) { - EmulatorContext.GeneralRegs[EMULATOR_REG_ECX].HighByte = Value; + EmulatorContext.GeneralRegs[FAST486_REG_ECX].HighByte = Value; } UCHAR CDECL getCL(VOID) { - return EmulatorContext.GeneralRegs[EMULATOR_REG_ECX].LowByte; + return EmulatorContext.GeneralRegs[FAST486_REG_ECX].LowByte; } VOID CDECL setCL(UCHAR Value) { - EmulatorContext.GeneralRegs[EMULATOR_REG_ECX].LowByte = Value; + EmulatorContext.GeneralRegs[FAST486_REG_ECX].LowByte = Value; } @@ -256,56 +213,56 @@ CDECL getEDX(VOID) { - return EmulatorContext.GeneralRegs[EMULATOR_REG_EDX].Long; + return EmulatorContext.GeneralRegs[FAST486_REG_EDX].Long; } VOID CDECL setEDX(ULONG Value) { - EmulatorContext.GeneralRegs[EMULATOR_REG_EDX].Long = Value; + EmulatorContext.GeneralRegs[FAST486_REG_EDX].Long = Value; } USHORT CDECL getDX(VOID) { - return EmulatorContext.GeneralRegs[EMULATOR_REG_EDX].LowWord; + return EmulatorContext.GeneralRegs[FAST486_REG_EDX].LowWord; } VOID CDECL setDX(USHORT Value) { - EmulatorContext.GeneralRegs[EMULATOR_REG_EDX].LowWord = Value; + EmulatorContext.GeneralRegs[FAST486_REG_EDX].LowWord = Value; } UCHAR CDECL getDH(VOID) { - return EmulatorContext.GeneralRegs[EMULATOR_REG_EDX].HighByte; + return EmulatorContext.GeneralRegs[FAST486_REG_EDX].HighByte; } VOID CDECL setDH(UCHAR Value) { - EmulatorContext.GeneralRegs[EMULATOR_REG_EDX].HighByte = Value; + EmulatorContext.GeneralRegs[FAST486_REG_EDX].HighByte = Value; } UCHAR CDECL getDL(VOID) { - return EmulatorContext.GeneralRegs[EMULATOR_REG_EDX].LowByte; + return EmulatorContext.GeneralRegs[FAST486_REG_EDX].LowByte; } VOID CDECL setDL(UCHAR Value) { - EmulatorContext.GeneralRegs[EMULATOR_REG_EDX].LowByte = Value; + EmulatorContext.GeneralRegs[FAST486_REG_EDX].LowByte = Value; } @@ -314,28 +271,28 @@ CDECL getESP(VOID) { - return EmulatorGetRegister(EMULATOR_REG_ESP); + return EmulatorContext.GeneralRegs[FAST486_REG_ESP].Long; } VOID CDECL setESP(ULONG Value) { - EmulatorSetStack(EmulatorGetRegister(EMULATOR_REG_SS), Value); + EmulatorSetStack(getSS(), Value); } USHORT CDECL getSP(VOID) { - return LOWORD(EmulatorGetRegister(EMULATOR_REG_ESP)); + return EmulatorContext.GeneralRegs[FAST486_REG_ESP].LowWord; } VOID CDECL setSP(USHORT Value) { - EmulatorSetStack(EmulatorGetRegister(EMULATOR_REG_SS), Value); + EmulatorSetStack(getSS(), Value); } @@ -344,28 +301,28 @@ CDECL getEBP(VOID) { - return EmulatorContext.GeneralRegs[EMULATOR_REG_EBP].Long; + return EmulatorContext.GeneralRegs[FAST486_REG_EBP].Long; } VOID CDECL setEBP(ULONG Value) { - EmulatorContext.GeneralRegs[EMULATOR_REG_EBP].Long = Value; + EmulatorContext.GeneralRegs[FAST486_REG_EBP].Long = Value; } USHORT CDECL getBP(VOID) { - return EmulatorContext.GeneralRegs[EMULATOR_REG_EBP].LowWord; + return EmulatorContext.GeneralRegs[FAST486_REG_EBP].LowWord; } VOID CDECL setBP(USHORT Value) { - EmulatorContext.GeneralRegs[EMULATOR_REG_EBP].LowWord = Value; + EmulatorContext.GeneralRegs[FAST486_REG_EBP].LowWord = Value; } @@ -374,28 +331,28 @@ CDECL getESI(VOID) { - return EmulatorContext.GeneralRegs[EMULATOR_REG_ESI].Long; + return EmulatorContext.GeneralRegs[FAST486_REG_ESI].Long; } VOID CDECL setESI(ULONG Value) { - EmulatorContext.GeneralRegs[EMULATOR_REG_ESI].Long = Value; + EmulatorContext.GeneralRegs[FAST486_REG_ESI].Long = Value; } USHORT CDECL getSI(VOID) { - return EmulatorContext.GeneralRegs[EMULATOR_REG_ESI].LowWord; + return EmulatorContext.GeneralRegs[FAST486_REG_ESI].LowWord; } VOID CDECL setSI(USHORT Value) { - EmulatorContext.GeneralRegs[EMULATOR_REG_ESI].LowWord = Value; + EmulatorContext.GeneralRegs[FAST486_REG_ESI].LowWord = Value; } @@ -404,28 +361,28 @@ CDECL getEDI(VOID) { - return EmulatorContext.GeneralRegs[EMULATOR_REG_EDI].Long; + return EmulatorContext.GeneralRegs[FAST486_REG_EDI].Long; } VOID CDECL setEDI(ULONG Value) { - EmulatorContext.GeneralRegs[EMULATOR_REG_EDI].Long = Value; + EmulatorContext.GeneralRegs[FAST486_REG_EDI].Long = Value; } USHORT CDECL getDI(VOID) { - return EmulatorContext.GeneralRegs[EMULATOR_REG_EDI].LowWord; + return EmulatorContext.GeneralRegs[FAST486_REG_EDI].LowWord; } VOID CDECL setDI(USHORT Value) { - EmulatorContext.GeneralRegs[EMULATOR_REG_EDI].LowWord = Value; + EmulatorContext.GeneralRegs[FAST486_REG_EDI].LowWord = Value; } @@ -441,7 +398,7 @@ CDECL setEIP(ULONG Value) { - EmulatorExecute(EmulatorGetRegister(EMULATOR_REG_CS), Value); + EmulatorExecute(getCS(), Value); } USHORT @@ -455,7 +412,7 @@ CDECL setIP(USHORT Value) { - EmulatorExecute(EmulatorGetRegister(EMULATOR_REG_CS), Value); + EmulatorExecute(getCS(), Value); } @@ -464,84 +421,84 @@ CDECL getCS(VOID) { - return EmulatorGetRegister(EMULATOR_REG_CS); + return EmulatorContext.SegmentRegs[FAST486_REG_CS].Selector; } VOID CDECL setCS(USHORT Value) { - EmulatorSetRegister(EMULATOR_REG_CS, Value); + Fast486SetSegment(&EmulatorContext, FAST486_REG_CS, Value); } USHORT CDECL getSS(VOID) { - return EmulatorGetRegister(EMULATOR_REG_SS); + return EmulatorContext.SegmentRegs[FAST486_REG_SS].Selector; } VOID CDECL setSS(USHORT Value) { - EmulatorSetRegister(EMULATOR_REG_SS, Value); + Fast486SetSegment(&EmulatorContext, FAST486_REG_SS, Value); } USHORT CDECL getDS(VOID) { - return EmulatorGetRegister(EMULATOR_REG_DS); + return EmulatorContext.SegmentRegs[FAST486_REG_DS].Selector; } VOID CDECL setDS(USHORT Value) { - EmulatorSetRegister(EMULATOR_REG_DS, Value); + Fast486SetSegment(&EmulatorContext, FAST486_REG_DS, Value); } USHORT CDECL getES(VOID) { - return EmulatorGetRegister(EMULATOR_REG_ES); + return EmulatorContext.SegmentRegs[FAST486_REG_ES].Selector; } VOID CDECL setES(USHORT Value) { - EmulatorSetRegister(EMULATOR_REG_ES, Value); + Fast486SetSegment(&EmulatorContext, FAST486_REG_ES, Value); } USHORT CDECL getFS(VOID) { - return EmulatorGetRegister(EMULATOR_REG_FS); + return EmulatorContext.SegmentRegs[FAST486_REG_FS].Selector; } VOID CDECL setFS(USHORT Value) { - EmulatorSetRegister(EMULATOR_REG_FS, Value); + Fast486SetSegment(&EmulatorContext, FAST486_REG_FS, Value); } USHORT CDECL getGS(VOID) { - return EmulatorGetRegister(EMULATOR_REG_GS); + return EmulatorContext.SegmentRegs[FAST486_REG_GS].Selector; } VOID CDECL setGS(USHORT Value) { - EmulatorSetRegister(EMULATOR_REG_GS, Value); + Fast486SetSegment(&EmulatorContext, FAST486_REG_GS, Value); } Modified: branches/ntvdm/subsystems/ntvdm/registers.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/register… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/registers.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/registers.h [iso-8859-1] Mon Nov 18 01:16:19 2013 @@ -11,8 +11,6 @@ /* INCLUDES *******************************************************************/ -ULONG EmulatorGetRegister(ULONG Register); -VOID EmulatorSetRegister(ULONG Register, ULONG Value); BOOLEAN EmulatorGetFlag(ULONG Flag); VOID EmulatorSetFlag(ULONG Flag); VOID EmulatorClearFlag(ULONG Flag);

1 0

[hbelusca] 61033: [NTVDM] - Implement and export getEFLAGS and setEFLAGS. - Do some code reorganization (move all registers-related functions into "registers.c").
by hbelusca＠svn.reactos.org 18 Nov '13

18 Nov '13

Author: hbelusca Date: Mon Nov 18 00:45:00 2013 New Revision: 61033 URL: http://svn.reactos.org/svn/reactos?rev=61033&view=rev Log: [NTVDM] - Implement and export getEFLAGS and setEFLAGS. - Do some code reorganization (move all registers-related functions into "registers.c"). Modified: branches/ntvdm/subsystems/ntvdm/emulator.c branches/ntvdm/subsystems/ntvdm/emulator.h branches/ntvdm/subsystems/ntvdm/ntvdm.spec branches/ntvdm/subsystems/ntvdm/registers.c branches/ntvdm/subsystems/ntvdm/registers.h Modified: branches/ntvdm/subsystems/ntvdm/emulator.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/emulator… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/emulator.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/emulator.c [iso-8859-1] Mon Nov 18 00:45:00 2013 @@ -14,6 +14,7 @@ #include "cmos.h" #include "bios.h" #include "bop.h" +#include "registers.h" #include "dos.h" #include "speaker.h" #include "vga.h" @@ -311,11 +312,6 @@ if (BaseAddress != NULL) HeapFree(GetProcessHeap(), 0, BaseAddress); } -VOID EmulatorSetStack(WORD Segment, DWORD Offset) -{ - Fast486SetStack(&EmulatorContext, Segment, Offset); -} - // FIXME: This function assumes 16-bit mode!!! VOID EmulatorExecute(WORD Segment, WORD Offset) { @@ -335,50 +331,6 @@ Fast486InterruptSignal(&EmulatorContext); } -ULONG EmulatorGetRegister(ULONG Register) -{ - if (Register < EMULATOR_REG_ES) - { - return EmulatorContext.GeneralRegs[Register].Long; - } - else - { - return EmulatorContext.SegmentRegs[Register - EMULATOR_REG_ES].Selector; - } -} - -VOID EmulatorSetRegister(ULONG Register, ULONG Value) -{ - if (Register < EMULATOR_REG_ES) - { - EmulatorContext.GeneralRegs[Register].Long = Value; - } - else - { - Fast486SetSegment(&EmulatorContext, Register - EMULATOR_REG_ES, (USHORT)Value); - } -} - -ULONG EmulatorGetProgramCounter(VOID) -{ - return EmulatorContext.InstPtr.Long; -} - -BOOLEAN EmulatorGetFlag(ULONG Flag) -{ - return (EmulatorContext.Flags.Long & Flag) ? TRUE : FALSE; -} - -VOID EmulatorSetFlag(ULONG Flag) -{ - EmulatorContext.Flags.Long |= Flag; -} - -VOID EmulatorClearFlag(ULONG Flag) -{ - EmulatorContext.Flags.Long &= ~Flag; -} - VOID EmulatorStep(VOID) { /* Dump the state for debugging purposes */ Modified: branches/ntvdm/subsystems/ntvdm/emulator.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/emulator… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/emulator.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/emulator.h [iso-8859-1] Mon Nov 18 00:45:00 2013 @@ -59,24 +59,6 @@ EMULATOR_EXCEPTION_PAGE_FAULT }; -enum -{ - EMULATOR_REG_AX, - EMULATOR_REG_CX, - EMULATOR_REG_DX, - EMULATOR_REG_BX, - EMULATOR_REG_SP, - EMULATOR_REG_BP, - EMULATOR_REG_SI, - EMULATOR_REG_DI, - EMULATOR_REG_ES, - EMULATOR_REG_CS, - EMULATOR_REG_SS, - EMULATOR_REG_DS, - EMULATOR_REG_FS, - EMULATOR_REG_GS -}; - extern FAST486_STATE EmulatorContext; /* FUNCTIONS ******************************************************************/ @@ -121,16 +103,9 @@ ); BOOLEAN EmulatorInitialize(VOID); -VOID EmulatorSetStack(WORD Segment, DWORD Offset); VOID EmulatorExecute(WORD Segment, WORD Offset); VOID EmulatorInterrupt(BYTE Number); VOID EmulatorInterruptSignal(VOID); -ULONG EmulatorGetRegister(ULONG Register); -ULONG EmulatorGetProgramCounter(VOID); -VOID EmulatorSetRegister(ULONG Register, ULONG Value); -BOOLEAN EmulatorGetFlag(ULONG Flag); -VOID EmulatorSetFlag(ULONG Flag); -VOID EmulatorClearFlag(ULONG Flag); VOID EmulatorStep(VOID); VOID EmulatorCleanup(VOID); VOID EmulatorSetA20(BOOLEAN Enabled); Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.spec URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ntvdm.sp… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/ntvdm.spec [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/ntvdm.spec [iso-8859-1] Mon Nov 18 00:45:00 2013 @@ -23,7 +23,7 @@ @ cdecl getECX() @ cdecl getEDI() @ cdecl getEDX() -; @ cdecl getEFLAGS() +@ cdecl getEFLAGS() @ cdecl getEIP() @ cdecl getES() @ cdecl getESI() @@ -69,7 +69,7 @@ @ cdecl setECX(long) @ cdecl setEDI(long) @ cdecl setEDX(long) -; @ cdecl setEFLAGS(long) +@ cdecl setEFLAGS(long) @ cdecl setEIP(long) @ cdecl setES(long) @ cdecl setESI(long) Modified: branches/ntvdm/subsystems/ntvdm/registers.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/register… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/registers.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/registers.c [iso-8859-1] Mon Nov 18 00:45:00 2013 @@ -12,118 +12,184 @@ #include "emulator.h" +// TODO: Should be moved to fast486.h +enum +{ + EMULATOR_REG_EAX, + EMULATOR_REG_ECX, + EMULATOR_REG_EDX, + EMULATOR_REG_EBX, + EMULATOR_REG_ESP, + EMULATOR_REG_EBP, + EMULATOR_REG_ESI, + EMULATOR_REG_EDI, + + EMULATOR_REG_ES, + EMULATOR_REG_CS, + EMULATOR_REG_SS, + EMULATOR_REG_DS, + EMULATOR_REG_FS, + EMULATOR_REG_GS +}; + /* PUBLIC FUNCTIONS ***********************************************************/ +ULONG EmulatorGetRegister(ULONG Register) +{ + if (Register < EMULATOR_REG_ES) + { + return EmulatorContext.GeneralRegs[Register].Long; + } + else + { + return EmulatorContext.SegmentRegs[Register - EMULATOR_REG_ES].Selector; + } +} + +VOID EmulatorSetRegister(ULONG Register, ULONG Value) +{ + if (Register < EMULATOR_REG_ES) + { + EmulatorContext.GeneralRegs[Register].Long = Value; + } + else + { + Fast486SetSegment(&EmulatorContext, Register - EMULATOR_REG_ES, (USHORT)Value); + } +} + +BOOLEAN EmulatorGetFlag(ULONG Flag) +{ + return (EmulatorContext.Flags.Long & Flag) ? TRUE : FALSE; +} + +VOID EmulatorSetFlag(ULONG Flag) +{ + EmulatorContext.Flags.Long |= Flag; +} + +VOID EmulatorClearFlag(ULONG Flag) +{ + EmulatorContext.Flags.Long &= ~Flag; +} + +VOID EmulatorSetStack(WORD Segment, DWORD Offset) +{ + Fast486SetStack(&EmulatorContext, Segment, Offset); +} + + + ULONG CDECL getEAX(VOID) { - return EmulatorContext.GeneralRegs[EMULATOR_REG_AX].Long; + return EmulatorContext.GeneralRegs[EMULATOR_REG_EAX].Long; } VOID CDECL setEAX(ULONG Value) { - EmulatorContext.GeneralRegs[EMULATOR_REG_AX].Long = Value; + EmulatorContext.GeneralRegs[EMULATOR_REG_EAX].Long = Value; } USHORT CDECL getAX(VOID) { - return EmulatorContext.GeneralRegs[EMULATOR_REG_AX].LowWord; + return EmulatorContext.GeneralRegs[EMULATOR_REG_EAX].LowWord; } VOID CDECL setAX(USHORT Value) { - EmulatorContext.GeneralRegs[EMULATOR_REG_AX].LowWord = Value; + EmulatorContext.GeneralRegs[EMULATOR_REG_EAX].LowWord = Value; } UCHAR CDECL getAH(VOID) { - return EmulatorContext.GeneralRegs[EMULATOR_REG_AX].HighByte; + return EmulatorContext.GeneralRegs[EMULATOR_REG_EAX].HighByte; } VOID CDECL setAH(UCHAR Value) { - EmulatorContext.GeneralRegs[EMULATOR_REG_AX].HighByte = Value; + EmulatorContext.GeneralRegs[EMULATOR_REG_EAX].HighByte = Value; } UCHAR CDECL getAL(VOID) { - return EmulatorContext.GeneralRegs[EMULATOR_REG_AX].LowByte; + return EmulatorContext.GeneralRegs[EMULATOR_REG_EAX].LowByte; } VOID CDECL setAL(UCHAR Value) { - EmulatorContext.GeneralRegs[EMULATOR_REG_AX].LowByte = Value; + EmulatorContext.GeneralRegs[EMULATOR_REG_EAX].LowByte = Value; } ULONG CDECL getEBX(VOID) { - return EmulatorContext.GeneralRegs[EMULATOR_REG_BX].Long; + return EmulatorContext.GeneralRegs[EMULATOR_REG_EBX].Long; } VOID CDECL setEBX(ULONG Value) { - EmulatorContext.GeneralRegs[EMULATOR_REG_BX].Long = Value; + EmulatorContext.GeneralRegs[EMULATOR_REG_EBX].Long = Value; } USHORT CDECL getBX(VOID) { - return EmulatorContext.GeneralRegs[EMULATOR_REG_BX].LowWord; + return EmulatorContext.GeneralRegs[EMULATOR_REG_EBX].LowWord; } VOID CDECL setBX(USHORT Value) { - EmulatorContext.GeneralRegs[EMULATOR_REG_BX].LowWord = Value; + EmulatorContext.GeneralRegs[EMULATOR_REG_EBX].LowWord = Value; } UCHAR CDECL getBH(VOID) { - return EmulatorContext.GeneralRegs[EMULATOR_REG_BX].HighByte; + return EmulatorContext.GeneralRegs[EMULATOR_REG_EBX].HighByte; } VOID CDECL setBH(UCHAR Value) { - EmulatorContext.GeneralRegs[EMULATOR_REG_BX].HighByte = Value; + EmulatorContext.GeneralRegs[EMULATOR_REG_EBX].HighByte = Value; } UCHAR CDECL getBL(VOID) { - return EmulatorContext.GeneralRegs[EMULATOR_REG_BX].LowByte; + return EmulatorContext.GeneralRegs[EMULATOR_REG_EBX].LowByte; } VOID CDECL setBL(UCHAR Value) { - EmulatorContext.GeneralRegs[EMULATOR_REG_BX].LowByte = Value; + EmulatorContext.GeneralRegs[EMULATOR_REG_EBX].LowByte = Value; } @@ -132,56 +198,56 @@ CDECL getECX(VOID) { - return EmulatorContext.GeneralRegs[EMULATOR_REG_CX].Long; + return EmulatorContext.GeneralRegs[EMULATOR_REG_ECX].Long; } VOID CDECL setECX(ULONG Value) { - EmulatorContext.GeneralRegs[EMULATOR_REG_CX].Long = Value; + EmulatorContext.GeneralRegs[EMULATOR_REG_ECX].Long = Value; } USHORT CDECL getCX(VOID) { - return EmulatorContext.GeneralRegs[EMULATOR_REG_CX].LowWord; + return EmulatorContext.GeneralRegs[EMULATOR_REG_ECX].LowWord; } VOID CDECL setCX(USHORT Value) { - EmulatorContext.GeneralRegs[EMULATOR_REG_CX].LowWord = Value; + EmulatorContext.GeneralRegs[EMULATOR_REG_ECX].LowWord = Value; } UCHAR CDECL getCH(VOID) { - return EmulatorContext.GeneralRegs[EMULATOR_REG_CX].HighByte; + return EmulatorContext.GeneralRegs[EMULATOR_REG_ECX].HighByte; } VOID CDECL setCH(UCHAR Value) { - EmulatorContext.GeneralRegs[EMULATOR_REG_CX].HighByte = Value; + EmulatorContext.GeneralRegs[EMULATOR_REG_ECX].HighByte = Value; } UCHAR CDECL getCL(VOID) { - return EmulatorContext.GeneralRegs[EMULATOR_REG_CX].LowByte; + return EmulatorContext.GeneralRegs[EMULATOR_REG_ECX].LowByte; } VOID CDECL setCL(UCHAR Value) { - EmulatorContext.GeneralRegs[EMULATOR_REG_CX].LowByte = Value; + EmulatorContext.GeneralRegs[EMULATOR_REG_ECX].LowByte = Value; } @@ -190,56 +256,56 @@ CDECL getEDX(VOID) { - return EmulatorContext.GeneralRegs[EMULATOR_REG_DX].Long; + return EmulatorContext.GeneralRegs[EMULATOR_REG_EDX].Long; } VOID CDECL setEDX(ULONG Value) { - EmulatorContext.GeneralRegs[EMULATOR_REG_DX].Long = Value; + EmulatorContext.GeneralRegs[EMULATOR_REG_EDX].Long = Value; } USHORT CDECL getDX(VOID) { - return EmulatorContext.GeneralRegs[EMULATOR_REG_DX].LowWord; + return EmulatorContext.GeneralRegs[EMULATOR_REG_EDX].LowWord; } VOID CDECL setDX(USHORT Value) { - EmulatorContext.GeneralRegs[EMULATOR_REG_DX].LowWord = Value; + EmulatorContext.GeneralRegs[EMULATOR_REG_EDX].LowWord = Value; } UCHAR CDECL getDH(VOID) { - return EmulatorContext.GeneralRegs[EMULATOR_REG_DX].HighByte; + return EmulatorContext.GeneralRegs[EMULATOR_REG_EDX].HighByte; } VOID CDECL setDH(UCHAR Value) { - EmulatorContext.GeneralRegs[EMULATOR_REG_DX].HighByte = Value; + EmulatorContext.GeneralRegs[EMULATOR_REG_EDX].HighByte = Value; } UCHAR CDECL getDL(VOID) { - return EmulatorContext.GeneralRegs[EMULATOR_REG_DX].LowByte; + return EmulatorContext.GeneralRegs[EMULATOR_REG_EDX].LowByte; } VOID CDECL setDL(UCHAR Value) { - EmulatorContext.GeneralRegs[EMULATOR_REG_DX].LowByte = Value; + EmulatorContext.GeneralRegs[EMULATOR_REG_EDX].LowByte = Value; } @@ -248,7 +314,7 @@ CDECL getESP(VOID) { - return EmulatorGetRegister(EMULATOR_REG_SP); + return EmulatorGetRegister(EMULATOR_REG_ESP); } VOID @@ -262,7 +328,7 @@ CDECL getSP(VOID) { - return LOWORD(EmulatorGetRegister(EMULATOR_REG_SP)); + return LOWORD(EmulatorGetRegister(EMULATOR_REG_ESP)); } VOID @@ -278,28 +344,28 @@ CDECL getEBP(VOID) { - return EmulatorContext.GeneralRegs[EMULATOR_REG_BP].Long; + return EmulatorContext.GeneralRegs[EMULATOR_REG_EBP].Long; } VOID CDECL setEBP(ULONG Value) { - EmulatorContext.GeneralRegs[EMULATOR_REG_BP].Long = Value; + EmulatorContext.GeneralRegs[EMULATOR_REG_EBP].Long = Value; } USHORT CDECL getBP(VOID) { - return EmulatorContext.GeneralRegs[EMULATOR_REG_BP].LowWord; + return EmulatorContext.GeneralRegs[EMULATOR_REG_EBP].LowWord; } VOID CDECL setBP(USHORT Value) { - EmulatorContext.GeneralRegs[EMULATOR_REG_BP].LowWord = Value; + EmulatorContext.GeneralRegs[EMULATOR_REG_EBP].LowWord = Value; } @@ -308,28 +374,28 @@ CDECL getESI(VOID) { - return EmulatorContext.GeneralRegs[EMULATOR_REG_SI].Long; + return EmulatorContext.GeneralRegs[EMULATOR_REG_ESI].Long; } VOID CDECL setESI(ULONG Value) { - EmulatorContext.GeneralRegs[EMULATOR_REG_SI].Long = Value; + EmulatorContext.GeneralRegs[EMULATOR_REG_ESI].Long = Value; } USHORT CDECL getSI(VOID) { - return EmulatorContext.GeneralRegs[EMULATOR_REG_SI].LowWord; + return EmulatorContext.GeneralRegs[EMULATOR_REG_ESI].LowWord; } VOID CDECL setSI(USHORT Value) { - EmulatorContext.GeneralRegs[EMULATOR_REG_SI].LowWord = Value; + EmulatorContext.GeneralRegs[EMULATOR_REG_ESI].LowWord = Value; } @@ -338,28 +404,28 @@ CDECL getEDI(VOID) { - return EmulatorContext.GeneralRegs[EMULATOR_REG_DI].Long; + return EmulatorContext.GeneralRegs[EMULATOR_REG_EDI].Long; } VOID CDECL setEDI(ULONG Value) { - EmulatorContext.GeneralRegs[EMULATOR_REG_DI].Long = Value; + EmulatorContext.GeneralRegs[EMULATOR_REG_EDI].Long = Value; } USHORT CDECL getDI(VOID) { - return EmulatorContext.GeneralRegs[EMULATOR_REG_DI].LowWord; + return EmulatorContext.GeneralRegs[EMULATOR_REG_EDI].LowWord; } VOID CDECL setDI(USHORT Value) { - EmulatorContext.GeneralRegs[EMULATOR_REG_DI].LowWord = Value; + EmulatorContext.GeneralRegs[EMULATOR_REG_EDI].LowWord = Value; } @@ -368,7 +434,7 @@ CDECL getEIP(VOID) { - return EmulatorGetProgramCounter(); + return EmulatorContext.InstPtr.Long; } VOID @@ -382,7 +448,7 @@ CDECL getIP(VOID) { - return LOWORD(EmulatorGetProgramCounter()); + return EmulatorContext.InstPtr.LowWord; } VOID @@ -618,6 +684,22 @@ +ULONG +CDECL +getEFLAGS(VOID) +{ + return EmulatorContext.Flags.Long; +} + +VOID +CDECL +setEFLAGS(ULONG Flags) +{ + EmulatorContext.Flags.Long = Flags; +} + + + USHORT CDECL getMSW(VOID) Modified: branches/ntvdm/subsystems/ntvdm/registers.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/register… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/registers.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/registers.h [iso-8859-1] Mon Nov 18 00:45:00 2013 @@ -10,6 +10,14 @@ #define _REGISTERS_H_ /* INCLUDES *******************************************************************/ + +ULONG EmulatorGetRegister(ULONG Register); +VOID EmulatorSetRegister(ULONG Register, ULONG Value); +BOOLEAN EmulatorGetFlag(ULONG Flag); +VOID EmulatorSetFlag(ULONG Flag); +VOID EmulatorClearFlag(ULONG Flag); +VOID EmulatorSetStack(WORD Segment, DWORD Offset); + ULONG getEAX(VOID); VOID setEAX(ULONG); @@ -104,6 +112,9 @@ ULONG getOF(VOID); VOID setOF(ULONG); +ULONG getEFLAGS(VOID); +VOID setEFLAGS(ULONG); + USHORT getMSW(VOID); VOID setMSW(USHORT);

1 0

[tkreuzer] 61032: [GDI32] Fix MSVC warnings
by tkreuzer＠svn.reactos.org 18 Nov '13

18 Nov '13

Author: tkreuzer Date: Mon Nov 18 00:35:32 2013 New Revision: 61032 URL: http://svn.reactos.org/svn/reactos?rev=61032&view=rev Log: [GDI32] Fix MSVC warnings Modified: trunk/reactos/win32ss/gdi/gdi32/objects/eng.c Modified: trunk/reactos/win32ss/gdi/gdi32/objects/eng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/objects/eng.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/objects/eng.c [iso-8859-1] Mon Nov 18 00:35:32 2013 @@ -112,11 +112,14 @@ HGLOBAL Hg; LPVOID Lock = NULL; - if ((HRSrc = FindResourceW( (HMODULE) h, MAKEINTRESOURCEW(iName), MAKEINTRESOURCEW(iType)))) - { - if ((Size = SizeofResource( (HMODULE) h, HRSrc ))) + HRSrc = FindResourceW((HMODULE)h, MAKEINTRESOURCEW(iName), MAKEINTRESOURCEW(iType)); + if (HRSrc != NULL) + { + Size = SizeofResource((HMODULE)h, HRSrc); + if (Size != 0) { - if ((Hg = LoadResource( (HMODULE) h, HRSrc ))) + Hg = LoadResource((HMODULE)h, HRSrc); + if (Hg != NULL) { Lock = LockResource( Hg ); }

1 0

[tfaber] 61031: [WINE] - We have <unistd.h> and <sys/time.h>, that doesn't depend on _MSC_VER.
by tfaber＠svn.reactos.org 18 Nov '13

18 Nov '13

Author: tfaber Date: Mon Nov 18 00:22:53 2013 New Revision: 61031 URL: http://svn.reactos.org/svn/reactos?rev=61031&view=rev Log: [WINE] - We have <unistd.h> and <sys/time.h>, that doesn't depend on _MSC_VER. Modified: trunk/reactos/include/reactos/wine/config.h Modified: trunk/reactos/include/reactos/wine/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/confi… ============================================================================== --- trunk/reactos/include/reactos/wine/config.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/config.h [iso-8859-1] Mon Nov 18 00:22:53 2013 @@ -1003,9 +1003,7 @@ /* #undef HAVE_SYS_TIMES_H */ /* Define to 1 if you have the <sys/time.h> header file. */ -#ifndef _MSC_VER - #define HAVE_SYS_TIME_H 1 -#endif +#define HAVE_SYS_TIME_H 1 /* Define to 1 if you have the <sys/types.h> header file. */ #define HAVE_SYS_TYPES_H 1 @@ -1053,9 +1051,7 @@ /* #undef HAVE_UCONTEXT_H */ /* Define to 1 if you have the <unistd.h> header file. */ -#ifndef _MSC_VER #define HAVE_UNISTD_H 1 -#endif /* Define to 1 if you have the `usleep' function. */ /* #undef HAVE_USLEEP */

1 0

[tfaber] 61030: [CMAKE] - Enable C4115 (struct defined in function parameter list) and fix its occurrences
by tfaber＠svn.reactos.org 18 Nov '13

18 Nov '13

Author: tfaber Date: Mon Nov 18 00:04:15 2013 New Revision: 61030 URL: http://svn.reactos.org/svn/reactos?rev=61030&view=rev Log: [CMAKE] - Enable C4115 (struct defined in function parameter list) and fix its occurrences Modified: trunk/reactos/cmake/msvc.cmake trunk/reactos/dll/win32/riched20/msvc.h trunk/reactos/dll/win32/windowscodecs/typeof.h Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=61030… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Mon Nov 18 00:04:15 2013 @@ -50,6 +50,10 @@ # - C4229: modifiers on data are ignored # - C4700: uninitialized variable usage add_compile_flags("/we4022 /we4047 /we4098 /we4113 /we4129 /we4229 /we4700") + +# Enable warnings above the default level, but don't treat them as errors: +# - C4115: named type definition in parentheses +add_compile_flags("/w14115") # Debugging #if(${CMAKE_BUILD_TYPE} STREQUAL "Debug") Modified: trunk/reactos/dll/win32/riched20/msvc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/msvc.h?… ============================================================================== --- trunk/reactos/dll/win32/riched20/msvc.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/msvc.h [iso-8859-1] Mon Nov 18 00:04:15 2013 @@ -4,13 +4,18 @@ #define typeof(X_) __typeof_ ## X_ +struct HDC__; struct ITextHost; -struct _RECT; -struct _CHARFORMATW; -struct _PARAFORMAT; -struct _POINT; -struct _SIZEL; -struct HDC__; +struct tagRECT; +struct _RECTL; +struct _charformatw; +struct _paraformat; +struct tagPOINT; +enum _TXTBACKSTYLE; +struct tagSIZE; +struct ITextServices; +struct tagDVTARGETDEVICE; +struct IDropTarget; #define WINAPI __stdcall #define HRESULT int Modified: trunk/reactos/dll/win32/windowscodecs/typeof.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/ty… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/typeof.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/typeof.h [iso-8859-1] Mon Nov 18 00:04:15 2013 @@ -15,6 +15,12 @@ #define __typeof_size __typeof_intptr #define __typeof_wchar unsigned short #endif + +struct jpeg_decompress_struct; +struct jpeg_compress_struct; +struct png_struct_def; +struct png_color_struct; +struct png_color_16_struct; typedef struct jpeg_error_mgr * (__cdecl typeof(jpeg_std_error))(struct jpeg_error_mgr *); typedef void (__cdecl typeof(jpeg_CreateDecompress))(struct jpeg_decompress_struct *, int, __typeof_size);

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
35
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2013