Ros-diffs

ros-diffs@reactos.org

17 participants
81085 discussions

[reactos] 01/01: [SHELL32][SHELL32_APITEST][SDK] Implement SheRemoveQuotesA/W (#5517)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=358e45d33a80a8db86832… commit 358e45d33a80a8db868324cf1f477c9e24408e53 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Aug 5 19:44:13 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Aug 5 19:44:13 2023 +0900 [SHELL32][SHELL32_APITEST][SDK] Implement SheRemoveQuotesA/W (#5517) - Implement SheRemoveQuotesA and SheRemoveQuotesW functions. - Add She testcase into shell32_apitest. - Add SheRemoveQuotesA/W into <undocshell.h>. CORE-9277 --- dll/win32/shell32/stubs.cpp | 42 ++++++++---- modules/rostests/apitests/shell32/CMakeLists.txt | 1 + modules/rostests/apitests/shell32/She.cpp | 87 ++++++++++++++++++++++++ modules/rostests/apitests/shell32/testlist.c | 2 + sdk/include/reactos/undocshell.h | 3 + 5 files changed, 123 insertions(+), 12 deletions(-) diff --git a/dll/win32/shell32/stubs.cpp b/dll/win32/shell32/stubs.cpp index 460a423206c..ec1da6daf41 100644 --- a/dll/win32/shell32/stubs.cpp +++ b/dll/win32/shell32/stubs.cpp @@ -440,26 +440,44 @@ SheSetCurDrive(INT iIndex) return 1; } -/* - * Unimplemented - */ EXTERN_C LPWSTR WINAPI -SheRemoveQuotesW(LPWSTR lpInput) +SheRemoveQuotesW(LPWSTR psz) { - FIXME("SheRemoveQuotesW() stub\n"); - return NULL; + PWCHAR pch; + + if (*psz == L'"') + { + for (pch = psz + 1; *pch && *pch != L'"'; ++pch) + { + *(pch - 1) = *pch; + } + + if (*pch == L'"') + *(pch - 1) = UNICODE_NULL; + } + + return psz; } -/* - * Unimplemented - */ EXTERN_C LPSTR WINAPI -SheRemoveQuotesA(LPSTR lpInput) +SheRemoveQuotesA(LPSTR psz) { - FIXME("SheRemoveQuotesA() stub\n"); - return NULL; + PCHAR pch; + + if (*psz == '"') + { + for (pch = psz + 1; *pch && *pch != '"'; ++pch) + { + *(pch - 1) = *pch; + } + + if (*pch == '"') + *(pch - 1) = ANSI_NULL; + } + + return psz; } /* diff --git a/modules/rostests/apitests/shell32/CMakeLists.txt b/modules/rostests/apitests/shell32/CMakeLists.txt index 797e6e5ed1c..602e25ad199 100644 --- a/modules/rostests/apitests/shell32/CMakeLists.txt +++ b/modules/rostests/apitests/shell32/CMakeLists.txt @@ -25,6 +25,7 @@ list(APPEND SOURCE SHCreateFileDataObject.cpp SHCreateFileExtractIconW.cpp SHParseDisplayName.cpp + She.cpp ShellExecCmdLine.cpp ShellExecuteEx.cpp ShellExecuteW.cpp diff --git a/modules/rostests/apitests/shell32/She.cpp b/modules/rostests/apitests/shell32/She.cpp new file mode 100644 index 00000000000..4c2c9f4e494 --- /dev/null +++ b/modules/rostests/apitests/shell32/She.cpp @@ -0,0 +1,87 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Test for She* functions + * COPYRIGHT: Copyright 2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +#include "shelltest.h" +#include <undocshell.h> + +typedef LPSTR (WINAPI *FN_SheRemoveQuotesA)(LPSTR psz); +typedef LPWSTR (WINAPI *FN_SheRemoveQuotesW)(LPWSTR psz); + +static FN_SheRemoveQuotesA pSheRemoveQuotesA = NULL; +static FN_SheRemoveQuotesW pSheRemoveQuotesW = NULL; + +static void test_SheRemoveQuotesA(void) +{ + CHAR sz0[] = "A\"Test\""; + CHAR sz1[] = "\"Test\""; + CHAR sz2[] = "\"Test\"123"; + + BOOL bGotException = FALSE; + _SEH2_TRY + { + pSheRemoveQuotesA(NULL); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + bGotException = TRUE; + } + _SEH2_END; + ok_int(bGotException, TRUE); + + ok_ptr(pSheRemoveQuotesA(sz0), sz0); + ok_str(sz0, "A\"Test\""); + + ok_ptr(pSheRemoveQuotesA(sz1), sz1); + ok_str(sz1, "Test"); + + ok_ptr(pSheRemoveQuotesA(sz2), sz2); + ok_str(sz2, "Test"); +} + +static void test_SheRemoveQuotesW(void) +{ + WCHAR sz0[] = L"A\"Test\""; + WCHAR sz1[] = L"\"Test\""; + WCHAR sz2[] = L"\"Test\"123"; + + BOOL bGotException = FALSE; + _SEH2_TRY + { + pSheRemoveQuotesW(NULL); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + bGotException = TRUE; + } + _SEH2_END; + ok_int(bGotException, TRUE); + + ok_ptr(pSheRemoveQuotesW(sz0), sz0); + ok_wstr(sz0, L"A\"Test\""); + + ok_ptr(pSheRemoveQuotesW(sz1), sz1); + ok_wstr(sz1, L"Test"); + + ok_ptr(pSheRemoveQuotesW(sz2), sz2); + ok_wstr(sz2, L"Test"); +} + +START_TEST(She) +{ + HINSTANCE hShell32 = GetModuleHandleW(L"shell32"); + pSheRemoveQuotesA = (FN_SheRemoveQuotesA)GetProcAddress(hShell32, "SheRemoveQuotesA"); + pSheRemoveQuotesW = (FN_SheRemoveQuotesW)GetProcAddress(hShell32, "SheRemoveQuotesW"); + + if (!pSheRemoveQuotesA || !pSheRemoveQuotesW) + { + skip("SheRemoveQuotes not found"); + return; + } + + test_SheRemoveQuotesA(); + test_SheRemoveQuotesW(); +} diff --git a/modules/rostests/apitests/shell32/testlist.c b/modules/rostests/apitests/shell32/testlist.c index 5522cb0b659..2d364f19770 100644 --- a/modules/rostests/apitests/shell32/testlist.c +++ b/modules/rostests/apitests/shell32/testlist.c @@ -26,6 +26,7 @@ extern void func_SHChangeNotify(void); extern void func_SHCreateDataObject(void); extern void func_SHCreateFileDataObject(void); extern void func_SHCreateFileExtractIconW(void); +extern void func_She(void); extern void func_ShellExecCmdLine(void); extern void func_ShellExecuteEx(void); extern void func_ShellExecuteW(void); @@ -60,6 +61,7 @@ const struct test winetest_testlist[] = { "SHCreateDataObject", func_SHCreateDataObject }, { "SHCreateFileDataObject", func_SHCreateFileDataObject }, { "SHCreateFileExtractIconW", func_SHCreateFileExtractIconW }, + { "She", func_She }, { "ShellExecCmdLine", func_ShellExecCmdLine }, { "ShellExecuteEx", func_ShellExecuteEx }, { "ShellExecuteW", func_ShellExecuteW }, diff --git a/sdk/include/reactos/undocshell.h b/sdk/include/reactos/undocshell.h index 9196713ef6d..1d87844e1a9 100644 --- a/sdk/include/reactos/undocshell.h +++ b/sdk/include/reactos/undocshell.h @@ -653,6 +653,9 @@ BOOL WINAPI GUIDFromStringW( _Out_ LPGUID pguid ); +LPSTR WINAPI SheRemoveQuotesA(LPSTR psz); +LPWSTR WINAPI SheRemoveQuotesW(LPWSTR psz); + /***************************************************************************** * Shell32 resources */

1 year, 5 months

[reactos] 01/01: [SHELL32] Improve CFSDropTarget::CopyItems logic (#5481)

by Huw Campbell

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1273bbe417825fa4d6d01… commit 1273bbe417825fa4d6d012c7d19c58637a02da46 Author: Huw Campbell <huw.campbell(a)gmail.com> AuthorDate: Sat Aug 5 20:12:36 2023 +1000 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Aug 5 13:12:36 2023 +0300 [SHELL32] Improve CFSDropTarget::CopyItems logic (#5481) The previous version resolved the path of the parent then did logic assuming simple pidls. This now resolves each source directly. This change addresses a longstanding TODO in copying and moving to shell folders. It's a simple change, but it removes a bit of code and makes things simpler. Corresponding Wine PR: https://gitlab.winehq.org/wine/wine/-/merge_requests/3360 --- dll/win32/shell32/droptargets/CFSDropTarget.cpp | 99 ++++++++++--------------- 1 file changed, 41 insertions(+), 58 deletions(-) diff --git a/dll/win32/shell32/droptargets/CFSDropTarget.cpp b/dll/win32/shell32/droptargets/CFSDropTarget.cpp index 7dff8fb3885..10aee5e3532 100644 --- a/dll/win32/shell32/droptargets/CFSDropTarget.cpp +++ b/dll/win32/shell32/droptargets/CFSDropTarget.cpp @@ -24,82 +24,65 @@ WINE_DEFAULT_DEBUG_CHANNEL (shell); -/**************************************************************************** - * BuildPathsList - * - * Builds a list of paths like the one used in SHFileOperation from a table of - * PIDLs relative to the given base folder - */ -static WCHAR* BuildPathsList(LPCWSTR wszBasePath, int cidl, LPCITEMIDLIST *pidls) -{ - WCHAR *pwszPathsList = (WCHAR *)HeapAlloc(GetProcessHeap(), 0, MAX_PATH * sizeof(WCHAR) * cidl + 1); - WCHAR *pwszListPos = pwszPathsList; - - for (int i = 0; i < cidl; i++) - { - FileStructW* pDataW = _ILGetFileStructW(pidls[i]); - if (!pDataW) - { - ERR("Mistreating a pidl:\n"); - pdump_always(pidls[i]); - continue; - } - - PathCombineW(pwszListPos, wszBasePath, pDataW->wszName); - pwszListPos += wcslen(pwszListPos) + 1; - } - *pwszListPos = 0; - return pwszPathsList; -} /**************************************************************************** * CFSDropTarget::_CopyItems * - * copies items to this folder - * FIXME: We should not ask the parent folder: 'What is your path', and then manually build paths assuming everything is a simple pidl! - * We should be asking the parent folder: Give me a full name for this pidl (for each child!) + * copies or moves items to this folder */ HRESULT CFSDropTarget::_CopyItems(IShellFolder * pSFFrom, UINT cidl, LPCITEMIDLIST * apidl, BOOL bCopy) { - LPWSTR pszSrcList; - HRESULT hr; - WCHAR wszTargetPath[MAX_PATH + 1]; + HRESULT ret; + WCHAR wszDstPath[MAX_PATH + 1] = {0}; + PWCHAR pwszSrcPathsList = (PWCHAR) HeapAlloc(GetProcessHeap(), 0, MAX_PATH * sizeof(WCHAR) * cidl + 1); + if (!pwszSrcPathsList) + return E_OUTOFMEMORY; - wcscpy(wszTargetPath, m_sPathTarget); - //Double NULL terminate. - wszTargetPath[wcslen(wszTargetPath) + 1] = '\0'; + PWCHAR pwszListPos = pwszSrcPathsList; + STRRET strretFrom; + SHFILEOPSTRUCTW fop; - TRACE ("(%p)->(%p,%u,%p)\n", this, pSFFrom, cidl, apidl); + /* Build a double null terminated list of C strings from source paths */ + for (UINT i = 0; i < cidl; i++) + { + ret = pSFFrom->GetDisplayNameOf(apidl[i], SHGDN_FORPARSING, &strretFrom); + if (FAILED(ret)) + goto cleanup; - STRRET strretFrom; - hr = pSFFrom->GetDisplayNameOf(NULL, SHGDN_FORPARSING, &strretFrom); - if (hr != S_OK) - return hr; + ret = StrRetToBufW(&strretFrom, NULL, pwszListPos, MAX_PATH); + if (FAILED(ret)) + goto cleanup; - pszSrcList = BuildPathsList(strretFrom.pOleStr, cidl, apidl); - TRACE("Source file (just the first) = %s, target path = %s, bCopy: %d\n", debugstr_w(pszSrcList), debugstr_w(m_sPathTarget), bCopy); - CoTaskMemFree(strretFrom.pOleStr); - if (!pszSrcList) - return E_OUTOFMEMORY; + pwszListPos += lstrlenW(pwszListPos) + 1; + } + /* Append the final null. */ + *pwszListPos = L'\0'; - SHFILEOPSTRUCTW op = {0}; - op.pFrom = pszSrcList; - op.pTo = wszTargetPath; - op.hwnd = m_hwndSite; - op.wFunc = bCopy ? FO_COPY : FO_MOVE; - op.fFlags = FOF_ALLOWUNDO | FOF_NOCONFIRMMKDIR; + /* Build a double null terminated target (this path) */ + ret = StringCchCopyW(wszDstPath, MAX_PATH, m_sPathTarget); + if (FAILED(ret)) + goto cleanup; - int res = SHFileOperationW(&op); + wszDstPath[lstrlenW(wszDstPath) + 1] = L'\0'; - HeapFree(GetProcessHeap(), 0, pszSrcList); + ZeroMemory(&fop, sizeof(fop)); + fop.hwnd = m_hwndSite; + fop.wFunc = bCopy ? FO_COPY : FO_MOVE; + fop.pFrom = pwszSrcPathsList; + fop.pTo = wszDstPath; + fop.fFlags = FOF_ALLOWUNDO | FOF_NOCONFIRMMKDIR; + ret = S_OK; - if (res) + if (SHFileOperationW(&fop)) { - ERR("SHFileOperationW failed with 0x%x\n", res); - return E_FAIL; + ERR("SHFileOperationW failed\n"); + ret = E_FAIL; } - return S_OK; + +cleanup: + HeapFree(GetProcessHeap(), 0, pwszSrcPathsList); + return ret; } CFSDropTarget::CFSDropTarget():

1 year, 5 months

[reactos] 01/01: [NTOS:MM] Fix use-after-free error

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9bc5b8357adc4bc19ffeb… commit 9bc5b8357adc4bc19ffebc46238eac555ed7143a Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Jul 29 13:48:46 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Aug 5 11:57:58 2023 +0300 [NTOS:MM] Fix use-after-free error The VAD / memory area can get deleted when calling MmUnmapViewOfSegment, so it must not be used after that. --- ntoskrnl/mm/section.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/ntoskrnl/mm/section.c b/ntoskrnl/mm/section.c index 653b4759b27..fe07ac03df0 100644 --- a/ntoskrnl/mm/section.c +++ b/ntoskrnl/mm/section.c @@ -3670,13 +3670,16 @@ MiRosUnmapViewOfSection(IN PEPROCESS Process, { PMM_SECTION_SEGMENT Segment = MemoryArea->SectionData.Segment; PMMVAD Vad = &MemoryArea->VadNode; + PCONTROL_AREA ControlArea = Vad->ControlArea; PFILE_OBJECT FileObject; SIZE_T ViewSize; LARGE_INTEGER ViewOffset; ViewOffset.QuadPart = MemoryArea->SectionData.ViewOffset; - + InterlockedIncrement64(Segment->ReferenceCount); + ViewSize = PAGE_SIZE + ((Vad->EndingVpn - Vad->StartingVpn) << PAGE_SHIFT); + Status = MmUnmapViewOfSegment(AddressSpace, BaseAddress); if (!NT_SUCCESS(Status)) { @@ -3685,6 +3688,10 @@ MiRosUnmapViewOfSection(IN PEPROCESS Process, ASSERT(NT_SUCCESS(Status)); } + /* These might be deleted now */ + Vad = NULL; + MemoryArea = NULL; + if (FlagOn(*Segment->Flags, MM_PHYSICALMEMORY_SEGMENT)) { /* Don't bother */ @@ -3706,11 +3713,10 @@ MiRosUnmapViewOfSection(IN PEPROCESS Process, /* * Flush only when last mapping is deleted. - * FIXME: Why Vad->ControlArea == NULL? + * FIXME: Why ControlArea == NULL? Or rather: is ControlArea ever not NULL here? */ - if (Vad->ControlArea == NULL || Vad->ControlArea->NumberOfMappedViews == 1) + if (ControlArea == NULL || ControlArea->NumberOfMappedViews == 1) { - ViewSize = PAGE_SIZE + ((Vad->EndingVpn - Vad->StartingVpn) << PAGE_SHIFT); while (ViewSize > 0) { ULONG FlushSize = min(ViewSize, PAGE_ROUND_DOWN(MAXULONG));

1 year, 5 months

[reactos] 01/01: [MSCAT32] Convert stubs into forwarders

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2d7ff7ea334a600959328… commit 2d7ff7ea334a60095932861aa8ff8c7cdfba43c2 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Jul 30 12:24:15 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Aug 5 09:00:13 2023 +0300 [MSCAT32] Convert stubs into forwarders --- dll/win32/mscat32/mscat32.spec | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dll/win32/mscat32/mscat32.spec b/dll/win32/mscat32/mscat32.spec index b0b1788c53d..a1d3384fb3f 100644 --- a/dll/win32/mscat32/mscat32.spec +++ b/dll/win32/mscat32/mscat32.spec @@ -1,5 +1,5 @@ -1 stub CryptCATVerifyMember -#@ stub CatalogCompactHashDatabase +1 stdcall CryptCATVerifyMember(ptr ptr ptr) wintrust.CryptCATVerifyMember +@ stdcall CatalogCompactHashDatabase() wintrust.CatalogCompactHashDatabase @ stdcall CryptCATAdminAcquireContext(long ptr long) wintrust.CryptCATAdminAcquireContext @ stdcall CryptCATAdminAddCatalog(long wstr wstr long) wintrust.CryptCATAdminAddCatalog @ stdcall CryptCATAdminCalcHashFromFileHandle(long ptr ptr long) wintrust.CryptCATAdminCalcHashFromFileHandle @@ -7,10 +7,10 @@ @ stdcall CryptCATAdminReleaseCatalogContext(long long long) wintrust.CryptCATAdminReleaseCatalogContext @ stdcall CryptCATAdminReleaseContext(long long) wintrust.CryptCATAdminReleaseContext @ stdcall CryptCATCDFClose(ptr) wintrust.CryptCATCDFClose -@ stub CryptCATCDFEnumAttributes +@ stdcall CryptCATCDFEnumAttributes(ptr ptr ptr ptr) wintrust.CryptCATCDFEnumAttributes @ stdcall CryptCATCDFEnumAttributesWithCDFTag(ptr wstr ptr ptr ptr) wintrust.CryptCATCDFEnumAttributesWithCDFTag @ stdcall CryptCATCDFEnumCatAttributes(ptr ptr ptr) wintrust.CryptCATCDFEnumCatAttributes -@ stub CryptCATCDFEnumMembers +@ stdcall CryptCATCDFEnumMembers(ptr ptr ptr) wintrust.CryptCATCDFEnumMembers @ stdcall CryptCATCDFEnumMembersByCDFTag(ptr wstr ptr ptr long) wintrust.CryptCATCDFEnumMembersByCDFTag @ stdcall CryptCATCDFEnumMembersByCDFTagEx(ptr wstr ptr ptr long ptr) wintrust.CryptCATCDFEnumMembersByCDFTagEx @ stdcall CryptCATCDFOpen(wstr ptr) wintrust.CryptCATCDFOpen @@ -32,5 +32,5 @@ @ stdcall -private DllRegisterServer() wintrust.mscat32DllRegisterServer @ stdcall -private DllUnregisterServer() wintrust.mscat32DllUnregisterServer @ stdcall IsCatalogFile(ptr wstr) wintrust.IsCatalogFile -@ stub MsCatConstructHashTag -@ stub MsCatFreeHashTag +@ stdcall MsCatConstructHashTag(long ptr ptr) wintrust.MsCatConstructHashTag +@ stdcall MsCatFreeHashTag(ptr) wintrust.MsCatFreeHashTag

1 year, 5 months

[reactos] 01/01: [SHELL32_APITEST] Add test for Control Panel's GetDisplayNameOf (#5495)

by Doug Lyons

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=21e30f3f67ece980ae488… commit 21e30f3f67ece980ae488780cc3e80e9fc5692d4 Author: Doug Lyons <douglyons(a)douglyons.com> AuthorDate: Fri Aug 4 08:54:31 2023 -0500 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Aug 4 16:54:31 2023 +0300 [SHELL32_APITEST] Add test for Control Panel's GetDisplayNameOf (#5495) New regression test for shell32!GetDisplayNameOf, showing that the return value of the function will be 'S_FALSE' when the first argument is NULL. Also, the returned STRRET structure data is not modified by this call. CORE-18841 --- modules/rostests/apitests/shell32/CMakeLists.txt | 1 + .../rostests/apitests/shell32/GetDisplayNameOf.cpp | 44 ++++++++++++++++++++++ modules/rostests/apitests/shell32/testlist.c | 2 + 3 files changed, 47 insertions(+) diff --git a/modules/rostests/apitests/shell32/CMakeLists.txt b/modules/rostests/apitests/shell32/CMakeLists.txt index 53c87297d89..797e6e5ed1c 100644 --- a/modules/rostests/apitests/shell32/CMakeLists.txt +++ b/modules/rostests/apitests/shell32/CMakeLists.txt @@ -15,6 +15,7 @@ list(APPEND SOURCE DragDrop.cpp ExtractIconEx.cpp FindExecutable.cpp + GetDisplayNameOf.cpp IShellFolderViewCB.cpp OpenAs_RunDLL.cpp PathResolve.cpp diff --git a/modules/rostests/apitests/shell32/GetDisplayNameOf.cpp b/modules/rostests/apitests/shell32/GetDisplayNameOf.cpp new file mode 100644 index 00000000000..0211715fb1c --- /dev/null +++ b/modules/rostests/apitests/shell32/GetDisplayNameOf.cpp @@ -0,0 +1,44 @@ +/* + * PROJECT: ReactOS API tests + * LICENSE: LGPL-2.1+ (https://spdx.org/licenses/LGPL-2.1+) + * PURPOSE: Test for GetDisplayNameOf + * COPYRIGHT: Copyright 2023 Mark Jansen <mark.jansen(a)reactos.org> + * Copyright 2023 Doug Lyons <douglyons(a)douglyons.com> + */ + +#include "shelltest.h" +#include <stdio.h> +#include <shellutils.h> + +START_TEST(GetDisplayNameOf) +{ + HRESULT hr; + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + + CComPtr<IShellFolder> spPanel; + + hr = CoCreateInstance(CLSID_ControlPanel, NULL, CLSCTX_ALL, + IID_PPV_ARG(IShellFolder, &spPanel)); + ok_hr(hr, S_OK); + if (SUCCEEDED(hr)) + { + STRRET ret, expected; + + memset(&ret, 'a', sizeof(ret)); + memset(&expected, 'a', sizeof(expected)); + hr = spPanel->GetDisplayNameOf(NULL, SHGDN_NORMAL, &ret); + + /* Return value is expected to be 'S_FALSE', which is out-of-spec behavior. + * The data after function call is expected to be unchanged. */ + ok_hex(hr, S_FALSE); + ok(memcmp(&ret, &expected, sizeof(ret)) == 0, "Data was changed!\n"); + + /* Repeat the same test with SHGDN_FORPARSING */ + memset(&ret, 'a', sizeof(ret)); + memset(&expected, 'a', sizeof(expected)); + hr = spPanel->GetDisplayNameOf(NULL, SHGDN_FORPARSING, &ret); + + ok_hex(hr, S_FALSE); + ok(memcmp(&ret, &expected, sizeof(ret)) == 0, "Data was changed!\n"); + } +} diff --git a/modules/rostests/apitests/shell32/testlist.c b/modules/rostests/apitests/shell32/testlist.c index 2c65335551f..5522cb0b659 100644 --- a/modules/rostests/apitests/shell32/testlist.c +++ b/modules/rostests/apitests/shell32/testlist.c @@ -16,6 +16,7 @@ extern void func_CUserNotification(void); extern void func_DragDrop(void); extern void func_ExtractIconEx(void); extern void func_FindExecutable(void); +extern void func_GetDisplayNameOf(void); extern void func_IShellFolderViewCB(void); extern void func_menu(void); extern void func_OpenAs_RunDLL(void); @@ -49,6 +50,7 @@ const struct test winetest_testlist[] = { "DragDrop", func_DragDrop }, { "ExtractIconEx", func_ExtractIconEx }, { "FindExecutable", func_FindExecutable }, + { "GetDisplayNameOf", func_GetDisplayNameOf }, { "IShellFolderViewCB", func_IShellFolderViewCB }, { "menu", func_menu }, { "OpenAs_RunDLL", func_OpenAs_RunDLL },

1 year, 5 months

[reactos] 01/01: [SDK] Add SHPropertyBag_ReadInt/WriteInt prototype (#5522)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=329df0a9e6b3dd250e631… commit 329df0a9e6b3dd250e6315155da47a538df7060d Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Aug 4 22:53:07 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Aug 4 22:53:07 2023 +0900 [SDK] Add SHPropertyBag_ReadInt/WriteInt prototype (#5522) Add SHPropertyBag_ReadInt / SHPropertyBag_WriteInt into <shlwapi_undoc.h>. CORE-9283 --- sdk/include/reactos/shlwapi_undoc.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sdk/include/reactos/shlwapi_undoc.h b/sdk/include/reactos/shlwapi_undoc.h index a2cec2e047c..a50900a731e 100644 --- a/sdk/include/reactos/shlwapi_undoc.h +++ b/sdk/include/reactos/shlwapi_undoc.h @@ -96,6 +96,7 @@ HRESULT WINAPI SHPropertyBag_ReadType(IPropertyBag *ppb, LPCWSTR pszPropName, VA HRESULT WINAPI SHPropertyBag_ReadBOOL(IPropertyBag *ppb, LPCWSTR pszPropName, BOOL *pbValue); BOOL WINAPI SHPropertyBag_ReadBOOLOld(IPropertyBag *ppb, LPCWSTR pszPropName, BOOL bDefValue); HRESULT WINAPI SHPropertyBag_ReadSHORT(IPropertyBag *ppb, LPCWSTR pszPropName, SHORT *psValue); +HRESULT WINAPI SHPropertyBag_ReadInt(IPropertyBag *ppb, LPCWSTR pszPropName, LPINT pnValue); HRESULT WINAPI SHPropertyBag_ReadLONG(IPropertyBag *ppb, LPCWSTR pszPropName, LPLONG pValue); HRESULT WINAPI SHPropertyBag_ReadDWORD(IPropertyBag *ppb, LPCWSTR pszPropName, DWORD *pdwValue); HRESULT WINAPI SHPropertyBag_ReadBSTR(IPropertyBag *ppb, LPCWSTR pszPropName, BSTR *pbstr); @@ -113,6 +114,7 @@ HRESULT WINAPI SHGetPerScreenResName(OUT LPWSTR lpResName, HRESULT WINAPI SHPropertyBag_Delete(IPropertyBag *ppb, LPCWSTR pszPropName); HRESULT WINAPI SHPropertyBag_WriteBOOL(IPropertyBag *ppb, LPCWSTR pszPropName, BOOL bValue); HRESULT WINAPI SHPropertyBag_WriteSHORT(IPropertyBag *ppb, LPCWSTR pszPropName, SHORT sValue); +HRESULT WINAPI SHPropertyBag_WriteInt(IPropertyBag *ppb, LPCWSTR pszPropName, INT nValue); HRESULT WINAPI SHPropertyBag_WriteLONG(IPropertyBag *ppb, LPCWSTR pszPropName, LONG lValue); HRESULT WINAPI SHPropertyBag_WriteDWORD(IPropertyBag *ppb, LPCWSTR pszPropName, DWORD dwValue); HRESULT WINAPI SHPropertyBag_WriteStr(IPropertyBag *ppb, LPCWSTR pszPropName, LPCWSTR pszValue);

1 year, 5 months

[reactos] 01/01: [SHELL32][SDK] Implement SHLimitInputCombo (#5521)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2e9d03da90c00c96170b1… commit 2e9d03da90c00c96170b1def93712217d48eb862 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Aug 4 22:29:05 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Aug 4 22:29:05 2023 +0900 [SHELL32][SDK] Implement SHLimitInputCombo (#5521) SHLimitInputCombo function sets limits on valid characters for a combobox control. This function works like SHLimitInputEdit, but the target is a combobox instead of a textbox. CORE-9277 --- dll/win32/shell32/stubs.cpp | 11 ----------- dll/win32/shell32/wine/shellord.c | 23 +++++++++++++++++++++++ sdk/include/reactos/undocshell.h | 2 ++ 3 files changed, 25 insertions(+), 11 deletions(-) diff --git a/dll/win32/shell32/stubs.cpp b/dll/win32/shell32/stubs.cpp index 2d49322a184..460a423206c 100644 --- a/dll/win32/shell32/stubs.cpp +++ b/dll/win32/shell32/stubs.cpp @@ -36,17 +36,6 @@ SHFindComputer(LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2) return FALSE; } -/* - * Unimplemented - */ -EXTERN_C BOOL -WINAPI -SHLimitInputCombo(HWND hWnd, LPVOID lpUnknown) -{ - FIXME("SHLimitInputCombo() stub\n"); - return FALSE; -} - /* * Unimplemented */ diff --git a/dll/win32/shell32/wine/shellord.c b/dll/win32/shell32/wine/shellord.c index fde33759c2a..43c3775c0e8 100644 --- a/dll/win32/shell32/wine/shellord.c +++ b/dll/win32/shell32/wine/shellord.c @@ -2815,3 +2815,26 @@ SHLimitInputEdit(HWND hWnd, IShellFolder *psf) return hr; } + +#ifdef __REACTOS__ +/************************************************************************* + * SHLimitInputCombo [SHELL32.748] + * + * Sets limits on valid characters for a combobox control. + * This function works like SHLimitInputEdit, but the target is a combobox + * instead of a textbox. + */ +HRESULT WINAPI +SHLimitInputCombo(HWND hWnd, IShellFolder *psf) +{ + HWND hwndEdit; + + TRACE("%p %p\n", hWnd, psf); + + hwndEdit = GetTopWindow(hWnd); + if (!hwndEdit) + return E_FAIL; + + return SHLimitInputEdit(hwndEdit, psf); +} +#endif diff --git a/sdk/include/reactos/undocshell.h b/sdk/include/reactos/undocshell.h index 7aeb796c8b7..9196713ef6d 100644 --- a/sdk/include/reactos/undocshell.h +++ b/sdk/include/reactos/undocshell.h @@ -644,6 +644,8 @@ BOOL WINAPI SHInitRestricted(LPCVOID unused, LPCVOID inpRegKey); #define SMC_EXEC 4 INT WINAPI Shell_GetCachedImageIndex(LPCWSTR szPath, INT nIndex, UINT bSimulateDoc); +HRESULT WINAPI SHLimitInputCombo(HWND hWnd, IShellFolder *psf); + HRESULT WINAPI SHGetImageList(int iImageList, REFIID riid, void **ppv); BOOL WINAPI GUIDFromStringW(

1 year, 5 months

[reactos] 01/01: [EXPLORER] Add support for Windows 7 style system tray icon spacing (#5489)

by Carl J. Bialorucki

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5b40f6f353d47bd341439… commit 5b40f6f353d47bd3414399a64bf47e40dd28a8e0 Author: Carl J. Bialorucki <cbialo2(a)outlook.com> AuthorDate: Fri Aug 4 05:20:19 2023 -0600 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Aug 4 14:20:19 2023 +0300 [EXPLORER] Add support for Windows 7 style system tray icon spacing (#5489) When using large taskbar icon: - Increase the padding around system tray icons. - Push the clock text further to the right, increasing the left padding between the clock and notification icons. This matches Windows 7 shell behavior. - Correct the spacing for the clock area, in the case when bPreferDate is enabled, only two lines are visible, and the day of the week is shorter than the date. CORE-11698 --- base/shell/explorer/precomp.h | 1 + base/shell/explorer/settings.cpp | 4 ++++ base/shell/explorer/syspager.cpp | 15 ++++++++++++++- base/shell/explorer/trayclock.cpp | 9 ++++++++- 4 files changed, 27 insertions(+), 2 deletions(-) diff --git a/base/shell/explorer/precomp.h b/base/shell/explorer/precomp.h index 91770090ef5..a52e3704266 100644 --- a/base/shell/explorer/precomp.h +++ b/base/shell/explorer/precomp.h @@ -211,6 +211,7 @@ struct TaskbarSettings BOOL bPreferDate; BOOL bHideInactiveIcons; BOOL bSmallIcons; + BOOL bCompactTrayIcons; TW_STRUCKRECTS2 sr; BOOL Load(); diff --git a/base/shell/explorer/settings.cpp b/base/shell/explorer/settings.cpp index 4c6b3dd2633..0f3daeddea6 100644 --- a/base/shell/explorer/settings.cpp +++ b/base/shell/explorer/settings.cpp @@ -32,6 +32,7 @@ BOOL TaskbarSettings::Save() SHSetValueW(hkExplorer, L"Advanced", L"TaskbarSizeMove", REG_DWORD, &bAllowSizeMove, sizeof(bAllowSizeMove)); sr.cbSize = sizeof(sr); SHSetValueW(hkExplorer, L"Advanced", L"TaskbarSmallIcons", REG_DWORD, &bSmallIcons, sizeof(bSmallIcons)); + SHSetValueW(hkExplorer, L"Advanced", L"CompactTrayIcons", REG_DWORD, &bCompactTrayIcons, sizeof(bCompactTrayIcons)); SHSetValueW(hkExplorer, L"StuckRects2", L"Settings", REG_BINARY, &sr, sizeof(sr)); /* TODO: AutoHide writes something to HKEY_CURRENT_USER\Software\Microsoft\Internet Explorer\Desktop\Components\0 figure out what and why */ @@ -61,6 +62,9 @@ BOOL TaskbarSettings::Load() dwRet = SHGetValueW(hkExplorer, L"Advanced", L"TaskbarSmallIcons", NULL, &dwValue, &cbSize); bSmallIcons = (dwRet == ERROR_SUCCESS) ? (dwValue != 0) : TRUE; + dwRet = SHGetValueW(hkExplorer, L"Advanced", L"CompactTrayIcons", NULL, &dwValue, &cbSize); + bCompactTrayIcons = (dwRet == ERROR_SUCCESS) ? (dwValue != 0) : bSmallIcons; + cbSize = sizeof(sr); dwRet = SHGetValueW(hkExplorer, L"StuckRects2", L"Settings", NULL, &sr, &cbSize); diff --git a/base/shell/explorer/syspager.cpp b/base/shell/explorer/syspager.cpp index 1bb2691b40f..35eb0faf75f 100644 --- a/base/shell/explorer/syspager.cpp +++ b/base/shell/explorer/syspager.cpp @@ -1252,6 +1252,11 @@ void CNotifyToolbar::Initialize(HWND hWndParent, CBalloonQueue * queue) tbm.dwMask = TBMF_BARPAD | TBMF_BUTTONSPACING | TBMF_PAD; tbm.cxPad = 1; tbm.cyPad = 1; + if (!g_TaskbarSettings.bCompactTrayIcons) + { + tbm.cxPad = GetSystemMetrics(SM_CXSMICON) / 2; + tbm.cyPad = GetSystemMetrics(SM_CYSMICON) / 2; + } tbm.cxBarPad = 1; tbm.cyBarPad = 1; tbm.cxButtonSpacing = 1; @@ -1397,11 +1402,19 @@ void CSysPagerWnd::GetSize(IN BOOL IsHorizontal, IN PSIZE size) INT columns = 0; INT cyButton = GetSystemMetrics(SM_CYSMICON) + 2; INT cxButton = GetSystemMetrics(SM_CXSMICON) + 2; + if (!g_TaskbarSettings.bCompactTrayIcons) + { + cyButton = MulDiv(GetSystemMetrics(SM_CYSMICON), 3, 2); + cxButton = MulDiv(GetSystemMetrics(SM_CXSMICON), 3, 2); + } int VisibleButtonCount = Toolbar.GetVisibleButtonCount(); if (IsHorizontal) { - rows = max(size->cy / cyButton, 1); + if (!g_TaskbarSettings.bCompactTrayIcons) + rows = max(size->cy / MulDiv(cyButton, 3, 2), 1); + else + rows = max(size->cy / cyButton, 1); columns = (VisibleButtonCount + rows - 1) / rows; } else diff --git a/base/shell/explorer/trayclock.cpp b/base/shell/explorer/trayclock.cpp index 39277e19a04..f25c63dbe9c 100644 --- a/base/shell/explorer/trayclock.cpp +++ b/base/shell/explorer/trayclock.cpp @@ -267,6 +267,10 @@ WORD CTrayClockWnd::GetMinimumSize(IN BOOL Horizontal, IN OUT PSIZE pSize) if (!LinesMeasured) return 0; + /* Prevents the date from being cut off when the day of the week is shorter than the date. */ + if (VisibleLines > 1 && g_TaskbarSettings.bPreferDate) + szMax.cx = LineSizes[CLOCKWND_FORMAT_DATE].cx; + for (i = 0; i < CLOCKWND_FORMAT_COUNT; i++) { if (LineSizes[i].cx != 0) @@ -567,8 +571,11 @@ VOID CTrayClockWnd::PaintLine(IN HDC hDC, IN OUT RECT *rcClient, IN UINT LineNum if (LineSizes[LineNumber].cx == 0) return; + INT HShift = ((IsHorizontal && (VisibleLines <= 1 || + g_TaskbarSettings.bCompactTrayIcons)) ? 0 : TRAY_CLOCK_WND_SPACING_X); + TextOut(hDC, - (rcClient->right - LineSizes[szLinesIndex].cx) / 2, + ((rcClient->right - LineSizes[szLinesIndex].cx) / 2) + HShift, rcClient->top + TRAY_CLOCK_WND_SPACING_Y, szLines[szLinesIndex], wcslen(szLines[szLinesIndex]));

1 year, 5 months

[reactos] 01/01: [SOLITAIRE] Use the shell about dialog for solitaire and spider (#5493)

by Carl J. Bialorucki

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f65c03a28c94c5f893f28… commit f65c03a28c94c5f893f2837f9761c10e8aaa2fc1 Author: Carl J. Bialorucki <cbialo2(a)outlook.com> AuthorDate: Thu Aug 3 16:50:39 2023 -0600 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Aug 4 01:50:39 2023 +0300 [SOLITAIRE] Use the shell about dialog for solitaire and spider (#5493) Use the shell about dialog for solitaire and spider solitaire. This increases visual consistency throughout the operating system and matches the behavior of the game from Windows XP. - Use the shell about dialog instead of a plain MessageBox. - Since the shell about dialog can only handle two lines of text, shorten the message dialog text to two lines. --- base/applications/games/solitaire/CMakeLists.txt | 2 +- base/applications/games/solitaire/lang/bg-BG.rc | 2 +- base/applications/games/solitaire/lang/ca-ES.rc | 2 +- base/applications/games/solitaire/lang/cs-CZ.rc | 2 +- base/applications/games/solitaire/lang/de-DE.rc | 2 +- base/applications/games/solitaire/lang/el-GR.rc | 2 +- base/applications/games/solitaire/lang/en-US.rc | 2 +- base/applications/games/solitaire/lang/es-ES.rc | 2 +- base/applications/games/solitaire/lang/eu-ES.rc | 2 +- base/applications/games/solitaire/lang/fr-FR.rc | 2 +- base/applications/games/solitaire/lang/he-IL.rc | 2 +- base/applications/games/solitaire/lang/hr-HR.rc | 2 +- base/applications/games/solitaire/lang/hu-HU.rc | 2 +- base/applications/games/solitaire/lang/id-ID.rc | 2 +- base/applications/games/solitaire/lang/it-IT.rc | 2 +- base/applications/games/solitaire/lang/ja-JP.rc | 2 +- base/applications/games/solitaire/lang/ko-KR.rc | 2 +- base/applications/games/solitaire/lang/lt-LT.rc | 2 +- base/applications/games/solitaire/lang/nl-NL.rc | 2 +- base/applications/games/solitaire/lang/no-NO.rc | 2 +- base/applications/games/solitaire/lang/pl-PL.rc | 2 +- base/applications/games/solitaire/lang/pt-BR.rc | 2 +- base/applications/games/solitaire/lang/ro-RO.rc | 2 +- base/applications/games/solitaire/lang/ru-RU.rc | 2 +- base/applications/games/solitaire/lang/sk-SK.rc | 2 +- base/applications/games/solitaire/lang/sq-AL.rc | 2 +- base/applications/games/solitaire/lang/sv-SE.rc | 2 +- base/applications/games/solitaire/lang/th-TH.rc | 2 +- base/applications/games/solitaire/lang/tr-TR.rc | 2 +- base/applications/games/solitaire/lang/uk-UA.rc | 2 +- base/applications/games/solitaire/lang/zh-CN.rc | 2 +- base/applications/games/solitaire/lang/zh-HK.rc | 2 +- base/applications/games/solitaire/lang/zh-TW.rc | 2 +- base/applications/games/solitaire/solitaire.cpp | 4 +++- base/applications/games/spider/CMakeLists.txt | 2 +- base/applications/games/spider/lang/bg-BG.rc | 2 +- base/applications/games/spider/lang/cs-CZ.rc | 2 +- base/applications/games/spider/lang/de-DE.rc | 2 +- base/applications/games/spider/lang/en-US.rc | 2 +- base/applications/games/spider/lang/es-ES.rc | 2 +- base/applications/games/spider/lang/fr-FR.rc | 2 +- base/applications/games/spider/lang/he-IL.rc | 2 +- base/applications/games/spider/lang/hr-HR.rc | 2 +- base/applications/games/spider/lang/hu-HU.rc | 2 +- base/applications/games/spider/lang/it-IT.rc | 2 +- base/applications/games/spider/lang/ja-JP.rc | 2 +- base/applications/games/spider/lang/nl-NL.rc | 2 +- base/applications/games/spider/lang/pl-PL.rc | 2 +- base/applications/games/spider/lang/pt-BR.rc | 2 +- base/applications/games/spider/lang/ro-RO.rc | 2 +- base/applications/games/spider/lang/ru-RU.rc | 2 +- base/applications/games/spider/lang/sk-SK.rc | 2 +- base/applications/games/spider/lang/sq-AL.rc | 2 +- base/applications/games/spider/lang/sv-SE.rc | 2 +- base/applications/games/spider/lang/tr-TR.rc | 2 +- base/applications/games/spider/lang/uk-UA.rc | 2 +- base/applications/games/spider/lang/zh-CN.rc | 2 +- base/applications/games/spider/spider.cpp | 4 +++- 58 files changed, 62 insertions(+), 58 deletions(-) diff --git a/base/applications/games/solitaire/CMakeLists.txt b/base/applications/games/solitaire/CMakeLists.txt index a229418320a..8f5ec1b023d 100644 --- a/base/applications/games/solitaire/CMakeLists.txt +++ b/base/applications/games/solitaire/CMakeLists.txt @@ -10,6 +10,6 @@ add_rc_deps(rsrc.rc ${CMAKE_CURRENT_SOURCE_DIR}/solitaire.ico) add_executable(sol ${SOURCE} rsrc.rc) target_link_libraries(sol cardlib) set_module_type(sol win32gui UNICODE) -add_importlibs(sol advapi32 comctl32 user32 gdi32 msvcrt kernel32) +add_importlibs(sol advapi32 comctl32 shell32 user32 gdi32 msvcrt kernel32) add_pch(sol solitaire.h SOURCE) add_cd_file(TARGET sol DESTINATION reactos/system32 FOR all) diff --git a/base/applications/games/solitaire/lang/bg-BG.rc b/base/applications/games/solitaire/lang/bg-BG.rc index 2b8a79bf8b5..741f1ffcd7e 100644 --- a/base/applications/games/solitaire/lang/bg-BG.rc +++ b/base/applications/games/solitaire/lang/bg-BG.rc @@ -55,7 +55,7 @@ END STRINGTABLE BEGIN IDS_SOL_NAME "Пасианс" - IDS_SOL_ABOUT "Solitaire by J Brown\n\nCardLib version 1.0." + IDS_SOL_ABOUT "Solitaire by J Brown\nCardLib version 1.0" IDS_SOL_QUIT "Да прекратя ли играта?" IDS_SOL_WIN "Поздравления, победихте!!" IDS_SOL_DEAL "Ново раздаване?" diff --git a/base/applications/games/solitaire/lang/ca-ES.rc b/base/applications/games/solitaire/lang/ca-ES.rc index 231eb5589b3..5fa358761c2 100644 --- a/base/applications/games/solitaire/lang/ca-ES.rc +++ b/base/applications/games/solitaire/lang/ca-ES.rc @@ -55,7 +55,7 @@ END STRINGTABLE BEGIN IDS_SOL_NAME "Solitari" - IDS_SOL_ABOUT "Solitari per J Brown\n\nCardLib versio 1.0." + IDS_SOL_ABOUT "Solitari per J Brown\nCardLib versio 1.0" IDS_SOL_QUIT "Voleu sortir del joc actual?" IDS_SOL_WIN "Felicitats, heu guanyat!!" IDS_SOL_DEAL "Deal again?" diff --git a/base/applications/games/solitaire/lang/cs-CZ.rc b/base/applications/games/solitaire/lang/cs-CZ.rc index bb61acd6295..3acd94595fa 100644 --- a/base/applications/games/solitaire/lang/cs-CZ.rc +++ b/base/applications/games/solitaire/lang/cs-CZ.rc @@ -53,7 +53,7 @@ END STRINGTABLE BEGIN IDS_SOL_NAME "Solitaire" - IDS_SOL_ABOUT "Solitaire by J Brown\n\nCardLib verze 1.0." + IDS_SOL_ABOUT "Solitaire by J Brown\nCardLib verze 1.0" IDS_SOL_QUIT "Ukončit rozehranou hru?" IDS_SOL_WIN "Gratulujeme, zvítězili jste!!" IDS_SOL_DEAL "Rozdat znova?" diff --git a/base/applications/games/solitaire/lang/de-DE.rc b/base/applications/games/solitaire/lang/de-DE.rc index 3211c65648b..b8ab16c2c4d 100644 --- a/base/applications/games/solitaire/lang/de-DE.rc +++ b/base/applications/games/solitaire/lang/de-DE.rc @@ -55,7 +55,7 @@ END STRINGTABLE BEGIN IDS_SOL_NAME "Solitär" - IDS_SOL_ABOUT "Solitär von J Brown\n\nCardLib version 1.0." + IDS_SOL_ABOUT "Solitär von J Brown\nCardLib version 1.0" IDS_SOL_QUIT "Laufendes Spiel beenden?" IDS_SOL_WIN "Glückwunsch, Sie haben gewonnen!" IDS_SOL_DEAL "Neu geben?" diff --git a/base/applications/games/solitaire/lang/el-GR.rc b/base/applications/games/solitaire/lang/el-GR.rc index 08707ffce52..30954f2f1fd 100644 --- a/base/applications/games/solitaire/lang/el-GR.rc +++ b/base/applications/games/solitaire/lang/el-GR.rc @@ -55,7 +55,7 @@ END STRINGTABLE BEGIN IDS_SOL_NAME "Πασιέντζα" - IDS_SOL_ABOUT "Solitaire by J Brown\n\nCardLib version 1.0." + IDS_SOL_ABOUT "Solitaire by J Brown\nCardLib version 1.0" IDS_SOL_QUIT "Τερματισμός του πιαχνιδιού αυτού;" IDS_SOL_WIN "Συγχαρητήρια, κερδίσατε!!" IDS_SOL_DEAL "Deal again?" diff --git a/base/applications/games/solitaire/lang/en-US.rc b/base/applications/games/solitaire/lang/en-US.rc index b8111ee7e2b..427fafa61ee 100644 --- a/base/applications/games/solitaire/lang/en-US.rc +++ b/base/applications/games/solitaire/lang/en-US.rc @@ -55,7 +55,7 @@ END STRINGTABLE BEGIN IDS_SOL_NAME "Solitaire" - IDS_SOL_ABOUT "Solitaire by J Brown\n\nCardLib version 1.0." + IDS_SOL_ABOUT "Solitaire by J Brown\nCardLib version 1.0" IDS_SOL_QUIT "Quit the current game?" IDS_SOL_WIN "Congratulations, you win!" IDS_SOL_DEAL "Deal again?" diff --git a/base/applications/games/solitaire/lang/es-ES.rc b/base/applications/games/solitaire/lang/es-ES.rc index 16d1944faa8..bc39ffb7d3e 100644 --- a/base/applications/games/solitaire/lang/es-ES.rc +++ b/base/applications/games/solitaire/lang/es-ES.rc @@ -57,7 +57,7 @@ END STRINGTABLE BEGIN IDS_SOL_NAME "Solitario" - IDS_SOL_ABOUT "Solitario por J Brown\n\nCardLib versión 1.0." + IDS_SOL_ABOUT "Solitario por J Brown\nCardLib versión 1.0" IDS_SOL_QUIT "¿Salir del juego actual?" IDS_SOL_WIN "¡Enhorabuena, has ganado!" IDS_SOL_DEAL "¿Jugar de nuevo?" diff --git a/base/applications/games/solitaire/lang/eu-ES.rc b/base/applications/games/solitaire/lang/eu-ES.rc index 064f283d75e..f8af4d832df 100644 --- a/base/applications/games/solitaire/lang/eu-ES.rc +++ b/base/applications/games/solitaire/lang/eu-ES.rc @@ -55,7 +55,7 @@ END STRINGTABLE BEGIN IDS_SOL_NAME "Solitarioa" - IDS_SOL_ABOUT "Solitarioa J Brown\n\nCardLib-k egina 1.0. bertsioa" + IDS_SOL_ABOUT "Solitarioa J Brown\nCardLib-k egina 1.0 bertsioa" IDS_SOL_QUIT "Uneko jokoa amaitu?" IDS_SOL_WIN "Zorionak, irabazi duzu!!" IDS_SOL_DEAL "Deal again?" diff --git a/base/applications/games/solitaire/lang/fr-FR.rc b/base/applications/games/solitaire/lang/fr-FR.rc index 2f81611d373..662b4abd1c4 100644 --- a/base/applications/games/solitaire/lang/fr-FR.rc +++ b/base/applications/games/solitaire/lang/fr-FR.rc @@ -55,7 +55,7 @@ END STRINGTABLE BEGIN IDS_SOL_NAME "Solitaire" - IDS_SOL_ABOUT "Solitaire par J Brown\n\nCardLib version 1.0." + IDS_SOL_ABOUT "Solitaire par J Brown\nCardLib version 1.0" IDS_SOL_QUIT "Quitter le jeu actuel ?" IDS_SOL_WIN "Félicitations ! Vous avez gagné !" IDS_SOL_DEAL "Redistribuer ?" diff --git a/base/applications/games/solitaire/lang/he-IL.rc b/base/applications/games/solitaire/lang/he-IL.rc index dda42542783..358d69848c3 100644 --- a/base/applications/games/solitaire/lang/he-IL.rc +++ b/base/applications/games/solitaire/lang/he-IL.rc @@ -57,7 +57,7 @@ END STRINGTABLE BEGIN IDS_SOL_NAME "סוליטייר" - IDS_SOL_ABOUT "Solitaire by J Brown\n\nCardLib version 1.0." + IDS_SOL_ABOUT "Solitaire by J Brown\nCardLib version 1.0" IDS_SOL_QUIT "להפסיק את המשחק הנוכחי?" IDS_SOL_WIN "כל הכבוד, ניצחת!" IDS_SOL_DEAL "לחלק שוב?" diff --git a/base/applications/games/solitaire/lang/hr-HR.rc b/base/applications/games/solitaire/lang/hr-HR.rc index 0f38cca40d2..46ad0a1777f 100644 --- a/base/applications/games/solitaire/lang/hr-HR.rc +++ b/base/applications/games/solitaire/lang/hr-HR.rc @@ -54,7 +54,7 @@ END STRINGTABLE BEGIN IDS_SOL_NAME "Solitaire" - IDS_SOL_ABOUT "Solitaire od J Brown\n\nCardLib verzija 1.0." + IDS_SOL_ABOUT "Solitaire od J Brown\nCardLib verzija 1.0" IDS_SOL_QUIT "Napusti trenutnu igru?" IDS_SOL_WIN "Čestitke, pobijedili ste!" IDS_SOL_DEAL "Ponovi?" diff --git a/base/applications/games/solitaire/lang/hu-HU.rc b/base/applications/games/solitaire/lang/hu-HU.rc index 981be2f1663..408125354f1 100644 --- a/base/applications/games/solitaire/lang/hu-HU.rc +++ b/base/applications/games/solitaire/lang/hu-HU.rc @@ -55,7 +55,7 @@ END STRINGTABLE BEGIN IDS_SOL_NAME "Pasziánsz" - IDS_SOL_ABOUT "Pasziánsz, készítette J Brown\n\nCardLib verzió 1.0." + IDS_SOL_ABOUT "Pasziánsz, készítette J Brown\nCardLib verzió 1.0" IDS_SOL_QUIT "Kilépés ebből a játékból?" IDS_SOL_WIN "Gratulálok, Ön nyert!" IDS_SOL_DEAL "Új leosztás?" diff --git a/base/applications/games/solitaire/lang/id-ID.rc b/base/applications/games/solitaire/lang/id-ID.rc index b877e5ae7a1..63bf4f8c149 100644 --- a/base/applications/games/solitaire/lang/id-ID.rc +++ b/base/applications/games/solitaire/lang/id-ID.rc @@ -55,7 +55,7 @@ END STRINGTABLE BEGIN IDS_SOL_NAME "Solitaire" - IDS_SOL_ABOUT "Solitaire oleh J Brown\n\nCardLib version 1.0." + IDS_SOL_ABOUT "Solitaire oleh J Brown\nCardLib version 1.0" IDS_SOL_QUIT "Keluar dari permainan saat ini?" IDS_SOL_WIN "Selamat, anda menang!" IDS_SOL_DEAL "Main lagi?" diff --git a/base/applications/games/solitaire/lang/it-IT.rc b/base/applications/games/solitaire/lang/it-IT.rc index 845f574e154..7305216bba1 100644 --- a/base/applications/games/solitaire/lang/it-IT.rc +++ b/base/applications/games/solitaire/lang/it-IT.rc @@ -56,7 +56,7 @@ END STRINGTABLE BEGIN IDS_SOL_NAME "Solitario" - IDS_SOL_ABOUT "Solitario by J Brown\n\nCardLib versione 1.0." + IDS_SOL_ABOUT "Solitario by J Brown\nCardLib versione 1.0" IDS_SOL_QUIT "Chiudere la partita in corso?" IDS_SOL_WIN "Congratulazioni, hai vinto!!" IDS_SOL_DEAL "Nuova partita?" diff --git a/base/applications/games/solitaire/lang/ja-JP.rc b/base/applications/games/solitaire/lang/ja-JP.rc index fc8bd2fa945..849a114c488 100644 --- a/base/applications/games/solitaire/lang/ja-JP.rc +++ b/base/applications/games/solitaire/lang/ja-JP.rc @@ -54,7 +54,7 @@ END STRINGTABLE BEGIN IDS_SOL_NAME "ソリティア" - IDS_SOL_ABOUT "J Brown によるソリティア\n\nCardLib バージョン 1.0。" + IDS_SOL_ABOUT "J Brown によるソリティア\nCardLib バージョン 1.0" IDS_SOL_QUIT "現在のゲームを終了しますか?" IDS_SOL_WIN "おめでとう、あなたの勝ちです!" IDS_SOL_DEAL "もう一度カードを配りますか?" diff --git a/base/applications/games/solitaire/lang/ko-KR.rc b/base/applications/games/solitaire/lang/ko-KR.rc index 5c16be49a6b..11be942c581 100644 --- a/base/applications/games/solitaire/lang/ko-KR.rc +++ b/base/applications/games/solitaire/lang/ko-KR.rc @@ -49,7 +49,7 @@ END STRINGTABLE BEGIN IDS_SOL_NAME "카드놀이" - IDS_SOL_ABOUT "Solitaire by J Brown\n\nCardLib version 1.0." + IDS_SOL_ABOUT "Solitaire by J Brown\nCardLib version 1.0" IDS_SOL_QUIT "현재 게임을 끝낼가요?" IDS_SOL_WIN "축하합니다!!" IDS_SOL_DEAL "Deal again?" diff --git a/base/applications/games/solitaire/lang/lt-LT.rc b/base/applications/games/solitaire/lang/lt-LT.rc index dbb674c3857..04c6f508cb8 100644 --- a/base/applications/games/solitaire/lang/lt-LT.rc +++ b/base/applications/games/solitaire/lang/lt-LT.rc @@ -55,7 +55,7 @@ END STRINGTABLE BEGIN IDS_SOL_NAME "Solitaire" - IDS_SOL_ABOUT "Solitaire\n\nSukurta J Brown\n\nCardLib version 1.0." + IDS_SOL_ABOUT "Solitaire sukurta J Brown\nCardLib version 1.0" IDS_SOL_QUIT "Baigti žaidimą?" IDS_SOL_WIN "Sveikiname, jūs laimėjote!!" IDS_SOL_DEAL "Dalinti vėl?" diff --git a/base/applications/games/solitaire/lang/nl-NL.rc b/base/applications/games/solitaire/lang/nl-NL.rc index 6e71cd9fc59..a1247a2bf40 100644 --- a/base/applications/games/solitaire/lang/nl-NL.rc +++ b/base/applications/games/solitaire/lang/nl-NL.rc @@ -55,7 +55,7 @@ END STRINGTABLE BEGIN IDS_SOL_NAME "Solitaire" - IDS_SOL_ABOUT "Solitaire door J Brown\n\nCardLib versie 1.0." + IDS_SOL_ABOUT "Solitaire door J Brown\nCardLib versie 1.0" IDS_SOL_QUIT "Het huidige spel afsluiten?" IDS_SOL_WIN "Gefeliciteerd, u heeft gewonnen!" IDS_SOL_DEAL "Nogmaals spelen?" diff --git a/base/applications/games/solitaire/lang/no-NO.rc b/base/applications/games/solitaire/lang/no-NO.rc index 79600a528cb..a4c8ccab983 100644 --- a/base/applications/games/solitaire/lang/no-NO.rc +++ b/base/applications/games/solitaire/lang/no-NO.rc @@ -47,7 +47,7 @@ END STRINGTABLE BEGIN IDS_SOL_NAME "Kabal" - IDS_SOL_ABOUT "Kabal av J Brown\n\nCardLib versjon 1.0." + IDS_SOL_ABOUT "Kabal av J Brown\nCardLib versjon 1.0" IDS_SOL_QUIT "Slutt nåværende spill?" IDS_SOL_WIN "Gratulerer, du vant!!" IDS_SOL_DEAL "Del ut igjen?" diff --git a/base/applications/games/solitaire/lang/pl-PL.rc b/base/applications/games/solitaire/lang/pl-PL.rc index 1cc70b5f4df..78c57462e2d 100644 --- a/base/applications/games/solitaire/lang/pl-PL.rc +++ b/base/applications/games/solitaire/lang/pl-PL.rc @@ -58,7 +58,7 @@ END STRINGTABLE BEGIN IDS_SOL_NAME "Pasjans" - IDS_SOL_ABOUT "Pasjans - autor: J. Brown\n\nCardLib wersja 1.0." + IDS_SOL_ABOUT "Pasjans - autor: J. Brown\nCardLib wersja 1.0" IDS_SOL_QUIT "Zakończyć aktualną grę?" IDS_SOL_WIN "Gratulacje, wygrałeś!" IDS_SOL_DEAL "Nowe rozdanie?" diff --git a/base/applications/games/solitaire/lang/pt-BR.rc b/base/applications/games/solitaire/lang/pt-BR.rc index 6f8563bc8a2..96150204679 100644 --- a/base/applications/games/solitaire/lang/pt-BR.rc +++ b/base/applications/games/solitaire/lang/pt-BR.rc @@ -49,7 +49,7 @@ END STRINGTABLE BEGIN IDS_SOL_NAME "Paciência" - IDS_SOL_ABOUT "Paciência por J Brown\n\nCardLib versão 1.0." + IDS_SOL_ABOUT "Paciência por J Brown\nCardLib versão 1.0" IDS_SOL_QUIT "Sair do jogo Atual?" IDS_SOL_WIN "Parabéns, Você ganhou!" IDS_SOL_DEAL "Jogar de Novo?" diff --git a/base/applications/games/solitaire/lang/ro-RO.rc b/base/applications/games/solitaire/lang/ro-RO.rc index bbcc5461f69..a5740a88549 100644 --- a/base/applications/games/solitaire/lang/ro-RO.rc +++ b/base/applications/games/solitaire/lang/ro-RO.rc @@ -56,7 +56,7 @@ END STRINGTABLE BEGIN IDS_SOL_NAME "Pasiență" - IDS_SOL_ABOUT "Pasiență de J Brown\nTradus de Petru Dimitriu\nCardLib versiunea 1.0." + IDS_SOL_ABOUT "Pasiență de J Brown; Tradus de Petru Dimitriu\nCardLib versiunea 1.0" IDS_SOL_QUIT "Abandonați jocul curent?" IDS_SOL_WIN "Felicitări, ați câștigat!" IDS_SOL_DEAL "O nouă rundă?" diff --git a/base/applications/games/solitaire/lang/ru-RU.rc b/base/applications/games/solitaire/lang/ru-RU.rc index 047ce7487f8..eff52d849cb 100644 --- a/base/applications/games/solitaire/lang/ru-RU.rc +++ b/base/applications/games/solitaire/lang/ru-RU.rc @@ -49,7 +49,7 @@ END STRINGTABLE BEGIN IDS_SOL_NAME "Пасьянс" - IDS_SOL_ABOUT "Пасьянс от J Brown\n\nCardLib версии 1.0." + IDS_SOL_ABOUT "Пасьянс от J Brown\nCardLib версии 1.0" IDS_SOL_QUIT "Закончить текущую игру?" IDS_SOL_WIN "Поздравляем, вы выиграли!" IDS_SOL_DEAL "Раздать ещё раз?" diff --git a/base/applications/games/solitaire/lang/sk-SK.rc b/base/applications/games/solitaire/lang/sk-SK.rc index 11a33849c43..0f69fe91379 100644 --- a/base/applications/games/solitaire/lang/sk-SK.rc +++ b/base/applications/games/solitaire/lang/sk-SK.rc @@ -56,7 +56,7 @@ END STRINGTABLE BEGIN IDS_SOL_NAME "Solitér" - IDS_SOL_ABOUT "Solitér od J Brown\n\nCardLib verzia 1.0" + IDS_SOL_ABOUT "Solitér od J Brown\nCardLib verzia 1.0" IDS_SOL_QUIT "Naozaj chcete skončiť aktuálnu hru?" IDS_SOL_WIN "Blahoželám, vyhrali ste!" IDS_SOL_DEAL "Rozdať znova?" diff --git a/base/applications/games/solitaire/lang/sq-AL.rc b/base/applications/games/solitaire/lang/sq-AL.rc index 02400e87f51..4f0fb679cf6 100644 --- a/base/applications/games/solitaire/lang/sq-AL.rc +++ b/base/applications/games/solitaire/lang/sq-AL.rc @@ -56,7 +56,7 @@ END STRINGTABLE BEGIN IDS_SOL_NAME "Solitaire" - IDS_SOL_ABOUT "Solitaire nga J Brown\n\nCardLib version 1.0." + IDS_SOL_ABOUT "Solitaire nga J Brown\nCardLib version 1.0" IDS_SOL_QUIT "Largohu Nga Loja?" IDS_SOL_WIN "Urime, keni fituar!" IDS_SOL_DEAL "Fillo Perseri?" diff --git a/base/applications/games/solitaire/lang/sv-SE.rc b/base/applications/games/solitaire/lang/sv-SE.rc index d548ee8670f..bc073589eab 100644 --- a/base/applications/games/solitaire/lang/sv-SE.rc +++ b/base/applications/games/solitaire/lang/sv-SE.rc @@ -47,7 +47,7 @@ END STRINGTABLE BEGIN IDS_SOL_NAME "Solitaire" - IDS_SOL_ABOUT "Solitaire av J Brown\nÖversätt av Ronny K Svensson\n\nCardLib version 1.0." + IDS_SOL_ABOUT "Solitaire av J Brown; Översätt av Ronny K Svensson\nCardLib version 1.0" IDS_SOL_QUIT "Avsluta nuvarande spel?" IDS_SOL_WIN "Grattis, du vann!" IDS_SOL_DEAL "Ge igen?" diff --git a/base/applications/games/solitaire/lang/th-TH.rc b/base/applications/games/solitaire/lang/th-TH.rc index c5e8486224e..12862c680be 100644 --- a/base/applications/games/solitaire/lang/th-TH.rc +++ b/base/applications/games/solitaire/lang/th-TH.rc @@ -55,7 +55,7 @@ END STRINGTABLE BEGIN IDS_SOL_NAME "Solitaire" - IDS_SOL_ABOUT "Solitaire by J Brown\n\nCardLib version 1.0." + IDS_SOL_ABOUT "Solitaire by J Brown\nCardLib version 1.0" IDS_SOL_QUIT "Quit the current game?" IDS_SOL_WIN "Congratulations, you win!" IDS_SOL_DEAL "Deal again?" diff --git a/base/applications/games/solitaire/lang/tr-TR.rc b/base/applications/games/solitaire/lang/tr-TR.rc index 67438265ec5..360fb9a05e6 100644 --- a/base/applications/games/solitaire/lang/tr-TR.rc +++ b/base/applications/games/solitaire/lang/tr-TR.rc @@ -56,7 +56,7 @@ END STRINGTABLE BEGIN IDS_SOL_NAME "Solitaire" - IDS_SOL_ABOUT "Solitaire, J Brown tarafından yazılmıştır.\n\nCardLib sürümü: 1.0" + IDS_SOL_ABOUT "Solitaire, J Brown tarafından yazılmıştır.\nCardLib sürümü: 1.0" IDS_SOL_QUIT "Şimdiki oyundan çıkılsın mı?" IDS_SOL_WIN "Tebrikler, kazandınız!" IDS_SOL_DEAL "Yeniden dağıtılsın mı?" diff --git a/base/applications/games/solitaire/lang/uk-UA.rc b/base/applications/games/solitaire/lang/uk-UA.rc index c65482340e7..c816ba697d2 100644 --- a/base/applications/games/solitaire/lang/uk-UA.rc +++ b/base/applications/games/solitaire/lang/uk-UA.rc @@ -55,7 +55,7 @@ END STRINGTABLE BEGIN IDS_SOL_NAME "Косинка" - IDS_SOL_ABOUT "Косинка від J Brown\n\nCardLib версії 1.0." + IDS_SOL_ABOUT "Косинка від J Brown\nCardLib версії 1.0" IDS_SOL_QUIT "Вийти з поточної гри?" IDS_SOL_WIN "Вітання, Ви виграли!!" IDS_SOL_DEAL "Роздати знову?" diff --git a/base/applications/games/solitaire/lang/zh-CN.rc b/base/applications/games/solitaire/lang/zh-CN.rc index b71141ea0a9..0eed7b48a5e 100644 --- a/base/applications/games/solitaire/lang/zh-CN.rc +++ b/base/applications/games/solitaire/lang/zh-CN.rc @@ -55,7 +55,7 @@ END STRINGTABLE BEGIN IDS_SOL_NAME "纸牌" - IDS_SOL_ABOUT "纸牌由 J Brown 开发\n\nCardLib 版本 1.0。" + IDS_SOL_ABOUT "纸牌由 J Brown 开发\nCardLib 版本 1.0" IDS_SOL_QUIT "退出当前游戏？" IDS_SOL_WIN "恭喜你，你赢了！" IDS_SOL_DEAL "再玩一次？" diff --git a/base/applications/games/solitaire/lang/zh-HK.rc b/base/applications/games/solitaire/lang/zh-HK.rc index 4668e43474b..12ca3c905c3 100644 --- a/base/applications/games/solitaire/lang/zh-HK.rc +++ b/base/applications/games/solitaire/lang/zh-HK.rc @@ -55,7 +55,7 @@ END STRINGTABLE BEGIN IDS_SOL_NAME "接龍" - IDS_SOL_ABOUT "接龍由 J Brown 開發\n\nCardLib 版本 1.0。" + IDS_SOL_ABOUT "接龍由 J Brown 開發\nCardLib 版本 1.0" IDS_SOL_QUIT "退出目前遊戲？" IDS_SOL_WIN "恭喜您，您贏咗！！" IDS_SOL_DEAL "再玩一次？" diff --git a/base/applications/games/solitaire/lang/zh-TW.rc b/base/applications/games/solitaire/lang/zh-TW.rc index 99e1ff427d1..31d90cf0966 100644 --- a/base/applications/games/solitaire/lang/zh-TW.rc +++ b/base/applications/games/solitaire/lang/zh-TW.rc @@ -55,7 +55,7 @@ END STRINGTABLE BEGIN IDS_SOL_NAME "接龍" - IDS_SOL_ABOUT "接龍由 J Brown 開發\n\nCardLib 版本 1.0" + IDS_SOL_ABOUT "接龍由 J Brown 開發\nCardLib 版本 1.0" IDS_SOL_QUIT "退出目前遊戲？" IDS_SOL_WIN "恭喜您，您贏了！！" IDS_SOL_DEAL "再玩一次？" diff --git a/base/applications/games/solitaire/solitaire.cpp b/base/applications/games/solitaire/solitaire.cpp index 3fd6a256cd3..187c0ead851 100644 --- a/base/applications/games/solitaire/solitaire.cpp +++ b/base/applications/games/solitaire/solitaire.cpp @@ -2,6 +2,7 @@ #include <winreg.h> #include <commctrl.h> +#include <shellapi.h> #include <tchar.h> #include "resource.h" @@ -738,7 +739,8 @@ LRESULT CALLBACK WndProc (HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam) return 0; case IDM_HELP_ABOUT: - MessageBox(hwnd, MsgAbout, szAppName, MB_OK|MB_ICONINFORMATION); + ShellAbout(hwnd, szAppName, MsgAbout, + LoadIcon(hInstance, MAKEINTRESOURCE(IDI_SOLITAIRE))); return 0; case IDM_GAME_EXIT: diff --git a/base/applications/games/spider/CMakeLists.txt b/base/applications/games/spider/CMakeLists.txt index 78d4f64d7aa..ddf29582e19 100644 --- a/base/applications/games/spider/CMakeLists.txt +++ b/base/applications/games/spider/CMakeLists.txt @@ -10,5 +10,5 @@ target_link_libraries(spider cardlib) target_include_directories(spider PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}) add_pch(spider spider.h SOURCE) set_module_type(spider win32gui UNICODE) -add_importlibs(spider advapi32 comctl32 user32 gdi32 msvcrt kernel32) +add_importlibs(spider advapi32 comctl32 shell32 user32 gdi32 msvcrt kernel32) add_cd_file(TARGET spider DESTINATION reactos/system32 FOR all) diff --git a/base/applications/games/spider/lang/bg-BG.rc b/base/applications/games/spider/lang/bg-BG.rc index 9cae6648e27..69c3db7551b 100644 --- a/base/applications/games/spider/lang/bg-BG.rc +++ b/base/applications/games/spider/lang/bg-BG.rc @@ -40,7 +40,7 @@ END STRINGTABLE BEGIN IDS_SPI_NAME "Паяк" - IDS_SPI_ABOUT "Spider Solitaire by Gregor Schneider\n\nCardLib version 1.0" + IDS_SPI_ABOUT "Spider Solitaire by Gregor Schneider\nCardLib version 1.0" IDS_SPI_QUIT "Изход от текушата игра?" IDS_SPI_WIN "Поздравления, спечелихте!" IDS_SPI_DEAL "Ново раздаване?" diff --git a/base/applications/games/spider/lang/cs-CZ.rc b/base/applications/games/spider/lang/cs-CZ.rc index 0f429589973..947c4984209 100644 --- a/base/applications/games/spider/lang/cs-CZ.rc +++ b/base/applications/games/spider/lang/cs-CZ.rc @@ -40,7 +40,7 @@ END STRINGTABLE BEGIN IDS_SPI_NAME "Spider" - IDS_SPI_ABOUT "Spider Solitaire vytvořil Gregor Schneider\n\nCardLib verze 1.0" + IDS_SPI_ABOUT "Spider Solitaire vytvořil Gregor Schneider\nCardLib verze 1.0" IDS_SPI_QUIT "Ukončit hru?" IDS_SPI_WIN "Gratulace k výhře!" IDS_SPI_DEAL "Rozdat znovu?" diff --git a/base/applications/games/spider/lang/de-DE.rc b/base/applications/games/spider/lang/de-DE.rc index 71a04c48d7b..d1c27231916 100644 --- a/base/applications/games/spider/lang/de-DE.rc +++ b/base/applications/games/spider/lang/de-DE.rc @@ -48,7 +48,7 @@ END STRINGTABLE BEGIN IDS_SPI_NAME "Spider" - IDS_SPI_ABOUT "Spider Solitaire von Gregor Schneider\n\nCardLib Version 1.0" + IDS_SPI_ABOUT "Spider Solitaire von Gregor Schneider\nCardLib Version 1.0" IDS_SPI_QUIT "Laufendes Spiel beenden?" IDS_SPI_WIN "Glückwunsch, Sie haben gewonnen!" IDS_SPI_DEAL "Neu geben?" diff --git a/base/applications/games/spider/lang/en-US.rc b/base/applications/games/spider/lang/en-US.rc index fd179384a60..50d2fee0afb 100644 --- a/base/applications/games/spider/lang/en-US.rc +++ b/base/applications/games/spider/lang/en-US.rc @@ -48,7 +48,7 @@ END STRINGTABLE BEGIN IDS_SPI_NAME "Spider" - IDS_SPI_ABOUT "Spider Solitaire by Gregor Schneider\n\nCardLib version 1.0" + IDS_SPI_ABOUT "Spider Solitaire by Gregor Schneider\nCardLib version 1.0" IDS_SPI_QUIT "Quit the current game?" IDS_SPI_WIN "Congratulations, you win!" IDS_SPI_DEAL "Deal again?" diff --git a/base/applications/games/spider/lang/es-ES.rc b/base/applications/games/spider/lang/es-ES.rc index 3d16fc8ae28..522387d1a5e 100644 --- a/base/applications/games/spider/lang/es-ES.rc +++ b/base/applications/games/spider/lang/es-ES.rc @@ -49,7 +49,7 @@ END STRINGTABLE BEGIN IDS_SPI_NAME "Spider" - IDS_SPI_ABOUT "Solitario Spider por Gregor Schneider\n\nCardLib versión 1.0" + IDS_SPI_ABOUT "Solitario Spider por Gregor Schneider\nCardLib versión 1.0" IDS_SPI_QUIT "¿Salir del juego actual?" IDS_SPI_WIN "¡Enhorabuena, has ganado!" IDS_SPI_DEAL "¿Jugar de nuevo?" diff --git a/base/applications/games/spider/lang/fr-FR.rc b/base/applications/games/spider/lang/fr-FR.rc index 330d6b9189d..03aee3d1963 100644 --- a/base/applications/games/spider/lang/fr-FR.rc +++ b/base/applications/games/spider/lang/fr-FR.rc @@ -48,7 +48,7 @@ END STRINGTABLE BEGIN IDS_SPI_NAME "Spider" - IDS_SPI_ABOUT "Spider Solitaire par Gregor Schneider\n\nCardLib version 1.0" + IDS_SPI_ABOUT "Spider Solitaire par Gregor Schneider\nCardLib version 1.0" IDS_SPI_QUIT "Quitter le jeu actuel ?" IDS_SPI_WIN "Félicitations, Vous avez gagné !" IDS_SPI_DEAL "Redistribuer ?" diff --git a/base/applications/games/spider/lang/he-IL.rc b/base/applications/games/spider/lang/he-IL.rc index 9941b9980e0..e0789a6c08f 100644 --- a/base/applications/games/spider/lang/he-IL.rc +++ b/base/applications/games/spider/lang/he-IL.rc @@ -50,7 +50,7 @@ END STRINGTABLE BEGIN IDS_SPI_NAME "עכביש" - IDS_SPI_ABOUT "Spider Solitaire by Gregor Schneider\n\nCardLib version 1.0" + IDS_SPI_ABOUT "Spider Solitaire by Gregor Schneider\nCardLib version 1.0" IDS_SPI_QUIT "להפסיק את המשחק הנוכחי?" IDS_SPI_WIN "כל הכבוד, ניצחת!" IDS_SPI_DEAL "לחלק שוב?" diff --git a/base/applications/games/spider/lang/hr-HR.rc b/base/applications/games/spider/lang/hr-HR.rc index 1812d575de4..33a5c5df9fe 100644 --- a/base/applications/games/spider/lang/hr-HR.rc +++ b/base/applications/games/spider/lang/hr-HR.rc @@ -47,7 +47,7 @@ END STRINGTABLE BEGIN IDS_SPI_NAME "Spider" - IDS_SPI_ABOUT "Spider Solitaire od Gregor Schneider\n\nCardLib verzija 1.0" + IDS_SPI_ABOUT "Spider Solitaire od Gregor Schneider\nCardLib verzija 1.0" IDS_SPI_QUIT "Napusti trenutnu igru?" IDS_SPI_WIN "Čestitke, pobijedili ste!" IDS_SPI_DEAL "Ponovno?" diff --git a/base/applications/games/spider/lang/hu-HU.rc b/base/applications/games/spider/lang/hu-HU.rc index c1c1feb5586..e99dd10551b 100644 --- a/base/applications/games/spider/lang/hu-HU.rc +++ b/base/applications/games/spider/lang/hu-HU.rc @@ -40,7 +40,7 @@ END STRINGTABLE BEGIN IDS_SPI_NAME "Fekete özvegy" - IDS_SPI_ABOUT "Fekete Özvegy, készítette Gregor Schneider\n\nCardLib verzió 1.0" + IDS_SPI_ABOUT "Fekete Özvegy, készítette Gregor Schneider\nCardLib verzió 1.0" IDS_SPI_QUIT "Kilépés ebből a játékból?" IDS_SPI_WIN "Gratulálok, Ön nyert!" IDS_SPI_DEAL "Új leosztás?" diff --git a/base/applications/games/spider/lang/it-IT.rc b/base/applications/games/spider/lang/it-IT.rc index 9e1be1d81ca..8fc4af47729 100644 --- a/base/applications/games/spider/lang/it-IT.rc +++ b/base/applications/games/spider/lang/it-IT.rc @@ -48,7 +48,7 @@ END STRINGTABLE BEGIN IDS_SPI_NAME "Spider" - IDS_SPI_ABOUT "Solitario Spider di Gregor Schneider\n\nCardLib version 1.0" + IDS_SPI_ABOUT "Solitario Spider di Gregor Schneider\nCardLib version 1.0" IDS_SPI_QUIT "Chiudere la partita?" IDS_SPI_WIN "Complimenti, hai vinto!" IDS_SPI_DEAL "Nuova partita?" diff --git a/base/applications/games/spider/lang/ja-JP.rc b/base/applications/games/spider/lang/ja-JP.rc index 889d5134c78..0f6ad4e42ba 100644 --- a/base/applications/games/spider/lang/ja-JP.rc +++ b/base/applications/games/spider/lang/ja-JP.rc @@ -48,7 +48,7 @@ END STRINGTABLE BEGIN IDS_SPI_NAME "スパイダ" - IDS_SPI_ABOUT "Gregor Schneider によるスパイダソリティア\n\nCardLib バージョン 1.0" + IDS_SPI_ABOUT "Gregor Schneider によるスパイダソリティア\nCardLib バージョン 1.0" IDS_SPI_QUIT "現在のゲームを終了しますか?" IDS_SPI_WIN "おめでとう、あなたの勝ちです!" IDS_SPI_DEAL "もう一度カードを配りますか?" diff --git a/base/applications/games/spider/lang/nl-NL.rc b/base/applications/games/spider/lang/nl-NL.rc index a68639eddb5..0fd47f1f5f3 100644 --- a/base/applications/games/spider/lang/nl-NL.rc +++ b/base/applications/games/spider/lang/nl-NL.rc @@ -48,7 +48,7 @@ END STRINGTABLE BEGIN IDS_SPI_NAME "Spider Solitaire" - IDS_SPI_ABOUT "Spider Solitaire door Gregor Schneider\n\nCardLib versie 1.0" + IDS_SPI_ABOUT "Spider Solitaire door Gregor Schneider\nCardLib versie 1.0" IDS_SPI_QUIT "Het huidige spel afsluiten?" IDS_SPI_WIN "Gefeliciteerd, u heeft gewonnen!" IDS_SPI_DEAL "Nogmaals spelen?" diff --git a/base/applications/games/spider/lang/pl-PL.rc b/base/applications/games/spider/lang/pl-PL.rc index f44421e142a..d67f32ebb4c 100644 --- a/base/applications/games/spider/lang/pl-PL.rc +++ b/base/applications/games/spider/lang/pl-PL.rc @@ -49,7 +49,7 @@ END STRINGTABLE BEGIN IDS_SPI_NAME "Pająk" - IDS_SPI_ABOUT "Pasjans - Pająk, autor: Gregor Schneider\n\nCardLib wersja 1.0" + IDS_SPI_ABOUT "Pasjans - Pająk, autor: Gregor Schneider\nCardLib wersja 1.0" IDS_SPI_QUIT "Czy na pewno chcesz zakończyć?" IDS_SPI_WIN "Gratulacje, wygrałeś(aś)!" IDS_SPI_DEAL "Rozdać ponownie?" diff --git a/base/applications/games/spider/lang/pt-BR.rc b/base/applications/games/spider/lang/pt-BR.rc index dae2ab6e86e..4f24fa9b701 100644 --- a/base/applications/games/spider/lang/pt-BR.rc +++ b/base/applications/games/spider/lang/pt-BR.rc @@ -40,7 +40,7 @@ END STRINGTABLE BEGIN IDS_SPI_NAME "Spider" - IDS_SPI_ABOUT "Paciência Spider por Gregor Schneider\n\nCardLib versão 1.0" + IDS_SPI_ABOUT "Paciência Spider por Gregor Schneider\nCardLib versão 1.0" IDS_SPI_QUIT "Desistir do jogo atual?" IDS_SPI_WIN "Parabéns, você venceu!" IDS_SPI_DEAL "Deseja jogar mais uma partida?" diff --git a/base/applications/games/spider/lang/ro-RO.rc b/base/applications/games/spider/lang/ro-RO.rc index ebffd5fca0a..471e1778f20 100644 --- a/base/applications/games/spider/lang/ro-RO.rc +++ b/base/applications/games/spider/lang/ro-RO.rc @@ -42,7 +42,7 @@ END STRINGTABLE BEGIN IDS_SPI_NAME "Pasiență-păianjen" - IDS_SPI_ABOUT "Pasiență-păianjen de Gregor Schneider\n\nCardLib versiune 1.0" + IDS_SPI_ABOUT "Pasiență-păianjen de Gregor Schneider\nCardLib versiune 1.0" IDS_SPI_QUIT "Abandonați jocul curent?" IDS_SPI_WIN "Felicitări, ați câștigat!" IDS_SPI_DEAL "O nouă rundă?" diff --git a/base/applications/games/spider/lang/ru-RU.rc b/base/applications/games/spider/lang/ru-RU.rc index 73a72d341f7..545c7004351 100644 --- a/base/applications/games/spider/lang/ru-RU.rc +++ b/base/applications/games/spider/lang/ru-RU.rc @@ -48,7 +48,7 @@ END STRINGTABLE BEGIN IDS_SPI_NAME "Пасьянс ""Паук""" - IDS_SPI_ABOUT "Пасьянс ""Паук"", Gregor Schneider\n\nCardLib версии 1.0" + IDS_SPI_ABOUT "Пасьянс ""Паук"", Gregor Schneider\nCardLib версии 1.0" IDS_SPI_QUIT "Выйти из текущей игры?" IDS_SPI_WIN "Поздравляем, вы выиграли!" IDS_SPI_DEAL "Попробовать снова?" diff --git a/base/applications/games/spider/lang/sk-SK.rc b/base/applications/games/spider/lang/sk-SK.rc index b4cb268e88e..45c5592350e 100644 --- a/base/applications/games/spider/lang/sk-SK.rc +++ b/base/applications/games/spider/lang/sk-SK.rc @@ -49,7 +49,7 @@ END STRINGTABLE BEGIN IDS_SPI_NAME "Pavúčí solitér" //Spider - IDS_SPI_ABOUT "Pavúčí solitér od Gregor Schneider\n\nCardLib verzia 1.0" + IDS_SPI_ABOUT "Pavúčí solitér od Gregor Schneider\nCardLib verzia 1.0" IDS_SPI_QUIT "Naozaj chcete skončiť aktuálnu hru?" IDS_SPI_WIN "Blahoželám, vyhrali ste!" IDS_SPI_DEAL "Rozdať znova?" diff --git a/base/applications/games/spider/lang/sq-AL.rc b/base/applications/games/spider/lang/sq-AL.rc index d0de5ad9cc6..c4d187ffa5d 100644 --- a/base/applications/games/spider/lang/sq-AL.rc +++ b/base/applications/games/spider/lang/sq-AL.rc @@ -49,7 +49,7 @@ END STRINGTABLE BEGIN IDS_SPI_NAME "Merimange" - IDS_SPI_ABOUT "Merimanga Solitare Nga Gregor Schneider\n\nCardLib versioni 1.0" + IDS_SPI_ABOUT "Merimanga Solitare Nga Gregor Schneider\nCardLib versioni 1.0" IDS_SPI_QUIT "Dil nga Loja?" IDS_SPI_WIN "Urime, keni fituar!" IDS_SPI_DEAL "Fillo Perseri?" diff --git a/base/applications/games/spider/lang/sv-SE.rc b/base/applications/games/spider/lang/sv-SE.rc index c49a336f929..6abe795fce8 100644 --- a/base/applications/games/spider/lang/sv-SE.rc +++ b/base/applications/games/spider/lang/sv-SE.rc @@ -47,7 +47,7 @@ END STRINGTABLE BEGIN IDS_SPI_NAME "Spider" - IDS_SPI_ABOUT "Spider Solitaire av Gregor Schneider\nÖversätt av Ronny K Svensson\n\nCardLib version 1.0" + IDS_SPI_ABOUT "Spider Solitaire av Gregor Schneider; Översätt av Ronny K Svensson\nCardLib version 1.0" IDS_SPI_QUIT "Avsluta ditt nuvarande spel?" IDS_SPI_WIN "Grattis, du vann!" IDS_SPI_DEAL "Ge igen?" diff --git a/base/applications/games/spider/lang/tr-TR.rc b/base/applications/games/spider/lang/tr-TR.rc index 98a39e3a9bb..cd2f253ad0b 100644 --- a/base/applications/games/spider/lang/tr-TR.rc +++ b/base/applications/games/spider/lang/tr-TR.rc @@ -49,7 +49,7 @@ END STRINGTABLE BEGIN IDS_SPI_NAME "Spider Solitaire" - IDS_SPI_ABOUT "Spider Solitaire, Gregor Schneider tarafından yazılmıştır.\n\nCardLib sürümü: 1.0" + IDS_SPI_ABOUT "Spider Solitaire, Gregor Schneider tarafından yazılmıştır.\nCardLib sürümü: 1.0" IDS_SPI_QUIT "Şimdiki oyundan çıkılsın mı?" IDS_SPI_WIN "Tebrikler, kazandınız!" IDS_SPI_DEAL "Yeniden dağıtılsın mı?" diff --git a/base/applications/games/spider/lang/uk-UA.rc b/base/applications/games/spider/lang/uk-UA.rc index 7cd813603d1..eb5294764ee 100644 --- a/base/applications/games/spider/lang/uk-UA.rc +++ b/base/applications/games/spider/lang/uk-UA.rc @@ -48,7 +48,7 @@ END STRINGTABLE BEGIN IDS_SPI_NAME "Пас’янс Паук" - IDS_SPI_ABOUT "Пас’янс Паук, Gregor Schneider\n\nCardLib версії 1.0" + IDS_SPI_ABOUT "Пас’янс Паук, Gregor Schneider\nCardLib версії 1.0" IDS_SPI_QUIT "Вийти з поточної гри?" IDS_SPI_WIN "Вітаємо, ви виграли!" IDS_SPI_DEAL "Спробувати знову?" diff --git a/base/applications/games/spider/lang/zh-CN.rc b/base/applications/games/spider/lang/zh-CN.rc index 092af9b2153..f151155096a 100644 --- a/base/applications/games/spider/lang/zh-CN.rc +++ b/base/applications/games/spider/lang/zh-CN.rc @@ -48,7 +48,7 @@ END STRINGTABLE BEGIN IDS_SPI_NAME "蜘蛛纸牌" - IDS_SPI_ABOUT "蜘蛛纸牌作者：Gregor Schneider\n\n使用 CardLib 版本 1.0" + IDS_SPI_ABOUT "蜘蛛纸牌作者：Gregor Schneider\n使用 CardLib 版本 1.0" IDS_SPI_QUIT "退出当前游戏吗？" IDS_SPI_WIN "祝贺您赢了！" IDS_SPI_DEAL "再来一次吗？" diff --git a/base/applications/games/spider/spider.cpp b/base/applications/games/spider/spider.cpp index a301254bc27..b7aa307b607 100644 --- a/base/applications/games/spider/spider.cpp +++ b/base/applications/games/spider/spider.cpp @@ -9,6 +9,7 @@ #include "spider.h" #include <commctrl.h> +#include <shellapi.h> #include <tchar.h> TCHAR szHelpPath[MAX_PATH]; @@ -365,7 +366,8 @@ LRESULT CALLBACK WndProc (HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam) return 0; case IDM_HELP_ABOUT: - MessageBox(hwnd, MsgAbout, szAppName, MB_OK|MB_ICONINFORMATION); + ShellAbout(hwnd, szAppName, MsgAbout, + LoadIcon(hInstance, MAKEINTRESOURCE(IDI_SPIDER))); return 0; case IDM_GAME_EXIT:

1 year, 5 months

[reactos] 01/01: [WALLPAPERS] Optimize PNG images (#5506)

by Andrew Dent

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cf4bb8fced0e685662ed2… commit cf4bb8fced0e685662ed2fe061c251f5720a054d Author: Andrew Dent <dent.ace(a)gmail.com> AuthorDate: Thu Aug 3 23:36:43 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Aug 4 01:36:43 2023 +0300 [WALLPAPERS] Optimize PNG images (#5506) - Lossless optimization with `pngslim` saving ~1-9%. - Restricted to RGB color mode (‘c2’), for maximum compatibility. --- modules/wallpapers/ReactOS_Mizu.png | Bin 39382 -> 39363 bytes modules/wallpapers/ReactOS_Mizu_16x9_A.png | Bin 45629 -> 45574 bytes modules/wallpapers/ReactOS_Mizu_16x9_B.png | Bin 45609 -> 45586 bytes modules/wallpapers/ReactOS_Mizu_4x3.png | Bin 38588 -> 38574 bytes .../Silhouette/reactos_silhouette_dark.png | Bin 104491 -> 94781 bytes .../Silhouette/reactos_silhouette_light.png | Bin 105660 -> 96171 bytes 6 files changed, 0 insertions(+), 0 deletions(-) diff --git a/modules/wallpapers/ReactOS_Mizu.png b/modules/wallpapers/ReactOS_Mizu.png index 43dc6d19c6b..ab1812b319d 100644 Binary files a/modules/wallpapers/ReactOS_Mizu.png and b/modules/wallpapers/ReactOS_Mizu.png differ diff --git a/modules/wallpapers/ReactOS_Mizu_16x9_A.png b/modules/wallpapers/ReactOS_Mizu_16x9_A.png index 482f83643f5..080e533fe54 100644 Binary files a/modules/wallpapers/ReactOS_Mizu_16x9_A.png and b/modules/wallpapers/ReactOS_Mizu_16x9_A.png differ diff --git a/modules/wallpapers/ReactOS_Mizu_16x9_B.png b/modules/wallpapers/ReactOS_Mizu_16x9_B.png index b9aa3092950..70c578c4e0c 100644 Binary files a/modules/wallpapers/ReactOS_Mizu_16x9_B.png and b/modules/wallpapers/ReactOS_Mizu_16x9_B.png differ diff --git a/modules/wallpapers/ReactOS_Mizu_4x3.png b/modules/wallpapers/ReactOS_Mizu_4x3.png index b38881de526..4facfb78408 100644 Binary files a/modules/wallpapers/ReactOS_Mizu_4x3.png and b/modules/wallpapers/ReactOS_Mizu_4x3.png differ diff --git a/modules/wallpapers/Silhouette/reactos_silhouette_dark.png b/modules/wallpapers/Silhouette/reactos_silhouette_dark.png index f38da3e23f6..c718d7a2755 100644 Binary files a/modules/wallpapers/Silhouette/reactos_silhouette_dark.png and b/modules/wallpapers/Silhouette/reactos_silhouette_dark.png differ diff --git a/modules/wallpapers/Silhouette/reactos_silhouette_light.png b/modules/wallpapers/Silhouette/reactos_silhouette_light.png index 9c2908c3600..94854745287 100644 Binary files a/modules/wallpapers/Silhouette/reactos_silhouette_light.png and b/modules/wallpapers/Silhouette/reactos_silhouette_light.png differ

1 year, 5 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