Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [SHELL32] Display cut items as ghosted (#7739)
by Whindmar Saksit 02 Mar '25

02 Mar '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f1a66daeeb474d81ec7e4… commit f1a66daeeb474d81ec7e4b486f5f341b91ee3c16 Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Sun Mar 2 13:07:23 2025 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Mar 2 13:07:23 2025 +0100 [SHELL32] Display cut items as ghosted (#7739) - When Ctrl+X is pressed on a selected item, it will appear ghosted until another clipboard action takes place. - Generate SHCNE_UPDATE* notifications when file attributes change. - When an items hidden attribute is changed (filesystem notification), we must update the ghosted state. CORE-9465 --- dll/shellext/netshell/shfldr_netconnect.cpp | 2 +- dll/win32/shell32/CDefView.cpp | 143 +++++++++++++++------ dll/win32/shell32/CDefViewBckgrndMenu.cpp | 4 +- dll/win32/shell32/CDefaultContextMenu.cpp | 8 +- dll/win32/shell32/CNewMenu.cpp | 2 +- dll/win32/shell32/droptargets/CFSDropTarget.cpp | 2 +- dll/win32/shell32/folders/CRecycleBin.cpp | 2 +- dll/win32/shell32/precomp.h | 2 +- .../shell32/shelldesktop/CDirectoryWatcher.cpp | 3 +- dll/win32/shell32/utils.h | 34 +++++ sdk/include/psdk/shobjidl.idl | 1 + sdk/include/reactos/shlguid_undoc.h | 1 - 12 files changed, 158 insertions(+), 46 deletions(-) diff --git a/dll/shellext/netshell/shfldr_netconnect.cpp b/dll/shellext/netshell/shfldr_netconnect.cpp index f7358065054..30689990fcd 100644 --- a/dll/shellext/netshell/shfldr_netconnect.cpp +++ b/dll/shellext/netshell/shfldr_netconnect.cpp @@ -661,7 +661,7 @@ HRESULT WINAPI CNetConUiObject::InvokeCommand(LPCMINVOKECOMMANDINFO lpcmi) { HRESULT hr; CComPtr<IShellView> psv; - hr = IUnknown_QueryService(m_pUnknown, SID_IFolderView, IID_PPV_ARG(IShellView, &psv)); + hr = IUnknown_QueryService(m_pUnknown, SID_SFolderView, IID_PPV_ARG(IShellView, &psv)); if (SUCCEEDED(hr)) { SVSIF selFlags = SVSI_DESELECTOTHERS | SVSI_EDIT | SVSI_ENSUREVISIBLE | SVSI_FOCUSED | SVSI_SELECT; diff --git a/dll/win32/shell32/CDefView.cpp b/dll/win32/shell32/CDefView.cpp index 55c99e6f7ad..d78feeb7f86 100644 --- a/dll/win32/shell32/CDefView.cpp +++ b/dll/win32/shell32/CDefView.cpp @@ -238,6 +238,7 @@ private: CComPtr<ICommDlgBrowser> m_pCommDlgBrowser; CComPtr<IFolderFilter> m_pFolderFilter; CComPtr<IShellFolderViewDual> m_pShellFolderViewDual; + ClipboardViewerChain m_ClipboardChain; CListView m_ListView; HWND m_hWndParent; FOLDERSETTINGS m_FolderSettings; @@ -274,6 +275,7 @@ private: BOOL m_isEditing; BOOL m_isParentFolderSpecial; bool m_ScheduledStatusbarUpdate; + bool m_HasCutItems; CLSID m_Category; BOOL m_Destroyed; @@ -313,6 +315,9 @@ public: HRESULT LoadColumn(UINT FoldCol, UINT ListCol, BOOL Insert, UINT ForceWidth = 0); HRESULT LoadColumns(SIZE_T *pColList = NULL, UINT ColListCount = 0); void ColumnListChanged(); + SFGAOF GetItemAttributes(PCUITEMID_CHILD pidl, UINT Query); + SFGAOF GetItemAttributes(int i, UINT Query); + void RefreshGhostedState(); PCUITEMID_CHILD _PidlByItem(int i); PCUITEMID_CHILD _PidlByItem(LVITEM& lvItem); int LV_FindItemByPidl(PCUITEMID_CHILD pidl); @@ -485,6 +490,8 @@ public: LRESULT OnCustomItem(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); LRESULT OnSettingChange(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); LRESULT OnInitMenuPopup(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); + LRESULT OnChangeCBChain(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); + LRESULT OnDrawClipboard(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); virtual VOID OnFinalMessage(HWND) override; @@ -542,6 +549,8 @@ public: MESSAGE_HANDLER(CWM_GETISHELLBROWSER, OnGetShellBrowser) MESSAGE_HANDLER(WM_SETTINGCHANGE, OnSettingChange) MESSAGE_HANDLER(WM_INITMENUPOPUP, OnInitMenuPopup) + MESSAGE_HANDLER(WM_CHANGECBCHAIN, OnChangeCBChain) + MESSAGE_HANDLER(WM_DRAWCLIPBOARD, OnDrawClipboard) END_MSG_MAP() BEGIN_COM_MAP(CDefView) @@ -592,6 +601,7 @@ CDefView::CDefView() : m_isEditing(FALSE), m_isParentFolderSpecial(FALSE), m_ScheduledStatusbarUpdate(false), + m_HasCutItems(false), m_Destroyed(FALSE) { ZeroMemory(&m_FolderSettings, sizeof(m_FolderSettings)); @@ -1287,6 +1297,18 @@ BOOL CDefView::_Sort(int Col) return m_ListView.SortItems(ListViewCompareItems, this); } +SFGAOF CDefView::GetItemAttributes(PCUITEMID_CHILD pidl, UINT Query) +{ + SFGAOF Attr = (SFGAOF)Query; + return SUCCEEDED(m_pSFParent->GetAttributesOf(1, &pidl, &Attr)) ? (Attr & Query) : 0; +} + +SFGAOF CDefView::GetItemAttributes(int i, UINT Query) +{ + PCUITEMID_CHILD pItem = _PidlByItem(i); + return pItem ? GetItemAttributes(pItem, Query) : 0; +} + PCUITEMID_CHILD CDefView::_PidlByItem(int i) { if (!m_ListView) @@ -1342,13 +1364,15 @@ int CDefView::LV_AddItem(PCUITEMID_CHILD pidl) if (_DoFolderViewCB(SFVM_ADDINGOBJECT, 0, (LPARAM)pidl) == S_FALSE) return -1; - lvItem.mask = LVIF_TEXT | LVIF_IMAGE | LVIF_PARAM; // set mask + lvItem.mask = LVIF_TEXT | LVIF_IMAGE | LVIF_PARAM | LVIF_STATE; lvItem.iItem = m_ListView.GetItemCount(); // add item to lists end lvItem.iSubItem = 0; lvItem.lParam = reinterpret_cast<LPARAM>(ILClone(pidl)); // set item's data lvItem.pszText = LPSTR_TEXTCALLBACKW; // get text on a callback basis lvItem.iImage = I_IMAGECALLBACK; // get image on a callback basis lvItem.stateMask = LVIS_CUT; + if (m_HasCutItems) + lvItem.state = GetItemAttributes(pidl, SFGAO_HIDDEN | SFGAO_GHOSTED) ? LVIS_CUT : 0; return m_ListView.InsertItem(&lvItem); } @@ -1422,14 +1446,21 @@ BOOLEAN CDefView::LV_UpdateItem(PCUITEMID_CHILD pidl) if (-1 != nItem) { - _DoFolderViewCB(SFVM_UPDATINGOBJECT, 0, (LPARAM)pidl); + _DoFolderViewCB(SFVM_UPDATINGOBJECT, nItem, (LPARAM)pidl); - lvItem.mask = LVIF_IMAGE; + lvItem.mask = LVIF_IMAGE | LVIF_STATE; lvItem.iItem = nItem; lvItem.iSubItem = 0; lvItem.iImage = SHMapPIDLToSystemImageListIndex(m_pSFParent, pidl, 0); - m_ListView.SetItem(&lvItem); - m_ListView.Update(nItem); + lvItem.stateMask = LVIS_CUT; + if (m_HasCutItems) + lvItem.state = GetItemAttributes(pidl, SFGAO_HIDDEN | SFGAO_GHOSTED) ? LVIS_CUT : 0; + PCUITEMID_CHILD pidlOld = _PidlByItem(nItem); + if (pidlOld && (lvItem.lParam = reinterpret_cast<LPARAM>(ILClone(pidl))) != NULL) + lvItem.mask |= LVIF_PARAM; + if (m_ListView.SetItem(&lvItem) && lvItem.lParam && pidlOld) + ILFree(const_cast<PUITEMID_CHILD>(pidlOld)); + for (UINT i = 0; m_ListView.SetItemText(nItem, i, LPSTR_TEXTCALLBACK); ++i) {} // Update all columns return TRUE; } @@ -1597,6 +1628,8 @@ LRESULT CDefView::OnDestroy(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHand m_Destroyed = TRUE; RevokeDragDrop(m_hWnd); SHChangeNotifyDeregister(m_hNotify); + m_hNotify = NULL; + m_ClipboardChain.Unhook(m_hWnd); if (m_pFileMenu) { IUnknown_SetSite(m_pFileMenu, NULL); @@ -1607,7 +1640,6 @@ LRESULT CDefView::OnDestroy(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHand DestroyMenu(m_hMenu); m_hMenu = NULL; } - m_hNotify = NULL; SHFree(m_pidlParent); m_pidlParent = NULL; } @@ -2672,18 +2704,14 @@ LRESULT CDefView::OnNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandl TRACE("-- text=%s\n", debugstr_w(lpdi->item.pszText)); } } - if(lpdi->item.mask & LVIF_IMAGE) /* image requested */ + if (lpdi->item.mask & LVIF_IMAGE) { lpdi->item.iImage = SHMapPIDLToSystemImageListIndex(m_pSFParent, pidl, 0); } - if(lpdi->item.mask & LVIF_STATE) + 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; - } + if ((lpdi->item.stateMask & LVIS_CUT) && GetItemAttributes(pidl, SFGAO_HIDDEN | SFGAO_GHOSTED)) + lpdi->item.state |= LVIS_CUT; } lpdi->item.mask |= LVIF_DI_SETITEM; break; @@ -2924,7 +2952,10 @@ LRESULT CDefView::OnChangeNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL & break; case SHCNE_UPDATEDIR: case SHCNE_ATTRIBUTES: - Refresh(); + if (child0) + LV_UpdateItem(child0); + else + Refresh(); UpdateStatusbar(); break; case SHCNE_FREESPACE: @@ -3029,6 +3060,31 @@ LRESULT CDefView::OnInitMenuPopup(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL return FALSE; } +LRESULT CDefView::OnChangeCBChain(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) +{ + bHandled = TRUE; + return m_ClipboardChain.HandleChangeCBChain(wParam, lParam); +} + +LRESULT CDefView::OnDrawClipboard(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) +{ + bHandled = TRUE; + const LRESULT res = m_ClipboardChain.HandleDrawClipboard(wParam, lParam); + if (m_HasCutItems) + { + m_ClipboardChain.Unhook(m_hWnd); + m_HasCutItems = false; + m_ListView.SetItemState(-1, 0, LVIS_CUT); // Somebody copied or pasted, nothing can be "cut" anymore + m_ListView.SendMessageW(LVM_SETCALLBACKMASK, m_ListView.SendMessageW(LVM_GETCALLBACKMASK, 0, 0) | LVIS_CUT, 0); + } + return res; +} + +void CDefView::RefreshGhostedState() +{ + for (UINT i = 0, c = m_ListView.GetItemCount(); i < c; ++i) + m_ListView.SetItemState(i, GetItemAttributes(i, SFGAO_HIDDEN | SFGAO_GHOSTED) ? LVIS_CUT : 0, LVIS_CUT); +} // The INTERFACE of the IShellView object @@ -3563,12 +3619,12 @@ HRESULT STDMETHODCALLTYPE CDefView::Item(int iItemIndex, PITEMID_CHILD *ppidl) HRESULT STDMETHODCALLTYPE CDefView::ItemCount(UINT uFlags, int *pcItems) { TRACE("(%p)->(%u %p)\n", this, uFlags, pcItems); - - if (uFlags != SVGIO_ALLVIEW) - FIXME("some flags unsupported, %x\n", uFlags & ~SVGIO_ALLVIEW); - - *pcItems = m_ListView.GetItemCount(); - + if (uFlags != SVGIO_ALLVIEW && uFlags != SVGIO_SELECTION) + FIXME("some flags unsupported, %x\n", uFlags & ~(SVGIO_ALLVIEW | SVGIO_SELECTION)); + if ((uFlags & SVGIO_TYPE_MASK) == SVGIO_SELECTION) + *pcItems = m_ListView.GetSelectedCount(); + else + *pcItems = m_ListView.GetItemCount(); return S_OK; } @@ -3827,14 +3883,15 @@ HRESULT STDMETHODCALLTYPE CDefView::SelectAndPositionItem(LPCITEMIDLIST item, UI HRESULT STDMETHODCALLTYPE CDefView::Rearrange(LPARAM sort) { - FIXME("(%p)->(%ld) stub\n", this, sort); - return E_NOTIMPL; + _Sort(LOWORD(sort & SHCIDS_COLUMNMASK)); + return S_OK; } HRESULT STDMETHODCALLTYPE CDefView::GetArrangeParam(LPARAM *sort) { - FIXME("(%p)->(%p) stub\n", this, sort); - return E_NOTIMPL; + int col = m_sortInfo.ListColumn; + *sort = col != LISTVIEW_SORT_INFO::UNSPECIFIEDCOLUMN ? col : 0; + return col != LISTVIEW_SORT_INFO::UNSPECIFIEDCOLUMN ? S_OK : S_FALSE; } HRESULT STDMETHODCALLTYPE CDefView::ArrangeGrid() @@ -3927,8 +3984,8 @@ HRESULT STDMETHODCALLTYPE CDefView::SetRedraw(BOOL redraw) HRESULT STDMETHODCALLTYPE CDefView::GetSelectedCount(UINT *count) { - FIXME("(%p)->(%p) stub\n", this, count); - return E_NOTIMPL; + *count = m_ListView.GetSelectedCount(); + return S_OK; } HRESULT STDMETHODCALLTYPE CDefView::GetSelectedObjects(PCUITEMID_CHILD **pidl, UINT *items) @@ -3998,8 +4055,26 @@ HRESULT STDMETHODCALLTYPE CDefView::IsBkDropTarget(IDropTarget *drop_target) HRESULT STDMETHODCALLTYPE CDefView::SetClipboard(BOOL move) { - FIXME("(%p)->(%d) stub\n", this, move); - return E_NOTIMPL; + if (!move) + return S_OK; + + UINT CutCount = 0; + for (int i = -1; (i = m_ListView.GetNextItem(i, LVNI_SELECTED)) != -1;) + { + if (!CutCount++) + { + // Turn off the LVIS_CUT LVM_SETCALLBACKMASK optimization + m_ListView.SendMessageW(LVM_SETCALLBACKMASK, m_ListView.SendMessageW(LVM_GETCALLBACKMASK, 0, 0) & ~LVIS_CUT, 0); + RefreshGhostedState(); + } + m_ListView.SetItemState(i, LVIS_CUT, LVIS_CUT); + } + if (CutCount) + { + m_ClipboardChain.Hook(m_hWnd); + m_HasCutItems = true; + } + return S_OK; } HRESULT STDMETHODCALLTYPE CDefView::SetPoints(IDataObject *obj) @@ -4622,12 +4697,9 @@ HRESULT WINAPI CDefView::GetAdvise(DWORD *pAspects, DWORD *pAdvf, IAdviseSink ** HRESULT STDMETHODCALLTYPE CDefView::QueryService(REFGUID guidService, REFIID riid, void **ppvObject) { - if (IsEqualIID(guidService, SID_IShellBrowser) && m_pShellBrowser) - return m_pShellBrowser->QueryInterface(riid, ppvObject); - else if (IsEqualIID(guidService, SID_IFolderView)) + if (IsEqualIID(guidService, SID_SFolderView)) return QueryInterface(riid, ppvObject); - - return E_NOINTERFACE; + return m_pShellBrowser ? IUnknown_QueryService(m_pShellBrowser, guidService, riid, ppvObject) : E_NOINTERFACE; } HRESULT CDefView::_MergeToolbar() @@ -4674,8 +4746,7 @@ HRESULT CDefView_CreateInstance(IShellFolder *pFolder, REFIID riid, LPVOID * ppv return ShellObjectCreatorInit<CDefView>(pFolder, riid, ppvOut); } -HRESULT WINAPI SHCreateShellFolderView(const SFV_CREATE *pcsfv, - IShellView **ppsv) +HRESULT WINAPI SHCreateShellFolderView(const SFV_CREATE *pcsfv, IShellView **ppsv) { CComPtr<IShellView> psv; HRESULT hRes; diff --git a/dll/win32/shell32/CDefViewBckgrndMenu.cpp b/dll/win32/shell32/CDefViewBckgrndMenu.cpp index 740b917f072..ad567c58293 100644 --- a/dll/win32/shell32/CDefViewBckgrndMenu.cpp +++ b/dll/win32/shell32/CDefViewBckgrndMenu.cpp @@ -70,7 +70,7 @@ BOOL CDefViewBckgrndMenu::_bIsDesktopBrowserMenu() /* Get a pointer to the shell browser */ CComPtr<IShellView> psv; - HRESULT hr = IUnknown_QueryService(m_site, SID_IFolderView, IID_PPV_ARG(IShellView, &psv)); + HRESULT hr = IUnknown_QueryService(m_site, SID_SFolderView, IID_PPV_ARG(IShellView, &psv)); if (FAILED_UNEXPECTEDLY(hr)) return FALSE; @@ -265,7 +265,7 @@ CDefViewBckgrndMenu::InvokeCommand(LPCMINVOKECOMMANDINFO lpcmi) /* Get a pointer to the shell browser */ CComPtr<IShellView> psv; - HRESULT hr = IUnknown_QueryService(m_site, SID_IFolderView, IID_PPV_ARG(IShellView, &psv)); + HRESULT hr = IUnknown_QueryService(m_site, SID_SFolderView, IID_PPV_ARG(IShellView, &psv)); if (FAILED_UNEXPECTEDLY(hr)) return hr; diff --git a/dll/win32/shell32/CDefaultContextMenu.cpp b/dll/win32/shell32/CDefaultContextMenu.cpp index b076980e7b6..17cffeef96f 100644 --- a/dll/win32/shell32/CDefaultContextMenu.cpp +++ b/dll/win32/shell32/CDefaultContextMenu.cpp @@ -1031,10 +1031,16 @@ HRESULT CDefaultContextMenu::DoCopyOrCut(LPCMINVOKECOMMANDINFOEX lpcmi, BOOL bCo GlobalUnlock(medium.hGlobal); m_pDataObj->SetData(&formatetc, &medium, TRUE); + CComPtr<IShellFolderView> psfv; + if (SUCCEEDED(IUnknown_QueryService(m_site, SID_SFolderView, IID_PPV_ARG(IShellFolderView, &psfv)))) + psfv->SetPoints(m_pDataObj); + HRESULT hr = OleSetClipboard(m_pDataObj); if (FAILED_UNEXPECTEDLY(hr)) return hr; + if (psfv) + psfv->SetClipboard(!bCopy); return S_OK; } @@ -1161,7 +1167,7 @@ CDefaultContextMenu::DoCreateNewFolder( return S_OK; /* Get a pointer to the shell view */ - hr = IUnknown_QueryService(m_site, SID_IFolderView, IID_PPV_ARG(IShellView, &psv)); + hr = IUnknown_QueryService(m_site, SID_SFolderView, IID_PPV_ARG(IShellView, &psv)); if (FAILED_UNEXPECTEDLY(hr)) return S_OK; diff --git a/dll/win32/shell32/CNewMenu.cpp b/dll/win32/shell32/CNewMenu.cpp index bef93ea9860..f525bf4ada4 100644 --- a/dll/win32/shell32/CNewMenu.cpp +++ b/dll/win32/shell32/CNewMenu.cpp @@ -430,7 +430,7 @@ HRESULT CNewMenu::SelectNewItem(LONG wEventId, UINT uFlags, LPWSTR pszName, BOOL return S_OK; /* Get a pointer to the shell view */ - hr = IUnknown_QueryService(m_pSite, SID_IFolderView, IID_PPV_ARG(IShellView, &lpSV)); + hr = IUnknown_QueryService(m_pSite, SID_SFolderView, IID_PPV_ARG(IShellView, &lpSV)); if (FAILED_UNEXPECTEDLY(hr)) return S_OK; diff --git a/dll/win32/shell32/droptargets/CFSDropTarget.cpp b/dll/win32/shell32/droptargets/CFSDropTarget.cpp index e7b5927500e..bc84e7ec939 100644 --- a/dll/win32/shell32/droptargets/CFSDropTarget.cpp +++ b/dll/win32/shell32/droptargets/CFSDropTarget.cpp @@ -468,7 +468,7 @@ HRESULT WINAPI CFSDropTarget::Drop(IDataObject *pDataObject, if (*pdwEffect == DROPEFFECT_MOVE && m_site) { CComPtr<IShellFolderView> psfv; - HRESULT hr = IUnknown_QueryService(m_site, SID_IFolderView, IID_PPV_ARG(IShellFolderView, &psfv)); + HRESULT hr = IUnknown_QueryService(m_site, SID_SFolderView, IID_PPV_ARG(IShellFolderView, &psfv)); if (SUCCEEDED(hr) && psfv->IsDropOnSource(this) == S_OK) { _RepositionItems(psfv, pDataObject, pt); diff --git a/dll/win32/shell32/folders/CRecycleBin.cpp b/dll/win32/shell32/folders/CRecycleBin.cpp index 6508e071326..5051c619d7e 100644 --- a/dll/win32/shell32/folders/CRecycleBin.cpp +++ b/dll/win32/shell32/folders/CRecycleBin.cpp @@ -505,7 +505,7 @@ fail: return mem; } -typedef struct +typedef struct _FILEOPDATA { PCUITEMID_CHILD_ARRAY apidl; UINT cidl, index; diff --git a/dll/win32/shell32/precomp.h b/dll/win32/shell32/precomp.h index 2d9e2776d6a..c1ae067bb98 100644 --- a/dll/win32/shell32/precomp.h +++ b/dll/win32/shell32/precomp.h @@ -322,7 +322,7 @@ InvokeIExecuteCommandWithDataObject( _In_opt_ LPCMINVOKECOMMANDINFOEX pICI, _In_opt_ IUnknown *pSite); -typedef enum { +typedef enum _FILEOPCALLBACKEVENT { FOCE_STARTOPERATIONS, FOCE_FINISHOPERATIONS, FOCE_PREMOVEITEM, diff --git a/dll/win32/shell32/shelldesktop/CDirectoryWatcher.cpp b/dll/win32/shell32/shelldesktop/CDirectoryWatcher.cpp index 1bb7d80cb30..d24e1540a6e 100644 --- a/dll/win32/shell32/shelldesktop/CDirectoryWatcher.cpp +++ b/dll/win32/shell32/shelldesktop/CDirectoryWatcher.cpp @@ -299,7 +299,8 @@ GetFilterFromEvents(DWORD fEvents) return (FILE_NOTIFY_CHANGE_FILE_NAME | FILE_NOTIFY_CHANGE_DIR_NAME | FILE_NOTIFY_CHANGE_CREATION | - FILE_NOTIFY_CHANGE_SIZE); + FILE_NOTIFY_CHANGE_SIZE | + FILE_NOTIFY_CHANGE_ATTRIBUTES); } // Restart a watch by using ReadDirectoryChangesW function diff --git a/dll/win32/shell32/utils.h b/dll/win32/shell32/utils.h index a4effec8964..4f546fa483f 100644 --- a/dll/win32/shell32/utils.h +++ b/dll/win32/shell32/utils.h @@ -90,3 +90,37 @@ SHELL_CreateFallbackExtractIconForNoAssocFile(REFIID riid, LPVOID *ppvOut) const int id = IDI_SHELL_DOCUMENT; return SHELL_CreateShell32DefaultExtractIcon(id > 1 ? -id : 0, riid, ppvOut); } + +struct ClipboardViewerChain +{ + HWND m_hWndNext = HWND_BOTTOM; + + void Unhook(HWND hWnd) + { + if (m_hWndNext != HWND_BOTTOM) + ChangeClipboardChain(hWnd, m_hWndNext); + m_hWndNext = HWND_BOTTOM; + } + + void Hook(HWND hWnd) + { + if (m_hWndNext == HWND_BOTTOM) + m_hWndNext = SetClipboardViewer(hWnd); + } + + LRESULT HandleChangeCBChain(WPARAM wParam, LPARAM lParam) + { + if (m_hWndNext == (HWND)wParam) + return (LRESULT)(m_hWndNext = (HWND)lParam); + else if (m_hWndNext && m_hWndNext != HWND_BOTTOM) + return ::SendMessageW(m_hWndNext, WM_CHANGECBCHAIN, wParam, lParam); + return 0; + } + + LRESULT HandleDrawClipboard(WPARAM wParam, LPARAM lParam) + { + if (m_hWndNext && m_hWndNext != HWND_BOTTOM) + return ::SendMessageW(m_hWndNext, WM_DRAWCLIPBOARD, wParam, lParam); + return 0; + } +}; diff --git a/sdk/include/psdk/shobjidl.idl b/sdk/include/psdk/shobjidl.idl index 8738863eb55..777cfde2e4a 100644 --- a/sdk/include/psdk/shobjidl.idl +++ b/sdk/include/psdk/shobjidl.idl @@ -898,6 +898,7 @@ interface IFolderView : IUnknown [in] DWORD flags ); } +cpp_quote("#define SID_SFolderView IID_IFolderView") [v1_enum] enum tagSORTDIRECTION { diff --git a/sdk/include/reactos/shlguid_undoc.h b/sdk/include/reactos/shlguid_undoc.h index 01dbfda2fe2..52aad4a13fb 100644 --- a/sdk/include/reactos/shlguid_undoc.h +++ b/sdk/include/reactos/shlguid_undoc.h @@ -211,7 +211,6 @@ DEFINE_GUID(IID_IPinnedList, 0xBBD20037, 0xBC0E, 0x42F1, 0x91, 0x3 #define SID_STravelLogCursor IID_ITravelLogStg #define SID_IBandSite IID_IBandSite -#define SID_IFolderView IID_IFolderView #define SID_IShellBrowser IID_IShellBrowser #endif // __SHLGUID_UNDOC_H

1 0

[reactos] 01/01: [NETSHELL] Reverted the removal of the unattended setup support for the network settings page.
by Eric Kohl 02 Mar '25

02 Mar '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c3505bb4f69424bcae908… commit c3505bb4f69424bcae908323f84700da34373030 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Mar 2 13:01:58 2025 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Mar 2 13:01:58 2025 +0100 [NETSHELL] Reverted the removal of the unattended setup support for the network settings page. I removed the unattended setup support by accident. This should fix our automatic tests. --- dll/shellext/netshell/setup.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dll/shellext/netshell/setup.cpp b/dll/shellext/netshell/setup.cpp index 722e8be1d76..eb469c82b3a 100644 --- a/dll/shellext/netshell/setup.cpp +++ b/dll/shellext/netshell/setup.cpp @@ -316,6 +316,11 @@ NetworkSettingsPageDlgProc( case PSN_SETACTIVE: /* Enable the Next button only */ PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_NEXT); + if (pSetupData->UnattendSetup) + { + SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, IDD_NETWORKCOMPONENTPAGE); + return TRUE; + } break; case PSN_WIZNEXT:

1 0

[reactos] 01/01: [NETSHELL] Fix build error
by Eric Kohl 02 Mar '25

02 Mar '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=abb04ec321cd1a173d0da… commit abb04ec321cd1a173d0dab0658b7d35510d5841c Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Mar 2 10:28:13 2025 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Mar 2 10:28:13 2025 +0100 [NETSHELL] Fix build error --- dll/shellext/netshell/setup.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/dll/shellext/netshell/setup.cpp b/dll/shellext/netshell/setup.cpp index 1fb2a6021a8..722e8be1d76 100644 --- a/dll/shellext/netshell/setup.cpp +++ b/dll/shellext/netshell/setup.cpp @@ -114,7 +114,6 @@ InstallNetworkComponent( ZeroMemory(&OboToken, sizeof(OboToken)); OboToken.Type = OBO_USER; - TRACE("pNetCfgClassSetup->Install %p\n", &pNetCfgClassSetup->Install); hr = pNetCfgClassSetup->Install(pszComponentName, &OboToken, 0, //NSF_PRIMARYINSTALL,

1 0

[reactos] 01/01: [NETSHELL][SYSSETUP] Move network installer code to the network setup wizard pages
by Eric Kohl 02 Mar '25

02 Mar '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6b9122b5f55388a5f81c9… commit 6b9122b5f55388a5f81c9fcd7ba7ac16f8634639 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Mar 2 09:53:06 2025 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Mar 2 09:53:06 2025 +0100 [NETSHELL][SYSSETUP] Move network installer code to the network setup wizard pages - Add a new page to the network setup wizard that installs the required network components in a background thread. - Remove the network setup code from syssetup.dll. TODO: Move the network setup code for the LiveCD. --- dll/shellext/netshell/lang/bg-BG.rc | 12 ++ dll/shellext/netshell/lang/cs-CZ.rc | 12 ++ dll/shellext/netshell/lang/da-DK.rc | 12 ++ dll/shellext/netshell/lang/de-DE.rc | 12 ++ dll/shellext/netshell/lang/el-GR.rc | 12 ++ dll/shellext/netshell/lang/en-US.rc | 12 ++ dll/shellext/netshell/lang/es-ES.rc | 12 ++ dll/shellext/netshell/lang/fr-FR.rc | 12 ++ dll/shellext/netshell/lang/he-IL.rc | 12 ++ dll/shellext/netshell/lang/hi-IN.rc | 12 ++ dll/shellext/netshell/lang/hu-HU.rc | 12 ++ dll/shellext/netshell/lang/id-ID.rc | 12 ++ dll/shellext/netshell/lang/it-IT.rc | 12 ++ dll/shellext/netshell/lang/ja-JP.rc | 12 ++ dll/shellext/netshell/lang/nl-NL.rc | 12 ++ dll/shellext/netshell/lang/no-NO.rc | 12 ++ dll/shellext/netshell/lang/pl-PL.rc | 12 ++ dll/shellext/netshell/lang/pt-PT.rc | 12 ++ dll/shellext/netshell/lang/ro-RO.rc | 12 ++ dll/shellext/netshell/lang/ru-RU.rc | 12 ++ dll/shellext/netshell/lang/sk-SK.rc | 12 ++ dll/shellext/netshell/lang/sq-AL.rc | 12 ++ dll/shellext/netshell/lang/sv-SE.rc | 12 ++ dll/shellext/netshell/lang/tr-TR.rc | 12 ++ dll/shellext/netshell/lang/uk-UA.rc | 12 ++ dll/shellext/netshell/lang/zh-CN.rc | 12 ++ dll/shellext/netshell/lang/zh-HK.rc | 12 ++ dll/shellext/netshell/lang/zh-TW.rc | 12 ++ dll/shellext/netshell/resource.h | 17 ++- dll/shellext/netshell/setup.cpp | 212 +++++++++++++++++++++++++----------- dll/win32/syssetup/install.c | 15 --- 31 files changed, 497 insertions(+), 83 deletions(-) diff --git a/dll/shellext/netshell/lang/bg-BG.rc b/dll/shellext/netshell/lang/bg-BG.rc index 592a2702763..a2a827116ed 100644 --- a/dll/shellext/netshell/lang/bg-BG.rc +++ b/dll/shellext/netshell/lang/bg-BG.rc @@ -76,6 +76,16 @@ BEGIN PUSHBUTTON "&Затваряне", IDC_CLOSE, 120, 155, 60, 14 END +IDD_NETWORKINITPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Setup" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_NET_SETUP, IDC_STATIC, 21, 10, 20, 20 + LTEXT "Please wait while ReactOS installs networking components.", IDC_STATIC, 53, 7, 240, 20 + CONTROL "", IDC_INSTALL_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 58, 275, 11 +END + IDD_NETWORKSETTINGSPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS Setup" @@ -165,6 +175,8 @@ END STRINGTABLE BEGIN + IDS_NETWORKINITTITLE "Network Install" + IDS_NETWORKINITSUBTITLE "Installs reqired networking components." IDS_NETWORKSETTINGSTITLE "Network Settings" IDS_NETWORKSETTINGSSUBTITLE "Installs network software used to connect to other networks, computers, and the Internet." IDS_NETWORKCOMPONENTTITLE "Network Components" diff --git a/dll/shellext/netshell/lang/cs-CZ.rc b/dll/shellext/netshell/lang/cs-CZ.rc index d8c18c17d9a..139b9aa9070 100644 --- a/dll/shellext/netshell/lang/cs-CZ.rc +++ b/dll/shellext/netshell/lang/cs-CZ.rc @@ -76,6 +76,16 @@ BEGIN PUSHBUTTON "&zavřít", IDC_CLOSE, 120, 155, 60, 14 END +IDD_NETWORKINITPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Setup" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_NET_SETUP, IDC_STATIC, 21, 10, 20, 20 + LTEXT "Please wait while ReactOS installs networking components.", IDC_STATIC, 53, 7, 240, 20 + CONTROL "", IDC_INSTALL_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 58, 275, 11 +END + IDD_NETWORKSETTINGSPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Instalátor ReactOS" @@ -165,6 +175,8 @@ END STRINGTABLE BEGIN + IDS_NETWORKINITTITLE "Network Install" + IDS_NETWORKINITSUBTITLE "Installs reqired networking components." IDS_NETWORKSETTINGSTITLE "Síťová nastavení" IDS_NETWORKSETTINGSSUBTITLE "Instaluje síťový software používaný k připojení k dalším sítím, počítačům a k Internetu." IDS_NETWORKCOMPONENTTITLE "Síťové součásti" diff --git a/dll/shellext/netshell/lang/da-DK.rc b/dll/shellext/netshell/lang/da-DK.rc index 557b5f61bca..1e7333af036 100644 --- a/dll/shellext/netshell/lang/da-DK.rc +++ b/dll/shellext/netshell/lang/da-DK.rc @@ -76,6 +76,16 @@ BEGIN PUSHBUTTON "&Close", IDC_CLOSE, 120, 155, 60, 14 END +IDD_NETWORKINITPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Setup" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_NET_SETUP, IDC_STATIC, 21, 10, 20, 20 + LTEXT "Please wait while ReactOS installs networking components.", IDC_STATIC, 53, 7, 240, 20 + CONTROL "", IDC_INSTALL_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 58, 275, 11 +END + IDD_NETWORKSETTINGSPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS Setup" @@ -165,6 +175,8 @@ END STRINGTABLE BEGIN + IDS_NETWORKINITTITLE "Network Install" + IDS_NETWORKINITSUBTITLE "Installs reqired networking components." IDS_NETWORKSETTINGSTITLE "Network Settings" IDS_NETWORKSETTINGSSUBTITLE "Installs network software used to connect to other networks, computers, and the Internet." IDS_NETWORKCOMPONENTTITLE "Network Components" diff --git a/dll/shellext/netshell/lang/de-DE.rc b/dll/shellext/netshell/lang/de-DE.rc index cfb2da5f0b5..c942a6f26ab 100644 --- a/dll/shellext/netshell/lang/de-DE.rc +++ b/dll/shellext/netshell/lang/de-DE.rc @@ -76,6 +76,16 @@ BEGIN PUSHBUTTON "&Schließen", IDC_CLOSE, 120, 155, 60, 14 END +IDD_NETWORKINITPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Setup" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_NET_SETUP, IDC_STATIC, 21, 10, 20, 20 + LTEXT "Bitte warten Sie, während ReactOS Netzwerkkomponenten installiert.", IDC_STATIC, 53, 7, 240, 20 + CONTROL "", IDC_INSTALL_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 58, 275, 11 +END + IDD_NETWORKSETTINGSPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS Setup" @@ -165,6 +175,8 @@ END STRINGTABLE BEGIN + IDS_NETWORKINITTITLE "Netzwerkinstallation" + IDS_NETWORKINITSUBTITLE "Netzwerkkomponenten werden instaliert." IDS_NETWORKSETTINGSTITLE "Netzwerkeinstellungen" IDS_NETWORKSETTINGSSUBTITLE "Die Installation von Netzwerksoftware ermöglicht das Herstellen von Verbindungen mit anderen Computern, Netzwerken und dem Internet." IDS_NETWORKCOMPONENTTITLE "Netzwerkkomponenten" diff --git a/dll/shellext/netshell/lang/el-GR.rc b/dll/shellext/netshell/lang/el-GR.rc index 42cce6e4c83..06818522d74 100644 --- a/dll/shellext/netshell/lang/el-GR.rc +++ b/dll/shellext/netshell/lang/el-GR.rc @@ -76,6 +76,16 @@ BEGIN PUSHBUTTON "&Close", IDC_CLOSE, 120, 155, 60, 14 END +IDD_NETWORKINITPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Setup" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_NET_SETUP, IDC_STATIC, 21, 10, 20, 20 + LTEXT "Please wait while ReactOS installs networking components.", IDC_STATIC, 53, 7, 240, 20 + CONTROL "", IDC_INSTALL_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 58, 275, 11 +END + IDD_NETWORKSETTINGSPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS Setup" @@ -165,6 +175,8 @@ END STRINGTABLE BEGIN + IDS_NETWORKINITTITLE "Network Install" + IDS_NETWORKINITSUBTITLE "Installs reqired networking components." IDS_NETWORKSETTINGSTITLE "Network Settings" IDS_NETWORKSETTINGSSUBTITLE "Installs network software used to connect to other networks, computers, and the Internet." IDS_NETWORKCOMPONENTTITLE "Network Components" diff --git a/dll/shellext/netshell/lang/en-US.rc b/dll/shellext/netshell/lang/en-US.rc index 3b9ac61b58b..6191d836647 100644 --- a/dll/shellext/netshell/lang/en-US.rc +++ b/dll/shellext/netshell/lang/en-US.rc @@ -76,6 +76,16 @@ BEGIN PUSHBUTTON "&Close", IDC_CLOSE, 120, 155, 60, 14 END +IDD_NETWORKINITPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Setup" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_NET_SETUP, IDC_STATIC, 21, 10, 20, 20 + LTEXT "Please wait while ReactOS installs networking components.", IDC_STATIC, 53, 7, 240, 20 + CONTROL "", IDC_INSTALL_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 58, 275, 11 +END + IDD_NETWORKSETTINGSPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS Setup" @@ -165,6 +175,8 @@ END STRINGTABLE BEGIN + IDS_NETWORKINITTITLE "Network Install" + IDS_NETWORKINITSUBTITLE "Installs reqired networking components." IDS_NETWORKSETTINGSTITLE "Network Settings" IDS_NETWORKSETTINGSSUBTITLE "Installs network software used to connect to other networks, computers, and the Internet." IDS_NETWORKCOMPONENTTITLE "Network Components" diff --git a/dll/shellext/netshell/lang/es-ES.rc b/dll/shellext/netshell/lang/es-ES.rc index 5b79c156d3b..410797605b3 100644 --- a/dll/shellext/netshell/lang/es-ES.rc +++ b/dll/shellext/netshell/lang/es-ES.rc @@ -84,6 +84,16 @@ BEGIN PUSHBUTTON "&Cerrar", IDC_CLOSE, 120, 155, 60, 14 END +IDD_NETWORKINITPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Setup" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_NET_SETUP, IDC_STATIC, 21, 10, 20, 20 + LTEXT "Please wait while ReactOS installs networking components.", IDC_STATIC, 53, 7, 240, 20 + CONTROL "", IDC_INSTALL_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 58, 275, 11 +END + IDD_NETWORKSETTINGSPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Instalador de ReactOS" @@ -173,6 +183,8 @@ END STRINGTABLE BEGIN + IDS_NETWORKINITTITLE "Network Install" + IDS_NETWORKINITSUBTITLE "Installs reqired networking components." IDS_NETWORKSETTINGSTITLE "Configuración de red" IDS_NETWORKSETTINGSSUBTITLE "Instala aplicaciones de red necesarias para conectarse a otras redes, equipos, y la Internet." IDS_NETWORKCOMPONENTTITLE "Componetes de red" diff --git a/dll/shellext/netshell/lang/fr-FR.rc b/dll/shellext/netshell/lang/fr-FR.rc index 092aa710e62..6b8a3c88887 100644 --- a/dll/shellext/netshell/lang/fr-FR.rc +++ b/dll/shellext/netshell/lang/fr-FR.rc @@ -76,6 +76,16 @@ BEGIN PUSHBUTTON "Fermer", IDC_CLOSE, 120, 155, 60, 14 END +IDD_NETWORKINITPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Setup" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_NET_SETUP, IDC_STATIC, 21, 10, 20, 20 + LTEXT "Please wait while ReactOS installs networking components.", IDC_STATIC, 53, 7, 240, 20 + CONTROL "", IDC_INSTALL_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 58, 275, 11 +END + IDD_NETWORKSETTINGSPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Installation de ReactOS" @@ -165,6 +175,8 @@ END STRINGTABLE BEGIN + IDS_NETWORKINITTITLE "Network Install" + IDS_NETWORKINITSUBTITLE "Installs reqired networking components." IDS_NETWORKSETTINGSTITLE "Paramètres réseau" IDS_NETWORKSETTINGSSUBTITLE "Installe les logiciels réseau utilisés pour se connecter à d'autres réseaux, ordinateurs et à l'Internet." IDS_NETWORKCOMPONENTTITLE "Composants réseau" diff --git a/dll/shellext/netshell/lang/he-IL.rc b/dll/shellext/netshell/lang/he-IL.rc index ea668baa15f..d71b7cbccd8 100644 --- a/dll/shellext/netshell/lang/he-IL.rc +++ b/dll/shellext/netshell/lang/he-IL.rc @@ -76,6 +76,16 @@ BEGIN PUSHBUTTON "סגור", IDC_CLOSE, 120, 155, 60, 14 END +IDD_NETWORKINITPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Setup" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_NET_SETUP, IDC_STATIC, 21, 10, 20, 20 + LTEXT "Please wait while ReactOS installs networking components.", IDC_STATIC, 53, 7, 240, 20 + CONTROL "", IDC_INSTALL_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 58, 275, 11 +END + IDD_NETWORKSETTINGSPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS Setup" @@ -165,6 +175,8 @@ END STRINGTABLE BEGIN + IDS_NETWORKINITTITLE "Network Install" + IDS_NETWORKINITSUBTITLE "Installs reqired networking components." IDS_NETWORKSETTINGSTITLE "Network Settings" IDS_NETWORKSETTINGSSUBTITLE "Installs network software used to connect to other networks, computers, and the Internet." IDS_NETWORKCOMPONENTTITLE "Network Components" diff --git a/dll/shellext/netshell/lang/hi-IN.rc b/dll/shellext/netshell/lang/hi-IN.rc index 698f640db12..fbb4edf6738 100644 --- a/dll/shellext/netshell/lang/hi-IN.rc +++ b/dll/shellext/netshell/lang/hi-IN.rc @@ -82,6 +82,16 @@ BEGIN PUSHBUTTON "&बंद करे", IDC_CLOSE, 120, 155, 60, 14 END +IDD_NETWORKINITPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Setup" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_NET_SETUP, IDC_STATIC, 21, 10, 20, 20 + LTEXT "Please wait while ReactOS installs networking components.", IDC_STATIC, 53, 7, 240, 20 + CONTROL "", IDC_INSTALL_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 58, 275, 11 +END + IDD_NETWORKSETTINGSPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "रिऐक्ट ओएस सेटअप" @@ -171,6 +181,8 @@ END STRINGTABLE BEGIN + IDS_NETWORKINITTITLE "Network Install" + IDS_NETWORKINITSUBTITLE "Installs reqired networking components." IDS_NETWORKSETTINGSTITLE "नेटवर्क सेटिंग" IDS_NETWORKSETTINGSSUBTITLE "अन्य नेटवर्क, कंप्यूटर और इंटरनेट से कनेक्ट करने के लिए उपयोग किया जाने वाला नेटवर्क सॉफ़्टवेयर इंस्टॉल करता है।" IDS_NETWORKCOMPONENTTITLE "नेटवर्क कम्पोनेन्ट" diff --git a/dll/shellext/netshell/lang/hu-HU.rc b/dll/shellext/netshell/lang/hu-HU.rc index 599ac84ce3b..d93157c2de2 100644 --- a/dll/shellext/netshell/lang/hu-HU.rc +++ b/dll/shellext/netshell/lang/hu-HU.rc @@ -76,6 +76,16 @@ BEGIN PUSHBUTTON "&Bezárás", IDC_CLOSE, 120, 155, 60, 14 END +IDD_NETWORKINITPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Setup" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_NET_SETUP, IDC_STATIC, 21, 10, 20, 20 + LTEXT "Please wait while ReactOS installs networking components.", IDC_STATIC, 53, 7, 240, 20 + CONTROL "", IDC_INSTALL_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 58, 275, 11 +END + IDD_NETWORKSETTINGSPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS telepítő" @@ -165,6 +175,8 @@ END STRINGTABLE BEGIN + IDS_NETWORKINITTITLE "Network Install" + IDS_NETWORKINITSUBTITLE "Installs reqired networking components." IDS_NETWORKSETTINGSTITLE "Hálózati beállítások" IDS_NETWORKSETTINGSSUBTITLE "Hálózati szoftverek telepítése, melyek segítségével más hálózatokhoz, számítógépekhez vagy az internethez lehet csatlakozni." IDS_NETWORKCOMPONENTTITLE "Hálózati összetevők" diff --git a/dll/shellext/netshell/lang/id-ID.rc b/dll/shellext/netshell/lang/id-ID.rc index 063538fd644..d5dbb02a03c 100644 --- a/dll/shellext/netshell/lang/id-ID.rc +++ b/dll/shellext/netshell/lang/id-ID.rc @@ -76,6 +76,16 @@ BEGIN PUSHBUTTON "&Close", IDC_CLOSE, 120, 155, 60, 14 END +IDD_NETWORKINITPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Setup" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_NET_SETUP, IDC_STATIC, 21, 10, 20, 20 + LTEXT "Please wait while ReactOS installs networking components.", IDC_STATIC, 53, 7, 240, 20 + CONTROL "", IDC_INSTALL_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 58, 275, 11 +END + IDD_NETWORKSETTINGSPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS Setup" @@ -165,6 +175,8 @@ END STRINGTABLE BEGIN + IDS_NETWORKINITTITLE "Network Install" + IDS_NETWORKINITSUBTITLE "Installs reqired networking components." IDS_NETWORKSETTINGSTITLE "Network Settings" IDS_NETWORKSETTINGSSUBTITLE "Installs network software used to connect to other networks, computers, and the Internet." IDS_NETWORKCOMPONENTTITLE "Network Components" diff --git a/dll/shellext/netshell/lang/it-IT.rc b/dll/shellext/netshell/lang/it-IT.rc index abcbc962619..6ab9a353b31 100644 --- a/dll/shellext/netshell/lang/it-IT.rc +++ b/dll/shellext/netshell/lang/it-IT.rc @@ -76,6 +76,16 @@ BEGIN PUSHBUTTON "&Close", IDC_CLOSE, 120, 155, 60, 14 END +IDD_NETWORKINITPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Setup" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_NET_SETUP, IDC_STATIC, 21, 10, 20, 20 + LTEXT "Please wait while ReactOS installs networking components.", IDC_STATIC, 53, 7, 240, 20 + CONTROL "", IDC_INSTALL_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 58, 275, 11 +END + IDD_NETWORKSETTINGSPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS Setup" @@ -165,6 +175,8 @@ END STRINGTABLE BEGIN + IDS_NETWORKINITTITLE "Network Install" + IDS_NETWORKINITSUBTITLE "Installs reqired networking components." IDS_NETWORKSETTINGSTITLE "Network Settings" IDS_NETWORKSETTINGSSUBTITLE "Installs network software used to connect to other networks, computers, and the Internet." IDS_NETWORKCOMPONENTTITLE "Network Components" diff --git a/dll/shellext/netshell/lang/ja-JP.rc b/dll/shellext/netshell/lang/ja-JP.rc index 52fa74df0f9..5189dd2301f 100644 --- a/dll/shellext/netshell/lang/ja-JP.rc +++ b/dll/shellext/netshell/lang/ja-JP.rc @@ -76,6 +76,16 @@ BEGIN PUSHBUTTON "閉じる(&C)", IDC_CLOSE, 120, 155, 60, 14 END +IDD_NETWORKINITPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Setup" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_NET_SETUP, IDC_STATIC, 21, 10, 20, 20 + LTEXT "Please wait while ReactOS installs networking components.", IDC_STATIC, 53, 7, 240, 20 + CONTROL "", IDC_INSTALL_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 58, 275, 11 +END + IDD_NETWORKSETTINGSPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS セットアップ" @@ -164,6 +174,8 @@ END STRINGTABLE BEGIN + IDS_NETWORKINITTITLE "Network Install" + IDS_NETWORKINITSUBTITLE "Installs reqired networking components." IDS_NETWORKSETTINGSTITLE "ネットワークの設定" IDS_NETWORKSETTINGSSUBTITLE "別のネットワーク、別のコンピュータ、そしてインターネットに接続するために使うネットワークソフトウェアをインストールします。" IDS_NETWORKCOMPONENTTITLE "ネットワークコンポーネント" diff --git a/dll/shellext/netshell/lang/nl-NL.rc b/dll/shellext/netshell/lang/nl-NL.rc index 9d580bf59e8..d92b5a331aa 100644 --- a/dll/shellext/netshell/lang/nl-NL.rc +++ b/dll/shellext/netshell/lang/nl-NL.rc @@ -76,6 +76,16 @@ BEGIN PUSHBUTTON "&Close", IDC_CLOSE, 120, 155, 60, 14 END +IDD_NETWORKINITPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Setup" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_NET_SETUP, IDC_STATIC, 21, 10, 20, 20 + LTEXT "Please wait while ReactOS installs networking components.", IDC_STATIC, 53, 7, 240, 20 + CONTROL "", IDC_INSTALL_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 58, 275, 11 +END + IDD_NETWORKSETTINGSPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS Setup" @@ -165,6 +175,8 @@ END STRINGTABLE BEGIN + IDS_NETWORKINITTITLE "Network Install" + IDS_NETWORKINITSUBTITLE "Installs reqired networking components." IDS_NETWORKSETTINGSTITLE "Network Settings" IDS_NETWORKSETTINGSSUBTITLE "Installs network software used to connect to other networks, computers, and the Internet." IDS_NETWORKCOMPONENTTITLE "Network Components" diff --git a/dll/shellext/netshell/lang/no-NO.rc b/dll/shellext/netshell/lang/no-NO.rc index b687747e32e..1bab98808b9 100644 --- a/dll/shellext/netshell/lang/no-NO.rc +++ b/dll/shellext/netshell/lang/no-NO.rc @@ -76,6 +76,16 @@ BEGIN PUSHBUTTON "&Lukk", IDC_CLOSE, 120, 155, 60, 14 END +IDD_NETWORKINITPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Setup" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_NET_SETUP, IDC_STATIC, 21, 10, 20, 20 + LTEXT "Please wait while ReactOS installs networking components.", IDC_STATIC, 53, 7, 240, 20 + CONTROL "", IDC_INSTALL_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 58, 275, 11 +END + IDD_NETWORKSETTINGSPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS Setup" @@ -165,6 +175,8 @@ END STRINGTABLE BEGIN + IDS_NETWORKINITTITLE "Network Install" + IDS_NETWORKINITSUBTITLE "Installs reqired networking components." IDS_NETWORKSETTINGSTITLE "Network Settings" IDS_NETWORKSETTINGSSUBTITLE "Installs network software used to connect to other networks, computers, and the Internet." IDS_NETWORKCOMPONENTTITLE "Network Components" diff --git a/dll/shellext/netshell/lang/pl-PL.rc b/dll/shellext/netshell/lang/pl-PL.rc index 5b110e2c82b..b7019c8d0be 100644 --- a/dll/shellext/netshell/lang/pl-PL.rc +++ b/dll/shellext/netshell/lang/pl-PL.rc @@ -78,6 +78,16 @@ BEGIN PUSHBUTTON "&Zamknij", IDC_CLOSE, 120, 155, 60, 14 END +IDD_NETWORKINITPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Setup" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_NET_SETUP, IDC_STATIC, 21, 10, 20, 20 + LTEXT "Please wait while ReactOS installs networking components.", IDC_STATIC, 53, 7, 240, 20 + CONTROL "", IDC_INSTALL_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 58, 275, 11 +END + IDD_NETWORKSETTINGSPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Instalator systemu ReactOS" @@ -167,6 +177,8 @@ END STRINGTABLE BEGIN + IDS_NETWORKINITTITLE "Network Install" + IDS_NETWORKINITSUBTITLE "Installs reqired networking components." IDS_NETWORKSETTINGSTITLE "Ustawienia sieciowe" IDS_NETWORKSETTINGSSUBTITLE "Zainstalowanie oprogramowania sieciowego pozwala na nawiązywanie połączeń z innymi komputerami, sieciami i Internetem." IDS_NETWORKCOMPONENTTITLE "Składniki sieciowe" diff --git a/dll/shellext/netshell/lang/pt-PT.rc b/dll/shellext/netshell/lang/pt-PT.rc index 945fa72cb37..e28ba575557 100644 --- a/dll/shellext/netshell/lang/pt-PT.rc +++ b/dll/shellext/netshell/lang/pt-PT.rc @@ -83,6 +83,16 @@ BEGIN PUSHBUTTON "&Fechar", IDC_CLOSE, 120, 155, 60, 14 END +IDD_NETWORKINITPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Setup" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_NET_SETUP, IDC_STATIC, 21, 10, 20, 20 + LTEXT "Please wait while ReactOS installs networking components.", IDC_STATIC, 53, 7, 240, 20 + CONTROL "", IDC_INSTALL_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 58, 275, 11 +END + IDD_NETWORKSETTINGSPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Programa de configuração do ReactOS" @@ -172,6 +182,8 @@ END STRINGTABLE BEGIN + IDS_NETWORKINITTITLE "Network Install" + IDS_NETWORKINITSUBTITLE "Installs reqired networking components." IDS_NETWORKSETTINGSTITLE "Definições de rede" IDS_NETWORKSETTINGSSUBTITLE "Instala aplicações de rede necessárias para ligar a outras redes, equipamentos, e à internet." IDS_NETWORKCOMPONENTTITLE "Componentes de rede" diff --git a/dll/shellext/netshell/lang/ro-RO.rc b/dll/shellext/netshell/lang/ro-RO.rc index 180844c682a..008a6d1f66f 100644 --- a/dll/shellext/netshell/lang/ro-RO.rc +++ b/dll/shellext/netshell/lang/ro-RO.rc @@ -85,6 +85,16 @@ BEGIN PUSHBUTTON "Î&nchidere", IDC_CLOSE, 120, 155, 60, 14 END +IDD_NETWORKINITPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Setup" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_NET_SETUP, IDC_STATIC, 21, 10, 20, 20 + LTEXT "Please wait while ReactOS installs networking components.", IDC_STATIC, 53, 7, 240, 20 + CONTROL "", IDC_INSTALL_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 58, 275, 11 +END + IDD_NETWORKSETTINGSPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Expert de instalare ReactOS" @@ -174,6 +184,8 @@ END STRINGTABLE BEGIN + IDS_NETWORKINITTITLE "Network Install" + IDS_NETWORKINITSUBTITLE "Installs reqired networking components." IDS_NETWORKSETTINGSTITLE "Setări de rețea" IDS_NETWORKSETTINGSSUBTITLE "Instalarea software-ului de rețea permite conectarea la alte computere, rețele şi la Internet." IDS_NETWORKCOMPONENTTITLE "Componente de rețea" diff --git a/dll/shellext/netshell/lang/ru-RU.rc b/dll/shellext/netshell/lang/ru-RU.rc index f62468d3a65..2b20b11ddee 100644 --- a/dll/shellext/netshell/lang/ru-RU.rc +++ b/dll/shellext/netshell/lang/ru-RU.rc @@ -76,6 +76,16 @@ BEGIN PUSHBUTTON "&Закрыть", IDC_CLOSE, 120, 155, 60, 14 END +IDD_NETWORKINITPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Setup" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_NET_SETUP, IDC_STATIC, 21, 10, 20, 20 + LTEXT "Please wait while ReactOS installs networking components.", IDC_STATIC, 53, 7, 240, 20 + CONTROL "", IDC_INSTALL_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 58, 275, 11 +END + IDD_NETWORKSETTINGSPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Установка ReactOS" @@ -165,6 +175,8 @@ END STRINGTABLE BEGIN + IDS_NETWORKINITTITLE "Network Install" + IDS_NETWORKINITSUBTITLE "Installs reqired networking components." IDS_NETWORKSETTINGSTITLE "Настройки сети" IDS_NETWORKSETTINGSSUBTITLE "Устанавливает сетевое программное обеспечение, необходимое для соединени с другими сетями, компьютерами или Интернетом." IDS_NETWORKCOMPONENTTITLE "Сетевые компоненты" diff --git a/dll/shellext/netshell/lang/sk-SK.rc b/dll/shellext/netshell/lang/sk-SK.rc index 21f93eefd9c..a7f2671d3d0 100644 --- a/dll/shellext/netshell/lang/sk-SK.rc +++ b/dll/shellext/netshell/lang/sk-SK.rc @@ -78,6 +78,16 @@ BEGIN PUSHBUTTON "&Zavrieť", IDC_CLOSE, 120, 155, 60, 14 END +IDD_NETWORKINITPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Setup" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_NET_SETUP, IDC_STATIC, 21, 10, 20, 20 + LTEXT "Please wait while ReactOS installs networking components.", IDC_STATIC, 53, 7, 240, 20 + CONTROL "", IDC_INSTALL_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 58, 275, 11 +END + IDD_NETWORKSETTINGSPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS Setup" @@ -167,6 +177,8 @@ END STRINGTABLE BEGIN + IDS_NETWORKINITTITLE "Network Install" + IDS_NETWORKINITSUBTITLE "Installs reqired networking components." IDS_NETWORKSETTINGSTITLE "Network Settings" IDS_NETWORKSETTINGSSUBTITLE "Installs network software used to connect to other networks, computers, and the Internet." IDS_NETWORKCOMPONENTTITLE "Network Components" diff --git a/dll/shellext/netshell/lang/sq-AL.rc b/dll/shellext/netshell/lang/sq-AL.rc index 28f8071757a..43a5c07b798 100644 --- a/dll/shellext/netshell/lang/sq-AL.rc +++ b/dll/shellext/netshell/lang/sq-AL.rc @@ -78,6 +78,16 @@ BEGIN PUSHBUTTON "&Mbyll", IDC_CLOSE, 125, 165, 62, 14 END +IDD_NETWORKINITPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Setup" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_NET_SETUP, IDC_STATIC, 21, 10, 20, 20 + LTEXT "Please wait while ReactOS installs networking components.", IDC_STATIC, 53, 7, 240, 20 + CONTROL "", IDC_INSTALL_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 58, 275, 11 +END + IDD_NETWORKSETTINGSPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS Setup" @@ -167,6 +177,8 @@ END STRINGTABLE BEGIN + IDS_NETWORKINITTITLE "Network Install" + IDS_NETWORKINITSUBTITLE "Installs reqired networking components." IDS_NETWORKSETTINGSTITLE "Network Settings" IDS_NETWORKSETTINGSSUBTITLE "Installs network software used to connect to other networks, computers, and the Internet." IDS_NETWORKCOMPONENTTITLE "Network Components" diff --git a/dll/shellext/netshell/lang/sv-SE.rc b/dll/shellext/netshell/lang/sv-SE.rc index faecdb3a58d..62fd00d58c8 100644 --- a/dll/shellext/netshell/lang/sv-SE.rc +++ b/dll/shellext/netshell/lang/sv-SE.rc @@ -76,6 +76,16 @@ BEGIN PUSHBUTTON "&Close", IDC_CLOSE, 120, 155, 60, 14 END +IDD_NETWORKINITPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Setup" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_NET_SETUP, IDC_STATIC, 21, 10, 20, 20 + LTEXT "Please wait while ReactOS installs networking components.", IDC_STATIC, 53, 7, 240, 20 + CONTROL "", IDC_INSTALL_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 58, 275, 11 +END + IDD_NETWORKSETTINGSPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS Setup" @@ -165,6 +175,8 @@ END STRINGTABLE BEGIN + IDS_NETWORKINITTITLE "Network Install" + IDS_NETWORKINITSUBTITLE "Installs reqired networking components." IDS_NETWORKSETTINGSTITLE "Network Settings" IDS_NETWORKSETTINGSSUBTITLE "Installs network software used to connect to other networks, computers, and the Internet." IDS_NETWORKCOMPONENTTITLE "Network Components" diff --git a/dll/shellext/netshell/lang/tr-TR.rc b/dll/shellext/netshell/lang/tr-TR.rc index b4e553afb6e..94003f8cace 100644 --- a/dll/shellext/netshell/lang/tr-TR.rc +++ b/dll/shellext/netshell/lang/tr-TR.rc @@ -78,6 +78,16 @@ BEGIN PUSHBUTTON "&Kapat", IDC_CLOSE, 120, 155, 60, 14 END +IDD_NETWORKINITPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Setup" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_NET_SETUP, IDC_STATIC, 21, 10, 20, 20 + LTEXT "Please wait while ReactOS installs networking components.", IDC_STATIC, 53, 7, 240, 20 + CONTROL "", IDC_INSTALL_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 58, 275, 11 +END + IDD_NETWORKSETTINGSPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS Kur" @@ -167,6 +177,8 @@ END STRINGTABLE BEGIN + IDS_NETWORKINITTITLE "Network Install" + IDS_NETWORKINITSUBTITLE "Installs reqired networking components." IDS_NETWORKSETTINGSTITLE "Ağ Ayarları" IDS_NETWORKSETTINGSSUBTITLE "Başka ağlara, bilgisayarlara ve İnternet'e bağlanmak için kullanılacak ağ yazılımını kurar." IDS_NETWORKCOMPONENTTITLE "Ağ Bileşenleri" diff --git a/dll/shellext/netshell/lang/uk-UA.rc b/dll/shellext/netshell/lang/uk-UA.rc index 73851236c8f..c4a785b828e 100644 --- a/dll/shellext/netshell/lang/uk-UA.rc +++ b/dll/shellext/netshell/lang/uk-UA.rc @@ -82,6 +82,16 @@ BEGIN PUSHBUTTON "&Закрити", IDC_CLOSE, 120, 155, 60, 14 END +IDD_NETWORKINITPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Setup" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_NET_SETUP, IDC_STATIC, 21, 10, 20, 20 + LTEXT "Please wait while ReactOS installs networking components.", IDC_STATIC, 53, 7, 240, 20 + CONTROL "", IDC_INSTALL_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 58, 275, 11 +END + IDD_NETWORKSETTINGSPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Встановлення ReactOS" @@ -171,6 +181,8 @@ END STRINGTABLE BEGIN + IDS_NETWORKINITTITLE "Network Install" + IDS_NETWORKINITSUBTITLE "Installs reqired networking components." IDS_NETWORKSETTINGSTITLE "Налаштування мережі" IDS_NETWORKSETTINGSSUBTITLE "Встановлює мережеве програмне забезпечення, необхідне для з'єднання з іншими мережами, комп'ютерами або Інтернетом." IDS_NETWORKCOMPONENTTITLE "Мережеві компоненти" diff --git a/dll/shellext/netshell/lang/zh-CN.rc b/dll/shellext/netshell/lang/zh-CN.rc index 19ab0466641..6df6485fb26 100644 --- a/dll/shellext/netshell/lang/zh-CN.rc +++ b/dll/shellext/netshell/lang/zh-CN.rc @@ -84,6 +84,16 @@ BEGIN PUSHBUTTON "关闭(&C)", IDC_CLOSE, 120, 155, 60, 14 END +IDD_NETWORKINITPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Setup" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_NET_SETUP, IDC_STATIC, 21, 10, 20, 20 + LTEXT "Please wait while ReactOS installs networking components.", IDC_STATIC, 53, 7, 240, 20 + CONTROL "", IDC_INSTALL_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 58, 275, 11 +END + IDD_NETWORKSETTINGSPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS 安装程序" @@ -173,6 +183,8 @@ END STRINGTABLE BEGIN + IDS_NETWORKINITTITLE "Network Install" + IDS_NETWORKINITSUBTITLE "Installs reqired networking components." IDS_NETWORKSETTINGSTITLE "网络设置" IDS_NETWORKSETTINGSSUBTITLE "安装用于连接其他网络、计算机和 Internet 的网络软件。" IDS_NETWORKCOMPONENTTITLE "网络组件" diff --git a/dll/shellext/netshell/lang/zh-HK.rc b/dll/shellext/netshell/lang/zh-HK.rc index f759809083c..c57c241fba7 100644 --- a/dll/shellext/netshell/lang/zh-HK.rc +++ b/dll/shellext/netshell/lang/zh-HK.rc @@ -84,6 +84,16 @@ BEGIN PUSHBUTTON "關閉(&C)", IDC_CLOSE, 120, 155, 60, 14 END +IDD_NETWORKINITPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Setup" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_NET_SETUP, IDC_STATIC, 21, 10, 20, 20 + LTEXT "Please wait while ReactOS installs networking components.", IDC_STATIC, 53, 7, 240, 20 + CONTROL "", IDC_INSTALL_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 58, 275, 11 +END + IDD_NETWORKSETTINGSPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS 安裝程式" @@ -173,6 +183,8 @@ END STRINGTABLE BEGIN + IDS_NETWORKINITTITLE "Network Install" + IDS_NETWORKINITSUBTITLE "Installs reqired networking components." IDS_NETWORKSETTINGSTITLE "網絡設定" IDS_NETWORKSETTINGSSUBTITLE "安裝用於連接到其他網絡、電腦和互聯網的網絡軟件。" IDS_NETWORKCOMPONENTTITLE "網絡元件" diff --git a/dll/shellext/netshell/lang/zh-TW.rc b/dll/shellext/netshell/lang/zh-TW.rc index 225bf0c1691..fc09d3704ee 100644 --- a/dll/shellext/netshell/lang/zh-TW.rc +++ b/dll/shellext/netshell/lang/zh-TW.rc @@ -84,6 +84,16 @@ BEGIN PUSHBUTTON "關閉(&C)", IDC_CLOSE, 120, 155, 60, 14 END +IDD_NETWORKINITPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Setup" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_NET_SETUP, IDC_STATIC, 21, 10, 20, 20 + LTEXT "Please wait while ReactOS installs networking components.", IDC_STATIC, 53, 7, 240, 20 + CONTROL "", IDC_INSTALL_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 58, 275, 11 +END + IDD_NETWORKSETTINGSPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS 安裝程式" @@ -173,6 +183,8 @@ END STRINGTABLE BEGIN + IDS_NETWORKINITTITLE "Network Install" + IDS_NETWORKINITSUBTITLE "Installs reqired networking components." IDS_NETWORKSETTINGSTITLE "網路設定" IDS_NETWORKSETTINGSSUBTITLE "安裝用於連接到其他網路、電腦和網際網路的網路軟體。" IDS_NETWORKCOMPONENTTITLE "網路元件" diff --git a/dll/shellext/netshell/resource.h b/dll/shellext/netshell/resource.h index 1519c473099..3d13418807a 100644 --- a/dll/shellext/netshell/resource.h +++ b/dll/shellext/netshell/resource.h @@ -52,6 +52,9 @@ #define IDC_CLOSE 1300 /* Network setup wizard pages */ +#define IDD_NETWORKINITPAGE 3400 +#define IDC_INSTALL_PROGRESS 3401 + #define IDD_NETWORKSETTINGSPAGE 3500 #define IDC_NETWORK_TYPICAL 3501 #define IDC_NETWORK_CUSTOM 3502 @@ -115,12 +118,14 @@ #define IDS_PROPERTY 10309 #define IDS_VALUE 10310 -#define IDS_NETWORKSETTINGSTITLE 13050 -#define IDS_NETWORKSETTINGSSUBTITLE 13051 -#define IDS_NETWORKCOMPONENTTITLE 13052 -#define IDS_NETWORKCOMPONENTSUBTITLE 13053 -#define IDS_NETWORKDOMAINTITLE 13054 -#define IDS_NETWORKDOMAINSUBTITLE 13055 +#define IDS_NETWORKINITTITLE 13050 +#define IDS_NETWORKINITSUBTITLE 13051 +#define IDS_NETWORKSETTINGSTITLE 13052 +#define IDS_NETWORKSETTINGSSUBTITLE 13053 +#define IDS_NETWORKCOMPONENTTITLE 13054 +#define IDS_NETWORKCOMPONENTSUBTITLE 13055 +#define IDS_NETWORKDOMAINTITLE 13056 +#define IDS_NETWORKDOMAINSUBTITLE 13057 #define IDS_REACTOS_SETUP 13456 #define IDS_WZD_DOMAIN_NAME 13457 diff --git a/dll/shellext/netshell/setup.cpp b/dll/shellext/netshell/setup.cpp index 800cb0b4c1f..1fb2a6021a8 100644 --- a/dll/shellext/netshell/setup.cpp +++ b/dll/shellext/netshell/setup.cpp @@ -15,10 +15,12 @@ typedef struct _NETWORKSETUPDATA { DWORD dwMagic; - BOOL bTypicalNetworkSetup; - - PSETUPDATA pSetupData; + + /* settings page data */ + BOOL bInitialSetupRun; + BOOL bTypicalNetworkSetup; + HWND hwndPage; } NETWORKSETUPDATA, *PNETWORKSETUPDATA; @@ -38,18 +40,19 @@ SetBoldText( static HRESULT -InstallTypicalNetworkSettings(VOID) +InstallNetworkComponent( + LPWSTR pszComponentName, + const GUID *pClassGuid) { INetCfg *pNetCfg = NULL; INetCfgLock *pNetCfgLock = NULL; - INetCfgComponent *pTcpipComponent = NULL; - INetCfgComponent *pNicComponent = NULL; - IEnumNetCfgComponent *pEnumNicComponents = NULL; - WCHAR *pszNicName; + INetCfgClassSetup *pNetCfgClassSetup = NULL; + INetCfgComponent *pNetCfgComponent = NULL; BOOL fWriteLocked = FALSE, fInitialized = FALSE; + OBO_TOKEN OboToken; HRESULT hr; - TRACE("InstallTypicalNetworkSettings()\n"); + TRACE("InstallNetworkComponent()\n"); hr = CoInitialize(NULL); if (hr != S_OK) @@ -99,61 +102,47 @@ InstallTypicalNetworkSettings(VOID) fInitialized = TRUE; - /* Find the TCP/IP driver */ - hr = pNetCfg->FindComponent(L"ms_tcpip", - &pTcpipComponent); + hr = pNetCfg->QueryNetCfgClass(pClassGuid, + IID_INetCfgClassSetup, + (PVOID*)&pNetCfgClassSetup); + if (hr != S_OK) + { + ERR("QueryNetCfgClass failed\n"); + goto exit; + } + + ZeroMemory(&OboToken, sizeof(OboToken)); + OboToken.Type = OBO_USER; + + TRACE("pNetCfgClassSetup->Install %p\n", &pNetCfgClassSetup->Install); + hr = pNetCfgClassSetup->Install(pszComponentName, + &OboToken, + 0, //NSF_PRIMARYINSTALL, + 0, + NULL, + NULL, + &pNetCfgComponent); if (hr == S_OK) { - FIXME("Found the TCP/IP driver!\n"); + if (pNetCfgComponent != NULL) + pNetCfgComponent->Release(); } else { - ERR("Initialize failed\n"); + ERR("Install failed\n"); goto exit; } - hr = pNetCfg->EnumComponents(&GUID_DEVCLASS_NET, - &pEnumNicComponents); + hr = pNetCfg->Apply(); if (hr != S_OK) { - ERR("EnumComponents failed\n"); + ERR("Apply failed\n"); goto exit; } - for (;;) - { - hr = pEnumNicComponents->Next(1, - &pNicComponent, - NULL); - if (hr != S_OK) - { - TRACE("EnumNicComponents done!\n"); - break; - } - - hr = pNicComponent->GetDisplayName(&pszNicName); - if (hr == S_OK) - { - FIXME("NIC name: %S\n", pszNicName); - CoTaskMemFree(pszNicName); - } - - // FIXME Bind Tcpip to the NIC - - pNicComponent->Release(); - pNicComponent = NULL; - } - - TRACE("Done!\n"); exit: - if (pNicComponent != NULL) - pNicComponent->Release(); - - if (pEnumNicComponents != NULL) - pEnumNicComponents->Release(); - - if (pTcpipComponent != NULL) - pTcpipComponent->Release(); + if (pNetCfgClassSetup != NULL) + pNetCfgClassSetup->Release(); if (fInitialized) pNetCfg->Uninitialize(); @@ -169,11 +158,111 @@ exit: CoUninitialize(); - TRACE("InstallTypicalNetworkSettings() done!\n"); + TRACE("InstallNetworkComponent() done!\n"); return hr; } +static +DWORD +WINAPI +InstallThreadProc( + _In_ LPVOID lpParameter) +{ + PNETWORKSETUPDATA pNetworkSetupData = (PNETWORKSETUPDATA)lpParameter; + + TRACE("InstallThreadProc()\n"); + + SendDlgItemMessage(pNetworkSetupData->hwndPage, IDC_INSTALL_PROGRESS, PBM_SETRANGE, 0, MAKELPARAM(0, 1)); + SendDlgItemMessage(pNetworkSetupData->hwndPage, IDC_INSTALL_PROGRESS, PBM_SETPOS, 0, 0); + + InstallNetworkComponent((LPWSTR)L"MS_TCPIP", &GUID_DEVCLASS_NETTRANS); + SendDlgItemMessage(pNetworkSetupData->hwndPage, IDC_INSTALL_PROGRESS, PBM_SETPOS, 1, 0); + + Sleep(500); + + TRACE("Done\n"); + + /* Done */ + pNetworkSetupData->bInitialSetupRun = TRUE; + PostMessage(pNetworkSetupData->hwndPage, WM_USER, 0, 0); + + return 0; +} + +static +INT_PTR +CALLBACK +NetworkInitPageDlgProc( + HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + PNETWORKSETUPDATA pNetworkSetupData; + PSETUPDATA pSetupData; + LPNMHDR lpnm; + + /* Retrieve pointer to the global setup data */ + pNetworkSetupData = (PNETWORKSETUPDATA)GetWindowLongPtr(hwndDlg, GWLP_USERDATA); + if ((pNetworkSetupData != NULL) && + (pNetworkSetupData->dwMagic == NETWORK_SETUP_MAGIC)) + pSetupData = pNetworkSetupData->pSetupData; + + switch (uMsg) + { + case WM_INITDIALOG: + /* Save pointer to the global setup data */ + pNetworkSetupData = (PNETWORKSETUPDATA)((LPPROPSHEETPAGE)lParam)->lParam; + SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (DWORD_PTR)pNetworkSetupData); + pSetupData = pNetworkSetupData->pSetupData; + + if (pSetupData->UnattendSetup) + { + //... + } + break; + + case WM_DESTROY: + /* ATTENTION: Free pNetworkSetupData only in one of the page functions!!! */ + //... + break; + + case WM_NOTIFY: + lpnm = (LPNMHDR)lParam; + + switch (lpnm->code) + { + case PSN_SETACTIVE: + /* Disable the Back and Next buttons */ + PropSheet_SetWizButtons(GetParent(hwndDlg), 0); + TRACE("Starting install thread!\n"); + pNetworkSetupData->hwndPage = hwndDlg; + CreateThread(NULL, 0, InstallThreadProc, (LPVOID)pNetworkSetupData, 0, NULL); + TRACE("Install thread done!\n"); + break; + + case PSN_WIZNEXT: + break; + + case PSN_WIZBACK: + break; + } + break; + + case WM_USER: + TRACE("WM_USER!\n"); + /* Enable the Next button and press it */ + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_NEXT); + PropSheet_PressButton(GetParent(hwndDlg), PSBTN_NEXT); + break; + + default: + break; + } + + return FALSE; +} static INT_PTR @@ -226,13 +315,8 @@ NetworkSettingsPageDlgProc( switch (lpnm->code) { case PSN_SETACTIVE: - /* Enable the Back and Next buttons */ - PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT); - if (pSetupData->UnattendSetup) - { - SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, IDD_NETWORKCOMPONENTPAGE); - return TRUE; - } + /* Enable the Next button only */ + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_NEXT); break; case PSN_WIZNEXT: @@ -243,8 +327,6 @@ NetworkSettingsPageDlgProc( { pNetworkSetupData->bTypicalNetworkSetup = TRUE; - InstallTypicalNetworkSettings(); - SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, IDD_NETWORKDOMAINPAGE); return TRUE; } @@ -459,7 +541,7 @@ NetSetupRequestWizardPages( { PNETWORKSETUPDATA pNetworkSetupData; PROPSHEETPAGE psp = {0}; - DWORD dwPageCount = 3; + DWORD dwPageCount = 4; INT nPage = 0; if (pPageCount == NULL) @@ -483,12 +565,18 @@ NetSetupRequestWizardPages( pNetworkSetupData->dwMagic = NETWORK_SETUP_MAGIC; pNetworkSetupData->pSetupData = pSetupData; - /* Create the Network Settings page */ psp.dwSize = sizeof(PROPSHEETPAGE); psp.hInstance = netshell_hInstance; psp.lParam = (LPARAM)pNetworkSetupData; + psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE; + psp.pszHeaderTitle = MAKEINTRESOURCE(IDS_NETWORKINITTITLE); + psp.pszHeaderSubTitle = MAKEINTRESOURCE(IDS_NETWORKINITSUBTITLE); + psp.pfnDlgProc = NetworkInitPageDlgProc; + psp.pszTemplate = MAKEINTRESOURCE(IDD_NETWORKINITPAGE); + pPages[nPage++] = CreatePropertySheetPage(&psp); + psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE; psp.pszHeaderTitle = MAKEINTRESOURCE(IDS_NETWORKSETTINGSTITLE); psp.pszHeaderSubTitle = MAKEINTRESOURCE(IDS_NETWORKSETTINGSSUBTITLE); diff --git a/dll/win32/syssetup/install.c b/dll/win32/syssetup/install.c index 4d964fab68c..74b7148a096 100644 --- a/dll/win32/syssetup/install.c +++ b/dll/win32/syssetup/install.c @@ -1514,7 +1514,6 @@ InstallReactOS(VOID) TOKEN_PRIVILEGES privs; HKEY hKey; HANDLE hHotkeyThread; - BOOL ret; InitializeSetupActionLog(FALSE); LogItem(NULL, L"Installing ReactOS"); @@ -1583,20 +1582,6 @@ InstallReactOS(VOID) if (!CommonInstall()) return 0; - /* Install the TCP/IP protocol driver */ - ret = InstallNetworkComponent(L"MS_TCPIP"); - if (!ret && GetLastError() != ERROR_FILE_NOT_FOUND) - { - DPRINT("InstallNetworkComponent() failed with error 0x%lx\n", GetLastError()); - } - else - { - /* Start the TCP/IP protocol driver */ - SetupStartService(L"Tcpip", FALSE); - SetupStartService(L"Dhcp", FALSE); - SetupStartService(L"Dnscache", FALSE); - } - InstallWizard(); InstallSecurity();

1 0

[reactos] 01/01: [COMCTL32_APITEST] Rename a test
by Timo Kreuzer 01 Mar '25

01 Mar '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a86055a037b5a310124a7… commit a86055a037b5a310124a79c946baa012e209a62f Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Mar 1 15:26:20 2025 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Mar 1 19:01:21 2025 +0200 [COMCTL32_APITEST] Rename a test The test name was conflicting with an existing winetest, which breaks testman. --- modules/rostests/apitests/comctl32/imagelist.c | 2 +- modules/rostests/apitests/comctl32/testlist.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/rostests/apitests/comctl32/imagelist.c b/modules/rostests/apitests/comctl32/imagelist.c index 8ef72f0520d..967ce2755e8 100644 --- a/modules/rostests/apitests/comctl32/imagelist.c +++ b/modules/rostests/apitests/comctl32/imagelist.c @@ -144,7 +144,7 @@ static void Test_Flags(void) } } -START_TEST(imagelist) +START_TEST(ImageListApi) { InitCommonControls(); Test_SystemIL(); diff --git a/modules/rostests/apitests/comctl32/testlist.c b/modules/rostests/apitests/comctl32/testlist.c index eeb9146bf79..f914fc51593 100644 --- a/modules/rostests/apitests/comctl32/testlist.c +++ b/modules/rostests/apitests/comctl32/testlist.c @@ -2,14 +2,14 @@ #include <apitest.h> extern void func_button(void); -extern void func_imagelist(void); +extern void func_ImageListApi(void); extern void func_propsheet(void); extern void func_toolbar(void); const struct test winetest_testlist[] = { { "buttonv6", func_button }, - { "imagelist", func_imagelist }, + { "ImageListApi", func_ImageListApi }, { "propsheetv6", func_propsheet }, { "toolbarv6", func_toolbar }, { 0, 0 }

1 0

[reactos] 01/01: [NETCFGX] Simple implementation of INetCfgClassSetup.Install()
by Eric Kohl 01 Mar '25

01 Mar '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7f248437e88d0d5cd011b… commit 7f248437e88d0d5cd011b7c68e61e15edcecb05d Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Mar 1 15:43:34 2025 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Mar 1 15:43:34 2025 +0100 [NETCFGX] Simple implementation of INetCfgClassSetup.Install() Import device installer code from syssetup.dll. This is the first step to move the network component installer code from syssetup.dll to netcfgx.dll and netshell.dll. --- dll/win32/netcfgx/CMakeLists.txt | 1 + dll/win32/netcfgx/netcfgclass_iface.c | 2 + dll/win32/netcfgx/netinstall.c | 627 ++++++++++++++++++++++++++++++++++ dll/win32/netcfgx/precomp.h | 4 + 4 files changed, 634 insertions(+) diff --git a/dll/win32/netcfgx/CMakeLists.txt b/dll/win32/netcfgx/CMakeLists.txt index 3e4dfb3f8b8..5f499a2e0fd 100644 --- a/dll/win32/netcfgx/CMakeLists.txt +++ b/dll/win32/netcfgx/CMakeLists.txt @@ -8,6 +8,7 @@ list(APPEND SOURCE netcfgx.c classfactory.c installer.c + netinstall.c netcfg_iface.c netcfgbindinginterface_iface.c netcfgbindingpath_iface.c diff --git a/dll/win32/netcfgx/netcfgclass_iface.c b/dll/win32/netcfgx/netcfgclass_iface.c index 10eda26cad6..667f36df07c 100644 --- a/dll/win32/netcfgx/netcfgclass_iface.c +++ b/dll/win32/netcfgx/netcfgclass_iface.c @@ -77,6 +77,8 @@ INetCfgClassSetup_fnInstall( if (ppComponent) *ppComponent = NULL; + InstallNetworkComponent(pszwComponentId); + return S_OK; } diff --git a/dll/win32/netcfgx/netinstall.c b/dll/win32/netcfgx/netinstall.c new file mode 100644 index 00000000000..1d167d81d03 --- /dev/null +++ b/dll/win32/netcfgx/netinstall.c @@ -0,0 +1,627 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * PURPOSE: Network configuration + * FILE: dll/win32/netcfgx/netinstall.c + * PROGRAMER: Eric Kohl + */ + +/* INCLUDES *****************************************************************/ + +#include "precomp.h" +#include <rpc.h> + + +typedef struct _COMPONENT_INFO +{ + PWSTR pszFullInfPath; + PWSTR pszInfPath; + PWSTR pszInfSection; + PWSTR pszComponentId; + PWSTR pszDescription; + PWSTR pszClassGuid; + DWORD dwCharacteristics; +} COMPONENT_INFO, *PCOMPONENT_INFO; + + +/* GLOBALS ******************************************************************/ + + +/* FUNCTIONS ****************************************************************/ + +static +BOOL +InstallInfSections( + _In_ HWND hWnd, + _In_ HKEY hKey, + _In_ LPCWSTR InfFile, + _In_ LPCWSTR InfSection) +{ + WCHAR Buffer[MAX_PATH]; + HINF hInf = INVALID_HANDLE_VALUE; + UINT BufferSize; + PVOID Context = NULL; + BOOL ret = FALSE; + + TRACE("InstallInfSections()\n"); + + if (InfSection == NULL) + return FALSE; + + /* Get Windows directory */ + BufferSize = ARRAYSIZE(Buffer) - 5 - wcslen(InfFile); + if (GetWindowsDirectoryW(Buffer, BufferSize) > BufferSize) + { + /* Function failed */ + SetLastError(ERROR_GEN_FAILURE); + goto cleanup; + } + + /* We have enough space to add some information in the buffer */ + if (Buffer[wcslen(Buffer) - 1] != '\\') + wcscat(Buffer, L"\\"); + wcscat(Buffer, L"Inf\\"); + wcscat(Buffer, InfFile); + + /* Install specified section */ + hInf = SetupOpenInfFileW(Buffer, NULL, INF_STYLE_WIN4, NULL); + if (hInf == INVALID_HANDLE_VALUE) + goto cleanup; + + Context = SetupInitDefaultQueueCallback(hWnd); + if (Context == NULL) + goto cleanup; + + ret = SetupInstallFromInfSectionW( + hWnd, hInf, + InfSection, SPINST_ALL, + hKey, NULL, SP_COPY_NEWER, + SetupDefaultQueueCallbackW, Context, + NULL, NULL); + if (ret == FALSE) + { + ERR("SetupInstallFromInfSectionW(%S) failed (Error %lx)\n", InfSection, GetLastError()); + goto cleanup; + } + + wcscpy(Buffer, InfSection); + wcscat(Buffer, L".Services"); + + ret = SetupInstallServicesFromInfSectionW(hInf, Buffer, 0); + if (ret == FALSE) + { + ERR("SetupInstallServicesFromInfSectionW(%S) failed (Error %lx)\n", Buffer, GetLastError()); + goto cleanup; + } + +cleanup: + if (Context) + SetupTermDefaultQueueCallback(Context); + + if (hInf != INVALID_HANDLE_VALUE) + SetupCloseInfFile(hInf); + + TRACE("InstallInfSections() done %u\n", ret); + + return ret; +} + + +static +BOOL +CreateInstanceKey( + _In_ PCOMPONENT_INFO pComponentInfo, + _Out_ PHKEY pInstanceKey) +{ + WCHAR szKeyBuffer[128]; + LPWSTR UuidString = NULL; + UUID Uuid; + RPC_STATUS RpcStatus; + HKEY hInstanceKey; + DWORD rc; + BOOL ret = FALSE; + + TRACE("CreateInstanceKey()\n"); + + *pInstanceKey = NULL; + + wcscpy(szKeyBuffer, L"SYSTEM\\CurrentControlSet\\Control\\Network\\"); + wcscat(szKeyBuffer, pComponentInfo->pszClassGuid); + wcscat(szKeyBuffer, L"\\{"); + + /* Create a new UUID */ + RpcStatus = UuidCreate(&Uuid); + if (RpcStatus != RPC_S_OK && RpcStatus != RPC_S_UUID_LOCAL_ONLY) + { + ERR("UuidCreate() failed with RPC status 0x%lx\n", RpcStatus); + goto done; + } + + RpcStatus = UuidToStringW(&Uuid, &UuidString); + if (RpcStatus != RPC_S_OK) + { + ERR("UuidToStringW() failed with RPC status 0x%lx\n", RpcStatus); + goto done; + } + + wcscat(szKeyBuffer, UuidString); + wcscat(szKeyBuffer, L"}"); + + RpcStringFreeW(&UuidString); + + TRACE("szKeyBuffer %S\n", szKeyBuffer); + + rc = RegCreateKeyExW(HKEY_LOCAL_MACHINE, + szKeyBuffer, + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_CREATE_SUB_KEY | KEY_SET_VALUE, + NULL, + &hInstanceKey, + NULL); + if (rc != ERROR_SUCCESS) + { + ERR("RegCreateKeyExW() failed with error 0x%lx\n", rc); + goto done; + } + + rc = RegSetValueExW(hInstanceKey, + L"Characteristics", + 0, + REG_DWORD, + (LPBYTE)&pComponentInfo->dwCharacteristics, + sizeof(DWORD)); + if (rc != ERROR_SUCCESS) + { + ERR("RegSetValueExW() failed with error 0x%lx\n", rc); + goto done; + } + + rc = RegSetValueExW(hInstanceKey, + L"ComponentId", + 0, + REG_SZ, + (LPBYTE)pComponentInfo->pszComponentId, + (wcslen(pComponentInfo->pszComponentId) + 1) * sizeof(WCHAR)); + if (rc != ERROR_SUCCESS) + { + ERR("RegSetValueExW() failed with error 0x%lx\n", rc); + goto done; + } + + rc = RegSetValueExW(hInstanceKey, + L"Description", + 0, + REG_SZ, + (LPBYTE)pComponentInfo->pszDescription, + (wcslen(pComponentInfo->pszDescription) + 1) * sizeof(WCHAR)); + if (rc != ERROR_SUCCESS) + { + ERR("RegSetValueExW() failed with error 0x%lx\n", rc); + goto done; + } + + rc = RegSetValueExW(hInstanceKey, + L"InfPath", + 0, + REG_SZ, + (LPBYTE)pComponentInfo->pszInfPath, + (wcslen(pComponentInfo->pszInfPath) + 1) * sizeof(WCHAR)); + if (rc != ERROR_SUCCESS) + { + ERR("RegSetValueExW() failed with error 0x%lx\n", rc); + goto done; + } + + rc = RegSetValueExW(hInstanceKey, + L"InfSection", + 0, + REG_SZ, + (LPBYTE)pComponentInfo->pszInfSection, + (wcslen(pComponentInfo->pszInfSection) + 1) * sizeof(WCHAR)); + if (rc != ERROR_SUCCESS) + { + ERR("RegSetValueExW() failed with error 0x%lx\n", rc); + goto done; + } + + *pInstanceKey = hInstanceKey; + ret = TRUE; + +done: + if (ret == FALSE) + RegCloseKey(hInstanceKey); + + TRACE("CreateInstanceKey() done %u\n", ret); + + return ret; +} + + +static +BOOL +CheckInfFile( + _In_ PWSTR pszFullInfName, + _In_ PCWSTR pszComponentId, + _In_ PCOMPONENT_INFO pComponentInfo) +{ + WCHAR szLineBuffer[MAX_PATH]; + HINF hInf = INVALID_HANDLE_VALUE; + INFCONTEXT MfgContext, DevContext, MiscContext; + DWORD dwLength; + + hInf = SetupOpenInfFileW(pszFullInfName, + NULL, + INF_STYLE_WIN4, + NULL); + if (hInf == INVALID_HANDLE_VALUE) + { + ERR("\n"); + return FALSE; + } + + if (!SetupFindFirstLineW(hInf, + L"Manufacturer", + NULL, + &MfgContext)) + { + ERR("No Manufacurer section found!\n"); + goto done; + } + + for (;;) + { + if (!SetupGetStringFieldW(&MfgContext, + 1, + szLineBuffer, + MAX_PATH, + NULL)) + break; + + TRACE("Manufacturer: %S\n", szLineBuffer); + if (!SetupFindFirstLineW(hInf, + szLineBuffer, + NULL, + &DevContext)) + break; + + for (;;) + { + if (!SetupGetStringFieldW(&DevContext, + 2, + szLineBuffer, + MAX_PATH, + NULL)) + break; + + TRACE("Device: %S\n", szLineBuffer); + if (_wcsicmp(szLineBuffer, pszComponentId) == 0) + { + TRACE("Found it!\n"); + + /* Get the section name*/ + SetupGetStringFieldW(&DevContext, + 1, + NULL, + 0, + &dwLength); + + pComponentInfo->pszInfSection = HeapAlloc(GetProcessHeap(), + 0, + dwLength * sizeof(WCHAR)); + if (pComponentInfo->pszInfSection) + { + SetupGetStringFieldW(&DevContext, + 1, + pComponentInfo->pszInfSection, + dwLength, + &dwLength); + } + + /* Get the description*/ + SetupGetStringFieldW(&DevContext, + 0, + NULL, + 0, + &dwLength); + + pComponentInfo->pszDescription = HeapAlloc(GetProcessHeap(), + 0, + dwLength * sizeof(WCHAR)); + if (pComponentInfo->pszDescription) + { + SetupGetStringFieldW(&DevContext, + 0, + pComponentInfo->pszDescription, + dwLength, + &dwLength); + } + + /* Get the class GUID */ + if (SetupFindFirstLineW(hInf, + L"Version", + L"ClassGuid", + &MiscContext)) + { + SetupGetStringFieldW(&MiscContext, + 1, + NULL, + 0, + &dwLength); + + pComponentInfo->pszClassGuid = HeapAlloc(GetProcessHeap(), + 0, + dwLength * sizeof(WCHAR)); + if (pComponentInfo->pszInfSection) + { + SetupGetStringFieldW(&MiscContext, + 1, + pComponentInfo->pszClassGuid, + dwLength, + &dwLength); + } + } + + /* Get the Characteristics value */ + if (SetupFindFirstLineW(hInf, + pComponentInfo->pszInfSection, + L"Characteristics", + &MiscContext)) + { + SetupGetIntField(&MiscContext, + 1, + (PINT)&pComponentInfo->dwCharacteristics); + } + + SetupCloseInfFile(hInf); + return TRUE; + } + + if (!SetupFindNextLine(&DevContext, &DevContext)) + break; + } + + if (!SetupFindNextLine(&MfgContext, &MfgContext)) + break; + } + +done: + if (hInf != INVALID_HANDLE_VALUE) + SetupCloseInfFile(hInf); + + return FALSE; +} + + +static +BOOL +ScanForInfFile( + _In_ PCWSTR pszComponentId, + _In_ PCOMPONENT_INFO pComponentInfo) +{ + WCHAR szInfPath[MAX_PATH]; + WCHAR szFullInfName[MAX_PATH]; + WCHAR szPathBuffer[MAX_PATH]; + WIN32_FIND_DATAW fdw; + HANDLE hFindFile = INVALID_HANDLE_VALUE; + BOOL bFound = FALSE; + + GetWindowsDirectoryW(szInfPath, MAX_PATH); + wcscat(szInfPath, L"\\inf"); + + wcscpy(szPathBuffer, szInfPath); + wcscat(szPathBuffer, L"\\*.inf"); + + hFindFile = FindFirstFileW(szPathBuffer, &fdw); + if (hFindFile == INVALID_HANDLE_VALUE) + return FALSE; + + for (;;) + { + if (wcscmp(fdw.cFileName, L".") == 0 || + wcscmp(fdw.cFileName, L"..") == 0) + continue; + + TRACE("FileName: %S\n", fdw.cFileName); + + wcscpy(szFullInfName, szInfPath); + wcscat(szFullInfName, L"\\"); + wcscat(szFullInfName, fdw.cFileName); + + TRACE("Full Inf Name: %S\n", szFullInfName); + if (CheckInfFile(szFullInfName, + pszComponentId, + pComponentInfo)) + { + pComponentInfo->pszFullInfPath = HeapAlloc(GetProcessHeap(), + 0, + (wcslen(szFullInfName) + 1) * sizeof(WCHAR)); + if (pComponentInfo->pszFullInfPath) + wcscpy(pComponentInfo->pszFullInfPath, szFullInfName); + + pComponentInfo->pszInfPath = HeapAlloc(GetProcessHeap(), + 0, + (wcslen(fdw.cFileName) + 1) * sizeof(WCHAR)); + if (pComponentInfo->pszInfPath) + wcscpy(pComponentInfo->pszInfPath, fdw.cFileName); + + pComponentInfo->pszComponentId = HeapAlloc(GetProcessHeap(), + 0, + (wcslen(pszComponentId) + 1) * sizeof(WCHAR)); + if (pComponentInfo->pszComponentId) + wcscpy(pComponentInfo->pszComponentId, pszComponentId); + + bFound = TRUE; + break; + } + + if (!FindNextFileW(hFindFile, &fdw)) + break; + } + + if (hFindFile != INVALID_HANDLE_VALUE) + FindClose(hFindFile); + + return bFound; +} + +static +VOID +StartNetworkServices( + _In_ PCOMPONENT_INFO pComponentInfo) +{ + WCHAR szServiceName[64]; + HINF hInf = INVALID_HANDLE_VALUE; + INFCONTEXT Context; + PWSTR pServiceSection = NULL; + + SC_HANDLE hManager = NULL; + SC_HANDLE hService = NULL; + + hManager = OpenSCManagerW(NULL, + NULL, + SC_MANAGER_ALL_ACCESS); + if (hManager == NULL) + { + ERR("\n"); + goto done; + } + + hInf = SetupOpenInfFileW(pComponentInfo->pszFullInfPath, + NULL, + INF_STYLE_WIN4, + NULL); + if (hInf == INVALID_HANDLE_VALUE) + { + ERR("\n"); + goto done; + } + + pServiceSection = HeapAlloc(GetProcessHeap(), 0, + (wcslen(pComponentInfo->pszInfSection) + wcslen(L".Service") + 1) * sizeof(WCHAR)); + if (pServiceSection == NULL) + { + ERR("\n"); + goto done; + } + + wcscpy(pServiceSection, pComponentInfo->pszInfSection); + wcscat(pServiceSection, L".Service"); + + TRACE("ServiceSection: %S\n", pServiceSection); + + if (!SetupFindFirstLineW(hInf, + pServiceSection, + L"AddService", + &Context)) + { + ERR("\n"); + goto done; + } + + for (;;) + { + SetupGetStringFieldW(&Context, + 1, + szServiceName, + 64, + NULL); + + hService = OpenServiceW(hManager, + szServiceName, + SERVICE_START); + if (hService) + { + if (!StartService(hService, 0, NULL)) + { + ERR("StartService() %S failed %lu\n", szServiceName, GetLastError()); + } + + CloseServiceHandle(hService); + } + + if (!SetupFindNextLine(&Context, &Context)) + break; + } + +done: + if (pServiceSection) + HeapFree(GetProcessHeap(), 0, pServiceSection); + + if (hInf != INVALID_HANDLE_VALUE) + SetupCloseInfFile(hInf); + + if (hManager != NULL) + CloseServiceHandle(hManager); +} + + +BOOL +InstallNetworkComponent( + _In_ PCWSTR pszComponentId) +{ + COMPONENT_INFO ComponentInfo; + HKEY hInstanceKey = NULL; + BOOL bResult = FALSE; + + TRACE("InstallNetworkComponent(%S)\n", pszComponentId); + + ZeroMemory(&ComponentInfo, sizeof(COMPONENT_INFO)); + + if (!ScanForInfFile(pszComponentId, &ComponentInfo)) + goto done; + + TRACE("Characteristics: 0x%lx\n", ComponentInfo.dwCharacteristics); + TRACE("ComponentId: %S\n", ComponentInfo.pszComponentId); + TRACE("Description: %S\n", ComponentInfo.pszDescription); + TRACE("InfPath: %S\n", ComponentInfo.pszInfPath); + TRACE("InfSection: %S\n", ComponentInfo.pszInfSection); + TRACE("ClassGuid: %S\n", ComponentInfo.pszClassGuid); + + if (!CreateInstanceKey(&ComponentInfo, + &hInstanceKey)) + { + ERR("CreateInstanceKey() failed (Error %lx)\n", GetLastError()); + goto done; + } + + if (!InstallInfSections(NULL, + hInstanceKey, + ComponentInfo.pszInfPath, + ComponentInfo.pszInfSection)) + { + ERR("InstallInfSections() failed (Error %lx)\n", GetLastError()); + goto done; + } + + bResult = TRUE; + + StartNetworkServices(&ComponentInfo); + +done: + if (hInstanceKey != NULL) + RegCloseKey(hInstanceKey); + + if (ComponentInfo.pszFullInfPath) + HeapFree(GetProcessHeap(), 0, ComponentInfo.pszFullInfPath); + + if (ComponentInfo.pszInfPath) + HeapFree(GetProcessHeap(), 0, ComponentInfo.pszInfPath); + + if (ComponentInfo.pszInfSection) + HeapFree(GetProcessHeap(), 0, ComponentInfo.pszInfSection); + + if (ComponentInfo.pszComponentId) + HeapFree(GetProcessHeap(), 0, ComponentInfo.pszComponentId); + + if (ComponentInfo.pszDescription) + HeapFree(GetProcessHeap(), 0, ComponentInfo.pszDescription); + + if (ComponentInfo.pszClassGuid) + HeapFree(GetProcessHeap(), 0, ComponentInfo.pszClassGuid); + + return bResult; +} + +/* EOF */ diff --git a/dll/win32/netcfgx/precomp.h b/dll/win32/netcfgx/precomp.h index e8551f7c43f..4823576c483 100644 --- a/dll/win32/netcfgx/precomp.h +++ b/dll/win32/netcfgx/precomp.h @@ -14,6 +14,7 @@ #include <windef.h> #include <winbase.h> #include <winreg.h> +#include <winsvc.h> #include <windowsx.h> #include <objbase.h> #include <netcfgx.h> @@ -76,6 +77,9 @@ HRESULT WINAPI IEnumNetCfgBindingPath_Constructor(IUnknown *pUnkOuter, REFIID ri /* netcfgclass_iface.c */ HRESULT WINAPI INetCfgClass_Constructor(IUnknown *pUnkOuter, REFIID riid, LPVOID *ppv, const GUID *pguidClass, INetCfg *pNetCfg); +/* netinstall.c */ +BOOL InstallNetworkComponent(_In_ PCWSTR pszComponentId); + /* tcpipconf_notify.c */ HRESULT WINAPI TcpipConfigNotify_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv);

1 0

[reactos] 01/01: [BROWSEUI][SHELL32] Fix desktop and computer find files locations (#7721)
by Whindmar Saksit 28 Feb '25

28 Feb '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9a55c931f89915cbd69f9… commit 9a55c931f89915cbd69f9401550a3398cf2e5d4f Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Fri Feb 28 18:52:48 2025 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Feb 28 18:52:48 2025 +0100 [BROWSEUI][SHELL32] Fix desktop and computer find files locations (#7721) - Searching the Desktop now searches the two desktop folders. - Searching My Computer now searches all local disks. - Adds a "Browse..." entry to the combobox list. --- dll/win32/browseui/shellfind/CFindFolder.cpp | 28 ++- dll/win32/browseui/shellfind/CSearchBar.cpp | 273 ++++++++++++++++++++++++--- dll/win32/browseui/shellfind/CSearchBar.h | 5 +- dll/win32/browseui/shellfind/shellfind.h | 48 ++++- dll/win32/shell32/lang/bg-BG.rc | 2 + dll/win32/shell32/lang/ca-ES.rc | 2 + dll/win32/shell32/lang/cs-CZ.rc | 2 + dll/win32/shell32/lang/da-DK.rc | 2 + dll/win32/shell32/lang/de-DE.rc | 2 + dll/win32/shell32/lang/el-GR.rc | 2 + dll/win32/shell32/lang/en-GB.rc | 2 + dll/win32/shell32/lang/en-US.rc | 2 + dll/win32/shell32/lang/es-ES.rc | 2 + dll/win32/shell32/lang/et-EE.rc | 2 + dll/win32/shell32/lang/eu-ES.rc | 2 + dll/win32/shell32/lang/fi-FI.rc | 2 + dll/win32/shell32/lang/fr-FR.rc | 2 + dll/win32/shell32/lang/he-IL.rc | 3 + dll/win32/shell32/lang/hi-IN.rc | 2 + dll/win32/shell32/lang/hu-HU.rc | 2 + dll/win32/shell32/lang/id-ID.rc | 2 + dll/win32/shell32/lang/it-IT.rc | 2 + dll/win32/shell32/lang/ja-JP.rc | 2 + dll/win32/shell32/lang/ko-KR.rc | 2 + dll/win32/shell32/lang/nl-NL.rc | 2 + dll/win32/shell32/lang/no-NO.rc | 2 + dll/win32/shell32/lang/pl-PL.rc | 2 + dll/win32/shell32/lang/pt-BR.rc | 2 + dll/win32/shell32/lang/pt-PT.rc | 2 + dll/win32/shell32/lang/ro-RO.rc | 2 + dll/win32/shell32/lang/ru-RU.rc | 2 + dll/win32/shell32/lang/sk-SK.rc | 2 + dll/win32/shell32/lang/sl-SI.rc | 2 + dll/win32/shell32/lang/sq-AL.rc | 2 + dll/win32/shell32/lang/sv-SE.rc | 2 + dll/win32/shell32/lang/tr-TR.rc | 2 + dll/win32/shell32/lang/uk-UA.rc | 2 + dll/win32/shell32/lang/zh-CN.rc | 2 + dll/win32/shell32/lang/zh-HK.rc | 2 + dll/win32/shell32/lang/zh-TW.rc | 2 + dll/win32/shell32/shresdef.h | 4 + 41 files changed, 398 insertions(+), 33 deletions(-) diff --git a/dll/win32/browseui/shellfind/CFindFolder.cpp b/dll/win32/browseui/shellfind/CFindFolder.cpp index ea703158c30..4a08b8a0852 100644 --- a/dll/win32/browseui/shellfind/CFindFolder.cpp +++ b/dll/win32/browseui/shellfind/CFindFolder.cpp @@ -148,7 +148,7 @@ struct _SearchData { HWND hwnd; HANDLE hStopEvent; - CStringW szPath; + LOCATIONITEM *pPaths; CStringW szFileName; CStringA szQueryA; CStringW szQueryW; @@ -156,6 +156,11 @@ struct _SearchData CStringA szQueryU8; BOOL SearchHidden; CComPtr<CFindFolder> pFindFolder; + + ~_SearchData() + { + FreeList(pPaths); + } }; template<typename TChar, typename TString, int (&StrNCmp)(const TChar *, const TChar *, size_t)> @@ -461,11 +466,17 @@ DWORD WINAPI CFindFolder::SearchThreadProc(LPVOID lpParameter) { _SearchData *data = static_cast<_SearchData*>(lpParameter); + SetThreadPriority(GetCurrentThread(), THREAD_PRIORITY_BELOW_NORMAL); + HRESULT hrCoInit = CoInitializeEx(NULL, COINIT_MULTITHREADED); data->pFindFolder->NotifyConnections(DISPID_SEARCHSTART); - UINT uTotalFound = RecursiveFind(data->szPath, data); + UINT uTotalFound = 0; + for (LOCATIONITEM *pLocation = data->pPaths; pLocation; pLocation = pLocation->pNext) + { + uTotalFound += RecursiveFind(pLocation->szPath, data); + } data->pFindFolder->NotifyConnections(DISPID_SEARCHCOMPLETE); @@ -521,7 +532,7 @@ LRESULT CFindFolder::StartSearch(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL & pSearchData->hwnd = m_hWnd; SearchStart *pSearchParams = (SearchStart *) lParam; - pSearchData->szPath = pSearchParams->szPath; + pSearchData->pPaths = pSearchParams->pPaths; pSearchData->szFileName = pSearchParams->szFileName; pSearchData->szQueryA = pSearchParams->szQuery; pSearchData->szQueryW = pSearchParams->szQuery; @@ -589,12 +600,15 @@ LRESULT CFindFolder::StartSearch(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL & SetEvent(m_hStopEvent); pSearchData->hStopEvent = m_hStopEvent = CreateEvent(NULL, TRUE, FALSE, NULL); - if (!SHCreateThread(SearchThreadProc, pSearchData, NULL, NULL)) + if (!SHCreateThread(SearchThreadProc, pSearchData, 0, NULL)) { - SHFree(pSearchData); - return 0; + if (pSearchData->hStopEvent) + { + CloseHandle(pSearchData->hStopEvent); + m_hStopEvent = NULL; + } + delete pSearchData; } - return 0; } diff --git a/dll/win32/browseui/shellfind/CSearchBar.cpp b/dll/win32/browseui/shellfind/CSearchBar.cpp index 2ff47bfaf24..543151394b3 100644 --- a/dll/win32/browseui/shellfind/CSearchBar.cpp +++ b/dll/win32/browseui/shellfind/CSearchBar.cpp @@ -47,8 +47,130 @@ static UINT GetShellViewItemCount(IShellView *pSV) return 0; } + +struct SPECIALFINDITEMID +{ + WORD cb; + BYTE Type, Id; + CLSID Cls; + WORD Terminator; +}; +enum { SPECIAL_BROWSE = 42 }; + +static const SPECIALFINDITEMID g_pidlBrowseDir = { FIELD_OFFSET(SPECIALFINDITEMID, Terminator), + 0, SPECIAL_BROWSE, CLSID_FindFolder, 0 }; + +static BYTE GetSpecial(PCIDLIST_ABSOLUTE pidl) +{ + if (pidl && pidl->mkid.cb == FIELD_OFFSET(SPECIALFINDITEMID, Terminator)) + { + SPECIALFINDITEMID *pSpecial = (SPECIALFINDITEMID*)pidl; + if (pSpecial->Type == g_pidlBrowseDir.Type && pSpecial->Cls == g_pidlBrowseDir.Cls && + ILIsEmpty(ILGetNext(pidl))) + { + return pSpecial->Id; + } + } + return 0; +} + +static HRESULT BindToObject(PCIDLIST_ABSOLUTE pidl, REFIID riid, void **ppv) +{ + PCUITEMID_CHILD pidlChild; + CComPtr<IShellFolder> psf; + HRESULT hr = SHBindToParent(pidl, IID_PPV_ARG(IShellFolder, &psf), &pidlChild); + return SUCCEEDED(hr) ? psf->BindToObject(pidlChild, NULL, riid, ppv) : hr; +} + +static HRESULT GetClassOfItem(PCIDLIST_ABSOLUTE pidl, CLSID *pCLSID) +{ + CComPtr<IShellFolder> psf; + HRESULT hr = BindToObject(pidl, IID_PPV_ARG(IShellFolder, &psf)); + return SUCCEEDED(hr) ? IUnknown_GetClassID(psf, pCLSID) : hr; +} + +void FreeList(LOCATIONITEM *pItems) +{ + while (pItems) + { + LOCATIONITEM *pNext = pItems->pNext; + CoTaskMemFree(pItems); + pItems = pNext; + } +} + +static LOCATIONITEM* CreateLocationListItem(PCWSTR szPath) +{ + const SIZE_T cch = lstrlenW(szPath) + 1; + LOCATIONITEM *p = (LOCATIONITEM*)CoTaskMemAlloc(FIELD_OFFSET(LOCATIONITEM, szPath[cch])); + if (p) + { + p->pNext = NULL; + CopyMemory(p->szPath, szPath, cch * sizeof(*szPath)); + } + return p; +} + +template<class T> static LOCATIONITEM* BuildLocationList(T **rgszPaths, SIZE_T nCount) +{ + LOCATIONITEM *pStart = NULL, *pPrev = NULL; + for (SIZE_T i = 0; i < nCount; ++i) + { + LOCATIONITEM *pItem = CreateLocationListItem(rgszPaths[i]); + if (!pStart) + pStart = pItem; + else if (pPrev) + pPrev->pNext = pItem; + pPrev = pItem; + if (!pItem) + { + FreeList(pStart); + return NULL; + } + } + return pStart; +} + +static LOCATIONITEM* GetDesktopLocations() +{ + SIZE_T nCount = 0; + PCWSTR rgszLocations[2]; + WCHAR szUser[MAX_PATH], szCommon[MAX_PATH]; + + rgszLocations[nCount] = szUser; + nCount += !!SHGetSpecialFolderPathW(NULL, szUser, CSIDL_DESKTOPDIRECTORY, TRUE); + rgszLocations[nCount] = szCommon; + nCount += !!SHGetSpecialFolderPathW(NULL, szCommon, CSIDL_COMMON_DESKTOPDIRECTORY, TRUE); + return BuildLocationList(rgszLocations, nCount); +} + +static LOCATIONITEM* GetLocalDisksLocations() +{ + PCWSTR rgszLocations[26]; + WCHAR rgszDrives[_countof(rgszLocations)][4]; + UINT nCount = 0; + for (UINT i = 0, fDrives = GetLogicalDrives(); i < _countof(rgszLocations); ++i) + { + if (fDrives & (1 << i)) + { + rgszDrives[nCount][0] = 'A' + i; + rgszDrives[nCount][1] = ':'; + rgszDrives[nCount][2] = '\\'; + rgszDrives[nCount][3] = UNICODE_NULL; + UINT fType = GetDriveTypeW(rgszDrives[nCount]); + if (fType == DRIVE_FIXED || fType == DRIVE_RAMDISK) + { + rgszLocations[nCount] = rgszDrives[nCount]; + nCount++; + } + } + } + return BuildLocationList(rgszLocations, nCount); +} + CSearchBar::CSearchBar() : m_pSite(NULL), + m_RealItemIndex(0), m_bVisible(FALSE) { } @@ -194,11 +316,15 @@ LRESULT CSearchBar::OnSearchButtonClicked(WORD wNotifyCode, WORD wID, HWND hWndC pSearchStart->SearchHidden = IsDlgButtonChecked(IDC_SEARCH_HIDDEN); - if (!GetAddressEditBoxPath(pSearchStart->szPath)) + WCHAR buf[MAX_PATH]; + pSearchStart->pPaths = GetAddressEditBoxLocations(buf); + if (!pSearchStart->pPaths) { - ShellMessageBoxW(_AtlBaseModule.GetResourceInstance(), m_hWnd, MAKEINTRESOURCEW(IDS_SEARCHINVALID), MAKEINTRESOURCEW(IDS_SEARCHLABEL), MB_OK | MB_ICONERROR, pSearchStart->szPath); + ShellMessageBoxW(_AtlBaseModule.GetResourceInstance(), m_hWnd, MAKEINTRESOURCEW(IDS_SEARCHINVALID), + MAKEINTRESOURCEW(IDS_SEARCHLABEL), MB_OK | MB_ICONERROR, buf); return 0; } + ScopedFreeLocationItems FreeLocationsHelper(pSearchStart->pPaths); // See if we have an szFileName by testing for its entry lenth > 0 and our searched FileName does not contain // an asterisk or a question mark. If so, then prepend and append an asterisk to the searched FileName. @@ -255,6 +381,7 @@ LRESULT CSearchBar::OnSearchButtonClicked(WORD wNotifyCode, WORD wID, HWND hWndC return 0; } + FreeLocationsHelper.Detach(); ::PostMessageW(hwnd, WM_SEARCH_START, 0, (LPARAM) pSearchStart.Detach()); SetSearchInProgress(TRUE); @@ -272,31 +399,89 @@ LRESULT CSearchBar::OnStopButtonClicked(WORD wNotifyCode, WORD wID, HWND hWndCtl return 0; } -BOOL CSearchBar::GetAddressEditBoxPath(WCHAR *szPath) +LRESULT CSearchBar::OnLocationEditChange(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled) { + HWND hComboboxEx = hWndCtl; + INT_PTR idx = SendMessageW(hComboboxEx, CB_GETCURSEL, 0, 0); + if (idx < 0) + return 0; + COMBOBOXEXITEMW item; + item.mask = CBEIF_LPARAM; + item.iItem = idx; + item.cchTextMax = 0; + if (!SendMessageW(hComboboxEx, CBEM_GETITEMW, 0, (LPARAM)&item) || + GetSpecial((LPITEMIDLIST)item.lParam) != SPECIAL_BROWSE) + { + m_RealItemIndex = idx; + return 0; + } + + idx = max(m_RealItemIndex, 0); + SendMessageW(hComboboxEx, CB_SETCURSEL, idx, 0); // Reset to previous item + + BROWSEINFOW bi = { hComboboxEx }; + bi.ulFlags = BIF_RETURNONLYFSDIRS | BIF_NEWDIALOGSTYLE; + if (PIDLIST_ABSOLUTE pidl = SHBrowseForFolderW(&bi)) + { + idx = FindItemInComboEx(hComboboxEx, pidl, ILIsEqual, TRUE); + if (idx < 0) + { + SHFILEINFO shfi; + if (SHGetFileInfoW((WCHAR*)pidl, 0, &shfi, sizeof(shfi), SHGFI_PIDL | SHGFI_DISPLAYNAME | SHGFI_SYSICONINDEX)) + { + item.mask = CBEIF_LPARAM | CBEIF_TEXT | CBEIF_SELECTEDIMAGE | CBEIF_IMAGE; + item.iItem = -1; + item.iImage = item.iSelectedImage = shfi.iIcon; + item.pszText = shfi.szDisplayName; + item.lParam = (LPARAM)pidl; // IAddressEditBox takes ownership + idx = SendMessageW(hComboboxEx, CBEM_INSERTITEMW, 0, (LPARAM)&item); + } + } + if (idx >= 0) + SendMessageW(hComboboxEx, CB_SETCURSEL, idx, 0); // Select the browsed item + else + SHFree(pidl); + } + return 0; +} + +LOCATIONITEM* CSearchBar::GetAddressEditBoxLocations(WCHAR *szPath) +{ + WCHAR szItemText[MAX_PATH], *pszPath = szPath; HWND hComboboxEx = GetDlgItem(IDC_SEARCH_COMBOBOX); ::GetWindowTextW(hComboboxEx, szPath, MAX_PATH); INT iSelectedIndex = SendMessageW(hComboboxEx, CB_GETCURSEL, 0, 0); if (iSelectedIndex != CB_ERR) { - WCHAR szItemText[MAX_PATH]; - COMBOBOXEXITEMW item = {0}; + COMBOBOXEXITEMW item; item.mask = CBEIF_LPARAM | CBEIF_TEXT; item.iItem = iSelectedIndex; item.pszText = szItemText; item.cchTextMax = _countof(szItemText); SendMessageW(hComboboxEx, CBEM_GETITEMW, 0, (LPARAM)&item); - - if (!wcscmp(szItemText, szPath) && SHGetPathFromIDListW((LPCITEMIDLIST)item.lParam, szItemText)) + if (!wcscmp(szItemText, szPath)) { - StringCbCopyW(szPath, MAX_PATH * sizeof(WCHAR), szItemText); - return TRUE; + LPCITEMIDLIST pidl = (LPCITEMIDLIST)item.lParam; + CLSID clsid; + HRESULT hr = GetClassOfItem(pidl, &clsid); + if (SUCCEEDED(hr) && clsid == CLSID_MyComputer) + return GetLocalDisksLocations(); + // TODO: Shell enumerate the network neighborhood if it is chosen + if (!pidl || !pidl->mkid.cb) + return GetDesktopLocations(); + if (GetSpecial(pidl) || !SHGetPathFromIDListW(pidl, szItemText)) + return NULL; + pszPath = szItemText; } } - DWORD dwAttributes = GetFileAttributesW(szPath); - return dwAttributes != INVALID_FILE_ATTRIBUTES - && (dwAttributes & FILE_ATTRIBUTE_DIRECTORY); + DWORD dwAttributes = GetFileAttributesW(pszPath); + if (dwAttributes != INVALID_FILE_ATTRIBUTES && (dwAttributes & FILE_ATTRIBUTE_DIRECTORY) && + PathIsAbsolute(pszPath)) + { + return BuildLocationList(&pszPath, 1); + } + return NULL; } LRESULT CSearchBar::OnSize(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) @@ -607,30 +792,70 @@ HRESULT STDMETHODCALLTYPE CSearchBar::Invoke(DISPID dispIdMember, REFIID riid, L if (FAILED_UNEXPECTEDLY(hResult)) return hResult; HWND hComboboxEx = GetDlgItem(IDC_SEARCH_COMBOBOX); - int index = SendMessageW(hComboboxEx, CB_GETCOUNT, 0, 0); - if (index <= 0) + INT_PTR count = SendMessageW(hComboboxEx, CB_GETCOUNT, 0, 0); + if (count <= 0) return S_OK; COMBOBOXEXITEMW item = {0}; item.mask = CBEIF_LPARAM; - item.iItem = index - 1; + item.iItem = count - 1; SendMessageW(hComboboxEx, CBEM_GETITEMW, 0, (LPARAM)&item); if (!item.lParam) return S_OK; - CComPtr<IShellFolder> pDesktopFolder; - hResult = SHGetDesktopFolder(&pDesktopFolder); - if (FAILED_UNEXPECTEDLY(hResult)) - return hResult; - CComPtr<IShellFolder> pShellFolder; - hResult = pDesktopFolder->BindToObject((LPCITEMIDLIST)item.lParam, NULL, IID_PPV_ARG(IShellFolder, &pShellFolder)); - if (FAILED(hResult)) - return S_OK; CLSID clsid; - hResult = IUnknown_GetClassID(pShellFolder, &clsid); + hResult = GetClassOfItem((LPCITEMIDLIST)item.lParam, &clsid); if (SUCCEEDED(hResult) && clsid == CLSID_FindFolder) { SendMessageW(hComboboxEx, CBEM_DELETEITEM, item.iItem, 0); SendMessageW(hComboboxEx, CB_SETCURSEL, 0, 0); + // Starting in My Computer is better than just searching the desktop folder + PIDLIST_ABSOLUTE pidl; + if (SUCCEEDED(SHGetSpecialFolderLocation(NULL, CSIDL_DRIVES, &pidl))) + { + INT_PTR idx = FindItemInComboEx(hComboboxEx, pidl, ILIsEqual, TRUE); + if (idx >= 0) + SendMessageW(hComboboxEx, CB_SETCURSEL, idx, 0); + SHFree(pidl); + } + } + + // Remove all non-filesystem items since we currently use FindFirstFile to search + BOOL fFoundBrowse = FALSE; + for (item.iItem = 0; SendMessageW(hComboboxEx, CBEM_GETITEMW, 0, (LPARAM)&item); item.iItem++) + { + LPCITEMIDLIST pidl = (LPCITEMIDLIST)item.lParam; + BYTE special = GetSpecial(pidl); + fFoundBrowse |= special == SPECIAL_BROWSE; + if (special) + continue; + const UINT fQuery = SFGAO_FILESYSTEM | SFGAO_FILESYSANCESTOR; + SHFILEINFO shfi; + shfi.dwAttributes = fQuery; + if (SHGetFileInfoW((WCHAR*)pidl, 0, &shfi, sizeof(shfi), SHGFI_PIDL | SHGFI_ATTRIBUTES | SHGFI_ATTR_SPECIFIED)) + { + if (!(shfi.dwAttributes & fQuery)) + { + if (SendMessageW(hComboboxEx, CBEM_DELETEITEM, item.iItem, 0) != CB_ERR) + item.iItem--; + } + } } + + // Add our custom Browse item + if (!fFoundBrowse) + { + WCHAR buf[200]; + item.mask = CBEIF_LPARAM | CBEIF_TEXT | CBEIF_INDENT; + item.iItem = -1; + item.iIndent = -2; // Remove space reserved for the non-existing item icon + item.lParam = (LPARAM)ILClone((LPITEMIDLIST)&g_pidlBrowseDir); + item.pszText = const_cast<PWSTR>(L"..."); + #define IDS_SEARCH_BROWSEITEM 10244 /* shell32 shresdef.h */ + if (LoadStringW(GetModuleHandleW(L"SHELL32"), IDS_SEARCH_BROWSEITEM, buf, _countof(buf))) + item.pszText = buf; + if (item.lParam) + SendMessageW(hComboboxEx, CBEM_INSERTITEMW, 0, (LPARAM)&item); + } + return S_OK; } case DISPID_SEARCHCOMPLETE: diff --git a/dll/win32/browseui/shellfind/CSearchBar.h b/dll/win32/browseui/shellfind/CSearchBar.h index 0a4ead4d307..0e3710152f1 100644 --- a/dll/win32/browseui/shellfind/CSearchBar.h +++ b/dll/win32/browseui/shellfind/CSearchBar.h @@ -24,10 +24,11 @@ private: // *** BaseBarSite information *** CComPtr<IUnknown> m_pSite; CComPtr<IAddressEditBox> m_AddressEditBox; + INT_PTR m_RealItemIndex; BOOL m_bVisible; HRESULT GetSearchResultsFolder(IShellBrowser **ppShellBrowser, HWND *pHwnd, IShellFolder **ppShellFolder); - BOOL GetAddressEditBoxPath(WCHAR *szPath); + LOCATIONITEM* GetAddressEditBoxLocations(WCHAR *szPath); void SetSearchInProgress(BOOL bInProgress); HRESULT TrySubscribeToSearchEvents(); void TrySetFocus(UINT Source); @@ -37,6 +38,7 @@ private: LRESULT OnSetFocus(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); LRESULT OnSearchButtonClicked(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled); LRESULT OnStopButtonClicked(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled); + LRESULT OnLocationEditChange(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled); LRESULT OnSize(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); public: @@ -105,5 +107,6 @@ public: MESSAGE_HANDLER(WM_SIZE, OnSize) COMMAND_HANDLER(IDC_SEARCH_BUTTON, BN_CLICKED, OnSearchButtonClicked) COMMAND_HANDLER(IDC_SEARCH_STOP_BUTTON, BN_CLICKED, OnStopButtonClicked) + COMMAND_HANDLER(IDC_SEARCH_COMBOBOX, CBN_EDITCHANGE, OnLocationEditChange) END_MSG_MAP() }; diff --git a/dll/win32/browseui/shellfind/shellfind.h b/dll/win32/browseui/shellfind/shellfind.h index 93256cb7970..1f42f99d7c1 100644 --- a/dll/win32/browseui/shellfind/shellfind.h +++ b/dll/win32/browseui/shellfind/shellfind.h @@ -31,12 +31,58 @@ #define WM_SEARCH_ADD_RESULT WM_USER + 2 #define WM_SEARCH_UPDATE_STATUS WM_USER + 3 +typedef struct tagLOCATIONITEM +{ + struct tagLOCATIONITEM *pNext; + WCHAR szPath[ANYSIZE_ARRAY]; +} LOCATIONITEM; + +void FreeList(LOCATIONITEM *pLI); + +struct ScopedFreeLocationItems +{ + LOCATIONITEM *m_ptr; + ScopedFreeLocationItems(LOCATIONITEM *ptr) : m_ptr(ptr) {} + ~ScopedFreeLocationItems() { FreeList(m_ptr); } + void Detach() { m_ptr = NULL; } +}; + struct SearchStart { - WCHAR szPath[MAX_PATH]; + LOCATIONITEM *pPaths; WCHAR szFileName[MAX_PATH]; WCHAR szQuery[MAX_PATH]; BOOL SearchHidden; }; +template<class T, class F, class R> +static INT_PTR FindItemInComboEx(HWND hCombo, T &FindItem, F CompareFunc, R RetMatch) +{ + COMBOBOXEXITEMW item; + item.mask = CBEIF_LPARAM; + item.cchTextMax = 0; + for (item.iItem = 0; SendMessageW(hCombo, CBEM_GETITEMW, 0, (LPARAM)&item); item.iItem++) + { + if (CompareFunc((T&)item.lParam, FindItem) == RetMatch) + return item.iItem; + } + return -1; +} + +static inline bool PathIsOnDrive(PCWSTR Path) +{ + return PathGetDriveNumberW(Path) >= 0 && (Path[2] == '\\' || !Path[2]); +} + +static inline BOOL PathIsOnUnc(PCWSTR Path) +{ + return PathIsUNCW(Path); // FIXME: Verify the path starts with <\\Server\Share>[\] +} + +static inline bool PathIsAbsolute(PCWSTR Path) +{ + // Note: PathIsRelativeW is too forgiving + return PathIsOnDrive(Path) || PathIsOnUnc(Path); +} + #endif /* _SHELLFIND_PCH_ */ diff --git a/dll/win32/shell32/lang/bg-BG.rc b/dll/win32/shell32/lang/bg-BG.rc index a6f1ec66737..ffa7fa93d77 100644 --- a/dll/win32/shell32/lang/bg-BG.rc +++ b/dll/win32/shell32/lang/bg-BG.rc @@ -998,6 +998,8 @@ BEGIN IDS_OBJECTS "%d Objects" IDS_OBJECTS_SELECTED "%d Objects Selected" + IDS_SEARCH_BROWSEITEM "Обзор..." + IDS_TITLE_MYCOMP "Моят компютър" IDS_TITLE_MYNET "Моята мрежа" IDS_TITLE_BIN_1 "Кошче (пълно)" diff --git a/dll/win32/shell32/lang/ca-ES.rc b/dll/win32/shell32/lang/ca-ES.rc index 50088b84052..e8f729c7c9e 100644 --- a/dll/win32/shell32/lang/ca-ES.rc +++ b/dll/win32/shell32/lang/ca-ES.rc @@ -998,6 +998,8 @@ BEGIN IDS_OBJECTS "%d Objects" IDS_OBJECTS_SELECTED "%d Objects Selected" + IDS_SEARCH_BROWSEITEM "Browse..." + IDS_TITLE_MYCOMP "My Computer" IDS_TITLE_MYNET "My Network Places" IDS_TITLE_BIN_1 "Recycle Bin (full)" diff --git a/dll/win32/shell32/lang/cs-CZ.rc b/dll/win32/shell32/lang/cs-CZ.rc index 744d8c727a7..9a2a3ebec95 100644 --- a/dll/win32/shell32/lang/cs-CZ.rc +++ b/dll/win32/shell32/lang/cs-CZ.rc @@ -1006,6 +1006,8 @@ BEGIN IDS_OBJECTS "Položek: %d" IDS_OBJECTS_SELECTED "Položek vybráno: %d" + IDS_SEARCH_BROWSEITEM "Procházet..." + IDS_TITLE_MYCOMP "Tento počítač" IDS_TITLE_MYNET "Místa v síti" IDS_TITLE_BIN_1 "Koš (plný)" diff --git a/dll/win32/shell32/lang/da-DK.rc b/dll/win32/shell32/lang/da-DK.rc index 7cb598194ad..46bc8854b97 100644 --- a/dll/win32/shell32/lang/da-DK.rc +++ b/dll/win32/shell32/lang/da-DK.rc @@ -1005,6 +1005,8 @@ BEGIN IDS_OBJECTS "%d Objects" IDS_OBJECTS_SELECTED "%d Objects Selected" + IDS_SEARCH_BROWSEITEM "Gennemse..." + IDS_TITLE_MYCOMP "Min Computer" IDS_TITLE_MYNET "My Network Places" IDS_TITLE_BIN_1 "Recycle Bin (full)" diff --git a/dll/win32/shell32/lang/de-DE.rc b/dll/win32/shell32/lang/de-DE.rc index ecb87154a4b..1270e5c1702 100644 --- a/dll/win32/shell32/lang/de-DE.rc +++ b/dll/win32/shell32/lang/de-DE.rc @@ -999,6 +999,8 @@ BEGIN IDS_OBJECTS "%d Objekte" IDS_OBJECTS_SELECTED "%d Objekte ausgewählt" + IDS_SEARCH_BROWSEITEM "Durchsuchen..." + IDS_TITLE_MYCOMP "Arbeitsplatz" IDS_TITLE_MYNET "Netzwerkumgebung" IDS_TITLE_BIN_1 "Papierkorb (voll)" diff --git a/dll/win32/shell32/lang/el-GR.rc b/dll/win32/shell32/lang/el-GR.rc index e26cab3ff42..906192f80db 100644 --- a/dll/win32/shell32/lang/el-GR.rc +++ b/dll/win32/shell32/lang/el-GR.rc @@ -998,6 +998,8 @@ BEGIN IDS_OBJECTS "%d Objects" IDS_OBJECTS_SELECTED "%d Objects Selected" + IDS_SEARCH_BROWSEITEM "Αναζήτηση..." + IDS_TITLE_MYCOMP "Ο υπολογιστής μου" IDS_TITLE_MYNET "My Network Places" IDS_TITLE_BIN_1 "Κάδος ανακύκλωσης (γεμάτος)" diff --git a/dll/win32/shell32/lang/en-GB.rc b/dll/win32/shell32/lang/en-GB.rc index 5c7426cba73..acc08e4f3bd 100644 --- a/dll/win32/shell32/lang/en-GB.rc +++ b/dll/win32/shell32/lang/en-GB.rc @@ -998,6 +998,8 @@ BEGIN IDS_OBJECTS "%d Objects" IDS_OBJECTS_SELECTED "%d Objects Selected" + IDS_SEARCH_BROWSEITEM "Browse..." + IDS_TITLE_MYCOMP "My Computer" IDS_TITLE_MYNET "My Network Places" IDS_TITLE_BIN_1 "Recycle Bin (full)" diff --git a/dll/win32/shell32/lang/en-US.rc b/dll/win32/shell32/lang/en-US.rc index be1df9decac..46a403aa4d6 100644 --- a/dll/win32/shell32/lang/en-US.rc +++ b/dll/win32/shell32/lang/en-US.rc @@ -998,6 +998,8 @@ BEGIN IDS_OBJECTS "%d Objects" IDS_OBJECTS_SELECTED "%d Objects Selected" + IDS_SEARCH_BROWSEITEM "Browse..." + IDS_TITLE_MYCOMP "My Computer" IDS_TITLE_MYNET "My Network Places" IDS_TITLE_BIN_1 "Recycle Bin (full)" diff --git a/dll/win32/shell32/lang/es-ES.rc b/dll/win32/shell32/lang/es-ES.rc index 0d4e112eada..8d515c6cbc0 100644 --- a/dll/win32/shell32/lang/es-ES.rc +++ b/dll/win32/shell32/lang/es-ES.rc @@ -1007,6 +1007,8 @@ BEGIN IDS_OBJECTS "%d elementos" IDS_OBJECTS_SELECTED "%d elementos seleccionados" + IDS_SEARCH_BROWSEITEM "Examinar..." + IDS_TITLE_MYCOMP "Mi equipo" IDS_TITLE_MYNET "Mis sitios de red" IDS_TITLE_BIN_1 "Papelera (llena)" diff --git a/dll/win32/shell32/lang/et-EE.rc b/dll/win32/shell32/lang/et-EE.rc index 67324abb2da..35a11ea9b6e 100644 --- a/dll/win32/shell32/lang/et-EE.rc +++ b/dll/win32/shell32/lang/et-EE.rc @@ -1005,6 +1005,8 @@ BEGIN IDS_OBJECTS "%d objekti" IDS_OBJECTS_SELECTED "%d objekti valitud" + IDS_SEARCH_BROWSEITEM "Sirvi..." + IDS_TITLE_MYCOMP "Minu arvuti" IDS_TITLE_MYNET "Minu võrgukohad" IDS_TITLE_BIN_1 "Prügikast (täis)" diff --git a/dll/win32/shell32/lang/eu-ES.rc b/dll/win32/shell32/lang/eu-ES.rc index 0eb4c03261c..9ce6a760948 100644 --- a/dll/win32/shell32/lang/eu-ES.rc +++ b/dll/win32/shell32/lang/eu-ES.rc @@ -1003,6 +1003,8 @@ BEGIN IDS_OBJECTS "%d elementuak" IDS_OBJECTS_SELECTED "%d elementu hautatuak" + IDS_SEARCH_BROWSEITEM "Arakatu..." + IDS_TITLE_MYCOMP "Ordenagailua" IDS_TITLE_MYNET "Nire sarelekuak" IDS_TITLE_BIN_1 "Zakarrontzia (betea)" diff --git a/dll/win32/shell32/lang/fi-FI.rc b/dll/win32/shell32/lang/fi-FI.rc index 1d7a4be529f..0743841d7e3 100644 --- a/dll/win32/shell32/lang/fi-FI.rc +++ b/dll/win32/shell32/lang/fi-FI.rc @@ -998,6 +998,8 @@ BEGIN IDS_OBJECTS "%d Objects" IDS_OBJECTS_SELECTED "%d Objects Selected" + IDS_SEARCH_BROWSEITEM "Selaa..." + IDS_TITLE_MYCOMP "Oma Tietokone" IDS_TITLE_MYNET "My Network Places" IDS_TITLE_BIN_1 "Recycle Bin (full)" diff --git a/dll/win32/shell32/lang/fr-FR.rc b/dll/win32/shell32/lang/fr-FR.rc index c38a47692fb..fbd939d7941 100644 --- a/dll/win32/shell32/lang/fr-FR.rc +++ b/dll/win32/shell32/lang/fr-FR.rc @@ -998,6 +998,8 @@ BEGIN IDS_OBJECTS "%d objet(s)" IDS_OBJECTS_SELECTED "%d objet(s) sélectionné(s)" + IDS_SEARCH_BROWSEITEM "Parcourir..." + IDS_TITLE_MYCOMP "Poste de travail" IDS_TITLE_MYNET "Mon réseau" IDS_TITLE_BIN_1 "Corbeille (pleine)" diff --git a/dll/win32/shell32/lang/he-IL.rc b/dll/win32/shell32/lang/he-IL.rc index 5f3bd630847..4ae2969e694 100644 --- a/dll/win32/shell32/lang/he-IL.rc +++ b/dll/win32/shell32/lang/he-IL.rc @@ -1005,6 +1005,9 @@ BEGIN IDS_OBJECTS "%d פריטים" IDS_OBJECTS_SELECTED "%d פריטים נבחרו" + IDS_SEARCH_BROWSEITEM "עיון..." + + IDS_TITLE_MYCOMP "המחשב שלי" IDS_TITLE_MYNET "מיקומי הרשת שלי" IDS_TITLE_BIN_1 "Recycle Bin (full)" diff --git a/dll/win32/shell32/lang/hi-IN.rc b/dll/win32/shell32/lang/hi-IN.rc index 8a6ed3d42b3..fc38faac4f1 100644 --- a/dll/win32/shell32/lang/hi-IN.rc +++ b/dll/win32/shell32/lang/hi-IN.rc @@ -1000,6 +1000,8 @@ BEGIN IDS_OBJECTS "%d वस्तुओं" IDS_OBJECTS_SELECTED "%d वस्तुओं का चयन किया" + IDS_SEARCH_BROWSEITEM "ब्राउज़ करें..." + IDS_TITLE_MYCOMP "मेरा कंप्यूटर" IDS_TITLE_MYNET "मेरे नेटवर्क स्थान" IDS_TITLE_BIN_1 "Recycle Bin (full)" diff --git a/dll/win32/shell32/lang/hu-HU.rc b/dll/win32/shell32/lang/hu-HU.rc index dca369f41aa..28a7923bb29 100644 --- a/dll/win32/shell32/lang/hu-HU.rc +++ b/dll/win32/shell32/lang/hu-HU.rc @@ -997,6 +997,8 @@ BEGIN IDS_OBJECTS "%d elem" IDS_OBJECTS_SELECTED "%d kijelölt elem" + IDS_SEARCH_BROWSEITEM "Böngészés..." + IDS_TITLE_MYCOMP "Számítógép" IDS_TITLE_MYNET "Hálózati helyek" IDS_TITLE_BIN_1 "Lomtár (tele)" diff --git a/dll/win32/shell32/lang/id-ID.rc b/dll/win32/shell32/lang/id-ID.rc index 14851b34ba0..50250ed016b 100644 --- a/dll/win32/shell32/lang/id-ID.rc +++ b/dll/win32/shell32/lang/id-ID.rc @@ -995,6 +995,8 @@ BEGIN IDS_OBJECTS "%d Obyek" IDS_OBJECTS_SELECTED "%d Obyek terpilih" + IDS_SEARCH_BROWSEITEM "Jelajah..." + IDS_TITLE_MYCOMP "Komputer Saya" IDS_TITLE_MYNET "Tempat Jaringan Saya" IDS_TITLE_BIN_1 "Tampungan Daur Ulang (penuh)" diff --git a/dll/win32/shell32/lang/it-IT.rc b/dll/win32/shell32/lang/it-IT.rc index 2f06fb39638..889df335f8a 100644 --- a/dll/win32/shell32/lang/it-IT.rc +++ b/dll/win32/shell32/lang/it-IT.rc @@ -998,6 +998,8 @@ BEGIN IDS_OBJECTS "%d Oggetti" IDS_OBJECTS_SELECTED "%d Oggetti selezionati" + IDS_SEARCH_BROWSEITEM "Esplora..." + IDS_TITLE_MYCOMP "Risorse del Computer" IDS_TITLE_MYNET "Risorse di rete" IDS_TITLE_BIN_1 "Cestino (pieno)" diff --git a/dll/win32/shell32/lang/ja-JP.rc b/dll/win32/shell32/lang/ja-JP.rc index b4002272715..a186027c5fe 100644 --- a/dll/win32/shell32/lang/ja-JP.rc +++ b/dll/win32/shell32/lang/ja-JP.rc @@ -995,6 +995,8 @@ BEGIN IDS_OBJECTS "%d 個のオブジェクト" IDS_OBJECTS_SELECTED "%d 個のオブジェクトが選択済み" + IDS_SEARCH_BROWSEITEM "参照..." + IDS_TITLE_MYCOMP "マイコンピュータ" IDS_TITLE_MYNET "マイネットワーク" IDS_TITLE_BIN_1 "ごみ箱 (いっぱい)" diff --git a/dll/win32/shell32/lang/ko-KR.rc b/dll/win32/shell32/lang/ko-KR.rc index b702a01f108..d6a31a17bdb 100644 --- a/dll/win32/shell32/lang/ko-KR.rc +++ b/dll/win32/shell32/lang/ko-KR.rc @@ -1005,6 +1005,8 @@ BEGIN IDS_OBJECTS "%d Objects" IDS_OBJECTS_SELECTED "%d Objects Selected" + IDS_SEARCH_BROWSEITEM "찾아보기..." + IDS_TITLE_MYCOMP "내 컴퓨터" IDS_TITLE_MYNET "내 네트워크 환경" IDS_TITLE_BIN_1 "Recycle Bin (full)" diff --git a/dll/win32/shell32/lang/nl-NL.rc b/dll/win32/shell32/lang/nl-NL.rc index 4ffb90d81eb..82d22450c87 100644 --- a/dll/win32/shell32/lang/nl-NL.rc +++ b/dll/win32/shell32/lang/nl-NL.rc @@ -998,6 +998,8 @@ BEGIN IDS_OBJECTS "%d Objects" IDS_OBJECTS_SELECTED "%d Objects Selected" + IDS_SEARCH_BROWSEITEM "Bladeren..." + IDS_TITLE_MYCOMP "My Computer" IDS_TITLE_MYNET "My Network Places" IDS_TITLE_BIN_1 "Recycle Bin (full)" diff --git a/dll/win32/shell32/lang/no-NO.rc b/dll/win32/shell32/lang/no-NO.rc index c0f8bd18da8..0321417fb24 100644 --- a/dll/win32/shell32/lang/no-NO.rc +++ b/dll/win32/shell32/lang/no-NO.rc @@ -998,6 +998,8 @@ BEGIN IDS_OBJECTS "%d Objects" IDS_OBJECTS_SELECTED "%d Objects Selected" + IDS_SEARCH_BROWSEITEM "Bla gjennom..." + IDS_TITLE_MYCOMP "Min datamaskin" IDS_TITLE_MYNET "Mine nettverkssteder" IDS_TITLE_BIN_1 "Papirkurv (full)" diff --git a/dll/win32/shell32/lang/pl-PL.rc b/dll/win32/shell32/lang/pl-PL.rc index e495ffef72b..1614266d238 100644 --- a/dll/win32/shell32/lang/pl-PL.rc +++ b/dll/win32/shell32/lang/pl-PL.rc @@ -1007,6 +1007,8 @@ BEGIN IDS_OBJECTS "Elementów: %d" IDS_OBJECTS_SELECTED "Zaznaczonych elementów: %d" + IDS_SEARCH_BROWSEITEM "Przeglądaj..." + IDS_TITLE_MYCOMP "Mój komputer" IDS_TITLE_MYNET "Moje miejsca sieciowe" IDS_TITLE_BIN_1 "Kosz (pełny)" diff --git a/dll/win32/shell32/lang/pt-BR.rc b/dll/win32/shell32/lang/pt-BR.rc index 16d1422681e..0b5c46f359f 100644 --- a/dll/win32/shell32/lang/pt-BR.rc +++ b/dll/win32/shell32/lang/pt-BR.rc @@ -998,6 +998,8 @@ BEGIN IDS_OBJECTS "%d Objects" IDS_OBJECTS_SELECTED "%d Objects Selected" + IDS_SEARCH_BROWSEITEM "Procurar..." + IDS_TITLE_MYCOMP "Meu Computador" IDS_TITLE_MYNET "Meus Locais de Rede" IDS_TITLE_BIN_1 "Lixeira (cheia)" diff --git a/dll/win32/shell32/lang/pt-PT.rc b/dll/win32/shell32/lang/pt-PT.rc index 2236d5c1dae..d606c701112 100644 --- a/dll/win32/shell32/lang/pt-PT.rc +++ b/dll/win32/shell32/lang/pt-PT.rc @@ -1007,6 +1007,8 @@ BEGIN IDS_OBJECTS "%d Objectos" IDS_OBJECTS_SELECTED "%d Objectos seleccionados" + IDS_SEARCH_BROWSEITEM "Procurar..." + IDS_TITLE_MYCOMP "O Meu Computador" IDS_TITLE_MYNET "Os Meus Locais na Rede" IDS_TITLE_BIN_1 "Reciclagem (cheia)" diff --git a/dll/win32/shell32/lang/ro-RO.rc b/dll/win32/shell32/lang/ro-RO.rc index 35ba49334c8..c5109abb36d 100644 --- a/dll/win32/shell32/lang/ro-RO.rc +++ b/dll/win32/shell32/lang/ro-RO.rc @@ -1006,6 +1006,8 @@ BEGIN IDS_OBJECTS "%d Obiecte" IDS_OBJECTS_SELECTED "%d Obiecte selectate" + IDS_SEARCH_BROWSEITEM "Răsfoire..." + IDS_TITLE_MYCOMP "Computerul meu" IDS_TITLE_MYNET "Locaţii în reţea" IDS_TITLE_BIN_1 "Coş de reciclare (plin)" diff --git a/dll/win32/shell32/lang/ru-RU.rc b/dll/win32/shell32/lang/ru-RU.rc index 773dde053f5..f81a82b00da 100644 --- a/dll/win32/shell32/lang/ru-RU.rc +++ b/dll/win32/shell32/lang/ru-RU.rc @@ -1007,6 +1007,8 @@ BEGIN IDS_OBJECTS "Объектов: %d" IDS_OBJECTS_SELECTED "Выделено объектов: %d" + IDS_SEARCH_BROWSEITEM "Обзор..." + IDS_TITLE_MYCOMP "Мой компьютер" IDS_TITLE_MYNET "Сетевое окружение" IDS_TITLE_BIN_1 "Корзина (полная)" diff --git a/dll/win32/shell32/lang/sk-SK.rc b/dll/win32/shell32/lang/sk-SK.rc index 59bb8bf6097..e17019cd76d 100644 --- a/dll/win32/shell32/lang/sk-SK.rc +++ b/dll/win32/shell32/lang/sk-SK.rc @@ -998,6 +998,8 @@ BEGIN IDS_OBJECTS "%d Objects" IDS_OBJECTS_SELECTED "%d Objects Selected" + IDS_SEARCH_BROWSEITEM "Prehľadávať..." + IDS_TITLE_MYCOMP "Tento počítač" IDS_TITLE_MYNET "Miesta v sieti" IDS_TITLE_BIN_1 "Kôš (plný)" diff --git a/dll/win32/shell32/lang/sl-SI.rc b/dll/win32/shell32/lang/sl-SI.rc index 40013522a90..17b3d7d9bee 100644 --- a/dll/win32/shell32/lang/sl-SI.rc +++ b/dll/win32/shell32/lang/sl-SI.rc @@ -998,6 +998,8 @@ BEGIN IDS_OBJECTS "%d Objects" IDS_OBJECTS_SELECTED "%d Objects Selected" + IDS_SEARCH_BROWSEITEM "Prebrskaj..." + IDS_TITLE_MYCOMP "My Computer" IDS_TITLE_MYNET "My Network Places" IDS_TITLE_BIN_1 "Recycle Bin (full)" diff --git a/dll/win32/shell32/lang/sq-AL.rc b/dll/win32/shell32/lang/sq-AL.rc index fcf87e2f734..6915235b1b3 100644 --- a/dll/win32/shell32/lang/sq-AL.rc +++ b/dll/win32/shell32/lang/sq-AL.rc @@ -1005,6 +1005,8 @@ BEGIN IDS_OBJECTS "%d Objects" IDS_OBJECTS_SELECTED "%d Objects Selected" + IDS_SEARCH_BROWSEITEM "Shfleto..." + IDS_TITLE_MYCOMP "Kompjuteri Im" IDS_TITLE_MYNET "Vendi Rrjetit Tim" IDS_TITLE_BIN_1 "Plehra (plot)" diff --git a/dll/win32/shell32/lang/sv-SE.rc b/dll/win32/shell32/lang/sv-SE.rc index 9d5486e743d..9628f301240 100644 --- a/dll/win32/shell32/lang/sv-SE.rc +++ b/dll/win32/shell32/lang/sv-SE.rc @@ -998,6 +998,8 @@ BEGIN IDS_OBJECTS "%d objekt" IDS_OBJECTS_SELECTED "%d markerade objekt" + IDS_SEARCH_BROWSEITEM "Bläddra..." + IDS_TITLE_MYCOMP "Den här datorn" IDS_TITLE_MYNET "Mina nätverksplatser" IDS_TITLE_BIN_1 "Papperskorgen (full)" diff --git a/dll/win32/shell32/lang/tr-TR.rc b/dll/win32/shell32/lang/tr-TR.rc index 2d52e60d51d..04a16690660 100644 --- a/dll/win32/shell32/lang/tr-TR.rc +++ b/dll/win32/shell32/lang/tr-TR.rc @@ -1007,6 +1007,8 @@ BEGIN IDS_OBJECTS "%d Nesne" IDS_OBJECTS_SELECTED "%d Nesne Seçili" + IDS_SEARCH_BROWSEITEM "Gözat..." + IDS_TITLE_MYCOMP "Bilgisayarım" IDS_TITLE_MYNET "Ağ Bağlantılarım" IDS_TITLE_BIN_1 "Recycle Bin (full)" diff --git a/dll/win32/shell32/lang/uk-UA.rc b/dll/win32/shell32/lang/uk-UA.rc index 853f4041a02..0a943e91999 100644 --- a/dll/win32/shell32/lang/uk-UA.rc +++ b/dll/win32/shell32/lang/uk-UA.rc @@ -998,6 +998,8 @@ BEGIN IDS_OBJECTS "%d об'єктів" IDS_OBJECTS_SELECTED "Обрано %d об'єктів" + IDS_SEARCH_BROWSEITEM "Огляд..." + IDS_TITLE_MYCOMP "Мій комп'ютер" IDS_TITLE_MYNET "Мережне оточення" IDS_TITLE_BIN_1 "Кошик (повний)" diff --git a/dll/win32/shell32/lang/zh-CN.rc b/dll/win32/shell32/lang/zh-CN.rc index 3d58230cc58..6685c210944 100644 --- a/dll/win32/shell32/lang/zh-CN.rc +++ b/dll/win32/shell32/lang/zh-CN.rc @@ -1008,6 +1008,8 @@ BEGIN IDS_OBJECTS "%d 个对象" IDS_OBJECTS_SELECTED "已选中 %d 个对象" + IDS_SEARCH_BROWSEITEM "浏览..." + IDS_TITLE_MYCOMP "我的电脑" IDS_TITLE_MYNET "网上邻居" IDS_TITLE_BIN_1 "回收站(满)" diff --git a/dll/win32/shell32/lang/zh-HK.rc b/dll/win32/shell32/lang/zh-HK.rc index e4700b57e72..dd7d89bef55 100644 --- a/dll/win32/shell32/lang/zh-HK.rc +++ b/dll/win32/shell32/lang/zh-HK.rc @@ -1006,6 +1006,8 @@ BEGIN IDS_OBJECTS "%d 個物件" IDS_OBJECTS_SELECTED "已選擇 %d 個物件" + IDS_SEARCH_BROWSEITEM "瀏覽..." + IDS_TITLE_MYCOMP "我的電腦" IDS_TITLE_MYNET "網絡上的芳鄰" IDS_TITLE_BIN_1 "Recycle Bin (full)" diff --git a/dll/win32/shell32/lang/zh-TW.rc b/dll/win32/shell32/lang/zh-TW.rc index 2bc2ea7d49f..7d5a8e2b402 100644 --- a/dll/win32/shell32/lang/zh-TW.rc +++ b/dll/win32/shell32/lang/zh-TW.rc @@ -1007,6 +1007,8 @@ BEGIN IDS_OBJECTS "%d 個物件" IDS_OBJECTS_SELECTED "已選擇 %d 個物件" + IDS_SEARCH_BROWSEITEM "瀏覽..." + IDS_TITLE_MYCOMP "我的電腦" IDS_TITLE_MYNET "網路上的芳鄰" IDS_TITLE_BIN_1 "Recycle Bin (full)" diff --git a/dll/win32/shell32/shresdef.h b/dll/win32/shell32/shresdef.h index d4c8422d29a..cc9a651da93 100644 --- a/dll/win32/shell32/shresdef.h +++ b/dll/win32/shell32/shresdef.h @@ -282,6 +282,10 @@ #define IDS_OBJECTS 6466 #define IDS_OBJECTS_SELECTED 6477 +/* Explorer file search */ +#define IDS_SEARCH_LOCALDRIVES 10241 +#define IDS_SEARCH_BROWSEITEM 10244 + /* Desktop icon titles */ #define IDS_TITLE_MYCOMP 30386 #define IDS_TITLE_MYNET 30387

1 0

[reactos] 01/01: [BROWSEUI] Set find files pane focus (#7722)
by Whindmar Saksit 28 Feb '25

28 Feb '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=556cc8a7b27c427a94ee2… commit 556cc8a7b27c427a94ee22364624122f5df006f8 Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Fri Feb 28 16:57:08 2025 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Feb 28 16:57:08 2025 +0100 [BROWSEUI] Set find files pane focus (#7722) CORE-16424 --- dll/win32/browseui/shellfind/CSearchBar.cpp | 50 +++++++++++++++++++++++++++++ dll/win32/browseui/shellfind/CSearchBar.h | 1 + 2 files changed, 51 insertions(+) diff --git a/dll/win32/browseui/shellfind/CSearchBar.cpp b/dll/win32/browseui/shellfind/CSearchBar.cpp index b7d97123798..2ff47bfaf24 100644 --- a/dll/win32/browseui/shellfind/CSearchBar.cpp +++ b/dll/win32/browseui/shellfind/CSearchBar.cpp @@ -20,6 +20,33 @@ WINE_DEFAULT_DEBUG_CHANNEL(shellfind); #define UNIMPLEMENTED DbgPrint("%s is UNIMPLEMENTED!\n", __FUNCTION__) #endif +static BOOL IsWindowChildOf(const HWND hNeedle, const HWND hRoot) +{ + if (hNeedle != hRoot) + { + for (HWND hParent = hNeedle; hParent;) + { + hParent = GetParent(hParent); + if (hParent == hRoot) + return TRUE; + } + } + return FALSE; +} + +static UINT GetShellViewItemCount(IShellView *pSV) +{ + int signedCount; + CComQIIDPtr<I_ID(IFolderView)> pFV(pSV); + if (pFV && SUCCEEDED(pFV->ItemCount(SVGIO_ALLVIEW, &signedCount))) + return signedCount; + UINT unsignedCount; + CComQIIDPtr<I_ID(IShellFolderView)> pSFV(pSV); + if (pSFV && SUCCEEDED(pSFV->GetObjectCount(&unsignedCount))) + return unsignedCount; + return 0; +} + CSearchBar::CSearchBar() : m_pSite(NULL), m_bVisible(FALSE) @@ -336,6 +363,8 @@ HRESULT STDMETHODCALLTYPE CSearchBar::ShowDW(BOOL fShow) { m_bVisible = fShow; ShowWindow(fShow); + if (fShow) + TrySetFocus(DISPID_WINDOWSTATECHANGED); return S_OK; } @@ -562,6 +591,7 @@ HRESULT STDMETHODCALLTYPE CSearchBar::Invoke(DISPID dispIdMember, REFIID riid, L case DISPID_DOCUMENTCOMPLETE: { TrySubscribeToSearchEvents(); + TrySetFocus(DISPID_NAVIGATECOMPLETE2); // Remove the search results folder from the address box CComPtr<IDispatch> pDispatch; @@ -606,8 +636,28 @@ HRESULT STDMETHODCALLTYPE CSearchBar::Invoke(DISPID dispIdMember, REFIID riid, L case DISPID_SEARCHCOMPLETE: case DISPID_SEARCHABORT: SetSearchInProgress(FALSE); + TrySetFocus(DISPID_SEARCHCOMPLETE); return S_OK; default: return E_INVALIDARG; } } + +void CSearchBar::TrySetFocus(UINT Source) +{ + CComPtr<IShellBrowser> pBrowser; + CComPtr<IShellView> pResultsSV; + if (SUCCEEDED(GetSearchResultsFolder(&pBrowser, NULL, NULL))) + pBrowser->QueryActiveShellView(&pResultsSV); + UINT cItems = pResultsSV ? GetShellViewItemCount(pResultsSV) : 0; + + // Attempt to set the focus if we are not in the results folder or if there are no results + HWND hWndFocus = ::GetFocus(); + if (!hWndFocus || !pResultsSV || cItems == 0) + { + BOOL IsOnButton = GetDlgItem(IDC_SEARCH_BUTTON) == hWndFocus; + BOOL IsOnSelfPane = hWndFocus == m_hWnd; + if (!hWndFocus || IsOnSelfPane || IsOnButton || !IsWindowChildOf(hWndFocus, m_hWnd)) + SendMessageW(WM_NEXTDLGCTL, (WPARAM)GetDlgItem(IDC_SEARCH_FILENAME), TRUE); + } +} diff --git a/dll/win32/browseui/shellfind/CSearchBar.h b/dll/win32/browseui/shellfind/CSearchBar.h index a798e368d5c..0a4ead4d307 100644 --- a/dll/win32/browseui/shellfind/CSearchBar.h +++ b/dll/win32/browseui/shellfind/CSearchBar.h @@ -30,6 +30,7 @@ private: BOOL GetAddressEditBoxPath(WCHAR *szPath); void SetSearchInProgress(BOOL bInProgress); HRESULT TrySubscribeToSearchEvents(); + void TrySetFocus(UINT Source); // *** ATL event handlers *** LRESULT OnInitDialog(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled);

1 0

[reactos] 01/01: [RAPPS] Added option to display small application icons (#7723)
by Whindmar Saksit 23 Feb '25

23 Feb '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a236c39ee547e7690dfd2… commit a236c39ee547e7690dfd2f856b42986f50891f1a Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Sun Feb 23 19:27:02 2025 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Feb 23 19:27:02 2025 +0100 [RAPPS] Added option to display small application icons (#7723) --- base/applications/rapps/appview.cpp | 14 ++-- base/applications/rapps/include/resource.h | 11 ++- base/applications/rapps/include/settings.h | 1 + base/applications/rapps/lang/bg-BG.rc | 8 +- base/applications/rapps/lang/cs-CZ.rc | 8 +- base/applications/rapps/lang/de-DE.rc | 8 +- base/applications/rapps/lang/en-US.rc | 8 +- base/applications/rapps/lang/es-ES.rc | 8 +- base/applications/rapps/lang/et-EE.rc | 8 +- base/applications/rapps/lang/fr-FR.rc | 8 +- base/applications/rapps/lang/he-IL.rc | 8 +- base/applications/rapps/lang/hu-HU.rc | 8 +- base/applications/rapps/lang/id-ID.rc | 8 +- base/applications/rapps/lang/it-IT.rc | 8 +- base/applications/rapps/lang/ja-JP.rc | 8 +- base/applications/rapps/lang/no-NO.rc | 8 +- base/applications/rapps/lang/pl-PL.rc | 8 +- base/applications/rapps/lang/pt-BR.rc | 8 +- base/applications/rapps/lang/pt-PT.rc | 8 +- base/applications/rapps/lang/ro-RO.rc | 8 +- base/applications/rapps/lang/ru-RU.rc | 8 +- base/applications/rapps/lang/sk-SK.rc | 8 +- base/applications/rapps/lang/sq-AL.rc | 8 +- base/applications/rapps/lang/sv-SE.rc | 8 +- base/applications/rapps/lang/tr-TR.rc | 8 +- base/applications/rapps/lang/uk-UA.rc | 8 +- base/applications/rapps/lang/zh-CN.rc | 8 +- base/applications/rapps/lang/zh-HK.rc | 8 +- base/applications/rapps/lang/zh-TW.rc | 8 +- base/applications/rapps/settings.cpp | 1 + base/applications/rapps/settingsdlg.cpp | 127 +++++++++++++++++++++++------ 31 files changed, 252 insertions(+), 110 deletions(-) diff --git a/base/applications/rapps/appview.cpp b/base/applications/rapps/appview.cpp index 248050ebb92..d8e40ab77f7 100644 --- a/base/applications/rapps/appview.cpp +++ b/base/applications/rapps/appview.cpp @@ -15,6 +15,7 @@ using namespace Gdiplus; HICON g_hDefaultPackageIcon = NULL; static int g_DefaultPackageIconILIdx = I_IMAGENONE; +UINT g_IconSize = 0; // **** Menu helpers **** @@ -1063,9 +1064,11 @@ AsyncLoadIconProc(LPVOID Param) if (task->TaskId == g_AsyncIconTaskId) { HICON hIcon; + HICON *phBigIcon = SettingsInfo.bSmallIcons ? NULL : &hIcon; + HICON *phSmallIcon = phBigIcon ? NULL : &hIcon; if (!task->Parse) - hIcon = (HICON)LoadImageW(NULL, task->Location, IMAGE_ICON, 0, 0, LR_LOADFROMFILE | LR_DEFAULTSIZE); - else if (!ExtractIconExW(task->Location, PathParseIconLocationW(task->Location), &hIcon, NULL, 1)) + hIcon = (HICON)LoadImageW(NULL, task->Location, IMAGE_ICON, g_IconSize, g_IconSize, LR_LOADFROMFILE); + else if (!ExtractIconExW(task->Location, PathParseIconLocationW(task->Location), phBigIcon, phSmallIcon, 1)) hIcon = NULL; if (hIcon) @@ -1392,13 +1395,14 @@ CAppsListView::SetDisplayAppType(APPLICATION_VIEW_TYPE AppType) if (!g_hDefaultPackageIcon) { ImageList_Destroy(m_hImageListView); - UINT IconSize = GetSystemMetrics(SM_CXICON); + g_IconSize = GetSystemMetrics(SettingsInfo.bSmallIcons ? SM_CXSMICON : SM_CXICON); + g_IconSize = max(g_IconSize, 8); UINT ilc = GetSystemColorDepth() | ILC_MASK; - m_hImageListView = ImageList_Create(IconSize, IconSize, ilc, 0, 1); + m_hImageListView = ImageList_Create(g_IconSize, g_IconSize, ilc, 0, 1); SetImageList(m_hImageListView, LVSIL_SMALL); SetImageList(m_hImageListView, LVSIL_NORMAL); g_hDefaultPackageIcon = (HICON)LoadImageW(hInst, MAKEINTRESOURCEW(IDI_MAIN), - IMAGE_ICON, IconSize, IconSize, LR_SHARED); + IMAGE_ICON, g_IconSize, g_IconSize, LR_SHARED); } ImageList_RemoveAll(m_hImageListView); diff --git a/base/applications/rapps/include/resource.h b/base/applications/rapps/include/resource.h index 1e0f1de14a3..2d832027eb9 100644 --- a/base/applications/rapps/include/resource.h +++ b/base/applications/rapps/include/resource.h @@ -1,4 +1,5 @@ #pragma once +#define LVCHECKSTYLES LVS_REPORT | LVS_NOCOLUMNHEADER | LVS_SINGLESEL | LVS_SORTASCENDING /* Icons */ #define IDI_MAIN 10 @@ -40,11 +41,11 @@ #define IDC_STATUSBAR 1000 #define IDC_DOWNLOAD_PROGRESS 1001 #define IDC_DOWNLOAD_STATUS 1002 -#define IDC_SAVE_WINDOW_POS 1003 -#define IDC_UPDATE_AVLIST 1004 +#define IDC_GENERALLIST 1003 + #define IDC_DOWNLOAD_DIR_EDIT 1005 #define IDC_DEL_AFTER_INSTALL 1006 -#define IDC_LOG_ENABLED 1007 + #define IDC_CHOOSE 1008 #define IDC_DEFAULT_SETTINGS 1009 #define IDC_INSTALL_TEXT 1010 @@ -127,6 +128,10 @@ #define IDS_APP_DISPLAY_LIST 136 #define IDS_APP_DISPLAY_TILE 137 #define IDS_NO_SEARCH_RESULTS 138 +#define IDS_CFG_SAVE_WINDOW_POS 139 +#define IDS_CFG_UPDATE_AVLIST 140 +#define IDS_CFG_LOG_ENABLED 141 +#define IDS_CFG_SMALL_ICONS 142 /* Tooltips */ #define IDS_TOOLTIP_INSTALL 200 diff --git a/base/applications/rapps/include/settings.h b/base/applications/rapps/include/settings.h index 29f48985e71..51d01a2d27d 100644 --- a/base/applications/rapps/include/settings.h +++ b/base/applications/rapps/include/settings.h @@ -9,6 +9,7 @@ struct SETTINGS_INFO BOOL bLogEnabled; WCHAR szDownloadDir[MAX_PATH]; BOOL bDelInstaller; + BOOL bSmallIcons; /* Window Pos */ BOOL Maximized; INT Left; diff --git a/base/applications/rapps/lang/bg-BG.rc b/base/applications/rapps/lang/bg-BG.rc index 6eb7997ec11..5d8f27e4dba 100644 --- a/base/applications/rapps/lang/bg-BG.rc +++ b/base/applications/rapps/lang/bg-BG.rc @@ -49,9 +49,7 @@ CAPTION "Настройки" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Общи", -1, 4, 2, 244, 61 - AUTOCHECKBOX "&Съхраняване разположението на прозореца", IDC_SAVE_WINDOW_POS, 15, 12, 223, 12 - AUTOCHECKBOX "Об&новяване на списъка с достъпните приложения при пускане", IDC_UPDATE_AVLIST, 15, 29, 227, 12 - AUTOCHECKBOX "&Вписване на слаганията и маханията на приложения", IDC_LOG_ENABLED, 15, 46, 223, 12 + CONTROL "", IDC_GENERALLIST, "SysListView32", WS_TABSTOP | LVCHECKSTYLES, 15, 12, 219, 46, WS_EX_STATICEDGE GROUPBOX "Сваляне", -1, 4, 65, 244, 51 LTEXT "Папка за свалените файлове", -1, 16, 75, 100, 9 EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL @@ -212,6 +210,10 @@ BEGIN IDS_APP_DISPLAY_LIST "List" IDS_APP_DISPLAY_TILE "Tile" IDS_NO_SEARCH_RESULTS "No search results" + IDS_CFG_SAVE_WINDOW_POS "Съхраняване разположението на прозореца" + IDS_CFG_UPDATE_AVLIST "Обновяване на списъка с достъпните приложения при пускане" + IDS_CFG_LOG_ENABLED "Вписване на слаганията и маханията на приложения" + IDS_CFG_SMALL_ICONS "Малки значета" END STRINGTABLE diff --git a/base/applications/rapps/lang/cs-CZ.rc b/base/applications/rapps/lang/cs-CZ.rc index 09f608b43c2..8d336327cfe 100644 --- a/base/applications/rapps/lang/cs-CZ.rc +++ b/base/applications/rapps/lang/cs-CZ.rc @@ -50,9 +50,7 @@ CAPTION "Nastavení" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Obecné", -1, 4, 2, 240, 61 - AUTOCHECKBOX "&Uložit pozici okna", IDC_SAVE_WINDOW_POS, 15, 12, 219, 12 - AUTOCHECKBOX "&Aktualizovat seznam dostupných programů při startu programu", IDC_UPDATE_AVLIST, 15, 29, 222, 12 - AUTOCHECKBOX "Ukládat &záznam instalací a odstranění programů", IDC_LOG_ENABLED, 15, 46, 219, 12 + CONTROL "", IDC_GENERALLIST, "SysListView32", WS_TABSTOP | LVCHECKSTYLES, 15, 12, 219, 46, WS_EX_STATICEDGE GROUPBOX "Stahování", -1, 4, 65, 240, 51 LTEXT "Složka se staženými soubory:", -1, 16, 75, 100, 9 EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL @@ -213,6 +211,10 @@ BEGIN IDS_APP_DISPLAY_LIST "Seznam" IDS_APP_DISPLAY_TILE "Dlaždice" IDS_NO_SEARCH_RESULTS "Žádné výsledky" + IDS_CFG_SAVE_WINDOW_POS "Uložit pozici okna" + IDS_CFG_UPDATE_AVLIST "Aktualizovat seznam dostupných programů při startu programu" + IDS_CFG_LOG_ENABLED "Ukládat záznam instalací a odstranění programů" + IDS_CFG_SMALL_ICONS "Malé ikony" END STRINGTABLE diff --git a/base/applications/rapps/lang/de-DE.rc b/base/applications/rapps/lang/de-DE.rc index 3196296a41f..53d4a111147 100644 --- a/base/applications/rapps/lang/de-DE.rc +++ b/base/applications/rapps/lang/de-DE.rc @@ -52,9 +52,7 @@ CAPTION "Einstellungen" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Allgemein", -1, 4, 2, 240, 61 - AUTOCHECKBOX "Fensterposition &speichern", IDC_SAVE_WINDOW_POS, 15, 12, 219, 12 - AUTOCHECKBOX "Beim Start Liste der verfügbaren Programme &aktualisieren", IDC_UPDATE_AVLIST, 15, 29, 222, 12 - AUTOCHECKBOX "Hinzufügen und Entfernen von Programmen mit&loggen", IDC_LOG_ENABLED, 15, 46, 219, 12 + CONTROL "", IDC_GENERALLIST, "SysListView32", WS_TABSTOP | LVCHECKSTYLES, 15, 12, 219, 46, WS_EX_STATICEDGE GROUPBOX "Download", -1, 4, 65, 240, 51 LTEXT "Ordner für Downloads:", -1, 16, 75, 100, 9 EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL @@ -215,6 +213,10 @@ BEGIN IDS_APP_DISPLAY_LIST "Liste" IDS_APP_DISPLAY_TILE "Kacheln" IDS_NO_SEARCH_RESULTS "No search results" + IDS_CFG_SAVE_WINDOW_POS "Fensterposition speichern" + IDS_CFG_UPDATE_AVLIST "Beim Start Liste der verfügbaren Programme aktualisieren" + IDS_CFG_LOG_ENABLED "Hinzufügen und Entfernen von Programmen mitloggen" + IDS_CFG_SMALL_ICONS "Kleine symbole" END STRINGTABLE diff --git a/base/applications/rapps/lang/en-US.rc b/base/applications/rapps/lang/en-US.rc index 558d5132645..499aeb5142d 100644 --- a/base/applications/rapps/lang/en-US.rc +++ b/base/applications/rapps/lang/en-US.rc @@ -52,9 +52,7 @@ CAPTION "Settings" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "General", -1, 4, 2, 240, 61 - AUTOCHECKBOX "&Save window position", IDC_SAVE_WINDOW_POS, 15, 12, 219, 12 - AUTOCHECKBOX "&Update the list of accessible programs at start", IDC_UPDATE_AVLIST, 15, 29, 222, 12 - AUTOCHECKBOX "&Log of installation and removal of programs", IDC_LOG_ENABLED, 15, 46, 219, 12 + CONTROL "", IDC_GENERALLIST, "SysListView32", WS_TABSTOP | LVCHECKSTYLES, 15, 12, 219, 46, WS_EX_STATICEDGE GROUPBOX "Downloading", -1, 4, 65, 240, 51 LTEXT "Downloads folder:", -1, 16, 75, 100, 9 EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL @@ -215,6 +213,10 @@ BEGIN IDS_APP_DISPLAY_LIST "List" IDS_APP_DISPLAY_TILE "Tile" IDS_NO_SEARCH_RESULTS "No search results" + IDS_CFG_SAVE_WINDOW_POS "Save window position" + IDS_CFG_UPDATE_AVLIST "Update the list of accessible programs at start" + IDS_CFG_LOG_ENABLED "Log of installation and removal of programs" + IDS_CFG_SMALL_ICONS "Small icons" END STRINGTABLE diff --git a/base/applications/rapps/lang/es-ES.rc b/base/applications/rapps/lang/es-ES.rc index 23ec16eb993..67f2a930802 100644 --- a/base/applications/rapps/lang/es-ES.rc +++ b/base/applications/rapps/lang/es-ES.rc @@ -51,9 +51,7 @@ CAPTION "Ajustes" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "General", -1, 4, 2, 240, 61 - AUTOCHECKBOX "&Guardar posición de la ventana", IDC_SAVE_WINDOW_POS, 15, 12, 219, 12 - AUTOCHECKBOX "&Actualizar la lista de programas accesibles al comenzar", IDC_UPDATE_AVLIST, 15, 29, 222, 12 - AUTOCHECKBOX "&Registro de programas instalados y desinstalados", IDC_LOG_ENABLED, 15, 46, 219, 12 + CONTROL "", IDC_GENERALLIST, "SysListView32", WS_TABSTOP | LVCHECKSTYLES, 15, 12, 219, 46, WS_EX_STATICEDGE GROUPBOX "Descargas", -1, 4, 65, 240, 51 LTEXT "Carpeta de descargas:", -1, 16, 75, 100, 9 EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL @@ -214,6 +212,10 @@ BEGIN IDS_APP_DISPLAY_LIST "Lista" IDS_APP_DISPLAY_TILE "Título" IDS_NO_SEARCH_RESULTS "Búsqueda sin resultados." + IDS_CFG_SAVE_WINDOW_POS "Guardar posición de la ventana" + IDS_CFG_UPDATE_AVLIST "Actualizar la lista de programas accesibles al comenzar" + IDS_CFG_LOG_ENABLED "Registro de programas instalados y desinstalados" + IDS_CFG_SMALL_ICONS "Iconos pequeños" END STRINGTABLE diff --git a/base/applications/rapps/lang/et-EE.rc b/base/applications/rapps/lang/et-EE.rc index 83de8d68f0d..9ab9214ea41 100644 --- a/base/applications/rapps/lang/et-EE.rc +++ b/base/applications/rapps/lang/et-EE.rc @@ -49,9 +49,7 @@ CAPTION "Sätted" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Üldine", -1, 4, 2, 240, 61 - AUTOCHECKBOX "&Salvesta akna asukoht", IDC_SAVE_WINDOW_POS, 15, 12, 219, 12 - AUTOCHECKBOX "&Värskenda kättesaadavate programmide nimekirja käivitusel", IDC_UPDATE_AVLIST, 15, 29, 222, 12 - AUTOCHECKBOX "Installeerimiste ja eemalduste &logi", IDC_LOG_ENABLED, 15, 46, 219, 12 + CONTROL "", IDC_GENERALLIST, "SysListView32", WS_TABSTOP | LVCHECKSTYLES, 15, 12, 219, 46, WS_EX_STATICEDGE GROUPBOX "Allalaadimine", -1, 4, 65, 240, 51 LTEXT "Allalaadimiste kaust:", -1, 16, 75, 100, 9 EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL @@ -212,6 +210,10 @@ BEGIN IDS_APP_DISPLAY_LIST "List" IDS_APP_DISPLAY_TILE "Tile" IDS_NO_SEARCH_RESULTS "No search results" + IDS_CFG_SAVE_WINDOW_POS "Salvesta akna asukoht" + IDS_CFG_UPDATE_AVLIST "Värskenda kättesaadavate programmide nimekirja käivitusel" + IDS_CFG_LOG_ENABLED "Installeerimiste ja eemalduste logi" + IDS_CFG_SMALL_ICONS "Väikesed ikoonid" END STRINGTABLE diff --git a/base/applications/rapps/lang/fr-FR.rc b/base/applications/rapps/lang/fr-FR.rc index 2bc101f0553..ddad6d4c90a 100644 --- a/base/applications/rapps/lang/fr-FR.rc +++ b/base/applications/rapps/lang/fr-FR.rc @@ -52,9 +52,7 @@ CAPTION "Configuration" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Général", -1, 4, 2, 240, 61 - AUTOCHECKBOX "&Enregistrer la position de la fenêtre", IDC_SAVE_WINDOW_POS, 15, 12, 219, 12 - AUTOCHECKBOX "&Mettre à jour la liste des programmes accessibles au démarrage", IDC_UPDATE_AVLIST, 15, 29, 222, 12 - AUTOCHECKBOX "&Journal de l'installation et de la suppression des programmes", IDC_LOG_ENABLED, 15, 46, 219, 12 + CONTROL "", IDC_GENERALLIST, "SysListView32", WS_TABSTOP | LVCHECKSTYLES, 15, 12, 219, 46, WS_EX_STATICEDGE GROUPBOX "Téléchargement", -1, 4, 65, 240, 51 LTEXT "Dossier des téléchargements :", -1, 16, 75, 100, 9 EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL @@ -215,6 +213,10 @@ BEGIN IDS_APP_DISPLAY_LIST "Liste" IDS_APP_DISPLAY_TILE "Tuile" IDS_NO_SEARCH_RESULTS "Aucun résultat" + IDS_CFG_SAVE_WINDOW_POS "Enregistrer la position de la fenêtre" + IDS_CFG_UPDATE_AVLIST "Mettre à jour la liste des programmes accessibles au démarrage" + IDS_CFG_LOG_ENABLED "Journal de l'installation et de la suppression des programmes" + IDS_CFG_SMALL_ICONS "Petites icônes" END STRINGTABLE diff --git a/base/applications/rapps/lang/he-IL.rc b/base/applications/rapps/lang/he-IL.rc index 369c7b1730d..90837d9fc01 100644 --- a/base/applications/rapps/lang/he-IL.rc +++ b/base/applications/rapps/lang/he-IL.rc @@ -52,9 +52,7 @@ CAPTION "הגדרות" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "כללי", -1, 4, 2, 240, 61 - AUTOCHECKBOX "שמור מיקום חלון", IDC_SAVE_WINDOW_POS, 15, 12, 219, 12 - AUTOCHECKBOX "עדכן את רשימת התוכניות האפשרויות בהפעלה", IDC_UPDATE_AVLIST, 15, 29, 222, 12 - AUTOCHECKBOX "תעד התקנה והסרה של תוכניות", IDC_LOG_ENABLED, 15, 46, 219, 12 + CONTROL "", IDC_GENERALLIST, "SysListView32", WS_TABSTOP | LVCHECKSTYLES, 15, 12, 219, 46, WS_EX_STATICEDGE GROUPBOX "הורדה", -1, 4, 65, 240, 51 LTEXT "תיקיית הורדות:", -1, 16, 75, 100, 9 EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL @@ -217,6 +215,10 @@ BEGIN IDS_APP_DISPLAY_LIST "List" IDS_APP_DISPLAY_TILE "Tile" IDS_NO_SEARCH_RESULTS "No search results" + IDS_CFG_SAVE_WINDOW_POS "שמור מיקום חלון" + IDS_CFG_UPDATE_AVLIST "עדכן את רשימת התוכניות האפשרויות בהפעלה" + IDS_CFG_LOG_ENABLED "תעד התקנה והסרה של תוכניות" + IDS_CFG_SMALL_ICONS "סמלים קטנים" END STRINGTABLE diff --git a/base/applications/rapps/lang/hu-HU.rc b/base/applications/rapps/lang/hu-HU.rc index 2691447be1b..21f7b9b71ee 100644 --- a/base/applications/rapps/lang/hu-HU.rc +++ b/base/applications/rapps/lang/hu-HU.rc @@ -49,9 +49,7 @@ CAPTION "Beállítások" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Általános", -1, 4, 2, 240, 61 - AUTOCHECKBOX "&Ablak helyének megjegyzése", IDC_SAVE_WINDOW_POS, 15, 12, 219, 12 - AUTOCHECKBOX "Elérhető programok listájának &frissítése indításkor", IDC_UPDATE_AVLIST, 15, 29, 222, 12 - AUTOCHECKBOX "Programok telepítésének és eltávolításának &naplózása", IDC_LOG_ENABLED, 15, 46, 219, 12 + CONTROL "", IDC_GENERALLIST, "SysListView32", WS_TABSTOP | LVCHECKSTYLES, 15, 12, 219, 46, WS_EX_STATICEDGE GROUPBOX "Letöltés", -1, 4, 65, 240, 51 LTEXT "Letöltés mappája:", -1, 16, 75, 100, 9 EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL @@ -212,6 +210,10 @@ BEGIN IDS_APP_DISPLAY_LIST "Lista" IDS_APP_DISPLAY_TILE "Csempe" IDS_NO_SEARCH_RESULTS "No search results" + IDS_CFG_SAVE_WINDOW_POS "Ablak helyének megjegyzése" + IDS_CFG_UPDATE_AVLIST "Elérhető programok listájának frissítése indításkor" + IDS_CFG_LOG_ENABLED "Programok telepítésének és eltávolításának naplózása" + IDS_CFG_SMALL_ICONS "Kis képek" END STRINGTABLE diff --git a/base/applications/rapps/lang/id-ID.rc b/base/applications/rapps/lang/id-ID.rc index ea276805166..1dde61b4136 100644 --- a/base/applications/rapps/lang/id-ID.rc +++ b/base/applications/rapps/lang/id-ID.rc @@ -49,9 +49,7 @@ CAPTION "Pengaturan" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Umum", -1, 4, 2, 240, 61 - AUTOCHECKBOX "&Simpan posisi jendela", IDC_SAVE_WINDOW_POS, 15, 12, 219, 12 - AUTOCHECKBOX "&Perbarui daftar program yang bisa diakses saat mulai", IDC_UPDATE_AVLIST, 15, 29, 222, 12 - AUTOCHECKBOX "&Log pemasangan dan pembongkaran program", IDC_LOG_ENABLED, 15, 46, 219, 12 + CONTROL "", IDC_GENERALLIST, "SysListView32", WS_TABSTOP | LVCHECKSTYLES, 15, 12, 219, 46, WS_EX_STATICEDGE GROUPBOX "Mengunduh", -1, 4, 65, 240, 51 LTEXT "Folder unduhan:", -1, 16, 75, 100, 9 EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL @@ -212,6 +210,10 @@ BEGIN IDS_APP_DISPLAY_LIST "List" IDS_APP_DISPLAY_TILE "Tile" IDS_NO_SEARCH_RESULTS "No search results" + IDS_CFG_SAVE_WINDOW_POS "Simpan posisi jendela" + IDS_CFG_UPDATE_AVLIST "Perbarui daftar program yang bisa diakses saat mulai" + IDS_CFG_LOG_ENABLED "Log pemasangan dan pembongkaran program" + IDS_CFG_SMALL_ICONS "Ikon Kecil" END STRINGTABLE diff --git a/base/applications/rapps/lang/it-IT.rc b/base/applications/rapps/lang/it-IT.rc index 2effb985435..1075574ba4c 100644 --- a/base/applications/rapps/lang/it-IT.rc +++ b/base/applications/rapps/lang/it-IT.rc @@ -51,9 +51,7 @@ CAPTION "Impostazioni" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Generale", -1, 4, 2, 240, 61 - AUTOCHECKBOX "&Salva la posizione della finestra", IDC_SAVE_WINDOW_POS, 15, 12, 219, 12 - AUTOCHECKBOX "&Aggiorna la lista dei programmi accessibili", IDC_UPDATE_AVLIST, 15, 29, 222, 12 - AUTOCHECKBOX "&Registra la installazione o disinstallazione dei programmi", IDC_LOG_ENABLED, 15, 46, 219, 12 + CONTROL "", IDC_GENERALLIST, "SysListView32", WS_TABSTOP | LVCHECKSTYLES, 15, 12, 219, 46, WS_EX_STATICEDGE GROUPBOX "Scaricamenti", -1, 4, 65, 240, 51 LTEXT "Cartella:", -1, 16, 75, 100, 9 EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL @@ -214,6 +212,10 @@ BEGIN IDS_APP_DISPLAY_LIST "List" IDS_APP_DISPLAY_TILE "Tile" IDS_NO_SEARCH_RESULTS "No search results" + IDS_CFG_SAVE_WINDOW_POS "Salva la posizione della finestra" + IDS_CFG_UPDATE_AVLIST "Aggiorna la lista dei programmi accessibili" + IDS_CFG_LOG_ENABLED "Registra la installazione o disinstallazione dei programmi" + IDS_CFG_SMALL_ICONS "Icone Piccole" END STRINGTABLE diff --git a/base/applications/rapps/lang/ja-JP.rc b/base/applications/rapps/lang/ja-JP.rc index da8c309d313..b62872f52ae 100644 --- a/base/applications/rapps/lang/ja-JP.rc +++ b/base/applications/rapps/lang/ja-JP.rc @@ -51,9 +51,7 @@ CAPTION "設定" FONT 9, "MS UI Gothic" BEGIN GROUPBOX "全般", -1, 4, 2, 240, 61 - AUTOCHECKBOX "ウィンドウの場所を保存する(&S)", IDC_SAVE_WINDOW_POS, 15, 12, 219, 12 - AUTOCHECKBOX "起動時に利用できるプログラムのリストを更新する(&U)", IDC_UPDATE_AVLIST, 15, 29, 222, 12 - AUTOCHECKBOX "プログラムのインストールと削除を記録する(&L)", IDC_LOG_ENABLED, 15, 46, 219, 12 + CONTROL "", IDC_GENERALLIST, "SysListView32", WS_TABSTOP | LVCHECKSTYLES, 15, 12, 219, 46, WS_EX_STATICEDGE GROUPBOX "ダウンロード処理", -1, 4, 65, 240, 51 LTEXT "ダウンロードするフォルダ:", -1, 16, 75, 100, 9 EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL @@ -214,6 +212,10 @@ BEGIN IDS_APP_DISPLAY_LIST "リスト" IDS_APP_DISPLAY_TILE "タイル" IDS_NO_SEARCH_RESULTS "検索結果はありません" + IDS_CFG_SAVE_WINDOW_POS "ウィンドウの場所を保存する" + IDS_CFG_UPDATE_AVLIST "起動時に利用できるプログラムのリストを更新する" + IDS_CFG_LOG_ENABLED "プログラムのインストールと削除を記録する" + IDS_CFG_SMALL_ICONS "小さいアイコン" END STRINGTABLE diff --git a/base/applications/rapps/lang/no-NO.rc b/base/applications/rapps/lang/no-NO.rc index 239190f4e3f..b271227c78a 100644 --- a/base/applications/rapps/lang/no-NO.rc +++ b/base/applications/rapps/lang/no-NO.rc @@ -49,9 +49,7 @@ CAPTION "Settings" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "General", -1, 4, 2, 240, 61 - AUTOCHECKBOX "&Save window position", IDC_SAVE_WINDOW_POS, 15, 12, 219, 12 - AUTOCHECKBOX "&Update the list of accessible programs at start", IDC_UPDATE_AVLIST, 15, 29, 222, 12 - AUTOCHECKBOX "&Log of installation and removal of programs", IDC_LOG_ENABLED, 15, 46, 219, 12 + CONTROL "", IDC_GENERALLIST, "SysListView32", WS_TABSTOP | LVCHECKSTYLES, 15, 12, 219, 46, WS_EX_STATICEDGE GROUPBOX "Downloading", -1, 4, 65, 240, 51 LTEXT "Folder for downloadings:", -1, 16, 75, 100, 9 EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL @@ -212,6 +210,10 @@ BEGIN IDS_APP_DISPLAY_LIST "List" IDS_APP_DISPLAY_TILE "Tile" IDS_NO_SEARCH_RESULTS "No search results" + IDS_CFG_SAVE_WINDOW_POS "Save window position" + IDS_CFG_UPDATE_AVLIST "Update the list of accessible programs at start" + IDS_CFG_LOG_ENABLED "Log of installation and removal of programs" + IDS_CFG_SMALL_ICONS "Små ikoner" END STRINGTABLE diff --git a/base/applications/rapps/lang/pl-PL.rc b/base/applications/rapps/lang/pl-PL.rc index 034773c2669..1aa2fcc6135 100644 --- a/base/applications/rapps/lang/pl-PL.rc +++ b/base/applications/rapps/lang/pl-PL.rc @@ -51,9 +51,7 @@ CAPTION "Ustawienia" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Ogólne", -1, 4, 2, 240, 61 - AUTOCHECKBOX "&Zapisz pozycję okna", IDC_SAVE_WINDOW_POS, 15, 12, 219, 12 - AUTOCHECKBOX "&Aktualizuj listę dostępnych programów przy każdym uruchomieniu", IDC_UPDATE_AVLIST, 15, 29, 222, 12 - AUTOCHECKBOX "Zapisuj &dziennik instalacji i usuwania programów", IDC_LOG_ENABLED, 15, 46, 219, 12 + CONTROL "", IDC_GENERALLIST, "SysListView32", WS_TABSTOP | LVCHECKSTYLES, 15, 12, 219, 46, WS_EX_STATICEDGE GROUPBOX "Pobieranie", -1, 4, 65, 240, 51 LTEXT "Katalog dla pobranych plików:", -1, 16, 75, 100, 9 EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL @@ -214,6 +212,10 @@ BEGIN IDS_APP_DISPLAY_LIST "Lista" IDS_APP_DISPLAY_TILE "Kafelki" IDS_NO_SEARCH_RESULTS "No search results" + IDS_CFG_SAVE_WINDOW_POS "Zapisz pozycję okna" + IDS_CFG_UPDATE_AVLIST "Aktualizuj listę dostępnych programów przy każdym uruchomieniu" + IDS_CFG_LOG_ENABLED "Zapisuj dziennik instalacji i usuwania programów" + IDS_CFG_SMALL_ICONS "Małe ikony" END STRINGTABLE diff --git a/base/applications/rapps/lang/pt-BR.rc b/base/applications/rapps/lang/pt-BR.rc index f939d288965..807615a63ca 100644 --- a/base/applications/rapps/lang/pt-BR.rc +++ b/base/applications/rapps/lang/pt-BR.rc @@ -49,9 +49,7 @@ CAPTION "Configurações" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Geral", -1, 4, 2, 240, 61 - AUTOCHECKBOX "&Salvar posição da janela", IDC_SAVE_WINDOW_POS, 15, 12, 219, 12 - AUTOCHECKBOX "&Atualizar esta lista de programas ao iniciar", IDC_UPDATE_AVLIST, 15, 29, 222, 12 - AUTOCHECKBOX "&Registro de instalação e remoção de programas", IDC_LOG_ENABLED, 15, 46, 219, 12 + CONTROL "", IDC_GENERALLIST, "SysListView32", WS_TABSTOP | LVCHECKSTYLES, 15, 12, 219, 46, WS_EX_STATICEDGE GROUPBOX "Baixando", -1, 4, 65, 240, 51 LTEXT "Pasta de download:", -1, 16, 75, 100, 9 EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL @@ -212,6 +210,10 @@ BEGIN IDS_APP_DISPLAY_LIST "List" IDS_APP_DISPLAY_TILE "Tile" IDS_NO_SEARCH_RESULTS "No search results" + IDS_CFG_SAVE_WINDOW_POS "Salvar posição da janela" + IDS_CFG_UPDATE_AVLIST "Atualizar esta lista de programas ao iniciar" + IDS_CFG_LOG_ENABLED "Registro de instalação e remoção de programas" + IDS_CFG_SMALL_ICONS "Ícones pequenos" END STRINGTABLE diff --git a/base/applications/rapps/lang/pt-PT.rc b/base/applications/rapps/lang/pt-PT.rc index c24f98afb4a..dfdd2850137 100644 --- a/base/applications/rapps/lang/pt-PT.rc +++ b/base/applications/rapps/lang/pt-PT.rc @@ -49,9 +49,7 @@ CAPTION "Configurações" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Geral", -1, 4, 2, 240, 61 - AUTOCHECKBOX "&Guardar posição da janela", IDC_SAVE_WINDOW_POS, 15, 12, 219, 12 - AUTOCHECKBOX "&Actualizar a lista de programas ao iniciar", IDC_UPDATE_AVLIST, 15, 29, 222, 12 - AUTOCHECKBOX "&Registar a instalação e remoção de programas", IDC_LOG_ENABLED, 15, 46, 219, 12 + CONTROL "", IDC_GENERALLIST, "SysListView32", WS_TABSTOP | LVCHECKSTYLES, 15, 12, 219, 46, WS_EX_STATICEDGE GROUPBOX "A carregar", -1, 4, 65, 240, 51 LTEXT "Pasta de download:", -1, 16, 75, 100, 9 EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL @@ -212,6 +210,10 @@ BEGIN IDS_APP_DISPLAY_LIST "Lista" IDS_APP_DISPLAY_TILE "Cabeçalho" IDS_NO_SEARCH_RESULTS "Busca sem resultados" + IDS_CFG_SAVE_WINDOW_POS "Guardar posição da janela" + IDS_CFG_UPDATE_AVLIST "Actualizar a lista de programas ao iniciar" + IDS_CFG_LOG_ENABLED "Registar a instalação e remoção de programas" + IDS_CFG_SMALL_ICONS "Ícones pequenos" END STRINGTABLE diff --git a/base/applications/rapps/lang/ro-RO.rc b/base/applications/rapps/lang/ro-RO.rc index f4092694c58..ba9421f37fe 100644 --- a/base/applications/rapps/lang/ro-RO.rc +++ b/base/applications/rapps/lang/ro-RO.rc @@ -51,9 +51,7 @@ CAPTION "Setări" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "General", -1, 4, 2, 240, 61 - AUTOCHECKBOX "&Salvare a poziției ferestrei", IDC_SAVE_WINDOW_POS, 15, 12, 219, 12 - AUTOCHECKBOX "&Actualizare la pornire a listei programelor disponibile", IDC_UPDATE_AVLIST, 15, 29, 222, 12 - AUTOCHECKBOX "Menținere a j&urnalului de instalare/dezinstalare a programelor", IDC_LOG_ENABLED, 15, 46, 219, 12 + CONTROL "", IDC_GENERALLIST, "SysListView32", WS_TABSTOP | LVCHECKSTYLES, 15, 12, 219, 46, WS_EX_STATICEDGE GROUPBOX "Descărcări", -1, 4, 65, 240, 51 LTEXT "Folderul pentru descărcări:", -1, 16, 75, 100, 9 EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL @@ -214,6 +212,10 @@ BEGIN IDS_APP_DISPLAY_LIST "Listă" IDS_APP_DISPLAY_TILE "Dale" IDS_NO_SEARCH_RESULTS "Niciun rezultat al căutării" + IDS_CFG_SAVE_WINDOW_POS "Salvare a poziției ferestrei" + IDS_CFG_UPDATE_AVLIST "Actualizare la pornire a listei programelor disponibile" + IDS_CFG_LOG_ENABLED "Menținere a jurnalului de instalare/dezinstalare a programelor" + IDS_CFG_SMALL_ICONS "Pictograme mici" END STRINGTABLE diff --git a/base/applications/rapps/lang/ru-RU.rc b/base/applications/rapps/lang/ru-RU.rc index 5e9f71915be..6b119334886 100644 --- a/base/applications/rapps/lang/ru-RU.rc +++ b/base/applications/rapps/lang/ru-RU.rc @@ -54,9 +54,7 @@ CAPTION "Параметры" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Общие", -1, 4, 2, 240, 61 - AUTOCHECKBOX "&Сохранять положение окна", IDC_SAVE_WINDOW_POS, 15, 12, 219, 12 - AUTOCHECKBOX "&Обновлять список доступных программ при запуске", IDC_UPDATE_AVLIST, 15, 29, 222, 12 - AUTOCHECKBOX "&Вести лог установки/удаления программ", IDC_LOG_ENABLED, 15, 46, 219, 12 + CONTROL "", IDC_GENERALLIST, "SysListView32", WS_TABSTOP | LVCHECKSTYLES, 15, 12, 219, 46, WS_EX_STATICEDGE GROUPBOX "Загрузка", -1, 4, 65, 240, 51 LTEXT "Папка для загрузок:", -1, 16, 75, 77, 9 EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL @@ -217,6 +215,10 @@ BEGIN IDS_APP_DISPLAY_LIST "Список" IDS_APP_DISPLAY_TILE "Плитка" IDS_NO_SEARCH_RESULTS "Ничего не найдено" + IDS_CFG_SAVE_WINDOW_POS "Сохранять положение окна" + IDS_CFG_UPDATE_AVLIST "Обновлять список доступных программ при запуске" + IDS_CFG_LOG_ENABLED "Вести лог установки/удаления программ" + IDS_CFG_SMALL_ICONS "Мелкие значки" END STRINGTABLE diff --git a/base/applications/rapps/lang/sk-SK.rc b/base/applications/rapps/lang/sk-SK.rc index f8202c7333c..44932a0b4e3 100644 --- a/base/applications/rapps/lang/sk-SK.rc +++ b/base/applications/rapps/lang/sk-SK.rc @@ -50,9 +50,7 @@ CAPTION "Nastavenia" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Všeobecné", -1, 4, 2, 240, 61 - AUTOCHECKBOX "&Uložiť pozíciu okna", IDC_SAVE_WINDOW_POS, 15, 12, 219, 12 - AUTOCHECKBOX "&Aktualizovať zoznam dostupných programov pri spustení", IDC_UPDATE_AVLIST, 15, 29, 222, 12 - AUTOCHECKBOX "&Záznam o inštalovaní a odstránení programov", IDC_LOG_ENABLED, 15, 46, 219, 12 + CONTROL "", IDC_GENERALLIST, "SysListView32", WS_TABSTOP | LVCHECKSTYLES, 15, 12, 219, 46, WS_EX_STATICEDGE GROUPBOX "Sťahovanie", -1, 4, 65, 240, 51 LTEXT "Priečinok pre sťahovanie:", -1, 16, 75, 100, 9 EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL @@ -213,6 +211,10 @@ BEGIN IDS_APP_DISPLAY_LIST "Zoznam" IDS_APP_DISPLAY_TILE "Dlaždice" IDS_NO_SEARCH_RESULTS "Žiadne výsledky" + IDS_CFG_SAVE_WINDOW_POS "Uložiť pozíciu okna" + IDS_CFG_UPDATE_AVLIST "Aktualizovať zoznam dostupných programov pri spustení" + IDS_CFG_LOG_ENABLED "Záznam o inštalovaní a odstránení programov" + IDS_CFG_SMALL_ICONS "Malé ikony" END STRINGTABLE diff --git a/base/applications/rapps/lang/sq-AL.rc b/base/applications/rapps/lang/sq-AL.rc index a9f60543bff..77feaa24eda 100644 --- a/base/applications/rapps/lang/sq-AL.rc +++ b/base/applications/rapps/lang/sq-AL.rc @@ -49,9 +49,7 @@ CAPTION "Konfigurime" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Pergjithshem", -1, 4, 2, 240, 61 - AUTOCHECKBOX "Ruaj pozicionin e dritare", IDC_SAVE_WINDOW_POS, 15, 12, 219, 12 - AUTOCHECKBOX "&Updejto listen e programeve te aksesuar ne start", IDC_UPDATE_AVLIST, 15, 29, 222, 12 - AUTOCHECKBOX "&Log instalalimin dhe heqjen e programeve", IDC_LOG_ENABLED, 15, 46, 219, 12 + CONTROL "", IDC_GENERALLIST, "SysListView32", WS_TABSTOP | LVCHECKSTYLES, 15, 12, 219, 46, WS_EX_STATICEDGE GROUPBOX "Shkarko", -1, 4, 65, 240, 51 LTEXT "Dosja e shkarkimit:", -1, 16, 75, 100, 9 EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL @@ -212,6 +210,10 @@ BEGIN IDS_APP_DISPLAY_LIST "List" IDS_APP_DISPLAY_TILE "Tile" IDS_NO_SEARCH_RESULTS "No search results" + IDS_CFG_SAVE_WINDOW_POS "Ruaj pozicionin e dritare" + IDS_CFG_UPDATE_AVLIST "Updejto listen e programeve te aksesuar ne start" + IDS_CFG_LOG_ENABLED "Log instalalimin dhe heqjen e programeve" + IDS_CFG_SMALL_ICONS "Ikonat e vogla" END STRINGTABLE diff --git a/base/applications/rapps/lang/sv-SE.rc b/base/applications/rapps/lang/sv-SE.rc index a9cb657a4e0..c14b19adb51 100644 --- a/base/applications/rapps/lang/sv-SE.rc +++ b/base/applications/rapps/lang/sv-SE.rc @@ -49,9 +49,7 @@ CAPTION "Inställningar" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Allmänna", -1, 4, 2, 240, 61 - AUTOCHECKBOX "&Spara fönsterposition", IDC_SAVE_WINDOW_POS, 15, 12, 219, 12 - AUTOCHECKBOX "&Uppdatera listan med tillgängliga program vid start", IDC_UPDATE_AVLIST, 15, 29, 222, 12 - AUTOCHECKBOX "&Logga ur installation och borttagning program", IDC_LOG_ENABLED, 15, 46, 219, 12 + CONTROL "", IDC_GENERALLIST, "SysListView32", WS_TABSTOP | LVCHECKSTYLES, 15, 12, 219, 46, WS_EX_STATICEDGE GROUPBOX "Nerladding", -1, 4, 65, 240, 51 LTEXT "Mapp för nerladdningar:", -1, 16, 75, 100, 9 EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL @@ -212,6 +210,10 @@ BEGIN IDS_APP_DISPLAY_LIST "List" IDS_APP_DISPLAY_TILE "Tile" IDS_NO_SEARCH_RESULTS "No search results" + IDS_CFG_SAVE_WINDOW_POS "Spara fönsterposition" + IDS_CFG_UPDATE_AVLIST "Uppdatera listan med tillgängliga program vid start" + IDS_CFG_LOG_ENABLED "Logga ur installation och borttagning program" + IDS_CFG_SMALL_ICONS "Små ikoner" END STRINGTABLE diff --git a/base/applications/rapps/lang/tr-TR.rc b/base/applications/rapps/lang/tr-TR.rc index 74a2fa7c531..c33ab128536 100644 --- a/base/applications/rapps/lang/tr-TR.rc +++ b/base/applications/rapps/lang/tr-TR.rc @@ -51,9 +51,7 @@ CAPTION "Ayarlar" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Genel", -1, 4, 2, 240, 61 - AUTOCHECKBOX "&Pencere Konumunu Kaydet", IDC_SAVE_WINDOW_POS, 15, 12, 219, 12 - AUTOCHECKBOX "&Başlangıçta Erişilebilir Programların Listesini Yenile", IDC_UPDATE_AVLIST, 15, 29, 222, 12 - AUTOCHECKBOX "P&rogramların Kurulma ve Kaldırma Günlüğünü Sakla", IDC_LOG_ENABLED, 15, 46, 219, 12 + CONTROL "", IDC_GENERALLIST, "SysListView32", WS_TABSTOP | LVCHECKSTYLES, 15, 12, 219, 46, WS_EX_STATICEDGE GROUPBOX "İndirme", -1, 4, 65, 240, 51 LTEXT "İndirme Dizini:", -1, 16, 75, 100, 9 EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL @@ -214,6 +212,10 @@ BEGIN IDS_APP_DISPLAY_LIST "Liste" IDS_APP_DISPLAY_TILE "Karo" IDS_NO_SEARCH_RESULTS "Arama sonucu yok" + IDS_CFG_SAVE_WINDOW_POS "Pencere Konumunu Kaydet" + IDS_CFG_UPDATE_AVLIST "Başlangıçta Erişilebilir Programların Listesini Yenile" + IDS_CFG_LOG_ENABLED "Programların Kurulma ve Kaldırma Günlüğünü Sakla" + IDS_CFG_SMALL_ICONS "Küçük simgeler" END STRINGTABLE diff --git a/base/applications/rapps/lang/uk-UA.rc b/base/applications/rapps/lang/uk-UA.rc index f3c6fd904f3..35cb17f24f2 100644 --- a/base/applications/rapps/lang/uk-UA.rc +++ b/base/applications/rapps/lang/uk-UA.rc @@ -52,9 +52,7 @@ CAPTION "Налаштування" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Загальні", -1, 4, 2, 240, 61 - AUTOCHECKBOX "&Зберігати положення вікна", IDC_SAVE_WINDOW_POS, 15, 12, 219, 12 - AUTOCHECKBOX "&Оновлювати список наявних програм при запуску", IDC_UPDATE_AVLIST, 15, 29, 222, 12 - AUTOCHECKBOX "&Вести звіт встановлення/видалення програм", IDC_LOG_ENABLED, 15, 46, 219, 12 + CONTROL "", IDC_GENERALLIST, "SysListView32", WS_TABSTOP | LVCHECKSTYLES, 15, 12, 219, 46, WS_EX_STATICEDGE GROUPBOX "Завантаження", -1, 4, 65, 240, 51 LTEXT "Тека для завантажень:", -1, 16, 75, 100, 9 EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL @@ -215,6 +213,10 @@ BEGIN IDS_APP_DISPLAY_LIST "List" IDS_APP_DISPLAY_TILE "Tile" IDS_NO_SEARCH_RESULTS "No search results" + IDS_CFG_SAVE_WINDOW_POS "Зберігати положення вікна" + IDS_CFG_UPDATE_AVLIST "Оновлювати список наявних програм при запуску" + IDS_CFG_LOG_ENABLED "Вести звіт встановлення/видалення програм" + IDS_CFG_SMALL_ICONS "Дрібні значки" END STRINGTABLE diff --git a/base/applications/rapps/lang/zh-CN.rc b/base/applications/rapps/lang/zh-CN.rc index 9ef28009d91..7eed7260cbf 100644 --- a/base/applications/rapps/lang/zh-CN.rc +++ b/base/applications/rapps/lang/zh-CN.rc @@ -53,9 +53,7 @@ CAPTION "设置" FONT 9, "宋体" BEGIN GROUPBOX "常规", -1, 4, 2, 240, 61 - AUTOCHECKBOX "保存窗口位置(&S)", IDC_SAVE_WINDOW_POS, 15, 12, 219, 12 - AUTOCHECKBOX "启动时更新可获得的程序列表(&U)", IDC_UPDATE_AVLIST, 15, 29, 222, 12 - AUTOCHECKBOX "将程序的安装和卸载记录到日志(&L)", IDC_LOG_ENABLED, 15, 46, 219, 12 + CONTROL "", IDC_GENERALLIST, "SysListView32", WS_TABSTOP | LVCHECKSTYLES, 15, 12, 219, 46, WS_EX_STATICEDGE GROUPBOX "下载设置", -1, 4, 65, 240, 51 LTEXT "下载文件夹：", -1, 16, 75, 100, 9 EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL @@ -216,6 +214,10 @@ BEGIN IDS_APP_DISPLAY_LIST "列表" IDS_APP_DISPLAY_TILE "卡片" IDS_NO_SEARCH_RESULTS "无搜索结果" + IDS_CFG_SAVE_WINDOW_POS "保存窗口位置" + IDS_CFG_UPDATE_AVLIST "启动时更新可获得的程序列表" + IDS_CFG_LOG_ENABLED "将程序的安装和卸载记录到日志" + IDS_CFG_SMALL_ICONS "小图标" END STRINGTABLE diff --git a/base/applications/rapps/lang/zh-HK.rc b/base/applications/rapps/lang/zh-HK.rc index 6d3492616f6..2340b0963c6 100644 --- a/base/applications/rapps/lang/zh-HK.rc +++ b/base/applications/rapps/lang/zh-HK.rc @@ -50,9 +50,7 @@ CAPTION "設定" FONT 9, "新細明體" BEGIN GROUPBOX "一般", -1, 4, 2, 240, 61 - AUTOCHECKBOX "儲存視窗位置(&S)", IDC_SAVE_WINDOW_POS, 15, 12, 219, 12 - AUTOCHECKBOX "啟動時更新可獲得的程式列表(&U)", IDC_UPDATE_AVLIST, 15, 29, 222, 12 - AUTOCHECKBOX "將程式的安裝和解除安裝記錄到記錄檔(&L)", IDC_LOG_ENABLED, 15, 46, 219, 12 + CONTROL "", IDC_GENERALLIST, "SysListView32", WS_TABSTOP | LVCHECKSTYLES, 15, 12, 219, 46, WS_EX_STATICEDGE GROUPBOX "正在下載", -1, 4, 65, 240, 51 LTEXT "下載資料夾：", -1, 16, 75, 100, 9 EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL @@ -213,6 +211,10 @@ BEGIN IDS_APP_DISPLAY_LIST "列表" IDS_APP_DISPLAY_TILE "並排" IDS_NO_SEARCH_RESULTS "沒有搜尋結果" + IDS_CFG_SAVE_WINDOW_POS "儲存視窗位置" + IDS_CFG_UPDATE_AVLIST "啟動時更新可獲得的程式列表" + IDS_CFG_LOG_ENABLED "將程式的安裝和解除安裝記錄到記錄檔" + IDS_CFG_SMALL_ICONS "小圖示" END STRINGTABLE diff --git a/base/applications/rapps/lang/zh-TW.rc b/base/applications/rapps/lang/zh-TW.rc index 6e0584d8b6e..a3befd8880d 100644 --- a/base/applications/rapps/lang/zh-TW.rc +++ b/base/applications/rapps/lang/zh-TW.rc @@ -50,9 +50,7 @@ CAPTION "設定" FONT 9, "新細明體" BEGIN GROUPBOX "一般", -1, 4, 2, 240, 61 - AUTOCHECKBOX "儲存視窗位置(&S)", IDC_SAVE_WINDOW_POS, 15, 12, 219, 12 - AUTOCHECKBOX "啟動時更新可獲得的程式列表(&U)", IDC_UPDATE_AVLIST, 15, 29, 222, 12 - AUTOCHECKBOX "記錄程式的安裝和解除安裝過程(&L)", IDC_LOG_ENABLED, 15, 46, 219, 12 + CONTROL "", IDC_GENERALLIST, "SysListView32", WS_TABSTOP | LVCHECKSTYLES, 15, 12, 219, 46, WS_EX_STATICEDGE GROUPBOX "正在下載", -1, 4, 65, 240, 51 LTEXT "下載資料夾：", -1, 16, 75, 100, 9 EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL @@ -213,6 +211,10 @@ BEGIN IDS_APP_DISPLAY_LIST "列表" IDS_APP_DISPLAY_TILE "並排" IDS_NO_SEARCH_RESULTS "沒有搜尋結果" + IDS_CFG_SAVE_WINDOW_POS "儲存視窗位置" + IDS_CFG_UPDATE_AVLIST "啟動時更新可獲得的程式列表" + IDS_CFG_LOG_ENABLED "記錄程式的安裝和解除安裝過程" + IDS_CFG_SMALL_ICONS "小圖示" END STRINGTABLE diff --git a/base/applications/rapps/settings.cpp b/base/applications/rapps/settings.cpp index b23c2dd7a49..e87d5d0315c 100644 --- a/base/applications/rapps/settings.cpp +++ b/base/applications/rapps/settings.cpp @@ -118,6 +118,7 @@ AddInfoFields(ATL::CAtlList<SettingsField *> &infoFields, SETTINGS_INFO &setting infoFields.AddTail(new SettingsFieldBool(&(settings.bLogEnabled), L"bLogEnabled")); infoFields.AddTail(new SettingsFieldString(settings.szDownloadDir, MAX_PATH, L"szDownloadDir")); infoFields.AddTail(new SettingsFieldBool(&(settings.bDelInstaller), L"bDelInstaller")); + infoFields.AddTail(new SettingsFieldBool(&(settings.bSmallIcons), L"SmallIcons")); infoFields.AddTail(new SettingsFieldBool(&(settings.Maximized), L"WindowPosMaximized")); infoFields.AddTail(new SettingsFieldInt(&(settings.Left), L"WindowPosLeft")); infoFields.AddTail(new SettingsFieldInt(&(settings.Top), L"WindowPosTop")); diff --git a/base/applications/rapps/settingsdlg.cpp b/base/applications/rapps/settingsdlg.cpp index 92782d59484..56efc75193c 100644 --- a/base/applications/rapps/settingsdlg.cpp +++ b/base/applications/rapps/settingsdlg.cpp @@ -7,7 +7,7 @@ */ #include "rapps.h" -SETTINGS_INFO NewSettingsInfo; +SETTINGS_INFO *g_pNewSettingsInfo; static int CALLBACK BrowseFolderCallback(HWND hwnd, UINT uMsg, LPARAM lParam, LPARAM lpData) @@ -23,7 +23,7 @@ BrowseFolderCallback(HWND hwnd, UINT uMsg, LPARAM lParam, LPARAM lpData) return 0; } -BOOL +static BOOL ChooseFolder(HWND hwnd) { BOOL bRet = FALSE; @@ -65,7 +65,7 @@ ChooseFolder(HWND hwnd) return bRet; } -BOOL +static BOOL IsUrlValid(const WCHAR *Url) { URL_COMPONENTSW UrlComponmentInfo = {0}; @@ -94,18 +94,74 @@ IsUrlValid(const WCHAR *Url) namespace { -inline BOOL +static inline BOOL IsCheckedDlgItem(HWND hDlg, INT nIDDlgItem) { - return (SendDlgItemMessageW(hDlg, nIDDlgItem, BM_GETCHECK, 0, 0) == BST_CHECKED) ? TRUE : FALSE; + return SendDlgItemMessageW(hDlg, nIDDlgItem, BM_GETCHECK, 0, 0) == BST_CHECKED; } -VOID +static inline void +AdjustListViewHeader(HWND hWndList) +{ + ListView_SetColumnWidth(hWndList, 0, LVSCW_AUTOSIZE_USEHEADER); +} + +static void +HandleGeneralListItems(HWND hWndList, PSETTINGS_INFO Load, PSETTINGS_INFO Save) +{ + PSETTINGS_INFO Info = Load ? Load : Save; + const struct { + WORD Id; + BOOL *Setting; + } Map[] = { + { IDS_CFG_SAVE_WINDOW_POS, &Info->bSaveWndPos }, + { IDS_CFG_UPDATE_AVLIST, &Info->bUpdateAtStart }, + { IDS_CFG_LOG_ENABLED, &Info->bLogEnabled }, + { IDS_CFG_SMALL_ICONS, &Info->bSmallIcons }, + }; + + if (Load) + { + UINT ExStyle = LVS_EX_CHECKBOXES | LVS_EX_LABELTIP; + ListView_SetExtendedListViewStyleEx(hWndList, ExStyle, ExStyle); + LVCOLUMN lvc; + lvc.mask = LVCF_TEXT | LVCF_SUBITEM; + lvc.iSubItem = 0; + lvc.pszText = const_cast<PWSTR>(L""); + ListView_InsertColumn(hWndList, 0, &lvc); + + CStringW Name; + for (SIZE_T i = 0; i < _countof(Map); ++i) + { + LVITEMW Item; + Item.mask = LVIF_TEXT | LVIF_PARAM; + Item.iItem = 0x7fff; + Item.iSubItem = 0; + Item.lParam = Map[i].Id; + Name.LoadStringW(Map[i].Id); + Item.pszText = const_cast<PWSTR>(Name.GetString()); + Item.iItem = ListView_InsertItem(hWndList, &Item); + ListView_SetCheckState(hWndList, Item.iItem, *Map[i].Setting); + } + ListView_SetItemState(hWndList, 0, -1, LVIS_FOCUSED | LVIS_SELECTED); + AdjustListViewHeader(hWndList); + } + else + { + for (SIZE_T i = 0; i < _countof(Map); ++i) + { + LVFINDINFOW FindInfo = { LVFI_PARAM, NULL, Map[i].Id }; + int Idx = ListView_FindItem(hWndList, -1, &FindInfo); + if (Idx >= 0) + *Map[i].Setting = ListView_GetCheckState(hWndList, Idx); + } + } +} + +static VOID InitSettingsControls(HWND hDlg, PSETTINGS_INFO Info) { - SendDlgItemMessageW(hDlg, IDC_SAVE_WINDOW_POS, BM_SETCHECK, Info->bSaveWndPos, 0); - SendDlgItemMessageW(hDlg, IDC_UPDATE_AVLIST, BM_SETCHECK, Info->bUpdateAtStart, 0); - SendDlgItemMessageW(hDlg, IDC_LOG_ENABLED, BM_SETCHECK, Info->bLogEnabled, 0); + HandleGeneralListItems(GetDlgItem(hDlg, IDC_GENERALLIST), Info, NULL); SendDlgItemMessageW(hDlg, IDC_DEL_AFTER_INSTALL, BM_SETCHECK, Info->bDelInstaller, 0); HWND hCtl = GetDlgItem(hDlg, IDC_DOWNLOAD_DIR_EDIT); @@ -134,16 +190,24 @@ InitSettingsControls(HWND hDlg, PSETTINGS_INFO Info) SetWindowTextW(GetDlgItem(hDlg, IDC_NO_PROXY_FOR), Info->szNoProxyFor); } -INT_PTR CALLBACK +static INT_PTR CALLBACK SettingsDlgProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam) { + SETTINGS_INFO &NewSettingsInfo = *g_pNewSettingsInfo; + switch (Msg) { case WM_INITDIALOG: - NewSettingsInfo = SettingsInfo; InitSettingsControls(hDlg, &SettingsInfo); return TRUE; + case WM_SETTINGCHANGE: + case WM_THEMECHANGED: + case WM_SYSCOLORCHANGE: + SendMessage(GetDlgItem(hDlg, IDC_GENERALLIST), Msg, wParam, lParam); + AdjustListViewHeader(GetDlgItem(hDlg, IDC_GENERALLIST)); + break; + case WM_COMMAND: { switch (LOWORD(wParam)) @@ -152,18 +216,6 @@ SettingsDlgProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam) ChooseFolder(hDlg); break; - case IDC_SAVE_WINDOW_POS: - NewSettingsInfo.bSaveWndPos = IsCheckedDlgItem(hDlg, IDC_SAVE_WINDOW_POS); - break; - - case IDC_UPDATE_AVLIST: - NewSettingsInfo.bUpdateAtStart = IsCheckedDlgItem(hDlg, IDC_UPDATE_AVLIST); - break; - - case IDC_LOG_ENABLED: - NewSettingsInfo.bLogEnabled = IsCheckedDlgItem(hDlg, IDC_LOG_ENABLED); - break; - case IDC_DEL_AFTER_INSTALL: NewSettingsInfo.bDelInstaller = IsCheckedDlgItem(hDlg, IDC_DEL_AFTER_INSTALL); break; @@ -203,6 +255,13 @@ SettingsDlgProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam) case IDOK: { + HandleGeneralListItems(GetDlgItem(hDlg, IDC_GENERALLIST), NULL, &NewSettingsInfo); + if (SettingsInfo.bSmallIcons != NewSettingsInfo.bSmallIcons) + { + SendMessageW(hMainWnd, WM_SETTINGCHANGE, SPI_SETICONMETRICS, 0); // Note: WM_SETTINGCHANGE cannot be posted + PostMessageW(hMainWnd, WM_COMMAND, ID_REFRESH, 0); + } + CStringW szDir; CStringW szSource; CStringW szProxy; @@ -281,8 +340,25 @@ SettingsDlgProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam) EndDialog(hDlg, LOWORD(wParam)); break; } + break; + } + + case WM_NOTIFY: + { + NMITEMACTIVATE &nmia = *(NMITEMACTIVATE*)lParam; + if (wParam == IDC_GENERALLIST && nmia.hdr.code == NM_CLICK) + { + LVHITTESTINFO lvhti; + lvhti.pt = nmia.ptAction; + if (nmia.iItem != -1 && ListView_HitTest(nmia.hdr.hwndFrom, &lvhti) != -1) + { + if (lvhti.flags & (LVHT_ONITEMICON | LVHT_ONITEMLABEL)) + ListView_SetCheckState(nmia.hdr.hwndFrom, nmia.iItem, + !ListView_GetCheckState(nmia.hdr.hwndFrom, nmia.iItem)); + } + } + break; } - break; } return FALSE; @@ -292,5 +368,8 @@ SettingsDlgProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam) VOID CreateSettingsDlg(HWND hwnd) { + SETTINGS_INFO NewSettingsInfo = SettingsInfo; + g_pNewSettingsInfo = &NewSettingsInfo; + DialogBoxW(hInst, MAKEINTRESOURCEW(IDD_SETTINGS_DIALOG), hwnd, SettingsDlgProc); }

1 0

[reactos] 01/01: [SHIMGVW] Only enable toolbar edit and print buttons if the shell verb exists (#7725)
by Whindmar Saksit 23 Feb '25

23 Feb '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=46d01bc7fdb55a35fb258… commit 46d01bc7fdb55a35fb258a518fc9fef4c11bd303 Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Sun Feb 23 14:08:36 2025 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Feb 23 14:08:36 2025 +0100 [SHIMGVW] Only enable toolbar edit and print buttons if the shell verb exists (#7725) CORE-20002 --- dll/win32/shimgvw/shimgvw.c | 43 ++++++++--------- dll/win32/shimgvw/shimgvw.h | 4 ++ dll/win32/shimgvw/util.c | 114 +++++++++++++++++++++++++++++++++++++++----- 3 files changed, 126 insertions(+), 35 deletions(-) diff --git a/dll/win32/shimgvw/shimgvw.c b/dll/win32/shimgvw/shimgvw.c index ba8dd000e81..392a0a463be 100644 --- a/dll/win32/shimgvw/shimgvw.c +++ b/dll/win32/shimgvw/shimgvw.c @@ -33,6 +33,7 @@ HWND g_hwndFullscreen = NULL; SHIMGVW_FILENODE * g_pCurrentFile = NULL; GpImage * g_pImage = NULL; SHIMGVW_SETTINGS g_Settings; +UINT g_ImageId; static const UINT s_ZoomSteps[] = { @@ -402,6 +403,10 @@ Preview_pLoadImage(PPREVIEW_DATA pData, LPCWSTR szOpenFileName) Preview_ResetZoom(pData); Preview_UpdateTitle(pData, szOpenFileName); + + ++g_ImageId; + EnableCommandIfVerbExists(g_ImageId, g_hMainWnd, IDC_PRINT, L"print", pData->m_szFile); + EnableCommandIfVerbExists(g_ImageId, g_hMainWnd, IDC_MODIFY, L"edit", pData->m_szFile); } static VOID @@ -557,15 +562,17 @@ Preview_pSaveImageAs(PPREVIEW_DATA pData) static VOID Preview_pPrintImage(PPREVIEW_DATA pData) { - /* FIXME */ + ShellExecuteVerb(g_hMainWnd, L"print", pData->m_szFile, FALSE); } static VOID Preview_UpdateUI(PPREVIEW_DATA pData) { BOOL bEnable = (g_pImage != NULL); - PostMessageW(pData->m_hwndToolBar, TB_ENABLEBUTTON, IDC_SAVEAS, bEnable); - PostMessageW(pData->m_hwndToolBar, TB_ENABLEBUTTON, IDC_PRINT, bEnable); + SendMessageW(pData->m_hwndToolBar, TB_ENABLEBUTTON, IDC_SAVEAS, bEnable); + // These will be validated and enabled later by EnableCommandIfVerbExists + SendMessageW(pData->m_hwndToolBar, TB_ENABLEBUTTON, IDC_PRINT, FALSE); + SendMessageW(pData->m_hwndToolBar, TB_ENABLEBUTTON, IDC_MODIFY, FALSE); } static VOID @@ -1397,26 +1404,8 @@ Preview_Delete(PPREVIEW_DATA pData) static VOID Preview_Edit(HWND hwnd) { - SHELLEXECUTEINFOW sei; - PPREVIEW_DATA pData = Preview_GetData(hwnd); - - if (!pData->m_szFile[0]) - return; - - ZeroMemory(&sei, sizeof(sei)); - sei.cbSize = sizeof(sei); - sei.lpVerb = L"edit"; - sei.lpFile = pData->m_szFile; - sei.nShow = SW_SHOWNORMAL; - if (!ShellExecuteExW(&sei)) - { - DPRINT1("Preview_Edit: ShellExecuteExW() failed with code %ld\n", GetLastError()); - } - else - { - // Destroy the window to quit the application - DestroyWindow(hwnd); - } + PPREVIEW_DATA pData = Preview_GetData(g_hMainWnd); + ShellExecuteVerb(pData->m_hwnd, L"edit", pData->m_szFile, TRUE); } static VOID @@ -1715,6 +1704,13 @@ PreviewWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) } break; } + case WM_UPDATECOMMANDSTATE: + { + PPREVIEW_DATA pData = Preview_GetData(g_hMainWnd); + if (g_ImageId == lParam) + SendMessage(pData->m_hwndToolBar, TB_ENABLEBUTTON, LOWORD(wParam), HIWORD(wParam)); + break; + } default: { return DefWindowProcW(hwnd, uMsg, wParam, lParam); @@ -1738,6 +1734,7 @@ ImageView_Main(HWND hwnd, LPCWSTR szFileName) INITCOMMONCONTROLSEX Icc = { .dwSize = sizeof(Icc), .dwICC = ICC_WIN95_CLASSES }; InitCommonControlsEx(&Icc); + SetThreadPriority(GetCurrentThread(), THREAD_PRIORITY_ABOVE_NORMAL); // Give UI higher priority than background threads /* Initialize COM */ hrCoInit = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED | COINIT_DISABLE_OLE1DDE); diff --git a/dll/win32/shimgvw/shimgvw.h b/dll/win32/shimgvw/shimgvw.h index 279d08cd244..cdb6f975fa2 100644 --- a/dll/win32/shimgvw/shimgvw.h +++ b/dll/win32/shimgvw/shimgvw.h @@ -30,6 +30,8 @@ #include "resource.h" +#define WM_UPDATECOMMANDSTATE (WM_APP + 0) + extern HINSTANCE g_hInstance; extern GpImage *g_pImage; @@ -72,6 +74,8 @@ void Anime_Pause(PANIME pAnime); BOOL Anime_OnTimer(PANIME pAnime, WPARAM wParam); void DoShellContextMenuOnFile(HWND hwnd, PCWSTR File, LPARAM lParam); +void EnableCommandIfVerbExists(UINT ImageId, HWND hwnd, UINT CmdId, PCWSTR Verb, PCWSTR File); +void ShellExecuteVerb(HWND hwnd, PCWSTR Verb, PCWSTR File, BOOL Quit); void DisplayHelp(HWND hwnd); static inline LPVOID QuickAlloc(SIZE_T cbSize, BOOL bZero) diff --git a/dll/win32/shimgvw/util.c b/dll/win32/shimgvw/util.c index 290ad083fad..5a3b8d46294 100644 --- a/dll/win32/shimgvw/util.c +++ b/dll/win32/shimgvw/util.c @@ -47,11 +47,10 @@ static void ModifyShellContextMenu(IContextMenu *pCM, HMENU hMenu, UINT CmdIdFirst, PCWSTR Assoc) { HRESULT hr; - UINT id, i; - for (i = 0; i < GetMenuItemCount(hMenu); ++i) + for (UINT i = 0, c = GetMenuItemCount(hMenu); i < c; ++i) { WCHAR buf[200]; - id = GetMenuItemIdByPos(hMenu, i); + UINT id = GetMenuItemIdByPos(hMenu, i); if (id == (UINT)-1) continue; @@ -131,8 +130,8 @@ die: g_pContextMenu = NULL; } -void -DoShellContextMenuOnFile(HWND hwnd, PCWSTR File, LPARAM lParam) +HRESULT +GetUIObjectOfPath(HWND hwnd, PCWSTR File, REFIID riid, void **ppv) { HRESULT hr; IShellFolder *pSF; @@ -140,19 +139,110 @@ DoShellContextMenuOnFile(HWND hwnd, PCWSTR File, LPARAM lParam) PIDLIST_ABSOLUTE pidl = ILCreateFromPath(File); if (pidl && SUCCEEDED(SHBindToParent(pidl, IID_PPV_ARG(IShellFolder, &pSF), &pidlItem))) { - IContextMenu *pCM; - hr = IShellFolder_GetUIObjectOf(pSF, hwnd, 1, &pidlItem, &IID_IContextMenu, NULL, (void**)&pCM); + hr = IShellFolder_GetUIObjectOf(pSF, hwnd, 1, &pidlItem, riid, NULL, ppv); + IShellFolder_Release(pSF); + } + SHFree(pidl); + return hr; +} + +void +DoShellContextMenuOnFile(HWND hwnd, PCWSTR File, LPARAM lParam) +{ + IContextMenu *pCM; + HRESULT hr = GetUIObjectOfPath(hwnd, File, IID_PPV_ARG(IContextMenu, &pCM)); + if (SUCCEEDED(hr)) + { + DoShellContextMenu(hwnd, pCM, File, lParam); + IContextMenu_Release(pCM); + } +} + +typedef struct _ENABLECOMMANDDATA +{ + HWND hwnd; + PCWSTR Verb; + UINT CmdId; + UINT ImageId; + WCHAR File[ANYSIZE_ARRAY]; +} ENABLECOMMANDDATA; + +static DWORD CALLBACK +EnableCommandIfVerbExistsProc(LPVOID ThreadParam) +{ + enum { first = 1, last = 0x7fff }; + ENABLECOMMANDDATA *pData = ThreadParam; + IContextMenu *pCM; + HRESULT hr = GetUIObjectOfPath(pData->hwnd, pData->File, IID_PPV_ARG(IContextMenu, &pCM)); + if (SUCCEEDED(hr)) + { + HMENU hMenu = CreatePopupMenu(); + hr = IContextMenu_QueryContextMenu(pCM, hMenu, 0, first, last, CMF_NORMAL); if (SUCCEEDED(hr)) { - DoShellContextMenu(hwnd, pCM, File, lParam); - IContextMenu_Release(pCM); + for (UINT i = 0, c = GetMenuItemCount(hMenu); i < c; ++i) + { + WCHAR buf[200]; + UINT id = GetMenuItemIdByPos(hMenu, i); + if (id == (UINT)-1) + continue; + + *buf = UNICODE_NULL; + hr = IContextMenu_GetCommandString(pCM, id - first, GCS_VERBW, NULL, (char*)buf, _countof(buf)); + if (SUCCEEDED(hr) && !lstrcmpiW(buf, pData->Verb)) + { + PostMessageW(pData->hwnd, WM_UPDATECOMMANDSTATE, MAKELONG(pData->CmdId, TRUE), pData->ImageId); + break; + } + } } - IShellFolder_Release(pSF); + DestroyMenu(hMenu); + IContextMenu_Release(pCM); + } + SHFree(pData); + return 0; +} + +void +EnableCommandIfVerbExists(UINT ImageId, HWND hwnd, UINT CmdId, PCWSTR Verb, PCWSTR File) +{ + const SIZE_T cch = lstrlenW(File) + 1; + ENABLECOMMANDDATA *pData = SHAlloc(FIELD_OFFSET(ENABLECOMMANDDATA, File[cch])); + if (pData) + { + pData->hwnd = hwnd; + pData->Verb = Verb; // Note: This assumes the string is valid for the lifetime of the thread. + pData->CmdId = CmdId; + pData->ImageId = ImageId; + CopyMemory(pData->File, File, cch * sizeof(*File)); + SHCreateThread(EnableCommandIfVerbExistsProc, pData, CTF_COINIT | CTF_INSIST, NULL); } - SHFree(pidl); } -void DisplayHelp(HWND hwnd) +void +ShellExecuteVerb(HWND hwnd, PCWSTR Verb, PCWSTR File, BOOL Quit) +{ + SHELLEXECUTEINFOW sei = { sizeof(sei), SEE_MASK_INVOKEIDLIST | SEE_MASK_ASYNCOK }; + if (!*File) + return; + + sei.hwnd = hwnd; + sei.lpVerb = Verb; + sei.lpFile = File; + sei.nShow = SW_SHOW; + if (!ShellExecuteExW(&sei)) + { + DPRINT1("ShellExecuteExW(%ls, %ls) failed with code %ld\n", Verb, File, GetLastError()); + } + else if (Quit) + { + // Destroy the window to quit the application + DestroyWindow(hwnd); + } +} + +void +DisplayHelp(HWND hwnd) { SHELL_ErrorBox(hwnd, ERROR_NOT_SUPPORTED); }

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
8139
Older →

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