Ros-diffs

ros-diffs@reactos.org

81390 discussions

[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 17 Apr '15

17 Apr '15

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; }

1 0

[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 17 Apr '15

17 Apr '15

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

1 0

[tfaber] 67229: [NTOS:MM] - Fix free condition in MiDereferenceImports. Based on a patch by Samuel Serapion. CORE-7208 #resolve
by tfaber＠svn.reactos.org 17 Apr '15

17 Apr '15

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);

1 0

[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 17 Apr '15

17 Apr '15

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);

1 0

[tfaber] 67227: [WIN32SS] - Fix some scrollbar bugs as indicated by user32_apitest:SetScrollInfo - Silence a trace CORE-9553 #resolve
by tfaber＠svn.reactos.org 17 Apr '15

17 Apr '15

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");

1 0

[tfaber] 67226: [USER32_APITEST] - Add a test for SetScrollInfo CORE-9553
by tfaber＠svn.reactos.org 17 Apr '15

17 Apr '15

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 },

1 0

[cwittich] 67225: [RAPPS] initialize CachedEntriesHead CORE-9060
by cwittich＠svn.reactos.org 17 Apr '15

17 Apr '15

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

1 0

[cwittich] 67224: [RAPPS] free cached entries and some other improvements patch by Ismael Ferreras Morezuelas aka swyter CORE-9060
by cwittich＠svn.reactos.org 17 Apr '15

17 Apr '15

Author: cwittich Date: Fri Apr 17 12:37:08 2015 New Revision: 67224 URL: http://svn.reactos.org/svn/reactos?rev=67224&view=rev Log: [RAPPS] free cached entries and some other improvements patch by Ismael Ferreras Morezuelas aka swyter CORE-9060 Modified: trunk/reactos/base/applications/rapps/CreateCabFile.sh trunk/reactos/base/applications/rapps/available.c trunk/reactos/base/applications/rapps/lang/es-ES.rc trunk/reactos/base/applications/rapps/misc.c trunk/reactos/base/applications/rapps/rapps.h trunk/reactos/base/applications/rapps/winmain.c Modified: trunk/reactos/base/applications/rapps/CreateCabFile.sh URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/Cr… ============================================================================== --- trunk/reactos/base/applications/rapps/CreateCabFile.sh [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/CreateCabFile.sh [iso-8859-1] Fri Apr 17 12:37:08 2015 @@ -2,8 +2,8 @@ cd rapps mkdir utf16 for i in $(find -type f); do - ../../../../output-MinGW-i386/host-tools/tools/utf16le.exe $i utf16/$i + ../../../host-tools/tools/utf16le $i utf16/$i done cd .. -../../../output-MinGW-i386/host-tools/tools/cabman/cabman -M mszip -S rappmgr.cab rapps/utf16/*.txt +../../host-tools/tools/cabman/cabman -M mszip -S rappmgr.cab rapps/utf16/*.txt rm -r rapps/uft16 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 12:37:08 2015 @@ -246,7 +246,7 @@ skip_if_cached: - if (Info->Category == -1) + if (Info->Category == FALSE) continue; if (EnumType != Info->Category && EnumType != ENUM_ALL_AVAILABLE) @@ -277,4 +277,22 @@ FindClose(hFind); return TRUE; +} + +VOID FreeCachedAvailableEntries(VOID) +{ + PAPPLICATION_INFO Info; + + /* loop and deallocate all the cached app infos in the list */ + for (pCachedEntry = CachedEntriesHead.Flink; pCachedEntry != &CachedEntriesHead;) + { + Info = CONTAINING_RECORD(pCachedEntry, APPLICATION_INFO, List); + + /* grab a reference to the next linked entry before getting rid of the current one */ + pCachedEntry = pCachedEntry->Flink; + + /* flush them down the toilet :D */ + RemoveEntryList(&Info->List); + HeapFree(GetProcessHeap(), 0, Info); + } } Modified: trunk/reactos/base/applications/rapps/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/es-ES.rc [iso-8859-1] Fri Apr 17 12:37:08 2015 @@ -194,10 +194,10 @@ IDS_AVAILABLEFORINST "Disponible para su instalaciÃ³n" IDS_UPDATES "Actualizaciones" IDS_APPLICATIONS "Aplicaciones" - IDS_CHOOSE_FOLDER_TEXT "Seleccione una carpeta donde se descargarÃ¡n los programas:" - IDS_CHOOSE_FOLDER_ERROR "Â¡La carpeta especificada no existe!" + IDS_CHOOSE_FOLDER_TEXT "Seleccione una carpeta de donde se descargarÃ¡n los programas:" + IDS_CHOOSE_FOLDER_ERROR "La carpeta especificada no existe." IDS_APP_REG_REMOVE "Â¿EstÃ¡ seguro de querer borrar del Registro los datos de instalaciÃ³n del programa?" IDS_INFORMATION "InformaciÃ³n" - IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!" - IDS_UNABLE_TO_REMOVE "Â¡No se pudieron borrar del Registro los datos de instalaciÃ³n del programa!" -END + IDS_UNABLE_TO_DOWNLOAD "No se pudo descargar el paquete. No se ha encontrado la direcciÃ³n de Internet." + IDS_UNABLE_TO_REMOVE "No se pudieron borrar del Registro los datos de instalaciÃ³n del programa." +END Modified: trunk/reactos/base/applications/rapps/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/mi… ============================================================================== --- trunk/reactos/base/applications/rapps/misc.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/misc.c [iso-8859-1] Fri Apr 17 12:37:08 2015 @@ -414,11 +414,7 @@ UINT ParserGetString(LPCWSTR lpKeyName, LPWSTR lpReturnedString, UINT nSize, LPCWSTR lpFileName) { PWSTR lpFullFileName = GetINIFullPath(lpFileName); - LPSTR lpRequiredBuf = HeapAlloc(GetProcessHeap(), 0, nSize); DWORD dwResult; - - if (!lpRequiredBuf) - return FALSE; /* we don't have cached section strings for the current system language, create them */ if(bCachedSectionStatus == FALSE) @@ -457,7 +453,7 @@ lpFullFileName); if (dwResult != 0) - goto skip; + return TRUE; /* 2nd - if they weren't present check for neutral sub-langs/ generic translations (e.g. "Section.0a") */ dwResult = GetPrivateProfileStringW(szCachedINISectionLocaleNeutral, @@ -468,7 +464,7 @@ lpFullFileName); if (dwResult != 0) - goto skip; + return TRUE; /* 3rd - if they weren't present fallback to standard english strings (just "Section") */ dwResult = GetPrivateProfileStringW(L"Section", @@ -478,18 +474,7 @@ nSize, lpFullFileName); - if (dwResult == 0) - { - HeapFree(GetProcessHeap(), 0, lpRequiredBuf); - return FALSE; - } - -skip: - - /* get rid of the dynamically allocated ANSI buffer */ - HeapFree(GetProcessHeap(), 0, lpRequiredBuf); - - return TRUE; + return (dwResult != 0 ? TRUE : FALSE); } UINT ParserGetInt(LPCWSTR lpKeyName, LPCWSTR lpFileName) Modified: trunk/reactos/base/applications/rapps/rapps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps.h [iso-8859-1] Fri Apr 17 12:37:08 2015 @@ -125,6 +125,7 @@ BOOL EnumAvailableApplications(INT EnumType, AVAILENUMPROC lpEnumProc); BOOL ShowAvailableAppInfo(INT Index); BOOL UpdateAppsDB(VOID); +VOID FreeCachedAvailableEntries(VOID); /* installdlg.c */ BOOL InstallApplication(INT Index); Modified: trunk/reactos/base/applications/rapps/winmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/wi… ============================================================================== --- trunk/reactos/base/applications/rapps/winmain.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/winmain.c [iso-8859-1] Fri Apr 17 12:37:08 2015 @@ -147,21 +147,6 @@ return TRUE; } -VOID -FreeAvailableAppList(VOID) -{ - INT Count = ListView_GetItemCount(hListView) - 1; - PVOID Info; - - while (Count >= 0) - { - Info = ListViewGetlParam(Count); - if (Info) - HeapFree(GetProcessHeap(), 0, Info); - Count--; - } -} - BOOL CALLBACK EnumAvailableAppProc(PAPPLICATION_INFO Info) @@ -202,9 +187,6 @@ if (IS_INSTALLED_ENUM(SelectedEnumType)) FreeInstalledAppList(); - /* FIXME: reenable when caching is fixed */ - /* else if (IS_AVAILABLE_ENUM(SelectedEnumType)) - FreeAvailableAppList(); */ (VOID) ListView_DeleteAllItems(hListView); @@ -887,11 +869,13 @@ FreeLogs(); - if (IS_AVAILABLE_ENUM(SelectedEnumType)) - FreeAvailableAppList(); + FreeCachedAvailableEntries(); + if (IS_INSTALLED_ENUM(SelectedEnumType)) FreeInstalledAppList(); - if (hImageTreeView) ImageList_Destroy(hImageTreeView); + + if (hImageTreeView) + ImageList_Destroy(hImageTreeView); PostQuitMessage(0); return 0;

1 0

[hbelusca] 67223: [NTVDM]: Fix VgaGetDoubleVisionState definition (it was already correctly used in hardware/mouse.c).
by hbelusca＠svn.reactos.org 17 Apr '15

17 Apr '15

Author: hbelusca Date: Fri Apr 17 12:13:49 2015 New Revision: 67223 URL: http://svn.reactos.org/svn/reactos?rev=67223&view=rev Log: [NTVDM]: Fix VgaGetDoubleVisionState definition (it was already correctly used in hardware/mouse.c). Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/vga.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/vga.h 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 12:13:49 2015 @@ -1890,11 +1890,11 @@ return Resolution; } -BOOLEAN VgaGetDoubleVisionState(PBOOLEAN Vertical, PBOOLEAN Horizontal) +BOOLEAN VgaGetDoubleVisionState(PBOOLEAN Horizontal, PBOOLEAN Vertical) { if (GraphicsConsoleBuffer == NULL) return FALSE; - if (Vertical) *Vertical = DoubleWidth; - if (Horizontal) *Horizontal = DoubleHeight; + if (Horizontal) *Horizontal = DoubleWidth; + if (Vertical) *Vertical = DoubleHeight; return TRUE; } Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/vga.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/vga.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/vga.h [iso-8859-1] Fri Apr 17 12:13:49 2015 @@ -262,7 +262,7 @@ VOID VgaRefreshDisplay(VOID); VOID VgaWriteFont(UINT FontNumber, CONST UCHAR *FontData, UINT Height); VOID VgaClearMemory(VOID); -BOOLEAN VgaGetDoubleVisionState(PBOOLEAN Vertical, PBOOLEAN Horizontal); +BOOLEAN VgaGetDoubleVisionState(PBOOLEAN Horizontal, PBOOLEAN Vertical); BOOLEAN VgaInitialize(HANDLE TextHandle); VOID VgaCleanup(VOID);

1 0

[tfaber] 67222: [KERNEL32_APITEST] - Make GetDriveType test succeed if the current directory is the drive root. Spotted by Edijs. - Use strsafe functions ROSTESTS-160 #resolve
by tfaber＠svn.reactos.org 17 Apr '15

17 Apr '15

Author: tfaber Date: Fri Apr 17 08:09:30 2015 New Revision: 67222 URL: http://svn.reactos.org/svn/reactos?rev=67222&view=rev Log: [KERNEL32_APITEST] - Make GetDriveType test succeed if the current directory is the drive root. Spotted by Edijs. - Use strsafe functions ROSTESTS-160 #resolve Modified: trunk/rostests/apitests/kernel32/GetDriveType.c Modified: trunk/rostests/apitests/kernel32/GetDriveType.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/GetDriv… ============================================================================== --- trunk/rostests/apitests/kernel32/GetDriveType.c [iso-8859-1] (original) +++ trunk/rostests/apitests/kernel32/GetDriveType.c [iso-8859-1] Fri Apr 17 08:09:30 2015 @@ -1,4 +1,5 @@ #include <apitest.h> +#include <strsafe.h> #define IS_DRIVE_TYPE_VALID(type) ((type) != DRIVE_UNKNOWN && (type) != DRIVE_NO_ROOT_DIR) @@ -6,45 +7,48 @@ { UINT Type, Type2, i; WCHAR Path[MAX_PATH]; - + /* Note: Successful calls can set last error to at least ERROR_NOT_A_REPARSE_POINT, we don't test it here */ SetLastError(0xdeadbeaf); - + Type = GetDriveTypeW(L""); ok(Type == DRIVE_NO_ROOT_DIR, "Expected DRIVE_NO_ROOT_DIR, got %u\n", Type); - + Type = GetDriveTypeW(L"\nC:\\"); ok(Type == DRIVE_NO_ROOT_DIR, "Expected DRIVE_NO_ROOT_DIR, got %u\n", Type); - + Type = GetDriveTypeW(L"Z:\\"); ok(Type == DRIVE_NO_ROOT_DIR, "Expected DRIVE_NO_ROOT_DIR, got %u\n", Type); - + ok(GetLastError() == 0xdeadbeaf, "Expected no errors, got %lu\n", GetLastError()); - + /* Drive root is accepted without ending slash */ Type = GetDriveTypeW(L"C:"); ok(IS_DRIVE_TYPE_VALID(Type), "Expected valid drive type, got %u\n", Type); - + Type = GetDriveTypeW(L"C:\\"); ok(IS_DRIVE_TYPE_VALID(Type), "Expected valid drive type, got %u\n", Type); - + Type = GetDriveTypeW(NULL); ok(IS_DRIVE_TYPE_VALID(Type), "Expected valid drive type, got %u\n", Type); - + i = GetCurrentDirectoryW(sizeof(Path)/sizeof(Path[0]), Path); if (i) { - /* Note: there is no backslash at the end of Path */ - SetLastError(0xdeadbeaf); - Type2 = GetDriveTypeW(Path); - ok(Type2 == DRIVE_NO_ROOT_DIR, "Expected DRIVE_NO_ROOT_DIR, got %u\n", Type2); - ok(GetLastError() == 0xdeadbeaf, "Expected ERROR_NOT_A_REPARSE_POINT, got %lu\n", GetLastError()); - - wcscpy(Path+i, L"\\"); + /* No trailing backslash returned unless we're at the drive root */ + if (Path[i - 1] != L'\\') + { + SetLastError(0xdeadbeaf); + Type2 = GetDriveTypeW(Path); + ok(Type2 == DRIVE_NO_ROOT_DIR, "Expected DRIVE_NO_ROOT_DIR, got %u\n", Type2); + ok(GetLastError() == 0xdeadbeaf, "Expected no errors, got %lu\n", GetLastError()); + + StringCchCopyW(Path + i, MAX_PATH - i, L"\\"); + } Type2 = GetDriveTypeW(Path); ok(Type == Type2, "Types are not equal: %u != %u\n", Type, Type2); } - + i = GetSystemDirectoryW(Path, sizeof(Path)/sizeof(Path[0])); if (i) { @@ -53,16 +57,16 @@ Type = GetDriveTypeW(Path); ok(Type == DRIVE_NO_ROOT_DIR, "Expected DRIVE_NO_ROOT_DIR, got %u\n", Type); ok(GetLastError() == 0xdeadbeaf, "Expected no errors, got %lu\n", GetLastError()); - - wcscpy(Path+i, L"\\"); + + StringCchCopyW(Path + i, MAX_PATH - i, L"\\"); Type = GetDriveTypeW(Path); ok(IS_DRIVE_TYPE_VALID(Type), "Expected valid drive type, got %u\n", Type); - - wcscpy(Path+i, L"/"); + + StringCchCopyW(Path + i, MAX_PATH - i, L"/"); Type = GetDriveTypeW(Path); ok(IS_DRIVE_TYPE_VALID(Type), "Expected valid drive type, got %u\n", Type); - - wcscpy(Path+i, L"\\\\"); + + StringCchCopyW(Path + i, MAX_PATH - i, L"\\\\"); Type = GetDriveTypeW(Path); ok(IS_DRIVE_TYPE_VALID(Type), "Expected valid drive type, got %u\n", Type); }

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