Ros-diffs July 2023

ros-diffs@reactos.org

26 participants
189 discussions

[reactos] 01/01: [SHLWAPI][SHLWAPI_APITEST][SDK] Implement SHPropertyBag_WritePOINTL etc. (#5474)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=57ce30b85fadf28888fdf… commit 57ce30b85fadf28888fdf97b094fd2ab94940673 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Jul 25 18:19:22 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Jul 25 18:19:22 2023 +0900 [SHLWAPI][SHLWAPI_APITEST][SDK] Implement SHPropertyBag_WritePOINTL etc. (#5474) - Implement SHPropertyBag_Delete, SHPropertyBag_WritePOINTL, SHPropertyBag_WritePOINTS, and SHPropertyBag_WriteRECTL functions. - SHPropertyBag_WriteInt is an alias to SHPropertyBag_WriteLONG. - Modify shlwapi.spec. - Modify shlwapi_undoc.h. - Add SHPropertyBag testcase to shlwapi_apitest.exe. CORE-9283 --- dll/win32/shlwapi/ordinal.c | 151 ++++++++++++++++++++ dll/win32/shlwapi/shlwapi.spec | 10 +- modules/rostests/apitests/shlwapi/CMakeLists.txt | 1 + .../rostests/apitests/shlwapi/SHPropertyBag.cpp | 155 +++++++++++++++++++++ modules/rostests/apitests/shlwapi/testlist.c | 2 + sdk/include/reactos/shlwapi_undoc.h | 4 + 6 files changed, 318 insertions(+), 5 deletions(-) diff --git a/dll/win32/shlwapi/ordinal.c b/dll/win32/shlwapi/ordinal.c index 981d9f68e4f..c7ba39c5cee 100644 --- a/dll/win32/shlwapi/ordinal.c +++ b/dll/win32/shlwapi/ordinal.c @@ -5322,6 +5322,25 @@ HRESULT WINAPI SHPropertyBag_ReadLONG(IPropertyBag *ppb, LPCWSTR pszPropName, LP } #ifdef __REACTOS__ +/************************************************************************** + * SHPropertyBag_Delete (SHLWAPI.535) + */ +HRESULT WINAPI SHPropertyBag_Delete(IPropertyBag *ppb, LPCWSTR pszPropName) +{ + VARIANT vari; + + TRACE("%p %s\n", ppb, debugstr_w(pszPropName)); + + if (!ppb || !pszPropName) + { + ERR("%p %s\n", ppb, debugstr_w(pszPropName)); + return E_INVALIDARG; + } + + V_VT(&vari) = VT_EMPTY; + return IPropertyBag_Write(ppb, pszPropName, &vari); +} + /************************************************************************** * SHPropertyBag_WriteBOOL (SHLWAPI.499) */ @@ -5471,6 +5490,138 @@ HRESULT WINAPI SHPropertyBag_WriteStream(IPropertyBag *ppb, LPCWSTR pszPropName, V_UNKNOWN(&vari) = (IUnknown*)pStream; return IPropertyBag_Write(ppb, pszPropName, &vari); } + +/************************************************************************** + * SHPropertyBag_WritePOINTL (SHLWAPI.522) + */ +HRESULT WINAPI SHPropertyBag_WritePOINTL(IPropertyBag *ppb, LPCWSTR pszPropName, const POINTL *pptl) +{ + HRESULT hr; + int cch, cch2; + WCHAR *pch, szBuff[MAX_PATH]; + + TRACE("%p %s %p\n", ppb, debugstr_w(pszPropName), pptl); + + if (!ppb || !pszPropName || !pptl) + { + ERR("%p %s %p\n", ppb, debugstr_w(pszPropName), pptl); + return E_INVALIDARG; + } + + StrCpyNW(szBuff, pszPropName, _countof(szBuff)); + + cch = lstrlenW(szBuff); + cch2 = _countof(szBuff) - cch; + if (cch2 < _countof(L".x")) + { + ERR("%s is too long\n", debugstr_w(pszPropName)); + return E_FAIL; + } + + pch = &szBuff[cch]; + + StrCpyNW(pch, L".x", cch2); + hr = SHPropertyBag_WriteLONG(ppb, szBuff, pptl->x); + if (FAILED(hr)) + return hr; + + StrCpyNW(pch, L".y", cch2); + hr = SHPropertyBag_WriteLONG(ppb, szBuff, pptl->y); + if (FAILED(hr)) + { + StrCpyNW(pch, L".x", cch2); + return SHPropertyBag_Delete(ppb, szBuff); + } + + return hr; +} + +/************************************************************************** + * SHPropertyBag_WritePOINTS (SHLWAPI.526) + */ +HRESULT WINAPI SHPropertyBag_WritePOINTS(IPropertyBag *ppb, LPCWSTR pszPropName, const POINTS *ppts) +{ + POINTL pt; + + TRACE("%p %s %p\n", ppb, debugstr_w(pszPropName), ppts); + + if (!ppb || !pszPropName || !ppts) + { + ERR("%p %s %p\n", ppb, debugstr_w(pszPropName), ppts); + return E_INVALIDARG; + } + + pt.x = ppts->x; + pt.y = ppts->y; + return SHPropertyBag_WritePOINTL(ppb, pszPropName, &pt); +} + +/************************************************************************** + * SHPropertyBag_WriteRECTL (SHLWAPI.524) + */ +HRESULT WINAPI SHPropertyBag_WriteRECTL(IPropertyBag *ppb, LPCWSTR pszPropName, const RECTL *prcl) +{ + HRESULT hr; + int cch, cch2; + WCHAR *pch, szBuff[MAX_PATH]; + + TRACE("%p %s %p\n", ppb, debugstr_w(pszPropName), prcl); + + if (!ppb || !pszPropName || !prcl) + { + ERR("%p %s %p\n", ppb, debugstr_w(pszPropName), prcl); + return E_INVALIDARG; + } + + StrCpyNW(szBuff, pszPropName, _countof(szBuff)); + + cch = lstrlenW(szBuff); + cch2 = _countof(szBuff) - cch; + if (cch2 < _countof(L".bottom")) + { + ERR("%s is too long\n", debugstr_w(pszPropName)); + return E_FAIL; + } + + pch = &szBuff[cch]; + + StrCpyNW(pch, L".left", cch2); + hr = SHPropertyBag_WriteLONG(ppb, szBuff, prcl->left); + if (SUCCEEDED(hr)) + { + StrCpyNW(pch, L".top", cch2); + hr = SHPropertyBag_WriteLONG(ppb, szBuff, prcl->top); + if (SUCCEEDED(hr)) + { + StrCpyNW(pch, L".right", cch2); + hr = SHPropertyBag_WriteLONG(ppb, szBuff, prcl->right); + if (SUCCEEDED(hr)) + { + StrCpyNW(pch, L".bottom", cch2); + hr = SHPropertyBag_WriteLONG(ppb, szBuff, prcl->bottom); + if (SUCCEEDED(hr)) + return hr; /* All successful */ + + StrCpyNW(pch, L".right", cch2); + hr = SHPropertyBag_Delete(ppb, szBuff); + if (SUCCEEDED(hr)) + return hr; + } + + StrCpyNW(pch, L".top", cch2); + hr = SHPropertyBag_Delete(ppb, szBuff); + if (SUCCEEDED(hr)) + return hr; + } + + StrCpyNW(pch, L".left", cch2); + hr = SHPropertyBag_Delete(ppb, szBuff); + if (SUCCEEDED(hr)) + return hr; + } + + return hr; +} #endif /* return flags for SHGetObjectCompatFlags, names derived from registry value names */ diff --git a/dll/win32/shlwapi/shlwapi.spec b/dll/win32/shlwapi/shlwapi.spec index 786ed81b005..0833bd8f20a 100644 --- a/dll/win32/shlwapi/shlwapi.spec +++ b/dll/win32/shlwapi/shlwapi.spec @@ -519,20 +519,20 @@ 519 stdcall -noname SKAllocValueW(long wstr wstr ptr ptr ptr) 520 stub -noname SHPropertyBag_ReadBSTR 521 stub -noname SHPropertyBag_ReadPOINTL -522 stub -noname SHPropertyBag_WritePOINTL +522 stdcall -noname SHPropertyBag_WritePOINTL(ptr wstr ptr) 523 stub -noname SHPropertyBag_ReadRECTL -524 stub -noname SHPropertyBag_WriteRECTL +524 stdcall -noname SHPropertyBag_WriteRECTL(ptr wstr ptr) 525 stub -noname SHPropertyBag_ReadPOINTS -526 stub -noname SHPropertyBag_WritePOINTS +526 stdcall -noname SHPropertyBag_WritePOINTS(ptr wstr ptr) 527 stub -noname SHPropertyBag_ReadSHORT 528 stdcall -noname SHPropertyBag_WriteSHORT(ptr wstr long) 529 stub -noname SHPropertyBag_ReadInt -530 stub -noname SHPropertyBag_WriteInt +530 stdcall -noname SHPropertyBag_WriteInt(ptr wstr long) SHPropertyBag_WriteLONG 531 stub -noname SHPropertyBag_ReadStream 532 stdcall -noname SHPropertyBag_WriteStream(ptr wstr ptr) 533 stub -noname SHGetPerScreenResName 534 stub -noname SHPropertyBag_ReadBOOL -535 stub -noname SHPropertyBag_Delete +535 stdcall -noname SHPropertyBag_Delete(ptr wstr) 536 stdcall -stub -noname IUnknown_QueryServicePropertyBag(ptr long ptr ptr) 537 stub -noname SHBoolSystemParametersInfo 538 stdcall -noname IUnknown_QueryServiceForWebBrowserApp(ptr ptr ptr) diff --git a/modules/rostests/apitests/shlwapi/CMakeLists.txt b/modules/rostests/apitests/shlwapi/CMakeLists.txt index 47636a5cae6..34fb46fb71e 100644 --- a/modules/rostests/apitests/shlwapi/CMakeLists.txt +++ b/modules/rostests/apitests/shlwapi/CMakeLists.txt @@ -14,6 +14,7 @@ list(APPEND SOURCE SHAreIconsEqual.c SHLoadIndirectString.c SHLoadRegUIString.c + SHPropertyBag.cpp StrFormatByteSizeW.c testdata.rc testlist.c) diff --git a/modules/rostests/apitests/shlwapi/SHPropertyBag.cpp b/modules/rostests/apitests/shlwapi/SHPropertyBag.cpp new file mode 100644 index 00000000000..6291f25d17e --- /dev/null +++ b/modules/rostests/apitests/shlwapi/SHPropertyBag.cpp @@ -0,0 +1,155 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Tests for SHPropertyBag Read/Write + * COPYRIGHT: Copyright 2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +#include <apitest.h> +#include <shlwapi.h> +#include <shlobj.h> +#include <shlwapi_undoc.h> + +#include <pseh/pseh2.h> + +static LPCWSTR s_pszPropNames[4] = { NULL, NULL, NULL, NULL }; +static VARTYPE s_vt; +static INT s_cWrite = 0; + +static void ResetTest(VARTYPE vt, + LPCWSTR pszName0 = NULL, LPCWSTR pszName1 = NULL, + LPCWSTR pszName2 = NULL, LPCWSTR pszName3 = NULL) +{ + s_vt = vt; + s_cWrite = 0; + s_pszPropNames[0] = pszName0; + s_pszPropNames[1] = pszName1; + s_pszPropNames[2] = pszName2; + s_pszPropNames[3] = pszName3; +} + +class CDummyWritePropertyBag : public IPropertyBag +{ +public: + CDummyWritePropertyBag() + { + } + + // IUnknown + STDMETHODIMP QueryInterface(REFIID riid, void **ppvObject) override + { + ok_int(0, 1); + return S_OK; + } + STDMETHODIMP_(ULONG) AddRef() override + { + ok_int(0, 1); + return S_OK; + } + STDMETHODIMP_(ULONG) Release() override + { + ok_int(0, 1); + return S_OK; + } + + // IPropertyBag + STDMETHODIMP Read(LPCWSTR pszPropName, VARIANT *pvari, IErrorLog *pErrorLog) override + { + ok_int(0, 1); + return S_OK; + } + + STDMETHODIMP Write(LPCWSTR pszPropName, VARIANT *pvari) override + { + ++s_cWrite; + ok_int(s_vt, V_VT(pvari)); + for (size_t i = 0; i < _countof(s_pszPropNames); ++i) + { + if (s_pszPropNames[i]) + { + ok_wstr(pszPropName, s_pszPropNames[i]); + s_pszPropNames[i] = NULL; + if (lstrcmpiW(pszPropName, L"RECTL2.bottom") == 0) + { + s_vt = VT_EMPTY; + ZeroMemory(&s_pszPropNames, sizeof(s_pszPropNames)); + s_pszPropNames[0] = L"RECTL2.right"; + return E_FAIL; + } + break; + } + } + return S_OK; + } +}; + +static void SHPropertyBag_WriteTest(void) +{ + HRESULT hr; + CDummyWritePropertyBag dummy; + + ResetTest(VT_EMPTY, L"EMPTY1"); + hr = SHPropertyBag_Delete(&dummy, s_pszPropNames[0]); + ok_long(hr, S_OK); + ok_int(s_cWrite, 1); + + ResetTest(VT_BOOL, L"BOOL1"); + hr = SHPropertyBag_WriteBOOL(&dummy, s_pszPropNames[0], TRUE); + ok_long(hr, S_OK); + ok_int(s_cWrite, 1); + + ResetTest(VT_UI2, L"SHORT1"); + hr = SHPropertyBag_WriteSHORT(&dummy, s_pszPropNames[0], 1); + ok_long(hr, S_OK); + ok_int(s_cWrite, 1); + + ResetTest(VT_I4, L"LONG1"); + hr = SHPropertyBag_WriteLONG(&dummy, s_pszPropNames[0], 1); + ok_long(hr, S_OK); + ok_int(s_cWrite, 1); + + ResetTest(VT_UI4, L"DWORD1"); + hr = SHPropertyBag_WriteDWORD(&dummy, s_pszPropNames[0], 1); + ok_long(hr, S_OK); + ok_int(s_cWrite, 1); + + ResetTest(VT_BSTR, L"Str1"); + hr = SHPropertyBag_WriteStr(&dummy, s_pszPropNames[0], L"1"); + ok_long(hr, S_OK); + ok_int(s_cWrite, 1); + + ResetTest(VT_I4, L"POINTL1.x", L"POINTL1.y"); + POINTL ptl = { 0xEEEE, 0xDDDD }; + hr = SHPropertyBag_WritePOINTL(&dummy, L"POINTL1", &ptl); + ok_long(hr, S_OK); + ok_int(s_cWrite, 2); + + ResetTest(VT_I4, L"POINTS1.x", L"POINTS1.y"); + POINTS pts = { 0x2222, 0x3333 }; + hr = SHPropertyBag_WritePOINTS(&dummy, L"POINTS1", &pts); + ok_long(hr, S_OK); + ok_int(s_cWrite, 2); + + ResetTest(VT_I4, L"RECTL1.left", L"RECTL1.top", L"RECTL1.right", L"RECTL1.bottom"); + RECTL rcl = { 123, 456, 789, 101112 }; + hr = SHPropertyBag_WriteRECTL(&dummy, L"RECTL1", &rcl); + ok_long(hr, S_OK); + ok_int(s_cWrite, 4); + + ResetTest(VT_I4, L"RECTL2.left", L"RECTL2.top", L"RECTL2.right", L"RECTL2.bottom"); + hr = SHPropertyBag_WriteRECTL(&dummy, L"RECTL2", &rcl); + ok_long(hr, S_OK); + ok_int(s_cWrite, 5); + + GUID guid; + ZeroMemory(&guid, sizeof(guid)); + ResetTest(VT_BSTR, L"GUID1"); + hr = SHPropertyBag_WriteGUID(&dummy, L"GUID1", &guid); + ok_long(hr, S_OK); + ok_int(s_cWrite, 1); +} + +START_TEST(SHPropertyBag) +{ + SHPropertyBag_WriteTest(); +} diff --git a/modules/rostests/apitests/shlwapi/testlist.c b/modules/rostests/apitests/shlwapi/testlist.c index ea30af72bee..08fd3c8e2be 100644 --- a/modules/rostests/apitests/shlwapi/testlist.c +++ b/modules/rostests/apitests/shlwapi/testlist.c @@ -10,6 +10,7 @@ extern void func_PathUnExpandEnvStringsForUser(void); extern void func_SHAreIconsEqual(void); extern void func_SHLoadIndirectString(void); extern void func_SHLoadRegUIString(void); +extern void func_SHPropertyBag(void); extern void func_StrFormatByteSizeW(void); const struct test winetest_testlist[] = @@ -23,6 +24,7 @@ const struct test winetest_testlist[] = { "SHAreIconsEqual", func_SHAreIconsEqual }, { "SHLoadIndirectString", func_SHLoadIndirectString }, { "SHLoadRegUIString", func_SHLoadRegUIString }, + { "SHPropertyBag", func_SHPropertyBag }, { "StrFormatByteSizeW", func_StrFormatByteSizeW }, { 0, 0 } }; diff --git a/sdk/include/reactos/shlwapi_undoc.h b/sdk/include/reactos/shlwapi_undoc.h index 86ac167b8a5..d584b57df2d 100644 --- a/sdk/include/reactos/shlwapi_undoc.h +++ b/sdk/include/reactos/shlwapi_undoc.h @@ -99,6 +99,7 @@ HRESULT WINAPI SHGetPerScreenResName(OUT LPWSTR lpResName, 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); HRESULT WINAPI SHPropertyBag_WriteLONG(IPropertyBag *ppb, LPCWSTR pszPropName, LONG lValue); @@ -106,6 +107,9 @@ HRESULT WINAPI SHPropertyBag_WriteDWORD(IPropertyBag *ppb, LPCWSTR pszPropName, HRESULT WINAPI SHPropertyBag_WriteStr(IPropertyBag *ppb, LPCWSTR pszPropName, LPCWSTR pszValue); HRESULT WINAPI SHPropertyBag_WriteGUID(IPropertyBag *ppb, LPCWSTR pszPropName, const GUID *pguid); HRESULT WINAPI SHPropertyBag_WriteStream(IPropertyBag *ppb, LPCWSTR pszPropName, IStream *pStream); +HRESULT WINAPI SHPropertyBag_WritePOINTL(IPropertyBag *ppb, LPCWSTR pszPropName, const POINTL *pptl); +HRESULT WINAPI SHPropertyBag_WritePOINTS(IPropertyBag *ppb, LPCWSTR pszPropName, const POINTS *ppts); +HRESULT WINAPI SHPropertyBag_WriteRECTL(IPropertyBag *ppb, LPCWSTR pszPropName, const RECTL *prcl); HWND WINAPI SHCreateWorkerWindowA(WNDPROC wndProc, HWND hWndParent, DWORD dwExStyle, DWORD dwStyle, HMENU hMenu, LONG_PTR wnd_extra);

1 year, 5 months

[reactos] 02/02: [NTUSER] Always reference a window when using it as parent/child etc.

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1599d7b79426961f7f887… commit 1599d7b79426961f7f887ef32d9307f2dd812d0e Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Mon Jul 24 22:20:29 2023 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Mon Jul 24 23:29:38 2023 +0200 [NTUSER] Always reference a window when using it as parent/child etc. CORE-18811 --- win32ss/user/ntuser/focus.c | 8 +++--- win32ss/user/ntuser/window.c | 39 ++++++++++++++++------------- win32ss/user/ntuser/window.h | 59 ++++++++++++++++++++++++++++++++++++++------ 3 files changed, 77 insertions(+), 29 deletions(-) diff --git a/win32ss/user/ntuser/focus.c b/win32ss/user/ntuser/focus.c index 07cc78c4f08..3b11d47d5f4 100644 --- a/win32ss/user/ntuser/focus.c +++ b/win32ss/user/ntuser/focus.c @@ -242,7 +242,7 @@ IntDeactivateWindow(PTHREADINFO pti, HANDLE tid) if ( pti->MessageQueue->spwndActive ) { pwndPrev = pti->MessageQueue->spwndActive; - ptiPrev = pwndPrev->head.pti; + ptiPrev = pwndPrev->head.pti; if (!co_IntSendDeactivateMessages(UserHMGetHandle(pwndPrev), 0, TRUE)) { @@ -403,7 +403,7 @@ IntActivateWindow(PWND Wnd, PTHREADINFO pti, HANDLE tid, DWORD Type) { Wnd = pmq->spwndActive; // Use active window from current queue. - UserRefObjectCo(Wnd, &Ref); + UserRefObjectCo(Wnd, &Ref); co_IntSendMessage( UserHMGetHandle(Wnd), WM_NCACTIVATE, TRUE, 0); @@ -433,7 +433,7 @@ co_IntMakeWindowActive(PWND Window) { spwndOwner = spwndOwner->spwndOwner; } - spwndOwner->spwndLastActive = Window; + WndSetLastActive(spwndOwner, Window); return TRUE; } ERR("MakeWindowActive Failed!\n"); @@ -830,7 +830,7 @@ co_IntSetForegroundMessageQueue( MsqPostMessage(ptiPrev, &Msg, FALSE, QS_EVENT, POSTEVENT_DAW, (LONG_PTR)tid); } } - + pumqChg = NULL; if ( ptiChg && !(ptiChg->TIF_flags & TIF_INCLEANUP) ) { diff --git a/win32ss/user/ntuser/window.c b/win32ss/user/ntuser/window.c index e587c73a58d..fe05bafac66 100644 --- a/win32ss/user/ntuser/window.c +++ b/win32ss/user/ntuser/window.c @@ -593,8 +593,6 @@ LRESULT co_UserFreeWindow(PWND Window, Window->style &= ~WS_VISIBLE; Window->head.pti->cVisWindows--; - WndSetOwner(Window, NULL); - /* remove the window already at this point from the thread window list so we don't get into trouble when destroying the thread windows while we're still in co_UserFreeWindow() */ @@ -733,6 +731,12 @@ LRESULT co_UserFreeWindow(PWND Window, ASSERT(Window->PropListItems==0); } + /* Kill any reference to linked windows. Prev & Next are taken care of in IntUnlinkWindow */ + WndSetOwner(Window, NULL); + WndSetParent(Window, NULL); + WndSetChild(Window, NULL); + WndSetLastActive(Window, NULL); + UserReferenceObject(Window); UserMarkObjectDestroy(Window); @@ -948,27 +952,27 @@ IntLinkWindow( return; } - Wnd->spwndPrev = WndInsertAfter; + WndSetPrev(Wnd, WndInsertAfter); if (Wnd->spwndPrev) { /* Link after WndInsertAfter */ ASSERT(Wnd != WndInsertAfter->spwndNext); - Wnd->spwndNext = WndInsertAfter->spwndNext; + WndSetNext(Wnd, WndInsertAfter->spwndNext); if (Wnd->spwndNext) - Wnd->spwndNext->spwndPrev = Wnd; + WndSetPrev(Wnd->spwndNext, Wnd); ASSERT(Wnd != Wnd->spwndPrev); - Wnd->spwndPrev->spwndNext = Wnd; + WndSetNext(Wnd->spwndPrev, Wnd); } else { /* Link at the top */ ASSERT(Wnd != Wnd->spwndParent->spwndChild); - Wnd->spwndNext = Wnd->spwndParent->spwndChild; + WndSetNext(Wnd, Wnd->spwndParent->spwndChild); if (Wnd->spwndNext) - Wnd->spwndNext->spwndPrev = Wnd; + WndSetPrev(Wnd->spwndNext, Wnd); - Wnd->spwndParent->spwndChild = Wnd; + WndSetChild(Wnd->spwndParent, Wnd); } } @@ -1220,7 +1224,7 @@ co_IntSetParent(PWND Wnd, PWND WndNewParent) Wnd->ExStyle2 &= ~WS_EX2_LINKED; /* Set the new parent */ - Wnd->spwndParent = WndNewParent; + WndSetParent(Wnd, WndNewParent); if ( Wnd->style & WS_CHILD && Wnd->spwndOwner && @@ -1352,15 +1356,16 @@ IntUnlinkWindow(PWND Wnd) ASSERT(Wnd != Wnd->spwndPrev); if (Wnd->spwndNext) - Wnd->spwndNext->spwndPrev = Wnd->spwndPrev; + WndSetPrev(Wnd->spwndNext, Wnd->spwndPrev); if (Wnd->spwndPrev) - Wnd->spwndPrev->spwndNext = Wnd->spwndNext; + WndSetNext(Wnd->spwndPrev, Wnd->spwndNext); if (Wnd->spwndParent && Wnd->spwndParent->spwndChild == Wnd) - Wnd->spwndParent->spwndChild = Wnd->spwndNext; + WndSetChild(Wnd->spwndParent, Wnd->spwndNext); - Wnd->spwndPrev = Wnd->spwndNext = NULL; + WndSetPrev(Wnd, NULL); + WndSetNext(Wnd, NULL); } // Win: ExpandWindowList @@ -1876,10 +1881,10 @@ PWND FASTCALL IntCreateWindow(CREATESTRUCTW* Cs, * Fill out the structure describing it. */ /* Remember, pWnd->head is setup in object.c ... */ - pWnd->spwndParent = ParentWindow; + WndSetParent(pWnd, ParentWindow); WndSetOwner(pWnd, OwnerWindow); pWnd->fnid = 0; - pWnd->spwndLastActive = pWnd; + WndSetLastActive(pWnd, pWnd); // Ramp up compatible version sets. if ( dwVer >= WINVER_WIN31 ) { @@ -2932,7 +2937,7 @@ BOOLEAN co_UserDestroyWindow(PVOID Object) pwndTemp = pwndTemp->spwndOwner; if (pwndTemp->spwndLastActive == Window) - pwndTemp->spwndLastActive = Window->spwndOwner; + WndSetLastActive(pwndTemp, Window->spwndOwner); } if (Window->spwndParent && IntIsWindow(UserHMGetHandle(Window))) diff --git a/win32ss/user/ntuser/window.h b/win32ss/user/ntuser/window.h index fa0387f30d3..a6c60a6354c 100644 --- a/win32ss/user/ntuser/window.h +++ b/win32ss/user/ntuser/window.h @@ -127,21 +127,64 @@ VOID FASTCALL IntCheckImeShowStatusInThread(PWND pImeWnd); static inline VOID -WndSetOwner(_Inout_ PWND pwnd, _In_opt_ PWND pwndOwner) +ReplaceWndPtr(_Inout_ PWND* ppwnd, _In_opt_ PWND pwndNew) { - /* First reference the new owner window */ - if (pwndOwner != NULL) + /* First reference the new one */ + if (pwndNew != NULL) { - UserReferenceObject(pwndOwner); + UserReferenceObject(pwndNew); } - /* Now dereference the previous owner window */ - if (pwnd->spwndOwner != NULL) + /* Then dereference the previous one */ + if (*ppwnd != NULL) { - UserDereferenceObject(pwnd->spwndOwner); + UserDereferenceObject(*ppwnd); } - pwnd->spwndOwner = pwndOwner; + /* And set */ + *ppwnd = pwndNew; +} + +static inline +VOID +WndSetOwner(_Inout_ PWND pwnd, _In_opt_ PWND pwndOwner) +{ + ReplaceWndPtr(&pwnd->spwndOwner, pwndOwner); +} + +static inline +VOID +WndSetParent(_Inout_ PWND pwnd, _In_opt_ PWND pwndParent) +{ + ReplaceWndPtr(&pwnd->spwndParent, pwndParent); +} + +static inline +VOID +WndSetChild(_Inout_ PWND pwnd, _In_opt_ PWND pwndChild) +{ + ReplaceWndPtr(&pwnd->spwndChild, pwndChild); +} + +static inline +VOID +WndSetNext(_Inout_ PWND pwnd, _In_opt_ PWND pwndNext) +{ + ReplaceWndPtr(&pwnd->spwndNext, pwndNext); +} + +static inline +VOID +WndSetPrev(_Inout_ PWND pwnd, _In_opt_ PWND pwndPrev) +{ + ReplaceWndPtr(&pwnd->spwndPrev, pwndPrev); +} + +static inline +VOID +WndSetLastActive(_Inout_ PWND pwnd, _In_opt_ PWND pwndLastActive) +{ + ReplaceWndPtr(&pwnd->spwndLastActive, pwndLastActive); } /* EOF */

1 year, 5 months

[reactos] 01/02: [USER32] Use static inline instead of inline

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b3d0591e76b1e1ece42a3… commit b3d0591e76b1e1ece42a3e052f24f8ad3338580e Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Mon Jul 24 22:18:36 2023 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Mon Jul 24 23:29:38 2023 +0200 [USER32] Use static inline instead of inline Fixes compilation with less optimizations --- win32ss/user/user32/windows/input.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/win32ss/user/user32/windows/input.c b/win32ss/user/user32/windows/input.c index 48b18b069da..dc6ddaff5f7 100644 --- a/win32ss/user/user32/windows/input.c +++ b/win32ss/user/user32/windows/input.c @@ -704,7 +704,7 @@ LoadKeyboardLayoutA(LPCSTR pszKLID, return LoadKeyboardLayoutW(wszKLID, Flags); } -inline BOOL IsValidKLID(_In_ LPCWSTR pwszKLID) +static inline BOOL IsValidKLID(_In_ LPCWSTR pwszKLID) { return (pwszKLID != NULL) && (wcsspn(pwszKLID, L"0123456789ABCDEFabcdef") == (KL_NAMELENGTH - 1)); }

1 year, 5 months

[reactos] 01/01: [SHLWAPI][SDK] Implement SHPropertyBag_WriteDWORD etc. (#5467)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dad99e3bd0ec7032c6195… commit dad99e3bd0ec7032c61956f9e5cc00423479805e Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Jul 24 07:12:05 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Jul 24 07:12:05 2023 +0900 [SHLWAPI][SDK] Implement SHPropertyBag_WriteDWORD etc. (#5467) CORE-9283 --- dll/win32/shlwapi/ordinal.c | 152 +++++++++++++++++++++++++++++++----- dll/win32/shlwapi/shlwapi.spec | 10 +-- sdk/include/reactos/shlwapi_undoc.h | 7 ++ 3 files changed, 144 insertions(+), 25 deletions(-) diff --git a/dll/win32/shlwapi/ordinal.c b/dll/win32/shlwapi/ordinal.c index 8286fe22e2f..981d9f68e4f 100644 --- a/dll/win32/shlwapi/ordinal.c +++ b/dll/win32/shlwapi/ordinal.c @@ -5322,42 +5322,154 @@ HRESULT WINAPI SHPropertyBag_ReadLONG(IPropertyBag *ppb, LPCWSTR pszPropName, LP } #ifdef __REACTOS__ +/************************************************************************** + * SHPropertyBag_WriteBOOL (SHLWAPI.499) + */ +HRESULT WINAPI SHPropertyBag_WriteBOOL(IPropertyBag *ppb, LPCWSTR pszPropName, BOOL bValue) +{ + VARIANT vari; + + TRACE("%p %s %d\n", ppb, debugstr_w(pszPropName), bValue); + + if (!ppb || !pszPropName) + { + ERR("%p %s\n", ppb, debugstr_w(pszPropName)); + return E_INVALIDARG; + } + + V_VT(&vari) = VT_BOOL; + V_BOOL(&vari) = (bValue ? VARIANT_TRUE : VARIANT_FALSE); /* NOTE: VARIANT_TRUE is (SHORT)-1 */ + return IPropertyBag_Write(ppb, pszPropName, &vari); +} + +/************************************************************************** + * SHPropertyBag_WriteSHORT (SHLWAPI.528) + */ +HRESULT WINAPI SHPropertyBag_WriteSHORT(IPropertyBag *ppb, LPCWSTR pszPropName, SHORT sValue) +{ + VARIANT vari; + + TRACE("%p %s %d\n", ppb, debugstr_w(pszPropName), sValue); + + if (!ppb || !pszPropName) + { + ERR("%p %s\n", ppb, debugstr_w(pszPropName)); + return E_INVALIDARG; + } + + V_VT(&vari) = VT_UI2; + V_UI2(&vari) = sValue; + return IPropertyBag_Write(ppb, pszPropName, &vari); +} + /************************************************************************** * SHPropertyBag_WriteLONG (SHLWAPI.497) * * This function asks a property bag to write a named property as a LONG. - * - * PARAMS - * ppb: a IPropertyBag interface - * pszPropName: Unicode string that names the property - * lValue: address to receive the property value as a 32-bit signed integer - * - * RETURNS - * HRESULT codes */ HRESULT WINAPI SHPropertyBag_WriteLONG(IPropertyBag *ppb, LPCWSTR pszPropName, LONG lValue) { - UNIMPLEMENTED; - return E_NOTIMPL; + VARIANT vari; + + TRACE("%p %s %ld\n", ppb, debugstr_w(pszPropName), lValue); + + if (!ppb || !pszPropName) + { + ERR("%p %s\n", ppb, debugstr_w(pszPropName)); + return E_INVALIDARG; + } + + V_VT(&vari) = VT_I4; + V_I4(&vari) = lValue; + return IPropertyBag_Write(ppb, pszPropName, &vari); +} + +/************************************************************************** + * SHPropertyBag_WriteDWORD (SHLWAPI.508) + */ +HRESULT WINAPI SHPropertyBag_WriteDWORD(IPropertyBag *ppb, LPCWSTR pszPropName, DWORD dwValue) +{ + VARIANT vari; + + TRACE("%p %s %lu\n", ppb, debugstr_w(pszPropName), dwValue); + + if (!ppb || !pszPropName) + { + ERR("%p %s\n", ppb, debugstr_w(pszPropName)); + return E_INVALIDARG; + } + + V_VT(&vari) = VT_UI4; + V_UI4(&vari) = dwValue; + return IPropertyBag_Write(ppb, pszPropName, &vari); } /************************************************************************** * SHPropertyBag_WriteStr (SHLWAPI.495) * * This function asks a property bag to write a string as the value of a named property. - * - * PARAMS - * ppb: a IPropertyBag interface - * pszPropName: Unicode string that names the property - * pValue: address to write the property value - * - * RETURNS - * HRESULT codes */ HRESULT WINAPI SHPropertyBag_WriteStr(IPropertyBag *ppb, LPCWSTR pszPropName, LPCWSTR pszValue) { - UNIMPLEMENTED; - return E_NOTIMPL; + HRESULT hr; + VARIANT vari; + + TRACE("%p %s %s\n", ppb, debugstr_w(pszPropName), debugstr_w(pszValue)); + + if (!ppb || !pszPropName) + { + ERR("%p %s\n", ppb, debugstr_w(pszPropName)); + return E_INVALIDARG; + } + + V_BSTR(&vari) = SysAllocString(pszValue); + if (!V_BSTR(&vari)) + return E_OUTOFMEMORY; + + V_VT(&vari) = VT_BSTR; + hr = IPropertyBag_Write(ppb, pszPropName, &vari); + + SysFreeString(V_BSTR(&vari)); + return hr; +} + +/************************************************************************** + * SHPropertyBag_WriteGUID (SHLWAPI.506) + */ +HRESULT WINAPI SHPropertyBag_WriteGUID(IPropertyBag *ppb, LPCWSTR pszPropName, const GUID *pguid) +{ + WCHAR szBuff[64]; + + 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; + } + + SHStringFromGUIDW(pguid, szBuff, _countof(szBuff)); + return SHPropertyBag_WriteStr(ppb, pszPropName, szBuff); +} + +/************************************************************************** + * SHPropertyBag_WriteStream (SHLWAPI.532) + */ +HRESULT WINAPI SHPropertyBag_WriteStream(IPropertyBag *ppb, LPCWSTR pszPropName, IStream *pStream) +{ + VARIANT vari; + + TRACE("%p %s %p\n", ppb, debugstr_w(pszPropName), pStream); + + if (!ppb || !pszPropName || !pStream) + { + ERR("%p %s %p\n", ppb, debugstr_w(pszPropName), pStream); + return E_INVALIDARG; + } + + V_VT(&vari) = VT_UNKNOWN; + V_UNKNOWN(&vari) = (IUnknown*)pStream; + return IPropertyBag_Write(ppb, pszPropName, &vari); } #endif diff --git a/dll/win32/shlwapi/shlwapi.spec b/dll/win32/shlwapi/shlwapi.spec index bcd304fda15..786ed81b005 100644 --- a/dll/win32/shlwapi/shlwapi.spec +++ b/dll/win32/shlwapi/shlwapi.spec @@ -496,16 +496,16 @@ 496 stdcall -noname SHPropertyBag_ReadLONG(ptr wstr ptr) 497 stdcall -noname SHPropertyBag_WriteLONG(ptr wstr long) 498 stub -noname SHPropertyBag_ReadBOOLOld -499 stub -noname SHPropertyBag_WriteBOOL +499 stdcall -noname SHPropertyBag_WriteBOOL(ptr wstr long) 500 stdcall AssocGetPerceivedType(wstr ptr ptr ptr) 501 stdcall AssocIsDangerous(wstr) 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 -506 stub -noname SHPropertyBag_WriteGUID +506 stdcall -noname SHPropertyBag_WriteGUID(ptr wstr ptr) 507 stdcall -stub -noname SHPropertyBag_ReadDWORD(ptr ptr ptr) -508 stub -noname SHPropertyBag_WriteDWORD +508 stdcall -noname SHPropertyBag_WriteDWORD(ptr wstr long) 509 stdcall -noname IUnknown_OnFocusChangeIS(ptr ptr long) 510 stdcall -noname SHLockSharedEx(ptr long long) 511 stdcall -stub -noname PathFileExistsDefExtAndAttributesW(wstr long ptr) @@ -525,11 +525,11 @@ 525 stub -noname SHPropertyBag_ReadPOINTS 526 stub -noname SHPropertyBag_WritePOINTS 527 stub -noname SHPropertyBag_ReadSHORT -528 stub -noname SHPropertyBag_WriteSHORT +528 stdcall -noname SHPropertyBag_WriteSHORT(ptr wstr long) 529 stub -noname SHPropertyBag_ReadInt 530 stub -noname SHPropertyBag_WriteInt 531 stub -noname SHPropertyBag_ReadStream -532 stub -noname SHPropertyBag_WriteStream +532 stdcall -noname SHPropertyBag_WriteStream(ptr wstr ptr) 533 stub -noname SHGetPerScreenResName 534 stub -noname SHPropertyBag_ReadBOOL 535 stub -noname SHPropertyBag_Delete diff --git a/sdk/include/reactos/shlwapi_undoc.h b/sdk/include/reactos/shlwapi_undoc.h index 631dd68b757..86ac167b8a5 100644 --- a/sdk/include/reactos/shlwapi_undoc.h +++ b/sdk/include/reactos/shlwapi_undoc.h @@ -99,6 +99,13 @@ HRESULT WINAPI SHGetPerScreenResName(OUT LPWSTR lpResName, IN DWORD dwReserved); HRESULT WINAPI SHPropertyBag_ReadStream(IPropertyBag*,LPCWSTR,IStream**); +HRESULT WINAPI SHPropertyBag_WriteBOOL(IPropertyBag *ppb, LPCWSTR pszPropName, BOOL bValue); +HRESULT WINAPI SHPropertyBag_WriteSHORT(IPropertyBag *ppb, LPCWSTR pszPropName, SHORT sValue); +HRESULT WINAPI SHPropertyBag_WriteLONG(IPropertyBag *ppb, LPCWSTR pszPropName, LONG lValue); +HRESULT WINAPI SHPropertyBag_WriteDWORD(IPropertyBag *ppb, LPCWSTR pszPropName, DWORD dwValue); +HRESULT WINAPI SHPropertyBag_WriteStr(IPropertyBag *ppb, LPCWSTR pszPropName, LPCWSTR pszValue); +HRESULT WINAPI SHPropertyBag_WriteGUID(IPropertyBag *ppb, LPCWSTR pszPropName, const GUID *pguid); +HRESULT WINAPI SHPropertyBag_WriteStream(IPropertyBag *ppb, LPCWSTR pszPropName, IStream *pStream); HWND WINAPI SHCreateWorkerWindowA(WNDPROC wndProc, HWND hWndParent, DWORD dwExStyle, DWORD dwStyle, HMENU hMenu, LONG_PTR wnd_extra);

1 year, 5 months

[reactos] 01/01: [DOCS] Update contributing rules and PR management (#4881)

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=02a19c314f7502674e59d… commit 02a19c314f7502674e59d18ae8296173ad92b271 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Mon Jul 24 00:58:56 2023 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Jul 24 00:58:56 2023 +0300 [DOCS] Update contributing rules and PR management (#4881) - Add points regarding real name and e-mail requirements - Replace old IRC links with the chat references - Update PR management guidelines accordingly --- CONTRIBUTING.md | 16 ++++++++++++---- PULL_REQUEST_MANAGEMENT.md | 14 ++++++++++++++ 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2792d14bdcb..d73b71200bb 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -63,13 +63,19 @@ Our commit style is defined in a __[commit template]__. Use it as a reference or ### Rules and Recommendations -- *Use your __real name__ and __real email__.* We do not accept anonymous contributions! +- *Use your __real name__ and __real email__.* We do not accept anonymous code contributions! + - Every commit that changes code or translations should have author's full legal name (in latin letters, diacritics allowed). + - It's recommended to have the same full name set in GitHub profile (in the [Name field here][GitHub Profile Settings]) that matches one specified in commits. +- There is an exception for media changes, such as changes of art (wallpapers, themes, icons, sounds) and out-of-code documentation. + - In these specific cases it's allowed to use a nickname or alias as author's name, and it's recommended to have the same name set in GitHub profile (in the [Name field here][GitHub Profile Settings]) matching one specified in commits. +- In any case the author must use a real e-mail address, this includes git commits (`user.email` setting) and GitHub [e-mail settings][GitHub Email Settings] - the checkbox "Keep my email addresses private" must be unchecked there. + - In order to *keep your privacy*, select appropriate "Primary email address" that will be applied to your commits in GitHub [e-mail settings][GitHub Email Settings]. - *Ensure your contribution is properly described.* Include the relevant issue number if applicable. - *Put only related changes.* It will make reviewing easier as the reviewer needs to recall less information about the existing source code that is changed. - *Search for similar pull requests/patches before submitting.* It may be that a similar pull request or issue was opened previously. Comment and review on that one instead. - *Keep your contribution small and focused on the topic.* It can be tempting to fix existing issues as you come across them while reading the source code. Resist the temptation and put in a note in the source code instead, or (even better) put the issue in the issue tracking system. - *Respect our __[Coding Style]__ and __[Programming Guidelines]__.* -- *Do not be afraid to ask questions.* Ask our developers on JIRA or [IRC] channel. +- *Do not be afraid to ask questions.* Ask our developers in the [chat]. To amend your commit with your name and e-mail (in any case you've forgot to set your name/e-mail) please take a look at this [guide](https://reactos.org/wiki/ReactOS_Git_For_Dummies#Amending_your_commi…. To set your name/e-mail globally for future commits that you push, [read this](https://reactos.org/wiki/ReactOS_Git_For_Dummies#Assign_commits_with_…. @@ -79,7 +85,7 @@ Finding a good project to start with can be a challenge, because when starting o - Find a test that fails, and try to make it succeed: <https://reactos.org/testman/> - Look around in JIRA, and if you have problems finding nice projects to start with, there is a label for this: <https://jira.reactos.org/issues/?jql=labels%20%3D%20starter-project> -- Ask for help on [IRC] +- Ask for help in the [chat] - Additionally, there are some tests that cause crashes/hangs, but these might be slightly harder: <https://jira.reactos.org/browse/ROSTESTS-125> [clean room reverse engineering]: https://en.wikipedia.org/wiki/Clean_room_design @@ -90,12 +96,14 @@ Finding a good project to start with can be a challenge, because when starting o [migration to GitHub]: https://reactos.org/project-news/reactos-repository-migrated-github/ [humans are terrible at tracking large amount of information]: https://www.eurekalert.org/pub_releases/2005-03/aps-hmc030805.php [Pull requests]: https://help.github.com/articles/about-pull-requests/ + [GitHub Profile Settings]: https://github.com/settings/profile + [GitHub Email Settings]: https://github.com/settings/emails [tips for reviewing patches]: https://www.drupal.org/patch/review [missing functionality]: https://reactos.org/wiki/Missing_ReactOS_Functionality [patch]: https://git-scm.com/docs/git-format-patch [Submitting Patches]: https://reactos.org/wiki/Submitting_Patches [Coding Style]: https://reactos.org/wiki/Coding_Style - [IRC]: https://reactos.org/wiki/Connect_to_the_ReactOS_IRC_Channels + [chat]: https://reactos.org/wiki/Mattermost [Programming Guidelines]: https://reactos.org/wiki/Programming_Guidelines [3rd Party Files.txt]: /media/doc/3rd_Party_Files.txt [README.WINE]: /media/doc/README.WINE diff --git a/PULL_REQUEST_MANAGEMENT.md b/PULL_REQUEST_MANAGEMENT.md index 8d36bb7be76..2718ee0ea22 100644 --- a/PULL_REQUEST_MANAGEMENT.md +++ b/PULL_REQUEST_MANAGEMENT.md @@ -14,3 +14,17 @@ In addition, in order to avoid coming off as rude to helpful contributors, pleas - Asking the contributor to do unrelated work - Closing without providing a reason - Merging with the intention to rewrite that code soon after + +Before merging a PR, make sure it follows the [contributing rules](CONTRIBUTING.md#rules-and-recommendations), but more importantly: +- Make sure the author has specified a real e-mail in all PR commits +- If PR contains code or translations, make sure the author has not specified a nickname or alias, but a full legal name in all PR commits +- If PR contains media (wallpapers, themes, icons, sounds) or out-of-code documentation, make sure the author has specified the name or alias in all PR commits +- If PR contains mixed code with media changes, handle it as PR with code +- Important notes before using "Squash and merge" strategy on a PR: + - Make sure the author's name in GitHub profile matches one in commits. If this is not the case, ask the author to set it accordingly. + - If the author does not want to set the name in GitHub profile: + - "no squash merge" label needs to be added to a PR. + - Make sure every commit message is formatted correctly as in [.gitmessage](https://github.com/reactos/reactos/blob/master/.gitmessage). + - Finally in this case a PR has to be merged either using "Rebase and merge" strategy or manually. + - By pressing "Squash and merge" button in a PR you can make sure the author does not use no-reply e-mail - + under the commit message there will be a text label saying: `This commit will be authored by <address(a)email.com>`

1 year, 5 months

[reactos] 03/03: [NTOS:MM] Use FORCEINLINE instead of simple inline

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=57e018acf6cc75288a2f4… commit 57e018acf6cc75288a2f40b7341543140055a0ae Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Sat Jul 22 23:48:58 2023 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Sun Jul 23 23:58:42 2023 +0200 [NTOS:MM] Use FORCEINLINE instead of simple inline inline implies an implementation must exist in another compilation unit --- ntoskrnl/include/internal/mm.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/include/internal/mm.h b/ntoskrnl/include/internal/mm.h index c7bf663d1c8..5e8ad09a861 100644 --- a/ntoskrnl/include/internal/mm.h +++ b/ntoskrnl/include/internal/mm.h @@ -868,7 +868,7 @@ MmDeleteKernelStack(PVOID Stack, /* balance.c / pagefile.c******************************************************/ -inline VOID UpdateTotalCommittedPages(LONG Delta) +FORCEINLINE VOID UpdateTotalCommittedPages(LONG Delta) { /* * Add up all the used "Committed" memory + pagefile. @@ -880,7 +880,7 @@ inline VOID UpdateTotalCommittedPages(LONG Delta) MiMemoryConsumers[MC_USER].PagesUsed + MiUsedSwapPages; */ - + /* Update Commitment */ SIZE_T TotalCommittedPages = InterlockedExchangeAddSizeT(&MmTotalCommittedPages, Delta) + Delta;

1 year, 5 months

[reactos] 02/03: [FRAMEDYN] Do not define GCC <-> MSVC aliases when building the DLL

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ea331f074ce10d2b9c298… commit ea331f074ce10d2b9c298f7d6bbf43130aa83bf3 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Sat Jul 22 23:48:05 2023 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Sun Jul 23 23:58:42 2023 +0200 [FRAMEDYN] Do not define GCC <-> MSVC aliases when building the DLL This fixes some issue when compiling without optimizations on GCC --- dll/win32/framedyn/chstring.cpp | 2 ++ sdk/include/psdk/chstring.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dll/win32/framedyn/chstring.cpp b/dll/win32/framedyn/chstring.cpp index 9f24a90ec2b..df2eacc65c1 100644 --- a/dll/win32/framedyn/chstring.cpp +++ b/dll/win32/framedyn/chstring.cpp @@ -24,6 +24,8 @@ /* INCLUDES ******************************************************************/ +#define CHSTRING_BUILD + #include <chstring.h> #define NDEBUG #include <debug.h> diff --git a/sdk/include/psdk/chstring.h b/sdk/include/psdk/chstring.h index a2994bc064b..384f40c8bbb 100644 --- a/sdk/include/psdk/chstring.h +++ b/sdk/include/psdk/chstring.h @@ -196,7 +196,7 @@ inline BOOL operator>=(const CHString& s1, CHSTRING_LPCWSTR s2) { return s1.Comp inline BOOL operator>=(const CHString& s1, const CHString& s2) { return s1.Compare(s2) >= 0; } /* Have GCC link to the symbols exported by framedyn.dll */ -#ifdef __GNUC__ +#if defined(__GNUC__) && !defined(CHSTRING_BUILD) #define DEFINE_FRAMEDYN_ALIAS(alias, orig) __asm__(".set " #alias ", \"" #orig "\"");

1 year, 5 months

[reactos] 01/03: [TXT2NLS] Explicitly include <cstdint>

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5508673dd518f4ce0b0f0… commit 5508673dd518f4ce0b0f08c8b2ce84b0d2a1a6f7 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Sat Jul 22 10:24:44 2023 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Sun Jul 23 23:58:42 2023 +0200 [TXT2NLS] Explicitly include <cstdint> --- sdk/tools/txt2nls/main.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/sdk/tools/txt2nls/main.cpp b/sdk/tools/txt2nls/main.cpp index 8d5c473914f..796066ecf9a 100644 --- a/sdk/tools/txt2nls/main.cpp +++ b/sdk/tools/txt2nls/main.cpp @@ -11,6 +11,7 @@ #include <vector> #include <cstring> #include <string> +#include <cstdint> static const char whitespaces[] = " \t\f\v\n\r"; static long line_number = -1;

1 year, 5 months

[reactos] 01/01: [DMILIB][UDMIHELP] Favor pragma once (#5472)

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e387e246118446136eb9d… commit e387e246118446136eb9d088dd327bb823274b97 Author: Joachim Henze <joachim.henze(a)reactos.org> AuthorDate: Sun Jul 23 22:52:07 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Jul 23 22:52:07 2023 +0200 [DMILIB][UDMIHELP] Favor pragma once (#5472) --- sdk/lib/dmilib/dmilib.h | 6 +----- sdk/lib/udmihelp/udmihelp.h | 5 +---- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/sdk/lib/dmilib/dmilib.h b/sdk/lib/dmilib/dmilib.h index 203352db57d..f59f8ce7966 100644 --- a/sdk/lib/dmilib/dmilib.h +++ b/sdk/lib/dmilib/dmilib.h @@ -1,13 +1,11 @@ /* * PROJECT: ReactOS DMI/SMBIOS Library * LICENSE: GPL - See COPYING in the top level directory - * FILE: dmilib.h * PURPOSE: SMBIOS table parsing functions * PROGRAMMERS: Timo Kreuzer (timo.kreuzer(a)reactos.org) */ -#ifndef DMILIB_H -#define DMILIB_H +#pragma once enum _ID_STRINGS { @@ -35,5 +33,3 @@ ParseSMBiosTables( _In_reads_bytes_(TableSize) PVOID SMBiosTables, _In_ ULONG TableSize, _Inout_updates_(ID_STRINGS_MAX) PCHAR * Strings); - -#endif /* DMILIB_H */ diff --git a/sdk/lib/udmihelp/udmihelp.h b/sdk/lib/udmihelp/udmihelp.h index 27652229d9e..265332d8f9c 100644 --- a/sdk/lib/udmihelp/udmihelp.h +++ b/sdk/lib/udmihelp/udmihelp.h @@ -5,8 +5,7 @@ * COPYRIGHT: Copyright 2018 Stanislav Motylkov */ -#ifndef UDMIHELP_H -#define UDMIHELP_H +#pragma once #ifdef __cplusplus extern "C" { @@ -36,5 +35,3 @@ FreeSMBiosData( #ifdef __cplusplus } // extern "C" #endif - -#endif /* UDMIHELP_H */

1 year, 5 months

[reactos] 01/01: [IEFRAME] Improve Japanese (ja-JP) translation

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7b52c287d4244d88b9b2c… commit 7b52c287d4244d88b9b2cf424c2b3702c7966701 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Jul 23 08:02:24 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sun Jul 23 08:02:24 2023 +0900 [IEFRAME] Improve Japanese (ja-JP) translation CORE-18706 --- dll/win32/ieframe/lang/ja-JP.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/ieframe/lang/ja-JP.rc b/dll/win32/ieframe/lang/ja-JP.rc index 36e4eca66e4..8643390d0d5 100644 --- a/dll/win32/ieframe/lang/ja-JP.rc +++ b/dll/win32/ieframe/lang/ja-JP.rc @@ -41,7 +41,7 @@ IDR_BROWSE_MAIN_MENU MENU STRINGTABLE { IDS_INTERNET "インターネットブラウザ" - IDS_INTERNET_DESCRIPTION "Opens a Web browser and displays information on the Internet." + IDS_INTERNET_DESCRIPTION "ウェブブラウザを開き、インターネットの情報を表示します。" IDS_TB_BACK "戻る" IDS_TB_FORWARD "進む"

1 year, 5 months

← Newer
1
2
3
4
5
6
7
...
19
Older →

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 July 2023