Ros-diffs September 2019

ros-diffs@reactos.org

21 participants
115 discussions

[reactos] 01/01: [INF] Create missing registry keys on TCPIP install
by Eric Kohl 23 Sep '19

23 Sep '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a800c764fa11e100196f1… commit a800c764fa11e100196f1ea14b620b8835c36937 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Mon Sep 23 21:04:29 2019 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon Sep 23 21:04:29 2019 +0200 [INF] Create missing registry keys on TCPIP install Create missing subkeys in order to prevent errors on adapter enumeration. CORE-15231 --- media/inf/nettcpip.inf | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/media/inf/nettcpip.inf b/media/inf/nettcpip.inf index 92a51132197..eb21c968b17 100644 --- a/media/inf/nettcpip.inf +++ b/media/inf/nettcpip.inf @@ -242,7 +242,13 @@ StartType = 1 ErrorControl = 1 ServiceBinary = %12%\tcpip.sys LoadOrderGroup = PNP_TDI -AddReg = tcpip_AddReg +AddReg = tcpip_AddReg_Parameters, tcpip_AddReg + +[tcpip_AddReg_Parameters] +HKR,"Parameters",,0x00000010 +HKR,"Parameters\Adapters",,0x00000010 +HKR,"Parameters\Interfaces",,0x00000010 +HKR,"Parameters\PersistentRoutes",,0x00000010 [tcpip_AddReg] HKR,"Parameters","DataBasePath",0x00020000,"%SystemRoot%\System32\drivers\etc" @@ -253,7 +259,6 @@ HKR,"Parameters","ForwardBroadcasts",0x00010001,0x00000000 HKR,"Parameters","IPEnableRouter",0x00010001,0x00000000 HKR,"Parameters","SearchList",0x00000000,"" HKR,"Parameters","EnableSecurityFilters",0x00010001,0x00000000 -;HKR,"Parameters","PersistentRoutes",,0x00000010 [dhcp_Service_Inst] DisplayName = "DHCP Client"

1 0

[reactos] 01/01: [NTOS:KE] Fix 'Sert' typo, in a comment (#1929)
by Serge Gautherie 22 Sep '19

22 Sep '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=03392458590ad69a0d7b5… commit 03392458590ad69a0d7b519337a0c101b657a3a0 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Mon Sep 23 01:13:07 2019 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Sep 23 01:13:07 2019 +0200 [NTOS:KE] Fix 'Sert' typo, in a comment (#1929) --- ntoskrnl/ke/devqueue.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ntoskrnl/ke/devqueue.c b/ntoskrnl/ke/devqueue.c index c7b23c3db2c..d5fa21c5c71 100644 --- a/ntoskrnl/ke/devqueue.c +++ b/ntoskrnl/ke/devqueue.c @@ -65,7 +65,7 @@ KeInsertDeviceQueue(IN PKDEVICE_QUEUE DeviceQueue, &DeviceQueueEntry->DeviceListEntry); } - /* Sert the Insert state into the entry */ + /* Set the Insert state into the entry */ DeviceQueueEntry->Inserted = Inserted; /* Release the lock */

1 0

[reactos] 01/01: [COMCTL32] Workaround v6 button redraw regressions CORE-13278 & CORE-16093
by Joachim Henze 22 Sep '19

22 Sep '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a40331b0f4c0a423fae10… commit a40331b0f4c0a423fae101dfc976376d7c7db647 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Sun Sep 22 21:17:10 2019 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Sun Sep 22 21:17:10 2019 +0200 [COMCTL32] Workaround v6 button redraw regressions CORE-13278 & CORE-16093 Most likely not correct, as it breaks comctl32:buttonv6 tests https://reactos.org/testman/compare.php?ids=68146,68147 But greatly eliminates perceived flickering when hovering with the mouse about buttons in unthemed mode. We suffered from these regressions for years and nobody did find a proper solution, therefore it's time to at least workaround them. The patch did not expose any new real-world-issues after I retested the whole rapps suite against it in 0.4.12RCs. I committed the same workaround already into 0.4.12-RC-30-g 9513c9bf12926e82c6956910366e661539789933 CORE-13278 was once introduced/unhidden by SVN 73806 == c607de714cefce7ce0acc2cdf15837f3bcf3d6dd CORE-16093 was once introduced/unhidden by SVN 74149 == 301c47607451bbf47331983f842cb9470bfe53e5 --- dll/win32/comctl32/button.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dll/win32/comctl32/button.c b/dll/win32/comctl32/button.c index 1b345180870..37dab409b0d 100644 --- a/dll/win32/comctl32/button.c +++ b/dll/win32/comctl32/button.c @@ -842,7 +842,9 @@ static LRESULT CALLBACK BUTTON_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, L nmhotitem.dwFlags = HICF_ENTERING; SendMessageW(GetParent(hWnd), WM_NOTIFY, nmhotitem.hdr.idFrom, (LPARAM)&nmhotitem); - InvalidateRect(hWnd, NULL, TRUE); + theme = GetWindowTheme( hWnd ); + if (theme) + InvalidateRect(hWnd, NULL, TRUE); } if(!TrackMouseEvent(&mouse_event) || !(mouse_event.dwFlags&TME_LEAVE)) @@ -896,7 +898,9 @@ static LRESULT CALLBACK BUTTON_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, L nmhotitem.dwFlags = HICF_LEAVING; SendMessageW(GetParent(hWnd), WM_NOTIFY, nmhotitem.hdr.idFrom, (LPARAM)&nmhotitem); - InvalidateRect(hWnd, NULL, TRUE); + theme = GetWindowTheme( hWnd ); + if (theme) + InvalidateRect(hWnd, NULL, TRUE); } break; #else

1 0

[reactos] 01/01: [BROWSEUI] RC de-DE of Search feature & Folderoptions caption CORE-16392
by Joachim Henze 22 Sep '19

22 Sep '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b7f62b9bf96e0d7c56675… commit b7f62b9bf96e0d7c56675bc49075a9fad35459e1 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Sun Sep 22 19:11:39 2019 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Sun Sep 22 19:11:39 2019 +0200 [BROWSEUI] RC de-DE of Search feature & Folderoptions caption CORE-16392 --- dll/win32/browseui/lang/de-DE.rc | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/dll/win32/browseui/lang/de-DE.rc b/dll/win32/browseui/lang/de-DE.rc index f289479f692..5d2f14cf53f 100644 --- a/dll/win32/browseui/lang/de-DE.rc +++ b/dll/win32/browseui/lang/de-DE.rc @@ -154,19 +154,19 @@ IDD_SEARCH_DLG DIALOGEX 0, 0, 260, 85 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CAPTION | WS_DLGFRAME FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Search by any or all of the criteria below.", IDC_SEARCH_LABEL, 4, 2, 120, 20 + LTEXT "Suche nach allen oder einigen der folgenden Kriterien.", IDC_SEARCH_LABEL, 4, 2, 120, 20 - LTEXT "All or part &of the file name:", -1, 10, 30, 500, 10 + LTEXT "Dateiname oder &Ordnername:", -1, 10, 30, 500, 10 EDITTEXT IDC_SEARCH_FILENAME, 10, 40, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - LTEXT "A &word or phrase in the file:", -1, 10, 60, 500, 10 + LTEXT "&Enthaltener Text:", -1, 10, 60, 500, 10 EDITTEXT IDC_SEARCH_QUERY, 10, 70, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - LTEXT "&Look in:", -1, 10, 90, 500, 10 + LTEXT "&Suchen in:", -1, 10, 90, 500, 10 CONTROL "", IDC_SEARCH_COMBOBOX, WC_COMBOBOXEXW, WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN | WS_TABSTOP | CCS_NODIVIDER | CCS_NOMOVEY | CBS_OWNERDRAWFIXED, 10, 100, 200, 200 - DEFPUSHBUTTON "Sea&rch", IDC_SEARCH_BUTTON, 80, 130, 40, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&Stop", IDC_SEARCH_STOP_BUTTON, 80, 130, 40, 15, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "&Jetzt suchen", IDC_SEARCH_BUTTON, 80, 130, 40, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "Abbrec&hen", IDC_SEARCH_STOP_BUTTON, 80, 130, 40, 15, WS_GROUP | WS_TABSTOP CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER | PBS_MARQUEE, 10, 150, 200, 8 END @@ -325,7 +325,7 @@ STRINGTABLE BEGIN IDS_BACK "Zurück zu %s" IDS_FORWARD "Vorwärts zu %s" - IDS_FOLDER_OPTIONS "Folder Options" + IDS_FOLDER_OPTIONS "Ordneroptionen" END @@ -343,11 +343,11 @@ END STRINGTABLE BEGIN - IDS_SEARCHINVALID "'%1' is not a valid folder." - IDS_SEARCH_FOLDER "Searching %s" - IDS_SEARCH_FILES_FOUND "%u files found" - IDS_SEARCH_OPEN_FOLDER "Open Containing &Folder" + IDS_SEARCHINVALID "'%1' ist kein gültiger Ordner." + IDS_SEARCH_FOLDER "%s wird durchsucht" + IDS_SEARCH_FILES_FOUND "%u Objekte gefunden" + IDS_SEARCH_OPEN_FOLDER "Übergeordneten Ordner ö&ffnen" IDS_COL_NAME "Name" - IDS_COL_LOCATION "In Folder" - IDS_COL_RELEVANCE "Relevance" + IDS_COL_LOCATION "In Ordner" + IDS_COL_RELEVANCE "Relevanz" END

1 0

[reactos] 01/01: [SHELL] IPersistFolder::Initialize takes a PCIDLIST_ABSOLUTE. CORE-16385
by Thomas Faber 22 Sep '19

22 Sep '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c2b476bd77673d0285f3a… commit c2b476bd77673d0285f3aa3f3c9a935f7e530a01 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Fri Sep 20 12:19:34 2019 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Sep 22 16:19:11 2019 +0200 [SHELL] IPersistFolder::Initialize takes a PCIDLIST_ABSOLUTE. CORE-16385 --- dll/shellext/ntobjshex/foldercommon.h | 2 +- dll/shellext/ntobjshex/ntobjfolder.cpp | 4 ++-- dll/shellext/ntobjshex/ntobjfolder.h | 4 ++-- dll/shellext/ntobjshex/regfolder.cpp | 4 ++-- dll/shellext/ntobjshex/regfolder.h | 4 ++-- dll/shellext/zipfldr/CZipFolder.hpp | 2 +- dll/win32/browseui/aclistisf.cpp | 2 +- dll/win32/browseui/aclistisf.h | 2 +- dll/win32/browseui/shellfind/CFindFolder.cpp | 2 +- dll/win32/browseui/shellfind/CFindFolder.h | 2 +- dll/win32/shell32/folders/CAdminToolsFolder.cpp | 2 +- dll/win32/shell32/folders/CAdminToolsFolder.h | 2 +- dll/win32/shell32/folders/CControlPanelFolder.cpp | 2 +- dll/win32/shell32/folders/CControlPanelFolder.h | 2 +- dll/win32/shell32/folders/CDesktopFolder.h | 2 +- dll/win32/shell32/folders/CDrivesFolder.h | 2 +- dll/win32/shell32/folders/CFSFolder.h | 2 +- dll/win32/shell32/folders/CFontsFolder.cpp | 2 +- dll/win32/shell32/folders/CFontsFolder.h | 2 +- dll/win32/shell32/folders/CMyDocsFolder.cpp | 2 +- dll/win32/shell32/folders/CMyDocsFolder.h | 2 +- dll/win32/shell32/folders/CNetFolder.cpp | 2 +- dll/win32/shell32/folders/CNetFolder.h | 2 +- dll/win32/shell32/folders/CPrinterFolder.cpp | 2 +- dll/win32/shell32/folders/CPrinterFolder.h | 2 +- dll/win32/shell32/folders/CRecycleBin.cpp | 2 +- dll/win32/shell32/folders/CRecycleBin.h | 2 +- dll/win32/shell32/shellmenu/CMergedFolder.cpp | 2 +- dll/win32/shell32/shellmenu/CMergedFolder.h | 2 +- sdk/include/psdk/shobjidl.idl | 2 +- 30 files changed, 34 insertions(+), 34 deletions(-) diff --git a/dll/shellext/ntobjshex/foldercommon.h b/dll/shellext/ntobjshex/foldercommon.h index 2780d637550..ae04fd40d85 100644 --- a/dll/shellext/ntobjshex/foldercommon.h +++ b/dll/shellext/ntobjshex/foldercommon.h @@ -631,7 +631,7 @@ public: } // IPersistFolder - virtual HRESULT STDMETHODCALLTYPE Initialize(LPCITEMIDLIST pidl) + virtual HRESULT STDMETHODCALLTYPE Initialize(PCIDLIST_ABSOLUTE pidl) { m_shellPidl = ILClone(pidl); diff --git a/dll/shellext/ntobjshex/ntobjfolder.cpp b/dll/shellext/ntobjshex/ntobjfolder.cpp index 24571cad1ed..38a4cabadd7 100644 --- a/dll/shellext/ntobjshex/ntobjfolder.cpp +++ b/dll/shellext/ntobjshex/ntobjfolder.cpp @@ -198,7 +198,7 @@ HRESULT STDMETHODCALLTYPE CNtObjectFolder::InternalBindToObject( } // IPersistFolder -HRESULT STDMETHODCALLTYPE CNtObjectFolder::Initialize(LPCITEMIDLIST pidl) +HRESULT STDMETHODCALLTYPE CNtObjectFolder::Initialize(PCIDLIST_ABSOLUTE pidl) { m_shellPidl = ILClone(pidl); @@ -208,7 +208,7 @@ HRESULT STDMETHODCALLTYPE CNtObjectFolder::Initialize(LPCITEMIDLIST pidl) } // Internal -HRESULT STDMETHODCALLTYPE CNtObjectFolder::Initialize(LPCITEMIDLIST pidl, PCWSTR ntPath) +HRESULT STDMETHODCALLTYPE CNtObjectFolder::Initialize(PCIDLIST_ABSOLUTE pidl, PCWSTR ntPath) { m_shellPidl = ILClone(pidl); diff --git a/dll/shellext/ntobjshex/ntobjfolder.h b/dll/shellext/ntobjshex/ntobjfolder.h index 5192e29856e..556ce571528 100644 --- a/dll/shellext/ntobjshex/ntobjfolder.h +++ b/dll/shellext/ntobjshex/ntobjfolder.h @@ -97,10 +97,10 @@ public: SHCOLUMNID *pscid); // IPersistFolder - virtual HRESULT STDMETHODCALLTYPE Initialize(LPCITEMIDLIST pidl); + virtual HRESULT STDMETHODCALLTYPE Initialize(PCIDLIST_ABSOLUTE pidl); // Internal - HRESULT STDMETHODCALLTYPE Initialize(LPCITEMIDLIST pidl, PCWSTR ntPath); + HRESULT STDMETHODCALLTYPE Initialize(PCIDLIST_ABSOLUTE pidl, PCWSTR ntPath); protected: virtual HRESULT STDMETHODCALLTYPE CompareIDs(LPARAM lParam, const NtPidlEntry * first, const NtPidlEntry * second); diff --git a/dll/shellext/ntobjshex/regfolder.cpp b/dll/shellext/ntobjshex/regfolder.cpp index a314ad70a65..c75c79cb158 100644 --- a/dll/shellext/ntobjshex/regfolder.cpp +++ b/dll/shellext/ntobjshex/regfolder.cpp @@ -136,7 +136,7 @@ HRESULT STDMETHODCALLTYPE CRegistryFolder::InternalBindToObject( return ShellObjectCreatorInit<CRegistryFolder>(fullPidl, path, m_hRoot, IID_PPV_ARG(IShellFolder, ppsfChild)); } -HRESULT STDMETHODCALLTYPE CRegistryFolder::Initialize(LPCITEMIDLIST pidl) +HRESULT STDMETHODCALLTYPE CRegistryFolder::Initialize(PCIDLIST_ABSOLUTE pidl) { m_shellPidl = ILClone(pidl); m_hRoot = NULL; @@ -145,7 +145,7 @@ HRESULT STDMETHODCALLTYPE CRegistryFolder::Initialize(LPCITEMIDLIST pidl) return S_OK; } -HRESULT STDMETHODCALLTYPE CRegistryFolder::Initialize(LPCITEMIDLIST pidl, PCWSTR ntPath, HKEY hRoot) +HRESULT STDMETHODCALLTYPE CRegistryFolder::Initialize(PCIDLIST_ABSOLUTE pidl, PCWSTR ntPath, HKEY hRoot) { m_shellPidl = ILClone(pidl); m_hRoot = hRoot; diff --git a/dll/shellext/ntobjshex/regfolder.h b/dll/shellext/ntobjshex/regfolder.h index 1de5db47863..08f687f8ce7 100644 --- a/dll/shellext/ntobjshex/regfolder.h +++ b/dll/shellext/ntobjshex/regfolder.h @@ -94,10 +94,10 @@ public: SHCOLUMNID *pscid); // IPersistFolder - virtual HRESULT STDMETHODCALLTYPE Initialize(LPCITEMIDLIST pidl); + virtual HRESULT STDMETHODCALLTYPE Initialize(PCIDLIST_ABSOLUTE pidl); // Internal - virtual HRESULT STDMETHODCALLTYPE Initialize(LPCITEMIDLIST pidl, PCWSTR ntPath, HKEY hRoot); + virtual HRESULT STDMETHODCALLTYPE Initialize(PCIDLIST_ABSOLUTE pidl, PCWSTR ntPath, HKEY hRoot); protected: virtual HRESULT STDMETHODCALLTYPE CompareIDs(LPARAM lParam, const RegPidlEntry * first, const RegPidlEntry * second); diff --git a/dll/shellext/zipfldr/CZipFolder.hpp b/dll/shellext/zipfldr/CZipFolder.hpp index e2407452eaf..e56ea3aedcd 100644 --- a/dll/shellext/zipfldr/CZipFolder.hpp +++ b/dll/shellext/zipfldr/CZipFolder.hpp @@ -605,7 +605,7 @@ public: } // *** IPersistFolder methods *** - STDMETHODIMP Initialize(LPCITEMIDLIST pidl) + STDMETHODIMP Initialize(PCIDLIST_ABSOLUTE pidl) { WCHAR tmpPath[MAX_PATH]; diff --git a/dll/win32/browseui/aclistisf.cpp b/dll/win32/browseui/aclistisf.cpp index b1bc8b7dfa1..72045b3a14e 100644 --- a/dll/win32/browseui/aclistisf.cpp +++ b/dll/win32/browseui/aclistisf.cpp @@ -95,7 +95,7 @@ HRESULT STDMETHODCALLTYPE CACListISF::GetClassID(CLSID *pClassID) } // *** IPersistFolder methods *** -HRESULT STDMETHODCALLTYPE CACListISF::Initialize(LPCITEMIDLIST pidl) +HRESULT STDMETHODCALLTYPE CACListISF::Initialize(PCIDLIST_ABSOLUTE pidl) { TRACE("(%p, %p)\n", this, pidl); return S_OK; diff --git a/dll/win32/browseui/aclistisf.h b/dll/win32/browseui/aclistisf.h index e50c309c6d0..ddb530946da 100644 --- a/dll/win32/browseui/aclistisf.h +++ b/dll/win32/browseui/aclistisf.h @@ -55,7 +55,7 @@ public: virtual HRESULT STDMETHODCALLTYPE GetClassID(CLSID *pClassID); // *** IPersistFolder methods *** - virtual HRESULT STDMETHODCALLTYPE Initialize(LPCITEMIDLIST pidl); + virtual HRESULT STDMETHODCALLTYPE Initialize(PCIDLIST_ABSOLUTE pidl); public: diff --git a/dll/win32/browseui/shellfind/CFindFolder.cpp b/dll/win32/browseui/shellfind/CFindFolder.cpp index 749fe927f4f..0a2aec890ac 100644 --- a/dll/win32/browseui/shellfind/CFindFolder.cpp +++ b/dll/win32/browseui/shellfind/CFindFolder.cpp @@ -681,7 +681,7 @@ STDMETHODIMP CFindFolder::GetCurFolder(PIDLIST_ABSOLUTE *pidl) } // *** IPersistFolder methods *** -STDMETHODIMP CFindFolder::Initialize(LPCITEMIDLIST pidl) +STDMETHODIMP CFindFolder::Initialize(PCIDLIST_ABSOLUTE pidl) { m_pidl = ILClone(pidl); if (!m_pidl) diff --git a/dll/win32/browseui/shellfind/CFindFolder.h b/dll/win32/browseui/shellfind/CFindFolder.h index 43be568b38e..a19651bde49 100644 --- a/dll/win32/browseui/shellfind/CFindFolder.h +++ b/dll/win32/browseui/shellfind/CFindFolder.h @@ -77,7 +77,7 @@ private: // *** IPersistFolder methods *** - STDMETHODIMP Initialize(LPCITEMIDLIST pidl); + STDMETHODIMP Initialize(PCIDLIST_ABSOLUTE pidl); // *** IPersist methods *** diff --git a/dll/win32/shell32/folders/CAdminToolsFolder.cpp b/dll/win32/shell32/folders/CAdminToolsFolder.cpp index f461a8b57e8..25ecc244e1f 100644 --- a/dll/win32/shell32/folders/CAdminToolsFolder.cpp +++ b/dll/win32/shell32/folders/CAdminToolsFolder.cpp @@ -168,7 +168,7 @@ HRESULT WINAPI CAdminToolsFolder::GetClassID(CLSID *lpClassId) return S_OK; } -HRESULT WINAPI CAdminToolsFolder::Initialize(LPCITEMIDLIST pidl) +HRESULT WINAPI CAdminToolsFolder::Initialize(PCIDLIST_ABSOLUTE pidl) { m_pidlInner = ILClone(pidl); if (!m_pidlInner) diff --git a/dll/win32/shell32/folders/CAdminToolsFolder.h b/dll/win32/shell32/folders/CAdminToolsFolder.h index 25478f0a883..e87a87f96d0 100644 --- a/dll/win32/shell32/folders/CAdminToolsFolder.h +++ b/dll/win32/shell32/folders/CAdminToolsFolder.h @@ -60,7 +60,7 @@ class CAdminToolsFolder : virtual HRESULT WINAPI GetClassID(CLSID *lpClassId); // IPersistFolder - virtual HRESULT WINAPI Initialize(LPCITEMIDLIST pidl); + virtual HRESULT WINAPI Initialize(PCIDLIST_ABSOLUTE pidl); // IPersistFolder2 virtual HRESULT WINAPI GetCurFolder(PIDLIST_ABSOLUTE * pidl); diff --git a/dll/win32/shell32/folders/CControlPanelFolder.cpp b/dll/win32/shell32/folders/CControlPanelFolder.cpp index 2782ad85a8d..53bd9cb6313 100644 --- a/dll/win32/shell32/folders/CControlPanelFolder.cpp +++ b/dll/win32/shell32/folders/CControlPanelFolder.cpp @@ -614,7 +614,7 @@ HRESULT WINAPI CControlPanelFolder::GetClassID(CLSID *lpClassId) * * NOTES: it makes no sense to change the pidl */ -HRESULT WINAPI CControlPanelFolder::Initialize(LPCITEMIDLIST pidl) +HRESULT WINAPI CControlPanelFolder::Initialize(PCIDLIST_ABSOLUTE pidl) { if (pidlRoot) SHFree((LPVOID)pidlRoot); diff --git a/dll/win32/shell32/folders/CControlPanelFolder.h b/dll/win32/shell32/folders/CControlPanelFolder.h index e3ced8697e5..1fa7969aff4 100644 --- a/dll/win32/shell32/folders/CControlPanelFolder.h +++ b/dll/win32/shell32/folders/CControlPanelFolder.h @@ -65,7 +65,7 @@ class CControlPanelFolder : virtual HRESULT WINAPI GetClassID(CLSID *lpClassId); // IPersistFolder - virtual HRESULT WINAPI Initialize(LPCITEMIDLIST pidl); + virtual HRESULT WINAPI Initialize(PCIDLIST_ABSOLUTE pidl); // IPersistFolder2 virtual HRESULT WINAPI GetCurFolder(PIDLIST_ABSOLUTE * pidl); diff --git a/dll/win32/shell32/folders/CDesktopFolder.h b/dll/win32/shell32/folders/CDesktopFolder.h index 90de48f619b..3ac844323aa 100644 --- a/dll/win32/shell32/folders/CDesktopFolder.h +++ b/dll/win32/shell32/folders/CDesktopFolder.h @@ -71,7 +71,7 @@ class CDesktopFolder : virtual HRESULT WINAPI GetClassID(CLSID *lpClassId); // *** IPersistFolder methods *** - virtual HRESULT WINAPI Initialize(LPCITEMIDLIST pidl); + virtual HRESULT WINAPI Initialize(PCIDLIST_ABSOLUTE pidl); // *** IPersistFolder2 methods *** virtual HRESULT WINAPI GetCurFolder(PIDLIST_ABSOLUTE * pidl); diff --git a/dll/win32/shell32/folders/CDrivesFolder.h b/dll/win32/shell32/folders/CDrivesFolder.h index 8d37ac216fe..21a04ea05af 100644 --- a/dll/win32/shell32/folders/CDrivesFolder.h +++ b/dll/win32/shell32/folders/CDrivesFolder.h @@ -65,7 +65,7 @@ class CDrivesFolder : virtual HRESULT WINAPI GetClassID(CLSID *lpClassId); // IPersistFolder - virtual HRESULT WINAPI Initialize(LPCITEMIDLIST pidl); + virtual HRESULT WINAPI Initialize(PCIDLIST_ABSOLUTE pidl); // IPersistFolder2 virtual HRESULT WINAPI GetCurFolder(PIDLIST_ABSOLUTE * pidl); diff --git a/dll/win32/shell32/folders/CFSFolder.h b/dll/win32/shell32/folders/CFSFolder.h index 11276c7ec6a..39b5c09ca2b 100644 --- a/dll/win32/shell32/folders/CFSFolder.h +++ b/dll/win32/shell32/folders/CFSFolder.h @@ -73,7 +73,7 @@ class CFSFolder : virtual HRESULT WINAPI GetClassID(CLSID *lpClassId); // IPersistFolder - virtual HRESULT WINAPI Initialize(LPCITEMIDLIST pidl); + virtual HRESULT WINAPI Initialize(PCIDLIST_ABSOLUTE pidl); // IPersistFolder2 virtual HRESULT WINAPI GetCurFolder(PIDLIST_ABSOLUTE * pidl); diff --git a/dll/win32/shell32/folders/CFontsFolder.cpp b/dll/win32/shell32/folders/CFontsFolder.cpp index 355354cec20..b094c4dc805 100644 --- a/dll/win32/shell32/folders/CFontsFolder.cpp +++ b/dll/win32/shell32/folders/CFontsFolder.cpp @@ -169,7 +169,7 @@ HRESULT WINAPI CFontsFolder::GetClassID(CLSID *lpClassId) return S_OK; } -HRESULT WINAPI CFontsFolder::Initialize(LPCITEMIDLIST pidl) +HRESULT WINAPI CFontsFolder::Initialize(PCIDLIST_ABSOLUTE pidl) { m_pidlInner = ILClone(pidl); if (!m_pidlInner) diff --git a/dll/win32/shell32/folders/CFontsFolder.h b/dll/win32/shell32/folders/CFontsFolder.h index 0229485514d..02345a3cf1d 100644 --- a/dll/win32/shell32/folders/CFontsFolder.h +++ b/dll/win32/shell32/folders/CFontsFolder.h @@ -60,7 +60,7 @@ class CFontsFolder : virtual HRESULT WINAPI GetClassID(CLSID *lpClassId); // IPersistFolder - virtual HRESULT WINAPI Initialize(LPCITEMIDLIST pidl); + virtual HRESULT WINAPI Initialize(PCIDLIST_ABSOLUTE pidl); // IPersistFolder2 virtual HRESULT WINAPI GetCurFolder(PIDLIST_ABSOLUTE *pidl); diff --git a/dll/win32/shell32/folders/CMyDocsFolder.cpp b/dll/win32/shell32/folders/CMyDocsFolder.cpp index 8c28b6711eb..ae7e4673b90 100644 --- a/dll/win32/shell32/folders/CMyDocsFolder.cpp +++ b/dll/win32/shell32/folders/CMyDocsFolder.cpp @@ -168,7 +168,7 @@ HRESULT WINAPI CMyDocsFolder::GetClassID(CLSID *lpClassId) return S_OK; } -HRESULT WINAPI CMyDocsFolder::Initialize(LPCITEMIDLIST pidl) +HRESULT WINAPI CMyDocsFolder::Initialize(PCIDLIST_ABSOLUTE pidl) { m_pidlInner = ILClone(pidl); if (!m_pidlInner) diff --git a/dll/win32/shell32/folders/CMyDocsFolder.h b/dll/win32/shell32/folders/CMyDocsFolder.h index 7c0e521ccd9..9f89621fae1 100644 --- a/dll/win32/shell32/folders/CMyDocsFolder.h +++ b/dll/win32/shell32/folders/CMyDocsFolder.h @@ -60,7 +60,7 @@ class CMyDocsFolder : virtual HRESULT WINAPI GetClassID(CLSID *lpClassId); // IPersistFolder - virtual HRESULT WINAPI Initialize(LPCITEMIDLIST pidl); + virtual HRESULT WINAPI Initialize(PCIDLIST_ABSOLUTE pidl); // IPersistFolder2 virtual HRESULT WINAPI GetCurFolder(PIDLIST_ABSOLUTE * pidl); diff --git a/dll/win32/shell32/folders/CNetFolder.cpp b/dll/win32/shell32/folders/CNetFolder.cpp index a2384b1117b..93d91ab6dbb 100644 --- a/dll/win32/shell32/folders/CNetFolder.cpp +++ b/dll/win32/shell32/folders/CNetFolder.cpp @@ -571,7 +571,7 @@ HRESULT WINAPI CNetFolder::GetClassID(CLSID *lpClassId) * * NOTES: it makes no sense to change the pidl */ -HRESULT WINAPI CNetFolder::Initialize(LPCITEMIDLIST pidl) +HRESULT WINAPI CNetFolder::Initialize(PCIDLIST_ABSOLUTE pidl) { if (pidlRoot) SHFree((LPVOID)pidlRoot); diff --git a/dll/win32/shell32/folders/CNetFolder.h b/dll/win32/shell32/folders/CNetFolder.h index 7a540db92d3..33d807d8fe5 100644 --- a/dll/win32/shell32/folders/CNetFolder.h +++ b/dll/win32/shell32/folders/CNetFolder.h @@ -62,7 +62,7 @@ class CNetFolder : virtual HRESULT WINAPI GetClassID(CLSID *lpClassId); // IPersistFolder - virtual HRESULT WINAPI Initialize(LPCITEMIDLIST pidl); + virtual HRESULT WINAPI Initialize(PCIDLIST_ABSOLUTE pidl); // IPersistFolder2 virtual HRESULT WINAPI GetCurFolder(PIDLIST_ABSOLUTE * pidl); diff --git a/dll/win32/shell32/folders/CPrinterFolder.cpp b/dll/win32/shell32/folders/CPrinterFolder.cpp index 69565afb6a7..83290cce1aa 100644 --- a/dll/win32/shell32/folders/CPrinterFolder.cpp +++ b/dll/win32/shell32/folders/CPrinterFolder.cpp @@ -479,7 +479,7 @@ HRESULT WINAPI CPrinterFolder::GetClassID(CLSID *lpClassId) /************************************************************************ * CPrinterFolder::Initialize */ -HRESULT WINAPI CPrinterFolder::Initialize(LPCITEMIDLIST pidl) +HRESULT WINAPI CPrinterFolder::Initialize(PCIDLIST_ABSOLUTE pidl) { if (pidlRoot) SHFree((LPVOID)pidlRoot); diff --git a/dll/win32/shell32/folders/CPrinterFolder.h b/dll/win32/shell32/folders/CPrinterFolder.h index 5ba34082afb..18daf653f53 100644 --- a/dll/win32/shell32/folders/CPrinterFolder.h +++ b/dll/win32/shell32/folders/CPrinterFolder.h @@ -65,7 +65,7 @@ class CPrinterFolder : virtual HRESULT WINAPI GetClassID(CLSID *lpClassId); // IPersistFolder - virtual HRESULT WINAPI Initialize(LPCITEMIDLIST pidl); + virtual HRESULT WINAPI Initialize(PCIDLIST_ABSOLUTE pidl); // IPersistFolder2 virtual HRESULT WINAPI GetCurFolder(PIDLIST_ABSOLUTE * pidl); diff --git a/dll/win32/shell32/folders/CRecycleBin.cpp b/dll/win32/shell32/folders/CRecycleBin.cpp index 5a6b72bab7f..23e7e201f12 100644 --- a/dll/win32/shell32/folders/CRecycleBin.cpp +++ b/dll/win32/shell32/folders/CRecycleBin.cpp @@ -432,7 +432,7 @@ HRESULT WINAPI CRecycleBin::GetClassID(CLSID *pClassID) return S_OK; } -HRESULT WINAPI CRecycleBin::Initialize(LPCITEMIDLIST pidl) +HRESULT WINAPI CRecycleBin::Initialize(PCIDLIST_ABSOLUTE pidl) { TRACE("(%p, %p)\n", this, pidl); diff --git a/dll/win32/shell32/folders/CRecycleBin.h b/dll/win32/shell32/folders/CRecycleBin.h index de62270dfdf..80945c42376 100644 --- a/dll/win32/shell32/folders/CRecycleBin.h +++ b/dll/win32/shell32/folders/CRecycleBin.h @@ -46,7 +46,7 @@ class CRecycleBin : // IPersistFolder virtual HRESULT WINAPI GetClassID(CLSID *pClassID); - virtual HRESULT WINAPI Initialize(LPCITEMIDLIST pidl); + virtual HRESULT WINAPI Initialize(PCIDLIST_ABSOLUTE pidl); // IPersistFolder2 virtual HRESULT WINAPI GetCurFolder(PIDLIST_ABSOLUTE * pidl); diff --git a/dll/win32/shell32/shellmenu/CMergedFolder.cpp b/dll/win32/shell32/shellmenu/CMergedFolder.cpp index 04a2fd4a49b..17337d0e09c 100644 --- a/dll/win32/shell32/shellmenu/CMergedFolder.cpp +++ b/dll/win32/shell32/shellmenu/CMergedFolder.cpp @@ -697,7 +697,7 @@ HRESULT STDMETHODCALLTYPE CMergedFolder::GetClassID(CLSID *lpClassId) } // IPersistFolder -HRESULT STDMETHODCALLTYPE CMergedFolder::Initialize(LPCITEMIDLIST pidl) +HRESULT STDMETHODCALLTYPE CMergedFolder::Initialize(PCIDLIST_ABSOLUTE pidl) { m_shellPidl = ILClone(pidl); return S_OK; diff --git a/dll/win32/shell32/shellmenu/CMergedFolder.h b/dll/win32/shell32/shellmenu/CMergedFolder.h index c4c10acb440..4bc9ee20278 100644 --- a/dll/win32/shell32/shellmenu/CMergedFolder.h +++ b/dll/win32/shell32/shellmenu/CMergedFolder.h @@ -191,7 +191,7 @@ public: virtual HRESULT STDMETHODCALLTYPE GetClassID(CLSID *lpClassId); // IPersistFolder - virtual HRESULT STDMETHODCALLTYPE Initialize(LPCITEMIDLIST pidl); + virtual HRESULT STDMETHODCALLTYPE Initialize(PCIDLIST_ABSOLUTE pidl); // IPersistFolder2 virtual HRESULT STDMETHODCALLTYPE GetCurFolder(PIDLIST_ABSOLUTE * pidl); diff --git a/sdk/include/psdk/shobjidl.idl b/sdk/include/psdk/shobjidl.idl index 7c2aab3d51e..f8fb81adcd4 100644 --- a/sdk/include/psdk/shobjidl.idl +++ b/sdk/include/psdk/shobjidl.idl @@ -53,7 +53,7 @@ interface IPersistFolder : IPersist { typedef IPersistFolder *LPPERSISTFOLDER; - HRESULT Initialize( [in] LPCITEMIDLIST pidl ); + HRESULT Initialize( [in] PCIDLIST_ABSOLUTE pidl ); }

1 0

[reactos] 02/02: [SHELL] IPersistFolder2::GetCurFolder takes a PIDLIST_ABSOLUTE*. CORE-16385
by Thomas Faber 22 Sep '19

22 Sep '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b90c24d6408ab9fc14480… commit b90c24d6408ab9fc14480b3931c0cc79661be664 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Tue Sep 10 12:24:11 2019 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Sep 22 16:19:09 2019 +0200 [SHELL] IPersistFolder2::GetCurFolder takes a PIDLIST_ABSOLUTE*. CORE-16385 --- dll/shellext/ntobjshex/foldercommon.h | 2 +- dll/shellext/zipfldr/CZipFolder.hpp | 2 +- dll/win32/browseui/shellfind/CFindFolder.cpp | 2 +- dll/win32/browseui/shellfind/CFindFolder.h | 2 +- dll/win32/shell32/CDefaultContextMenu.cpp | 2 +- dll/win32/shell32/folders/CAdminToolsFolder.cpp | 2 +- dll/win32/shell32/folders/CAdminToolsFolder.h | 2 +- dll/win32/shell32/folders/CControlPanelFolder.cpp | 2 +- dll/win32/shell32/folders/CControlPanelFolder.h | 2 +- dll/win32/shell32/folders/CDesktopFolder.cpp | 2 +- dll/win32/shell32/folders/CDesktopFolder.h | 2 +- dll/win32/shell32/folders/CDrivesFolder.cpp | 2 +- dll/win32/shell32/folders/CDrivesFolder.h | 2 +- dll/win32/shell32/folders/CFSFolder.cpp | 2 +- dll/win32/shell32/folders/CFSFolder.h | 2 +- dll/win32/shell32/folders/CFontsFolder.cpp | 2 +- dll/win32/shell32/folders/CFontsFolder.h | 2 +- dll/win32/shell32/folders/CMyDocsFolder.cpp | 2 +- dll/win32/shell32/folders/CMyDocsFolder.h | 2 +- dll/win32/shell32/folders/CNetFolder.cpp | 2 +- dll/win32/shell32/folders/CNetFolder.h | 2 +- dll/win32/shell32/folders/CPrinterFolder.cpp | 2 +- dll/win32/shell32/folders/CPrinterFolder.h | 2 +- dll/win32/shell32/folders/CRecycleBin.cpp | 2 +- dll/win32/shell32/folders/CRecycleBin.h | 2 +- dll/win32/shell32/shellmenu/CMergedFolder.cpp | 2 +- dll/win32/shell32/shellmenu/CMergedFolder.h | 2 +- sdk/include/psdk/shobjidl.idl | 2 +- 28 files changed, 28 insertions(+), 28 deletions(-) diff --git a/dll/shellext/ntobjshex/foldercommon.h b/dll/shellext/ntobjshex/foldercommon.h index ce015b37b65..2780d637550 100644 --- a/dll/shellext/ntobjshex/foldercommon.h +++ b/dll/shellext/ntobjshex/foldercommon.h @@ -641,7 +641,7 @@ public: } // IPersistFolder2 - virtual HRESULT STDMETHODCALLTYPE GetCurFolder(LPITEMIDLIST * pidl) + virtual HRESULT STDMETHODCALLTYPE GetCurFolder(PIDLIST_ABSOLUTE * pidl) { if (pidl) *pidl = ILClone(m_shellPidl); diff --git a/dll/shellext/zipfldr/CZipFolder.hpp b/dll/shellext/zipfldr/CZipFolder.hpp index b5412639355..e2407452eaf 100644 --- a/dll/shellext/zipfldr/CZipFolder.hpp +++ b/dll/shellext/zipfldr/CZipFolder.hpp @@ -598,7 +598,7 @@ public: //STDMETHODIMP GetCurFile(LPOLESTR *ppszFileName); //// *** IPersistFolder2 methods *** - STDMETHODIMP GetCurFolder(LPITEMIDLIST * pidl) + STDMETHODIMP GetCurFolder(PIDLIST_ABSOLUTE * pidl) { *pidl = ILClone(m_CurDir); return S_OK; diff --git a/dll/win32/browseui/shellfind/CFindFolder.cpp b/dll/win32/browseui/shellfind/CFindFolder.cpp index f29aed1bcd4..749fe927f4f 100644 --- a/dll/win32/browseui/shellfind/CFindFolder.cpp +++ b/dll/win32/browseui/shellfind/CFindFolder.cpp @@ -674,7 +674,7 @@ STDMETHODIMP CFindFolder::MessageSFVCB(UINT uMsg, WPARAM wParam, LPARAM lParam) } //// *** IPersistFolder2 methods *** -STDMETHODIMP CFindFolder::GetCurFolder(LPITEMIDLIST *pidl) +STDMETHODIMP CFindFolder::GetCurFolder(PIDLIST_ABSOLUTE *pidl) { *pidl = ILClone(m_pidl); return S_OK; diff --git a/dll/win32/browseui/shellfind/CFindFolder.h b/dll/win32/browseui/shellfind/CFindFolder.h index ab866161b0f..43be568b38e 100644 --- a/dll/win32/browseui/shellfind/CFindFolder.h +++ b/dll/win32/browseui/shellfind/CFindFolder.h @@ -73,7 +73,7 @@ private: static DWORD WINAPI SearchThreadProc(LPVOID lpParameter); //// *** IPersistFolder2 methods *** - STDMETHODIMP GetCurFolder(LPITEMIDLIST *pidl); + STDMETHODIMP GetCurFolder(PIDLIST_ABSOLUTE *pidl); // *** IPersistFolder methods *** diff --git a/dll/win32/shell32/CDefaultContextMenu.cpp b/dll/win32/shell32/CDefaultContextMenu.cpp index a65e5a05ab3..a57b5324fce 100644 --- a/dll/win32/shell32/CDefaultContextMenu.cpp +++ b/dll/win32/shell32/CDefaultContextMenu.cpp @@ -233,7 +233,7 @@ HRESULT WINAPI CDefaultContextMenu::Initialize(const DEFCONTEXTMENU *pdcm, LPFND CComPtr<IPersistFolder2> pf = NULL; if (SUCCEEDED(m_psf->QueryInterface(IID_PPV_ARG(IPersistFolder2, &pf)))) { - if (FAILED(pf->GetCurFolder(reinterpret_cast<LPITEMIDLIST*>(&m_pidlFolder)))) + if (FAILED(pf->GetCurFolder(&m_pidlFolder))) ERR("GetCurFolder failed\n"); } TRACE("pidlFolder %p\n", m_pidlFolder); diff --git a/dll/win32/shell32/folders/CAdminToolsFolder.cpp b/dll/win32/shell32/folders/CAdminToolsFolder.cpp index 47a6415f6a3..f461a8b57e8 100644 --- a/dll/win32/shell32/folders/CAdminToolsFolder.cpp +++ b/dll/win32/shell32/folders/CAdminToolsFolder.cpp @@ -180,7 +180,7 @@ HRESULT WINAPI CAdminToolsFolder::Initialize(LPCITEMIDLIST pidl) IID_PPV_ARG(IShellFolder2, &m_pisfInner)); } -HRESULT WINAPI CAdminToolsFolder::GetCurFolder(LPITEMIDLIST *pidl) +HRESULT WINAPI CAdminToolsFolder::GetCurFolder(PIDLIST_ABSOLUTE *pidl) { if (!pidl) return E_POINTER; diff --git a/dll/win32/shell32/folders/CAdminToolsFolder.h b/dll/win32/shell32/folders/CAdminToolsFolder.h index f6cd79a2fe4..25478f0a883 100644 --- a/dll/win32/shell32/folders/CAdminToolsFolder.h +++ b/dll/win32/shell32/folders/CAdminToolsFolder.h @@ -63,7 +63,7 @@ class CAdminToolsFolder : virtual HRESULT WINAPI Initialize(LPCITEMIDLIST pidl); // IPersistFolder2 - virtual HRESULT WINAPI GetCurFolder(LPITEMIDLIST * pidl); + virtual HRESULT WINAPI GetCurFolder(PIDLIST_ABSOLUTE * pidl); DECLARE_REGISTRY_RESOURCEID(IDR_ADMINFOLDERSHORTCUT) DECLARE_NOT_AGGREGATABLE(CAdminToolsFolder) diff --git a/dll/win32/shell32/folders/CControlPanelFolder.cpp b/dll/win32/shell32/folders/CControlPanelFolder.cpp index 8dc2fbb5379..2782ad85a8d 100644 --- a/dll/win32/shell32/folders/CControlPanelFolder.cpp +++ b/dll/win32/shell32/folders/CControlPanelFolder.cpp @@ -638,7 +638,7 @@ HRESULT WINAPI CControlPanelFolder::Initialize(LPCITEMIDLIST pidl) /************************************************************************** * CControlPanelFolder::GetCurFolder */ -HRESULT WINAPI CControlPanelFolder::GetCurFolder(LPITEMIDLIST * pidl) +HRESULT WINAPI CControlPanelFolder::GetCurFolder(PIDLIST_ABSOLUTE * pidl) { TRACE("(%p)->(%p)\n", this, pidl); diff --git a/dll/win32/shell32/folders/CControlPanelFolder.h b/dll/win32/shell32/folders/CControlPanelFolder.h index a4966a3569f..e3ced8697e5 100644 --- a/dll/win32/shell32/folders/CControlPanelFolder.h +++ b/dll/win32/shell32/folders/CControlPanelFolder.h @@ -68,7 +68,7 @@ class CControlPanelFolder : virtual HRESULT WINAPI Initialize(LPCITEMIDLIST pidl); // IPersistFolder2 - virtual HRESULT WINAPI GetCurFolder(LPITEMIDLIST * pidl); + virtual HRESULT WINAPI GetCurFolder(PIDLIST_ABSOLUTE * pidl); DECLARE_REGISTRY_RESOURCEID(IDR_CONTROLPANEL) DECLARE_NOT_AGGREGATABLE(CControlPanelFolder) diff --git a/dll/win32/shell32/folders/CDesktopFolder.cpp b/dll/win32/shell32/folders/CDesktopFolder.cpp index 277499fbc41..ab34e0c9ae8 100644 --- a/dll/win32/shell32/folders/CDesktopFolder.cpp +++ b/dll/win32/shell32/folders/CDesktopFolder.cpp @@ -825,7 +825,7 @@ HRESULT WINAPI CDesktopFolder::Initialize(LPCITEMIDLIST pidl) return E_INVALIDARG; } -HRESULT WINAPI CDesktopFolder::GetCurFolder(LPITEMIDLIST * pidl) +HRESULT WINAPI CDesktopFolder::GetCurFolder(PIDLIST_ABSOLUTE * pidl) { TRACE ("(%p)->(%p)\n", this, pidl); diff --git a/dll/win32/shell32/folders/CDesktopFolder.h b/dll/win32/shell32/folders/CDesktopFolder.h index 76ee35fbf3b..90de48f619b 100644 --- a/dll/win32/shell32/folders/CDesktopFolder.h +++ b/dll/win32/shell32/folders/CDesktopFolder.h @@ -74,7 +74,7 @@ class CDesktopFolder : virtual HRESULT WINAPI Initialize(LPCITEMIDLIST pidl); // *** IPersistFolder2 methods *** - virtual HRESULT WINAPI GetCurFolder(LPITEMIDLIST * pidl); + virtual HRESULT WINAPI GetCurFolder(PIDLIST_ABSOLUTE * pidl); // IContextMenuCB virtual HRESULT WINAPI CallBack(IShellFolder *psf, HWND hwndOwner, IDataObject *pdtobj, UINT uMsg, WPARAM wParam, LPARAM lParam); diff --git a/dll/win32/shell32/folders/CDrivesFolder.cpp b/dll/win32/shell32/folders/CDrivesFolder.cpp index 17542eeea41..0f8810c066a 100644 --- a/dll/win32/shell32/folders/CDrivesFolder.cpp +++ b/dll/win32/shell32/folders/CDrivesFolder.cpp @@ -1062,7 +1062,7 @@ HRESULT WINAPI CDrivesFolder::Initialize(LPCITEMIDLIST pidl) /************************************************************************** * CDrivesFolder::GetCurFolder */ -HRESULT WINAPI CDrivesFolder::GetCurFolder(LPITEMIDLIST *pidl) +HRESULT WINAPI CDrivesFolder::GetCurFolder(PIDLIST_ABSOLUTE *pidl) { TRACE("(%p)->(%p)\n", this, pidl); diff --git a/dll/win32/shell32/folders/CDrivesFolder.h b/dll/win32/shell32/folders/CDrivesFolder.h index f83057d79dc..8d37ac216fe 100644 --- a/dll/win32/shell32/folders/CDrivesFolder.h +++ b/dll/win32/shell32/folders/CDrivesFolder.h @@ -68,7 +68,7 @@ class CDrivesFolder : virtual HRESULT WINAPI Initialize(LPCITEMIDLIST pidl); // IPersistFolder2 - virtual HRESULT WINAPI GetCurFolder(LPITEMIDLIST * pidl); + virtual HRESULT WINAPI GetCurFolder(PIDLIST_ABSOLUTE * pidl); // IContextMenuCB virtual HRESULT WINAPI CallBack(IShellFolder *psf, HWND hwndOwner, IDataObject *pdtobj, UINT uMsg, WPARAM wParam, LPARAM lParam); diff --git a/dll/win32/shell32/folders/CFSFolder.cpp b/dll/win32/shell32/folders/CFSFolder.cpp index 4ce2a2babe1..c475c2cf098 100644 --- a/dll/win32/shell32/folders/CFSFolder.cpp +++ b/dll/win32/shell32/folders/CFSFolder.cpp @@ -1398,7 +1398,7 @@ HRESULT WINAPI CFSFolder::Initialize(LPCITEMIDLIST pidl) /************************************************************************** * CFSFolder::GetCurFolder */ -HRESULT WINAPI CFSFolder::GetCurFolder(LPITEMIDLIST * pidl) +HRESULT WINAPI CFSFolder::GetCurFolder(PIDLIST_ABSOLUTE * pidl) { TRACE ("(%p)->(%p)\n", this, pidl); diff --git a/dll/win32/shell32/folders/CFSFolder.h b/dll/win32/shell32/folders/CFSFolder.h index 947ec92222d..11276c7ec6a 100644 --- a/dll/win32/shell32/folders/CFSFolder.h +++ b/dll/win32/shell32/folders/CFSFolder.h @@ -76,7 +76,7 @@ class CFSFolder : virtual HRESULT WINAPI Initialize(LPCITEMIDLIST pidl); // IPersistFolder2 - virtual HRESULT WINAPI GetCurFolder(LPITEMIDLIST * pidl); + virtual HRESULT WINAPI GetCurFolder(PIDLIST_ABSOLUTE * pidl); // IPersistFolder3 virtual HRESULT WINAPI InitializeEx(IBindCtx *pbc, LPCITEMIDLIST pidlRoot, const PERSIST_FOLDER_TARGET_INFO *ppfti); diff --git a/dll/win32/shell32/folders/CFontsFolder.cpp b/dll/win32/shell32/folders/CFontsFolder.cpp index 3b9a3d83434..355354cec20 100644 --- a/dll/win32/shell32/folders/CFontsFolder.cpp +++ b/dll/win32/shell32/folders/CFontsFolder.cpp @@ -181,7 +181,7 @@ HRESULT WINAPI CFontsFolder::Initialize(LPCITEMIDLIST pidl) IID_PPV_ARG(IShellFolder2, &m_pisfInner)); } -HRESULT WINAPI CFontsFolder::GetCurFolder(LPITEMIDLIST *pidl) +HRESULT WINAPI CFontsFolder::GetCurFolder(PIDLIST_ABSOLUTE *pidl) { if (!pidl) return E_POINTER; diff --git a/dll/win32/shell32/folders/CFontsFolder.h b/dll/win32/shell32/folders/CFontsFolder.h index e3b9205187c..0229485514d 100644 --- a/dll/win32/shell32/folders/CFontsFolder.h +++ b/dll/win32/shell32/folders/CFontsFolder.h @@ -63,7 +63,7 @@ class CFontsFolder : virtual HRESULT WINAPI Initialize(LPCITEMIDLIST pidl); // IPersistFolder2 - virtual HRESULT WINAPI GetCurFolder(LPITEMIDLIST *pidl); + virtual HRESULT WINAPI GetCurFolder(PIDLIST_ABSOLUTE *pidl); DECLARE_REGISTRY_RESOURCEID(IDR_FONTSFOLDERSHORTCUT) DECLARE_NOT_AGGREGATABLE(CFontsFolder) diff --git a/dll/win32/shell32/folders/CMyDocsFolder.cpp b/dll/win32/shell32/folders/CMyDocsFolder.cpp index f27448d811f..8c28b6711eb 100644 --- a/dll/win32/shell32/folders/CMyDocsFolder.cpp +++ b/dll/win32/shell32/folders/CMyDocsFolder.cpp @@ -180,7 +180,7 @@ HRESULT WINAPI CMyDocsFolder::Initialize(LPCITEMIDLIST pidl) IID_PPV_ARG(IShellFolder2, &m_pisfInner)); } -HRESULT WINAPI CMyDocsFolder::GetCurFolder(LPITEMIDLIST *pidl) +HRESULT WINAPI CMyDocsFolder::GetCurFolder(PIDLIST_ABSOLUTE *pidl) { if (!pidl) return E_POINTER; diff --git a/dll/win32/shell32/folders/CMyDocsFolder.h b/dll/win32/shell32/folders/CMyDocsFolder.h index b689a6719f2..7c0e521ccd9 100644 --- a/dll/win32/shell32/folders/CMyDocsFolder.h +++ b/dll/win32/shell32/folders/CMyDocsFolder.h @@ -63,7 +63,7 @@ class CMyDocsFolder : virtual HRESULT WINAPI Initialize(LPCITEMIDLIST pidl); // IPersistFolder2 - virtual HRESULT WINAPI GetCurFolder(LPITEMIDLIST * pidl); + virtual HRESULT WINAPI GetCurFolder(PIDLIST_ABSOLUTE * pidl); DECLARE_REGISTRY_RESOURCEID(IDR_MYDOCUMENTS) DECLARE_NOT_AGGREGATABLE(CMyDocsFolder) diff --git a/dll/win32/shell32/folders/CNetFolder.cpp b/dll/win32/shell32/folders/CNetFolder.cpp index 35e2ef7eb77..a2384b1117b 100644 --- a/dll/win32/shell32/folders/CNetFolder.cpp +++ b/dll/win32/shell32/folders/CNetFolder.cpp @@ -583,7 +583,7 @@ HRESULT WINAPI CNetFolder::Initialize(LPCITEMIDLIST pidl) /************************************************************************** * CNetFolder::GetCurFolder */ -HRESULT WINAPI CNetFolder::GetCurFolder(LPITEMIDLIST *pidl) +HRESULT WINAPI CNetFolder::GetCurFolder(PIDLIST_ABSOLUTE *pidl) { TRACE("(%p)->(%p)\n", this, pidl); diff --git a/dll/win32/shell32/folders/CNetFolder.h b/dll/win32/shell32/folders/CNetFolder.h index 33f65bf3191..7a540db92d3 100644 --- a/dll/win32/shell32/folders/CNetFolder.h +++ b/dll/win32/shell32/folders/CNetFolder.h @@ -65,7 +65,7 @@ class CNetFolder : virtual HRESULT WINAPI Initialize(LPCITEMIDLIST pidl); // IPersistFolder2 - virtual HRESULT WINAPI GetCurFolder(LPITEMIDLIST * pidl); + virtual HRESULT WINAPI GetCurFolder(PIDLIST_ABSOLUTE * pidl); DECLARE_REGISTRY_RESOURCEID(IDR_NETWORKPLACES) DECLARE_NOT_AGGREGATABLE(CNetFolder) diff --git a/dll/win32/shell32/folders/CPrinterFolder.cpp b/dll/win32/shell32/folders/CPrinterFolder.cpp index 85a89680f00..69565afb6a7 100644 --- a/dll/win32/shell32/folders/CPrinterFolder.cpp +++ b/dll/win32/shell32/folders/CPrinterFolder.cpp @@ -491,7 +491,7 @@ HRESULT WINAPI CPrinterFolder::Initialize(LPCITEMIDLIST pidl) /************************************************************************** * CPrinterFolder::GetCurFolder */ -HRESULT WINAPI CPrinterFolder::GetCurFolder(LPITEMIDLIST * pidl) +HRESULT WINAPI CPrinterFolder::GetCurFolder(PIDLIST_ABSOLUTE * pidl) { TRACE ("(%p)->(%p)\n", this, pidl); diff --git a/dll/win32/shell32/folders/CPrinterFolder.h b/dll/win32/shell32/folders/CPrinterFolder.h index 699338079ef..5ba34082afb 100644 --- a/dll/win32/shell32/folders/CPrinterFolder.h +++ b/dll/win32/shell32/folders/CPrinterFolder.h @@ -68,7 +68,7 @@ class CPrinterFolder : virtual HRESULT WINAPI Initialize(LPCITEMIDLIST pidl); // IPersistFolder2 - virtual HRESULT WINAPI GetCurFolder(LPITEMIDLIST * pidl); + virtual HRESULT WINAPI GetCurFolder(PIDLIST_ABSOLUTE * pidl); DECLARE_REGISTRY_RESOURCEID(IDR_PRINTERS) DECLARE_NOT_AGGREGATABLE(CPrinterFolder) diff --git a/dll/win32/shell32/folders/CRecycleBin.cpp b/dll/win32/shell32/folders/CRecycleBin.cpp index e2198897fdc..5a6b72bab7f 100644 --- a/dll/win32/shell32/folders/CRecycleBin.cpp +++ b/dll/win32/shell32/folders/CRecycleBin.cpp @@ -443,7 +443,7 @@ HRESULT WINAPI CRecycleBin::Initialize(LPCITEMIDLIST pidl) return S_OK; } -HRESULT WINAPI CRecycleBin::GetCurFolder(LPITEMIDLIST *ppidl) +HRESULT WINAPI CRecycleBin::GetCurFolder(PIDLIST_ABSOLUTE *ppidl) { TRACE("\n"); *ppidl = ILClone(pidl); diff --git a/dll/win32/shell32/folders/CRecycleBin.h b/dll/win32/shell32/folders/CRecycleBin.h index 1f3ea7bc784..de62270dfdf 100644 --- a/dll/win32/shell32/folders/CRecycleBin.h +++ b/dll/win32/shell32/folders/CRecycleBin.h @@ -49,7 +49,7 @@ class CRecycleBin : virtual HRESULT WINAPI Initialize(LPCITEMIDLIST pidl); // IPersistFolder2 - virtual HRESULT WINAPI GetCurFolder(LPITEMIDLIST * pidl); + virtual HRESULT WINAPI GetCurFolder(PIDLIST_ABSOLUTE * pidl); // IShellFolder virtual HRESULT WINAPI ParseDisplayName(HWND hwndOwner, LPBC pbc, LPOLESTR lpszDisplayName, DWORD *pchEaten, PIDLIST_RELATIVE *ppidl, DWORD *pdwAttributes); diff --git a/dll/win32/shell32/shellmenu/CMergedFolder.cpp b/dll/win32/shell32/shellmenu/CMergedFolder.cpp index 892c5011a7a..04a2fd4a49b 100644 --- a/dll/win32/shell32/shellmenu/CMergedFolder.cpp +++ b/dll/win32/shell32/shellmenu/CMergedFolder.cpp @@ -704,7 +704,7 @@ HRESULT STDMETHODCALLTYPE CMergedFolder::Initialize(LPCITEMIDLIST pidl) } // IPersistFolder2 -HRESULT STDMETHODCALLTYPE CMergedFolder::GetCurFolder(LPITEMIDLIST * pidl) +HRESULT STDMETHODCALLTYPE CMergedFolder::GetCurFolder(PIDLIST_ABSOLUTE * pidl) { if (pidl) *pidl = m_shellPidl; diff --git a/dll/win32/shell32/shellmenu/CMergedFolder.h b/dll/win32/shell32/shellmenu/CMergedFolder.h index ae0ab3e28c5..c4c10acb440 100644 --- a/dll/win32/shell32/shellmenu/CMergedFolder.h +++ b/dll/win32/shell32/shellmenu/CMergedFolder.h @@ -194,7 +194,7 @@ public: virtual HRESULT STDMETHODCALLTYPE Initialize(LPCITEMIDLIST pidl); // IPersistFolder2 - virtual HRESULT STDMETHODCALLTYPE GetCurFolder(LPITEMIDLIST * pidl); + virtual HRESULT STDMETHODCALLTYPE GetCurFolder(PIDLIST_ABSOLUTE * pidl); // IAugmentedShellFolder2 virtual HRESULT STDMETHODCALLTYPE AddNameSpace(LPGUID lpGuid, IShellFolder * psf, LPCITEMIDLIST pcidl, ULONG dwUnknown); diff --git a/sdk/include/psdk/shobjidl.idl b/sdk/include/psdk/shobjidl.idl index cd5374357cb..7c2aab3d51e 100644 --- a/sdk/include/psdk/shobjidl.idl +++ b/sdk/include/psdk/shobjidl.idl @@ -69,7 +69,7 @@ interface IPersistFolder2 : IPersistFolder { typedef IPersistFolder2 *LPPERSISTFOLDER2; - HRESULT GetCurFolder( [out] LPITEMIDLIST *ppidl ); + HRESULT GetCurFolder( [out] PIDLIST_ABSOLUTE *ppidl ); }

1 0

[reactos] 01/02: [LABEL] Fix MSVC build.
by Thomas Faber 22 Sep '19

22 Sep '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4328daa6e4fb64bdae90f… commit 4328daa6e4fb64bdae90ff793fb26eb8f655f5a8 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sun Sep 22 16:12:03 2019 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Sep 22 16:19:07 2019 +0200 [LABEL] Fix MSVC build. --- base/applications/cmdutils/label/lang/sk-SK.rc | 1 - base/applications/cmdutils/label/lang/tr-TR.rc | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/base/applications/cmdutils/label/lang/sk-SK.rc b/base/applications/cmdutils/label/lang/sk-SK.rc index a7d7376679d..1a340057cb1 100644 --- a/base/applications/cmdutils/label/lang/sk-SK.rc +++ b/base/applications/cmdutils/label/lang/sk-SK.rc @@ -8,7 +8,6 @@ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT STRINGTABLE BEGIN - STRING_LABEL_HELP "Displays or changes drive label.\n\nLABEL [drive:][label]\n" STRING_LABEL_HELP "Creates, changes or deletes the volume label of a disk.\n\n\ LABEL [drive:][label]\n\n\ drive: Specifies the drive letter of a drive.\n\ diff --git a/base/applications/cmdutils/label/lang/tr-TR.rc b/base/applications/cmdutils/label/lang/tr-TR.rc index 74da1a5e5e7..18c20385f50 100644 --- a/base/applications/cmdutils/label/lang/tr-TR.rc +++ b/base/applications/cmdutils/label/lang/tr-TR.rc @@ -4,7 +4,7 @@ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT STRINGTABLE BEGIN - STRING_LABEL_HELP "Sürücü etiketini görüntüler ya da değiştirir.\n\nLABEL [sürücü:][etiket]\n" +// STRING_LABEL_HELP "Sürücü etiketini görüntüler ya da değiştirir.\n\nLABEL [sürücü:][etiket]\n" STRING_LABEL_HELP "Creates, changes or deletes the volume label of a disk.\n\n\ LABEL [drive:][label]\n\n\ drive: Specifies the drive letter of a drive.\n\

1 0

[reactos] 01/01: [LABEL] Prompt the user to confirm the deletion of a volume label
by Eric Kohl 22 Sep '19

22 Sep '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=87ecf824c02e5857e432b… commit 87ecf824c02e5857e432bba520d28560c76414c5 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Sep 22 15:31:19 2019 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Sep 22 15:31:19 2019 +0200 [LABEL] Prompt the user to confirm the deletion of a volume label --- base/applications/cmdutils/label/label.c | 43 ++++++++++++++++++++++++++ base/applications/cmdutils/label/lang/cs-CZ.rc | 2 ++ base/applications/cmdutils/label/lang/de-DE.rc | 2 ++ base/applications/cmdutils/label/lang/el-GR.rc | 2 ++ base/applications/cmdutils/label/lang/en-US.rc | 2 ++ base/applications/cmdutils/label/lang/es-ES.rc | 2 ++ base/applications/cmdutils/label/lang/fr-FR.rc | 2 ++ base/applications/cmdutils/label/lang/hu-HU.rc | 2 ++ base/applications/cmdutils/label/lang/id-ID.rc | 2 ++ base/applications/cmdutils/label/lang/it-IT.rc | 2 ++ base/applications/cmdutils/label/lang/ja-JP.rc | 2 ++ base/applications/cmdutils/label/lang/no-NO.rc | 2 ++ base/applications/cmdutils/label/lang/pl-PL.rc | 2 ++ base/applications/cmdutils/label/lang/ro-RO.rc | 2 ++ base/applications/cmdutils/label/lang/ru-RU.rc | 2 ++ base/applications/cmdutils/label/lang/sk-SK.rc | 2 ++ base/applications/cmdutils/label/lang/sq-AL.rc | 2 ++ base/applications/cmdutils/label/lang/sv-SE.rc | 2 ++ base/applications/cmdutils/label/lang/tr-TR.rc | 2 ++ base/applications/cmdutils/label/lang/uk-UA.rc | 2 ++ base/applications/cmdutils/label/lang/zh-CN.rc | 2 ++ base/applications/cmdutils/label/lang/zh-TW.rc | 2 ++ base/applications/cmdutils/label/resource.h | 12 ++++--- 23 files changed, 92 insertions(+), 5 deletions(-) diff --git a/base/applications/cmdutils/label/label.c b/base/applications/cmdutils/label/label.c index b4e829d3106..6011f3d3549 100644 --- a/base/applications/cmdutils/label/label.c +++ b/base/applications/cmdutils/label/label.c @@ -102,6 +102,43 @@ IsValidPathName(LPCWSTR pszPath) } +static +BOOL +PromptYesNo(VOID) +{ + WCHAR szOptions[4]; + WCHAR szInput[16]; + BOOL bResult = FALSE; + + LoadString(GetModuleHandle(NULL), STRING_LABEL_OPTIONS, szOptions, ARRAYSIZE(szOptions)); + + for (;;) + { + ConPuts(StdOut, L"\n"); + ConResPuts(StdOut, STRING_LABEL_PROMPT); + + ConInString(szInput, ARRAYSIZE(szInput)); + + if (towupper(szInput[0]) == szOptions[0]) + { + bResult = TRUE; + break; + } + else if (towupper(szInput[0]) == szOptions[1]) + { + bResult = FALSE; + break; + } + + ConPuts(StdOut, L"\n"); + } + + ConPuts(StdOut, L"\n"); + + return bResult; +} + + int wmain(int argc, WCHAR *argv[]) { WCHAR szRootPath[] = L" :\\"; @@ -204,6 +241,12 @@ int wmain(int argc, WCHAR *argv[]) ConInString(szLabel, ARRAYSIZE(szLabel)); ConPuts(StdOut, L"\n"); + + if (wcslen(szLabel) == 0) + { + if (PromptYesNo() == FALSE) + return 0; + } } if (!SetVolumeLabelW(szRootPath, szLabel)) diff --git a/base/applications/cmdutils/label/lang/cs-CZ.rc b/base/applications/cmdutils/label/lang/cs-CZ.rc index 145ea84c4c7..251d3f805e0 100644 --- a/base/applications/cmdutils/label/lang/cs-CZ.rc +++ b/base/applications/cmdutils/label/lang/cs-CZ.rc @@ -15,6 +15,8 @@ LABEL [drive:][label]\n\n\ STRING_LABEL_TEXT2 "Volume in drive %c: has no label\n" STRING_LABEL_TEXT3 "Volume Serial Number is %04X-%04X\n" STRING_LABEL_TEXT4 "Volume label (32 Characters, ENTER if none)? " + STRING_LABEL_PROMPT "Delete current volume label (Y/N)? " + STRING_LABEL_OPTIONS "YN" STRING_ERROR_INVALID_DRIVE "Neplatná specifikace jednotky\n" STRING_ERROR_INVALID_LABEL "Invalid volume label\n" END diff --git a/base/applications/cmdutils/label/lang/de-DE.rc b/base/applications/cmdutils/label/lang/de-DE.rc index 3b1121b201d..128b366d645 100644 --- a/base/applications/cmdutils/label/lang/de-DE.rc +++ b/base/applications/cmdutils/label/lang/de-DE.rc @@ -12,6 +12,8 @@ LABEL [Laufwerk:][Bezeichnung]\n\n\ STRING_LABEL_TEXT2 "Volume in Laufwerk %c: hat keine Bezeichnung\n" STRING_LABEL_TEXT3 "Volumenummer: %04X-%04X\n" STRING_LABEL_TEXT4 "Volumebezeichnung (32 Zeichen, EINGABETASTE für keine)? " + STRING_LABEL_PROMPT "Aktuelle Volumebezeichnung löschen (J/N)? " + STRING_LABEL_OPTIONS "JN" STRING_ERROR_INVALID_DRIVE "Ungültige Laufwerksangaben\n" STRING_ERROR_INVALID_LABEL "Unzulässige Volumebezeichnung\n" END diff --git a/base/applications/cmdutils/label/lang/el-GR.rc b/base/applications/cmdutils/label/lang/el-GR.rc index d724d95166c..c941987f904 100644 --- a/base/applications/cmdutils/label/lang/el-GR.rc +++ b/base/applications/cmdutils/label/lang/el-GR.rc @@ -16,6 +16,8 @@ LABEL [drive:][label]\n\n\ STRING_LABEL_TEXT2 "Volume in drive %c: has no label\n" STRING_LABEL_TEXT3 "Volume Serial Number is %04X-%04X\n" STRING_LABEL_TEXT4 "Volume label (32 Characters, ENTER if none)? " + STRING_LABEL_PROMPT "Delete current volume label (Y/N)? " + STRING_LABEL_OPTIONS "YN" STRING_ERROR_INVALID_DRIVE "Invalid drive specification\n" STRING_ERROR_INVALID_LABEL "Invalid volume label\n" END diff --git a/base/applications/cmdutils/label/lang/en-US.rc b/base/applications/cmdutils/label/lang/en-US.rc index f3665681eeb..9c55f55ce20 100644 --- a/base/applications/cmdutils/label/lang/en-US.rc +++ b/base/applications/cmdutils/label/lang/en-US.rc @@ -10,6 +10,8 @@ LABEL [drive:][label]\n\n\ STRING_LABEL_TEXT2 "Volume in drive %c: has no label\n" STRING_LABEL_TEXT3 "Volume Serial Number is %04X-%04X\n" STRING_LABEL_TEXT4 "Volume label (32 characters, ENTER if none)? " + STRING_LABEL_PROMPT "Delete current volume label (Y/N)? " + STRING_LABEL_OPTIONS "YN" STRING_ERROR_INVALID_DRIVE "Invalid drive specification\n" STRING_ERROR_INVALID_LABEL "Invalid volume label\n" END diff --git a/base/applications/cmdutils/label/lang/es-ES.rc b/base/applications/cmdutils/label/lang/es-ES.rc index 522965934da..a6c2bdb8690 100644 --- a/base/applications/cmdutils/label/lang/es-ES.rc +++ b/base/applications/cmdutils/label/lang/es-ES.rc @@ -13,6 +13,8 @@ LABEL [drive:][label]\n\n\ STRING_LABEL_TEXT2 "El volumen en la unidad %c: no tiene etiqueta\n" STRING_LABEL_TEXT3 "El número de serie del volumen es %04X-%04X\n" STRING_LABEL_TEXT4 "Etiqueta del volumen (32 Caracteres, INTRO para ninguna)? " + STRING_LABEL_PROMPT "Delete current volume label (Y/N)? " + STRING_LABEL_OPTIONS "YN" STRING_ERROR_INVALID_DRIVE "Especificación de unidad errónea\n" STRING_ERROR_INVALID_LABEL "Invalid volume label\n" END diff --git a/base/applications/cmdutils/label/lang/fr-FR.rc b/base/applications/cmdutils/label/lang/fr-FR.rc index 859f140290f..8c56fce96fa 100644 --- a/base/applications/cmdutils/label/lang/fr-FR.rc +++ b/base/applications/cmdutils/label/lang/fr-FR.rc @@ -13,6 +13,8 @@ LABEL [drive:][label]\n\n\ STRING_LABEL_TEXT2 "Le disque %c: n'a pas de nom de volume\n" STRING_LABEL_TEXT3 "Le numéro de serie du volume est %04X-%04X\n" STRING_LABEL_TEXT4 "Nom de volume (32 Caractères, ENTREE si aucun) ? " + STRING_LABEL_PROMPT "Delete current volume label (Y/N)? " + STRING_LABEL_OPTIONS "YN" STRING_ERROR_INVALID_DRIVE "Lecteur spécifié introuvable\n" STRING_ERROR_INVALID_LABEL "Invalid volume label\n" END diff --git a/base/applications/cmdutils/label/lang/hu-HU.rc b/base/applications/cmdutils/label/lang/hu-HU.rc index 49b51a7afee..ce2f033c3bc 100644 --- a/base/applications/cmdutils/label/lang/hu-HU.rc +++ b/base/applications/cmdutils/label/lang/hu-HU.rc @@ -14,6 +14,8 @@ LABEL [drive:][label]\n\n\ STRING_LABEL_TEXT2 "A (%c) megjajtóban lévõ kötetnek nincs címkéje.\n" STRING_LABEL_TEXT3 "A kötet sorozatszáma %04X-%04X\n" STRING_LABEL_TEXT4 "Új kötetcímke (32 betû, ENTER ha üres)? " + STRING_LABEL_PROMPT "Delete current volume label (Y/N)? " + STRING_LABEL_OPTIONS "YN" STRING_ERROR_INVALID_DRIVE "Érvénytelen meghajtó\n" STRING_ERROR_INVALID_LABEL "Invalid volume label\n" END diff --git a/base/applications/cmdutils/label/lang/id-ID.rc b/base/applications/cmdutils/label/lang/id-ID.rc index 18200374fd4..2aaf3435942 100644 --- a/base/applications/cmdutils/label/lang/id-ID.rc +++ b/base/applications/cmdutils/label/lang/id-ID.rc @@ -13,6 +13,8 @@ LABEL [drive:][label]\n\n\ STRING_LABEL_TEXT2 "Volume di drive %c: tidak berlabel\n" STRING_LABEL_TEXT3 "Nomor Seri Volume adalah %04X-%04X\n" STRING_LABEL_TEXT4 "Label Drive (32 Karakter, ENTER jika sudah)? " + STRING_LABEL_PROMPT "Delete current volume label (Y/N)? " + STRING_LABEL_OPTIONS "YN" STRING_ERROR_INVALID_DRIVE "Spesifikasi drive tidak benar\n" STRING_ERROR_INVALID_LABEL "Invalid volume label\n" END diff --git a/base/applications/cmdutils/label/lang/it-IT.rc b/base/applications/cmdutils/label/lang/it-IT.rc index 3d5bd687b4f..1e971b240f3 100644 --- a/base/applications/cmdutils/label/lang/it-IT.rc +++ b/base/applications/cmdutils/label/lang/it-IT.rc @@ -12,6 +12,8 @@ LABEL [drive:][label]\n\n\ STRING_LABEL_TEXT2 "Il Volume nel disco %c: non ha etichetta\n" STRING_LABEL_TEXT3 "Il numero di serie del Volume è %04X-%04X\n" STRING_LABEL_TEXT4 "Etichetta del disco (32 Caratteri, INVIO per nessuna)? " + STRING_LABEL_PROMPT "Delete current volume label (Y/N)? " + STRING_LABEL_OPTIONS "YN" STRING_ERROR_INVALID_DRIVE "Disco non valido\n" STRING_ERROR_INVALID_LABEL "Invalid volume label\n" END diff --git a/base/applications/cmdutils/label/lang/ja-JP.rc b/base/applications/cmdutils/label/lang/ja-JP.rc index 87909fa82dd..5182180384d 100644 --- a/base/applications/cmdutils/label/lang/ja-JP.rc +++ b/base/applications/cmdutils/label/lang/ja-JP.rc @@ -11,6 +11,8 @@ LABEL [drive:][label]\n\n\ STRING_LABEL_TEXT2 "ドライブ %c: にはボリュームラベルがありませんl\n" STRING_LABEL_TEXT3 "ボリュームシリアル番号は %04X-%04X\n です" STRING_LABEL_TEXT4 "ボリュームラベルを 32 文字以内で入力してください。\n必要なければ Enter キーを押してください: " + STRING_LABEL_PROMPT "Delete current volume label (Y/N)? " + STRING_LABEL_OPTIONS "YN" STRING_ERROR_INVALID_DRIVE "無効なドライブ指定です。\n" STRING_ERROR_INVALID_LABEL "Invalid volume label\n" END diff --git a/base/applications/cmdutils/label/lang/no-NO.rc b/base/applications/cmdutils/label/lang/no-NO.rc index cc5d7019707..04c0e4754aa 100644 --- a/base/applications/cmdutils/label/lang/no-NO.rc +++ b/base/applications/cmdutils/label/lang/no-NO.rc @@ -11,6 +11,8 @@ LABEL [drive:][label]\n\n\ STRING_LABEL_TEXT2 "Volumet i stasjon %c: er uten navn\n" STRING_LABEL_TEXT3 "Volumserienummeret er %04X-%04X\n" STRING_LABEL_TEXT4 "Volumnavn (32 tegn, Enter = intet navn)? " + STRING_LABEL_PROMPT "Delete current volume label (Y/N)? " + STRING_LABEL_OPTIONS "YN" STRING_ERROR_INVALID_DRIVE "Ugyldig stasjon angitt\n" STRING_ERROR_INVALID_LABEL "Invalid volume label\n" END diff --git a/base/applications/cmdutils/label/lang/pl-PL.rc b/base/applications/cmdutils/label/lang/pl-PL.rc index 9c94d9b7fb4..0a8bc124466 100644 --- a/base/applications/cmdutils/label/lang/pl-PL.rc +++ b/base/applications/cmdutils/label/lang/pl-PL.rc @@ -20,6 +20,8 @@ LABEL [drive:][label]\n\n\ STRING_LABEL_TEXT2 "Wolumin w napędzie %c: nie posiada etykiety\n" STRING_LABEL_TEXT3 "Numer seryjny woluminu to: %04X-%04X\n" STRING_LABEL_TEXT4 "Podaj etykietę (0-32 znaków, ENTER = brak etykiety) " + STRING_LABEL_PROMPT "Delete current volume label (Y/N)? " + STRING_LABEL_OPTIONS "YN" STRING_ERROR_INVALID_DRIVE "Nieprawidłowe określenie napędu\n" STRING_ERROR_INVALID_LABEL "Invalid volume label\n" END diff --git a/base/applications/cmdutils/label/lang/ro-RO.rc b/base/applications/cmdutils/label/lang/ro-RO.rc index 3885ab76bc0..0529cd30aa5 100644 --- a/base/applications/cmdutils/label/lang/ro-RO.rc +++ b/base/applications/cmdutils/label/lang/ro-RO.rc @@ -13,6 +13,8 @@ LABEL [drive:][label]\n\n\ STRING_LABEL_TEXT2 "Volumul unității %c: nu este etichetat.\n" STRING_LABEL_TEXT3 "Numărul de serie al volumului este %04X-%04X\n" STRING_LABEL_TEXT4 "Introduceți eticheta unității (opțională, de 32 caractere), apoi ENTER " + STRING_LABEL_PROMPT "Delete current volume label (Y/N)? " + STRING_LABEL_OPTIONS "YN" STRING_ERROR_INVALID_DRIVE "Specificarea unității este eronată\n" STRING_ERROR_INVALID_LABEL "Invalid volume label\n" END diff --git a/base/applications/cmdutils/label/lang/ru-RU.rc b/base/applications/cmdutils/label/lang/ru-RU.rc index c2e03f6c090..f3b8e08f66a 100644 --- a/base/applications/cmdutils/label/lang/ru-RU.rc +++ b/base/applications/cmdutils/label/lang/ru-RU.rc @@ -13,6 +13,8 @@ LABEL [drive:][label]\n\n\ STRING_LABEL_TEXT2 "Том в устройстве %c: не имеет метки\n" STRING_LABEL_TEXT3 "Серийный номер тома: %04X-%04X\n" STRING_LABEL_TEXT4 "Метка тома (32 букв, ВВОД для пустой метки)? " + STRING_LABEL_PROMPT "Delete current volume label (Y/N)? " + STRING_LABEL_OPTIONS "YN" STRING_ERROR_INVALID_DRIVE "Неверное определение диска\n" STRING_ERROR_INVALID_LABEL "Invalid volume label\n" END diff --git a/base/applications/cmdutils/label/lang/sk-SK.rc b/base/applications/cmdutils/label/lang/sk-SK.rc index 399cdc5abf6..a7d7376679d 100644 --- a/base/applications/cmdutils/label/lang/sk-SK.rc +++ b/base/applications/cmdutils/label/lang/sk-SK.rc @@ -17,6 +17,8 @@ LABEL [drive:][label]\n\n\ STRING_LABEL_TEXT2 "Volume in drive %c: has no label\n" STRING_LABEL_TEXT3 "Volume Serial Number is %04X-%04X\n" STRING_LABEL_TEXT4 "Volume label (32 Characters, ENTER if none)? " + STRING_LABEL_PROMPT "Delete current volume label (Y/N)? " + STRING_LABEL_OPTIONS "YN" STRING_ERROR_INVALID_DRIVE "Invalid drive specification\n" STRING_ERROR_INVALID_LABEL "Invalid volume label\n" END diff --git a/base/applications/cmdutils/label/lang/sq-AL.rc b/base/applications/cmdutils/label/lang/sq-AL.rc index 556f76b6a44..9b6e89c5231 100644 --- a/base/applications/cmdutils/label/lang/sq-AL.rc +++ b/base/applications/cmdutils/label/lang/sq-AL.rc @@ -15,6 +15,8 @@ LABEL [drive:][label]\n\n\ STRING_LABEL_TEXT2 "Volumi në drive %c: has no label\n" STRING_LABEL_TEXT3 "Numri Serial i Volumit është %04X-%04X\n" STRING_LABEL_TEXT4 "Volume label (32 Characters, ENTER if none)? " + STRING_LABEL_PROMPT "Delete current volume label (Y/N)? " + STRING_LABEL_OPTIONS "YN" STRING_ERROR_INVALID_DRIVE "Specifikimi i drivit invalid\n" STRING_ERROR_INVALID_LABEL "Invalid volume label\n" END diff --git a/base/applications/cmdutils/label/lang/sv-SE.rc b/base/applications/cmdutils/label/lang/sv-SE.rc index e147b59678a..131cfd15128 100644 --- a/base/applications/cmdutils/label/lang/sv-SE.rc +++ b/base/applications/cmdutils/label/lang/sv-SE.rc @@ -11,6 +11,8 @@ LABEL [drive:][label]\n\n\ STRING_LABEL_TEXT2 "Volymen i enhet %c: är utan namn\n" STRING_LABEL_TEXT3 "Volymens serienummer är %04X-%04X\n" STRING_LABEL_TEXT4 "Volymnamn (32 tecken, Enter = inget namn)? " + STRING_LABEL_PROMPT "Delete current volume label (Y/N)? " + STRING_LABEL_OPTIONS "YN" STRING_ERROR_INVALID_DRIVE "Ogiltig enhet angiven\n" STRING_ERROR_INVALID_LABEL "Invalid volume label\n" END diff --git a/base/applications/cmdutils/label/lang/tr-TR.rc b/base/applications/cmdutils/label/lang/tr-TR.rc index 491a84f045e..74da1a5e5e7 100644 --- a/base/applications/cmdutils/label/lang/tr-TR.rc +++ b/base/applications/cmdutils/label/lang/tr-TR.rc @@ -13,6 +13,8 @@ LABEL [drive:][label]\n\n\ STRING_LABEL_TEXT2 "%c sürücüsünde birimin etiketi yok\n" STRING_LABEL_TEXT3 "Birim Dizilik Numarası %04X-%04X\n" STRING_LABEL_TEXT4 "Sürücü etiketi (32 damga, yok için Giriş)? " + STRING_LABEL_PROMPT "Delete current volume label (Y/N)? " + STRING_LABEL_OPTIONS "YN" STRING_ERROR_INVALID_DRIVE "Geçersiz sürücü belirtmesi.\n" STRING_ERROR_INVALID_LABEL "Invalid volume label\n" END diff --git a/base/applications/cmdutils/label/lang/uk-UA.rc b/base/applications/cmdutils/label/lang/uk-UA.rc index 43ecd9f3d59..4f1ca0ce539 100644 --- a/base/applications/cmdutils/label/lang/uk-UA.rc +++ b/base/applications/cmdutils/label/lang/uk-UA.rc @@ -19,6 +19,8 @@ LABEL [drive:][label]\n\n\ STRING_LABEL_TEXT2 "Том в пристрої %c: не має мiтки\n" STRING_LABEL_TEXT3 "Серiйний номер тому: %04X-%04X\n" STRING_LABEL_TEXT4 "Мiтка тому (32 букв, ENTER без мiтки)? " + STRING_LABEL_PROMPT "Delete current volume label (Y/N)? " + STRING_LABEL_OPTIONS "YN" STRING_ERROR_INVALID_DRIVE "Невiрне визначення диску\n" STRING_ERROR_INVALID_LABEL "Invalid volume label\n" END diff --git a/base/applications/cmdutils/label/lang/zh-CN.rc b/base/applications/cmdutils/label/lang/zh-CN.rc index f3961d109e2..a4eea705b4f 100644 --- a/base/applications/cmdutils/label/lang/zh-CN.rc +++ b/base/applications/cmdutils/label/lang/zh-CN.rc @@ -13,6 +13,8 @@ LABEL [drive:][label]\n\n\ STRING_LABEL_TEXT2 "驱动器 %c 中的卷没有卷标。\n" STRING_LABEL_TEXT3 "卷的序列号是 %04X-%04X\n" STRING_LABEL_TEXT4 "驱动器卷标 (32 个字符, 按 ENTER 忽略)? " + STRING_LABEL_PROMPT "Delete current volume label (Y/N)? " + STRING_LABEL_OPTIONS "YN" STRING_ERROR_INVALID_DRIVE "无效驱动器指定\n" STRING_ERROR_INVALID_LABEL "Invalid volume label\n" END diff --git a/base/applications/cmdutils/label/lang/zh-TW.rc b/base/applications/cmdutils/label/lang/zh-TW.rc index 5abebec41fc..5b7503b2443 100644 --- a/base/applications/cmdutils/label/lang/zh-TW.rc +++ b/base/applications/cmdutils/label/lang/zh-TW.rc @@ -14,6 +14,8 @@ LABEL [drive:][label]\n\n\ STRING_LABEL_TEXT2 "驅動器 %c 中的卷沒有卷標。\n" STRING_LABEL_TEXT3 "卷的序列號是 %04X-%04X\n" STRING_LABEL_TEXT4 "驅動器卷標 (32 個字元, 按 ENTER 忽略)? " + STRING_LABEL_PROMPT "Delete current volume label (Y/N)? " + STRING_LABEL_OPTIONS "YN" STRING_ERROR_INVALID_DRIVE "無效驅動器指定\n" STRING_ERROR_INVALID_LABEL "Invalid volume label\n" END \ No newline at end of file diff --git a/base/applications/cmdutils/label/resource.h b/base/applications/cmdutils/label/resource.h index 00ead3093a8..864a0c95184 100644 --- a/base/applications/cmdutils/label/resource.h +++ b/base/applications/cmdutils/label/resource.h @@ -2,11 +2,13 @@ #define RC_STRING_MAX_SIZE 3072 -#define STRING_LABEL_HELP 661 -#define STRING_LABEL_TEXT1 662 -#define STRING_LABEL_TEXT2 663 -#define STRING_LABEL_TEXT3 664 -#define STRING_LABEL_TEXT4 665 +#define STRING_LABEL_HELP 661 +#define STRING_LABEL_TEXT1 662 +#define STRING_LABEL_TEXT2 663 +#define STRING_LABEL_TEXT3 664 +#define STRING_LABEL_TEXT4 665 +#define STRING_LABEL_PROMPT 666 +#define STRING_LABEL_OPTIONS 667 #define STRING_ERROR_INVALID_DRIVE 106 #define STRING_ERROR_INVALID_LABEL 107

1 0

[reactos] 01/01: [LABEL][CMD] Convert the label command to a standalone executable
by Eric Kohl 22 Sep '19

22 Sep '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6bfe4f68aff2011f2a840… commit 6bfe4f68aff2011f2a840ddfe16cd42067033d8e Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Sep 22 14:50:37 2019 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Sep 22 14:51:23 2019 +0200 [LABEL][CMD] Convert the label command to a standalone executable CORE-9444 --- base/applications/cmdutils/CMakeLists.txt | 1 + base/applications/cmdutils/label/CMakeLists.txt | 8 + base/applications/cmdutils/label/label.c | 218 ++++++++++++++++++++++++ base/applications/cmdutils/label/label.rc | 77 +++++++++ base/applications/cmdutils/label/lang/cs-CZ.rc | 20 +++ base/applications/cmdutils/label/lang/de-DE.rc | 17 ++ base/applications/cmdutils/label/lang/el-GR.rc | 21 +++ base/applications/cmdutils/label/lang/en-US.rc | 15 ++ base/applications/cmdutils/label/lang/es-ES.rc | 18 ++ base/applications/cmdutils/label/lang/fr-FR.rc | 18 ++ base/applications/cmdutils/label/lang/hu-HU.rc | 19 +++ base/applications/cmdutils/label/lang/id-ID.rc | 18 ++ base/applications/cmdutils/label/lang/it-IT.rc | 17 ++ base/applications/cmdutils/label/lang/ja-JP.rc | 16 ++ base/applications/cmdutils/label/lang/no-NO.rc | 16 ++ base/applications/cmdutils/label/lang/pl-PL.rc | 25 +++ base/applications/cmdutils/label/lang/ro-RO.rc | 18 ++ base/applications/cmdutils/label/lang/ru-RU.rc | 18 ++ base/applications/cmdutils/label/lang/sk-SK.rc | 22 +++ base/applications/cmdutils/label/lang/sq-AL.rc | 20 +++ base/applications/cmdutils/label/lang/sv-SE.rc | 16 ++ base/applications/cmdutils/label/lang/tr-TR.rc | 18 ++ base/applications/cmdutils/label/lang/uk-UA.rc | 24 +++ base/applications/cmdutils/label/lang/zh-CN.rc | 18 ++ base/applications/cmdutils/label/lang/zh-TW.rc | 19 +++ base/applications/cmdutils/label/resource.h | 13 ++ base/shell/cmd/CMakeLists.txt | 1 - base/shell/cmd/cmd.h | 3 - base/shell/cmd/cmdtable.c | 4 - base/shell/cmd/config.h | 1 - base/shell/cmd/label.c | 105 ------------ base/shell/cmd/lang/cs-CZ.rc | 5 - base/shell/cmd/lang/de-DE.rc | 5 - base/shell/cmd/lang/el-GR.rc | 5 - base/shell/cmd/lang/en-US.rc | 5 - base/shell/cmd/lang/es-ES.rc | 5 - base/shell/cmd/lang/fr-FR.rc | 5 - base/shell/cmd/lang/hu-HU.rc | 6 - base/shell/cmd/lang/id-ID.rc | 5 - base/shell/cmd/lang/it-IT.rc | 6 - base/shell/cmd/lang/ja-JP.rc | 5 - base/shell/cmd/lang/no-NO.rc | 5 - base/shell/cmd/lang/pl-PL.rc | 5 - base/shell/cmd/lang/ro-RO.rc | 5 - base/shell/cmd/lang/ru-RU.rc | 5 - base/shell/cmd/lang/sk-SK.rc | 5 - base/shell/cmd/lang/sq-AL.rc | 5 - base/shell/cmd/lang/sv-SE.rc | 5 - base/shell/cmd/lang/tr-TR.rc | 5 - base/shell/cmd/lang/uk-UA.rc | 5 - base/shell/cmd/lang/zh-CN.rc | 5 - base/shell/cmd/lang/zh-TW.rc | 5 - base/shell/cmd/resource.h | 6 - 53 files changed, 710 insertions(+), 227 deletions(-) diff --git a/base/applications/cmdutils/CMakeLists.txt b/base/applications/cmdutils/CMakeLists.txt index 20f8529aa78..d2a800ca416 100644 --- a/base/applications/cmdutils/CMakeLists.txt +++ b/base/applications/cmdutils/CMakeLists.txt @@ -11,6 +11,7 @@ add_subdirectory(find) add_subdirectory(fsutil) add_subdirectory(help) add_subdirectory(hostname) +add_subdirectory(label) add_subdirectory(lodctr) add_subdirectory(mode) add_subdirectory(mofcomp) diff --git a/base/applications/cmdutils/label/CMakeLists.txt b/base/applications/cmdutils/label/CMakeLists.txt new file mode 100644 index 00000000000..291a6c2cbe6 --- /dev/null +++ b/base/applications/cmdutils/label/CMakeLists.txt @@ -0,0 +1,8 @@ + +include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/conutils) + +add_executable(label label.c label.rc) +set_module_type(label win32cui UNICODE) +target_link_libraries(label conutils ${PSEH_LIB}) +add_importlibs(label user32 msvcrt kernel32) +add_cd_file(TARGET label DESTINATION reactos/system32 FOR all) diff --git a/base/applications/cmdutils/label/label.c b/base/applications/cmdutils/label/label.c new file mode 100644 index 00000000000..b4e829d3106 --- /dev/null +++ b/base/applications/cmdutils/label/label.c @@ -0,0 +1,218 @@ +/* + * LABEL.C - label internal command. + * + * + * History: + * + * 10-Dec-1998 (Eric Kohl) + * Started. + * + * 11-Dec-1998 (Eric Kohl) + * Finished. + * + * 19-Jan-1998 (Eric Kohl) + * Unicode ready! + * + * 28-Apr-2005 (Magnus Olsen <magnus(a)greatlord.com>) + * Remove all hardcoded strings in En.rc + */ + +#include <stdio.h> +#include <stdlib.h> + +#include <windef.h> +#include <winbase.h> +#include <wincon.h> +#include <winnls.h> +#include <winuser.h> + +#include <conutils.h> + +#include "resource.h" + +#define MAX_LABEL_LENGTH 32 +#define MAX_DRIVE_LENGTH 2 + + +static +VOID +ConFormatMessage(PCON_STREAM Stream, DWORD MessageId, ...) +{ + va_list arg_ptr; + + va_start(arg_ptr, MessageId); + ConMsgPrintfV(Stream, + FORMAT_MESSAGE_FROM_SYSTEM, + NULL, + MessageId, + LANG_USER_DEFAULT, + &arg_ptr); + va_end(arg_ptr); +} + + +static +VOID +ConInString(LPWSTR lpInput, DWORD dwLength) +{ + DWORD dwOldMode; + DWORD dwRead = 0; + HANDLE hFile; + LPWSTR p; + PCHAR pBuf; + + pBuf = (PCHAR)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwLength - 1); + + hFile = GetStdHandle(STD_INPUT_HANDLE); + GetConsoleMode(hFile, &dwOldMode); + + SetConsoleMode(hFile, ENABLE_LINE_INPUT | ENABLE_ECHO_INPUT); + + ReadFile(hFile, (PVOID)pBuf, dwLength - 1, &dwRead, NULL); + + MultiByteToWideChar(GetConsoleCP(), 0, pBuf, dwRead, lpInput, dwLength - 1); + HeapFree(GetProcessHeap(), 0, pBuf); + + for (p = lpInput; *p; p++) + { + if (*p == L'\x0d') + { + *p = UNICODE_NULL; + break; + } + } + + SetConsoleMode(hFile, dwOldMode); +} + + +static +BOOL +IsValidPathName(LPCWSTR pszPath) +{ + WCHAR szOldPath[MAX_PATH]; + BOOL bResult; + + GetCurrentDirectoryW(MAX_PATH, szOldPath); + bResult = SetCurrentDirectoryW(pszPath); + + SetCurrentDirectoryW(szOldPath); + + return bResult; +} + + +int wmain(int argc, WCHAR *argv[]) +{ + WCHAR szRootPath[] = L" :\\"; + WCHAR szBuffer[80]; + WCHAR szLabel[80]; + WCHAR szOldLabel[80]; + DWORD dwSerialNr; + INT len, i; + + /* Initialize the Console Standard Streams */ + ConInitStdStreams(); + + /* set empty label string */ + szLabel[0] = UNICODE_NULL; + + /* print help */ + if (argc > 1 && wcscmp(argv[1], L"/?") == 0) + { + ConResPuts(StdOut, STRING_LABEL_HELP); + return 0; + } + + if (argc > 1) + { + len = 0; + for (i = 1; i < argc; i++) + { + if (i > 1) + len++; + len += wcslen(argv[i]); + } + + if (len > MAX_LABEL_LENGTH + MAX_DRIVE_LENGTH) + { + ConResPuts(StdOut, STRING_ERROR_INVALID_LABEL); + return 1; + } + + for (i = 1; i < argc; i++) + { + if (i > 1) + wcscat(szBuffer, L" "); + wcscat(szBuffer, argv[i]); + } + } + + if (wcslen(szBuffer) > 0) + { + if (szBuffer[1] == L':') + { + szRootPath[0] = towupper(szBuffer[0]); + wcscpy(szLabel, &szBuffer[2]); + } + else + { + wcscpy(szLabel, szBuffer); + } + } + + if (wcslen(szLabel) > MAX_LABEL_LENGTH) + { + ConResPuts(StdOut, STRING_ERROR_INVALID_LABEL); + return 1; + } + + if (szRootPath[0] == L' ') + { + /* get label of current drive */ + WCHAR szCurPath[MAX_PATH]; + GetCurrentDirectoryW(MAX_PATH, szCurPath); + szRootPath[0] = szCurPath[0]; + } + + /* check root path */ + if (!IsValidPathName(szRootPath)) + { + ConResPuts(StdErr, STRING_ERROR_INVALID_DRIVE); + return 1; + } + + if (wcslen(szLabel) == 0) + { + GetVolumeInformationW(szRootPath, szOldLabel, ARRAYSIZE(szOldLabel), &dwSerialNr, + NULL, NULL, NULL, 0); + + /* print drive info */ + if (szOldLabel[0] != UNICODE_NULL) + { + ConResPrintf(StdOut, STRING_LABEL_TEXT1, towupper(szRootPath[0]), szOldLabel); + } + else + { + ConResPrintf(StdOut, STRING_LABEL_TEXT2, towupper(szRootPath[0])); + } + + /* print the volume serial number */ + ConResPrintf(StdOut, STRING_LABEL_TEXT3, HIWORD(dwSerialNr), LOWORD(dwSerialNr)); + + ConResPuts(StdOut, STRING_LABEL_TEXT4); + + ConInString(szLabel, ARRAYSIZE(szLabel)); + ConPuts(StdOut, L"\n"); + } + + if (!SetVolumeLabelW(szRootPath, szLabel)) + { + ConFormatMessage(StdOut, GetLastError()); + return 1; + } + + return 0; +} + +/* EOF */ diff --git a/base/applications/cmdutils/label/label.rc b/base/applications/cmdutils/label/label.rc new file mode 100644 index 00000000000..88b6bd3a6ce --- /dev/null +++ b/base/applications/cmdutils/label/label.rc @@ -0,0 +1,77 @@ +#include <windef.h> + +#include "resource.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Label Command" +#define REACTOS_STR_INTERNAL_NAME "label" +#define REACTOS_STR_ORIGINAL_FILENAME "label.exe" +#include <reactos/version.rc> + +/* UTF-8 */ +#pragma code_page(65001) + +#ifdef LANGUAGE_CS_CZ + #include "lang/cs-CZ.rc" +#endif +#ifdef LANGUAGE_DE_DE + #include "lang/de-DE.rc" +#endif +#ifdef LANGUAGE_EL_GR + #include "lang/el-GR.rc" +#endif +#ifdef LANGUAGE_EN_US + #include "lang/en-US.rc" +#endif +#ifdef LANGUAGE_ES_ES + #include "lang/es-ES.rc" +#endif +#ifdef LANGUAGE_FR_FR + #include "lang/fr-FR.rc" +#endif +#ifdef LANGUAGE_HU_HU + #include "lang/hu-HU.rc" +#endif +#ifdef LANGUAGE_ID_ID + #include "lang/id-ID.rc" +#endif +#ifdef LANGUAGE_IT_IT + #include "lang/it-IT.rc" +#endif +#ifdef LANGUAGE_NB_NO + #include "lang/no-NO.rc" +#endif +#ifdef LANGUAGE_JA_JP + #include "lang/ja-JP.rc" +#endif +#ifdef LANGUAGE_PL_PL + #include "lang/pl-PL.rc" +#endif +#ifdef LANGUAGE_RO_RO + #include "lang/ro-RO.rc" +#endif +#ifdef LANGUAGE_RU_RU + #include "lang/ru-RU.rc" +#endif +#ifdef LANGUAGE_SK_SK + #include "lang/sk-SK.rc" +#endif +#ifdef LANGUAGE_SV_SE + #include "lang/sv-SE.rc" +#endif +#ifdef LANGUAGE_SQ_AL + #include "lang/sq-AL.rc" +#endif +#ifdef LANGUAGE_TR_TR + #include "lang/tr-TR.rc" +#endif +#ifdef LANGUAGE_UK_UA + #include "lang/uk-UA.rc" +#endif +#ifdef LANGUAGE_ZH_CN + #include "lang/zh-CN.rc" +#endif +#ifdef LANGUAGE_ZH_TW + #include "lang/zh-TW.rc" +#endif diff --git a/base/applications/cmdutils/label/lang/cs-CZ.rc b/base/applications/cmdutils/label/lang/cs-CZ.rc new file mode 100644 index 00000000000..145ea84c4c7 --- /dev/null +++ b/base/applications/cmdutils/label/lang/cs-CZ.rc @@ -0,0 +1,20 @@ +/* FILE: base/shell/cmd/lang/cs-CZ.rc + * TRANSLATOR: Radek Liska aka Black_Fox (radekliska at gmail dot com) + * UPDATED: 2015-04-12 + */ + +LANGUAGE LANG_CZECH, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + STRING_LABEL_HELP "Creates, changes or deletes the volume label of a disk.\n\n\ +LABEL [drive:][label]\n\n\ + drive: Specifies the drive letter of a drive.\n\ + label Specifies the label of the drive." + STRING_LABEL_TEXT1 "Volume in drive %c: is %s\n" + STRING_LABEL_TEXT2 "Volume in drive %c: has no label\n" + STRING_LABEL_TEXT3 "Volume Serial Number is %04X-%04X\n" + STRING_LABEL_TEXT4 "Volume label (32 Characters, ENTER if none)? " + STRING_ERROR_INVALID_DRIVE "Neplatná specifikace jednotky\n" + STRING_ERROR_INVALID_LABEL "Invalid volume label\n" +END diff --git a/base/applications/cmdutils/label/lang/de-DE.rc b/base/applications/cmdutils/label/lang/de-DE.rc new file mode 100644 index 00000000000..3b1121b201d --- /dev/null +++ b/base/applications/cmdutils/label/lang/de-DE.rc @@ -0,0 +1,17 @@ +/* German language file by Klemens Friedl <frik85> 2005-06-03 */ + +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + STRING_LABEL_HELP "Erstellt, ändert oder löscht die Bezeichnung eines Laufwerks.\n\n\ +LABEL [Laufwerk:][Bezeichnung]\n\n\ + Laufwerk: Gibt den Laufwerksbuchstaben eines Laufwerks an.\n\ + Bezeichnung Gibt die Bezeichnung des Laufwerks an.\n" + STRING_LABEL_TEXT1 "Volume in Laufwerk %c: ist %s\n" + STRING_LABEL_TEXT2 "Volume in Laufwerk %c: hat keine Bezeichnung\n" + STRING_LABEL_TEXT3 "Volumenummer: %04X-%04X\n" + STRING_LABEL_TEXT4 "Volumebezeichnung (32 Zeichen, EINGABETASTE für keine)? " + STRING_ERROR_INVALID_DRIVE "Ungültige Laufwerksangaben\n" + STRING_ERROR_INVALID_LABEL "Unzulässige Volumebezeichnung\n" +END diff --git a/base/applications/cmdutils/label/lang/el-GR.rc b/base/applications/cmdutils/label/lang/el-GR.rc new file mode 100644 index 00000000000..d724d95166c --- /dev/null +++ b/base/applications/cmdutils/label/lang/el-GR.rc @@ -0,0 +1,21 @@ +/* + * Αρχική έκδοση - Ημιτελής. + * Ελληνική μετάφραση - Απόστολος Αλεξιάδης + */ + +LANGUAGE LANG_GREEK, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN +// STRING_LABEL_HELP "Displays or changes drive label.\n\nLABEL [drive:][label]\n" + STRING_LABEL_HELP "Creates, changes or deletes the volume label of a disk.\n\n\ +LABEL [drive:][label]\n\n\ + drive: Specifies the drive letter of a drive.\n\ + label Specifies the label of the drive." + STRING_LABEL_TEXT1 "Volume in drive %c: is %s\n" + STRING_LABEL_TEXT2 "Volume in drive %c: has no label\n" + STRING_LABEL_TEXT3 "Volume Serial Number is %04X-%04X\n" + STRING_LABEL_TEXT4 "Volume label (32 Characters, ENTER if none)? " + STRING_ERROR_INVALID_DRIVE "Invalid drive specification\n" + STRING_ERROR_INVALID_LABEL "Invalid volume label\n" +END diff --git a/base/applications/cmdutils/label/lang/en-US.rc b/base/applications/cmdutils/label/lang/en-US.rc new file mode 100644 index 00000000000..f3665681eeb --- /dev/null +++ b/base/applications/cmdutils/label/lang/en-US.rc @@ -0,0 +1,15 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +STRINGTABLE +BEGIN + STRING_LABEL_HELP "Creates, changes or deletes the volume label of a disk.\n\n\ +LABEL [drive:][label]\n\n\ + drive: Specifies the drive letter of a drive.\n\ + label Specifies the label of the drive." + STRING_LABEL_TEXT1 "Volume in drive %c: is %s\n" + STRING_LABEL_TEXT2 "Volume in drive %c: has no label\n" + STRING_LABEL_TEXT3 "Volume Serial Number is %04X-%04X\n" + STRING_LABEL_TEXT4 "Volume label (32 characters, ENTER if none)? " + STRING_ERROR_INVALID_DRIVE "Invalid drive specification\n" + STRING_ERROR_INVALID_LABEL "Invalid volume label\n" +END diff --git a/base/applications/cmdutils/label/lang/es-ES.rc b/base/applications/cmdutils/label/lang/es-ES.rc new file mode 100644 index 00000000000..522965934da --- /dev/null +++ b/base/applications/cmdutils/label/lang/es-ES.rc @@ -0,0 +1,18 @@ +/* Spanish translation by HUMA2000, Jose Pedro Fernández Pascual e Ismael Ferreras Morezuelas (Swyter) */ + +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN +// STRING_LABEL_HELP "Muestra o cambia la etiqueta de una unidad.\n\nLABEL [unidad:][etiqueta]\n" + STRING_LABEL_HELP "Creates, changes or deletes the volume label of a disk.\n\n\ +LABEL [drive:][label]\n\n\ + drive: Specifies the drive letter of a drive.\n\ + label Specifies the label of the drive." + STRING_LABEL_TEXT1 "El volumen en la unidad %c: es %s\n" + STRING_LABEL_TEXT2 "El volumen en la unidad %c: no tiene etiqueta\n" + STRING_LABEL_TEXT3 "El número de serie del volumen es %04X-%04X\n" + STRING_LABEL_TEXT4 "Etiqueta del volumen (32 Caracteres, INTRO para ninguna)? " + STRING_ERROR_INVALID_DRIVE "Especificación de unidad errónea\n" + STRING_ERROR_INVALID_LABEL "Invalid volume label\n" +END diff --git a/base/applications/cmdutils/label/lang/fr-FR.rc b/base/applications/cmdutils/label/lang/fr-FR.rc new file mode 100644 index 00000000000..859f140290f --- /dev/null +++ b/base/applications/cmdutils/label/lang/fr-FR.rc @@ -0,0 +1,18 @@ +/* French translation by Sylvain Pétréolle, Pierre Schweitzer */ + +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN +// STRING_LABEL_HELP "Affiche ou change le nom de volume du disque.\n\nLABEL [disque:][nomdevolume]\n" + STRING_LABEL_HELP "Creates, changes or deletes the volume label of a disk.\n\n\ +LABEL [drive:][label]\n\n\ + drive: Specifies the drive letter of a drive.\n\ + label Specifies the label of the drive." + STRING_LABEL_TEXT1 "Le nom de volume du disque %c: est %s\n" + STRING_LABEL_TEXT2 "Le disque %c: n'a pas de nom de volume\n" + STRING_LABEL_TEXT3 "Le numéro de serie du volume est %04X-%04X\n" + STRING_LABEL_TEXT4 "Nom de volume (32 Caractères, ENTREE si aucun) ? " + STRING_ERROR_INVALID_DRIVE "Lecteur spécifié introuvable\n" + STRING_ERROR_INVALID_LABEL "Invalid volume label\n" +END diff --git a/base/applications/cmdutils/label/lang/hu-HU.rc b/base/applications/cmdutils/label/lang/hu-HU.rc new file mode 100644 index 00000000000..49b51a7afee --- /dev/null +++ b/base/applications/cmdutils/label/lang/hu-HU.rc @@ -0,0 +1,19 @@ +/* Hungarian translation by Robert Horvath (talley at cubeclub.hu) 2005 */ + +LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN +// STRING_LABEL_HELP "A kötet címkéjét megjeleníti, vagy megváltoztatja.\n\n\ +//LABEL [meghajtó:] [új_címke]\n" + STRING_LABEL_HELP "Creates, changes or deletes the volume label of a disk.\n\n\ +LABEL [drive:][label]\n\n\ + drive: Specifies the drive letter of a drive.\n\ + label Specifies the label of the drive." + STRING_LABEL_TEXT1 "A (%c) meghajtóban lévõ kötet címkéje %s\n" + STRING_LABEL_TEXT2 "A (%c) megjajtóban lévõ kötetnek nincs címkéje.\n" + STRING_LABEL_TEXT3 "A kötet sorozatszáma %04X-%04X\n" + STRING_LABEL_TEXT4 "Új kötetcímke (32 betû, ENTER ha üres)? " + STRING_ERROR_INVALID_DRIVE "Érvénytelen meghajtó\n" + STRING_ERROR_INVALID_LABEL "Invalid volume label\n" +END diff --git a/base/applications/cmdutils/label/lang/id-ID.rc b/base/applications/cmdutils/label/lang/id-ID.rc new file mode 100644 index 00000000000..18200374fd4 --- /dev/null +++ b/base/applications/cmdutils/label/lang/id-ID.rc @@ -0,0 +1,18 @@ +/* Indonesian language file by Zaenal Mutaqin <ade999 at gmail dot com> 2007-02-15 */ + +LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN +// STRING_LABEL_HELP "Menampilkan atau mengubah label drive.\n\nLABEL [drive:][label]\n" + STRING_LABEL_HELP "Creates, changes or deletes the volume label of a disk.\n\n\ +LABEL [drive:][label]\n\n\ + drive: Specifies the drive letter of a drive.\n\ + label Specifies the label of the drive." + STRING_LABEL_TEXT1 "Volume di drive %c: adalah %s\n" + STRING_LABEL_TEXT2 "Volume di drive %c: tidak berlabel\n" + STRING_LABEL_TEXT3 "Nomor Seri Volume adalah %04X-%04X\n" + STRING_LABEL_TEXT4 "Label Drive (32 Karakter, ENTER jika sudah)? " + STRING_ERROR_INVALID_DRIVE "Spesifikasi drive tidak benar\n" + STRING_ERROR_INVALID_LABEL "Invalid volume label\n" +END diff --git a/base/applications/cmdutils/label/lang/it-IT.rc b/base/applications/cmdutils/label/lang/it-IT.rc new file mode 100644 index 00000000000..3d5bd687b4f --- /dev/null +++ b/base/applications/cmdutils/label/lang/it-IT.rc @@ -0,0 +1,17 @@ +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN +// STRING_LABEL_HELP "Visualizza o modifica l'etichetta di un disco.\n\n\ +//LABEL [disco:][etichetta]\n" + STRING_LABEL_HELP "Creates, changes or deletes the volume label of a disk.\n\n\ +LABEL [drive:][label]\n\n\ + drive: Specifies the drive letter of a drive.\n\ + label Specifies the label of the drive." + STRING_LABEL_TEXT1 "Il Volume nel disco %c: è %s\n" + STRING_LABEL_TEXT2 "Il Volume nel disco %c: non ha etichetta\n" + STRING_LABEL_TEXT3 "Il numero di serie del Volume è %04X-%04X\n" + STRING_LABEL_TEXT4 "Etichetta del disco (32 Caratteri, INVIO per nessuna)? " + STRING_ERROR_INVALID_DRIVE "Disco non valido\n" + STRING_ERROR_INVALID_LABEL "Invalid volume label\n" +END diff --git a/base/applications/cmdutils/label/lang/ja-JP.rc b/base/applications/cmdutils/label/lang/ja-JP.rc new file mode 100644 index 00000000000..87909fa82dd --- /dev/null +++ b/base/applications/cmdutils/label/lang/ja-JP.rc @@ -0,0 +1,16 @@ +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN +// STRING_LABEL_HELP "ディスクのボリュームラベルを表示または変更します。\n\nLABEL [ドライブ:][ラベル]\n" + STRING_LABEL_HELP "Creates, changes or deletes the volume label of a disk.\n\n\ +LABEL [drive:][label]\n\n\ + drive: Specifies the drive letter of a drive.\n\ + label Specifies the label of the drive." + STRING_LABEL_TEXT1 "ドライブ %c: のボリュームラベルは %s です\n" + STRING_LABEL_TEXT2 "ドライブ %c: にはボリュームラベルがありませんl\n" + STRING_LABEL_TEXT3 "ボリュームシリアル番号は %04X-%04X\n です" + STRING_LABEL_TEXT4 "ボリュームラベルを 32 文字以内で入力してください。\n必要なければ Enter キーを押してください: " + STRING_ERROR_INVALID_DRIVE "無効なドライブ指定です。\n" + STRING_ERROR_INVALID_LABEL "Invalid volume label\n" +END diff --git a/base/applications/cmdutils/label/lang/no-NO.rc b/base/applications/cmdutils/label/lang/no-NO.rc new file mode 100644 index 00000000000..cc5d7019707 --- /dev/null +++ b/base/applications/cmdutils/label/lang/no-NO.rc @@ -0,0 +1,16 @@ +LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN +// STRING_LABEL_HELP "Viser eller endrer navn på stasjon.\n\nLABEL [stasjon:][merke]\n" + STRING_LABEL_HELP "Creates, changes or deletes the volume label of a disk.\n\n\ +LABEL [drive:][label]\n\n\ + drive: Specifies the drive letter of a drive.\n\ + label Specifies the label of the drive." + STRING_LABEL_TEXT1 "Volumet i stasjon %c: er %s\n" + STRING_LABEL_TEXT2 "Volumet i stasjon %c: er uten navn\n" + STRING_LABEL_TEXT3 "Volumserienummeret er %04X-%04X\n" + STRING_LABEL_TEXT4 "Volumnavn (32 tegn, Enter = intet navn)? " + STRING_ERROR_INVALID_DRIVE "Ugyldig stasjon angitt\n" + STRING_ERROR_INVALID_LABEL "Invalid volume label\n" +END diff --git a/base/applications/cmdutils/label/lang/pl-PL.rc b/base/applications/cmdutils/label/lang/pl-PL.rc new file mode 100644 index 00000000000..9c94d9b7fb4 --- /dev/null +++ b/base/applications/cmdutils/label/lang/pl-PL.rc @@ -0,0 +1,25 @@ +/* + * Translated by Caemyr - Olaf Siejka (Jan, 2008) + * Updated by niski - Maciej Bialas (Mar, 2010) + * Use ReactOS forum PM or IRC to contact me + * http://www.reactos.org + * IRC: irc.freenode.net #reactos-pl; + * UTF-8 conversion by Caemyr (May, 2011) + */ + +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN +// STRING_LABEL_HELP "Wyświetla lub zmienia etykietę napędu.\n\nLABEL [napęd:][etykieta]\n" + STRING_LABEL_HELP "Creates, changes or deletes the volume label of a disk.\n\n\ +LABEL [drive:][label]\n\n\ + drive: Specifies the drive letter of a drive.\n\ + label Specifies the label of the drive." + STRING_LABEL_TEXT1 "Wolumin w napędzie %c: ma etykietę: %s\n" + STRING_LABEL_TEXT2 "Wolumin w napędzie %c: nie posiada etykiety\n" + STRING_LABEL_TEXT3 "Numer seryjny woluminu to: %04X-%04X\n" + STRING_LABEL_TEXT4 "Podaj etykietę (0-32 znaków, ENTER = brak etykiety) " + STRING_ERROR_INVALID_DRIVE "Nieprawidłowe określenie napędu\n" + STRING_ERROR_INVALID_LABEL "Invalid volume label\n" +END diff --git a/base/applications/cmdutils/label/lang/ro-RO.rc b/base/applications/cmdutils/label/lang/ro-RO.rc new file mode 100644 index 00000000000..3885ab76bc0 --- /dev/null +++ b/base/applications/cmdutils/label/lang/ro-RO.rc @@ -0,0 +1,18 @@ +/* Translator: Ștefan Fulea (stefan dot fulea at mail dot com) */ + +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN +// STRING_LABEL_HELP "Afișează sau modifică eticheta unei unități (de stocare).\n\nLABEL [unitate:][etichetă]\n" + STRING_LABEL_HELP "Creates, changes or deletes the volume label of a disk.\n\n\ +LABEL [drive:][label]\n\n\ + drive: Specifies the drive letter of a drive.\n\ + label Specifies the label of the drive." + STRING_LABEL_TEXT1 "Volumul unității %c: este etichetat ca %s\n" + STRING_LABEL_TEXT2 "Volumul unității %c: nu este etichetat.\n" + STRING_LABEL_TEXT3 "Numărul de serie al volumului este %04X-%04X\n" + STRING_LABEL_TEXT4 "Introduceți eticheta unității (opțională, de 32 caractere), apoi ENTER " + STRING_ERROR_INVALID_DRIVE "Specificarea unității este eronată\n" + STRING_ERROR_INVALID_LABEL "Invalid volume label\n" +END diff --git a/base/applications/cmdutils/label/lang/ru-RU.rc b/base/applications/cmdutils/label/lang/ru-RU.rc new file mode 100644 index 00000000000..c2e03f6c090 --- /dev/null +++ b/base/applications/cmdutils/label/lang/ru-RU.rc @@ -0,0 +1,18 @@ +/* Russian translation by Andrey Korotaev (unC0Rr(a)inbox.ru) & Aleksey Bragin (aleksey(a)reactos.org) & Kudratov Olimjon (olim98(a)bk.ru)*/ + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN +// STRING_LABEL_HELP "Создание, изменение и удаление меток тома.\n\nLABEL [диск:][метка]\n" + STRING_LABEL_HELP "Creates, changes or deletes the volume label of a disk.\n\n\ +LABEL [drive:][label]\n\n\ + drive: Specifies the drive letter of a drive.\n\ + label Specifies the label of the drive." + STRING_LABEL_TEXT1 "Том в устройстве %c имеет метку %s\n" + STRING_LABEL_TEXT2 "Том в устройстве %c: не имеет метки\n" + STRING_LABEL_TEXT3 "Серийный номер тома: %04X-%04X\n" + STRING_LABEL_TEXT4 "Метка тома (32 букв, ВВОД для пустой метки)? " + STRING_ERROR_INVALID_DRIVE "Неверное определение диска\n" + STRING_ERROR_INVALID_LABEL "Invalid volume label\n" +END diff --git a/base/applications/cmdutils/label/lang/sk-SK.rc b/base/applications/cmdutils/label/lang/sk-SK.rc new file mode 100644 index 00000000000..399cdc5abf6 --- /dev/null +++ b/base/applications/cmdutils/label/lang/sk-SK.rc @@ -0,0 +1,22 @@ +/* Slovak translation for CMD + * TRANSLATOR: Mário Kačmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) + * DATE OF TR: 21-03-2009 + * LastChange: 10-08-2010 + */ + +LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + STRING_LABEL_HELP "Displays or changes drive label.\n\nLABEL [drive:][label]\n" + STRING_LABEL_HELP "Creates, changes or deletes the volume label of a disk.\n\n\ +LABEL [drive:][label]\n\n\ + drive: Specifies the drive letter of a drive.\n\ + label Specifies the label of the drive." + STRING_LABEL_TEXT1 "Volume in drive %c: is %s\n" + STRING_LABEL_TEXT2 "Volume in drive %c: has no label\n" + STRING_LABEL_TEXT3 "Volume Serial Number is %04X-%04X\n" + STRING_LABEL_TEXT4 "Volume label (32 Characters, ENTER if none)? " + STRING_ERROR_INVALID_DRIVE "Invalid drive specification\n" + STRING_ERROR_INVALID_LABEL "Invalid volume label\n" +END diff --git a/base/applications/cmdutils/label/lang/sq-AL.rc b/base/applications/cmdutils/label/lang/sq-AL.rc new file mode 100644 index 00000000000..556f76b6a44 --- /dev/null +++ b/base/applications/cmdutils/label/lang/sq-AL.rc @@ -0,0 +1,20 @@ +/* TRANSLATOR : Ardit Dani (Ard1t) (ardit.dani(a)gmail.com) + * DATE OF TR: 29-11-2013 +*/ + +LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN +// STRING_LABEL_HELP "Shfaq ose ndrysho etiketën e driverit.\n\nLABEL [drive:][etikete]\n" + STRING_LABEL_HELP "Creates, changes or deletes the volume label of a disk.\n\n\ +LABEL [drive:][label]\n\n\ + drive: Specifies the drive letter of a drive.\n\ + label Specifies the label of the drive." + STRING_LABEL_TEXT1 "Volumi në drive %c: is %s\n" + STRING_LABEL_TEXT2 "Volumi në drive %c: has no label\n" + STRING_LABEL_TEXT3 "Numri Serial i Volumit është %04X-%04X\n" + STRING_LABEL_TEXT4 "Volume label (32 Characters, ENTER if none)? " + STRING_ERROR_INVALID_DRIVE "Specifikimi i drivit invalid\n" + STRING_ERROR_INVALID_LABEL "Invalid volume label\n" +END diff --git a/base/applications/cmdutils/label/lang/sv-SE.rc b/base/applications/cmdutils/label/lang/sv-SE.rc new file mode 100644 index 00000000000..e147b59678a --- /dev/null +++ b/base/applications/cmdutils/label/lang/sv-SE.rc @@ -0,0 +1,16 @@ +LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN +// STRING_LABEL_HELP "Skapar, tar bort eller ändrar etikett på enhet.\n\nLABEL [enhet:][etikett]\n" + STRING_LABEL_HELP "Creates, changes or deletes the volume label of a disk.\n\n\ +LABEL [drive:][label]\n\n\ + drive: Specifies the drive letter of a drive.\n\ + label Specifies the label of the drive." + STRING_LABEL_TEXT1 "Volymen i enhet %c: är %s\n" + STRING_LABEL_TEXT2 "Volymen i enhet %c: är utan namn\n" + STRING_LABEL_TEXT3 "Volymens serienummer är %04X-%04X\n" + STRING_LABEL_TEXT4 "Volymnamn (32 tecken, Enter = inget namn)? " + STRING_ERROR_INVALID_DRIVE "Ogiltig enhet angiven\n" + STRING_ERROR_INVALID_LABEL "Invalid volume label\n" +END diff --git a/base/applications/cmdutils/label/lang/tr-TR.rc b/base/applications/cmdutils/label/lang/tr-TR.rc new file mode 100644 index 00000000000..491a84f045e --- /dev/null +++ b/base/applications/cmdutils/label/lang/tr-TR.rc @@ -0,0 +1,18 @@ +/* TRANSLATOR: 2015 Erdem Ersoy (eersoy93) (erdemersoy [at] erdemersoy [dot] net) */ + +LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + STRING_LABEL_HELP "Sürücü etiketini görüntüler ya da değiştirir.\n\nLABEL [sürücü:][etiket]\n" + STRING_LABEL_HELP "Creates, changes or deletes the volume label of a disk.\n\n\ +LABEL [drive:][label]\n\n\ + drive: Specifies the drive letter of a drive.\n\ + label Specifies the label of the drive." + STRING_LABEL_TEXT1 "%c sürücüsünde birim %s\n" + STRING_LABEL_TEXT2 "%c sürücüsünde birimin etiketi yok\n" + STRING_LABEL_TEXT3 "Birim Dizilik Numarası %04X-%04X\n" + STRING_LABEL_TEXT4 "Sürücü etiketi (32 damga, yok için Giriş)? " + STRING_ERROR_INVALID_DRIVE "Geçersiz sürücü belirtmesi.\n" + STRING_ERROR_INVALID_LABEL "Invalid volume label\n" +END diff --git a/base/applications/cmdutils/label/lang/uk-UA.rc b/base/applications/cmdutils/label/lang/uk-UA.rc new file mode 100644 index 00000000000..43ecd9f3d59 --- /dev/null +++ b/base/applications/cmdutils/label/lang/uk-UA.rc @@ -0,0 +1,24 @@ +/* + * PROJECT: Command-line interface + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/shell/cmd/lang/uk-UA.rc + * PURPOSE: Ukraianian Language File for Command-line interface + * TRANSLATORS: Artem Reznikov, Igor Paliychuk + */ + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN +// STRING_LABEL_HELP "Вiдображення або змiна мiтки тому.\n\nLABEL [диск:][мiтка]\n" + STRING_LABEL_HELP "Creates, changes or deletes the volume label of a disk.\n\n\ +LABEL [drive:][label]\n\n\ + drive: Specifies the drive letter of a drive.\n\ + label Specifies the label of the drive." + STRING_LABEL_TEXT1 "Том в пристрої %c: має мiтку %s\n" + STRING_LABEL_TEXT2 "Том в пристрої %c: не має мiтки\n" + STRING_LABEL_TEXT3 "Серiйний номер тому: %04X-%04X\n" + STRING_LABEL_TEXT4 "Мiтка тому (32 букв, ENTER без мiтки)? " + STRING_ERROR_INVALID_DRIVE "Невiрне визначення диску\n" + STRING_ERROR_INVALID_LABEL "Invalid volume label\n" +END diff --git a/base/applications/cmdutils/label/lang/zh-CN.rc b/base/applications/cmdutils/label/lang/zh-CN.rc new file mode 100644 index 00000000000..f3961d109e2 --- /dev/null +++ b/base/applications/cmdutils/label/lang/zh-CN.rc @@ -0,0 +1,18 @@ +/* Simplified Chinese translation by Song Fuchang (0xfc) <sfc_0(a)yahoo.com.cn> 2011 */ + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED + +STRINGTABLE +BEGIN +// STRING_LABEL_HELP "显示或改变驱动器卷标。\n\nLABEL [驱动器:][卷标]\n" + STRING_LABEL_HELP "Creates, changes or deletes the volume label of a disk.\n\n\ +LABEL [drive:][label]\n\n\ + drive: Specifies the drive letter of a drive.\n\ + label Specifies the label of the drive." + STRING_LABEL_TEXT1 "驱动器 %c 中的卷是 %s\n" + STRING_LABEL_TEXT2 "驱动器 %c 中的卷没有卷标。\n" + STRING_LABEL_TEXT3 "卷的序列号是 %04X-%04X\n" + STRING_LABEL_TEXT4 "驱动器卷标 (32 个字符, 按 ENTER 忽略)? " + STRING_ERROR_INVALID_DRIVE "无效驱动器指定\n" + STRING_ERROR_INVALID_LABEL "Invalid volume label\n" +END diff --git a/base/applications/cmdutils/label/lang/zh-TW.rc b/base/applications/cmdutils/label/lang/zh-TW.rc new file mode 100644 index 00000000000..5abebec41fc --- /dev/null +++ b/base/applications/cmdutils/label/lang/zh-TW.rc @@ -0,0 +1,19 @@ +/* Traditional Chinese translation by Henry Tang Ih 2016 (henrytang2(a)hotmail.com) */ +/* Improved by Luo Yufan 2019 <njlyf2011(a)hotmail.com> */ + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL + +STRINGTABLE +BEGIN +// STRING_LABEL_HELP "顯示或改變驅動器卷標。\n\nLABEL [驅動器:][卷標]\n" + STRING_LABEL_HELP "Creates, changes or deletes the volume label of a disk.\n\n\ +LABEL [drive:][label]\n\n\ + drive: Specifies the drive letter of a drive.\n\ + label Specifies the label of the drive." + STRING_LABEL_TEXT1 "驅動器 %c 中的卷是 %s\n" + STRING_LABEL_TEXT2 "驅動器 %c 中的卷沒有卷標。\n" + STRING_LABEL_TEXT3 "卷的序列號是 %04X-%04X\n" + STRING_LABEL_TEXT4 "驅動器卷標 (32 個字元, 按 ENTER 忽略)? " + STRING_ERROR_INVALID_DRIVE "無效驅動器指定\n" + STRING_ERROR_INVALID_LABEL "Invalid volume label\n" +END \ No newline at end of file diff --git a/base/applications/cmdutils/label/resource.h b/base/applications/cmdutils/label/resource.h new file mode 100644 index 00000000000..00ead3093a8 --- /dev/null +++ b/base/applications/cmdutils/label/resource.h @@ -0,0 +1,13 @@ +#pragma once + +#define RC_STRING_MAX_SIZE 3072 + +#define STRING_LABEL_HELP 661 +#define STRING_LABEL_TEXT1 662 +#define STRING_LABEL_TEXT2 663 +#define STRING_LABEL_TEXT3 664 +#define STRING_LABEL_TEXT4 665 + +#define STRING_ERROR_INVALID_DRIVE 106 +#define STRING_ERROR_INVALID_LABEL 107 + diff --git a/base/shell/cmd/CMakeLists.txt b/base/shell/cmd/CMakeLists.txt index 99fdd19742f..7bf64b58acd 100644 --- a/base/shell/cmd/CMakeLists.txt +++ b/base/shell/cmd/CMakeLists.txt @@ -36,7 +36,6 @@ list(APPEND SOURCE history.c if.c internal.c - label.c locale.c memory.c misc.c diff --git a/base/shell/cmd/cmd.h b/base/shell/cmd/cmd.h index 2ddafab6a4a..48f6df0b5b2 100644 --- a/base/shell/cmd/cmd.h +++ b/base/shell/cmd/cmd.h @@ -237,9 +237,6 @@ INT CommandExit (LPTSTR); INT CommandRem (LPTSTR); INT CommandShowCommands (LPTSTR); -/* Prototypes for LABEL.C */ -INT cmd_label (LPTSTR); - /* Prototypes for LOCALE.C */ extern TCHAR cDateSeparator; extern INT nDateFormat; diff --git a/base/shell/cmd/cmdtable.c b/base/shell/cmd/cmdtable.c index 20d3f690bb0..657baad9150 100644 --- a/base/shell/cmd/cmdtable.c +++ b/base/shell/cmd/cmdtable.c @@ -121,10 +121,6 @@ COMMAND cmds[] = {_T("if"), 0, cmd_if}, -#ifdef INCLUDE_CMD_LABEL - {_T("label"), 0, cmd_label}, -#endif - #ifdef INCLUDE_CMD_MEMORY {_T("memory"), 0, CommandMemory}, #endif diff --git a/base/shell/cmd/config.h b/base/shell/cmd/config.h index 90f7b9cbb53..3a5b70b221a 100644 --- a/base/shell/cmd/config.h +++ b/base/shell/cmd/config.h @@ -61,7 +61,6 @@ #define INCLUDE_CMD_DELAY #define INCLUDE_CMD_DIR #define INCLUDE_CMD_FREE -#define INCLUDE_CMD_LABEL #define INCLUDE_CMD_MEMORY #define INCLUDE_CMD_MKDIR #define INCLUDE_CMD_MKLINK diff --git a/base/shell/cmd/label.c b/base/shell/cmd/label.c deleted file mode 100644 index a42ac3b2d37..00000000000 --- a/base/shell/cmd/label.c +++ /dev/null @@ -1,105 +0,0 @@ -/* - * LABEL.C - label internal command. - * - * - * History: - * - * 10-Dec-1998 (Eric Kohl) - * Started. - * - * 11-Dec-1998 (Eric Kohl) - * Finished. - * - * 19-Jan-1998 (Eric Kohl) - * Unicode ready! - * - * 28-Apr-2005 (Magnus Olsen <magnus(a)greatlord.com>) - * Remove all hardcoded strings in En.rc - */ - -#include "precomp.h" - -#ifdef INCLUDE_CMD_LABEL - - -INT cmd_label (LPTSTR param) -{ - TCHAR szRootPath[] = _T("A:\\"); - TCHAR szLabel[80]; - TCHAR szOldLabel[80]; - DWORD dwSerialNr; - - /* set empty label string */ - szLabel[0] = _T('\0'); - - nErrorLevel = 0; - - /* print help */ - if (!_tcsncmp (param, _T("/?"), 2)) - { - ConOutResPaging(TRUE,STRING_LABEL_HELP1); - return 0; - } - - /* get parameters */ - if (param[0] != _T('\0') && param[1] == _T(':')) - { - szRootPath[0] = toupper(*param); - param += 2; - while (_istspace(*param)) - param++; - } - else - { - /* get label of current drive */ - TCHAR szCurPath[MAX_PATH]; - GetCurrentDirectory (MAX_PATH, szCurPath); - szRootPath[0] = szCurPath[0]; - } - - _tcsncat(szLabel, param, 79); - - /* check root path */ - if (!IsValidPathName (szRootPath)) - { - error_invalid_drive (); - nErrorLevel = 1; - return 1; - } - - if (szLabel[0] == _T('\0')) - { - GetVolumeInformation(szRootPath, szOldLabel, 80, &dwSerialNr, - NULL, NULL, NULL, 0); - - /* print drive info */ - if (szOldLabel[0] != _T('\0')) - { - ConOutResPrintf(STRING_LABEL_HELP2, _totupper(szRootPath[0]), szOldLabel); - } - else - { - ConOutResPrintf(STRING_LABEL_HELP3, _totupper(szRootPath[0])); - } - - /* print the volume serial number */ - ConOutResPrintf(STRING_LABEL_HELP4, HIWORD(dwSerialNr), LOWORD(dwSerialNr)); - - ConOutResPuts(STRING_LABEL_HELP5); - - ConInString(szLabel, 80); - } - - if (!SetVolumeLabel(szRootPath, szLabel)) - { - ConOutFormatMessage(GetLastError()); - nErrorLevel = 1; - return 1; - } - - return 0; -} - -#endif /* INCLUDE_CMD_LABEL */ - -/* EOF */ diff --git a/base/shell/cmd/lang/cs-CZ.rc b/base/shell/cmd/lang/cs-CZ.rc index 4910facf73c..f457e51a921 100644 --- a/base/shell/cmd/lang/cs-CZ.rc +++ b/base/shell/cmd/lang/cs-CZ.rc @@ -249,11 +249,6 @@ string1==string2 Specifies a true condition if the specified text strings\n\ EXIST filename Specifies a true condition if the specified filename exists.\n\ DEFINED variable Specifies a true condition if the specified variable is\n\ defined.\n" - STRING_LABEL_HELP1 "Displays or changes drive label.\n\nLABEL [drive:][label]\n" - STRING_LABEL_HELP2 "Volume in drive %c: is %s\n" - STRING_LABEL_HELP3 "Volume in drive %c: has no label\n" - STRING_LABEL_HELP4 "Volume Serial Number is %04X-%04X\n" - STRING_LABEL_HELP5 "Drive label (11 Characters, ENTER if none)? " STRING_LOCALE_HELP1 "Current time is" STRING_MKDIR_HELP "Creates a directory.\n\n\ MKDIR [drive:]path\nMD [drive:]path" diff --git a/base/shell/cmd/lang/de-DE.rc b/base/shell/cmd/lang/de-DE.rc index 078cb1ba32b..b5decb1d027 100644 --- a/base/shell/cmd/lang/de-DE.rc +++ b/base/shell/cmd/lang/de-DE.rc @@ -243,11 +243,6 @@ Variable1==Variable2\n\ EXIST Dateiname Bedingung ist erfüllt, wenn die angegebene Datei existiert.\n\ DEFINED Variable Bedingung ist erfüllt, wenn die angegebene Datei definiert\n\ wurde." - STRING_LABEL_HELP1 "Erstellt, ändert oder löscht die Bezeichnung eines Volumes.\n\nLABEL [Laufwerk:][label]" - STRING_LABEL_HELP2 "Datenträger im Laufwerk %c: ist %s\n" - STRING_LABEL_HELP3 "Datenträger im Laufwerk %c: hat keine Bezeichnung\n" - STRING_LABEL_HELP4 "Datenträger-Seriennummer: %04X-%04X\n" - STRING_LABEL_HELP5 "Laufwerksbezeichnung (max. 11 Zeichen, ENTER für keine)? " STRING_LOCALE_HELP1 "Aktuelle Zeit: " STRING_MKDIR_HELP "Erzeugt ein Verzeichnis.\n\n\ MKDIR [Laufwerk:]Pfad\nMD [Laufwerk:]Pfad" diff --git a/base/shell/cmd/lang/el-GR.rc b/base/shell/cmd/lang/el-GR.rc index fab27d826c3..62b61f55b27 100644 --- a/base/shell/cmd/lang/el-GR.rc +++ b/base/shell/cmd/lang/el-GR.rc @@ -248,11 +248,6 @@ string1==string2 Specifies a true condition if the specified text strings\n\ EXIST filename Specifies a true condition if the specified filename exists.\n\ DEFINED variable Specifies a true condition if the specified variable is\n\ defined.\n" - STRING_LABEL_HELP1 "Displays or changes drive label.\n\nLABEL [drive:][label]\n" - STRING_LABEL_HELP2 "Volume in drive %c: is %s\n" - STRING_LABEL_HELP3 "Volume in drive %c: has no label\n" - STRING_LABEL_HELP4 "Volume Serial Number is %04X-%04X\n" - STRING_LABEL_HELP5 "Drive label (11 Characters, ENTER if none)? " STRING_LOCALE_HELP1 "Current time is" STRING_MKDIR_HELP "Creates a directory.\n\n\ MKDIR [drive:]path\nMD [drive:]path" diff --git a/base/shell/cmd/lang/en-US.rc b/base/shell/cmd/lang/en-US.rc index e0324bb8744..3a3b4653770 100644 --- a/base/shell/cmd/lang/en-US.rc +++ b/base/shell/cmd/lang/en-US.rc @@ -244,11 +244,6 @@ string1==string2 Specifies a true condition if the specified text strings\n\ EXIST filename Specifies a true condition if the specified filename exists.\n\ DEFINED variable Specifies a true condition if the specified variable is\n\ defined.\n" - STRING_LABEL_HELP1 "Displays or changes drive label.\n\nLABEL [drive:][label]\n" - STRING_LABEL_HELP2 "Volume in drive %c: is %s\n" - STRING_LABEL_HELP3 "Volume in drive %c: has no label\n" - STRING_LABEL_HELP4 "Volume Serial Number is %04X-%04X\n" - STRING_LABEL_HELP5 "Drive label (11 Characters, ENTER if none)? " STRING_LOCALE_HELP1 "Current time is" STRING_MKDIR_HELP "Creates a directory.\n\n\ MKDIR [drive:]path\nMD [drive:]path" diff --git a/base/shell/cmd/lang/es-ES.rc b/base/shell/cmd/lang/es-ES.rc index 2ca450e2436..e46541239e9 100644 --- a/base/shell/cmd/lang/es-ES.rc +++ b/base/shell/cmd/lang/es-ES.rc @@ -246,11 +246,6 @@ comando Especifica el comando a ejecutar si se cumple la condición.\n string1==string2 Especifica una condición verdadera si las cadenas de texto coinciden.\n\ EXIST archivo Especifica una condición verdadera si existe el archivo especificado.\n\ DEFINED variable Especifica una condición verdadera si la variable está definida.\n" - STRING_LABEL_HELP1 "Muestra o cambia la etiqueta de una unidad.\n\nLABEL [unidad:][etiqueta]\n" - STRING_LABEL_HELP2 "El volumen en la unidad %c: es %s\n" - STRING_LABEL_HELP3 "El volumen en la unidad %c: no tiene etiqueta\n" - STRING_LABEL_HELP4 "El número de serie del volumen es %04X-%04X\n" - STRING_LABEL_HELP5 "Etiqueta del volumen (11 Caracteres, INTRO para ninguna)? " STRING_LOCALE_HELP1 "La hora actual es" STRING_MKDIR_HELP "Crea un directorio.\n\n\ MKDIR [unidad:]ruta\nMD [unidad:]ruta" diff --git a/base/shell/cmd/lang/fr-FR.rc b/base/shell/cmd/lang/fr-FR.rc index 09799ca373d..79c52de94b8 100644 --- a/base/shell/cmd/lang/fr-FR.rc +++ b/base/shell/cmd/lang/fr-FR.rc @@ -258,11 +258,6 @@ commande Indique la commande à lancer si la condition est vérifiée.\ chaine1==chaine2 La condition sera vraie si les deux chaines sont identiques.\n\ EXIST nomfichier La condition sera vraie si le fichier spécifié existe.\n\ DEFINED variable La condition sera vraie si la variable indiquée est définie." - STRING_LABEL_HELP1 "Affiche ou change le nom de volume du disque.\n\nLABEL [disque:][nomdevolume]\n" - STRING_LABEL_HELP2 "Le nom de volume du disque %c: est %s\n" - STRING_LABEL_HELP3 "Le disque %c: n'a pas de nom de volume\n" - STRING_LABEL_HELP4 "Le numéro de serie du volume est %04X-%04X\n" - STRING_LABEL_HELP5 "Nom de volume (11 Caractères, ENTREE si aucun) ? " STRING_LOCALE_HELP1 "L'heure actuelle est " STRING_MKDIR_HELP "Crée un répertoire.\n\n\ MKDIR [lecteur:]chemin\nMD [lecteur:]chemin" diff --git a/base/shell/cmd/lang/hu-HU.rc b/base/shell/cmd/lang/hu-HU.rc index b984b99262c..be3cc7b2d64 100644 --- a/base/shell/cmd/lang/hu-HU.rc +++ b/base/shell/cmd/lang/hu-HU.rc @@ -230,12 +230,6 @@ string1==string2 Specifies a true condition if the specified text strings\n\ EXIST állományname Specifies a true condition if the specified állományname exists.\n\ DEFINED variable Specifies a true condition if the specified variable is\n\ defined.\n" - STRING_LABEL_HELP1 "A kötet címkéjét megjeleníti, vagy megváltoztatja.\n\n\ -LABEL [meghajtó:] [új_címke]\n" - STRING_LABEL_HELP2 "A (%c) meghajtóban lévõ kötet címkéje %s\n" - STRING_LABEL_HELP3 "A (%c) megjajtóban lévõ kötetnek nincs címkéje.\n" - STRING_LABEL_HELP4 "A kötet sorozatszáma %04X-%04X\n" - STRING_LABEL_HELP5 "Új kötetcímke (11 betû, ENTER ha üres)? " STRING_LOCALE_HELP1 "Az aktuális idõ:" STRING_MKDIR_HELP "Létrehoz egy új mappát.\n\n\ MKDIR [meghajtó:]path\nMD [meghajtó:]path" diff --git a/base/shell/cmd/lang/id-ID.rc b/base/shell/cmd/lang/id-ID.rc index ffb62a078bd..c668844ab96 100644 --- a/base/shell/cmd/lang/id-ID.rc +++ b/base/shell/cmd/lang/id-ID.rc @@ -245,11 +245,6 @@ string1==string2 Menetapkan kondisi benar jika string teks yang ditetapkan\n\ sama.\n\ EXIST filename Menetapkan kondisi benar jika nama file ada.\n\ DEFINED variable Menetapkan kondisi benar jika variabel didefinisikan.\n" - STRING_LABEL_HELP1 "Menampilkan atau mengubah label drive.\n\nLABEL [drive:][label]\n" - STRING_LABEL_HELP2 "Volume di drive %c: adalah %s\n" - STRING_LABEL_HELP3 "Volume di drive %c: tidak berlabel\n" - STRING_LABEL_HELP4 "Nomor Seri Volume adalah %04X-%04X\n" - STRING_LABEL_HELP5 "Label Drive (11 Karakter, ENTER jika sudah)? " STRING_LOCALE_HELP1 "Waktu saat ini" STRING_MKDIR_HELP "Membuat direktori.\n\n\ MKDIR [drive:]path\nMD [drive:]path" diff --git a/base/shell/cmd/lang/it-IT.rc b/base/shell/cmd/lang/it-IT.rc index 16b8cb84b55..2373773b9ac 100644 --- a/base/shell/cmd/lang/it-IT.rc +++ b/base/shell/cmd/lang/it-IT.rc @@ -245,12 +245,6 @@ command E' il comando da eseguire se la condizione è verificata.\n\ string1==string2 E' verificata se sono uguali le due stringhe\n\ EXIST nomefile E' verificata se il file esiste.\n\ DEFINED variabile E' verificata se la variabile è definita.\n" - STRING_LABEL_HELP1 "Visualizza o modifica l'etichetta di un disco.\n\n\ -LABEL [disco:][etichetta]\n" - STRING_LABEL_HELP2 "Il Volume nel disco %c: è %s\n" - STRING_LABEL_HELP3 "Il Volume nel disco %c: non ha etichetta\n" - STRING_LABEL_HELP4 "Il numero di serie del Volume è %04X-%04X\n" - STRING_LABEL_HELP5 "Etichetta del disco (11 Caratteri, INVIO per nessuna)? " STRING_LOCALE_HELP1 "L'ora attuale è" STRING_MKDIR_HELP "Crea una cartella.\n\n\ MKDIR [disco:]percorso\nMD [disco:]percorso" diff --git a/base/shell/cmd/lang/ja-JP.rc b/base/shell/cmd/lang/ja-JP.rc index 16885267eab..442677324ae 100644 --- a/base/shell/cmd/lang/ja-JP.rc +++ b/base/shell/cmd/lang/ja-JP.rc @@ -251,11 +251,6 @@ EXIST ファイル名指定したファイル名が存在するときに条件指定します。\n\ DEFINED 変数指定した変数が定義されているときに条件が真になるように\n\ 指定します。\n" - STRING_LABEL_HELP1 "ディスクのボリュームラベルを表示または変更します。\n\nLABEL [ドライブ:][ラベル]\n" - STRING_LABEL_HELP2 "ドライブ %c: のボリュームラベルは %s です\n" - STRING_LABEL_HELP3 "ドライブ %c: にはボリュームラベルがありませんl\n" - STRING_LABEL_HELP4 "ボリュームシリアル番号は %04X-%04X\n です" - STRING_LABEL_HELP5 "ボリュームラベルを 11 文字以内で入力してください。\n必要なければ Enter キーを押してください: " STRING_LOCALE_HELP1 "現在時刻は" STRING_MKDIR_HELP "ディレクトリを作成します。\n\n\ MKDIR [ドライブ:]パス\n\ diff --git a/base/shell/cmd/lang/no-NO.rc b/base/shell/cmd/lang/no-NO.rc index 2d8f2930113..0f491bd80a4 100644 --- a/base/shell/cmd/lang/no-NO.rc +++ b/base/shell/cmd/lang/no-NO.rc @@ -243,11 +243,6 @@ streng1==streng2 Angir et oppfylt vilkår hvis tekststrengene er like\n\ EXIST filnavn Angir et oppfylt vilkår hvis spesifisert filnavn eksisterer.\n\ DEFINED variabel Angir et oppfylt vilkår hvis spesifisert variabel er\n\ definert.\n" - STRING_LABEL_HELP1 "Viser eller endrer navn på stasjon.\n\nLABEL [stasjon:][merke]\n" - STRING_LABEL_HELP2 "Volumet i stasjon %c: er %s\n" - STRING_LABEL_HELP3 "Volumet i stasjon %c: er uten navn\n" - STRING_LABEL_HELP4 "Volumserienummeret er %04X-%04X\n" - STRING_LABEL_HELP5 "Volumnavn (11 tegn, Enter = intet navn)? " STRING_LOCALE_HELP1 "gjeldende tid er" STRING_MKDIR_HELP "Oppretter en mappe.\n\n\ MKDIR [stasjon:]mappe\nMD [stasjon:]mappe" diff --git a/base/shell/cmd/lang/pl-PL.rc b/base/shell/cmd/lang/pl-PL.rc index 1e56fe86c69..16b8eb18606 100644 --- a/base/shell/cmd/lang/pl-PL.rc +++ b/base/shell/cmd/lang/pl-PL.rc @@ -250,11 +250,6 @@ komenda Komenda do wykonania, gdy warunek będzie spełniony.\n\ ciąg1==ciąg2 Zwraca PRAWDA, gdy oba ciągi znaków są identyczne\n\ EXIST plik Zwraca PRAWDA, jeśli podany plik istnieje.\n\ DEFINED zmienna Zwraca PRAWDA, jeśli podana zmienna została zdefiniowana\n" - STRING_LABEL_HELP1 "Wyświetla lub zmienia etykietę napędu.\n\nLABEL [napęd:][etykieta]\n" - STRING_LABEL_HELP2 "Wolumin w napędzie %c: ma etykietę: %s\n" - STRING_LABEL_HELP3 "Wolumin w napędzie %c: nie posiada etykiety\n" - STRING_LABEL_HELP4 "Numer seryjny woluminu to: %04X-%04X\n" - STRING_LABEL_HELP5 "Podaj etykietę (0-11 znaków, ENTER = brak etykiety) " STRING_LOCALE_HELP1 "Czas bieżący" STRING_MKDIR_HELP "Tworzy katalog.\n\n\ MKDIR [napęd:]ścieżka\nMD [napęd:]ścieżka" diff --git a/base/shell/cmd/lang/ro-RO.rc b/base/shell/cmd/lang/ro-RO.rc index 3c83bbc2a2d..6d6fe74cc9c 100644 --- a/base/shell/cmd/lang/ro-RO.rc +++ b/base/shell/cmd/lang/ro-RO.rc @@ -274,11 +274,6 @@ O etichetă va fi definită pe un rând întreg, începând cu două puncte (:)\ fișierului specificat.\n\ DEFINED variablă Determină o condiție satisfăcută dacă «variabilă»\n\ a fost anterior definită.\n" - STRING_LABEL_HELP1 "Afișează sau modifică eticheta unei unități (de stocare).\n\nLABEL [unitate:][etichetă]\n" - STRING_LABEL_HELP2 "Volumul unității %c: este etichetat ca %s\n" - STRING_LABEL_HELP3 "Volumul unității %c: nu este etichetat.\n" - STRING_LABEL_HELP4 "Numărul de serie al volumului este %04X-%04X\n" - STRING_LABEL_HELP5 "Introduceți eticheta unității (opțională, de 11 caractere), apoi ENTER " STRING_LOCALE_HELP1 "Ora curentă este" STRING_MKDIR_HELP "Crează un director.\n\n\ MD [unitate:]cale\nMKDIR [unitate:]cale\n" diff --git a/base/shell/cmd/lang/ru-RU.rc b/base/shell/cmd/lang/ru-RU.rc index bffa1f14800..bc7675835f1 100644 --- a/base/shell/cmd/lang/ru-RU.rc +++ b/base/shell/cmd/lang/ru-RU.rc @@ -250,11 +250,6 @@ GOTO метка\n\n\ За этой командой может следовать ключевое слово ELSE,\n\ служащее для указания команды, которая должна\n\ выполняться в том случае, если условие ложно.\n" - STRING_LABEL_HELP1 "Создание, изменение и удаление меток тома.\n\nLABEL [диск:][метка]\n" - STRING_LABEL_HELP2 "Том в устройстве %c имеет метку %s\n" - STRING_LABEL_HELP3 "Том в устройстве %c: не имеет метки\n" - STRING_LABEL_HELP4 "Серийный номер тома: %04X-%04X\n" - STRING_LABEL_HELP5 "Метка тома (11 букв, ВВОД для пустой метки)? " STRING_LOCALE_HELP1 "Текущее время: " STRING_MKDIR_HELP "Создание каталога.\n\n\ MKDIR [диск:]путь\nMD [диск:]путь" diff --git a/base/shell/cmd/lang/sk-SK.rc b/base/shell/cmd/lang/sk-SK.rc index 641709f900d..9d80e685832 100644 --- a/base/shell/cmd/lang/sk-SK.rc +++ b/base/shell/cmd/lang/sk-SK.rc @@ -250,11 +250,6 @@ string1==string2 Specifies a true condition if the specified text strings\n\ EXIST filename Specifies a true condition if the specified filename exists.\n\ DEFINED variable Specifies a true condition if the specified variable is\n\ defined.\n" - STRING_LABEL_HELP1 "Displays or changes drive label.\n\nLABEL [drive:][label]\n" - STRING_LABEL_HELP2 "Volume in drive %c: is %s\n" - STRING_LABEL_HELP3 "Volume in drive %c: has no label\n" - STRING_LABEL_HELP4 "Volume Serial Number is %04X-%04X\n" - STRING_LABEL_HELP5 "Drive label (11 Characters, ENTER if none)? " STRING_LOCALE_HELP1 "Aktuálny čas je" STRING_MKDIR_HELP "Creates a directory.\n\n\ MKDIR [drive:]path\nMD [drive:]path" diff --git a/base/shell/cmd/lang/sq-AL.rc b/base/shell/cmd/lang/sq-AL.rc index 38fc7c71173..b7c25c89d90 100644 --- a/base/shell/cmd/lang/sq-AL.rc +++ b/base/shell/cmd/lang/sq-AL.rc @@ -248,11 +248,6 @@ string1==string2 Përcakton një kusht të vërtetë nëse vargjet e specifikua EXIST filename Përcakton një kusht të vërtetë, nëse ekziston dokumenti i specifikuar.\n\ DEFINED variable Përcakton një kusht të vërtetë nëse variabli është specifikuar\n\ dhe karakterizuar.\n" - STRING_LABEL_HELP1 "Shfaq ose ndrysho etiketën e driverit.\n\nLABEL [drive:][etikete]\n" - STRING_LABEL_HELP2 "Volumi në drive %c: is %s\n" - STRING_LABEL_HELP3 "Volumi në drive %c: has no label\n" - STRING_LABEL_HELP4 "Numri Serial i Volumit është %04X-%04X\n" - STRING_LABEL_HELP5 "Drive label (11 Characters, ENTER if none)? " STRING_LOCALE_HELP1 "Koha e tanishme është" STRING_MKDIR_HELP "Krijon një skedë.\n\n\ MKDIR [drive:]rrugë\nMD [drive:]rrugë" diff --git a/base/shell/cmd/lang/sv-SE.rc b/base/shell/cmd/lang/sv-SE.rc index ea59758eb0a..0a6abe6dcbc 100644 --- a/base/shell/cmd/lang/sv-SE.rc +++ b/base/shell/cmd/lang/sv-SE.rc @@ -243,11 +243,6 @@ sträng1==sträng2 Anger ett uppfyllt villkor om textsträngarna är lika\n\ EXIST filnamn Anger ett uppfyllt villkor om angivet filnamn existerar.\n\ DEFINED variabel Anger ett uppfyllt villkor om angiven variabel är\n\ definerad.\n" - STRING_LABEL_HELP1 "Skapar, tar bort eller ändrar etikett på enhet.\n\nLABEL [enhet:][etikett]\n" - STRING_LABEL_HELP2 "Volymen i enhet %c: är %s\n" - STRING_LABEL_HELP3 "Volymen i enhet %c: är utan namn\n" - STRING_LABEL_HELP4 "Volymens serienummer är %04X-%04X\n" - STRING_LABEL_HELP5 "Volymnamn (11 tecken, Enter = inget namn)? " STRING_LOCALE_HELP1 "aktuell tid är" STRING_MKDIR_HELP "Skapar en mapp.\n\n\ MKDIR [enhet:]mapp\nMD [enhet:]mapp" diff --git a/base/shell/cmd/lang/tr-TR.rc b/base/shell/cmd/lang/tr-TR.rc index be6104a3e11..15be8f6b215 100644 --- a/base/shell/cmd/lang/tr-TR.rc +++ b/base/shell/cmd/lang/tr-TR.rc @@ -251,11 +251,6 @@ dizgi1==dizgi2 Belirtilen metin dizgileri birbiriyle uyuşuyorsa bir doğru\n şart belirtir.\n\ EXIST kütük adı Belirtilen kütük adı varsa bir doğru şart belirtir.\n\ DEFINED değişken Belirtilen değişken tanımlanmışsa bir doğru şart belirtir.\n" - STRING_LABEL_HELP1 "Sürücü etiketini görüntüler ya da değiştirir.\n\nLABEL [sürücü:][etiket]\n" - STRING_LABEL_HELP2 "%c sürücüsünde birim %s\n" - STRING_LABEL_HELP3 "%c sürücüsünde birimin etiketi yok\n" - STRING_LABEL_HELP4 "Birim Dizilik Numarası %04X-%04X\n" - STRING_LABEL_HELP5 "Sürücü etiketi (11 damga, yok için Giriş)? " STRING_LOCALE_HELP1 "Şimdiki zaman" STRING_MKDIR_HELP "Bir dizin oluşturur.\n\n\ MKDIR [sürücü:]yol\nMD [sürücü:]yol" diff --git a/base/shell/cmd/lang/uk-UA.rc b/base/shell/cmd/lang/uk-UA.rc index 91054347780..acc6ac68b37 100644 --- a/base/shell/cmd/lang/uk-UA.rc +++ b/base/shell/cmd/lang/uk-UA.rc @@ -255,11 +255,6 @@ ERRORLEVEL число Ця умова є iстинною, якщо код, що EXIST iм'я_файлу Умова є iстинною, якщо файл з вказаним iменем iснує.\n\ DEFINED змiнна Ця умова є iстинною, якщо вказана змiнна\n\ задана.\n" - STRING_LABEL_HELP1 "Вiдображення або змiна мiтки тому.\n\nLABEL [диск:][мiтка]\n" - STRING_LABEL_HELP2 "Том в пристрої %c: має мiтку %s\n" - STRING_LABEL_HELP3 "Том в пристрої %c: не має мiтки\n" - STRING_LABEL_HELP4 "Серiйний номер тому: %04X-%04X\n" - STRING_LABEL_HELP5 "Мiтка тому (11 букв, ENTER без мiтки)? " STRING_LOCALE_HELP1 "Поточний час: " STRING_MKDIR_HELP "Створення каталогу.\n\n\ MKDIR [диск:]шлях\nMD [диск:]шлях" diff --git a/base/shell/cmd/lang/zh-CN.rc b/base/shell/cmd/lang/zh-CN.rc index 0ce1b121baa..5c4e3a73e09 100644 --- a/base/shell/cmd/lang/zh-CN.rc +++ b/base/shell/cmd/lang/zh-CN.rc @@ -230,11 +230,6 @@ ERRORLEVEL 数字当上一个程序返回一个大于或等于指定数字字符串1==字符串2 当所指定的字符串相匹配时为真。\n\ EXIST 文件名当指定的文件名存在时为真。\n\ DEFINED 变量当指定的变量已被定义时为真。\n" - STRING_LABEL_HELP1 "显示或改变驱动器卷标。\n\nLABEL [驱动器:][卷标]\n" - STRING_LABEL_HELP2 "驱动器 %c 中的卷是 %s\n" - STRING_LABEL_HELP3 "驱动器 %c 中的卷没有卷标。\n" - STRING_LABEL_HELP4 "卷的序列号是 %04X-%04X\n" - STRING_LABEL_HELP5 "驱动器卷标 (11 个字符, 按 ENTER 忽略)? " STRING_LOCALE_HELP1 "当前时间是" STRING_MKDIR_HELP "创建一个目录。\n\n\ MKDIR [驱动器:]路径\nMD [驱动器:]路径" diff --git a/base/shell/cmd/lang/zh-TW.rc b/base/shell/cmd/lang/zh-TW.rc index 7a76081e272..5d818bd809f 100644 --- a/base/shell/cmd/lang/zh-TW.rc +++ b/base/shell/cmd/lang/zh-TW.rc @@ -231,11 +231,6 @@ ERRORLEVEL 數字當上一個程式返回一個大於或等於指定數字字元串1==字元串2 當所指定的字元串相匹配時為真。\n\ EXIST 檔名當指定的檔名存在時為真。\n\ DEFINED 變數當指定的變數已被定義時為真。\n" - STRING_LABEL_HELP1 "顯示或改變驅動器卷標。\n\nLABEL [驅動器:][卷標]\n" - STRING_LABEL_HELP2 "驅動器 %c 中的卷是 %s\n" - STRING_LABEL_HELP3 "驅動器 %c 中的卷沒有卷標。\n" - STRING_LABEL_HELP4 "卷的序列號是 %04X-%04X\n" - STRING_LABEL_HELP5 "驅動器卷標 (11 個字元, 按 ENTER 忽略)? " STRING_LOCALE_HELP1 "當前時間是" STRING_MKDIR_HELP "創建一個目錄。\n\n\ MKDIR [驅動器:]路徑\nMD [驅動器:]路徑" diff --git a/base/shell/cmd/resource.h b/base/shell/cmd/resource.h index ff914ba1ddc..933d5677408 100644 --- a/base/shell/cmd/resource.h +++ b/base/shell/cmd/resource.h @@ -134,12 +134,6 @@ #define STRING_GOTO_HELP1 659 -#define STRING_LABEL_HELP1 661 -#define STRING_LABEL_HELP2 662 -#define STRING_LABEL_HELP3 663 -#define STRING_LABEL_HELP4 664 -#define STRING_LABEL_HELP5 665 - #define STRING_LOCALE_HELP1 666 #define STRING_MKDIR_HELP 667

1 0

[reactos] 05/05: [SHELL32_APITEST] Fix PIDL leaks.
by Thomas Faber 22 Sep '19

22 Sep '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cf2b918e0f5dc4ed745a3… commit cf2b918e0f5dc4ed745a36158f2f003972d591be Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Tue Sep 10 12:12:02 2019 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Sep 22 11:42:10 2019 +0200 [SHELL32_APITEST] Fix PIDL leaks. --- modules/rostests/apitests/shell32/CFSFolder.cpp | 2 +- modules/rostests/apitests/shell32/CMyComputer.cpp | 2 +- modules/rostests/apitests/shell32/CShellDesktop.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/rostests/apitests/shell32/CFSFolder.cpp b/modules/rostests/apitests/shell32/CFSFolder.cpp index b4be49fcc1c..ef92e081343 100644 --- a/modules/rostests/apitests/shell32/CFSFolder.cpp +++ b/modules/rostests/apitests/shell32/CFSFolder.cpp @@ -76,7 +76,7 @@ VOID TestUninitialized() hr = ppf2->Initialize(testpidl); ok(hr == S_OK, "hr = %lx\n", hr); - LPITEMIDLIST pidl; + CComHeapPtr<ITEMIDLIST> pidl; hr = ppf2->GetCurFolder(&pidl); ok(hr == S_OK, "hr = %lx\n", hr); ok(pidl->mkid.cb == 2 * sizeof(WORD), "got wrong pidl size, cb = %x\n", pidl->mkid.cb); diff --git a/modules/rostests/apitests/shell32/CMyComputer.cpp b/modules/rostests/apitests/shell32/CMyComputer.cpp index 0d77ea23afb..0254d8e14e2 100644 --- a/modules/rostests/apitests/shell32/CMyComputer.cpp +++ b/modules/rostests/apitests/shell32/CMyComputer.cpp @@ -65,7 +65,7 @@ VOID TestInitialize(_In_ IShellFolder2 *psf2) //hr = ppf2->GetCurFolder(NULL); //ok(hr == E_INVALIDARG, "hr = %lx\n", hr); - LPITEMIDLIST pidl; + CComHeapPtr<ITEMIDLIST> pidl; hr = ppf2->GetCurFolder(&pidl); ok(hr == S_OK, "hr = %lx\n", hr); // 0 in win10, 14 in xp diff --git a/modules/rostests/apitests/shell32/CShellDesktop.cpp b/modules/rostests/apitests/shell32/CShellDesktop.cpp index 885e2251639..329ee8f8f2d 100644 --- a/modules/rostests/apitests/shell32/CShellDesktop.cpp +++ b/modules/rostests/apitests/shell32/CShellDesktop.cpp @@ -205,7 +205,7 @@ VOID TestInitialize(_In_ IShellFolder *psf) //hr = ppf2->GetCurFolder(NULL); //ok(hr == E_INVALIDARG, "hr = %lx\n", hr); - LPITEMIDLIST pidl; + CComHeapPtr<ITEMIDLIST> pidl; hr = ppf2->GetCurFolder(&pidl); ok(hr == S_OK, "hr = %lx\n", hr); ok(pidl->mkid.cb == 0, "expected empty pidl got cb = %x\n", pidl->mkid.cb);

1 0

← Newer
1
2
3
4
5
6
7
...
12
Older →

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2019