Ros-diffs

ros-diffs@reactos.org

81390 discussions

[pschweitzer] 54420: [EXPLORER] Remove dead code/file. ReactOS has its own implementation of those functions. The file was even not built any longer.
by pschweitzer＠svn.reactos.org 18 Nov '11

18 Nov '11

Author: pschweitzer Date: Fri Nov 18 19:49:08 2011 New Revision: 54420 URL: http://svn.reactos.org/svn/reactos?rev=54420&view=rev Log: [EXPLORER] Remove dead code/file. ReactOS has its own implementation of those functions. The file was even not built any longer. Removed: trunk/reactos/base/shell/explorer/utility/splitpath.c Removed: trunk/reactos/base/shell/explorer/utility/splitpath.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/utilit… ============================================================================== --- trunk/reactos/base/shell/explorer/utility/splitpath.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/utility/splitpath.c (removed) @@ -1,151 +1,0 @@ -/* - * Copyright 2000 Martin Fuchs - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include "utility.h" - -#ifdef UNICODE - -void _wsplitpath(const WCHAR* path, WCHAR* drv, WCHAR* dir, WCHAR* name, WCHAR* ext) -{ - const WCHAR* end; /* end of processed string */ - const WCHAR* p; /* search pointer */ - const WCHAR* s; /* copy pointer */ - - /* extract drive name */ - if (path[0] && path[1]==':') { - if (drv) { - *drv++ = *path++; - *drv++ = *path++; - *drv = L'\0'; - } - } else if (drv) - *drv = L'\0'; - - /* search for end of string or stream separator */ - for(end=path; *end && *end!=L':'; ) - end++; - - /* search for begin of file extension */ - for(p=end; p>path && *--p!=L'\\' && *p!=L'/'; ) - if (*p == L'.') { - end = p; - break; - } - - if (ext) - for(s=end; *ext=*s++; ) - ext++; - - /* search for end of directory name */ - for(p=end; p>path; ) - if (*--p=='\\' || *p=='/') { - p++; - break; - } - - if (name) { - for(s=p; s<end; ) - *name++ = *s++; - - *name = L'\0'; - } - - if (dir) { - for(s=path; s<p; ) - *dir++ = *s++; - - *dir = L'\0'; - } -} - -#else - -void _splitpath(const CHAR* path, CHAR* drv, CHAR* dir, CHAR* name, CHAR* ext) -{ - const CHAR* end; /* end of processed string */ - const CHAR* p; /* search pointer */ - const CHAR* s; /* copy pointer */ - - /* extract drive name */ - if (path[0] && path[1]==':') { - if (drv) { - *drv++ = *path++; - *drv++ = *path++; - *drv = '\0'; - } - } else if (drv) - *drv = '\0'; - - /* search for end of string or stream separator */ - for(end=path; *end && *end!=':'; ) - end++; - - /* search for begin of file extension */ - for(p=end; p>path && *--p!='\\' && *p!='/'; ) - if (*p == '.') { - end = p; - break; - } - - if (ext) - for(s=end; (*ext=*s++); ) - ext++; - - /* search for end of directory name */ - for(p=end; p>path; ) - if (*--p=='\\' || *p=='/') { - p++; - break; - } - - if (name) { - for(s=p; s<end; ) - *name++ = *s++; - - *name = '\0'; - } - - if (dir) { - for(s=path; s<p; ) - *dir++ = *s++; - - *dir = '\0'; - } -} - -#endif - -/* -void main() // test splipath() -{ - TCHAR drv[_MAX_DRIVE+1], dir[_MAX_DIR], name[_MAX_FNAME], ext[_MAX_EXT]; - - _tsplitpath(L"x\\y", drv, dir, name, ext); - _tsplitpath(L"x\\", drv, dir, name, ext); - _tsplitpath(L"\\x", drv, dir, name, ext); - _tsplitpath(L"x", drv, dir, name, ext); - _tsplitpath(L"", drv, dir, name, ext); - _tsplitpath(L".x", drv, dir, name, ext); - _tsplitpath(L":x", drv, dir, name, ext); - _tsplitpath(L"a:x", drv, dir, name, ext); - _tsplitpath(L"a.b:x", drv, dir, name, ext); - _tsplitpath(L"W:\\/\\abc/Z:~", drv, dir, name, ext); - _tsplitpath(L"abc.EFGH:12345", drv, dir, name, ext); - _tsplitpath(L"C:/dos/command.com", drv, dir, name, ext); -} -*/

1 0

[rharabien] 54419: [SHELL32] - Remove "retrieve display name from control panel app" FIXME - it's already done + minor code improvements.
by rharabien＠svn.reactos.org 18 Nov '11

18 Nov '11

Author: rharabien Date: Fri Nov 18 19:30:21 2011 New Revision: 54419 URL: http://svn.reactos.org/svn/reactos?rev=54419&view=rev Log: [SHELL32] - Remove "retrieve display name from control panel app" FIXME - it's already done + minor code improvements. Modified: trunk/reactos/dll/win32/shell32/shfldr_cpanel.cpp Modified: trunk/reactos/dll/win32/shell32/shfldr_cpanel.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_c… ============================================================================== --- trunk/reactos/dll/win32/shell32/shfldr_cpanel.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shfldr_cpanel.cpp [iso-8859-1] Fri Nov 18 19:30:21 2011 @@ -566,11 +566,11 @@ */ HRESULT WINAPI CControlPanelFolder::GetDisplayNameOf(LPCITEMIDLIST pidl, DWORD dwFlags, LPSTRRET strRet) { - CHAR szPath[MAX_PATH]; - WCHAR wszPath[MAX_PATH+1]; /* +1 for potential backslash */ - PIDLCPanelStruct* pcpanel; - - *szPath = '\0'; + CHAR szName[MAX_PATH]; + WCHAR wszName[MAX_PATH+1]; /* +1 for potential backslash */ + PIDLCPanelStruct *pCPanel; + + *szName = '\0'; TRACE("(%p)->(pidl=%p,0x%08x,%p)\n", this, pidl, dwFlags, strRet); pdump(pidl); @@ -578,14 +578,13 @@ if (!pidl || !strRet) return E_INVALIDARG; - pcpanel = _ILGetCPanelPointer(pidl); - - if (pcpanel) - { - lstrcpyA(szPath, pcpanel->szName+pcpanel->offsDispName); - - if (!(dwFlags & SHGDN_FORPARSING)) - FIXME("retrieve display name from control panel app\n"); + pCPanel = _ILGetCPanelPointer(pidl); + + if (pCPanel) + { + /* copy display name from pidl - it was retrived from applet before; + SHGDN_FORPARSING does not need special handling */ + lstrcpyA(szName, pCPanel->szName + pCPanel->offsDispName); } /* take names of special folders only if it's only this folder */ else if (_ILIsSpecialFolder(pidl)) @@ -594,7 +593,7 @@ if (bSimplePidl) { - _ILSimpleGetTextW(pidl, wszPath, MAX_PATH); /* append my own path */ + _ILSimpleGetTextW(pidl, wszName, MAX_PATH); /* append my own path */ } else { @@ -606,29 +605,29 @@ /* go deeper if needed */ int len = 0; - PathAddBackslashW(wszPath); - len = wcslen(wszPath); - - if (!SUCCEEDED(SHELL32_GetDisplayNameOfChild(this, pidl, dwFlags, wszPath + len, MAX_PATH + 1 - len))) + PathAddBackslashW(wszName); + len = wcslen(wszName); + + if (!SUCCEEDED(SHELL32_GetDisplayNameOfChild(this, pidl, dwFlags, wszName + len, MAX_PATH + 1 - len))) return E_OUTOFMEMORY; - if (!WideCharToMultiByte(CP_ACP, 0, wszPath, -1, szPath, MAX_PATH, NULL, NULL)) - wszPath[0] = '\0'; + if (!WideCharToMultiByte(CP_ACP, 0, wszName, -1, szName, MAX_PATH, NULL, NULL)) + wszName[0] = '\0'; } else { if (bSimplePidl) { - if (!WideCharToMultiByte(CP_ACP, 0, wszPath, -1, szPath, MAX_PATH, NULL, NULL)) - wszPath[0] = '\0'; + if (!WideCharToMultiByte(CP_ACP, 0, wszName, -1, szName, MAX_PATH, NULL, NULL)) + wszName[0] = '\0'; } } } strRet->uType = STRRET_CSTR; - lstrcpynA(strRet->cStr, szPath, MAX_PATH); - - TRACE("--(%p)->(%s)\n", this, szPath); + lstrcpynA(strRet->cStr, szName, MAX_PATH); + + TRACE("--(%p)->(%s)\n", this, szName); return S_OK; }

1 0

[cgutman] 54418: [HALX86] - Do not allow software interrupts to preempt code running with interrupts disabled during KfLowerIrql
by cgutman＠svn.reactos.org 18 Nov '11

18 Nov '11

Author: cgutman Date: Fri Nov 18 18:53:41 2011 New Revision: 54418 URL: http://svn.reactos.org/svn/reactos?rev=54418&view=rev Log: [HALX86] - Do not allow software interrupts to preempt code running with interrupts disabled during KfLowerIrql Modified: trunk/reactos/hal/halx86/up/pic.c Modified: trunk/reactos/hal/halx86/up/pic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/up/pic.c?rev=54… ============================================================================== --- trunk/reactos/hal/halx86/up/pic.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/up/pic.c [iso-8859-1] Fri Nov 18 18:53:41 2011 @@ -665,26 +665,30 @@ /* Set old IRQL */ Pcr->Irql = OldIrql; - - /* Check for pending software interrupts and compare with current IRQL */ - PendingIrqlMask = Pcr->IRR & FindHigherIrqlMask[OldIrql]; - if (PendingIrqlMask) - { - /* Check if pending IRQL affects hardware state */ - BitScanReverse(&PendingIrql, PendingIrqlMask); - if (PendingIrql > DISPATCH_LEVEL) + + /* Make sure interrupts were enabled */ + if (EFlags & EFLAGS_INTERRUPT_MASK) + { + /* Check for pending software interrupts and compare with current IRQL */ + PendingIrqlMask = Pcr->IRR & FindHigherIrqlMask[OldIrql]; + if (PendingIrqlMask) { - /* Set new PIC mask */ - Mask.Both = Pcr->IDR; - __outbyte(PIC1_DATA_PORT, Mask.Master); - __outbyte(PIC2_DATA_PORT, Mask.Slave); - - /* Clear IRR bit */ - Pcr->IRR ^= (1 << PendingIrql); + /* Check if pending IRQL affects hardware state */ + BitScanReverse(&PendingIrql, PendingIrqlMask); + if (PendingIrql > DISPATCH_LEVEL) + { + /* Set new PIC mask */ + Mask.Both = Pcr->IDR; + __outbyte(PIC1_DATA_PORT, Mask.Master); + __outbyte(PIC2_DATA_PORT, Mask.Slave); + + /* Clear IRR bit */ + Pcr->IRR ^= (1 << PendingIrql); + } + + /* Now handle pending interrupt */ + SWInterruptHandlerTable[PendingIrql](); } - - /* Now handle pending interrupt */ - SWInterruptHandlerTable[PendingIrql](); } /* Restore interrupt state */

1 0

[pschweitzer] 54417: [MSVCRT_APITEST] Add msvcrt_apitest to CDs
by pschweitzer＠svn.reactos.org 18 Nov '11

18 Nov '11

Author: pschweitzer Date: Fri Nov 18 18:25:44 2011 New Revision: 54417 URL: http://svn.reactos.org/svn/reactos?rev=54417&view=rev Log: [MSVCRT_APITEST] Add msvcrt_apitest to CDs Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Fri Nov 18 18:25:44 2011 @@ -874,6 +874,7 @@ modules\rostests\apitests\dciman32\dciman32_apitest.exe 7 optional modules\rostests\apitests\gdi32\gdi32_apitest.exe 7 optional modules\rostests\apitests\kernel32\kernel32_apitest.exe 7 optional +modules\rostests\apitests\msvcrt\msvcrt_apitest.exe 7 optional modules\rostests\apitests\ntdll\ntdll_apitest.exe 7 optional modules\rostests\apitests\user32\user32_apitest.exe 7 optional modules\rostests\apitests\ws2_32\ws2_32_apitest.exe 7 optional

1 0

[pschweitzer] 54416: [MSVCRT_APITEST] Build msvcrt_apitest
by pschweitzer＠svn.reactos.org 18 Nov '11

18 Nov '11

Author: pschweitzer Date: Fri Nov 18 18:23:43 2011 New Revision: 54416 URL: http://svn.reactos.org/svn/reactos?rev=54416&view=rev Log: [MSVCRT_APITEST] Build msvcrt_apitest Modified: trunk/rostests/apitests/CMakeLists.txt trunk/rostests/apitests/directory.rbuild Modified: trunk/rostests/apitests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/CMakeLists.txt?r… ============================================================================== --- trunk/rostests/apitests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/CMakeLists.txt [iso-8859-1] Fri Nov 18 18:23:43 2011 @@ -4,6 +4,7 @@ add_subdirectory(advapi32) add_subdirectory(dciman32) add_subdirectory(gdi32) +add_subdirectory(msvcrt) add_subdirectory(ntdll) add_subdirectory(user32) add_subdirectory(kernel32) Modified: trunk/rostests/apitests/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/directory.rbuild… ============================================================================== --- trunk/rostests/apitests/directory.rbuild [iso-8859-1] (original) +++ trunk/rostests/apitests/directory.rbuild [iso-8859-1] Fri Nov 18 18:23:43 2011 @@ -16,6 +16,10 @@ <directory name="gdi32"> <xi:include href="gdi32/gdi32_apitest.rbuild" /> + </directory> + + <directory name="msvcrt"> + <xi:include href="msvcrt/msvcrt_apitest.rbuild" /> </directory> <directory name="ntdll">

1 0

[cgutman] 54415: [I8042PRT] - Implement support for hot plugging PS/2 mice if one was present at boot (same requirement as Windows) - Fixes bug 1395
by cgutman＠svn.reactos.org 17 Nov '11

17 Nov '11

Author: cgutman Date: Thu Nov 17 23:41:18 2011 New Revision: 54415 URL: http://svn.reactos.org/svn/reactos?rev=54415&view=rev Log: [I8042PRT] - Implement support for hot plugging PS/2 mice if one was present at boot (same requirement as Windows) - Fixes bug 1395 Modified: trunk/reactos/drivers/input/i8042prt/mouse.c Modified: trunk/reactos/drivers/input/i8042prt/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/mou… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/mouse.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/i8042prt/mouse.c [iso-8859-1] Thu Nov 17 23:41:18 2011 @@ -361,12 +361,8 @@ Irql = KeAcquireInterruptSpinLock(PortDeviceExtension->HighestDIRQLInterrupt); - WARN_(I8042PRT, "Mouse initialization timeout! (substate %x). Disabling mouse.\n", + WARN_(I8042PRT, "Mouse initialization timeout! (substate %x)\n", DeviceExtension->MouseResetState); - - i8042Flush(PortDeviceExtension); - i8042ChangeMode(PortDeviceExtension, CCB_MOUSE_INT_ENAB, CCB_MOUSE_DISAB); - i8042Flush(PortDeviceExtension); PortDeviceExtension->Flags &= ~MOUSE_PRESENT; @@ -633,8 +629,21 @@ if (i8042MouCallIsrHook(DeviceExtension, Status, Value, &ToReturn)) return ToReturn; - if (MouseResetting != DeviceExtension->MouseState) + if (MouseIdle == DeviceExtension->MouseState) + { + /* Magic packet value that indicates a reset */ + if (0xAA == Value) + { + WARN_(I8042PRT, "Hot plugged mouse!\n"); + DeviceExtension->MouseState = MouseResetting; + DeviceExtension->MouseResetState = ExpectingReset; + } + else + return FALSE; + } + else if (MouseResetting != DeviceExtension->MouseState) return FALSE; + DeviceExtension->MouseTimeoutState = TimeoutStart; PortDeviceExtension = DeviceExtension->Common.PortDeviceExtension; @@ -870,6 +879,7 @@ DeviceExtension->MouseResetState = ExpectingEnableACK; return TRUE; case ExpectingEnableACK: + PortDeviceExtension->Flags |= MOUSE_PRESENT; DeviceExtension->MouseState = MouseIdle; DeviceExtension->MouseTimeoutState = TimeoutCancel; INFO_(I8042PRT, "Mouse type = %u\n", DeviceExtension->MouseType);

1 0

[pschweitzer] 54414: [CRT] Fix _fpclass. Spotted by: Vincenzo Cotugno Reviewed by: Timo Kreuzer
by pschweitzer＠svn.reactos.org 17 Nov '11

17 Nov '11

Author: pschweitzer Date: Thu Nov 17 22:38:15 2011 New Revision: 54414 URL: http://svn.reactos.org/svn/reactos?rev=54414&view=rev Log: [CRT] Fix _fpclass. Spotted by: Vincenzo Cotugno Reviewed by: Timo Kreuzer Modified: trunk/reactos/lib/sdk/crt/float/fpclass.c trunk/reactos/lib/sdk/crt/float/isnan.c Modified: trunk/reactos/lib/sdk/crt/float/fpclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/float/fpclass.… ============================================================================== --- trunk/reactos/lib/sdk/crt/float/fpclass.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/float/fpclass.c [iso-8859-1] Thu Nov 17 22:38:15 2011 @@ -1,8 +1,8 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries - * FILE: lib/crt/?????? - * PURPOSE: Unknown + * FILE: lib/sdk/crt/float/fpclass.c + * PURPOSE: Floating-point classes * PROGRAMER: Unknown * UPDATE HISTORY: * 25/11/05: Added license header @@ -55,32 +55,28 @@ d.__d = &__d; if ( d.d->exponent == 0 ) { - if ( d.d->mantissah == 0 && d.d->mantissal == 0 ) { - if ( d.d->sign ==0 ) + if ( d.d->mantissah == 0 && d.d->mantissal == 0 ) { + if ( d.d->sign == 0 ) + return FP_PZERO; + else return FP_NZERO; + } else { + if ( d.d->sign == 0 ) + return FP_PDENORM; else - return FP_PZERO; - } else { - if ( d.d->sign ==0 ) return FP_NDENORM; - else - return FP_PDENORM; } } - if (d.d->exponent == 0x7ff ) { - if ( d.d->mantissah == 0 && d.d->mantissal == 0 ) { - if ( d.d->sign ==0 ) + else if (d.d->exponent == 0x7ff ) { + if ( d.d->mantissah == 0 && d.d->mantissal == 0 ) { + if ( d.d->sign == 0 ) + return FP_PINF; + else return FP_NINF; - else - return FP_PINF; } - else if ( d.d->mantissah == 0 && d.d->mantissal != 0 ) { + else if ( (d.d->mantissah & 0x80000) != 0 ) { return FP_QNAN; } - else if ( d.d->mantissah == 0 && d.d->mantissal != 0 ) { - return FP_SNAN; - } - } - return 0; + return FP_SNAN; } Modified: trunk/reactos/lib/sdk/crt/float/isnan.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/float/isnan.c?… ============================================================================== --- trunk/reactos/lib/sdk/crt/float/isnan.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/float/isnan.c [iso-8859-1] Thu Nov 17 22:38:15 2011 @@ -50,7 +50,7 @@ exponent and a nonzero mantissa. */ return (( x.x->exponent == 0x7fff) - && ( (x.x->mantissah & 0x80000000) != 0) + && ( (x.x->mantissah & 0x80000) != 0) && ( (x.x->mantissah & (unsigned int)0x7fffffff) != 0 || x.x->mantissal != 0 )); } @@ -91,7 +91,7 @@ maximum possible value and a zero mantissa. */ - if ( x.x->exponent == 0x7fff && ( (x.x->mantissah == 0x80000000 ) && x.x->mantissal == 0 )) + if ( x.x->exponent == 0x7fff && ( (x.x->mantissah == 0x80000 ) && x.x->mantissal == 0 )) return x.x->sign ? -1 : 1; return 0; }

1 0

[rharabien] 54413: [SHELL32] - Revert r54404
by rharabien＠svn.reactos.org 17 Nov '11

17 Nov '11

Author: rharabien Date: Thu Nov 17 22:19:48 2011 New Revision: 54413 URL: http://svn.reactos.org/svn/reactos?rev=54413&view=rev Log: [SHELL32] - Revert r54404 Modified: trunk/reactos/dll/win32/shell32/shell32_main.cpp Modified: trunk/reactos/dll/win32/shell32/shell32_main.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_main.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32_main.cpp [iso-8859-1] Thu Nov 17 22:19:48 2011 @@ -1377,6 +1377,11 @@ HIMAGELIST ShellSmallIconList = 0; HIMAGELIST ShellBigIconList = 0; +void *operator new (size_t, void *buf) +{ + return buf; +} + /************************************************************************* * SHELL32 DllMain * @@ -1388,6 +1393,12 @@ TRACE("%p 0x%x %p\n", hInstance, dwReason, fImpLoad); if (dwReason == DLL_PROCESS_ATTACH) { + /* HACK - the global constructors don't run, so I placement new them here */ + new (&gModule) CShell32Module; + new (&_AtlWinModule) CAtlWinModule; + new (&_AtlBaseModule) CAtlBaseModule; + new (&_AtlComModule) CAtlComModule; + shell32_hInstance = hInstance; gModule.Init(ObjectMap, hInstance, NULL);

1 0

[cgutman] 54412: [I8042PRT] - Discard extra ACK packets from the mouse during reset - Fixes certain mice that send the ACK out of order
by cgutman＠svn.reactos.org 17 Nov '11

17 Nov '11

Author: cgutman Date: Thu Nov 17 21:19:32 2011 New Revision: 54412 URL: http://svn.reactos.org/svn/reactos?rev=54412&view=rev Log: [I8042PRT] - Discard extra ACK packets from the mouse during reset - Fixes certain mice that send the ACK out of order Modified: trunk/reactos/drivers/input/i8042prt/mouse.c Modified: trunk/reactos/drivers/input/i8042prt/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/mou… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/mouse.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/i8042prt/mouse.c [iso-8859-1] Thu Nov 17 21:19:32 2011 @@ -458,7 +458,7 @@ IoMarkIrpPending(Irp); DeviceExtension->MouseState = MouseResetting; - DeviceExtension->MouseResetState = 1100; + DeviceExtension->MouseResetState = ExpectingReset; DeviceExtension->MouseHook.IsrWritePort = i8042MouIsrWritePort; DeviceExtension->MouseHook.QueueMousePacket = i8042MouQueuePacket; DeviceExtension->MouseHook.CallContext = DeviceExtension; @@ -640,10 +640,13 @@ switch ((ULONG)DeviceExtension->MouseResetState) { - case 1100: /* the first ack, drop it. */ - DeviceExtension->MouseResetState = ExpectingReset; - return TRUE; case ExpectingReset: + if (MOUSE_ACK == Value) + { + WARN_(I8042PRT, "Dropping extra ACK\n"); + return TRUE; + } + /* First, 0xFF is sent. The mouse is supposed to say AA00 if ok, FC00 if not. */ if (0xAA == Value) { @@ -657,6 +660,12 @@ } return TRUE; case ExpectingResetId: + if (MOUSE_ACK == Value) + { + WARN_(I8042PRT, "Dropping extra ACK #2\n"); + return TRUE; + } + if (0x00 == Value) { DeviceExtension->MouseResetState++;

1 0

[dgorbachev] 54411: [SMSS] Limit the size of swapfile (to 2GiB). Bug #4760.
by dgorbachev＠svn.reactos.org 17 Nov '11

17 Nov '11

Author: dgorbachev Date: Thu Nov 17 20:22:16 2011 New Revision: 54411 URL: http://svn.reactos.org/svn/reactos?rev=54411&view=rev Log: [SMSS] Limit the size of swapfile (to 2GiB). Bug #4760. Modified: trunk/reactos/base/system/smss/initpage.c Modified: trunk/reactos/base/system/smss/initpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/initpage.… ============================================================================== --- trunk/reactos/base/system/smss/initpage.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss/initpage.c [iso-8859-1] Thu Nov 17 20:22:16 2011 @@ -196,6 +196,12 @@ } + /* FIXME */ + if (InitialSize.QuadPart > (ULONGLONG)GIGABYTE * 2) + InitialSize.QuadPart = (ULONGLONG)GIGABYTE * 2; + if (MaximumSize.QuadPart > (ULONGLONG)GIGABYTE * 2) + MaximumSize.QuadPart = (ULONGLONG)GIGABYTE * 2; + /* Make sure that max is not smaller then initial */ if (InitialSize.QuadPart > MaximumSize.QuadPart) { @@ -457,6 +463,12 @@ } } + /* FIXME */ + if (InitialSizeInMB.QuadPart > 2048) + InitialSizeInMB.QuadPart = 2048; + if (MaximumSizeInMB.QuadPart > 2048) + MaximumSizeInMB.QuadPart = 2048; + DPRINT("InitialSize %I64u MB MaximumSize %I64u MB\n", InitialSizeInMB.QuadPart, MaximumSizeInMB.QuadPart);

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