Ros-diffs

ros-diffs@reactos.org

12 participants
81034 discussions

[reactos] 01/01: [ADVAPI32] Handle HKEY_CLASSES_ROOT in RegQueryInfoKeyW (#5870)

by Whindmar Saksit

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=413b5a0827af51e102f99… commit 413b5a0827af51e102f99f3b2cb59867cdbacb6b Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Mon Nov 13 18:02:41 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Nov 13 18:02:41 2023 +0100 [ADVAPI32] Handle HKEY_CLASSES_ROOT in RegQueryInfoKeyW (#5870) CORE-8582 , CORE-14676 This fixes the bug where Regedit is unable to show all the keys in HKCR when a key exists in both HKCU and HKLM. --- dll/win32/advapi32/reg/hkcr.c | 65 +++++++++++++++++++++++++++++++++++++++++++ dll/win32/advapi32/reg/reg.c | 10 +++++++ dll/win32/advapi32/reg/reg.h | 15 ++++++++++ 3 files changed, 90 insertions(+) diff --git a/dll/win32/advapi32/reg/hkcr.c b/dll/win32/advapi32/reg/hkcr.c index f55a783eb5d..21921ebb42b 100644 --- a/dll/win32/advapi32/reg/hkcr.c +++ b/dll/win32/advapi32/reg/hkcr.c @@ -1014,3 +1014,68 @@ Exit: return ErrorCode; } + +/* HKCR version of RegQueryInfoKeyW */ +LONG +WINAPI +QueryInfoHKCRKey( + _In_ HKEY hKey, + _Out_writes_to_opt_(*lpcchClass, *lpcchClass + 1) LPWSTR lpClass, + _Inout_opt_ LPDWORD lpcchClass, + _Reserved_ LPDWORD lpReserved, + _Out_opt_ LPDWORD lpcSubKeys, + _Out_opt_ LPDWORD lpcbMaxSubKeyLen, + _Out_opt_ LPDWORD lpcbMaxClassLen, + _Out_opt_ LPDWORD lpcValues, + _Out_opt_ LPDWORD lpcbMaxValueNameLen, + _Out_opt_ LPDWORD lpcbMaxValueLen, + _Out_opt_ LPDWORD lpcbSecurityDescriptor, + _Out_opt_ PFILETIME lpftLastWriteTime) +{ + HKEY PreferredKey, FallbackKey; + LONG retval, err; + DWORD OtherSubKeys = 0, OtherMaxSub = 0, OtherMaxClass = 0; + DWORD OtherValues = 0, OtherMaxName = 0, OtherMaxVal = 0; + + ASSERT(IsHKCRKey(hKey)); + + /* Remove the HKCR flag while we're working */ + hKey = (HKEY)(((ULONG_PTR)hKey) & ~0x2); + + retval = GetFallbackHKCRKey(hKey, &FallbackKey, FALSE); + if (retval == ERROR_SUCCESS) + { + retval = RegQueryInfoKeyW(FallbackKey, lpClass, lpcchClass, lpReserved, + &OtherSubKeys, &OtherMaxSub, &OtherMaxClass, + &OtherValues, &OtherMaxName, &OtherMaxVal, + lpcbSecurityDescriptor, lpftLastWriteTime); + if (FallbackKey != hKey) + RegCloseKey(FallbackKey); + } + + err = GetPreferredHKCRKey(hKey, &PreferredKey); + if (err == ERROR_SUCCESS) + { + err = RegQueryInfoKeyW(PreferredKey, lpClass, lpcchClass, lpReserved, + lpcSubKeys, lpcbMaxSubKeyLen, lpcbMaxClassLen, + lpcValues, lpcbMaxValueNameLen, lpcbMaxValueLen, + lpcbSecurityDescriptor, lpftLastWriteTime); + if (PreferredKey != hKey) + RegCloseKey(PreferredKey); + } + + if (lpcSubKeys) + *lpcSubKeys = (err ? 0 : *lpcSubKeys) + OtherSubKeys; + if (lpcValues) + *lpcValues = (err ? 0 : *lpcValues) + OtherValues; + if (lpcbMaxSubKeyLen) + *lpcbMaxSubKeyLen = max((err ? 0 : *lpcbMaxSubKeyLen), OtherMaxSub); + if (lpcbMaxClassLen) + *lpcbMaxClassLen = max((err ? 0 : *lpcbMaxClassLen), OtherMaxClass); + if (lpcbMaxValueNameLen) + *lpcbMaxValueNameLen = max((err ? 0 : *lpcbMaxValueNameLen), OtherMaxName); + if (lpcbMaxValueLen) + *lpcbMaxValueLen = max((err ? 0 : *lpcbMaxValueLen), OtherMaxVal); + + return (err == ERROR_SUCCESS) ? ERROR_SUCCESS : retval; +} diff --git a/dll/win32/advapi32/reg/reg.c b/dll/win32/advapi32/reg/reg.c index 58515793c4e..1ded4b54222 100644 --- a/dll/win32/advapi32/reg/reg.c +++ b/dll/win32/advapi32/reg/reg.c @@ -3718,6 +3718,16 @@ RegQueryInfoKeyW(HKEY hKey, return RtlNtStatusToDosError(Status); } + if (IsHKCRKey(KeyHandle)) + { + ErrorCode = QueryInfoHKCRKey(KeyHandle, lpClass, lpcClass, lpReserved, + lpcSubKeys, lpcMaxSubKeyLen, lpcMaxClassLen, + lpcValues, lpcMaxValueNameLen, lpcMaxValueLen, + lpcbSecurityDescriptor, lpftLastWriteTime); + ClosePredefKey(KeyHandle); + return ErrorCode; + } + if (lpClass != NULL) { if (*lpcClass > 0) diff --git a/dll/win32/advapi32/reg/reg.h b/dll/win32/advapi32/reg/reg.h index 2c5c128d38c..469f2b6fbcd 100644 --- a/dll/win32/advapi32/reg/reg.h +++ b/dll/win32/advapi32/reg/reg.h @@ -96,3 +96,18 @@ EnumHKCRValue( _Out_opt_ LPBYTE data, _Inout_opt_ PDWORD count); +LONG +WINAPI +QueryInfoHKCRKey( + _In_ HKEY hKey, + _Out_writes_to_opt_(*lpcchClass, *lpcchClass + 1) LPWSTR lpClass, + _Inout_opt_ LPDWORD lpcchClass, + _Reserved_ LPDWORD lpReserved, + _Out_opt_ LPDWORD lpcSubKeys, + _Out_opt_ LPDWORD lpcbMaxSubKeyLen, + _Out_opt_ LPDWORD lpcbMaxClassLen, + _Out_opt_ LPDWORD lpcValues, + _Out_opt_ LPDWORD lpcbMaxValueNameLen, + _Out_opt_ LPDWORD lpcbMaxValueLen, + _Out_opt_ LPDWORD lpcbSecurityDescriptor, + _Out_opt_ PFILETIME lpftLastWriteTime);

1 year, 2 months

[reactos] 01/01: [ADVPACK] Handle ADN_DEL_IF_EMPTY in DelNodeW and DelNodeRunDLL32 (#5821)

by Whindmar Saksit

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6eb8a1d0c70fcda787b9f… commit 6eb8a1d0c70fcda787b9f16147564372bc630faf Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Mon Nov 13 16:42:26 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Nov 13 16:42:26 2023 +0100 [ADVPACK] Handle ADN_DEL_IF_EMPTY in DelNodeW and DelNodeRunDLL32 (#5821) - Handling ADN_DEL_IF_EMPTY is critical to avoid data loss. - SetFileAttributesW failing is not fatal, the delete might still succeed. NOTE: Not in Wine yet. --- dll/win32/advpack/files.c | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/dll/win32/advpack/files.c b/dll/win32/advpack/files.c index 3e4cb366007..6f06bf0e9ab 100644 --- a/dll/win32/advpack/files.c +++ b/dll/win32/advpack/files.c @@ -341,9 +341,17 @@ static HRESULT DELNODE_recurse_dirtree(LPWSTR fname, DWORD flags) HANDLE hFindFile; WIN32_FIND_DATAW w32fd; BOOL done = TRUE; - int fname_len = lstrlenW(fname); + int fname_len; + +#ifdef __REACTOS__ + if (flags & ADN_DEL_IF_EMPTY) + { + goto deleteinitialdirectory; + } +#endif /* Generate a path with wildcard suitable for iterating */ + fname_len = lstrlenW(fname); if (fname_len && fname[fname_len-1] != '\\') fname[fname_len++] = '\\'; lstrcpyW(fname + fname_len, asterisk); @@ -371,8 +379,14 @@ static HRESULT DELNODE_recurse_dirtree(LPWSTR fname, DWORD flags) if (done) { +#ifdef __REACTOS__ +deleteinitialdirectory: TRACE("%s: directory\n", debugstr_w(fname)); + SetFileAttributesW(fname, FILE_ATTRIBUTE_NORMAL); + if (RemoveDirectoryW(fname)) +#else if (SetFileAttributesW(fname, FILE_ATTRIBUTE_NORMAL) && RemoveDirectoryW(fname)) +#endif { ret = S_OK; } @@ -381,7 +395,12 @@ static HRESULT DELNODE_recurse_dirtree(LPWSTR fname, DWORD flags) else { TRACE("%s: file\n", debugstr_w(fname)); +#ifdef __REACTOS__ + SetFileAttributesW(fname, FILE_ATTRIBUTE_NORMAL); + if (DeleteFileW(fname)) +#else if (SetFileAttributesW(fname, FILE_ATTRIBUTE_NORMAL) && DeleteFileW(fname)) +#endif { ret = S_OK; } @@ -435,9 +454,14 @@ HRESULT WINAPI DelNodeW(LPCWSTR pszFileOrDirName, DWORD dwFlags) HRESULT ret = E_FAIL; TRACE("(%s, %d)\n", debugstr_w(pszFileOrDirName), dwFlags); - + +#ifdef __REACTOS__ + if (dwFlags & ~ADN_DEL_IF_EMPTY) + FIXME("Flags %#x ignored!\n", dwFlags & ~ADN_DEL_IF_EMPTY); +#else if (dwFlags) FIXME("Flags ignored!\n"); +#endif if (pszFileOrDirName && *pszFileOrDirName) {

1 year, 2 months

[reactos] 01/01: [SHELL32][SHELLEXT] IEnumIDList::Next must handle pceltFetched and memory errors correctly (#5820)

by Whindmar Saksit

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f283a3f9ae16eb047d602… commit f283a3f9ae16eb047d60272186fcb911c79dc266 Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Mon Nov 13 16:31:37 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Nov 13 16:31:37 2023 +0100 [SHELL32][SHELLEXT] IEnumIDList::Next must handle pceltFetched and memory errors correctly (#5820) - pceltFetched can be NULL if the caller is not requesting multiple items. - All entries returned in rgelt must be valid, they cannot be NULL. --- dll/shellext/fontext/CEnumFonts.cpp | 21 ++++++++++++++++----- dll/shellext/netshell/enumlist.cpp | 8 ++++++++ dll/shellext/zipfldr/CEnumZipContents.cpp | 24 ++++++++++++------------ dll/win32/shell32/CEnumIDListBase.cpp | 6 ++++++ 4 files changed, 42 insertions(+), 17 deletions(-) diff --git a/dll/shellext/fontext/CEnumFonts.cpp b/dll/shellext/fontext/CEnumFonts.cpp index 3897a73debd..957e816d322 100644 --- a/dll/shellext/fontext/CEnumFonts.cpp +++ b/dll/shellext/fontext/CEnumFonts.cpp @@ -36,9 +36,10 @@ public: // *** IEnumIDList methods *** STDMETHODIMP Next(ULONG celt, LPITEMIDLIST *rgelt, ULONG *pceltFetched) { - if (!pceltFetched || !rgelt) + if (!rgelt || (!pceltFetched && celt != 1)) return E_POINTER; + HRESULT hr = S_OK; ULONG Fetched = 0; while (celt) @@ -48,15 +49,25 @@ public: if (m_Index < g_FontCache->Size()) { CStringW Name = g_FontCache->Name(m_Index); - rgelt[Fetched] = _ILCreate(Name, m_Index); - + LPITEMIDLIST item = _ILCreate(Name, m_Index); + if (!item) + { + hr = Fetched ? S_FALSE : E_OUTOFMEMORY; + break; + } + rgelt[Fetched] = item; m_Index++; Fetched++; } + else + { + hr = S_FALSE; + } } - *pceltFetched = Fetched; - return Fetched ? S_OK : S_FALSE; + if (pceltFetched) + *pceltFetched = Fetched; + return hr; } STDMETHODIMP Skip(ULONG celt) { diff --git a/dll/shellext/netshell/enumlist.cpp b/dll/shellext/netshell/enumlist.cpp index a95eab776d8..9369663f708 100644 --- a/dll/shellext/netshell/enumlist.cpp +++ b/dll/shellext/netshell/enumlist.cpp @@ -277,9 +277,17 @@ CEnumIDList::Next( for (i = 0; i < celt; i++) { if (!m_pCurrent) + { + hr = S_FALSE; break; + } temp = ILClone(m_pCurrent->pidl); + if (!temp) + { + hr = i ? S_FALSE : E_OUTOFMEMORY; + break; + } rgelt[i] = temp; m_pCurrent = m_pCurrent->pNext; } diff --git a/dll/shellext/zipfldr/CEnumZipContents.cpp b/dll/shellext/zipfldr/CEnumZipContents.cpp index 372e21ba772..a3f5bcbf79c 100644 --- a/dll/shellext/zipfldr/CEnumZipContents.cpp +++ b/dll/shellext/zipfldr/CEnumZipContents.cpp @@ -34,25 +34,25 @@ public: // *** IEnumIDList methods *** STDMETHODIMP Next(ULONG celt, LPITEMIDLIST *rgelt, ULONG *pceltFetched) { - if (!pceltFetched || !rgelt) + if (!rgelt || (!pceltFetched && celt != 1)) return E_POINTER; - *pceltFetched = 0; - - if (celt != 1) - return E_FAIL; - + LPITEMIDLIST item; CStringW name; bool dir; unz_file_info64 info; - if (mEnumerator.next_unique(m_Prefix, name, dir, info)) + for (ULONG i = 0; i < celt; ++i) { - *pceltFetched = 1; - *rgelt = _ILCreate(dir ? ZIP_PIDL_DIRECTORY : ZIP_PIDL_FILE, name, info); - return S_OK; + if (pceltFetched) + *pceltFetched = i; + if (!mEnumerator.next_unique(m_Prefix, name, dir, info)) + return S_FALSE; + item = _ILCreate(dir ? ZIP_PIDL_DIRECTORY : ZIP_PIDL_FILE, name, info); + if (!item) + return i ? S_FALSE : E_OUTOFMEMORY; + rgelt[i] = item; } - - return S_FALSE; + return S_OK; } STDMETHODIMP Skip(ULONG celt) { diff --git a/dll/win32/shell32/CEnumIDListBase.cpp b/dll/win32/shell32/CEnumIDListBase.cpp index 59633418c3d..47adf6e2ea8 100644 --- a/dll/win32/shell32/CEnumIDListBase.cpp +++ b/dll/win32/shell32/CEnumIDListBase.cpp @@ -172,9 +172,15 @@ HRESULT WINAPI CEnumIDListBase::Next( for(i = 0; i < celt; i++) { if(!mpCurrent) + { hr = S_FALSE; break; + } temp = ILClone(mpCurrent->pidl); + if (!temp) + { hr = i ? S_FALSE : E_OUTOFMEMORY; + break; + } rgelt[i] = temp; mpCurrent = mpCurrent->pNext; }

1 year, 2 months

[reactos] 01/01: [DEVMGR] Fix some bugs spotted by Thomas Faber in PR #5775 (#5790)

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b4b1c5b9aac030f96a0bb… commit b4b1c5b9aac030f96a0bb58f14e7de9bee17d3c5 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Oct 12 15:34:06 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Nov 13 16:26:00 2023 +0100 [DEVMGR] Fix some bugs spotted by Thomas Faber in PR #5775 (#5790) - Fix TCHAR/WCHAR mis-usage, - Fix as a result, a buffer overflow (GlobalAlloc takes the size in bytes, but a number of characters was passed to it instead). - Remove usage of unsafe string function. Now the item text is directly retrieved within the allocated buffer. --- dll/win32/devmgr/properties/advprop.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dll/win32/devmgr/properties/advprop.cpp b/dll/win32/devmgr/properties/advprop.cpp index c53fe65a46c..1c776069465 100644 --- a/dll/win32/devmgr/properties/advprop.cpp +++ b/dll/win32/devmgr/properties/advprop.cpp @@ -413,7 +413,7 @@ DriverDetailsDlgProc(IN HWND hwndDlg, pnmv->iItem, pnmv->iSubItem, szDriverPath, - MAX_PATH); + _countof(szDriverPath)); UpdateDriverVersionInfoDetails(hwndDlg, szDriverPath); @@ -1944,16 +1944,11 @@ AdvProcDetailsDlgProc(IN HWND hwndDlg, if (nSelectedId < 0 || nSelectedItems <= 0) break; - TCHAR szItemName[MAX_PATH]; HGLOBAL hGlobal; LPWSTR pszBuffer; + SIZE_T cchSize = MAX_PATH + 1; - ListView_GetItemText(hwndListView, - nSelectedId, 0, - szItemName, - _countof(szItemName)); - - hGlobal = GlobalAlloc(GHND, MAX_PATH); + hGlobal = GlobalAlloc(GHND, cchSize * sizeof(WCHAR)); if (!hGlobal) break; pszBuffer = (LPWSTR)GlobalLock(hGlobal); @@ -1963,7 +1958,12 @@ AdvProcDetailsDlgProc(IN HWND hwndDlg, break; } - wsprintf(pszBuffer, L"%s", szItemName); + ListView_GetItemText(hwndListView, + nSelectedId, 0, + pszBuffer, + cchSize); + /* Ensure NULL-termination */ + pszBuffer[cchSize - 1] = UNICODE_NULL; GlobalUnlock(hGlobal);

1 year, 2 months

[reactos] 01/01: [SHELL32] Add support for more registry verb flags and CMF flags (#5785)

by Whindmar Saksit

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7fb91d98f92d0600b0173… commit 7fb91d98f92d0600b0173b6fe1d6be8dda4066f8 Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Mon Nov 13 16:21:13 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Nov 13 16:21:13 2023 +0100 [SHELL32] Add support for more registry verb flags and CMF flags (#5785) - Adds support for registry controlled menu separators and the documented values to turn off verbs. - Adds support for CMF_OPTIMIZEFORINVOKE, CMF_NODEFAULT, CMF_DONOTPICKDEFAULT, CMF_EXPLORE and CMF_DISABLEDVERBS. Bugs fixed: - A verb with "Extended" set in the registry could cause the menu to invoke the incorrect command! This happened because skipping InsertMenuItemW caused InvokeCommand to use the wrong index with m_StaticEntries. - Uses IS_INTRESOURCE instead of HIWORD to check if something is a string (only matters on 64-bit). - TryToBrowse leaking a PIDL when calling ILCombine. Notes: - This PR introduces the RosGetProcessEffectiveVersion() helper function discussed in chat. - Relaxed FAILED_UNEXPECTEDLY to FAILED in two places because IContextMenu cannot assume that it has a site that leads to IShellBrowser. --- dll/win32/shell32/CDefaultContextMenu.cpp | 345 ++++++++++++++++++++---------- sdk/include/psdk/shobjidl.idl | 25 ++- sdk/include/reactos/compat_undoc.h | 11 + sdk/include/reactos/shellutils.h | 12 ++ 4 files changed, 270 insertions(+), 123 deletions(-) diff --git a/dll/win32/shell32/CDefaultContextMenu.cpp b/dll/win32/shell32/CDefaultContextMenu.cpp index 577e93d332e..af57d92d3bb 100644 --- a/dll/win32/shell32/CDefaultContextMenu.cpp +++ b/dll/win32/shell32/CDefaultContextMenu.cpp @@ -7,9 +7,24 @@ */ #include "precomp.h" +#include <compat_undoc.h> WINE_DEFAULT_DEBUG_CHANNEL(dmenu); +static inline bool RegValueExists(HKEY hKey, LPCWSTR Name) +{ + return RegQueryValueExW(hKey, Name, NULL, NULL, NULL, NULL) == ERROR_SUCCESS; +} + +static BOOL InsertMenuItemAt(HMENU hMenu, UINT Pos, UINT Flags) +{ + MENUITEMINFOW mii; + mii.cbSize = FIELD_OFFSET(MENUITEMINFOW, hbmpItem); // USER32 version agnostic + mii.fMask = MIIM_TYPE; + mii.fType = Flags; + return InsertMenuItemW(hMenu, Pos, TRUE, &mii); +} + typedef struct _DynamicShellEntry_ { UINT iIdCmdFirst; @@ -24,30 +39,32 @@ typedef struct _StaticShellEntry_ HKEY hkClass; } StaticShellEntry, *PStaticShellEntry; +#define DCM_FCIDM_SHVIEW_OFFSET 0x7000 // Offset from the menu ids in the menu resource to FCIDM_SHVIEW_* // // verbs for InvokeCommandInfo // -struct _StaticInvokeCommandMap_ +static const struct _StaticInvokeCommandMap_ { LPCSTR szStringVerb; - UINT IntVerb; + WORD IntVerb; + SHORT DfmCmd; } g_StaticInvokeCmdMap[] = { { "RunAs", 0 }, // Unimplemented { "Print", 0 }, // Unimplemented { "Preview", 0 }, // Unimplemented - { "Open", FCIDM_SHVIEW_OPEN }, - { CMDSTR_NEWFOLDERA, FCIDM_SHVIEW_NEWFOLDER }, - { "cut", FCIDM_SHVIEW_CUT}, - { "copy", FCIDM_SHVIEW_COPY}, - { "paste", FCIDM_SHVIEW_INSERT}, - { "link", FCIDM_SHVIEW_CREATELINK}, - { "delete", FCIDM_SHVIEW_DELETE}, - { "properties", FCIDM_SHVIEW_PROPERTIES}, - { "rename", FCIDM_SHVIEW_RENAME}, - { "copyto", FCIDM_SHVIEW_COPYTO }, - { "moveto", FCIDM_SHVIEW_MOVETO }, + { "Open", FCIDM_SHVIEW_OPEN }, + { CMDSTR_NEWFOLDERA, FCIDM_SHVIEW_NEWFOLDER, (SHORT)DFM_CMD_NEWFOLDER }, + { "cut", FCIDM_SHVIEW_CUT, /* ? */ }, + { "copy", FCIDM_SHVIEW_COPY, (SHORT)DFM_CMD_COPY }, + { "paste", FCIDM_SHVIEW_INSERT, (SHORT)DFM_CMD_PASTE }, + { "link", FCIDM_SHVIEW_CREATELINK, (SHORT)DFM_CMD_LINK }, + { "delete", FCIDM_SHVIEW_DELETE, (SHORT)DFM_CMD_DELETE }, + { "properties", FCIDM_SHVIEW_PROPERTIES, (SHORT)DFM_CMD_PROPERTIES }, + { "rename", FCIDM_SHVIEW_RENAME, (SHORT)DFM_CMD_RENAME }, + { "copyto", FCIDM_SHVIEW_COPYTO }, + { "moveto", FCIDM_SHVIEW_MOVETO }, }; class CDefaultContextMenu : @@ -79,13 +96,14 @@ class CDefaultContextMenu : UINT m_iIdDfltLast; /* last default part id */ HRESULT _DoCallback(UINT uMsg, WPARAM wParam, LPVOID lParam); - void AddStaticEntry(const HKEY hkeyClass, const WCHAR *szVerb); - void AddStaticEntriesForKey(HKEY hKey); + void AddStaticEntry(const HKEY hkeyClass, const WCHAR *szVerb, UINT uFlags); + void AddStaticEntriesForKey(HKEY hKey, UINT uFlags); + void TryPickDefault(HMENU hMenu, UINT idCmdFirst, UINT DfltOffset, UINT uFlags); BOOL IsShellExtensionAlreadyLoaded(REFCLSID clsid); HRESULT LoadDynamicContextMenuHandler(HKEY hKey, REFCLSID clsid); BOOL EnumerateDynamicContextHandlerForKey(HKEY hRootKey); UINT AddShellExtensionsToMenu(HMENU hMenu, UINT* pIndexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags); - UINT AddStaticContextMenusToMenu(HMENU hMenu, UINT* IndexMenu, UINT iIdCmdFirst, UINT iIdCmdLast); + UINT AddStaticContextMenusToMenu(HMENU hMenu, UINT* IndexMenu, UINT iIdCmdFirst, UINT iIdCmdLast, UINT uFlags); HRESULT DoPaste(LPCMINVOKECOMMANDINFOEX lpcmi, BOOL bLink); HRESULT DoOpenOrExplore(LPCMINVOKECOMMANDINFOEX lpcmi); HRESULT DoCreateLink(LPCMINVOKECOMMANDINFOEX lpcmi); @@ -229,7 +247,7 @@ HRESULT CDefaultContextMenu::_DoCallback(UINT uMsg, WPARAM wParam, LPVOID lParam return E_FAIL; } -void CDefaultContextMenu::AddStaticEntry(const HKEY hkeyClass, const WCHAR *szVerb) +void CDefaultContextMenu::AddStaticEntry(const HKEY hkeyClass, const WCHAR *szVerb, UINT uFlags) { POSITION it = m_StaticEntries.GetHeadPosition(); while (it != NULL) @@ -244,7 +262,7 @@ void CDefaultContextMenu::AddStaticEntry(const HKEY hkeyClass, const WCHAR *szVe TRACE("adding verb %s\n", debugstr_w(szVerb)); - if (!wcsicmp(szVerb, L"open")) + if (!wcsicmp(szVerb, L"open") && !(uFlags & CMF_NODEFAULT)) { /* open verb is always inserted in front */ m_StaticEntries.AddHead({ szVerb, hkeyClass }); @@ -255,7 +273,7 @@ void CDefaultContextMenu::AddStaticEntry(const HKEY hkeyClass, const WCHAR *szVe } } -void CDefaultContextMenu::AddStaticEntriesForKey(HKEY hKey) +void CDefaultContextMenu::AddStaticEntriesForKey(HKEY hKey, UINT uFlags) { WCHAR wszName[40]; DWORD cchName, dwIndex = 0; @@ -271,7 +289,7 @@ void CDefaultContextMenu::AddStaticEntriesForKey(HKEY hKey) if (RegEnumKeyExW(hShellKey, dwIndex++, wszName, &cchName, NULL, NULL, NULL, NULL) != ERROR_SUCCESS) break; - AddStaticEntry(hKey, wszName); + AddStaticEntry(hKey, wszName, uFlags); } RegCloseKey(hShellKey); @@ -450,13 +468,15 @@ CDefaultContextMenu::AddStaticContextMenusToMenu( HMENU hMenu, UINT* pIndexMenu, UINT iIdCmdFirst, - UINT iIdCmdLast) + UINT iIdCmdLast, + UINT uFlags) { + UINT ntver = RosGetProcessEffectiveVersion(); MENUITEMINFOW mii; UINT idResource; WCHAR wszVerb[40]; UINT fState; - UINT cIds = 0; + UINT cIds = 0, indexFirst = *pIndexMenu; mii.cbSize = sizeof(mii); mii.fMask = MIIM_ID | MIIM_TYPE | MIIM_STATE | MIIM_DATA; @@ -468,6 +488,7 @@ CDefaultContextMenu::AddStaticContextMenusToMenu( while (it != NULL) { StaticShellEntry& info = m_StaticEntries.GetNext(it); + BOOL forceFirstPos = FALSE; fState = MFS_ENABLED; mii.dwTypeData = NULL; @@ -481,12 +502,19 @@ CDefaultContextMenu::AddStaticContextMenusToMenu( if (info.Verb.CompareNoCase(L"open") == 0) { - /* override default when open verb is found */ - fState |= MFS_DEFAULT; idResource = IDS_OPEN_VERB; + fState |= MFS_DEFAULT; /* override default when open verb is found */ + forceFirstPos++; } else if (info.Verb.CompareNoCase(L"explore") == 0) + { idResource = IDS_EXPLORE_VERB; + if (uFlags & CMF_EXPLORE) + { + fState |= MFS_DEFAULT; + forceFirstPos++; + } + } else if (info.Verb.CompareNoCase(L"runas") == 0) idResource = IDS_RUNAS_VERB; else if (info.Verb.CompareNoCase(L"edit") == 0) @@ -496,9 +524,7 @@ CDefaultContextMenu::AddStaticContextMenusToMenu( else if (info.Verb.CompareNoCase(L"print") == 0) idResource = IDS_PRINT_VERB; else if (info.Verb.CompareNoCase(L"printto") == 0) - { continue; - } else idResource = 0; @@ -513,53 +539,96 @@ CDefaultContextMenu::AddStaticContextMenusToMenu( continue; } - BOOL Extended = FALSE; + UINT cmdFlags = 0; + BOOL hide = FALSE; HKEY hkVerb; if (idResource > 0) { - if (LoadStringW(shell32_hInstance, idResource, wszVerb, _countof(wszVerb))) - mii.dwTypeData = wszVerb; /* use translated verb */ - else - ERR("Failed to load string\n"); - - LONG res = RegOpenKeyW(info.hkClass, wszKey, &hkVerb); - if (res == ERROR_SUCCESS) + if (!(uFlags & CMF_OPTIMIZEFORINVOKE)) { - res = RegQueryValueExW(hkVerb, L"Extended", NULL, NULL, NULL, NULL); - Extended = (res == ERROR_SUCCESS); - - RegCloseKey(hkVerb); + if (LoadStringW(shell32_hInstance, idResource, wszVerb, _countof(wszVerb))) + mii.dwTypeData = wszVerb; /* use translated verb */ + else + ERR("Failed to load string\n"); } + + if (RegOpenKeyW(info.hkClass, wszKey, &hkVerb) != ERROR_SUCCESS) + hkVerb = NULL; } else { - LONG res = RegOpenKeyW(info.hkClass, wszKey, &hkVerb); - if (res == ERROR_SUCCESS) + if (RegOpenKeyW(info.hkClass, wszKey, &hkVerb) == ERROR_SUCCESS) { - DWORD cbVerb = sizeof(wszVerb); - res = RegLoadMUIStringW(hkVerb, NULL, wszVerb, cbVerb, NULL, 0, NULL); - if (res == ERROR_SUCCESS) + if (!(uFlags & CMF_OPTIMIZEFORINVOKE)) { - /* use description for the menu entry */ - mii.dwTypeData = wszVerb; - } + DWORD cbVerb = sizeof(wszVerb); - res = RegQueryValueExW(hkVerb, L"Extended", NULL, NULL, NULL, NULL); - Extended = (res == ERROR_SUCCESS); + LONG res = RegLoadMUIStringW(hkVerb, L"MUIVerb", wszVerb, cbVerb, NULL, 0, NULL); + if (res || !*wszVerb) + res = RegLoadMUIStringW(hkVerb, NULL, wszVerb, cbVerb, NULL, 0, NULL); - RegCloseKey(hkVerb); + if (res == ERROR_SUCCESS && *wszVerb) + { + /* use description for the menu entry */ + mii.dwTypeData = wszVerb; + } + } + } + else + { + hkVerb = NULL; } } - if (!Extended || GetAsyncKeyState(VK_SHIFT) < 0) + if (hkVerb) { - mii.cch = wcslen(mii.dwTypeData); + // FIXME: GetAsyncKeyState should not be called here, clients + // need to be updated to set the CMF_EXTENDEDVERBS flag. + if (!(uFlags & CMF_EXTENDEDVERBS) && GetAsyncKeyState(VK_SHIFT) >= 0) + hide |= RegValueExists(hkVerb, L"Extended"); + + hide |= RegValueExists(hkVerb, L"ProgrammaticAccessOnly"); + + if (!(uFlags & CMF_DISABLEDVERBS)) + hide |= RegValueExists(hkVerb, L"LegacyDisable"); + + if (RegValueExists(hkVerb, L"NeverDefault")) + fState &= ~MFS_DEFAULT; + + if (RegValueExists(hkVerb, L"SeparatorBefore")) + cmdFlags |= ECF_SEPARATORBEFORE; + if (RegValueExists(hkVerb, L"SeparatorAfter")) + cmdFlags |= ECF_SEPARATORAFTER; + + RegCloseKey(hkVerb); + } + + if (((uFlags & CMF_NODEFAULT) && ntver >= _WIN32_WINNT_VISTA) || + ((uFlags & CMF_DONOTPICKDEFAULT) && ntver >= _WIN32_WINNT_WIN7)) + { + fState &= ~MFS_DEFAULT; + } + + if (!hide) + { + if (cmdFlags & ECF_SEPARATORBEFORE) + { + if (InsertMenuItemAt(hMenu, *pIndexMenu, MF_SEPARATOR)) + (*pIndexMenu)++; + } + mii.fState = fState; mii.wID = iIdCmdFirst + cIds; - InsertMenuItemW(hMenu, *pIndexMenu, TRUE, &mii); - (*pIndexMenu)++; - cIds++; + if (InsertMenuItemW(hMenu, forceFirstPos ? indexFirst : *pIndexMenu, TRUE, &mii)) + (*pIndexMenu)++; + + if (cmdFlags & ECF_SEPARATORAFTER) + { + if (InsertMenuItemAt(hMenu, *pIndexMenu, MF_SEPARATOR)) + (*pIndexMenu)++; + } } + cIds++; // Always increment the id because it acts as the index into m_StaticEntries if (mii.wID >= iIdCmdLast) break; @@ -587,7 +656,7 @@ void WINAPI _InsertMenuItemW( else if (fType == MFT_STRING) { mii.fMask = MIIM_ID | MIIM_TYPE | MIIM_STATE; - if ((ULONG_PTR)HIWORD((ULONG_PTR)dwTypeData) == 0) + if (IS_INTRESOURCE(dwTypeData)) { if (LoadStringW(shell32_hInstance, LOWORD((ULONG_PTR)dwTypeData), wszText, _countof(wszText))) mii.dwTypeData = wszText; @@ -607,6 +676,42 @@ void WINAPI _InsertMenuItemW( InsertMenuItemW(hMenu, indexMenu, fByPosition, &mii); } +void +CDefaultContextMenu::TryPickDefault(HMENU hMenu, UINT idCmdFirst, UINT DfltOffset, UINT uFlags) +{ + // Are we allowed to pick a default? + UINT ntver = RosGetProcessEffectiveVersion(); + if (((uFlags & CMF_NODEFAULT) && ntver >= _WIN32_WINNT_VISTA) || + ((uFlags & CMF_DONOTPICKDEFAULT) && ntver >= _WIN32_WINNT_WIN7)) + { + return; + } + + // Do we already have a default? + if ((int)GetMenuDefaultItem(hMenu, MF_BYPOSITION, 0) != -1) + return; + + // Does the view want to pick one? + INT_PTR forceDfm = 0; + if (_DoCallback(DFM_GETDEFSTATICID, 0, &forceDfm) == S_OK && forceDfm) + { + for (UINT i = 0; i < _countof(g_StaticInvokeCmdMap); ++i) + { + UINT menuItemId = g_StaticInvokeCmdMap[i].IntVerb + DfltOffset - DCM_FCIDM_SHVIEW_OFFSET; + if (g_StaticInvokeCmdMap[i].DfmCmd == forceDfm && + SetMenuDefaultItem(hMenu, menuItemId, MF_BYCOMMAND)) + { + return; + } + } + } + + // Don't want to pick something like cut or delete as the default but + // a static or dynamic verb is a good default. + if (m_iIdSCMLast > m_iIdSCMFirst || m_iIdSHELast > m_iIdSHEFirst) + SetMenuDefaultItem(hMenu, idCmdFirst, MF_BYCOMMAND); +} + HRESULT WINAPI CDefaultContextMenu::QueryContextMenu( @@ -623,15 +728,15 @@ CDefaultContextMenu::QueryContextMenu( TRACE("BuildShellItemContextMenu entered\n"); /* Load static verbs and shell extensions from registry */ - for (UINT i = 0; i < m_cKeys; i++) + for (UINT i = 0; i < m_cKeys && !(uFlags & CMF_NOVERBS); i++) { - AddStaticEntriesForKey(m_aKeys[i]); + AddStaticEntriesForKey(m_aKeys[i], uFlags); EnumerateDynamicContextHandlerForKey(m_aKeys[i]); } /* Add static context menu handlers */ - cIds = AddStaticContextMenusToMenu(hMenu, &IndexMenu, idCmdFirst, idCmdLast); - m_iIdSCMFirst = 0; + cIds = AddStaticContextMenusToMenu(hMenu, &IndexMenu, idCmdFirst, idCmdLast, uFlags); + m_iIdSCMFirst = 0; // FIXME: This should be = idCmdFirst? m_iIdSCMLast = cIds; idCmdNext = idCmdFirst + cIds; @@ -654,44 +759,49 @@ CDefaultContextMenu::QueryContextMenu( idCmdNext = idCmdFirst + cIds; } - if (uFlags & CMF_VERBSONLY) - return MAKE_HRESULT(SEVERITY_SUCCESS, 0, cIds); + //TODO: DFM_MERGECONTEXTMENU_BOTTOM + + UINT idDefaultOffset = 0; + BOOL isBackgroundMenu = !m_cidl; + if (!(uFlags & CMF_VERBSONLY) && !isBackgroundMenu) + { + /* Get the attributes of the items */ + SFGAOF rfg = SFGAO_BROWSABLE | SFGAO_CANCOPY | SFGAO_CANLINK | SFGAO_CANMOVE | SFGAO_CANDELETE | SFGAO_CANRENAME | SFGAO_HASPROPSHEET | SFGAO_FILESYSTEM | SFGAO_FOLDER; + hr = m_psf->GetAttributesOf(m_cidl, m_apidl, &rfg); + if (FAILED_UNEXPECTEDLY(hr)) + return MAKE_HRESULT(SEVERITY_SUCCESS, 0, cIds); + + /* Add the default part of the menu */ + HMENU hmenuDefault = LoadMenu(_AtlBaseModule.GetResourceInstance(), L"MENU_SHV_FILE"); + + /* Remove uneeded entries */ + if (!(rfg & SFGAO_CANMOVE)) + DeleteMenu(hmenuDefault, IDM_CUT, MF_BYCOMMAND); + if (!(rfg & SFGAO_CANCOPY)) + DeleteMenu(hmenuDefault, IDM_COPY, MF_BYCOMMAND); + if (!((rfg & SFGAO_FILESYSTEM) && HasClipboardData())) + DeleteMenu(hmenuDefault, IDM_INSERT, MF_BYCOMMAND); + if (!(rfg & SFGAO_CANLINK)) + DeleteMenu(hmenuDefault, IDM_CREATELINK, MF_BYCOMMAND); + if (!(rfg & SFGAO_CANDELETE)) + DeleteMenu(hmenuDefault, IDM_DELETE, MF_BYCOMMAND); + if (!(rfg & SFGAO_CANRENAME)) + DeleteMenu(hmenuDefault, IDM_RENAME, MF_BYCOMMAND); + if (!(rfg & SFGAO_HASPROPSHEET)) + DeleteMenu(hmenuDefault, IDM_PROPERTIES, MF_BYCOMMAND); + + idDefaultOffset = idCmdNext; + UINT idMax = Shell_MergeMenus(hMenu, GetSubMenu(hmenuDefault, 0), IndexMenu, idCmdNext, idCmdLast, 0); + m_iIdDfltFirst = cIds; + cIds += idMax - idCmdNext; + m_iIdDfltLast = cIds; + + DestroyMenu(hmenuDefault); + } - /* If this is a background context menu we are done */ - if (!m_cidl) - return MAKE_HRESULT(SEVERITY_SUCCESS, 0, cIds); + TryPickDefault(hMenu, idCmdFirst, idDefaultOffset, uFlags); - /* Get the attributes of the items */ - SFGAOF rfg = SFGAO_BROWSABLE | SFGAO_CANCOPY | SFGAO_CANLINK | SFGAO_CANMOVE | SFGAO_CANDELETE | SFGAO_CANRENAME | SFGAO_HASPROPSHEET | SFGAO_FILESYSTEM | SFGAO_FOLDER; - hr = m_psf->GetAttributesOf(m_cidl, m_apidl, &rfg); - if (FAILED_UNEXPECTEDLY(hr)) - return MAKE_HRESULT(SEVERITY_SUCCESS, 0, cIds); - - /* Add the default part of the menu */ - HMENU hmenuDefault = LoadMenu(_AtlBaseModule.GetResourceInstance(), L"MENU_SHV_FILE"); - - /* Remove uneeded entries */ - if (!(rfg & SFGAO_CANMOVE)) - DeleteMenu(hmenuDefault, IDM_CUT, MF_BYCOMMAND); - if (!(rfg & SFGAO_CANCOPY)) - DeleteMenu(hmenuDefault, IDM_COPY, MF_BYCOMMAND); - if (!((rfg & SFGAO_FILESYSTEM) && HasClipboardData())) - DeleteMenu(hmenuDefault, IDM_INSERT, MF_BYCOMMAND); - if (!(rfg & SFGAO_CANLINK)) - DeleteMenu(hmenuDefault, IDM_CREATELINK, MF_BYCOMMAND); - if (!(rfg & SFGAO_CANDELETE)) - DeleteMenu(hmenuDefault, IDM_DELETE, MF_BYCOMMAND); - if (!(rfg & SFGAO_CANRENAME)) - DeleteMenu(hmenuDefault, IDM_RENAME, MF_BYCOMMAND); - if (!(rfg & SFGAO_HASPROPSHEET)) - DeleteMenu(hmenuDefault, IDM_PROPERTIES, MF_BYCOMMAND); - - UINT idMax = Shell_MergeMenus(hMenu, GetSubMenu(hmenuDefault, 0), IndexMenu, idCmdNext, idCmdLast, 0); - m_iIdDfltFirst = cIds; - cIds += idMax - idCmdNext; - m_iIdDfltLast = cIds; - - DestroyMenu(hmenuDefault); + // TODO: DFM_MERGECONTEXTMENU_TOP return MAKE_HRESULT(SEVERITY_SUCCESS, 0, cIds); } @@ -1040,7 +1150,7 @@ CDefaultContextMenu::BrowserFlagsFromVerb(LPCMINVOKECOMMANDINFOEX lpcmi, PStatic /* Get a pointer to the shell browser */ hr = IUnknown_QueryService(m_site, SID_IShellBrowser, IID_PPV_ARG(IShellBrowser, &psb)); - if (FAILED_UNEXPECTEDLY(hr)) + if (FAILED(hr)) return 0; /* See if we are in Explore or Browse mode. If the browser's tree is present, we are in Explore mode.*/ @@ -1065,7 +1175,7 @@ CDefaultContextMenu::BrowserFlagsFromVerb(LPCMINVOKECOMMANDINFOEX lpcmi, PStatic HRESULT CDefaultContextMenu::TryToBrowse( - LPCMINVOKECOMMANDINFOEX lpcmi, LPCITEMIDLIST pidl, DWORD wFlags) + LPCMINVOKECOMMANDINFOEX lpcmi, LPCITEMIDLIST pidlChild, DWORD wFlags) { CComPtr<IShellBrowser> psb; HRESULT hr; @@ -1075,10 +1185,17 @@ CDefaultContextMenu::TryToBrowse( /* Get a pointer to the shell browser */ hr = IUnknown_QueryService(m_site, SID_IShellBrowser, IID_PPV_ARG(IShellBrowser, &psb)); - if (FAILED_UNEXPECTEDLY(hr)) - return 0; + if (FAILED(hr)) + return hr; - return psb->BrowseObject(ILCombine(m_pidlFolder, pidl), wFlags); + PIDLIST_ABSOLUTE pidl; + hr = SHILCombine(m_pidlFolder, pidlChild, &pidl); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + hr = psb->BrowseObject(pidl, wFlags & ~SBSP_RELATIVE); + ILFree(pidl); + return hr; } HRESULT @@ -1101,7 +1218,8 @@ CDefaultContextMenu::InvokePidl(LPCMINVOKECOMMANDINFOEX lpcmi, LPCITEMIDLIST pid } else { - SHGetPathFromIDListW(m_pidlFolder, wszDir); + if (!SHGetPathFromIDListW(m_pidlFolder, wszDir)) + *wszDir = UNICODE_NULL; } SHELLEXECUTEINFOW sei; @@ -1143,23 +1261,24 @@ CDefaultContextMenu::InvokeRegVerb( /* Get the browse flags to see if we need to browse */ DWORD wFlags = BrowserFlagsFromVerb(lpcmi, pEntry); - BOOL bBrowsed = FALSE; for (i=0; i < m_cidl; i++) { /* Check if we need to browse */ - if (wFlags > 0) + if (wFlags) { - /* In xp if we have browsed, we don't open any more folders. - * In win7 we browse to the first folder we find and - * open new windows for each of the rest of the folders */ - if (bBrowsed) - continue; - hr = TryToBrowse(lpcmi, m_apidl[i], wFlags); if (SUCCEEDED(hr)) { - bBrowsed = TRUE; + /* In WinXP if we have browsed, we don't open any more folders. + * In Win7 we browse to the first folder we find and + * open new windows for each of the rest of the folders */ + UINT ntver = RosGetProcessEffectiveVersion(); + if (ntver >= _WIN32_WINNT_VISTA) + wFlags = 0; // FIXME: = SBSP_NEWBROWSER | (wFlags & ~SBSP_SAMEBROWSER); + else + i = m_cidl; + continue; } } @@ -1184,7 +1303,7 @@ CDefaultContextMenu::InvokeCommand( memcpy(&LocalInvokeInfo, lpcmi, min(sizeof(LocalInvokeInfo), lpcmi->cbSize)); /* Check if this is a string verb */ - if (HIWORD(LocalInvokeInfo.lpVerb)) + if (!IS_INTRESOURCE(LocalInvokeInfo.lpVerb)) { /* Get the ID which corresponds to this verb, and update our local copy */ if (MapVerbToCmdId((LPVOID)LocalInvokeInfo.lpVerb, &CmdId, FALSE)) @@ -1217,7 +1336,7 @@ CDefaultContextMenu::InvokeCommand( { CmdId -= m_iIdDfltFirst; /* See the definitions of IDM_CUT and co to see how this works */ - CmdId += 0x7000; + CmdId += DCM_FCIDM_SHVIEW_OFFSET; } if (LocalInvokeInfo.cbSize >= sizeof(CMINVOKECOMMANDINFOEX) && (LocalInvokeInfo.fMask & CMIC_MASK_PTINVOKE)) @@ -1344,7 +1463,7 @@ CDefaultContextMenu::GetCommandString( { CmdId -= m_iIdDfltFirst; /* See the definitions of IDM_CUT and co to see how this works */ - CmdId += 0x7000; + CmdId += DCM_FCIDM_SHVIEW_OFFSET; } /* Loop looking for a matching Id */ diff --git a/sdk/include/psdk/shobjidl.idl b/sdk/include/psdk/shobjidl.idl index 54bf45a34c2..ef9e51d16e1 100644 --- a/sdk/include/psdk/shobjidl.idl +++ b/sdk/include/psdk/shobjidl.idl @@ -1596,16 +1596,21 @@ interface IDropTargetHelper : IUnknown ] interface IContextMenu : IUnknown { -cpp_quote("#define CMF_NORMAL 0x00000000") -cpp_quote("#define CMF_DEFAULTONLY 0x00000001") -cpp_quote("#define CMF_VERBSONLY 0x00000002") -cpp_quote("#define CMF_EXPLORE 0x00000004") -cpp_quote("#define CMF_NOVERBS 0x00000008") -cpp_quote("#define CMF_CANRENAME 0x00000010") -cpp_quote("#define CMF_NODEFAULT 0x00000020") -cpp_quote("#define CMF_INCLUDESTATIC 0x00000040") -cpp_quote("#define CMF_EXTENDEDVERBS 0x00000100") -cpp_quote("#define CMF_RESERVED 0xffff0000") +cpp_quote("#define CMF_NORMAL 0x00000000") +cpp_quote("#define CMF_DEFAULTONLY 0x00000001") +cpp_quote("#define CMF_VERBSONLY 0x00000002") +cpp_quote("#define CMF_EXPLORE 0x00000004") +cpp_quote("#define CMF_NOVERBS 0x00000008") +cpp_quote("#define CMF_CANRENAME 0x00000010") +cpp_quote("#define CMF_NODEFAULT 0x00000020") +cpp_quote("#define CMF_INCLUDESTATIC 0x00000040") +cpp_quote("#define CMF_EXTENDEDVERBS 0x00000100") +cpp_quote("#define CMF_DISABLEDVERBS 0x00000200") +cpp_quote("#define CMF_ASYNCVERBSTATE 0x00000400") +cpp_quote("#define CMF_OPTIMIZEFORINVOKE 0x00000800") +cpp_quote("#define CMF_SYNCCASCADEMENU 0x00001000") +cpp_quote("#define CMF_DONOTPICKDEFAULT 0x00002000") +cpp_quote("#define CMF_RESERVED 0xffff0000") cpp_quote("#define GCS_VERBA 0x00000000") cpp_quote("#define GCS_HELPTEXTA 0x00000001") diff --git a/sdk/include/reactos/compat_undoc.h b/sdk/include/reactos/compat_undoc.h index 44212efb2d2..b0516322a37 100644 --- a/sdk/include/reactos/compat_undoc.h +++ b/sdk/include/reactos/compat_undoc.h @@ -34,5 +34,16 @@ DWORD RosGetProcessCompatVersion(VOID) return g_CompatVersion < REACTOS_COMPATVERSION_UNINITIALIZED ? g_CompatVersion : 0; } +static +inline +UINT RosGetProcessEffectiveVersion(VOID) +{ + PPEB peb = NtCurrentPeb(); + UINT shimVer = RosGetProcessCompatVersion(); + if (shimVer) + return shimVer; + else + return (peb->OSMajorVersion << 8) | (peb->OSMinorVersion); +} #endif // COMPAT_UNDOC_H diff --git a/sdk/include/reactos/shellutils.h b/sdk/include/reactos/shellutils.h index 9ccce4d3373..226de2ee325 100644 --- a/sdk/include/reactos/shellutils.h +++ b/sdk/include/reactos/shellutils.h @@ -410,6 +410,18 @@ HRESULT inline ShellObjectCreatorInit(T1 initArg1, T2 initArg2, T3 initArg3, T4 return hResult; } +template<class P, class R> static HRESULT SHILClone(P pidl, R *ppOut) +{ + R r = *ppOut = (R)ILClone((PIDLIST_RELATIVE)pidl); + return r ? S_OK : E_OUTOFMEMORY; +} + +template<class B, class R> static HRESULT SHILCombine(B base, PCUIDLIST_RELATIVE sub, R *ppOut) +{ + R r = *ppOut = (R)ILCombine((PCIDLIST_ABSOLUTE)base, sub); + return r ? S_OK : E_OUTOFMEMORY; +} + HRESULT inline SHSetStrRet(LPSTRRET pStrRet, LPCSTR pstrValue) { pStrRet->uType = STRRET_CSTR;

1 year, 2 months

[reactos] 01/01: [SHELL32] Support more FOLDERFLAGS in DefView (#5760)

by Whindmar Saksit

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=23f31cf7b400f4503a6c4… commit 23f31cf7b400f4503a6c4ec412047972281fdbf3 Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Mon Nov 13 16:13:21 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Nov 13 16:13:21 2023 +0100 [SHELL32] Support more FOLDERFLAGS in DefView (#5760) This adds support for more of the FOLDERSETTINGS FOLDERFLAGS. - Turned on LVS_EX_DOUBLEBUFFER even though there is no setting for it. XP has it on for folders but not the desktop and this matches that. Vista might turn it on for its shadow labels on the desktop, further investigation required. - Fixes a bug where LVS_EX_SNAPTOGRID was incorrectly assigned where the WS_EX flags go. - LVS_AUTOARRANGE seems to be incorrectly forced on but for compatibility I decided to leave it but added a comment. The existing code already has the check for FWF_AUTOARRANGE. --- dll/win32/shell32/CDefView.cpp | 37 ++++++++++++++++++++++++++++++------- 1 file changed, 30 insertions(+), 7 deletions(-) diff --git a/dll/win32/shell32/CDefView.cpp b/dll/win32/shell32/CDefView.cpp index a06feb085b4..9f91cf9ead9 100644 --- a/dll/win32/shell32/CDefView.cpp +++ b/dll/win32/shell32/CDefView.cpp @@ -629,19 +629,27 @@ void CDefView::UpdateStatusbar() BOOL CDefView::CreateList() { HRESULT hr; - DWORD dwStyle, dwExStyle; + DWORD dwStyle, dwExStyle, ListExStyle; UINT ViewMode; TRACE("%p\n", this); dwStyle = WS_TABSTOP | WS_VISIBLE | WS_CHILDWINDOW | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | - LVS_SHAREIMAGELISTS | LVS_EDITLABELS | LVS_AUTOARRANGE; + LVS_SHAREIMAGELISTS | LVS_EDITLABELS | LVS_AUTOARRANGE; // FIXME: Why is LVS_AUTOARRANGE here? dwExStyle = WS_EX_CLIENTEDGE; + ListExStyle = 0; if (m_FolderSettings.fFlags & FWF_DESKTOP) + { + m_FolderSettings.fFlags |= FWF_NOCLIENTEDGE | FWF_NOSCROLL; dwStyle |= LVS_ALIGNLEFT; + } else - dwStyle |= LVS_ALIGNTOP | LVS_SHOWSELALWAYS; + { + dwStyle |= LVS_SHOWSELALWAYS; // MSDN says FWF_SHOWSELALWAYS is deprecated, always turn on for folders. + dwStyle |= (m_FolderSettings.fFlags & FWF_ALIGNLEFT) ? LVS_ALIGNLEFT : LVS_ALIGNTOP; + ListExStyle = LVS_EX_DOUBLEBUFFER; + } ViewMode = m_FolderSettings.ViewMode; hr = _DoFolderViewCB(SFVM_DEFVIEWMODE, 0, (LPARAM)&ViewMode); @@ -680,14 +688,27 @@ BOOL CDefView::CreateList() dwStyle |= LVS_AUTOARRANGE; if (m_FolderSettings.fFlags & FWF_SNAPTOGRID) - dwExStyle |= LVS_EX_SNAPTOGRID; - - if (m_FolderSettings.fFlags & FWF_DESKTOP) - m_FolderSettings.fFlags |= FWF_NOCLIENTEDGE | FWF_NOSCROLL; + ListExStyle |= LVS_EX_SNAPTOGRID; if (m_FolderSettings.fFlags & FWF_SINGLESEL) dwStyle |= LVS_SINGLESEL; + if (m_FolderSettings.fFlags & FWF_FULLROWSELECT) + ListExStyle |= LVS_EX_FULLROWSELECT; + + if (m_FolderSettings.fFlags & FWF_SINGLECLICKACTIVATE) + ListExStyle |= LVS_EX_TRACKSELECT | LVS_EX_ONECLICKACTIVATE; + + if (m_FolderSettings.fFlags & FWF_NOCOLUMNHEADER) + dwStyle |= LVS_NOCOLUMNHEADER; + +#if 0 + // FIXME: Because this is a negative, everyone gets the new flag by default unless they + // opt out. This code should be enabled when the shell looks like Vista instead of 2003. + if (!(m_FolderSettings.fFlags & FWF_NOHEADERINALLVIEWS)) + ListExStyle |= LVS_EX_HEADERINALLVIEWS; +#endif + if (m_FolderSettings.fFlags & FWF_NOCLIENTEDGE) dwExStyle &= ~WS_EX_CLIENTEDGE; @@ -697,6 +718,8 @@ BOOL CDefView::CreateList() if (!m_ListView) return FALSE; + m_ListView.SetExtendedListViewStyle(ListExStyle); + m_sortInfo.bIsAscending = TRUE; m_sortInfo.nHeaderID = -1; m_sortInfo.nLastHeaderID = -1;

1 year, 2 months

[reactos] 01/01: [VMX_SVGA] Demote 3 DPRINT1() and define NDEBUG (#5843)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bac646f9febb3703447fb… commit bac646f9febb3703447fbe8ba52de8490207e1bf Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Mon Nov 13 11:11:10 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Nov 13 11:11:10 2023 +0100 [VMX_SVGA] Demote 3 DPRINT1() and define NDEBUG (#5843) Addendum to 486e587 (r45778). --- win32ss/drivers/miniport/vmx_svga/vmx_svga.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/win32ss/drivers/miniport/vmx_svga/vmx_svga.c b/win32ss/drivers/miniport/vmx_svga/vmx_svga.c index 0afd883fec8..0d1f39d9478 100644 --- a/win32ss/drivers/miniport/vmx_svga/vmx_svga.c +++ b/win32ss/drivers/miniport/vmx_svga/vmx_svga.c @@ -9,7 +9,9 @@ /* INCLUDES *******************************************************************/ #include "precomp.h" -#include "debug.h" + +#define NDEBUG +#include <debug.h> /* GLOBALS ********************************************************************/ @@ -89,7 +91,7 @@ VmxFindAdapter(IN PVOID HwDeviceExtension, { VP_STATUS Status; PHW_DEVICE_EXTENSION DeviceExtension = HwDeviceExtension; - DPRINT1("VMX searching for adapter\n"); + DPRINT("VMX searching for adapter\n"); /* Zero out the fields */ VideoPortZeroMemory(DeviceExtension, sizeof(HW_DEVICE_EXTENSION)); @@ -104,7 +106,7 @@ VmxFindAdapter(IN PVOID HwDeviceExtension, /* Initialize the device extension and find the adapter */ Status = VmxInitDevice(DeviceExtension); - DPRINT1("Init status: %lx\n", Status); + DPRINT("Init status: %lx\n", Status); if (Status != NO_ERROR) return ERROR_DEV_NOT_EXIST; /* Save this adapter extension */ @@ -249,7 +251,7 @@ DriverEntry(IN PVOID Context1, VIDEO_HW_INITIALIZATION_DATA InitData; /* Zero initialization structure and array of extensions, one per screen */ - DPRINT1("VMX-SVGAII Loading...\n"); + DPRINT("VMX-SVGAII Loading...\n"); VideoPortZeroMemory(VmxDeviceExtensionArray, sizeof(VmxDeviceExtensionArray)); VideoPortZeroMemory(&InitData, sizeof(InitData));

1 year, 2 months

[reactos] 01/01: [ATL] Added CComPtr.CoCreateInstance helper methods (#5905)

by Whindmar Saksit

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c6ec8d924e59a958ff78e… commit c6ec8d924e59a958ff78e4371ac0a09c67b00f3f Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Mon Nov 13 11:03:05 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Nov 13 11:03:05 2023 +0100 [ATL] Added CComPtr.CoCreateInstance helper methods (#5905) --- sdk/lib/atl/atlcomcli.h | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/sdk/lib/atl/atlcomcli.h b/sdk/lib/atl/atlcomcli.h index a11b05ace36..e7c5fd32ca4 100644 --- a/sdk/lib/atl/atlcomcli.h +++ b/sdk/lib/atl/atlcomcli.h @@ -98,6 +98,19 @@ public: p->Release(); } + HRESULT CoCreateInstance(REFCLSID rclsid, REFIID riid, LPUNKNOWN pOuter = NULL, DWORD ClsCtx = CLSCTX_ALL) + { + ATLASSERT(!p); + return ::CoCreateInstance(rclsid, pOuter, ClsCtx, riid, (void**)&p); + } + + HRESULT CoCreateInstance(LPCOLESTR ProgID, REFIID riid, LPUNKNOWN pOuter = NULL, DWORD ClsCtx = CLSCTX_ALL) + { + CLSID clsid; + HRESULT hr = CLSIDFromProgID(ProgID, &clsid); + return FAILED(hr) ? hr : CoCreateInstance(clsid, riid, pOuter, ClsCtx); + } + T *operator = (T *lp) { T* pOld = p; @@ -142,6 +155,16 @@ public: return *this; } + + HRESULT CoCreateInstance(REFCLSID rclsid, LPUNKNOWN pOuter = NULL, DWORD ClsCtx = CLSCTX_ALL) + { + return CoCreateInstance(rclsid, __uuidof(T), pOuter, ClsCtx); + } + + HRESULT CoCreateInstance(LPCOLESTR ProgID, LPUNKNOWN pOuter = NULL, DWORD ClsCtx = CLSCTX_ALL) + { + return CoCreateInstance(ProgID, __uuidof(T), pOuter, ClsCtx); + } #endif void Release()

1 year, 2 months

[reactos] 01/01: [WIN32U_VISTA] .def: Delete this obsolete file (#5931)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8d54c2d4332b9f503cf44… commit 8d54c2d4332b9f503cf448c3658ffcb5b042d486 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Mon Nov 13 11:01:31 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Nov 13 11:01:31 2023 +0100 [WIN32U_VISTA] .def: Delete this obsolete file (#5931) --- .../apitests/win32u/win32u_vista/win32u_vista.def | 780 --------------------- 1 file changed, 780 deletions(-) diff --git a/modules/rostests/apitests/win32u/win32u_vista/win32u_vista.def b/modules/rostests/apitests/win32u/win32u_vista/win32u_vista.def deleted file mode 100644 index 8add31ef204..00000000000 --- a/modules/rostests/apitests/win32u/win32u_vista/win32u_vista.def +++ /dev/null @@ -1,780 +0,0 @@ -; -; ReactOS Operating System -; -; This file contains all win32k native api functions from win 2k3 sp 2 -; -LIBRARY w32kdll.dll - -EXPORTS -NtGdiAbortDoc@4 -NtGdiAbortPath@4 -NtGdiAddFontResourceW@24 -NtGdiAddRemoteFontToDC@16 -NtGdiAddFontMemResourceEx@20 -NtGdiRemoveMergeFont@8 -NtGdiAddRemoteMMInstanceToDC@12 -NtGdiAlphaBlend@48 -NtGdiAngleArc@24 -NtGdiAnyLinkedFonts@0 -NtGdiFontIsLinked@4 -NtGdiArcInternal@40 -NtGdiBeginPath@4 -NtGdiBitBlt@44 -NtGdiCancelDC@4 -NtGdiCheckBitmapBits@32 -NtGdiCloseFigure@4 -NtGdiClearBitmapAttributes@8 -NtGdiClearBrushAttributes@8 -NtGdiColorCorrectPalette@24 -NtGdiCombineRgn@16 -NtGdiCombineTransform@12 -NtGdiComputeXformCoefficients@4 -NtGdiConfigureOPMProtectedOutput@16 -NtGdiConsoleTextOut@16 -NtGdiConvertMetafileRect@8 -NtGdiCreateBitmap@20 -NtGdiCreateClientObj@4 -NtGdiCreateColorSpace@4 -NtGdiCreateColorTransform@32 -NtGdiCreateCompatibleBitmap@12 -NtGdiCreateCompatibleDC@4 -NtGdiCreateDIBBrush@24 -NtGdiCreateDIBitmapInternal@44 -NtGdiCreateDIBSection@36 -NtGdiCreateEllipticRgn@16 -NtGdiCreateHalftonePalette@4 -NtGdiCreateHatchBrushInternal@12 -NtGdiCreateMetafileDC@4 -NtGdiCreateOPMProtectedOutputs@20 -NtGdiCreatePaletteInternal@8 -NtGdiCreatePatternBrushInternal@12 -NtGdiCreatePen@16 -NtGdiCreateRectRgn@16 -NtGdiCreateRoundRectRgn@24 -NtGdiCreateServerMetaFile@24 -NtGdiCreateSolidBrush@8 -NtGdiD3dContextCreate@16 -NtGdiD3dContextDestroy@4 -NtGdiD3dContextDestroyAll@4 -NtGdiD3dValidateTextureStageState@4 -NtGdiD3dDrawPrimitives2@28 -NtGdiDdGetDriverState@4 -NtGdiDdAddAttachedSurface@12 -NtGdiDdAlphaBlt@12 -NtGdiDdAttachSurface@8 -NtGdiDdBeginMoCompFrame@8 -NtGdiDdBlt@12 -NtGdiDdCanCreateSurface@8 -NtGdiDdCanCreateD3DBuffer@8 -NtGdiDdColorControl@8 -NtGdiDdCreateDirectDrawObject@4 -NtGdiDdCreateSurface@32 -NtGdiDdCreateD3DBuffer@32 -NtGdiDdCreateMoComp@8 -NtGdiDdCreateSurfaceObject@24 -NtGdiDdDeleteDirectDrawObject@4 -NtGdiDdDeleteSurfaceObject@4 -NtGdiDdDestroyMoComp@8 -NtGdiDdDestroySurface@8 -NtGdiDdDestroyD3DBuffer@4 -NtGdiDdEndMoCompFrame@8 -NtGdiDdFlip@20 -NtGdiDdFlipToGDISurface@8 -NtGdiDdGetAvailDriverMemory@8 -NtGdiDdGetBltStatus@8 -NtGdiDdGetDC@8 -NtGdiDdGetDriverInfo@8 -NtGdiDdGetDxHandle@12 -NtGdiDdGetFlipStatus@8 -NtGdiDdGetInternalMoCompInfo@8 -NtGdiDdGetMoCompBuffInfo@8 -NtGdiDdGetMoCompGuids@8 -NtGdiDdGetMoCompFormats@8 -NtGdiDdGetScanLine@8 -NtGdiDdLock@12 -NtGdiDdLockD3D@8 -NtGdiDdQueryDirectDrawObject@44 -NtGdiDdQueryMoCompStatus@8 -NtGdiDdReenableDirectDrawObject@8 -NtGdiDdReleaseDC@4 -NtGdiDdRenderMoComp@8 -NtGdiDdResetVisrgn@8 -NtGdiDdSetColorKey@8 -NtGdiDdSetExclusiveMode@8 -NtGdiDdSetGammaRamp@12 -NtGdiDdCreateSurfaceEx@12 -NtGdiDdSetOverlayPosition@12 -NtGdiDdUnattachSurface@8 -NtGdiDdUnlock@8 -NtGdiDdUnlockD3D@8 -NtGdiDdUpdateOverlay@12 -NtGdiDdWaitForVerticalBlank@8 -NtGdiDvpCanCreateVideoPort@8 -NtGdiDvpColorControl@8 -NtGdiDvpCreateVideoPort@8 -NtGdiDvpDestroyVideoPort@8 -NtGdiDvpFlipVideoPort@16 -NtGdiDvpGetVideoPortBandwidth@8 -NtGdiDvpGetVideoPortField@8 -NtGdiDvpGetVideoPortFlipStatus@8 -NtGdiDvpGetVideoPortInputFormats@8 -NtGdiDvpGetVideoPortLine@8 -NtGdiDvpGetVideoPortOutputFormats@8 -NtGdiDvpGetVideoPortConnectInfo@8 -NtGdiDvpGetVideoSignalStatus@8 -NtGdiDvpUpdateVideoPort@16 -NtGdiDvpWaitForVideoPortSync@8 -NtGdiDvpAcquireNotification@12 -NtGdiDvpReleaseNotification@8 -NtGdiDxgGenericThunk@24 -NtGdiDeleteClientObj@4 -NtGdiDeleteColorSpace@4 -NtGdiDeleteColorTransform@8 -NtGdiDeleteObjectApp@4 -NtGdiDescribePixelFormat@16 -NtGdiDestroyOPMProtectedOutput@4 -NtGdiGetPerBandInfo@8 -NtGdiDoBanding@16 -NtGdiDoPalette@24 -NtGdiDrawEscape@16 -NtGdiEllipse@20 -NtGdiEnableEudc@4 -NtGdiEndDoc@4 -NtGdiEndPage@4 -NtGdiEndPath@4 -NtGdiEnumFontChunk@20 -NtGdiEnumFontClose@4 -NtGdiEnumFontOpen@28 -NtGdiEnumObjects@16 -NtGdiEqualRgn@8 -NtGdiEudcLoadUnloadLink@28 -NtGdiExcludeClipRect@20 -NtGdiExtCreatePen@44 -NtGdiExtCreateRegion@12 -NtGdiExtEscape@32 -NtGdiExtFloodFill@20 -NtGdiExtGetObjectW@12 -NtGdiExtSelectClipRgn@12 -NtGdiExtTextOutW@36 -NtGdiFillPath@4 -NtGdiFillRgn@12 -NtGdiFlattenPath@4 -NtGdiFlush@0 -NtGdiForceUFIMapping@8 -NtGdiFrameRgn@20 -NtGdiFullscreenControl@20 -NtGdiGetAndSetDCDword@16 -NtGdiGetAppClipBox@8 -NtGdiGetBitmapBits@12 -NtGdiGetBitmapDimension@8 -NtGdiGetBoundsRect@12 -NtGdiGetCertificate@16 -NtGdiGetCertificateSize@12 -NtGdiGetCharABCWidthsW@24 -NtGdiGetCharacterPlacementW@24 -NtGdiGetCharSet@4 -NtGdiGetCharWidthW@24 -NtGdiGetCharWidthInfo@8 -NtGdiGetColorAdjustment@8 -NtGdiGetColorSpaceforBitmap@4 -NtGdiGetCOPPCompatibleOPMInformation@12 -NtGdiGetDCDword@12 -NtGdiGetDCforBitmap@4 -NtGdiGetDCObject@8 -NtGdiGetDCPoint@12 -NtGdiGetDeviceCaps@8 -NtGdiGetDeviceGammaRamp@8 -NtGdiGetDeviceCapsAll@8 -NtGdiGetDIBitsInternal@36 -NtGdiGetETM@8 -NtGdiGetEudcTimeStampEx@12 -NtGdiGetFontData@20 -NtGdiGetFontResourceInfoInternalW@28 -NtGdiGetGlyphIndicesW@20 -NtGdiGetGlyphIndicesWInternal@24 -NtGdiGetGlyphOutline@32 -NtGdiGetOPMInformation@12 -NtGdiGetKerningPairs@12 -NtGdiGetLinkedUFIs@12 -NtGdiGetMiterLimit@8 -NtGdiGetMonitorID@12 -NtGdiGetNearestColor@8 -NtGdiGetNearestPaletteIndex@8 -NtGdiGetObjectBitmapHandle@8 -NtGdiGetOPMRandomNumber@8 -NtGdiGetOutlineTextMetricsInternalW@16 -NtGdiGetPath@16 -NtGdiGetPixel@12 -NtGdiGetRandomRgn@12 -NtGdiGetRasterizerCaps@8 -NtGdiGetRealizationInfo@12 -NtGdiGetRegionData@12 -NtGdiGetRgnBox@8 -NtGdiGetServerMetaFileBits@28 -NtGdiGetSpoolMessage@16 -NtGdiGetStats@20 -NtGdiGetStockObject@4 -NtGdiGetStringBitmapW@20 -NtGdiGetSuggestedOPMProtectedOutputArraySize@8 -NtGdiGetSystemPaletteUse@4 -NtGdiGetTextCharsetInfo@12 -NtGdiGetTextExtent@20 -NtGdiGetTextExtentExW@32 -NtGdiGetTextFaceW@16 -NtGdiGetTextMetricsW@12 -NtGdiGetTransform@12 -NtGdiGetUFI@24 -NtGdiGetEmbUFI@28 -NtGdiGetUFIPathname@40 -NtGdiGetEmbedFonts@0 -NtGdiChangeGhostFont@8 -NtGdiAddEmbFontToDC@8 -NtGdiGetFontUnicodeRanges@8 -NtGdiGetWidthTable@28 -NtGdiGradientFill@24 -NtGdiHfontCreate@20 -NtGdiIcmBrushInfo@32 -NtGdiInit@0 -NtGdiInitSpool@0 -NtGdiIntersectClipRect@20 -NtGdiInvertRgn@8 -NtGdiLineTo@12 -NtGdiMakeFontDir@20 -NtGdiMakeInfoDC@8 -NtGdiMaskBlt@52 -NtGdiModifyWorldTransform@12 -NtGdiMonoBitmap@4 -NtGdiMoveTo@16 -NtGdiOffsetClipRgn@12 -NtGdiOffsetRgn@12 -NtGdiOpenDCW@32 -NtGdiPatBlt@24 -NtGdiPolyPatBlt@20 -NtGdiPathToRegion@4 -NtGdiPlgBlt@44 -NtGdiPolyDraw@16 -NtGdiPolyPolyDraw@20 -NtGdiPolyTextOutW@16 -NtGdiPtInRegion@12 -NtGdiPtVisible@12 -NtGdiQueryFonts@12 -NtGdiQueryFontAssocInfo@4 -NtGdiRectangle@20 -NtGdiRectInRegion@8 -NtGdiRectVisible@8 -NtGdiRemoveFontResourceW@24 -NtGdiRemoveFontMemResourceEx@4 -NtGdiResetDC@20 -NtGdiResizePalette@8 -NtGdiRestoreDC@8 -NtGdiRoundRect@28 -NtGdiSaveDC@4 -NtGdiScaleViewportExtEx@24 -NtGdiScaleWindowExtEx@24 -NtGdiSelectBitmap@8 -NtGdiSelectBrush@8 -NtGdiSelectClipPath@8 -NtGdiSelectFont@8 -NtGdiSelectPen@8 -NtGdiSetBitmapAttributes@8 -NtGdiSetBitmapBits@12 -NtGdiSetBitmapDimension@16 -NtGdiSetBoundsRect@12 -NtGdiSetBrushAttributes@8 -NtGdiSetBrushOrg@16 -NtGdiSetColorAdjustment@8 -NtGdiSetColorSpace@8 -NtGdiSetDeviceGammaRamp@8 -NtGdiSetDIBitsToDeviceInternal@64 -NtGdiSetFontEnumeration@4 -NtGdiSetFontXform@12 -NtGdiSetIcmMode@12 -NtGdiSetLinkedUFIs@12 -NtGdiSetMagicColors@12 -NtGdiSetMetaRgn@4 -NtGdiSetMiterLimit@12 -NtGdiGetDeviceWidth@4 -NtGdiMirrorWindowOrg@4 -NtGdiSetLayout@12 -NtGdiSetOPMSigningKeyAndSequenceNumbers@8 -NtGdiSetPixel@16 -NtGdiSetPixelFormat@8 -NtGdiSetRectRgn@20 -NtGdiSetSystemPaletteUse@8 -NtGdiSetTextJustification@12 -NtGdiSetupPublicCFONT@12 -NtGdiSetVirtualResolution@20 -NtGdiSetSizeDevice@12 -NtGdiStartDoc@16 -NtGdiStartPage@4 -NtGdiStretchBlt@48 -NtGdiStretchDIBitsInternal@64 -NtGdiStrokeAndFillPath@4 -NtGdiStrokePath@4 -NtGdiSwapBuffers@4 -NtGdiTransformPoints@20 -NtGdiTransparentBlt@44 -NtGdiUnloadPrinterDriver@8 -NtGdiUnmapMemFont@4 -NtGdiUnrealizeObject@4 -NtGdiUpdateColors@4 -NtGdiWidenPath@4 -NtUserActivateKeyboardLayout@8 -NtUserAddClipboardFormatListener@4 -NtUserAlterWindowStyle@12 -NtUserAssociateInputContext@12 -NtUserAttachThreadInput@12 -NtUserBeginPaint@8 -NtUserBitBltSysBmp@32 -NtUserBlockInput@4 -NtUserBuildHimcList@16 -NtUserBuildHwndList@28 -NtUserBuildNameList@16 -NtUserBuildPropList@16 -NtUserCallHwnd@8 -NtUserCallHwndLock@8 -NtUserCallHwndOpt@8 -NtUserCallHwndParam@12 -NtUserCallHwndParamLock@12 -NtUserCallMsgFilter@8 -NtUserCallNextHookEx@16 -NtUserCallNoParam@4 -NtUserCallOneParam@8 -NtUserCallTwoParam@12 -NtUserChangeClipboardChain@8 -NtUserChangeDisplaySettings@16 -NtUserCheckAccessForIntegrityLevel@12 -NtUserCheckDesktopByThreadId@4 -NtUserCheckWindowThreadDesktop@12 -NtUserCheckImeHotKey@8 -NtUserCheckMenuItem@12 -NtUserChildWindowFromPointEx@16 -NtUserClipCursor@4 -NtUserCloseClipboard@0 -NtUserCloseDesktop@4 -NtUserCloseWindowStation@4 -NtUserConsoleControl@12 -NtUserConvertMemHandle@8 -NtUserCopyAcceleratorTable@12 -NtUserCountClipboardFormats@0 -NtUserCreateAcceleratorTable@8 -NtUserCreateCaret@16 -NtUserCreateDesktopEx@24 -NtUserCreateInputContext@4 -NtUserCreateLocalMemHandle@16 -NtUserCreateWindowEx@60 -NtUserCreateWindowStation@28 -NtUserDdeInitialize@20 -NtUserDeferWindowPos@32 -NtUserDefSetText@8 -NtUserDeleteMenu@12 -NtUserDestroyAcceleratorTable@4 -NtUserDestroyCursor@8 -NtUserDestroyInputContext@4 -NtUserDestroyMenu@4 -NtUserDestroyWindow@4 -NtUserDisableThreadIme@4 -NtUserDispatchMessage@4 -NtUserDoSoundConnect@0 -NtUserDoSoundDisconnect@0 -NtUserDragDetect@12 -NtUserDragObject@20 -NtUserDrawAnimatedRects@16 -NtUserDrawCaption@16 -NtUserDrawCaptionTemp@28 -NtUserDrawIconEx@44 -NtUserDrawMenuBarTemp@20 -NtUserEmptyClipboard@0 -NtUserEnableMenuItem@12 -NtUserEnableScrollBar@12 -NtUserEndDeferWindowPosEx@8 -NtUserEndMenu@0 -NtUserEndPaint@8 -NtUserEnumDisplayDevices@16 -NtUserEnumDisplayMonitors@16 -NtUserEnumDisplaySettings@16 -NtUserEvent@4 -NtUserExcludeUpdateRgn@8 -NtUserFillWindow@16 -NtUserFindExistingCursorIcon@12 -NtUserFindWindowEx@20 -NtUserFlashWindowEx@4 -NtUserFrostCrashedWindow@8 -NtUserGetAltTabInfo@24 -NtUserGetAncestor@8 -NtUserGetAppImeLevel@4 -NtUserGetAsyncKeyState@4 -NtUserGetAtomName@8 -NtUserGetCaretBlinkTime@0 -NtUserGetCaretPos@4 -NtUserGetClassInfoEx@20 -NtUserGetClassName@12 -NtUserGetClipboardData@8 -NtUserGetClipboardFormatName@12 -NtUserGetClipboardOwner@0 -NtUserGetClipboardSequenceNumber@0 -NtUserGetClipboardViewer@0 -NtUserGetClipCursor@4 -NtUserGetComboBoxInfo@8 -NtUserGetControlBrush@12 -NtUserGetControlColor@16 -NtUserGetCPD@12 -NtUserGetCursorFrameInfo@16 -NtUserGetCursorInfo@4 -NtUserGetDC@4 -NtUserGetDCEx@12 -NtUserGetDoubleClickTime@0 -NtUserGetForegroundWindow@0 -NtUserGetGuiResources@8 -NtUserGetGUIThreadInfo@8 -NtUserGetIconInfo@24 -NtUserGetIconSize@16 -NtUserGetImeHotKey@16 -NtUserGetImeInfoEx@8 -NtUserGetInternalWindowPos@12 -NtUserGetKeyboardLayoutList@8 -NtUserGetKeyboardLayoutName@4 -NtUserGetKeyboardState@4 -NtUserGetKeyNameText@12 -NtUserGetKeyState@4 -NtUserGetListBoxInfo@4 -NtUserGetMenuBarInfo@16 -NtUserGetMenuIndex@8 -NtUserGetMenuItemRect@16 -NtUserGetMessage@16 -NtUserGetMouseMovePointsEx@20 -NtUserGetObjectInformation@20 -NtUserGetOpenClipboardWindow@0 -NtUserGetPriorityClipboardFormat@8 -NtUserGetProcessWindowStation@0 -NtUserGetRawInputBuffer@12 -NtUserGetRawInputData@20 -NtUserGetRawInputDeviceInfo@16 -NtUserGetRawInputDeviceList@12 -NtUserGetRegisteredRawInputDevices@12 -NtUserGetScrollBarInfo@12 -NtUserGetSystemMenu@8 -NtUserGetThreadDesktop@8 -NtUserGetThreadState@4 -NtUserGetTitleBarInfo@8 -NtUserGetUpdatedClipboardFormats@12 -NtUserGetUpdateRect@12 -NtUserGetUpdateRgn@12 -NtUserGetWindowDC@4 -NtUserGetWindowPlacement@8 -NtUserGetWOWClass@8 -NtUserGhostWindowFromHungWindow@4 -NtUserHardErrorControl@12 -NtUserHideCaret@4 -NtUserHiliteMenuItem@16 -NtUserHungWindowFromGhostWindow@4 -NtUserImpersonateDdeClientWindow@8 -NtUserInitialize@8 -NtUserInitializeClientPfnArrays@16 -NtUserInitTask@48 -NtUserInternalGetWindowText@12 -NtUserInternalGetWindowIcon@8 -NtUserInvalidateRect@12 -NtUserInvalidateRgn@12 -NtUserIsClipboardFormatAvailable@4 -NtUserKillTimer@8 -NtUserLoadKeyboardLayoutEx@28 -NtUserLockWindowStation@4 -NtUserLockWindowUpdate@4 -NtUserLockWorkStation@0 -NtUserLogicalToPhysicalPoint@8 -NtUserMapVirtualKeyEx@16 -NtUserMenuItemFromPoint@16 -NtUserMessageCall@28 -NtUserMinMaximize@12 -NtUserMNDragLeave@0 -NtUserMNDragOver@8 -NtUserModifyUserStartupInfoFlags@8 -NtUserMoveWindow@24 -NtUserNotifyIMEStatus@12 -NtUserNotifyProcessCreate@16 -NtUserNotifyWinEvent@16 -NtUserOpenClipboard@8 -NtUserOpenDesktop@12 -NtUserOpenInputDesktop@12 -NtUserOpenThreadDesktop@20 -NtUserOpenWindowStation@8 -NtUserPaintDesktop@4 -NtUserPaintMonitor@12 -NtUserPeekMessage@20 -NtUserPhysicalToLogicalPoint@8 -NtUserPostMessage@16 -NtUserPostThreadMessage@16 -NtUserPrintWindow@12 -NtUserProcessConnect@8 -NtUserQueryInformationThread@16 -NtUserQueryInputContext@8 -NtUserQuerySendMessage@4 -NtUserQueryWindow@8 -NtUserRealChildWindowFromPoint@12 -NtUserRealInternalGetMessage@24 -NtUserRealWaitMessageEx@8 -NtUserRedrawWindow@16 -NtUserRegisterClassExWOW@28 -NtUserRegisterErrorReportingDialog@8 -NtUserRegisterUserApiHook@16 -NtUserRegisterHotKey@16 -NtUserRegisterRawInputDevices@12 -NtUserRegisterTasklist@4 -NtUserRegisterWindowMessage@4 -NtUserRemoveClipboardFormatListener@4 -NtUserRemoveMenu@12 -NtUserRemoveProp@8 -NtUserResolveDesktop@16 -NtUserResolveDesktopForWOW@4 -NtUserSBGetParms@16 -NtUserScrollDC@28 -NtUserScrollWindowEx@32 -NtUserSelectPalette@12 -NtUserSendInput@12 -NtUserSetActiveWindow@4 -NtUserSetAppImeLevel@8 -NtUserSetCapture@4 -NtUserSetClassLong@16 -NtUserSetClassWord@12 -NtUserSetClipboardData@12 -NtUserSetClipboardViewer@4 -NtUserSetConsoleReserveKeys@8 -NtUserSetCursor@4 -NtUserSetCursorContents@8 -NtUserSetCursorIconData@16 -NtUserSetFocus@4 -NtUserSetImeHotKey@20 -NtUserSetImeInfoEx@4 -NtUserSetImeOwnerWindow@8 -NtUserSetInformationProcess@16 -NtUserSetInformationThread@16 -NtUserSetInternalWindowPos@16 -NtUserSetKeyboardState@4 -NtUserSetMenu@12 -NtUserSetMenuContextHelpId@8 -NtUserSetMenuDefaultItem@12 -NtUserSetMenuFlagRtoL@4 -NtUserSetObjectInformation@16 -NtUserSetParent@8 -NtUserSetProcessWindowStation@4 -NtUserGetProp@8 -NtUserSetProp@12 -NtUserSetScrollInfo@16 -NtUserSetShellWindowEx@8 -NtUserSetSysColors@16 -NtUserSetSystemCursor@8 -NtUserSetSystemMenu@8 -NtUserSetSystemTimer@12 -NtUserSetThreadDesktop@4 -NtUserSetThreadLayoutHandles@8 -NtUserSetThreadState@8 -NtUserSetTimer@16 -NtUserSetProcessDPIAware@0 -NtUserSetWindowFNID@8 -NtUserSetWindowLong@16 -NtUserSetWindowPlacement@8 -NtUserSetWindowPos@28 -NtUserSetWindowRgn@12 -NtUserGetWindowRgnEx@12 -NtUserSetWindowRgnEx@12 -NtUserSetWindowsHookAW@12 -NtUserSetWindowsHookEx@24 -NtUserSetWindowStationUser@16 -NtUserSetWindowWord@12 -NtUserSetWinEventHook@32 -NtUserShowCaret@4 -NtUserShowScrollBar@12 -NtUserShowWindow@8 -NtUserShowWindowAsync@8 -NtUserSoundSentry@0 -NtUserSwitchDesktop@8 -NtUserSystemParametersInfo@16 -NtUserTestForInteractiveUser@4 -NtUserThunkedMenuInfo@8 -NtUserThunkedMenuItemInfo@24 -NtUserToUnicodeEx@28 -NtUserTrackMouseEvent@4 -NtUserTrackPopupMenuEx@24 -NtUserCalcMenuBar@20 -NtUserPaintMenuBar@24 -NtUserTranslateAccelerator@12 -NtUserTranslateMessage@8 -NtUserUnhookWindowsHookEx@4 -NtUserUnhookWinEvent@4 -NtUserUnloadKeyboardLayout@4 -NtUserUnlockWindowStation@4 -NtUserUnregisterClass@12 -NtUserUnregisterUserApiHook@0 -NtUserUnregisterHotKey@8 -NtUserUpdateInputContext@12 -NtUserUpdateInstance@12 -NtUserUpdateLayeredWindow@40 -NtUserGetLayeredWindowAttributes@16 -NtUserSetLayeredWindowAttributes@16 -NtUserUpdatePerUserSystemParameters@4 -NtUserUserHandleGrantAccess@12 -NtUserValidateHandleSecure@4 -NtUserValidateRect@8 -NtUserValidateTimerCallback@4 -NtUserVkKeyScanEx@12 -NtUserWaitForInputIdle@12 -NtUserWaitForMsgAndEvent@4 -NtUserWaitMessage@0 -NtUserWin32PoolAllocationStats@24 -NtUserWindowFromPhysicalPoint@8 -NtUserWindowFromPoint@8 -NtUserYieldTask@0 -NtUserRemoteConnect@12 -NtUserRemoteRedrawRectangle@16 -NtUserRemoteRedrawScreen@0 -NtUserRemoteStopScreenUpdates@0 -NtUserCtxDisplayIOCtl@12 -NtUserRegisterSessionPort@4 -NtUserUnregisterSessionPort@0 -NtUserUpdateWindowTransform@12 -NtUserDwmStartRedirection@4 -NtUserDwmStopRedirection@0 -NtUserDwmHintDxUpdate@8 -NtUserDwmGetDxRgn@12 -NtUserGetWindowMinimizeRect@8 -NtGdiEngAssociateSurface@12 -NtGdiEngCreateBitmap@24 -NtGdiEngCreateDeviceSurface@16 -NtGdiEngCreateDeviceBitmap@16 -NtGdiEngCreatePalette@24 -NtGdiEngComputeGlyphSet@12 -NtGdiEngCopyBits@24 -NtGdiEngDeletePalette@4 -NtGdiEngDeleteSurface@4 -NtGdiEngEraseSurface@12 -NtGdiEngUnlockSurface@4 -NtGdiEngLockSurface@4 -NtGdiEngBitBlt@44 -NtGdiEngStretchBlt@44 -NtGdiEngPlgBlt@44 -NtGdiEngMarkBandingSurface@4 -NtGdiEngStrokePath@32 -NtGdiEngFillPath@28 -NtGdiEngStrokeAndFillPath@40 -NtGdiEngPaint@20 -NtGdiEngLineTo@36 -NtGdiEngAlphaBlend@28 -NtGdiEngGradientFill@40 -NtGdiEngTransparentBlt@32 -NtGdiEngTextOut@40 -NtGdiEngStretchBltROP@52 -NtGdiXLATEOBJ_cGetPalette@16 -NtGdiXLATEOBJ_iXlate@8 -NtGdiXLATEOBJ_hGetColorTransform@4 -NtGdiCLIPOBJ_bEnum@12 -NtGdiCLIPOBJ_cEnumStart@20 -NtGdiCLIPOBJ_ppoGetPath@4 -NtGdiEngDeletePath@4 -NtGdiEngCreateClip@0 -NtGdiEngDeleteClip@4 -NtGdiBRUSHOBJ_ulGetBrushColor@4 -NtGdiBRUSHOBJ_pvAllocRbrush@8 -NtGdiBRUSHOBJ_pvGetRbrush@4 -NtGdiBRUSHOBJ_hGetColorTransform@4 -NtGdiXFORMOBJ_bApplyXform@20 -NtGdiXFORMOBJ_iGetXform@8 -NtGdiFONTOBJ_vGetInfo@12 -NtGdiFONTOBJ_pxoGetXform@4 -NtGdiFONTOBJ_cGetGlyphs@20 -NtGdiFONTOBJ_pifi@4 -NtGdiFONTOBJ_pfdg@4 -NtGdiFONTOBJ_pQueryGlyphAttrs@8 -NtGdiFONTOBJ_pvTrueTypeFontFile@8 -NtGdiFONTOBJ_cGetAllGlyphHandles@8 -NtGdiSTROBJ_bEnum@12 -NtGdiSTROBJ_bEnumPositionsOnly@12 -NtGdiSTROBJ_bGetAdvanceWidths@16 -NtGdiSTROBJ_vEnumStart@4 -NtGdiSTROBJ_dwGetCodePage@4 -NtGdiPATHOBJ_vGetBounds@8 -NtGdiPATHOBJ_bEnum@8 -NtGdiPATHOBJ_vEnumStart@4 -NtGdiPATHOBJ_vEnumStartClipLines@16 -NtGdiPATHOBJ_bEnumClipLines@12 -NtGdiGetDhpdev@4 -NtGdiEngCheckAbort@4 -NtGdiHT_Get8BPPFormatPalette@16 -NtGdiHT_Get8BPPMaskPalette@24 -NtGdiUpdateTransform@4 -NtGdiSetPUMPDOBJ@16 -NtGdiBRUSHOBJ_DeleteRbrush@8 -NtGdiUMPDEngFreeUserMem@4 -NtGdiDrawStream@12 -NtGdiDwmGetDirtyRgn@20 -NtGdiDwmGetSurfaceData@8 -NtGdiDdDDICreateAllocation@4 -NtGdiDdDDIQueryResourceInfo@4 -NtGdiDdDDIOpenResource@4 -NtGdiDdDDIDestroyAllocation@4 -NtGdiDdDDISetAllocationPriority@4 -NtGdiDdDDIQueryAllocationResidency@4 -NtGdiDdDDICreateDevice@4 -NtGdiDdDDIDestroyDevice@4 -NtGdiDdDDICreateContext@4 -NtGdiDdDDIDestroyContext@4 -NtGdiDdDDICreateSynchronizationObject@4 -NtGdiDdDDIDestroySynchronizationObject@4 -NtGdiDdDDIWaitForSynchronizationObject@4 -NtGdiDdDDISignalSynchronizationObject@4 -NtGdiDdDDIGetRuntimeData@4 -NtGdiDdDDIQueryAdapterInfo@4 -NtGdiDdDDILock@4 -NtGdiDdDDIUnlock@4 -NtGdiDdDDIGetDisplayModeList@4 -NtGdiDdDDISetDisplayMode@4 -NtGdiDdDDIGetMultisampleMethodList@4 -NtGdiDdDDIPresent@4 -NtGdiDdDDIRender@4 -NtGdiDdDDIOpenAdapterFromDeviceName@4 -NtGdiDdDDIOpenAdapterFromHdc@4 -NtGdiDdDDICloseAdapter@4 -NtGdiDdDDIGetSharedPrimaryHandle@4 -NtGdiDdDDIEscape@4 -NtGdiDdDDIQueryStatistics@4 -NtGdiDdDDISetVidPnSourceOwner@4 -NtGdiDdDDIGetPresentHistory@4 -NtGdiDdDDICreateOverlay@4 -NtGdiDdDDIUpdateOverlay@4 -NtGdiDdDDIFlipOverlay@4 -NtGdiDdDDIDestroyOverlay@4 -NtGdiDdDDIWaitForVerticalBlankEvent@4 -NtGdiDdDDISetGammaRamp@4 -NtGdiDdDDIGetDeviceState@4 -NtGdiDdDDICreateDCFromMemory@4 -NtGdiDdDDIDestroyDCFromMemory@4 -NtGdiDdDDISetContextSchedulingPriority@4 -NtGdiDdDDIGetContextSchedulingPriority@4 -NtGdiDdDDISetProcessSchedulingPriorityClass@8 -NtGdiDdDDIGetProcessSchedulingPriorityClass@8 -NtGdiDdDDIReleaseProcessVidPnSourceOwners@4 -NtGdiDdDDIGetScanLine@4 -NtGdiDdDDISetQueuedLimit@4 -NtGdiDdDDIPollDisplayChildren@4 -NtGdiDdDDIInvalidateActiveVidPn@4 -NtGdiDdDDICheckOcclusion@4 -NtGdiDdDDIWaitForIdle@4 -NtGdiDdDDICheckMonitorPowerState@4 -NtGdiDdDDICheckExclusiveOwnership@0 -NtGdiDdDDISetDisplayPrivateDriverFormat@4 -NtGdiDdDDISharedPrimaryLockNotification@4 -NtGdiDdDDISharedPrimaryUnLockNotification@4 -NtGdiMakeObjectXferable@8 -NtGdiMakeObjectUnXferable@4 -NtGdiGetNumberOfPhysicalMonitors@8 -NtGdiGetPhysicalMonitors@16 -NtGdiGetPhysicalMonitorDescription@12 -NtGdiDestroyPhysicalMonitor@4 -NtGdiDDCCIGetVCPFeature@20 -NtGdiDDCCISetVCPFeature@12 -NtGdiDDCCISaveCurrentSettings@4 -NtGdiDDCCIGetCapabilitiesStringLength@8 -NtGdiDDCCIGetCapabilitiesString@12 -NtGdiDDCCIGetTimingReport@8 -NtUserSetMirrorRendering@8 -NtUserShowSystemCursor@4

1 year, 2 months

[reactos] 01/01: [USETUP][SHELL32][ACCESS] Improve Portuguese (pt-PT) Translation (#5897)

by Jose Carlos Jesus

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=357189bdea315fee4d29f… commit 357189bdea315fee4d29f381b7f50bf53f69d1f0 Author: Jose Carlos Jesus <zecarlos1957(a)hotmail.com> AuthorDate: Mon Nov 13 05:59:05 2023 -0400 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Nov 13 10:59:05 2023 +0100 [USETUP][SHELL32][ACCESS] Improve Portuguese (pt-PT) Translation (#5897) --- base/setup/usetup/lang/pt-PT.h | 28 ++++++++++++++-------------- dll/cpl/access/lang/pt-PT.rc | 4 ++-- dll/win32/shell32/lang/pt-PT.rc | 4 ++-- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/base/setup/usetup/lang/pt-PT.h b/base/setup/usetup/lang/pt-PT.h index 62deb60c0fe..45422f564e7 100644 --- a/base/setup/usetup/lang/pt-PT.h +++ b/base/setup/usetup/lang/pt-PT.h @@ -1127,7 +1127,7 @@ static MUI_ENTRY ptPTChangeSystemPartition[] = { 0, 0, - "ENTER = Continue ESC = Cancel", + "ENTER = Continuar ESC = Cancelar", TEXT_TYPE_STATUS | TEXT_PADDING_BIG, TEXT_ID_STATIC }, @@ -1432,7 +1432,7 @@ static MUI_ENTRY ptPTBootLoaderSelectPageEntries[] = { 6, 8, - "Please select where Setup should install the bootloader:", + "Por favor seleccione onde o instalador dever\240 instalar o gestor de arranque:", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -2021,17 +2021,17 @@ MUI_ERROR ptPTErrorEntries[] = }, { // ERROR_INVALID_CABINET_INF, - "O ficheiro cab n\306o cont\202m um ficheiro inf v\240lido.\n", + "O arquivo cab n\306o cont\202m um ficheiro inf v\240lido.\n", "ENTER=Reiniciar" }, { // ERROR_CABINET_MISSING, - "N\306o foi poss\241vel encontrar o ficheiro cab.\n", + "N\306o foi poss\241vel encontrar o arquivo cab.\n", "ENTER=Reiniciar" }, { // ERROR_CABINET_SCRIPT, - "O ficheiro cab n\306o cont\202m um script de instala\207\306o.\n", + "O arquivo cab n\306o cont\202m um script de instala\207\306o.\n", "ENTER=Reiniciar" }, { @@ -2255,7 +2255,7 @@ MUI_STRING ptPTStrings[] = {STRING_PLEASEWAIT, " Por favor, aguarde..."}, {STRING_INSTALLCREATEPARTITION, - " ENTER = Instalar C = Criar Prim\240ria E = Criar Estendida F3 = Sair"}, + " ENTER = Instalar Criar parti\207\306o C = Prim\240ria E = Estendida F3 = Sair"}, {STRING_INSTALLCREATELOGICAL, " ENTER = Instalar C = Criar parti\207\306o L\242gica F3 = Sair"}, {STRING_INSTALLDELETEPARTITION, @@ -2294,15 +2294,15 @@ MUI_STRING ptPTStrings[] = {STRING_REBOOTCOMPUTER, "ENTER=Reiniciar"}, {STRING_DELETING, - " A apagar arquivo: %S"}, + " A apagar o ficheiro: %S"}, {STRING_MOVING, - " A mover arquivo: %S to: %S"}, + " A mover o ficheiro: %S para: %S"}, {STRING_RENAMING, - " A renomear arquivo: %S to: %S"}, + " A renomear o ficheiro: %S para: %S"}, {STRING_COPYING, - " A Copiar arquivo: %S"}, + " A Copiar o ficheiro: %S"}, {STRING_SETUPCOPYINGFILES, - "O instalador est\240 a copiar os arquivos..."}, + "O instalador est\240 a copiar os ficheiros..."}, {STRING_REGHIVEUPDATE, " A actualizar a estrutura do registo..."}, {STRING_IMPORTFILE, @@ -2332,11 +2332,11 @@ MUI_STRING ptPTStrings[] = {STRING_CHECKINGDISK, "O instalador est\240 a verificar o disco..."}, {STRING_FORMATDISK1, - " Formatar a parti\207\306o utilizando o sistema de arquivos %S (R\240pido) "}, + " Formatar a parti\207\306o utilizando o sistema de ficheiros %S (R\240pido) "}, {STRING_FORMATDISK2, - " Formatar a parti\207\306o utilizando o sistema de arquivos %S "}, + " Formatar a parti\207\306o utilizando o sistema de ficheiros %S "}, {STRING_KEEPFORMAT, - " Manter o sistema de arquivos actual (sem altera\207\344es) "}, + " Manter o sistema de ficheiros actual (sem altera\207\344es) "}, {STRING_HDDISK1, "%s."}, {STRING_HDDISK2, diff --git a/dll/cpl/access/lang/pt-PT.rc b/dll/cpl/access/lang/pt-PT.rc index 30500d18ff2..d7838e75ffe 100644 --- a/dll/cpl/access/lang/pt-PT.rc +++ b/dll/cpl/access/lang/pt-PT.rc @@ -1,4 +1,4 @@ -LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE IDD_PROPPAGEKEYBOARD DIALOGEX 0, 0, 246, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION @@ -96,7 +96,7 @@ BEGIN AUTOCHECKBOX "Emitir um &som ao activar ou desactivar um recurso", IDC_NOTIFICATION_SOUND, 12, 90, 222, 14 GROUPBOX "Dispositivos ""Teclas série""", -1, 6, 115, 234, 47 - LTEXT "Os dispositivos ""Teclas série"" permitem o acesso alternativo aos recursos de teclado e do rato.", + LTEXT "Os dispositivos ""Teclas série"" permitem o acesso alternativo aos recursos do teclado e do rato.", -1, 12, 124, 222, 20 AUTOCHECKBOX "&Utilizar as ""Teclas série""", IDC_SERIAL_BOX, 12, 142, 126, 14 PUSHBUTTON "&Definições", IDC_SERIAL_BUTTON, 144, 142, 90, 14 diff --git a/dll/win32/shell32/lang/pt-PT.rc b/dll/win32/shell32/lang/pt-PT.rc index 35a71da2a44..9100e619ede 100644 --- a/dll/win32/shell32/lang/pt-PT.rc +++ b/dll/win32/shell32/lang/pt-PT.rc @@ -1,4 +1,4 @@ -LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_PORTUGAL +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE MENU_001 MENUEX BEGIN @@ -888,7 +888,7 @@ BEGIN IDS_NETWORKPLACE "Os Meus Locais na Rede" IDS_NEWFOLDER "Nova Pasta" - IDS_NEWITEMFORMAT "New %s" + IDS_NEWITEMFORMAT "Novo %s" IDS_DRIVE_FIXED "Disco Local" IDS_DRIVE_CDROM "CD Drive"

1 year, 2 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs