Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 67941: [CMAKE] Do not treat C4189 as an error when compiling with VS 2010, or when in release mode.
by akhaldi＠svn.reactos.org 28 May '15

28 May '15

Author: akhaldi Date: Thu May 28 12:19:24 2015 New Revision: 67941 URL: http://svn.reactos.org/svn/reactos?rev=67941&view=rev Log: [CMAKE] Do not treat C4189 as an error when compiling with VS 2010, or when in release mode. Modified: trunk/reactos/cmake/msvc.cmake Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=67941… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Thu May 28 12:19:24 2015 @@ -64,20 +64,21 @@ # - C4129: unrecognized escape sequence # - TODO: C4133: incompatible types # - C4163: 'identifier': not available as an intrinsic function -# - C4189: local variable initialized but not referenced # - C4229: modifiers on data are ignored # - C4700: uninitialized variable usage # - C4603: macro is not defined or definition is different after precompiled header use # - C4716: function must return a value -add_compile_flags("/we4013 /we4020 /we4022 /we4047 /we4098 /we4113 /we4129 /we4163 /we4189 /we4229 /we4700 /we4603 /we4716") +add_compile_flags("/we4013 /we4020 /we4022 /we4047 /we4098 /we4113 /we4129 /we4163 /we4229 /we4700 /we4603 /we4716") + +# - C4189: local variable initialized but not referenced +# Not in Release mode and not with MSVC 2010 +if((NOT CMAKE_BUILD_TYPE STREQUAL "Release") AND (NOT MSVC_VERSION LESS 1700)) + add_compile_flags("/we4189") +endif() # Enable warnings above the default level, but don't treat them as errors: # - C4115: named type definition in parentheses add_compile_flags("/w14115") - -if(CMAKE_BUILD_TYPE STREQUAL "Release") - add_compile_flags("/w14189") -endif() # Debugging #if(${CMAKE_BUILD_TYPE} STREQUAL "Debug")

1 0

[akhaldi] 67940: [TCPIP] Identify TCP/IP driver as version 4. By Lee Schroeder. CORE-9744
by akhaldi＠svn.reactos.org 28 May '15

28 May '15

Author: akhaldi Date: Thu May 28 10:31:38 2015 New Revision: 67940 URL: http://svn.reactos.org/svn/reactos?rev=67940&view=rev Log: [TCPIP] Identify TCP/IP driver as version 4. By Lee Schroeder. CORE-9744 Modified: trunk/reactos/drivers/network/tcpip/tcpip.rc trunk/reactos/media/inf/nettcpip.inf Modified: trunk/reactos/drivers/network/tcpip/tcpip.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip.rc [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip.rc [iso-8859-1] Thu May 28 10:31:38 2015 @@ -1,5 +1,5 @@ #define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "TCP/IP protocol driver" +#define REACTOS_STR_FILE_DESCRIPTION "TCP/IPv4 protocol driver" #define REACTOS_STR_INTERNAL_NAME "tcpip" #define REACTOS_STR_ORIGINAL_FILENAME "tcpip.sys" #include <reactos/version.rc> Modified: trunk/reactos/media/inf/nettcpip.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/nettcpip.inf?rev… ============================================================================== --- trunk/reactos/media/inf/nettcpip.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/nettcpip.inf [iso-8859-1] Thu May 28 10:31:38 2015 @@ -1,6 +1,6 @@ ; NETTCPIP.INF -; Installation file for TCP/IP protocol +; Installation file for TCP/IP Version 4 Protocol [Version] Signature = "$Windows NT$" @@ -11,24 +11,24 @@ Provider = %ReactOS% DriverVer = 04/12/2006,1.00 -;----------------------------- TCP/IP DRIVER ---------------------------- +;----------------------------- TCP/IPv4 DRIVER ---------------------------- [MS_TCPIP.PrimaryInstall] AddReg = TCPIP_AddReg_Global.NT [TCPIP_AddReg_Global.NT] ; The following entries should be generated from .inf files during installation -; TCPIP Protocol +; TCPIPv4 Protocol HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E975-E325-11CE-BFC1-08002BE10318}\{RandomProtocolGUID_TCPIP}","Characteristics",0x00010001,0x00000080 HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E975-E325-11CE-BFC1-08002BE10318}\{RandomProtocolGUID_TCPIP}","ComponentId",0x00000000,"ms_tcpip" -HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E975-E325-11CE-BFC1-08002BE10318}\{RandomProtocolGUID_TCPIP}","Description",0x00000000,"Internet Protocol (TCP/IP)" +HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E975-E325-11CE-BFC1-08002BE10318}\{RandomProtocolGUID_TCPIP}","Description",0x00000000,"Internet Protocol Version 4 (TCP/IPv4)" HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E975-E325-11CE-BFC1-08002BE10318}\{RandomProtocolGUID_TCPIP}","InfPath",0x00000000,"BUGBUG_Create from Inffile.inf" HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E975-E325-11CE-BFC1-08002BE10318}\{RandomProtocolGUID_TCPIP}","InfSection",0x00000000,"BUGBUG_Create from Inffile.inf" HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E975-E325-11CE-BFC1-08002BE10318}\{RandomProtocolGUID_TCPIP}\Ndi","ClsId",0x00000000,"{A907657F-6FDF-11D0-8EFB-00C04FD912B2}" HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E975-E325-11CE-BFC1-08002BE10318}\{RandomProtocolGUID_TCPIP}\Ndi","HelpText",0x00000000,"Transmission Control Protocol/Internet Protocol" HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E975-E325-11CE-BFC1-08002BE10318}\{RandomProtocolGUID_TCPIP}\Ndi","Service",0x00000000,"Tcpip" -; TCP/IP driver +; TCP/IPv4 driver ; NOTE: These settings should be added by the network setup ; These bindings are of the windows 2000 type, and will probably need to be ; twiddled to get 3rd-party network-related software to work.

1 0

[akhaldi] 67939: [PSDK] Update access.idl.
by akhaldi＠svn.reactos.org 28 May '15

28 May '15

Author: akhaldi Date: Thu May 28 10:26:15 2015 New Revision: 67939 URL: http://svn.reactos.org/svn/reactos?rev=67939&view=rev Log: [PSDK] Update access.idl. Modified: trunk/reactos/include/psdk/access.idl Modified: trunk/reactos/include/psdk/access.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/access.idl?re… ============================================================================== --- trunk/reactos/include/psdk/access.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/access.idl [iso-8859-1] Thu May 28 10:26:15 2015 @@ -34,7 +34,7 @@ [call_as(AddRefAccessor)] HRESULT RemoteAddRefAccessor([in] HACCESSOR hAccessor, - [in, out, unique] DBREFCOUNT *pcRefCount, + [in, out, unique, annotation("__out_opt")] DBREFCOUNT *pcRefCount, [out] IErrorInfo **ppErrorInfoRem); [local] @@ -48,10 +48,10 @@ [call_as(CreateAccessor)] HRESULT RemoteCreateAccessor([in] DBACCESSORFLAGS dwAccessorFlags, [in] DBCOUNTITEM cBindings, - [in, unique, size_is(cBindings)] DBBINDING *rgBindings, + [in, unique, size_is((ULONG)cBindings)] DBBINDING *rgBindings, [in] DBLENGTH cbRowSize, [out] HACCESSOR *phAccessor, - [in, out, unique, size_is(cBindings)] DBBINDSTATUS *rgStatus, + [in, out, unique, size_is((ULONG)cBindings)] DBBINDSTATUS *rgStatus, [out] IErrorInfo **ppErrorInfoRem); [local] @@ -64,7 +64,7 @@ HRESULT RemoteGetBindings([in] HACCESSOR hAccessor, [out] DBACCESSORFLAGS *pdwAccessorFlags, [in, out] DBCOUNTITEM *pcBindings, - [out, size_is(,*pcBindings)] DBBINDING **prgBindings, + [out, size_is(,(ULONG)*pcBindings)] DBBINDING **prgBindings, [out] IErrorInfo **ppErrorInfoRem); [local]

1 0

[aandrejevic] 67938: [NTVDM] Implement VGA panning.
by aandrejevic＠svn.reactos.org 27 May '15

27 May '15

Author: aandrejevic Date: Wed May 27 23:31:49 2015 New Revision: 67938 URL: http://svn.reactos.org/svn/reactos?rev=67938&view=rev Log: [NTVDM] Implement VGA panning. Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/vga.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/vga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/vga.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/vga.c [iso-8859-1] Wed May 27 23:31:49 2015 @@ -1059,9 +1059,11 @@ { SHORT i, j, k; DWORD AddressSize = VgaGetAddressSize(); + DWORD ScanlineSize = (DWORD)VgaCrtcRegisters[VGA_CRTC_OFFSET_REG] * 2; + BYTE PresetRowScan = VgaCrtcRegisters[VGA_CRTC_PRESET_ROW_SCAN_REG] & 0x1F; DWORD Address = MAKEWORD(VgaCrtcRegisters[VGA_CRTC_START_ADDR_LOW_REG], - VgaCrtcRegisters[VGA_CRTC_START_ADDR_HIGH_REG]); - DWORD ScanlineSize = (DWORD)VgaCrtcRegisters[VGA_CRTC_OFFSET_REG] * 2; + VgaCrtcRegisters[VGA_CRTC_START_ADDR_HIGH_REG]) + + ((VgaCrtcRegisters[VGA_CRTC_PRESET_ROW_SCAN_REG] >> 5) & 3); /* * If console framebuffer is NULL, that means something went wrong @@ -1075,6 +1077,7 @@ /* Graphics mode */ PBYTE GraphicsBuffer = (PBYTE)ConsoleFramebuffer; DWORD InterlaceHighBit = VGA_INTERLACE_HIGH_BIT; + SHORT X, Y; /* * Synchronize access to the graphics framebuffer @@ -1096,6 +1099,10 @@ /* Odd-numbered line in interlaced mode - set the high bit */ Address |= InterlaceHighBit; } + + /* Apply the preset row scan */ + Y = i - PresetRowScan; + if (Y < 0) Y += CurrResolution.Y; /* Loop through the pixels */ for (j = 0; j < CurrResolution.X; j++) @@ -1216,58 +1223,71 @@ : 0); } + /* Apply horizontal pixel panning */ + if (VgaAcRegisters[VGA_AC_CONTROL_REG] & VGA_AC_CONTROL_8BIT) + { + X = j - ((VgaAcRegisters[VGA_AC_HORZ_PANNING_REG] & 0x0F) >> 1); + } + else + { + X = j - (VgaAcRegisters[VGA_AC_HORZ_PANNING_REG] & 0x0F); + } + + /* Wrap around */ + if (X < 0) X += CurrResolution.X; + /* Take into account DoubleVision mode when checking for pixel updates */ if (DoubleWidth && DoubleHeight) { /* Now check if the resulting pixel data has changed */ - if (GraphicsBuffer[(i * 2 * CurrResolution.X * 2) + (j * 2)] != PixelData) + if (GraphicsBuffer[(Y * 2 * CurrResolution.X * 2) + (X * 2)] != PixelData) { /* Yes, write the new value */ - GraphicsBuffer[(i * 2 * CurrResolution.X * 2) + (j * 2)] = PixelData; - GraphicsBuffer[(i * 2 * CurrResolution.X * 2) + (j * 2 + 1)] = PixelData; - GraphicsBuffer[((i * 2 + 1) * CurrResolution.X * 2) + (j * 2)] = PixelData; - GraphicsBuffer[((i * 2 + 1) * CurrResolution.X * 2) + (j * 2 + 1)] = PixelData; + GraphicsBuffer[(Y * 2 * CurrResolution.X * 2) + (X * 2)] = PixelData; + GraphicsBuffer[(Y * 2 * CurrResolution.X * 2) + (X * 2 + 1)] = PixelData; + GraphicsBuffer[((Y * 2 + 1) * CurrResolution.X * 2) + (X * 2)] = PixelData; + GraphicsBuffer[((Y * 2 + 1) * CurrResolution.X * 2) + (X * 2 + 1)] = PixelData; /* Mark the specified pixel as changed */ - VgaMarkForUpdate(i, j); + VgaMarkForUpdate(Y, X); } } else if (DoubleWidth && !DoubleHeight) { /* Now check if the resulting pixel data has changed */ - if (GraphicsBuffer[(i * CurrResolution.X * 2) + (j * 2)] != PixelData) + if (GraphicsBuffer[(Y * CurrResolution.X * 2) + (X * 2)] != PixelData) { /* Yes, write the new value */ - GraphicsBuffer[(i * CurrResolution.X * 2) + (j * 2)] = PixelData; - GraphicsBuffer[(i * CurrResolution.X * 2) + (j * 2 + 1)] = PixelData; + GraphicsBuffer[(Y * CurrResolution.X * 2) + (X * 2)] = PixelData; + GraphicsBuffer[(Y * CurrResolution.X * 2) + (X * 2 + 1)] = PixelData; /* Mark the specified pixel as changed */ - VgaMarkForUpdate(i, j); + VgaMarkForUpdate(Y, X); } } else if (!DoubleWidth && DoubleHeight) { /* Now check if the resulting pixel data has changed */ - if (GraphicsBuffer[(i * 2 * CurrResolution.X) + j] != PixelData) + if (GraphicsBuffer[(Y * 2 * CurrResolution.X) + X] != PixelData) { /* Yes, write the new value */ - GraphicsBuffer[(i * 2 * CurrResolution.X) + j] = PixelData; - GraphicsBuffer[((i * 2 + 1) * CurrResolution.X) + j] = PixelData; + GraphicsBuffer[(Y * 2 * CurrResolution.X) + X] = PixelData; + GraphicsBuffer[((Y * 2 + 1) * CurrResolution.X) + X] = PixelData; /* Mark the specified pixel as changed */ - VgaMarkForUpdate(i, j); + VgaMarkForUpdate(Y, X); } } else // if (!DoubleWidth && !DoubleHeight) { /* Now check if the resulting pixel data has changed */ - if (GraphicsBuffer[i * CurrResolution.X + j] != PixelData) + if (GraphicsBuffer[Y * CurrResolution.X + X] != PixelData) { /* Yes, write the new value */ - GraphicsBuffer[i * CurrResolution.X + j] = PixelData; + GraphicsBuffer[Y * CurrResolution.X + X] = PixelData; /* Mark the specified pixel as changed */ - VgaMarkForUpdate(i, j); + VgaMarkForUpdate(Y, X); } } } @@ -1297,6 +1317,12 @@ DWORD CurrentAddr; PCHAR_CELL CharBuffer = (PCHAR_CELL)ConsoleFramebuffer; CHAR_CELL CharInfo; + + /* + * Technically, the horizontal panning and preset row count should + * affect text mode too. However, it works on pixels and not characters, + * so we can't support it currently. + */ /* Loop through the scanlines */ for (i = 0; i < CurrResolution.Y; i++)

1 0

[jimtabor] 67937: [NtUser] - De-reference global cursor. See CORE-8305.
by jimtabor＠svn.reactos.org 27 May '15

27 May '15

Author: jimtabor Date: Wed May 27 22:13:03 2015 New Revision: 67937 URL: http://svn.reactos.org/svn/reactos?rev=67937&view=rev Log: [NtUser] - De-reference global cursor. See CORE-8305. Modified: trunk/reactos/win32ss/user/ntuser/cursoricon.c Modified: trunk/reactos/win32ss/user/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/cursor… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/cursoricon.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/cursoricon.c [iso-8859-1] Wed May 27 22:13:03 2015 @@ -1077,6 +1077,12 @@ if (pcurOld->CURSORF_flags & CURSORF_GLOBAL) { TRACE("Returning Global Cursor hcur %p\n",hOldCursor); + + if (pcurOld->head.cLockObj > 2) // Throttle down to 2. + { + UserDereferenceObject(pcurOld); + } + goto leave; }

1 0

[ekohl] 67936: [PARPORT] - Add FdoQueryBusRelations to enumerate the 'attached' raw port. - Create the PDO for the raw port (\Device\ParallelX) and let the symbolic link (\DosDevices\LPTX) point to...
by ekohl＠svn.reactos.org 27 May '15

27 May '15

Author: ekohl Date: Wed May 27 20:18:10 2015 New Revision: 67936 URL: http://svn.reactos.org/svn/reactos?rev=67936&view=rev Log: [PARPORT] - Add FdoQueryBusRelations to enumerate the 'attached' raw port. - Create the PDO for the raw port (\Device\ParallelX) and let the symbolic link (\DosDevices\LPTX) point to it. - Move the open, close and write code from the FDO to the PDO. Added: trunk/reactos/drivers/parallel/parport/hardware.h (with props) Modified: trunk/reactos/drivers/parallel/parport/fdo.c trunk/reactos/drivers/parallel/parport/misc.c trunk/reactos/drivers/parallel/parport/parport.h trunk/reactos/drivers/parallel/parport/pdo.c Modified: trunk/reactos/drivers/parallel/parport/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/parallel/parport/f… ============================================================================== --- trunk/reactos/drivers/parallel/parport/fdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/parallel/parport/fdo.c [iso-8859-1] Wed May 27 20:18:10 2015 @@ -6,37 +6,6 @@ */ #include "parport.h" - -/* - * The following constants describe the various signals of the printer port - * hardware. Note that the hardware inverts some signals and that some - * signals are active low. An example is LP_STROBE, which must be programmed - * with 1 for being active and 0 for being inactive, because the strobe signal - * gets inverted, but it is also active low. - */ - -/* - * bit defines for 8255 status port - * base + 1 - * accessed with LP_S(minor), which gets the byte... - */ -#define LP_PBUSY 0x80 /* inverted input, active high */ -#define LP_PACK 0x40 /* unchanged input, active low */ -#define LP_POUTPA 0x20 /* unchanged input, active high */ -#define LP_PSELECD 0x10 /* unchanged input, active high */ -#define LP_PERRORP 0x08 /* unchanged input, active low */ - -/* - * defines for 8255 control port - * base + 2 - * accessed with LP_C(minor) - */ -#define LP_PINTEN 0x10 -#define LP_PSELECP 0x08 /* inverted output, active low */ -#define LP_PINITP 0x04 /* unchanged output, active low */ -#define LP_PAUTOLF 0x02 /* inverted output, active low */ -#define LP_PSTROBE 0x01 /* inverted output, active low */ - /* FUNCTIONS ****************************************************************/ @@ -86,11 +55,7 @@ DeviceExtension->Common.IsFDO = TRUE; DeviceExtension->Common.PnpState = dsStopped; - DeviceExtension->ParallelPortNumber = IoGetConfigurationInformation()->ParallelCount++; - if (pLptPortNumber == NULL) - DeviceExtension->LptPort = DeviceExtension->ParallelPortNumber + 1; - else - DeviceExtension->LptPort = *pLptPortNumber; + DeviceExtension->PortNumber = IoGetConfigurationInformation()->ParallelCount++; DeviceExtension->Pdo = Pdo; Status = IoAttachDeviceToDeviceStackSafe(Fdo, @@ -141,127 +106,185 @@ IN PCM_RESOURCE_LIST ResourceListTranslated) { PFDO_DEVICE_EXTENSION DeviceExtension; + ULONG i; +// ULONG Vector = 0; +// KIRQL Dirql = 0; +// KAFFINITY Affinity = 0; +// KINTERRUPT_MODE InterruptMode = Latched; +// BOOLEAN ShareInterrupt = TRUE; + + DPRINT("FdoStartDevice ()\n"); + + DeviceExtension = (PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + ASSERT(DeviceExtension); + ASSERT(DeviceExtension->Common.IsFDO == TRUE); + + if (!ResourceList) + { + DPRINT1("No allocated resources sent to driver\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + if (ResourceList->Count != 1) + { + DPRINT1("Wrong number of allocated resources sent to driver\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + if ((ResourceList->List[0].PartialResourceList.Version != 1) || + (ResourceList->List[0].PartialResourceList.Revision != 1) || + (ResourceListTranslated->List[0].PartialResourceList.Version != 1) || + (ResourceListTranslated->List[0].PartialResourceList.Revision != 1)) + { + DPRINT1("Revision mismatch: %u.%u != 1.1 or %u.%u != 1.1\n", + ResourceList->List[0].PartialResourceList.Version, + ResourceList->List[0].PartialResourceList.Revision, + ResourceListTranslated->List[0].PartialResourceList.Version, + ResourceListTranslated->List[0].PartialResourceList.Revision); + return STATUS_REVISION_MISMATCH; + } + + DeviceExtension->BaseAddress = 0; + + for (i = 0; i < ResourceList->List[0].PartialResourceList.Count; i++) + { + PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptor = &ResourceList->List[0].PartialResourceList.PartialDescriptors[i]; + PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptorTranslated = &ResourceListTranslated->List[0].PartialResourceList.PartialDescriptors[i]; + + switch (PartialDescriptor->Type) + { + case CmResourceTypePort: + DPRINT("Port: BaseAddress 0x%lx Length %lu\n", + PartialDescriptor->u.Port.Start.u.LowPart, + PartialDescriptor->u.Port.Length); + + if (DeviceExtension->BaseAddress == 0) + { + if (PartialDescriptor->u.Port.Length < 8) + return STATUS_INSUFFICIENT_RESOURCES; + + DeviceExtension->BaseAddress = PartialDescriptor->u.Port.Start.u.LowPart; + } + break; + + case CmResourceTypeInterrupt: + DPRINT("Interrupt: Level %lu Vector %lu\n", + PartialDescriptorTranslated->u.Interrupt.Level, + PartialDescriptorTranslated->u.Interrupt.Vector); + +// Dirql = (KIRQL)PartialDescriptorTranslated->u.Interrupt.Level; +// Vector = PartialDescriptorTranslated->u.Interrupt.Vector; +// Affinity = PartialDescriptorTranslated->u.Interrupt.Affinity; + +// if (PartialDescriptorTranslated->Flags & CM_RESOURCE_INTERRUPT_LATCHED) +// InterruptMode = Latched; +// else +// InterruptMode = LevelSensitive; + +// ShareInterrupt = (PartialDescriptorTranslated->ShareDisposition == CmResourceShareShared); + break; + + default: + DPRINT1("Other ressource: \n"); + break; + } + } + + DPRINT("New LPT port: Base 0x%lx\n", + DeviceExtension->BaseAddress); + + if (!DeviceExtension->BaseAddress) + return STATUS_INSUFFICIENT_RESOURCES; + +#if 0 + if (!Dirql) + return STATUS_INSUFFICIENT_RESOURCES; +#endif + + DeviceExtension->Common.PnpState = dsStarted; + + + /* We don't really care if the call succeeded or not... */ + + return STATUS_SUCCESS; +} + + +static +NTSTATUS +FdoCreateRawParallelPdo( + IN PDEVICE_OBJECT DeviceObject) +{ + PFDO_DEVICE_EXTENSION FdoDeviceExtension; + PPDO_DEVICE_EXTENSION PdoDeviceExtension = NULL; + PDEVICE_OBJECT Pdo = NULL; WCHAR DeviceNameBuffer[32]; WCHAR LinkNameBuffer[32]; WCHAR LptPortBuffer[32]; UNICODE_STRING DeviceName; UNICODE_STRING LinkName; UNICODE_STRING LptPort; - ULONG i; -// ULONG Vector = 0; -// KIRQL Dirql = 0; -// KAFFINITY Affinity = 0; -// KINTERRUPT_MODE InterruptMode = Latched; -// BOOLEAN ShareInterrupt = TRUE; OBJECT_ATTRIBUTES ObjectAttributes; UNICODE_STRING KeyName; HANDLE KeyHandle; NTSTATUS Status; - DPRINT("FdoStartDevice ()\n"); - - DeviceExtension = (PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - - ASSERT(DeviceExtension); - ASSERT(DeviceExtension->Common.IsFDO == TRUE); - - if (!ResourceList) - { - DPRINT1("No allocated resources sent to driver\n"); - return STATUS_INSUFFICIENT_RESOURCES; - } - - if (ResourceList->Count != 1) - { - DPRINT1("Wrong number of allocated resources sent to driver\n"); - return STATUS_INSUFFICIENT_RESOURCES; - } - - if ((ResourceList->List[0].PartialResourceList.Version != 1) || - (ResourceList->List[0].PartialResourceList.Revision != 1) || - (ResourceListTranslated->List[0].PartialResourceList.Version != 1) || - (ResourceListTranslated->List[0].PartialResourceList.Revision != 1)) - { - DPRINT1("Revision mismatch: %u.%u != 1.1 or %u.%u != 1.1\n", - ResourceList->List[0].PartialResourceList.Version, - ResourceList->List[0].PartialResourceList.Revision, - ResourceListTranslated->List[0].PartialResourceList.Version, - ResourceListTranslated->List[0].PartialResourceList.Revision); - return STATUS_REVISION_MISMATCH; - } - - DeviceExtension->BaseAddress = 0; - - for (i = 0; i < ResourceList->List[0].PartialResourceList.Count; i++) - { - PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptor = &ResourceList->List[0].PartialResourceList.PartialDescriptors[i]; - PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptorTranslated = &ResourceListTranslated->List[0].PartialResourceList.PartialDescriptors[i]; - - switch (PartialDescriptor->Type) - { - case CmResourceTypePort: - DPRINT("Port: BaseAddress 0x%lx Length %lu\n", - PartialDescriptor->u.Port.Start.u.LowPart, - PartialDescriptor->u.Port.Length); - - if (DeviceExtension->BaseAddress == 0) - { - if (PartialDescriptor->u.Port.Length < 8) - return STATUS_INSUFFICIENT_RESOURCES; - - DeviceExtension->BaseAddress = PartialDescriptor->u.Port.Start.u.LowPart; - } - break; - - case CmResourceTypeInterrupt: - DPRINT("Interrupt: Level %lu Vector %lu\n", - PartialDescriptorTranslated->u.Interrupt.Level, - PartialDescriptorTranslated->u.Interrupt.Vector); - -// Dirql = (KIRQL)PartialDescriptorTranslated->u.Interrupt.Level; -// Vector = PartialDescriptorTranslated->u.Interrupt.Vector; -// Affinity = PartialDescriptorTranslated->u.Interrupt.Affinity; - -// if (PartialDescriptorTranslated->Flags & CM_RESOURCE_INTERRUPT_LATCHED) -// InterruptMode = Latched; -// else -// InterruptMode = LevelSensitive; - -// ShareInterrupt = (PartialDescriptorTranslated->ShareDisposition == CmResourceShareShared); - break; - - default: - DPRINT1("Other ressource: \n"); - break; - } - } - - DPRINT("New LPT port: Base 0x%lx\n", - DeviceExtension->BaseAddress); - - if (!DeviceExtension->BaseAddress) - return STATUS_INSUFFICIENT_RESOURCES; - -#if 0 - if (!Dirql) - return STATUS_INSUFFICIENT_RESOURCES; -#endif - - /* Create link \DosDevices\LPTX -> \Device\ParallelPortX */ - swprintf(DeviceNameBuffer, L"\\Device\\ParallelPort%lu", DeviceExtension->ParallelPortNumber); - swprintf(LinkNameBuffer, L"\\DosDevices\\LPT%lu", DeviceExtension->LptPort); - swprintf(LptPortBuffer, L"LPT%lu", DeviceExtension->LptPort); - RtlInitUnicodeString(&DeviceName, DeviceNameBuffer); + DPRINT("FdoCreateRawParallelPdo()\n"); + + FdoDeviceExtension = (PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + /* Create new device object */ + swprintf(DeviceNameBuffer, + L"\\Device\\Parallel%lu", + FdoDeviceExtension->PortNumber); + RtlInitUnicodeString(&DeviceName, + DeviceNameBuffer); + + Status = IoCreateDevice(DeviceObject->DriverObject, + sizeof(PDO_DEVICE_EXTENSION), + &DeviceName, + FILE_DEVICE_CONTROLLER, + 0, + FALSE, + &Pdo); + if (!NT_SUCCESS(Status)) + { + DPRINT1("IoCreateDevice() failed with status 0x%08x\n", Status); + goto done; + } + + Pdo->Flags |= DO_BUS_ENUMERATED_DEVICE; + Pdo->Flags |= DO_POWER_PAGABLE; + + PdoDeviceExtension = (PPDO_DEVICE_EXTENSION)Pdo->DeviceExtension; + RtlZeroMemory(PdoDeviceExtension, sizeof(PDO_DEVICE_EXTENSION)); + + PdoDeviceExtension->Common.IsFDO = FALSE; + PdoDeviceExtension->Common.PnpState = dsStopped; + + Pdo->StackSize = DeviceObject->StackSize + 1; + + FdoDeviceExtension->AttachedRawPdo = Pdo; + PdoDeviceExtension->AttachedFdo = DeviceObject; + + PdoDeviceExtension->PortNumber = FdoDeviceExtension->PortNumber; + PdoDeviceExtension->LptPort = PdoDeviceExtension->PortNumber + 1; + + + /* Create link \DosDevices\LPTX -> \Device\ParallelY */ + swprintf(LinkNameBuffer, L"\\DosDevices\\LPT%lu", PdoDeviceExtension->LptPort); RtlInitUnicodeString(&LinkName, LinkNameBuffer); - RtlInitUnicodeString(&LptPort, LptPortBuffer); Status = IoCreateSymbolicLink(&LinkName, &DeviceName); if (!NT_SUCCESS(Status)) { DPRINT1("IoCreateSymbolicLink() failed with status 0x%08x\n", Status); - return Status; - } - + goto done; + } + + swprintf(LptPortBuffer, L"LPT%lu", PdoDeviceExtension->LptPort); + RtlInitUnicodeString(&LptPort, LptPortBuffer); /* Write an entry value under HKLM\HARDWARE\DeviceMap\PARALLEL PORTS. */ /* This step is not mandatory, so do not exit in case of error. */ @@ -292,10 +315,66 @@ ZwClose(KeyHandle); } - DeviceExtension->Common.PnpState = dsStarted; - - - /* We don't really care if the call succeeded or not... */ + Pdo->Flags |= DO_BUFFERED_IO; + Pdo->Flags &= ~DO_DEVICE_INITIALIZING; + +done: + if (!NT_SUCCESS(Status)) + { + if (Pdo) + { + ASSERT(PdoDeviceExtension); + IoDeleteDevice(Pdo); + } + } + + return Status; +} + + +static +NTSTATUS +FdoQueryBusRelations( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + PIO_STACK_LOCATION IrpSp) +{ + PFDO_DEVICE_EXTENSION DeviceExtension; + PDEVICE_RELATIONS DeviceRelations; + ULONG Size; + ULONG i; + ULONG PdoCount = 0; + NTSTATUS Status; + + UNREFERENCED_PARAMETER(IrpSp); + + DPRINT("FdoQueryBusRelations()\n"); + + DeviceExtension = (PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + ASSERT(DeviceExtension->Common.IsFDO); + + /* TODO: Enumerate parallel devices and create their PDOs */ + + Status = FdoCreateRawParallelPdo(DeviceObject); + if (!NT_SUCCESS(Status)) + return Status; + + PdoCount++; + + /* Allocate a buffer for the device relations */ + Size = sizeof(DEVICE_RELATIONS) + sizeof(PDEVICE_OBJECT) * (PdoCount - 1); + DeviceRelations = ExAllocatePoolWithTag(PagedPool, Size, PARPORT_TAG); + if (DeviceRelations == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + /* Fill the buffer */ + i = 0; + ObReferenceObject(DeviceExtension->AttachedRawPdo); + DeviceRelations->Objects[i] = DeviceExtension->AttachedRawPdo; + + Irp->IoStatus.Information = (ULONG_PTR)DeviceRelations; + + DPRINT("Done\n"); return STATUS_SUCCESS; } @@ -345,7 +424,7 @@ goto done; } - DPRINT("Open LPT%lu: successful\n", DeviceExtension->LptPort); + DPRINT("Open parallel port %lu: successful\n", DeviceExtension->PortNumber); DeviceExtension->OpenCount++; done: @@ -397,68 +476,11 @@ FdoWrite(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - PFDO_DEVICE_EXTENSION DeviceExtension; - PIO_STACK_LOCATION IoStack; - PUCHAR Buffer; - ULONG i; - UCHAR PortStatus; - ULONG ulCount; - DPRINT("FdoWrite()\n"); - - DeviceExtension = (PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - IoStack = IoGetCurrentIrpStackLocation(Irp); - - Buffer = GetUserBuffer(Irp); - DPRINT("Length: %lu\n", IoStack->Parameters.Write.Length); - DPRINT("Buffer: %p\n", Buffer); - - if (Buffer != NULL) - { - DPRINT("%s\n", Buffer); - } - - for (i = 0; i < IoStack->Parameters.Write.Length; i++) - { - DPRINT("%lu: %c\n", i, Buffer[i]); - - ulCount = 0; - - do - { - KeStallExecutionProcessor(10); - PortStatus = READ_PORT_UCHAR((PUCHAR)(DeviceExtension->BaseAddress + 1)); - ulCount++; - } - while (ulCount < 500000 && !(PortStatus & LP_PBUSY)); - - if (ulCount == 500000) - { - DPRINT1("Timed out\n"); - - Irp->IoStatus.Information = 0; - Irp->IoStatus.Status = STATUS_TIMEOUT; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - - return STATUS_TIMEOUT; - } - - /* Write character */ - WRITE_PORT_UCHAR((PUCHAR)DeviceExtension->BaseAddress, Buffer[i]); - - KeStallExecutionProcessor(10); - - WRITE_PORT_UCHAR((PUCHAR)(DeviceExtension->BaseAddress + 2), (LP_PSELECP | LP_PINITP | LP_PSTROBE)); - - KeStallExecutionProcessor(10); - - WRITE_PORT_UCHAR((PUCHAR)(DeviceExtension->BaseAddress + 2), (LP_PSELECP | LP_PINITP)); - } Irp->IoStatus.Information = 0; Irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_SUCCESS; } @@ -524,26 +546,29 @@ switch (Stack->Parameters.QueryDeviceRelations.Type) { case BusRelations: - DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / BusRelations\n"); + DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / BusRelations\n"); + Status = FdoQueryBusRelations(DeviceObject, Irp, Stack); + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; + + case RemovalRelations: + DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / RemovalRelations\n"); return ForwardIrpAndForget(DeviceObject, Irp); - case RemovalRelations: - DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / RemovalRelations\n"); - return ForwardIrpAndForget(DeviceObject, Irp); - default: - DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / Unknown type 0x%lx\n", + DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / Unknown type 0x%lx\n", Stack->Parameters.QueryDeviceRelations.Type); return ForwardIrpAndForget(DeviceObject, Irp); } break; case IRP_MN_FILTER_RESOURCE_REQUIREMENTS: /* (optional) 0xd */ - DPRINT1("IRP_MJ_PNP / IRP_MN_FILTER_RESOURCE_REQUIREMENTS\n"); + DPRINT("IRP_MJ_PNP / IRP_MN_FILTER_RESOURCE_REQUIREMENTS\n"); return ForwardIrpAndForget(DeviceObject, Irp); default: - DPRINT1("Unknown minor function 0x%x\n", MinorFunction); + DPRINT("Unknown minor function 0x%x\n", MinorFunction); return ForwardIrpAndForget(DeviceObject, Irp); } Added: trunk/reactos/drivers/parallel/parport/hardware.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/parallel/parport/h… ============================================================================== --- trunk/reactos/drivers/parallel/parport/hardware.h (added) +++ trunk/reactos/drivers/parallel/parport/hardware.h [iso-8859-1] Wed May 27 20:18:10 2015 @@ -0,0 +1,41 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: Parallel Port Function Driver + * FILE: drivers/parallel/parport/hardware.h + * PURPOSE: Hardware definitions + */ + +#ifndef _HARDWARE_H_ +#define _HARDWARE_H_ + +/* + * The following constants describe the various signals of the printer port + * hardware. Note that the hardware inverts some signals and that some + * signals are active low. An example is LP_STROBE, which must be programmed + * with 1 for being active and 0 for being inactive, because the strobe signal + * gets inverted, but it is also active low. + */ + +/* + * bit defines for 8255 status port + * base + 1 + * accessed with LP_S(minor), which gets the byte... + */ +#define LP_PBUSY 0x80 /* inverted input, active high */ +#define LP_PACK 0x40 /* unchanged input, active low */ +#define LP_POUTPA 0x20 /* unchanged input, active high */ +#define LP_PSELECD 0x10 /* unchanged input, active high */ +#define LP_PERRORP 0x08 /* unchanged input, active low */ + +/* + * defines for 8255 control port + * base + 2 + * accessed with LP_C(minor) + */ +#define LP_PINTEN 0x10 +#define LP_PSELECP 0x08 /* inverted output, active low */ +#define LP_PINITP 0x04 /* unchanged output, active low */ +#define LP_PAUTOLF 0x02 /* inverted output, active low */ +#define LP_PSTROBE 0x01 /* inverted output, active low */ + +#endif /* _HARDWARE_H_ */ Propchange: trunk/reactos/drivers/parallel/parport/hardware.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/parallel/parport/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/parallel/parport/m… ============================================================================== --- trunk/reactos/drivers/parallel/parport/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/parallel/parport/misc.c [iso-8859-1] Wed May 27 20:18:10 2015 @@ -61,7 +61,10 @@ { PDEVICE_OBJECT LowerDevice; - LowerDevice = ((PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->LowerDevice; + if (((PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->Common.IsFDO) + LowerDevice = ((PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->LowerDevice; + else + LowerDevice = ((PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->AttachedFdo; ASSERT(LowerDevice); IoSkipCurrentIrpStackLocation(Irp); Modified: trunk/reactos/drivers/parallel/parport/parport.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/parallel/parport/p… ============================================================================== --- trunk/reactos/drivers/parallel/parport/parport.h [iso-8859-1] (original) +++ trunk/reactos/drivers/parallel/parport/parport.h [iso-8859-1] Wed May 27 20:18:10 2015 @@ -1,6 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: Parallel Port Function Driver + * FILE: drivers/parallel/parport/parport.h * PURPOSE: Parport driver header */ @@ -11,6 +12,8 @@ #include <ndk/haltypes.h> #include <ntddpar.h> #include <stdio.h> + +#include "hardware.h" //#define NDEBUG #include <debug.h> @@ -37,9 +40,11 @@ PDEVICE_OBJECT Pdo; PDEVICE_OBJECT LowerDevice; - ULONG ParallelPortNumber; + PDEVICE_OBJECT AttachedRawPdo; + PDEVICE_OBJECT AttachedPdo[2]; - ULONG LptPort; + ULONG PortNumber; + ULONG OpenCount; ULONG BaseAddress; @@ -51,8 +56,16 @@ { COMMON_DEVICE_EXTENSION Common; + PDEVICE_OBJECT AttachedFdo; + + ULONG PortNumber; + ULONG LptPort; + + ULONG OpenCount; + } PDO_DEVICE_EXTENSION, *PPDO_DEVICE_EXTENSION; +#define PARPORT_TAG 'trpP' /* fdo.c */ Modified: trunk/reactos/drivers/parallel/parport/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/parallel/parport/p… ============================================================================== --- trunk/reactos/drivers/parallel/parport/pdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/parallel/parport/pdo.c [iso-8859-1] Wed May 27 20:18:10 2015 @@ -14,12 +14,31 @@ PdoCreate(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { + PPDO_DEVICE_EXTENSION DeviceExtension; + PIO_STACK_LOCATION Stack; + NTSTATUS Status = STATUS_SUCCESS; + DPRINT("PdoCreate()\n"); + Stack = IoGetCurrentIrpStackLocation(Irp); + DeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + if (Stack->Parameters.Create.Options & FILE_DIRECTORY_FILE) + { + DPRINT1("Not a directory\n"); + Status = STATUS_NOT_A_DIRECTORY; + goto done; + } + + DPRINT("Open LPT%lu: successful\n", DeviceExtension->LptPort); + DeviceExtension->OpenCount++; + +done: + Irp->IoStatus.Status = Status; Irp->IoStatus.Information = 0; - Irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_SUCCESS; + + return Status; } @@ -28,11 +47,17 @@ PdoClose(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { + PPDO_DEVICE_EXTENSION pDeviceExtension; + DPRINT("PdoClose()\n"); + + pDeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + pDeviceExtension->OpenCount--; Irp->IoStatus.Information = 0; Irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; } @@ -56,7 +81,66 @@ PdoWrite(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { + PPDO_DEVICE_EXTENSION PdoDeviceExtension; + PFDO_DEVICE_EXTENSION FdoDeviceExtension; + PIO_STACK_LOCATION IoStack; + PUCHAR Buffer; + ULONG i; + UCHAR PortStatus; + ULONG ulCount; + DPRINT("PdoWrite()\n"); + + PdoDeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + FdoDeviceExtension = (PFDO_DEVICE_EXTENSION)PdoDeviceExtension->AttachedFdo->DeviceExtension; + + IoStack = IoGetCurrentIrpStackLocation(Irp); + + Buffer = GetUserBuffer(Irp); + DPRINT("Length: %lu\n", IoStack->Parameters.Write.Length); + DPRINT("Buffer: %p\n", Buffer); + + if (Buffer != NULL) + { + DPRINT("%s\n", Buffer); + } + + for (i = 0; i < IoStack->Parameters.Write.Length; i++) + { + DPRINT("%lu: %c\n", i, Buffer[i]); + + ulCount = 0; + + do + { + KeStallExecutionProcessor(10); + PortStatus = READ_PORT_UCHAR((PUCHAR)(FdoDeviceExtension->BaseAddress + 1)); + ulCount++; + } + while (ulCount < 500000 && !(PortStatus & LP_PBUSY)); + + if (ulCount == 500000) + { + DPRINT("Timed out\n"); + + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = STATUS_TIMEOUT; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return STATUS_TIMEOUT; + } + + /* Write character */ + WRITE_PORT_UCHAR((PUCHAR)FdoDeviceExtension->BaseAddress, Buffer[i]); + + KeStallExecutionProcessor(10); + + WRITE_PORT_UCHAR((PUCHAR)(FdoDeviceExtension->BaseAddress + 2), (LP_PSELECP | LP_PINITP | LP_PSTROBE)); + + KeStallExecutionProcessor(10); + + WRITE_PORT_UCHAR((PUCHAR)(FdoDeviceExtension->BaseAddress + 2), (LP_PSELECP | LP_PINITP)); + } Irp->IoStatus.Information = 0; Irp->IoStatus.Status = STATUS_SUCCESS;

1 0

[akhaldi] 67935: [PSDK] Apply Wine commit ea41f29 by Vincent Povirk: Fix off-by-one error in EmfPlusRecordType enumeration.
by akhaldi＠svn.reactos.org 27 May '15

27 May '15

Author: akhaldi Date: Wed May 27 19:58:39 2015 New Revision: 67935 URL: http://svn.reactos.org/svn/reactos?rev=67935&view=rev Log: [PSDK] Apply Wine commit ea41f29 by Vincent Povirk: Fix off-by-one error in EmfPlusRecordType enumeration. Modified: trunk/reactos/include/psdk/gdiplusenums.h Modified: trunk/reactos/include/psdk/gdiplusenums.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/gdiplusenums.… ============================================================================== --- trunk/reactos/include/psdk/gdiplusenums.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/gdiplusenums.h [iso-8859-1] Wed May 27 19:58:39 2015 @@ -672,7 +672,6 @@ EmfPlusRecordTypeSetAntiAliasMode, EmfPlusRecordTypeSetTextRenderingHint, EmfPlusRecordTypeSetTextContrast, - EmfPlusRecordTypeSetGammaValue, EmfPlusRecordTypeSetInterpolationMode, EmfPlusRecordTypeSetPixelOffsetMode, EmfPlusRecordTypeSetCompositingMode,

1 0

[aandrejevic] 67934: [NTVDM] Now that the Fast486 FPU is feature-complete, tell programs that we have a builtin FPU. (This commit may cause regressions if there are bugs in the FPU)
by aandrejevic＠svn.reactos.org 27 May '15

27 May '15

Author: aandrejevic Date: Wed May 27 01:07:05 2015 New Revision: 67934 URL: http://svn.reactos.org/svn/reactos?rev=67934&view=rev Log: [NTVDM] Now that the Fast486 FPU is feature-complete, tell programs that we have a builtin FPU. (This commit may cause regressions if there are bugs in the FPU) Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios.h Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios.h [iso-8859-1] Wed May 27 01:07:05 2015 @@ -33,7 +33,7 @@ // by all applications (e.g. QBasic runtime would use the native FPU if the bit // is set, but then subsequently fails, unless the FPU bit is unset in that case // QBasic uses its emulated FPU). -#define BIOS_EQUIPMENT_LIST 0x2C // Bit1: FPU, Bit 2: Mouse +#define BIOS_EQUIPMENT_LIST 0x2E // Bit1: FPU, Bit 2: Mouse #pragma pack(push, 1)

1 0

[aandrejevic] 67933: [FAST486] Implement FPATAN. Fix the sign of the FPTAN result. Spotted by fox_anthony.
by aandrejevic＠svn.reactos.org 27 May '15

27 May '15

Author: aandrejevic Date: Wed May 27 01:00:20 2015 New Revision: 67933 URL: http://svn.reactos.org/svn/reactos?rev=67933&view=rev Log: [FAST486] Implement FPATAN. Fix the sign of the FPTAN result. Spotted by fox_anthony. Modified: trunk/reactos/lib/fast486/fpu.c Modified: trunk/reactos/lib/fast486/fpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fpu.c?rev=6793… ============================================================================== --- trunk/reactos/lib/fast486/fpu.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fpu.c [iso-8859-1] Wed May 27 01:00:20 2015 @@ -221,6 +221,60 @@ {0xD3D56292AB7E800DULL, FPU_REAL10_BIAS - 14, FALSE}, /* 1 / 9900 */ }; +static const FAST486_FPU_DATA_REG FpuInverseNumberAtan[INVERSE_NUMBERS_COUNT] = +{ + {0xAAAAAAAAAAAAAAAAULL, FPU_REAL10_BIAS - 1, FALSE}, /* 2 / 3 */ + {0xCCCCCCCCCCCCCCCCULL, FPU_REAL10_BIAS - 1, FALSE}, /* 4 / 5 */ + {0xDB6DB6DB6DB6DB6DULL, FPU_REAL10_BIAS - 1, FALSE}, /* 6 / 7 */ + {0xE38E38E38E38E38EULL, FPU_REAL10_BIAS - 1, FALSE}, /* 8 / 9 */ + {0xE8BA2E8BA2E8BA2EULL, FPU_REAL10_BIAS - 1, FALSE}, /* 10 / 11 */ + {0xEC4EC4EC4EC4EC4EULL, FPU_REAL10_BIAS - 1, FALSE}, /* 12 / 13 */ + {0xEEEEEEEEEEEEEEEEULL, FPU_REAL10_BIAS - 1, FALSE}, /* 14 / 15 */ + {0xF0F0F0F0F0F0F0F0ULL, FPU_REAL10_BIAS - 1, FALSE}, /* 16 / 17 */ + {0xF286BCA1AF286BCAULL, FPU_REAL10_BIAS - 1, FALSE}, /* 18 / 19 */ + {0xF3CF3CF3CF3CF3CFULL, FPU_REAL10_BIAS - 1, FALSE}, /* 20 / 21 */ + {0xF4DE9BD37A6F4DE9ULL, FPU_REAL10_BIAS - 1, FALSE}, /* 22 / 23 */ + {0xF5C28F5C28F5C28FULL, FPU_REAL10_BIAS - 1, FALSE}, /* 24 / 25 */ + {0xF684BDA12F684BDAULL, FPU_REAL10_BIAS - 1, FALSE}, /* 26 / 27 */ + {0xF72C234F72C234F7ULL, FPU_REAL10_BIAS - 1, FALSE}, /* 28 / 29 */ + {0xF7BDEF7BDEF7BDEFULL, FPU_REAL10_BIAS - 1, FALSE}, /* 30 / 31 */ + {0xF83E0F83E0F83E0FULL, FPU_REAL10_BIAS - 1, FALSE}, /* 32 / 33 */ + {0xF8AF8AF8AF8AF8AFULL, FPU_REAL10_BIAS - 1, FALSE}, /* 34 / 35 */ + {0xF914C1BACF914C1BULL, FPU_REAL10_BIAS - 1, FALSE}, /* 36 / 37 */ + {0xF96F96F96F96F96FULL, FPU_REAL10_BIAS - 1, FALSE}, /* 38 / 39 */ + {0xF9C18F9C18F9C18FULL, FPU_REAL10_BIAS - 1, FALSE}, /* 40 / 41 */ + {0xFA0BE82FA0BE82FAULL, FPU_REAL10_BIAS - 1, FALSE}, /* 42 / 43 */ + {0xFA4FA4FA4FA4FA4FULL, FPU_REAL10_BIAS - 1, FALSE}, /* 44 / 45 */ + {0xFA8D9DF51B3BEA36ULL, FPU_REAL10_BIAS - 1, FALSE}, /* 46 / 47 */ + {0xFAC687D6343EB1A1ULL, FPU_REAL10_BIAS - 1, FALSE}, /* 48 / 49 */ + {0xFAFAFAFAFAFAFAFAULL, FPU_REAL10_BIAS - 1, FALSE}, /* 50 / 51 */ + {0xFB2B78C13521CFB2ULL, FPU_REAL10_BIAS - 1, FALSE}, /* 52 / 53 */ + {0xFB586FB586FB586FULL, FPU_REAL10_BIAS - 1, FALSE}, /* 54 / 55 */ + {0xFB823EE08FB823EEULL, FPU_REAL10_BIAS - 1, FALSE}, /* 56 / 57 */ + {0xFBA9386822B63CBEULL, FPU_REAL10_BIAS - 1, FALSE}, /* 58 / 59 */ + {0xFBCDA3AC10C9714FULL, FPU_REAL10_BIAS - 1, FALSE}, /* 60 / 61 */ + {0xFBEFBEFBEFBEFBEFULL, FPU_REAL10_BIAS - 1, FALSE}, /* 62 / 63 */ + {0xFC0FC0FC0FC0FC0FULL, FPU_REAL10_BIAS - 1, FALSE}, /* 64 / 65 */ + {0xFC2DD9CA81E9131AULL, FPU_REAL10_BIAS - 1, FALSE}, /* 66 / 67 */ + {0xFC4A33F128CFC4A3ULL, FPU_REAL10_BIAS - 1, FALSE}, /* 68 / 69 */ + {0xFC64F52EDF8C9EA5ULL, FPU_REAL10_BIAS - 1, FALSE}, /* 70 / 71 */ + {0xFC7E3F1F8FC7E3F1ULL, FPU_REAL10_BIAS - 1, FALSE}, /* 72 / 73 */ + {0xFC962FC962FC962FULL, FPU_REAL10_BIAS - 1, FALSE}, /* 74 / 75 */ + {0xFCACE213F2B3884FULL, FPU_REAL10_BIAS - 1, FALSE}, /* 76 / 77 */ + {0xFCC26E2D5DF984DCULL, FPU_REAL10_BIAS - 1, FALSE}, /* 78 / 79 */ + {0xFCD6E9E06522C3F3ULL, FPU_REAL10_BIAS - 1, FALSE}, /* 80 / 81 */ + {0xFCEA68DE12818ACBULL, FPU_REAL10_BIAS - 1, FALSE}, /* 82 / 83 */ + {0xFCFCFCFCFCFCFCFCULL, FPU_REAL10_BIAS - 1, FALSE}, /* 84 / 85 */ + {0xFD0EB66FD0EB66FDULL, FPU_REAL10_BIAS - 1, FALSE}, /* 86 / 87 */ + {0xFD1FA3F47E8FD1FAULL, FPU_REAL10_BIAS - 1, FALSE}, /* 88 / 89 */ + {0xFD2FD2FD2FD2FD2FULL, FPU_REAL10_BIAS - 1, FALSE}, /* 90 / 91 */ + {0xFD3F4FD3F4FD3F4FULL, FPU_REAL10_BIAS - 1, FALSE}, /* 92 / 93 */ + {0xFD4E25B9EFD4E25BULL, FPU_REAL10_BIAS - 1, FALSE}, /* 94 / 95 */ + {0xFD5C5F02A3A0FD5CULL, FPU_REAL10_BIAS - 1, FALSE}, /* 96 / 97 */ + {0xFD6A052BF5A814AFULL, FPU_REAL10_BIAS - 1, FALSE}, /* 98 / 99 */ + {0xFD7720F353A4C0A2ULL, FPU_REAL10_BIAS - 1, FALSE}, /* 100 / 101 */ +}; + /* PRIVATE FUNCTIONS **********************************************************/ #ifndef FAST486_NO_FPU @@ -1313,7 +1367,7 @@ PCFAST486_FPU_DATA_REG FirstOperand, PCFAST486_FPU_DATA_REG SecondOperand, BOOLEAN RoundToNearest, - PFAST486_FPU_DATA_REG Result, + PFAST486_FPU_DATA_REG Result OPTIONAL, PLONGLONG Quotient OPTIONAL) { BOOLEAN Success = FALSE; @@ -1326,10 +1380,13 @@ State->FpuControl.Rc = RoundToNearest ? FPU_ROUND_NEAREST : FPU_ROUND_TRUNCATE; if (!Fast486FpuToInteger(State, &Temp, &Integer)) goto Cleanup; - Fast486FpuFromInteger(State, Integer, &Temp); - - if (!Fast486FpuMultiply(State, &Temp, SecondOperand, &Temp)) goto Cleanup; - if (!Fast486FpuSubtract(State, FirstOperand, &Temp, Result)) goto Cleanup; + + if (Result) + { + Fast486FpuFromInteger(State, Integer, &Temp); + if (!Fast486FpuMultiply(State, &Temp, SecondOperand, &Temp)) goto Cleanup; + if (!Fast486FpuSubtract(State, FirstOperand, &Temp, Result)) goto Cleanup; + } if (Quotient) *Quotient = Integer; Success = TRUE; @@ -1562,6 +1619,123 @@ return TRUE; } +/* + * Calculates arctan using Euler's formula: + * arctan(x) = (x / (1 + x^2)) * sum { prod { (2j * x^2) + * / ((2j + 1) * (1 + x^2)), j >= 1, j <= i }, i >= 0 } + */ +static inline BOOLEAN FASTCALL +Fast486FpuCalculateArcTangent(PFAST486_STATE State, + PCFAST486_FPU_DATA_REG Numerator, + PCFAST486_FPU_DATA_REG Denominator, + PFAST486_FPU_DATA_REG Result) +{ + INT i; + BOOLEAN Inverted = FALSE; + FAST486_FPU_DATA_REG TempNumerator = *Numerator; + FAST486_FPU_DATA_REG TempDenominator = *Denominator; + FAST486_FPU_DATA_REG Value; + FAST486_FPU_DATA_REG TempResult; + FAST486_FPU_DATA_REG ValDivValSqP1; + FAST486_FPU_DATA_REG SeriesElement = FpuOne; + + TempNumerator.Sign = FALSE; + TempDenominator.Sign = FALSE; + + /* Compare the numerator to the denominator */ + if (!Fast486FpuSubtract(State, &TempNumerator, &TempDenominator, &TempResult)) + { + return FALSE; + } + + if ((Inverted = !TempResult.Sign)) + { + if (!Fast486FpuDivide(State, &TempDenominator, &TempNumerator, &Value)) + { + return FALSE; + } + } + else + { + if (!Fast486FpuDivide(State, &TempNumerator, &TempDenominator, &Value)) + { + return FALSE; + } + } + + /* Apparently, atan2(0, 0) = +/- 0 or +/- pi for some reason... */ + if (FPU_IS_INDEFINITE(&Value)) Value = FpuZero; + + /* Calculate the value divided by the value squared plus one */ + if (!Fast486FpuMultiply(State, &Value, &Value, &ValDivValSqP1)) return FALSE; + if (!Fast486FpuAdd(State, &ValDivValSqP1, &FpuOne, &ValDivValSqP1)) return FALSE; + if (!Fast486FpuDivide(State, &Value, &ValDivValSqP1, &ValDivValSqP1)) return FALSE; + + TempResult = FpuOne; + + for (i = 0; i < INVERSE_NUMBERS_COUNT; i++) + { + if (!Fast486FpuMultiply(State, &SeriesElement, &Value, &SeriesElement)) + { + /* An exception occurred */ + return FALSE; + } + + if (!Fast486FpuMultiply(State, &SeriesElement, &ValDivValSqP1, &SeriesElement)) + { + /* An exception occurred */ + return FALSE; + } + + if (!Fast486FpuMultiply(State, + &SeriesElement, + &FpuInverseNumberAtan[i], + &SeriesElement)) + { + /* An exception occurred */ + return FALSE; + } + + if (!Fast486FpuAdd(State, &TempResult, &SeriesElement, &TempResult)) + { + /* An exception occurred */ + return FALSE; + } + } + + if (!Fast486FpuMultiply(State, &TempResult, &ValDivValSqP1, &TempResult)) + { + /* An exception occurred */ + return FALSE; + } + + if (Inverted) + { + /* Since y/x is positive, arctan(y/x) = pi/2 - arctan(x/y) */ + if (!Fast486FpuSubtract(State, &FpuHalfPi, &TempResult, &TempResult)) return FALSE; + } + + /* Adjust the sign */ + if (!(!Numerator->Sign == !Denominator->Sign)) TempResult.Sign = !TempResult.Sign; + + if (Denominator->Sign) + { + if (Numerator->Sign) + { + /* Subtract PI */ + if (!Fast486FpuSubtract(State, &TempResult, &FpuPi, &TempResult)) return FALSE; + } + else + { + /* Add PI */ + if (!Fast486FpuAdd(State, &TempResult, &FpuPi, &TempResult)) return FALSE; + } + } + + *Result = TempResult; + return TRUE; +} + static inline BOOLEAN FASTCALL Fast486FpuLoadEnvironment(PFAST486_STATE State, INT Segment, @@ -2138,15 +2312,33 @@ { FAST486_FPU_DATA_REG Sine; FAST486_FPU_DATA_REG Cosine; + ULONGLONG Quadrant; /* Compute the sine */ if (!Fast486FpuCalculateSine(State, &FPU_ST(0), &Sine)) break; + + /* Normalize the angle */ + if (!Fast486FpuRemainder(State, + &FPU_ST(0), + &FpuHalfPi, + FALSE, + NULL, + (PLONGLONG)&Quadrant)) + { + break; + } + + /* Normalize the quadrant number */ + Quadrant &= 3; /* Find the cosine by calculating sqrt(1 - sin(x) ^ 2) */ if (!Fast486FpuMultiply(State, &Sine, &Sine, &Cosine)) break; if (!Fast486FpuSubtract(State, &FpuOne, &Cosine, &Cosine)) break; if (!Fast486FpuCalculateSquareRoot(State, &Cosine, &Cosine)) break; + /* Adjust the sign of the cosine */ + if (Quadrant == 1 || Quadrant == 2) Cosine.Sign = TRUE; + /* Divide the sine by the cosine to get the tangent */ if (!Fast486FpuDivide(State, &Sine, &Cosine, &FPU_ST(0))) break; FPU_UPDATE_TAG(0); @@ -2159,9 +2351,17 @@ /* FPATAN */ case 0x33: { - // TODO: NOT IMPLEMENTED - UNIMPLEMENTED; - + if (!Fast486FpuCalculateArcTangent(State, + &FPU_ST(1), + &FPU_ST(0), + &FPU_ST(1))) + { + break; + } + + FPU_UPDATE_TAG(1); + + Fast486FpuPop(State); break; }

1 0

[aandrejevic] 67932: [FAST486] Implement FPTAN by calculating the sine and then dividing it by the approximated cosine: sqrt(1 - sin(x) ^ 2). This method turned out to be faster and more precise th...
by aandrejevic＠svn.reactos.org 26 May '15

26 May '15

Author: aandrejevic Date: Tue May 26 19:11:33 2015 New Revision: 67932 URL: http://svn.reactos.org/svn/reactos?rev=67932&view=rev Log: [FAST486] Implement FPTAN by calculating the sine and then dividing it by the approximated cosine: sqrt(1 - sin(x) ^ 2). This method turned out to be faster and more precise than the Maclaurin series for tan(x), which converges very slowly. Modified: trunk/reactos/lib/fast486/fpu.c Modified: trunk/reactos/lib/fast486/fpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fpu.c?rev=6793… ============================================================================== --- trunk/reactos/lib/fast486/fpu.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fpu.c [iso-8859-1] Tue May 26 19:11:33 2015 @@ -1173,7 +1173,7 @@ */ static inline VOID FASTCALL Fast486FpuCalculateTwoPowerMinusOne(PFAST486_STATE State, - PFAST486_FPU_DATA_REG Operand, + PCFAST486_FPU_DATA_REG Operand, PFAST486_FPU_DATA_REG Result) { INT i; @@ -1221,7 +1221,7 @@ static inline BOOLEAN FASTCALL Fast486FpuCalculateLogBase2(PFAST486_STATE State, - PFAST486_FPU_DATA_REG Operand, + PCFAST486_FPU_DATA_REG Operand, PFAST486_FPU_DATA_REG Result) { INT i; @@ -1345,7 +1345,7 @@ */ static inline BOOLEAN FASTCALL Fast486FpuCalculateSine(PFAST486_STATE State, - PFAST486_FPU_DATA_REG Operand, + PCFAST486_FPU_DATA_REG Operand, PFAST486_FPU_DATA_REG Result) { INT i; @@ -1425,7 +1425,7 @@ */ static inline BOOLEAN FASTCALL Fast486FpuCalculateCosine(PFAST486_STATE State, - PFAST486_FPU_DATA_REG Operand, + PCFAST486_FPU_DATA_REG Operand, PFAST486_FPU_DATA_REG Result) { FAST486_FPU_DATA_REG Value = *Operand; @@ -2136,9 +2136,23 @@ /* FPTAN */ case 0x32: { - // TODO: NOT IMPLEMENTED - UNIMPLEMENTED; - + FAST486_FPU_DATA_REG Sine; + FAST486_FPU_DATA_REG Cosine; + + /* Compute the sine */ + if (!Fast486FpuCalculateSine(State, &FPU_ST(0), &Sine)) break; + + /* Find the cosine by calculating sqrt(1 - sin(x) ^ 2) */ + if (!Fast486FpuMultiply(State, &Sine, &Sine, &Cosine)) break; + if (!Fast486FpuSubtract(State, &FpuOne, &Cosine, &Cosine)) break; + if (!Fast486FpuCalculateSquareRoot(State, &Cosine, &Cosine)) break; + + /* Divide the sine by the cosine to get the tangent */ + if (!Fast486FpuDivide(State, &Sine, &Cosine, &FPU_ST(0))) break; + FPU_UPDATE_TAG(0); + + /* Push 1.00 */ + Fast486FpuPush(State, &FpuOne); break; }

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