Ros-diffs January 2022

ros-diffs@reactos.org

28 participants
173 discussions

[reactos] 01/03: [NTOS:KE] Move CPU features detection to a separate function on i586

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=705e07ce3150473de09c1… commit 705e07ce3150473de09c12457023b0a773370b59 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Sat Jan 15 03:24:55 2022 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Tue Jan 25 02:12:26 2022 +0300 [NTOS:KE] Move CPU features detection to a separate function on i586 --- ntoskrnl/ke/i386/kiinit.c | 86 +++++++++++++++++++++++++++-------------------- 1 file changed, 49 insertions(+), 37 deletions(-) diff --git a/ntoskrnl/ke/i386/kiinit.c b/ntoskrnl/ke/i386/kiinit.c index c8a9872b519..5c24902d2e5 100644 --- a/ntoskrnl/ke/i386/kiinit.c +++ b/ntoskrnl/ke/i386/kiinit.c @@ -392,6 +392,46 @@ KiInitializePcr(IN ULONG ProcessorNumber, Pcr->PrcbData.MultiThreadProcessorSet = Pcr->PrcbData.SetMember; } +static +CODE_SEG("INIT") +VOID +KiVerifyCpuFeatures(PKPRCB Prcb) +{ + ULONG FeatureBits; + + /* Detect and set the CPU Type */ + KiSetProcessorType(); + + /* Check if an FPU is present */ + KeI386NpxPresent = KiIsNpxPresent(); + + /* Bugcheck if this is a 386 CPU */ + if (Prcb->CpuType == 3) + KeBugCheckEx(UNSUPPORTED_PROCESSOR, 0x386, 0, 0, 0); + + /* Get the processor features for the CPU */ + FeatureBits = KiGetFeatureBits(); + + /* Detect 8-byte compare exchange support */ + if (!(FeatureBits & KF_CMPXCHG8B)) + { + ULONG Vendor[3]; + + /* Copy the vendor string */ + RtlCopyMemory(Vendor, Prcb->VendorString, sizeof(Vendor)); + + /* Bugcheck the system. Windows *requires* this */ + KeBugCheckEx(UNSUPPORTED_PROCESSOR, + (1 << 24 ) | (Prcb->CpuType << 16) | Prcb->CpuStep, + Vendor[0], + Vendor[1], + Vendor[2]); + } + + /* Save feature bits */ + Prcb->FeatureBits = FeatureBits; +} + CODE_SEG("INIT") VOID NTAPI @@ -402,27 +442,16 @@ KiInitializeKernel(IN PKPROCESS InitProcess, IN CCHAR Number, IN PLOADER_PARAMETER_BLOCK LoaderBlock) { - BOOLEAN NpxPresent; - ULONG FeatureBits; ULONG PageDirectory[2]; PVOID DpcStack; - ULONG Vendor[3]; KIRQL DummyIrql; - /* Detect and set the CPU Type */ - KiSetProcessorType(); - - /* Check if an FPU is present */ - NpxPresent = KiIsNpxPresent(); - /* Initialize the Power Management Support for this PRCB */ PoInitializePrcb(Prcb); - /* Bugcheck if this is a 386 CPU */ - if (Prcb->CpuType == 3) KeBugCheckEx(UNSUPPORTED_PROCESSOR, 0x386, 0, 0, 0); - - /* Get the processor features for the CPU */ - FeatureBits = KiGetFeatureBits(); + /* Set boot-level flags */ + if (Number == 0) + KeFeatureBits = Prcb->FeatureBits; /* Set the default NX policy (opt-in) */ SharedUserData->NXSupportPolicy = NX_SUPPORT_POLICY_OPTIN; @@ -432,31 +461,28 @@ KiInitializeKernel(IN PKPROCESS InitProcess, { /* Set it always on */ SharedUserData->NXSupportPolicy = NX_SUPPORT_POLICY_ALWAYSON; - FeatureBits |= KF_NX_ENABLED; + KeFeatureBits |= KF_NX_ENABLED; } else if (strstr(KeLoaderBlock->LoadOptions, "NOEXECUTE=OPTOUT")) { /* Set it in opt-out mode */ SharedUserData->NXSupportPolicy = NX_SUPPORT_POLICY_OPTOUT; - FeatureBits |= KF_NX_ENABLED; + KeFeatureBits |= KF_NX_ENABLED; } else if ((strstr(KeLoaderBlock->LoadOptions, "NOEXECUTE=OPTIN")) || (strstr(KeLoaderBlock->LoadOptions, "NOEXECUTE"))) { /* Set the feature bits */ - FeatureBits |= KF_NX_ENABLED; + KeFeatureBits |= KF_NX_ENABLED; } else if ((strstr(KeLoaderBlock->LoadOptions, "NOEXECUTE=ALWAYSOFF")) || (strstr(KeLoaderBlock->LoadOptions, "EXECUTE"))) { /* Set disabled mode */ SharedUserData->NXSupportPolicy = NX_SUPPORT_POLICY_ALWAYSOFF; - FeatureBits |= KF_NX_DISABLED; + KeFeatureBits |= KF_NX_DISABLED; } - /* Save feature bits */ - Prcb->FeatureBits = FeatureBits; - /* Save CPU state */ KiSaveProcessorControlState(&Prcb->ProcessorState); @@ -475,30 +501,14 @@ KiInitializeKernel(IN PKPROCESS InitProcess, KeNodeBlock[0]->ProcessorMask = Prcb->SetMember; /* Set boot-level flags */ - KeI386NpxPresent = NpxPresent; KeI386CpuType = Prcb->CpuType; KeI386CpuStep = Prcb->CpuStep; KeProcessorArchitecture = PROCESSOR_ARCHITECTURE_INTEL; KeProcessorLevel = (USHORT)Prcb->CpuType; if (Prcb->CpuID) KeProcessorRevision = Prcb->CpuStep; - KeFeatureBits = FeatureBits; KeI386FxsrPresent = (KeFeatureBits & KF_FXSR) ? TRUE : FALSE; KeI386XMMIPresent = (KeFeatureBits & KF_XMMI) ? TRUE : FALSE; - /* Detect 8-byte compare exchange support */ - if (!(KeFeatureBits & KF_CMPXCHG8B)) - { - /* Copy the vendor string */ - RtlCopyMemory(Vendor, Prcb->VendorString, sizeof(Vendor)); - - /* Bugcheck the system. Windows *requires* this */ - KeBugCheckEx(UNSUPPORTED_PROCESSOR, - (1 << 24 ) | (Prcb->CpuType << 16) | Prcb->CpuStep, - Vendor[0], - Vendor[1], - Vendor[2]); - } - /* Set the current MP Master KPRCB to the Boot PRCB */ Prcb->MultiThreadSetMaster = Prcb; @@ -813,6 +823,8 @@ AppCpuInit: __writefsdword(KPCR_SET_MEMBER_COPY, 1 << Cpu); __writefsdword(KPCR_PRCB_SET_MEMBER, 1 << Cpu); + KiVerifyCpuFeatures(Pcr->Prcb); + /* Initialize the Processor with HAL */ HalInitializeProcessor(Cpu, KeLoaderBlock);

2 years, 11 months

[reactos] 01/01: [SHELL32] Enable _DEBUG and fix assertion failures (#4307)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c199edda45cdc4b228847… commit c199edda45cdc4b228847a2b02e06326c37f3c2b Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Jan 25 03:42:46 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Jan 25 03:42:46 2022 +0900 [SHELL32] Enable _DEBUG and fix assertion failures (#4307) Improve debuggability. Fix "WorkerW" window class conflict. - Enable _DEBUG macro if debugging, in order to enable ATLASSERT macro. - Fix assertion failures. - Add SHCreateDefaultWorkerWindow helper function and CWorkerTraits, then use them. - Don't create the broker and server windows by themselves, but subclass. CORE-17505, CORE-13950 --- dll/win32/shell32/CDefView.cpp | 3 ++- dll/win32/shell32/changenotify.cpp | 11 ++++------- dll/win32/shell32/precomp.h | 4 ++++ dll/win32/shell32/shelldesktop/CChangeNotifyServer.cpp | 13 ++++--------- dll/win32/shell32/shelldesktop/CChangeNotifyServer.h | 12 ++++++++++++ 5 files changed, 26 insertions(+), 17 deletions(-) diff --git a/dll/win32/shell32/CDefView.cpp b/dll/win32/shell32/CDefView.cpp index 45d1e4ce827..8ee02097f55 100644 --- a/dll/win32/shell32/CDefView.cpp +++ b/dll/win32/shell32/CDefView.cpp @@ -1027,7 +1027,8 @@ HRESULT CDefView::FillList() LRESULT CDefView::OnShowWindow(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) { - m_ListView.UpdateWindow(); + if (m_ListView.IsWindow()) + m_ListView.UpdateWindow(); bHandled = FALSE; return 0; } diff --git a/dll/win32/shell32/changenotify.cpp b/dll/win32/shell32/changenotify.cpp index c35201cce7c..4666771734b 100644 --- a/dll/win32/shell32/changenotify.cpp +++ b/dll/win32/shell32/changenotify.cpp @@ -66,14 +66,9 @@ EXTERN_C void FreeChangeNotifications(void) // The new delivery method is enabled by SHCNRF_NewDelivery flag. // With the new delivery method the server directly sends the delivery message. -typedef CWinTraits < - WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, - WS_EX_TOOLWINDOW -> CBrokerTraits; - // This class brokers all notifications that don't have the SHCNRF_NewDelivery flag class CChangeNotifyBroker : - public CWindowImpl<CChangeNotifyBroker, CWindow, CBrokerTraits> + public CWindowImpl<CChangeNotifyBroker, CWindow, CWorkerTraits> { public: CChangeNotifyBroker(HWND hwndClient, UINT uMsg) : @@ -139,13 +134,15 @@ CreateNotificationBroker(HWND hwnd, UINT wMsg) return NULL; } - HWND hwndBroker = pBroker->Create(0); + HWND hwndBroker = SHCreateDefaultWorkerWindow(); if (hwndBroker == NULL) { ERR("hwndBroker == NULL\n"); delete pBroker; + return NULL; } + pBroker->SubclassWindow(hwndBroker); return hwndBroker; } diff --git a/dll/win32/shell32/precomp.h b/dll/win32/shell32/precomp.h index 9b422353e6c..983e619d358 100644 --- a/dll/win32/shell32/precomp.h +++ b/dll/win32/shell32/precomp.h @@ -1,6 +1,10 @@ #ifndef _PRECOMP_H__ #define _PRECOMP_H__ +#if DBG && !defined(_DEBUG) + #define _DEBUG // CORE-17505 +#endif + #include <stdarg.h> #include <assert.h> diff --git a/dll/win32/shell32/shelldesktop/CChangeNotifyServer.cpp b/dll/win32/shell32/shelldesktop/CChangeNotifyServer.cpp index c0835faa919..55918cad656 100644 --- a/dll/win32/shell32/shelldesktop/CChangeNotifyServer.cpp +++ b/dll/win32/shell32/shelldesktop/CChangeNotifyServer.cpp @@ -23,11 +23,6 @@ struct ITEM CDirectoryWatcher *pDirWatch; // for filesystem notification }; -typedef CWinTraits < - WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, - WS_EX_TOOLWINDOW -> CChangeNotifyServerTraits; - ////////////////////////////////////////////////////////////////////////////// // CChangeNotifyServer // @@ -37,7 +32,7 @@ typedef CWinTraits < // to this window where all processing takes place. class CChangeNotifyServer : - public CWindowImpl<CChangeNotifyServer, CWindow, CChangeNotifyServerTraits>, + public CWindowImpl<CChangeNotifyServer, CWindow, CWorkerTraits>, public CComObjectRootEx<CComMultiThreadModelNoCS>, public IOleWindow { @@ -470,10 +465,10 @@ HRESULT WINAPI CChangeNotifyServer::ContextSensitiveHelp(BOOL fEnterMode) HRESULT CChangeNotifyServer::Initialize() { // This is called by CChangeNotifyServer_CreateInstance right after instantiation. - // Create the window of the server here. - Create(0); - if (!m_hWnd) + HWND hwnd = SHCreateDefaultWorkerWindow(); + if (!hwnd) return E_FAIL; + SubclassWindow(hwnd); return S_OK; } diff --git a/dll/win32/shell32/shelldesktop/CChangeNotifyServer.h b/dll/win32/shell32/shelldesktop/CChangeNotifyServer.h index 4c5dc9083de..3f6e5174fce 100644 --- a/dll/win32/shell32/shelldesktop/CChangeNotifyServer.h +++ b/dll/win32/shell32/shelldesktop/CChangeNotifyServer.h @@ -6,6 +6,8 @@ */ #pragma once +#include <shlwapi_undoc.h> // for SHCreateWorkerWindowW + ///////////////////////////////////////////////////////////////////////////// // CChangeNotifyServer is a delivery worker window that is managed by CDesktopBrowser. // The process of CChangeNotifyServer is same as the process of CDesktopBrowser. @@ -89,3 +91,13 @@ typedef struct HANDBAG #define HANDBAG_MAGIC 0xFACEB00C HRESULT CChangeNotifyServer_CreateInstance(REFIID riid, void **ppv); + +#define WORKER_STYLE (WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN) +#define WORKER_EXSTYLE WS_EX_TOOLWINDOW + +typedef CWinTraits<WORKER_STYLE, WORKER_EXSTYLE> CWorkerTraits; + +inline HWND SHCreateDefaultWorkerWindow(VOID) +{ + return SHCreateWorkerWindowW(NULL, NULL, WORKER_EXSTYLE, WORKER_STYLE, NULL, 0); +}

2 years, 11 months

[reactos] 01/01: [RAPPS] Enable _DEBUG and fix assertion failures

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a92304fdd46fd590f563a… commit a92304fdd46fd590f563ad3c98bb6cea73153cce Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Jan 24 10:50:26 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Mon Jan 24 10:50:26 2022 +0900 [RAPPS] Enable _DEBUG and fix assertion failures CORE-17505 --- base/applications/rapps/appview.cpp | 2 -- base/applications/rapps/include/rapps.h | 4 ++++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/base/applications/rapps/appview.cpp b/base/applications/rapps/appview.cpp index 7cffc3748bb..0072d4603e8 100644 --- a/base/applications/rapps/appview.cpp +++ b/base/applications/rapps/appview.cpp @@ -2047,8 +2047,6 @@ BOOL CApplicationView::AddAvailableApplication(CAvailableApplicationInfo *AvlbAp VOID CApplicationView::SetWatermark(const CStringW& Text) { - ATLASSERT(GetItemCount() == 0); - m_ListView->SetWatermark(Text); } diff --git a/base/applications/rapps/include/rapps.h b/base/applications/rapps/include/rapps.h index 595cf24e76e..ca31dd2e16b 100644 --- a/base/applications/rapps/include/rapps.h +++ b/base/applications/rapps/include/rapps.h @@ -1,6 +1,10 @@ #ifndef _RAPPS_H #define _RAPPS_H +#if DBG && !defined(_DEBUG) + #define _DEBUG // CORE-17505 +#endif + #include "defines.h" #include "dialogs.h"

2 years, 11 months

[reactos] 01/01: [EXPLORER] Enable _DEBUG and fix assertion failures (#4306)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d958950217f67dd0a7703… commit d958950217f67dd0a77035fd1e5f827b0f793e65 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Jan 24 10:26:13 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Jan 24 10:26:13 2022 +0900 [EXPLORER] Enable _DEBUG and fix assertion failures (#4306) - Enable _DEBUG if debugging. - Fix assertion failures. CORE-18013 --- base/shell/explorer/precomp.h | 4 ++++ base/shell/explorer/syspager.cpp | 6 ++++-- base/shell/explorer/taskswnd.cpp | 3 ++- base/shell/explorer/traywnd.cpp | 12 +++++++----- 4 files changed, 17 insertions(+), 8 deletions(-) diff --git a/base/shell/explorer/precomp.h b/base/shell/explorer/precomp.h index efce3c2a233..0080f6806e0 100644 --- a/base/shell/explorer/precomp.h +++ b/base/shell/explorer/precomp.h @@ -9,6 +9,10 @@ #define WIN7_COMPAT_MODE 1 #endif +#if DBG && !defined(_DEBUG) + #define _DEBUG // CORE-17505 +#endif + #include <stdio.h> #include <tchar.h> diff --git a/base/shell/explorer/syspager.cpp b/base/shell/explorer/syspager.cpp index b28e742cef4..072f1ef522b 100644 --- a/base/shell/explorer/syspager.cpp +++ b/base/shell/explorer/syspager.cpp @@ -1231,8 +1231,10 @@ void CNotifyToolbar::Initialize(HWND hWndParent, CBalloonQueue * queue) TBSTYLE_FLAT | TBSTYLE_TOOLTIPS | TBSTYLE_WRAPABLE | TBSTYLE_TRANSPARENT | CCS_TOP | CCS_NORESIZE | CCS_NOPARENTALIGN | CCS_NODIVIDER; - // HACK & FIXME: CORE-17505 - SubclassWindow(CToolbar::Create(hWndParent, styles)); + // HACK & FIXME: CORE-18016 + HWND hwnd = CToolbar::Create(hWndParent, styles); + m_hWnd = NULL; + SubclassWindow(hwnd); // Force the toolbar tooltips window to always show tooltips even if not foreground HWND tooltipsWnd = (HWND)SendMessageW(TB_GETTOOLTIPS); diff --git a/base/shell/explorer/taskswnd.cpp b/base/shell/explorer/taskswnd.cpp index caa725fc14e..e7f224ea136 100644 --- a/base/shell/explorer/taskswnd.cpp +++ b/base/shell/explorer/taskswnd.cpp @@ -285,9 +285,10 @@ public: TBSTYLE_TOOLTIPS | TBSTYLE_WRAPABLE | TBSTYLE_LIST | TBSTYLE_TRANSPARENT | CCS_TOP | CCS_NORESIZE | CCS_NODIVIDER; + // HACK & FIXME: CORE-18016 HWND toolbar = CToolbar::Create(hWndParent, styles); SetDrawTextFlags(DT_NOPREFIX, DT_NOPREFIX); - // HACK & FIXME: CORE-17505 + m_hWnd = NULL; return SubclassWindow(toolbar); } }; diff --git a/base/shell/explorer/traywnd.cpp b/base/shell/explorer/traywnd.cpp index 57acf0d28a0..c4a30a6ffe3 100644 --- a/base/shell/explorer/traywnd.cpp +++ b/base/shell/explorer/traywnd.cpp @@ -200,8 +200,10 @@ public: VOID Initialize() { - // HACK & FIXME: CORE-17505 - SubclassWindow(m_hWnd); + // HACK & FIXME: CORE-18016 + HWND hWnd = m_hWnd; + m_hWnd = NULL; + SubclassWindow(hWnd); SetWindowTheme(m_hWnd, L"Start", NULL); @@ -216,8 +218,6 @@ public: UpdateSize(); } - // Hack: - // Use DECLARE_WND_SUPERCLASS instead! HWND Create(HWND hwndParent) { WCHAR szStartCaption[32]; @@ -231,6 +231,7 @@ public: DWORD dwStyle = WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | BS_PUSHBUTTON | BS_LEFT | BS_VCENTER; + // HACK & FIXME: CORE-18016 m_hWnd = CreateWindowEx( 0, WC_BUTTON, @@ -3327,6 +3328,7 @@ public: if (TrayWnd->m_TrayBandSite != NULL) { + pcm.Release(); if (FAILED(TrayWnd->m_TrayBandSite->AddContextMenus( hPopup, indexMenu, @@ -3336,7 +3338,7 @@ public: &pcm))) { WARN("AddContextMenus failed.\n"); - pcm = NULL; + pcm.Release(); } }

2 years, 11 months

[reactos] 01/01: [RAPPS] Update outdated README regarding size CORE-18018

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c262020016f637c8a158a… commit c262020016f637c8a158a43db443e0ebc071d2f8 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Sun Jan 23 22:03:08 2022 +0100 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Sun Jan 23 22:03:08 2022 +0100 [RAPPS] Update outdated README regarding size CORE-18018 --- base/applications/rapps/README.ENG | 2 +- base/applications/rapps/README.RUS | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/base/applications/rapps/README.ENG b/base/applications/rapps/README.ENG index 4e4876f549d..69d6cb1dd07 100644 --- a/base/applications/rapps/README.ENG +++ b/base/applications/rapps/README.ENG @@ -49,7 +49,7 @@ File format overview: Version = 1.1.1 License = GPL Description = Shortish description giving some additional background information about what it does. - Size = 10 MB + SizeBytes = 1594881 Category = 5 URLSite = https://example.org/ URLDownload = https://ftp.example.org/pub/installer.exe diff --git a/base/applications/rapps/README.RUS b/base/applications/rapps/README.RUS index 7c74b5c90f7..8110169c573 100644 --- a/base/applications/rapps/README.RUS +++ b/base/applications/rapps/README.RUS @@ -17,7 +17,7 @@ RegName = Version = 1.1.1 ; �� License = �� ; �� Description = �� ; �� -Size = �� ; �� +SizeBytes = 1594881 Category = 5 ; �� URLSite = http://www.site.com/ ; �� . �� URLDownload = http://ftp.site.com/pub/installer.exe ; �� . ��

2 years, 11 months

[reactos] 01/01: [RAPPS] Addendum to 0.4.15-dev-3724-g3a7c0d8 CORE-18018

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=adfef37b2b299be9b3113… commit adfef37b2b299be9b311356b763741603639cdff Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Sun Jan 23 21:21:50 2022 +0100 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Sun Jan 23 21:21:50 2022 +0100 [RAPPS] Addendum to 0.4.15-dev-3724-g3a7c0d8 CORE-18018 For a moment I thought this member was obsolete entirely, and intended to delete it entirely. (as its size is just ULONG which is too small for big downloads > 4GB size). It apparently works also without it to display the size, as we actually use a different member that stores the size as a string. But there actually still *is* a usage for that ULONG representation. In (the rare) corner-case the http download does not allow to query the size, then the ULONG representation m_SizeBytes is used as a fallback for the download-progress-bar to avoid 'marquee mode'. The 'fallback of the fallback' so to say. We should enlarge this to be a 64bit unsigned value some day. --- base/applications/rapps/available.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/base/applications/rapps/available.cpp b/base/applications/rapps/available.cpp index ee37a2b975f..d2da0043f33 100644 --- a/base/applications/rapps/available.cpp +++ b/base/applications/rapps/available.cpp @@ -217,6 +217,7 @@ VOID CAvailableApplicationInfo::RetrieveSize() if (!m_Parser->GetInt(L"SizeBytes", iSizeBytes)) return; + m_SizeBytes = iSizeBytes; StrFormatByteSizeW(iSizeBytes, m_szSize.GetBuffer(MAX_PATH), MAX_PATH); m_szSize.ReleaseBuffer(); }

2 years, 11 months

[reactos] 01/01: [RAPPS] Fallback to legacy "size" entry is not longer needed CORE-18018

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3a7c0d82d2fd4f1413cf0… commit 3a7c0d82d2fd4f1413cf0ed50eedad52b107d491 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Sun Jan 23 20:24:47 2022 +0100 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Sun Jan 23 20:24:47 2022 +0100 [RAPPS] Fallback to legacy "size" entry is not longer needed CORE-18018 on 2021-10-03 Mark Jansen deleted all old size entries from the rapps database via https://git.reactos.org/?p=rapps-db.git;a=commit;h=551e8cb95716f46e05c3be08… So it makes no sense to keep that fallback-code in RAPPS available.cpp RetrieveSize() func. --- base/applications/rapps/available.cpp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/base/applications/rapps/available.cpp b/base/applications/rapps/available.cpp index fcc069b8d0a..ee37a2b975f 100644 --- a/base/applications/rapps/available.cpp +++ b/base/applications/rapps/available.cpp @@ -215,13 +215,8 @@ VOID CAvailableApplicationInfo::RetrieveSize() INT iSizeBytes; if (!m_Parser->GetInt(L"SizeBytes", iSizeBytes)) - { - // fall back to "Size" string - GetString(L"Size", m_szSize); return; - } - m_SizeBytes = iSizeBytes; StrFormatByteSizeW(iSizeBytes, m_szSize.GetBuffer(MAX_PATH), MAX_PATH); m_szSize.ReleaseBuffer(); }

2 years, 11 months

[reactos] 01/01: [NTOS:MM] Implement partial virtual region releases. CORE-17938

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8d701598fb1ac1da99df4… commit 8d701598fb1ac1da99df489e365c93b8a9fc6647 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Mon Dec 27 20:00:45 2021 -0500 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Jan 22 15:07:06 2022 -0500 [NTOS:MM] Implement partial virtual region releases. CORE-17938 Fixes boot with MS videoprt.sys (and some apitests). --- ntoskrnl/mm/ARM3/virtual.c | 100 +++++++++++++++++++++++++++++++++++++-------- 1 file changed, 84 insertions(+), 16 deletions(-) diff --git a/ntoskrnl/mm/ARM3/virtual.c b/ntoskrnl/mm/ARM3/virtual.c index abe0e810074..f178edbb909 100644 --- a/ntoskrnl/mm/ARM3/virtual.c +++ b/ntoskrnl/mm/ARM3/virtual.c @@ -5210,8 +5210,10 @@ NtFreeVirtualMemory(IN HANDLE ProcessHandle, SIZE_T PRegionSize; PVOID PBaseAddress; LONG_PTR AlreadyDecommitted, CommitReduction = 0; + LONG_PTR FirstCommit; ULONG_PTR StartingAddress, EndingAddress; PMMVAD Vad; + PMMVAD NewVad; NTSTATUS Status; PEPROCESS Process; PMMSUPPORT AddressSpace; @@ -5436,6 +5438,8 @@ NtFreeVirtualMemory(IN HANDLE ProcessHandle, // if ((EndingAddress >> PAGE_SHIFT) == Vad->EndingVpn) { + // + // Case D (freeing the entire region) // // This is the easiest one to handle -- it is identical to // the code path above when the caller sets a zero region size @@ -5447,16 +5451,24 @@ NtFreeVirtualMemory(IN HANDLE ProcessHandle, } else { + // + // Case A (freeing a part at the beginning) // // This case is pretty easy too -- we compute a bunch of // pages to decommit, and then push the VAD's starting address // a bit further down, then decrement the commit charge // - // NOT YET IMPLEMENTED IN ARM3. - // - DPRINT1("Case A not handled\n"); - Status = STATUS_FREE_VM_NOT_AT_BASE; - goto FailPath; + MiLockProcessWorkingSetUnsafe(Process, CurrentThread); + CommitReduction = MiCalculatePageCommitment(StartingAddress, + EndingAddress, + Vad, + Process); + Vad->u.VadFlags.CommitCharge -= CommitReduction; + // For ReactOS: shrink the corresponding memory area + ASSERT(Vad->StartingVpn == MemoryArea->VadNode.StartingVpn); + ASSERT(Vad->EndingVpn == MemoryArea->VadNode.EndingVpn); + Vad->StartingVpn = (EndingAddress + 1) >> PAGE_SHIFT; + MemoryArea->VadNode.StartingVpn = Vad->StartingVpn; // // After analyzing the VAD, set it to NULL so that we don't @@ -5472,8 +5484,8 @@ NtFreeVirtualMemory(IN HANDLE ProcessHandle, // if ((EndingAddress >> PAGE_SHIFT) == Vad->EndingVpn) { - PMEMORY_AREA MemoryArea; - + // + // Case C (freeing a part at the end) // // This is pretty easy and similar to case A. We compute the // amount of pages to decommit, update the VAD's commit charge @@ -5487,7 +5499,6 @@ NtFreeVirtualMemory(IN HANDLE ProcessHandle, Process); Vad->u.VadFlags.CommitCharge -= CommitReduction; // For ReactOS: shrink the corresponding memory area - MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, (PVOID)StartingAddress); ASSERT(Vad->StartingVpn == MemoryArea->VadNode.StartingVpn); ASSERT(Vad->EndingVpn == MemoryArea->VadNode.EndingVpn); Vad->EndingVpn = (StartingAddress - 1) >> PAGE_SHIFT; @@ -5496,16 +5507,73 @@ NtFreeVirtualMemory(IN HANDLE ProcessHandle, else { // - // This is case B and the hardest one. Because we are removing - // a chunk of memory from the very middle of the VAD, we must - // actually split the VAD into two new VADs and compute the - // commit charges for each of them, and reinsert new charges. + // Case B (freeing a part in the middle) + // + // This is the hardest one. Because we are removing a chunk + // of memory from the very middle of the VAD, we must actually + // split the VAD into two new VADs and compute the commit + // charges for each of them, and reinsert new charges. + // + NewVad = ExAllocatePoolZero(NonPagedPool, sizeof(MMVAD_LONG), 'SdaV'); + if (NewVad == NULL) + { + DPRINT1("Failed to allocate a VAD!\n"); + Status = STATUS_INSUFFICIENT_RESOURCES; + goto FailPath; + } + + // + // This new VAD describes the second chunk, so we keep the end + // address of the original and adjust the start to point past + // the released region. + // The commit charge will be calculated below. + // + NewVad->StartingVpn = (EndingAddress + 1) >> PAGE_SHIFT; + NewVad->EndingVpn = Vad->EndingVpn; + NewVad->u.LongFlags = Vad->u.LongFlags; + NewVad->u.VadFlags.CommitCharge = 0; + ASSERT(NewVad->EndingVpn >= NewVad->StartingVpn); + + // + // TODO: charge quota for the new VAD + // + + // + // Get the commit charge for the released region + // + MiLockProcessWorkingSetUnsafe(Process, CurrentThread); + CommitReduction = MiCalculatePageCommitment(StartingAddress, + EndingAddress, + Vad, + Process); + + // + // Adjust the end of the original VAD (first chunk). + // For ReactOS: shrink the corresponding memory area + // + ASSERT(Vad->StartingVpn == MemoryArea->VadNode.StartingVpn); + ASSERT(Vad->EndingVpn == MemoryArea->VadNode.EndingVpn); + Vad->EndingVpn = (StartingAddress - 1) >> PAGE_SHIFT; + MemoryArea->VadNode.EndingVpn = Vad->EndingVpn; + + // + // Now the addresses for both VADs are consistent, + // so insert the new one. + // ReactOS: This will take care of creating a second MEMORY_AREA. + // + MiInsertVad(NewVad, &Process->VadRoot); + // - // NOT YET IMPLEMENTED IN ARM3. + // Calculate the commit charge for the first split. + // The second chunk's size is the original size, minus the + // released region's size, minus this first chunk. // - DPRINT1("Case B not handled\n"); - Status = STATUS_FREE_VM_NOT_AT_BASE; - goto FailPath; + FirstCommit = MiCalculatePageCommitment(Vad->StartingVpn << PAGE_SHIFT, + StartingAddress - 1, + Vad, + Process); + NewVad->u.VadFlags.CommitCharge = Vad->u.VadFlags.CommitCharge - CommitReduction - FirstCommit; + Vad->u.VadFlags.CommitCharge = FirstCommit; } //

2 years, 11 months

[reactos] 01/01: [ATL][MSPAINT] Add ATLTRACE and fix assertion failures (#4299)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7014cf04b1a03540457cd… commit 7014cf04b1a03540457cd61678cd517b523eee7f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Jan 23 00:59:12 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Jan 23 00:59:12 2022 +0900 [ATL][MSPAINT] Add ATLTRACE and fix assertion failures (#4299) - Implement ATLTRACE and AtlTrace in atlbase.h. - Fix assertion failures in mspaint. CORE-17969, CORE-18012 --- base/applications/mspaint/history.cpp | 14 +- base/applications/mspaint/imgarea.cpp | 10 +- base/applications/mspaint/mouse.cpp | 2 +- base/applications/mspaint/palettemodel.cpp | 9 +- base/applications/mspaint/precomp.h | 9 + base/applications/mspaint/scrollbox.cpp | 14 +- base/applications/mspaint/selection.cpp | 2 +- base/applications/mspaint/textedit.cpp | 8 +- base/applications/mspaint/toolsmodel.cpp | 11 +- base/applications/mspaint/winproc.cpp | 62 +++--- sdk/lib/atl/atlbase.h | 2 +- sdk/lib/atl/atltrace.h | 293 +++++++++++++++++++++++++++++ 12 files changed, 380 insertions(+), 56 deletions(-) diff --git a/base/applications/mspaint/history.cpp b/base/applications/mspaint/history.cpp index 1a5cd8966a8..7aa36fab4dc 100644 --- a/base/applications/mspaint/history.cpp +++ b/base/applications/mspaint/history.cpp @@ -14,12 +14,14 @@ void ImageModel::NotifyDimensionsChanged() { - imageArea.SendMessage(WM_IMAGEMODELDIMENSIONSCHANGED); + if (imageArea.IsWindow()) + imageArea.SendMessage(WM_IMAGEMODELDIMENSIONSCHANGED); } void ImageModel::NotifyImageChanged() { - imageArea.SendMessage(WM_IMAGEMODELIMAGECHANGED); + if (imageArea.IsWindow()) + imageArea.SendMessage(WM_IMAGEMODELIMAGECHANGED); } ImageModel::ImageModel() @@ -44,7 +46,7 @@ ImageModel::ImageModel() void ImageModel::CopyPrevious() { - DPRINT("%s: %d\n", __FUNCTION__, currInd); + ATLTRACE("%s: %d\n", __FUNCTION__, currInd); DeleteObject(hBms[(currInd + 1) % HISTORYSIZE]); hBms[(currInd + 1) % HISTORYSIZE] = CopyDIBImage(hBms[currInd]); currInd = (currInd + 1) % HISTORYSIZE; @@ -57,7 +59,7 @@ void ImageModel::CopyPrevious() void ImageModel::Undo() { - DPRINT("%s: %d\n", __FUNCTION__, undoSteps); + ATLTRACE("%s: %d\n", __FUNCTION__, undoSteps); if (undoSteps > 0) { int oldWidth = GetWidth(); @@ -76,7 +78,7 @@ void ImageModel::Undo() void ImageModel::Redo() { - DPRINT("%s: %d\n", __FUNCTION__, redoSteps); + ATLTRACE("%s: %d\n", __FUNCTION__, redoSteps); if (redoSteps > 0) { int oldWidth = GetWidth(); @@ -95,7 +97,7 @@ void ImageModel::Redo() void ImageModel::ResetToPrevious() { - DPRINT("%s: %d\n", __FUNCTION__, currInd); + ATLTRACE("%s: %d\n", __FUNCTION__, currInd); DeleteObject(hBms[currInd]); hBms[currInd] = CopyDIBImage(hBms[(currInd + HISTORYSIZE - 1) % HISTORYSIZE]); SelectObject(hDrawingDC, hBms[currInd]); diff --git a/base/applications/mspaint/imgarea.cpp b/base/applications/mspaint/imgarea.cpp index cfa9a84d8d3..0cb2f8de2ab 100644 --- a/base/applications/mspaint/imgarea.cpp +++ b/base/applications/mspaint/imgarea.cpp @@ -68,6 +68,8 @@ void CImgAreaWindow::drawZoomFrame(int mouseX, int mouseY) LRESULT CImgAreaWindow::OnSize(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { + if (!IsWindow() || !sizeboxLeftTop.IsWindow()) + return 0; int imgXRes = imageModel.GetWidth(); int imgYRes = imageModel.GetHeight(); sizeboxLeftTop.MoveWindow( @@ -105,7 +107,7 @@ LRESULT CImgAreaWindow::OnEraseBkGnd(UINT nMsg, WPARAM wParam, LPARAM lParam, BO HDC hdc = (HDC)wParam; if (toolsModel.GetActiveTool() == TOOL_TEXT && !toolsModel.IsBackgroundTransparent() && - textEditWindow.IsWindowVisible()) + ::IsWindowVisible(textEditWindow)) { // Do clipping HWND hChild = textEditWindow; @@ -143,11 +145,11 @@ LRESULT CImgAreaWindow::OnPaint(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& b DeleteObject(SelectObject(hdc, oldPen)); } EndPaint(&ps); - if (selectionWindow.IsWindowVisible()) + if (selectionWindow.IsWindow()) selectionWindow.Invalidate(FALSE); - if (miniature.IsWindowVisible()) + if (miniature.IsWindow()) miniature.Invalidate(FALSE); - if (textEditWindow.IsWindowVisible()) + if (textEditWindow.IsWindow()) textEditWindow.Invalidate(FALSE); return 0; } diff --git a/base/applications/mspaint/mouse.cpp b/base/applications/mspaint/mouse.cpp index 16a6500e9d1..b442d0c9daf 100644 --- a/base/applications/mspaint/mouse.cpp +++ b/base/applications/mspaint/mouse.cpp @@ -394,7 +394,7 @@ struct TextTool : ToolBase { imageModel.ResetToPrevious(); - BOOL bTextBoxShown = textEditWindow.IsWindowVisible(); + BOOL bTextBoxShown = ::IsWindowVisible(textEditWindow); if (bTextBoxShown && textEditWindow.GetWindowTextLength() > 0) { CString szText; diff --git a/base/applications/mspaint/palettemodel.cpp b/base/applications/mspaint/palettemodel.cpp index 1f5dd899be6..c91899bd982 100644 --- a/base/applications/mspaint/palettemodel.cpp +++ b/base/applications/mspaint/palettemodel.cpp @@ -95,13 +95,16 @@ void PaletteModel::SetBgColor(COLORREF newColor) void PaletteModel::NotifyColorChanged() { - paletteWindow.SendMessage(WM_PALETTEMODELCOLORCHANGED); - selectionWindow.SendMessage(WM_PALETTEMODELCOLORCHANGED); + if (paletteWindow.IsWindow()) + paletteWindow.SendMessage(WM_PALETTEMODELCOLORCHANGED); + if (selectionWindow.IsWindow()) + selectionWindow.SendMessage(WM_PALETTEMODELCOLORCHANGED); if (textEditWindow.IsWindow()) textEditWindow.SendMessage(WM_PALETTEMODELCOLORCHANGED); } void PaletteModel::NotifyPaletteChanged() { - paletteWindow.SendMessage(WM_PALETTEMODELPALETTECHANGED); + if (paletteWindow.IsWindow()) + paletteWindow.SendMessage(WM_PALETTEMODELPALETTECHANGED); } diff --git a/base/applications/mspaint/precomp.h b/base/applications/mspaint/precomp.h index 1f27501432f..df5b929bd82 100644 --- a/base/applications/mspaint/precomp.h +++ b/base/applications/mspaint/precomp.h @@ -1,6 +1,15 @@ #ifndef _MSPAINT_H #define _MSPAINT_H +#ifdef NDEBUG + #undef DBG + #undef _DEBUG +#endif + +#if DBG && !defined(_DEBUG) + #define _DEBUG +#endif + #include <stdarg.h> #include <windef.h> diff --git a/base/applications/mspaint/scrollbox.cpp b/base/applications/mspaint/scrollbox.cpp index d2be15f8f18..c05dffd5ec9 100644 --- a/base/applications/mspaint/scrollbox.cpp +++ b/base/applications/mspaint/scrollbox.cpp @@ -61,7 +61,8 @@ UpdateScrollbox() scrollboxWindow.GetWindowRect(&tempRect); sizeScrollBox = CSize(tempRect.Width(), tempRect.Height()); - imageArea.GetClientRect(&tempRect); + if (imageArea.IsWindow()) + imageArea.GetClientRect(&tempRect); sizeImageArea = CSize(tempRect.Width(), tempRect.Height()); sizeImageArea += CSize(GRIP_SIZE * 2, GRIP_SIZE * 2); @@ -87,14 +88,17 @@ UpdateScrollbox() si.nPage = sizeScrollBox.cy; scrollboxWindow.SetScrollInfo(SB_VERT, &si); - scrlClientWindow.MoveWindow(-scrollboxWindow.GetScrollPos(SB_HORZ), - -scrollboxWindow.GetScrollPos(SB_VERT), - sizeImageArea.cx, sizeImageArea.cy, TRUE); + if (scrlClientWindow.IsWindow()) + { + scrlClientWindow.MoveWindow( + -scrollboxWindow.GetScrollPos(SB_HORZ), -scrollboxWindow.GetScrollPos(SB_VERT), + sizeImageArea.cx, sizeImageArea.cy, TRUE); + } } LRESULT CScrollboxWindow::OnSize(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - if (m_hWnd == scrollboxWindow.m_hWnd) + if (m_hWnd && m_hWnd == scrollboxWindow.m_hWnd) { UpdateScrollbox(); } diff --git a/base/applications/mspaint/selection.cpp b/base/applications/mspaint/selection.cpp index c2c32880f97..74083505bc2 100644 --- a/base/applications/mspaint/selection.cpp +++ b/base/applications/mspaint/selection.cpp @@ -57,7 +57,7 @@ ColorKeyedMaskBlt(HDC hdcDest, int nXDest, int nYDest, int nWidth, int nHeight, void ForceRefreshSelectionContents() { - if (selectionWindow.IsWindowVisible()) + if (::IsWindowVisible(selectionWindow)) { selectionWindow.SendMessage(WM_LBUTTONDOWN, 0, MAKELPARAM(0, 0)); selectionWindow.SendMessage(WM_MOUSEMOVE, 0, MAKELPARAM(0, 0)); diff --git a/base/applications/mspaint/textedit.cpp b/base/applications/mspaint/textedit.cpp index 792633a55e7..80f87682e32 100644 --- a/base/applications/mspaint/textedit.cpp +++ b/base/applications/mspaint/textedit.cpp @@ -300,12 +300,12 @@ HWND CTextEditWindow::Create(HWND hwndParent) const DWORD style = ES_LEFT | ES_MULTILINE | ES_WANTRETURN | ES_AUTOVSCROLL | WS_CHILD | WS_THICKFRAME; - m_hWnd = ::CreateWindowEx(0, WC_EDIT, NULL, style, 0, 0, 0, 0, - hwndParent, NULL, hProgInstance, NULL); - if (m_hWnd) + HWND hwnd = ::CreateWindowEx(0, WC_EDIT, NULL, style, 0, 0, 0, 0, + hwndParent, NULL, hProgInstance, NULL); + if (hwnd) { #undef SubclassWindow // Don't use this macro - SubclassWindow(m_hWnd); + SubclassWindow(hwnd); UpdateFont(); diff --git a/base/applications/mspaint/toolsmodel.cpp b/base/applications/mspaint/toolsmodel.cpp index 021df46d336..8811cf087ff 100644 --- a/base/applications/mspaint/toolsmodel.cpp +++ b/base/applications/mspaint/toolsmodel.cpp @@ -159,13 +159,14 @@ void ToolsModel::SetZoom(int nZoom) void ToolsModel::NotifyToolChanged() { - toolBoxContainer.SendMessage(WM_TOOLSMODELTOOLCHANGED, m_activeTool); - toolSettingsWindow.SendMessage(WM_TOOLSMODELTOOLCHANGED, m_activeTool); - + if (toolBoxContainer.IsWindow()) + toolBoxContainer.SendMessage(WM_TOOLSMODELTOOLCHANGED, m_activeTool); + if (toolSettingsWindow.IsWindow()) + toolSettingsWindow.SendMessage(WM_TOOLSMODELTOOLCHANGED, m_activeTool); if (fontsDialog.IsWindow()) fontsDialog.SendMessage(WM_TOOLSMODELTOOLCHANGED, m_activeTool); - - textEditWindow.SendMessage(WM_TOOLSMODELTOOLCHANGED, m_activeTool); + if (textEditWindow.IsWindow()) + textEditWindow.SendMessage(WM_TOOLSMODELTOOLCHANGED, m_activeTool); } void ToolsModel::NotifyToolSettingsChanged() diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp index a0af103f080..9105d85115e 100644 --- a/base/applications/mspaint/winproc.cpp +++ b/base/applications/mspaint/winproc.cpp @@ -51,7 +51,7 @@ void CMainWindow::alignChildrenToMainWindow() RECT clientRect; GetClientRect(&clientRect); - if (toolBoxContainer.IsWindowVisible()) + if (::IsWindowVisible(toolBoxContainer)) { x = 56; w = clientRect.right - 56; @@ -61,7 +61,7 @@ void CMainWindow::alignChildrenToMainWindow() x = 0; w = clientRect.right; } - if (paletteWindow.IsWindowVisible()) + if (::IsWindowVisible(paletteWindow)) { y = 49; h = clientRect.bottom - 49; @@ -73,13 +73,18 @@ void CMainWindow::alignChildrenToMainWindow() } RECT statusBarRect0; - SendMessage(hStatusBar, SB_GETRECT, 0, (LPARAM)&statusBarRect0); int statusBarBorders[3]; - SendMessage(hStatusBar, SB_GETBORDERS, 0, (LPARAM)&statusBarBorders); + if (::IsWindow(hStatusBar)) + { + ::SendMessage(hStatusBar, SB_GETRECT, 0, (LPARAM)&statusBarRect0); + ::SendMessage(hStatusBar, SB_GETBORDERS, 0, (LPARAM)&statusBarBorders); + } int statusBarHeight = statusBarRect0.bottom - statusBarRect0.top + statusBarBorders[1]; - scrollboxWindow.MoveWindow(x, y, w, ::IsWindowVisible(hStatusBar) ? h - statusBarHeight : h, TRUE); - paletteWindow.MoveWindow(x, 9, 255, 32, TRUE); + if (scrollboxWindow.IsWindow()) + scrollboxWindow.MoveWindow(x, y, w, ::IsWindowVisible(hStatusBar) ? h - statusBarHeight : h, TRUE); + if (paletteWindow.IsWindow()) + paletteWindow.MoveWindow(x, 9, 255, 32, TRUE); } void CMainWindow::saveImage(BOOL overwrite) @@ -268,7 +273,9 @@ LRESULT CMainWindow::OnClose(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHan LRESULT CMainWindow::OnInitMenuPopup(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { HMENU menu = GetMenu(); - BOOL trueSelection = (selectionWindow.IsWindowVisible() && ((toolsModel.GetActiveTool() == TOOL_FREESEL) || (toolsModel.GetActiveTool() == TOOL_RECTSEL))); + BOOL trueSelection = + (::IsWindowVisible(selectionWindow) && + ((toolsModel.GetActiveTool() == TOOL_FREESEL) || (toolsModel.GetActiveTool() == TOOL_RECTSEL))); switch (lParam) { case 0: /* File menu */ @@ -320,17 +327,17 @@ LRESULT CMainWindow::OnInitMenuPopup(UINT nMsg, WPARAM wParam, LPARAM lParam, BO CloseClipboard(); break; case 2: /* View menu */ - CheckMenuItem(menu, IDM_VIEWTOOLBOX, CHECKED_IF(toolBoxContainer.IsWindowVisible())); - CheckMenuItem(menu, IDM_VIEWCOLORPALETTE, CHECKED_IF(paletteWindow.IsWindowVisible())); - CheckMenuItem(menu, IDM_VIEWSTATUSBAR, CHECKED_IF(::IsWindowVisible(hStatusBar))); - CheckMenuItem(menu, IDM_FORMATICONBAR, CHECKED_IF(fontsDialog.IsWindowVisible())); - EnableMenuItem(menu, IDM_FORMATICONBAR, ENABLED_IF(toolsModel.GetActiveTool() == TOOL_TEXT)); + CheckMenuItem(menu, IDM_VIEWTOOLBOX, CHECKED_IF(::IsWindowVisible(toolBoxContainer))); + CheckMenuItem(menu, IDM_VIEWCOLORPALETTE, CHECKED_IF(::IsWindowVisible(paletteWindow))); + CheckMenuItem(menu, IDM_VIEWSTATUSBAR, CHECKED_IF(::IsWindowVisible(hStatusBar))); + CheckMenuItem(menu, IDM_FORMATICONBAR, CHECKED_IF(::IsWindowVisible(fontsDialog))); + EnableMenuItem(menu, IDM_FORMATICONBAR, ENABLED_IF(toolsModel.GetActiveTool() == TOOL_TEXT)); - CheckMenuItem(menu, IDM_VIEWSHOWGRID, CHECKED_IF(showGrid)); - CheckMenuItem(menu, IDM_VIEWSHOWMINIATURE, CHECKED_IF(showMiniature)); + CheckMenuItem(menu, IDM_VIEWSHOWGRID, CHECKED_IF(showGrid)); + CheckMenuItem(menu, IDM_VIEWSHOWMINIATURE, CHECKED_IF(showMiniature)); break; case 3: /* Image menu */ - EnableMenuItem(menu, IDM_IMAGECROP, ENABLED_IF(selectionWindow.IsWindowVisible())); + EnableMenuItem(menu, IDM_IMAGECROP, ENABLED_IF(::IsWindowVisible(selectionWindow))); CheckMenuItem(menu, IDM_IMAGEDRAWOPAQUE, CHECKED_IF(!toolsModel.IsBackgroundTransparent())); break; } @@ -351,8 +358,11 @@ LRESULT CMainWindow::OnInitMenuPopup(UINT nMsg, WPARAM wParam, LPARAM lParam, BO LRESULT CMainWindow::OnSize(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { int test[] = { LOWORD(lParam) - 260, LOWORD(lParam) - 140, LOWORD(lParam) - 20 }; - SendMessage(hStatusBar, WM_SIZE, wParam, lParam); - SendMessage(hStatusBar, SB_SETPARTS, 3, (LPARAM)&test); + if (::IsWindow(hStatusBar)) + { + ::SendMessage(hStatusBar, WM_SIZE, wParam, lParam); + ::SendMessage(hStatusBar, SB_SETPARTS, 3, (LPARAM)&test); + } alignChildrenToMainWindow(); Invalidate(TRUE); return 0; @@ -519,13 +529,13 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH break; } case IDM_EDITUNDO: - if (toolsModel.GetActiveTool() == TOOL_TEXT && textEditWindow.IsWindowVisible()) + if (toolsModel.GetActiveTool() == TOOL_TEXT && ::IsWindowVisible(textEditWindow)) break; imageModel.Undo(); imageArea.Invalidate(FALSE); break; case IDM_EDITREDO: - if (toolsModel.GetActiveTool() == TOOL_TEXT && textEditWindow.IsWindowVisible()) + if (toolsModel.GetActiveTool() == TOOL_TEXT && ::IsWindowVisible(textEditWindow)) break; imageModel.Redo(); imageArea.Invalidate(FALSE); @@ -558,7 +568,7 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH } case IDM_EDITSELECTALL: { - if (toolsModel.GetActiveTool() == TOOL_TEXT && textEditWindow.IsWindowVisible()) + if (toolsModel.GetActiveTool() == TOOL_TEXT && ::IsWindowVisible(textEditWindow)) { textEditWindow.SendMessage(EM_SETSEL, 0, -1); break; @@ -608,13 +618,13 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH switch (mirrorRotateDialog.DoModal(mainWindow.m_hWnd)) { case 1: /* flip horizontally */ - if (selectionWindow.IsWindowVisible()) + if (::IsWindowVisible(selectionWindow)) selectionModel.FlipHorizontally(); else imageModel.FlipHorizontally(); break; case 2: /* flip vertically */ - if (selectionWindow.IsWindowVisible()) + if (::IsWindowVisible(selectionWindow)) selectionModel.FlipVertically(); else imageModel.FlipVertically(); @@ -622,7 +632,7 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH case 3: /* rotate 90 degrees */ break; case 4: /* rotate 180 degrees */ - if (selectionWindow.IsWindowVisible()) + if (::IsWindowVisible(selectionWindow)) selectionModel.RotateNTimes90Degrees(2); else imageModel.RotateNTimes90Degrees(2); @@ -656,11 +666,11 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH break; case IDM_VIEWTOOLBOX: - toolBoxContainer.ShowWindow(toolBoxContainer.IsWindowVisible() ? SW_HIDE : SW_SHOW); + toolBoxContainer.ShowWindow(::IsWindowVisible(toolBoxContainer) ? SW_HIDE : SW_SHOW); alignChildrenToMainWindow(); break; case IDM_VIEWCOLORPALETTE: - paletteWindow.ShowWindow(paletteWindow.IsWindowVisible() ? SW_HIDE : SW_SHOW); + paletteWindow.ShowWindow(::IsWindowVisible(paletteWindow) ? SW_HIDE : SW_SHOW); alignChildrenToMainWindow(); break; case IDM_VIEWSTATUSBAR: @@ -674,7 +684,7 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH { fontsDialog.Create(mainWindow); } - registrySettings.ShowTextTool = !fontsDialog.IsWindowVisible(); + registrySettings.ShowTextTool = !::IsWindowVisible(fontsDialog); fontsDialog.ShowWindow(registrySettings.ShowTextTool ? SW_SHOW : SW_HIDE); fontsDialog.SendMessage(DM_REPOSITION, 0, 0); } diff --git a/sdk/lib/atl/atlbase.h b/sdk/lib/atl/atlbase.h index 502d7b1ad44..a9408bb01a4 100644 --- a/sdk/lib/atl/atlbase.h +++ b/sdk/lib/atl/atlbase.h @@ -26,6 +26,7 @@ #include "atlcomcli.h" #include "atlalloc.h" #include "atlexcept.h" +#include "atltrace.h" #include "comcat.h" #include "tchar.h" @@ -1856,7 +1857,6 @@ inline HRESULT WINAPI AtlComModuleRevokeClassObjects(_ATL_COM_MODULE *module) return S_OK; } - }; // namespace ATL #ifndef _ATL_NO_AUTOMATIC_NAMESPACE diff --git a/sdk/lib/atl/atltrace.h b/sdk/lib/atl/atltrace.h new file mode 100644 index 00000000000..6230af9f1fc --- /dev/null +++ b/sdk/lib/atl/atltrace.h @@ -0,0 +1,293 @@ +/* + * PROJECT: ReactOS ATL + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) + * PURPOSE: Providing ATLTRACE macro + * COPYRIGHT: Copyright 2022 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +#pragma once + +#include "atldef.h" + +#if DBG // FIXME: We should use _DEBUG instead of DBG. CORE-17505 + +#include <stdio.h> +#include <crtdbg.h> + +extern "C" +{ +// FIXME: Enabling _DEBUG at top level causes assertion failures... CORE-17505 +int __cdecl _CrtDbgReport(int reportType, const char *filename, int linenumber, const char *moduleName, const char *format, ...); +int __cdecl _CrtDbgReportW(int reportType, const wchar_t *filename, int linenumber, const wchar_t *moduleName, const wchar_t *format, ...); +} + +namespace ATL +{ + +template <UINT t_category = (1 << 19), UINT t_level = 0> +class CTraceCategoryEx +{ +public: + enum + { + TraceGeneral = (1 << 0), + TraceCom = (1 << 1), + TraceQI = (1 << 2), + TraceRegistrar = (1 << 3), + TraceRefcount = (1 << 4), + TraceWindowing = (1 << 5), + TraceControls = (1 << 6), + TraceHosting = (1 << 7), + TraceDBClient = (1 << 8), + TraceDBProvider = (1 << 9), + TraceSnapin = (1 << 10), + TraceNotImpl = (1 << 11), + TraceAllocation = (1 << 12), + TraceException = (1 << 13), + TraceTime = (1 << 14), + TraceCache = (1 << 15), + TraceStencil = (1 << 16), + TraceString = (1 << 17), + TraceMap = (1 << 18), + TraceUtil = (1 << 19), + TraceSecurity = (1 << 20), + TraceSync = (1 << 21), + TraceISAPI = (1 << 22), + TraceUser = TraceUtil + }; + + CTraceCategoryEx(LPCTSTR name = NULL) : m_name(name) + { + } + + static UINT GetLevel() { return t_level; } + static UINT GetCategory() { return t_category; } + operator UINT() const { return GetCategory(); } + LPCTSTR GetCategoryName() const { return m_name; } + +protected: + LPCTSTR m_name; +}; + +class CTraceCategory : public CTraceCategoryEx<> +{ + CTraceCategory(LPCTSTR name = NULL) : CTraceCategoryEx<>(name) + { + } +}; + +#define DEFINE_TRACE_CATEGORY(name, cat) extern const DECLSPEC_SELECTANY CTraceCategoryEx<cat, 0> name(TEXT(#name)) +DEFINE_TRACE_CATEGORY(atlTraceGeneral, CTraceCategoryEx<>::TraceGeneral); +DEFINE_TRACE_CATEGORY(atlTraceCOM, CTraceCategoryEx<>::TraceCom); +DEFINE_TRACE_CATEGORY(atlTraceQI, CTraceCategoryEx<>::TraceQI); +DEFINE_TRACE_CATEGORY(atlTraceRegistrar, CTraceCategoryEx<>::TraceRegistrar); +DEFINE_TRACE_CATEGORY(atlTraceRefcount, CTraceCategoryEx<>::TraceRefcount); +DEFINE_TRACE_CATEGORY(atlTraceWindowing, CTraceCategoryEx<>::TraceWindowing); +DEFINE_TRACE_CATEGORY(atlTraceControls, CTraceCategoryEx<>::TraceControls); +DEFINE_TRACE_CATEGORY(atlTraceHosting, CTraceCategoryEx<>::TraceHosting); +DEFINE_TRACE_CATEGORY(atlTraceDBClient, CTraceCategoryEx<>::TraceDBClient); +DEFINE_TRACE_CATEGORY(atlTraceDBProvider, CTraceCategoryEx<>::TraceDBProvider); +DEFINE_TRACE_CATEGORY(atlTraceSnapin, CTraceCategoryEx<>::TraceSnapin); +DEFINE_TRACE_CATEGORY(atlTraceNotImpl, CTraceCategoryEx<>::TraceNotImpl); +DEFINE_TRACE_CATEGORY(atlTraceAllocation, CTraceCategoryEx<>::TraceAllocation); +DEFINE_TRACE_CATEGORY(atlTraceException, CTraceCategoryEx<>::TraceException); +DEFINE_TRACE_CATEGORY(atlTraceTime, CTraceCategoryEx<>::TraceTime); +DEFINE_TRACE_CATEGORY(atlTraceCache, CTraceCategoryEx<>::TraceCache); +DEFINE_TRACE_CATEGORY(atlTraceStencil, CTraceCategoryEx<>::TraceStencil); +DEFINE_TRACE_CATEGORY(atlTraceString, CTraceCategoryEx<>::TraceString); +DEFINE_TRACE_CATEGORY(atlTraceMap, CTraceCategoryEx<>::TraceMap); +DEFINE_TRACE_CATEGORY(atlTraceUtil, CTraceCategoryEx<>::TraceUtil); +DEFINE_TRACE_CATEGORY(atlTraceSecurity, CTraceCategoryEx<>::TraceSecurity); +DEFINE_TRACE_CATEGORY(atlTraceSync, CTraceCategoryEx<>::TraceSync); +DEFINE_TRACE_CATEGORY(atlTraceISAPI, CTraceCategoryEx<>::TraceISAPI); +#undef DEFINE_TRACE_CATEGORY + +struct CTraceCategoryEasy +{ + UINT m_category; + UINT m_level; + LPCTSTR m_name; + + template <UINT t_category, UINT t_level> + CTraceCategoryEasy(const CTraceCategoryEx<t_category, t_level>& cat) + { + m_category = t_category; + m_level = t_level; + m_name = cat.GetCategoryName(); + } + + operator UINT() const { return m_category; } + + BOOL IsGeneral() const + { + return lstrcmp(m_name, TEXT("atlTraceGeneral")) == 0; + } +}; + +struct CTrace +{ + enum + { + DefaultTraceLevel = 0, + DisableTracing = 0xFFFFFFFF, + EnableAllCategories = 0xFFFFFFFF + }; + + static UINT GetLevel() { return s_level; } + static UINT GetCategories() { return s_categories; } + static void SetLevel(UINT level) { s_level = level; } + static void SetCategories(UINT categories) { s_categories = categories; } + + static bool IsTracingEnabled(UINT category, UINT level) + { + return (s_level != DisableTracing && s_level >= level && (s_categories & category)); + } + +protected: + static UINT s_categories; + static UINT s_level; +}; + +DECLSPEC_SELECTANY UINT CTrace::s_categories = CTrace::EnableAllCategories; +DECLSPEC_SELECTANY UINT CTrace::s_level = CTrace::DefaultTraceLevel; + +template <typename X_CHAR> +inline VOID __stdcall +AtlTraceV(_In_opt_z_ const X_CHAR * file, + _In_ INT line, + _In_ const CTraceCategoryEasy& cat, + _In_ UINT level, + _In_z_ _Printf_format_string_ PCSTR format, + _In_ va_list va) +{ + char szBuff[1024], szFile[MAX_PATH]; + size_t cch = 0; + const BOOL bUnicode = (sizeof(TCHAR) == 2); + + if (!CTrace::IsTracingEnabled(cat, level)) + return; + +#ifdef _STRSAFE_H_INCLUDED_ + StringCchPrintfA(szFile, _countof(szFile), ((sizeof(X_CHAR) == 2) ? "%ls" : "%hs"), file); + if (!cat.IsGeneral()) + { + StringCchPrintfA(szBuff, _countof(szBuff), (bUnicode ? "%ls - " : "%hs - "), cat.m_name); + StringCchLengthA(szBuff, _countof(szBuff), &cch); + } + StringCchVPrintfA(&szBuff[cch], _countof(szBuff) - cch, format, va); +#else + _snprintf(szFile, _countof(szFile), ((sizeof(X_CHAR) == 2) ? "%ls" : "%hs"), file); + if (!cat.IsGeneral()) + cch = _snprintf(szBuff, _countof(szBuff), (bUnicode ? "%ls - " : "%hs - "), cat.m_name); + _vsnprintf(&szBuff[cch], _countof(szBuff) - cch, format, va); +#endif + + _CrtDbgReport(_CRT_WARN, szFile, line, NULL, "%hs", szBuff); +} + +template <typename X_CHAR> +inline VOID __stdcall +AtlTraceV(_In_opt_z_ const X_CHAR * file, + _In_ INT line, + _In_ const CTraceCategoryEasy& cat, + _In_ UINT level, + _In_z_ _Printf_format_string_ PCWSTR format, + _In_ va_list va) +{ + WCHAR szBuff[1024], szFile[MAX_PATH]; + size_t cch = 0; + const BOOL bUnicode = (sizeof(TCHAR) == 2); + + if (!CTrace::IsTracingEnabled(cat, level)) + return; + +#ifdef _STRSAFE_H_INCLUDED_ + StringCchPrintfW(szFile, _countof(szFile), ((sizeof(X_CHAR) == 2) ? L"%ls" : L"%hs"), file); + if (!cat.IsGeneral()) + { + StringCchPrintfW(szBuff, _countof(szBuff), (bUnicode ? L"%ls - " : L"%hs - "), cat.m_name); + StringCchLengthW(szBuff, _countof(szBuff), &cch); + } + StringCchVPrintfW(&szBuff[cch], _countof(szBuff) - cch, format, va); +#else + _snwprintf(szFile, _countof(szFile), ((sizeof(X_CHAR) == 2) ? L"%ls" : L"%hs"), file); + if (!cat.IsGeneral()) + cch = _snwprintf(szBuff, _countof(szBuff), (bUnicode ? L"%ls - " : L"%hs - "), cat.m_name); + _vsnwprintf(&szBuff[cch], _countof(szBuff) - cch, format, va); +#endif + + _CrtDbgReportW(_CRT_WARN, szFile, line, NULL, L"%ls", szBuff); +} + +template <typename X_CHAR, typename Y_CHAR> +inline VOID __cdecl +AtlTraceEx(_In_opt_z_ const X_CHAR * file, + _In_ INT line, + _In_ const CTraceCategoryEasy& cat, + _In_ UINT level, + _In_z_ _Printf_format_string_ const Y_CHAR * format, + ...) +{ + va_list va; + va_start(va, format); + AtlTraceV(file, line, cat, level, format, va); + va_end(va); +} + +template <typename X_CHAR, typename Y_CHAR> +inline VOID __cdecl +AtlTraceEx(_In_opt_z_ const X_CHAR *file, + _In_ INT line, + _In_z_ _Printf_format_string_ const Y_CHAR *format, + ...) +{ + va_list va; + va_start(va, format); + AtlTraceV(file, line, atlTraceGeneral, 0, format, va); + va_end(va); +} + +inline VOID __stdcall +AtlTraceEx(_In_opt_z_ PCTSTR file, + _In_ INT line, + _In_ DWORD value) +{ + AtlTraceEx(file, line, TEXT("%ld (0x%lX)\n"), value, value); +} + +template <typename X_CHAR> +inline VOID __cdecl +AtlTrace(_In_z_ _Printf_format_string_ const X_CHAR *format, ...) +{ + va_list va; + va_start(va, format); + AtlTraceV(NULL, -1, atlTraceGeneral, 0, format, va); + va_end(va); +} + +} // namespace ATL + +#endif // DBG + +#ifndef ATLTRACE + #if DBG // FIXME: We should use _DEBUG instead of DBG. CORE-17505 + #define ATLTRACE(format, ...) ATL::AtlTraceEx(__FILE__, __LINE__, format, ##__VA_ARGS__) + #else + #define ATLTRACE(format, ...) ((void)0) + #endif +#endif + +#define ATLTRACE2 ATLTRACE + +#if DBG // FIXME: We should use _DEBUG instead of DBG. CORE-17505 + #define ATLTRACENOTIMPL(funcname) do { \ + ATLTRACE(atlTraceNotImpl, 0, #funcname " is not implemented.\n"); \ + return E_NOTIMPL; \ + } while (0) +#else + #define ATLTRACENOTIMPL(funcname) return E_NOTIMPL +#endif + +#ifndef _ATL_NO_AUTOMATIC_NAMESPACE +using namespace ATL; +#endif //!_ATL_NO_AUTOMATIC_NAMESPACE

2 years, 11 months

[reactos] 01/01: [SFCFILES] Add sfcfiles dll and header file

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=085f135f1a1f27e4e439e… commit 085f135f1a1f27e4e439eb99454408ef62bc57dd Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Jan 22 13:28:50 2022 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Jan 22 13:28:50 2022 +0100 [SFCFILES] Add sfcfiles dll and header file Sfcfiles.dll contains only a short list of protected files (WIP). --- dll/win32/CMakeLists.txt | 1 + dll/win32/sfcfiles/CMakeLists.txt | 10 +++++++ dll/win32/sfcfiles/sfcfiles.c | 59 +++++++++++++++++++++++++++++++++++++++ dll/win32/sfcfiles/sfcfiles.rc | 5 ++++ dll/win32/sfcfiles/sfcfiles.spec | 1 + sdk/include/psdk/sfcfiles.h | 25 +++++++++++++++++ 6 files changed, 101 insertions(+) diff --git a/dll/win32/CMakeLists.txt b/dll/win32/CMakeLists.txt index c0238ebeea5..d596b912ab0 100644 --- a/dll/win32/CMakeLists.txt +++ b/dll/win32/CMakeLists.txt @@ -184,6 +184,7 @@ add_subdirectory(serialui) add_subdirectory(setupapi) add_subdirectory(sfc) add_subdirectory(sfc_os) +add_subdirectory(sfcfiles) add_subdirectory(shdoclc) add_subdirectory(shdocvw) add_subdirectory(shell32) diff --git a/dll/win32/sfcfiles/CMakeLists.txt b/dll/win32/sfcfiles/CMakeLists.txt new file mode 100644 index 00000000000..0cd46689e87 --- /dev/null +++ b/dll/win32/sfcfiles/CMakeLists.txt @@ -0,0 +1,10 @@ +spec2def(sfcfiles.dll sfcfiles.spec) + +list(APPEND SOURCE + sfcfiles.c + ${CMAKE_CURRENT_BINARY_DIR}/sfcfiles.def) + +add_library(sfcfiles MODULE ${SOURCE}) +set_module_type(sfcfiles win32dll) +add_importlibs(sfcfiles msvcrt kernel32 ntdll) +add_cd_file(TARGET sfcfiles DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/sfcfiles/sfcfiles.c b/dll/win32/sfcfiles/sfcfiles.c new file mode 100644 index 00000000000..da329e8c7c5 --- /dev/null +++ b/dll/win32/sfcfiles/sfcfiles.c @@ -0,0 +1,59 @@ +/* + * PROJECT: ReactOS System File Checker + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * FILE: dll/win32/sfcfiles/sfcfiles.c + * PURPOSE: List of protected files + * PROGRAMMERS: Copyright 2022 Eric Kohl (eric.kohl(a)reactos.org) + */ + +#define WIN32_NO_STATUS +#include <windef.h> +#include <winbase.h> +#include <ndk/umtypes.h> +#include <sfcfiles.h> + + +static +PROTECT_FILE_ENTRY +ProtectedFiles[] = +{ + {NULL, L"%systemroot%\\system32\\advapi32.dll", NULL}, + {NULL, L"%systemroot%\\system32\\comctl32.dll", NULL}, + {NULL, L"%systemroot%\\system32\\comdlg32.dll", NULL}, + {NULL, L"%systemroot%\\system32\\kernel32.dll", NULL}, + {NULL, L"%systemroot%\\system32\\ntdll.dll", NULL}, + {NULL, L"%systemroot%\\system32\\ntoskrnl.exe", NULL} +}; + + +BOOL +WINAPI +DllMain( + _In_ HINSTANCE hInstDLL, + _In_ DWORD fdwReason, + _In_ LPVOID lpvReserved) +{ + switch (fdwReason) + { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hInstDLL); + break; + + case DLL_PROCESS_DETACH: + break; + } + + return TRUE; +} + + +NTSTATUS +WINAPI +SfcGetFiles( + _Out_ PPROTECT_FILE_ENTRY *ProtFileData, + _Out_ PULONG FileCount) +{ + *ProtFileData = ProtectedFiles; + *FileCount = ARRAYSIZE(ProtectedFiles); + return STATUS_SUCCESS; +} diff --git a/dll/win32/sfcfiles/sfcfiles.rc b/dll/win32/sfcfiles/sfcfiles.rc new file mode 100644 index 00000000000..ddcb33c079f --- /dev/null +++ b/dll/win32/sfcfiles/sfcfiles.rc @@ -0,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "System File Checker Files" +#define REACTOS_STR_INTERNAL_NAME "sfcfiles" +#define REACTOS_STR_ORIGINAL_FILENAME "sfcfiles.dll" +#include <reactos/version.rc> diff --git a/dll/win32/sfcfiles/sfcfiles.spec b/dll/win32/sfcfiles/sfcfiles.spec new file mode 100644 index 00000000000..a4d118834df --- /dev/null +++ b/dll/win32/sfcfiles/sfcfiles.spec @@ -0,0 +1 @@ +@ stdcall SfcGetFiles(ptr ptr) diff --git a/sdk/include/psdk/sfcfiles.h b/sdk/include/psdk/sfcfiles.h new file mode 100644 index 00000000000..b7a03179058 --- /dev/null +++ b/sdk/include/psdk/sfcfiles.h @@ -0,0 +1,25 @@ +#ifndef __SFCFILES_H +#define __SFCFILES_H + +#ifdef __cplusplus +extern "C" { +#endif + +typedef struct _PROTECT_FILE_ENTRY +{ + PWSTR SourceFileName; + PWSTR FileName; + PWSTR InfName; +} PROTECT_FILE_ENTRY, *PPROTECT_FILE_ENTRY; + +NTSTATUS +WINAPI +SfcGetFiles( + _Out_ PPROTECT_FILE_ENTRY *ProtFileData, + _Out_ PULONG FileCount); + +#ifdef __cplusplus +} +#endif + +#endif

2 years, 11 months

← Newer
1
2
3
4
5
6
7
8
...
18
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 January 2022