Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [APPWIZ.CPL] Set a default shortcut-link description (#1520)
by Katayama Hirofumi MZ 24 Apr '19

24 Apr '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9de816c9710243678c933… commit 9de816c9710243678c933567abec34856d34aa42 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Apr 24 10:44:44 2019 +0900 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Apr 24 03:44:44 2019 +0200 [APPWIZ.CPL] Set a default shortcut-link description (#1520) CORE-15511 --- dll/cpl/appwiz/createlink.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dll/cpl/appwiz/createlink.c b/dll/cpl/appwiz/createlink.c index a35e915f03..77213efefe 100644 --- a/dll/cpl/appwiz/createlink.c +++ b/dll/cpl/appwiz/createlink.c @@ -450,7 +450,14 @@ ShowCreateShortcutWizard(HWND hwndCPl, LPWSTR szPath) StringCchCopyW(pContext->szOldFile, _countof(pContext->szOldFile), szPath); pch = PathFindFileNameW(pContext->szOrigin); if (pch && *pch) + { + /* build szDescription */ + StringCchCopyW(pContext->szDescription, _countof(pContext->szDescription), pch); + *pch = 0; + + pch = PathFindExtensionW(pContext->szDescription); *pch = 0; + } } PathAddBackslashW(pContext->szOrigin);

1 0

[reactos] 02/02: [SHELL32] Make the new-item menu work (aka. make it dynamic) when the .lnk handler doesn't have any ShellNew entry.
by Hermès Bélusca-Maïto 24 Apr '19

24 Apr '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=62823a08cecf31f46a7b8… commit 62823a08cecf31f46a7b8f4de91ceabda96941ca Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Apr 24 03:41:41 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Apr 24 03:41:41 2019 +0200 [SHELL32] Make the new-item menu work (aka. make it dynamic) when the .lnk handler doesn't have any ShellNew entry. --- dll/win32/shell32/CNewMenu.cpp | 50 +++++++++++++++++++++++++----------------- dll/win32/shell32/CNewMenu.h | 1 + 2 files changed, 31 insertions(+), 20 deletions(-) diff --git a/dll/win32/shell32/CNewMenu.cpp b/dll/win32/shell32/CNewMenu.cpp index c4c3c28a97..3445ebdcfe 100644 --- a/dll/win32/shell32/CNewMenu.cpp +++ b/dll/win32/shell32/CNewMenu.cpp @@ -31,6 +31,9 @@ CNewMenu::CNewMenu() : m_pItems(NULL), m_pLinkItem(NULL), m_pSite(NULL), + m_idCmdFirst(0), + m_idCmdFolder(-1), + m_idCmdLink(-1), m_hIconFolder(NULL), m_hIconLink(NULL) { @@ -297,6 +300,9 @@ CNewMenu::LoadCachedItems() BOOL CNewMenu::LoadAllItems() { + // TODO: We need to find a way to refresh the cache from time to time, when + // e.g. new extensions with ShellNew handlers have been added or removed. + /* If there are any unload them */ UnloadAllItems(); @@ -324,6 +330,8 @@ CNewMenu::InsertShellNewItems(HMENU hMenu, UINT idCmdFirst, UINT Pos) ZeroMemory(&mii, sizeof(mii)); mii.cbSize = sizeof(mii); + m_idCmdFirst = idCmd; + /* Insert the new folder action */ if (!LoadStringW(shell32_hInstance, FCIDM_SHVIEW_NEWFOLDER, wszBuf, _countof(wszBuf))) wszBuf[0] = 0; @@ -333,7 +341,7 @@ CNewMenu::InsertShellNewItems(HMENU hMenu, UINT idCmdFirst, UINT Pos) mii.wID = idCmd; mii.hbmpItem = HBMMENU_CALLBACK; if (InsertMenuItemW(hMenu, Pos++, TRUE, &mii)) - ++idCmd; + m_idCmdFolder = idCmd++; /* Insert the new shortcut action */ if (m_pLinkItem) @@ -344,7 +352,7 @@ CNewMenu::InsertShellNewItems(HMENU hMenu, UINT idCmdFirst, UINT Pos) mii.cch = wcslen(mii.dwTypeData); mii.wID = idCmd; if (InsertMenuItemW(hMenu, Pos++, TRUE, &mii)) - ++idCmd; + m_idCmdLink = idCmd++; } /* Insert a seperator for the custom new action */ @@ -354,7 +362,7 @@ CNewMenu::InsertShellNewItems(HMENU hMenu, UINT idCmdFirst, UINT Pos) InsertMenuItemW(hMenu, Pos++, TRUE, &mii); /* Insert the rest of the items */ - mii.fMask = MIIM_ID | MIIM_BITMAP | MIIM_STRING; + mii.fMask = MIIM_ID | MIIM_BITMAP | MIIM_STRING | MIIM_DATA; mii.fType = 0; for (SHELLNEW_ITEM *pCurItem = m_pItems; pCurItem; pCurItem = pCurItem->pNext) @@ -364,6 +372,7 @@ CNewMenu::InsertShellNewItems(HMENU hMenu, UINT idCmdFirst, UINT Pos) continue; TRACE("szDesc %s\n", debugstr_w(pCurItem->pwszDesc)); + mii.dwItemData = (ULONG_PTR)pCurItem; mii.dwTypeData = pCurItem->pwszDesc; mii.cch = wcslen(mii.dwTypeData); mii.wID = idCmd; @@ -376,23 +385,24 @@ CNewMenu::InsertShellNewItems(HMENU hMenu, UINT idCmdFirst, UINT Pos) CNewMenu::SHELLNEW_ITEM *CNewMenu::FindItemFromIdOffset(UINT IdOffset) { - if (IdOffset == 0) - return NULL; /* Folder */ - - if (IdOffset == 1) - return m_pLinkItem; /* shortcut */ + /* Folder */ + if (m_idCmdFirst + IdOffset == m_idCmdFolder) + return NULL; - /* Find shell new item */ - SHELLNEW_ITEM *pItem = m_pItems; - for (UINT i = 2; pItem; ++i) - { - if (i == IdOffset) - break; + /* Shortcut */ + if (m_idCmdFirst + IdOffset == m_idCmdLink) + return m_pLinkItem; - pItem = pItem->pNext; - } + /* Find shell new item - Retrieve menu item info */ + MENUITEMINFOW mii; + ZeroMemory(&mii, sizeof(mii)); + mii.cbSize = sizeof(mii); + mii.fMask = MIIM_DATA; - return pItem; + if (GetMenuItemInfoW(m_hSubMenu, m_idCmdFirst + IdOffset, FALSE, &mii) && mii.dwItemData) + return (SHELLNEW_ITEM *)mii.dwItemData; + else + return NULL; } HRESULT CNewMenu::SelectNewItem(LONG wEventId, UINT uFlags, LPWSTR pszName, BOOL bRename) @@ -657,7 +667,7 @@ CNewMenu::InvokeCommand(LPCMINVOKECOMMANDINFO lpici) { HRESULT hr = E_FAIL; - if (LOWORD(lpici->lpVerb) == 0) + if (m_idCmdFirst + LOWORD(lpici->lpVerb) == m_idCmdFolder) { hr = CreateNewFolder(lpici); } @@ -722,11 +732,11 @@ CNewMenu::HandleMenuMsg2(UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *plRes DWORD id = LOWORD(lpdis->itemID); HICON hIcon = NULL; - if (id == 0) + if (m_idCmdFirst + id == m_idCmdFolder) { hIcon = m_hIconFolder; } - else if (id == 1) + else if (m_idCmdFirst + id == m_idCmdLink) { hIcon = m_hIconLink; } diff --git a/dll/win32/shell32/CNewMenu.h b/dll/win32/shell32/CNewMenu.h index e5c45e73d2..738fae0213 100644 --- a/dll/win32/shell32/CNewMenu.h +++ b/dll/win32/shell32/CNewMenu.h @@ -59,6 +59,7 @@ private: SHELLNEW_ITEM *m_pLinkItem; // Points to the link handler item in the m_pItems list. CComPtr<IUnknown> m_pSite; HMENU m_hSubMenu; + UINT m_idCmdFirst, m_idCmdFolder, m_idCmdLink; HICON m_hIconFolder, m_hIconLink; SHELLNEW_ITEM *LoadItem(LPCWSTR pwszExt);

1 0

[reactos] 01/02: [SHELL32] Code formatting/style/whitespace fix + fix two memory leaks in failure paths of CNewMenu::LoadItem().
by Hermès Bélusca-Maïto 24 Apr '19

24 Apr '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0416c598f83b7dcfa808a… commit 0416c598f83b7dcfa808aebb6ee4672061f01153 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Apr 24 03:36:27 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Apr 24 03:36:27 2019 +0200 [SHELL32] Code formatting/style/whitespace fix + fix two memory leaks in failure paths of CNewMenu::LoadItem(). --- dll/win32/shell32/CNewMenu.cpp | 90 +++++++++++++++++++++++------------------- dll/win32/shell32/CNewMenu.h | 2 +- 2 files changed, 51 insertions(+), 41 deletions(-) diff --git a/dll/win32/shell32/CNewMenu.cpp b/dll/win32/shell32/CNewMenu.cpp index d4b86863f3..c4c3c28a97 100644 --- a/dll/win32/shell32/CNewMenu.cpp +++ b/dll/win32/shell32/CNewMenu.cpp @@ -31,8 +31,8 @@ CNewMenu::CNewMenu() : m_pItems(NULL), m_pLinkItem(NULL), m_pSite(NULL), - m_hiconFolder(NULL), - m_hiconLink(NULL) + m_hIconFolder(NULL), + m_hIconLink(NULL) { } @@ -76,7 +76,7 @@ CNewMenu::SHELLNEW_ITEM *CNewMenu::LoadItem(LPCWSTR pwszExt) { HKEY hKey; WCHAR wszBuf[MAX_PATH]; - BYTE *pData = NULL; + PBYTE pData = NULL; DWORD cbData; StringCbPrintfW(wszBuf, sizeof(wszBuf), L"%s\\ShellNew", pwszExt); @@ -115,7 +115,7 @@ CNewMenu::SHELLNEW_ITEM *CNewMenu::LoadItem(LPCWSTR pwszExt) { if (Types[i].bNeedData && cbData > 0) { - pData = (BYTE*)malloc(cbData); + pData = (PBYTE)malloc(cbData); RegGetValueW(hKey, NULL, Types[i].pszName, dwFlags, &dwType, pData, &cbData); if (!Types[i].bStr && (dwType == REG_SZ || dwType == REG_EXPAND_SZ)) { @@ -132,11 +132,17 @@ CNewMenu::SHELLNEW_ITEM *CNewMenu::LoadItem(LPCWSTR pwszExt) /* Was any key found? */ if (!Types[i].pszName) + { + free(pData); return NULL; + } SHFILEINFOW fi; - if (!SHGetFileInfoW(pwszExt, FILE_ATTRIBUTE_NORMAL, &fi, sizeof(fi), SHGFI_USEFILEATTRIBUTES|SHGFI_TYPENAME|SHGFI_ICON|SHGFI_SMALLICON)) + if (!SHGetFileInfoW(pwszExt, FILE_ATTRIBUTE_NORMAL, &fi, sizeof(fi), SHGFI_USEFILEATTRIBUTES | SHGFI_TYPENAME | SHGFI_ICON | SHGFI_SMALLICON)) + { + free(pData); return NULL; + } /* Create new item */ SHELLNEW_ITEM *pNewItem = static_cast<SHELLNEW_ITEM *>(HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(SHELLNEW_ITEM))); @@ -198,9 +204,9 @@ CNewMenu::CacheItems() } } } - + dwSize++; - + lpValues = (LPWSTR) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwSize * sizeof(WCHAR)); if (!lpValues) return FALSE; @@ -216,17 +222,17 @@ CNewMenu::CacheItems() HeapFree(GetProcessHeap(), 0, lpValues); return FALSE; } - + if (RegSetValueExW(hKey, L"Classes", NULL, REG_MULTI_SZ, (LPBYTE)lpValues, dwSize * sizeof(WCHAR)) != ERROR_SUCCESS) { HeapFree(GetProcessHeap(), 0, lpValues); RegCloseKey(hKey); return FALSE; } - + HeapFree(GetProcessHeap(), 0, lpValues); RegCloseKey(hKey); - + return TRUE; } @@ -239,17 +245,17 @@ CNewMenu::LoadCachedItems() HKEY hKey; SHELLNEW_ITEM *pNewItem; SHELLNEW_ITEM *pCurItem = NULL; - - if (RegOpenKeyExW(HKEY_CURRENT_USER, ShellNewKey, 0, KEY_READ, &hKey) != ERROR_SUCCESS) + + 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); @@ -258,7 +264,7 @@ CNewMenu::LoadCachedItems() wszName = lpValues; - for (; '\0' != *wszName; wszName += wcslen(wszName) + 1) + for (; *wszName != '\0'; wszName += wcslen(wszName) + 1) { pNewItem = LoadItem(wszName); if (pNewItem) @@ -281,10 +287,10 @@ CNewMenu::LoadCachedItems() } } } - + HeapFree(GetProcessHeap(), 0, lpValues); RegCloseKey(hKey); - + return TRUE; } @@ -306,8 +312,8 @@ UINT CNewMenu::InsertShellNewItems(HMENU hMenu, UINT idCmdFirst, UINT Pos) { MENUITEMINFOW mii; - WCHAR wszBuf[256]; UINT idCmd = idCmdFirst; + WCHAR wszBuf[256]; if (m_pItems == NULL) { @@ -318,7 +324,7 @@ CNewMenu::InsertShellNewItems(HMENU hMenu, UINT idCmdFirst, UINT Pos) ZeroMemory(&mii, sizeof(mii)); mii.cbSize = sizeof(mii); - /* Insert new folder action */ + /* Insert the new folder action */ if (!LoadStringW(shell32_hInstance, FCIDM_SHVIEW_NEWFOLDER, wszBuf, _countof(wszBuf))) wszBuf[0] = 0; mii.fMask = MIIM_ID | MIIM_BITMAP | MIIM_STRING; @@ -341,18 +347,17 @@ CNewMenu::InsertShellNewItems(HMENU hMenu, UINT idCmdFirst, UINT Pos) ++idCmd; } - /* Insert seperator for custom new action */ + /* Insert a seperator for the custom new action */ mii.fMask = MIIM_TYPE | MIIM_ID; mii.fType = MFT_SEPARATOR; mii.wID = -1; InsertMenuItemW(hMenu, Pos++, TRUE, &mii); - /* Insert rest of items */ + /* Insert the rest of the items */ mii.fMask = MIIM_ID | MIIM_BITMAP | MIIM_STRING; mii.fType = 0; - SHELLNEW_ITEM *pCurItem = m_pItems; - while (pCurItem) + for (SHELLNEW_ITEM *pCurItem = m_pItems; pCurItem; pCurItem = pCurItem->pNext) { /* Skip shortcut item */ if (pCurItem == m_pLinkItem) @@ -364,7 +369,6 @@ CNewMenu::InsertShellNewItems(HMENU hMenu, UINT idCmdFirst, UINT Pos) mii.wID = idCmd; if (InsertMenuItemW(hMenu, Pos++, TRUE, &mii)) ++idCmd; - pCurItem = pCurItem->pNext; } return idCmd - idCmdFirst; @@ -436,7 +440,7 @@ HRESULT CNewMenu::CreateNewFolder(LPCMINVOKECOMMANDINFO lpici) WCHAR wszName[MAX_PATH]; WCHAR wszNewFolder[25]; HRESULT hr; - + /* Get folder path */ hr = SHGetPathFromIDListW(m_pidlFolder, wszPath); if (FAILED_UNEXPECTEDLY(hr)) @@ -553,7 +557,7 @@ HRESULT CNewMenu::NewItemByNonCommand(SHELLNEW_ITEM *pItem, LPWSTR wszName, else { StringCbPrintfW(wszBuf, sizeof(wszBuf), L"Cannot create file: %s", wszName); - MessageBoxW(NULL, wszBuf, L"Cannot create file", MB_OK|MB_ICONERROR); // FIXME load localized error msg + MessageBoxW(NULL, wszBuf, L"Cannot create file", MB_OK | MB_ICONERROR); // FIXME load localized error msg } return S_OK; @@ -615,9 +619,9 @@ CNewMenu::QueryContextMenu(HMENU hMenu, UINT idCmdLast, UINT uFlags) { - WCHAR wszNew[200]; MENUITEMINFOW mii; UINT cItems = 0; + WCHAR wszNew[200]; TRACE("%p %p %u %u %u %u\n", this, hMenu, indexMenu, idCmdFirst, idCmdLast, uFlags); @@ -631,7 +635,7 @@ CNewMenu::QueryContextMenu(HMENU hMenu, cItems = InsertShellNewItems(m_hSubMenu, idCmdFirst, 0); - memset(&mii, 0, sizeof(mii)); + ZeroMemory(&mii, sizeof(mii)); mii.cbSize = sizeof(mii); mii.fMask = MIIM_TYPE | MIIM_ID | MIIM_STATE | MIIM_SUBMENU; mii.fType = MFT_STRING; @@ -654,7 +658,9 @@ CNewMenu::InvokeCommand(LPCMINVOKECOMMANDINFO lpici) HRESULT hr = E_FAIL; if (LOWORD(lpici->lpVerb) == 0) + { hr = CreateNewFolder(lpici); + } else { SHELLNEW_ITEM *pItem = FindItemFromIdOffset(LOWORD(lpici->lpVerb)); @@ -715,11 +721,15 @@ CNewMenu::HandleMenuMsg2(UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *plRes break; DWORD id = LOWORD(lpdis->itemID); - HICON hIcon = 0; + HICON hIcon = NULL; if (id == 0) - hIcon = m_hiconFolder; + { + hIcon = m_hIconFolder; + } else if (id == 1) - hIcon = m_hiconLink; + { + hIcon = m_hIconLink; + } else { SHELLNEW_ITEM *pItem = FindItemFromIdOffset(id); @@ -730,12 +740,12 @@ CNewMenu::HandleMenuMsg2(UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *plRes if (!hIcon) break; - DrawIconEx(lpdis->hDC, - 2, - lpdis->rcItem.top + (lpdis->rcItem.bottom - lpdis->rcItem.top - 16) / 2, - hIcon, - 16, - 16, + DrawIconEx(lpdis->hDC, + 2, + lpdis->rcItem.top + (lpdis->rcItem.bottom - lpdis->rcItem.top - 16) / 2, + hIcon, + 16, + 16, 0, NULL, DI_NORMAL); if(plResult) @@ -753,7 +763,7 @@ CNewMenu::Initialize(LPCITEMIDLIST pidlFolder, m_pidlFolder = ILClone(pidlFolder); /* Load folder and shortcut icons */ - 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); + 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; } diff --git a/dll/win32/shell32/CNewMenu.h b/dll/win32/shell32/CNewMenu.h index a0c62eb86e..e5c45e73d2 100644 --- a/dll/win32/shell32/CNewMenu.h +++ b/dll/win32/shell32/CNewMenu.h @@ -59,7 +59,7 @@ private: SHELLNEW_ITEM *m_pLinkItem; // Points to the link handler item in the m_pItems list. CComPtr<IUnknown> m_pSite; HMENU m_hSubMenu; - HICON m_hiconFolder, m_hiconLink; + HICON m_hIconFolder, m_hIconLink; SHELLNEW_ITEM *LoadItem(LPCWSTR pwszExt); void UnloadItem(SHELLNEW_ITEM *pItem);

1 0

[reactos] 01/01: [SHELL32] Implement 'New Link' (Retrial of #1510), CORE-15511 (#1518)
by Katayama Hirofumi MZ 24 Apr '19

24 Apr '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8e60c2efeefbb2a4d9389… commit 8e60c2efeefbb2a4d93894c8300c0244bf54fea6 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Apr 23 10:48:34 2019 +0900 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Apr 24 03:28:17 2019 +0200 [SHELL32] Implement 'New Link' (Retrial of #1510), CORE-15511 (#1518) Correctly create cache about ".lnk" and handling in the member functions. Co-authored-by: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> --- dll/win32/shell32/CNewMenu.cpp | 309 +++++++++++++++++++++-------------------- dll/win32/shell32/CNewMenu.h | 7 +- 2 files changed, 164 insertions(+), 152 deletions(-) diff --git a/dll/win32/shell32/CNewMenu.cpp b/dll/win32/shell32/CNewMenu.cpp index 4a17e9b58b..d4b86863f3 100644 --- a/dll/win32/shell32/CNewMenu.cpp +++ b/dll/win32/shell32/CNewMenu.cpp @@ -4,6 +4,7 @@ * Copyright 2007 Johannes Anderwald (johannes.anderwald(a)reactos.org) * Copyright 2009 Andrew Hill * Copyright 2012 Rafal Harabien + * Copyright 2019 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -60,18 +61,14 @@ void CNewMenu::UnloadAllItems() { SHELLNEW_ITEM *pCurItem; - /* Unload normal items */ + /* Unload the handler items, including the link item */ while (m_pItems) { pCurItem = m_pItems; m_pItems = m_pItems->pNext; - UnloadItem(pCurItem); } - - /* Unload link item */ - if (m_pLinkItem) - UnloadItem(m_pLinkItem); + m_pItems = NULL; m_pLinkItem = NULL; } @@ -183,21 +180,21 @@ CNewMenu::CacheItems() if (pNewItem) { dwSize += wcslen(wszName) + 1; - if (wcsicmp(pNewItem->pwszExt, L".lnk") == 0) + if (!m_pLinkItem && wcsicmp(pNewItem->pwszExt, L".lnk") == 0) { - /* Link handler */ + /* The unique link handler */ m_pLinkItem = pNewItem; } + + /* Add at the end of the list */ + if (pCurItem) + { + pCurItem->pNext = pNewItem; + pCurItem = pNewItem; + } else { - /* Add at the end of list */ - if (pCurItem) - { - pCurItem->pNext = pNewItem; - pCurItem = pNewItem; - } - else - pCurItem = m_pItems = pNewItem; + pCurItem = m_pItems = pNewItem; } } } @@ -208,13 +205,10 @@ CNewMenu::CacheItems() if (!lpValues) return FALSE; - lpValue = lpValues; - pCurItem = m_pItems; - while (pCurItem) + for (pCurItem = m_pItems, lpValue = lpValues; pCurItem; pCurItem = pCurItem->pNext) { 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) @@ -269,21 +263,21 @@ CNewMenu::LoadCachedItems() pNewItem = LoadItem(wszName); if (pNewItem) { - if (wcsicmp(pNewItem->pwszExt, L".lnk") == 0) + if (!m_pLinkItem && wcsicmp(pNewItem->pwszExt, L".lnk") == 0) { - /* Link handler */ + /* The unique link handler */ m_pLinkItem = pNewItem; } + + /* Add at the end of the list */ + if (pCurItem) + { + pCurItem->pNext = pNewItem; + pCurItem = pNewItem; + } else { - /* Add at the end of list */ - if (pCurItem) - { - pCurItem->pNext = pNewItem; - pCurItem = pNewItem; - } - else - pCurItem = m_pItems = pNewItem; + pCurItem = m_pItems = pNewItem; } } } @@ -299,27 +293,13 @@ 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))); - if (m_pLinkItem) - { - m_pLinkItem->Type = SHELLNEW_TYPE_NULLFILE; - m_pLinkItem->pwszDesc = _wcsdup(L"Link"); - m_pLinkItem->pwszExt = _wcsdup(L".lnk"); - } - } - if (m_pItems == NULL) - return FALSE; - else - return TRUE; + return (m_pItems != NULL); } UINT @@ -349,14 +329,17 @@ CNewMenu::InsertShellNewItems(HMENU hMenu, UINT idCmdFirst, UINT Pos) if (InsertMenuItemW(hMenu, Pos++, TRUE, &mii)) ++idCmd; - /* Insert new shortcut action */ - if (!LoadStringW(shell32_hInstance, FCIDM_SHVIEW_NEWLINK, wszBuf, _countof(wszBuf))) - wszBuf[0] = 0; - mii.dwTypeData = wszBuf; - mii.cch = wcslen(mii.dwTypeData); - mii.wID = idCmd; - if (InsertMenuItemW(hMenu, Pos++, TRUE, &mii)) - ++idCmd; + /* Insert the new shortcut action */ + if (m_pLinkItem) + { + if (!LoadStringW(shell32_hInstance, FCIDM_SHVIEW_NEWLINK, wszBuf, _countof(wszBuf))) + wszBuf[0] = 0; + mii.dwTypeData = wszBuf; + mii.cch = wcslen(mii.dwTypeData); + mii.wID = idCmd; + if (InsertMenuItemW(hMenu, Pos++, TRUE, &mii)) + ++idCmd; + } /* Insert seperator for custom new action */ mii.fMask = MIIM_TYPE | MIIM_ID; @@ -371,6 +354,10 @@ CNewMenu::InsertShellNewItems(HMENU hMenu, UINT idCmdFirst, UINT Pos) SHELLNEW_ITEM *pCurItem = m_pItems; while (pCurItem) { + /* Skip shortcut item */ + if (pCurItem == m_pLinkItem) + continue; + TRACE("szDesc %s\n", debugstr_w(pCurItem->pwszDesc)); mii.dwTypeData = pCurItem->pwszDesc; mii.cch = wcslen(mii.dwTypeData); @@ -404,13 +391,18 @@ CNewMenu::SHELLNEW_ITEM *CNewMenu::FindItemFromIdOffset(UINT IdOffset) return pItem; } -HRESULT CNewMenu::SelectNewItem(LONG wEventId, UINT uFlags, LPWSTR pszName) +HRESULT CNewMenu::SelectNewItem(LONG wEventId, UINT uFlags, LPWSTR pszName, BOOL bRename) { CComPtr<IShellBrowser> lpSB; CComPtr<IShellView> lpSV; HRESULT hr = E_FAIL; LPITEMIDLIST pidl; PITEMID_CHILD pidlNewItem; + DWORD dwSelectFlags; + + dwSelectFlags = SVSI_DESELECTOTHERS | SVSI_ENSUREVISIBLE | SVSI_FOCUSED | SVSI_SELECT; + if (bRename) + dwSelectFlags |= SVSI_EDIT; /* Notify the view object about the new item */ SHChangeNotify(wEventId, uFlags, (LPCVOID) pszName, NULL); @@ -430,8 +422,7 @@ HRESULT CNewMenu::SelectNewItem(LONG wEventId, UINT uFlags, LPWSTR pszName) pidlNewItem = ILFindLastID(pidl); - hr = lpSV->SelectItem(pidlNewItem, SVSI_DESELECTOTHERS | SVSI_EDIT | SVSI_ENSUREVISIBLE | - SVSI_FOCUSED | SVSI_SELECT); + hr = lpSV->SelectItem(pidlNewItem, dwSelectFlags); SHFree(pidl); @@ -463,121 +454,139 @@ HRESULT CNewMenu::CreateNewFolder(LPCMINVOKECOMMANDINFO lpici) return E_FAIL; /* Show and select the new item in the def view */ - SelectNewItem(SHCNE_MKDIR, SHCNF_PATHW, wszName); + SelectNewItem(SHCNE_MKDIR, SHCNF_PATHW, wszName, TRUE); return S_OK; } -HRESULT CNewMenu::CreateNewItem(SHELLNEW_ITEM *pItem, LPCMINVOKECOMMANDINFO lpcmi) +HRESULT CNewMenu::NewItemByCommand(SHELLNEW_ITEM *pItem, LPCWSTR wszPath) { WCHAR wszBuf[MAX_PATH]; - WCHAR wszPath[MAX_PATH]; - HRESULT hr; + LPWSTR Ptr, pwszCmd; + WCHAR wszTemp[MAX_PATH]; + STARTUPINFOW si; + PROCESS_INFORMATION pi; - /* Get folder path */ - hr = SHGetPathFromIDListW(m_pidlFolder, wszPath); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; + if (!ExpandEnvironmentStringsW((LPWSTR)pItem->pData, wszBuf, _countof(wszBuf))) + { + TRACE("ExpandEnvironmentStrings failed\n"); + return E_FAIL; + } - switch (pItem->Type) + /* Expand command parameter, FIXME: there can be more modifiers */ + Ptr = wcsstr(wszBuf, L"%1"); + if (Ptr) { - case SHELLNEW_TYPE_COMMAND: - { - LPWSTR Ptr, pwszCmd; - WCHAR wszTemp[MAX_PATH]; - STARTUPINFOW si; - PROCESS_INFORMATION pi; + Ptr[1] = L's'; + StringCbPrintfW(wszTemp, sizeof(wszTemp), wszBuf, wszPath); + pwszCmd = wszTemp; + } + else + { + pwszCmd = wszBuf; + } - if (!ExpandEnvironmentStringsW((LPWSTR)pItem->pData, wszBuf, _countof(wszBuf))) - { - TRACE("ExpandEnvironmentStrings failed\n"); - break; - } + /* Create process */ + ZeroMemory(&si, sizeof(si)); + si.cb = sizeof(si); + if (CreateProcessW(NULL, pwszCmd, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) + { + CloseHandle(pi.hProcess); + CloseHandle(pi.hThread); + return S_OK; + } + else + { + ERR("Failed to create process\n"); + return E_FAIL; + } +} - /* Expand command parameter, FIXME: there can be more modifiers */ - Ptr = wcsstr(wszBuf, L"%1"); - if (Ptr) - { - Ptr[1] = L's'; - StringCbPrintfW(wszTemp, sizeof(wszTemp), wszBuf, wszPath); - pwszCmd = wszTemp; - } - else - { - pwszCmd = wszBuf; - } +HRESULT CNewMenu::NewItemByNonCommand(SHELLNEW_ITEM *pItem, LPWSTR wszName, + DWORD cchNameMax, LPCWSTR wszPath) +{ + WCHAR wszBuf[MAX_PATH]; + WCHAR wszNewFile[MAX_PATH]; + BOOL bSuccess = TRUE; - /* Create process */ - ZeroMemory(&si, sizeof(si)); - si.cb = sizeof(si); - if (CreateProcessW(NULL, pwszCmd, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) - { - CloseHandle(pi.hProcess); - CloseHandle(pi.hThread); - } - else - { - ERR("Failed to create process\n"); - } - break; - } + if (!LoadStringW(shell32_hInstance, FCIDM_SHVIEW_NEW, wszBuf, _countof(wszBuf))) + return E_FAIL; - case SHELLNEW_TYPE_DATA: - case SHELLNEW_TYPE_FILENAME: - case SHELLNEW_TYPE_NULLFILE: + StringCchPrintfW(wszNewFile, _countof(wszNewFile), L"%s %s%s", wszBuf, pItem->pwszDesc, pItem->pwszExt); + + /* Create the name of the new file */ + if (!PathYetAnotherMakeUniqueName(wszName, wszPath, NULL, wszNewFile)) + return E_FAIL; + + /* Create new file */ + HANDLE hFile = CreateFileW(wszName, GENERIC_WRITE, 0, NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL); + if (hFile != INVALID_HANDLE_VALUE) + { + if (pItem->Type == SHELLNEW_TYPE_DATA) { - BOOL bSuccess = TRUE; - WCHAR wszName[MAX_PATH]; - WCHAR wszNewFile[MAX_PATH]; + /* Write a content */ + DWORD cbWritten; + WriteFile(hFile, pItem->pData, pItem->cbData, &cbWritten, NULL); + } - if (!LoadStringW(shell32_hInstance, FCIDM_SHVIEW_NEW, wszBuf, _countof(wszBuf))) - return E_FAIL; + /* Close file now */ + CloseHandle(hFile); + } + else + { + bSuccess = FALSE; + } - StringCchPrintfW(wszNewFile, _countof(wszNewFile), L"%s %s%s", wszBuf, pItem->pwszDesc, pItem->pwszExt); + if (pItem->Type == SHELLNEW_TYPE_FILENAME) + { + /* Copy file */ + if (!CopyFileW((LPWSTR)pItem->pData, wszName, FALSE)) + ERR("Copy file failed: %ls\n", (LPWSTR)pItem->pData); + } - /* Create the name of the new file */ - if (!PathYetAnotherMakeUniqueName(wszName, wszPath, NULL, wszNewFile)) - return E_FAIL; + /* Show message if we failed */ + if (bSuccess) + { + TRACE("Notifying fs %s\n", debugstr_w(wszName)); + SelectNewItem(SHCNE_CREATE, SHCNF_PATHW, wszName, pItem != m_pLinkItem); + } + else + { + StringCbPrintfW(wszBuf, sizeof(wszBuf), L"Cannot create file: %s", wszName); + MessageBoxW(NULL, wszBuf, L"Cannot create file", MB_OK|MB_ICONERROR); // FIXME load localized error msg + } - /* Create new file */ - HANDLE hFile = CreateFileW(wszName, GENERIC_WRITE, 0, NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL); - if (hFile != INVALID_HANDLE_VALUE) - { - if (pItem->Type == SHELLNEW_TYPE_DATA) - { - /* Write a content */ - DWORD cbWritten; - WriteFile(hFile, pItem->pData, pItem->cbData, &cbWritten, NULL); - } + return S_OK; +} - /* Close file now */ - CloseHandle(hFile); - } - else - { - bSuccess = FALSE; - } +HRESULT CNewMenu::CreateNewItem(SHELLNEW_ITEM *pItem, LPCMINVOKECOMMANDINFO lpcmi) +{ + HRESULT hr; + WCHAR wszPath[MAX_PATH], wszName[MAX_PATH]; - if (pItem->Type == SHELLNEW_TYPE_FILENAME) - { - /* Copy file */ - if (!CopyFileW((LPWSTR)pItem->pData, wszName, FALSE)) - ERR("Copy file failed: %ls\n", (LPWSTR)pItem->pData); - } + /* Get folder path */ + hr = SHGetPathFromIDListW(m_pidlFolder, wszPath); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; - /* Show message if we failed */ - if (bSuccess) - { - TRACE("Notifying fs %s\n", debugstr_w(wszName)); - SelectNewItem(SHCNE_CREATE, SHCNF_PATHW, wszName); - } - else - { - StringCbPrintfW(wszBuf, sizeof(wszBuf), L"Cannot create file: %s", wszName); - MessageBoxW(NULL, wszBuf, L"Cannot create file", MB_OK|MB_ICONERROR); // FIXME load localized error msg - } + if (pItem == m_pLinkItem) + { + NewItemByNonCommand(pItem, wszName, _countof(wszName), wszPath); + NewItemByCommand(pItem, wszName); + return S_OK; + } + + switch (pItem->Type) + { + case SHELLNEW_TYPE_COMMAND: + NewItemByCommand(pItem, wszPath); + break; + + case SHELLNEW_TYPE_DATA: + case SHELLNEW_TYPE_FILENAME: + case SHELLNEW_TYPE_NULLFILE: + NewItemByNonCommand(pItem, wszName, _countof(wszName), wszPath); break; - } case SHELLNEW_TYPE_INVALID: ERR("Invalid type\n"); diff --git a/dll/win32/shell32/CNewMenu.h b/dll/win32/shell32/CNewMenu.h index 2475e725a9..a0c62eb86e 100644 --- a/dll/win32/shell32/CNewMenu.h +++ b/dll/win32/shell32/CNewMenu.h @@ -56,7 +56,7 @@ private: LPITEMIDLIST m_pidlFolder; LPWSTR m_wszPath; SHELLNEW_ITEM *m_pItems; - SHELLNEW_ITEM *m_pLinkItem; + SHELLNEW_ITEM *m_pLinkItem; // Points to the link handler item in the m_pItems list. CComPtr<IUnknown> m_pSite; HMENU m_hSubMenu; HICON m_hiconFolder, m_hiconLink; @@ -71,7 +71,10 @@ private: SHELLNEW_ITEM *FindItemFromIdOffset(UINT IdOffset); HRESULT CreateNewFolder(LPCMINVOKECOMMANDINFO lpici); HRESULT CreateNewItem(SHELLNEW_ITEM *pItem, LPCMINVOKECOMMANDINFO lpcmi); - HRESULT SelectNewItem(LONG wEventId, UINT uFlags, LPWSTR pszName); + HRESULT SelectNewItem(LONG wEventId, UINT uFlags, LPWSTR pszName, BOOL bRename); + HRESULT NewItemByCommand(SHELLNEW_ITEM *pItem, LPCWSTR wszPath); + HRESULT NewItemByNonCommand(SHELLNEW_ITEM *pItem, LPWSTR wszName, + DWORD cchNameMax, LPCWSTR wszPath); public: CNewMenu();

1 0

[reactos] 01/01: [MSPAINT] Set default extension .bmp (#1515)
by Katayama Hirofumi MZ 23 Apr '19

23 Apr '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f2512254e00d38d7de636… commit f2512254e00d38d7de63661eec1ca706c1efebe5 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Apr 23 14:25:18 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Apr 23 14:25:18 2019 +0900 [MSPAINT] Set default extension .bmp (#1515) Set the default extension of mspaint to .bmp. CORE-7114 --- base/applications/mspaint/main.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/base/applications/mspaint/main.cpp b/base/applications/mspaint/main.cpp index 8abe4ffa41..6b0d512cf4 100644 --- a/base/applications/mspaint/main.cpp +++ b/base/applications/mspaint/main.cpp @@ -355,6 +355,7 @@ _tWinMain (HINSTANCE hThisInstance, HINSTANCE hPrevInstance, LPTSTR lpszArgument ofn.lpstrFileTitle = ofnFiletitle; ofn.nMaxFileTitle = SIZEOF(ofnFiletitle); ofn.Flags = OFN_HIDEREADONLY; + ofn.lpstrDefExt = L"bmp"; CopyMemory(sfnFilename, filepathname, sizeof(filepathname)); CString strExporters; @@ -371,6 +372,7 @@ _tWinMain (HINSTANCE hThisInstance, HINSTANCE hPrevInstance, LPTSTR lpszArgument sfn.nMaxFileTitle = SIZEOF(sfnFiletitle); sfn.Flags = OFN_OVERWRITEPROMPT | OFN_HIDEREADONLY | OFN_EXPLORER | OFN_ENABLEHOOK; sfn.lpfnHook = OFNHookProc; + sfn.lpstrDefExt = L"bmp"; /* creating the size boxes */ RECT sizeboxPos = {0, 0, 0 + 3, 0 + 3};

1 0

[reactos] 02/02: [STOBJECT] Store the "Show x icon in the taskbar" setting for the hotplug, power and volume icons.
by Eric Kohl 22 Apr '19

22 Apr '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8c30fdab1c42af81800e2… commit 8c30fdab1c42af81800e2ba7b68845192a9cae92 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Tue Apr 23 00:12:23 2019 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Tue Apr 23 00:12:23 2019 +0200 [STOBJECT] Store the "Show x icon in the taskbar" setting for the hotplug, power and volume icons. CORE-12365 CORE-12972 CORE-15234 --- dll/shellext/stobject/csystray.cpp | 99 +++++++++++++++++++++++++++++++++----- dll/shellext/stobject/csystray.h | 6 +++ dll/shellext/stobject/hotplug.cpp | 18 ++++--- dll/shellext/stobject/power.cpp | 17 ++++--- dll/shellext/stobject/precomp.h | 5 ++ dll/shellext/stobject/volume.cpp | 19 ++++---- 6 files changed, 128 insertions(+), 36 deletions(-) diff --git a/dll/shellext/stobject/csystray.cpp b/dll/shellext/stobject/csystray.cpp index d73e67e55d..136927896b 100644 --- a/dll/shellext/stobject/csystray.cpp +++ b/dll/shellext/stobject/csystray.cpp @@ -13,15 +13,80 @@ #include <shellutils.h> SysTrayIconHandlers_t g_IconHandlers [] = { - { Volume_Init, Volume_Shutdown, Volume_Update, Volume_Message }, - { Hotplug_Init, Hotplug_Shutdown, Hotplug_Update, Hotplug_Message }, - { Power_Init, Power_Shutdown, Power_Update, Power_Message } + { VOLUME_SERVICE_FLAG, Volume_Init, Volume_Shutdown, Volume_Update, Volume_Message }, + { HOTPLUG_SERVICE_FLAG, Hotplug_Init, Hotplug_Shutdown, Hotplug_Update, Hotplug_Message }, + { POWER_SERVICE_FLAG, Power_Init, Power_Shutdown, Power_Update, Power_Message } }; const int g_NumIcons = _countof(g_IconHandlers); CSysTray::CSysTray() {} CSysTray::~CSysTray() {} +VOID CSysTray::GetServicesEnabled() +{ + HKEY hKey; + DWORD dwSize; + + /* Enable power and volume by default */ + this->dwServicesEnabled = POWER_SERVICE_FLAG | VOLUME_SERVICE_FLAG; + + if (RegCreateKeyExW(HKEY_CURRENT_USER, + L"Software\\Microsoft\\Windows\\CurrentVersion\\Applets\\SysTray", + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_READ, + NULL, + &hKey, + NULL) == ERROR_SUCCESS) + { + dwSize = sizeof(DWORD); + RegQueryValueExW(hKey, + L"Services", + NULL, + NULL, + (LPBYTE)&this->dwServicesEnabled, + &dwSize); + + RegCloseKey(hKey); + } +} + +VOID CSysTray::EnableService(DWORD dwServiceFlag, BOOL bEnable) +{ + HKEY hKey; + + if (bEnable) + this->dwServicesEnabled |= dwServiceFlag; + else + this->dwServicesEnabled &= ~dwServiceFlag; + + if (RegCreateKeyExW(HKEY_CURRENT_USER, + L"Software\\Microsoft\\Windows\\CurrentVersion\\Applets\\SysTray", + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_WRITE, + NULL, + &hKey, + NULL) == ERROR_SUCCESS) + { + RegSetValueExW(hKey, + L"Services", + 0, + REG_DWORD, + (LPBYTE)&this->dwServicesEnabled, + sizeof(DWORD)); + + RegCloseKey(hKey); + } +} + +BOOL CSysTray::IsServiceEnabled(DWORD dwServiceFlag) +{ + return (this->dwServicesEnabled & dwServiceFlag); +} + HRESULT CSysTray::InitNetShell() { HRESULT hr = CoCreateInstance(CLSID_ConnectionTray, 0, 1u, IID_PPV_ARG(IOleCommandTarget, &pctNetShell)); @@ -49,9 +114,12 @@ HRESULT CSysTray::InitIcons() TRACE("Initializing Notification icons...\n"); for (int i = 0; i < g_NumIcons; i++) { - HRESULT hr = g_IconHandlers[i].pfnInit(this); - if (FAILED(hr)) - return hr; + if (this->dwServicesEnabled & g_IconHandlers[i].dwServiceFlag) + { + HRESULT hr = g_IconHandlers[i].pfnInit(this); + if (FAILED(hr)) + return hr; + } } return InitNetShell(); @@ -62,9 +130,12 @@ HRESULT CSysTray::ShutdownIcons() TRACE("Shutting down Notification icons...\n"); for (int i = 0; i < g_NumIcons; i++) { - HRESULT hr = g_IconHandlers[i].pfnShutdown(this); - if (FAILED(hr)) - return hr; + if (this->dwServicesEnabled & g_IconHandlers[i].dwServiceFlag) + { + HRESULT hr = g_IconHandlers[i].pfnShutdown(this); + if (FAILED(hr)) + return hr; + } } return ShutdownNetShell(); @@ -75,9 +146,12 @@ HRESULT CSysTray::UpdateIcons() TRACE("Updating Notification icons...\n"); for (int i = 0; i < g_NumIcons; i++) { - HRESULT hr = g_IconHandlers[i].pfnUpdate(this); - if (FAILED(hr)) - return hr; + if (this->dwServicesEnabled & g_IconHandlers[i].dwServiceFlag) + { + HRESULT hr = g_IconHandlers[i].pfnUpdate(this); + if (FAILED(hr)) + return hr; + } } return S_OK; @@ -236,6 +310,7 @@ BOOL CSysTray::ProcessWindowMessage(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM return FALSE; case WM_CREATE: + GetServicesEnabled(); InitIcons(); SetTimer(1, 2000, NULL); return TRUE; diff --git a/dll/shellext/stobject/csystray.h b/dll/shellext/stobject/csystray.h index 214a4c6549..0ff5236782 100644 --- a/dll/shellext/stobject/csystray.h +++ b/dll/shellext/stobject/csystray.h @@ -28,6 +28,7 @@ class CSysTray : // TODO: keep icon handlers here + DWORD dwServicesEnabled; HWND hwndSysTray; static DWORD WINAPI s_SysTrayThreadProc(PVOID param); @@ -44,11 +45,16 @@ class CSysTray : HRESULT InitNetShell(); HRESULT ShutdownNetShell(); + VOID GetServicesEnabled(); + public: HRESULT NotifyIcon(INT code, UINT uId, HICON hIcon, LPCWSTR szTip, DWORD dwstate = 0); HWND GetHWnd() { return m_hWnd; } + VOID EnableService(DWORD dwServiceFlag, BOOL bEnable); + BOOL IsServiceEnabled(DWORD dwServiceFlag); + protected: BOOL ProcessWindowMessage(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT &lResult, DWORD dwMsgMapID = 0); diff --git a/dll/shellext/stobject/hotplug.cpp b/dll/shellext/stobject/hotplug.cpp index af7d69891b..03348f92d2 100644 --- a/dll/shellext/stobject/hotplug.cpp +++ b/dll/shellext/stobject/hotplug.cpp @@ -22,7 +22,6 @@ CSimpleArray<DEVINST> g_devList; static HICON g_hIconHotplug = NULL; static LPCWSTR g_strTooltip = L"Safely Remove Hardware and Eject Media"; static WCHAR g_strMenuSel[DISPLAY_NAME_LEN]; -static BOOL g_IsRunning = FALSE; static BOOL g_IsRemoving = FALSE; /*++ @@ -132,7 +131,6 @@ HRESULT STDMETHODCALLTYPE Hotplug_Init(_In_ CSysTray * pSysTray) { TRACE("Hotplug_Init\n"); g_hIconHotplug = LoadIcon(g_hInstance, MAKEINTRESOURCE(IDI_HOTPLUG_OK)); - g_IsRunning = TRUE; EnumHotpluggedDevices(g_devList); return pSysTray->NotifyIcon(NIM_ADD, ID_ICON_HOTPLUG, g_hIconHotplug, g_strTooltip, NIS_HIDDEN); @@ -152,8 +150,6 @@ HRESULT STDMETHODCALLTYPE Hotplug_Shutdown(_In_ CSysTray * pSysTray) { TRACE("Hotplug_Shutdown\n"); - g_IsRunning = FALSE; - return pSysTray->NotifyIcon(NIM_DELETE, ID_ICON_HOTPLUG, NULL, NULL); } @@ -263,20 +259,26 @@ HRESULT STDMETHODCALLTYPE Hotplug_Message(_In_ CSysTray * pSysTray, UINT uMsg, W case WM_USER + 220: TRACE("Hotplug_Message: WM_USER+220\n"); - if (wParam == 1) + if (wParam == HOTPLUG_SERVICE_FLAG) { - if (lParam == FALSE) + if (lParam) + { + pSysTray->EnableService(HOTPLUG_SERVICE_FLAG, TRUE); return Hotplug_Init(pSysTray); + } else + { + pSysTray->EnableService(HOTPLUG_SERVICE_FLAG, FALSE); return Hotplug_Shutdown(pSysTray); + } } return S_FALSE; case WM_USER + 221: TRACE("Hotplug_Message: WM_USER+221\n"); - if (wParam == 1) + if (wParam == HOTPLUG_SERVICE_FLAG) { - lResult = (LRESULT)g_IsRunning; + lResult = (LRESULT)pSysTray->IsServiceEnabled(HOTPLUG_SERVICE_FLAG); return S_OK; } return S_FALSE; diff --git a/dll/shellext/stobject/power.cpp b/dll/shellext/stobject/power.cpp index 6cb16fdbc9..932dc47dea 100644 --- a/dll/shellext/stobject/power.cpp +++ b/dll/shellext/stobject/power.cpp @@ -28,7 +28,6 @@ typedef struct _PWRSCHEMECONTEXT CString g_strTooltip; static HICON g_hIconBattery = NULL; -static BOOL g_IsRunning = FALSE; /*++ @@ -117,7 +116,6 @@ HRESULT STDMETHODCALLTYPE Power_Init(_In_ CSysTray * pSysTray) { TRACE("Power_Init\n"); g_hIconBattery = DynamicLoadIcon(g_hInstance); - g_IsRunning = TRUE; return pSysTray->NotifyIcon(NIM_ADD, ID_ICON_POWER, g_hIconBattery, g_strTooltip); } @@ -133,7 +131,6 @@ HRESULT STDMETHODCALLTYPE Power_Update(_In_ CSysTray * pSysTray) HRESULT STDMETHODCALLTYPE Power_Shutdown(_In_ CSysTray * pSysTray) { TRACE("Power_Shutdown\n"); - g_IsRunning = FALSE; return pSysTray->NotifyIcon(NIM_DELETE, ID_ICON_POWER, NULL, NULL); } @@ -238,20 +235,26 @@ HRESULT STDMETHODCALLTYPE Power_Message(_In_ CSysTray * pSysTray, UINT uMsg, WPA { case WM_USER + 220: TRACE("Power_Message: WM_USER+220\n"); - if (wParam == 1) + if (wParam == POWER_SERVICE_FLAG) { - if (lParam == FALSE) + if (lParam) + { + pSysTray->EnableService(POWER_SERVICE_FLAG, TRUE); return Power_Init(pSysTray); + } else + { + pSysTray->EnableService(POWER_SERVICE_FLAG, FALSE); return Power_Shutdown(pSysTray); + } } return S_FALSE; case WM_USER + 221: TRACE("Power_Message: WM_USER+221\n"); - if (wParam == 1) + if (wParam == POWER_SERVICE_FLAG) { - lResult = (LRESULT)g_IsRunning; + lResult = (LRESULT)pSysTray->IsServiceEnabled(POWER_SERVICE_FLAG); return S_OK; } return S_FALSE; diff --git a/dll/shellext/stobject/precomp.h b/dll/shellext/stobject/precomp.h index 674a32ebf0..87747a90b4 100644 --- a/dll/shellext/stobject/precomp.h +++ b/dll/shellext/stobject/precomp.h @@ -34,6 +34,10 @@ extern HINSTANCE g_hInstance; #define ID_ICON_HOTPLUG (WM_APP + 0x4CC) #define ID_ICON_POWER (WM_APP + 0x4CD) +#define POWER_SERVICE_FLAG 0x00000001 +#define HOTPLUG_SERVICE_FLAG 0x00000002 +#define VOLUME_SERVICE_FLAG 0x00000004 + #include "csystray.h" typedef HRESULT(STDMETHODCALLTYPE * PFNSTINIT) (_In_ CSysTray * pSysTray); @@ -43,6 +47,7 @@ typedef HRESULT(STDMETHODCALLTYPE * PFNSTMESSAGE) (_In_ CSysTray * pSysTray, UI struct SysTrayIconHandlers_t { + DWORD dwServiceFlag; PFNSTINIT pfnInit; PFNSTSHUTDOWN pfnShutdown; PFNSTUPDATE pfnUpdate; diff --git a/dll/shellext/stobject/volume.cpp b/dll/shellext/stobject/volume.cpp index dbc92ad5ce..04723a7be2 100644 --- a/dll/shellext/stobject/volume.cpp +++ b/dll/shellext/stobject/volume.cpp @@ -21,7 +21,6 @@ DWORD g_muteControlID; UINT g_mmDeviceChange; static BOOL g_IsMute = FALSE; -static BOOL g_IsRunning = FALSE; static HRESULT __stdcall Volume_FindMixerControl(CSysTray * pSysTray) { @@ -156,8 +155,6 @@ HRESULT STDMETHODCALLTYPE Volume_Init(_In_ CSysTray * pSysTray) Volume_IsMute(); - g_IsRunning = TRUE; - HICON icon; if (g_IsMute) icon = g_hIconMute; @@ -204,8 +201,6 @@ HRESULT STDMETHODCALLTYPE Volume_Shutdown(_In_ CSysTray * pSysTray) { TRACE("Volume_Shutdown\n"); - g_IsRunning = FALSE; - return pSysTray->NotifyIcon(NIM_DELETE, ID_ICON_VOLUME, NULL, NULL); } @@ -267,20 +262,26 @@ HRESULT STDMETHODCALLTYPE Volume_Message(_In_ CSysTray * pSysTray, UINT uMsg, WP { case WM_USER + 220: TRACE("Volume_Message: WM_USER+220\n"); - if (wParam == 4) + if (wParam == VOLUME_SERVICE_FLAG) { - if (lParam == FALSE) + if (lParam) + { + pSysTray->EnableService(VOLUME_SERVICE_FLAG, TRUE); return Volume_Init(pSysTray); + } else + { + pSysTray->EnableService(VOLUME_SERVICE_FLAG, FALSE); return Volume_Shutdown(pSysTray); + } } return S_FALSE; case WM_USER + 221: TRACE("Volume_Message: WM_USER+221\n"); - if (wParam == 4) + if (wParam == VOLUME_SERVICE_FLAG) { - lResult = (LRESULT)g_IsRunning; + lResult = (LRESULT)pSysTray->IsServiceEnabled(VOLUME_SERVICE_FLAG); return S_OK; } return S_FALSE;

1 0

[reactos] 01/02: [POWERCFG] Fix indentation and coding style. No code changes!
by Eric Kohl 22 Apr '19

22 Apr '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=22411ef22366a6d6a8341… commit 22411ef22366a6d6a8341767f9dd7f7d6b784dae Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Tue Apr 23 00:09:10 2019 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Tue Apr 23 00:09:10 2019 +0200 [POWERCFG] Fix indentation and coding style. No code changes! --- dll/cpl/powercfg/advanced.c | 137 +++++++++++++++++++++++-------------------- dll/cpl/powercfg/hibernate.c | 38 ++++++------ 2 files changed, 94 insertions(+), 81 deletions(-) diff --git a/dll/cpl/powercfg/advanced.c b/dll/cpl/powercfg/advanced.c index 6ca281abe6..da43d67f82 100644 --- a/dll/cpl/powercfg/advanced.c +++ b/dll/cpl/powercfg/advanced.c @@ -47,31 +47,32 @@ GetSystrayPowerIconState(VOID) static VOID AddItem(HWND hDlgCtrl, INT ResourceId, LPARAM lParam, POWER_ACTION * lpAction) { - TCHAR szBuffer[MAX_PATH]; - LRESULT Index; - if (LoadString(hApplet, ResourceId, szBuffer, MAX_PATH) < MAX_PATH) - { - Index = SendMessage(hDlgCtrl, CB_ADDSTRING, 0, (LPARAM)szBuffer); - if (Index != CB_ERR) + TCHAR szBuffer[MAX_PATH]; + LRESULT Index; + + if (LoadString(hApplet, ResourceId, szBuffer, MAX_PATH) < MAX_PATH) { - SendMessage(hDlgCtrl, CB_SETITEMDATA, (WPARAM)Index, lParam); - lpAction[Index] = (POWER_ACTION)lParam; + Index = SendMessage(hDlgCtrl, CB_ADDSTRING, 0, (LPARAM)szBuffer); + if (Index != CB_ERR) + { + SendMessage(hDlgCtrl, CB_SETITEMDATA, (WPARAM)Index, lParam); + lpAction[Index] = (POWER_ACTION)lParam; + } } - } } static INT FindActionIndex(POWER_ACTION * lpAction, DWORD dwActionSize, POWER_ACTION poAction) { - INT Index; + INT Index; - for (Index = 0; Index < (INT)dwActionSize; Index++) - { - if (lpAction[Index] == poAction) - return Index; - } + for (Index = 0; Index < (INT)dwActionSize; Index++) + { + if (lpAction[Index] == poAction) + return Index; + } - return -1; + return -1; } static BOOLEAN @@ -175,26 +176,31 @@ SaveCurrentPowerActionPolicy(IN HWND hDlgCtrl, switch(ItemData) { - case PowerActionNone: - Policy->Action = PowerActionNone; - Policy->EventCode = POWER_FORCE_TRIGGER_RESET; - break; - case PowerActionWarmEject: - Policy->Action = PowerActionNone; - Policy->EventCode = POWER_USER_NOTIFY_BUTTON; - break; - case PowerActionShutdown: - Policy->Action = PowerActionNone; - Policy->EventCode = POWER_USER_NOTIFY_SHUTDOWN; - break; - case PowerActionSleep: - case PowerActionHibernate: - Policy->Action = (POWER_ACTION)ItemData; - Policy->EventCode = 0; - break; - default: - return FALSE; + case PowerActionNone: + Policy->Action = PowerActionNone; + Policy->EventCode = POWER_FORCE_TRIGGER_RESET; + break; + + case PowerActionWarmEject: + Policy->Action = PowerActionNone; + Policy->EventCode = POWER_USER_NOTIFY_BUTTON; + break; + + case PowerActionShutdown: + Policy->Action = PowerActionNone; + Policy->EventCode = POWER_USER_NOTIFY_SHUTDOWN; + break; + + case PowerActionSleep: + case PowerActionHibernate: + Policy->Action = (POWER_ACTION)ItemData; + Policy->EventCode = 0; + break; + + default: + return FALSE; } + Policy->Flags = (POWER_ACTION_UI_ALLOWED | POWER_ACTION_QUERY_ALLOWED); return TRUE; @@ -372,8 +378,8 @@ Adv_InitDialog(VOID) if (bHibernate) { AddItem(hList2, IDS_PowerActionHibernate, (LPARAM)PowerActionHibernate, g_PowerButton); - } + if (bShutdown) { AddItem(hList2, IDS_PowerActionShutdown, (LPARAM)PowerActionShutdown, g_PowerButton); @@ -516,35 +522,37 @@ AdvancedDlgProc(HWND hwndDlg, WPARAM wParam, LPARAM lParam) { - switch(uMsg) - { - case WM_INITDIALOG: - hAdv = hwndDlg; - Adv_InitDialog(); - return TRUE; - break; - case WM_COMMAND: - switch(LOWORD(wParam)) - { - case IDC_SYSTRAYBATTERYMETER: - case IDC_PASSWORDLOGON: - case IDC_VIDEODIMDISPLAY: - if (HIWORD(wParam) == BN_CLICKED) - { - PropSheet_Changed(GetParent(hwndDlg), hwndDlg); - } - break; - case IDC_LIDCLOSE: - case IDC_POWERBUTTON: - case IDC_SLEEPBUTTON: - if (HIWORD(wParam) == CBN_SELCHANGE) + switch (uMsg) + { + case WM_INITDIALOG: + hAdv = hwndDlg; + Adv_InitDialog(); + return TRUE; + + case WM_COMMAND: + switch (LOWORD(wParam)) { - PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + case IDC_SYSTRAYBATTERYMETER: + case IDC_PASSWORDLOGON: + case IDC_VIDEODIMDISPLAY: + if (HIWORD(wParam) == BN_CLICKED) + { + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + } + break; + + case IDC_LIDCLOSE: + case IDC_POWERBUTTON: + case IDC_SLEEPBUTTON: + if (HIWORD(wParam) == CBN_SELCHANGE) + { + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + } + break; } break; - } - break; - case WM_NOTIFY: + + case WM_NOTIFY: { LPNMHDR lpnm = (LPNMHDR)lParam; if (lpnm->code == (UINT)PSN_APPLY) @@ -553,6 +561,7 @@ AdvancedDlgProc(HWND hwndDlg, } return TRUE; } - } - return FALSE; + } + + return FALSE; } diff --git a/dll/cpl/powercfg/hibernate.c b/dll/cpl/powercfg/hibernate.c index 1310cc8f30..38ac05bc4b 100644 --- a/dll/cpl/powercfg/hibernate.c +++ b/dll/cpl/powercfg/hibernate.c @@ -73,7 +73,7 @@ Hib_SaveData(HWND hwndDlg) bHibernate = (BOOLEAN)(IsDlgButtonChecked(hwndDlg, IDC_HIBERNATEFILE) == BST_CHECKED); - if (CallNtPowerInformation(SystemReserveHiberFile,&bHibernate, sizeof(bHibernate), NULL, 0) == STATUS_SUCCESS) + if (CallNtPowerInformation(SystemReserveHiberFile, &bHibernate, sizeof(bHibernate), NULL, 0) == STATUS_SUCCESS) { Pos_InitData(); Adv_InitDialog(); @@ -91,22 +91,25 @@ HibernateDlgProc(HWND hwndDlg, WPARAM wParam, LPARAM lParam) { - switch(uMsg) - { - case WM_INITDIALOG: - Hib_InitDialog(hwndDlg); - return TRUE; - case WM_COMMAND: - switch(LOWORD(wParam)) - { - case IDC_HIBERNATEFILE: - if (HIWORD(wParam) == BN_CLICKED) + switch (uMsg) + { + case WM_INITDIALOG: + Hib_InitDialog(hwndDlg); + return TRUE; + + case WM_COMMAND: + switch (LOWORD(wParam)) { - PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + case IDC_HIBERNATEFILE: + if (HIWORD(wParam) == BN_CLICKED) + { + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + } + break; } - } - break; - case WM_NOTIFY: + break; + + case WM_NOTIFY: { LPNMHDR lpnm = (LPNMHDR)lParam; if (lpnm->code == (UINT)PSN_APPLY) @@ -114,6 +117,7 @@ HibernateDlgProc(HWND hwndDlg, return Hib_SaveData(hwndDlg); } } - } - return FALSE; + } + + return FALSE; }

1 0

[reactos] 01/01: [STOBJECT][MMSYS][POWERCFG] Store the "Show x icon in the taskbar" setting for the hotplug, power and volume icons.
by Eric Kohl 22 Apr '19

22 Apr '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8fb2a2dd12ed238b52d82… commit 8fb2a2dd12ed238b52d82e658c8726e787fe2070 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Tue Apr 23 00:04:01 2019 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Tue Apr 23 00:04:01 2019 +0200 [STOBJECT][MMSYS][POWERCFG] Store the "Show x icon in the taskbar" setting for the hotplug, power and volume icons. CORE-12365 CORE-12972 CORE-15234 --- dll/cpl/mmsys/volume.c | 2 +- dll/cpl/powercfg/advanced.c | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dll/cpl/mmsys/volume.c b/dll/cpl/mmsys/volume.c index 4c3189bbbe..b8e546e276 100644 --- a/dll/cpl/mmsys/volume.c +++ b/dll/cpl/mmsys/volume.c @@ -365,7 +365,7 @@ SaveData(HWND hwndDlg) bShowIcon = (IsDlgButtonChecked(hwndDlg, IDC_ICON_IN_TASKBAR) == BST_CHECKED); - SetSystrayVolumeIconState(!bShowIcon); + SetSystrayVolumeIconState(bShowIcon); } VOID diff --git a/dll/cpl/powercfg/advanced.c b/dll/cpl/powercfg/advanced.c index 6f28272868..6ca281abe6 100644 --- a/dll/cpl/powercfg/advanced.c +++ b/dll/cpl/powercfg/advanced.c @@ -301,17 +301,20 @@ Adv_InitDialog(VOID) BOOLEAN bSuspend = FALSE; BOOLEAN bHibernate; BOOLEAN bShutdown; + BOOL bEnabled; SYSTEM_POWER_CAPABILITIES spc; - if (GetSystrayPowerIconState()) + bEnabled = GetSystrayPowerIconState(); + + if (bEnabled) gGPP.user.GlobalFlags |= EnableSysTrayBatteryMeter; else gGPP.user.GlobalFlags &= ~EnableSysTrayBatteryMeter; CheckDlgButton(hAdv, IDC_SYSTRAYBATTERYMETER, - gGPP.user.GlobalFlags & EnableSysTrayBatteryMeter ? BST_CHECKED : BST_UNCHECKED); + bEnabled ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hAdv, IDC_PASSWORDLOGON, gGPP.user.GlobalFlags & EnablePasswordLogon ? BST_CHECKED : BST_UNCHECKED); @@ -501,7 +504,7 @@ Adv_SaveData(HWND hwndDlg) MessageBox(hwndDlg, L"WriteGlobalPwrPolicy failed", NULL, MB_OK); } - SetSystrayPowerIconState(!bSystrayBatteryMeter); + SetSystrayPowerIconState(bSystrayBatteryMeter); Adv_InitDialog(); }

1 0

[reactos] 03/03: [EXPLORER] Minor cleanup/comment fixes.
by Hermès Bélusca-Maïto 22 Apr '19

22 Apr '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a7ddabcc128c882df214d… commit a7ddabcc128c882df214de984e941e32e25b53a4 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Apr 22 21:25:41 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Apr 22 21:25:41 2019 +0200 [EXPLORER] Minor cleanup/comment fixes. --- base/shell/explorer/syspager.cpp | 12 ++++++++---- base/shell/explorer/trayclock.cpp | 4 +--- base/shell/explorer/trayntfy.cpp | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/base/shell/explorer/syspager.cpp b/base/shell/explorer/syspager.cpp index 1755ebedde..44ccff9b90 100644 --- a/base/shell/explorer/syspager.cpp +++ b/base/shell/explorer/syspager.cpp @@ -180,7 +180,8 @@ public: void Initialize(HWND hWndParent, CBalloonQueue * queue); }; -extern const WCHAR szSysPagerWndClass[]; + +static const WCHAR szSysPagerWndClass[] = L"SysPager"; class CSysPagerWnd : public CComCoClass<CSysPagerWnd>, @@ -258,6 +259,10 @@ public: HRESULT Initialize(IN HWND hWndParent); }; +/* + * IconWatcher + */ + CIconWatcher::CIconWatcher() : m_hWatcherThread(NULL), m_WakeUpEvent(NULL), @@ -489,8 +494,8 @@ UINT WINAPI CIconWatcher::WatcherThread(_In_opt_ LPVOID lpParam) } /* -* NotifyToolbar -*/ + * BalloonQueue + */ CBalloonQueue::CBalloonQueue() : m_hwndParent(NULL), @@ -1255,7 +1260,6 @@ void CNotifyToolbar::Initialize(HWND hWndParent, CBalloonQueue * queue) /* * SysPagerWnd */ -const WCHAR szSysPagerWndClass[] = L"SysPager"; CSysPagerWnd::CSysPagerWnd() {} diff --git a/base/shell/explorer/trayclock.cpp b/base/shell/explorer/trayclock.cpp index 8c217c8c4c..f21ba2c110 100644 --- a/base/shell/explorer/trayclock.cpp +++ b/base/shell/explorer/trayclock.cpp @@ -39,7 +39,7 @@ const UINT ClockWndFormatsCount = _ARRAYSIZE(ClockWndFormats); #define CLOCKWND_FORMAT_COUNT ClockWndFormatsCount -extern const WCHAR szTrayClockWndClass[]; +static const WCHAR szTrayClockWndClass[] = L"TrayClockWClass"; class CTrayClockWnd : public CComCoClass<CTrayClockWnd>, @@ -142,8 +142,6 @@ public: HRESULT Initialize(IN HWND hWndParent); }; -const WCHAR szTrayClockWndClass[] = L"TrayClockWClass"; - #define ID_TRAYCLOCK_TIMER 0 #define ID_TRAYCLOCK_TIMER_INIT 1 diff --git a/base/shell/explorer/trayntfy.cpp b/base/shell/explorer/trayntfy.cpp index 4326ca727e..63dc236263 100644 --- a/base/shell/explorer/trayntfy.cpp +++ b/base/shell/explorer/trayntfy.cpp @@ -25,7 +25,7 @@ * TrayNotifyWnd */ -static const WCHAR szTrayNotifyWndClass [] = TEXT("TrayNotifyWnd"); +static const WCHAR szTrayNotifyWndClass[] = L"TrayNotifyWnd"; #define TRAY_NOTIFY_WND_SPACING_X 1 #define TRAY_NOTIFY_WND_SPACING_Y 1

1 0

[reactos] 02/03: [NTOS:CM] In CmpParseKey(), do not assert but instead correctly return failure if CmpHandleExitNode() doesn't return a valid node, or CmpCreateKeyControlBlock() fails.
by Hermès Bélusca-Maïto 22 Apr '19

22 Apr '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=884db2ea06f1c961d2efc… commit 884db2ea06f1c961d2efcc13d477bc76ea0f7f50 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Apr 22 21:09:10 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Apr 22 21:09:10 2019 +0200 [NTOS:CM] In CmpParseKey(), do not assert but instead correctly return failure if CmpHandleExitNode() doesn't return a valid node, or CmpCreateKeyControlBlock() fails. --- ntoskrnl/config/cmparse.c | 35 ++++++++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 7 deletions(-) diff --git a/ntoskrnl/config/cmparse.c b/ntoskrnl/config/cmparse.c index fe25e252bd..872a79619a 100644 --- a/ntoskrnl/config/cmparse.c +++ b/ntoskrnl/config/cmparse.c @@ -960,7 +960,7 @@ CmpHandleExitNode(IN OUT PHHIVE *Hive, { /* Release it */ ASSERT(*ReleaseHive != NULL); - HvReleaseCell((*ReleaseHive), *ReleaseCell); + HvReleaseCell(*ReleaseHive, *ReleaseCell); } /* Get the link references */ @@ -968,7 +968,7 @@ CmpHandleExitNode(IN OUT PHHIVE *Hive, *Cell = (*KeyNode)->ChildHiveReference.KeyCell; /* Get the new node */ - *KeyNode = (PCM_KEY_NODE)HvGetCell((*Hive), *Cell); + *KeyNode = (PCM_KEY_NODE)HvGetCell(*Hive, *Cell); if (*KeyNode) { /* Set the new release values */ @@ -1191,7 +1191,12 @@ CmpParseKey(IN PVOID ParseObject, &Node, &HiveToRelease, &CellToRelease); - if (!Node) ASSERT(FALSE); + if (!Node) + { + /* Fail */ + Status = STATUS_INSUFFICIENT_RESOURCES; + break; + } } /* Do the open */ @@ -1232,7 +1237,12 @@ CmpParseKey(IN PVOID ParseObject, &Node, &HiveToRelease, &CellToRelease); - if (!Node) ASSERT(FALSE); + if (!Node) + { + /* Fail */ + Status = STATUS_INSUFFICIENT_RESOURCES; + break; + } } /* Create a KCB for this key */ @@ -1242,7 +1252,12 @@ CmpParseKey(IN PVOID ParseObject, ParentKcb, 0, &NextName); - if (!Kcb) ASSERT(FALSE); + if (!Kcb) + { + /* Fail */ + Status = STATUS_INSUFFICIENT_RESOURCES; + break; + } /* Dereference the parent and set the new one */ CmpDereferenceKeyControlBlock(ParentKcb); @@ -1353,7 +1368,12 @@ CmpParseKey(IN PVOID ParseObject, &Node, &HiveToRelease, &CellToRelease); - if (!Node) ASSERT(FALSE); + if (!Node) + { + /* Fail */ + Status = STATUS_INSUFFICIENT_RESOURCES; + break; + } } /* Do the open */ @@ -1386,7 +1406,8 @@ CmpParseKey(IN PVOID ParseObject, /* Dereference the parent if it exists */ Quickie: - if (ParentKcb) CmpDereferenceKeyControlBlock(ParentKcb); + if (ParentKcb) + CmpDereferenceKeyControlBlock(ParentKcb); /* Unlock the registry */ CmpUnlockRegistry();

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