Ros-diffs

ros-diffs@reactos.org

11 participants
81011 discussions

[reactos] 04/04: [WINSRV] Delay-load psapi.dll

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=59f8611321c676050a413… commit 59f8611321c676050a41315c660f93f7d6b9143c Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Feb 22 14:05:04 2024 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Feb 22 22:41:06 2024 +0100 [WINSRV] Delay-load psapi.dll Note that it is used only in debug builds in order to display the list of processes being terminated in the debug log. --- win32ss/user/winsrv/CMakeLists.txt | 2 +- win32ss/user/winsrv/consrv.cmake | 4 ++-- win32ss/user/winsrv/usersrv.cmake | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/win32ss/user/winsrv/CMakeLists.txt b/win32ss/user/winsrv/CMakeLists.txt index a04ad47fabd..c0cc6d68164 100644 --- a/win32ss/user/winsrv/CMakeLists.txt +++ b/win32ss/user/winsrv/CMakeLists.txt @@ -29,7 +29,7 @@ target_link_libraries(winsrv consrv usersrv) # Add win32ksys because of NtUser...() target_link_libraries(winsrv ${CONSRV_TARGET_LINK_LIBS} win32ksys libcntpr ${PSEH_LIB}) -add_delay_importlibs(winsrv ${CONSRV_DELAY_IMPORT_LIBS} advapi32) +add_delay_importlibs(winsrv ${CONSRV_DELAY_IMPORT_LIBS} ${USERSRV_DELAY_IMPORT_LIBS} advapi32) add_importlibs(winsrv ${CONSRV_IMPORT_LIBS} ${USERSRV_IMPORT_LIBS} csrsrv gdi32 user32 kernel32 ntdll) add_dependencies(winsrv bugcodes xdk) add_cd_file(TARGET winsrv DESTINATION reactos/system32 FOR all) diff --git a/win32ss/user/winsrv/consrv.cmake b/win32ss/user/winsrv/consrv.cmake index d2ef3a2b5ec..dd4b6da03c2 100644 --- a/win32ss/user/winsrv/consrv.cmake +++ b/win32ss/user/winsrv/consrv.cmake @@ -57,7 +57,7 @@ target_link_libraries(consrv pseh) add_dependencies(consrv psdk) add_pch(consrv consrv/consrv.h CONSRV_SOURCE) #add_object_library(consrv ${CONSRV_SOURCE}) -list(APPEND CONSRV_IMPORT_LIBS psapi) -list(APPEND CONSRV_DELAY_IMPORT_LIBS shell32 ole32) +#list(APPEND CONSRV_IMPORT_LIBS) +list(APPEND CONSRV_DELAY_IMPORT_LIBS shell32 ole32 psapi) list(APPEND CONSRV_TARGET_LINK_LIBS concfg uuid) set_module_type(consrv module UNICODE) diff --git a/win32ss/user/winsrv/usersrv.cmake b/win32ss/user/winsrv/usersrv.cmake index 8db138e5a27..ebdd72ca597 100644 --- a/win32ss/user/winsrv/usersrv.cmake +++ b/win32ss/user/winsrv/usersrv.cmake @@ -14,5 +14,6 @@ target_link_libraries(usersrv pseh) add_dependencies(usersrv xdk) add_pch(usersrv usersrv/usersrv.h USERSRV_SOURCE) #add_object_library(usersrv ${USERSRV_SOURCE}) -list(APPEND USERSRV_IMPORT_LIBS basesrv psapi) +list(APPEND USERSRV_IMPORT_LIBS basesrv) +list(APPEND USERSRV_DELAY_IMPORT_LIBS psapi) set_module_type(usersrv module UNICODE)

10 months, 3 weeks

[reactos] 03/04: [WINSRV] Use ARRAYSIZE() instead of hardcoding buffer size in GetProcessImageFileNameW call

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2c0af91ba198b3114db0f… commit 2c0af91ba198b3114db0f9ad8973a345431b9d28 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Feb 22 14:03:33 2024 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Feb 22 22:41:05 2024 +0100 [WINSRV] Use ARRAYSIZE() instead of hardcoding buffer size in GetProcessImageFileNameW call --- win32ss/user/winsrv/consrv/shutdown.c | 3 +-- win32ss/user/winsrv/usersrv/shutdown.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/win32ss/user/winsrv/consrv/shutdown.c b/win32ss/user/winsrv/consrv/shutdown.c index 91e43993ba8..aec89dfb8e6 100644 --- a/win32ss/user/winsrv/consrv/shutdown.c +++ b/win32ss/user/winsrv/consrv/shutdown.c @@ -49,7 +49,7 @@ NonConsoleProcessShutdown(IN PCSR_PROCESS Process, /* Terminate this process */ #if DBG WCHAR buffer[MAX_PATH]; - if (!GetProcessImageFileNameW(Process->ProcessHandle, buffer, MAX_PATH)) + if (!GetProcessImageFileNameW(Process->ProcessHandle, buffer, ARRAYSIZE(buffer))) { DPRINT1("Terminating process %x\n", Process->ClientId.UniqueProcess); } @@ -58,7 +58,6 @@ NonConsoleProcessShutdown(IN PCSR_PROCESS Process, DPRINT1("Terminating process %x (%S)\n", Process->ClientId.UniqueProcess, buffer); } #endif - NtTerminateProcess(Process->ProcessHandle, 0); WaitForSingleObject(Process->ProcessHandle, ShutdownSettings.ProcessTerminateTimeout); } diff --git a/win32ss/user/winsrv/usersrv/shutdown.c b/win32ss/user/winsrv/usersrv/shutdown.c index 42973b4cfc6..ce9d4f97e1e 100644 --- a/win32ss/user/winsrv/usersrv/shutdown.c +++ b/win32ss/user/winsrv/usersrv/shutdown.c @@ -777,7 +777,7 @@ UserClientShutdown(IN PCSR_PROCESS CsrProcess, #if DBG { WCHAR buffer[MAX_PATH]; - if (!GetProcessImageFileNameW(CsrProcess->ProcessHandle, buffer, MAX_PATH)) + if (!GetProcessImageFileNameW(CsrProcess->ProcessHandle, buffer, ARRAYSIZE(buffer))) { DPRINT1("Terminating process %x\n", CsrProcess->ClientId.UniqueProcess); } @@ -788,7 +788,6 @@ UserClientShutdown(IN PCSR_PROCESS CsrProcess, } #endif NtTerminateProcess(CsrProcess->ProcessHandle, 0); - WaitForSingleObject(CsrProcess->ProcessHandle, ShutdownSettings.ProcessTerminateTimeout); /* We are done */

10 months, 3 weeks

[reactos] 02/04: [PSAPI] Don't make the dll depend on MSVCRT

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e5db85276e31e3b914575… commit e5db85276e31e3b9145755b9129a5b727701817e Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Feb 22 13:37:36 2024 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Feb 22 22:41:04 2024 +0100 [PSAPI] Don't make the dll depend on MSVCRT psapi.dll can also used by low-level DLLs, such as winsrv.dll, therefore it is better to reduce its dependencies. --- dll/win32/psapi/CMakeLists.txt | 4 ++-- dll/win32/psapi/psapi.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dll/win32/psapi/CMakeLists.txt b/dll/win32/psapi/CMakeLists.txt index d92b5d415ff..60c1398b70e 100644 --- a/dll/win32/psapi/CMakeLists.txt +++ b/dll/win32/psapi/CMakeLists.txt @@ -7,7 +7,7 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/psapi.def) add_library(psapi MODULE ${SOURCE}) -set_module_type(psapi win32dll) +set_module_type(psapi win32dll ENTRYPOINT DllMain 12) target_link_libraries(psapi ${PSEH_LIB}) -add_importlibs(psapi msvcrt kernel32 ntdll) +add_importlibs(psapi kernel32 ntdll) add_cd_file(TARGET psapi DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/psapi/psapi.c b/dll/win32/psapi/psapi.c index 8194571624d..c73f3176d3b 100644 --- a/dll/win32/psapi/psapi.c +++ b/dll/win32/psapi/psapi.c @@ -299,9 +299,9 @@ DllMain(HINSTANCE hDllHandle, PsStopAndAnalyzeProfile(); } break; - } + } - return TRUE; + return TRUE; }

10 months, 3 weeks

[reactos] 01/04: [USETUP] Exchange SetupStartPage and LanguagePage

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=047f1c3d551ee404b83d6… commit 047f1c3d551ee404b83d63918b86baea21c3e670 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Feb 22 12:05:56 2024 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Feb 22 22:41:03 2024 +0100 [USETUP] Exchange SetupStartPage and LanguagePage --- base/setup/usetup/usetup.c | 206 ++++++++++++++++++++++----------------------- 1 file changed, 103 insertions(+), 103 deletions(-) diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index 59593f38b59..9dbba31f27c 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -536,6 +536,109 @@ GetNTOSInstallationName( } +/* + * Start page + * + * Next pages: + * LanguagePage (at once, default) + * InstallIntroPage (at once, if unattended) + * QuitPage + * + * SIDEEFFECTS + * Init Sdi + * Init USetupData.SourcePath + * Init USetupData.SourceRootPath + * Init USetupData.SourceRootDir + * Init USetupData.SetupInf + * Init USetupData.RequiredPartitionDiskSpace + * Init IsUnattendedSetup + * If unattended, init *List and sets the Codepage + * If unattended, init SelectedLanguageId + * If unattended, init USetupData.LanguageId + * + * RETURNS + * Number of the next page. + */ +static PAGE_NUMBER +SetupStartPage(PINPUT_RECORD Ir) +{ + ULONG Error; + PGENERIC_LIST_ENTRY ListEntry; + PCWSTR LocaleId; + + MUIDisplayPage(SETUP_INIT_PAGE); + + /* Initialize Setup, phase 1 */ + Error = InitializeSetup(&USetupData, 1); + if (Error != ERROR_SUCCESS) + { + MUIDisplayError(Error, Ir, POPUP_WAIT_ENTER); + return QUIT_PAGE; + } + + /* Initialize the user-mode PnP manager */ + if (!EnableUserModePnpManager()) + DPRINT1("The user-mode PnP manager could not initialize, expect unavailable devices!\n"); + + /* Wait for any immediate pending installations to finish */ + if (WaitNoPendingInstallEvents(NULL) != STATUS_WAIT_0) + DPRINT1("WaitNoPendingInstallEvents() failed to wait!\n"); + + CheckUnattendedSetup(&USetupData); + + if (IsUnattendedSetup) + { + // TODO: Read options from inf + /* Load the hardware, language and keyboard layout lists */ + + USetupData.ComputerList = CreateComputerTypeList(USetupData.SetupInf); + USetupData.DisplayList = CreateDisplayDriverList(USetupData.SetupInf); + USetupData.KeyboardList = CreateKeyboardDriverList(USetupData.SetupInf); + + USetupData.LanguageList = CreateLanguageList(USetupData.SetupInf, DefaultLanguage); + + /* new part */ + SelectedLanguageId = DefaultLanguage; + wcscpy(DefaultLanguage, USetupData.LocaleID); + USetupData.LanguageId = (LANGID)(wcstol(SelectedLanguageId, NULL, 16) & 0xFFFF); + + USetupData.LayoutList = CreateKeyboardLayoutList(USetupData.SetupInf, SelectedLanguageId, DefaultKBLayout); + + /* first we hack LanguageList */ + for (ListEntry = GetFirstListEntry(USetupData.LanguageList); ListEntry; + ListEntry = GetNextListEntry(ListEntry)) + { + LocaleId = ((PGENENTRY)GetListEntryData(ListEntry))->Id; + if (!wcsicmp(USetupData.LocaleID, LocaleId)) + { + DPRINT("found %S in LanguageList\n", LocaleId); + SetCurrentListEntry(USetupData.LanguageList, ListEntry); + break; + } + } + + /* now LayoutList */ + for (ListEntry = GetFirstListEntry(USetupData.LayoutList); ListEntry; + ListEntry = GetNextListEntry(ListEntry)) + { + LocaleId = ((PGENENTRY)GetListEntryData(ListEntry))->Id; + if (!wcsicmp(USetupData.LocaleID, LocaleId)) + { + DPRINT("found %S in LayoutList\n", LocaleId); + SetCurrentListEntry(USetupData.LayoutList, ListEntry); + break; + } + } + + SetConsoleCodePage(); + + return INSTALL_INTRO_PAGE; + } + + return LANGUAGE_PAGE; +} + + /* * Displays the LanguagePage. * @@ -690,109 +793,6 @@ LanguagePage(PINPUT_RECORD Ir) } -/* - * Start page - * - * Next pages: - * LanguagePage (at once, default) - * InstallIntroPage (at once, if unattended) - * QuitPage - * - * SIDEEFFECTS - * Init Sdi - * Init USetupData.SourcePath - * Init USetupData.SourceRootPath - * Init USetupData.SourceRootDir - * Init USetupData.SetupInf - * Init USetupData.RequiredPartitionDiskSpace - * Init IsUnattendedSetup - * If unattended, init *List and sets the Codepage - * If unattended, init SelectedLanguageId - * If unattended, init USetupData.LanguageId - * - * RETURNS - * Number of the next page. - */ -static PAGE_NUMBER -SetupStartPage(PINPUT_RECORD Ir) -{ - ULONG Error; - PGENERIC_LIST_ENTRY ListEntry; - PCWSTR LocaleId; - - MUIDisplayPage(SETUP_INIT_PAGE); - - /* Initialize Setup, phase 1 */ - Error = InitializeSetup(&USetupData, 1); - if (Error != ERROR_SUCCESS) - { - MUIDisplayError(Error, Ir, POPUP_WAIT_ENTER); - return QUIT_PAGE; - } - - /* Initialize the user-mode PnP manager */ - if (!EnableUserModePnpManager()) - DPRINT1("The user-mode PnP manager could not initialize, expect unavailable devices!\n"); - - /* Wait for any immediate pending installations to finish */ - if (WaitNoPendingInstallEvents(NULL) != STATUS_WAIT_0) - DPRINT1("WaitNoPendingInstallEvents() failed to wait!\n"); - - CheckUnattendedSetup(&USetupData); - - if (IsUnattendedSetup) - { - // TODO: Read options from inf - /* Load the hardware, language and keyboard layout lists */ - - USetupData.ComputerList = CreateComputerTypeList(USetupData.SetupInf); - USetupData.DisplayList = CreateDisplayDriverList(USetupData.SetupInf); - USetupData.KeyboardList = CreateKeyboardDriverList(USetupData.SetupInf); - - USetupData.LanguageList = CreateLanguageList(USetupData.SetupInf, DefaultLanguage); - - /* new part */ - SelectedLanguageId = DefaultLanguage; - wcscpy(DefaultLanguage, USetupData.LocaleID); - USetupData.LanguageId = (LANGID)(wcstol(SelectedLanguageId, NULL, 16) & 0xFFFF); - - USetupData.LayoutList = CreateKeyboardLayoutList(USetupData.SetupInf, SelectedLanguageId, DefaultKBLayout); - - /* first we hack LanguageList */ - for (ListEntry = GetFirstListEntry(USetupData.LanguageList); ListEntry; - ListEntry = GetNextListEntry(ListEntry)) - { - LocaleId = ((PGENENTRY)GetListEntryData(ListEntry))->Id; - if (!wcsicmp(USetupData.LocaleID, LocaleId)) - { - DPRINT("found %S in LanguageList\n", LocaleId); - SetCurrentListEntry(USetupData.LanguageList, ListEntry); - break; - } - } - - /* now LayoutList */ - for (ListEntry = GetFirstListEntry(USetupData.LayoutList); ListEntry; - ListEntry = GetNextListEntry(ListEntry)) - { - LocaleId = ((PGENENTRY)GetListEntryData(ListEntry))->Id; - if (!wcsicmp(USetupData.LocaleID, LocaleId)) - { - DPRINT("found %S in LayoutList\n", LocaleId); - SetCurrentListEntry(USetupData.LayoutList, ListEntry); - break; - } - } - - SetConsoleCodePage(); - - return INSTALL_INTRO_PAGE; - } - - return LANGUAGE_PAGE; -} - - /* * Displays the WelcomePage. *

10 months, 3 weeks

[reactos] 01/01: [MSCTFIME] Implement CModeBias (#6515)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9262df661e9f679c2f73c… commit 9262df661e9f679c2f73c95404454d1efafda696 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Feb 22 18:43:08 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Feb 22 18:43:08 2024 +0900 [MSCTFIME] Implement CModeBias (#6515) Supporting TIPs... JIRA issue: CORE-19360 - Rename compartment.cpp as misc.cpp. - Implement CModeBias class. --- dll/ime/msctfime/CMakeLists.txt | 2 +- dll/ime/msctfime/{compartment.cpp => misc.cpp} | 49 +++++++++++++++++++++++++- dll/ime/msctfime/{compartment.h => misc.h} | 14 +++++++- dll/ime/msctfime/msctfime.h | 7 +++- 4 files changed, 68 insertions(+), 4 deletions(-) diff --git a/dll/ime/msctfime/CMakeLists.txt b/dll/ime/msctfime/CMakeLists.txt index 3a48a7cbabb..0e5acc805b0 100644 --- a/dll/ime/msctfime/CMakeLists.txt +++ b/dll/ime/msctfime/CMakeLists.txt @@ -6,9 +6,9 @@ spec2def(msctfime.ime msctfime.spec) list(APPEND SOURCE bridge.cpp - compartment.cpp functions.cpp inputcontext.cpp + misc.cpp msctfime.cpp profile.cpp sinks.cpp diff --git a/dll/ime/msctfime/compartment.cpp b/dll/ime/msctfime/misc.cpp similarity index 76% rename from dll/ime/msctfime/compartment.cpp rename to dll/ime/msctfime/misc.cpp index d92b1b526f4..18e01939ada 100644 --- a/dll/ime/msctfime/compartment.cpp +++ b/dll/ime/msctfime/misc.cpp @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS msctfime.ime * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) - * PURPOSE: Supporting compartments + * PURPOSE: Miscellaneous of msctfime.ime * COPYRIGHT: Copyright 2024 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> */ @@ -161,3 +161,50 @@ ClearCompartment( return hr; } + +/***********************************************************************/ + +struct MODEBIAS +{ + REFGUID m_guid; + LONG m_bias; +}; + +static const MODEBIAS g_ModeBiasMap[] = +{ + { GUID_MODEBIAS_FILENAME, 0x00000001 }, + { GUID_MODEBIAS_NUMERIC, 0x00000004 }, + { GUID_MODEBIAS_URLHISTORY, 0x00010000 }, + { GUID_MODEBIAS_DEFAULT, 0x00000000 }, + { GUID_MODEBIAS_NONE, 0x00000000 }, +}; + +void CModeBias::SetModeBias(REFGUID rguid) +{ + m_guid = rguid; +} + +GUID CModeBias::ConvertModeBias(LONG bias) +{ + const GUID *pguid = &GUID_NULL; + for (auto& item : g_ModeBiasMap) + { + if (item.m_bias == bias) + { + pguid = &item.m_guid; + break; + } + } + + return *pguid; +} + +LONG CModeBias::ConvertModeBias(REFGUID guid) +{ + for (auto& item : g_ModeBiasMap) + { + if (IsEqualGUID(guid, item.m_guid)) + return item.m_bias; + } + return 0; +} diff --git a/dll/ime/msctfime/compartment.h b/dll/ime/msctfime/misc.h similarity index 74% rename from dll/ime/msctfime/compartment.h rename to dll/ime/msctfime/misc.h index 88805566832..ca96a227f54 100644 --- a/dll/ime/msctfime/compartment.h +++ b/dll/ime/msctfime/misc.h @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS msctfime.ime * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) - * PURPOSE: Supporting compartments + * PURPOSE: Miscellaneous of msctfime.ime * COPYRIGHT: Copyright 2024 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> */ @@ -42,3 +42,15 @@ ClearCompartment( IUnknown *pUnknown, REFGUID rguid, BOOL bThread); + +/***********************************************************************/ + +class CModeBias +{ +public: + GUID m_guid; + + GUID ConvertModeBias(LONG bias); + LONG ConvertModeBias(REFGUID guid); + void SetModeBias(REFGUID rguid); +}; diff --git a/dll/ime/msctfime/msctfime.h b/dll/ime/msctfime/msctfime.h index cb482318830..28597863047 100644 --- a/dll/ime/msctfime/msctfime.h +++ b/dll/ime/msctfime/msctfime.h @@ -50,13 +50,18 @@ static inline HIMC GetActiveContext(VOID) DEFINE_GUID(GUID_COMPARTMENT_CTFIME_DIMFLAGS, 0xA94C5FD2, 0xC471, 0x4031, 0x95, 0x46, 0x70, 0x9C, 0x17, 0x30, 0x0C, 0xB9); DEFINE_GUID(GUID_COMPARTMENT_CTFIME_CICINPUTCONTEXT, 0x85A688F7, 0x6DC8, 0x4F17, 0xA8, 0x3A, 0xB1, 0x1C, 0x09, 0xCD, 0xD7, 0xBF); +DEFINE_GUID(GUID_MODEBIAS_FILENAME, 0xD7F707FE, 0x44C6, 0x4FCA, 0x8E, 0x76, 0x86, 0xAB, 0x50, 0xC7, 0x93, 0x1B); +DEFINE_GUID(GUID_MODEBIAS_NUMERIC, 0x4021766C, 0xE872, 0x48FD, 0x9C, 0xEE, 0x4E, 0xC5, 0xC7, 0x5E, 0x16, 0xC3); +DEFINE_GUID(GUID_MODEBIAS_URLHISTORY, 0x8B0E54D9, 0x63F2, 0x4C68, 0x84, 0xD4, 0x79, 0xAE, 0xE7, 0xA5, 0x9F, 0x09); +DEFINE_GUID(GUID_MODEBIAS_DEFAULT, 0xF3DA8BD4, 0x0786, 0x49C2, 0x8C, 0x09, 0x68, 0x39, 0xD8, 0xB8, 0x4F, 0x58); +#define GUID_MODEBIAS_NONE GUID_NULL #include "resource.h" #include "bridge.h" -#include "compartment.h" #include "functions.h" #include "inputcontext.h" +#include "misc.h" #include "profile.h" #include "sinks.h" #include "tls.h"

10 months, 3 weeks

[reactos] 01/01: [MSCTFIME] Implement CicBridge::OnSetOpenStatus (#6514)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7d0b5482f6ae2997d85f9… commit 7d0b5482f6ae2997d85f9bba819333de2077f184 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Feb 22 17:28:40 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Feb 22 17:28:40 2024 +0900 [MSCTFIME] Implement CicBridge::OnSetOpenStatus (#6514) Supporting TIPs... JIRA issue: CORE-19360 - Add CicInputContext::EscbCompComplete method (stub). - Implement CicBridge::OnSetOpenStatus method. --- dll/ime/msctfime/bridge.cpp | 13 +++++++++++-- dll/ime/msctfime/functions.cpp | 2 +- dll/ime/msctfime/functions.h | 2 +- dll/ime/msctfime/inputcontext.cpp | 6 ++++++ dll/ime/msctfime/inputcontext.h | 1 + dll/ime/msctfime/tls.h | 2 +- dll/ime/msctfime/ui.cpp | 13 ++++++------- 7 files changed, 27 insertions(+), 12 deletions(-) diff --git a/dll/ime/msctfime/bridge.cpp b/dll/ime/msctfime/bridge.cpp index e7801024cf9..ed74a566328 100644 --- a/dll/ime/msctfime/bridge.cpp +++ b/dll/ime/msctfime/bridge.cpp @@ -178,6 +178,7 @@ HRESULT CicBridge::DestroyInputContext(TLS *pTLS, HIMC hIMC) return hr; } +/// @implemented ITfContext * CicBridge::GetInputContext(CicIMCCLock<CTFIMECONTEXT>& imeContext) { @@ -187,14 +188,22 @@ CicBridge::GetInputContext(CicIMCCLock<CTFIMECONTEXT>& imeContext) return pCicIC->m_pContext; } -/// @unimplemented +/// @implemented HRESULT CicBridge::OnSetOpenStatus( TLS *pTLS, ITfThreadMgr_P *pThreadMgr, CicIMCLock& imcLock, CicInputContext *pCicIC) { - return E_NOTIMPL; + if (!imcLock.get().fOpen && imcLock.ValidCompositionString()) + pCicIC->EscbCompComplete(imcLock); + + pTLS->m_bNowOpening = TRUE; + HRESULT hr = SetCompartmentDWORD(m_cliendId, pThreadMgr, + GUID_COMPARTMENT_KEYBOARD_OPENCLOSE, + imcLock.get().fOpen, FALSE); + pTLS->m_bNowOpening = FALSE; + return hr; } /// Selects the IME context. diff --git a/dll/ime/msctfime/functions.cpp b/dll/ime/msctfime/functions.cpp index 2852aece1cd..e3133022023 100644 --- a/dll/ime/msctfime/functions.cpp +++ b/dll/ime/msctfime/functions.cpp @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS msctfime.ime * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) - * PURPOSE: The functions of msctfime.ime + * PURPOSE: The functionalities of msctfime.ime * COPYRIGHT: Copyright 2024 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> */ diff --git a/dll/ime/msctfime/functions.h b/dll/ime/msctfime/functions.h index 6938162a6e5..d0b7d8c2ebe 100644 --- a/dll/ime/msctfime/functions.h +++ b/dll/ime/msctfime/functions.h @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS msctfime.ime * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) - * PURPOSE: The functions of msctfime.ime + * PURPOSE: The functionalities of msctfime.ime * COPYRIGHT: Copyright 2024 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> */ diff --git a/dll/ime/msctfime/inputcontext.cpp b/dll/ime/msctfime/inputcontext.cpp index 81344d26545..7362040c8fb 100644 --- a/dll/ime/msctfime/inputcontext.cpp +++ b/dll/ime/msctfime/inputcontext.cpp @@ -260,6 +260,12 @@ HRESULT CicInputContext::EscbClearDocFeedBuffer(CicIMCLock& imcLock, BOOL bFlag) return E_NOTIMPL; } +/// @unimplemented +HRESULT CicInputContext::EscbCompComplete(CicIMCLock& imcLock) +{ + return E_NOTIMPL; +} + /// @unimplemented HRESULT CicInputContext::SetupReconvertString( diff --git a/dll/ime/msctfime/inputcontext.h b/dll/ime/msctfime/inputcontext.h index b567304b779..185d9b8161b 100644 --- a/dll/ime/msctfime/inputcontext.h +++ b/dll/ime/msctfime/inputcontext.h @@ -91,6 +91,7 @@ public: HRESULT SetupDocFeedString(CicIMCLock& imcLock, UINT uCodePage); HRESULT EscbClearDocFeedBuffer(CicIMCLock& imcLock, BOOL bFlag); + HRESULT EscbCompComplete(CicIMCLock& imcLock); HRESULT SetupReconvertString( CicIMCLock& imcLock, ITfThreadMgr_P *pThreadMgr, diff --git a/dll/ime/msctfime/tls.h b/dll/ime/msctfime/tls.h index 28f6d427177..ae1a6000e9c 100644 --- a/dll/ime/msctfime/tls.h +++ b/dll/ime/msctfime/tls.h @@ -25,7 +25,7 @@ public: DWORD m_dwFlags2; DWORD m_dwUnknown2; BOOL m_bDestroyed; - DWORD m_dwNowOpening; + BOOL m_bNowOpening; DWORD m_NonEAComposition; DWORD m_cWnds; diff --git a/dll/ime/msctfime/ui.cpp b/dll/ime/msctfime/ui.cpp index 2fec663f97f..fb8ae4105a9 100644 --- a/dll/ime/msctfime/ui.cpp +++ b/dll/ime/msctfime/ui.cpp @@ -444,15 +444,14 @@ UI::~UI() delete m_pComp; } -/// @unimplemented +/// @implemented HRESULT UI::_Create() { m_pComp = new(cicNoThrow) UIComposition(); if (!m_pComp) return E_OUTOFMEMORY; - SetWindowLongPtrW(m_hWnd, UIGWLP_UI, (LONG_PTR)this); - //FIXME + ::SetWindowLongPtrW(m_hWnd, UIGWLP_UI, (LONG_PTR)this); return S_OK; } @@ -460,13 +459,13 @@ HRESULT UI::_Create() void UI::_Destroy() { m_pComp->OnDestroy(); - SetWindowLongPtrW(m_hWnd, UIGWLP_UI, 0); + ::SetWindowLongPtrW(m_hWnd, UIGWLP_UI, 0); } /// @implemented void UI::OnCreate(HWND hWnd) { - UI *pUI = (UI*)GetWindowLongPtrW(hWnd, UIGWLP_UI); + UI *pUI = (UI*)::GetWindowLongPtrW(hWnd, UIGWLP_UI); if (pUI) return; pUI = new(cicNoThrow) UI(hWnd); @@ -477,7 +476,7 @@ void UI::OnCreate(HWND hWnd) /// @implemented void UI::OnDestroy(HWND hWnd) { - UI *pUI = (UI*)GetWindowLongPtrW(hWnd, UIGWLP_UI); + UI *pUI = (UI*)::GetWindowLongPtrW(hWnd, UIGWLP_UI); if (!pUI) return; @@ -656,7 +655,7 @@ UIWndProc( /***********************************************************************/ -/// @unimplemented +/// @implemented BOOL RegisterImeClass(VOID) { WNDCLASSEXW wcx;

10 months, 3 weeks

[reactos] 01/01: [MSCTFIME][CICERO] Implement CFnDocFeed (#6513)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f53f1334eda2daeb94e2c… commit f53f1334eda2daeb94e2cf2d7722f4e6a76e06fa Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Feb 22 15:46:05 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Feb 22 15:46:05 2024 +0900 [MSCTFIME][CICERO] Implement CFnDocFeed (#6513) Supporting TIPs... JIRA issue: CORE-19360 - Add missing CicInputContext methods. - Implement CFnDocFeed class. --- dll/ime/msctfime/bridge.cpp | 13 ++--- dll/ime/msctfime/functions.cpp | 100 +++++++++++++++++++++++++++++++++++--- dll/ime/msctfime/inputcontext.cpp | 41 +++++++++++++--- dll/ime/msctfime/inputcontext.h | 12 ++++- dll/ime/msctfime/msctfime.cpp | 35 +++---------- dll/ime/msctfime/msctfime.h | 8 +++ dll/ime/msctfime/ui.cpp | 2 - sdk/lib/cicero/cicimc.h | 3 +- 8 files changed, 156 insertions(+), 58 deletions(-) diff --git a/dll/ime/msctfime/bridge.cpp b/dll/ime/msctfime/bridge.cpp index de9e6ba10ef..e7801024cf9 100644 --- a/dll/ime/msctfime/bridge.cpp +++ b/dll/ime/msctfime/bridge.cpp @@ -87,11 +87,8 @@ CicBridge::CreateInputContext( _In_ HIMC hIMC) { CicIMCLock imcLock(hIMC); - HRESULT hr = imcLock.m_hr; - if (!imcLock) - hr = E_FAIL; - if (FAILED(hr)) - return hr; + if (FAILED(imcLock.m_hr)) + return imcLock.m_hr; if (!imcLock.get().hCtfImeContext) { @@ -126,7 +123,7 @@ CicBridge::CreateInputContext( imeContext.get().m_pCicIC = pCicIC; } - hr = pCicIC->CreateInputContext(pTLS->m_pThreadMgr, imcLock); + HRESULT hr = pCicIC->CreateInputContext(pTLS->m_pThreadMgr, imcLock); if (FAILED(hr)) { pCicIC->Release(); @@ -149,8 +146,6 @@ HRESULT CicBridge::DestroyInputContext(TLS *pTLS, HIMC hIMC) { CicIMCLock imcLock(hIMC); HRESULT hr = imcLock.m_hr; - if (!imcLock) - hr = E_FAIL; if (FAILED(hr)) return hr; @@ -217,8 +212,6 @@ CicBridge::SelectEx( return imcLock.m_hr; CicIMCCLock<CTFIMECONTEXT> imeContext(imcLock.get().hCtfImeContext); - if (!imeContext) - imeContext.m_hr = E_FAIL; if (FAILED(imeContext.m_hr)) return imeContext.m_hr; diff --git a/dll/ime/msctfime/functions.cpp b/dll/ime/msctfime/functions.cpp index c9832f90cff..2852aece1cd 100644 --- a/dll/ime/msctfime/functions.cpp +++ b/dll/ime/msctfime/functions.cpp @@ -150,26 +150,112 @@ STDMETHODIMP_(ULONG) CFnDocFeed::Release() return m_cRefs; } -/// @unimplemented +/// @implemented STDMETHODIMP CFnDocFeed::DocFeed() { - return E_NOTIMPL; + TLS *pTLS = TLS::GetTLS(); + if (!pTLS) + return E_OUTOFMEMORY; + + HIMC hIMC = GetActiveContext(); + CicIMCLock imcLock(hIMC); + if (FAILED(imcLock.m_hr)) + return imcLock.m_hr; + + CicIMCCLock<CTFIMECONTEXT> imeContext(imcLock.get().hCtfImeContext); + if (FAILED(imeContext.m_hr)) + return imeContext.m_hr; + CicInputContext *pCicIC = imeContext.get().m_pCicIC; + if (!pCicIC) + return E_FAIL; + + UINT uCodePage = CP_ACP; + pTLS->m_pProfile->GetCodePageA(&uCodePage); + pCicIC->SetupDocFeedString(imcLock, uCodePage); + return S_OK; } -/// @unimplemented +/// @implemented STDMETHODIMP CFnDocFeed::ClearDocFeedBuffer() { - return E_NOTIMPL; + if (!TLS::GetTLS()) + return E_OUTOFMEMORY; + + HIMC hIMC = GetActiveContext(); + CicIMCLock imcLock(hIMC); + if (FAILED(imcLock.m_hr)) + return imcLock.m_hr; + + CicIMCCLock<CTFIMECONTEXT> imeContext(imcLock.get().hCtfImeContext); + if (FAILED(imeContext.m_hr)) + return imeContext.m_hr; + + CicInputContext *pCicIC = imeContext.get().m_pCicIC; + if (!pCicIC) + return E_FAIL; + + pCicIC->EscbClearDocFeedBuffer(imcLock, TRUE); + return S_OK; } /// @unimplemented STDMETHODIMP CFnDocFeed::StartReconvert() { - return E_NOTIMPL; + TLS *pTLS = TLS::GetTLS(); + if (!pTLS) + return E_OUTOFMEMORY; + auto *pThreadMgr = pTLS->m_pThreadMgr; + if (!pThreadMgr) + return E_OUTOFMEMORY; + + HIMC hIMC = GetActiveContext(); + CicIMCLock imcLock(hIMC); + if (FAILED(imcLock.m_hr)) + return imcLock.m_hr; + + CicIMCCLock<CTFIMECONTEXT> imeContext(imcLock.get().hCtfImeContext); + if (FAILED(imeContext.m_hr)) + return imeContext.m_hr; + CicInputContext *pCicIC = imeContext.get().m_pCicIC; + if (!pCicIC) + return E_FAIL; + + UINT uCodePage = CP_ACP; + pTLS->m_pProfile->GetCodePageA(&uCodePage); + + pCicIC->m_bReconverting = TRUE; + pCicIC->SetupReconvertString(imcLock, pThreadMgr, uCodePage, 0, 0); + pCicIC->EndReconvertString(imcLock); + pCicIC->m_bReconverting = FALSE; + return S_OK; } -/// @unimplemented +/// @implemented STDMETHODIMP CFnDocFeed::StartUndoCompositionString() { - return E_NOTIMPL; + TLS *pTLS = TLS::GetTLS(); + if (!pTLS) + return E_OUTOFMEMORY; + auto *pThreadMgr = pTLS->m_pThreadMgr; + if (!pThreadMgr) + return E_OUTOFMEMORY; + + HIMC hIMC = GetActiveContext(); + CicIMCLock imcLock(hIMC); + if (FAILED(imcLock.m_hr)) + return imcLock.m_hr; + + CicIMCCLock<CTFIMECONTEXT> imeContext(imcLock.get().hCtfImeContext); + if (FAILED(imeContext.m_hr)) + return imeContext.m_hr; + CicInputContext *pCicIC = imeContext.get().m_pCicIC; + if (!pCicIC) + return E_FAIL; + + UINT uCodePage = CP_ACP; + pTLS->m_pProfile->GetCodePageA(&uCodePage); + + pCicIC->SetupReconvertString(imcLock, pThreadMgr, uCodePage, 0, TRUE); + pCicIC->EndReconvertString(imcLock); + return S_OK; } diff --git a/dll/ime/msctfime/inputcontext.cpp b/dll/ime/msctfime/inputcontext.cpp index 1bdf64cb62e..81344d26545 100644 --- a/dll/ime/msctfime/inputcontext.cpp +++ b/dll/ime/msctfime/inputcontext.cpp @@ -65,7 +65,7 @@ CicInputContext::OnStartComposition( ITfCompositionView *pComposition, BOOL *pfOk) { - if ((m_cCompLocks <= 0) || m_dwUnknown6_5) + if ((m_cCompLocks <= 0) || m_bReconverting) { *pfOk = TRUE; ++m_cCompLocks; @@ -103,13 +103,10 @@ CicInputContext::GetGuidAtom( _Out_opt_ LPDWORD pdwGuidAtom) { CicIMCCLock<CTFIMECONTEXT> imeContext(imcLock.get().hCompStr); - HRESULT hr = imeContext.m_hr; - if (!imeContext) - hr = E_FAIL; - if (FAILED(hr)) - return hr; + if (FAILED(imeContext.m_hr)) + return imeContext.m_hr; - hr = E_FAIL; + HRESULT hr = E_FAIL; if (iAtom < m_cGuidAtoms) { *pdwGuidAtom = m_adwGuidAtoms[iAtom]; @@ -251,6 +248,36 @@ CicInputContext::OnCleanupContext( return S_OK; } +/// @unimplemented +HRESULT CicInputContext::SetupDocFeedString(CicIMCLock& imcLock, UINT uCodePage) +{ + return E_NOTIMPL; +} + +/// @unimplemented +HRESULT CicInputContext::EscbClearDocFeedBuffer(CicIMCLock& imcLock, BOOL bFlag) +{ + return E_NOTIMPL; +} + +/// @unimplemented +HRESULT +CicInputContext::SetupReconvertString( + CicIMCLock& imcLock, + ITfThreadMgr_P *pThreadMgr, + UINT uCodePage, + DWORD dwUnknown61, + BOOL bUndo) +{ + return E_NOTIMPL; +} + +/// @unimplemented +HRESULT CicInputContext::EndReconvertString(CicIMCLock& imcLock) +{ + return E_NOTIMPL; +} + /// Retrieves the IME information. /// @implemented HRESULT diff --git a/dll/ime/msctfime/inputcontext.h b/dll/ime/msctfime/inputcontext.h index 2273161926e..b567304b779 100644 --- a/dll/ime/msctfime/inputcontext.h +++ b/dll/ime/msctfime/inputcontext.h @@ -47,7 +47,7 @@ public: GUID m_guid; DWORD m_dwUnknown6[11]; BOOL m_bSelecting; - DWORD m_dwUnknown6_5; + BOOL m_bReconverting; LONG m_cCompLocks; DWORD m_dwUnknown7[5]; WORD m_cGuidAtoms; @@ -88,4 +88,14 @@ public: HRESULT CreateInputContext(_Inout_ ITfThreadMgr *pThreadMgr, _Inout_ CicIMCLock& imcLock); HRESULT DestroyInputContext(); + + HRESULT SetupDocFeedString(CicIMCLock& imcLock, UINT uCodePage); + HRESULT EscbClearDocFeedBuffer(CicIMCLock& imcLock, BOOL bFlag); + HRESULT SetupReconvertString( + CicIMCLock& imcLock, + ITfThreadMgr_P *pThreadMgr, + UINT uCodePage, + DWORD dwUnknown61, + BOOL bUndo); + HRESULT EndReconvertString(CicIMCLock& imcLock); }; diff --git a/dll/ime/msctfime/msctfime.cpp b/dll/ime/msctfime/msctfime.cpp index 445998d6a9c..87ca208819c 100644 --- a/dll/ime/msctfime/msctfime.cpp +++ b/dll/ime/msctfime/msctfime.cpp @@ -142,14 +142,6 @@ HRESULT InitDisplayAttrbuteLib(PCIC_LIBTHREAD pLibThread) return hr; } -HIMC GetActiveContext(VOID) -{ - HWND hwndFocus = ::GetFocus(); - if (!hwndFocus) - hwndFocus = ::GetActiveWindow(); - return ::ImmGetContext(hwndFocus); -} - /// @implemented HRESULT UninitDisplayAttrbuteLib(PCIC_LIBTHREAD pLibThread) { @@ -184,8 +176,6 @@ InternalSelectEx( _In_ LANGID LangID) { CicIMCLock imcLock(hIMC); - if (!imcLock) - imcLock.m_hr = E_FAIL; if (FAILED(imcLock.m_hr)) return imcLock.m_hr; @@ -608,25 +598,17 @@ CtfImeGetGuidAtom( TRACE("(%p, 0x%lX, %p)\n", hIMC, dwUnknown, pdwGuidAtom); CicIMCLock imcLock(hIMC); - - HRESULT hr = imcLock.m_hr; - if (!imcLock) - hr = E_FAIL; - if (FAILED(hr)) - return hr; + if (FAILED(imcLock.m_hr)) + return imcLock.m_hr; CicIMCCLock<CTFIMECONTEXT> imccLock(imcLock.get().hCtfImeContext); - hr = imccLock.m_hr; - if (!imccLock) - hr = E_FAIL; - if (FAILED(hr)) - return hr; + if (FAILED(imccLock.m_hr)) + return imccLock.m_hr; if (!imccLock.get().m_pCicIC) return E_OUTOFMEMORY; - hr = imccLock.get().m_pCicIC->GetGuidAtom(imcLock, dwUnknown, pdwGuidAtom); - return hr; + return imccLock.get().m_pCicIC->GetGuidAtom(imcLock, dwUnknown, pdwGuidAtom); } /*********************************************************************** @@ -641,13 +623,8 @@ CtfImeIsGuidMapEnable( TRACE("(%p)\n", hIMC); BOOL ret = FALSE; - HRESULT hr; CicIMCLock imcLock(hIMC); - - hr = imcLock.m_hr; - if (!imcLock) - hr = E_FAIL; - if (SUCCEEDED(hr)) + if (SUCCEEDED(imcLock.m_hr)) ret = !!(imcLock.get().fdwInit & INIT_GUIDMAP); return ret; diff --git a/dll/ime/msctfime/msctfime.h b/dll/ime/msctfime/msctfime.h index 7b2f2fff822..cb482318830 100644 --- a/dll/ime/msctfime/msctfime.h +++ b/dll/ime/msctfime/msctfime.h @@ -40,6 +40,14 @@ EXTERN_C BOOLEAN WINAPI DllShutdownInProgress(VOID); HRESULT InitDisplayAttrbuteLib(PCIC_LIBTHREAD pLibThread); HRESULT UninitDisplayAttrbuteLib(PCIC_LIBTHREAD pLibThread); +static inline HIMC GetActiveContext(VOID) +{ + HWND hwndFocus = ::GetFocus(); + if (!hwndFocus) + hwndFocus = ::GetActiveWindow(); + return ::ImmGetContext(hwndFocus); +} + DEFINE_GUID(GUID_COMPARTMENT_CTFIME_DIMFLAGS, 0xA94C5FD2, 0xC471, 0x4031, 0x95, 0x46, 0x70, 0x9C, 0x17, 0x30, 0x0C, 0xB9); DEFINE_GUID(GUID_COMPARTMENT_CTFIME_CICINPUTCONTEXT, 0x85A688F7, 0x6DC8, 0x4F17, 0xA8, 0x3A, 0xB1, 0x1C, 0x09, 0xCD, 0xD7, 0xBF); diff --git a/dll/ime/msctfime/ui.cpp b/dll/ime/msctfime/ui.cpp index 660d20824d6..2fec663f97f 100644 --- a/dll/ime/msctfime/ui.cpp +++ b/dll/ime/msctfime/ui.cpp @@ -357,8 +357,6 @@ STDMETHODIMP_(LRESULT) CDefCompFrameWindow::OnWindowPosChanged(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { CicIMCLock imcLock(m_hIMC); - if (!imcLock) - imcLock.m_hr = E_FAIL; if (SUCCEEDED(imcLock.m_hr)) ::SendMessage(imcLock.get().hWnd, WM_IME_NOTIFY, 0xF, (LPARAM)m_hIMC); return ::DefWindowProc(hWnd, uMsg, wParam, lParam); diff --git a/sdk/lib/cicero/cicimc.h b/sdk/lib/cicero/cicimc.h index 779884abfdd..7db0783cee5 100644 --- a/sdk/lib/cicero/cicimc.h +++ b/sdk/lib/cicero/cicimc.h @@ -45,8 +45,7 @@ class CicIMCCLock : public CIC_IMCC_LOCK<T_DATA> public: CicIMCCLock(HIMCC hIMCC) : CIC_IMCC_LOCK<T_DATA>(hIMCC) { - if (hIMCC) - _LockIMCC(this->m_hIMCC, &this->m_pIMCC); + this->m_hr = _LockIMCC(this->m_hIMCC, &this->m_pIMCC); } ~CicIMCCLock() {

10 months, 3 weeks

[reactos] 01/01: [EXT2FS] Ext2Read(): Complete request on VCB_VOLUME_LOCKED case (#4770)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0086d05007aaa4505afd5… commit 0086d05007aaa4505afd5e1f38c87ac965aac840 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Wed Feb 21 16:31:09 2024 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Feb 21 07:31:09 2024 -0800 [EXT2FS] Ext2Read(): Complete request on VCB_VOLUME_LOCKED case (#4770) CORE-10645 Co-authored-by: Victor Martinez Calvo <vicmarcal(a)gmail.com> --- drivers/filesystems/ext2/src/read.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/filesystems/ext2/src/read.c b/drivers/filesystems/ext2/src/read.c index b01e97e1c35..b754299b496 100644 --- a/drivers/filesystems/ext2/src/read.c +++ b/drivers/filesystems/ext2/src/read.c @@ -905,6 +905,9 @@ Ext2Read (IN PEXT2_IRP_CONTEXT IrpContext) if (FlagOn(Vcb->Flags, VCB_VOLUME_LOCKED) && Vcb->LockFile != FileObject ) { Status = STATUS_ACCESS_DENIED; +#ifdef __REACTOS__ + bCompleteRequest = TRUE; +#endif _SEH2_LEAVE; }

10 months, 3 weeks

[reactos] 01/01: [MSCTFIME][CICERO] Implement CDefCompFrameWindow (#6512)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a55345be298e4f7ab4521… commit a55345be298e4f7ab452109c77bf8b97e9e3ad18 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Feb 21 10:36:32 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Feb 21 10:36:32 2024 +0900 [MSCTFIME][CICERO] Implement CDefCompFrameWindow (#6512) Supporting TIPs... JIRA issue: CORE-19360 - Add delay link to uxtheme.dll. - Implement CDefCompFrameGripper, CCompFinalizeButton, CCompButtonFrameWindow, and CDefCompFrameWindow classes. --- dll/ime/msctfime/CMakeLists.txt | 2 +- dll/ime/msctfime/msctfime.h | 1 + dll/ime/msctfime/ui.cpp | 322 ++++++++++++++++++++++++++++++++++++++++ dll/ime/msctfime/ui.h | 95 ++++++++++++ sdk/lib/cicero/cicuif.cpp | 8 +- sdk/lib/cicero/cicuif.h | 4 +- 6 files changed, 425 insertions(+), 7 deletions(-) diff --git a/dll/ime/msctfime/CMakeLists.txt b/dll/ime/msctfime/CMakeLists.txt index 288c14afc7f..3a48a7cbabb 100644 --- a/dll/ime/msctfime/CMakeLists.txt +++ b/dll/ime/msctfime/CMakeLists.txt @@ -26,5 +26,5 @@ set_module_type(msctfime win32dll UNICODE) set_target_properties(msctfime PROPERTIES SUFFIX ".ime") target_link_libraries(msctfime wine uuid cicero) add_importlibs(msctfime user32 gdi32 advapi32 msvcrt kernel32 ntdll) -add_delay_importlibs(msctfime comctl32 msctf oleaut32 imm32) +add_delay_importlibs(msctfime uxtheme comctl32 msctf oleaut32 imm32) add_cd_file(TARGET msctfime DESTINATION reactos/system32 FOR all) diff --git a/dll/ime/msctfime/msctfime.h b/dll/ime/msctfime/msctfime.h index f7ada8fbd6e..7b2f2fff822 100644 --- a/dll/ime/msctfime/msctfime.h +++ b/dll/ime/msctfime/msctfime.h @@ -28,6 +28,7 @@ #include <cicarray.h> #include <cicimc.h> #include <cictf.h> +#include <cicreg.h> #include <ciccaret.h> #include <cicuif.h> #include <cicutb.h> diff --git a/dll/ime/msctfime/ui.cpp b/dll/ime/msctfime/ui.cpp index 74a8c733de0..660d20824d6 100644 --- a/dll/ime/msctfime/ui.cpp +++ b/dll/ime/msctfime/ui.cpp @@ -9,6 +9,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(msctfime); +/***********************************************************************/ + UINT WM_MSIME_SERVICE = 0; UINT WM_MSIME_UIREADY = 0; UINT WM_MSIME_RECONVERTREQUEST = 0; @@ -61,6 +63,326 @@ BOOL RegisterMSIMEMessage(VOID) WM_MSIME_KEYMAP); } +/***********************************************************************/ + +/// @implemented +CDefCompFrameGripper::CDefCompFrameGripper( + CDefCompFrameWindow *pDefCompFrameWindow, + LPCRECT prc, + DWORD style) : CUIFGripper(pDefCompFrameWindow, prc, style) +{ + m_pDefCompFrameWindow = pDefCompFrameWindow; +} + +/***********************************************************************/ + +/// @implemented +CCompFinalizeButton::CCompFinalizeButton( + CCompFrameWindow *pParent, + DWORD nObjectID, + LPCRECT prc, + DWORD style, + DWORD dwButtonFlags, + LPCWSTR pszText) + : CUIFToolbarButton(pParent, nObjectID, prc, style, dwButtonFlags, pszText) +{ + m_pCompFrameWindow = pParent; +} + +/// @implemented +CCompFinalizeButton::~CCompFinalizeButton() +{ + HICON hIcon = CUIFToolbarButton::GetIcon(); + if (hIcon) + { + ::DestroyIcon(hIcon); + CUIFToolbarButton::SetIcon(NULL); + } +} + +/// @implemented +void CCompFinalizeButton::OnLeftClick() +{ + HIMC hIMC = m_pCompFrameWindow->m_hIMC; + if (hIMC) + ::ImmNotifyIME(hIMC, NI_COMPOSITIONSTR, CPS_COMPLETE, 0); +} + +/***********************************************************************/ + +/// @implemented +CCompFrameWindow::CCompFrameWindow(HIMC hIMC, DWORD style) + : CUIFWindow(g_hInst, style) +{ + m_hIMC = hIMC; +} + +/***********************************************************************/ + +/// @implemented +CCompButtonFrameWindow::CCompButtonFrameWindow(HIMC hIMC, DWORD style) + : CCompFrameWindow(hIMC, style) +{ +} + +/// @implemented +void CCompButtonFrameWindow::Init() +{ + if (m_pFinalizeButton) + return; + + RECT rc = { 0, 0, 0, 0 }; + m_pFinalizeButton = new(cicNoThrow) CCompFinalizeButton(this, 0, &rc, 0, 0x10000, NULL); + + m_pFinalizeButton->Initialize(); + m_pFinalizeButton->Init(); + + HICON hIcon = (HICON)::LoadImageW(g_hInst, MAKEINTRESOURCEW(IDI_DOWN), IMAGE_ICON, 16, 16, 0); + m_pFinalizeButton->SetIcon(hIcon); + + WCHAR szText[256]; + LoadStringW(g_hInst, IDS_FINALIZE_STRING, szText, _countof(szText)); + m_pFinalizeButton->SetToolTip(szText); + + AddUIObj(m_pFinalizeButton); +} + +/// @implemented +void CCompButtonFrameWindow::MoveShow(LONG x, LONG y, BOOL bShow) +{ + INT nWidth = m_Margins.cxRightWidth + m_Margins.cxLeftWidth + 18; + INT nHeight = m_Margins.cyBottomHeight + m_Margins.cyTopHeight + 18; + Move(x, y, nWidth + 4, nHeight + 4); + + if (m_pFinalizeButton) + { + RECT rc = { 1, 1, nWidth + 1, nHeight + 1 }; + m_pFinalizeButton->SetRect(&rc); + } + + Show(bShow); +} + +/// @implemented +STDMETHODIMP_(void) CCompButtonFrameWindow::OnCreate(HWND hWnd) +{ + ::SetWindowTheme(hWnd, L"TOOLBAR", NULL); + + ZeroMemory(&m_Margins, sizeof(m_Margins)); + + CUIFTheme theme; + theme.m_hTheme = NULL; + theme.m_iPartId = 1; + theme.m_iStateId = 0; + theme.m_pszClassList = L"TOOLBAR"; + if (SUCCEEDED(theme.InternalOpenThemeData(hWnd))) + theme.GetThemeMargins(NULL, 1, 3602, NULL, &m_Margins); +} + +/***********************************************************************/ + +/// @implemented +CDefCompFrameWindow::CDefCompFrameWindow(HIMC hIMC, DWORD style) + : CCompFrameWindow(hIMC, style) +{ + LoadPosition(); + m_iPartId = 1; + m_iStateId = 1; + m_pszClassList = L"TASKBAR"; +} + +/// @implemented +CDefCompFrameWindow::~CDefCompFrameWindow() +{ + SavePosition(); +} + +/// @implemented +void CDefCompFrameWindow::Init() +{ + RECT rc; + + if (!m_pGripper) + { + ZeroMemory(&rc, sizeof(rc)); + m_pGripper = new(cicNoThrow) CDefCompFrameGripper(this, &rc, 0); + m_pGripper->Initialize(); + AddUIObj(m_pGripper); + } + + if (!m_pFinalizeButton) + { + ZeroMemory(&rc, sizeof(rc)); + m_pFinalizeButton = new(cicNoThrow) CCompFinalizeButton(this, 0, &rc, 0, 0x10000, NULL); + m_pFinalizeButton->Initialize(); + m_pFinalizeButton->Init(); + + HICON hIcon = (HICON)LoadImageW(g_hInst, MAKEINTRESOURCEW(IDI_DOWN), IMAGE_ICON, 16, 16, 0); + m_pFinalizeButton->SetIcon(hIcon); + + WCHAR szText[256]; + ::LoadStringW(g_hInst, IDS_FINALIZE_STRING, szText, _countof(szText)); + SetToolTip(szText); + + AddUIObj(m_pFinalizeButton); + } +} + +/// @implemented +INT CDefCompFrameWindow::GetGripperWidth() +{ + if (!m_pGripper || FAILED(m_pGripper->EnsureThemeData(m_hWnd))) + return 5; + + INT ret = -1; + HDC hDC = ::GetDC(m_hWnd); + SIZE partSize; + if (SUCCEEDED(m_pGripper->GetThemePartSize(hDC, 1, 0, TS_TRUE, &partSize))) + ret = partSize.cx + 4; + + ::ReleaseDC(m_hWnd, hDC); + + return ((ret < 0) ? 5 : ret); +} + +/// @implemented +void CDefCompFrameWindow::MyScreenToClient(LPPOINT ppt, LPRECT prc) +{ + if (ppt) + ::ScreenToClient(m_hWnd, ppt); + + if (prc) + { + ::ScreenToClient(m_hWnd, (LPPOINT)prc); + ::ScreenToClient(m_hWnd, (LPPOINT)&prc->right); + } +} + +/// @implemented +void CDefCompFrameWindow::SetCompStrRect(INT nWidth, INT nHeight, BOOL bShow) +{ + INT GripperWidth = GetGripperWidth(); + + RECT rc; + ::GetWindowRect(m_hWnd, &rc); + + Move(rc.left, rc.top, GripperWidth + nWidth + 24, nHeight + 10); + + if (m_pGripper) + { + rc = { 2, 3, GripperWidth + 2, nHeight + 7 }; + m_pGripper->SetRect(&rc); + } + + if (m_pFinalizeButton) + { + rc = { + GripperWidth + nWidth + 4, + 3, + m_Margins.cxLeftWidth + m_Margins.cxRightWidth + GripperWidth + nWidth + 22, + m_Margins.cyBottomHeight + m_Margins.cyTopHeight + 21 + }; + m_pFinalizeButton->SetRect(&rc); + } + + Show(bShow); + + ::MoveWindow(m_hwndDefCompFrame, GripperWidth + 2, 7, nWidth, nHeight, TRUE); + ::ShowWindow(m_hwndDefCompFrame, (bShow ? SW_SHOWNOACTIVATE : SW_HIDE)); +} + +/// @implemented +void CDefCompFrameWindow::LoadPosition() +{ + DWORD x = 0, y = 0; + + LSTATUS error; + CicRegKey regKey; + error = regKey.Open(HKEY_CURRENT_USER, + TEXT("SOFTWARE\\Microsoft\\CTF\\CUAS\\DefaultCompositionWindow")); + if (error == ERROR_SUCCESS) + { + regKey.QueryDword(TEXT("Left"), &x); + regKey.QueryDword(TEXT("Top"), &y); + } + + Move(x, y, 0, 0); +} + +/// @implemented +void CDefCompFrameWindow::SavePosition() +{ + LSTATUS error; + CicRegKey regKey; + error = regKey.Create(HKEY_CURRENT_USER, + TEXT("SOFTWARE\\Microsoft\\CTF\\CUAS\\DefaultCompositionWindow")); + if (error == ERROR_SUCCESS) + { + regKey.SetDword(TEXT("Left"), m_nLeft); + regKey.SetDword(TEXT("Top"), m_nTop); + } +} + +/// @implemented +STDMETHODIMP_(void) CDefCompFrameWindow::OnCreate(HWND hWnd) +{ + ::SetWindowTheme(hWnd, L"TASKBAR", NULL); + + ZeroMemory(&m_Margins, sizeof(m_Margins)); + + CUIFTheme theme; + theme.m_hTheme = NULL; + theme.m_iPartId = 1; + theme.m_iStateId = 0; + theme.m_pszClassList = L"TOOLBAR"; + if (SUCCEEDED(theme.InternalOpenThemeData(hWnd))) + GetThemeMargins(NULL, 1, 3602, NULL, &m_Margins); +} + +/// @implemented +STDMETHODIMP_(BOOL) CDefCompFrameWindow::OnSetCursor(UINT uMsg, LONG x, LONG y) +{ + if (!::IsWindow(m_hwndDefCompFrame)) + return FALSE; + + RECT rc; + ::GetWindowRect(m_hwndDefCompFrame, &rc); + MyScreenToClient(NULL, &rc); + POINT pt = { x, y }; + return ::PtInRect(&rc, pt); +} + +/// @implemented +STDMETHODIMP_(LRESULT) +CDefCompFrameWindow::OnWindowPosChanged(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + CicIMCLock imcLock(m_hIMC); + if (!imcLock) + imcLock.m_hr = E_FAIL; + if (SUCCEEDED(imcLock.m_hr)) + ::SendMessage(imcLock.get().hWnd, WM_IME_NOTIFY, 0xF, (LPARAM)m_hIMC); + return ::DefWindowProc(hWnd, uMsg, wParam, lParam); +} + +/// @implemented +STDMETHODIMP_(void) CDefCompFrameWindow::HandleMouseMsg(UINT uMsg, LONG x, LONG y) +{ + if (::IsWindow(m_hwndDefCompFrame)) + { + RECT rc; + ::GetWindowRect(m_hwndDefCompFrame, &rc); + MyScreenToClient(NULL, &rc); + + POINT pt = { x, y }; + if (::PtInRect(&rc, pt)) + ::SendMessage(m_hwndDefCompFrame, 0x7E8, 0, 0); + } + + CUIFWindow::HandleMouseMsg(uMsg, x, y); +} + +/***********************************************************************/ + // For GetWindowLongPtr/SetWindowLongPtr #define UIGWLP_HIMC 0 #define UIGWLP_UI sizeof(HIMC) diff --git a/dll/ime/msctfime/ui.h b/dll/ime/msctfime/ui.h index e9433fc734c..71b32ebb40d 100644 --- a/dll/ime/msctfime/ui.h +++ b/dll/ime/msctfime/ui.h @@ -7,6 +7,15 @@ #pragma once +class CUIFGripper; + class CDefCompFrameGripper; +class CUIFToolbarButton; + class CCompFinalizeButton; +class CUIFWindow; + class CCompFrameWindow; + class CCompButtonFrameWindow; + class CDefCompFrameWindow; + /***********************************************************************/ extern UINT WM_MSIME_SERVICE; @@ -25,6 +34,92 @@ BOOL RegisterMSIMEMessage(VOID); /***********************************************************************/ +class CDefCompFrameGripper : public CUIFGripper +{ +public: + CDefCompFrameWindow *m_pDefCompFrameWindow; + + CDefCompFrameGripper(CDefCompFrameWindow *pDefCompFrameWindow, LPCRECT prc, DWORD style); +}; + +/***********************************************************************/ + +class CCompFrameWindow; + +class CCompFinalizeButton : public CUIFToolbarButton +{ +public: + CCompFrameWindow *m_pCompFrameWindow; + + CCompFinalizeButton( + CCompFrameWindow *pParent, + DWORD nObjectID, + LPCRECT prc, + DWORD style, + DWORD dwButtonFlags, + LPCWSTR pszText); + ~CCompFinalizeButton() override; + + STDMETHOD_(void, OnLeftClick)() override; +}; + +/***********************************************************************/ + +class CCompFrameWindow : public CUIFWindow +{ +public: + HIMC m_hIMC; + + CCompFrameWindow(HIMC hIMC, DWORD style); +}; + +/***********************************************************************/ + +class CCompButtonFrameWindow : public CCompFrameWindow +{ +public: + MARGINS m_Margins; + CCompFinalizeButton *m_pFinalizeButton; + + CCompButtonFrameWindow(HIMC hIMC, DWORD style); + + void Init(); + void MoveShow(LONG x, LONG y, BOOL bShow); + + STDMETHOD_(void, OnCreate)(HWND hWnd) override; +}; + +/***********************************************************************/ + +class CDefCompFrameWindow : public CCompFrameWindow +{ +public: + HWND m_hwndDefCompFrame; + CDefCompFrameGripper *m_pGripper; + CCompFinalizeButton *m_pFinalizeButton; + MARGINS m_Margins; + +public: + CDefCompFrameWindow(HIMC hIMC, DWORD style); + ~CDefCompFrameWindow() override; + + void Init(); + INT GetGripperWidth(); + void MyScreenToClient(LPPOINT ppt, LPRECT prc); + void SetCompStrRect(INT nWidth, INT nHeight, BOOL bShow); + + void LoadPosition(); + void SavePosition(); + + STDMETHOD_(void, OnCreate)(HWND hWnd) override; + STDMETHOD_(BOOL, OnSetCursor)(UINT uMsg, LONG x, LONG y) override; + STDMETHOD_(LRESULT, OnWindowPosChanged)(HWND hWnd, UINT uMsg, WPARAM wParam, + LPARAM lParam) override; + STDMETHOD_(void, HandleMouseMsg)(UINT uMsg, LONG x, LONG y) override; +}; + +/***********************************************************************/ + struct UIComposition { void OnImeStartComposition(CicIMCLock& imcLock, HWND hUIWnd); diff --git a/sdk/lib/cicero/cicuif.cpp b/sdk/lib/cicero/cicuif.cpp index 322058e1ad3..3ef832053a9 100644 --- a/sdk/lib/cicero/cicuif.cpp +++ b/sdk/lib/cicero/cicuif.cpp @@ -3409,7 +3409,7 @@ STDMETHODIMP_(void) CUIFToolbarMenuButton::OnLButtonUp(LONG x, LONG y) { CUIFButton::OnLButtonUp(x, y); - m_pToolbarButton->OnUnknownMouse2(x, y); + m_pToolbarButton->OnUnknownMouse0(); } STDMETHODIMP_(BOOL) @@ -3444,16 +3444,16 @@ CUIFToolbarButtonElement::OnLButtonUp(LONG x, LONG y) { CUIFButton::OnLButtonUp(x, y); if ((m_pToolbarButton->m_dwToolbarButtonFlags & 0x30000) == 0x20000) - m_pToolbarButton->OnUnknownMouse2(x, y); + m_pToolbarButton->OnUnknownMouse0(); else - m_pToolbarButton->OnUnknownMouse1(x, y); + m_pToolbarButton->OnLeftClick(); } STDMETHODIMP_(void) CUIFToolbarButtonElement::OnRButtonUp(LONG x, LONG y) { if ((m_pToolbarButton->m_dwToolbarButtonFlags & 0x30000) != 0x20000) - m_pToolbarButton->OnUnknownMouse0(); + m_pToolbarButton->OnRightClick(); } ///////////////////////////////////////////////////////////////////////////// diff --git a/sdk/lib/cicero/cicuif.h b/sdk/lib/cicero/cicuif.h index e01518cb05d..6ec4f1deeb3 100644 --- a/sdk/lib/cicero/cicuif.h +++ b/sdk/lib/cicero/cicuif.h @@ -928,8 +928,8 @@ public: STDMETHOD_(void, SetToolTip)(LPCWSTR pszToolTip) override; STDMETHOD_(void, OnUnknownMouse0)() { } - STDMETHOD_(void, OnUnknownMouse1)(LONG x, LONG y) { } - STDMETHOD_(void, OnUnknownMouse2)(LONG x, LONG y) { } + STDMETHOD_(void, OnLeftClick)() { } + STDMETHOD_(void, OnRightClick)() { } }; /////////////////////////////////////////////////////////////////////////////

10 months, 3 weeks

[reactos] 01/01: [SETUPLIB][USETUP] Some cleanup for partition code.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b7ad4a2298edc0c232e00… commit b7ad4a2298edc0c232e001c1662205dad022578f Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Dec 7 23:29:28 2023 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Feb 20 15:52:37 2024 +0100 [SETUPLIB][USETUP] Some cleanup for partition code. - Make the Create*Partition helpers take a size in bytes, not in sectors. This allows them to be easier to use by the caller, alleviating the need for making the size conversion into sectors. Instead it is done internally by the helpers. - Introduce helper macros to easily retrieve the size of a partition entry or a disk in bytes, from their internal representation in number of sectors. - The 'AutoCreate' variable being USETUP-specific, remove it from the PARTENTRY structure and use instead a flag set into the 'New' member. - Rename IsDiskSizeValid to IsPartitionLargeEnough, to better describe what the function is for. --- base/setup/lib/utils/osdetect.c | 6 +- base/setup/lib/utils/partlist.c | 104 ++++++++++++++++--------------- base/setup/lib/utils/partlist.h | 18 ++++-- base/setup/usetup/partlist.c | 4 +- base/setup/usetup/usetup.c | 134 ++++++++++++++++++++-------------------- 5 files changed, 139 insertions(+), 127 deletions(-) diff --git a/base/setup/lib/utils/osdetect.c b/base/setup/lib/utils/osdetect.c index 0ee246c60b1..cc45fa907c2 100644 --- a/base/setup/lib/utils/osdetect.c +++ b/base/setup/lib/utils/osdetect.c @@ -806,12 +806,11 @@ CreateNTOSInstallationsList( ASSERT(PartEntry->DiskEntry == DiskEntry); - DPRINT(" Primary Partition #%d, index %d - Type 0x%02x, IsLogical = %s, IsPartitioned = %s, IsNew = %s, AutoCreate = %s, FormatState = %lu -- Should I check it? %s\n", + DPRINT(" Primary Partition #%d, index %d - Type 0x%02x, IsLogical = %s, IsPartitioned = %s, IsNew = %s, FormatState = %lu -- Should I check it? %s\n", PartEntry->PartitionNumber, PartEntry->PartitionIndex, PartEntry->PartitionType, PartEntry->LogicalPartition ? "TRUE" : "FALSE", PartEntry->IsPartitioned ? "TRUE" : "FALSE", PartEntry->New ? "Yes" : "No", - PartEntry->AutoCreate ? "Yes" : "No", PartEntry->FormatState, ShouldICheckThisPartition(PartEntry) ? "YES!" : "NO!"); @@ -828,12 +827,11 @@ CreateNTOSInstallationsList( ASSERT(PartEntry->DiskEntry == DiskEntry); - DPRINT(" Logical Partition #%d, index %d - Type 0x%02x, IsLogical = %s, IsPartitioned = %s, IsNew = %s, AutoCreate = %s, FormatState = %lu -- Should I check it? %s\n", + DPRINT(" Logical Partition #%d, index %d - Type 0x%02x, IsLogical = %s, IsPartitioned = %s, IsNew = %s, FormatState = %lu -- Should I check it? %s\n", PartEntry->PartitionNumber, PartEntry->PartitionIndex, PartEntry->PartitionType, PartEntry->LogicalPartition ? "TRUE" : "FALSE", PartEntry->IsPartitioned ? "TRUE" : "FALSE", PartEntry->New ? "Yes" : "No", - PartEntry->AutoCreate ? "Yes" : "No", PartEntry->FormatState, ShouldICheckThisPartition(PartEntry) ? "YES!" : "NO!"); diff --git a/base/setup/lib/utils/partlist.c b/base/setup/lib/utils/partlist.c index 49c15e9ffe2..6bb16fed9d4 100644 --- a/base/setup/lib/utils/partlist.c +++ b/base/setup/lib/utils/partlist.c @@ -552,7 +552,7 @@ IsSuperFloppy( } /* The partition lengths should agree */ - PartitionLengthEstimate = DiskEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector; + PartitionLengthEstimate = GetDiskSizeInBytes(DiskEntry); if (PartitionInfo->PartitionLength.QuadPart != PartitionLengthEstimate) { DPRINT1("PartitionLength = %I64u is different from PartitionLengthEstimate = %I64u\n", @@ -676,26 +676,46 @@ CreateInsertBlankRegion( static BOOLEAN InitializePartitionEntry( - IN OUT PPARTENTRY PartEntry, - IN ULONGLONG SectorCount, - IN BOOLEAN AutoCreate) + _Inout_ PPARTENTRY PartEntry, + _In_opt_ ULONGLONG SizeBytes) { PDISKENTRY DiskEntry = PartEntry->DiskEntry; + ULONGLONG SectorCount; + + DPRINT1("Current entry sector count: %I64u\n", PartEntry->SectorCount.QuadPart); - DPRINT1("Current partition sector count: %I64u\n", PartEntry->SectorCount.QuadPart); + /* The entry must not be already partitioned and not be void */ + ASSERT(!PartEntry->IsPartitioned); + ASSERT(PartEntry->SectorCount.QuadPart); + + /* Convert the size in bytes to sector count. SizeBytes being + * zero means the caller wants to use all the empty space. */ + if ((SizeBytes == 0) || (SizeBytes == GetPartEntrySizeInBytes(PartEntry))) + { + /* Use all of the unpartitioned disk space */ + SectorCount = PartEntry->SectorCount.QuadPart; + } + else + { + SectorCount = SizeBytes / DiskEntry->BytesPerSector; + if (SectorCount == 0) + { + /* SizeBytes was certainly less than the minimal size, so fail */ + DPRINT1("Partition size %I64u too small\n", SizeBytes); + return FALSE; + } + } + DPRINT1(" New sector count: %I64u\n", SectorCount); - /* Fail if we try to initialize this partition entry with more sectors than what it actually contains */ + /* Fail if we request more sectors than what the entry actually contains */ if (SectorCount > PartEntry->SectorCount.QuadPart) return FALSE; - /* Fail if the partition is already in use */ - ASSERT(!PartEntry->IsPartitioned); - - if ((AutoCreate != FALSE) || + if ((SectorCount == 0) || (AlignDown(PartEntry->StartSector.QuadPart + SectorCount, DiskEntry->SectorAlignment) - PartEntry->StartSector.QuadPart == PartEntry->SectorCount.QuadPart)) { - PartEntry->AutoCreate = AutoCreate; + /* Reuse the whole current entry */ } else { @@ -703,7 +723,8 @@ InitializePartitionEntry( ULONGLONG SectorCount2; PPARTENTRY NewPartEntry; - /* Create a partition entry that represents the remaining space after the partition to be initialized */ + /* Create a partition entry that represents the remaining space + * after the partition to be initialized */ StartSector = AlignDown(PartEntry->StartSector.QuadPart + SectorCount, DiskEntry->SectorAlignment); SectorCount2 = PartEntry->StartSector.QuadPart + PartEntry->SectorCount.QuadPart - StartSector; @@ -735,7 +756,6 @@ InitializePartitionEntry( PartEntry->FormatState = Unformatted; PartEntry->FileSystem[0] = L'\0'; - // PartEntry->AutoCreate = AutoCreate; PartEntry->BootIndicator = FALSE; DPRINT1("First Sector : %I64u\n", PartEntry->StartSector.QuadPart); @@ -2390,37 +2410,24 @@ GetPrevPartition( return NULL; } -// static -FORCEINLINE +static inline BOOLEAN IsEmptyLayoutEntry( - IN PPARTITION_INFORMATION PartitionInfo) + _In_ PPARTITION_INFORMATION PartitionInfo) { - if (PartitionInfo->StartingOffset.QuadPart == 0 && - PartitionInfo->PartitionLength.QuadPart == 0) - { - return TRUE; - } - - return FALSE; + return (PartitionInfo->StartingOffset.QuadPart == 0 && + PartitionInfo->PartitionLength.QuadPart == 0); } -// static -FORCEINLINE +static inline BOOLEAN IsSamePrimaryLayoutEntry( - IN PPARTITION_INFORMATION PartitionInfo, - IN PDISKENTRY DiskEntry, - IN PPARTENTRY PartEntry) + _In_ PPARTITION_INFORMATION PartitionInfo, + _In_ PPARTENTRY PartEntry) { - if (PartitionInfo->StartingOffset.QuadPart == PartEntry->StartSector.QuadPart * DiskEntry->BytesPerSector && - PartitionInfo->PartitionLength.QuadPart == PartEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector) + return ((PartitionInfo->StartingOffset.QuadPart == GetPartEntryOffsetInBytes(PartEntry)) && + (PartitionInfo->PartitionLength.QuadPart == GetPartEntrySizeInBytes(PartEntry))); // PartitionInfo->PartitionType == PartEntry->PartitionType - { - return TRUE; - } - - return FALSE; } static @@ -2578,12 +2585,12 @@ UpdateDiskLayout( PartEntry->OnDiskPartitionNumber = (!IsContainerPartition(PartEntry->PartitionType) ? PartitionNumber : 0); - if (!IsSamePrimaryLayoutEntry(PartitionInfo, DiskEntry, PartEntry)) + if (!IsSamePrimaryLayoutEntry(PartitionInfo, PartEntry)) { DPRINT1("Updating primary partition entry %lu\n", Index); - PartitionInfo->StartingOffset.QuadPart = PartEntry->StartSector.QuadPart * DiskEntry->BytesPerSector; - PartitionInfo->PartitionLength.QuadPart = PartEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector; + PartitionInfo->StartingOffset.QuadPart = GetPartEntryOffsetInBytes(PartEntry); + PartitionInfo->PartitionLength.QuadPart = GetPartEntrySizeInBytes(PartEntry); PartitionInfo->HiddenSectors = PartEntry->StartSector.LowPart; PartitionInfo->PartitionNumber = PartEntry->PartitionNumber; PartitionInfo->PartitionType = PartEntry->PartitionType; @@ -2624,8 +2631,8 @@ UpdateDiskLayout( DPRINT1("Updating logical partition entry %lu\n", Index); - PartitionInfo->StartingOffset.QuadPart = PartEntry->StartSector.QuadPart * DiskEntry->BytesPerSector; - PartitionInfo->PartitionLength.QuadPart = PartEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector; + PartitionInfo->StartingOffset.QuadPart = GetPartEntryOffsetInBytes(PartEntry); + PartitionInfo->PartitionLength.QuadPart = GetPartEntrySizeInBytes(PartEntry); PartitionInfo->HiddenSectors = DiskEntry->SectorAlignment; PartitionInfo->PartitionNumber = PartEntry->PartitionNumber; PartitionInfo->PartitionType = PartEntry->PartitionType; @@ -2862,12 +2869,11 @@ BOOLEAN CreatePartition( _In_ PPARTLIST List, _Inout_ PPARTENTRY PartEntry, - _In_ ULONGLONG SectorCount, - _In_ BOOLEAN AutoCreate) + _In_opt_ ULONGLONG SizeBytes) { ERROR_NUMBER Error; - DPRINT1("CreatePartition(%I64u)\n", SectorCount); + DPRINT1("CreatePartition(%I64u bytes)\n", SizeBytes); if (List == NULL || PartEntry == NULL || PartEntry->DiskEntry == NULL || PartEntry->IsPartitioned) @@ -2883,7 +2889,7 @@ CreatePartition( } /* Initialize the partition entry, inserting a new blank region if needed */ - if (!InitializePartitionEntry(PartEntry, SectorCount, AutoCreate)) + if (!InitializePartitionEntry(PartEntry, SizeBytes)) return FALSE; UpdateDiskLayout(PartEntry->DiskEntry); @@ -2924,11 +2930,11 @@ BOOLEAN CreateExtendedPartition( _In_ PPARTLIST List, _Inout_ PPARTENTRY PartEntry, - _In_ ULONGLONG SectorCount) + _In_opt_ ULONGLONG SizeBytes) { ERROR_NUMBER Error; - DPRINT1("CreateExtendedPartition(%I64u)\n", SectorCount); + DPRINT1("CreateExtendedPartition(%I64u bytes)\n", SizeBytes); if (List == NULL || PartEntry == NULL || PartEntry->DiskEntry == NULL || PartEntry->IsPartitioned) @@ -2944,7 +2950,7 @@ CreateExtendedPartition( } /* Initialize the partition entry, inserting a new blank region if needed */ - if (!InitializePartitionEntry(PartEntry, SectorCount, FALSE)) + if (!InitializePartitionEntry(PartEntry, SizeBytes)) return FALSE; ASSERT(PartEntry->LogicalPartition == FALSE); @@ -3933,7 +3939,7 @@ SetMountedDeviceValues( /* Assign a "\DosDevices\#:" mount point to this partition */ if (PartEntry->DriveLetter) { - StartingOffset.QuadPart = PartEntry->StartSector.QuadPart * DiskEntry->BytesPerSector; + StartingOffset.QuadPart = GetPartEntryOffsetInBytes(PartEntry); if (!SetMountedDeviceValue(PartEntry->DriveLetter, DiskEntry->LayoutBuffer->Signature, StartingOffset)) @@ -3956,7 +3962,7 @@ SetMountedDeviceValues( /* Assign a "\DosDevices\#:" mount point to this partition */ if (PartEntry->DriveLetter) { - StartingOffset.QuadPart = PartEntry->StartSector.QuadPart * DiskEntry->BytesPerSector; + StartingOffset.QuadPart = GetPartEntryOffsetInBytes(PartEntry); if (!SetMountedDeviceValue(PartEntry->DriveLetter, DiskEntry->LayoutBuffer->Signature, StartingOffset)) diff --git a/base/setup/lib/utils/partlist.h b/base/setup/lib/utils/partlist.h index c59b5e1f4b7..d5b20615455 100644 --- a/base/setup/lib/utils/partlist.h +++ b/base/setup/lib/utils/partlist.h @@ -70,9 +70,6 @@ typedef struct _PARTENTRY /* Partition is new, table does not exist on disk yet */ BOOLEAN New; - /* Partition was created automatically */ - BOOLEAN AutoCreate; - /* Partition must be checked */ BOOLEAN NeedsCheck; @@ -227,6 +224,16 @@ RoundingDivide( IN ULONGLONG Divisor); +#define GetPartEntryOffsetInBytes(PartEntry) \ + ((PartEntry)->StartSector.QuadPart * (PartEntry)->DiskEntry->BytesPerSector) + +#define GetPartEntrySizeInBytes(PartEntry) \ + ((PartEntry)->SectorCount.QuadPart * (PartEntry)->DiskEntry->BytesPerSector) + +#define GetDiskSizeInBytes(DiskEntry) \ + ((DiskEntry)->SectorCount.QuadPart * (DiskEntry)->BytesPerSector) + + BOOLEAN IsSuperFloppy( IN PDISKENTRY DiskEntry); @@ -306,14 +313,13 @@ BOOLEAN CreatePartition( _In_ PPARTLIST List, _Inout_ PPARTENTRY PartEntry, - _In_ ULONGLONG SectorCount, - _In_ BOOLEAN AutoCreate); + _In_opt_ ULONGLONG SizeBytes); BOOLEAN CreateExtendedPartition( _In_ PPARTLIST List, _Inout_ PPARTENTRY PartEntry, - _In_ ULONGLONG SectorCount); + _In_opt_ ULONGLONG SizeBytes); NTSTATUS DismountVolume( diff --git a/base/setup/usetup/partlist.c b/base/setup/usetup/partlist.c index 5feaf446529..72ae328cbde 100644 --- a/base/setup/usetup/partlist.c +++ b/base/setup/usetup/partlist.c @@ -156,7 +156,7 @@ PartitionDescription( PCSTR Unit; /* Get the partition size */ - PartSize = PartEntry->SectorCount.QuadPart * PartEntry->DiskEntry->BytesPerSector; + PartSize = GetPartEntrySizeInBytes(PartEntry); PrettifySize2(&PartSize, &Unit); if (PartEntry->IsPartitioned == FALSE) @@ -307,7 +307,7 @@ DiskDescription( PCSTR Unit; /* Get the disk size */ - DiskSize = DiskEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector; + DiskSize = GetDiskSizeInBytes(DiskEntry); PrettifySize1(&DiskSize, &Unit); // diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index 61fae743780..59593f38b59 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -79,6 +79,9 @@ static enum { PartTypeExtended // MBR-disk container } PartCreateType = PartTypeData; +/* Flag set in PARTENTRY::New when a partition is created automatically */ +#define PARTITION_NEW_AUTOCREATE 0x80 + /* List of supported file systems for the partition to be formatted */ static PFILE_SYSTEM_LIST FileSystemList = NULL; @@ -1503,18 +1506,18 @@ LayoutSettingsPage(PINPUT_RECORD Ir) } -static BOOL -IsDiskSizeValid(PPARTENTRY PartEntry) +static BOOLEAN +IsPartitionLargeEnough( + _In_ PPARTENTRY PartEntry) { - ULONGLONG size; + /* Retrieve the maximum size in MB (rounded up) */ + ULONGLONG PartSize = RoundingDivide(GetPartEntrySizeInBytes(PartEntry), MB); - size = PartEntry->SectorCount.QuadPart * PartEntry->DiskEntry->BytesPerSector; - size = (size + (512 * KB)) / MB; /* in MBytes */ - - if (size < USetupData.RequiredPartitionDiskSpace) + if (PartSize < USetupData.RequiredPartitionDiskSpace) { /* Partition is too small so ask for another one */ - DPRINT1("Partition is too small (size: %I64u MB), required disk space is %lu MB\n", size, USetupData.RequiredPartitionDiskSpace); + DPRINT1("Partition is too small (size: %I64u MB), required disk space is %lu MB\n", + PartSize, USetupData.RequiredPartitionDiskSpace); return FALSE; } else @@ -1608,13 +1611,15 @@ SelectPartitionPage(PINPUT_RECORD Ir) ASSERT(CurrentPartition != NULL); ASSERT(!IsContainerPartition(CurrentPartition->PartitionType)); + /* Automatically create the partition on the whole empty space; + * it will be formatted later with default parameters */ CreatePartition(PartitionList, CurrentPartition, - CurrentPartition->SectorCount.QuadPart, - TRUE); + 0ULL); + CurrentPartition->New |= PARTITION_NEW_AUTOCREATE; // FIXME?? Aren't we going to enter an infinite loop, if this test fails?? - if (!IsDiskSizeValid(CurrentPartition)) + if (!IsPartitionLargeEnough(CurrentPartition)) { MUIDisplayError(ERROR_INSUFFICIENT_PARTITION_SIZE, Ir, POPUP_WAIT_ANY_KEY, USetupData.RequiredPartitionDiskSpace); @@ -1632,7 +1637,7 @@ SelectPartitionPage(PINPUT_RECORD Ir) DrawPartitionList(&ListUi); // FIXME: Doesn't make much sense... // FIXME?? Aren't we going to enter an infinite loop, if this test fails?? - if (!IsDiskSizeValid(InstallPartition)) + if (!IsPartitionLargeEnough(InstallPartition)) { MUIDisplayError(ERROR_INSUFFICIENT_PARTITION_SIZE, Ir, POPUP_WAIT_ANY_KEY, USetupData.RequiredPartitionDiskSpace); @@ -1737,13 +1742,15 @@ SelectPartitionPage(PINPUT_RECORD Ir) return SELECT_PARTITION_PAGE; } + /* Automatically create the partition on the whole empty space; + * it will be formatted later with default parameters */ CreatePartition(PartitionList, CurrentPartition, - 0ULL, - TRUE); + 0ULL); + CurrentPartition->New |= PARTITION_NEW_AUTOCREATE; } - if (!IsDiskSizeValid(CurrentPartition)) + if (!IsPartitionLargeEnough(CurrentPartition)) { MUIDisplayError(ERROR_INSUFFICIENT_PARTITION_SIZE, Ir, POPUP_WAIT_ANY_KEY, USetupData.RequiredPartitionDiskSpace); @@ -2040,11 +2047,9 @@ CreatePartitionPage(PINPUT_RECORD Ir) PPARTENTRY PartEntry; PDISKENTRY DiskEntry; ULONG uID; - BOOLEAN Quit; - BOOLEAN Cancel; ULONG MaxSize; - ULONGLONG PartSize; - ULONGLONG SectorCount; + ULONGLONG MaxPartSize, PartSize; + BOOLEAN Quit, Cancel; WCHAR InputBuffer[50]; CHAR LineBuffer[100]; @@ -2078,15 +2083,17 @@ CreatePartitionPage(PINPUT_RECORD Ir) CONSOLE_SetStatusText(MUIGetString(STRING_CREATEPARTITION)); + MaxPartSize = GetPartEntrySizeInBytes(PartEntry); + while (TRUE) { - MaxSize = (PartEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector) / MB; /* in MBytes (rounded) */ - if (MaxSize > PARTITION_MAXSIZE) - MaxSize = PARTITION_MAXSIZE; + /* Retrieve the maximum size in MB (rounded up) + * and cap it with what the user can enter */ + MaxSize = (ULONG)RoundingDivide(MaxPartSize, MB); + MaxSize = min(MaxSize, PARTITION_MAXSIZE); - ShowPartitionSizeInputBox(12, 14, xScreen - 12, 17, /* left, top, right, bottom */ + ShowPartitionSizeInputBox(12, 14, xScreen - 12, 17, MaxSize, InputBuffer, &Quit, &Cancel); - if (Quit) { if (ConfirmQuit(Ir)) @@ -2097,50 +2104,41 @@ CreatePartitionPage(PINPUT_RECORD Ir) { return SELECT_PARTITION_PAGE; } - else - { - PartSize = _wcstoui64(InputBuffer, NULL, 10); - /* Retry if too small or too large */ - if (PartSize < 1) - continue; - if (PartSize > MaxSize) - continue; - - /* Convert to bytes */ - if (PartSize == MaxSize) - { - /* Use all of the unpartitioned disk space */ - SectorCount = PartEntry->SectorCount.QuadPart; - } - else - { - /* Calculate the sector count from the size in MB */ - SectorCount = PartSize * MB / DiskEntry->BytesPerSector; + PartSize = _wcstoui64(InputBuffer, NULL, 10); - /* But never get larger than the unpartitioned disk space */ - if (SectorCount > PartEntry->SectorCount.QuadPart) - SectorCount = PartEntry->SectorCount.QuadPart; - } + /* Retry if too small or too large */ + if ((PartSize < 1) || (PartSize > MaxSize)) + continue; - DPRINT("Partition size: %I64u bytes\n", PartSize); + /* + * If the input size, given in MB, specifies the maximum partition + * size, it may slightly under- or over-estimate it due to rounding + * error. In this case, use all of the unpartitioned disk space. + * Otherwise, directly convert the size to bytes. + */ + if (PartSize == MaxSize) + PartSize = MaxPartSize; + else // if (PartSize < MaxSize) + PartSize *= MB; + DPRINT("Partition size: %I64u bytes\n", PartSize); - if (PartCreateType == PartTypeData) - { - CreatePartition(PartitionList, - CurrentPartition, - SectorCount, - FALSE); - } - else // if (PartCreateType == PartTypeExtended) - { - CreateExtendedPartition(PartitionList, - CurrentPartition, - SectorCount); - } + ASSERT(PartSize <= MaxPartSize); - return SELECT_PARTITION_PAGE; + if (PartCreateType == PartTypeData) + { + CreatePartition(PartitionList, + CurrentPartition, + PartSize); } + else // if (PartCreateType == PartTypeExtended) + { + CreateExtendedPartition(PartitionList, + CurrentPartition, + PartSize); + } + + return SELECT_PARTITION_PAGE; } return CREATE_PARTITION_PAGE; @@ -2392,10 +2390,14 @@ SelectFileSystemPage(PINPUT_RECORD Ir) */ if (!SystemPartition->IsPartitioned) { + /* Automatically create the partition; it will be + * formatted later with default parameters */ + // FIXME: Don't use the whole empty space, but a minimal size + // specified from the TXTSETUP.SIF or unattended setup. CreatePartition(PartitionList, SystemPartition, - 0LL, // SystemPartition->SectorCount.QuadPart, - TRUE); + 0ULL); + SystemPartition->New |= PARTITION_NEW_AUTOCREATE; ASSERT(SystemPartition->IsPartitioned); } @@ -2548,9 +2550,9 @@ SelectFileSystemPage(PINPUT_RECORD Ir) MUIDisplayPage(SELECT_FILE_SYSTEM_PAGE); - if (PartEntry->AutoCreate) + if (PartEntry->New & PARTITION_NEW_AUTOCREATE) { - PartEntry->AutoCreate = FALSE; + PartEntry->New &= ~PARTITION_NEW_AUTOCREATE; CONSOLE_SetTextXY(6, 8, MUIGetString(STRING_NEWPARTITION)); }

10 months, 3 weeks

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs