Ros-diffs March 2025

ros-diffs@reactos.org

15 participants
66 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

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2025