Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tfaber] 71982: [NTOS:IO] - Avoid infinite loop in IopMountVolume. Brought to you by Vadim Galyant. CORE-11663 #resolve
by tfaber＠svn.reactos.org 23 Jul '16

23 Jul '16

Author: tfaber Date: Sat Jul 23 18:18:11 2016 New Revision: 71982 URL: http://svn.reactos.org/svn/reactos?rev=71982&view=rev Log: [NTOS:IO] - Avoid infinite loop in IopMountVolume. Brought to you by Vadim Galyant. CORE-11663 #resolve Modified: trunk/reactos/ntoskrnl/io/iomgr/volume.c Modified: trunk/reactos/ntoskrnl/io/iomgr/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/volume.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/volume.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/volume.c [iso-8859-1] Sat Jul 23 18:18:11 2016 @@ -554,6 +554,7 @@ (ListEntry->Flink != FsList)) { /* Then skip this entry */ + ListEntry = ListEntry->Flink; continue; }

1 0

[mjansen] 71981: [SHELL32] Addendum to r71980, RegSetValueEx expects a size in bytes, not chars. CORE-10439
by mjansen＠svn.reactos.org 23 Jul '16

23 Jul '16

Author: mjansen Date: Sat Jul 23 13:15:19 2016 New Revision: 71981 URL: http://svn.reactos.org/svn/reactos?rev=71981&view=rev Log: [SHELL32] Addendum to r71980, RegSetValueEx expects a size in bytes, not chars. CORE-10439 Modified: trunk/reactos/dll/win32/shell32/CNewMenu.cpp Modified: trunk/reactos/dll/win32/shell32/CNewMenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CNewMenu… ============================================================================== --- trunk/reactos/dll/win32/shell32/CNewMenu.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CNewMenu.cpp [iso-8859-1] Sat Jul 23 13:15:19 2016 @@ -224,7 +224,7 @@ return FALSE; } - if (RegSetValueExW(hKey, L"Classes", NULL, REG_MULTI_SZ, (LPBYTE)lpValues, dwSize) != ERROR_SUCCESS) + if (RegSetValueExW(hKey, L"Classes", NULL, REG_MULTI_SZ, (LPBYTE)lpValues, dwSize * sizeof(WCHAR)) != ERROR_SUCCESS) { HeapFree(GetProcessHeap(), 0, lpValues); return FALSE;

1 0

[cwittich] 71980: [SHELL32] cache entries of "New" menu CORE-10439
by cwittich＠svn.reactos.org 23 Jul '16

23 Jul '16

Author: cwittich Date: Sat Jul 23 12:31:30 2016 New Revision: 71980 URL: http://svn.reactos.org/svn/reactos?rev=71980&view=rev Log: [SHELL32] cache entries of "New" menu CORE-10439 Modified: trunk/reactos/dll/win32/shell32/CNewMenu.cpp trunk/reactos/dll/win32/shell32/CNewMenu.h Modified: trunk/reactos/dll/win32/shell32/CNewMenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CNewMenu… ============================================================================== --- trunk/reactos/dll/win32/shell32/CNewMenu.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CNewMenu.cpp [iso-8859-1] Sat Jul 23 12:31:30 2016 @@ -163,17 +163,18 @@ } BOOL -CNewMenu::LoadAllItems() -{ +CNewMenu::CacheItems() +{ + HKEY hKey; + DWORD dwSize = 0; DWORD dwIndex = 0; + LPWSTR lpValue; + LPWSTR lpValues; WCHAR wszName[MAX_PATH]; SHELLNEW_ITEM *pNewItem; SHELLNEW_ITEM *pCurItem = NULL; - /* If there are any unload them */ - UnloadAllItems(); - - /* Enumerate all extesions */ + /* Enumerate all extensions */ while (RegEnumKeyW(HKEY_CLASSES_ROOT, dwIndex++, wszName, _countof(wszName)) == ERROR_SUCCESS) { if (wszName[0] != L'.') @@ -182,6 +183,7 @@ pNewItem = LoadItem(wszName); if (pNewItem) { + dwSize += wcslen(wszName) + 1; if (wcsicmp(pNewItem->pwszExt, L".lnk") == 0) { /* Link handler */ @@ -200,7 +202,109 @@ } } } - + + dwSize++; + + lpValues = (LPWSTR) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwSize * sizeof(WCHAR)); + if (!lpValues) + return FALSE; + + lpValue = lpValues; + pCurItem = m_pItems; + while (pCurItem) + { + memcpy(lpValue, pCurItem->pwszExt, (wcslen(pCurItem->pwszExt) + 1) * sizeof(WCHAR)); + lpValue += wcslen(pCurItem->pwszExt) + 1; + pCurItem = pCurItem->pNext; + } + + if (RegCreateKeyEx(HKEY_CURRENT_USER, ShellNewKey, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hKey, NULL) != ERROR_SUCCESS) + { + HeapFree(GetProcessHeap(), 0, lpValues); + return FALSE; + } + + if (RegSetValueExW(hKey, L"Classes", NULL, REG_MULTI_SZ, (LPBYTE)lpValues, dwSize) != ERROR_SUCCESS) + { + HeapFree(GetProcessHeap(), 0, lpValues); + return FALSE; + } + + HeapFree(GetProcessHeap(), 0, lpValues); + RegCloseKey(hKey); + + return TRUE; +} + +BOOL +CNewMenu::LoadCachedItems() +{ + LPWSTR wszName; + LPWSTR lpValues; + DWORD dwSize; + HKEY hKey; + SHELLNEW_ITEM *pNewItem; + SHELLNEW_ITEM *pCurItem = NULL; + + if (RegOpenKeyExW(HKEY_CURRENT_USER, ShellNewKey, 0, KEY_READ, &hKey) != ERROR_SUCCESS) + return FALSE; + + if (RegQueryValueExW(hKey, L"Classes", NULL, NULL, NULL, &dwSize) != ERROR_SUCCESS) + return FALSE; + + lpValues = (LPWSTR) HeapAlloc(GetProcessHeap(), 0, dwSize); + if (!lpValues) + return FALSE; + + if (RegQueryValueExW(hKey, L"Classes", NULL, NULL, (LPBYTE)lpValues, &dwSize) != ERROR_SUCCESS) + { + HeapFree(GetProcessHeap(), 0, lpValues); + return FALSE; + } + + wszName = lpValues; + + for (; '\0' != *wszName; wszName += wcslen(wszName) + 1) + { + pNewItem = LoadItem(wszName); + if (pNewItem) + { + if (wcsicmp(pNewItem->pwszExt, L".lnk") == 0) + { + /* Link handler */ + m_pLinkItem = pNewItem; + } + else + { + /* Add at the end of list */ + if (pCurItem) + { + pCurItem->pNext = pNewItem; + pCurItem = pNewItem; + } + else + pCurItem = m_pItems = pNewItem; + } + } + } + + HeapFree(GetProcessHeap(), 0, lpValues); + RegCloseKey(hKey); + + return TRUE; +} + +BOOL +CNewMenu::LoadAllItems() +{ + /* If there are any unload them */ + UnloadAllItems(); + + if (!LoadCachedItems()) + { + CacheItems(); + } + if (!m_pLinkItem) { m_pLinkItem = static_cast<SHELLNEW_ITEM *>(HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(SHELLNEW_ITEM))); Modified: trunk/reactos/dll/win32/shell32/CNewMenu.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CNewMenu… ============================================================================== --- trunk/reactos/dll/win32/shell32/CNewMenu.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CNewMenu.h [iso-8859-1] Sat Jul 23 12:31:30 2016 @@ -23,33 +23,35 @@ #ifndef _SHV_ITEM_NEW_H_ #define _SHV_ITEM_NEW_H_ +const WCHAR ShellNewKey[] = L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Discardable\\PostSetup\\ShellNew"; + class CNewMenu : - public CComCoClass<CNewMenu, &CLSID_NewMenu>, - public CComObjectRootEx<CComMultiThreadModelNoCS>, - public IObjectWithSite, - public IContextMenu3, - public IShellExtInit + public CComCoClass<CNewMenu, &CLSID_NewMenu>, + public CComObjectRootEx<CComMultiThreadModelNoCS>, + public IObjectWithSite, + public IContextMenu3, + public IShellExtInit { private: - enum SHELLNEW_TYPE - { - SHELLNEW_TYPE_INVALID = -1, - SHELLNEW_TYPE_COMMAND = 1, - SHELLNEW_TYPE_DATA = 2, - SHELLNEW_TYPE_FILENAME = 4, - SHELLNEW_TYPE_NULLFILE = 8 - }; + enum SHELLNEW_TYPE + { + SHELLNEW_TYPE_INVALID = -1, + SHELLNEW_TYPE_COMMAND = 1, + SHELLNEW_TYPE_DATA = 2, + SHELLNEW_TYPE_FILENAME = 4, + SHELLNEW_TYPE_NULLFILE = 8 + }; - struct SHELLNEW_ITEM - { - SHELLNEW_TYPE Type; - LPWSTR pwszExt; - PBYTE pData; - ULONG cbData; - LPWSTR pwszDesc; - HICON hIcon; - SHELLNEW_ITEM *pNext; - }; + struct SHELLNEW_ITEM + { + SHELLNEW_TYPE Type; + LPWSTR pwszExt; + PBYTE pData; + ULONG cbData; + LPWSTR pwszDesc; + HICON hIcon; + SHELLNEW_ITEM *pNext; + }; LPITEMIDLIST m_pidlFolder; LPWSTR m_wszPath; @@ -62,35 +64,37 @@ SHELLNEW_ITEM *LoadItem(LPCWSTR pwszExt); void UnloadItem(SHELLNEW_ITEM *pItem); - void UnloadAllItems(); - BOOL LoadAllItems(); - UINT InsertShellNewItems(HMENU hMenu, UINT idFirst, UINT idMenu); - SHELLNEW_ITEM *FindItemFromIdOffset(UINT IdOffset); - HRESULT CreateNewFolder(LPCMINVOKECOMMANDINFO lpici); - HRESULT CreateNewItem(SHELLNEW_ITEM *pItem, LPCMINVOKECOMMANDINFO lpcmi); + void UnloadAllItems(); + BOOL CacheItems(); + BOOL LoadCachedItems(); + BOOL LoadAllItems(); + UINT InsertShellNewItems(HMENU hMenu, UINT idFirst, UINT idMenu); + SHELLNEW_ITEM *FindItemFromIdOffset(UINT IdOffset); + HRESULT CreateNewFolder(LPCMINVOKECOMMANDINFO lpici); + HRESULT CreateNewItem(SHELLNEW_ITEM *pItem, LPCMINVOKECOMMANDINFO lpcmi); HRESULT SelectNewItem(LPCMINVOKECOMMANDINFO lpici, LONG wEventId, UINT uFlags, LPWSTR pszName); public: - CNewMenu(); - ~CNewMenu(); + CNewMenu(); + ~CNewMenu(); - // IObjectWithSite - virtual HRESULT STDMETHODCALLTYPE SetSite(IUnknown *pUnkSite); - virtual HRESULT STDMETHODCALLTYPE GetSite(REFIID riid, void **ppvSite); + // IObjectWithSite + virtual HRESULT STDMETHODCALLTYPE SetSite(IUnknown *pUnkSite); + virtual HRESULT STDMETHODCALLTYPE GetSite(REFIID riid, void **ppvSite); - // IContextMenu - virtual HRESULT WINAPI QueryContextMenu(HMENU hMenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags); - virtual HRESULT WINAPI InvokeCommand(LPCMINVOKECOMMANDINFO lpcmi); - virtual HRESULT WINAPI GetCommandString(UINT_PTR idCommand, UINT uFlags, UINT *lpReserved, LPSTR lpszName, UINT uMaxNameLen); + // IContextMenu + virtual HRESULT WINAPI QueryContextMenu(HMENU hMenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags); + virtual HRESULT WINAPI InvokeCommand(LPCMINVOKECOMMANDINFO lpcmi); + virtual HRESULT WINAPI GetCommandString(UINT_PTR idCommand, UINT uFlags, UINT *lpReserved, LPSTR lpszName, UINT uMaxNameLen); - // IContextMenu3 - virtual HRESULT WINAPI HandleMenuMsg2(UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *plResult); + // IContextMenu3 + virtual HRESULT WINAPI HandleMenuMsg2(UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *plResult); - // IContextMenu2 - virtual HRESULT WINAPI HandleMenuMsg(UINT uMsg, WPARAM wParam, LPARAM lParam); + // IContextMenu2 + virtual HRESULT WINAPI HandleMenuMsg(UINT uMsg, WPARAM wParam, LPARAM lParam); - // IShellExtInit - virtual HRESULT STDMETHODCALLTYPE Initialize(LPCITEMIDLIST pidlFolder, IDataObject *pdtobj, HKEY hkeyProgID); + // IShellExtInit + virtual HRESULT STDMETHODCALLTYPE Initialize(LPCITEMIDLIST pidlFolder, IDataObject *pdtobj, HKEY hkeyProgID); DECLARE_REGISTRY_RESOURCEID(IDR_NEWMENU) DECLARE_NOT_AGGREGATABLE(CNewMenu) @@ -98,11 +102,11 @@ DECLARE_PROTECT_FINAL_CONSTRUCT() BEGIN_COM_MAP(CNewMenu) - COM_INTERFACE_ENTRY_IID(IID_IObjectWithSite, IObjectWithSite) - COM_INTERFACE_ENTRY_IID(IID_IContextMenu3, IContextMenu3) - COM_INTERFACE_ENTRY_IID(IID_IContextMenu2, IContextMenu2) - COM_INTERFACE_ENTRY_IID(IID_IContextMenu, IContextMenu) - COM_INTERFACE_ENTRY_IID(IID_IShellExtInit, IShellExtInit) + COM_INTERFACE_ENTRY_IID(IID_IObjectWithSite, IObjectWithSite) + COM_INTERFACE_ENTRY_IID(IID_IContextMenu3, IContextMenu3) + COM_INTERFACE_ENTRY_IID(IID_IContextMenu2, IContextMenu2) + COM_INTERFACE_ENTRY_IID(IID_IContextMenu, IContextMenu) + COM_INTERFACE_ENTRY_IID(IID_IShellExtInit, IShellExtInit) END_COM_MAP() };

1 0

[gadamopoulos] 71979: [SHELL32] - CDefView: Add the skeleton check that should be used to implement moving items in the CDefView. Nothing more is implemented because GetKeyState is completely unrel...
by gadamopoulos＠svn.reactos.org 23 Jul '16

23 Jul '16

Author: gadamopoulos Date: Sat Jul 23 08:42:38 2016 New Revision: 71979 URL: http://svn.reactos.org/svn/reactos?rev=71979&view=rev Log: [SHELL32] - CDefView: Add the skeleton check that should be used to implement moving items in the CDefView. Nothing more is implemented because GetKeyState is completely unreliable. Modified: trunk/reactos/dll/win32/shell32/CDefView.cpp Modified: trunk/reactos/dll/win32/shell32/CDefView.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CDefView… ============================================================================== --- trunk/reactos/dll/win32/shell32/CDefView.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CDefView.cpp [iso-8859-1] Sat Jul 23 08:42:38 2016 @@ -97,6 +97,7 @@ DWORD m_dwAdvf; CComPtr<IAdviseSink> m_pAdvSink; // for drag and drop + CComPtr<IDataObject> m_pSourceDataObject; CComPtr<IDropTarget> m_pCurDropTarget; /* The sub-item, which is currently dragged over */ CComPtr<IDataObject> m_pCurDataObject; /* The dragged data-object */ LONG m_iDragOverItem; /* Dragged over item's index, iff m_pCurDropTarget != NULL */ @@ -1786,7 +1787,12 @@ } DWORD dwEffect2; + + m_pSourceDataObject = pda; + DoDragDrop(pda, this, dwEffect, &dwEffect2); + + m_pSourceDataObject.Release(); } } break; @@ -2937,7 +2943,23 @@ HRESULT WINAPI CDefView::Drop(IDataObject* pDataObject, DWORD grfKeyState, POINTL pt, DWORD *pdwEffect) { - if (m_pCurDropTarget) + ERR("GetKeyState(VK_LBUTTON): %d\n", GetKeyState(VK_LBUTTON)); + + if ((m_iDragOverItem == -1) && + (*pdwEffect & DROPEFFECT_MOVE) && + (GetKeyState(VK_LBUTTON) != 0) && + (m_pSourceDataObject.p) && + (SHIsSameObject(pDataObject, m_pSourceDataObject))) + { + ERR("Should implement moving items here!\n"); + + if (m_pCurDropTarget) + { + m_pCurDropTarget->DragLeave(); + m_pCurDropTarget.Release(); + } + } + else if (m_pCurDropTarget) { m_pCurDropTarget->Drop(pDataObject, grfKeyState, pt, pdwEffect); m_pCurDropTarget.Release();

1 0

[hbelusca] 71978: [ADVPACK]: Addendum to r71977: Add the resource file into the CMakeList. CORE-7645
by hbelusca＠svn.reactos.org 22 Jul '16

22 Jul '16

Author: hbelusca Date: Fri Jul 22 14:15:09 2016 New Revision: 71978 URL: http://svn.reactos.org/svn/reactos?rev=71978&view=rev Log: [ADVPACK]: Addendum to r71977: Add the resource file into the CMakeList. CORE-7645 Modified: trunk/reactos/dll/win32/advpack/CMakeLists.txt Modified: trunk/reactos/dll/win32/advpack/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advpack/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/advpack/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advpack/CMakeLists.txt [iso-8859-1] Fri Jul 22 14:15:09 2016 @@ -12,6 +12,7 @@ add_library(advpack SHARED ${SOURCE} + advpack.rc ${CMAKE_CURRENT_BINARY_DIR}/advpack.def) set_module_type(advpack win32dll)

1 0

[hbelusca] 71977: [ADVPACK]: Add file version information resource. CORE-7645 #comment Please retest the installation of Visual Basic 6 runtime with revision >= 71977.
by hbelusca＠svn.reactos.org 22 Jul '16

22 Jul '16

Author: hbelusca Date: Fri Jul 22 13:19:25 2016 New Revision: 71977 URL: http://svn.reactos.org/svn/reactos?rev=71977&view=rev Log: [ADVPACK]: Add file version information resource. CORE-7645 #comment Please retest the installation of Visual Basic 6 runtime with revision >= 71977. Added: trunk/reactos/dll/win32/advpack/advpack.rc (with props) Added: trunk/reactos/dll/win32/advpack/advpack.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advpack/advpack.… ============================================================================== --- trunk/reactos/dll/win32/advpack/advpack.rc (added) +++ trunk/reactos/dll/win32/advpack/advpack.rc [iso-8859-1] Fri Jul 22 13:19:25 2016 @@ -0,0 +1,7 @@ +#include <windef.h> + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "Advanced INF Package Installer" +#define REACTOS_STR_INTERNAL_NAME "advpack" +#define REACTOS_STR_ORIGINAL_FILENAME "advpack.dll" +#include <reactos/version.rc> Propchange: trunk/reactos/dll/win32/advpack/advpack.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[ekohl] 71976: [USETUP] Keyboard Modifier LEDs not working in usetup. Patch by Carlo Bramini. CORE-3368 #resolve #comment Thanks a lot!
by ekohl＠svn.reactos.org 21 Jul '16

21 Jul '16

Author: ekohl Date: Thu Jul 21 20:53:43 2016 New Revision: 71976 URL: http://svn.reactos.org/svn/reactos?rev=71976&view=rev Log: [USETUP] Keyboard Modifier LEDs not working in usetup. Patch by Carlo Bramini. CORE-3368 #resolve #comment Thanks a lot! Modified: trunk/reactos/base/setup/usetup/native/utils/console.c trunk/reactos/base/setup/usetup/native/utils/keytrans.c trunk/reactos/base/setup/usetup/native/utils/keytrans.h Modified: trunk/reactos/base/setup/usetup/native/utils/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/native/u… ============================================================================== --- trunk/reactos/base/setup/usetup/native/utils/console.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/native/utils/console.c [iso-8859-1] Thu Jul 21 20:53:43 2016 @@ -218,7 +218,7 @@ return FALSE; lpBuffer->EventType = KEY_EVENT; - Status = IntTranslateKey(&InputData, &lpBuffer->Event.KeyEvent); + Status = IntTranslateKey(hConsoleInput, &InputData, &lpBuffer->Event.KeyEvent); if (!NT_SUCCESS(Status)) return FALSE; Modified: trunk/reactos/base/setup/usetup/native/utils/keytrans.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/native/u… ============================================================================== --- trunk/reactos/base/setup/usetup/native/utils/keytrans.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/native/utils/keytrans.c [iso-8859-1] Thu Jul 21 20:53:43 2016 @@ -117,13 +117,6 @@ 0, 0, 0, 0 }; -/* - * Note how the keyboard lights are not handled, so while NUMLOCK_ON can - * be on, the light will never be. If this starts to be a problem it can be - * fixed, but it's too much work for too little gain to do now. - * Look in win32k/ntuser/input.c for an example. - */ - static WORD KeyTableNumlock[] = { /* 0x00 */ 0, 0, 0, 0, @@ -255,12 +248,15 @@ static void -IntUpdateControlKeyState(LPDWORD State, PKEYBOARD_INPUT_DATA InputData) +IntUpdateControlKeyState(HANDLE hConsoleInput, LPDWORD State, PKEYBOARD_INPUT_DATA InputData) { DWORD Value = 0; + DWORD oldState, newState; if (InputData->Flags & KEY_E1) /* Only the pause key has E1 */ return; + + oldState = newState = *State; if (!(InputData->Flags & KEY_E0)) { switch (InputData->MakeCode) { @@ -278,22 +274,19 @@ break; case 0x3A: - Value = CAPSLOCK_ON; if (!(InputData->Flags & KEY_BREAK)) - *State ^= Value; - return; + newState ^= CAPSLOCK_ON; + break; case 0x45: - Value = NUMLOCK_ON; if (!(InputData->Flags & KEY_BREAK)) - *State ^= Value; - return; + newState ^= NUMLOCK_ON; + break; case 0x46: - Value = SCROLLLOCK_ON; if (!(InputData->Flags & KEY_BREAK)) - *State ^= Value; - return; + newState ^= SCROLLLOCK_ON; + break; default: return; @@ -313,10 +306,52 @@ } } + /* Check if the state of the indicators has been changed */ + if ((oldState ^ newState) & (NUMLOCK_ON | CAPSLOCK_ON | SCROLLLOCK_ON)) + { + IO_STATUS_BLOCK IoStatusBlock; + NTSTATUS Status; + KEYBOARD_INDICATOR_PARAMETERS kip; + + kip.LedFlags = 0; + kip.UnitId = 0; + + if ((newState & NUMLOCK_ON)) + kip.LedFlags |= KEYBOARD_NUM_LOCK_ON; + + if ((newState & CAPSLOCK_ON)) + kip.LedFlags |= KEYBOARD_CAPS_LOCK_ON; + + if ((newState & SCROLLLOCK_ON)) + kip.LedFlags |= KEYBOARD_SCROLL_LOCK_ON; + + /* Update the state of the leds on primary keyboard */ + DPRINT("NtDeviceIoControlFile dwLeds=%x\n", kip.LedFlags); + + Status = NtDeviceIoControlFile( + hConsoleInput, + NULL, + NULL, + NULL, + &IoStatusBlock, + IOCTL_KEYBOARD_SET_INDICATORS, + &kip, + sizeof(kip), + NULL, + 0); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtDeviceIoControlFile(IOCTL_KEYBOARD_SET_INDICATORS) failed (Status %lx)\n", Status); + } + } else + /* Normal press/release state handling */ if (InputData->Flags & KEY_BREAK) - *State &= ~Value; + newState &= ~Value; else - *State |= Value; + newState |= Value; + + *State = newState; } static DWORD @@ -379,7 +414,7 @@ * in the app so I'll just fill the others with somewhat sane values */ NTSTATUS -IntTranslateKey(PKEYBOARD_INPUT_DATA InputData, KEY_EVENT_RECORD *Event) +IntTranslateKey(HANDLE hConsoleInput, PKEYBOARD_INPUT_DATA InputData, KEY_EVENT_RECORD *Event) { static DWORD dwControlKeyState; @@ -395,7 +430,7 @@ DPRINT("Translating: %x\n", InputData->MakeCode); - IntUpdateControlKeyState(&dwControlKeyState, InputData); + IntUpdateControlKeyState(hConsoleInput, &dwControlKeyState, InputData); Event->dwControlKeyState = dwControlKeyState; if (InputData->Flags & KEY_E0) Modified: trunk/reactos/base/setup/usetup/native/utils/keytrans.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/native/u… ============================================================================== --- trunk/reactos/base/setup/usetup/native/utils/keytrans.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/native/utils/keytrans.h [iso-8859-1] Thu Jul 21 20:53:43 2016 @@ -28,6 +28,6 @@ #include <ntddkbd.h> NTSTATUS -IntTranslateKey(PKEYBOARD_INPUT_DATA InputData, KEY_EVENT_RECORD *Event); +IntTranslateKey(HANDLE hConsoleInput, PKEYBOARD_INPUT_DATA InputData, KEY_EVENT_RECORD *Event); /* EOF */

1 0

[mjansen] 71975: [ACPPAGE] Add windows ME to the Win98 selection item. Patch by Lee Schroeder. CORE-11606 #resolve #comment Thanks!
by mjansen＠svn.reactos.org 21 Jul '16

21 Jul '16

Author: mjansen Date: Thu Jul 21 17:29:41 2016 New Revision: 71975 URL: http://svn.reactos.org/svn/reactos?rev=71975&view=rev Log: [ACPPAGE] Add windows ME to the Win98 selection item. Patch by Lee Schroeder. CORE-11606 #resolve #comment Thanks! Modified: trunk/reactos/dll/shellext/acppage/CLayerUIPropPage.cpp Modified: trunk/reactos/dll/shellext/acppage/CLayerUIPropPage.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/CLaye… ============================================================================== --- trunk/reactos/dll/shellext/acppage/CLayerUIPropPage.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/acppage/CLayerUIPropPage.cpp [iso-8859-1] Thu Jul 21 17:29:41 2016 @@ -72,7 +72,7 @@ const PCWSTR Name; } g_CompatModes[] = { { L"Windows 95", L"WIN95" }, - { L"Windows 98", L"WIN98" }, + { L"Windows 98/ME", L"WIN98" }, { L"Windows NT 4.0 (SP5)", L"NT4SP5" }, { L"Windows 2000", L"WIN2000" }, { L"Windows XP (SP2)", L"WINXPSP2" },

1 0

[tfaber] 71974: [SERIAL] - Properly stub SerialPower CORE-11648
by tfaber＠svn.reactos.org 20 Jul '16

20 Jul '16

Author: tfaber Date: Wed Jul 20 12:50:58 2016 New Revision: 71974 URL: http://svn.reactos.org/svn/reactos?rev=71974&view=rev Log: [SERIAL] - Properly stub SerialPower CORE-11648 Modified: trunk/reactos/drivers/serial/serial/power.c Modified: trunk/reactos/drivers/serial/serial/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/serial/serial/powe… ============================================================================== --- trunk/reactos/drivers/serial/serial/power.c [iso-8859-1] (original) +++ trunk/reactos/drivers/serial/serial/power.c [iso-8859-1] Wed Jul 20 12:50:58 2016 @@ -16,9 +16,12 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { + PSERIAL_DEVICE_EXTENSION DeviceExtension; + TRACE_(SERIAL, "IRP_MJ_POWER dispatch\n"); - Irp->IoStatus.Information = 0; - Irp->IoStatus.Status = STATUS_SUCCESS; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_SUCCESS; + + DeviceExtension = DeviceObject->DeviceExtension; + PoStartNextPowerIrp(Irp); + IoSkipCurrentIrpStackLocation(Irp); + return PoCallDriver(DeviceExtension->LowerDevice, Irp); }

1 0

[tfaber] 71973: [PARPORT] - Properly stub FdoPower and PdoPower CORE-11648
by tfaber＠svn.reactos.org 20 Jul '16

20 Jul '16

Author: tfaber Date: Wed Jul 20 12:21:11 2016 New Revision: 71973 URL: http://svn.reactos.org/svn/reactos?rev=71973&view=rev Log: [PARPORT] - Properly stub FdoPower and PdoPower CORE-11648 Modified: trunk/reactos/drivers/parallel/parport/fdo.c trunk/reactos/drivers/parallel/parport/pdo.c Modified: trunk/reactos/drivers/parallel/parport/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/parallel/parport/f… ============================================================================== --- trunk/reactos/drivers/parallel/parport/fdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/parallel/parport/fdo.c [iso-8859-1] Wed Jul 20 12:21:11 2016 @@ -600,13 +600,14 @@ FdoPower(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { + PDEVICE_OBJECT LowerDevice; + DPRINT("FdoPower()\n"); - Irp->IoStatus.Information = 0; - Irp->IoStatus.Status = STATUS_SUCCESS; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - - return STATUS_SUCCESS; + LowerDevice = ((PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->LowerDevice; + PoStartNextPowerIrp(Irp); + IoSkipCurrentIrpStackLocation(Irp); + return PoCallDriver(LowerDevice, Irp);; } /* EOF */ Modified: trunk/reactos/drivers/parallel/parport/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/parallel/parport/p… ============================================================================== --- trunk/reactos/drivers/parallel/parport/pdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/parallel/parport/pdo.c [iso-8859-1] Wed Jul 20 12:21:11 2016 @@ -175,12 +175,25 @@ PdoPower(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { + NTSTATUS Status; + PIO_STACK_LOCATION IoStack; + DPRINT("PdoPower()\n"); - Irp->IoStatus.Information = 0; - Irp->IoStatus.Status = STATUS_SUCCESS; + IoStack = IoGetCurrentIrpStackLocation(Irp); + + switch (IoStack->MinorFunction) + { + case IRP_MN_SET_POWER: + case IRP_MN_QUERY_POWER: + Irp->IoStatus.Status = STATUS_SUCCESS; + break; + } + + Status = Irp->IoStatus.Status; + PoStartNextPowerIrp(Irp); IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_SUCCESS; + return Status; } /* EOF */

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