Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tfaber] 69651: [WIN32K:NTUSER] - Properly set the window minimize status in WM_ACTIVATE's WPARAM. CID 513028, 513029
by tfaber＠svn.reactos.org 22 Oct '15

22 Oct '15

Author: tfaber Date: Thu Oct 22 21:06:25 2015 New Revision: 69651 URL: http://svn.reactos.org/svn/reactos?rev=69651&view=rev Log: [WIN32K:NTUSER] - Properly set the window minimize status in WM_ACTIVATE's WPARAM. CID 513028, 513029 Modified: trunk/reactos/win32ss/user/ntuser/focus.c Modified: trunk/reactos/win32ss/user/ntuser/focus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/focus.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/focus.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/focus.c [iso-8859-1] Thu Oct 22 21:06:25 2015 @@ -62,7 +62,7 @@ if (co_IntSendMessageNoWait(hWndPrev, WM_NCACTIVATE, FALSE, 0)) //(LPARAM)hWnd)) { co_IntSendMessageNoWait(hWndPrev, WM_ACTIVATE, - MAKEWPARAM(WA_INACTIVE, WndPrev->style & WS_MINIMIZE), + MAKEWPARAM(WA_INACTIVE, (WndPrev->style & WS_MINIMIZE) != 0), (LPARAM)hWnd); if (WndPrev) @@ -248,7 +248,7 @@ co_IntSendMessage( UserHMGetHandle(Window), WM_ACTIVATE, - MAKEWPARAM(MouseActivate ? WA_CLICKACTIVE : WA_ACTIVE, Window->style & WS_MINIMIZE), + MAKEWPARAM(MouseActivate ? WA_CLICKACTIVE : WA_ACTIVE, (Window->style & WS_MINIMIZE) != 0), (LPARAM)(WindowPrev ? UserHMGetHandle(WindowPrev) : 0)); if (Window->spwndParent == UserGetDesktopWindow() &&

1 0

[gedmurphy] 69650: The c++ bool is 1 byte, not 4. Thanks Thomas
by gedmurphy＠svn.reactos.org 22 Oct '15

22 Oct '15

Author: gedmurphy Date: Thu Oct 22 17:37:51 2015 New Revision: 69650 URL: http://svn.reactos.org/svn/reactos?rev=69650&view=rev Log: The c++ bool is 1 byte, not 4. Thanks Thomas Modified: trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.cpp trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.h Modified: trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/M… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.cpp [iso-8859-1] Thu Oct 22 17:37:51 2015 @@ -786,7 +786,7 @@ // we set a timer to run in 500ms, which should leave enough time for all // the messages to come through. Wrap so we don't set multiple timers // - if (InterlockedCompareExchange((LONG *)&This->m_RefreshPending, true, false) == false) + if (InterlockedCompareExchange((LONG *)&This->m_RefreshPending, TRUE, FALSE) == FALSE) { SetTimer(hwnd, REFRESH_TIMER, 500, NULL); } @@ -807,7 +807,7 @@ KillTimer(hwnd, REFRESH_TIMER); // Allow more change notifications - InterlockedExchange((LONG *)&This->m_RefreshPending, false); + InterlockedExchange((LONG *)&This->m_RefreshPending, FALSE); } break; } Modified: trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/M… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.h [iso-8859-1] Thu Oct 22 17:37:51 2015 @@ -17,7 +17,7 @@ HMENU m_hMenu; HMENU m_hActionMenu; int m_CmdShow; - bool m_RefreshPending; + BOOL m_RefreshPending; public: CDeviceManager(void);

1 0

[gedmurphy] 69649: [DEVMGR] - Automatically refresh the view whenever there is a hardware change on the machine - Don't force a refresh when we enable/disable devices, this is now be picked up auto...
by gedmurphy＠svn.reactos.org 22 Oct '15

22 Oct '15

Author: gedmurphy Date: Thu Oct 22 17:21:30 2015 New Revision: 69649 URL: http://svn.reactos.org/svn/reactos?rev=69649&view=rev Log: [DEVMGR] - Automatically refresh the view whenever there is a hardware change on the machine - Don't force a refresh when we enable/disable devices, this is now be picked up automatically Modified: trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.cpp trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.cpp trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.h trunk/reactos/dll/win32/devmgr/precomp.h Modified: trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/D… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.cpp [iso-8859-1] Thu Oct 22 17:21:30 2015 @@ -700,13 +700,7 @@ } } - if (Node->EnableDevice(Enable, NeedsReboot)) - { - Refresh(m_ViewType, true, true, Node->GetDeviceId()); - return true; - } - - return false; + return Node->EnableDevice(Enable, NeedsReboot); } bool Modified: trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/M… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.cpp [iso-8859-1] Thu Oct 22 17:21:30 2015 @@ -20,6 +20,8 @@ #define BTN_DISABLE_DRV 3 #define BTN_UPDATE_DRV 4 #define BTN_UNINSTALL_DRV 5 + +#define REFRESH_TIMER 1 HINSTANCE g_hThisInstance = NULL; HINSTANCE g_hParentInstance = NULL; @@ -81,7 +83,8 @@ m_hMainWnd(NULL), m_hStatusBar(NULL), m_hToolBar(NULL), - m_CmdShow(0) + m_CmdShow(0), + m_RefreshPending(false) { m_szMainWndClass = L"DevMgmtWndClass"; } @@ -773,6 +776,42 @@ break; } + case WM_DEVICECHANGE: + { + if (wParam == DBT_DEVNODES_CHANGED) + { + // + // The OS can send multiple change messages in quick sucsession. To avoid + // refreshing multiple times (and to avoid waiting in the message thread) + // we set a timer to run in 500ms, which should leave enough time for all + // the messages to come through. Wrap so we don't set multiple timers + // + if (InterlockedCompareExchange((LONG *)&This->m_RefreshPending, true, false) == false) + { + SetTimer(hwnd, REFRESH_TIMER, 500, NULL); + } + } + break; + } + case WM_TIMER: + { + if (wParam == REFRESH_TIMER) + { + // Schedule a refresh (this just creates a thread and returns) + This->m_DeviceView->Refresh(This->m_DeviceView->GetCurrentView(), + true, + true, + NULL); + + // Cleanup the timer + KillTimer(hwnd, REFRESH_TIMER); + + // Allow more change notifications + InterlockedExchange((LONG *)&This->m_RefreshPending, false); + } + break; + } + case WM_ENTERMENULOOP: { This->UpdateStatusBar(true); Modified: trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/M… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.h [iso-8859-1] Thu Oct 22 17:21:30 2015 @@ -17,6 +17,7 @@ HMENU m_hMenu; HMENU m_hActionMenu; int m_CmdShow; + bool m_RefreshPending; public: CDeviceManager(void); Modified: trunk/reactos/dll/win32/devmgr/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/precomp.h… ============================================================================== --- trunk/reactos/dll/win32/devmgr/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/precomp.h [iso-8859-1] Thu Oct 22 17:21:30 2015 @@ -12,6 +12,7 @@ #include <Cfgmgr32.h> #include <devguid.h> #include <process.h> +#include <dbt.h> #include <RegStr.h> #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit @@ -59,6 +60,7 @@ #include <strsafe.h> #include <regstr.h> #include <newdevp.h> +#include <dbt.h> #include <setupapi.h> #include <commctrl.h>

1 0

[tfaber] 69648: [WIN32K:NTUSER] - Fix uninitialized variable use in failure case of NtUserSetCursorIconData. CID 1322233
by tfaber＠svn.reactos.org 22 Oct '15

22 Oct '15

Author: tfaber Date: Thu Oct 22 16:41:38 2015 New Revision: 69648 URL: http://svn.reactos.org/svn/reactos?rev=69648&view=rev Log: [WIN32K:NTUSER] - Fix uninitialized variable use in failure case of NtUserSetCursorIconData. CID 1322233 Modified: trunk/reactos/win32ss/user/ntuser/cursoricon.c Modified: trunk/reactos/win32ss/user/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/cursor… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/cursoricon.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/cursoricon.c [iso-8859-1] Thu Oct 22 16:41:38 2015 @@ -1507,7 +1507,7 @@ PINT ajifRate; UINT cjSize; NTSTATUS status; - BOOL bResult; + BOOL bResult = FALSE; TRACE("Enter NtUserSetCursorIconData\n"); @@ -1531,7 +1531,6 @@ { ERR("Range error (cpcur = %u, cicur = %u)\n", cursordata.cpcur, cursordata.cicur); - bResult = FALSE; goto Exit; } @@ -1547,7 +1546,6 @@ { ERR("Failed to allocate memory (cpcur = %u, cicur = %u)\n", cursordata.cpcur, cursordata.cicur); - bResult = FALSE; goto Exit; } @@ -1590,7 +1588,6 @@ _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { SetLastNtError(_SEH2_GetExceptionCode()); - bResult = FALSE; goto Exit; } _SEH2_END

1 0

[gadamopoulos] 69647: [SHELL32] - Add DoDeleteAsync method that takes the data object and the fMask parameter from IContextMenu in order to distinguish if we need a permanent delete. - CDefView: Pr...
by gadamopoulos＠svn.reactos.org 22 Oct '15

22 Oct '15

Author: gadamopoulos Date: Thu Oct 22 15:23:21 2015 New Revision: 69647 URL: http://svn.reactos.org/svn/reactos?rev=69647&view=rev Log: [SHELL32] - Add DoDeleteAsync method that takes the data object and the fMask parameter from IContextMenu in order to distinguish if we need a permanent delete. - CDefView: Properly add CMIC_MASK_SHIFT_DOWN and CMIC_MASK_CONTROL_DOWN flags when calling Invoke. - CDefaultContextMenu: use DoDeleteAsync and pass fmask so as to make Shift+Delete shortcut to permanently delete files. Note: GetKeyState sometimes returns wrong results but this doesn't concern the shell. CORE-4365 Modified: trunk/reactos/dll/win32/shell32/CDefView.cpp trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp trunk/reactos/dll/win32/shell32/folders/CRecycleBin.cpp trunk/reactos/dll/win32/shell32/folders/CRecycleBin.h 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] Thu Oct 22 15:23:21 2015 @@ -151,6 +151,7 @@ void OnDeactivate(); void DoActivate(UINT uState); HRESULT drag_notify_subitem(DWORD grfKeyState, POINTL pt, DWORD *pdwEffect); + HRESULT InvokeContextMenuCommand(UINT uCommand); LRESULT OnExplorerCommand(UINT uCommand, BOOL bUseSelection); // *** IOleWindow methods *** @@ -1250,13 +1251,30 @@ return m_cidl; } +HRESULT CDefView::InvokeContextMenuCommand(UINT uCommand) +{ + CMINVOKECOMMANDINFO cmi; + + ZeroMemory(&cmi, sizeof(cmi)); + cmi.cbSize = sizeof(cmi); + cmi.lpVerb = MAKEINTRESOURCEA(uCommand); + cmi.hwnd = m_hWnd; + + if (GetKeyState(VK_SHIFT) & 0x8000) + cmi.fMask |= CMIC_MASK_SHIFT_DOWN; + + if (GetKeyState(VK_CONTROL) & 0x8000) + cmi.fMask |= CMIC_MASK_CONTROL_DOWN; + + return m_pCM->InvokeCommand(&cmi); +} + /********************************************************** * ShellView_OpenSelectedItems() */ HRESULT CDefView::OpenSelectedItems() { HMENU hMenu; - CMINVOKECOMMANDINFO cmi; UINT uCommand; HRESULT hResult; @@ -1287,12 +1305,7 @@ goto cleanup; } - ZeroMemory(&cmi, sizeof(cmi)); - cmi.cbSize = sizeof(cmi); - cmi.lpVerb = (LPCSTR)MAKEINTRESOURCEA(uCommand); - cmi.hwnd = m_hWnd; - - hResult = m_pCM->InvokeCommand(&cmi); + InvokeContextMenuCommand(uCommand); cleanup: @@ -1314,7 +1327,6 @@ WORD y; UINT uCommand; HMENU hMenu; - CMINVOKECOMMANDINFO cmi; HRESULT hResult; // for some reason I haven't figured out, we sometimes recurse into this method @@ -1339,9 +1351,6 @@ hResult = m_pCM->QueryContextMenu(hMenu, 0, FCIDM_SHVIEWFIRST, FCIDM_SHVIEWLAST, CMF_NORMAL); if (FAILED( hResult)) goto cleanup; - - if (m_FolderSettings.fFlags & FWF_DESKTOP) - SetMenuDefaultItem(hMenu, FCIDM_SHVIEW_OPEN, MF_BYCOMMAND); uCommand = TrackPopupMenu(hMenu, TPM_LEFTALIGN | TPM_RETURNCMD | TPM_LEFTBUTTON | TPM_RIGHTBUTTON, @@ -1352,14 +1361,9 @@ if (uCommand == FCIDM_SHVIEW_OPEN && OnDefaultCommand() == S_OK) goto cleanup; - ZeroMemory(&cmi, sizeof(cmi)); - cmi.cbSize = sizeof(cmi); - cmi.lpVerb = MAKEINTRESOURCEA(uCommand); - cmi.hwnd = m_hWnd; - m_pCM->InvokeCommand(&cmi); + InvokeContextMenuCommand(uCommand); cleanup: - if (m_pCM) m_pCM.Release(); @@ -1372,7 +1376,6 @@ LRESULT CDefView::OnExplorerCommand(UINT uCommand, BOOL bUseSelection) { HRESULT hResult; - CMINVOKECOMMANDINFO cmi; HMENU hMenu; hMenu = CreatePopupMenu(); @@ -1387,14 +1390,9 @@ if (FAILED( hResult)) goto cleanup; - ZeroMemory(&cmi, sizeof(cmi)); - cmi.cbSize = sizeof(cmi); - cmi.lpVerb = MAKEINTRESOURCEA(uCommand); - cmi.hwnd = m_hWnd; - m_pCM->InvokeCommand(&cmi); + InvokeContextMenuCommand(uCommand); cleanup: - if (m_pCM) m_pCM.Release(); Modified: trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CDefault… ============================================================================== --- trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp [iso-8859-1] Thu Oct 22 15:23:21 2015 @@ -1165,19 +1165,9 @@ return S_OK; } -HRESULT CDefaultContextMenu::DoDelete(LPCMINVOKECOMMANDINFO lpcmi) { - TRACE("(%p) Deleting\n", this); - - CComPtr<IDataObject> pDataObject; - - if (SUCCEEDED(SHCreateDataObject(m_pidlFolder, m_cidl, m_apidl, NULL, IID_PPV_ARG(IDataObject, &pDataObject)))) - { - IStream *s; - CoMarshalInterThreadInterfaceInStream(IID_IDataObject, pDataObject, &s); - SHCreateThread(DoDeleteThreadProc, s, NULL, NULL); - } - else - return E_FAIL; +HRESULT CDefaultContextMenu::DoDelete(LPCMINVOKECOMMANDINFO lpcmi) +{ + DoDeleteAsync(m_pDataObj, lpcmi->fMask); return S_OK; } Modified: trunk/reactos/dll/win32/shell32/folders/CRecycleBin.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CRecycleBin.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CRecycleBin.cpp [iso-8859-1] Thu Oct 22 15:23:21 2015 @@ -1030,10 +1030,14 @@ InitFormatEtc (fmt, cfShellIDList, TYMED_HGLOBAL); /* Handle cfShellIDList Drop objects here, otherwise send the approriate message to other software */ - if (SUCCEEDED(pDataObject->QueryGetData(&fmt))) { - IStream *s; - CoMarshalInterThreadInterfaceInStream(IID_IDataObject, pDataObject, &s); - SHCreateThread(DoDeleteThreadProc, s, NULL, NULL); + if (SUCCEEDED(pDataObject->QueryGetData(&fmt))) + { + DWORD fMask = 0; + + if ((dwKeyState & MK_SHIFT) == MK_SHIFT) + fMask |= CMIC_MASK_SHIFT_DOWN; + + DoDeleteAsync(pDataObject, fMask); } else { @@ -1045,20 +1049,7 @@ return S_OK; } -DWORD WINAPI DoDeleteThreadProc(LPVOID lpParameter) -{ - CoInitialize(NULL); - CComPtr<IDataObject> pDataObject; - HRESULT hr = CoGetInterfaceAndReleaseStream (static_cast<IStream*>(lpParameter), IID_PPV_ARG(IDataObject, &pDataObject)); - if (SUCCEEDED(hr)) - { - DoDeleteDataObject(pDataObject); - } - CoUninitialize(); - return 0; -} - -HRESULT WINAPI DoDeleteDataObject(IDataObject *pda) +HRESULT WINAPI DoDeleteDataObject(IDataObject *pda, DWORD fMask) { TRACE("performing delete"); HRESULT hr; @@ -1160,7 +1151,8 @@ ZeroMemory(&FileOp, sizeof(FileOp)); FileOp.wFunc = FO_DELETE; FileOp.pFrom = pwszPaths; - FileOp.fFlags = FOF_ALLOWUNDO; + if ((fMask & CMIC_MASK_SHIFT_DOWN) == 0) + FileOp.fFlags = FOF_ALLOWUNDO; if (SHFileOperationW(&FileOp) != 0) { @@ -1174,6 +1166,35 @@ ReleaseStgMedium(&medium); return hr; +} + +struct DeleteThreadData { + IStream *s; + DWORD fMask; +}; + +DWORD WINAPI DoDeleteThreadProc(LPVOID lpParameter) +{ + DeleteThreadData *data = static_cast<DeleteThreadData*>(lpParameter); + CoInitialize(NULL); + IDataObject *pDataObject; + HRESULT hr = CoGetInterfaceAndReleaseStream (data->s, IID_PPV_ARG(IDataObject, &pDataObject)); + if (SUCCEEDED(hr)) + { + DoDeleteDataObject(pDataObject, data->fMask); + } + pDataObject->Release(); + CoUninitialize(); + HeapFree(GetProcessHeap(), 0, data); + return 0; +} + +void DoDeleteAsync(IDataObject *pda, DWORD fMask) +{ + DeleteThreadData *data = static_cast<DeleteThreadData*>(HeapAlloc(GetProcessHeap(), 0, sizeof(DeleteThreadData))); + data->fMask = fMask; + CoMarshalInterThreadInterfaceInStream(IID_IDataObject, pda, &data->s); + SHCreateThread(DoDeleteThreadProc, data, NULL, NULL); } /************************************************************************* Modified: trunk/reactos/dll/win32/shell32/folders/CRecycleBin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CRecycleBin.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CRecycleBin.h [iso-8859-1] Thu Oct 22 15:23:21 2015 @@ -22,8 +22,7 @@ #ifndef _SHFLDR_RECYCLEBIN_H_ #define _SHFLDR_RECYCLEBIN_H_ -DWORD WINAPI DoDeleteThreadProc(LPVOID lpParameter); -HRESULT WINAPI DoDeleteDataObject(IDataObject *pda); +void DoDeleteAsync(IDataObject *pda, DWORD fMask); BOOL TRASH_CanTrashFile(LPCWSTR wszPath); BOOL TRASH_TrashFile(LPCWSTR wszPath);

1 0

[tfaber] 69646: [WIN32K:NTUSER] - Don't pass an uninitialized DOSENDMESSAGE structure to co_IntDoSendMessage. CID 701425
by tfaber＠svn.reactos.org 22 Oct '15

22 Oct '15

Author: tfaber Date: Thu Oct 22 15:12:09 2015 New Revision: 69646 URL: http://svn.reactos.org/svn/reactos?rev=69646&view=rev Log: [WIN32K:NTUSER] - Don't pass an uninitialized DOSENDMESSAGE structure to co_IntDoSendMessage. CID 701425 Modified: trunk/reactos/win32ss/user/ntuser/message.c Modified: trunk/reactos/win32ss/user/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/messag… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] Thu Oct 22 15:12:09 2015 @@ -2760,7 +2760,7 @@ _SEH2_END; } - Ret = co_IntDoSendMessage( hWnd, Msg, wParam, lParam, &dsm ); + Ret = co_IntDoSendMessage( hWnd, Msg, wParam, lParam, pdsm ? &dsm : NULL ); if (pdsm) {

1 0

[tfaber] 69645: [WIN32K:NTUSER] - Only resend WM_ENTERIDLE after encountering a relevant message. CID 1321906
by tfaber＠svn.reactos.org 22 Oct '15

22 Oct '15

Author: tfaber Date: Thu Oct 22 14:43:39 2015 New Revision: 69645 URL: http://svn.reactos.org/svn/reactos?rev=69645&view=rev Log: [WIN32K:NTUSER] - Only resend WM_ENTERIDLE after encountering a relevant message. CID 1321906 Modified: trunk/reactos/win32ss/user/ntuser/menu.c Modified: trunk/reactos/win32ss/user/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/menu.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/menu.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/menu.c [iso-8859-1] Thu Oct 22 14:43:39 2015 @@ -3906,7 +3906,7 @@ IntTranslateKbdMessage(&msg, 0); mt.Pt = msg.pt; - if ( (msg.hwnd == mt.CurrentMenu->hWnd) || ((msg.message!=WM_TIMER) || (msg.message!=WM_SYSTIMER)) ) + if ( (msg.hwnd == mt.CurrentMenu->hWnd) || ((msg.message!=WM_TIMER) && (msg.message!=WM_SYSTIMER)) ) enterIdleSent=FALSE; fRemove = FALSE;

1 0

[tfaber] 69644: [WIN32K:NTUSER] - Don't call PopupMenuWndProc for the message window in IntDispatchMessage. CID 1322026
by tfaber＠svn.reactos.org 22 Oct '15

22 Oct '15

Author: tfaber Date: Thu Oct 22 14:13:40 2015 New Revision: 69644 URL: http://svn.reactos.org/svn/reactos?rev=69644&view=rev Log: [WIN32K:NTUSER] - Don't call PopupMenuWndProc for the message window in IntDispatchMessage. CID 1322026 Modified: trunk/reactos/win32ss/user/ntuser/message.c Modified: trunk/reactos/win32ss/user/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/messag… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] Thu Oct 22 14:13:40 2015 @@ -750,6 +750,7 @@ pMsg->wParam, pMsg->lParam, &retval); + break; case FNID_MENU: DoCallBack = !PopupMenuWndProc( Window, pMsg->message,

1 0

[tfaber] 69643: [WIN32K:NTGDI] - Fix pool leak in failure case of PATH_StrokePath. CID 716633
by tfaber＠svn.reactos.org 22 Oct '15

22 Oct '15

Author: tfaber Date: Thu Oct 22 13:48:12 2015 New Revision: 69643 URL: http://svn.reactos.org/svn/reactos?rev=69643&view=rev Log: [WIN32K:NTGDI] - Fix pool leak in failure case of PATH_StrokePath. CID 716633 Modified: trunk/reactos/win32ss/gdi/ntgdi/path.c Modified: trunk/reactos/win32ss/gdi/ntgdi/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/path.c?r… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/path.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/path.c [iso-8859-1] Thu Oct 22 13:48:12 2015 @@ -1644,6 +1644,7 @@ if (!Realloc) { DPRINT1("Can't allocate pool!\n"); + ExFreePoolWithTag(pBzrPts, TAG_BEZIER); goto end; }

1 0

[tfaber] 69642: [WIN32K:NTGDI] - Correctly pass 'planes' and 'bpp' arguments to IntCreateDIBitmap in GreCreateDIBitmapInternal. CID 1250302
by tfaber＠svn.reactos.org 22 Oct '15

22 Oct '15

Author: tfaber Date: Thu Oct 22 11:29:55 2015 New Revision: 69642 URL: http://svn.reactos.org/svn/reactos?rev=69642&view=rev Log: [WIN32K:NTGDI] - Correctly pass 'planes' and 'bpp' arguments to IntCreateDIBitmap in GreCreateDIBitmapInternal. CID 1250302 Modified: trunk/reactos/win32ss/gdi/ntgdi/dibobj.c Modified: trunk/reactos/win32ss/gdi/ntgdi/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dibobj.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] Thu Oct 22 11:29:55 2015 @@ -1529,7 +1529,7 @@ planes = 0; compression = 0; } - Bmp = IntCreateDIBitmap(Dc, cx, cy, bpp, planes, compression, fInit, pjInit, pbmi, iUsage); + Bmp = IntCreateDIBitmap(Dc, cx, cy, planes, bpp, compression, fInit, pjInit, pbmi, iUsage); DC_UnlockDc(Dc); if(!hDc)

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