Ros-diffs August 2023

ros-diffs@reactos.org

30 participants
167 discussions

[reactos] 01/01: [HALX86] HalHandleNMI: Re-enable debugger-entering code.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bd0eaa924d6f91cac3d89… commit bd0eaa924d6f91cac3d89dbfbe1984681761846d Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Aug 2 22:03:54 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Aug 3 13:26:24 2023 +0200 [HALX86] HalHandleNMI: Re-enable debugger-entering code. --- hal/halx86/generic/nmi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hal/halx86/generic/nmi.c b/hal/halx86/generic/nmi.c index 3da64f1e1aa..42a003d75bd 100644 --- a/hal/halx86/generic/nmi.c +++ b/hal/halx86/generic/nmi.c @@ -99,7 +99,8 @@ HalHandleNMI( /* Enter the debugger if possible */ KiBugCheckData[0] = (ULONG_PTR)KeServiceDescriptorTable; /* NMI Corruption? */ - //if (!(KdDebuggerNotPresent) && (KdDebuggerEnabled)) KeEnterKernelDebugger(); + if (!KdDebuggerNotPresent && KdDebuggerEnabled) + KeEnterKernelDebugger(); #endif /* !_MINIHAL_ */ /* Freeze the system */

1 year, 4 months

[reactos] 03/03: [SHELL32] Fix taskbar large icon for control panel applets

by Thamatip Chitpong

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=32411dece03b7559b6e0c… commit 32411dece03b7559b6e0cae92bc00c15e11e232c Author: Thamatip Chitpong <thamatip.chitpong(a)reactos.org> AuthorDate: Thu Aug 3 12:57:17 2023 +0700 Commit: Thamatip Chitpong <thamatip.chitpong(a)reactos.org> CommitDate: Thu Aug 3 16:43:08 2023 +0700 [SHELL32] Fix taskbar large icon for control panel applets Addendum to 0e8cf6f (#5465). CORE-11698 --- dll/win32/shell32/wine/control.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dll/win32/shell32/wine/control.c b/dll/win32/shell32/wine/control.c index 7485efcf261..82768d2971c 100644 --- a/dll/win32/shell32/wine/control.c +++ b/dll/win32/shell32/wine/control.c @@ -815,6 +815,12 @@ Control_ShowAppletInTaskbar(CPlApplet* applet, UINT index) SetWindowTextW(applet->hWnd, applet->info[index].name); + /* Set large icon for the taskbar button */ + if (applet->info[index].icon) + { + SendMessageW(applet->hWnd, WM_SETICON, ICON_BIG, (LPARAM)applet->info[index].icon); + } + /* Try loading the small icon for the taskbar button */ hSmallIcon = (HICON)LoadImageW(applet->hModule, MAKEINTRESOURCEW(applet->info[index].idIcon),

1 year, 4 months

[reactos] 02/03: [EXPLORER] Add comments for CTaskSwitchWnd::GetWndIcon

by Thamatip Chitpong

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4c21d97d848168b33d681… commit 4c21d97d848168b33d68133f2503c1aa9ce48820 Author: Thamatip Chitpong <thamatip.chitpong(a)reactos.org> AuthorDate: Wed Aug 2 19:09:58 2023 +0700 Commit: Thamatip Chitpong <thamatip.chitpong(a)reactos.org> CommitDate: Thu Aug 3 16:43:08 2023 +0700 [EXPLORER] Add comments for CTaskSwitchWnd::GetWndIcon --- base/shell/explorer/taskswnd.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/base/shell/explorer/taskswnd.cpp b/base/shell/explorer/taskswnd.cpp index 2602a76c686..588e7d73fd3 100644 --- a/base/shell/explorer/taskswnd.cpp +++ b/base/shell/explorer/taskswnd.cpp @@ -490,6 +490,8 @@ public: HICON GetWndIcon(HWND hwnd) { HICON hIcon = NULL; + + /* Retrieve icon by sending a message */ #define GET_ICON(type) \ SendMessageTimeout(hwnd, WM_GETICON, (type), 0, SMTO_NOTIMEOUTIFNOTHUNG, 100, (PDWORD_PTR)&hIcon) @@ -512,6 +514,7 @@ public: } #undef GET_ICON + /* If we failed, retrieve icon from the window class */ hIcon = (HICON)GetClassLongPtr(hwnd, g_TaskbarSettings.bSmallIcons ? GCLP_HICONSM : GCLP_HICON); if (hIcon) return hIcon;

1 year, 4 months

[reactos] 01/03: [EXPLORER] Fix taskbar large icon for some apps

by Thamatip Chitpong

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9049638dac6774eeceafa… commit 9049638dac6774eeceafa51a4e2a5e17acabf36e Author: Thamatip Chitpong <thamatip.chitpong(a)reactos.org> AuthorDate: Wed Aug 2 13:40:50 2023 +0700 Commit: Thamatip Chitpong <thamatip.chitpong(a)reactos.org> CommitDate: Thu Aug 3 16:43:08 2023 +0700 [EXPLORER] Fix taskbar large icon for some apps Addendum to 0e8cf6f (#5465). CORE-11698 --- base/shell/explorer/taskswnd.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/base/shell/explorer/taskswnd.cpp b/base/shell/explorer/taskswnd.cpp index abe3f10ae47..2602a76c686 100644 --- a/base/shell/explorer/taskswnd.cpp +++ b/base/shell/explorer/taskswnd.cpp @@ -512,11 +512,11 @@ public: } #undef GET_ICON - hIcon = (HICON)GetClassLongPtr(hwnd, GCLP_HICONSM); + hIcon = (HICON)GetClassLongPtr(hwnd, g_TaskbarSettings.bSmallIcons ? GCLP_HICONSM : GCLP_HICON); if (hIcon) return hIcon; - return (HICON)GetClassLongPtr(hwnd, GCLP_HICON); + return (HICON)GetClassLongPtr(hwnd, g_TaskbarSettings.bSmallIcons ? GCLP_HICON : GCLP_HICONSM); } INT UpdateTaskItemButton(IN PTASK_ITEM TaskItem)

1 year, 4 months

[reactos] 01/01: [SHLWAPI] Fix version control (_WIN32_WINNT) (#5514)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=01603541454b9153097e6… commit 01603541454b9153097e675459a6da9ccd6e96d1 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Aug 3 18:25:12 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Aug 3 18:25:12 2023 +0900 [SHLWAPI] Fix version control (_WIN32_WINNT) (#5514) - _WIN32_WINNT had wrong value to do workaround on Vista+ RegGetValueW. - Do #undef and #define _WIN32_WINNT _WIN32_WINNT_VISTA in assoc.c. - Delete _WIN32_WINNT hack in CMakeLists.txt. CORE-9283 --- dll/win32/shlwapi/CMakeLists.txt | 5 +---- dll/win32/shlwapi/assoc.c | 4 ++++ dll/win32/shlwapi/path.c | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dll/win32/shlwapi/CMakeLists.txt b/dll/win32/shlwapi/CMakeLists.txt index af8ec781824..fcb03a15c37 100644 --- a/dll/win32/shlwapi/CMakeLists.txt +++ b/dll/win32/shlwapi/CMakeLists.txt @@ -1,9 +1,6 @@ project(SHELL) -remove_definitions(-D_WIN32_WINNT=0x502) -add_definitions(-D_WIN32_WINNT=0x600) - add_definitions( -D__WINESRC__ -D_SHLWAPI_) @@ -11,7 +8,6 @@ add_definitions( spec2def(shlwapi.dll shlwapi.spec ADD_IMPORTLIB) list(APPEND SOURCE - assoc.c clist.c istream.c msgbox.c @@ -27,6 +23,7 @@ list(APPEND SOURCE url.c) list(APPEND PCH_SKIP_SOURCE + assoc.c wsprintf.c ${CMAKE_CURRENT_BINARY_DIR}/shlwapi_stubs.c) diff --git a/dll/win32/shlwapi/assoc.c b/dll/win32/shlwapi/assoc.c index a5cb4b11290..28c54527497 100644 --- a/dll/win32/shlwapi/assoc.c +++ b/dll/win32/shlwapi/assoc.c @@ -17,6 +17,10 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifdef __REACTOS__ + #undef _WIN32_WINNT + #define _WIN32_WINNT _WIN32_WINNT_VISTA /* for RegGetValueW */ +#endif #include <stdarg.h> #include <assert.h> diff --git a/dll/win32/shlwapi/path.c b/dll/win32/shlwapi/path.c index 2966a8bf93b..b1b55b3f244 100644 --- a/dll/win32/shlwapi/path.c +++ b/dll/win32/shlwapi/path.c @@ -2249,7 +2249,7 @@ BOOL WINAPI PathIsUNCA(LPCSTR lpszPath) * considered UNC, while on Windows Vista+ this is not the case anymore. */ // #ifdef __REACTOS__ -#if (WINVER >= _WIN32_WINNT_VISTA) +#if (_WIN32_WINNT >= _WIN32_WINNT_VISTA) if (lpszPath && (lpszPath[0]=='\\') && (lpszPath[1]=='\\') && (lpszPath[2]!='?')) #else if (lpszPath && (lpszPath[0]=='\\') && (lpszPath[1]=='\\')) @@ -2272,7 +2272,7 @@ BOOL WINAPI PathIsUNCW(LPCWSTR lpszPath) * considered UNC, while on Windows Vista+ this is not the case anymore. */ // #ifdef __REACTOS__ -#if (WINVER >= _WIN32_WINNT_VISTA) +#if (_WIN32_WINNT >= _WIN32_WINNT_VISTA) if (lpszPath && (lpszPath[0]=='\\') && (lpszPath[1]=='\\') && (lpszPath[2]!='?')) #else if (lpszPath && (lpszPath[0]=='\\') && (lpszPath[1]=='\\'))

1 year, 4 months

[reactos] 01/01: [SHLWAPI][SHLWAPI_APITEST][SDK] Implement SHPropertyBag_ReadGUID etc. (#5491)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6299340c453afd140f6fc… commit 6299340c453afd140f6fc7d96795d90c0852458c Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Aug 2 10:35:25 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Aug 2 10:35:25 2023 +0900 [SHLWAPI][SHLWAPI_APITEST][SDK] Implement SHPropertyBag_ReadGUID etc. (#5491) - Implement SHPropertyBag_ReadGUID and SHPropertyBag_ReadStream functions. - Modify shlwapi.spec and shlwapi_undoc.h. CORE-9283 --- dll/win32/shlwapi/ordinal.c | 98 ++++++++++++++++++++++ dll/win32/shlwapi/shlwapi.spec | 4 +- modules/rostests/apitests/shlwapi/CMakeLists.txt | 4 +- .../rostests/apitests/shlwapi/SHPropertyBag.cpp | 88 +++++++++++++++++-- sdk/include/reactos/shlwapi_undoc.h | 3 +- 5 files changed, 187 insertions(+), 10 deletions(-) diff --git a/dll/win32/shlwapi/ordinal.c b/dll/win32/shlwapi/ordinal.c index 1162e8b720f..3599e723011 100644 --- a/dll/win32/shlwapi/ordinal.c +++ b/dll/win32/shlwapi/ordinal.c @@ -5350,6 +5350,36 @@ DoDefault: return hr; } +BOOL +VariantArrayToBuffer( + _In_ const VARIANT *pvarIn, + _Out_writes_(cbSize) LPVOID pvDest, + _In_ SIZE_T cbSize) +{ + LPVOID pvData; + LONG LowerBound, UpperBound; + LPSAFEARRAY pArray; + + /* Only supports byte array */ + if (!pvarIn || V_VT(pvarIn) != (VT_UI1 | VT_ARRAY)) + return FALSE; + + /* Boundary check and access */ + pArray = V_ARRAY(pvarIn); + if (SafeArrayGetDim(pArray) == 1 && + SUCCEEDED(SafeArrayGetLBound(pArray, 1, &LowerBound)) && + SUCCEEDED(SafeArrayGetUBound(pArray, 1, &UpperBound)) && + ((LONG)cbSize <= UpperBound - LowerBound + 1) && + SUCCEEDED(SafeArrayAccessData(pArray, &pvData))) + { + CopyMemory(pvDest, pvData, cbSize); + SafeArrayUnaccessData(pArray); + return TRUE; /* Success */ + } + + return FALSE; /* Failure */ +} + /************************************************************************** * SHPropertyBag_ReadType (SHLWAPI.493) */ @@ -5670,6 +5700,74 @@ HRESULT WINAPI SHPropertyBag_ReadRECTL(IPropertyBag *ppb, LPCWSTR pszPropName, R return SHPropertyBag_ReadLONG(ppb, szBuff, &prcl->bottom); } +/************************************************************************** + * SHPropertyBag_ReadGUID (SHLWAPI.505) + */ +HRESULT WINAPI SHPropertyBag_ReadGUID(IPropertyBag *ppb, LPCWSTR pszPropName, GUID *pguid) +{ + HRESULT hr; + BOOL bRet; + VARIANT vari; + + TRACE("%p %s %p\n", ppb, debugstr_w(pszPropName), pguid); + + if (!ppb || !pszPropName || !pguid) + { + ERR("%p %s %p\n", ppb, debugstr_w(pszPropName), pguid); + return E_INVALIDARG; + } + + hr = SHPropertyBag_ReadType(ppb, pszPropName, &vari, VT_EMPTY); + if (FAILED(hr)) + { + ERR("%p %s %p\n", ppb, debugstr_w(pszPropName), pguid); + return hr; + } + + if (V_VT(&vari) == (VT_UI1 | VT_ARRAY)) /* Byte Array */ + bRet = VariantArrayToBuffer(&vari, pguid, sizeof(*pguid)); + else if (V_VT(&vari) == VT_BSTR) + bRet = GUIDFromStringW(V_BSTR(&vari), pguid); + else +#if (_WIN32_WINNT >= _WIN32_WINNT_VISTA) + bRet = FALSE; +#else + bRet = TRUE; /* This is by design in WinXP/Win2k3. */ +#endif + + if (!bRet) + ERR("%p %s %p\n", ppb, debugstr_w(pszPropName), pguid); + + VariantClear(&vari); + return (bRet ? S_OK : E_FAIL); +} + +/************************************************************************** + * SHPropertyBag_ReadStream (SHLWAPI.531) + */ +HRESULT WINAPI SHPropertyBag_ReadStream(IPropertyBag *ppb, LPCWSTR pszPropName, IStream **ppStream) +{ + HRESULT hr; + VARIANT vari; + + TRACE("%p %s %p\n", ppb, debugstr_w(pszPropName), ppStream); + + if (!ppb || !pszPropName || !ppStream) + { + ERR("%p %s %p\n", ppb, debugstr_w(pszPropName), ppStream); + return E_INVALIDARG; + } + + hr = SHPropertyBag_ReadType(ppb, pszPropName, &vari, VT_UNKNOWN); + if (FAILED(hr)) + return hr; + + hr = IUnknown_QueryInterface(V_UNKNOWN(&vari), &IID_IStream, (void **)ppStream); + IUnknown_Release(V_UNKNOWN(&vari)); + + return hr; +} + /************************************************************************** * SHPropertyBag_Delete (SHLWAPI.535) */ diff --git a/dll/win32/shlwapi/shlwapi.spec b/dll/win32/shlwapi/shlwapi.spec index 001d7b9ab17..8dc01d454dc 100644 --- a/dll/win32/shlwapi/shlwapi.spec +++ b/dll/win32/shlwapi/shlwapi.spec @@ -502,7 +502,7 @@ 502 stdcall AssocQueryKeyA(long long str str ptr) 503 stdcall AssocQueryKeyW(long long wstr wstr ptr) 504 stdcall AssocQueryStringA(long long str str ptr ptr) -505 stub -noname SHPropertyBag_ReadGUID +505 stdcall -noname SHPropertyBag_ReadGUID(ptr wstr ptr) 506 stdcall -noname SHPropertyBag_WriteGUID(ptr wstr ptr) 507 stdcall -noname SHPropertyBag_ReadDWORD(ptr wstr ptr) 508 stdcall -noname SHPropertyBag_WriteDWORD(ptr wstr long) @@ -528,7 +528,7 @@ 528 stdcall -noname SHPropertyBag_WriteSHORT(ptr wstr long) 529 stdcall -noname SHPropertyBag_ReadInt(ptr wstr ptr) SHPropertyBag_ReadLONG 530 stdcall -noname SHPropertyBag_WriteInt(ptr wstr long) SHPropertyBag_WriteLONG -531 stub -noname SHPropertyBag_ReadStream +531 stdcall -noname SHPropertyBag_ReadStream(ptr wstr ptr) 532 stdcall -noname SHPropertyBag_WriteStream(ptr wstr ptr) 533 stub -noname SHGetPerScreenResName 534 stdcall -noname SHPropertyBag_ReadBOOL(ptr wstr ptr) diff --git a/modules/rostests/apitests/shlwapi/CMakeLists.txt b/modules/rostests/apitests/shlwapi/CMakeLists.txt index ef141efc92f..d5c4d32562e 100644 --- a/modules/rostests/apitests/shlwapi/CMakeLists.txt +++ b/modules/rostests/apitests/shlwapi/CMakeLists.txt @@ -24,7 +24,7 @@ add_rc_deps(testdata.rc ${CMAKE_CURRENT_BINARY_DIR}/shlwapi_resource_dll/shlwapi add_executable(shlwapi_apitest ${SOURCE}) set_module_type(shlwapi_apitest win32cui) -target_link_libraries(shlwapi_apitest ${PSEH_LIB}) -add_importlibs(shlwapi_apitest shlwapi oleaut32 user32 advapi32 msvcrt kernel32) +target_link_libraries(shlwapi_apitest ${PSEH_LIB} uuid) +add_importlibs(shlwapi_apitest shlwapi oleaut32 ole32 user32 advapi32 msvcrt kernel32) add_dependencies(shlwapi_apitest shlwapi_resource_dll) add_rostests_file(TARGET shlwapi_apitest) diff --git a/modules/rostests/apitests/shlwapi/SHPropertyBag.cpp b/modules/rostests/apitests/shlwapi/SHPropertyBag.cpp index bdf3e6f02e1..1aca2d256c0 100644 --- a/modules/rostests/apitests/shlwapi/SHPropertyBag.cpp +++ b/modules/rostests/apitests/shlwapi/SHPropertyBag.cpp @@ -9,6 +9,7 @@ #include <shlwapi.h> #include <shlobj.h> #include <shlwapi_undoc.h> +#include <versionhelpers.h> #include <pseh/pseh2.h> @@ -29,6 +30,30 @@ static void ResetTest(VARTYPE vt, s_pszPropNames[3] = pszName3; } +static SAFEARRAY* CreateByteArray(LPCVOID pvSrc, DWORD cbSize) +{ + SAFEARRAYBOUND Bound; + Bound.lLbound = 0; + Bound.cElements = cbSize; + + SAFEARRAY* pArray = SafeArrayCreate(VT_UI1, 1, &Bound); + if (!pArray) + return NULL; + + void HUGEP *pvData; + HRESULT hr = SafeArrayAccessData(pArray, &pvData); + if (FAILED(hr)) + { + SafeArrayDestroy(pArray); + return NULL; + } + + CopyMemory(pvData, pvSrc, cbSize); + SafeArrayUnaccessData(pArray); + + return pArray; +} + class CDummyPropertyBag : public IPropertyBag { public: @@ -39,17 +64,17 @@ public: // IUnknown STDMETHODIMP QueryInterface(REFIID riid, void **ppvObject) override { - ok_int(0, 1); + ok(FALSE, "Unexpected call\n"); return S_OK; } STDMETHODIMP_(ULONG) AddRef() override { - ok_int(0, 1); + ok(FALSE, "Unexpected call\n"); return S_OK; } STDMETHODIMP_(ULONG) Release() override { - ok_int(0, 1); + ok(FALSE, "Unexpected call\n"); return S_OK; } @@ -64,13 +89,38 @@ public: { ok_wstr(pszPropName, s_pszPropNames[i]); s_pszPropNames[i] = NULL; + if (lstrcmpiW(pszPropName, L"RECTL2.top") == 0) return E_FAIL; + if (lstrcmpiW(pszPropName, L"GUID1") == 0) + { + V_VT(pvari) = (VT_UI1 | VT_ARRAY); + V_ARRAY(pvari) = CreateByteArray(&IID_IShellLink, sizeof(IID)); + return S_OK; + } + + if (lstrcmpiW(pszPropName, L"GUID2") == 0) + { + WCHAR szText[50]; + StringFromGUID2(IID_IUnknown, szText, _countof(szText)); + + V_VT(pvari) = VT_BSTR; + V_BSTR(pvari) = SysAllocString(szText); + return S_OK; + } + + if (lstrcmpiW(pszPropName, L"GUID3") == 0) + { + V_VT(pvari) = VT_EMPTY; + V_UI4(pvari) = 0xDEADFACE; + return S_OK; + } + goto Skip1; } } - ok_int(0, 1); + ok(FALSE, "Unexpected call\n"); Skip1: return S_OK; } @@ -95,7 +145,7 @@ Skip1: goto Skip2; } } - ok_int(0, 1); + ok(FALSE, "Unexpected call\n"); Skip2: return S_OK; } @@ -113,6 +163,7 @@ static void SHPropertyBag_ReadTest(void) POINTL ptl = { 0xEEEE, 0xDDDD }; POINTS pts = { 0x2222, 0x3333 }; RECTL rcl = { 123, 456, 789, 101112 }; + GUID guid = { 0 }; ResetTest(VT_BOOL, L"BOOL1"); hr = SHPropertyBag_ReadBOOL(&dummy, s_pszPropNames[0], &bValue); @@ -168,6 +219,33 @@ static void SHPropertyBag_ReadTest(void) ok_long(hr, E_FAIL); ok_int(s_cRead, 2); ok_int(s_cWrite, 0); + + ResetTest(VT_EMPTY, L"GUID1"); + hr = SHPropertyBag_ReadGUID(&dummy, L"GUID1", &guid); + ok_long(hr, S_OK); + ok_int(s_cRead, 1); + ok_int(s_cWrite, 0); + ok_int(IsEqualGUID(guid, IID_IShellLink), TRUE); + + ResetTest(VT_EMPTY, L"GUID2"); + hr = SHPropertyBag_ReadGUID(&dummy, L"GUID2", &guid); + ok_long(hr, S_OK); + ok_int(s_cRead, 1); + ok_int(s_cWrite, 0); + ok_int(IsEqualGUID(guid, IID_IUnknown), TRUE); + + ResetTest(VT_EMPTY, L"GUID3"); + guid = IID_IExtractIcon; + hr = SHPropertyBag_ReadGUID(&dummy, L"GUID3", &guid); + + if (IsWindowsVistaOrGreater()) + ok_long(hr, E_INVALIDARG); + else + ok_long(hr, S_OK); + + ok_int(s_cRead, 1); + ok_int(s_cWrite, 0); + ok_int(IsEqualGUID(guid, IID_IExtractIcon), TRUE); } static void SHPropertyBag_WriteTest(void) diff --git a/sdk/include/reactos/shlwapi_undoc.h b/sdk/include/reactos/shlwapi_undoc.h index 564a105f5e9..a2cec2e047c 100644 --- a/sdk/include/reactos/shlwapi_undoc.h +++ b/sdk/include/reactos/shlwapi_undoc.h @@ -103,12 +103,13 @@ HRESULT WINAPI SHPropertyBag_ReadStr(IPropertyBag *ppb, LPCWSTR pszPropName, LPW HRESULT WINAPI SHPropertyBag_ReadPOINTL(IPropertyBag *ppb, LPCWSTR pszPropName, POINTL *pptl); HRESULT WINAPI SHPropertyBag_ReadPOINTS(IPropertyBag *ppb, LPCWSTR pszPropName, POINTS *ppts); HRESULT WINAPI SHPropertyBag_ReadRECTL(IPropertyBag *ppb, LPCWSTR pszPropName, RECTL *prcl); +HRESULT WINAPI SHPropertyBag_ReadGUID(IPropertyBag *ppb, LPCWSTR pszPropName, GUID *pguid); +HRESULT WINAPI SHPropertyBag_ReadStream(IPropertyBag *ppb, LPCWSTR pszPropName, IStream **ppStream); HRESULT WINAPI SHGetPerScreenResName(OUT LPWSTR lpResName, IN INT cchResName, IN DWORD dwReserved); -HRESULT WINAPI SHPropertyBag_ReadStream(IPropertyBag*,LPCWSTR,IStream**); 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);

1 year, 4 months

[reactos] 01/01: [NTOSKRNL][NTGDI] Formatting addendum, no functional change

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=53b30e3f3bf454356dad5… commit 53b30e3f3bf454356dad537c782543cba35e0f1a Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Tue Aug 1 22:31:36 2023 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Tue Aug 1 22:32:25 2023 +0200 [NTOSKRNL][NTGDI] Formatting addendum, no functional change I intend to port back the combined work of Thomas Faber and Serge Gautherie in context of CORE 14271. Both developers fixed wrong retval evaluations for SeSinglePrivilegeCheck() and RtlCreateUnicodeString(). Both functions do return a BOOLEAN, and therefore using NTSTATUS() on them is wrong. Those bugs have been fixed at multiple places. That is long gone. But Serge fixed his locations a bit more elegantly, without the need for additional variables. Therefore this addendum adapts a few of Thomas locations to the improved Serge-ified style. Yes: I intentionally used a space instead of a minus after the mentioned CORE 14271, as I don't want that pure stylistic addendum to be linked with the initial ticket anymore. That would be overkill. --- ntoskrnl/config/cmsysini.c | 8 +------- win32ss/gdi/ntgdi/freetype.c | 12 +++--------- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/ntoskrnl/config/cmsysini.c b/ntoskrnl/config/cmsysini.c index 572f8a342f8..282e422b759 100644 --- a/ntoskrnl/config/cmsysini.c +++ b/ntoskrnl/config/cmsysini.c @@ -1,7 +1,6 @@ /* * PROJECT: ReactOS Kernel * LICENSE: BSD - See COPYING.ARM in the top level directory - * FILE: ntoskrnl/config/cmsysini.c * PURPOSE: Configuration Manager - System Initialization Code * PROGRAMMERS: ReactOS Portable Systems Group * Alex Ionescu (alex.ionescu(a)reactos.org) @@ -873,7 +872,6 @@ CmpInitializeSystemHive(IN PLOADER_PARAMETER_BLOCK LoaderBlock) UNICODE_STRING KeyName; PCMHIVE SystemHive = NULL; PSECURITY_DESCRIPTOR SecurityDescriptor; - BOOLEAN Success; PAGED_CODE(); @@ -921,12 +919,8 @@ CmpInitializeSystemHive(IN PLOADER_PARAMETER_BLOCK LoaderBlock) } /* Set the hive filename */ - Success = RtlCreateUnicodeString(&SystemHive->FileFullPath, - L"\\SystemRoot\\System32\\Config\\SYSTEM"); - if (!Success) - { + if (!RtlCreateUnicodeString(&SystemHive->FileFullPath, L"\\SystemRoot\\System32\\Config\\SYSTEM")) return FALSE; - } /* Manually set the hive as volatile, if in Live CD mode */ if (HiveBase && CmpShareSystemHives) diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index fcf6f2dfcc7..c8bdd59f773 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -1,7 +1,6 @@ /* * PROJECT: ReactOS win32 kernel mode subsystem * LICENSE: GPL - See COPYING in the top level directory - * FILE: win32ss/gdi/ntgdi/freetype.c * PURPOSE: FreeType font engine interface * PROGRAMMERS: Copyright 2001 Huw D M Davies for CodeWeavers. * Copyright 2006 Dmitry Timoshkov for CodeWeavers. @@ -521,7 +520,6 @@ IntLoadFontSubstList(PLIST_ENTRY pHead) BYTE CharSets[FONTSUBST_FROM_AND_TO]; LPWSTR pch; PFONTSUBST_ENTRY pEntry; - BOOLEAN Success; /* the FontSubstitutes registry key */ static UNICODE_STRING FontSubstKey = @@ -566,8 +564,7 @@ IntLoadFontSubstList(PLIST_ENTRY pHead) pInfo = (PKEY_VALUE_FULL_INFORMATION)InfoBuffer; Length = pInfo->NameLength / sizeof(WCHAR); pInfo->Name[Length] = UNICODE_NULL; /* truncate */ - Success = RtlCreateUnicodeString(&FromW, pInfo->Name); - if (!Success) + if (!RtlCreateUnicodeString(&FromW, pInfo->Name)) { Status = STATUS_INSUFFICIENT_RESOURCES; DPRINT("RtlCreateUnicodeString failed\n"); @@ -589,8 +586,7 @@ IntLoadFontSubstList(PLIST_ENTRY pHead) pch = (LPWSTR)((PUCHAR)pInfo + pInfo->DataOffset); Length = pInfo->DataLength / sizeof(WCHAR); pch[Length] = UNICODE_NULL; /* truncate */ - Success = RtlCreateUnicodeString(&ToW, pch); - if (!Success) + if (!RtlCreateUnicodeString(&ToW, pch)) { Status = STATUS_INSUFFICIENT_RESOURCES; DPRINT("RtlCreateUnicodeString failed\n"); @@ -1650,7 +1646,6 @@ IntLoadFontsInRegistry(VOID) LPBYTE InfoBuffer; PKEY_VALUE_FULL_INFORMATION pInfo; LPWSTR pchPath; - BOOLEAN Success; WCHAR szPath[MAX_PATH]; INT nFontCount = 0; DWORD dwFlags; @@ -1717,8 +1712,7 @@ IntLoadFontsInRegistry(VOID) pInfo = (PKEY_VALUE_FULL_INFORMATION)InfoBuffer; Length = pInfo->NameLength / sizeof(WCHAR); pInfo->Name[Length] = UNICODE_NULL; /* truncate */ - Success = RtlCreateUnicodeString(&FontTitleW, pInfo->Name); - if (!Success) + if (!RtlCreateUnicodeString(&FontTitleW, pInfo->Name)) { Status = STATUS_INSUFFICIENT_RESOURCES; DPRINT1("RtlCreateUnicodeString failed\n");

1 year, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2023