Ros-diffs November 2011

ros-diffs@reactos.org

16 participants
274 discussions

[rharabien] 54424: [SHELL32] - Fix dereferencing context menu object twice.

by rharabien＠svn.reactos.org

Author: rharabien Date: Fri Nov 18 21:07:18 2011 New Revision: 54424 URL: http://svn.reactos.org/svn/reactos?rev=54424&view=rev Log: [SHELL32] - Fix dereferencing context menu object twice. Modified: trunk/reactos/dll/win32/shell32/shlview.cpp Modified: trunk/reactos/dll/win32/shell32/shlview.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlview.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlview.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlview.cpp [iso-8859-1] Fri Nov 18 21:07:18 2011 @@ -1143,7 +1143,6 @@ DestroyMenu( hmenu ); hr = IUnknown_SetSite(cm, NULL); } - cm->Release(); }

12 years, 10 months

[rharabien] 54423: [SHELL32] - Fix "No text" warnings when starting control panel

by rharabien＠svn.reactos.org

Author: rharabien Date: Fri Nov 18 20:50:26 2011 New Revision: 54423 URL: http://svn.reactos.org/svn/reactos?rev=54423&view=rev Log: [SHELL32] - Fix "No text" warnings when starting control panel Modified: trunk/reactos/dll/win32/shell32/pidl.cpp Modified: trunk/reactos/dll/win32/shell32/pidl.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/pidl.cpp… ============================================================================== --- trunk/reactos/dll/win32/shell32/pidl.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/pidl.cpp [iso-8859-1] Fri Nov 18 20:50:26 2011 @@ -2014,6 +2014,9 @@ case PT_NETPROVIDER: case PT_SHARE: return pdata->u.network.szNames; + + case PT_CPLAPPLET: + return pdata->u.cpanel.szName; } return NULL; }

12 years, 10 months

[rharabien] 54422: [SHELL32] - Improve method names and simplify _ILCreateCPanelApplet

by rharabien＠svn.reactos.org

Author: rharabien Date: Fri Nov 18 20:26:33 2011 New Revision: 54422 URL: http://svn.reactos.org/svn/reactos?rev=54422&view=rev Log: [SHELL32] - Improve method names and simplify _ILCreateCPanelApplet 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 20:26:33 2011 @@ -41,9 +41,9 @@ CControlPanelEnum(); ~CControlPanelEnum(); HRESULT WINAPI Initialize(DWORD dwFlags); - BOOL SHELL_RegisterCPanelApp(LPCSTR path); - int SHELL_RegisterRegistryCPanelApps(HKEY hkey_root, LPCSTR szRepPath); - int SHELL_RegisterCPanelFolders(HKEY hkey_root, LPCSTR szRepPath); + BOOL RegisterCPanelApp(LPCSTR path); + int RegisterRegistryCPanelApps(HKEY hkey_root, LPCSTR szRepPath); + int RegisterCPanelFolders(HKEY hkey_root, LPCSTR szRepPath); BOOL CreateCPanelEnumList(DWORD dwFlags); BEGIN_COM_MAP(CControlPanelEnum) @@ -77,43 +77,41 @@ return S_OK; } -static LPITEMIDLIST _ILCreateCPanelApplet(LPCSTR name, LPCSTR displayName, LPCSTR comment, int iconIdx) -{ - PIDLCPanelStruct *p; +static LPITEMIDLIST _ILCreateCPanelApplet(LPCSTR pszName, LPCSTR pszDisplayName, LPCSTR pszComment, int iIconIdx) +{ + PIDLCPanelStruct *pCP; LPITEMIDLIST pidl; - PIDLDATA tmp; - int size0 = (char*)&tmp.u.cpanel.szName - (char*)&tmp.u.cpanel; - int size = size0; - int l; - - tmp.type = PT_CPLAPPLET; - tmp.u.cpanel.dummy = 0; - tmp.u.cpanel.iconIdx = iconIdx; - - l = strlen(name); - size += l + 1; - - tmp.u.cpanel.offsDispName = l+1; - l = strlen(displayName); - size += l + 1; - - tmp.u.cpanel.offsComment = tmp.u.cpanel.offsDispName + 1 + l; - l = strlen(comment); - size += l + 1; - - pidl = (LPITEMIDLIST)SHAlloc(size + 4); + LPPIDLDATA pData; + int cchName, cchDisplayName, cchComment, cbData; + + /* Calculate lengths of given strings */ + cchName = strlen(pszName); + cchDisplayName = strlen(pszDisplayName); + cchComment = strlen(pszComment); + + /* Allocate PIDL */ + cbData = sizeof(pidl->mkid.cb) + sizeof(pData->type) + sizeof(pData->u.cpanel) - sizeof(pData->u.cpanel.szName) + + cchName + cchDisplayName + cchComment + 3; + pidl = (LPITEMIDLIST)SHAlloc(cbData + sizeof(WORD)); if (!pidl) return NULL; - pidl->mkid.cb = size + 2; - memcpy(pidl->mkid.abID, &tmp, 2 + size0); - - p = &((PIDLDATA *)pidl->mkid.abID)->u.cpanel; - strcpy(p->szName, name); - strcpy(p->szName+tmp.u.cpanel.offsDispName, displayName); - strcpy(p->szName+tmp.u.cpanel.offsComment, comment); - - *(WORD*)((char*)pidl + (size + 2)) = 0; + /* Copy data to allocated memory */ + pidl->mkid.cb = cbData; + pData = (PIDLDATA *)pidl->mkid.abID; + pData->type = PT_CPLAPPLET; + + pCP = &pData->u.cpanel; + pCP->dummy = 0; + pCP->iconIdx = iIconIdx; + strcpy(pCP->szName, pszName); + pCP->offsDispName = cchName + 1; + strcpy(pCP->szName + pCP->offsDispName, pszDisplayName); + pCP->offsComment = pCP->offsDispName + cchDisplayName + 1; + strcpy(pCP->szName + pCP->offsComment, pszComment); + + /* Add PIDL NULL terminator */ + *(WORD*)(pCP->szName + pCP->offsComment + cchComment + 1) = 0; pcheck(pidl); @@ -134,7 +132,7 @@ return NULL; } -BOOL CControlPanelEnum::SHELL_RegisterCPanelApp(LPCSTR path) +BOOL CControlPanelEnum::RegisterCPanelApp(LPCSTR path) { LPITEMIDLIST pidl; CPlApplet* applet; @@ -177,7 +175,7 @@ return TRUE; } -int CControlPanelEnum::SHELL_RegisterRegistryCPanelApps(HKEY hkey_root, LPCSTR szRepPath) +int CControlPanelEnum::RegisterRegistryCPanelApps(HKEY hkey_root, LPCSTR szRepPath) { char name[MAX_PATH]; char value[MAX_PATH]; @@ -197,7 +195,7 @@ if (RegEnumValueA(hkey, idx, name, &nameLen, NULL, NULL, (LPBYTE)&value, &valueLen) != ERROR_SUCCESS) break; - if (SHELL_RegisterCPanelApp(value)) + if (RegisterCPanelApp(value)) ++cnt; } RegCloseKey(hkey); @@ -206,7 +204,7 @@ return cnt; } -int CControlPanelEnum::SHELL_RegisterCPanelFolders(HKEY hkey_root, LPCSTR szRepPath) +int CControlPanelEnum::RegisterCPanelFolders(HKEY hkey_root, LPCSTR szRepPath) { char name[MAX_PATH]; HKEY hkey; @@ -249,7 +247,7 @@ /* enumerate control panel folders */ if (dwFlags & SHCONTF_FOLDERS) - SHELL_RegisterCPanelFolders(HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\ControlPanel\\NameSpace"); + RegisterCPanelFolders(HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\ControlPanel\\NameSpace"); /* enumerate the control panel applets */ if (dwFlags & SHCONTF_NONFOLDERS) @@ -273,14 +271,14 @@ if (!(wfd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) { strcpy(p, wfd.cFileName); if (strcmp(wfd.cFileName, "ncpa.cpl")) - SHELL_RegisterCPanelApp(szPath); + RegisterCPanelApp(szPath); } } while(FindNextFileA(hFile, &wfd)); FindClose(hFile); } - SHELL_RegisterRegistryCPanelApps(HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Control Panel\\Cpls"); - SHELL_RegisterRegistryCPanelApps(HKEY_CURRENT_USER, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Control Panel\\Cpls"); + RegisterRegistryCPanelApps(HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Control Panel\\Cpls"); + RegisterRegistryCPanelApps(HKEY_CURRENT_USER, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Control Panel\\Cpls"); } return TRUE; }

12 years, 10 months

[pschweitzer] 54421: [EXPLORER] Remove not needed comment

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Fri Nov 18 19:51:02 2011 New Revision: 54421 URL: http://svn.reactos.org/svn/reactos?rev=54421&view=rev Log: [EXPLORER] Remove not needed comment Modified: trunk/reactos/base/shell/explorer/CMakeLists.txt Modified: trunk/reactos/base/shell/explorer/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/CMakeL… ============================================================================== --- trunk/reactos/base/shell/explorer/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/CMakeLists.txt [iso-8859-1] Fri Nov 18 19:51:02 2011 @@ -49,7 +49,6 @@ utility/dragdropimpl.cpp utility/utility.cpp utility/xmlstorage.cpp -# utility/splitpath.c msvcrt has _wsplitpath already utility/window.cpp utility/shellbrowserimpl.cpp) # utility/shelltests.cpp

12 years, 10 months

[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

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); -} -*/

12 years, 10 months

[rharabien] 54419: [SHELL32] - Remove "retrieve display name from control panel app" FIXME - it's already done + minor code improvements.

by rharabien＠svn.reactos.org

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

12 years, 10 months

[cgutman] 54418: [HALX86] - Do not allow software interrupts to preempt code running with interrupts disabled during KfLowerIrql

by cgutman＠svn.reactos.org

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 */

12 years, 10 months

[pschweitzer] 54417: [MSVCRT_APITEST] Add msvcrt_apitest to CDs

by pschweitzer＠svn.reactos.org

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

12 years, 10 months

[pschweitzer] 54416: [MSVCRT_APITEST] Build msvcrt_apitest

by pschweitzer＠svn.reactos.org

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

12 years, 10 months

[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

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

12 years, 10 months

← Newer
1
...
11
12
13
14
15
16
17
...
28
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 November 2011