Ros-diffs

ros-diffs@reactos.org

13 participants
81035 discussions

[reactos] 01/01: [SHELL32][SDK] Implement ShortSizeFormatW (#5829)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2ccdd87809ba49093da9f… commit 2ccdd87809ba49093da9f0143bd150228bd54b4a Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Oct 28 14:55:25 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Oct 28 14:55:25 2023 +0900 [SHELL32][SDK] Implement ShortSizeFormatW (#5829) - Implement ShortSizeFormatW. - Add ShortSizeFormatW prototype into <undocshell.h>. - Modify shell32.spec. --- dll/win32/shell32/shell32.spec | 2 +- dll/win32/shell32/stubs.cpp | 11 ----------- dll/win32/shell32/utils.cpp | 13 +++++++++++++ sdk/include/reactos/undocshell.h | 5 +++++ 4 files changed, 19 insertions(+), 12 deletions(-) diff --git a/dll/win32/shell32/shell32.spec b/dll/win32/shell32/shell32.spec index 9cc8bfd8cdc..2aabb8efb2a 100644 --- a/dll/win32/shell32/shell32.spec +++ b/dll/win32/shell32/shell32.spec @@ -200,7 +200,7 @@ 201 stdcall -noname SHDesktopMessageLoop(ptr) 202 stub -noname DDEHandleViewFolderNotify 203 stdcall -noname AddCommasW(long wstr) -204 stdcall -noname ShortSizeFormatW(double) +204 stdcall -noname ShortSizeFormatW(long ptr) 205 stdcall -noname Printer_LoadIconsW(wstr ptr ptr) 206 stdcall ExtractAssociatedIconA(long str ptr) 207 stdcall ExtractAssociatedIconExA(long str long long) diff --git a/dll/win32/shell32/stubs.cpp b/dll/win32/shell32/stubs.cpp index 1faf6c87977..ee4452a9277 100644 --- a/dll/win32/shell32/stubs.cpp +++ b/dll/win32/shell32/stubs.cpp @@ -14,17 +14,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); -/* - * Unimplemented - */ -EXTERN_C LPWSTR -WINAPI -ShortSizeFormatW(LONGLONG llNumber) -{ - FIXME("ShortSizeFormatW() stub\n"); - return NULL; -} - /* * Unimplemented */ diff --git a/dll/win32/shell32/utils.cpp b/dll/win32/shell32/utils.cpp index 512bd1b754f..215be665a6c 100644 --- a/dll/win32/shell32/utils.cpp +++ b/dll/win32/shell32/utils.cpp @@ -86,6 +86,19 @@ ExtractIconResInfoA( return ExtractIconResInfoW(hHandle, strFileNameW, wIndex, lpSize, lpIcon); } +/************************************************************************* + * ShortSizeFormatW (SHELL32.204) + */ +EXTERN_C +LPWSTR WINAPI +ShortSizeFormatW( + _In_ DWORD dwNumber, + _Out_writes_(0x8FFF) LPWSTR pszBuffer) +{ + TRACE("(%lu, %p)\n", dwNumber, pszBuffer); + return StrFormatByteSizeW(dwNumber, pszBuffer, 0x8FFF); +} + /************************************************************************* * SHOpenEffectiveToken (SHELL32.235) */ diff --git a/sdk/include/reactos/undocshell.h b/sdk/include/reactos/undocshell.h index e294e8c4e54..a8dc8c2c145 100644 --- a/sdk/include/reactos/undocshell.h +++ b/sdk/include/reactos/undocshell.h @@ -700,6 +700,11 @@ LargeIntegerToString( _In_opt_ const NUMBERFMTW *pNumberFormat, _In_ DWORD dwNumberFlags); +LPWSTR WINAPI +ShortSizeFormatW( + _In_ DWORD dwNumber, + _Out_writes_(0x8FFF) LPWSTR pszBuffer); + BOOL WINAPI SHOpenEffectiveToken(_Out_ LPHANDLE phToken); DWORD WINAPI SHGetUserSessionId(_In_opt_ HANDLE hToken);

1 year, 2 months

[reactos] 01/01: [SHELL32] Implement ExtractIconResInfoA (#5846)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=81e936486ede27c51179c… commit 81e936486ede27c51179c462aace7b84aed79c27 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Oct 28 11:38:29 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Oct 28 11:38:29 2023 +0900 [SHELL32] Implement ExtractIconResInfoA (#5846) - Add ExtractIconResInfoA implementation. - Add ExtractIconResInfo prototype to <undocshell.h>. --- dll/win32/shell32/stubs.cpp | 26 ++++++-------------------- dll/win32/shell32/utils.cpp | 21 +++++++++++++++++++++ sdk/include/reactos/undocshell.h | 16 ++++++++++++++++ 3 files changed, 43 insertions(+), 20 deletions(-) diff --git a/dll/win32/shell32/stubs.cpp b/dll/win32/shell32/stubs.cpp index 56480aae5bd..1faf6c87977 100644 --- a/dll/win32/shell32/stubs.cpp +++ b/dll/win32/shell32/stubs.cpp @@ -939,26 +939,12 @@ Printers_AddPrinterPropPages(LPVOID lpUnknown1, LPVOID lpUnknown2) */ EXTERN_C WORD WINAPI -ExtractIconResInfoA(HANDLE hHandle, - LPSTR lpFile, - WORD wIndex, - LPWORD lpSize, - LPHANDLE lpIcon) -{ - FIXME("ExtractIconResInfoA() stub\n"); - return 0; -} - -/* - * Unimplemented - */ -EXTERN_C WORD -WINAPI -ExtractIconResInfoW(HANDLE hHandle, - LPWSTR lpFile, - WORD wIndex, - LPWORD lpSize, - LPHANDLE lpIcon) +ExtractIconResInfoW( + _In_ HANDLE hHandle, + _In_ LPCWSTR lpFileName, + _In_ WORD wIndex, + _Out_ LPWORD lpSize, + _Out_ LPHANDLE lpIcon) { FIXME("ExtractIconResInfoW() stub\n"); return 0; diff --git a/dll/win32/shell32/utils.cpp b/dll/win32/shell32/utils.cpp index 6adeca8afd7..512bd1b754f 100644 --- a/dll/win32/shell32/utils.cpp +++ b/dll/win32/shell32/utils.cpp @@ -65,6 +65,27 @@ PathIsSlowA( return PathIsSlowW(strFileW, dwAttr); } +/************************************************************************* + * ExtractIconResInfoA (SHELL32.221) + */ +EXTERN_C +WORD WINAPI +ExtractIconResInfoA( + _In_ HANDLE hHandle, + _In_ LPCSTR lpFileName, + _In_ WORD wIndex, + _Out_ LPWORD lpSize, + _Out_ LPHANDLE lpIcon) +{ + TRACE("(%p, %s, %u, %p, %p)\n", hHandle, debugstr_a(lpFileName), wIndex, lpSize, lpIcon); + + if (!lpFileName) + return 0; + + CStringW strFileNameW(lpFileName); + return ExtractIconResInfoW(hHandle, strFileNameW, wIndex, lpSize, lpIcon); +} + /************************************************************************* * SHOpenEffectiveToken (SHELL32.235) */ diff --git a/sdk/include/reactos/undocshell.h b/sdk/include/reactos/undocshell.h index 5b6953e9204..e294e8c4e54 100644 --- a/sdk/include/reactos/undocshell.h +++ b/sdk/include/reactos/undocshell.h @@ -239,6 +239,22 @@ HICON WINAPI SHGetFileIcon( BOOL WINAPI FileIconInit(BOOL bFullInit); +WORD WINAPI +ExtractIconResInfoA( + _In_ HANDLE hHandle, + _In_ LPCSTR lpFileName, + _In_ WORD wIndex, + _Out_ LPWORD lpSize, + _Out_ LPHANDLE lpIcon); + +WORD WINAPI +ExtractIconResInfoW( + _In_ HANDLE hHandle, + _In_ LPCWSTR lpFileName, + _In_ WORD wIndex, + _Out_ LPWORD lpSize, + _Out_ LPHANDLE lpIcon); + /**************************************************************************** * File Menu Routines */

1 year, 2 months

[reactos] 01/01: [SHELL32][SDK] Implement PathIsSlowA and SHSetFolderPathA (#5841)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9dfb3e8e051388f765de2… commit 9dfb3e8e051388f765de20bc259e71276ad15eb6 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Oct 28 09:59:12 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Oct 28 09:59:12 2023 +0900 [SHELL32][SDK] Implement PathIsSlowA and SHSetFolderPathA (#5841) - Implement PathIsSlowA and SHSetFolderPathA functions. - Add PathIsSlow and SHSetFolderPath prototypes to <shlobj.h>. - Fix some <shlobj.h>'s bugs. - Improve SHOpenPropSheetA function. --- dll/win32/shell32/stubs.cpp | 42 +++++++------------------- dll/win32/shell32/utils.cpp | 73 ++++++++++++++++++++++++++++++++++----------- sdk/include/psdk/shlobj.h | 43 ++++++++++++++++++++++---- 3 files changed, 103 insertions(+), 55 deletions(-) diff --git a/dll/win32/shell32/stubs.cpp b/dll/win32/shell32/stubs.cpp index ad3f31c2873..56480aae5bd 100644 --- a/dll/win32/shell32/stubs.cpp +++ b/dll/win32/shell32/stubs.cpp @@ -225,13 +225,13 @@ SHGetSetFolderCustomSettingsA(LPSHFOLDERCUSTOMSETTINGSA pfcs, */ BOOL WINAPI SHOpenPropSheetW( - _In_opt_z_ LPCWSTR pszCaption, + _In_opt_ LPCWSTR pszCaption, _In_opt_ HKEY *ahKeys, _In_ UINT cKeys, _In_ const CLSID *pclsidDefault, _In_ IDataObject *pDataObject, _In_opt_ IShellBrowser *pShellBrowser, - _In_opt_z_ LPCWSTR pszStartPage) + _In_opt_ LPCWSTR pszStartPage) { FIXME("SHOpenPropSheetW() stub\n"); return FALSE; @@ -1028,24 +1028,11 @@ FirstUserLogon(LPWSTR lpUnknown1, LPWSTR lpUnknown2) */ EXTERN_C HRESULT WINAPI -SHSetFolderPathA(int csidl, - HANDLE hToken, - DWORD dwFlags, - LPCSTR pszPath) -{ - FIXME("SHSetFolderPathA() stub\n"); - return E_FAIL; -} - -/* - * Unimplemented - */ -EXTERN_C HRESULT -WINAPI -SHSetFolderPathW(int csidl, - HANDLE hToken, - DWORD dwFlags, - LPCWSTR pszPath) +SHSetFolderPathW( + _In_ INT csidl, + _In_ HANDLE hToken, + _In_ DWORD dwFlags, + _In_ LPCWSTR pszPath) { FIXME("SHSetFolderPathW() stub\n"); return E_FAIL; @@ -1089,23 +1076,14 @@ SHShouldShowWizards(LPVOID lpUnknown) */ EXTERN_C BOOL WINAPI -PathIsSlowW(LPCWSTR pszFile, DWORD dwFileAttr) +PathIsSlowW( + _In_ LPCWSTR pszFile, + _In_ DWORD dwAttr) { FIXME("PathIsSlowW() stub\n"); return FALSE; } -/* - * Unimplemented - */ -EXTERN_C BOOL -WINAPI -PathIsSlowA(LPCSTR pszFile, DWORD dwFileAttr) -{ - FIXME("PathIsSlowA() stub\n"); - return FALSE; -} - /* * Unimplemented */ diff --git a/dll/win32/shell32/utils.cpp b/dll/win32/shell32/utils.cpp index c9170ff29af..6adeca8afd7 100644 --- a/dll/win32/shell32/utils.cpp +++ b/dll/win32/shell32/utils.cpp @@ -9,7 +9,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); -static BOOL OpenEffectiveToken(DWORD DesiredAccess, HANDLE *phToken) +static BOOL +OpenEffectiveToken( + _In_ DWORD DesiredAccess, + _Out_ HANDLE *phToken) { BOOL ret; @@ -28,6 +31,40 @@ static BOOL OpenEffectiveToken(DWORD DesiredAccess, HANDLE *phToken) return ret; } +/************************************************************************* + * SHSetFolderPathA (SHELL32.231) + * + * @see https://learn.microsoft.com/en-us/windows/win32/api/shlobj_core/nf-shlobj_c… + */ +EXTERN_C +HRESULT WINAPI +SHSetFolderPathA( + _In_ INT csidl, + _In_ HANDLE hToken, + _In_ DWORD dwFlags, + _In_ LPCSTR pszPath) +{ + TRACE("(%d, %p, 0x%X, %s)\n", csidl, hToken, dwFlags, debugstr_a(pszPath)); + CStringW strPathW(pszPath); + return SHSetFolderPathW(csidl, hToken, dwFlags, strPathW); +} + +/************************************************************************* + * PathIsSlowA (SHELL32.240) + * + * @see https://learn.microsoft.com/en-us/windows/win32/api/shlobj/nf-shlobj-pathis… + */ +EXTERN_C +BOOL WINAPI +PathIsSlowA( + _In_ LPCSTR pszFile, + _In_ DWORD dwAttr) +{ + TRACE("(%s, 0x%X)\n", debugstr_a(pszFile), dwAttr); + CStringW strFileW(pszFile); + return PathIsSlowW(strFileW, dwAttr); +} + /************************************************************************* * SHOpenEffectiveToken (SHELL32.235) */ @@ -68,7 +105,7 @@ EXTERN_C DWORD WINAPI SHGetUserSessionId(_In_opt_ HANDLE hToken) EXTERN_C HRESULT WINAPI SHInvokePrivilegedFunctionW( - _In_z_ LPCWSTR pszName, + _In_ LPCWSTR pszName, _In_ PRIVILEGED_FUNCTION fn, _In_opt_ LPARAM lParam) { @@ -110,7 +147,9 @@ SHInvokePrivilegedFunctionW( */ EXTERN_C BOOL WINAPI -SHTestTokenPrivilegeW(_In_opt_ HANDLE hToken, _In_z_ LPCWSTR lpName) +SHTestTokenPrivilegeW( + _In_opt_ HANDLE hToken, + _In_ LPCWSTR lpName) { LUID Luid; DWORD dwLength; @@ -314,7 +353,7 @@ SHFindComputer(LPCITEMIDLIST pidlRoot, LPCITEMIDLIST pidlSavedSearch) static HRESULT Int64ToStr( _In_ LONGLONG llValue, - _Out_writes_z_(cchValue) LPWSTR pszValue, + _Out_writes_(cchValue) LPWSTR pszValue, _In_ UINT cchValue) { WCHAR szBuff[40]; @@ -361,9 +400,9 @@ Int64GetNumFormat( _Out_ NUMBERFMTW *pDest, _In_opt_ const NUMBERFMTW *pSrc, _In_ DWORD dwNumberFlags, - _Out_writes_z_(cchDecimal) LPWSTR pszDecimal, + _Out_writes_(cchDecimal) LPWSTR pszDecimal, _In_ INT cchDecimal, - _Out_writes_z_(cchThousand) LPWSTR pszThousand, + _Out_writes_(cchThousand) LPWSTR pszThousand, _In_ INT cchThousand) { WCHAR szBuff[20]; @@ -419,7 +458,7 @@ EXTERN_C INT WINAPI Int64ToString( _In_ LONGLONG llValue, - _Out_writes_z_(cchOut) LPWSTR pszOut, + _Out_writes_(cchOut) LPWSTR pszOut, _In_ UINT cchOut, _In_ BOOL bUseFormat, _In_opt_ const NUMBERFMTW *pNumberFormat, @@ -457,7 +496,7 @@ EXTERN_C INT WINAPI LargeIntegerToString( _In_ const LARGE_INTEGER *pLargeInt, - _Out_writes_z_(cchOut) LPWSTR pszOut, + _Out_writes_(cchOut) LPWSTR pszOut, _In_ UINT cchOut, _In_ BOOL bUseFormat, _In_opt_ const NUMBERFMTW *pNumberFormat, @@ -475,30 +514,30 @@ LargeIntegerToString( EXTERN_C BOOL WINAPI SHOpenPropSheetA( - _In_opt_z_ LPCSTR pszCaption, + _In_opt_ LPCSTR pszCaption, _In_opt_ HKEY *ahKeys, _In_ UINT cKeys, _In_ const CLSID *pclsidDefault, _In_ IDataObject *pDataObject, _In_opt_ IShellBrowser *pShellBrowser, - _In_opt_z_ LPCSTR pszStartPage) + _In_opt_ LPCSTR pszStartPage) { - WCHAR szStartPageW[MAX_PATH], szCaptionW[MAX_PATH]; + CStringW strStartPageW, strCaptionW; LPCWSTR pszCaptionW = NULL, pszStartPageW = NULL; - TRACE("(%s, %p, %u, %p, %p, %p, %s)", pszCaption, ahKeys, cKeys, pclsidDefault, pDataObject, - pShellBrowser, pszStartPage); + TRACE("(%s, %p, %u, %p, %p, %p, %s)", debugstr_a(pszCaption), ahKeys, cKeys, pclsidDefault, + pDataObject, pShellBrowser, debugstr_a(pszStartPage)); if (pszCaption) { - SHAnsiToUnicode(pszCaption, szCaptionW, _countof(szCaptionW)); - pszCaptionW = szCaptionW; + strStartPageW = pszCaption; + pszCaptionW = strCaptionW; } if (pszStartPage) { - SHAnsiToUnicode(pszStartPage, szStartPageW, _countof(szStartPageW)); - pszStartPageW = szStartPageW; + strStartPageW = pszStartPage; + pszStartPageW = strStartPageW; } return SHOpenPropSheetW(pszCaptionW, ahKeys, cKeys, pclsidDefault, diff --git a/sdk/include/psdk/shlobj.h b/sdk/include/psdk/shlobj.h index 39124f6af41..a9c90ffc137 100644 --- a/sdk/include/psdk/shlobj.h +++ b/sdk/include/psdk/shlobj.h @@ -190,7 +190,35 @@ SHGetFolderPathAndSubDirW( _In_opt_ LPCWSTR, _Out_writes_(MAX_PATH) LPWSTR); -#define SHGetFolderPathAndSubDir WINELIB_NAME_AW(SHGetFolderPathAndSubDir); +#define SHGetFolderPathAndSubDir WINELIB_NAME_AW(SHGetFolderPathAndSubDir) + +HRESULT WINAPI +SHSetFolderPathA( + _In_ INT csidl, + _In_ HANDLE hToken, + _In_ DWORD dwFlags, + _In_ LPCSTR pszPath); + +HRESULT WINAPI +SHSetFolderPathW( + _In_ INT csidl, + _In_ HANDLE hToken, + _In_ DWORD dwFlags, + _In_ LPCWSTR pszPath); + +#define SHSetFolderPath WINELIB_NAME_AW(SHSetFolderPath) + +BOOL WINAPI +PathIsSlowA( + _In_ LPCSTR pszFile, + _In_ DWORD dwAttr); + +BOOL WINAPI +PathIsSlowW( + _In_ LPCWSTR pszFile, + _In_ DWORD dwAttr); + +#define PathIsSlow WINELIB_NAME_AW(PathIsSlow) _Success_(return != 0) BOOL @@ -242,7 +270,7 @@ SHPathPrepareForWriteW( _In_opt_ IUnknown*, _In_ LPCWSTR, DWORD); -#define SHPathPrepareForWrite WINELIB_NAME_AW(SHPathPrepareForWrite); +#define SHPathPrepareForWrite WINELIB_NAME_AW(SHPathPrepareForWrite) UINT WINAPI @@ -342,22 +370,25 @@ HINSTANCE WINAPI SHGetShellStyleHInstance(VOID); BOOL WINAPI SHOpenPropSheetA( - _In_opt_z_ LPCSTR pszCaption, + _In_opt_ LPCSTR pszCaption, _In_opt_ HKEY *ahKeys, _In_ UINT cKeys, _In_ const CLSID *pclsidDefault, _In_ IDataObject *pDataObject, _In_opt_ IShellBrowser *pShellBrowser, - _In_opt_z_ LPCSTR pszStartPage); + _In_opt_ LPCSTR pszStartPage); + BOOL WINAPI SHOpenPropSheetW( - _In_opt_z_ LPCWSTR pszCaption, + _In_opt_ LPCWSTR pszCaption, _In_opt_ HKEY *ahKeys, _In_ UINT cKeys, _In_ const CLSID *pclsidDefault, _In_ IDataObject *pDataObject, _In_opt_ IShellBrowser *pShellBrowser, - _In_opt_z_ LPCWSTR pszStartPage); + _In_opt_ LPCWSTR pszStartPage); + +#define SHOpenPropSheet WINELIB_NAME_AW(SHOpenPropSheet) /***************************************************************************** * IContextMenu interface

1 year, 2 months

[reactos] 01/01: [SHELL32][SDK] Implement SHOpenPropSheetA (#5830)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dcc9a2d8f3c298401b1be… commit dcc9a2d8f3c298401b1be40967264892b03188e3 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Oct 27 19:34:02 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Oct 27 19:34:02 2023 +0900 [SHELL32][SDK] Implement SHOpenPropSheetA (#5830) - Add SHOpenPropSheetA and SHOpenPropSheetW prototypes to <shlobj.h>. - Implement SHOpenPropSheetA function. --- dll/win32/shell32/stubs.cpp | 43 ++++++++++++++----------------------------- dll/win32/shell32/utils.cpp | 38 ++++++++++++++++++++++++++++++++++++++ sdk/include/psdk/shlobj.h | 19 +++++++++++++++++++ 3 files changed, 71 insertions(+), 29 deletions(-) diff --git a/dll/win32/shell32/stubs.cpp b/dll/win32/shell32/stubs.cpp index 9ca95825c7f..ad3f31c2873 100644 --- a/dll/win32/shell32/stubs.cpp +++ b/dll/win32/shell32/stubs.cpp @@ -218,35 +218,20 @@ SHGetSetFolderCustomSettingsA(LPSHFOLDERCUSTOMSETTINGSA pfcs, return E_FAIL; } -/* - * Unimplemented - */ -EXTERN_C BOOL -WINAPI -SHOpenPropSheetA(LPCSTR lpCaption, - HKEY hKeys[], - UINT uCount, - const CLSID *pClsID, - IDataObject *pDataObject, - IShellBrowser *pShellBrowser, - LPCSTR lpStartPage) -{ - FIXME("SHOpenPropSheetA() stub\n"); - return FALSE; -} - -/* - * Unimplemented - */ -EXTERN_C BOOL -WINAPI -SHOpenPropSheetW(LPCWSTR lpCaption, - HKEY hKeys[], - UINT uCount, - const CLSID *pClsID, - IDataObject *pDataObject, - IShellBrowser *pShellBrowser, - LPCWSTR lpStartPage) +/************************************************************************* + * SHOpenPropSheetW [SHELL32.80] + * + * @see https://learn.microsoft.com/en-us/windows/win32/api/shlobj/nf-shlobj-shopen… + */ +BOOL WINAPI +SHOpenPropSheetW( + _In_opt_z_ LPCWSTR pszCaption, + _In_opt_ HKEY *ahKeys, + _In_ UINT cKeys, + _In_ const CLSID *pclsidDefault, + _In_ IDataObject *pDataObject, + _In_opt_ IShellBrowser *pShellBrowser, + _In_opt_z_ LPCWSTR pszStartPage) { FIXME("SHOpenPropSheetW() stub\n"); return FALSE; diff --git a/dll/win32/shell32/utils.cpp b/dll/win32/shell32/utils.cpp index f10cb11e290..c9170ff29af 100644 --- a/dll/win32/shell32/utils.cpp +++ b/dll/win32/shell32/utils.cpp @@ -466,3 +466,41 @@ LargeIntegerToString( return Int64ToString(pLargeInt->QuadPart, pszOut, cchOut, bUseFormat, pNumberFormat, dwNumberFlags); } + +/************************************************************************* + * SHOpenPropSheetA [SHELL32.707] + * + * @see https://learn.microsoft.com/en-us/windows/win32/api/shlobj/nf-shlobj-shopen… + */ +EXTERN_C +BOOL WINAPI +SHOpenPropSheetA( + _In_opt_z_ LPCSTR pszCaption, + _In_opt_ HKEY *ahKeys, + _In_ UINT cKeys, + _In_ const CLSID *pclsidDefault, + _In_ IDataObject *pDataObject, + _In_opt_ IShellBrowser *pShellBrowser, + _In_opt_z_ LPCSTR pszStartPage) +{ + WCHAR szStartPageW[MAX_PATH], szCaptionW[MAX_PATH]; + LPCWSTR pszCaptionW = NULL, pszStartPageW = NULL; + + TRACE("(%s, %p, %u, %p, %p, %p, %s)", pszCaption, ahKeys, cKeys, pclsidDefault, pDataObject, + pShellBrowser, pszStartPage); + + if (pszCaption) + { + SHAnsiToUnicode(pszCaption, szCaptionW, _countof(szCaptionW)); + pszCaptionW = szCaptionW; + } + + if (pszStartPage) + { + SHAnsiToUnicode(pszStartPage, szStartPageW, _countof(szStartPageW)); + pszStartPageW = szStartPageW; + } + + return SHOpenPropSheetW(pszCaptionW, ahKeys, cKeys, pclsidDefault, + pDataObject, pShellBrowser, pszStartPageW); +} diff --git a/sdk/include/psdk/shlobj.h b/sdk/include/psdk/shlobj.h index 601fd58f30c..39124f6af41 100644 --- a/sdk/include/psdk/shlobj.h +++ b/sdk/include/psdk/shlobj.h @@ -340,6 +340,25 @@ int WINAPI PathCleanupSpec(_In_opt_ LPCWSTR, _Inout_ LPWSTR); HINSTANCE WINAPI SHGetShellStyleHInstance(VOID); #endif +BOOL WINAPI +SHOpenPropSheetA( + _In_opt_z_ LPCSTR pszCaption, + _In_opt_ HKEY *ahKeys, + _In_ UINT cKeys, + _In_ const CLSID *pclsidDefault, + _In_ IDataObject *pDataObject, + _In_opt_ IShellBrowser *pShellBrowser, + _In_opt_z_ LPCSTR pszStartPage); +BOOL WINAPI +SHOpenPropSheetW( + _In_opt_z_ LPCWSTR pszCaption, + _In_opt_ HKEY *ahKeys, + _In_ UINT cKeys, + _In_ const CLSID *pclsidDefault, + _In_ IDataObject *pDataObject, + _In_opt_ IShellBrowser *pShellBrowser, + _In_opt_z_ LPCWSTR pszStartPage); + /***************************************************************************** * IContextMenu interface */

1 year, 2 months

[reactos] 01/01: [SHELL32] Fix copyto/moveto actions of Search Results (#5816)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8f6b01696316bd4213f4f… commit 8f6b01696316bd4213f4f8b2157f032f3c8a1047 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Oct 27 12:34:51 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Oct 27 12:34:51 2023 +0900 [SHELL32] Fix copyto/moveto actions of Search Results (#5816) - Extend CDefView::InvokeContextMenuCommand 2nd parameter to LPCSTR. - Add CDefView::_DoCopyToMoveToFolder method. - Use CDefView::_DoCopyToMoveToFolder for FCIDM_SHVIEW_COPYTO and FCIDM_SHVIEW_MOVETO command actions. CORE-18426 --- dll/win32/shell32/CDefView.cpp | 47 ++++++++++++++++++++++++++++++++++-------- 1 file changed, 38 insertions(+), 9 deletions(-) diff --git a/dll/win32/shell32/CDefView.cpp b/dll/win32/shell32/CDefView.cpp index 9f12fd09549..a06feb085b4 100644 --- a/dll/win32/shell32/CDefView.cpp +++ b/dll/win32/shell32/CDefView.cpp @@ -163,6 +163,7 @@ class CDefView : INT _FindInsertableIndexFromPoint(POINT pt); void _HandleStatusBarResize(int width); void _ForceStatusBarResize(); + void _DoCopyToMoveToFolder(BOOL bCopy); public: CDefView(); @@ -197,7 +198,7 @@ class CDefView : void OnDeactivate(); void DoActivate(UINT uState); HRESULT drag_notify_subitem(DWORD grfKeyState, POINTL pt, DWORD *pdwEffect); - HRESULT InvokeContextMenuCommand(CComPtr<IContextMenu> &pCM, UINT uCommand, POINT* pt); + HRESULT InvokeContextMenuCommand(CComPtr<IContextMenu>& pCM, LPCSTR lpVerb, POINT* pt = NULL); LRESULT OnExplorerCommand(UINT uCommand, BOOL bUseSelection); // *** IOleWindow methods *** @@ -1513,14 +1514,14 @@ UINT CDefView::GetSelections() return m_cidl; } -HRESULT CDefView::InvokeContextMenuCommand(CComPtr<IContextMenu> &pCM, UINT uCommand, POINT* pt) +HRESULT CDefView::InvokeContextMenuCommand(CComPtr<IContextMenu>& pCM, LPCSTR lpVerb, POINT* pt) { CMINVOKECOMMANDINFOEX cmi; ZeroMemory(&cmi, sizeof(cmi)); cmi.cbSize = sizeof(cmi); - cmi.lpVerb = MAKEINTRESOURCEA(uCommand); cmi.hwnd = m_hWnd; + cmi.lpVerb = lpVerb; if (GetKeyState(VK_SHIFT) & 0x8000) cmi.fMask |= CMIC_MASK_SHIFT_DOWN; @@ -1583,7 +1584,7 @@ HRESULT CDefView::OpenSelectedItems() return E_FAIL; } - InvokeContextMenuCommand(pCM, uCommand, NULL); + InvokeContextMenuCommand(pCM, MAKEINTRESOURCEA(uCommand), NULL); return hResult; } @@ -1682,7 +1683,7 @@ LRESULT CDefView::OnContextMenu(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &b if (uCommand == FCIDM_SHVIEW_OPEN && OnDefaultCommand() == S_OK) return 0; - InvokeContextMenuCommand(m_pCM, uCommand - CONTEXT_MENU_BASE_ID, &pt); + InvokeContextMenuCommand(m_pCM, MAKEINTRESOURCEA(uCommand - CONTEXT_MENU_BASE_ID), &pt); return 0; } @@ -1731,7 +1732,7 @@ LRESULT CDefView::OnExplorerCommand(UINT uCommand, BOOL bUseSelection) } // FIXME: We should probably use the objects position? - InvokeContextMenuCommand(pCM, uCommand, NULL); + InvokeContextMenuCommand(pCM, MAKEINTRESOURCEA(uCommand), NULL); return 0; } @@ -1818,6 +1819,29 @@ void CDefView::DoActivate(UINT uState) TRACE("--\n"); } +void CDefView::_DoCopyToMoveToFolder(BOOL bCopy) +{ + if (!GetSelections()) + return; + + SFGAOF rfg = SFGAO_CANCOPY | SFGAO_CANMOVE | SFGAO_FILESYSTEM; + HRESULT hr = m_pSFParent->GetAttributesOf(m_cidl, m_apidl, &rfg); + if (FAILED_UNEXPECTEDLY(hr)) + return; + + if (!bCopy && !(rfg & SFGAO_CANMOVE)) + return; + if (bCopy && !(rfg & SFGAO_CANCOPY)) + return; + + CComPtr<IContextMenu> pCM; + hr = m_pSFParent->GetUIObjectOf(m_hWnd, m_cidl, m_apidl, IID_IContextMenu, 0, (void **)&pCM); + if (FAILED_UNEXPECTEDLY(hr)) + return; + + InvokeContextMenuCommand(pCM, (bCopy ? "copyto" : "moveto"), NULL); +} + /********************************************************** * ShellView_OnActivate() */ @@ -1954,26 +1978,31 @@ LRESULT CDefView::OnCommand(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHand case FCIDM_SHVIEW_COPY: case FCIDM_SHVIEW_RENAME: case FCIDM_SHVIEW_PROPERTIES: - case FCIDM_SHVIEW_COPYTO: - case FCIDM_SHVIEW_MOVETO: if (SHRestricted(REST_NOVIEWCONTEXTMENU)) return 0; return OnExplorerCommand(dwCmdID, TRUE); + case FCIDM_SHVIEW_COPYTO: + case FCIDM_SHVIEW_MOVETO: + _DoCopyToMoveToFolder(dwCmdID == FCIDM_SHVIEW_COPYTO); + return 0; + case FCIDM_SHVIEW_INSERT: case FCIDM_SHVIEW_UNDO: case FCIDM_SHVIEW_INSERTLINK: case FCIDM_SHVIEW_NEWFOLDER: return OnExplorerCommand(dwCmdID, FALSE); default: + { /* WM_COMMAND messages from the file menu are routed to the CDefView so as to let m_pFileMenu handle the command */ if (m_pFileMenu && dwCmd == 0) { HMENU Dummy = NULL; MenuCleanup _(m_pFileMenu, Dummy); - InvokeContextMenuCommand(m_pFileMenu, dwCmdID, NULL); + InvokeContextMenuCommand(m_pFileMenu, MAKEINTRESOURCEA(dwCmdID), NULL); } + } } return 0;

1 year, 2 months

[reactos] 01/01: [IPHLPAPI] Silence obsolete FIXME in GetAdaptersAddresses (#5834)

by Doug Lyons

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4eace8d762426e9ca7de0… commit 4eace8d762426e9ca7de0b357eb92d17299d9a9b Author: Doug Lyons <douglyons(a)douglyons.com> AuthorDate: Thu Oct 26 11:45:44 2023 -0500 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Oct 26 16:45:44 2023 +0000 [IPHLPAPI] Silence obsolete FIXME in GetAdaptersAddresses (#5834) --- dll/win32/iphlpapi/address.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/win32/iphlpapi/address.c b/dll/win32/iphlpapi/address.c index fb40963c7d4..e3ac92588c5 100644 --- a/dll/win32/iphlpapi/address.c +++ b/dll/win32/iphlpapi/address.c @@ -331,8 +331,8 @@ GetAdaptersAddresses( DWORD MIN_SIZE = 15 * 1024; PIP_ADAPTER_ADDRESSES PreviousAA = NULL; - FIXME("GetAdaptersAddresses - Semi Stub: Family %u, Flags 0x%08x, Reserved %p, pAdapterAddress %p, pOutBufLen %p.\n", - Family, Flags, Reserved, pAdapterAddresses, pOutBufLen); + TRACE("Family %u, Flags 0x%08x, Reserved %p, pAdapterAddress %p, pOutBufLen %p\n", + Family, Flags, Reserved, pAdapterAddresses, pOutBufLen); if (!pOutBufLen) return ERROR_INVALID_PARAMETER;

1 year, 2 months

[reactos] 01/01: [SHELL32][SDK] Implement IsSuspendAllowed (#5831)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=995f56d1d34a8a8a93dea… commit 995f56d1d34a8a8a93deac5fb576f767a8552a85 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Oct 26 23:27:45 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Oct 26 23:27:45 2023 +0900 [SHELL32][SDK] Implement IsSuspendAllowed (#5831) - Add IsShutdownAllowed helper function. - Add IsSuspendAllowed prototype to <undocshell.h>. - Implement IsSuspendAllowed function. --- dll/win32/shell32/stubs.cpp | 11 ----------- dll/win32/shell32/utils.cpp | 14 ++++++++++++++ sdk/include/reactos/undocshell.h | 1 + 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/dll/win32/shell32/stubs.cpp b/dll/win32/shell32/stubs.cpp index f8518336906..9ca95825c7f 100644 --- a/dll/win32/shell32/stubs.cpp +++ b/dll/win32/shell32/stubs.cpp @@ -783,17 +783,6 @@ DAD_DragEnterEx2(HWND hwndTarget, return FALSE; } -/* - * Unimplemented - */ -EXTERN_C BOOL -WINAPI -IsSuspendAllowed(VOID) -{ - FIXME("IsSuspendAllowed() stub\n"); - return FALSE; -} - /* * Unimplemented */ diff --git a/dll/win32/shell32/utils.cpp b/dll/win32/shell32/utils.cpp index 57ade40713e..f10cb11e290 100644 --- a/dll/win32/shell32/utils.cpp +++ b/dll/win32/shell32/utils.cpp @@ -164,6 +164,20 @@ Quit: return ret; } +BOOL IsShutdownAllowed(VOID) +{ + return SHTestTokenPrivilegeW(NULL, SE_SHUTDOWN_NAME); +} + +/************************************************************************* + * IsSuspendAllowed (SHELL32.53) + */ +BOOL WINAPI IsSuspendAllowed(VOID) +{ + TRACE("()\n"); + return IsShutdownAllowed() && IsPwrSuspendAllowed(); +} + /************************************************************************* * SHGetShellStyleHInstance (SHELL32.749) */ diff --git a/sdk/include/reactos/undocshell.h b/sdk/include/reactos/undocshell.h index 1577466ab9f..5b6953e9204 100644 --- a/sdk/include/reactos/undocshell.h +++ b/sdk/include/reactos/undocshell.h @@ -697,6 +697,7 @@ SHInvokePrivilegedFunctionW( BOOL WINAPI SHTestTokenPrivilegeW(_In_opt_ HANDLE hToken, _In_z_ LPCWSTR lpName); +BOOL WINAPI IsSuspendAllowed(VOID); /***************************************************************************** * Shell32 resources

1 year, 2 months

[reactos] 01/01: [REGEDIT] Improve error handling (#5833)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=be8a6f8af19b7b9f7be29… commit be8a6f8af19b7b9f7be29ea6b81ed8da029daa2c Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Oct 26 19:57:42 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Oct 26 19:57:42 2023 +0900 [REGEDIT] Improve error handling (#5833) - Don't exit the main program on error. - Improve output_message function. - Use output_message instead of some error_exit function calls. CORE-19188 --- base/applications/regedit/regedit.c | 8 +++++--- base/applications/regedit/regproc.c | 25 +++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/base/applications/regedit/regedit.c b/base/applications/regedit/regedit.c index 35fa13f037d..0e3cc27f669 100644 --- a/base/applications/regedit/regedit.c +++ b/base/applications/regedit/regedit.c @@ -37,9 +37,7 @@ static void output_writeconsole(const WCHAR *str, DWORD wlen) #ifdef __REACTOS__ /* This is win32gui application, don't ever try writing to console. * For the console version we have a separate reg.exe application. */ - WCHAR AppStr[255]; - LoadStringW(hInst, IDS_APP_TITLE, AppStr, ARRAY_SIZE(AppStr)); - MessageBoxW(NULL, str, AppStr, MB_OK | MB_ICONINFORMATION); + MessageBoxW(NULL, str, NULL, MB_ICONERROR); #else DWORD count; @@ -219,7 +217,11 @@ static void PerformRegAction(REGEDIT_ACTION action, WCHAR **argv, int *i) break; } default: +#ifdef __REACTOS__ + output_message(STRING_UNHANDLED_ACTION); +#else error_exit(STRING_UNHANDLED_ACTION); +#endif break; } } diff --git a/base/applications/regedit/regproc.c b/base/applications/regedit/regproc.c index f140b672381..1ef1fc9e6c2 100644 --- a/base/applications/regedit/regproc.c +++ b/base/applications/regedit/regproc.c @@ -1105,11 +1105,23 @@ void delete_registry_key(WCHAR *reg_key_name) if (!(key_class = parse_key_name(reg_key_name, &key_name))) { if (key_name) *(key_name - 1) = 0; +#ifdef __REACTOS__ + output_message(STRING_INVALID_SYSTEM_KEY, reg_key_name); + return; +#else error_exit(STRING_INVALID_SYSTEM_KEY, reg_key_name); +#endif } if (!key_name || !*key_name) +#ifdef __REACTOS__ + { + output_message(STRING_DELETE_FAILED, reg_key_name); + return; + } +#else error_exit(STRING_DELETE_FAILED, reg_key_name); +#endif #ifdef __REACTOS__ SHDeleteKey(key_class, key_name); @@ -1460,7 +1472,12 @@ static FILE *REGPROC_open_export_file(WCHAR *file_name, BOOL unicode) if (!file) { _wperror(L"regedit"); +#ifdef __REACTOS__ + output_message(STRING_CANNOT_OPEN_FILE, file_name); + return NULL; +#else error_exit(STRING_CANNOT_OPEN_FILE, file_name); +#endif } } @@ -1506,6 +1523,10 @@ static BOOL export_key(WCHAR *file_name, WCHAR *path, BOOL unicode) return FALSE; fp = REGPROC_open_export_file(file_name, unicode); +#ifdef __REACTOS__ + if (!fp) + return TRUE; /* Error message is already displayed */ +#endif export_registry_data(fp, key, path, unicode); export_newline(fp, unicode); fclose(fp); @@ -1522,6 +1543,10 @@ static BOOL export_all(WCHAR *file_name, WCHAR *path, BOOL unicode) WCHAR *class_name; fp = REGPROC_open_export_file(file_name, unicode); +#ifdef __REACTOS__ + if (!fp) + return TRUE; /* Error message is already displayed */ +#endif for (i = 0; i < ARRAY_SIZE(classes); i++) {

1 year, 2 months

[reactos] 01/01: [REGEDIT] Use <strsafe.h> functions strictly Part 2 (#5832)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fea414b9ed2cc7a81fdda… commit fea414b9ed2cc7a81fddad18bc90f9d023beee15 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Oct 26 10:39:12 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Oct 26 10:39:12 2023 +0900 [REGEDIT] Use <strsafe.h> functions strictly Part 2 (#5832) Follow-up to #5825. Use StringCchPrintfW instead of swprintf. CORE-18876 --- base/applications/regedit/regproc.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/base/applications/regedit/regproc.c b/base/applications/regedit/regproc.c index 8311a477712..f140b672381 100644 --- a/base/applications/regedit/regproc.c +++ b/base/applications/regedit/regproc.c @@ -1191,7 +1191,8 @@ static size_t export_value_name(FILE *fp, WCHAR *name, size_t len, BOOL unicode) WCHAR *str = REGPROC_escape_string(name, len, &line_len); WCHAR *buf = malloc((line_len + 4) * sizeof(WCHAR)); #ifdef __REACTOS__ - line_len = swprintf(buf, L"\"%s\"=", str); + StringCchPrintfW(buf, line_len + 4, L"\"%s\"=", str); + line_len = wcslen(buf); #else line_len = swprintf(buf, line_len + 4, L"\"%s\"=", str); #endif @@ -1218,7 +1219,7 @@ static void export_string_data(WCHAR **buf, WCHAR *data, size_t size) str = REGPROC_escape_string(data, len, &line_len); *buf = malloc((line_len + 3) * sizeof(WCHAR)); #ifdef __REACTOS__ - swprintf(*buf, L"\"%s\"", str); + StringCchPrintfW(*buf, line_len + 3, L"\"%s\"", str); #else swprintf(*buf, line_len + 3, L"\"%s\"", str); #endif @@ -1229,7 +1230,7 @@ static void export_dword_data(WCHAR **buf, DWORD *data) { *buf = malloc(15 * sizeof(WCHAR)); #ifdef __REACTOS__ - swprintf(*buf, L"dword:%08x", *data); + StringCchPrintfW(*buf, 15, L"dword:%08x", *data); #else swprintf(*buf, 15, L"dword:%08x", *data); #endif @@ -1249,7 +1250,8 @@ static size_t export_hex_data_type(FILE *fp, DWORD type, BOOL unicode) { WCHAR *buf = malloc(15 * sizeof(WCHAR)); #ifdef __REACTOS__ - line_len = swprintf(buf, L"hex(%x):", type); + StringCchPrintfW(buf, 15, L"hex(%x):", type); + line_len = wcslen(buf); #else line_len = swprintf(buf, 15, L"hex(%x):", type); #endif @@ -1280,7 +1282,8 @@ static void export_hex_data(FILE *fp, WCHAR **buf, DWORD type, DWORD line_len, for (i = 0, pos = 0; i < size; i++) { #ifdef __REACTOS__ - pos += swprintf(*buf + pos, L"%02x", ((BYTE *)data)[i]); + StringCchPrintfW(*buf + pos, 3, L"%02x", ((BYTE *)data)[i]); + pos += wcslen(*buf + pos); #else pos += swprintf(*buf + pos, 3, L"%02x", ((BYTE *)data)[i]); #endif @@ -1346,7 +1349,7 @@ static WCHAR *build_subkey_path(WCHAR *path, DWORD path_len, WCHAR *subkey_name, subkey_path = malloc((path_len + subkey_len + 2) * sizeof(WCHAR)); #ifdef __REACTOS__ - swprintf(subkey_path, L"%s\\%s", path, subkey_name); + StringCchPrintfW(subkey_path, path_len + subkey_len + 2, L"%s\\%s", path, subkey_name); #else swprintf(subkey_path, path_len + subkey_len + 2, L"%s\\%s", path, subkey_name); #endif @@ -1360,7 +1363,7 @@ static void export_key_name(FILE *fp, WCHAR *name, BOOL unicode) buf = malloc((lstrlenW(name) + 7) * sizeof(WCHAR)); #ifdef __REACTOS__ - swprintf(buf, L"\r\n[%s]\r\n", name); + StringCchPrintfW(buf, lstrlenW(name) + 7, L"\r\n[%s]\r\n", name); #else swprintf(buf, lstrlenW(name) + 7, L"\r\n[%s]\r\n", name); #endif

1 year, 2 months

[reactos] 01/01: [REGEDIT] Use <strsafe.h> functions strictly (#5825)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8cef980ab96b7027120f7… commit 8cef980ab96b7027120f759ccd467bbaa278302b Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Oct 26 10:09:31 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Oct 26 10:09:31 2023 +0900 [REGEDIT] Use <strsafe.h> functions strictly (#5825) Use safer functions for buffer manipulation to avoid buffer overflow/overrun. CORE-18876 --- base/applications/regedit/childwnd.c | 9 +++++---- base/applications/regedit/edit.c | 26 ++++++++++++++------------ base/applications/regedit/find.c | 21 ++++++++++----------- base/applications/regedit/framewnd.c | 8 +++++--- base/applications/regedit/security.c | 3 +-- base/applications/regedit/txtproc.c | 5 +++-- 6 files changed, 38 insertions(+), 34 deletions(-) diff --git a/base/applications/regedit/childwnd.c b/base/applications/regedit/childwnd.c index 67a88bc90a5..d77ed1899b3 100644 --- a/base/applications/regedit/childwnd.c +++ b/base/applications/regedit/childwnd.c @@ -177,7 +177,7 @@ static void SuggestKeys(HKEY hRootKey, LPCWSTR pszKeyPath, LPWSTR pszSuggestions RegCloseKey(hOtherKey); bFound = TRUE; - wcscpy(szLastFound, szBuffer); + StringCbCopyW(szLastFound, sizeof(szLastFound), szBuffer); pszKeyPath = szLastFound; } } @@ -258,10 +258,11 @@ UpdateAddress(HTREEITEM hItem, HKEY hRootKey, LPCWSTR pszPath, BOOL bSelectNone) if (fullPath) { /* set (correct) the address bar text */ - if (keyPath[0] != L'\0') - swprintf(fullPath, L"%s%s%s", rootName, keyPath[0]==L'\\'?L"":L"\\", keyPath); + if (keyPath[0] != UNICODE_NULL) + StringCbPrintfW(fullPath, cbFullPath, L"%s%s%s", rootName, + ((keyPath[0] == L'\\') ? L"" : L"\\"), keyPath); else - fullPath = wcscpy(fullPath, rootName); + StringCbCopyW(fullPath, cbFullPath, rootName); SendMessageW(hStatusBar, SB_SETTEXTW, 0, (LPARAM)fullPath); SendMessageW(g_pChildWnd->hAddressBarWnd, WM_SETTEXT, 0, (LPARAM)fullPath); diff --git a/base/applications/regedit/edit.c b/base/applications/regedit/edit.c index d84361c7a0a..8805ccb35e7 100644 --- a/base/applications/regedit/edit.c +++ b/base/applications/regedit/edit.c @@ -50,10 +50,10 @@ void error(HWND hwnd, INT resId, ...) hInstance = GetModuleHandle(0); if (!LoadStringW(hInstance, IDS_ERROR, title, ARRAY_SIZE(title))) - wcscpy(title, L"Error"); + StringCbCopyW(title, sizeof(title), L"Error"); if (!LoadStringW(hInstance, resId, errfmt, ARRAY_SIZE(errfmt))) - wcscpy(errfmt, L"Unknown error string!"); + StringCbCopyW(errfmt, sizeof(errfmt), L"Unknown error string!"); va_start(ap, resId); _vsnwprintf(errstr, ARRAY_SIZE(errstr), errfmt, ap); @@ -66,7 +66,7 @@ static void error_code_messagebox(HWND hwnd, DWORD error_code) { WCHAR title[256]; if (!LoadStringW(hInst, IDS_ERROR, title, ARRAY_SIZE(title))) - wcscpy(title, L"Error"); + StringCbCopyW(title, sizeof(title), L"Error"); ErrorMessageBox(hwnd, title, error_code); } @@ -81,13 +81,13 @@ void warning(HWND hwnd, INT resId, ...) hInstance = GetModuleHandle(0); if (!LoadStringW(hInstance, IDS_WARNING, title, ARRAY_SIZE(title))) - wcscpy(title, L"Warning"); + StringCbCopyW(title, sizeof(title), L"Warning"); if (!LoadStringW(hInstance, resId, errfmt, ARRAY_SIZE(errfmt))) - wcscpy(errfmt, L"Unknown error string!"); + StringCbCopyW(errfmt, sizeof(errfmt), L"Unknown error string!"); va_start(ap, resId); - _vsnwprintf(errstr, ARRAY_SIZE(errstr), errfmt, ap); + StringCbVPrintfW(errstr, sizeof(errstr), errfmt, ap); va_end(ap); MessageBoxW(hwnd, errstr, title, MB_OK | MB_ICONSTOP); @@ -304,7 +304,7 @@ INT_PTR CALLBACK modify_dword_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LP SetDlgItemTextW(hwndDlg, IDC_VALUE_NAME, buffer); } CheckRadioButton (hwndDlg, IDC_FORMAT_HEX, IDC_FORMAT_DEC, IDC_FORMAT_HEX); - swprintf(ValueString, L"%lx", dwordValueData); + StringCbPrintfW(ValueString, sizeof(ValueString), L"%lx", dwordValueData); SetDlgItemTextW(hwndDlg, IDC_VALUE_DATA, ValueString); SendMessage(GetDlgItem(hwndDlg, IDC_VALUE_DATA), EM_SETSEL, 0, -1); SetFocus(GetDlgItem(hwndDlg, IDC_VALUE_DATA)); @@ -327,7 +327,7 @@ INT_PTR CALLBACK modify_dword_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LP } } } - swprintf(ValueString, L"%lx", Value); + StringCbPrintfW(ValueString, sizeof(ValueString), L"%lx", Value); SetDlgItemTextW(hwndDlg, IDC_VALUE_DATA, ValueString); return TRUE; } @@ -347,7 +347,7 @@ INT_PTR CALLBACK modify_dword_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LP } } } - swprintf(ValueString, L"%lu", Value); + StringCbPrintfW(ValueString, sizeof(ValueString), L"%lu", Value); SetDlgItemTextW(hwndDlg, IDC_VALUE_DATA, ValueString); return TRUE; } @@ -1491,6 +1491,7 @@ LONG RenameKey(HKEY hKey, LPCWSTR lpSubKey, LPCWSTR lpNewName) LPCWSTR s; LPWSTR lpNewSubKey = NULL; LONG Ret = 0; + SIZE_T cbNewSubKey; if (!lpSubKey) return Ret; @@ -1499,11 +1500,12 @@ LONG RenameKey(HKEY hKey, LPCWSTR lpSubKey, LPCWSTR lpNewName) if (s) { s++; - lpNewSubKey = (LPWSTR) HeapAlloc(GetProcessHeap(), 0, (s - lpSubKey + wcslen(lpNewName) + 1) * sizeof(WCHAR)); + cbNewSubKey = (s - lpSubKey + wcslen(lpNewName) + 1) * sizeof(WCHAR); + lpNewSubKey = (LPWSTR) HeapAlloc(GetProcessHeap(), 0, cbNewSubKey); if (lpNewSubKey != NULL) { - memcpy(lpNewSubKey, lpSubKey, (s - lpSubKey) * sizeof(WCHAR)); - wcscpy(lpNewSubKey + (s - lpSubKey), lpNewName); + StringCbCopyNW(lpNewSubKey, cbNewSubKey, lpSubKey, (s - lpSubKey) * sizeof(WCHAR)); + StringCbCatW(lpNewSubKey, cbNewSubKey, lpNewName); lpNewName = lpNewSubKey; } else diff --git a/base/applications/regedit/find.c b/base/applications/regedit/find.c index 444f4a25952..9405271a916 100644 --- a/base/applications/regedit/find.c +++ b/base/applications/regedit/find.c @@ -144,7 +144,7 @@ BOOL RegFindRecurse( if(wcslen(pszSubKey) >= _countof(szSubKey)) return FALSE; - wcscpy(szSubKey, pszSubKey); + StringCbCopyW(szSubKey, sizeof(szSubKey), pszSubKey); hSubKey = NULL; lResult = RegOpenKeyExW(hKey, szSubKey, 0, KEY_ALL_ACCESS, &hSubKey); @@ -304,14 +304,14 @@ BOOL RegFindRecurse( ppszFoundValueName)) { LPWSTR psz = *ppszFoundSubKey; - *ppszFoundSubKey = malloc( - (wcslen(szSubKey) + wcslen(psz) + 2) * sizeof(WCHAR)); + SIZE_T cbFoundSubKey = (wcslen(szSubKey) + wcslen(psz) + 2) * sizeof(WCHAR); + *ppszFoundSubKey = malloc(cbFoundSubKey); if (*ppszFoundSubKey == NULL) goto err; if (szSubKey[0]) { - wcscpy(*ppszFoundSubKey, szSubKey); - wcscat(*ppszFoundSubKey, s_backslash); + StringCbCopyW(*ppszFoundSubKey, cbFoundSubKey, szSubKey); + StringCbCatW(*ppszFoundSubKey, cbFoundSubKey, s_backslash); } else **ppszFoundSubKey = 0; @@ -368,7 +368,7 @@ BOOL RegFindWalk( ppszFoundValueName)) return TRUE; - wcscpy(szSubKey, pszSubKey); + StringCbCopyW(szSubKey, sizeof(szSubKey), pszSubKey); while(szSubKey[0] != 0) { if (DoEvents()) @@ -460,15 +460,14 @@ BOOL RegFindWalk( ppszFoundSubKey, ppszFoundValueName)) { LPWSTR psz = *ppszFoundSubKey; - *ppszFoundSubKey = malloc( - (wcslen(szSubKey) + wcslen(psz) + 2) * - sizeof(WCHAR)); + SIZE_T cbFoundSubKey = (wcslen(szSubKey) + wcslen(psz) + 2) * sizeof(WCHAR); + *ppszFoundSubKey = malloc(cbFoundSubKey); if (*ppszFoundSubKey == NULL) goto err; if (szSubKey[0]) { - wcscpy(*ppszFoundSubKey, szSubKey); - wcscat(*ppszFoundSubKey, s_backslash); + StringCbCopyW(*ppszFoundSubKey, cbFoundSubKey, szSubKey); + StringCbCatW(*ppszFoundSubKey, cbFoundSubKey, s_backslash); } else **ppszFoundSubKey = 0; diff --git a/base/applications/regedit/framewnd.c b/base/applications/regedit/framewnd.c index 6b5b1c28cfb..6f382a072cd 100644 --- a/base/applications/regedit/framewnd.c +++ b/base/applications/regedit/framewnd.c @@ -138,7 +138,7 @@ static void OnMenuSelect(HWND hWnd, UINT nItemID, UINT nFlags, HMENU hSysMenu) { WCHAR str[100]; - wcscpy(str, L""); + str[0] = UNICODE_NULL; if (nFlags & MF_POPUP) { if (hSysMenu != GetMenu(hWnd)) @@ -814,6 +814,7 @@ BOOL CopyKeyName(HWND hWnd, HKEY hRootKey, LPCWSTR keyName) WCHAR szBuffer[512]; HGLOBAL hGlobal; LPWSTR s; + SIZE_T cbGlobal; if (!OpenClipboard(hWnd)) goto done; @@ -825,12 +826,13 @@ BOOL CopyKeyName(HWND hWnd, HKEY hRootKey, LPCWSTR keyName) if (!GetKeyName(szBuffer, ARRAY_SIZE(szBuffer), hRootKey, keyName)) goto done; - hGlobal = GlobalAlloc(GMEM_MOVEABLE, (wcslen(szBuffer) + 1) * sizeof(WCHAR)); + cbGlobal = (wcslen(szBuffer) + 1) * sizeof(WCHAR); + hGlobal = GlobalAlloc(GMEM_MOVEABLE, cbGlobal); if (!hGlobal) goto done; s = GlobalLock(hGlobal); - wcscpy(s, szBuffer); + StringCbCopyW(s, cbGlobal, szBuffer); GlobalUnlock(hGlobal); SetClipboardData(CF_UNICODETEXT, hGlobal); diff --git a/base/applications/regedit/security.c b/base/applications/regedit/security.c index 71251583e9c..0ea90092d91 100644 --- a/base/applications/regedit/security.c +++ b/base/applications/regedit/security.c @@ -782,8 +782,7 @@ CRegKeySecurity_fnConstructor(LPWSTR lpRegKey, obj->ObjectInfo = *ObjectInfo; obj->Btn = Btn; obj->hRootKey = hRootKey; - wcscpy(obj->szRegKey, - lpRegKey); + StringCbCopyW(obj->szRegKey, sizeof(obj->szRegKey), lpRegKey); } else SetLastError(ERROR_NOT_ENOUGH_MEMORY); diff --git a/base/applications/regedit/txtproc.c b/base/applications/regedit/txtproc.c index f5e3ea041c2..092930e6f7a 100644 --- a/base/applications/regedit/txtproc.c +++ b/base/applications/regedit/txtproc.c @@ -194,8 +194,9 @@ static WCHAR * txt_build_subkey_path(LPCWSTR path, DWORD path_len, LPCWSTR subkey_name, DWORD subkey_len) { WCHAR *subkey_path; - subkey_path = malloc((path_len + subkey_len + 2) * sizeof(WCHAR)); - swprintf(subkey_path, L"%s\\%s", path, subkey_name); + SIZE_T cb_subkey_path = (path_len + subkey_len + 2) * sizeof(WCHAR); + subkey_path = malloc(cb_subkey_path); + StringCbPrintfW(subkey_path, cb_subkey_path, L"%s\\%s", path, subkey_name); return subkey_path; }

1 year, 2 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs