Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [RAPPS] Don't display Freeware license string if the type is also Freeware (#7689)
by Whindmar Saksit 30 Jan '25

30 Jan '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d5ce3d28abb48c0a1e0b4… commit d5ce3d28abb48c0a1e0b40f7c6802154433c9ac2 Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Thu Jan 30 21:14:10 2025 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Jan 30 21:14:10 2025 +0100 [RAPPS] Don't display Freeware license string if the type is also Freeware (#7689) License=Freeware, LicenseType=2 should not display as "Freeware (Freeware)" --- base/applications/rapps/appinfo.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/base/applications/rapps/appinfo.cpp b/base/applications/rapps/appinfo.cpp index eefbb91d2e5..1970b9459d9 100644 --- a/base/applications/rapps/appinfo.cpp +++ b/base/applications/rapps/appinfo.cpp @@ -163,16 +163,16 @@ CAvailableApplicationInfo::LicenseString() LicenseType licenseType; if (IsKnownLicenseType(IntBuffer)) - { licenseType = static_cast<LicenseType>(IntBuffer); - } else - { licenseType = LICENSE_NONE; + + if (licenseType == LICENSE_NONE || licenseType == LICENSE_FREEWARE) + { if (szLicenseString.CompareNoCase(L"Freeware") == 0) { licenseType = LICENSE_FREEWARE; - szLicenseString = L""; + szLicenseString = L""; // Don't display as "Freeware (Freeware)" } }

1 0

[reactos] 01/01: [RAPPS] Allow database to override download filename (#7668)
by Whindmar Saksit 30 Jan '25

30 Jan '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a23db39c8a422b40c3dea… commit a23db39c8a422b40c3deab643996aac6e775217d Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Thu Jan 30 17:46:39 2025 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Jan 30 17:46:39 2025 +0100 [RAPPS] Allow database to override download filename (#7668) http://example.com/setup.exe?foo=bar needs to use be able to use setup.exe as the filename. --- base/applications/rapps/include/appinfo.h | 1 + base/applications/rapps/loaddlg.cpp | 26 ++++++++++++-------------- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/base/applications/rapps/include/appinfo.h b/base/applications/rapps/include/appinfo.h index 175048b6008..32cfc20b3dd 100644 --- a/base/applications/rapps/include/appinfo.h +++ b/base/applications/rapps/include/appinfo.h @@ -82,6 +82,7 @@ enum InstallerType #define DB_REGNAME L"RegName" #define DB_INSTALLER L"Installer" #define DB_SCOPE L"Scope" // User or Machine +#define DB_SAVEAS L"SaveAs" #define DB_GENINSTSECTION L"Generate" #define GENERATE_ARPSUBKEY L"RApps" // Our uninstall data is stored here diff --git a/base/applications/rapps/loaddlg.cpp b/base/applications/rapps/loaddlg.cpp index df8afcbeeea..c863a5e2165 100644 --- a/base/applications/rapps/loaddlg.cpp +++ b/base/applications/rapps/loaddlg.cpp @@ -144,6 +144,10 @@ struct DownloadInfo IType = AppInfo.GetInstallerType(); if (IType == INSTALLER_GENERATE) szPackageName = AppInfo.szIdentifier; + + CConfigParser *cfg = static_cast<const CAvailableApplicationInfo&>(AppInfo).GetConfigParser(); + if (cfg) + cfg->GetString(DB_SAVEAS, szFileName); } bool Equal(const DownloadInfo &other) const @@ -157,6 +161,7 @@ struct DownloadInfo CStringW szName; CStringW szSHA1; CStringW szPackageName; + CStringW szFileName; ULONG SizeInBytes; }; @@ -719,7 +724,7 @@ CDownloadManager::PerformDownloadAndInstall(const DownloadInfo &Info) CStringW str; CPathW Path; - PCWSTR p, q; + PCWSTR p; ULONG dwContentLen, dwBytesWritten, dwBytesRead, dwStatus, dwStatusLen; ULONG dwCurrentBytesRead = 0; @@ -734,7 +739,7 @@ CDownloadManager::PerformDownloadAndInstall(const DownloadInfo &Info) const DWORD dwUrlConnectFlags = INTERNET_FLAG_DONT_CACHE | INTERNET_FLAG_PRAGMA_NOCACHE | INTERNET_FLAG_KEEP_CONNECTION; URL_COMPONENTSW urlComponents; - size_t urlLength, filenameLength; + size_t urlLength; unsigned char lpBuffer[4096]; // Change caption to show the currently downloaded app @@ -768,7 +773,6 @@ CDownloadManager::PerformDownloadAndInstall(const DownloadInfo &Info) // build the path for the download p = wcsrchr(Info.szUrl.GetString(), L'/'); - q = wcsrchr(Info.szUrl.GetString(), L'?'); // do we have a final slash separator? if (!p) @@ -777,14 +781,6 @@ CDownloadManager::PerformDownloadAndInstall(const DownloadInfo &Info) goto end; } - // prepare the tentative length of the filename, maybe we've to remove part of it later on - filenameLength = wcslen(p) * sizeof(WCHAR); - - /* do we have query arguments in the target URL after the filename? account for them - (e.g. https://example.org/myfile.exe?no_adware_plz) */ - if (q && q > p && (q - p) > 0) - filenameLength -= wcslen(q - 1) * sizeof(WCHAR); - // is the path valid? can we access it? if (GetFileAttributesW(Path) == INVALID_FILE_ATTRIBUTES) { @@ -803,9 +799,11 @@ CDownloadManager::PerformDownloadAndInstall(const DownloadInfo &Info) break; case DLTYPE_APPLICATION: { - CStringW str = p + 1; // use the filename retrieved from URL - UrlUnescapeAndMakeFileNameValid(str); - Path += str; + CStringW name = Info.szFileName; + if (name.IsEmpty()) + name = p + 1; // use the filename retrieved from URL + UrlUnescapeAndMakeFileNameValid(name); + Path += name; break; } }

1 0

[reactos] 01/01: [SDK] Define IAssociationElement, IAssociationArray etc. (#7678)
by Katayama Hirofumi MZ 30 Jan '25

30 Jan '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7e52f64044259fc7d53aa… commit 7e52f64044259fc7d53aac1c28ff36d99c1178bc Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Jan 30 22:16:46 2025 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Jan 30 22:16:46 2025 +0900 [SDK] Define IAssociationElement, IAssociationArray etc. (#7678) Defining missing interfaces for file association... JIRA issue: CORE-19278 - Define IID_IAssociationElementOld, and IID_IAssociationElement interface IDs in <shlguid_undoc.h>. - Define ASSOCQUERY, and IAssociationElementOld in <shlwapi_undoc.h>. - Define IAssociationElement, IEnumAssociationElements, IAssociationArrayOld, and IAssociationArray interfaces in <shlobj_undoc.h>. - Simplify <shlwapi_undoc.h> and <shlobj_undoc.h>. --- sdk/include/reactos/shlguid_undoc.h | 2 + sdk/include/reactos/shlobj_undoc.h | 171 +++++++++++++++++++++++++++++++----- sdk/include/reactos/shlwapi_undoc.h | 86 +++++++++++++----- 3 files changed, 212 insertions(+), 47 deletions(-) diff --git a/sdk/include/reactos/shlguid_undoc.h b/sdk/include/reactos/shlguid_undoc.h index b72e61c9e3d..01dbfda2fe2 100644 --- a/sdk/include/reactos/shlguid_undoc.h +++ b/sdk/include/reactos/shlguid_undoc.h @@ -161,6 +161,8 @@ DEFINE_GUID(IID_IDelegateHostItemContainer,0x02468693, 0xE7E5, 0x4C6B, 0x99, 0x9 DEFINE_GUID(IID_IDrawPropertyControl, 0xE6DFF6FD, 0xBCD5, 0x4162, 0x9C, 0x65, 0xA3, 0xB1, 0x8C, 0x61, 0x6F, 0xDB); DEFINE_GUID(IID_IEnumAssociationElements, 0xA6B0FB57, 0x7523, 0x4439, 0x94, 0x25, 0xEB, 0xE9, 0x98, 0x23, 0xB8, 0x28); DEFINE_GUID(IID_IEnumerateAssociationElements,0x7513A16E,0xCF00,0x4817,0xA8, 0x90, 0xA2, 0x3C, 0x60, 0x8F, 0xE7, 0xB7); +DEFINE_GUID(IID_IAssociationElementOld, 0xE58B1ABF, 0x9596, 0x4DBA, 0x89, 0x97, 0x89, 0xDC, 0xDE, 0xF4, 0x69, 0x92); +DEFINE_GUID(IID_IAssociationElement, 0xD8F6AD5B, 0xB44F, 0x4BCC, 0x88, 0xFD, 0xEB, 0x34, 0x73, 0xDB, 0x75, 0x02); DEFINE_GUID(IID_IFilterCondition, 0xFCA2857D, 0x1760, 0x4AD3, 0x8C, 0x63, 0xC9, 0xB6, 0x02, 0xFC, 0xBA, 0xEA); DEFINE_GUID(IID_IFolderNotify, 0x0FF22D71, 0x5172, 0x11D1, 0xA9, 0xC6, 0x08, 0x00, 0x36, 0xAF, 0x3F, 0x03); DEFINE_GUID(IID_IFolderProperties, 0x7361EE29, 0x5BAD, 0x459D, 0xA9, 0xF5, 0xF6, 0x55, 0x06, 0x89, 0x82, 0xF0); diff --git a/sdk/include/reactos/shlobj_undoc.h b/sdk/include/reactos/shlobj_undoc.h index c9796909aa1..b0392644ecd 100644 --- a/sdk/include/reactos/shlobj_undoc.h +++ b/sdk/include/reactos/shlobj_undoc.h @@ -1,30 +1,20 @@ /* - * ReactOS undocumented shell interface - * - * Copyright 2009 Andrew Hill <ash77 at domain reactos.org> - * Copyright 2013 Dominik Hornung - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * PROJECT: ReactOS header + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Undocumented shell interface + * COPYRIGHT: Copyright 2009 Andrew Hill <ash77 at domain reactos.org> + * Copyright 2013 Dominik Hornung + * Copyright 2025 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> */ -#ifndef __SHLOBJ_UNDOC__H -#define __SHLOBJ_UNDOC__H +#pragma once + +#define SHLWAPI_ISHELLFOLDER_HELPERS +#include <shlwapi_undoc.h> // For ASSOCQUERY #ifdef __cplusplus extern "C" { -#endif /* defined(__cplusplus) */ +#endif typedef struct tagSLOTITEMDATA { @@ -817,12 +807,145 @@ DECLARE_INTERFACE_(ITrayPriv, IUnknown) #define ITrayPriv_AppendMenu(T,a) (T)->lpVtbl->AppendMenu(T,a) #endif +/***************************************************************************** + * IAssociationElement interface + * + * @see IAssociationElementOld + * @see https://www.geoffchappell.com/studies/windows/shell/shlwapi/interfaces/iass… + */ +#define INTERFACE IAssociationElement +DECLARE_INTERFACE_(IAssociationElement, IUnknown) // {D8F6AD5B-B44F-4BCC-88FD-EB3473DB7502} +{ + /*** IUnknown ***/ + STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; + /*** IAssociationElement ***/ + STDMETHOD(QueryString)(THIS_ ASSOCQUERY query, PCWSTR key, PWSTR *ppszValue) PURE; + STDMETHOD(QueryDword)(THIS_ ASSOCQUERY query, PCWSTR key, DWORD *pdwValue) PURE; + STDMETHOD(QueryGuid)(THIS_ ASSOCQUERY query, PCWSTR key, GUID *pguid) PURE; + STDMETHOD(QueryExists)(THIS_ ASSOCQUERY query, PCWSTR key) PURE; + STDMETHOD(QueryDirect)(THIS_ ASSOCQUERY query, PCWSTR key, FLAGGED_BYTE_BLOB **ppBlob) PURE; + STDMETHOD(QueryObject)(THIS_ ASSOCQUERY query, PCWSTR key, REFIID riid, PVOID *ppvObj) PURE; +}; +#undef INTERFACE + +#ifdef COBJMACROS +#define IAssociationElement_QueryInterface(T,a,b) (T)->lpVtbl->QueryInterface(T,a,b) +#define IAssociationElement_AddRef(T) (T)->lpVtbl->AddRef(T) +#define IAssociationElement_Release(T) (T)->lpVtbl->Release(T) +#define IAssociationElement_QueryString(T,a,b,c) (T)->lpVtbl->QueryString(T,a,b,c) +#define IAssociationElement_QueryDword(T,a,b,c) (T)->lpVtbl->QueryDword(T,a,b,c) +#define IAssociationElement_QueryGuid(T,a,b,c) (T)->lpVtbl->QueryGuid(T,a,b,c) +#define IAssociationElement_QueryExists(T,a,b) (T)->lpVtbl->QueryExists(T,a,b) +#define IAssociationElement_QueryDirect(T,a,b,c) (T)->lpVtbl->QueryDirect(T,a,b,c) +#define IAssociationElement_QueryObject(T,a,b,c,d) (T)->lpVtbl->QueryObject(T,a,b,c,d) +#endif + +/***************************************************************************** + * IEnumAssociationElements interface + * + * @see https://www.geoffchappell.com/studies/windows/shell/shell32/interfaces/ienu… + */ +#define INTERFACE IEnumAssociationElements +DECLARE_INTERFACE_(IEnumAssociationElements, IUnknown) // {A6B0FB57-7523-4439-9425-EBE99823B828} +{ + /*** IUnknown ***/ + STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; + /*** IEnumAssociationElements ***/ + STDMETHOD(Next)(THIS_ ULONG celt, IAssociationElement *pElement, ULONG *pceltFetched) PURE; + STDMETHOD(Skip)(THIS_ ULONG celt) PURE; + STDMETHOD(Reset)(THIS) PURE; + STDMETHOD(Clone)(THIS_ IEnumAssociationElements **ppNew) PURE; +}; +#undef INTERFACE + +#ifdef COBJMACROS +#define IEnumAssociationElements_QueryInterface(T,a,b) (T)->lpVtbl->QueryInterface(T,a,b) +#define IEnumAssociationElements_AddRef(T) (T)->lpVtbl->AddRef(T) +#define IEnumAssociationElements_Release(T) (T)->lpVtbl->Release(T) +#define IEnumAssociationElements_Next(T,a,b,c) (T)->lpVtbl->Next(T,a,b,c) +#define IEnumAssociationElements_Skip(T,a) (T)->lpVtbl->Skip(T,a) +#define IEnumAssociationElements_Reset(T) (T)->lpVtbl->Reset(T) +#define IEnumAssociationElements_Clone(T,a) (T)->lpVtbl->Clone(T,a) +#endif + +/***************************************************************************** + * IAssociationArrayOld interface + * + * @see IAssociationArray + * @see https://www.geoffchappell.com/studies/windows/shell/shell32/interfaces/iass… + */ +#define INTERFACE IAssociationArrayOld +DECLARE_INTERFACE_(IAssociationArrayOld, IUnknown) // {3B877E3C-67DE-4F9A-B29B-17D0A1521C6A} +{ + /*** IUnknown ***/ + STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; + /*** IAssociationArrayOld ***/ + STDMETHOD(EnumElements)(THIS_ ULONG flags, IEnumAssociationElements **ppElement) PURE; + STDMETHOD(QueryString)(THIS_ ULONG flags, ASSOCQUERY query, PCWSTR key, PWSTR *ppszValue) PURE; + STDMETHOD(QueryDword)(THIS_ ULONG flags, ASSOCQUERY query, PCWSTR key, DWORD *pdwValue) PURE; + STDMETHOD(QueryExists)(THIS_ ULONG flags, ASSOCQUERY query, PCWSTR key) PURE; + STDMETHOD(QueryDirect)(THIS_ ULONG flags, ASSOCQUERY query, PCWSTR key, FLAGGED_BYTE_BLOB **ppBlob) PURE; + STDMETHOD(QueryObject)(THIS_ ULONG flags, ASSOCQUERY query, PCWSTR key, REFIID riid, PVOID *ppvObj) PURE; +}; +#undef INTERFACE + +#ifdef COBJMACROS +#define IAssociationArrayOld_QueryInterface(T,a,b) (T)->lpVtbl->QueryInterface(T,a,b) +#define IAssociationArrayOld_AddRef(T) (T)->lpVtbl->AddRef(T) +#define IAssociationArrayOld_Release(T) (T)->lpVtbl->Release(T) +#define IAssociationArrayOld_EnumElements(T,a,b) (T)->lpVtbl->EnumElements(T,a,b) +#define IAssociationArrayOld_QueryString(T,a,b,c,d) (T)->lpVtbl->QueryString(T,a,b,c,d) +#define IAssociationArrayOld_QueryDword(T,a,b,c,d) (T)->lpVtbl->QueryDword(T,a,b,c,d) +#define IAssociationArrayOld_QueryExists(T,a,b,c) (T)->lpVtbl->QueryExists(T,a,b,c) +#define IAssociationArrayOld_QueryDirect(T,a,b,c,d) (T)->lpVtbl->QueryDirect(T,a,b,c,d) +#define IAssociationArrayOld_QueryObject(T,a,b,c,d,e) (T)->lpVtbl->QueryObject(T,a,b,c,d,e) +#endif + +/***************************************************************************** + * IAssociationArray interface + * + * @see IAssociationArrayOld + * @see https://www.geoffchappell.com/studies/windows/shell/shell32/interfaces/iass… + */ +#define INTERFACE IAssociationArray +DECLARE_INTERFACE_(IAssociationArray, IUnknown) // {19ADBAFD-1C5F-4FC7-94EE-846702DFB58B} +{ + /*** IUnknown ***/ + STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; + /*** IAssociationArray ***/ + STDMETHOD(QueryString)(THIS_ ASSOCQUERY query, PCWSTR key, PWSTR *ppszValue) PURE; + STDMETHOD(QueryDword)(THIS_ ASSOCQUERY query, PCWSTR key, DWORD *pdwValue) PURE; + STDMETHOD(QueryGuid)(THIS_ ASSOCQUERY query, PCWSTR key, GUID *pguid) PURE; + STDMETHOD(QueryExists)(THIS_ ASSOCQUERY query, PCWSTR key) PURE; + STDMETHOD(QueryDirect)(THIS_ ASSOCQUERY query, PCWSTR key, FLAGGED_BYTE_BLOB **ppBlob) PURE; + STDMETHOD(QueryObject)(THIS_ ASSOCQUERY query, PCWSTR key, REFIID riid, PVOID *ppvObj) PURE; +}; +#undef INTERFACE + +#ifdef COBJMACROS +#define IAssociationArray_QueryInterface(T,a,b) (T)->lpVtbl->QueryInterface(T,a,b) +#define IAssociationArray_AddRef(T) (T)->lpVtbl->AddRef(T) +#define IAssociationArray_Release(T) (T)->lpVtbl->Release(T) +#define IAssociationArray_QueryString(T,a,b,c) (T)->lpVtbl->QueryString(T,a,b,c) +#define IAssociationArray_QueryDword(T,a,b,c) (T)->lpVtbl->QueryDword(T,a,b,c) +#define IAssociationArray_QueryGuid(T,a,b,c) (T)->lpVtbl->QueryGuid(T,a,b,c) +#define IAssociationArray_QueryExists(T,a,b) (T)->lpVtbl->QueryExists(T,a,b) +#define IAssociationArray_QueryDirect(T,a,b,c) (T)->lpVtbl->QueryDirect(T,a,b,c) +#define IAssociationArray_QueryObject(T,a,b,c,d) (T)->lpVtbl->QueryObject(T,a,b,c,d) +#endif + HANDLE WINAPI SHCreateDesktop(IShellDesktopTray*); BOOL WINAPI SHDesktopMessageLoop(HANDLE); HRESULT WINAPI SHCreateFileDataObject(PCIDLIST_ABSOLUTE pidlFolder, UINT cidl, PCUITEMID_CHILD_ARRAY apidl, IDataObject* pDataInner, IDataObject** ppDataObj); #ifdef __cplusplus } /* extern "C" */ -#endif /* defined(__cplusplus) */ - -#endif // __SHLOBJ_UNDOC__H +#endif diff --git a/sdk/include/reactos/shlwapi_undoc.h b/sdk/include/reactos/shlwapi_undoc.h index c3ffe8c93df..d4b2cf3fd1d 100644 --- a/sdk/include/reactos/shlwapi_undoc.h +++ b/sdk/include/reactos/shlwapi_undoc.h @@ -1,29 +1,38 @@ /* - * ReactOS shlwapi - * - * Copyright 2009 Andrew Hill <ash77 at domain reactos.org> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * PROJECT: ReactOS header + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Undocumented SHLWAPI definitions + * COPYRIGHT: Copyright 2009 Andrew Hill <ash77 at domain reactos.org> + * Copyright 2025 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> */ -#ifndef __SHLWAPI_UNDOC_H -#define __SHLWAPI_UNDOC_H +#pragma once + +#include <winreg.h> // For REGSAM #ifdef __cplusplus extern "C" { -#endif /* defined(__cplusplus) */ +#endif + +/***************************************************************************** + * ASSOCQUERY --- The type flags of association query + * + * @see IAssociationElementOld, IAssociationElement, IAssociationArrayOld, IAssociationArray + * @see https://www.geoffchappell.com/studies/windows/shell/shell32/api/assocelem/q… + */ +typedef DWORD ASSOCQUERY; +#define ASSOCQUERY_LOWORD_MASK 0x0000FFFF // The low-order word of flags +#define ASSOCQUERY_STRING 0x00010000 // Responds to QueryString method +#define ASSOCQUERY_EXISTS 0x00020000 // Responds to QueryExists method +#define ASSOCQUERY_DIRECT 0x00040000 // Responds to QueryDirect method +#define ASSOCQUERY_DWORD 0x00080000 // Responds to QueryDword method +#define ASSOCQUERY_INDIRECT 0x00100000 // Obtains resource string from QueryString +#define ASSOCQUERY_OBJECT 0x00200000 // Responds to QueryObject method +#define ASSOCQUERY_GUID 0x00400000 // Responds to QueryGuid method +#define ASSOCQUERY_EXTRA_NON_VERB 0x01000000 // Expects pszExtra for path or value +#define ASSOCQUERY_EXTRA_VERB 0x02000000 // Expects pszExtra for verb +#define ASSOCQUERY_SIGNIFICANCE 0x04000000 // Significance unknown +#define ASSOCQUERY_FALLBACK 0x80000000 // Fallback to secondary query source #define SHELL_NO_POLICY ((DWORD)-1) @@ -402,8 +411,39 @@ IShellFolder_CompareIDs( _In_ PCUIDLIST_RELATIVE pidl2); #endif /* SHLWAPI_ISHELLFOLDER_HELPERS */ +/***************************************************************************** + * IAssociationElementOld interface + * + * @see IAssociationElement + * @see https://www.geoffchappell.com/studies/windows/shell/shlwapi/interfaces/iass… + */ +#define INTERFACE IAssociationElementOld +DECLARE_INTERFACE_(IAssociationElementOld, IUnknown) // {E58B1ABF-9596-4DBA-8997-89DCDEF46992} +{ + /*** IUnknown ***/ + STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; + /*** IAssociationElementOld ***/ + STDMETHOD(QueryString)(THIS_ ASSOCQUERY query, PCWSTR key, PWSTR *ppszValue) PURE; + STDMETHOD(QueryDword)(THIS_ ASSOCQUERY query, PCWSTR key, DWORD *pdwValue) PURE; + STDMETHOD(QueryExists)(THIS_ ASSOCQUERY query, PCWSTR key) PURE; + STDMETHOD(QueryDirect)(THIS_ ASSOCQUERY query, PCWSTR key, FLAGGED_BYTE_BLOB **ppBlob) PURE; + STDMETHOD(QueryObject)(THIS_ ASSOCQUERY query, PCWSTR key, REFIID riid, PVOID *ppvObj) PURE; +}; +#undef INTERFACE + +#ifdef COBJMACROS +#define IAssociationElementOld_QueryInterface(T,a,b) (T)->lpVtbl->QueryInterface(T,a,b) +#define IAssociationElementOld_AddRef(T) (T)->lpVtbl->AddRef(T) +#define IAssociationElementOld_Release(T) (T)->lpVtbl->Release(T) +#define IAssociationElementOld_QueryString(T,a,b,c) (T)->lpVtbl->QueryString(T,a,b,c) +#define IAssociationElementOld_QueryDword(T,a,b,c) (T)->lpVtbl->QueryDword(T,a,b,c) +#define IAssociationElementOld_QueryExists(T,a,b) (T)->lpVtbl->QueryExists(T,a,b) +#define IAssociationElementOld_QueryDirect(T,a,b,c) (T)->lpVtbl->QueryDirect(T,a,b,c) +#define IAssociationElementOld_QueryObject(T,a,b,c,d) (T)->lpVtbl->QueryObject(T,a,b,c,d) +#endif + #ifdef __cplusplus } /* extern "C" */ -#endif /* defined(__cplusplus) */ - -#endif /* __SHLWAPI_UNDOC_H */ +#endif

1 0

[reactos] 04/04: [UCRT] fenv.h: Fix GCC build of _Fenv1
by Timo Kreuzer 30 Jan '25

30 Jan '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=de3a6706e7ea508024ccd… commit de3a6706e7ea508024ccd63a4b7993931b4354d6 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Nov 4 16:28:56 2024 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Jan 30 11:30:32 2025 +0200 [UCRT] fenv.h: Fix GCC build of _Fenv1 --- sdk/include/ucrt/fenv.h | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/sdk/include/ucrt/fenv.h b/sdk/include/ucrt/fenv.h index 6384e4697b5..37e0ecd4110 100644 --- a/sdk/include/ucrt/fenv.h +++ b/sdk/include/ucrt/fenv.h @@ -64,12 +64,17 @@ _ACRTIMP int __cdecl fesetround(_In_ int _Round); // initialized, indicating no exceptions are masked. In the current // implementation (_Fenv1), the global variable is initialized with all // exceptions masked, which is the actual initial environment. + #ifdef __cplusplus + #define CPP_EXTERN extern + #else + #define CPP_EXTERN + #endif #if defined _M_IX86 - __declspec(selectany) extern const fenv_t _Fenv1 = { 0x3f3f103f, 0 }; + CPP_EXTERN __declspec(selectany) const fenv_t _Fenv1 = { 0x3f3f103f, 0 }; #elif defined _M_X64 - __declspec(selectany) extern const fenv_t _Fenv1 = { 0x3f00003f, 0 }; + CPP_EXTERN __declspec(selectany) const fenv_t _Fenv1 = { 0x3f00003f, 0 }; #else - __declspec(selectany) extern const fenv_t _Fenv1 = { 0x0000003f, 0 }; + CPP_EXTERN __declspec(selectany) const fenv_t _Fenv1 = { 0x0000003f, 0 }; #endif #endif

1 0

[reactos] 03/04: [UCRT] Add GCC compatible definition of _CRT_STDIO_INLINE
by Timo Kreuzer 30 Jan '25

30 Jan '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a438d7c3b88d33bdb393e… commit a438d7c3b88d33bdb393e3dc3eec3214d7acbf15 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Nov 9 19:19:52 2024 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Jan 30 11:30:32 2025 +0200 [UCRT] Add GCC compatible definition of _CRT_STDIO_INLINE In C99 mode GCC emits global symbols for inline functions, as soon as the compilation unit contains a declaration that marks the function as "extern". A number of functions like printf are implicitly declared as extern by GCC, which seemingly cannot be disabled. This would lead to the inline function being emitted as a global symbol in every compilation unit. Using static inline prevents duplicate symbol errors. --- sdk/include/ucrt/corecrt_stdio_config.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sdk/include/ucrt/corecrt_stdio_config.h b/sdk/include/ucrt/corecrt_stdio_config.h index 360a45824d6..cc4b410b525 100644 --- a/sdk/include/ucrt/corecrt_stdio_config.h +++ b/sdk/include/ucrt/corecrt_stdio_config.h @@ -23,7 +23,11 @@ _CRT_BEGIN_C_HEADER #undef _CRT_STDIO_INLINE #define _CRT_STDIO_INLINE #elif !defined _CRT_STDIO_INLINE + #if defined(__GNUC__) + #define _CRT_STDIO_INLINE static __inline + #else #define _CRT_STDIO_INLINE __inline + #endif #endif #if !defined RC_INVOKED // RC has no target architecture

1 0

[reactos] 02/04: [UCRT] Make __local_stdio_printf/scanf_options GCC compatible
by Timo Kreuzer 30 Jan '25

30 Jan '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4ca68ffb1c8adef648400… commit 4ca68ffb1c8adef6484005ce457bfed7db82b8c3 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Nov 9 19:21:11 2024 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Jan 30 11:30:32 2025 +0200 [UCRT] Make __local_stdio_printf/scanf_options GCC compatible --- sdk/include/ucrt/corecrt_stdio_config.h | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/sdk/include/ucrt/corecrt_stdio_config.h b/sdk/include/ucrt/corecrt_stdio_config.h index 88e041260d5..360a45824d6 100644 --- a/sdk/include/ucrt/corecrt_stdio_config.h +++ b/sdk/include/ucrt/corecrt_stdio_config.h @@ -82,24 +82,20 @@ _CRT_BEGIN_C_HEADER #endif #if _CRT_FUNCTIONS_REQUIRED - // This function must not be inlined into callers to avoid ODR violations. The - // static local variable has different names in C and in C++ translation units. + __declspec(selectany) unsigned __int64 __local_stdio_printf_options_storage; _Check_return_ _Ret_notnull_ _CRT_INLINE_PURE_SECURITYCRITICAL_ATTRIBUTE - __declspec(noinline) __inline unsigned __int64* __CRTDECL __local_stdio_printf_options(void) + __inline unsigned __int64* __CRTDECL __local_stdio_printf_options(void) { - static unsigned __int64 _OptionsStorage; - return &_OptionsStorage; + return &__local_stdio_printf_options_storage; } - // This function must not be inlined into callers to avoid ODR violations. The - // static local variable has different names in C and in C++ translation units. + __declspec(selectany) unsigned __int64 __local_stdio_scanf_options_storage; _Check_return_ _Ret_notnull_ _CRT_INLINE_PURE_SECURITYCRITICAL_ATTRIBUTE - __declspec(noinline) __inline unsigned __int64* __CRTDECL __local_stdio_scanf_options(void) + __inline unsigned __int64* __CRTDECL __local_stdio_scanf_options(void) { - static unsigned __int64 _OptionsStorage; - return &_OptionsStorage; + return &__local_stdio_scanf_options_storage; } #endif

1 0

[reactos] 01/04: [CMAKE] Define _CRT_SUPPRESS_RESTRICT on GCC builds
by Timo Kreuzer 30 Jan '25

30 Jan '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bb9392e4e1b2cab035070… commit bb9392e4e1b2cab035070b99b9855072a3069974 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Tue Jan 28 21:30:42 2025 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Jan 30 11:30:32 2025 +0200 [CMAKE] Define _CRT_SUPPRESS_RESTRICT on GCC builds This prevents the use of __declspec(restrict) in UCRT headers. --- sdk/cmake/gcc.cmake | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sdk/cmake/gcc.cmake b/sdk/cmake/gcc.cmake index 6043ab70e2e..54224a806ef 100644 --- a/sdk/cmake/gcc.cmake +++ b/sdk/cmake/gcc.cmake @@ -251,6 +251,9 @@ endif() # Fix build with GLIBCXX + our c++ headers add_definitions(-D_GLIBCXX_HAVE_BROKEN_VSWPRINTF) +# Fix build with UCRT headers +add_definitions(-D_CRT_SUPPRESS_RESTRICT) + # Alternative arch name if(ARCH STREQUAL "amd64") set(ARCH2 x86_64)

1 0

[reactos] 01/01: [NTOS:KDBG] Add back 'cregs' command
by Hervé Poussineau 29 Jan '25

29 Jan '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=70bf3bb8fa7ed1eefde80… commit 70bf3bb8fa7ed1eefde808efb3b43e85040b24bf Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sat Oct 12 07:46:41 2024 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Wed Jan 29 18:25:24 2025 +0100 [NTOS:KDBG] Add back 'cregs' command This command was removed in commit baa47fa5e06948b7e76ba820f7a342547eaf0cde because there was no way to get the CRx registers from a CONTEXT structure. Previous code was also displaying current GDTR/LDTR and IDT. Rewrite the code to use KdSystemDebugControl(SysDbgReadControlSpace, ...) to get CRx, GDTR/LDTR and IDT values just before entering debugger. --- ntoskrnl/kdbg/kdb_cli.c | 79 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) diff --git a/ntoskrnl/kdbg/kdb_cli.c b/ntoskrnl/kdbg/kdb_cli.c index b4794dca739..c86b770c81d 100644 --- a/ntoskrnl/kdbg/kdb_cli.c +++ b/ntoskrnl/kdbg/kdb_cli.c @@ -353,6 +353,7 @@ static const struct #endif // _M_IX86 { "x", "x [address] [L count]", "Display count dwords, starting at address.", KdbpCmdDisassembleX }, { "regs", "regs", "Display general purpose registers.", KdbpCmdRegs }, + { "cregs", "cregs", "Display control, descriptor table and task segment registers.", KdbpCmdRegs }, { "sregs", "sregs", "Display status registers.", KdbpCmdRegs }, { "dregs", "dregs", "Display debug registers.", KdbpCmdRegs }, { "bt", "bt [*frameaddr|thread id]", "Prints current backtrace or from given frame address.", KdbpCmdBackTrace }, @@ -984,6 +985,84 @@ KdbpCmdRegs( } KdbpPrint("\n"); } + else if (Argv[0][0] == 'c') /* cregs */ + { + ULONG Cr0, Cr2, Cr3, Cr4; + KDESCRIPTOR Gdtr = {0, 0, 0}, Idtr = {0, 0, 0}; + USHORT Ldtr, Tr; + static const PCHAR Cr0Bits[32] = { " PE", " MP", " EM", " TS", " ET", " NE", NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + " WP", NULL, " AM", NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, " NW", " CD", " PG" }; + static const PCHAR Cr4Bits[32] = { " VME", " PVI", " TSD", " DE", " PSE", " PAE", " MCE", " PGE", + " PCE", " OSFXSR", " OSXMMEXCPT", NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL }; + SYSDBG_CONTROL_SPACE Input; + KSPECIAL_REGISTERS SpecialRegisters; + NTSTATUS Status = STATUS_NOT_IMPLEMENTED; + + /* Retrieve the control registers */ + RtlZeroMemory(&Input, sizeof(Input)); + Input.Buffer = &SpecialRegisters; + Input.Request = sizeof(SpecialRegisters); +#ifdef _M_IX86 + Input.Address = sizeof(CONTEXT); +#else + Input.Address = AMD64_DEBUG_CONTROL_SPACE_KSPECIAL; +#endif + Status = KdSystemDebugControl(SysDbgReadControlSpace, + &Input, sizeof(Input), + NULL, 0, + NULL, KernelMode); + if (!NT_SUCCESS(Status)) + { + KdbpPrint("Failed to get registers: status 0x%08x\n", Status); + return TRUE; + } + Cr0 = SpecialRegisters.Cr0; + Cr2 = SpecialRegisters.Cr2; + Cr3 = SpecialRegisters.Cr3; + Cr4 = SpecialRegisters.Cr4; + + /* Retrieve the descriptor table and task segment registers */ + Gdtr = SpecialRegisters.Gdtr; + Ldtr = SpecialRegisters.Ldtr; + Idtr = SpecialRegisters.Idtr; + Tr = SpecialRegisters.Tr; + + /* Display the control registers */ + KdbpPrint("CR0 0x%08x ", Cr0); + for (i = 0; i < 32; i++) + { + if (!Cr0Bits[i]) + continue; + + if ((Cr0 & (1 << i)) != 0) + KdbpPrint(Cr0Bits[i]); + } + KdbpPrint("\n"); + + KdbpPrint("CR2 0x%08x\n", Cr2); + KdbpPrint("CR3 0x%08x Pagedir-Base 0x%08x %s%s\n", Cr3, (Cr3 & 0xfffff000), + (Cr3 & (1 << 3)) ? " PWT" : "", (Cr3 & (1 << 4)) ? " PCD" : "" ); + KdbpPrint("CR4 0x%08x ", Cr4); + for (i = 0; i < 32; i++) + { + if (!Cr4Bits[i]) + continue; + + if ((Cr4 & (1 << i)) != 0) + KdbpPrint(Cr4Bits[i]); + } + KdbpPrint("\n"); + + /* Display the descriptor table and task segment registers */ + KdbpPrint("GDTR Base 0x%08x Size 0x%04x\n", Gdtr.Base, Gdtr.Limit); + KdbpPrint("LDTR 0x%04x\n", Ldtr); + KdbpPrint("IDTR Base 0x%08x Size 0x%04x\n", Idtr.Base, Idtr.Limit); + KdbpPrint("TR 0x%04x\n", Tr); + } else if (Argv[0][0] == 's') /* sregs */ { KdbpPrint("CS 0x%04x Index 0x%04x %cDT RPL%d\n",

1 0

[reactos] 01/01: Revert "[NTUSER] Enable SM_CXICON etc. settings from registry (#7679)" (#7682)
by Katayama Hirofumi MZ 29 Jan '25

29 Jan '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2f23e70ad55cc661bc756… commit 2f23e70ad55cc661bc756fb492535fdfab2e9921 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Jan 29 21:34:19 2025 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Jan 29 21:34:19 2025 +0900 Revert "[NTUSER] Enable SM_CXICON etc. settings from registry (#7679)" (#7682) This reverts commit 3b3741c10af77bd54184e9d271206ac017e73b34 of #7679 . It seems like the shell icon size is not the system icon size. The wide string L"Shell Small Icon Size" is detected in shell32.dll and themeui.dll. No L"Shell Small Icon Size" in win32k.sys found. JIRA issue: CORE-12905 --- win32ss/user/ntuser/metric.c | 9 ++++----- win32ss/user/ntuser/sysparams.c | 10 ---------- win32ss/user/ntuser/sysparams.h | 3 --- 3 files changed, 4 insertions(+), 18 deletions(-) diff --git a/win32ss/user/ntuser/metric.c b/win32ss/user/ntuser/metric.c index 4ece647717f..e070bb0fa51 100644 --- a/win32ss/user/ntuser/metric.c +++ b/win32ss/user/ntuser/metric.c @@ -5,7 +5,6 @@ * FILE: win32ss/user/ntuser/metric.c * PROGRAMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) * Timo Kreuzer (timo.kreuzer(a)reactos.org) - * Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) */ #include <win32k.h> @@ -131,10 +130,10 @@ InitMetrics(VOID) piSysMet[SM_CXHTHUMB] = gspv.ncm.iScrollHeight; // 16; piSysMet[SM_CYVSCROLL] = gspv.ncm.iScrollHeight; // 16 piSysMet[SM_CXHSCROLL] = gspv.ncm.iScrollHeight; // 16; - piSysMet[SM_CXICON] = gspv.nIconSize; // 32 - piSysMet[SM_CYICON] = gspv.nIconSize; // 32 - piSysMet[SM_CXSMICON] = gspv.nSmallIconSize; // 16 - piSysMet[SM_CYSMICON] = gspv.nSmallIconSize; // 16 + piSysMet[SM_CXICON] = 32; + piSysMet[SM_CYICON] = 32; + piSysMet[SM_CXSMICON] = 16; + piSysMet[SM_CYSMICON] = 16; piSysMet[SM_CXICONSPACING] = gspv.im.iHorzSpacing; // 64; piSysMet[SM_CYICONSPACING] = gspv.im.iVertSpacing; // 64; piSysMet[SM_CXCURSOR] = 32; diff --git a/win32ss/user/ntuser/sysparams.c b/win32ss/user/ntuser/sysparams.c index 538d18bb341..59cc76f13f9 100644 --- a/win32ss/user/ntuser/sysparams.c +++ b/win32ss/user/ntuser/sysparams.c @@ -4,7 +4,6 @@ * PURPOSE: System parameters functions * FILE: win32ss/user/ntuser/sysparams.c * PROGRAMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) - * Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) */ // TODO: @@ -206,11 +205,6 @@ SpiFixupValues(VOID) // gspv.tmMenuFont.tmExternalLeading); if (gspv.iDblClickTime == 0) gspv.iDblClickTime = 500; - if (gspv.nIconSize <= 0) - gspv.nIconSize = 32; - if (gspv.nSmallIconSize <= 0) - gspv.nSmallIconSize = 16; - // FIXME: Hack!!! gspv.tmMenuFont.tmHeight = 11; gspv.tmMenuFont.tmExternalLeading = 2; @@ -302,10 +296,6 @@ SpiUpdatePerUserSystemParameters(VOID) gspv.im.iTitleWrap = SpiLoadMetric(VAL_ITWRAP, 1); SpiLoadFont(&gspv.im.lfFont, L"IconFont", &lf1); - /* Load icon size */ - gspv.nIconSize = SpiLoadInt(KEY_METRIC, L"Shell Icon Size", 32); - gspv.nSmallIconSize = SpiLoadInt(KEY_METRIC, L"Shell Small Icon Size", 16); - /* Load desktop settings */ gspv.bDragFullWindows = SpiLoadInt(KEY_DESKTOP, VAL_DRAG, 0); gspv.iWheelScrollLines = SpiLoadInt(KEY_DESKTOP, VAL_SCRLLLINES, 3); diff --git a/win32ss/user/ntuser/sysparams.h b/win32ss/user/ntuser/sysparams.h index dafb7f4b181..0b564f86099 100644 --- a/win32ss/user/ntuser/sysparams.h +++ b/win32ss/user/ntuser/sysparams.h @@ -157,9 +157,6 @@ typedef struct _SPIVALUES DWORD dwForegroundFlashCount; DWORD dwCaretWidth; - INT nIconSize; - INT nSmallIconSize; - // SPI_LANGDRIVER // SPI_SETDESKPATTERN // SPI_SETPENWINDOWS

1 0

[reactos] 01/01: [NTUSER] Enable SM_CXICON etc. settings from registry (#7679)
by Katayama Hirofumi MZ 29 Jan '25

29 Jan '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3b3741c10af77bd54184e… commit 3b3741c10af77bd54184e9d271206ac017e73b34 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Jan 29 20:20:25 2025 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Jan 29 20:20:25 2025 +0900 [NTUSER] Enable SM_CXICON etc. settings from registry (#7679) Improve usability. JIRA issue: CORE-12905 - Add nIconSize and nSmallIconSize values to SPIVALUES structure. - Load "Shell Icon Size" and "Shell Small Icon Size" values from registry. - Enable changing of SM_CXICON, SM_CYICON, SM_CXSMICON, and SM_CYSMICON settings. --- win32ss/user/ntuser/metric.c | 9 +++++---- win32ss/user/ntuser/sysparams.c | 10 ++++++++++ win32ss/user/ntuser/sysparams.h | 3 +++ 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/win32ss/user/ntuser/metric.c b/win32ss/user/ntuser/metric.c index e070bb0fa51..4ece647717f 100644 --- a/win32ss/user/ntuser/metric.c +++ b/win32ss/user/ntuser/metric.c @@ -5,6 +5,7 @@ * FILE: win32ss/user/ntuser/metric.c * PROGRAMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) * Timo Kreuzer (timo.kreuzer(a)reactos.org) + * Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) */ #include <win32k.h> @@ -130,10 +131,10 @@ InitMetrics(VOID) piSysMet[SM_CXHTHUMB] = gspv.ncm.iScrollHeight; // 16; piSysMet[SM_CYVSCROLL] = gspv.ncm.iScrollHeight; // 16 piSysMet[SM_CXHSCROLL] = gspv.ncm.iScrollHeight; // 16; - piSysMet[SM_CXICON] = 32; - piSysMet[SM_CYICON] = 32; - piSysMet[SM_CXSMICON] = 16; - piSysMet[SM_CYSMICON] = 16; + piSysMet[SM_CXICON] = gspv.nIconSize; // 32 + piSysMet[SM_CYICON] = gspv.nIconSize; // 32 + piSysMet[SM_CXSMICON] = gspv.nSmallIconSize; // 16 + piSysMet[SM_CYSMICON] = gspv.nSmallIconSize; // 16 piSysMet[SM_CXICONSPACING] = gspv.im.iHorzSpacing; // 64; piSysMet[SM_CYICONSPACING] = gspv.im.iVertSpacing; // 64; piSysMet[SM_CXCURSOR] = 32; diff --git a/win32ss/user/ntuser/sysparams.c b/win32ss/user/ntuser/sysparams.c index 59cc76f13f9..538d18bb341 100644 --- a/win32ss/user/ntuser/sysparams.c +++ b/win32ss/user/ntuser/sysparams.c @@ -4,6 +4,7 @@ * PURPOSE: System parameters functions * FILE: win32ss/user/ntuser/sysparams.c * PROGRAMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) + * Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) */ // TODO: @@ -205,6 +206,11 @@ SpiFixupValues(VOID) // gspv.tmMenuFont.tmExternalLeading); if (gspv.iDblClickTime == 0) gspv.iDblClickTime = 500; + if (gspv.nIconSize <= 0) + gspv.nIconSize = 32; + if (gspv.nSmallIconSize <= 0) + gspv.nSmallIconSize = 16; + // FIXME: Hack!!! gspv.tmMenuFont.tmHeight = 11; gspv.tmMenuFont.tmExternalLeading = 2; @@ -296,6 +302,10 @@ SpiUpdatePerUserSystemParameters(VOID) gspv.im.iTitleWrap = SpiLoadMetric(VAL_ITWRAP, 1); SpiLoadFont(&gspv.im.lfFont, L"IconFont", &lf1); + /* Load icon size */ + gspv.nIconSize = SpiLoadInt(KEY_METRIC, L"Shell Icon Size", 32); + gspv.nSmallIconSize = SpiLoadInt(KEY_METRIC, L"Shell Small Icon Size", 16); + /* Load desktop settings */ gspv.bDragFullWindows = SpiLoadInt(KEY_DESKTOP, VAL_DRAG, 0); gspv.iWheelScrollLines = SpiLoadInt(KEY_DESKTOP, VAL_SCRLLLINES, 3); diff --git a/win32ss/user/ntuser/sysparams.h b/win32ss/user/ntuser/sysparams.h index 0b564f86099..dafb7f4b181 100644 --- a/win32ss/user/ntuser/sysparams.h +++ b/win32ss/user/ntuser/sysparams.h @@ -157,6 +157,9 @@ typedef struct _SPIVALUES DWORD dwForegroundFlashCount; DWORD dwCaretWidth; + INT nIconSize; + INT nSmallIconSize; + // SPI_LANGDRIVER // SPI_SETDESKPATTERN // SPI_SETPENWINDOWS

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs