https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f482244f45978b66ff35d508ff4439c7ddf3eb1e
commit f482244f45978b66ff35d508ff4439c7ddf3eb1e
Author: Katayama Hirofumi MZ <katayama.hirofumi...@gmail.com>
AuthorDate: Thu Jan 16 20:09:30 2025 +0900
Commit: GitHub <nore...@github.com>
CommitDate: Thu Jan 16 20:09:30 2025 +0900
[SHELL32] Move SHOpenPropSheetA to propsheet.cpp (#7624)
Improve consistency of code management.
JIRA issue: CORE-19278
- Move SHOpenPropSheetA from
utils.cpp into propsheet.cpp that
contains SHOpenPropSheetW.
---
dll/win32/shell32/propsheet.cpp | 35 +++++++++++++++++++++++++++++++++++
dll/win32/shell32/utils.cpp | 38 --------------------------------------
2 files changed, 35 insertions(+), 38 deletions(-)
diff --git a/dll/win32/shell32/propsheet.cpp b/dll/win32/shell32/propsheet.cpp
index 3fccaa0ac1a..7768e16c358 100644
--- a/dll/win32/shell32/propsheet.cpp
+++ b/dll/win32/shell32/propsheet.cpp
@@ -160,6 +160,41 @@ SHELL32_OpenPropSheet(LPCWSTR pszCaption, HKEY *ahKeys,
UINT cKeys,
return (Result != -1);
}
+/*************************************************************************
+ * SHOpenPropSheetA [SHELL32.707]
+ *
+ * @see
https://learn.microsoft.com/en-us/windows/win32/api/shlobj/nf-shlobj-shopenpropsheeta
+ */
+EXTERN_C
+BOOL WINAPI
+SHOpenPropSheetA(
+ _In_opt_ LPCSTR pszCaption,
+ _In_opt_ HKEY *ahKeys,
+ _In_ UINT cKeys,
+ _In_ const CLSID *pclsidDefault,
+ _In_ IDataObject *pDataObject,
+ _In_opt_ IShellBrowser *pShellBrowser,
+ _In_opt_ LPCSTR pszStartPage)
+{
+ CStringW strStartPageW, strCaptionW;
+ LPCWSTR pszCaptionW = NULL, pszStartPageW = NULL;
+
+ if (pszCaption)
+ {
+ strStartPageW = pszCaption;
+ pszCaptionW = strCaptionW;
+ }
+
+ if (pszStartPage)
+ {
+ strStartPageW = pszStartPage;
+ pszStartPageW = strStartPageW;
+ }
+
+ return SHOpenPropSheetW(pszCaptionW, ahKeys, cKeys, pclsidDefault,
+ pDataObject, pShellBrowser, pszStartPageW);
+}
+
/*************************************************************************
* SHOpenPropSheetW [SHELL32.80]
*
diff --git a/dll/win32/shell32/utils.cpp b/dll/win32/shell32/utils.cpp
index a384c6c4925..440d22f6460 100644
--- a/dll/win32/shell32/utils.cpp
+++ b/dll/win32/shell32/utils.cpp
@@ -1116,44 +1116,6 @@ CopyStreamUI(
return hr;
}
-/*************************************************************************
- * SHOpenPropSheetA [SHELL32.707]
- *
- * @see
https://learn.microsoft.com/en-us/windows/win32/api/shlobj/nf-shlobj-shopenpropsheeta
- */
-EXTERN_C
-BOOL WINAPI
-SHOpenPropSheetA(
- _In_opt_ LPCSTR pszCaption,
- _In_opt_ HKEY *ahKeys,
- _In_ UINT cKeys,
- _In_ const CLSID *pclsidDefault,
- _In_ IDataObject *pDataObject,
- _In_opt_ IShellBrowser *pShellBrowser,
- _In_opt_ LPCSTR pszStartPage)
-{
- CStringW strStartPageW, strCaptionW;
- LPCWSTR pszCaptionW = NULL, pszStartPageW = NULL;
-
- TRACE("(%s, %p, %u, %p, %p, %p, %s)", debugstr_a(pszCaption), ahKeys,
cKeys, pclsidDefault,
- pDataObject, pShellBrowser, debugstr_a(pszStartPage));
-
- if (pszCaption)
- {
- strStartPageW = pszCaption;
- pszCaptionW = strCaptionW;
- }
-
- if (pszStartPage)
- {
- strStartPageW = pszStartPage;
- pszStartPageW = strStartPageW;
- }
-
- return SHOpenPropSheetW(pszCaptionW, ahKeys, cKeys, pclsidDefault,
- pDataObject, pShellBrowser, pszStartPageW);
-}
-
/*************************************************************************
* Activate_RunDLL [SHELL32.105]
*
