Ros-diffs April 2015

ros-diffs@reactos.org

17 participants
481 discussions

[hbelusca] 67234: [NTVDM]: For CreateHardwareTimer, use frequencies (in hertz) instead of using milliseconds or nanoseconds (depending on some additional flag to be specified). It's therefore easie...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Apr 17 23:58:01 2015 New Revision: 67234 URL: http://svn.reactos.org/svn/reactos?rev=67234&view=rev Log: [NTVDM]: For CreateHardwareTimer, use frequencies (in hertz) instead of using milliseconds or nanoseconds (depending on some additional flag to be specified). It's therefore easier to specify what you want. Modified: trunk/reactos/subsystems/mvdm/ntvdm/clock.c trunk/reactos/subsystems/mvdm/ntvdm/clock.h trunk/reactos/subsystems/mvdm/ntvdm/hardware/cmos.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/mouse.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/pit.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/ps2.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/vga.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/clock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/cloc… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/clock.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/clock.c [iso-8859-1] Fri Apr 17 23:58:01 2015 @@ -141,7 +141,7 @@ } } -PHARDWARE_TIMER CreateHardwareTimer(ULONG Flags, ULONG Delay, PHARDWARE_TIMER_PROC Callback) +PHARDWARE_TIMER CreateHardwareTimer(ULONG Flags, ULONG Frequency, PHARDWARE_TIMER_PROC Callback) { PHARDWARE_TIMER Timer; @@ -151,7 +151,7 @@ Timer->Flags = Flags & ~HARDWARE_TIMER_ENABLED; Timer->EnableCount = 0; Timer->Callback = Callback; - SetHardwareTimerDelay(Timer, (ULONGLONG)Delay); + SetHardwareTimerDelay(Timer, 1000000000ULL / (ULONGLONG)Frequency); if (Flags & HARDWARE_TIMER_ENABLED) EnableHardwareTimer(Timer); return Timer; @@ -202,7 +202,7 @@ } else { - Timer->Delay = NewDelay; + Timer->Delay = NewDelay / 1000000ULL; } } @@ -234,7 +234,7 @@ #ifdef IPS_DISPLAY - IpsTimer = CreateHardwareTimer(HARDWARE_TIMER_ENABLED, 1000, IpsDisplayCallback); + IpsTimer = CreateHardwareTimer(HARDWARE_TIMER_ENABLED, 1, IpsDisplayCallback); if (IpsTimer == NULL) { wprintf(L"FATAL: Cannot create IPS display timer.\n"); Modified: trunk/reactos/subsystems/mvdm/ntvdm/clock.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/cloc… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/clock.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/clock.h [iso-8859-1] Fri Apr 17 23:58:01 2015 @@ -35,7 +35,7 @@ PHARDWARE_TIMER CreateHardwareTimer ( ULONG Flags, - ULONG Delay, /* milliseconds for normal timers, nanoseconds for precise timers */ + ULONG Frequency, // in Hz PHARDWARE_TIMER_PROC Callback ); VOID EnableHardwareTimer(PHARDWARE_TIMER Timer); Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/cmos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/cmos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/cmos.c [iso-8859-1] Fri Apr 17 23:58:01 2015 @@ -501,9 +501,9 @@ RegisterIoPort(CMOS_ADDRESS_PORT, NULL , CmosWritePort); RegisterIoPort(CMOS_DATA_PORT , CmosReadPort, CmosWritePort); - ClockTimer = CreateHardwareTimer(HARDWARE_TIMER_ENABLED, 1000, RtcTimeUpdate); + ClockTimer = CreateHardwareTimer(HARDWARE_TIMER_ENABLED, 1, RtcTimeUpdate); PeriodicTimer = CreateHardwareTimer(HARDWARE_TIMER_ENABLED | HARDWARE_TIMER_PRECISE, - 1000000, /* 1,000,000 ns = 1 ms */ + 1000, RtcPeriodicTick); } Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/mouse.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/mouse.c [iso-8859-1] Fri Apr 17 23:58:01 2015 @@ -454,7 +454,7 @@ MouseMutex = CreateMutex(NULL, FALSE, NULL); if (MouseMutex == NULL) return FALSE; - StreamTimer = CreateHardwareTimer(HARDWARE_TIMER_ENABLED, 10, MouseStreamingCallback); + StreamTimer = CreateHardwareTimer(HARDWARE_TIMER_ENABLED, 100, MouseStreamingCallback); MouseReset(); return TRUE; Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/pit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/pit.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/pit.c [iso-8859-1] Fri Apr 17 23:58:01 2015 @@ -511,7 +511,7 @@ /* Register the hardware timer */ MasterClock = CreateHardwareTimer(HARDWARE_TIMER_ENABLED | HARDWARE_TIMER_PRECISE, - 1000000000ULL / PIT_BASE_FREQUENCY, + PIT_BASE_FREQUENCY, PitClock); } Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/ps2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/ps2.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/ps2.c [iso-8859-1] Fri Apr 17 23:58:01 2015 @@ -405,7 +405,7 @@ RegisterIoPort(PS2_CONTROL_PORT, PS2ReadPort, PS2WritePort); RegisterIoPort(PS2_DATA_PORT , PS2ReadPort, PS2WritePort); - IrqTimer = CreateHardwareTimer(HARDWARE_TIMER_ONESHOT, 10, GeneratePS2Irq); + IrqTimer = CreateHardwareTimer(HARDWARE_TIMER_ONESHOT, 100, GeneratePS2Irq); return TRUE; } 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] Fri Apr 17 23:58:01 2015 @@ -2127,8 +2127,8 @@ RegisterIoPort(0x3D8, VgaReadPort, VgaWritePort); // CGA_MODE_CTRL_REG RegisterIoPort(0x3D9, VgaReadPort, VgaWritePort); // CGA_PAL_CTRL_REG - HSyncTimer = CreateHardwareTimer(HARDWARE_TIMER_ENABLED, 0, VgaHorizontalRetrace); - VSyncTimer = CreateHardwareTimer(HARDWARE_TIMER_ENABLED, 16, VgaVerticalRetrace); + HSyncTimer = CreateHardwareTimer(HARDWARE_TIMER_ENABLED, 31469, VgaHorizontalRetrace); + VSyncTimer = CreateHardwareTimer(HARDWARE_TIMER_ENABLED, 60, VgaVerticalRetrace); /* Return success */ return TRUE;

9 years, 8 months

[aandrejevic] 67233: [NTVDM] The DOS_MCB structure needs to be byte-aligned.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Fri Apr 17 21:59:41 2015 New Revision: 67233 URL: http://svn.reactos.org/svn/reactos?rev=67233&view=rev Log: [NTVDM] The DOS_MCB structure needs to be byte-aligned. Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.h Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.h [iso-8859-1] Fri Apr 17 21:59:41 2015 @@ -18,6 +18,7 @@ DOS_ALLOC_LAST_FIT }; +#pragma pack(push, 1) typedef struct _DOS_MCB { CHAR BlockType; @@ -26,6 +27,7 @@ BYTE Unused[3]; CHAR Name[8]; } DOS_MCB, *PDOS_MCB; +#pragma pack(pop) /* VARIABLES ******************************************************************/

9 years, 8 months

[tfaber] 67232: [WINMM] - Sync MCI_SysInfo with Wine. CORE-8528 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Apr 17 19:20:32 2015 New Revision: 67232 URL: http://svn.reactos.org/svn/reactos?rev=67232&view=rev Log: [WINMM] - Sync MCI_SysInfo with Wine. CORE-8528 #resolve Modified: trunk/reactos/dll/win32/winmm/mci.c Modified: trunk/reactos/dll/win32/winmm/mci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/mci.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/winmm/mci.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winmm/mci.c [iso-8859-1] Fri Apr 17 19:20:32 2015 @@ -35,11 +35,6 @@ * + only works on string interface, on regular devices (don't work on all * nor custom devices) * - command table handling isn't thread safe - */ - -/* to be cross checked: - * - heapalloc for *sizeof(WCHAR) when needed - * - size of string in WCHAR or bytes? (#chars for MCI_INFO, #bytes for MCI_SYSINFO) */ #include "winemm.h" @@ -1726,19 +1721,25 @@ static DWORD MCI_SysInfo(UINT uDevID, DWORD dwFlags, LPMCI_SYSINFO_PARMSW lpParms) { DWORD ret = MCIERR_INVALID_DEVICE_ID, cnt = 0; - WCHAR buf[2048], *s = buf, *p; + WCHAR buf[2048], *s, *p; LPWINE_MCIDRIVER wmd; HKEY hKey; - if (lpParms == NULL || lpParms->lpstrReturn == NULL) - return MCIERR_NULL_PARAMETER_BLOCK; + if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; + if (lpParms->lpstrReturn == NULL) return MCIERR_PARAM_OVERFLOW; TRACE("(%08x, %08X, %p[num=%d, wDevTyp=%u])\n", uDevID, dwFlags, lpParms, lpParms->dwNumber, lpParms->wDeviceType); - - switch (dwFlags & ~MCI_SYSINFO_OPEN) { + if ((WORD)MCI_ALL_DEVICE_ID == LOWORD(uDevID)) + uDevID = MCI_ALL_DEVICE_ID; /* Be compatible with Win9x */ + + switch (dwFlags & ~(MCI_SYSINFO_OPEN|MCI_NOTIFY|MCI_WAIT)) { case MCI_SYSINFO_QUANTITY: - if (lpParms->wDeviceType < MCI_DEVTYPE_FIRST || lpParms->wDeviceType > MCI_DEVTYPE_LAST) { + if (lpParms->dwRetSize < sizeof(DWORD)) + return MCIERR_PARAM_OVERFLOW; + /* Win9x returns 0 for 0 < uDevID < (UINT16)MCI_ALL_DEVICE_ID */ + if (uDevID == MCI_ALL_DEVICE_ID) { + /* wDeviceType == MCI_ALL_DEVICE_ID is not recognized. */ if (dwFlags & MCI_SYSINFO_OPEN) { TRACE("MCI_SYSINFO_QUANTITY: # of open MCI drivers\n"); EnterCriticalSection(&WINMM_cs); @@ -1758,21 +1759,32 @@ } } else { if (dwFlags & MCI_SYSINFO_OPEN) { - TRACE("MCI_SYSINFO_QUANTITY: # of open MCI drivers of type %u\n", lpParms->wDeviceType); + TRACE("MCI_SYSINFO_QUANTITY: # of open MCI drivers of type %d\n", lpParms->wDeviceType); EnterCriticalSection(&WINMM_cs); for (wmd = MciDrivers; wmd; wmd = wmd->lpNext) { if (wmd->wType == lpParms->wDeviceType) cnt++; } LeaveCriticalSection(&WINMM_cs); } else { - TRACE("MCI_SYSINFO_QUANTITY: # of installed MCI drivers of type %u\n", lpParms->wDeviceType); + TRACE("MCI_SYSINFO_QUANTITY: # of installed MCI drivers of type %d\n", lpParms->wDeviceType); FIXME("Don't know how to get # of MCI devices of a given type\n"); - cnt = 1; + /* name = LoadStringW(hWinMM32Instance, LOWORD(lpParms->wDeviceType)) + * then lookup registry and/or system.ini for name, ignoring digits suffix */ + switch (LOWORD(lpParms->wDeviceType)) { + case MCI_DEVTYPE_CD_AUDIO: + case MCI_DEVTYPE_WAVEFORM_AUDIO: + case MCI_DEVTYPE_SEQUENCER: + cnt = 1; + break; + default: /* "digitalvideo" gets 0 because it's not in the registry */ + cnt = 0; + } } } *(DWORD*)lpParms->lpstrReturn = cnt; TRACE("(%d) => '%d'\n", lpParms->dwNumber, *(DWORD*)lpParms->lpstrReturn); ret = MCI_INTEGER_RETURNED; + /* return ret; Only Win9x sends a notification in this case. */ break; case MCI_SYSINFO_INSTALLNAME: TRACE("MCI_SYSINFO_INSTALLNAME\n"); @@ -1780,18 +1792,33 @@ ret = MCI_WriteString(lpParms->lpstrReturn, lpParms->dwRetSize, wmd->lpstrDeviceType); } else { - *lpParms->lpstrReturn = 0; - ret = MCIERR_INVALID_DEVICE_ID; + ret = (uDevID == MCI_ALL_DEVICE_ID) + ? MCIERR_CANNOT_USE_ALL : MCIERR_INVALID_DEVICE_NAME; } TRACE("(%d) => %s\n", lpParms->dwNumber, debugstr_w(lpParms->lpstrReturn)); break; case MCI_SYSINFO_NAME: - TRACE("MCI_SYSINFO_NAME\n"); + s = NULL; if (dwFlags & MCI_SYSINFO_OPEN) { - FIXME("Don't handle MCI_SYSINFO_NAME|MCI_SYSINFO_OPEN (yet)\n"); - ret = MCIERR_UNRECOGNIZED_COMMAND; - } else { - s = NULL; + /* Win9x returns 0 for 0 < uDevID < (UINT16)MCI_ALL_DEVICE_ID */ + TRACE("MCI_SYSINFO_NAME: nth alias of type %d\n", + uDevID == MCI_ALL_DEVICE_ID ? MCI_ALL_DEVICE_ID : lpParms->wDeviceType); + EnterCriticalSection(&WINMM_cs); + for (wmd = MciDrivers; wmd; wmd = wmd->lpNext) { + /* wDeviceType == MCI_ALL_DEVICE_ID is not recognized. */ + if (uDevID == MCI_ALL_DEVICE_ID || + lpParms->wDeviceType == wmd->wType) { + cnt++; + if (cnt == lpParms->dwNumber) { + s = wmd->lpstrAlias; + break; + } + } + } + LeaveCriticalSection(&WINMM_cs); + ret = s ? MCI_WriteString(lpParms->lpstrReturn, lpParms->dwRetSize, s) : MCIERR_OUTOFRANGE; + } else if (MCI_ALL_DEVICE_ID == uDevID) { + TRACE("MCI_SYSINFO_NAME: device #%d\n", lpParms->dwNumber); if (RegOpenKeyExW( HKEY_LOCAL_MACHINE, wszHklmMci, 0, KEY_QUERY_VALUE, &hKey ) == ERROR_SUCCESS) { if (RegQueryInfoKeyW( hKey, 0, 0, 0, &cnt, @@ -1815,14 +1842,27 @@ } } } - ret = s ? MCI_WriteString(lpParms->lpstrReturn, lpParms->dwRetSize / sizeof(WCHAR), s) : MCIERR_OUTOFRANGE; + ret = s ? MCI_WriteString(lpParms->lpstrReturn, lpParms->dwRetSize, s) : MCIERR_OUTOFRANGE; + } else { + FIXME("MCI_SYSINFO_NAME: nth device of type %d\n", lpParms->wDeviceType); + /* Cheating: what is asked for is the nth device from the registry. */ + if (1 != lpParms->dwNumber || /* Handle only one of each kind. */ + lpParms->wDeviceType < MCI_DEVTYPE_FIRST || lpParms->wDeviceType > MCI_DEVTYPE_LAST) + ret = MCIERR_OUTOFRANGE; + else { + LoadStringW(hWinMM32Instance, LOWORD(lpParms->wDeviceType), + lpParms->lpstrReturn, lpParms->dwRetSize); + ret = 0; + } } TRACE("(%d) => %s\n", lpParms->dwNumber, debugstr_w(lpParms->lpstrReturn)); break; default: TRACE("Unsupported flag value=%08x\n", dwFlags); - ret = MCIERR_UNRECOGNIZED_COMMAND; - } + ret = MCIERR_UNRECOGNIZED_KEYWORD; + } + if ((dwFlags & MCI_NOTIFY) && HRESULT_CODE(ret)==0) + mciDriverNotify((HWND)lpParms->dwCallback, uDevID, MCI_NOTIFY_SUCCESSFUL); return ret; }

9 years, 8 months

[aandrejevic] 67231: [NTVDM] - The auxiliary PS/2 port IRQ is disabled by default. - In the DOS mouse driver's IRQ handler, just reading the entire packet is faster than waiting for one IRQ per byt...

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Fri Apr 17 18:36:45 2015 New Revision: 67231 URL: http://svn.reactos.org/svn/reactos?rev=67231&view=rev Log: [NTVDM] - The auxiliary PS/2 port IRQ is disabled by default. - In the DOS mouse driver's IRQ handler, just reading the entire packet is faster than waiting for one IRQ per byte. (real drivers can do that too, using polling, which is slower on real hardware but faster in NTVDM). - Increase the speed of the PS/2 IRQ scheduler so that mouse packets don't fill up the queue completely. And consequently, increase the number of CPU steps per cycle to avoid "stuck key" bugs. Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/moubios32.c trunk/reactos/subsystems/mvdm/ntvdm/clock.c trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/mouse.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/ps2.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/moubios32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/moubios32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/moubios32.c [iso-8859-1] Fri Apr 17 18:36:45 2015 @@ -110,6 +110,24 @@ BOOLEAN MouseBios32Initialize(VOID) { + BYTE ControllerConfig; + + /* Clear the mouse queue */ + while (PS2PortQueueRead(1)) continue; + + /* Enable packet reporting */ + IOWriteB(PS2_CONTROL_PORT, 0xD4); + IOWriteB(PS2_DATA_PORT, 0xF4); + + /* Read the mouse ACK reply */ + PS2PortQueueRead(1); + + /* Enable IRQ12 */ + IOWriteB(PS2_CONTROL_PORT, 0x20); + ControllerConfig = IOReadB(PS2_DATA_PORT); + IOWriteB(PS2_CONTROL_PORT, 0x60); + IOWriteB(PS2_DATA_PORT, ControllerConfig | 0x02); + /* Set up the HW vector interrupts */ EnableHwIRQ(12, BiosMouseIrq); Modified: trunk/reactos/subsystems/mvdm/ntvdm/clock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/cloc… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/clock.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/clock.c [iso-8859-1] Fri Apr 17 18:36:45 2015 @@ -39,7 +39,7 @@ // #define WORKING_TIMER /* Processor speed */ -#define STEPS_PER_CYCLE 256 +#define STEPS_PER_CYCLE 1024 /* VARIABLES ******************************************************************/ Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.c [iso-8859-1] Fri Apr 17 18:36:45 2015 @@ -30,8 +30,6 @@ #define MICKEYS_PER_CELL_HORIZ 8 #define MICKEYS_PER_CELL_VERT 16 -static MOUSE_PACKET Packet; -static INT ByteCounter = 0; static BOOLEAN DriverEnabled = FALSE; static MOUSE_DRIVER_STATE DriverState; static DWORD OldIrqHandler; @@ -289,50 +287,25 @@ static VOID WINAPI DosMouseIrq(LPWORD Stack) { + BYTE Flags; + SHORT DeltaX, DeltaY; COORD Position; BYTE ButtonState; - switch (ByteCounter) - { - case 0: - { - Packet.Flags = IOReadB(PS2_DATA_PORT); - break; - } - - case 1: - { - Packet.HorzCounter = IOReadB(PS2_DATA_PORT); - break; - } - - case 2: - { - Packet.VertCounter = IOReadB(PS2_DATA_PORT); - break; - } - - default: - { - /* Shouldn't happen */ - ASSERT(FALSE); - } - } - - if (++ByteCounter == 3) - { - SHORT DeltaX = Packet.HorzCounter; - SHORT DeltaY = Packet.VertCounter; - - /* Adjust the sign */ - if (Packet.Flags & MOUSE_X_SIGN) DeltaX = -DeltaX; - if (Packet.Flags & MOUSE_Y_SIGN) DeltaY = -DeltaY; - - DriverState.HorizCount += DeltaX; - DriverState.VertCount += DeltaY; - - ByteCounter = 0; - } + /* Read the whole packet at once */ + Flags = IOReadB(PS2_DATA_PORT); + PS2PortQueueRead(1); + DeltaX = IOReadB(PS2_DATA_PORT); + PS2PortQueueRead(1); + DeltaY = IOReadB(PS2_DATA_PORT); + + /* Adjust the sign */ + if (Flags & MOUSE_X_SIGN) DeltaX = -DeltaX; + if (Flags & MOUSE_Y_SIGN) DeltaY = -DeltaY; + + /* Update the counters */ + DriverState.HorizCount += DeltaX; + DriverState.VertCount += DeltaY; /* * Get the absolute position directly from the mouse, this is the only @@ -834,13 +807,6 @@ /* Set the IRQ handler */ RegisterDosInt32(MOUSE_IRQ_INT, DosMouseIrq); - - /* Enable packet reporting */ - IOWriteB(PS2_CONTROL_PORT, 0xD4); - IOWriteB(PS2_DATA_PORT, 0xF4); - - /* Read the mouse ACK reply */ - PS2PortQueueRead(1); } } Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/mouse.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/mouse.c [iso-8859-1] Fri Apr 17 18:36:45 2015 @@ -208,6 +208,7 @@ } DataByteWait = 0; + return; } /* Check if we're in wrap mode */ Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/ps2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/ps2.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/ps2.c [iso-8859-1] Fri Apr 17 18:36:45 2015 @@ -42,7 +42,7 @@ #define PS2_PORTS 2 static PS2_PORT Ports[PS2_PORTS]; -#define PS2_DEFAULT_CONFIG 0x47 +#define PS2_DEFAULT_CONFIG 0x45 static BYTE ControllerConfig = PS2_DEFAULT_CONFIG; static BYTE ControllerCommand = 0x00; @@ -405,7 +405,7 @@ RegisterIoPort(PS2_CONTROL_PORT, PS2ReadPort, PS2WritePort); RegisterIoPort(PS2_DATA_PORT , PS2ReadPort, PS2WritePort); - IrqTimer = CreateHardwareTimer(HARDWARE_TIMER_ONESHOT, 20, GeneratePS2Irq); + IrqTimer = CreateHardwareTimer(HARDWARE_TIMER_ONESHOT, 10, GeneratePS2Irq); return TRUE; }

9 years, 8 months

[tfaber] 67230: [LIBUSB] - Make some compilers and static analyzers happy by removing a no-op condition. Patch by Samuel Serapion. CORE-7214 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Apr 17 18:27:16 2015 New Revision: 67230 URL: http://svn.reactos.org/svn/reactos?rev=67230&view=rev Log: [LIBUSB] - Make some compilers and static analyzers happy by removing a no-op condition. Patch by Samuel Serapion. CORE-7214 #resolve Modified: trunk/reactos/lib/drivers/libusb/hub_controller.cpp Modified: trunk/reactos/lib/drivers/libusb/hub_controller.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/libusb/hub_con… ============================================================================== --- trunk/reactos/lib/drivers/libusb/hub_controller.cpp [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/libusb/hub_controller.cpp [iso-8859-1] Fri Apr 17 18:27:16 2015 @@ -3680,13 +3680,10 @@ // // Interface version 0 // - if (IoStack->Parameters.QueryInterface.Version >= 0) - { - InterfaceHub->Size = IoStack->Parameters.QueryInterface.Size; - InterfaceHub->BusContext = PVOID(this); - InterfaceHub->InterfaceReference = USBI_InterfaceReference; - InterfaceHub->InterfaceDereference = USBI_InterfaceDereference; - } + InterfaceHub->Size = IoStack->Parameters.QueryInterface.Size; + InterfaceHub->BusContext = PVOID(this); + InterfaceHub->InterfaceReference = USBI_InterfaceReference; + InterfaceHub->InterfaceDereference = USBI_InterfaceDereference; // // Interface version 1 @@ -3768,17 +3765,14 @@ // // interface version 0 // - if (IoStack->Parameters.QueryInterface.Version >= 0) - { - InterfaceDI->Size = IoStack->Parameters.QueryInterface.Size; - InterfaceDI->BusContext = PVOID(this); - InterfaceDI->InterfaceReference = USBI_InterfaceReference; - InterfaceDI->InterfaceDereference = USBI_InterfaceDereference; - InterfaceDI->GetUSBDIVersion = USBDI_GetUSBDIVersion; - InterfaceDI->QueryBusTime = USBDI_QueryBusTime; - InterfaceDI->SubmitIsoOutUrb = USBDI_SubmitIsoOutUrb; - InterfaceDI->QueryBusInformation = USBDI_QueryBusInformation; - } + InterfaceDI->Size = IoStack->Parameters.QueryInterface.Size; + InterfaceDI->BusContext = PVOID(this); + InterfaceDI->InterfaceReference = USBI_InterfaceReference; + InterfaceDI->InterfaceDereference = USBI_InterfaceDereference; + InterfaceDI->GetUSBDIVersion = USBDI_GetUSBDIVersion; + InterfaceDI->QueryBusTime = USBDI_QueryBusTime; + InterfaceDI->SubmitIsoOutUrb = USBDI_SubmitIsoOutUrb; + InterfaceDI->QueryBusInformation = USBDI_QueryBusInformation; // // interface version 1

9 years, 8 months

[tfaber] 67229: [NTOS:MM] - Fix free condition in MiDereferenceImports. Based on a patch by Samuel Serapion. CORE-7208 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Apr 17 18:21:12 2015 New Revision: 67229 URL: http://svn.reactos.org/svn/reactos?rev=67229&view=rev Log: [NTOS:MM] - Fix free condition in MiDereferenceImports. Based on a patch by Samuel Serapion. CORE-7208 #resolve Modified: trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c [iso-8859-1] Fri Apr 17 18:21:12 2015 @@ -445,9 +445,9 @@ MiDereferenceImports(CurrentImports); /* Check if we had valid imports */ - if ((CurrentImports != MM_SYSLDR_BOOT_LOADED) || - (CurrentImports != MM_SYSLDR_NO_IMPORTS) || - !((ULONG_PTR)LdrEntry->LoadedImports & MM_SYSLDR_SINGLE_ENTRY)) + if ((CurrentImports != MM_SYSLDR_BOOT_LOADED) && + (CurrentImports != MM_SYSLDR_NO_IMPORTS) && + !((ULONG_PTR)CurrentImports & MM_SYSLDR_SINGLE_ENTRY)) { /* Free them */ ExFreePoolWithTag(CurrentImports, TAG_LDR_IMPORTS);

9 years, 8 months

[tfaber] 67228: [WIN32K:NTUSER] - Fix range check in NtUserSetWindowFNID. Patch by Samuel Serapion. - Update comment on an old hack CORE-7212 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Apr 17 18:06:39 2015 New Revision: 67228 URL: http://svn.reactos.org/svn/reactos?rev=67228&view=rev Log: [WIN32K:NTUSER] - Fix range check in NtUserSetWindowFNID. Patch by Samuel Serapion. - Update comment on an old hack CORE-7212 #resolve Modified: trunk/reactos/win32ss/user/ntuser/window.c Modified: trunk/reactos/win32ss/user/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/window… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] Fri Apr 17 18:06:39 2015 @@ -3992,9 +3992,10 @@ // From user land we only set these. if (fnID != FNID_DESTROY) - { // Hacked so we can mark desktop~! - if ( (/*(fnID < FNID_BUTTON)*/ (fnID < FNID_FIRST) && (fnID > FNID_GHOST)) || - Wnd->fnid != 0 ) + { + /* HACK: The minimum should be FNID_BUTTON, but menu code relies on this */ + if (fnID < FNID_FIRST || fnID > FNID_GHOST || + Wnd->fnid != 0) { EngSetLastError(ERROR_INVALID_PARAMETER); RETURN( FALSE);

9 years, 8 months

[tfaber] 67227: [WIN32SS] - Fix some scrollbar bugs as indicated by user32_apitest:SetScrollInfo - Silence a trace CORE-9553 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Apr 17 18:02:09 2015 New Revision: 67227 URL: http://svn.reactos.org/svn/reactos?rev=67227&view=rev Log: [WIN32SS] - Fix some scrollbar bugs as indicated by user32_apitest:SetScrollInfo - Silence a trace CORE-9553 #resolve Modified: trunk/reactos/win32ss/user/ntuser/scrollbar.c trunk/reactos/win32ss/user/user32/controls/scrollbar.c Modified: trunk/reactos/win32ss/user/ntuser/scrollbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/scroll… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/scrollbar.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/scrollbar.c [iso-8859-1] Fri Apr 17 18:02:09 2015 @@ -347,6 +347,8 @@ PSBDATA pSBData; DWORD OldPos = 0; BOOL bChangeParams = FALSE; /* Don't show/hide scrollbar if params don't change */ + UINT MaxPage; + int MaxPos; ASSERT_REFS_CO(Window); @@ -404,14 +406,12 @@ /* Set the scroll range */ if (lpsi->fMask & SIF_RANGE) { - /* Invalid range -> range is set to (0,0) */ - if ((lpsi->nMin > lpsi->nMax) || - ((UINT)(lpsi->nMax - lpsi->nMin) >= 0x80000000)) + if (lpsi->nMin > lpsi->nMax) { - Info->nMin = 0; - Info->nMax = 0; - pSBData->posMin = 0; - pSBData->posMax = 0; + Info->nMin = lpsi->nMin; + Info->nMax = lpsi->nMin; + pSBData->posMin = lpsi->nMin; + pSBData->posMax = lpsi->nMin; bChangeParams = TRUE; } else if (Info->nMin != lpsi->nMin || Info->nMax != lpsi->nMax) @@ -425,23 +425,22 @@ } /* Make sure the page size is valid */ - if (Info->nPage < 0) - { - pSBData->page = Info->nPage = 0; - } - else if ((Info->nMax - Info->nMin + 1UL) < Info->nPage) - { - pSBData->page = Info->nPage = Info->nMax - Info->nMin + 1; + MaxPage = abs(Info->nMax - Info->nMin) + 1; + if (Info->nPage > MaxPage) + { + pSBData->page = Info->nPage = MaxPage; } /* Make sure the pos is inside the range */ + MaxPos = Info->nMax + 1 - (int)max(Info->nPage, 1); + ASSERT(MaxPos >= Info->nMin); if (Info->nPos < Info->nMin) { pSBData->pos = Info->nPos = Info->nMin; } - else if (Info->nPos > (Info->nMax - max((int)Info->nPage - 1, 0))) - { - pSBData->pos = Info->nPos = Info->nMax - max(Info->nPage - 1, 0); + else if (Info->nPos > MaxPos) + { + pSBData->pos = Info->nPos = MaxPos; } /* Modified: trunk/reactos/win32ss/user/user32/controls/scrollbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/contro… ============================================================================== --- trunk/reactos/win32ss/user/user32/controls/scrollbar.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/controls/scrollbar.c [iso-8859-1] Fri Apr 17 18:02:09 2015 @@ -1043,7 +1043,7 @@ Info.cbSize = sizeof(SCROLLINFO); Info.fMask = SIF_RANGE | SIF_PAGE | SIF_POS; Info.nMin = 0; - Info.nMax = 100; + Info.nMax = 0; Info.nPage = 0; Info.nPos = 0; Info.nTrackPos = 0; @@ -1189,7 +1189,7 @@ { if (!pWnd->fnid) { - ERR("ScrollBar CTL size %d\n",(sizeof(SBWND)-sizeof(WND))); + TRACE("ScrollBar CTL size %d\n", (sizeof(SBWND)-sizeof(WND))); if ( pWnd->cbwndExtra != (sizeof(SBWND)-sizeof(WND)) ) { ERR("Wrong Extra bytes for Scrollbar!\n");

9 years, 8 months

[tfaber] 67226: [USER32_APITEST] - Add a test for SetScrollInfo CORE-9553

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Apr 17 17:22:07 2015 New Revision: 67226 URL: http://svn.reactos.org/svn/reactos?rev=67226&view=rev Log: [USER32_APITEST] - Add a test for SetScrollInfo CORE-9553 Added: trunk/rostests/apitests/user32/SetScrollInfo.c (with props) Modified: trunk/rostests/apitests/user32/CMakeLists.txt trunk/rostests/apitests/user32/testlist.c Modified: trunk/rostests/apitests/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/CMakeList… ============================================================================== --- trunk/rostests/apitests/user32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/CMakeLists.txt [iso-8859-1] Fri Apr 17 17:22:07 2015 @@ -25,6 +25,7 @@ SetActiveWindow.c SetCursorPos.c SetParent.c + SetScrollInfo.c SystemParametersInfo.c TrackMouseEvent.c WndProc.c Added: trunk/rostests/apitests/user32/SetScrollInfo.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/SetScroll… ============================================================================== --- trunk/rostests/apitests/user32/SetScrollInfo.c (added) +++ trunk/rostests/apitests/user32/SetScrollInfo.c [iso-8859-1] Fri Apr 17 17:22:07 2015 @@ -0,0 +1,160 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory + * PURPOSE: Test for SetScrollInfo + * PROGRAMMERS: Thomas Faber <thomas.faber(a)reactos.org> + */ + +#include <apitest.h> + +#include <wingdi.h> +#include <winuser.h> + +START_TEST(SetScrollInfo) +{ + struct + { + int nMin; + int nMax; + UINT nPage; + int nPos; + int nMinResult; + int nMaxResult; + UINT nPageResult; + int nPosResult; + } tests[] = + { + /* min max pg pos min max pg pos */ + /* [0] */ { 0, 0, 0, 0, 0, 0, 0, 0 }, + { 0, 0, 1, 1, 0, 0, 1, 0 }, + + /* vary nPage only */ + { 5, 10, 0, 0, 5, 10, 0, 5 }, + { 5, 10, 1, 0, 5, 10, 1, 5 }, + { 5, 10, 4, 0, 5, 10, 4, 5 }, + /* [5] */ { 5, 10, 5, 0, 5, 10, 5, 5 }, + { 5, 10, 6, 0, 5, 10, 6, 5 }, + { 5, 10, 7, 0, 5, 10, 6, 5 }, + { 5, 10, 10, 0, 5, 10, 6, 5 }, + { 5, 10, 11, 0, 5, 10, 6, 5 }, + /* [10] */ { 5, 10, 0xffffffff, 0, 5, 10, 6, 5 }, + + /* vary nPos only */ + { 5, 10, 0, 4, 5, 10, 0, 5 }, + { 5, 10, 0, 5, 5, 10, 0, 5 }, + { 5, 10, 0, 10, 5, 10, 0, 10 }, + { 5, 10, 0, 11, 5, 10, 0, 10 }, + /* [15] */ { 5, 10, 0, -1, 5, 10, 0, 5 }, + { 5, 10, 0, 0x80000000, 5, 10, 0, 5 }, + { 5, 10, 0, 0x7fffffff, 5, 10, 0, 10 }, + + /* maximum nPos depends on nPage */ + { 5, 10, 0, 9, 5, 10, 0, 9 }, + { 5, 10, 0, 10, 5, 10, 0, 10 }, + /* [20] */ { 5, 10, 0, 11, 5, 10, 0, 10 }, + { 5, 10, 1, 9, 5, 10, 1, 9 }, + { 5, 10, 1, 10, 5, 10, 1, 10 }, + { 5, 10, 1, 11, 5, 10, 1, 10 }, + { 5, 10, 2, 9, 5, 10, 2, 9 }, + /* [25] */ { 5, 10, 2, 10, 5, 10, 2, 9 }, + { 5, 10, 2, 11, 5, 10, 2, 9 }, + { 5, 10, 3, 9, 5, 10, 3, 8 }, + { 5, 10, 3, 10, 5, 10, 3, 8 }, + { 5, 10, 3, 11, 5, 10, 3, 8 }, + + /* relation between min and max? */ + /* min max pg pos min max pg pos */ + /* [30] */ { 5, 6, 0, 0, 5, 6, 0, 5 }, + { 5, 5, 0, 0, 5, 5, 0, 5 }, + { 6, 5, 0, 0, 6, 6, 0, 6 }, + { 7, 5, 0, 0, 7, 7, 0, 7 }, + { -2, 0, 0, 0, -2, 0, 0, 0 }, + /* [35] */ { -2, -1, 0, 0, -2, -1, 0, -1 }, + { -1, 0, 0, 0, -1, 0, 0, 0 }, + { -1, -1, 0, 0, -1, -1, 0, -1 }, + { 0, -1, 0, 0, 0, 0, 0, 0 }, + { 1, -1, 0, 0, 1, 1, 0, 1 }, + /* [40] */ { 0x80000000, 0x7fffffff, 0, 0, 0x80000000, 0x7fffffff, 0, 0 }, + { 0x80000001, 0x7fffffff, 0, 0, 0x80000001, 0x7fffffff, 0, 0 }, + { 0x80000000, 0x7ffffffe, 0, 0, 0x80000000, 0x7ffffffe, 0, 0 }, + { 0x7fffffff, 0x80000000, 0, 0, 0x7fffffff, 0x7fffffff, 0, 0x7fffffff }, + { 0, 0x7fffffff, 0, 0, 0, 0x7fffffff, 0, 0 }, + /* [45] */ { -1, 0x7fffffff, 0, 0, -1, 0x7fffffff, 0, 0 }, + { -2, 0x7fffffff, 0, 0, -2, 0x7fffffff, 0, 0 }, + + /* What happens to nPage when we have a large range? */ + { 0x80000000, 0x7fffffff, 1, 5, 0x80000000, 0x7fffffff, 1, 5 }, + { 0x80000000, 0x7fffffff, 2, 5, 0x80000000, 0x7fffffff, 2, 5 }, + { 0x80000000, 0x7fffffff, 3, 5, 0x80000000, 0x7fffffff, 2, 5 }, + /* [50] */ { 0x80000000, 0x7fffffff, 0x7fffffff, 5, 0x80000000, 0x7fffffff, 2, 5 }, + { 0x80000000, 0x7fffffff, 0x80000000, 5, 0x80000000, 0x7fffffff, 2, 5 }, + { 0x80000000, 0x7fffffff, 0x80000001, 5, 0x80000000, 0x7fffffff, 2, 5 }, + { 0x80000000, 0x7fffffff, 0xffffffff, 5, 0x80000000, 0x7fffffff, 2, 5 }, + { 0x80000001, 0x7fffffff, 1, 5, 0x80000001, 0x7fffffff, 1, 5 }, + /* [55] */ { 0x80000001, 0x7fffffff, 2, 5, 0x80000001, 0x7fffffff, 2, 5 }, + { 0x80000001, 0x7fffffff, 3, 5, 0x80000001, 0x7fffffff, 3, 5 }, + { 0x80000001, 0x7fffffff, 4, 5, 0x80000001, 0x7fffffff, 3, 5 }, + { 0x80000000, 0x7ffffffe, 1, 5, 0x80000000, 0x7ffffffe, 1, 5 }, + { 0x80000000, 0x7ffffffe, 2, 5, 0x80000000, 0x7ffffffe, 2, 5 }, + /* [60] */ { 0x80000000, 0x7ffffffe, 3, 5, 0x80000000, 0x7ffffffe, 3, 5 }, + { 0x80000000, 0x7ffffffe, 4, 5, 0x80000000, 0x7ffffffe, 3, 5 }, + { 0, 0x7fffffff, 0x7fffffff, 5, 0, 0x7fffffff, 0x7fffffff, 1 }, + { 0, 0x7fffffff, 0x80000000, 5, 0, 0x7fffffff, 0x80000000, 0 }, + { 0, 0x7fffffff, 0x80000001, 5, 0, 0x7fffffff, 0x80000000, 0 }, + /* [65] */ { 0, 0x7fffffff, 0x80000002, 5, 0, 0x7fffffff, 0x80000000, 0 }, + { -1, 0x7fffffff, 0x7fffffff, 5, -1, 0x7fffffff, 0x7fffffff, 1 }, + { -1, 0x7fffffff, 0x80000000, 5, -1, 0x7fffffff, 0x80000000, 0 }, + { -1, 0x7fffffff, 0x80000001, 5, -1, 0x7fffffff, 0x80000001, -1 }, + { -1, 0x7fffffff, 0x80000002, 5, -1, 0x7fffffff, 0x80000001, -1 }, + /* [70] */ { -1, 0x7fffffff, 0x80000003, 5, -1, 0x7fffffff, 0x80000001, -1 }, + { -2, 0x7fffffff, 0x80000000, 5, -2, 0x7fffffff, 0x80000000, 0 }, + { -2, 0x7fffffff, 0x80000001, 5, -2, 0x7fffffff, 0x80000000, 0 }, + { 0xf0000000, 0x7fffffff, 0x90000000, 5, 0xf0000000, 0x7fffffff, 0x70000002, 5 }, + { 0xf0000000, 0x7fffffff, 0x90000001, 5, 0xf0000000, 0x7fffffff, 0x70000002, 5 }, + }; + unsigned i; + HWND hScroll; + SCROLLINFO si; + BOOL success; + int ret; + + hScroll = CreateWindowExW(0, L"SCROLLBAR", NULL, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL); + ok(hScroll != NULL, "\n"); + if (!hScroll) + { + skip("No scroll bar\n"); + return; + } + + si.cbSize = sizeof(si); + si.fMask = SIF_PAGE | SIF_POS | SIF_RANGE; + success = GetScrollInfo(hScroll, SB_CTL, &si); + ok(success == TRUE, "GetScrollInfo returned %d\n", success); + ok(si.nMin == 0, "nMin = %d\n", si.nMin); + ok(si.nMax == 0, "nMax = %d\n", si.nMax); + ok(si.nPage == 0, "nPage = %u\n", si.nPage); + ok(si.nPos == 0, "nPos = %d\n", si.nPos); + + for (i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) + { + si.cbSize = sizeof(si); + si.fMask = SIF_PAGE | SIF_POS | SIF_RANGE; + si.nMin = tests[i].nMin; + si.nMax = tests[i].nMax; + si.nPage = tests[i].nPage; + si.nPos = tests[i].nPos; + ret = SetScrollInfo(hScroll, SB_CTL, &si, FALSE); + ok(ret == tests[i].nPosResult, "[%d] ret = %d, expected %d\n", i, ret, tests[i].nPosResult); + + FillMemory(&si, sizeof(si), 0x55); + si.cbSize = sizeof(si); + si.fMask = SIF_PAGE | SIF_POS | SIF_RANGE; + success = GetScrollInfo(hScroll, SB_CTL, &si); + ok(success == TRUE, "[%d] GetScrollInfo returned %d\n", i, success); + ok(si.nMin == tests[i].nMinResult, "[%d] nMin = %d, expected %d\n", i, si.nMin, tests[i].nMinResult); + ok(si.nMax == tests[i].nMaxResult, "[%d] nMax = %d, expected %d\n", i, si.nMax, tests[i].nMaxResult); + ok(si.nPage == tests[i].nPageResult, "[%d] nPage = %u, expected %u\n", i, si.nPage, tests[i].nPageResult); + ok(si.nPos == tests[i].nPosResult, "[%d] nPos = %d, expected %d\n", i, si.nPos, tests[i].nPosResult); + } + DestroyWindow(hScroll); +} Propchange: trunk/rostests/apitests/user32/SetScrollInfo.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/user32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/testlist.… ============================================================================== --- trunk/rostests/apitests/user32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/testlist.c [iso-8859-1] Fri Apr 17 17:22:07 2015 @@ -27,6 +27,7 @@ extern void func_SetActiveWindow(void); extern void func_SetCursorPos(void); extern void func_SetParent(void); +extern void func_SetScrollInfo(void); extern void func_SystemParametersInfo(void); extern void func_TrackMouseEvent(void); extern void func_WndProc(void); @@ -58,6 +59,7 @@ { "SetActiveWindow", func_SetActiveWindow }, { "SetCursorPos", func_SetCursorPos }, { "SetParent", func_SetParent }, + { "SetScrollInfo", func_SetScrollInfo }, { "SystemParametersInfo", func_SystemParametersInfo }, { "TrackMouseEvent", func_TrackMouseEvent }, { "WndProc", func_WndProc },

9 years, 8 months

[cwittich] 67225: [RAPPS] initialize CachedEntriesHead CORE-9060

by cwittich＠svn.reactos.org

Author: cwittich Date: Fri Apr 17 13:06:33 2015 New Revision: 67225 URL: http://svn.reactos.org/svn/reactos?rev=67225&view=rev Log: [RAPPS] initialize CachedEntriesHead CORE-9060 Modified: trunk/reactos/base/applications/rapps/available.c Modified: trunk/reactos/base/applications/rapps/available.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/av… ============================================================================== --- trunk/reactos/base/applications/rapps/available.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/available.c [iso-8859-1] Fri Apr 17 13:06:33 2015 @@ -25,7 +25,7 @@ if (!ParserGetString(a, b, MAX_PATH, FindFileData.cFileName)) \ b[0] = '\0'; -LIST_ENTRY CachedEntriesHead = {0}; +LIST_ENTRY CachedEntriesHead = { &CachedEntriesHead, &CachedEntriesHead }; PLIST_ENTRY pCachedEntry = NULL; BOOL

9 years, 8 months

← Newer
1
...
23
24
25
26
27
28
29
...
49
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2015