Ros-diffs December 2019

ros-diffs@reactos.org

18 participants
225 discussions

[reactos] 01/01: [DNSRSLVR] Add support for IP6 hosts file entries

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c35ebdfeb613242eaa905… commit c35ebdfeb613242eaa905230033712d43d8b0070 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Dec 1 17:17:50 2019 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Dec 1 17:18:47 2019 +0100 [DNSRSLVR] Add support for IP6 hosts file entries --- base/services/dnsrslvr/hostsfile.c | 201 +++++++++++++++++++------------------ 1 file changed, 106 insertions(+), 95 deletions(-) diff --git a/base/services/dnsrslvr/hostsfile.c b/base/services/dnsrslvr/hostsfile.c index 1f12b87455f..98d39374d4e 100644 --- a/base/services/dnsrslvr/hostsfile.c +++ b/base/services/dnsrslvr/hostsfile.c @@ -8,11 +8,14 @@ */ #include "precomp.h" +#include <inaddr.h> +#include <in6addr.h> #define NDEBUG #include <debug.h> +static WCHAR szHexChar[] = L"0123456789abcdef"; static PWSTR @@ -50,104 +53,51 @@ AnsiToUnicode( static BOOL -ParseV4Address( - LPCSTR AddressString, - OUT PDWORD pAddress) +ParseIpv4Address( + _In_ PCSTR AddressString, + _Out_ PIN_ADDR pAddress) { - CHAR *cp; - DWORD val, base; - unsigned char c; - DWORD parts[4], *pp = parts; + PCSTR pTerminator = NULL; + NTSTATUS Status; - cp = (CHAR *)AddressString; + Status = RtlIpv4StringToAddressA(AddressString, + TRUE, + &pTerminator, + pAddress); + if (NT_SUCCESS(Status) && pTerminator != NULL && *pTerminator == '\0') + return TRUE; - if (!AddressString) - return FALSE; - - if (!isdigit(*cp)) - return FALSE; - -again: - /* - * Collect number up to ``.''. - * Values are specified as for C: - * 0x=hex, 0=octal, other=decimal. - */ - val = 0; base = 10; - if (*cp == '0') - { - if (*++cp == 'x' || *cp == 'X') - base = 16, cp++; - else - base = 8; - } - - while ((c = *cp)) - { - if (isdigit(c)) - { - val = (val * base) + (c - '0'); - cp++; - continue; - } - - if (base == 16 && isxdigit(c)) - { - val = (val << 4) + (c + 10 - (islower(c) ? 'a' : 'A')); - cp++; - continue; - } - break; - } - - if (*cp == '.') - { - /* - * Internet format: - * a.b.c.d - */ - if (pp >= parts + 4) - return FALSE; - *pp++ = val; - cp++; - goto again; - } - - /* Check for trailing characters */ - if (*cp && *cp > ' ') - return FALSE; - - if (pp >= parts + 4) - return FALSE; - - *pp++ = val; - /* - * Concoct the address according to - * the number of parts specified. - */ - if ((DWORD)(pp - parts) != 4) - return FALSE; + return FALSE; +} - if (parts[0] > 0xff || parts[1] > 0xff || parts[2] > 0xff || parts[3] > 0xff) - return FALSE; - val = (parts[3] << 24) | (parts[2] << 16) | (parts[1] << 8) | parts[0]; +static +BOOL +ParseIpv6Address( + _In_ LPCSTR AddressString, + _Out_ PIN6_ADDR pAddress) +{ + PCSTR pTerminator = NULL; + NTSTATUS Status; - if (pAddress) - *pAddress = val; + Status = RtlIpv6StringToAddressA(AddressString, + &pTerminator, + pAddress); + if (NT_SUCCESS(Status) && pTerminator != NULL && *pTerminator == '\0') + return TRUE; - return TRUE; + return FALSE; } static VOID -AddV4HostEntries( +AddIpv4HostEntries( PWSTR pszHostName, - DWORD dwIpAddress) + PIN_ADDR pAddress) { DNS_RECORDW ARecord, PtrRecord; - WCHAR szInAddrArpaName[32]; + WCHAR szReverseName[32]; /* Prepare the A record */ ZeroMemory(&ARecord, sizeof(DNS_RECORDW)); @@ -157,19 +107,19 @@ AddV4HostEntries( ARecord.wDataLength = sizeof(DNS_A_DATA); ARecord.dwTtl = 86400; - ARecord.Data.A.IpAddress = dwIpAddress; + ARecord.Data.A.IpAddress = pAddress->S_un.S_addr; - swprintf(szInAddrArpaName, + /* Prepare the PTR record */ + swprintf(szReverseName, L"%u.%u.%u.%u.in-addr.arpa", - (dwIpAddress >> 24) & 0xFF, - (dwIpAddress >> 16) & 0xFF, - (dwIpAddress >> 8) & 0xFF, - dwIpAddress & 0xFF); + pAddress->S_un.S_un_b.s_b4, + pAddress->S_un.S_un_b.s_b3, + pAddress->S_un.S_un_b.s_b2, + pAddress->S_un.S_un_b.s_b1); - /* Prepare the PTR record */ ZeroMemory(&PtrRecord, sizeof(DNS_RECORDW)); - PtrRecord.pName = szInAddrArpaName; + PtrRecord.pName = szReverseName; PtrRecord.wType = DNS_TYPE_PTR; PtrRecord.wDataLength = sizeof(DNS_PTR_DATA); PtrRecord.dwTtl = 86400; @@ -181,6 +131,56 @@ AddV4HostEntries( } +static +VOID +AddIpv6HostEntries( + PWSTR pszHostName, + PIN6_ADDR pAddress) +{ + DNS_RECORDW AAAARecord, PtrRecord; + WCHAR szReverseName[80]; + DWORD i, j, k; + + /* Prepare the AAAA record */ + ZeroMemory(&AAAARecord, sizeof(DNS_RECORDW)); + + AAAARecord.pName = pszHostName; + AAAARecord.wType = DNS_TYPE_AAAA; + AAAARecord.wDataLength = sizeof(DNS_AAAA_DATA); + AAAARecord.dwTtl = 86400; + + CopyMemory(&AAAARecord.Data.AAAA.Ip6Address, + &pAddress->u.Byte, + sizeof(IN6_ADDR)); + + /* Prepare the PTR record */ + ZeroMemory(szReverseName, sizeof(szReverseName)); + + for (i = 0; i < sizeof(IN6_ADDR); i++) + { + j = 4 * i; + k = sizeof(IN6_ADDR) - 1 - i; + szReverseName[j] = szHexChar[pAddress->u.Byte[k] & 0xF]; + szReverseName[j + 1] = L'.'; + szReverseName[j + 2] = szHexChar[(pAddress->u.Byte[k] >> 4) & 0xF]; + szReverseName[j + 3] = L'.'; + } + wcscat(szReverseName, L"ip6.arpa"); + + ZeroMemory(&PtrRecord, sizeof(DNS_RECORDW)); + + PtrRecord.pName = szReverseName; + PtrRecord.wType = DNS_TYPE_PTR; + PtrRecord.wDataLength = sizeof(DNS_PTR_DATA); + PtrRecord.dwTtl = 86400; + + PtrRecord.Data.PTR.pNameHost = pszHostName; + + DnsIntCacheAddEntry(&AAAARecord); + DnsIntCacheAddEntry(&PtrRecord); +} + + static FILE * OpenHostsFile(VOID) @@ -285,7 +285,8 @@ ReadHostsFile(VOID) CHAR szLineBuffer[512]; FILE *pHostFile = NULL; CHAR *Ptr, *NameStart, *NameEnd, *AddressStart, *AddressEnd; - DWORD Address; + struct in_addr Ipv4Address; + struct in6_addr Ipv6Address; PWSTR pszHostName; pHostFile = OpenHostsFile(); @@ -374,15 +375,25 @@ ReadHostsFile(VOID) DPRINT("%s ==> %s\n", NameStart, AddressStart); - if (ParseV4Address(AddressStart, &Address)) + if (ParseIpv4Address(AddressStart, &Ipv4Address)) { - DPRINT("IP4: %s ==> 0x%08lx\n", AddressStart, Address); + DPRINT("IPv4: %s\n", AddressStart); pszHostName = AnsiToUnicode(NameStart); if (pszHostName != NULL) { - AddV4HostEntries(pszHostName, Address); + AddIpv4HostEntries(pszHostName, &Ipv4Address); + HeapFree(GetProcessHeap(), 0, pszHostName); + } + } + else if (ParseIpv6Address(AddressStart, &Ipv6Address)) + { + DPRINT("IPv6: %s\n", AddressStart); + pszHostName = AnsiToUnicode(NameStart); + if (pszHostName != NULL) + { + AddIpv6HostEntries(pszHostName, &Ipv6Address); HeapFree(GetProcessHeap(), 0, pszHostName); } }

5 years

[reactos] 01/01: [SHELLEXT][ZIPFLDR] Implement ZIP creation (#2114)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=962ff6e2fa96dd9f6f5fe… commit 962ff6e2fa96dd9f6f5fee0e04551d4a54c076ec Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Dec 1 21:20:53 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Dec 1 21:20:53 2019 +0900 [SHELLEXT][ZIPFLDR] Implement ZIP creation (#2114) This PR will implement *.ZFSendToTarget file type that will realize SendTo ZIP folder in future. CORE-16495, CORE-12562 --- dll/shellext/zipfldr/CMakeLists.txt | 2 + dll/shellext/zipfldr/CSendToZip.cpp | 90 +++++++++ dll/shellext/zipfldr/CSendToZip.hpp | 79 ++++++++ dll/shellext/zipfldr/CZipCreater.cpp | 358 +++++++++++++++++++++++++++++++++++ dll/shellext/zipfldr/CZipCreater.hpp | 32 ++++ dll/shellext/zipfldr/lang/de-DE.rc | 5 + dll/shellext/zipfldr/lang/en-US.rc | 5 + dll/shellext/zipfldr/lang/et-EE.rc | 5 + dll/shellext/zipfldr/lang/fr-FR.rc | 5 + dll/shellext/zipfldr/lang/hi-IN.rc | 5 + dll/shellext/zipfldr/lang/it-IT.rc | 5 + dll/shellext/zipfldr/lang/ja-JP.rc | 5 + dll/shellext/zipfldr/lang/pl-PL.rc | 5 + dll/shellext/zipfldr/lang/ro-RO.rc | 5 + dll/shellext/zipfldr/lang/ru-RU.rc | 5 + dll/shellext/zipfldr/lang/sv-SE.rc | 5 + dll/shellext/zipfldr/lang/zh-CN.rc | 5 + dll/shellext/zipfldr/precomp.h | 2 + dll/shellext/zipfldr/res/zipfldr.rgs | 32 +++- dll/shellext/zipfldr/resource.h | 6 +- dll/shellext/zipfldr/zipfldr.cpp | 1 + 21 files changed, 658 insertions(+), 4 deletions(-) diff --git a/dll/shellext/zipfldr/CMakeLists.txt b/dll/shellext/zipfldr/CMakeLists.txt index 3c39dc45c3e..a0244d642aa 100644 --- a/dll/shellext/zipfldr/CMakeLists.txt +++ b/dll/shellext/zipfldr/CMakeLists.txt @@ -28,6 +28,8 @@ list(APPEND SOURCE CExplorerCommand.cpp CEnumZipContents.cpp CFolderViewCB.cpp + CSendToZip.cpp + CZipCreater.cpp CZipEnumerator.hpp CZipExtract.cpp CZipFolder.hpp diff --git a/dll/shellext/zipfldr/CSendToZip.cpp b/dll/shellext/zipfldr/CSendToZip.cpp new file mode 100644 index 00000000000..9ec9bd5dc7a --- /dev/null +++ b/dll/shellext/zipfldr/CSendToZip.cpp @@ -0,0 +1,90 @@ +/* + * PROJECT: ReactOS Zip Shell Extension + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: SendTo handler + * COPYRIGHT: Copyright 2019 Mark Jansen (mark.jansen(a)reactos.org) + * Copyright 2019 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) + */ + +#include "precomp.h" + +STDMETHODIMP +CSendToZip::DragEnter(IDataObject *pDataObj, DWORD grfKeyState, POINTL pt, + DWORD *pdwEffect) +{ + m_pDataObject = pDataObj; + + FORMATETC etc = { CF_HDROP, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }; + m_fCanDragDrop = SUCCEEDED(pDataObj->QueryGetData(&etc)); + + if (m_fCanDragDrop) + *pdwEffect &= DROPEFFECT_COPY; + else + *pdwEffect = DROPEFFECT_NONE; + + return S_OK; +} + +STDMETHODIMP CSendToZip::DragOver(DWORD grfKeyState, POINTL pt, DWORD *pdwEffect) +{ + if (m_fCanDragDrop) + *pdwEffect &= DROPEFFECT_COPY; + else + *pdwEffect = DROPEFFECT_NONE; + + return S_OK; +} + +STDMETHODIMP CSendToZip::DragLeave() +{ + m_fCanDragDrop = FALSE; + m_pDataObject.Release(); + return S_OK; +} + +STDMETHODIMP +CSendToZip::Drop(IDataObject *pDataObj, DWORD grfKeyState, POINTL pt, + DWORD *pdwEffect) +{ + m_pDataObject = pDataObj; + *pdwEffect &= DROPEFFECT_COPY; + + if (!pDataObj || !m_fCanDragDrop || !*pdwEffect) + { + DPRINT1("Drop failed: %d %d %d\n", + !pDataObj, !m_fCanDragDrop, !*pdwEffect); + *pdwEffect = 0; + DragLeave(); + return E_FAIL; + } + + STGMEDIUM stg; + FORMATETC etc = { CF_HDROP, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }; + HRESULT hr = pDataObj->GetData(&etc, &stg); + if (FAILED_UNEXPECTEDLY(hr)) + { + *pdwEffect = 0; + DragLeave(); + return E_FAIL; + } + + HDROP hDrop = reinterpret_cast<HDROP>(stg.hGlobal); + UINT cItems = ::DragQueryFileW(hDrop, -1, NULL, 0); + + CZipCreator *pCreater = CZipCreator::DoCreate(); + + for (UINT iItem = 0; iItem < cItems; ++iItem) + { + WCHAR szPath[MAX_PATH]; + DragQueryFileW(hDrop, iItem, szPath, _countof(szPath)); + + pCreater->DoAddItem(szPath); + } + + ::ReleaseStgMedium(&stg); + + CZipCreator::runThread(pCreater); // pCreater is deleted in runThread + + DragLeave(); + return hr; +} diff --git a/dll/shellext/zipfldr/CSendToZip.hpp b/dll/shellext/zipfldr/CSendToZip.hpp new file mode 100644 index 00000000000..1f3eb248a13 --- /dev/null +++ b/dll/shellext/zipfldr/CSendToZip.hpp @@ -0,0 +1,79 @@ +/* + * PROJECT: ReactOS Zip Shell Extension + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: SendTo handler + * COPYRIGHT: Copyright 2019 Mark Jansen (mark.jansen(a)reactos.org) + * Copyright 2019 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) + */ + +#ifndef CSENDTOZIP_HPP_ +#define CSENDTOZIP_HPP_ + +class CSendToZip : + public CComCoClass<CSendToZip, &CLSID_ZipFolderSendTo>, + public CComObjectRootEx<CComMultiThreadModelNoCS>, + public IDropTarget, + public IPersistFile +{ + CComPtr<IDataObject> m_pDataObject; + BOOL m_fCanDragDrop; + +public: + CSendToZip() : m_fCanDragDrop(FALSE) + { + InterlockedIncrement(&g_ModuleRefCnt); + } + + virtual ~CSendToZip() + { + InterlockedDecrement(&g_ModuleRefCnt); + } + + // *** IShellFolder2 methods *** + STDMETHODIMP DragEnter(IDataObject *pDataObj, DWORD grfKeyState, POINTL pt, DWORD *pdwEffect); + STDMETHODIMP DragOver(DWORD grfKeyState, POINTL pt, DWORD *pdwEffect); + STDMETHODIMP DragLeave(); + STDMETHODIMP Drop(IDataObject *pDataObj, DWORD grfKeyState, POINTL pt, DWORD *pdwEffect); + + // *** IPersistFile methods *** + STDMETHODIMP IsDirty() + { + return S_FALSE; + } + STDMETHODIMP Load(LPCOLESTR pszFileName, DWORD dwMode) + { + return S_OK; + } + STDMETHODIMP Save(LPCOLESTR pszFileName, BOOL fRemember) + { + return E_FAIL; + } + STDMETHODIMP SaveCompleted(LPCOLESTR pszFileName) + { + return E_FAIL; + } + STDMETHODIMP GetCurFile(LPOLESTR *ppszFileName) + { + return E_FAIL; + } + + // *** IPersist methods *** + STDMETHODIMP GetClassID(CLSID *pclsid) + { + return E_FAIL; + } + +public: + DECLARE_NO_REGISTRY() // Handled manually + DECLARE_NOT_AGGREGATABLE(CSendToZip) + + DECLARE_PROTECT_FINAL_CONSTRUCT() + + BEGIN_COM_MAP(CSendToZip) + COM_INTERFACE_ENTRY_IID(IID_IDropTarget, IDropTarget) + COM_INTERFACE_ENTRY_IID(IID_IPersistFile, IPersistFile) + COM_INTERFACE_ENTRY_IID(IID_IPersist, IPersist) + END_COM_MAP() +}; + +#endif diff --git a/dll/shellext/zipfldr/CZipCreater.cpp b/dll/shellext/zipfldr/CZipCreater.cpp new file mode 100644 index 00000000000..694128b6bcb --- /dev/null +++ b/dll/shellext/zipfldr/CZipCreater.cpp @@ -0,0 +1,358 @@ +/* + * PROJECT: ReactOS Zip Shell Extension + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Create a zip file + * COPYRIGHT: Copyright 2019 Mark Jansen (mark.jansen(a)reactos.org) + * Copyright 2019 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) + */ + +#include "precomp.h" +#include "atlsimpcoll.h" +#include "minizip/zip.h" +#include "minizip/iowin32.h" +#include <process.h> + +static CStringW DoGetZipName(LPCWSTR filename) +{ + WCHAR szPath[MAX_PATH]; + StringCbCopyW(szPath, sizeof(szPath), filename); + PathRemoveExtensionW(szPath); + + CStringW ret = szPath; + ret += L".zip"; + + UINT i = 2; + while (PathFileExistsW(ret)) + { + CStringW str; + str.Format(L" (%u).zip", i++); + + ret = szPath; + ret += str; + } + + return ret; +} + +static CStringA DoGetAnsiName(LPCWSTR filename) +{ + CHAR buf[MAX_PATH]; + WideCharToMultiByte(CP_ACP, 0, filename, -1, buf, _countof(buf), NULL, NULL); + return buf; +} + +static CStringW DoGetBaseName(LPCWSTR filename) +{ + WCHAR szBaseName[MAX_PATH]; + StringCbCopyW(szBaseName, sizeof(szBaseName), filename); + PathRemoveFileSpecW(szBaseName); + PathAddBackslashW(szBaseName); + return szBaseName; +} + +static CStringA +DoGetNameInZip(const CStringW& basename, const CStringW& filename) +{ + CStringW basenameI = basename, filenameI = filename; + basenameI.MakeUpper(); + filenameI.MakeUpper(); + + CStringW ret; + if (filenameI.Find(basenameI) == 0) + ret = filename.Mid(basename.GetLength()); + else + ret = filename; + + ret.Replace(L'\\', L'/'); + + return DoGetAnsiName(ret); +} + +static BOOL +DoReadAllOfFile(LPCWSTR filename, CSimpleArray<BYTE>& contents, + zip_fileinfo *pzi) +{ + contents.RemoveAll(); + + HANDLE hFile = CreateFileW(filename, GENERIC_READ, FILE_SHARE_READ, + NULL, OPEN_EXISTING, + FILE_FLAG_SEQUENTIAL_SCAN, NULL); + if (hFile == INVALID_HANDLE_VALUE) + { + DPRINT1("%S: cannot open\n", filename); + return FALSE; + } + + FILETIME ft, ftLocal; + ZeroMemory(pzi, sizeof(*pzi)); + if (GetFileTime(hFile, NULL, NULL, &ft)) + { + SYSTEMTIME st; + FileTimeToLocalFileTime(&ft, &ftLocal); + FileTimeToSystemTime(&ftLocal, &st); + pzi->tmz_date.tm_sec = st.wSecond; + pzi->tmz_date.tm_min = st.wMinute; + pzi->tmz_date.tm_hour = st.wHour; + pzi->tmz_date.tm_mday = st.wDay; + pzi->tmz_date.tm_mon = st.wMonth - 1; + pzi->tmz_date.tm_year = st.wYear; + } + + const DWORD cbBuff = 0x7FFF; + LPBYTE pbBuff = reinterpret_cast<LPBYTE>(CoTaskMemAlloc(cbBuff)); + if (!pbBuff) + { + DPRINT1("Out of memory\n"); + CloseHandle(hFile); + return FALSE; + } + + for (;;) + { + DWORD cbRead; + if (!ReadFile(hFile, pbBuff, cbBuff, &cbRead, NULL) || !cbRead) + break; + + for (DWORD i = 0; i < cbRead; ++i) + contents.Add(pbBuff[i]); + } + + CoTaskMemFree(pbBuff); + CloseHandle(hFile); + + return TRUE; +} + +static void +DoAddFilesFromItem(CSimpleArray<CStringW>& files, LPCWSTR item) +{ + if (!PathIsDirectoryW(item)) + { + files.Add(item); + return; + } + + WCHAR szPath[MAX_PATH]; + StringCbCopyW(szPath, sizeof(szPath), item); + PathAppendW(szPath, L"*"); + + WIN32_FIND_DATAW find; + HANDLE hFind = FindFirstFileW(szPath, &find); + if (hFind == INVALID_HANDLE_VALUE) + return; + + do + { + if (wcscmp(find.cFileName, L".") == 0 || + wcscmp(find.cFileName, L"..") == 0) + { + continue; + } + + StringCbCopyW(szPath, sizeof(szPath), item); + PathAppendW(szPath, find.cFileName); + + if (find.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) + DoAddFilesFromItem(files, szPath); + else + files.Add(szPath); + } while (FindNextFileW(hFind, &find)); + + FindClose(hFind); +} + +struct CZipCreatorImpl +{ + CSimpleArray<CStringW> m_items; + + unsigned JustDoIt(); +}; + +CZipCreator::CZipCreator() : m_pimpl(new CZipCreatorImpl) +{ + InterlockedIncrement(&g_ModuleRefCnt); +} + +CZipCreator::~CZipCreator() +{ + InterlockedDecrement(&g_ModuleRefCnt); + delete m_pimpl; +} + +static unsigned __stdcall +create_zip_function(void *arg) +{ + CZipCreator *pCreater = reinterpret_cast<CZipCreator *>(arg); + return pCreater->m_pimpl->JustDoIt(); +} + +BOOL CZipCreator::runThread(CZipCreator *pCreater) +{ + unsigned tid = 0; + HANDLE hThread = reinterpret_cast<HANDLE>( + _beginthreadex(NULL, 0, create_zip_function, pCreater, 0, &tid)); + + if (hThread) + { + CloseHandle(hThread); + return TRUE; + } + + DPRINT1("hThread == NULL\n"); + + CStringW strTitle(MAKEINTRESOURCEW(IDS_ERRORTITLE)); + CStringW strText(MAKEINTRESOURCEW(IDS_CANTSTARTTHREAD)); + MessageBoxW(NULL, strText, strTitle, MB_ICONERROR); + + delete pCreater; + return FALSE; +} + +void CZipCreator::DoAddItem(LPCWSTR pszFile) +{ + // canonicalize path + WCHAR szPath[MAX_PATH]; + GetFullPathNameW(pszFile, _countof(szPath), szPath, NULL); + + m_pimpl->m_items.Add(szPath); +} + +enum CZC_ERROR +{ + CZCERR_ZEROITEMS = 1, + CZCERR_NOFILES, + CZCERR_CREATE, + CZCERR_READ +}; + +unsigned CZipCreatorImpl::JustDoIt() +{ + // TODO: Show progress. + + if (m_items.GetSize() <= 0) + { + DPRINT1("GetSize() <= 0\n"); + return CZCERR_ZEROITEMS; + } + + CSimpleArray<CStringW> files; + for (INT iItem = 0; iItem < m_items.GetSize(); ++iItem) + { + DoAddFilesFromItem(files, m_items[iItem]); + } + + if (files.GetSize() <= 0) + { + DPRINT1("files.GetSize() <= 0\n"); + + CStringW strTitle(MAKEINTRESOURCEW(IDS_ERRORTITLE)); + CStringW strText; + strText.Format(IDS_NOFILES, static_cast<LPCWSTR>(m_items[0])); + MessageBoxW(NULL, strText, strTitle, MB_ICONERROR); + + return CZCERR_NOFILES; + } + + zlib_filefunc64_def ffunc; + fill_win32_filefunc64W(&ffunc); + + CStringW strZipName = DoGetZipName(m_items[0]); + zipFile zf = zipOpen2_64(strZipName, APPEND_STATUS_CREATE, NULL, &ffunc); + if (zf == 0) + { + DPRINT1("zf == 0\n"); + + int err = CZCERR_CREATE; + + CStringW strTitle(MAKEINTRESOURCEW(IDS_ERRORTITLE)); + CStringW strText; + strText.Format(IDS_CANTCREATEZIP, static_cast<LPCWSTR>(strZipName), err); + MessageBoxW(NULL, strText, strTitle, MB_ICONERROR); + + return err; + } + + // TODO: password + const char *password = NULL; + int zip64 = 1; // always zip64 + zip_fileinfo zi; + + int err = 0; + CStringW strTarget, strBaseName = DoGetBaseName(m_items[0]); + for (INT iFile = 0; iFile < files.GetSize(); ++iFile) + { + const CStringW& strFile = files[iFile]; + + CSimpleArray<BYTE> contents; + if (!DoReadAllOfFile(strFile, contents, &zi)) + { + DPRINT1("DoReadAllOfFile failed\n"); + err = CZCERR_READ; + strTarget = strFile; + break; + } + + unsigned long crc = 0; + if (password) + { + // TODO: crc = ...; + } + + CStringA strNameInZip = DoGetNameInZip(strBaseName, strFile); + err = zipOpenNewFileInZip3_64(zf, + strNameInZip, + &zi, + NULL, + 0, + NULL, + 0, + NULL, + Z_DEFLATED, + Z_DEFAULT_COMPRESSION, + 0, + -MAX_WBITS, + DEF_MEM_LEVEL, + Z_DEFAULT_STRATEGY, + password, + crc, + zip64); + if (err) + { + DPRINT1("zipOpenNewFileInZip3_64\n"); + break; + } + + err = zipWriteInFileInZip(zf, contents.GetData(), contents.GetSize()); + if (err) + { + DPRINT1("zipWriteInFileInZip\n"); + break; + } + + err = zipCloseFileInZip(zf); + if (err) + { + DPRINT1("zipCloseFileInZip\n"); + break; + } + } + + zipClose(zf, NULL); + + if (err) + { + DeleteFileW(strZipName); + + CStringW strTitle(MAKEINTRESOURCEW(IDS_ERRORTITLE)); + + CStringW strText; + if (err < 0) + strText.Format(IDS_CANTCREATEZIP, static_cast<LPCWSTR>(strZipName), err); + else + strText.Format(IDS_CANTREADFILE, static_cast<LPCWSTR>(strTarget)); + + MessageBoxW(NULL, strText, strTitle, MB_ICONERROR); + } + + return err; +} diff --git a/dll/shellext/zipfldr/CZipCreater.hpp b/dll/shellext/zipfldr/CZipCreater.hpp new file mode 100644 index 00000000000..52fb14f9ead --- /dev/null +++ b/dll/shellext/zipfldr/CZipCreater.hpp @@ -0,0 +1,32 @@ +/* + * PROJECT: ReactOS Zip Shell Extension + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Create a zip file + * COPYRIGHT: Copyright 2019 Mark Jansen (mark.jansen(a)reactos.org) + * Copyright 2019 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) + */ +#ifndef CZIPCREATER_HPP_ +#define CZIPCREATER_HPP_ + +struct CZipCreatorImpl; + +class CZipCreator +{ +public: + struct CZipCreatorImpl *m_pimpl; + + virtual ~CZipCreator(); + + static CZipCreator* DoCreate() + { + return new CZipCreator(); + } + + virtual void DoAddItem(LPCWSTR pszFile); + static BOOL runThread(CZipCreator* pCreater); + +protected: + CZipCreator(); +}; + +#endif diff --git a/dll/shellext/zipfldr/lang/de-DE.rc b/dll/shellext/zipfldr/lang/de-DE.rc index 5925822e051..6f50cb7d0d0 100644 --- a/dll/shellext/zipfldr/lang/de-DE.rc +++ b/dll/shellext/zipfldr/lang/de-DE.rc @@ -68,6 +68,11 @@ BEGIN IDS_COL_DATE_MOD "Änderungsdatum" IDS_YES "Ja" IDS_NO "Nein" + IDS_ERRORTITLE "Compressed (zipped) Folders Error" + IDS_CANTSTARTTHREAD "Cannot start thread to compress files." + IDS_NOFILES "The specified directory '%s' is empty, so Compressed (zipped) Folders cannot add it to the archive." + IDS_CANTCREATEZIP "Failed to create a compressed folder '%s' (Error Code: %d)." + IDS_CANTREADFILE "Cannot read file '%s'." IDS_WIZ_TITLE "Extrahier-Assistent" IDS_WIZ_DEST_TITLE "Ziel auswählen" diff --git a/dll/shellext/zipfldr/lang/en-US.rc b/dll/shellext/zipfldr/lang/en-US.rc index bba5be5c870..a73ad541688 100644 --- a/dll/shellext/zipfldr/lang/en-US.rc +++ b/dll/shellext/zipfldr/lang/en-US.rc @@ -68,6 +68,11 @@ BEGIN IDS_COL_DATE_MOD "Date modified" IDS_YES "Yes" IDS_NO "No" + IDS_ERRORTITLE "Compressed (zipped) Folders Error" + IDS_CANTSTARTTHREAD "Cannot start thread to compress files." + IDS_NOFILES "The specified directory '%s' is empty, so Compressed (zipped) Folders cannot add it to the archive." + IDS_CANTCREATEZIP "Failed to create a compressed folder '%s' (Error Code: %d)." + IDS_CANTREADFILE "Cannot read file '%s'." IDS_WIZ_TITLE "Extraction Wizard" IDS_WIZ_DEST_TITLE "Select a Destination" diff --git a/dll/shellext/zipfldr/lang/et-EE.rc b/dll/shellext/zipfldr/lang/et-EE.rc index c9a7cc0f982..eb2b0280afb 100644 --- a/dll/shellext/zipfldr/lang/et-EE.rc +++ b/dll/shellext/zipfldr/lang/et-EE.rc @@ -68,6 +68,11 @@ BEGIN IDS_COL_DATE_MOD "Kuupäeval muudetud" IDS_YES "Jah" IDS_NO "Ei" + IDS_ERRORTITLE "Compressed (zipped) Folders Error" + IDS_CANTSTARTTHREAD "Cannot start thread to compress files." + IDS_NOFILES "The specified directory '%s' is empty, so Compressed (zipped) Folders cannot add it to the archive." + IDS_CANTCREATEZIP "Failed to create a compressed folder '%s' (Error Code: %d)." + IDS_CANTREADFILE "Cannot read file '%s'." IDS_WIZ_TITLE "Ekstraktimise visard" IDS_WIZ_DEST_TITLE "Vali sihtkoht" diff --git a/dll/shellext/zipfldr/lang/fr-FR.rc b/dll/shellext/zipfldr/lang/fr-FR.rc index 19d4520a605..24decc1fa3c 100644 --- a/dll/shellext/zipfldr/lang/fr-FR.rc +++ b/dll/shellext/zipfldr/lang/fr-FR.rc @@ -68,6 +68,11 @@ BEGIN IDS_COL_DATE_MOD "Date de modification" IDS_YES "Oui" IDS_NO "Non" + IDS_ERRORTITLE "Compressed (zipped) Folders Error" + IDS_CANTSTARTTHREAD "Cannot start thread to compress files." + IDS_NOFILES "The specified directory '%s' is empty, so Compressed (zipped) Folders cannot add it to the archive." + IDS_CANTCREATEZIP "Failed to create a compressed folder '%s' (Error Code: %d)." + IDS_CANTREADFILE "Cannot read file '%s'." IDS_WIZ_TITLE "Assistant d'extraction" IDS_WIZ_DEST_TITLE "Choisir une destination" diff --git a/dll/shellext/zipfldr/lang/hi-IN.rc b/dll/shellext/zipfldr/lang/hi-IN.rc index 7794f630cb3..cf31cce8e32 100644 --- a/dll/shellext/zipfldr/lang/hi-IN.rc +++ b/dll/shellext/zipfldr/lang/hi-IN.rc @@ -55,6 +55,11 @@ BEGIN IDS_COL_DATE_MOD "तिथि संशोधित" IDS_YES "हाँ" IDS_NO "नहीं" + IDS_ERRORTITLE "Compressed (zipped) Folders Error" + IDS_CANTSTARTTHREAD "Cannot start thread to compress files." + IDS_NOFILES "The specified directory '%s' is empty, so Compressed (zipped) Folders cannot add it to the archive." + IDS_CANTCREATEZIP "Failed to create a compressed folder '%s' (Error Code: %d)." + IDS_CANTREADFILE "Cannot read file '%s'." IDS_WIZ_TITLE "निष्कर्षण विज़ार्ड" IDS_WIZ_DEST_TITLE "एक गंतव्य चुनें" diff --git a/dll/shellext/zipfldr/lang/it-IT.rc b/dll/shellext/zipfldr/lang/it-IT.rc index 9f8864383f7..d3572fa0101 100644 --- a/dll/shellext/zipfldr/lang/it-IT.rc +++ b/dll/shellext/zipfldr/lang/it-IT.rc @@ -68,6 +68,11 @@ BEGIN IDS_COL_DATE_MOD "Data modificata" IDS_YES "Sì" IDS_NO "No" + IDS_ERRORTITLE "Compressed (zipped) Folders Error" + IDS_CANTSTARTTHREAD "Cannot start thread to compress files." + IDS_NOFILES "The specified directory '%s' is empty, so Compressed (zipped) Folders cannot add it to the archive." + IDS_CANTCREATEZIP "Failed to create a compressed folder '%s' (Error Code: %d)." + IDS_CANTREADFILE "Cannot read file '%s'." IDS_WIZ_TITLE "Estrazione Guidata" IDS_WIZ_DEST_TITLE "Seleziona una Destinazione" diff --git a/dll/shellext/zipfldr/lang/ja-JP.rc b/dll/shellext/zipfldr/lang/ja-JP.rc index 63564b7200d..157e6717dac 100644 --- a/dll/shellext/zipfldr/lang/ja-JP.rc +++ b/dll/shellext/zipfldr/lang/ja-JP.rc @@ -68,6 +68,11 @@ BEGIN IDS_COL_DATE_MOD "変更日" IDS_YES "はい" IDS_NO "いいえ" + IDS_ERRORTITLE "Compressed (zipped) Folders Error" + IDS_CANTSTARTTHREAD "Cannot start thread to compress files." + IDS_NOFILES "The specified directory '%s' is empty, so Compressed (zipped) Folders cannot add it to the archive." + IDS_CANTCREATEZIP "Failed to create a compressed folder '%s' (Error Code: %d)." + IDS_CANTREADFILE "Cannot read file '%s'." IDS_WIZ_TITLE "展開ウィザード" IDS_WIZ_DEST_TITLE "展開先を選んで下さい" diff --git a/dll/shellext/zipfldr/lang/pl-PL.rc b/dll/shellext/zipfldr/lang/pl-PL.rc index c4130cb6db2..fcdb0436d22 100644 --- a/dll/shellext/zipfldr/lang/pl-PL.rc +++ b/dll/shellext/zipfldr/lang/pl-PL.rc @@ -67,6 +67,11 @@ BEGIN IDS_COL_DATE_MOD "Data modyfikacji" IDS_YES "Tak" IDS_NO "Nie" + IDS_ERRORTITLE "Compressed (zipped) Folders Error" + IDS_CANTSTARTTHREAD "Cannot start thread to compress files." + IDS_NOFILES "The specified directory '%s' is empty, so Compressed (zipped) Folders cannot add it to the archive." + IDS_CANTCREATEZIP "Failed to create a compressed folder '%s' (Error Code: %d)." + IDS_CANTREADFILE "Cannot read file '%s'." IDS_WIZ_TITLE "Kreator wyodrębniania" IDS_WIZ_DEST_TITLE "Wybierz miejsce docelowe" diff --git a/dll/shellext/zipfldr/lang/ro-RO.rc b/dll/shellext/zipfldr/lang/ro-RO.rc index 31642b0f48a..cb15956e6cb 100644 --- a/dll/shellext/zipfldr/lang/ro-RO.rc +++ b/dll/shellext/zipfldr/lang/ro-RO.rc @@ -68,6 +68,11 @@ BEGIN IDS_COL_DATE_MOD "Data modificată" IDS_YES "Da" IDS_NO "Nu" + IDS_ERRORTITLE "Compressed (zipped) Folders Error" + IDS_CANTSTARTTHREAD "Cannot start thread to compress files." + IDS_NOFILES "The specified directory '%s' is empty, so Compressed (zipped) Folders cannot add it to the archive." + IDS_CANTCREATEZIP "Failed to create a compressed folder '%s' (Error Code: %d)." + IDS_CANTREADFILE "Cannot read file '%s'." IDS_WIZ_TITLE "Asistent de extracție" IDS_WIZ_DEST_TITLE "Selectați o Destinație" diff --git a/dll/shellext/zipfldr/lang/ru-RU.rc b/dll/shellext/zipfldr/lang/ru-RU.rc index 89096a34401..1791169c937 100644 --- a/dll/shellext/zipfldr/lang/ru-RU.rc +++ b/dll/shellext/zipfldr/lang/ru-RU.rc @@ -68,6 +68,11 @@ BEGIN IDS_COL_DATE_MOD "Дата изменения" IDS_YES "Да" IDS_NO "Нет" + IDS_ERRORTITLE "Compressed (zipped) Folders Error" + IDS_CANTSTARTTHREAD "Cannot start thread to compress files." + IDS_NOFILES "The specified directory '%s' is empty, so Compressed (zipped) Folders cannot add it to the archive." + IDS_CANTCREATEZIP "Failed to create a compressed folder '%s' (Error Code: %d)." + IDS_CANTREADFILE "Cannot read file '%s'." IDS_WIZ_TITLE "Мастер извлечения архивов" IDS_WIZ_DEST_TITLE "Укажите путь" diff --git a/dll/shellext/zipfldr/lang/sv-SE.rc b/dll/shellext/zipfldr/lang/sv-SE.rc index a2f1c90c73c..886dddfe8bf 100644 --- a/dll/shellext/zipfldr/lang/sv-SE.rc +++ b/dll/shellext/zipfldr/lang/sv-SE.rc @@ -68,6 +68,11 @@ BEGIN IDS_COL_DATE_MOD "Ändrad den" IDS_YES "Ja" IDS_NO "Nej" + IDS_ERRORTITLE "Compressed (zipped) Folders Error" + IDS_CANTSTARTTHREAD "Cannot start thread to compress files." + IDS_NOFILES "The specified directory '%s' is empty, so Compressed (zipped) Folders cannot add it to the archive." + IDS_CANTCREATEZIP "Failed to create a compressed folder '%s' (Error Code: %d)." + IDS_CANTREADFILE "Cannot read file '%s'." IDS_WIZ_TITLE "Extraheringsguiden" IDS_WIZ_DEST_TITLE "Välj ett mål" diff --git a/dll/shellext/zipfldr/lang/zh-CN.rc b/dll/shellext/zipfldr/lang/zh-CN.rc index 27066adfdf9..6d69c012991 100644 --- a/dll/shellext/zipfldr/lang/zh-CN.rc +++ b/dll/shellext/zipfldr/lang/zh-CN.rc @@ -68,6 +68,11 @@ BEGIN IDS_COL_DATE_MOD "修改日期" IDS_YES "是" IDS_NO "否" + IDS_ERRORTITLE "Compressed (zipped) Folders Error" + IDS_CANTSTARTTHREAD "Cannot start thread to compress files." + IDS_NOFILES "The specified directory '%s' is empty, so Compressed (zipped) Folders cannot add it to the archive." + IDS_CANTCREATEZIP "Failed to create a compressed folder '%s' (Error Code: %d)." + IDS_CANTREADFILE "Cannot read file '%s'." IDS_WIZ_TITLE "解压向导" IDS_WIZ_DEST_TITLE "选择一个目标文件夹" diff --git a/dll/shellext/zipfldr/precomp.h b/dll/shellext/zipfldr/precomp.h index e25e2f19024..ed61dc75dcc 100644 --- a/dll/shellext/zipfldr/precomp.h +++ b/dll/shellext/zipfldr/precomp.h @@ -78,5 +78,7 @@ eZipConfirmResponse _CZipAskReplace(HWND hDlg, const char* FullPath); #include "CZipEnumerator.hpp" #include "CZipFolder.hpp" +#include "CZipCreater.hpp" +#include "CSendToZip.hpp" #endif /* ZIPFLDR_PRECOMP_H */ diff --git a/dll/shellext/zipfldr/res/zipfldr.rgs b/dll/shellext/zipfldr/res/zipfldr.rgs index 82cfc8dfaeb..c57aeae4815 100644 --- a/dll/shellext/zipfldr/res/zipfldr.rgs +++ b/dll/shellext/zipfldr/res/zipfldr.rgs @@ -12,10 +12,26 @@ HKCR val UseDropHandler = s '' } } - '{b8cdcb65-b1bf-4b42-9428-1dfdb7ee92af}' = s 'Compressed (zipped) Folder Menu' + '{B8CDCB65-B1BF-4B42-9428-1DFDB7EE92AF}' = s 'Compressed (zipped) Folder Menu' { InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Apartment' } } + '{888DCA60-FC0A-11CF-8F0F-00C04FD7D062}' = s 'Compressed (zipped) Folder SendTo Target' + { + val EditFlags = d '0x01' + val FriendlyTypeName = s '%MODULE%,-10226' + val NeverShowExt = s '' + val NoOpen = s 'Drag Files onto this icon to compress them.' + DefaultIcon = s '%MODULE%' { } + InprocServer32 = s '%MODULE%' + { + val ThreadingModel = s 'Apartment' + } + ShellEx + { + DropHandler = s '{888DCA60-FC0A-11CF-8F0F-00C04FD7D062}' { } + } + } } NoRemove Applications { @@ -24,7 +40,7 @@ HKCR NoRemove CompressedFolder { FriendlyTypeName = s '%MODULE%,-10195' - CLSID = s '{E88DCCE0-B7B3-11d1-A9F0-00AA0060FA31}' + CLSID = s '{E88DCCE0-B7B3-11D1-A9F0-00AA0060FA31}' DefaultIcon = s '%MODULE%' NoRemove Shell @@ -41,7 +57,7 @@ HKCR { NoRemove ContextMenuHandlers { - ForceRemove '{b8cdcb65-b1bf-4b42-9428-1dfdb7ee92af}' = s 'Compressed (zipped) Folder Menu' + ForceRemove '{B8CDCB65-B1BF-4B42-9428-1DFDB7EE92AF}' = s 'Compressed (zipped) Folder Menu' { } } @@ -52,3 +68,13 @@ HKCR val 'Content Type' = s 'application/x-zip-compressed' } } +HKLM +{ + NoRemove Software + { + NoRemove Classes + { + '.ZFSendToTarget' = s 'CLSID\{888DCA60-FC0A-11CF-8F0F-00C04FD7D062}' + } + } +} diff --git a/dll/shellext/zipfldr/resource.h b/dll/shellext/zipfldr/resource.h index b14faeb7d28..b294e823b77 100644 --- a/dll/shellext/zipfldr/resource.h +++ b/dll/shellext/zipfldr/resource.h @@ -35,7 +35,11 @@ #define IDS_COL_DATE_MOD 106 #define IDS_YES 107 #define IDS_NO 108 - +#define IDS_ERRORTITLE 109 +#define IDS_CANTSTARTTHREAD 110 +#define IDS_NOFILES 111 +#define IDS_CANTCREATEZIP 112 +#define IDS_CANTREADFILE 113 /* Wizard titles */ #define IDS_WIZ_TITLE 8000 diff --git a/dll/shellext/zipfldr/zipfldr.cpp b/dll/shellext/zipfldr/zipfldr.cpp index 2b9e5b63801..eecb1ac02de 100644 --- a/dll/shellext/zipfldr/zipfldr.cpp +++ b/dll/shellext/zipfldr/zipfldr.cpp @@ -31,6 +31,7 @@ public: BEGIN_OBJECT_MAP(ObjectMap) OBJECT_ENTRY(CLSID_ZipFolderStorageHandler, CZipFolder) OBJECT_ENTRY(CLSID_ZipFolderContextMenu, CZipFolder) + OBJECT_ENTRY(CLSID_ZipFolderSendTo, CSendToZip) END_OBJECT_MAP() CZipFldrModule gModule;

5 years

[reactos] 01/01: [TRANSLATION] Update Portuguese translation (#2115)

by Jose Carlos Jesus

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=62a95e4943285e81d0c67… commit 62a95e4943285e81d0c678975e7378bd1490d74d Author: Jose Carlos Jesus <zecarlos1957(a)hotmail.com> AuthorDate: Sun Dec 1 09:14:13 2019 +0000 Commit: Robert Naumann <gonzomdx(a)gmail.com> CommitDate: Sun Dec 1 10:14:13 2019 +0100 [TRANSLATION] Update Portuguese translation (#2115) --- dll/win32/shell32/lang/pt-PT.rc | 170 ++++++++++++++++++++-------------------- 1 file changed, 85 insertions(+), 85 deletions(-) diff --git a/dll/win32/shell32/lang/pt-PT.rc b/dll/win32/shell32/lang/pt-PT.rc index a01bebdd281..a50a08f91c1 100644 --- a/dll/win32/shell32/lang/pt-PT.rc +++ b/dll/win32/shell32/lang/pt-PT.rc @@ -720,10 +720,10 @@ BEGIN IDS_SHV_COLUMN_SIZE "Tamanho" IDS_SHV_COLUMN_TYPE "Tipo" IDS_SHV_COLUMN_MODIFIED "Modificado" - IDS_SHV_COLUMN_ATTRIBUTES "propriedades" + IDS_SHV_COLUMN_ATTRIBUTES "Propriedades" IDS_SHV_COLUMN_DISK_CAPACITY "Tamanho" IDS_SHV_COLUMN_DISK_AVAILABLE "Disponível" - IDS_SHV_COLUMN_OWNER "Dono" + IDS_SHV_COLUMN_OWNER "Proprietário" IDS_SHV_COLUMN_GROUP "Grupo" IDS_SHV_COLUMN_FILENAME "Nome do ficheiro" IDS_SHV_COLUMN_CATEGORY "Categoria" @@ -731,10 +731,10 @@ BEGIN IDS_SHV_COLUMN_DELDATE "Data da eliminação" IDS_SHV_COLUMN_FONTTYPE "Tipo de letra" IDS_SHV_COLUMN_WORKGROUP "Grupo de trabalho" - IDS_SHV_COLUMN_NETLOCATION "localizações na rede" + IDS_SHV_COLUMN_NETLOCATION "Localizações na rede" IDS_SHV_COLUMN_DOCUMENTS "Documentos" IDS_SHV_COLUMN_STATUS "Estado" - IDS_SHV_COLUMN_COMMENTS "Commentários" + IDS_SHV_COLUMN_COMMENTS "Comentários" IDS_SHV_COLUMN_LOCATION "Localização" IDS_SHV_COLUMN_MODEL "Modelo" @@ -765,22 +765,22 @@ BEGIN IDS_CUT "Cortar" IDS_RESTORE "Restaurar" IDS_FORMATDRIVE "Formatar..." - IDS_RENAME "Renaomear" + IDS_RENAME "Renomear" IDS_PASTE "Inserir" - IDS_EJECT "Eject" + IDS_EJECT "Ejectar" IDS_DISCONNECT "Desligar" - IDS_OPENFILELOCATION "Open f&ile location" - IDS_DESKLINK "Desktop (Create shortcut)" - IDS_SENDTO_MENU "Se&nd To" - IDS_MOVEERRORTITLE "Error Moving File or Folder" - IDS_COPYERRORTITLE "Error Copying File or Folder" - IDS_MOVEERRORSAME "Cannot move '%s': The destination folder is the same as the source folder." - IDS_COPYERRORSAME "Cannot copy '%s': The source and destination file names are the same." - IDS_MOVEERRORSUBF "Cannot move '%s': The destination folder is a subfolder of the source folder." - IDS_COPYERRORSUBF "Cannot copy '%s': The destination folder is a subfolder of the source folder." - - IDS_CREATEFOLDER_DENIED "Impossivel de criar pasta '%1'" - IDS_CREATEFOLDER_CAPTION "Impossivel de criar pasta" + IDS_OPENFILELOCATION "Abrir localização do f&icheiro" + IDS_DESKLINK "Área de trabalho (Criar atalho)" + IDS_SENDTO_MENU "&Enviar para" + IDS_MOVEERRORTITLE "Erro ao mover pasta ou ficheiro" + IDS_COPYERRORTITLE "Erro ao copiar pasta ou ficheiro" + IDS_MOVEERRORSAME "Impossivel mover '%s': A paste de destino é a mesma da origem." + IDS_COPYERRORSAME "Impossivel copiar '%s': Os nomes dos arquivos de origem e de destino são os mesmos." + IDS_MOVEERRORSUBF "Impossivel mover '%s': A pasta de destino é uma subpasta da pasta de origem." + IDS_COPYERRORSUBF "Impossivel copiar '%s': A pasta de destino é uma subpasta da pasta de origem." + + IDS_CREATEFOLDER_DENIED "Impossivel criar pasta '%1'" + IDS_CREATEFOLDER_CAPTION "Impossivel criar pasta" IDS_DELETEITEM_CAPTION "Confirmar exclusão do ficheiro" IDS_DELETEFOLDER_CAPTION "Confirmar exclusão da pasta" IDS_DELETEITEM_TEXT "Tem certeza que deseja excluir '%1'?" @@ -829,7 +829,7 @@ BEGIN IDS_MYMUSIC "As Minhas Músicas" IDS_MYVIDEO "Os Meus Vídeos" IDS_DESKTOPDIRECTORY "Ambiente de Trabalho" - IDS_NETHOOD "Visinhança na rede" + IDS_NETHOOD "Vizinhança na rede" IDS_TEMPLATES "Modelos" IDS_APPDATA "Dados de Aplicação" IDS_PRINTHOOD "PrintHood" @@ -864,7 +864,7 @@ BEGIN IDS_OPEN_WITH_OTHER "Outros Programas:" IDS_SHELL_ABOUT_AUTHORS "&Autores" - IDS_SHELL_ABOUT_BACK "< &Trás" + IDS_SHELL_ABOUT_BACK "< &Retroceder" FCIDM_SHVIEW_NEW "Novo" FCIDM_SHVIEW_NEWFOLDER "&Pasta" FCIDM_SHVIEW_NEWLINK "&Atalho" @@ -876,28 +876,28 @@ BEGIN IDS_PICK_ICON_FILTER "Ficheiros de icones (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" IDS_OPEN_WITH_FILTER "Ficheiros executáveis (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" - IDS_CANTLOCKVOLUME "Unable to lock volume (Error Code: %lu)." - IDS_CANTDISMOUNTVOLUME "Unable to dismount volume (Error Code: %lu)." - IDS_CANTEJECTMEDIA "Unable to eject media (Error Code: %lu)." - IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." - IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." - IDS_NONE "(None)" + IDS_CANTLOCKVOLUME "Não foi possível bloquear o volume (Código de erro: %lu)." + IDS_CANTDISMOUNTVOLUME "Não foi possível desmontar o volume (Código de erro: %lu)." + IDS_CANTEJECTMEDIA "Não foi possível ejectar a mídia (Código de erro: %lu)." + IDS_CANTSHOWPROPERTIES "Não foi possível mostrar as propriedades (Código de erro: %lu)." + IDS_CANTDISCONNECT "Não foi possível desconectar (Código de erro: %lu)." + IDS_NONE "(Nenhum)" /* Friendly File Type Names */ IDS_DIRECTORY "Pasta" - IDS_BAT_FILE "ReactOS Batch File" - IDS_CMD_FILE "ReactOS Command Script" + IDS_BAT_FILE "Arquivo em lote do ReactOS" + IDS_CMD_FILE "Script de Comando do ReactOS" IDS_COM_FILE "Aplicação DOS" IDS_CPL_FILE "Item do Painel de Controle" IDS_CUR_FILE "Cursor" - IDS_DB__FILE "Database File" + IDS_DB__FILE "Arquivo de banco de dados" IDS_DLL_FILE "Extensão da Aplicação" - IDS_DRV_FILE "Driver do Dispositivo" - IDS_EFI_FILE "Extensible Firmware Interface Executable" + IDS_DRV_FILE "Controlador do Dispositivo" + IDS_EFI_FILE "Interface de Firmware Extensível Executável" IDS_EXE_FILE "Aplicação" - IDS_NLS_FILE "National Language Support File" - IDS_OCX_FILE "ActiveX Control" - IDS_TLB_FILE "Type Library" + IDS_NLS_FILE "Arquivo de Suporte ao Idioma Nacional" + IDS_OCX_FILE "Control ActiveX" + IDS_TLB_FILE "Biblioteca de tipos" IDS_FON_FILE "Ficheiro de tipo de letra" IDS_TTF_FILE "Tipo de letra TrueType" IDS_OTF_FILE "Tipo de letra OpenType" @@ -905,20 +905,20 @@ BEGIN IDS_ICO_FILE "Icon" IDS_INI_FILE "Definições" IDS_LNK_FILE "Atalho" - IDS_NT__FILE "NT DOS32 Configuration File" - IDS_PIF_FILE "NT VDM Program Information File" - IDS_SCR_FILE "Screen Saver" + IDS_NT__FILE "Arquivo de configuração do NT DOS32" + IDS_PIF_FILE "Arquivo de informações do programa NT VDM" + IDS_SCR_FILE "Protector de ecrã" IDS_SYS_FILE "Ficheiro de Sistema" - IDS_VXD_FILE "Driver de Dispositivo Virtual" - IDS_ANY_FILE "%s-file" + IDS_VXD_FILE "Controlador de Dispositivo Virtual" + IDS_ANY_FILE "%s-arquivo" IDS_OPEN_VERB "Abrir" - IDS_EXPLORE_VERB "Explore" + IDS_EXPLORE_VERB "Explorar" IDS_RUNAS_VERB "Executar como..." IDS_EDIT_VERB "Editar" IDS_FIND_VERB "Procurar" IDS_PRINT_VERB "Imprimir" - IDS_CMD_VERB "Command Prompt here" + IDS_CMD_VERB "Prompt de Comando aqui" IDS_FILE_FOLDER "%u Ficheiros, %u Pastas" IDS_PRINTERS "Impressoras" @@ -937,50 +937,50 @@ BEGIN /* As in 'INI File' or 'WAV File', fallback string for no-name extensions used in the _File type_ tab of the _Folder Options_ dialog */ - IDS_FILE_EXT_TYPE "%s File" + IDS_FILE_EXT_TYPE "Arquivo %s" IDS_BYTES_FORMAT "bytes" - IDS_UNKNOWN_APP "Unknown application" - IDS_EXE_DESCRIPTION "Description:" - - IDS_MENU_EMPTY "(Empty)" - IDS_OBJECTS "%d Objects" - IDS_OBJECTS_SELECTED "%d Objects Selected" - - IDS_ADVANCED_FOLDER "Files and Folders" - IDS_ADVANCED_NET_CRAWLER "Automatically search for network folders and printers" - IDS_ADVANCED_FOLDER_SIZE_TIP "Display file size information in folder tips" - IDS_ADVANCED_FRIENDLY_TREE "Display simple folder view in Explorer's Folders list" - IDS_ADVANCED_WEB_VIEW_BARRICADE "Display the contents of system folders" - IDS_ADVANCED_SHOW_FULL_PATH_ADDRESS "Display the full path in address bar" - IDS_ADVANCED_SHOW_FULL_PATH "Display the full path in the title bar" - IDS_ADVANCED_DISABLE_THUMB_CACHE "Do not cache thumbnails" - IDS_ADVANCED_HIDDEN "Hidden files and folders" - IDS_ADVANCED_DONT_SHOW_HIDDEN "Do not show hidden files and folders" - IDS_ADVANCED_SHOW_HIDDEN "Show hidden files and folders" - IDS_ADVANCED_HIDE_FILE_EXT "Hide extensions for known file types" - IDS_ADVANCED_SUPER_HIDDEN "Hide protected operating system files (Recommended)" - IDS_ADVANCED_DESKTOP_PROCESS "Launch folder windows in a separate process" - IDS_ADVANCED_CLASSIC_VIEW_STATE "Remember each folder's view settings" - IDS_ADVANCED_PERSIST_BROWSERS "Restore previous folder windows at logon" - IDS_ADVANCED_CONTROL_PANEL_IN_MY_COMPUTER "Show Control Panel in My Computer" - IDS_ADVANCED_SHOW_COMP_COLOR "Show encrypted or compressed NTFS files in color" - IDS_ADVANCED_SHOW_INFO_TIP "Show pop-up description for folder and desktop items" - - IDS_NEWEXT_ADVANCED_LEFT "<< Ad&vanced" - IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>" - IDS_NEWEXT_NEW "<New>" - IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." - IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" - IDS_NEWEXT_EXT_IN_USE "Extension is in use" - - IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" - IDS_SPECIFY_ACTION "You must specify an action." - IDS_INVALID_PROGRAM "The specified program could not be found. Make sure the file name and path are correct." - IDS_REMOVE_ACTION "Are you sure you want to remove this action?" - IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." - IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" - IDS_EDITING_ACTION "Editing action for type: " - IDS_NO_ICONS "The file '%s' contains no icons.\n\nChoose an icon from the list or specify a different file." - IDS_FILE_NOT_FOUND "The file '%s' was not found." + IDS_UNKNOWN_APP "Applicação desconhecida" + IDS_EXE_DESCRIPTION "Descrição:" + + IDS_MENU_EMPTY "(Vazio)" + IDS_OBJECTS "%d Objetos" + IDS_OBJECTS_SELECTED "%d Objetos Seleccionados" + + IDS_ADVANCED_FOLDER "Pastas e ficheiros" + IDS_ADVANCED_NET_CRAWLER "Pesquise automaticamente pastas e impressoras de rede" + IDS_ADVANCED_FOLDER_SIZE_TIP "Exibir informações de tamanho de arquivo nas informações de pastas" + IDS_ADVANCED_FRIENDLY_TREE "Exibir visualização simples na lista de pastas do Explorador" + IDS_ADVANCED_WEB_VIEW_BARRICADE "Exibir o conteúdo das pastas do sistema" + IDS_ADVANCED_SHOW_FULL_PATH_ADDRESS "Exibir o caminho completo na barra de endereço" + IDS_ADVANCED_SHOW_FULL_PATH "Exibir o caminho completo na barra de título" + IDS_ADVANCED_DISABLE_THUMB_CACHE "Não armazenar em cache miniaturas" + IDS_ADVANCED_HIDDEN "Arquivos e pastas ocultos" + IDS_ADVANCED_DONT_SHOW_HIDDEN "Não mostrar arquivos e pastas ocultos" + IDS_ADVANCED_SHOW_HIDDEN "Mostrar arquivos e pastas ocultos" + IDS_ADVANCED_HIDE_FILE_EXT "Ocultar extensões de ficheiros conhecidos" + IDS_ADVANCED_SUPER_HIDDEN "Ocultar arquivos protegidos do sistema operacional (recomendado)" + IDS_ADVANCED_DESKTOP_PROCESS "Iniciar janelas de pastas num processo separado" + IDS_ADVANCED_CLASSIC_VIEW_STATE "Lembre-se das configurações de exibição de cada pasta" + IDS_ADVANCED_PERSIST_BROWSERS "Restaurar janelas de pastas anteriores no início de sessão" + IDS_ADVANCED_CONTROL_PANEL_IN_MY_COMPUTER "Mostrar painel de controle no meu computador" + IDS_ADVANCED_SHOW_COMP_COLOR "Mostrar arquivos NTFS criptografados ou compactados em cores" + IDS_ADVANCED_SHOW_INFO_TIP "Mostrar descrição pop-up para itens de pasta e área de trabalho" + + IDS_NEWEXT_ADVANCED_LEFT "<< A&vançado" + IDS_NEWEXT_ADVANCED_RIGHT "Avança&do >>" + IDS_NEWEXT_NEW "<Novo>" + IDS_NEWEXT_SPECIFY_EXT "Deve especificar uma extensão." + IDS_NEWEXT_ALREADY_ASSOC "A extensão %s já está associada ao tipo de arquivo %s. Deseja desassociar %s com %s e criar um novo tipo de arquivo?" + IDS_NEWEXT_EXT_IN_USE "A extensão está em uso" + + IDS_REMOVE_EXT "Se remover uma extensão de nome de arquivo registrado, não poderá abrir arquivos com esta extensão clicando duas vezes nos ícones. \n\nTem certeza de que deseja remover esta extensão?" + IDS_SPECIFY_ACTION "Deve especificar uma acção." + IDS_INVALID_PROGRAM "Não foi possível encontrar o programa especificado. Verifique se o nome e o caminho do arquivo estão correctos." + IDS_REMOVE_ACTION "Tem certeza de que deseja remover esta acção?" + IDS_ACTION_EXISTS "A acção '%s' já está registrada para este tipo de arquivo. Digite um nome diferente e tente novamente." + IDS_EXE_FILTER "Programas\0*.exe\0Todos os tipos\0*.*\0" + IDS_EDITING_ACTION "Editar acção para o tipo: " + IDS_NO_ICONS "O arquivo '%s' não contém ícones. \n\nEscolha um ícone da lista ou especifique um arquivo diferente." + IDS_FILE_NOT_FOUND "O arquivo '%s' não foi encontrado." END

5 years

[reactos] 01/01: [SHELL32] Fix regression of DoCreateSendToFiles

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=79d21f76644bbc890b53a… commit 79d21f76644bbc890b53a9cd2beab7af6bc62fa3 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Dec 1 13:55:43 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sun Dec 1 13:55:43 2019 +0900 [SHELL32] Fix regression of DoCreateSendToFiles CoInitializeEx/CoUninitialize added. CORE-12562 --- dll/win32/shell32/wine/shellpath.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/dll/win32/shell32/wine/shellpath.c b/dll/win32/shell32/wine/shellpath.c index 6974a4d9628..3c1906375fe 100644 --- a/dll/win32/shell32/wine/shellpath.c +++ b/dll/win32/shell32/wine/shellpath.c @@ -2195,6 +2195,28 @@ CreateShellLink( return hr; } +static HRESULT +CreateShellLinkCoInit( + LPCWSTR pszLinkPath, + LPCWSTR pszCmd, + LPCWSTR pszArg OPTIONAL, + LPCWSTR pszDir OPTIONAL, + LPCWSTR pszIconPath OPTIONAL, + INT iIconNr OPTIONAL, + LPCWSTR pszComment OPTIONAL) +{ + HRESULT hr = CoInitializeEx(NULL, COINIT_MULTITHREADED); + BOOL bCoInit = (hr == S_OK); + + hr = CreateShellLink(pszLinkPath, pszCmd, pszArg, pszDir, + pszIconPath, iIconNr, pszComment); + + if (bCoInit) + CoUninitialize(); + + return hr; +} + HRESULT DoCreateSendToFiles(LPCWSTR pszSendTo) { WCHAR szTarget[MAX_PATH]; @@ -2212,8 +2234,8 @@ HRESULT DoCreateSendToFiles(LPCWSTR pszSendTo) GetSystemDirectoryW(szShell32, ARRAY_SIZE(szShell32)); PathAppendW(szShell32, L"shell32.dll"); - hr = CreateShellLink(szSendToFile, szTarget, NULL, NULL, - szShell32, -IDI_SHELL_MY_DOCUMENTS, NULL); + hr = CreateShellLinkCoInit(szSendToFile, szTarget, NULL, NULL, + szShell32, -IDI_SHELL_MY_DOCUMENTS, NULL); if (FAILED_UNEXPECTEDLY(hr)) return hr;

5 years

[reactos] 01/01: [SHELL32_APITEST] Improve DragDrop testcase 2

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4f7bb559fbdb70e19b0a5… commit 4f7bb559fbdb70e19b0a5bb45033e2ce6eb5a49e Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Dec 1 11:44:43 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sun Dec 1 11:44:43 2019 +0900 [SHELL32_APITEST] Improve DragDrop testcase 2 CORE-11238 --- modules/rostests/apitests/shell32/DragDrop.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/rostests/apitests/shell32/DragDrop.cpp b/modules/rostests/apitests/shell32/DragDrop.cpp index c292353d86a..46ab8bb1c72 100644 --- a/modules/rostests/apitests/shell32/DragDrop.cpp +++ b/modules/rostests/apitests/shell32/DragDrop.cpp @@ -264,7 +264,7 @@ static void DoTestEntry(const TEST_ENTRY *pEntry) CoTaskMemFree(pidl); pidl = NULL; } - ok(pidl != NULL, "pidl is NULL\n"); + ok(pidl != NULL, "Line %d: pidl is NULL\n", line); pDropTarget = NULL; PITEMID_CHILD pidlLast = ILFindLastID(pidl); hr = s_pDesktop->GetUIObjectOf(NULL, 1, &pidlLast, IID_IDropTarget, @@ -274,7 +274,7 @@ static void DoTestEntry(const TEST_ENTRY *pEntry) if (!pDropTarget) { - skip("pDropTarget was NULL\n"); + skip("Line %d: pDropTarget was NULL\n", line); // clean up DeleteFileW(s_szSrcTestFile);

5 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2019