Ros-diffs April 2015

ros-diffs@reactos.org

17 participants
481 discussions

[tfaber] 67014: [NTOS:IO] - Fix file object reference leak in NtWriteFile CORE-9472 #resolve
by tfaber＠svn.reactos.org 03 Apr '15

03 Apr '15

Author: tfaber Date: Fri Apr 3 03:40:53 2015 New Revision: 67014 URL: http://svn.reactos.org/svn/reactos?rev=67014&view=rev Log: [NTOS:IO] - Fix file object reference leak in NtWriteFile CORE-9472 #resolve Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iofunc.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iofunc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iofunc.c [iso-8859-1] Fri Apr 3 03:40:53 2015 @@ -3201,7 +3201,8 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - /* Return the exception code */ + /* Release the file object and return the exception code */ + ObDereferenceObject(FileObject); _SEH2_YIELD(return _SEH2_GetExceptionCode()); } _SEH2_END;

1 0

[hbelusca] 67013: [CMD]: Fix the ConWrite newline support I added in r59411 (strpbrk only applies on NULL-terminated strings, whereas here I manipulate char-counted strings). Spotted by Thomas. As ...
by hbelusca＠svn.reactos.org 03 Apr '15

03 Apr '15

Author: hbelusca Date: Fri Apr 3 00:11:42 2015 New Revision: 67013 URL: http://svn.reactos.org/svn/reactos?rev=67013&view=rev Log: [CMD]: Fix the ConWrite newline support I added in r59411 (strpbrk only applies on NULL-terminated strings, whereas here I manipulate char-counted strings). Spotted by Thomas. As a result should fix almost all of the non-NULL-terminated strings that show up in the failed cmd wine test. Modified: trunk/reactos/base/shell/cmd/console.c Modified: trunk/reactos/base/shell/cmd/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/console.c?r… ============================================================================== --- trunk/reactos/base/shell/cmd/console.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/console.c [iso-8859-1] Fri Apr 3 00:11:42 2015 @@ -137,15 +137,19 @@ static VOID ConWrite(TCHAR *str, DWORD len, DWORD nStdHandle) { - DWORD dwWritten; + DWORD dwNumBytes = 0; HANDLE hOutput = GetStdHandle(nStdHandle); PVOID p; + /* If we don't write anything, just return */ + if (!str || len == 0) + return; + /* Check whether we are writing to a console and if so, write to it */ if (IsConsoleHandle(hOutput)) { - if (WriteConsole(hOutput, str, len, &dwWritten, NULL)) - return; + WriteConsole(hOutput, str, len, &dwNumBytes, NULL); + return; } /* We're writing to a file or pipe instead of the console. Convert the @@ -164,30 +168,38 @@ #endif /* * Find any newline character in the buffer, - * send the part BEFORE the newline, then send - * a carriage-return + newline, and then send + * write the part BEFORE the newline, then write + * a carriage-return + newline, and then write * the remaining part of the buffer. * * This fixes output in files and serial console. */ - while (str && *(PWCHAR)str && len > 0) + while (len > 0) { - p = wcspbrk((PWCHAR)str, L"\r\n"); - if (p) + /* Loop until we find a \r or \n character */ + // FIXME: What about the pair \r\n ? + p = str; + while (*(PWCHAR)p != L'\r' && *(PWCHAR)p != L'\n' && len > 0) { - len -= ((PWCHAR)p - (PWCHAR)str) + 1; - WriteFile(hOutput, str, ((PWCHAR)p - (PWCHAR)str) * sizeof(WCHAR), &dwWritten, NULL); - WriteFile(hOutput, L"\r\n", 2 * sizeof(WCHAR), &dwWritten, NULL); + /* Advance one character */ + p = (PVOID)((PWCHAR)p + 1); + len--; + } + + /* Write everything up to \r or \n */ + dwNumBytes = ((PWCHAR)p - (PWCHAR)str) * sizeof(WCHAR); + WriteFile(hOutput, str, dwNumBytes, &dwNumBytes, NULL); + + /* If we hit \r or \n ... */ + if (*(PWCHAR)p == L'\r' || *(PWCHAR)p == L'\n') + { + /* ... send a carriage-return + newline sequence and skip \r or \n */ + WriteFile(hOutput, L"\r\n", 2 * sizeof(WCHAR), &dwNumBytes, NULL); str = (PVOID)((PWCHAR)p + 1); - } - else - { - WriteFile(hOutput, str, len * sizeof(WCHAR), &dwWritten, NULL); - break; + len--; } } - // WriteFile(hOutput, str, len * sizeof(WCHAR), &dwWritten, NULL); #ifndef _UNICODE cmd_free(buffer); #endif @@ -206,30 +218,38 @@ #endif /* * Find any newline character in the buffer, - * send the part BEFORE the newline, then send - * a carriage-return + newline, and then send + * write the part BEFORE the newline, then write + * a carriage-return + newline, and then write * the remaining part of the buffer. * * This fixes output in files and serial console. */ - while (str && *(PCHAR)str && len > 0) + while (len > 0) { - p = strpbrk((PCHAR)str, "\r\n"); - if (p) + /* Loop until we find a \r or \n character */ + // FIXME: What about the pair \r\n ? + p = str; + while (*(PCHAR)p != '\r' && *(PCHAR)p != '\n' && len > 0) { - len -= ((PCHAR)p - (PCHAR)str) + 1; - WriteFile(hOutput, str, ((PCHAR)p - (PCHAR)str), &dwWritten, NULL); - WriteFile(hOutput, "\r\n", 2, &dwWritten, NULL); + /* Advance one character */ + p = (PVOID)((PCHAR)p + 1); + len--; + } + + /* Write everything up to \r or \n */ + dwNumBytes = ((PCHAR)p - (PCHAR)str) * sizeof(CHAR); + WriteFile(hOutput, str, dwNumBytes, &dwNumBytes, NULL); + + /* If we hit \r or \n ... */ + if (*(PCHAR)p == '\r' || *(PCHAR)p == '\n') + { + /* ... send a carriage-return + newline sequence and skip \r or \n */ + WriteFile(hOutput, "\r\n", 2, &dwNumBytes, NULL); str = (PVOID)((PCHAR)p + 1); - } - else - { - WriteFile(hOutput, str, len, &dwWritten, NULL); - break; + len--; } } - // WriteFile(hOutput, str, len, &dwWritten, NULL); #ifdef _UNICODE cmd_free(buffer); #endif

1 0

[hbelusca] 67012: [CMD]: When the CD command echoes the current path, it should return to a newline. CORE-6810
by hbelusca＠svn.reactos.org 02 Apr '15

02 Apr '15

Author: hbelusca Date: Thu Apr 2 23:47:00 2015 New Revision: 67012 URL: http://svn.reactos.org/svn/reactos?rev=67012&view=rev Log: [CMD]: When the CD command echoes the current path, it should return to a newline. CORE-6810 Modified: trunk/reactos/base/shell/cmd/internal.c Modified: trunk/reactos/base/shell/cmd/internal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/internal.c?… ============================================================================== --- trunk/reactos/base/shell/cmd/internal.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/internal.c [iso-8859-1] Thu Apr 2 23:47:00 2015 @@ -241,7 +241,7 @@ error_invalid_drive(); return 1; } - ConOutPuts(szCurrent); + ConOutPrintf(_T("%s\n"), szCurrent); return 0; } @@ -249,7 +249,7 @@ GetCurrentDirectory(MAX_PATH, szCurrent); if (param[0] == _T('\0')) { - ConOutPuts(szCurrent); + ConOutPrintf(_T("%s\n"), szCurrent); return 0; }

1 0

[cwittich] 67011: [STOBJECT] Reorder volume menu items patch by Jared CORE-9468
by cwittich＠svn.reactos.org 02 Apr '15

02 Apr '15

Author: cwittich Date: Thu Apr 2 06:09:25 2015 New Revision: 67011 URL: http://svn.reactos.org/svn/reactos?rev=67011&view=rev Log: [STOBJECT] Reorder volume menu items patch by Jared CORE-9468 Modified: trunk/reactos/dll/shellext/stobject/volume.cpp Modified: trunk/reactos/dll/shellext/stobject/volume.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/stobject/volu… ============================================================================== --- trunk/reactos/dll/shellext/stobject/volume.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/stobject/volume.cpp [iso-8859-1] Thu Apr 2 06:09:25 2015 @@ -216,12 +216,12 @@ { WCHAR strAdjust[128]; WCHAR strOpen[128]; + LoadStringW(g_hInstance, IDS_VOL_OPEN, strOpen, _countof(strOpen)); LoadStringW(g_hInstance, IDS_VOL_ADJUST, strAdjust, _countof(strAdjust)); - LoadStringW(g_hInstance, IDS_VOL_OPEN, strOpen, _countof(strOpen)); HMENU hPopup = CreatePopupMenu(); + AppendMenuW(hPopup, MF_STRING, IDS_VOL_OPEN, strOpen); AppendMenuW(hPopup, MF_STRING, IDS_VOL_ADJUST, strAdjust); - AppendMenuW(hPopup, MF_STRING, IDS_VOL_OPEN, strOpen); DWORD flags = TPM_RETURNCMD | TPM_NONOTIFY | TPM_RIGHTALIGN | TPM_BOTTOMALIGN; DWORD msgPos = GetMessagePos();

1 0

[gadamopoulos] 67010: [SHELL32] - CNetFolder: As this folder isn't really implemented yet, there is no need to call the hacky common implementation of wine's shell folders (which will be removed ev...
by gadamopoulos＠svn.reactos.org 01 Apr '15

01 Apr '15

Author: gadamopoulos Date: Wed Apr 1 20:34:52 2015 New Revision: 67010 URL: http://svn.reactos.org/svn/reactos?rev=67010&view=rev Log: [SHELL32] - CNetFolder: As this folder isn't really implemented yet, there is no need to call the hacky common implementation of wine's shell folders (which will be removed eventually). Modified: trunk/reactos/dll/win32/shell32/folders/CNetFolder.cpp Modified: trunk/reactos/dll/win32/shell32/folders/CNetFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CNetFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CNetFolder.cpp [iso-8859-1] Wed Apr 1 20:34:52 2015 @@ -106,7 +106,7 @@ TRACE ("(%p)->(pidl=%p,%p,%s,%p)\n", this, pidl, pbcReserved, shdebugstr_guid (&riid), ppvOut); - return SHELL32_BindToChild(pidlRoot, NULL, pidl, riid, ppvOut); + return E_NOTIMPL; } /************************************************************************** @@ -127,12 +127,7 @@ HRESULT WINAPI CNetFolder::CompareIDs(LPARAM lParam, PCUIDLIST_RELATIVE pidl1, PCUIDLIST_RELATIVE pidl2) { - int nReturn; - - TRACE("(%p)->(0x%08lx,pidl1=%p,pidl2=%p)\n", this, lParam, pidl1, pidl2); - nReturn = SHELL32_CompareIDs(this, lParam, pidl1, pidl2); - TRACE("-- %i\n", nReturn); - return nReturn; + return E_NOTIMPL; } /************************************************************************** @@ -198,13 +193,7 @@ *rgfInOut = dwNethoodAttributes; else { - while (cidl > 0 && *apidl) - { - pdump(*apidl); - SHELL32_GetItemAttributes(this, *apidl, rgfInOut); - apidl++; - cidl--; - } + /* FIXME: Implement when enumerating items is implemented */ } /* make sure SFGAO_VALIDATE is cleared, some apps depend on that */

1 0

[gadamopoulos] 67009: [SHELL32] - Implement IContextMenu3 interface. Implement drawing the icons on WM_DRAWITEM. CORE-8866
by gadamopoulos＠svn.reactos.org 01 Apr '15

01 Apr '15

Author: gadamopoulos Date: Wed Apr 1 20:22:25 2015 New Revision: 67009 URL: http://svn.reactos.org/svn/reactos?rev=67009&view=rev Log: [SHELL32] - Implement IContextMenu3 interface. Implement drawing the icons on WM_DRAWITEM. CORE-8866 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] Wed Apr 1 20:22:25 2015 @@ -30,17 +30,14 @@ m_pItems = NULL; m_pLinkItem = NULL; m_pSite = NULL; - m_hbmFolder = NULL; - m_hbmLink = NULL; + m_hiconFolder = NULL; + m_hiconLink = NULL; + m_idCmdFirst = 0; } CNewMenu::~CNewMenu() { UnloadAllItems(); - if (m_hbmFolder) - DeleteObject(m_hbmFolder); - if (m_hbmLink) - DeleteObject(m_hbmLink); } void CNewMenu::UnloadItem(SHELLNEW_ITEM *pItem) @@ -50,8 +47,8 @@ free(pItem->pwszDesc); free(pItem->pwszExt); - if (pItem->hBitmap) - DeleteObject(pItem->hBitmap); + if (pItem->hIcon) + DestroyIcon(pItem->hIcon); HeapFree(GetProcessHeap(), 0, pItem); } @@ -73,29 +70,6 @@ if (m_pLinkItem) UnloadItem(m_pLinkItem); m_pLinkItem = NULL; -} - -static HBITMAP IconToBitmap(HICON hIcon) -{ - HDC hdc, hdcScr; - HBITMAP hbm, hbmOld; - RECT rc; - - hdcScr = GetDC(NULL); - hdc = CreateCompatibleDC(hdcScr); - SetRect(&rc, 0, 0, GetSystemMetrics(SM_CXMENUCHECK), GetSystemMetrics(SM_CYMENUCHECK)); - hbm = CreateCompatibleBitmap(hdcScr, rc.right, rc.bottom); - ReleaseDC(NULL, hdcScr); - - hbmOld = (HBITMAP)SelectObject(hdc, hbm); - FillRect(hdc, &rc, (HBRUSH)(COLOR_MENU + 1)); - if (!DrawIconEx(hdc, 0, 0, hIcon, rc.right, rc.bottom, 0, NULL, DI_NORMAL)) - ERR("DrawIcon failed: %x\n", GetLastError()); - SelectObject(hdc, hbmOld); - - DeleteDC(hdc); - - return hbm; } CNewMenu::SHELLNEW_ITEM *CNewMenu::LoadItem(LPCWSTR pwszExt) @@ -179,10 +153,7 @@ pNewItem->pwszExt = _wcsdup(pwszExt); pNewItem->pwszDesc = _wcsdup(fi.szTypeName); if (fi.hIcon) - { - pNewItem->hBitmap = IconToBitmap(fi.hIcon); - DestroyIcon(fi.hIcon); - } + pNewItem->hIcon = fi.hIcon; return pNewItem; } @@ -262,16 +233,11 @@ /* Insert new folder action */ if (!LoadStringW(shell32_hInstance, FCIDM_SHVIEW_NEWFOLDER, wszBuf, _countof(wszBuf))) wszBuf[0] = 0; - mii.fMask = MIIM_ID | MIIM_TYPE | MIIM_STATE | MIIM_DATA; - mii.fType = MFT_STRING; + mii.fMask = MIIM_ID | MIIM_BITMAP | MIIM_STRING; mii.dwTypeData = wszBuf; mii.cch = wcslen(mii.dwTypeData); mii.wID = idCmd; - if (m_hbmFolder) - { - mii.fMask |= MIIM_CHECKMARKS; - mii.hbmpChecked = mii.hbmpUnchecked = m_hbmFolder; - } + mii.hbmpItem = HBMMENU_CALLBACK; if (InsertMenuItemW(hMenu, Pos++, TRUE, &mii)) ++idCmd; @@ -281,11 +247,6 @@ mii.dwTypeData = wszBuf; mii.cch = wcslen(mii.dwTypeData); mii.wID = idCmd; - if (m_hbmLink) - { - mii.fMask |= MIIM_CHECKMARKS; - mii.hbmpChecked = mii.hbmpUnchecked = m_hbmLink; - } if (InsertMenuItemW(hMenu, Pos++, TRUE, &mii)) ++idCmd; @@ -296,22 +257,16 @@ InsertMenuItemW(hMenu, Pos++, TRUE, &mii); /* Insert rest of items */ - mii.fType = MFT_STRING; - mii.fState = MFS_ENABLED; + mii.fMask = MIIM_ID | MIIM_BITMAP | MIIM_STRING; + mii.fType = 0; SHELLNEW_ITEM *pCurItem = m_pItems; while (pCurItem) { TRACE("szDesc %s\n", debugstr_w(pCurItem->pwszDesc)); - mii.fMask = MIIM_ID | MIIM_TYPE | MIIM_STATE | MIIM_DATA; mii.dwTypeData = pCurItem->pwszDesc; mii.cch = wcslen(mii.dwTypeData); mii.wID = idCmd; - if (pCurItem->hBitmap) - { - mii.fMask |= MIIM_CHECKMARKS; - mii.hbmpChecked = mii.hbmpUnchecked = pCurItem->hBitmap; - } if (InsertMenuItemW(hMenu, Pos++, TRUE, &mii)) ++idCmd; pCurItem = pCurItem->pNext; @@ -562,6 +517,8 @@ MENUITEMINFOW mii; UINT cItems = 0; + m_idCmdFirst = idCmdFirst; + TRACE("%p %p %u %u %u %u\n", this, hMenu, indexMenu, idCmdFirst, idCmdLast, uFlags); @@ -637,15 +594,71 @@ return S_OK; } +HRESULT +WINAPI +CNewMenu::HandleMenuMsg2(UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *plResult) +{ + switch (uMsg) + { + case WM_MEASUREITEM: + { + MEASUREITEMSTRUCT* lpmis = reinterpret_cast<MEASUREITEMSTRUCT*>(lParam); + if (!lpmis || lpmis->CtlType != ODT_MENU) + break; + + if (lpmis->itemWidth < (UINT)GetSystemMetrics(SM_CXMENUCHECK)) + lpmis->itemWidth = GetSystemMetrics(SM_CXMENUCHECK); + if (lpmis->itemHeight < 16) + lpmis->itemHeight = 16; + + if (plResult) + *plResult = TRUE; + break; + } + case WM_DRAWITEM: + { + DRAWITEMSTRUCT* lpdis = reinterpret_cast<DRAWITEMSTRUCT*>(lParam); + if (!lpdis || lpdis->CtlType != ODT_MENU) + break; + + DWORD id = LOWORD(lpdis->itemID) - m_idCmdFirst; + HICON hIcon = 0; + if (id == 0) + hIcon = m_hiconFolder; + else if (id == 1) + hIcon = m_hiconLink; + else + { + SHELLNEW_ITEM *pItem = FindItemFromIdOffset(id); + if (pItem) + hIcon = pItem->hIcon; + } + + if (!hIcon) + break; + + DrawIconEx(lpdis->hDC, + 2, + lpdis->rcItem.top + (lpdis->rcItem.bottom - lpdis->rcItem.top - 16) / 2, + hIcon, + 16, + 16, + 0, NULL, DI_NORMAL); + + if(plResult) + *plResult = TRUE; + } + } + + return S_OK; +} + HRESULT WINAPI CNewMenu::Initialize(LPCITEMIDLIST pidlFolder, IDataObject *pdtobj, HKEY hkeyProgID) { /* Load folder and shortcut icons */ - HICON hIcon = (HICON)LoadImage(shell32_hInstance, MAKEINTRESOURCE(IDI_SHELL_FOLDER), IMAGE_ICON, 0, 0, LR_SHARED); - m_hbmFolder = hIcon ? IconToBitmap(hIcon) : NULL; - hIcon = (HICON)LoadImage(shell32_hInstance, MAKEINTRESOURCE(IDI_SHELL_SHORTCUT), IMAGE_ICON, 0, 0, LR_SHARED); - m_hbmLink = hIcon ? IconToBitmap(hIcon) : NULL; - + m_hiconFolder = (HICON)LoadImage(shell32_hInstance, MAKEINTRESOURCE(IDI_SHELL_FOLDER), IMAGE_ICON, 16, 16, LR_SHARED); + m_hiconLink = (HICON)LoadImage(shell32_hInstance, MAKEINTRESOURCE(IDI_SHELL_SHORTCUT), IMAGE_ICON, 16, 16, LR_SHARED); return S_OK; } 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] Wed Apr 1 20:22:25 2015 @@ -27,7 +27,7 @@ public CComCoClass<CNewMenu, &CLSID_NewMenu>, public CComObjectRootEx<CComMultiThreadModelNoCS>, public IObjectWithSite, - public IContextMenu2, + public IContextMenu3, public IShellExtInit { private: @@ -47,7 +47,7 @@ PBYTE pData; ULONG cbData; LPWSTR pwszDesc; - HBITMAP hBitmap; + HICON hIcon; SHELLNEW_ITEM *pNext; }; @@ -56,7 +56,8 @@ SHELLNEW_ITEM *m_pLinkItem; CComPtr<IUnknown> m_pSite; HMENU m_hSubMenu; - HBITMAP m_hbmFolder, m_hbmLink; + HICON m_hiconFolder, m_hiconLink; + UINT m_idCmdFirst; SHELLNEW_ITEM *LoadItem(LPCWSTR pwszExt); void UnloadItem(SHELLNEW_ITEM *pItem); @@ -80,6 +81,9 @@ 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); + // IContextMenu2 virtual HRESULT WINAPI HandleMenuMsg(UINT uMsg, WPARAM wParam, LPARAM lParam); @@ -93,6 +97,7 @@ 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)

1 0

[gadamopoulos] 67008: [SHELL32] - Show hidden files as dithered.
by gadamopoulos＠svn.reactos.org 01 Apr '15

01 Apr '15

Author: gadamopoulos Date: Wed Apr 1 19:18:34 2015 New Revision: 67008 URL: http://svn.reactos.org/svn/reactos?rev=67008&view=rev Log: [SHELL32] - Show hidden files as dithered. 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] Wed Apr 1 19:18:34 2015 @@ -787,6 +787,7 @@ lvItem.lParam = reinterpret_cast<LPARAM>(ILClone(pidl)); /*set the item's data*/ lvItem.pszText = LPSTR_TEXTCALLBACKW; /*get text on a callback basis*/ lvItem.iImage = I_IMAGECALLBACK; /*get the image on a callback basis*/ + lvItem.stateMask = LVIS_CUT; if (m_ListView.InsertItem(&lvItem) == -1) return FALSE; @@ -881,7 +882,10 @@ { /* if the value is 1, then show all hidden files/folders */ if (flagVal == 1) + { dFlags |= SHCONTF_INCLUDEHIDDEN; + m_ListView.SendMessageW(LVM_SETCALLBACKMASK, LVIS_CUT, 0); + } } /* close the key */ @@ -1755,6 +1759,17 @@ { lpdi->item.iImage = SHMapPIDLToSystemImageListIndex(m_pSFParent, pidl, 0); } + if(lpdi->item.mask & LVIF_STATE) + { + ULONG attributes = SFGAO_HIDDEN; + if (SUCCEEDED(m_pSFParent->GetAttributesOf(1, &pidl, &attributes))) + { + if (attributes & SFGAO_HIDDEN) + { + lpdi->item.state |= LVIS_CUT; + } + } + } lpdi->item.mask |= LVIF_DI_SETITEM; break;

1 0

[akhaldi] 67007: [STREAM] Plug a leak on failure path. Spotted by Samuel Serapion using cppcheck. CORE-8211
by akhaldi＠svn.reactos.org 01 Apr '15

01 Apr '15

Author: akhaldi Date: Wed Apr 1 17:53:02 2015 New Revision: 67007 URL: http://svn.reactos.org/svn/reactos?rev=67007&view=rev Log: [STREAM] Plug a leak on failure path. Spotted by Samuel Serapion using cppcheck. CORE-8211 Modified: trunk/reactos/drivers/wdm/audio/legacy/stream/driver.c Modified: trunk/reactos/drivers/wdm/audio/legacy/stream/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/s… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/stream/driver.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/stream/driver.c [iso-8859-1] Wed Apr 1 17:53:02 2015 @@ -50,6 +50,7 @@ { /* Failed to attach */ IoDeleteDevice(DeviceObject); + ExFreePool(ItemList); return STATUS_UNSUCCESSFUL; }

1 0

[tkreuzer] 67006: [WINSRV] Enable C_ASSERT only on x86. Fixes x64 build.
by tkreuzer＠svn.reactos.org 01 Apr '15

01 Apr '15

Author: tkreuzer Date: Wed Apr 1 17:51:05 2015 New Revision: 67006 URL: http://svn.reactos.org/svn/reactos?rev=67006&view=rev Log: [WINSRV] Enable C_ASSERT only on x86. Fixes x64 build. Modified: trunk/reactos/win32ss/user/winsrv/concfg/settings.h Modified: trunk/reactos/win32ss/user/winsrv/concfg/settings.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/concfg… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/concfg/settings.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/concfg/settings.h [iso-8859-1] Wed Apr 1 17:51:05 2015 @@ -58,7 +58,9 @@ WCHAR ConsoleTitle[ANYSIZE_ARRAY]; } CONSOLE_STATE_INFO, *PCONSOLE_STATE_INFO; +#ifdef _M_IX86 C_ASSERT(sizeof(CONSOLE_STATE_INFO) == 0xD0); +#endif #pragma pack(pop)

1 0

[cwittich] 67005: [DEVMGR] don't show an empty list when no driver files are required CORE-3341
by cwittich＠svn.reactos.org 01 Apr '15

01 Apr '15

Author: cwittich Date: Wed Apr 1 12:03:12 2015 New Revision: 67005 URL: http://svn.reactos.org/svn/reactos?rev=67005&view=rev Log: [DEVMGR] don't show an empty list when no driver files are required CORE-3341 Modified: trunk/reactos/dll/win32/devmgr/advprop.c trunk/reactos/dll/win32/devmgr/hwpage.c trunk/reactos/dll/win32/devmgr/precomp.h Modified: trunk/reactos/dll/win32/devmgr/advprop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/advprop.c… ============================================================================== --- trunk/reactos/dll/win32/devmgr/advprop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/advprop.c [iso-8859-1] Wed Apr 1 12:03:12 2015 @@ -319,6 +319,7 @@ { LV_COLUMN lvc; HWND hDriversListView; + WCHAR szBuffer[260]; dap = (PDEVADVPROP_INFO)lParam; if (dap != NULL) @@ -341,6 +342,13 @@ UpdateDriverDetailsDlg(hwndDlg, hDriversListView, dap); + + if (ListView_GetItemCount(hDriversListView) == 0) + { + if(LoadStringW(hDllInstance, IDS_NODRIVERS, szBuffer, _countof(szBuffer))) + MessageBoxW(hwndDlg, szBuffer, dap->szDevName, MB_OK); + EndDialog(hwndDlg, IDCANCEL); + } } Ret = TRUE; Modified: trunk/reactos/dll/win32/devmgr/hwpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/hwpage.c?… ============================================================================== --- trunk/reactos/dll/win32/devmgr/hwpage.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/hwpage.c [iso-8859-1] Wed Apr 1 12:03:12 2015 @@ -962,8 +962,8 @@ case WM_DESTROY: { - /* zero hpd pointer in window data, because it can be used later (WM_DESTROY has not to be last message) */ - SetWindowLongPtr(hwndDlg, DWL_USER, (DWORD_PTR)NULL); + /* zero hpd pointer in window data, because it can be used later (WM_DESTROY has not to be last message) */ + SetWindowLongPtr(hwndDlg, DWL_USER, (DWORD_PTR)NULL); /* free devices list */ FreeDevicesList(hpd); 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] Wed Apr 1 12:03:12 2015 @@ -2,6 +2,7 @@ #define __DEVMGR_H #include <stdarg.h> +#include <stdlib.h> #define WIN32_NO_STATUS #include <windef.h>

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2015