Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [SHELL32] Pass correct lParam to DFM_INVOKECOMMAND (#6765)
by Whindmar Saksit 22 Aug '24

22 Aug '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3b73d62eaacb9f3d988b0… commit 3b73d62eaacb9f3d988b0ce058b501a529db3193 Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Thu Aug 22 21:04:48 2024 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Aug 22 21:04:48 2024 +0200 [SHELL32] Pass correct lParam to DFM_INVOKECOMMAND (#6765) --- dll/win32/shell32/CDefaultContextMenu.cpp | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/dll/win32/shell32/CDefaultContextMenu.cpp b/dll/win32/shell32/CDefaultContextMenu.cpp index 751958da3f8..9bc9c97ab68 100644 --- a/dll/win32/shell32/CDefaultContextMenu.cpp +++ b/dll/win32/shell32/CDefaultContextMenu.cpp @@ -157,6 +157,7 @@ class CDefaultContextMenu : WCHAR m_DefVerbs[MAX_PATH]; HRESULT _DoCallback(UINT uMsg, WPARAM wParam, LPVOID lParam); + HRESULT _DoInvokeCommandCallback(LPCMINVOKECOMMANDINFOEX lpcmi, WPARAM CmdId); 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); @@ -1053,7 +1054,7 @@ HRESULT CDefaultContextMenu::DoProperties( LPCMINVOKECOMMANDINFOEX lpcmi) { - HRESULT hr = _DoCallback(DFM_INVOKECOMMAND, DFM_CMD_PROPERTIES, NULL); + HRESULT hr = _DoInvokeCommandCallback(lpcmi, DFM_CMD_PROPERTIES); // We are asked to run the default property sheet if (hr == S_FALSE) @@ -1458,6 +1459,29 @@ CDefaultContextMenu::InvokeRegVerb( return S_OK; } +HRESULT +CDefaultContextMenu::_DoInvokeCommandCallback( + LPCMINVOKECOMMANDINFOEX lpcmi, WPARAM CmdId) +{ + BOOL Unicode = IsUnicode(*lpcmi); + WCHAR lParamBuf[MAX_PATH]; + LPARAM lParam = 0; + + if (Unicode && lpcmi->lpParametersW) + lParam = (LPARAM)lpcmi->lpParametersW; + else if (lpcmi->lpParameters) + lParam = SHAnsiToUnicode(lpcmi->lpParameters, lParamBuf, _countof(lParamBuf)) ? (LPARAM)lParamBuf : 0; + + HRESULT hr; +#if 0 // TODO: Try DFM_INVOKECOMMANDEX first. + DFMICS dfmics = { sizeof(DFMICS), lpcmi->fMask, lParam, m_iIdSCMFirst?, m_iIdDfltLast?, (LPCMINVOKECOMMANDINFO)lpcmi, m_site }; + hr = _DoCallback(DFM_INVOKECOMMANDEX, CmdId, &dfmics); + if (hr == E_NOTIMPL) +#endif + hr = _DoCallback(DFM_INVOKECOMMAND, CmdId, (void*)lParam); + return hr; +} + HRESULT WINAPI CDefaultContextMenu::InvokeCommand( @@ -1498,7 +1522,7 @@ CDefaultContextMenu::InvokeCommand( if (m_iIdCBFirst != m_iIdCBLast && CmdId >= m_iIdCBFirst && CmdId < m_iIdCBLast) { - Result = _DoCallback(DFM_INVOKECOMMAND, CmdId - m_iIdCBFirst, NULL); + Result = _DoInvokeCommandCallback(&LocalInvokeInfo, CmdId - m_iIdCBFirst); return Result; }

1 0

[reactos] 02/02: [SETUPLIB] SetupCreateDirectory(): Don't assume the form of the directory prefix (#7257)
by Hermès Bélusca-Maïto 22 Aug '24

22 Aug '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ea5728b5f3238038e3165… commit ea5728b5f3238038e31654eddea44b393d267c30 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Aug 7 22:31:01 2024 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Aug 22 20:40:35 2024 +0200 [SETUPLIB] SetupCreateDirectory(): Don't assume the form of the directory prefix (#7257) Addendum to commit 32e6eed760 (r63715) CORE-5982 The function assumed that the directory path name to be created always starts with a harddisk-partition root device name of the form: \Device\HarddiskX\PartitionY\ Indeed, it can be (when using the volume manager) of the form: \Device\HarddiskVolumeN\ and could even have a different format if trying to install ReactOS on an external removable drive or other weird device. Since the format of this prefix is not 100% always the same, a different way to create the sub-directories is needed. The nested-directory creation algorithm is changed as follows: Suppose that the directory to be created is: \Device\HarddiskVolume1\ReactOS\system32\drivers The function first loops backwards each path component in order to find the deepest existing sub-directory: it will try to verify whether each of the following sub-directories exist, successively: \Device\HarddiskVolume1\ReactOS\system32\drivers \Device\HarddiskVolume1\ReactOS\system32\ \Device\HarddiskVolume1\ReactOS\ \Device\HarddiskVolume1\ (Notice the trailing path separators kept in this step.) In principle, this root device FS directory must exist (since the volume has been formatted previously). Once found, the function will then create each of the sub-directories in turn: \Device\HarddiskVolume1\ReactOS \Device\HarddiskVolume1\ReactOS\system32 \Device\HarddiskVolume1\ReactOS\system32\drivers ---- An alternative to the fix could be to always specify the root device name in a separate parameter, but this hasn't been pursued here so as to not modify all the callers of this function. --- base/setup/lib/utils/filesup.c | 149 +++++++++++++++++++++-------------------- base/setup/lib/utils/filesup.h | 14 ++-- 2 files changed, 88 insertions(+), 75 deletions(-) diff --git a/base/setup/lib/utils/filesup.c b/base/setup/lib/utils/filesup.c index 5ddd641be34..81da91faa12 100644 --- a/base/setup/lib/utils/filesup.c +++ b/base/setup/lib/utils/filesup.c @@ -27,27 +27,24 @@ static NTSTATUS SetupCreateSingleDirectory( - IN PCWSTR DirectoryName) + _In_ PCUNICODE_STRING DirectoryName) { + NTSTATUS Status; + UNICODE_STRING PathName = *DirectoryName; OBJECT_ATTRIBUTES ObjectAttributes; IO_STATUS_BLOCK IoStatusBlock; - UNICODE_STRING PathName; HANDLE DirectoryHandle; - NTSTATUS Status; - - if (!RtlCreateUnicodeString(&PathName, DirectoryName)) - return STATUS_NO_MEMORY; - if (PathName.Length > sizeof(WCHAR) && - PathName.Buffer[PathName.Length / sizeof(WCHAR) - 1] == L'\\') + /* Remove the trailing separator if needed */ + if (PathName.Length >= 2 * sizeof(WCHAR) && + PathName.Buffer[PathName.Length / sizeof(WCHAR) - 1] == OBJ_NAME_PATH_SEPARATOR) { PathName.Length -= sizeof(WCHAR); - PathName.Buffer[PathName.Length / sizeof(WCHAR)] = UNICODE_NULL; } InitializeObjectAttributes(&ObjectAttributes, &PathName, - OBJ_CASE_INSENSITIVE | OBJ_INHERIT, + OBJ_CASE_INSENSITIVE, NULL, NULL); @@ -63,79 +60,80 @@ SetupCreateSingleDirectory( NULL, 0); if (NT_SUCCESS(Status)) - { NtClose(DirectoryHandle); - } - - RtlFreeUnicodeString(&PathName); return Status; } +/** + * @brief + * Create a new directory, specified by the given path. + * Any intermediate non-existing directory is created as well. + * + * @param[in] PathName + * The path of the directory to be created. + * + * @return An NTSTATUS code indicating success or failure. + **/ NTSTATUS SetupCreateDirectory( - IN PCWSTR PathName) + _In_ PCWSTR PathName) { NTSTATUS Status = STATUS_SUCCESS; - PWCHAR PathBuffer = NULL; - PWCHAR Ptr, EndPtr; - ULONG BackslashCount; - ULONG Size; - - Size = (wcslen(PathName) + 1) * sizeof(WCHAR); - PathBuffer = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, Size); - if (PathBuffer == NULL) - return STATUS_INSUFFICIENT_RESOURCES; + UNICODE_STRING PathNameU; + PCWSTR Buffer; + PCWCH Ptr, End; - wcscpy(PathBuffer, PathName); - EndPtr = PathBuffer + wcslen(PathName); + RtlInitUnicodeString(&PathNameU, PathName); + Buffer = PathNameU.Buffer; + End = Buffer + (PathNameU.Length / sizeof(WCHAR)); - Ptr = PathBuffer; - - /* Skip the '\Device\HarddiskX\PartitionY\ part */ - BackslashCount = 0; - while (Ptr < EndPtr && BackslashCount < 4) + /* Find the deepest existing sub-directory: start from the + * end and go back, verifying each sub-directory in turn */ + for (Ptr = End; Ptr > Buffer;) { - if (*Ptr == L'\\') - BackslashCount++; - - Ptr++; + BOOLEAN bExists; + + /* If we are on a separator, truncate at the next character. + * The trailing separator is kept for the existence check. */ + if ((Ptr < End) && (*Ptr == OBJ_NAME_PATH_SEPARATOR)) + PathNameU.Length = (ULONG_PTR)(Ptr+1) - (ULONG_PTR)Buffer; + + /* Check if the sub-directory exists and stop + * if so: this is the deepest existing one */ + DPRINT("PathName: %wZ\n", &PathNameU); + bExists = DoesPathExist_UStr(NULL, &PathNameU, TRUE); + if (bExists) + break; + + /* Skip back any consecutive path separators */ + while ((Ptr > Buffer) && (*Ptr == OBJ_NAME_PATH_SEPARATOR)) + --Ptr; + /* Go to the beginning of the path component, stop at the separator */ + while ((Ptr > Buffer) && (*Ptr != OBJ_NAME_PATH_SEPARATOR)) + --Ptr; } - while (Ptr < EndPtr) - { - if (*Ptr == L'\\') - { - *Ptr = 0; - - DPRINT("PathBuffer: %S\n", PathBuffer); - if (!DoesDirExist(NULL, PathBuffer)) - { - DPRINT("Create: %S\n", PathBuffer); - Status = SetupCreateSingleDirectory(PathBuffer); - if (!NT_SUCCESS(Status)) - goto done; - } - - *Ptr = L'\\'; - } + /* Skip any consecutive path separators */ + while ((Ptr < End) && (*Ptr == OBJ_NAME_PATH_SEPARATOR)) + ++Ptr; - Ptr++; - } - - if (!DoesDirExist(NULL, PathBuffer)) + /* Create all the remaining sub-directories */ + for (; Ptr < End; ++Ptr) { - DPRINT("Create: %S\n", PathBuffer); - Status = SetupCreateSingleDirectory(PathBuffer); + /* Go to the end of the current path component, stop at + * the separator or terminating NUL and truncate it */ + while ((Ptr < End) && (*Ptr != OBJ_NAME_PATH_SEPARATOR)) + ++Ptr; + PathNameU.Length = (ULONG_PTR)Ptr - (ULONG_PTR)Buffer; + + DPRINT("Create: %wZ\n", &PathNameU); + Status = SetupCreateSingleDirectory(&PathNameU); if (!NT_SUCCESS(Status)) - goto done; + break; } -done: DPRINT("Done.\n"); - if (PathBuffer != NULL) - RtlFreeHeap(RtlGetProcessHeap(), 0, PathBuffer); - return Status; } @@ -694,20 +692,18 @@ CombinePaths( } BOOLEAN -DoesPathExist( - IN HANDLE RootDirectory OPTIONAL, - IN PCWSTR PathName, - IN BOOLEAN IsDirectory) +DoesPathExist_UStr( + _In_opt_ HANDLE RootDirectory, + _In_ PCUNICODE_STRING PathName, + _In_ BOOLEAN IsDirectory) { NTSTATUS Status; - UNICODE_STRING Name; HANDLE FileHandle; OBJECT_ATTRIBUTES ObjectAttributes; IO_STATUS_BLOCK IoStatusBlock; - RtlInitUnicodeString(&Name, PathName); InitializeObjectAttributes(&ObjectAttributes, - &Name, + (PUNICODE_STRING)PathName, OBJ_CASE_INSENSITIVE, RootDirectory, NULL); @@ -729,12 +725,23 @@ DoesPathExist( { DPRINT("Failed to open %s '%wZ', Status 0x%08lx\n", IsDirectory ? "directory" : "file", - &Name, Status); + PathName, Status); } return NT_SUCCESS(Status); } +BOOLEAN +DoesPathExist( + _In_opt_ HANDLE RootDirectory, + _In_ PCWSTR PathName, + _In_ BOOLEAN IsDirectory) +{ + UNICODE_STRING PathNameU; + RtlInitUnicodeString(&PathNameU, PathName); + return DoesPathExist_UStr(RootDirectory, &PathNameU, IsDirectory); +} + // FIXME: DEPRECATED! HACKish function that needs to be deprecated! BOOLEAN DoesFileExist_2( diff --git a/base/setup/lib/utils/filesup.h b/base/setup/lib/utils/filesup.h index 2962819b53f..03de9235c0f 100644 --- a/base/setup/lib/utils/filesup.h +++ b/base/setup/lib/utils/filesup.h @@ -10,7 +10,7 @@ NTSTATUS SetupCreateDirectory( - IN PCWSTR DirectoryName); + _In_ PCWSTR PathName); NTSTATUS SetupDeleteFile( @@ -65,11 +65,17 @@ CombinePaths( IN ULONG NumberOfPathComponents, IN /* PCWSTR */ ...); +BOOLEAN +DoesPathExist_UStr( + _In_opt_ HANDLE RootDirectory, + _In_ PCUNICODE_STRING PathName, + _In_ BOOLEAN IsDirectory); + BOOLEAN DoesPathExist( - IN HANDLE RootDirectory OPTIONAL, - IN PCWSTR PathName, - IN BOOLEAN IsDirectory); + _In_opt_ HANDLE RootDirectory, + _In_ PCWSTR PathName, + _In_ BOOLEAN IsDirectory); #define DoesDirExist(RootDirectory, DirName) \ DoesPathExist((RootDirectory), (DirName), TRUE)

1 0

[reactos] 01/02: [SETUPLIB] SetupCreateSingleDirectory(): Remove '\.' trailing sequence handling hack
by Hermès Bélusca-Maïto 22 Aug '24

22 Aug '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=00ddae49d54ae74ae7e18… commit 00ddae49d54ae74ae7e1858b9f51a9b58d455c4c Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Aug 22 18:07:18 2024 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Aug 22 20:40:34 2024 +0200 [SETUPLIB] SetupCreateSingleDirectory(): Remove '\.' trailing sequence handling hack It was introduced in commit 703eb5e8c9 (r7756) in order to hack around the "dot"-path added in the reactos.dff generator file by the earlier commit 3bd689f185 (r7269). Its aim was to describe the installation directory itself, instead of one of its sub-directories. That _invalid_ "dot"-path was removed later by commit 027e2bfa3a (r15423); however the '\.' hack stayed for quite a while in our code. The correct way to describe the installation directory itself is to use instead "\", compatible with Windows' setup, as was originally done in txtsetup.sif, and fixed in reactos.dff(.in) in commit 97bb83fcd9 (r66604). --- base/setup/lib/utils/filesup.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/base/setup/lib/utils/filesup.c b/base/setup/lib/utils/filesup.c index 0ecf3fdcc32..5ddd641be34 100644 --- a/base/setup/lib/utils/filesup.c +++ b/base/setup/lib/utils/filesup.c @@ -38,14 +38,6 @@ SetupCreateSingleDirectory( if (!RtlCreateUnicodeString(&PathName, DirectoryName)) return STATUS_NO_MEMORY; - if (PathName.Length > sizeof(WCHAR) && - PathName.Buffer[PathName.Length / sizeof(WCHAR) - 2] == L'\\' && - PathName.Buffer[PathName.Length / sizeof(WCHAR) - 1] == L'.') - { - PathName.Length -= sizeof(WCHAR); - PathName.Buffer[PathName.Length / sizeof(WCHAR)] = UNICODE_NULL; - } - if (PathName.Length > sizeof(WCHAR) && PathName.Buffer[PathName.Length / sizeof(WCHAR) - 1] == L'\\') {

1 0

[reactos] 01/01: [SHELL32] CDefaultContextMenu must forward the .lnk path (#7264)
by Whindmar Saksit 22 Aug '24

22 Aug '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d009de44adaaf3a281b0a… commit d009de44adaaf3a281b0ae35b699a42c1673323e Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Thu Aug 22 14:34:22 2024 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Aug 22 14:34:22 2024 +0200 [SHELL32] CDefaultContextMenu must forward the .lnk path (#7264) Forward the .lnk path (if any) so consrv gets STARTF_TITLEISLINKNAME and can apply console properties and icon from the shortcut. --- dll/win32/shell32/CDefaultContextMenu.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dll/win32/shell32/CDefaultContextMenu.cpp b/dll/win32/shell32/CDefaultContextMenu.cpp index ed2e95bb1c7..751958da3f8 100644 --- a/dll/win32/shell32/CDefaultContextMenu.cpp +++ b/dll/win32/shell32/CDefaultContextMenu.cpp @@ -1357,6 +1357,9 @@ CDefaultContextMenu::InvokePidl(LPCMINVOKECOMMANDINFOEX lpcmi, LPCITEMIDLIST pid else if (!StrIsNullOrEmpty(lpcmi->lpParameters) && __SHCloneStrAtoW(&pszParamsW, lpcmi->lpParameters)) sei.lpParameters = pszParamsW; + if (!sei.lpClass && (lpcmi->fMask & (CMIC_MASK_HASLINKNAME | CMIC_MASK_HASTITLE)) && unicode) + sei.lpClass = lpcmi->lpTitleW; // Forward .lnk path from CShellLink::DoOpen (for consrv STARTF_TITLEISLINKNAME) + ShellExecuteExW(&sei); ILFree(pidlFull);

1 0

[reactos] 01/01: [CMAKE] Use COMPILE_OPTIONS instead of superseded COMPILE_FLAGS
by Serge Gautherie 21 Aug '24

21 Aug '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=44662eaf621860d0cf9da… commit 44662eaf621860d0cf9da1b55b3a1a14e1ba0010 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Mon Jun 3 17:52:29 2024 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Wed Aug 21 11:34:48 2024 +0300 [CMAKE] Use COMPILE_OPTIONS instead of superseded COMPILE_FLAGS for set_source_files_properties(). --- boot/freeldr/freeldr/pcat.cmake | 2 +- dll/directx/wine/ddraw/CMakeLists.txt | 2 +- dll/opengl/glu32/CMakeLists.txt | 2 +- dll/win32/kernel32/CMakeLists.txt | 6 +++--- dll/win32/windowscodecs/CMakeLists.txt | 2 +- drivers/wdm/audio/drivers/CMIDriver/cmicontrol/CMakeLists.txt | 2 +- modules/rostests/apitests/ntdll/CMakeLists.txt | 2 +- modules/rostests/apitests/rtl/CMakeLists.txt | 2 +- sdk/lib/rtl/CMakeLists.txt | 2 +- win32ss/user/winsrv/consrv.cmake | 4 ++-- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/boot/freeldr/freeldr/pcat.cmake b/boot/freeldr/freeldr/pcat.cmake index 177d5a3adba..0a9c96cdee5 100644 --- a/boot/freeldr/freeldr/pcat.cmake +++ b/boot/freeldr/freeldr/pcat.cmake @@ -82,7 +82,7 @@ if(ARCH STREQUAL "i386") arch/i386/xbox/xboxvideo.c) if(NOT MSVC) # Prevent a warning when doing a memcmp with address 0 - set_source_files_properties(arch/i386/xbox/xboxmem.c PROPERTIES COMPILE_FLAGS "-Wno-nonnull") + set_source_files_properties(arch/i386/xbox/xboxmem.c PROPERTIES COMPILE_OPTIONS "-Wno-nonnull") endif() elseif(SARCH STREQUAL "pc98") diff --git a/dll/directx/wine/ddraw/CMakeLists.txt b/dll/directx/wine/ddraw/CMakeLists.txt index 4ac3ca28690..824633ebff0 100644 --- a/dll/directx/wine/ddraw/CMakeLists.txt +++ b/dll/directx/wine/ddraw/CMakeLists.txt @@ -27,7 +27,7 @@ list(APPEND SOURCE if(MSVC) # FIXME: http://www.cmake.org/Bug/view.php?id=12998 #target_compile_options(ddraw PRIVATE "/FIwine/typeof.h") - set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "/FIwine/typeof.h") + set_source_files_properties(${SOURCE} PROPERTIES COMPILE_OPTIONS "/FIwine/typeof.h") endif() add_library(ddraw MODULE diff --git a/dll/opengl/glu32/CMakeLists.txt b/dll/opengl/glu32/CMakeLists.txt index 76ace8871bf..f60619510b6 100644 --- a/dll/opengl/glu32/CMakeLists.txt +++ b/dll/opengl/glu32/CMakeLists.txt @@ -124,7 +124,7 @@ if(CMAKE_C_COMPILER_ID STREQUAL "GNU") target_compile_options(glu32 PRIVATE -Wno-write-strings) target_compile_options(glu32 PRIVATE -Wno-unused-but-set-variable) # Prevent a warning when comparing 'this' against 0 - set_source_files_properties(src/libnurbs/internals/arc.cc PROPERTIES COMPILE_FLAGS "-Wno-nonnull-compare") + set_source_files_properties(src/libnurbs/internals/arc.cc PROPERTIES COMPILE_OPTIONS "-Wno-nonnull-compare") endif() if(CMAKE_C_COMPILER_ID STREQUAL "Clang") diff --git a/dll/win32/kernel32/CMakeLists.txt b/dll/win32/kernel32/CMakeLists.txt index ba56d1ffeee..4661ef9b0cb 100644 --- a/dll/win32/kernel32/CMakeLists.txt +++ b/dll/win32/kernel32/CMakeLists.txt @@ -94,13 +94,13 @@ list(APPEND SOURCE if(MSVC) # Disable warning C4146: unary minus operator applied to unsigned type, result still unsigned - set_source_files_properties(wine/res.c PROPERTIES COMPILE_FLAGS /wd4146) + set_source_files_properties(wine/res.c PROPERTIES COMPILE_OPTIONS "/wd4146") # Disable warning C4267: 'initializing': conversion from 'size_t' to 'DWORD', possible loss of data - set_source_files_properties(winnls/string/locale.c PROPERTIES COMPILE_FLAGS /wd4267) + set_source_files_properties(winnls/string/locale.c PROPERTIES COMPILE_OPTIONS "/wd4267") else() # Disable warning: 'variable' defined but not used - set_source_files_properties(winnls/string/locale.c PROPERTIES COMPILE_FLAGS -Wno-unused-variable) + set_source_files_properties(winnls/string/locale.c PROPERTIES COMPILE_OPTIONS "-Wno-unused-variable") endif() if(ARCH STREQUAL "i386") diff --git a/dll/win32/windowscodecs/CMakeLists.txt b/dll/win32/windowscodecs/CMakeLists.txt index d4fc4b281b2..ee7ff716e3b 100644 --- a/dll/win32/windowscodecs/CMakeLists.txt +++ b/dll/win32/windowscodecs/CMakeLists.txt @@ -52,7 +52,7 @@ if(MSVC) if(ARCH STREQUAL "i386") list(APPEND SOURCE msvc-thiscall.c) endif() - set_source_files_properties(bitmap.c PROPERTIES COMPILE_FLAGS "/FImsvc.h") + set_source_files_properties(bitmap.c PROPERTIES COMPILE_OPTIONS "/FImsvc.h") list(APPEND PCH_SKIP_SOURCE bitmap.c) else() list(APPEND SOURCE bitmap.c) diff --git a/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/CMakeLists.txt b/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/CMakeLists.txt index 61cf0185783..30700176df0 100644 --- a/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/CMakeLists.txt +++ b/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/CMakeLists.txt @@ -4,7 +4,7 @@ include_directories(..) add_executable(cmicontrol main.cpp window.rc) if(NOT MSVC) - set_source_files_properties(main.cpp PROPERTIES COMPILE_FLAGS "-Wno-write-strings") + set_source_files_properties(main.cpp PROPERTIES COMPILE_OPTIONS "-Wno-write-strings") endif() add_dependencies(cmicontrol psdk) diff --git a/modules/rostests/apitests/ntdll/CMakeLists.txt b/modules/rostests/apitests/ntdll/CMakeLists.txt index 9b3b4b1ddc1..6f956813680 100644 --- a/modules/rostests/apitests/ntdll/CMakeLists.txt +++ b/modules/rostests/apitests/ntdll/CMakeLists.txt @@ -137,7 +137,7 @@ add_pch(ntdll_apitest precomp.h "${PCH_SKIP_SOURCE}") add_dependencies(ntdll_apitest load_notifications) if(NOT MSVC) - set_source_files_properties(RtlGetFullPathName_UstrEx.c PROPERTIES COMPILE_FLAGS "-Wno-format") + set_source_files_properties(RtlGetFullPathName_UstrEx.c PROPERTIES COMPILE_OPTIONS "-Wno-format") endif() add_rostests_file(TARGET ntdll_apitest) diff --git a/modules/rostests/apitests/rtl/CMakeLists.txt b/modules/rostests/apitests/rtl/CMakeLists.txt index 887a5eddd71..1eb33d0e7c7 100644 --- a/modules/rostests/apitests/rtl/CMakeLists.txt +++ b/modules/rostests/apitests/rtl/CMakeLists.txt @@ -37,7 +37,7 @@ target_compile_definitions(rtl_test_lib PRIVATE _RTL_TEST _NTSYSTEM_) add_dependencies(rtl_test_lib asm) if(NOT MSVC) - set_source_files_properties(RtlGetFullPathName_UstrEx.c PROPERTIES COMPILE_FLAGS "-Wno-format") + set_source_files_properties(RtlGetFullPathName_UstrEx.c PROPERTIES COMPILE_OPTIONS "-Wno-format") endif() # RTL tests with static linkage (called unittest, so it won't run in rosautotest) diff --git a/sdk/lib/rtl/CMakeLists.txt b/sdk/lib/rtl/CMakeLists.txt index 28321a868e9..a37e1ab9407 100644 --- a/sdk/lib/rtl/CMakeLists.txt +++ b/sdk/lib/rtl/CMakeLists.txt @@ -18,7 +18,7 @@ list(APPEND RTL_WINE_SOURCE if(MSVC) # Silence warning C4267: 'initializing': conversion from 'size_t' to 'const int', possible loss of data - set_source_files_properties(${RTL_WINE_SOURCE} PROPERTIES COMPILE_FLAGS /wd4267) + set_source_files_properties(${RTL_WINE_SOURCE} PROPERTIES COMPILE_OPTIONS "/wd4267") endif() list(APPEND SOURCE diff --git a/win32ss/user/winsrv/consrv.cmake b/win32ss/user/winsrv/consrv.cmake index dd4b6da03c2..116333c40fc 100644 --- a/win32ss/user/winsrv/consrv.cmake +++ b/win32ss/user/winsrv/consrv.cmake @@ -46,10 +46,10 @@ list(APPEND CONSRV_SOURCE if(MSVC) ## NOTE: No need to specify it as we use MSVC :) ##target_compile_options(consrv PRIVATE "/Ze") - #set_source_files_properties(${CONSRV_SOURCE} PROPERTIES COMPILE_FLAGS "/Ze") + #set_source_files_properties(${CONSRV_SOURCE} PROPERTIES COMPILE_OPTIONS "/Ze") else() #target_compile_options(consrv PRIVATE "-fms-extensions") - set_source_files_properties(${CONSRV_SOURCE} PROPERTIES COMPILE_FLAGS "-fms-extensions") + set_source_files_properties(${CONSRV_SOURCE} PROPERTIES COMPILE_OPTIONS "-fms-extensions") endif() add_library(consrv ${CONSRV_SOURCE})

1 0

[reactos] 01/01: [TRANSLATION] Improve Italian (it-IT) translation part 2 (#7248)
by Gabriele Lo Re 20 Aug '24

20 Aug '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fbcbbd8768b8a3dda9013… commit fbcbbd8768b8a3dda9013dfe3553867176c521b1 Author: Gabriele Lo Re <gabrolr70(a)gmail.com> AuthorDate: Wed Aug 21 01:29:34 2024 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Aug 21 01:29:34 2024 +0200 [TRANSLATION] Improve Italian (it-IT) translation part 2 (#7248) --- base/applications/games/winmine/lang/it-IT.rc | 2 +- base/applications/magnify/lang/it-IT.rc | 12 +-- base/applications/mspaint/lang/it-IT.rc | 109 +++++++++++++------------- base/applications/notepad/lang/it-IT.rc | 16 ++-- base/applications/taskmgr/lang/it-IT.rc | 58 +++++++------- base/system/winlogon/lang/it-IT.rc | 4 +- dll/cpl/desk/lang/it-IT.rc | 6 +- dll/cpl/main/lang/it-IT.rc | 6 +- dll/win32/browseui/lang/it-IT.rc | 2 +- win32ss/user/user32/lang/it-IT.rc | 2 +- 10 files changed, 109 insertions(+), 108 deletions(-) diff --git a/base/applications/games/winmine/lang/it-IT.rc b/base/applications/games/winmine/lang/it-IT.rc index b8145476e32..a143184e35d 100644 --- a/base/applications/games/winmine/lang/it-IT.rc +++ b/base/applications/games/winmine/lang/it-IT.rc @@ -14,7 +14,7 @@ BEGIN MENUITEM "&Nuovo\tF2", IDM_NEW MENUITEM SEPARATOR MENUITEM "&Contrassegna domanda", IDM_MARKQ - MENUITEM "Sound", IDM_SOUND + MENUITEM "Suono", IDM_SOUND MENUITEM SEPARATOR MENUITEM "&Principiante", IDM_BEGINNER MENUITEM "&Avanzato", IDM_ADVANCED diff --git a/base/applications/magnify/lang/it-IT.rc b/base/applications/magnify/lang/it-IT.rc index d203b9fea3a..392cd0464bf 100644 --- a/base/applications/magnify/lang/it-IT.rc +++ b/base/applications/magnify/lang/it-IT.rc @@ -7,7 +7,7 @@ BEGIN MENUITEM "E&sci", IDM_EXIT MENUITEM "&Opzioni", IDM_OPTIONS MENUITEM SEPARATOR - MENUITEM "&Informazioni su Magnifier", IDM_ABOUT + MENUITEM "&Informazioni su Lente d'ingrandimento", IDM_ABOUT END END @@ -19,18 +19,18 @@ END IDD_ABOUTBOX DIALOGEX 22, 17, 220, 75 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_CAPTION | WS_SYSMENU -CAPTION "Informazioni Magnifier" +CAPTION "Informazioni su Lente d'ingrandimento" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_ICON, IDC_MYICON, 14, 9, 20, 20 - LTEXT "Magnifier Versione 1.0", IDC_STATIC, 49, 10, 119, 8, SS_NOPREFIX + LTEXT "Lente d'ingrandimento Versione 1.0", IDC_STATIC, 49, 10, 119, 8, SS_NOPREFIX LTEXT "Copyright (C) 2007 Marc Piulachs (marc.piulachs(a)codexchange.net)", IDC_STATIC, 48, 24, 125, 22 PUSHBUTTON "OK", IDOK, 162, 48, 50, 14 END IDD_DIALOGOPTIONS DIALOGEX 0, 0, 153, 182 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Impostazioni di Magnifier" +CAPTION "Impostazioni di Lente d'ingrandimento" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "Uscita", IDOK, 96, 161, 50, 14 @@ -55,12 +55,12 @@ END IDD_WARNINGDIALOG DIALOGEX 0, 0, 250, 97 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION -CAPTION "ReactOS Magnifier" +CAPTION "Lente d'ingrandimento ReactOS" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "OK", IDOK, 193, 76, 50, 14 ICON IDI_ICON, IDC_STATIC, 7, 17, 20, 20 - LTEXT "Magnifier é stato realizzato per fornire un livello minimo di funzionalità agli utenti affetti da problemi visivi. La maggior parte di questi utenti avrà bisogno di un programma di utilità dotato di maggiori funzioni per l'uso quotidiano.", IDC_STATIC, 36, 7, 207, 33 + LTEXT "Lente d'ingrandimento é stato realizzato per fornire un livello minimo di funzionalità agli utenti affetti da problemi visivi. La maggior parte di questi utenti avrà bisogno di un programma di utilità dotato di maggiori funzioni per l'uso quotidiano.", IDC_STATIC, 36, 7, 207, 33 CONTROL "Non mostrare più questo messaggio", IDC_SHOWWARNINGCHECK, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 43, 80, 137, 10 END diff --git a/base/applications/mspaint/lang/it-IT.rc b/base/applications/mspaint/lang/it-IT.rc index ba56d939c18..d48250a1882 100644 --- a/base/applications/mspaint/lang/it-IT.rc +++ b/base/applications/mspaint/lang/it-IT.rc @@ -4,6 +4,7 @@ * PURPOSE: Italian resource file * TRANSLATORS: Copyright 2009 Gabriel Ilardi <gabrielilardi(a)hotmail.it> * Copyright 2009-2010 Paolo Devoti <devotip(a)tiscali.it> + * Copyright 2024 Gabriele Lo Re <gabrolr70(a)gmail.com> */ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL @@ -14,26 +15,26 @@ ID_MENU MENU BEGIN POPUP "&File" BEGIN - MENUITEM "Nuovo\tCtrl+N", IDM_FILENEW - MENUITEM "Apri...\tCtrl+F12", IDM_FILEOPEN - MENUITEM "Salva\tMaiusc+F12", IDM_FILESAVE - MENUITEM "Sal&va con nome...", IDM_FILESAVEAS + MENUITEM "&Nuovo\tCtrl+N", IDM_FILENEW + MENUITEM "&Apri...\tCtrl+F12", IDM_FILEOPEN + MENUITEM "&Salva\tMaiusc+F12", IDM_FILESAVE + MENUITEM "Sa&lva con nome...", IDM_FILESAVEAS MENUITEM SEPARATOR - MENUITEM "From Scanner or Camera...", IDM_FILEFROMSCANNERORCAMERA + MENUITEM "Da Scanner o &fotocamera...", IDM_FILEFROMSCANNERORCAMERA MENUITEM SEPARATOR - MENUITEM "Page View", IDM_FILEPAGEVIEW - MENUITEM "Page Setup...", IDM_FILEPAGESETUP - MENUITEM "Print...\tCtrl+P", IDM_FILEPRINT + MENUITEM "Anteprima &di stampa", IDM_FILEPAGEVIEW + MENUITEM "&Imposta pagina...", IDM_FILEPAGESETUP + MENUITEM "S&tampa...\tCtrl+P", IDM_FILEPRINT MENUITEM SEPARATOR - MENUITEM "Send...", IDM_FILESEND + MENUITEM "In&via...", IDM_FILESEND MENUITEM SEPARATOR MENUITEM "Imposta come sfondo (normale)", IDM_FILEASWALLPAPERPLANE - MENUITEM "Imposta come sfondo (centrata)", IDM_FILEASWALLPAPERCENTERED - MENUITEM "Imposta come sfondo (estesa)", IDM_FILEASWALLPAPERSTRETCHED + MENUITEM "Imp&osta come sfondo (centrato)", IDM_FILEASWALLPAPERCENTERED + MENUITEM "Imposta come sfondo (esteso)", IDM_FILEASWALLPAPERSTRETCHED MENUITEM SEPARATOR - MENUITEM "Most recently used file", IDM_FILEMOSTRECENTLYUSEDFILE, GRAYED + MENUITEM "File recenti", IDM_FILEMOSTRECENTLYUSEDFILE, GRAYED MENUITEM SEPARATOR - MENUITEM "E&sci\tAlt+F4", IDM_FILEEXIT + MENUITEM "&Esci\tAlt+F4", IDM_FILEEXIT END POPUP "&Modifica" BEGIN @@ -44,22 +45,22 @@ BEGIN MENUITEM "&Copia\tCtrl+C", IDM_EDITCOPY MENUITEM "I&ncolla\tCtrl+V", IDM_EDITPASTE MENUITEM SEPARATOR - MENUITEM "Crop &selection", IDM_CROPSELECTION - MENUITEM "Cance&lla area selezionata\tCanc", IDM_EDITDELETESELECTION + MENUITEM "Ritaglia s&elezione", IDM_CROPSELECTION + MENUITEM "Cancella area sele&zionata\tCanc", IDM_EDITDELETESELECTION MENUITEM "&Inverte selezione", IDM_EDITINVERTSELECTION - MENUITEM "Sele&ziona tutto\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "&Seleziona tutto\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "Copia &su...", IDM_EDITCOPYTO + MENUITEM "C&opia in...", IDM_EDITCOPYTO MENUITEM "Incolla &da...", IDM_EDITPASTEFROM END POPUP "&Visualizza" BEGIN - MENUITEM "Casella degli strumenti\tCtrl+T", IDM_VIEWTOOLBOX, CHECKED - MENUITEM "Tavolozza\tCtrl+L", IDM_VIEWCOLORPALETTE, CHECKED - MENUITEM "Barra di stato", IDM_VIEWSTATUSBAR, CHECKED - MENUITEM "Barra degli strumenti di testo", IDM_FORMATICONBAR, CHECKED, GRAYED + MENUITEM "&Casella degli strumenti\tCtrl+T", IDM_VIEWTOOLBOX, CHECKED + MENUITEM "Tav&olozza\tCtrl+L", IDM_VIEWCOLORPALETTE, CHECKED + MENUITEM "Barra di s&tato", IDM_VIEWSTATUSBAR, CHECKED + MENUITEM "B&arra degli strumenti di testo", IDM_FORMATICONBAR, CHECKED, GRAYED MENUITEM SEPARATOR - POPUP "Zoom" + POPUP "&Zoom" BEGIN POPUP "User defined" BEGIN @@ -73,32 +74,32 @@ BEGIN END MENUITEM SEPARATOR MENUITEM "Mostra griglia\tCtrl+G", IDM_VIEWSHOWGRID - MENUITEM "Mostra miniature", IDM_VIEWSHOWMINIATURE + MENUITEM "Mostra anteprima", IDM_VIEWSHOWMINIATURE END MENUITEM "Visualizza a schermo intero\tCtrl+F", IDM_VIEWFULLSCREEN END POPUP "&Immagine" BEGIN - MENUITEM "Ca&povolgi/ruota...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Capovolgi/ruota...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Allunga/Inclina...\tCtrl+W", IDM_IMAGESTRETCHSKEW MENUITEM "&Ritaglia", IDM_IMAGECROP MENUITEM "&Inverti colori\tCtrl+I", IDM_IMAGEINVERTCOLORS - MENUITEM "&Attributi...\tCtrl+E", IDM_IMAGEATTRIBUTES - MENUITEM "&Cancella immagine\tCtrl+Maiusc+N", IDM_IMAGEDELETEIMAGE + MENUITEM "A&ttributi...\tCtrl+E", IDM_IMAGEATTRIBUTES + MENUITEM "Ca&ncella immagine\tCtrl+Maiusc+N", IDM_IMAGEDELETEIMAGE MENUITEM "&Opaco", IDM_IMAGEDRAWOPAQUE END POPUP "&Colori" BEGIN - MENUITEM "Modifica colori...", IDM_COLORSEDITPALETTE + MENUITEM "&Modifica colori...", IDM_COLORSEDITPALETTE MENUITEM SEPARATOR - MENUITEM "Modern palette", IDM_COLORSMODERNPALETTE + MENUITEM "Tavolozza moderna", IDM_COLORSMODERNPALETTE MENUITEM "Old palette", IDM_COLORSOLDPALETTE END POPUP "&Aiuto" BEGIN - MENUITEM "Guida in linea", IDM_HELPHELPTOPICS + MENUITEM "&Guida in linea", IDM_HELPHELPTOPICS MENUITEM SEPARATOR - MENUITEM "Informazioni", IDM_HELPINFO + MENUITEM "&Informazioni su Paint", IDM_HELPINFO END END @@ -108,17 +109,17 @@ BEGIN BEGIN MENUITEM "&Taglia\tCtrl+X", IDM_EDITCUT MENUITEM "&Copia\tCtrl+C", IDM_EDITCOPY - MENUITEM "I&ncolla\tCtrl+V", IDM_EDITPASTE + MENUITEM "&Incolla\tCtrl+V", IDM_EDITPASTE MENUITEM SEPARATOR - MENUITEM "Crop &selection", IDM_CROPSELECTION - MENUITEM "Cance&lla area selezionata\tCanc", IDM_EDITDELETESELECTION - MENUITEM "Sele&ziona tutto\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "Ritaglia s&elezione", IDM_CROPSELECTION + MENUITEM "Cancella area sele&zionata\tCanc", IDM_EDITDELETESELECTION + MENUITEM "&Seleziona tutto\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "Copia &su...", IDM_EDITCOPYTO + MENUITEM "C&opia in...", IDM_EDITCOPYTO MENUITEM "Incolla &da...", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Ca&povolgi/ruota...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "S&tretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Capovolgi/ruota...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Allunga/Inclina...\tCtrl+W", IDM_IMAGESTRETCHSKEW MENUITEM "&Inverti colori\tCtrl+I", IDM_IMAGEINVERTCOLORS END END @@ -196,9 +197,9 @@ END IDD_STRETCHSKEW DIALOGEX 100, 100, 225, 150 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" -CAPTION "Stretch and skew image" +CAPTION "Allunga e inclina l'immagine" BEGIN - GROUPBOX "Stretch", IDD_STRETCHSKEWGROUPSTRETCH, 6, 6, 158, 66 + GROUPBOX "Allunga", IDD_STRETCHSKEWGROUPSTRETCH, 6, 6, 158, 66 ICON IDI_HORZSTRETCH, IDD_STRETCHSKEWICONHSTRETCH, 12, 18, 32, 32 LTEXT "Orizzontalmente:", IDD_STRETCHSKEWTEXTHSTRETCH, 45, 24, 40, 10 EDITTEXT IDD_STRETCHSKEWEDITHSTRETCH, 90, 23, 32, 12 @@ -207,7 +208,7 @@ BEGIN LTEXT "Verticalmente:", IDD_STRETCHSKEWTEXTVSTRETCH, 45, 49, 40, 10 EDITTEXT IDD_STRETCHSKEWEDITVSTRETCH, 90, 48, 32, 12 LTEXT "%", IDD_STRETCHSKEWTEXTVPERCENT, 125, 49, 15, 10 - GROUPBOX "Skew", IDD_STRETCHSKEWGROUPSKEW, 6, 76, 158, 66 + GROUPBOX "Inclina", IDD_STRETCHSKEWGROUPSKEW, 6, 76, 158, 66 ICON IDI_HORZSKEW, IDD_STRETCHSKEWICONHSKEW, 12, 88, 32, 32 LTEXT "Orizzontalmente:", IDD_STRETCHSKEWTEXTHSKEW, 45, 94, 40, 10 EDITTEXT IDD_STRETCHSKEWEDITHSKEW, 90, 93, 32, 12 @@ -236,8 +237,8 @@ BEGIN IDS_PROGRAMNAME "Paint" IDS_WINDOWTITLE "%s - Paint" IDS_INFOTITLE "Paint per ReactOS" - IDS_INFOTEXT "Available under the GNU Lesser General Public License (LGPL, see www.gnu.org)" - IDS_SAVEPROMPTTEXT "Volete salvare le modifiche a %s?" + IDS_INFOTEXT "Disponibile sotto licenza GNU Lesser General Public (LGPL, vedi www.gnu.org)" + IDS_SAVEPROMPTTEXT "Si vuole salvare le modifiche a %s?" IDS_DEFAULTFILENAME "SenzaNome" IDS_MINIATURETITLE "Miniature" IDS_TOOLTIP1 "Selezione libera" @@ -256,21 +257,21 @@ BEGIN IDS_TOOLTIP14 "Poligono" IDS_TOOLTIP15 "Ellisse" IDS_TOOLTIP16 "Rettangolo arrotondato" - IDS_ALLFILES "All Files" - IDS_ALLPICTUREFILES "All Picture Files" + IDS_ALLFILES "Tutti i file" + IDS_ALLPICTUREFILES "Tutti i file immagine" IDS_FILESIZE "%d bytes" IDS_INTNUMBERS "Si prega di inserire solo numeri interi!" IDS_PERCENTAGE "La percentuale deve essere compresa tra 1 e 500." IDS_ANGLE "L'angolo deve essere compreso tra -89 e 89." IDS_LOADERRORTEXT "l file %s non può essere caricato." - IDS_ENLARGEPROMPTTEXT "The image in the clipboard is larger than the bitmap.\nWould you like the bitmap enlarged?" - IDS_BOLD "Bold" - IDS_ITALIC "Italic" - IDS_UNDERLINE "Underline" - IDS_VERTICAL "Vertical" + IDS_ENLARGEPROMPTTEXT "L'immagine negli appunti è più grande della tela.\La si vuole allargare?" + IDS_BOLD "Grossivo" + IDS_ITALIC "Italico" + IDS_UNDERLINE "Sottolineato" + IDS_VERTICAL "Verticale" IDS_PRINTRES "%d x %d pixel/cm" - IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." - IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" - IDS_CANTSENDMAIL "Failed to send a mail." - IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" + IDS_CANTPASTE "Impossibile incollare dagli appunti. Il formato dati è incorretto o non supportato." + IDS_SAVEERROR "Impossibile salvare la bitmap nel file:\n\n%s" + IDS_CANTSENDMAIL "Impossibile inviare l'email." + IDS_LOSECOLOR "Le informazioni sul colore saranno perse con quest'operazione. Sei sicuro di procedere?" END diff --git a/base/applications/notepad/lang/it-IT.rc b/base/applications/notepad/lang/it-IT.rc index 50eb30337bf..195ab007b93 100644 --- a/base/applications/notepad/lang/it-IT.rc +++ b/base/applications/notepad/lang/it-IT.rc @@ -25,7 +25,7 @@ BEGIN POPUP "&File" BEGIN MENUITEM "&Nuovo\tCtrl+N", CMD_NEW - MENUITEM "New &Window\tCtrl+Shift+N", CMD_NEW_WINDOW + MENUITEM "Nuova &finestra\tCtrl+Shift+N", CMD_NEW_WINDOW MENUITEM "&Apri...\tCtrl+O", CMD_OPEN MENUITEM "&Salva\tCtrl+S", CMD_SAVE MENUITEM "Sal&va con nome...", CMD_SAVE_AS @@ -65,7 +65,7 @@ BEGIN BEGIN MENUITEM "&Guida in linea", CMD_HELP_CONTENTS MENUITEM SEPARATOR - MENUITEM "&About Notepad", CMD_HELP_ABOUT_NOTEPAD + MENUITEM "Informazioni &su Blocco note", CMD_HELP_ABOUT_NOTEPAD END END @@ -135,7 +135,7 @@ CAPTION "Now printing" STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" BEGIN - CTEXT "Print job is starting...", IDC_PRINTING_STATUS, 5, 10, 150, 15 + CTEXT "Inizio stampa...", IDC_PRINTING_STATUS, 5, 10, 150, 15 CTEXT "(Filename)", IDC_PRINTING_FILENAME, 5, 35, 150, 15 CTEXT "Pagina %u", IDC_PRINTING_PAGE, 5, 55, 150, 15 PUSHBUTTON "Annulla", IDCANCEL, 50, 75, 60, 20 @@ -169,19 +169,19 @@ di memoria libera." STRING_UNICODE "Unicode" STRING_UNICODE_BE "Unicode (big endian)" STRING_UTF8 "UTF-8" - STRING_UTF8_BOM "UTF-8 with BOM" + STRING_UTF8_BOM "UTF-8 con BOM" STRING_CRLF "Windows (CR + LF)" STRING_LF "Unix (LF)" STRING_CR "Mac (CR)" STRING_LINE_COLUMN "Linea %d, colonna %d" STRING_PRINTERROR "Impossibile stampare il file '%s'.\n\nControllare che la stampante sia accesa e impostata correttamente." STRING_DEFAULTFONT "Lucida Console" - STRING_LINE_NUMBER_OUT_OF_RANGE "The specified line number is out of range." - STRING_NOWPRINTING "Now printing page..." + STRING_LINE_NUMBER_OUT_OF_RANGE "Numero di riga maggiore del numero totale di righe." + STRING_NOWPRINTING "Stampa in corso della pagina..." STRING_PRINTCANCELING "The print job is being canceled..." STRING_PRINTCOMPLETE "Printing is successfully done." - STRING_PRINTCANCELED "Printing has been canceled." - STRING_PRINTFAILED "Printing failed." + STRING_PRINTCANCELED "La stampa è stata annullata." + STRING_PRINTFAILED "Stampa fallita." STRING_TEXT_DOCUMENT "Documento di testo" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/taskmgr/lang/it-IT.rc b/base/applications/taskmgr/lang/it-IT.rc index cd21fbb829d..1f19afe96ec 100644 --- a/base/applications/taskmgr/lang/it-IT.rc +++ b/base/applications/taskmgr/lang/it-IT.rc @@ -48,19 +48,19 @@ BEGIN END POPUP "Sh&ut Down" BEGIN - MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY - MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE - MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF - MENUITEM "&Restart", ID_SHUTDOWN_REBOOT - MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF - MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "&Sospendi", ID_SHUTDOWN_STANDBY + MENUITEM "&Iberna", ID_SHUTDOWN_HIBERNATE + MENUITEM "&Arresta", ID_SHUTDOWN_POWEROFF + MENUITEM "&Riavvia", ID_SHUTDOWN_REBOOT + MENUITEM "&Disconetti %s", ID_SHUTDOWN_LOGOFF + MENUITEM "&Cambia utente\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER - MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "Chi&udi sessione", ID_SHUTDOWN_DISCONNECT, GRAYED MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "&Aiuto" BEGIN - MENUITEM "Task Manager &Help Topics", ID_HELP_TOPICS + MENUITEM "G&uida in linea di Task Manager", ID_HELP_TOPICS MENUITEM SEPARATOR MENUITEM "&Informazioni su Task Manager", ID_HELP_ABOUT END @@ -324,10 +324,10 @@ BEGIN ID_OPTIONS_ALWAYSONTOP "Task Manager rimane di fronte a ogni altra finestra a meno che sia minimizzato" ID_OPTIONS_MINIMIZEONUSE "Task Manager è minimizzato quando viene eseguita una operazione PassaA" ID_OPTIONS_HIDEWHENMINIMIZED "Nasconde Task Manager Quando è minimizzato" - ID_VIEW_REFRESH "Costringe Task Manager a effettuare un aggiornamneto, indipendentemente dalla frequenza di aggiornamento impostata" - ID_VIEW_LARGE "Visualizza i task usando icone grandi" - ID_VIEW_SMALL "Visualizza i task usando icone piccole" - ID_VIEW_DETAILS "Visualizza le informazioni di ogni task" + ID_VIEW_REFRESH "Costringe Task Manager a effettuare un aggiornamento, indipendentemente dalla frequenza di aggiornamento impostata" + ID_VIEW_LARGE "Visualizza i processi usando icone grandi" + ID_VIEW_SMALL "Visualizza i processi usando icone piccole" + ID_VIEW_DETAILS "Visualizza le informazioni di ogni processo" ID_VIEW_UPDATESPEED_HIGH "Aggiorna lo schermo due volte al secondo" ID_VIEW_UPDATESPEED_NORMAL "Aggiorna lo schermo ogni due secondi" ID_VIEW_UPDATESPEED_LOW "Aggiorna lo schermo ogni quattro secondi" @@ -343,20 +343,20 @@ BEGIN ID_WINDOWS_CASCADE "Sovrappone diagonalmente le finestre sul desktop" ID_WINDOWS_BRINGTOFRONT "Porta la finestra in vista ma senza attivarla" ID_HELP_TOPICS "Visualizza gli aiuti di Task Manager" - ID_HELP_ABOUT "Visualizza le informazioni sul program, version e copyright" + ID_HELP_ABOUT "Visualizza le informazioni sul programma, versione e copyright" ID_FILE_EXIT "Esce da Task Manager" - ID_OPTIONS_SHOW16BITTASKS "Mostra i task a 16-bit con ntvdm.exe associato" + ID_OPTIONS_SHOW16BITTASKS "Mostra i processi a 16-bit con ntvdm.exe associato" ID_VIEW_SELECTCOLUMNS "Seleziona quali colonne saranno visibili nella pagina dei processi" ID_VIEW_SHOWKERNELTIMES "Mostra il tempo di kernel nel grafico delle prestazioni" ID_VIEW_CPUHISTORY_ONEGRAPHALL "Un singolo grafico mostra l'uso di cpu totale" ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU "Ogni CPU ha il suo grafico" - ID_APPLICATION_PAGE_SWITCHTO "Porta un task in vista e gli dà il focus" + ID_APPLICATION_PAGE_SWITCHTO "Porta un processo in vista e gli dà il focus" END STRINGTABLE BEGIN - ID_ENDTASK "Richiede la chiusura del task selezionato" - ID_GOTOPROCESS "Porta il focus al task selezionato" + ID_ENDTASK "Richiede la chiusura del processo selezionato" + ID_GOTOPROCESS "Porta il focus al processo selezionato" ID_RESTORE "Ripristina Task Manager dallo stato nascosto" ID_PROCESS_PAGE_ENDPROCESS "Rimuove il processo dal sistema" ID_PROCESS_PAGE_ENDPROCESSTREE "Rimuove il processo e i suoi discendenti dal sistema" @@ -368,8 +368,8 @@ BEGIN ID_PROCESS_PAGE_SETPRIORITY_NORMAL "Assegna al processo la classe di priorità NORMAL" ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL "Assegna al processo la classe di priorità BELOW NORMAL" ID_PROCESS_PAGE_SETPRIORITY_LOW "Assegna al processo la classe di priorità LOW" - ID_PROCESS_PAGE_PROPERTIES "Shows process file properties" - ID_PROCESS_PAGE_OPENFILELOCATION "Opens process file location" + ID_PROCESS_PAGE_PROPERTIES "Mostra proprietà file del processo" + ID_PROCESS_PAGE_OPENFILELOCATION "Apri posizione processo" END STRINGTABLE @@ -377,7 +377,7 @@ BEGIN IDS_TAB_APPS "Applicazioni" IDS_TAB_PROCESSES "Processi" IDS_TAB_PERFORMANCE "Prestazioni" - IDS_TAB_TASK "Task" + IDS_TAB_TASK "Processo" IDS_TAB_STATUS "Stato" IDS_TAB_IMAGENAME "Nome immagine" IDS_TAB_PID "PID" @@ -398,12 +398,12 @@ BEGIN IDS_TAB_THREADS "Threads" IDS_TAB_USERPBJECTS "Oggetti USER" IDS_TAB_GDIOBJECTS "Oggetti GDI" - IDS_TAB_IOREADS "I/O Letture" - IDS_TAB_IOWRITES "I/O Scritture" - IDS_TAB_IOOTHER "I/O Altro" - IDS_TAB_IOREADBYTES "I/O Letture Bytes" - IDS_TAB_IOWRITESBYTES "I/O Scritture Bytes" - IDS_TAB_IOOTHERBYTES "I/O Altro Bytes" + IDS_TAB_IOREADS "Letture I/O" + IDS_TAB_IOWRITES "Scritture I/O" + IDS_TAB_IOOTHER "Altro I/O" + IDS_TAB_IOREADBYTES "Letture Bytes I/O" + IDS_TAB_IOWRITESBYTES "Scritture Bytes I/O " + IDS_TAB_IOOTHERBYTES "Altro Bytes I/O " IDS_TAB_COMMANDLINE "Linea di comando" IDS_MENU_SELECTCOLUMNS "&Selezione Colonne..." IDS_MENU_16BITTASK "&Mostra task 16-bit" @@ -413,9 +413,9 @@ BEGIN IDS_MENU_DETAILS "&Dettagli" IDS_MENU_ONEGRAPHALLCPUS "&Un grafico, tutte le CPU" IDS_MENU_ONEGRAPHPERCPU "Un grafico &Per CPU" - IDS_MENU_CPUHISTORY "&CPU History" + IDS_MENU_CPUHISTORY "Storia &CPU" IDS_MENU_SHOWKERNELTIMES "&Mostra tempo di Kernel" - IDS_CREATENEWTASK "Create Nuovo Task" + IDS_CREATENEWTASK "Crea nuovo processo" IDS_CREATENEWTASK_DESC "Scrivi il nome di un programma, Cartella, documento o risorsa internet e Task Manager lo aprirà." IDS_MSG_ACCESSPROCESSAFF "Impossibile accedere o impostare la 'Process Affinity'" IDS_MSG_PROCESSONEPRO "Il processo deve avere affinity con almeno un processore." @@ -425,7 +425,7 @@ BEGIN IDS_MSG_TASKMGRWARNING "Segnalazione di Task Manager" IDS_MSG_WARNINGTERMINATING "ATTENZIONE: Arrestare un processo può provocare\n effetti indesiderati compresa la perdita di dati o l'instabilità del sistema.\nIl processo non potrà salvare il prorio stato o i dati\nprima del suo arresto.\nSei sicuro di voler procedere?" IDS_MSG_UNABLETERMINATEPRO "Impossibile arrestare il Processo" - IDS_MSG_CLOSESYSTEMPROCESS "This is a critical system process. Task Manager will not end this process." + IDS_MSG_CLOSESYSTEMPROCESS "Questo è un processo di sistema critico. Task Manager non terminerà questo processo." IDS_MSG_UNABLECHANGEPRIORITY "Impossibile cambiare la Priorità" IDS_MSG_WARNINGCHANGEPRIORITY "ATTENZIONE: La modifica della classe di priorità può provocare\n effetti indesiderati compresa la perdita di dati o l'instabilità del sistema.\nSei sicuro di voler procedere?" IDS_MSG_TRAYICONCPUUSAGE "Uso CPU: %d%%" diff --git a/base/system/winlogon/lang/it-IT.rc b/base/system/winlogon/lang/it-IT.rc index 0f85f8862b0..0486c47ec81 100644 --- a/base/system/winlogon/lang/it-IT.rc +++ b/base/system/winlogon/lang/it-IT.rc @@ -26,8 +26,8 @@ CAPTION "System Shutdown" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_WARNING, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20 - LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down.", -1, 38, 7, 135, 40 - LTEXT "The system shuts down in:", -1, 38, 50, 90, 8 + LTEXT "È stato inizializzato uno spegnimento di sistema. Per favore salvare il lavoro e terminare la sessione. Tutto il lavoro non salvato andrà perso quando il sistema sarà spento.", -1, 38, 7, 135, 40 + LTEXT "Il sistema si spegnerà:", -1, 38, 50, 90, 8 LTEXT "00:00:00", IDC_SYSSHUTDOWNTIMELEFT, 132, 50, 41, 8 LTEXT "Message:", -1, 38, 65, 135, 8 EDITTEXT IDC_SYSSHUTDOWNMESSAGE, 34, 75, 139, 58, ES_LEFT | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP, WS_EX_STATICEDGE diff --git a/dll/cpl/desk/lang/it-IT.rc b/dll/cpl/desk/lang/it-IT.rc index efaa7affdf2..4189b95d304 100644 --- a/dll/cpl/desk/lang/it-IT.rc +++ b/dll/cpl/desk/lang/it-IT.rc @@ -5,7 +5,7 @@ CAPTION "Temi" STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Un tema è uno sfondo più un set di suoni, icone, e altri elementi per personalizzare il computer in un clic.", IDC_STATIC, 5, 5, 235, 30 + LTEXT "Un tema è uno sfondo più una combinazione di suoni, icone, e altri elementi per personalizzare il computer in un clic.", IDC_STATIC, 5, 5, 235, 30 LTEXT "Tema:", IDC_STATIC, 5, 42, 55, 10 COMBOBOX IDC_THEMES_COMBOBOX, 5, 52, 160, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Salva &Come...", IDC_THEMES_SAVE_AS, 170, 52, 70, 14 @@ -77,7 +77,7 @@ CAPTION "Avanzato" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - LTEXT "Se selezioni un tema che non sia ReactOS classico, sovrascriverà le seguenti impostazioni, eccetto in alcuni vecchi programmi.", IDC_ADVAPPEARANCE_DISCLAIMER, 7, 133, 232, 30, BS_MULTILINE + LTEXT "Se selezioni un tema che non sia ReactOS classico, le seguenti impostazioni verranno sovrascritte, eccetto in alcuni vecchi programmi.", IDC_ADVAPPEARANCE_DISCLAIMER, 7, 133, 232, 30, BS_MULTILINE LTEXT "Elemento", 8, 5, 160, 50, 9 COMBOBOX IDC_ADVAPPEARANCE_ELEMENT, 5, 170, 130, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_CHILD | WS_VSCROLL | WS_TABSTOP @@ -233,7 +233,7 @@ END STRINGTABLE BEGIN - IDS_DESKTOP_ITEMS "Oggetti Desktop" + IDS_DESKTOP_ITEMS "Elementi Desktop" END STRINGTABLE diff --git a/dll/cpl/main/lang/it-IT.rc b/dll/cpl/main/lang/it-IT.rc index fca405fbb4a..b34dace9e0b 100644 --- a/dll/cpl/main/lang/it-IT.rc +++ b/dll/cpl/main/lang/it-IT.rc @@ -56,7 +56,7 @@ BEGIN GROUPBOX "Configurazione dei pulsanti", -1, 5, 5, 230, 70 CHECKBOX "&Inverti il pulsante secondario e primario", IDC_SWAP_MOUSE_BUTTONS, 10, 15, 140, 10 CONTROL "", IDC_IMAGE_SWAP_MOUSE, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 165, 15, 65, 57, WS_EX_STATICEDGE - LTEXT "Assegna al tasto destro del mouse le funzioni principali come ad esempio la selezione e il trascinamento degli oggetti", -1, 10, 30, 150, 30 + LTEXT "Assegna al tasto destro del mouse le funzioni principali come ad esempio la selezione e il trascinamento degli elementi", -1, 10, 30, 150, 30 GROUPBOX "Velocità doppio clic", -1, 5, 76, 230, 70 LTEXT "Fare doppio clic sulla cartella per verificare le impostazioni. Se la cartella non si apre o chiude, provare ad usare una velocità minore.", -1, 10, 86, 150, 30 LTEXT "Velocità: Lenta", -1, 10, 121, 92, 8 @@ -66,7 +66,7 @@ BEGIN GROUPBOX "Blocca clic", -1, 5, 150, 230, 70 CHECKBOX "&Attiva Blocca Clic", IDC_CHECK_CLICK_LOCK, 10, 160, 70, 20 PUSHBUTTON "&Impostazioni...", IDC_BUTTON_CLICK_LOCK, 164, 160, 66, 14 - LTEXT "Permette di selezionare e trascinare oggetti senza tenere premuto il tasto del mouse. Per selezionare, premere il pulsante del mouse. Per rilasciare, fare clic di nuovo.", -1, 10, 180, 190, 30 + LTEXT "Permette di selezionare e trascinare elementi senza tenere premuto il tasto del mouse. Per selezionare, premere il pulsante del mouse. Per rilasciare, fare clic di nuovo.", -1, 10, 180, 190, 30 END IDD_PAGE_POINTER DIALOGEX 0, 0, 246, 228 @@ -168,6 +168,6 @@ BEGIN IDS_REMOVE_TITLE "Conferma la rimozione della combinazione dei cursori" IDS_REMOVE_TEXT "Confermate di voler rimuovere la combinazione dei cursori '%s'?" IDS_OVERWRITE_TITLE "Sovrascrivvere combinazione dei cursori" - IDS_OVERWRITE_TEXT "Il nome della combinazione dei cursori è già in uso. Volere sovrascrivere quello esistente?" + IDS_OVERWRITE_TEXT "Il nome della combinazione dei cursori è già in uso. Si vuole sovrascrivere quello esistente?" IDS_ANIMATE_CURSOR "Cursori animati" END diff --git a/dll/win32/browseui/lang/it-IT.rc b/dll/win32/browseui/lang/it-IT.rc index e0813a0cf7f..dd9c906df15 100644 --- a/dll/win32/browseui/lang/it-IT.rc +++ b/dll/win32/browseui/lang/it-IT.rc @@ -336,5 +336,5 @@ END STRINGTABLE BEGIN IDS_PARSE_ADDR_ERR_TITLE "ReactOS Explorer" - IDS_PARSE_ADDR_ERR_TEXT "ReactOS Explorer non può trovare '%1'. Controlla la digitazione e riprova." + IDS_PARSE_ADDR_ERR_TEXT "ReactOS Explorer non è in grado di trovare '%1'. Controlla la digitazione e riprova." END diff --git a/win32ss/user/user32/lang/it-IT.rc b/win32ss/user/user32/lang/it-IT.rc index 3851c60641d..f92245b3e5e 100644 --- a/win32ss/user/user32/lang/it-IT.rc +++ b/win32ss/user/user32/lang/it-IT.rc @@ -59,7 +59,7 @@ STRINGTABLE BEGIN IDS_ERROR "Errore" IDS_NOT_RESPONDING " (Not Responding)" - IDS_ASK_TERMINATE "Questa applicazione non risponde. Terminare il processo?" + IDS_ASK_TERMINATE "Questo processo non risponde. Si vuole terminarlo?" IDS_HUNG_UP_TITLE "Hung up!" IDS_OK "OK" IDS_CANCEL "Annulla"

1 0

[reactos] 01/01: [CRT] Fix prototype of _Strftime
by Timo Kreuzer 20 Aug '24

20 Aug '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7765ff89ff2169b17b135… commit 7765ff89ff2169b17b135c82547512b8ae49f452 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Wed May 15 13:17:40 2024 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Aug 20 13:47:10 2024 +0300 [CRT] Fix prototype of _Strftime --- sdk/lib/crt/time/strftime.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sdk/lib/crt/time/strftime.c b/sdk/lib/crt/time/strftime.c index 8cb28b0f751..8eb4a662f04 100644 --- a/sdk/lib/crt/time/strftime.c +++ b/sdk/lib/crt/time/strftime.c @@ -112,8 +112,9 @@ static inline BOOL strftime_int(char *str, size_t *pos, size_t max, * _Strftime (MSVCRT.@) */ size_t CDECL _Strftime(char *str, size_t max, const char *format, - const struct tm *mstm, MSVCRT___lc_time_data *time_data) + const struct tm *mstm, void *_Lc_time_arg) { + MSVCRT___lc_time_data *time_data = (MSVCRT___lc_time_data*)_Lc_time_arg; size_t ret, tmp; BOOL alternate;

1 0

[reactos] 01/01: [RAPPS] Improve Romanian (ro-RO) translation (#6858)
by Andrei Miloiu 19 Aug '24

19 Aug '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fd1a48d4972edcd9581a2… commit fd1a48d4972edcd9581a20e6bd5c485c5556c845 Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Tue Aug 20 00:54:05 2024 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Aug 19 23:54:05 2024 +0200 [RAPPS] Improve Romanian (ro-RO) translation (#6858) --- base/applications/rapps/lang/ro-RO.rc | 98 +++++++++++++++++------------------ 1 file changed, 49 insertions(+), 49 deletions(-) diff --git a/base/applications/rapps/lang/ro-RO.rc b/base/applications/rapps/lang/ro-RO.rc index 1b320c177f0..79b1f9ad619 100644 --- a/base/applications/rapps/lang/ro-RO.rc +++ b/base/applications/rapps/lang/ro-RO.rc @@ -19,20 +19,20 @@ BEGIN END POPUP "&Programe" BEGIN - MENUITEM "&Instalează\tCtrl+Enter", ID_INSTALL - MENUITEM "&Dezinstalează\tCtrl+Del", ID_UNINSTALL - MENUITEM "&Modifică", ID_MODIFY + MENUITEM "&Instalare\tCtrl+Enter", ID_INSTALL + MENUITEM "&Dezinstalare\tCtrl+Del", ID_UNINSTALL + MENUITEM "&Modificare", ID_MODIFY MENUITEM SEPARATOR - MENUITEM "&Elimină din registru", ID_REGREMOVE + MENUITEM "&Eliminare din registru", ID_REGREMOVE MENUITEM SEPARATOR - MENUITEM "Împ&rospătează\tF5", ID_REFRESH + MENUITEM "Împ&rospătare\tF5", ID_REFRESH MENUITEM SEPARATOR - MENUITEM "Actualizează &baza de date\tCtrl+F5", ID_RESETDB + MENUITEM "&Actualizare baza de date\tCtrl+F5", ID_RESETDB END POPUP "Aj&utor" BEGIN - MENUITEM "&Manual…\tF1", ID_HELP, GRAYED - MENUITEM "&Despre…", ID_ABOUT + MENUITEM "&Ajutor\tF1", ID_HELP, GRAYED + MENUITEM "&Despre", ID_ABOUT END END @@ -40,8 +40,8 @@ IDR_LINKMENU MENU BEGIN POPUP "" BEGIN - MENUITEM "&Deschide în navigator", ID_OPEN_LINK - MENUITEM "&Copiază în memorie", ID_COPY_LINK + MENUITEM "&Deschidere a legăturii în navigator", ID_OPEN_LINK + MENUITEM "&Copiere a legăturii în clipboard", ID_COPY_LINK END END @@ -49,58 +49,58 @@ IDR_APPLICATIONMENU MENU BEGIN POPUP "" BEGIN - MENUITEM "&Instalează\tCtrl+Enter", ID_INSTALL - MENUITEM "&Dezinstalează\tCtrl+Del", ID_UNINSTALL - MENUITEM "&Modifică", ID_MODIFY + MENUITEM "&Instalare\tCtrl+Enter", ID_INSTALL + MENUITEM "&Dezinstalare\tCtrl+Del", ID_UNINSTALL + MENUITEM "&Modificare", ID_MODIFY MENUITEM SEPARATOR - MENUITEM "&Elimină din registru", ID_REGREMOVE + MENUITEM "&Eliminare din registru", ID_REGREMOVE MENUITEM SEPARATOR - MENUITEM "Împ&rospătează\tF5", ID_REFRESH + MENUITEM "Împ&rospătare\tF5", ID_REFRESH MENUITEM SEPARATOR - MENUITEM "Actualizează &baza de date\tCtrl+F5", ID_RESETDB + MENUITEM "&Actualizare a bazei de date\tCtrl+F5", ID_RESETDB END END IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 265 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Preferințe" +CAPTION "Setări" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Generale", -1, 4, 2, 240, 61 - AUTOCHECKBOX "&Păstrează poziția ferestrei", IDC_SAVE_WINDOW_POS, 15, 12, 219, 12 - AUTOCHECKBOX "Actualizea&ză la pornire lista programelor disponibile", IDC_UPDATE_AVLIST, 15, 29, 222, 12 - AUTOCHECKBOX "Menține j&urnal de instalare/dezinstalare a programelor", IDC_LOG_ENABLED, 15, 46, 219, 12 + GROUPBOX "General", -1, 4, 2, 240, 61 + AUTOCHECKBOX "&Salvare a poziției ferestrei", IDC_SAVE_WINDOW_POS, 15, 12, 219, 12 + AUTOCHECKBOX "&Actualizare la pornire a listei programelor disponibile", IDC_UPDATE_AVLIST, 15, 29, 222, 12 + AUTOCHECKBOX "Menținere a j&urnalului de instalare/dezinstalare a programelor", IDC_LOG_ENABLED, 15, 46, 219, 12 GROUPBOX "Descărcări", -1, 4, 65, 240, 51 LTEXT "Folderul pentru descărcări:", -1, 16, 75, 100, 9 EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL - PUSHBUTTON "Spe&cificare…", IDC_CHOOSE, 187, 85, 50, 14 - AUTOCHECKBOX "Șt&erge aplicația de instalare după instalarea programului", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 + PUSHBUTTON "&Răsfoire", IDC_CHOOSE, 187, 85, 50, 14 + AUTOCHECKBOX "Se șterge de instalare &după instalarea programului", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 GROUPBOX "Sursa programului", -1, 4, 118, 240, 46 - AUTORADIOBUTTON "Folosește valorile implicite", IDC_SOURCE_DEFAULT, 15, 132, 121, 10, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "Se folosesc valorile implicite", IDC_SOURCE_DEFAULT, 15, 132, 121, 10, WS_GROUP | WS_TABSTOP AUTORADIOBUTTON "Sursa specificată", IDC_USE_SOURCE, 15, 147, 74, 10 EDITTEXT IDC_SOURCE_URL, 97, 147, 140, 12, ES_AUTOHSCROLL | WS_DISABLED - GROUPBOX "Mandatar", -1, 4, 166, 240, 76 - AUTORADIOBUTTON "Configur&ația mandatar din sistem", IDC_PROXY_DEFAULT, 15, 180, 210, 10, WS_GROUP | WS_TABSTOP - AUTORADIOBUTTON "Di&rect (fără mandatar)", IDC_NO_PROXY, 15, 195, 210, 10 - AUTORADIOBUTTON "Man&datar", IDC_USE_PROXY, 15, 210, 74, 10 + GROUPBOX "Proxy", -1, 4, 166, 240, 76 + AUTORADIOBUTTON "Setări proxy de sistem", IDC_PROXY_DEFAULT, 15, 180, 210, 10, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "Direct (fără proxy)", IDC_NO_PROXY, 15, 195, 210, 10 + AUTORADIOBUTTON "Proxy", IDC_USE_PROXY, 15, 210, 74, 10 EDITTEXT IDC_PROXY_SERVER, 90, 210, 147, 12, ES_AUTOHSCROLL | WS_DISABLED LTEXT "excepție pentru", -1, 26, 226, 64, 10 EDITTEXT IDC_NO_PROXY_FOR, 90, 225, 147, 12, ES_AUTOHSCROLL | WS_DISABLED - PUSHBUTTON "I&mplicite", IDC_DEFAULT_SETTINGS, 8, 245, 60, 14, WS_GROUP | WS_TABSTOP - DEFPUSHBUTTON "Confirmă", IDOK, 116, 245, 60, 14 - PUSHBUTTON "Anulează", IDCANCEL, 181, 245, 60, 14 + PUSHBUTTON "Implicit", IDC_DEFAULT_SETTINGS, 8, 245, 60, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 116, 245, 60, 14 + PUSHBUTTON "Revocare", IDCANCEL, 181, 245, 60, 14 END IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Instalare aplicație" +CAPTION "Instalare a aplicației" FONT 8, "MS Shell Dlg" BEGIN LTEXT "…", IDC_INSTALL_TEXT, 4, 5, 209, 35 - AUTORADIOBUTTON "Instalea&ză de pe un disc (CD sau DVD)", IDC_CD_INSTALL, 10, 46, 197, 11, WS_GROUP - AUTORADIOBUTTON "&Descarcă și instalează", IDC_DOWNLOAD_INSTALL, 10, 59, 197, 11, NOT WS_TABSTOP - DEFPUSHBUTTON "Confirmă", IDOK, 86, 78, 60, 14 - PUSHBUTTON "Anulează", IDCANCEL, 150, 78, 60, 14 + AUTORADIOBUTTON "&Instalare de pe un disc (CD sau DVD)", IDC_CD_INSTALL, 10, 46, 197, 11, WS_GROUP + AUTORADIOBUTTON "&Descărcare și instalare", IDC_DOWNLOAD_INSTALL, 10, 59, 197, 11, NOT WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 86, 78, 60, 14 + PUSHBUTTON "Revocare", IDCANCEL, 150, 78, 60, 14 END IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 220 @@ -110,18 +110,18 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_DOWNLOAD_PROGRESS, "msctls_progress32", WS_BORDER | PBS_SMOOTH, 10, 10, 200, 12 EDITTEXT IDC_DOWNLOAD_STATUS, 10, 28, 200, 22, ES_CENTER | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_DISABLED | NOT WS_BORDER - PUSHBUTTON "Anulează", IDCANCEL, 85, 53, 50, 15, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Revocare", IDCANCEL, 85, 53, 50, 15, WS_GROUP | WS_TABSTOP END STRINGTABLE BEGIN - IDS_TOOLTIP_INSTALL "Instalează" - IDS_TOOLTIP_UNINSTALL "Dezinstalează" - IDS_TOOLTIP_MODIFY "Modifică" - IDS_TOOLTIP_SELECT_ALL "Selectează/Deselectează Toate" + IDS_TOOLTIP_INSTALL "Instalare" + IDS_TOOLTIP_UNINSTALL "Dezinstalare" + IDS_TOOLTIP_MODIFY "Modificare" + IDS_TOOLTIP_SELECT_ALL "Selectare/Deselectare Toate" IDS_TOOLTIP_SETTINGS "Preferințe" - IDS_TOOLTIP_REFRESH "Împrospătează" - IDS_TOOLTIP_UPDATE_DB "Actualizează baza de date" + IDS_TOOLTIP_REFRESH "Împrospătare" + IDS_TOOLTIP_UPDATE_DB "Actualizare baza de date" IDS_TOOLTIP_EXIT "Ieșire" END @@ -188,11 +188,11 @@ END STRINGTABLE BEGIN - IDS_APPTITLE "Gestionar de programe" + IDS_APPTITLE "Managerul de aplicații ReactOS" IDS_APP_AUTHORS "Marcă înregistrată 2009 Dmitry Chapyshev" IDS_SEARCH_TEXT "Căutare…" IDS_APPS_COUNT "Numărul de programe: %d; Selectate: %d" - IDS_WELCOME_TITLE "Bun venit la gestionarul de programe ReactOS!\n\n" + IDS_WELCOME_TITLE "Bun venit la Managerul de aplicații ReactOS!\n\n" IDS_WELCOME_TEXT "Alegeți o categorie din stânga, apoi alegeți o aplicație pentru a o instala sau dezinstala.\nArdesa web ReactOS: " IDS_WELCOME_URL "https://reactos.org" IDS_INSTALLED "Instalate" @@ -208,12 +208,12 @@ BEGIN IDS_UNABLE_TO_DOWNLOAD2 "Pachetul nu se poate descărca! Verificați conexiunea de Internet!" IDS_UNABLE_TO_REMOVE "Datele de registru pentru acest program nu s-au putut elimina!" IDS_UNABLE_TO_INSTALL "Programul de instalare nu se poate executa!" - IDS_UNABLE_TO_QUERY_CERT "Regăsirea informații despre certificat a eșuat.\n\nVreți să continuați oricum?" + IDS_UNABLE_TO_QUERY_CERT "Imposibil de obținut informații despre certificat.\n\nContinuați oricum?" IDS_INTEG_CHECK_TITLE "Integritatea pachetului în verificare…" - IDS_INTEG_CHECK_FAIL "Pachetul nu a trecut de verificarea de integritate. Utilizarea programului nu este recomandată." + IDS_INTEG_CHECK_FAIL "Pachetul nu a trecut de verificarea de integritate. Nu se recomandă utilizarea programului." IDS_INTERRUPTED_DOWNLOAD "Descărcarea a fost întreruptă. Verificați conexiunea la Internet." IDS_UNABLE_TO_WRITE "Nu se poate scrie pe disc. Discul poate fi la capacitate maximă." - IDS_INSTALL_SELECTED "Instalează selecționate" + IDS_INSTALL_SELECTED "Instalare aplicații selectate" IDS_SELECTEDFORINST "Selectate pentru instalare" IDS_MISMATCH_CERT_INFO "Certificatul în uz este necunoscut:\nSubiect: %s\nEmitent: %s\nVreți să continuați oricum?" IDS_UNABLE_PATH "Formatul căii specificate nu este corect." @@ -273,5 +273,5 @@ END STRINGTABLE BEGIN - IDS_INSTGEN_CONFIRMUNINST "Are you sure you want to uninstall %s?" + IDS_INSTGEN_CONFIRMUNINST "Sigur doriți să dezinstalați %s?" END

1 0

[reactos] 01/01: [DESK] Fix 3dtext screensaver restart after opening settings (#7213)
by Doug Lyons 19 Aug '24

19 Aug '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=24517d525812e955167ed… commit 24517d525812e955167ed3e05156633a381ca6fd Author: Doug Lyons <douglyons(a)douglyons.com> AuthorDate: Sun Aug 18 20:09:47 2024 -0500 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Aug 18 20:09:47 2024 -0500 [DESK] Fix 3dtext screensaver restart after opening settings (#7213) --- dll/cpl/desk/screensaver.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/dll/cpl/desk/screensaver.c b/dll/cpl/desk/screensaver.c index a0515eab698..56da1e87fb4 100644 --- a/dll/cpl/desk/screensaver.c +++ b/dll/cpl/desk/screensaver.c @@ -223,7 +223,7 @@ SetScreenSaverPreviewBox(HWND hwndDlg, PDATA pData) } } -static BOOL +static VOID WaitForSettingsDialog(HWND hwndDlg, HANDLE hProcess) { @@ -243,22 +243,18 @@ WaitForSettingsDialog(HWND hwndDlg, { if (msg.message == WM_QUIT) { - return FALSE; + return; } - if (IsDialogMessage(hwndDlg, &msg)) + if (!IsDialogMessage(hwndDlg, &msg)) { TranslateMessage(&msg); DispatchMessage(&msg); } } } - else if (dwResult == WAIT_OBJECT_0) - { - return TRUE; - } else { - return FALSE; + return; } } } @@ -308,8 +304,8 @@ ScreenSaverConfig(HWND hwndDlg, PDATA pData) pData->PrevWindowPi.hThread = pData->PrevWindowPi.hProcess = NULL; } - if (WaitForSettingsDialog(hwndDlg, pi.hProcess)) - SetScreenSaverPreviewBox(hwndDlg, pData); + WaitForSettingsDialog(hwndDlg, pi.hProcess); + SetScreenSaverPreviewBox(hwndDlg, pData); CloseHandle(pi.hProcess); CloseHandle(pi.hThread);

1 0

[reactos] 01/01: [SHELL32] Handle SHCreateShellFolderViewEx callback function (#7240)
by Whindmar Saksit 18 Aug '24

18 Aug '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e639d7c1e7e0215e865a8… commit e639d7c1e7e0215e865a82535457a8de602b8785 Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Mon Aug 19 00:34:05 2024 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Aug 19 00:34:05 2024 +0200 [SHELL32] Handle SHCreateShellFolderViewEx callback function (#7240) The caller supplied callback function is wrapped in a IShellFolderViewCB so we can use (the newer) SHCreateShellFolderView. --- dll/win32/shell32/CDefView.cpp | 25 +------ dll/win32/shell32/CDefViewUtil.cpp | 140 +++++++++++++++++++++++++++++++++++++ dll/win32/shell32/CMakeLists.txt | 1 + sdk/include/psdk/shlobj.h | 1 + 4 files changed, 145 insertions(+), 22 deletions(-) diff --git a/dll/win32/shell32/CDefView.cpp b/dll/win32/shell32/CDefView.cpp index 3ada8ae10b7..7617f85e5d7 100644 --- a/dll/win32/shell32/CDefView.cpp +++ b/dll/win32/shell32/CDefView.cpp @@ -1733,7 +1733,7 @@ LRESULT CDefView::OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandl LPITEMIDLIST pidlTarget = NULL; LONG fEvents = 0; HRESULT hr = _DoFolderViewCB(SFVM_GETNOTIFY, (WPARAM)&pidlTarget, (LPARAM)&fEvents); - if (FAILED(hr) || (!pidlTarget && !fEvents)) + if (FAILED(hr) || (!pidlTarget && !fEvents)) // FIXME: MSDN says both zero means no notifications { pidlTarget = m_pidlParent; fEvents = SHCNE_ALLEVENTS; @@ -3464,7 +3464,7 @@ HRESULT WINAPI CDefView::GetItemObject(UINT uItem, REFIID riid, LPVOID *ppvOut) FOLDERVIEWMODE CDefView::GetDefaultViewMode() { FOLDERVIEWMODE mode = ((m_FolderSettings.fFlags & FWF_DESKTOP) || !IsOS(OS_SERVERADMINUI)) ? FVM_ICON : FVM_DETAILS; - FOLDERVIEWMODE temp; + FOLDERVIEWMODE temp = mode; if (SUCCEEDED(_DoFolderViewCB(SFVM_DEFVIEWMODE, 0, (LPARAM)&temp)) && temp >= FVM_FIRST && temp <= FVM_LAST) mode = temp; return mode; @@ -3753,6 +3753,7 @@ HRESULT STDMETHODCALLTYPE CDefView::CreateViewWindow3(IShellBrowser *psb, IShell /* Get our parent window */ m_pShellBrowser->GetWindow(&m_hWndParent); + _DoFolderViewCB(SFVM_HWNDMAIN, 0, (LPARAM)m_hWndParent); /* Try to get the ICommDlgBrowserInterface, adds a reference !!! */ m_pCommDlgBrowser = NULL; @@ -4656,26 +4657,6 @@ HRESULT CDefView_CreateInstance(IShellFolder *pFolder, REFIID riid, LPVOID * ppv return ShellObjectCreatorInit<CDefView>(pFolder, riid, ppvOut); } -HRESULT WINAPI SHCreateShellFolderViewEx( - LPCSFV psvcbi, // [in] shelltemplate struct - IShellView **ppsv) // [out] IShellView pointer -{ - CComPtr<IShellView> psv; - HRESULT hRes; - - TRACE("sf=%p pidl=%p cb=%p mode=0x%08x parm=%p\n", - psvcbi->pshf, psvcbi->pidl, psvcbi->pfnCallback, - psvcbi->fvm, psvcbi->psvOuter); - - *ppsv = NULL; - hRes = CDefView_CreateInstance(psvcbi->pshf, IID_PPV_ARG(IShellView, &psv)); - if (FAILED_UNEXPECTEDLY(hRes)) - return hRes; - - *ppsv = psv.Detach(); - return hRes; -} - HRESULT WINAPI SHCreateShellFolderView(const SFV_CREATE *pcsfv, IShellView **ppsv) { diff --git a/dll/win32/shell32/CDefViewUtil.cpp b/dll/win32/shell32/CDefViewUtil.cpp new file mode 100644 index 00000000000..3996b0d3891 --- /dev/null +++ b/dll/win32/shell32/CDefViewUtil.cpp @@ -0,0 +1,140 @@ +/* + * PROJECT: shell32 + * LICENSE: LGPL-2.1+ (https://spdx.org/licenses/LGPL-2.1+) + * PURPOSE: DefView utility functions + * COPYRIGHT: Copyright 2024 Whindmar Saksit <whindsaks(a)proton.me> + */ + +#include "precomp.h" + +WINE_DEFAULT_DEBUG_CHANNEL(shell); + +class CObjectWithSiteBase : + public IObjectWithSite +{ +public: + IUnknown* m_pUnkSite; + + CObjectWithSiteBase() : m_pUnkSite(NULL) {} + virtual ~CObjectWithSiteBase() { SetSite(NULL); } + + // IObjectWithSite + STDMETHODIMP SetSite(IUnknown *pUnkSite) override + { + IUnknown_Set(&m_pUnkSite, pUnkSite); + return S_OK; + } + STDMETHODIMP GetSite(REFIID riid, void **ppvSite) override + { + *ppvSite = NULL; + return m_pUnkSite ? m_pUnkSite->QueryInterface(riid, ppvSite) : E_FAIL; + } +}; + +// This class adapts the legacy function callback to work as an IShellFolderViewCB +class CShellFolderViewCBWrapper : + public CComObjectRootEx<CComMultiThreadModelNoCS>, + public IShellFolderViewCB, + public CObjectWithSiteBase +{ +protected: + HWND m_hWndMain; + PIDLIST_ABSOLUTE m_Pidl; + CComPtr<IShellFolder> m_psf; + CComPtr<IShellView> m_psvOuter; + LPFNVIEWCALLBACK m_Callback; + FOLDERVIEWMODE m_FVM; + LONG m_Events; + +public: + CShellFolderViewCBWrapper() : m_hWndMain(NULL), m_Pidl(NULL) {} + + virtual ~CShellFolderViewCBWrapper() + { + ILFree(m_Pidl); + } + + HRESULT WINAPI Initialize(LPCSFV psvcbi) + { + m_psf = psvcbi->pshf; + m_psvOuter = psvcbi->psvOuter; + m_Pidl = psvcbi->pidl ? ILClone(psvcbi->pidl) : NULL; + m_Callback = psvcbi->pfnCallback; + m_FVM = psvcbi->fvm; + m_Events = psvcbi->lEvents; + return S_OK; + } + + // IShellFolderViewCB + STDMETHODIMP MessageSFVCB(UINT uMsg, WPARAM wParam, LPARAM lParam) override + { + switch (uMsg) + { + case SFVM_HWNDMAIN: + m_hWndMain = (HWND)lParam; + break; + + case SFVM_DEFVIEWMODE: + if (m_FVM) + *(FOLDERVIEWMODE*)lParam = m_FVM; + break; + } + + HRESULT hr = m_Callback(m_psvOuter, m_psf, m_hWndMain, uMsg, wParam, lParam); + if (SUCCEEDED(hr)) + return hr; + + switch (uMsg) + { + case SFVM_GETNOTIFY: + *(LPITEMIDLIST*)wParam = m_Pidl; + *(LONG*)lParam = m_Events; + return S_OK; + } + return hr; + } + + // IObjectWithSite + STDMETHODIMP SetSite(IUnknown *pUnkSite) override + { + // learn.microsoft.com/en-us/windows/win32/shell/sfvm-setisfv + HRESULT hr = CObjectWithSiteBase::SetSite(pUnkSite); + MessageSFVCB(SFVM_SETISFV, 0, (LPARAM)pUnkSite); + return hr; + } + + DECLARE_NO_REGISTRY() + DECLARE_NOT_AGGREGATABLE(CShellFolderViewCBWrapper) + BEGIN_COM_MAP(CShellFolderViewCBWrapper) + COM_INTERFACE_ENTRY_IID(IID_IShellFolderViewCB, IShellFolderViewCB) + COM_INTERFACE_ENTRY_IID(IID_IObjectWithSite, IObjectWithSite) + END_COM_MAP() +}; + +/************************************************************************* + * SHCreateShellFolderViewEx [SHELL32.174] (Win95+) + */ +EXTERN_C HRESULT WINAPI +SHCreateShellFolderViewEx(_In_ LPCSFV pcsfv, _Out_ IShellView **ppsv) +{ + if (!ppsv) + return E_INVALIDARG; + *ppsv = NULL; + + TRACE("sf=%p pidl=%p cb=%p mode=0x%08x outer=%p\n", + pcsfv->pshf, pcsfv->pidl, pcsfv->pfnCallback, + pcsfv->fvm, pcsfv->psvOuter); + + CComPtr<IShellFolderViewCB> psfvcb; + SFV_CREATE create = { sizeof(create), pcsfv->pshf, pcsfv->psvOuter }; + + if (pcsfv->pfnCallback) + { + HRESULT hr = ShellObjectCreatorInit<CShellFolderViewCBWrapper>(pcsfv, + IID_PPV_ARG(IShellFolderViewCB, &psfvcb)); + if (FAILED(hr)) + return hr; + create.psfvcb = psfvcb; + } + return SHCreateShellFolderView(&create, ppsv); +} diff --git a/dll/win32/shell32/CMakeLists.txt b/dll/win32/shell32/CMakeLists.txt index 1b76acb0560..7226ba4105d 100644 --- a/dll/win32/shell32/CMakeLists.txt +++ b/dll/win32/shell32/CMakeLists.txt @@ -65,6 +65,7 @@ list(APPEND SOURCE shlfolder.cpp CFileSysBindData.cpp CDefView.cpp + CDefViewUtil.cpp CDefViewDual.cpp CDefViewBckgrndMenu.cpp stubs.cpp diff --git a/sdk/include/psdk/shlobj.h b/sdk/include/psdk/shlobj.h index 608e78618f0..10e73f0ddcd 100644 --- a/sdk/include/psdk/shlobj.h +++ b/sdk/include/psdk/shlobj.h @@ -1331,6 +1331,7 @@ SHCreateShellFolderViewEx( #define SFVM_GETEXTVIEWS 40 /* undocumented */ #define SFVM_THISIDLIST 41 #define SFVM_UPDATINGOBJECT 43 /* undocumented */ +#define SFVM_HWNDMAIN 46 /* undocumented */ #define SFVM_ADDPROPERTYPAGES 47 #define SFVM_BACKGROUNDENUMDONE 48 #define SFVM_GETNOTIFY 49

1 0

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