Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 65075: * Sync up to trunk head (r65074).
by akhaldi＠svn.reactos.org 28 Oct '14

28 Oct '14

Author: akhaldi Date: Tue Oct 28 16:58:25 2014 New Revision: 65075 URL: http://svn.reactos.org/svn/reactos?rev=65075&view=rev Log: * Sync up to trunk head (r65074). Added: branches/shell-experiments/win32ss/gdi/gdi32/objects/clientobj.c - copied unchanged from r65074, trunk/reactos/win32ss/gdi/gdi32/objects/clientobj.c Modified: branches/shell-experiments/ (props changed) branches/shell-experiments/base/applications/network/net/cmdAccounts.c branches/shell-experiments/base/applications/network/net/cmdHelpMsg.c branches/shell-experiments/base/applications/network/net/cmdLocalGroup.c branches/shell-experiments/base/applications/network/net/cmdStart.c branches/shell-experiments/base/applications/network/net/cmdUser.c branches/shell-experiments/base/applications/network/net/main.c branches/shell-experiments/base/applications/network/net/net.h branches/shell-experiments/dll/win32/advapi32/wine/security.c branches/shell-experiments/dll/win32/kernel32/client/file/mntpoint.c branches/shell-experiments/dll/win32/kernel32/client/resntfy.c branches/shell-experiments/dll/win32/rasdlg/lang/tr-TR.rc branches/shell-experiments/drivers/bus/acpi/main.c branches/shell-experiments/drivers/bus/pcix/fdo.c branches/shell-experiments/drivers/filesystems/fastfat/create.c branches/shell-experiments/drivers/filesystems/fastfat/dir.c branches/shell-experiments/drivers/filesystems/fastfat/direntry.c branches/shell-experiments/drivers/filesystems/fastfat/dirwr.c branches/shell-experiments/drivers/filesystems/fastfat/fcb.c branches/shell-experiments/drivers/filesystems/fastfat/finfo.c branches/shell-experiments/drivers/filesystems/ntfs/attrib.c branches/shell-experiments/drivers/filesystems/ntfs/dirctl.c branches/shell-experiments/drivers/filesystems/ntfs/fcb.c branches/shell-experiments/drivers/filesystems/ntfs/mft.c branches/shell-experiments/drivers/filesystems/ntfs/ntfs.h branches/shell-experiments/include/ddk/nt_vdd.h branches/shell-experiments/include/reactos/libs/fast486/fast486.h branches/shell-experiments/lib/fast486/common.c branches/shell-experiments/lib/fast486/common.h branches/shell-experiments/lib/fast486/common.inl branches/shell-experiments/lib/fast486/extraops.c branches/shell-experiments/lib/fast486/fast486.c branches/shell-experiments/lib/fast486/fpu.c branches/shell-experiments/lib/fast486/opcodes.c branches/shell-experiments/lib/fast486/opgroups.c branches/shell-experiments/lib/sdk/crt/mem/i386/memchr_asm.s branches/shell-experiments/lib/sdk/crt/mem/i386/memmove_asm.s branches/shell-experiments/lib/sdk/crt/mem/i386/memset_asm.s branches/shell-experiments/lib/sdk/crt/string/i386/tcsnlen.inc branches/shell-experiments/ntoskrnl/se/accesschk.c branches/shell-experiments/subsystems/ntvdm/bios/vidbios.c branches/shell-experiments/subsystems/ntvdm/clock.c branches/shell-experiments/subsystems/ntvdm/cpu/registers.c branches/shell-experiments/subsystems/ntvdm/dos/dos32krnl/dos.c branches/shell-experiments/subsystems/ntvdm/emulator.c branches/shell-experiments/subsystems/ntvdm/emulator.h branches/shell-experiments/subsystems/ntvdm/hardware/keyboard.c branches/shell-experiments/subsystems/ntvdm/hardware/pic.c branches/shell-experiments/subsystems/ntvdm/hardware/ps2.c branches/shell-experiments/subsystems/ntvdm/hardware/vga.c branches/shell-experiments/subsystems/ntvdm/io.c branches/shell-experiments/subsystems/ntvdm/ntvdm.c branches/shell-experiments/win32ss/gdi/gdi32/CMakeLists.txt branches/shell-experiments/win32ss/gdi/gdi32/include/gdi32p.h branches/shell-experiments/win32ss/gdi/gdi32/main/dllmain.c branches/shell-experiments/win32ss/gdi/gdi32/misc/misc.c branches/shell-experiments/win32ss/gdi/gdi32/objects/dc.c branches/shell-experiments/win32ss/gdi/ntgdi/bitmaps.c branches/shell-experiments/win32ss/gdi/ntgdi/gdiobj.c branches/shell-experiments/win32ss/user/ntuser/desktop.c branches/shell-experiments/win32ss/user/ntuser/msgqueue.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/shell-experiments/base/applications/network/net/cmdAccounts.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/network/net/cmdHelpMsg.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/network/net/cmdLocalGroup.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/network/net/cmdStart.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/network/net/cmdUser.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/network/net/main.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/network/net/net.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/dll/win32/advapi32/wine/security.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/adv… Modified: branches/shell-experiments/dll/win32/kernel32/client/file/mntpoint.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/ker… Modified: branches/shell-experiments/dll/win32/kernel32/client/resntfy.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/ker… Modified: branches/shell-experiments/dll/win32/rasdlg/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/ras… Modified: branches/shell-experiments/drivers/bus/acpi/main.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/bus/a… Modified: branches/shell-experiments/drivers/bus/pcix/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/bus/p… Modified: branches/shell-experiments/drivers/filesystems/fastfat/create.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/files… Modified: branches/shell-experiments/drivers/filesystems/fastfat/dir.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/files… Modified: branches/shell-experiments/drivers/filesystems/fastfat/direntry.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/files… Modified: branches/shell-experiments/drivers/filesystems/fastfat/dirwr.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/files… Modified: branches/shell-experiments/drivers/filesystems/fastfat/fcb.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/files… Modified: branches/shell-experiments/drivers/filesystems/fastfat/finfo.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/files… Modified: branches/shell-experiments/drivers/filesystems/ntfs/attrib.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/files… Modified: branches/shell-experiments/drivers/filesystems/ntfs/dirctl.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/files… Modified: branches/shell-experiments/drivers/filesystems/ntfs/fcb.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/files… Modified: branches/shell-experiments/drivers/filesystems/ntfs/mft.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/files… Modified: branches/shell-experiments/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/files… Modified: branches/shell-experiments/include/ddk/nt_vdd.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/ddk/n… Modified: branches/shell-experiments/include/reactos/libs/fast486/fast486.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/react… Modified: branches/shell-experiments/lib/fast486/common.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/fast486/c… Modified: branches/shell-experiments/lib/fast486/common.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/fast486/c… Modified: branches/shell-experiments/lib/fast486/common.inl URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/fast486/c… Modified: branches/shell-experiments/lib/fast486/extraops.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/fast486/e… Modified: branches/shell-experiments/lib/fast486/fast486.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/fast486/f… Modified: branches/shell-experiments/lib/fast486/fpu.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/fast486/f… Modified: branches/shell-experiments/lib/fast486/opcodes.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/fast486/o… Modified: branches/shell-experiments/lib/fast486/opgroups.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/fast486/o… Modified: branches/shell-experiments/lib/sdk/crt/mem/i386/memchr_asm.s URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/sdk/crt/m… Modified: branches/shell-experiments/lib/sdk/crt/mem/i386/memmove_asm.s URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/sdk/crt/m… Modified: branches/shell-experiments/lib/sdk/crt/mem/i386/memset_asm.s URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/sdk/crt/m… Modified: branches/shell-experiments/lib/sdk/crt/string/i386/tcsnlen.inc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/sdk/crt/s… Modified: branches/shell-experiments/ntoskrnl/se/accesschk.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/se/a… Modified: branches/shell-experiments/subsystems/ntvdm/bios/vidbios.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/subsystems/nt… Modified: branches/shell-experiments/subsystems/ntvdm/clock.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/subsystems/nt… Modified: branches/shell-experiments/subsystems/ntvdm/cpu/registers.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/subsystems/nt… Modified: branches/shell-experiments/subsystems/ntvdm/dos/dos32krnl/dos.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/subsystems/nt… Modified: branches/shell-experiments/subsystems/ntvdm/emulator.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/subsystems/nt… Modified: branches/shell-experiments/subsystems/ntvdm/emulator.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/subsystems/nt… Modified: branches/shell-experiments/subsystems/ntvdm/hardware/keyboard.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/subsystems/nt… Modified: branches/shell-experiments/subsystems/ntvdm/hardware/pic.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/subsystems/nt… Modified: branches/shell-experiments/subsystems/ntvdm/hardware/ps2.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/subsystems/nt… Modified: branches/shell-experiments/subsystems/ntvdm/hardware/vga.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/subsystems/nt… Modified: branches/shell-experiments/subsystems/ntvdm/io.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/subsystems/nt… Modified: branches/shell-experiments/subsystems/ntvdm/ntvdm.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/subsystems/nt… Modified: branches/shell-experiments/win32ss/gdi/gdi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/gdi/g… Modified: branches/shell-experiments/win32ss/gdi/gdi32/include/gdi32p.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/gdi/g… Modified: branches/shell-experiments/win32ss/gdi/gdi32/main/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/gdi/g… Modified: branches/shell-experiments/win32ss/gdi/gdi32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/gdi/g… Modified: branches/shell-experiments/win32ss/gdi/gdi32/objects/dc.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/gdi/g… Modified: branches/shell-experiments/win32ss/gdi/ntgdi/bitmaps.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/gdi/n… Modified: branches/shell-experiments/win32ss/gdi/ntgdi/gdiobj.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/gdi/n… Modified: branches/shell-experiments/win32ss/user/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/…

1 0

[dquintana] 65074: [RSHELL] * Fix executing items after the menu has closed.
by dquintana＠svn.reactos.org 28 Oct '14

28 Oct '14

Author: dquintana Date: Tue Oct 28 15:39:47 2014 New Revision: 65074 URL: http://svn.reactos.org/svn/reactos?rev=65074&view=rev Log: [RSHELL] * Fix executing items after the menu has closed. Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp branches/shell-experiments/base/shell/rshell/CMenuToolbars.h Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuBand.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuBand.cpp [iso-8859-1] Tue Oct 28 15:39:47 2014 @@ -948,14 +948,18 @@ switch (changeType) { case MPOS_EXECUTE: + { + CMenuToolbarBase * tb = m_hotBar; + int item = m_hotItem; + tb->PrepareExecuteItem(item); if (m_subMenuParent) { m_subMenuParent->OnSelect(changeType); } TRACE("Menu closed, executing item...\n"); - m_hotBar->ExecuteItem(m_hotItem); + tb->ExecuteItem(); break; - + } case MPOS_SELECTLEFT: if (m_parentBand && m_parentBand->_IsPopup()==S_FALSE) return m_parentBand->_MenuItemHotTrack(VK_LEFT); Modified: branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp [iso-8859-1] Tue Oct 28 15:39:47 2014 @@ -846,16 +846,17 @@ return ProcessClick(btn.idCommand); } -HRESULT CMenuToolbarBase::ExecuteItem(INT iItem) +HRESULT CMenuToolbarBase::PrepareExecuteItem(INT iItem) { this->m_menuBand->_KillPopupTimers(); - INT index; - DWORD_PTR data; - - GetDataFromId(iItem, &index, &data); - - return InternalExecuteItem(iItem, index, data); + m_executeItem = iItem; + return GetDataFromId(iItem, &m_executeIndex, &m_executeData); +} + +HRESULT CMenuToolbarBase::ExecuteItem() +{ + return InternalExecuteItem(m_executeItem, m_executeItem, m_executeData); } HRESULT CMenuToolbarBase::OnContextMenu(NMMOUSE * rclick) Modified: branches/shell-experiments/base/shell/rshell/CMenuToolbars.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuToolbars.h [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuToolbars.h [iso-8859-1] Tue Oct 28 15:39:47 2014 @@ -51,6 +51,10 @@ DWORD m_initFlags; BOOL m_isTrackingPopup; + INT m_executeIndex; + INT m_executeItem; + DWORD_PTR m_executeData; + private: static LRESULT CALLBACK s_SubclassProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); @@ -77,7 +81,8 @@ HRESULT KeyboardItemChange(DWORD changeType); - HRESULT ExecuteItem(INT iItem); + HRESULT PrepareExecuteItem(INT iItem); + HRESULT ExecuteItem(); HRESULT IsTrackedItem(INT index); HRESULT ChangeTrackedItem(INT index, BOOL wasTracking, BOOL mouse);

1 0

[gadamopoulos] 65073: [STOBJECT] - Disable querying if audio is muted or not for now. - Hides an assert that happened in wdmaud.drv
by gadamopoulos＠svn.reactos.org 28 Oct '14

28 Oct '14

Author: gadamopoulos Date: Tue Oct 28 15:27:00 2014 New Revision: 65073 URL: http://svn.reactos.org/svn/reactos?rev=65073&view=rev Log: [STOBJECT] - Disable querying if audio is muted or not for now. - Hides an assert that happened in wdmaud.drv Modified: branches/shell-experiments/dll/shellext/stobject/volume.cpp Modified: branches/shell-experiments/dll/shellext/stobject/volume.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/shellext/… ============================================================================== --- branches/shell-experiments/dll/shellext/stobject/volume.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/shellext/stobject/volume.cpp [iso-8859-1] Tue Oct 28 15:27:00 2014 @@ -114,6 +114,7 @@ HRESULT Volume_IsMute() { +#if 0 MIXERCONTROLDETAILS mixerControlDetails; if (g_mixerId != (UINT)-1 && g_muteControlID != (DWORD)-1) @@ -132,7 +133,7 @@ g_IsMute = detailsResult != 0; } - +#endif return S_OK; }

1 0

[gadamopoulos] 65072: [SHELL32] - Return a readable folder name when SHGDN_FORADDRESSBAR was specified - We no longer show GUIDs in the address bar
by gadamopoulos＠svn.reactos.org 28 Oct '14

28 Oct '14

Author: gadamopoulos Date: Tue Oct 28 15:07:31 2014 New Revision: 65072 URL: http://svn.reactos.org/svn/reactos?rev=65072&view=rev Log: [SHELL32] - Return a readable folder name when SHGDN_FORADDRESSBAR was specified - We no longer show GUIDs in the address bar Modified: branches/shell-experiments/dll/win32/shell32/folders/desktop.cpp branches/shell-experiments/dll/win32/shell32/folders/mycomp.cpp Modified: branches/shell-experiments/dll/win32/shell32/folders/desktop.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/folders/desktop.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/folders/desktop.cpp [iso-8859-1] Tue Oct 28 15:07:31 2014 @@ -679,7 +679,7 @@ if ((clsid = _ILGetGUIDPointer (pidl))) { - if (GET_SHGDN_FOR (dwFlags) & SHGDN_FORPARSING) + if (GET_SHGDN_FOR (dwFlags) == SHGDN_FORPARSING) { int bWantsForParsing; Modified: branches/shell-experiments/dll/win32/shell32/folders/mycomp.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/folders/mycomp.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/folders/mycomp.cpp [iso-8859-1] Tue Oct 28 15:07:31 2014 @@ -491,7 +491,7 @@ clsid = _ILGetGUIDPointer (pidl); if (clsid) { - if (GET_SHGDN_FOR (dwFlags) & SHGDN_FORPARSING) + if (GET_SHGDN_FOR (dwFlags) == SHGDN_FORPARSING) { static const WCHAR clsidW[] = L"CLSID\\"; static const WCHAR shellfolderW[] = L"\\shellfolder";

1 0

[gadamopoulos] 65071: [RSHELL] - Actually give focus to the start menu when CMenuDeskBar::Popup is called - Fixes opening and navigating the start menu with the keyboard
by gadamopoulos＠svn.reactos.org 28 Oct '14

28 Oct '14

Author: gadamopoulos Date: Tue Oct 28 14:31:19 2014 New Revision: 65071 URL: http://svn.reactos.org/svn/reactos?rev=65071&view=rev Log: [RSHELL] - Actually give focus to the start menu when CMenuDeskBar::Popup is called - Fixes opening and navigating the start menu with the keyboard Modified: branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp Modified: branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp [iso-8859-1] Tue Oct 28 14:31:19 2014 @@ -381,7 +381,7 @@ y = rcWorkArea.bottom - cy; } - this->SetWindowPos(HWND_TOPMOST, x, y, cx, cy, SWP_SHOWWINDOW | SWP_NOACTIVATE); + this->SetWindowPos(HWND_TOPMOST, x, y, cx, cy, SWP_SHOWWINDOW); m_ShowFlags = dwFlags; m_Shown = true;

1 0

[gadamopoulos] 65070: [EXPLORER_NEW] - Use IMenuPopup_OnSelect to close the start menu when the win key is pressed. - Fixes closing the start menu (on windows and on reactos)
by gadamopoulos＠svn.reactos.org 28 Oct '14

28 Oct '14

Author: gadamopoulos Date: Tue Oct 28 14:18:16 2014 New Revision: 65070 URL: http://svn.reactos.org/svn/reactos?rev=65070&view=rev Log: [EXPLORER_NEW] - Use IMenuPopup_OnSelect to close the start menu when the win key is pressed. - Fixes closing the start menu (on windows and on reactos) Modified: branches/shell-experiments/base/shell/explorer-new/traywnd.c Modified: branches/shell-experiments/base/shell/explorer-new/traywnd.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… ============================================================================== --- branches/shell-experiments/base/shell/explorer-new/traywnd.c [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/explorer-new/traywnd.c [iso-8859-1] Tue Oct 28 14:18:16 2014 @@ -2889,9 +2889,13 @@ break; if (IsWindowVisible(hwndStartMenu)) - SetWindowPos(hwndStartMenu, 0,0,0,0,0, SWP_HIDEWINDOW | SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER); + { + IMenuPopup_OnSelect(This->StartMenuPopup, MPOS_CANCELLEVEL); + } else + { SendMessage(This->hWnd, WM_COMMAND, MAKEWPARAM(BN_CLICKED, IDC_STARTBTN), (LPARAM)This->hwndStart); + } break; }

1 0

[gadamopoulos] 65069: [WIN32K] - Send the HSHELL_TASKMAN notification to the shell when the windows key is pressed - Needed to open and close the start menu with the keyboard
by gadamopoulos＠svn.reactos.org 28 Oct '14

28 Oct '14

Author: gadamopoulos Date: Tue Oct 28 13:45:43 2014 New Revision: 65069 URL: http://svn.reactos.org/svn/reactos?rev=65069&view=rev Log: [WIN32K] - Send the HSHELL_TASKMAN notification to the shell when the windows key is pressed - Needed to open and close the start menu with the keyboard Modified: branches/shell-experiments/win32ss/user/ntuser/hotkey.c Modified: branches/shell-experiments/win32ss/user/ntuser/hotkey.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… ============================================================================== --- branches/shell-experiments/win32ss/user/ntuser/hotkey.c [iso-8859-1] (original) +++ branches/shell-experiments/win32ss/user/ntuser/hotkey.c [iso-8859-1] Tue Oct 28 13:45:43 2014 @@ -219,7 +219,7 @@ { TRACE("System Hot key Id %d Key %d\n",pHotKey->id, wVk ); UserPostMessage(UserHMGetHandle(pWnd), WM_SYSCOMMAND, SC_TASKLIST, 0); - //ptiLastInput = pWnd->head.pti; + co_IntShellHookNotify(HSHELL_TASKMAN, 0, 0); bWinHotkeyActive = FALSE; return FALSE; }

1 0

[pschweitzer] 65068: [NTFS] ReleaseAttributeContext() is to be used out of mft.c I believe that at some point, we're leaking memory...
by pschweitzer＠svn.reactos.org 28 Oct '14

28 Oct '14

Author: pschweitzer Date: Tue Oct 28 10:26:47 2014 New Revision: 65068 URL: http://svn.reactos.org/svn/reactos?rev=65068&view=rev Log: [NTFS] ReleaseAttributeContext() is to be used out of mft.c I believe that at some point, we're leaking memory... Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.h Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] Tue Oct 28 10:26:47 2014 @@ -600,6 +600,9 @@ /* mft.c */ +VOID +ReleaseAttributeContext(PNTFS_ATTR_CONTEXT Context); + ULONG ReadAttribute(PDEVICE_EXTENSION Vcb, PNTFS_ATTR_CONTEXT Context,

1 0

[tkreuzer] 65067: [GDI32] Implement separate functions for all SelectObject cases.
by tkreuzer＠svn.reactos.org 28 Oct '14

28 Oct '14

Author: tkreuzer Date: Tue Oct 28 09:06:33 2014 New Revision: 65067 URL: http://svn.reactos.org/svn/reactos?rev=65067&view=rev Log: [GDI32] Implement separate functions for all SelectObject cases. Modified: trunk/reactos/win32ss/gdi/gdi32/objects/dc.c Modified: trunk/reactos/win32ss/gdi/gdi32/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/objects/dc.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/objects/dc.c [iso-8859-1] Tue Oct 28 09:06:33 2014 @@ -1695,26 +1695,23 @@ } -/* - * @implemented - * - */ -HGDIOBJ -WINAPI -SelectObject( - _In_ HDC hdc, - _In_ HGDIOBJ hGdiObj) -{ - PDC_ATTR pdcattr; - HGDIOBJ hOldObj = NULL; - UINT uType; - - /* Fix up 16 bit handles */ - hGdiObj = GdiFixUpHandle(hGdiObj); - if (!GdiIsHandleValid(hGdiObj)) - { - return NULL; - } +HBITMAP +WINAPI +GdiSelectBitmap( + _In_ HDC hdc, + _In_ HBITMAP hbmp) +{ + return NtGdiSelectBitmap(hdc, hbmp); +} + +HBRUSH +WINAPI +GdiSelectBrush( + _In_ HDC hdc, + _In_ HBRUSH hbr) +{ + PDC_ATTR pdcattr; + HBRUSH hbrOld; /* Get the DC attribute */ pdcattr = GdiGetDcAttr(hdc); @@ -1724,68 +1721,133 @@ return NULL; } - uType = GDI_HANDLE_GET_TYPE(hGdiObj); - - switch (uType) - { - case GDI_OBJECT_TYPE_REGION: - return (HGDIOBJ)ExtSelectClipRgn(hdc, hGdiObj, RGN_COPY); - - case GDI_OBJECT_TYPE_BITMAP: - return NtGdiSelectBitmap(hdc, hGdiObj); - - case GDI_OBJECT_TYPE_BRUSH: - hOldObj = pdcattr->hbrush; - pdcattr->ulDirty_ |= DC_BRUSH_DIRTY; - pdcattr->hbrush = hGdiObj; - return hOldObj; -// return NtGdiSelectBrush(hdc, hGdiObj); - - case GDI_OBJECT_TYPE_PEN: - case GDI_OBJECT_TYPE_EXTPEN: - hOldObj = pdcattr->hpen; - pdcattr->ulDirty_ |= DC_PEN_DIRTY; - pdcattr->hpen = hGdiObj; - return hOldObj; -// return NtGdiSelectPen(hdc, hGdiObj); - - case GDI_OBJECT_TYPE_FONT: - hOldObj = pdcattr->hlfntNew; - if (hOldObj == hGdiObj) return hOldObj; - - pdcattr->ulDirty_ &= ~SLOW_WIDTHS; - pdcattr->ulDirty_ |= DIRTY_CHARSET; - pdcattr->hlfntNew = hGdiObj; - - if (!(pdcattr->ulDirty_ & DC_DIBSECTION)) - { - PGDIBSOBJECT pgO; - - pgO = GdiAllocBatchCommand(hdc, GdiBCSelObj); - if (pgO) - { - pgO->hgdiobj = hGdiObj; - return hOldObj; - } - } - - // default for select object font - return NtGdiSelectFont(hdc, hGdiObj); - -#if 0 - case GDI_OBJECT_TYPE_METADC: - return MFDRV_SelectObject(hdc, hGdiObj); - case GDI_OBJECT_TYPE_EMF: - PLDC pLDC = GdiGetLDC(hdc); - if (!pLDC) return NULL; - return EMFDRV_SelectObject(hdc, hGdiObj); -#endif - case GDI_OBJECT_TYPE_COLORSPACE: - SetColorSpace(hdc, (HCOLORSPACE) hGdiObj); - return NULL; - - case GDI_OBJECT_TYPE_PALETTE: + /* Get the current brush. If it matches the new brush, we're done */ + hbrOld = pdcattr->hbrush; + if (hbrOld == hbr) + return hbrOld; + + /* Set the new brush and update dirty flags */ + pdcattr->hbrush = hbr; + pdcattr->ulDirty_ |= DC_BRUSH_DIRTY; + return hbrOld; +} + +HPEN +WINAPI +GdiSelectPen( + _In_ HDC hdc, + _In_ HPEN hpen) +{ + PDC_ATTR pdcattr; + HPEN hpenOld; + + /* Get the DC attribute */ + pdcattr = GdiGetDcAttr(hdc); + if (pdcattr == NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); + return NULL; + } + + /* Get the current pen. If it matches the new pen, we're done */ + hpenOld = pdcattr->hpen; + if (hpenOld == hpen) + return hpenOld; + + /* Set the new pen and update dirty flags */ + pdcattr->ulDirty_ |= DC_PEN_DIRTY; + pdcattr->hpen = hpen; + return hpenOld; +} + +HFONT +WINAPI +GdiSelectFont( + _In_ HDC hdc, + _In_ HFONT hfont) +{ + PDC_ATTR pdcattr; + HFONT hfontOld; + + /* Get the DC attribute */ + pdcattr = GdiGetDcAttr(hdc); + if (pdcattr == NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); + return NULL; + } + + /* Get the current font. If it matches the new font, we're done */ + hfontOld = pdcattr->hlfntNew; + if (hfontOld == hfont) + return hfontOld; + + /* Set the new font and update dirty flags */ + pdcattr->hlfntNew = hfont; + pdcattr->ulDirty_ &= ~SLOW_WIDTHS; + pdcattr->ulDirty_ |= DIRTY_CHARSET; + + /* If the DC does not have a DIB section selected, try a batch command */ + if (!(pdcattr->ulDirty_ & DC_DIBSECTION)) + { + PGDIBSOBJECT pgO; + + pgO = GdiAllocBatchCommand(hdc, GdiBCSelObj); + if (pgO) + { + pgO->hgdiobj = hfont; + return hfontOld; + } + } + + /* We could not use the batch command, call win32k */ + return NtGdiSelectFont(hdc, hfont); +} + + +/* + * @implemented + * + */ +HGDIOBJ +WINAPI +SelectObject( + _In_ HDC hdc, + _In_ HGDIOBJ hobj) +{ + /* Fix up 16 bit handles */ + hobj = GdiFixUpHandle(hobj); + if (!GdiIsHandleValid(hobj)) + { + return NULL; + } + + /* Call the appropriate select function */ + switch (GDI_HANDLE_GET_TYPE(hobj)) + { + case GDILoObjType_LO_REGION_TYPE: + return (HGDIOBJ)ExtSelectClipRgn(hdc, hobj, RGN_COPY); + + case GDILoObjType_LO_BITMAP_TYPE: + case GDILoObjType_LO_DIBSECTION_TYPE: + return GdiSelectBitmap(hdc, hobj); + + case GDILoObjType_LO_BRUSH_TYPE: + return GdiSelectBrush(hdc, hobj); + + case GDILoObjType_LO_PEN_TYPE: + case GDILoObjType_LO_EXTPEN_TYPE: + return GdiSelectPen(hdc, hobj); + + case GDILoObjType_LO_FONT_TYPE: + return GdiSelectFont(hdc, hobj); + + case GDILoObjType_LO_ICMLCS_TYPE: + return SetColorSpace(hdc, hobj); + + case GDILoObjType_LO_PALETTE_TYPE: SetLastError(ERROR_INVALID_FUNCTION); + default: return NULL; }

1 0

[cwittich] 65066: [DRIVERS] don't use uninitialized variables
by cwittich＠svn.reactos.org 28 Oct '14

28 Oct '14

Author: cwittich Date: Tue Oct 28 08:15:49 2014 New Revision: 65066 URL: http://svn.reactos.org/svn/reactos?rev=65066&view=rev Log: [DRIVERS] don't use uninitialized variables Modified: trunk/reactos/drivers/bus/acpi/main.c trunk/reactos/drivers/bus/pcix/fdo.c Modified: trunk/reactos/drivers/bus/acpi/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/main.c?re… ============================================================================== --- trunk/reactos/drivers/bus/acpi/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/main.c [iso-8859-1] Tue Oct 28 08:15:49 2014 @@ -450,7 +450,7 @@ LPWSTR ProcessorVendorIdentifier = NULL; LPWSTR HardwareIdsBuffer = NULL; HANDLE ProcessorHandle = NULL; - ULONG Length, Level1Length = 0, Level2Length = 0, Level3Length = 0; + ULONG Length = 0, Level1Length = 0, Level2Length = 0, Level3Length = 0; SIZE_T HardwareIdsLength = 0; SIZE_T VendorIdentifierLength; ULONG i; Modified: trunk/reactos/drivers/bus/pcix/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/fdo.c?rev… ============================================================================== --- trunk/reactos/drivers/bus/pcix/fdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/fdo.c [iso-8859-1] Tue Oct 28 08:15:49 2014 @@ -478,6 +478,8 @@ AttachedTo = NULL; FdoExtension = NULL; PdoExtension = NULL; + DeviceObject = NULL; + do { /* Check if there's already a device extension for this bus */

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