Ros-diffs March 2023

ros-diffs@reactos.org

18 participants
139 discussions

[reactos] 01/01: [NTOS:KDBG] Temporarily HACK-work-around symbols loading by disabling them at BootPhase 0.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=942b0221e85bdcf5a4bca… commit 942b0221e85bdcf5a4bca7865fb4c72ffa105309 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Mar 20 03:10:14 2023 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Mar 20 03:10:14 2023 +0100 [NTOS:KDBG] Temporarily HACK-work-around symbols loading by disabling them at BootPhase 0. Of course, now that we **correctly** set the LoadSymbools setting, we attempt loading symbols at BootPhase 0 and everything goes awry! So introduce that hack to fallback to our old behaviour. A proper fix (and removal of the hack) will be done in future commits. --- ntoskrnl/kdbg/kdb_symbols.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/ntoskrnl/kdbg/kdb_symbols.c b/ntoskrnl/kdbg/kdb_symbols.c index 3222c40ce6d..69861f23ed8 100644 --- a/ntoskrnl/kdbg/kdb_symbols.c +++ b/ntoskrnl/kdbg/kdb_symbols.c @@ -344,6 +344,10 @@ BOOLEAN KdbSymInit( _In_ ULONG BootPhase) { +#if 1 // FIXME: This is a workaround HACK!! + static BOOLEAN OrigLoadSymbols = FALSE; +#endif + DPRINT("KdbSymInit() BootPhase=%d\n", BootPhase); if (BootPhase == 0) @@ -398,6 +402,13 @@ KdbSymInit( while (*CommandLine && !isspace(*CommandLine)) ++CommandLine; } + +#if 1 // FIXME: This is a workaround HACK!! +// Save the actual value of LoadSymbols but disable it for BootPhase 0. + OrigLoadSymbols = LoadSymbols; + LoadSymbols = FALSE; + return OrigLoadSymbols; +#endif } else if (BootPhase == 1) { @@ -406,6 +417,11 @@ KdbSymInit( KIRQL OldIrql; PLIST_ENTRY ListEntry; +#if 1 // FIXME: This is a workaround HACK!! +// Now, restore the actual value of LoadSymbols. + LoadSymbols = OrigLoadSymbols; +#endif + /* Do not continue loading symbols if we have less than 96MB of RAM */ if (MmNumberOfPhysicalPages < (96 * 1024 * 1024 / PAGE_SIZE)) LoadSymbols = FALSE;

1 year, 9 months

[reactos] 01/01: [NTOS:KDBG] Fix parsing the boot command line for the (NO)LOADSYMBOLS options.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=934812c4b22dadc37abb7… commit 934812c4b22dadc37abb7a3c27272e843ecdf244 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Mar 20 02:28:16 2023 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Mar 20 02:44:41 2023 +0100 [NTOS:KDBG] Fix parsing the boot command line for the (NO)LOADSYMBOLS options. Addendum to commit de892d5b. The boot options get stripped of their optional command switch '/' (and replaced by whitspace separation) by the NT loader. Also, forbid the presence of space between the optional '=' character following (NO)LOADSYMBOLS. In addition, fix the default initialization of LoadSymbols in KdbSymInit(): we cannot rely on MmNumberOfPhysicalPages in BootPhase 0 since at this point, the Memory Manager hasn't been initialized and this variable is not yet set. (We are called by KdInitSystem(0) -> KdDebuggerInitialize0 at kernel init.) It gets initialized later on between BootPhase 0 and 1. Also display a nice KDBG signon showing the status of symbols loading. --- ntoskrnl/kd/kdio.c | 3 ++ ntoskrnl/kdbg/kdb.h | 2 +- ntoskrnl/kdbg/kdb_cli.c | 23 +++++++++++++-- ntoskrnl/kdbg/kdb_symbols.c | 69 ++++++++++++++++++++++----------------------- 4 files changed, 57 insertions(+), 40 deletions(-) diff --git a/ntoskrnl/kd/kdio.c b/ntoskrnl/kd/kdio.c index be47e04c1c7..4ce92e3f076 100644 --- a/ntoskrnl/kd/kdio.c +++ b/ntoskrnl/kd/kdio.c @@ -229,6 +229,7 @@ KdpDebugLogInit( /* Register for later BootPhase 2 reinitialization */ DispatchTable->KdpInitRoutine = KdpDebugLogInit; + /* Announce ourselves */ HalDisplayString(" File log debugging enabled\r\n"); } else if (BootPhase >= 2) @@ -413,6 +414,7 @@ KdpSerialInit( } else if (BootPhase == 1) { + /* Announce ourselves */ HalDisplayString(" Serial debugging enabled\r\n"); } @@ -526,6 +528,7 @@ KdpScreenInit( /* Take control of the display */ KdpScreenAcquire(); + /* Announce ourselves */ HalDisplayString(" Screen debugging enabled\r\n"); } diff --git a/ntoskrnl/kdbg/kdb.h b/ntoskrnl/kdbg/kdb.h index b606d4a5156..2ec084fbb13 100644 --- a/ntoskrnl/kdbg/kdb.h +++ b/ntoskrnl/kdbg/kdb.h @@ -171,7 +171,7 @@ KdbSymProcessSymbols( _Inout_ PLDR_DATA_TABLE_ENTRY LdrEntry, _In_ BOOLEAN Load); -VOID +BOOLEAN KdbSymInit( _In_ ULONG BootPhase); diff --git a/ntoskrnl/kdbg/kdb_cli.c b/ntoskrnl/kdbg/kdb_cli.c index aaebf573cf8..f114a862958 100644 --- a/ntoskrnl/kdbg/kdb_cli.c +++ b/ntoskrnl/kdbg/kdb_cli.c @@ -3964,6 +3964,9 @@ KdbInitialize( _In_ PKD_DISPATCH_TABLE DispatchTable, _In_ ULONG BootPhase) { + /* Saves the different symbol-loading status across boot phases */ + static ULONG LoadSymbols = 0; + if (BootPhase == 0) { /* Write out the functions that we support for now */ @@ -3993,12 +3996,26 @@ KdbInitialize( KeInitializeSpinLock(&KdpDmesgLogSpinLock); } + /* Initialize symbols support in BootPhase 0 and 1 */ if (BootPhase <= 1) { - /* Initialize symbols support */ - KdbSymInit(BootPhase); + LoadSymbols <<= 1; + LoadSymbols |= KdbSymInit(BootPhase); } - else if (BootPhase >= 2) + + if (BootPhase == 1) + { + /* Announce ourselves */ + CHAR buffer[60]; + RtlStringCbPrintfA(buffer, sizeof(buffer), + " KDBG debugger enabled - %s\r\n", + !(LoadSymbols & 0x2) ? "No symbols loaded" : + !(LoadSymbols & 0x1) ? "Kernel symbols loaded" + : "Loading symbols"); + HalDisplayString(buffer); + } + + if (BootPhase >= 2) { /* I/O is now set up for disk access: Read KDB Data */ NTSTATUS Status = KdbpCliInit(); diff --git a/ntoskrnl/kdbg/kdb_symbols.c b/ntoskrnl/kdbg/kdb_symbols.c index 2ac4d29b30f..3222c40ce6d 100644 --- a/ntoskrnl/kdbg/kdb_symbols.c +++ b/ntoskrnl/kdbg/kdb_symbols.c @@ -337,9 +337,10 @@ KdbSymProcessSymbols( * @param[in] BootPhase * Phase of initialization. * - * @return None. + * @return + * TRUE if symbols are to be loaded at this given BootPhase; FALSE if not. **/ -VOID +BOOLEAN KdbSymInit( _In_ ULONG BootPhase) { @@ -347,61 +348,55 @@ KdbSymInit( if (BootPhase == 0) { - PCHAR p1, p2; + PSTR CommandLine; SHORT Found = FALSE; CHAR YesNo; - /* - * Default symbols loading strategy: - * In DBG builds, load symbols only if we have 96MB of RAM or more. - * In REL builds, do not load them by default. - */ + /* By default, load symbols in DBG builds, but not in REL builds */ #if DBG - LoadSymbols = (MmNumberOfPhysicalPages >= 0x6000); + LoadSymbols = TRUE; #else LoadSymbols = FALSE; #endif - /* Check the command line for /LOADSYMBOLS, /NOLOADSYMBOLS, - * /LOADSYMBOLS={YES|NO}, /NOLOADSYMBOLS={YES|NO} */ + /* Check the command line for LOADSYMBOLS, NOLOADSYMBOLS, + * LOADSYMBOLS={YES|NO}, NOLOADSYMBOLS={YES|NO} */ ASSERT(KeLoaderBlock); - p1 = KeLoaderBlock->LoadOptions; - while ('\0' != *p1 && NULL != (p2 = strchr(p1, '/'))) + CommandLine = KeLoaderBlock->LoadOptions; + while (*CommandLine) { - p2++; + /* Skip any whitespace */ + while (isspace(*CommandLine)) + ++CommandLine; + Found = 0; - if (0 == _strnicmp(p2, "LOADSYMBOLS", 11)) + if (_strnicmp(CommandLine, "LOADSYMBOLS", 11) == 0) { Found = +1; - p2 += 11; + CommandLine += 11; } - else if (0 == _strnicmp(p2, "NOLOADSYMBOLS", 13)) + else if (_strnicmp(CommandLine, "NOLOADSYMBOLS", 13) == 0) { Found = -1; - p2 += 13; + CommandLine += 13; } - if (0 != Found) + if (Found != 0) { - while (isspace(*p2)) + if (*CommandLine == '=') { - p2++; - } - if ('=' == *p2) - { - p2++; - while (isspace(*p2)) - { - p2++; - } - YesNo = toupper(*p2); - if ('N' == YesNo || 'F' == YesNo || '0' == YesNo) + ++CommandLine; + YesNo = toupper(*CommandLine); + if (YesNo == 'N' || YesNo == '0') { Found = -1 * Found; } } LoadSymbols = (0 < Found); } - p1 = p2; + + /* Move on to the next option */ + while (*CommandLine && !isspace(*CommandLine)) + ++CommandLine; } } else if (BootPhase == 1) @@ -411,13 +406,13 @@ KdbSymInit( KIRQL OldIrql; PLIST_ENTRY ListEntry; - /* Do not load symbols if we have less than 96MB of RAM */ - if (MmNumberOfPhysicalPages < 0x6000) + /* Do not continue loading symbols if we have less than 96MB of RAM */ + if (MmNumberOfPhysicalPages < (96 * 1024 * 1024 / PAGE_SIZE)) LoadSymbols = FALSE; /* Continue this phase only if we need to load symbols */ if (!LoadSymbols) - return; + return LoadSymbols; /* Launch our worker thread */ InitializeListHead(&SymbolsToLoad); @@ -433,7 +428,7 @@ KdbSymInit( { DPRINT1("Failed starting symbols loader thread: 0x%08x\n", Status); LoadSymbols = FALSE; - return; + return LoadSymbols; } RosSymInitKernelMode(); @@ -450,6 +445,8 @@ KdbSymInit( KeReleaseSpinLock(&PsLoadedModuleSpinLock, OldIrql); } + + return LoadSymbols; } /* EOF */

1 year, 9 months

[reactos] 01/01: [TRANSLATION] Improvements to portuguese (pt-PT) translation (#5154)

by Jose Carlos Jesus

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2cfb757b299d92be510f9… commit 2cfb757b299d92be510f95ee557e517a078f5a2f Author: Jose Carlos Jesus <zecarlos1957(a)hotmail.com> AuthorDate: Sun Mar 19 16:32:24 2023 -0300 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Mar 19 20:32:24 2023 +0100 [TRANSLATION] Improvements to portuguese (pt-PT) translation (#5154) For: hivedef.inf, powercfg.cpl, sysdm.cpl and: netshell.dll, netcfgx.dll, shell32.dll, userenv.dll Also fix "My Documents" and "My Network Places" folder names. --- boot/bootdata/hivedef.inf | 4 +-- dll/cpl/powercfg/lang/pt-PT.rc | 34 +++++++++++------------ dll/cpl/sysdm/lang/pt-PT.rc | 18 ++++++------- dll/shellext/netshell/lang/pt-PT.rc | 10 +++---- dll/win32/netcfgx/lang/pt-PT.rc | 12 ++++----- dll/win32/shell32/lang/pt-PT.rc | 54 ++++++++++++++++++------------------- dll/win32/userenv/lang/pt-PT.rc | 2 +- 7 files changed, 67 insertions(+), 67 deletions(-) diff --git a/boot/bootdata/hivedef.inf b/boot/bootdata/hivedef.inf index 4752935daea..bbf27e93139 100644 --- a/boot/bootdata/hivedef.inf +++ b/boot/bootdata/hivedef.inf @@ -3198,7 +3198,7 @@ POWERCFG_NAME_2="Apresentação" POWERCFG_DESC_2="Este esquema mantém o monitor ligado para fazer apresentações." POWERCFG_NAME_3="Sempre ligado" POWERCFG_DESC_3="Este esquema mantém o computador em funcionamento para que possa ser acessado da rede. Use este esquema se não tiver hardware de activação de rede." -POWERCFG_NAME_4="Gerenciamento mínimo de energia" +POWERCFG_NAME_4="Gestão de energia mínima" POWERCFG_DESC_4="Este esquema mantém o computador ligado com optimização para obter alto desempenho." POWERCFG_NAME_5="Bateria carregada" POWERCFG_DESC_5="Esquema extremamente agressivo para economizar energia." @@ -3216,7 +3216,7 @@ DESKTOP_SCHEME_10="Marinho" DESKTOP_SCHEME_11="Ameixa" DESKTOP_SCHEME_12="Abóbora" DESKTOP_SCHEME_13="Dia chuvoso" -DESKTOP_SCHEME_14="ReactOS Classico" +DESKTOP_SCHEME_14="ReactOS Clássico" DESKTOP_SCHEME_15="Rosa" DESKTOP_SCHEME_16="Areia" DESKTOP_SCHEME_17="Céu" diff --git a/dll/cpl/powercfg/lang/pt-PT.rc b/dll/cpl/powercfg/lang/pt-PT.rc index 5a65f5d1977..3d1f3f666f1 100644 --- a/dll/cpl/powercfg/lang/pt-PT.rc +++ b/dll/cpl/powercfg/lang/pt-PT.rc @@ -6,7 +6,7 @@ CAPTION "Esquemas de energia" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_ACDC, IDI_ACDC, 7, 7, 28, 22 - LTEXT "Seleccione o esquema de energia com as configurações mais apropriadas para este computador. Note que a alteração das configurações abaixo, modificará o esquema seleccionado.", -1, 37, 6, 209, 36 + LTEXT "Seleccione o esquema de energia com as definições mais apropriadas para este computador. Note que a alteração às definições abaixo, modificará o esquema seleccionado.", -1, 37, 6, 209, 36 GROUPBOX "&Esquemas de energia", -1, 6, 43, 240, 50 COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Guardar como...", IDC_SAVEAS_BTN, 109, 72, 70, 14, WS_DISABLED @@ -20,10 +20,10 @@ BEGIN LTEXT "Desligar o &monitor:", IDC_MONITOR, 13, 148, 84, 10 COMBOBOX IDC_MONITORACLIST, 100, 145, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_MONITORDCLIST, 173, 145, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Desligar d&iscos rígidos:", IDC_DISK, 13, 171, 84, 10 + LTEXT "Desligar &discos rígidos:", IDC_DISK, 13, 171, 84, 10 COMBOBOX IDC_DISKACLIST, 100, 167, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_DISKDCLIST, 173, 167, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Entra em s&tandby:", IDC_STANDBY, 13, 191, 84, 10 + LTEXT "Entra em modo de &espera:", IDC_STANDBY, 13, 191, 84, 10 COMBOBOX IDC_STANDBYACLIST, 100, 188, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_STANDBYDCLIST, 173, 188, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "Entra em &hibernação:", IDC_HIBERNATE, 13, 212, 84, 10 @@ -37,7 +37,7 @@ CAPTION "Esquemas de energia" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_ACDC, IDI_ACDC, 7, 7, 28, 22 - LTEXT "Seleccione o esquema de energia com as configurações mais apropriadas para este computador. Note que a alteração das configurações abaixo, modificará o esquema seleccionado.", -1, 37, 6, 209, 36 + LTEXT "Seleccione o esquema de energia com as definições mais apropriadas para este computador. Note que a alteração das definições abaixo, modificará o esquema seleccionado.", -1, 37, 6, 209, 36 GROUPBOX "&Esquemas de energia", -1, 6, 43, 240, 50 COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL PUSHBUTTON "&Guardar como...", IDC_SAVEAS_BTN, 109, 72, 70, 14, WS_DISABLED @@ -45,9 +45,9 @@ BEGIN GROUPBOX "Desconhecido", IDC_GRPDETAIL, 6, 95, 240, 136 LTEXT "Desligar o &monitor:", IDC_MONITOR, 13, 148, 84, 10 COMBOBOX IDC_MONITORACLIST, 100, 145, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Desligar d&iscos rígidos:", IDC_DISK, 13, 171, 84, 10 + LTEXT "Desligar &discos rígidos:", IDC_DISK, 13, 171, 84, 10 COMBOBOX IDC_DISKACLIST, 100, 167, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Entra em s&tandby:", IDC_STANDBY, 13, 191, 84, 10 + LTEXT "Entra em modo de &espera:", IDC_STANDBY, 13, 191, 84, 10 COMBOBOX IDC_STANDBYACLIST, 100, 188, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "Entra em &hibernação:", IDC_HIBERNATE, 13, 212, 84, 10 COMBOBOX IDC_HIBERNATEACLIST, 100, 209, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP @@ -69,7 +69,7 @@ BEGIN LTEXT "Desconhecida", IDC_ALARMMSG1, 154, 71, 84, 10 LTEXT "Acção:", -1, 95, 83, 55, 10 LTEXT "Desconhecida", IDC_ALARMAKTION1, 154, 83, 84, 10 - LTEXT "Executar Programa:", -1, 95, 95, 55, 10 + LTEXT "Executar programa:", -1, 95, 95, 55, 10 LTEXT "Desconhecido", IDC_ALARMPROG1, 154, 95, 84, 10 GROUPBOX "Alarme de bateria muito fraca", -1, 6, 120, 239, 106 AUTOCHECKBOX "Activar o alarme de bateria &muito fraca quando o nível de energia atingir:", IDC_ALARM2, 15, 131, 195, 15, WS_TABSTOP @@ -82,7 +82,7 @@ BEGIN LTEXT "Desconhecida", IDC_ALARMMSG2, 154, 185, 84, 10 LTEXT "Acção:", -1, 95, 198, 45, 10 LTEXT "Desconhecida", IDC_ALARMAKTION2, 154, 198, 84, 10 - LTEXT "Executar Programa:", -1, 95, 211, 50, 10 + LTEXT "Executar programa:", -1, 95, 211, 50, 10 LTEXT "Desconhecido", IDC_ALARMPROG2, 154, 211, 84, 10 END @@ -95,7 +95,7 @@ BEGIN LTEXT "Seleccione as definições de poupança de energia que deseja utilizar.", -1, 37, 6, 207, 20 GROUPBOX "Opções", -1, 6, 30, 240, 65 AUTOCHECKBOX "Mostrar sempre o &icone na barra de tarefas", IDC_SYSTRAYBATTERYMETER, 17, 43, 220, 10, WS_TABSTOP - AUTOCHECKBOX "&Perguntar a palavra-passe quando o computador reiniciar o trabalho.", IDC_PASSWORDLOGON, 17, 60, 220, 10, WS_TABSTOP + AUTOCHECKBOX "&Perguntar a palavra-passe quando o computador reiniciar.", IDC_PASSWORDLOGON, 17, 60, 220, 10, WS_TABSTOP AUTOCHECKBOX "&Ajustar o brilho quando ligado a baterias.", IDC_VIDEODIMDISPLAY, 17, 78, 220, 10, WS_TABSTOP GROUPBOX "Botões de energia", -1, 6, 101, 240, 127 LTEXT "Ao baixar a &tampa do portátil:", IDC_SLIDCLOSE, 15, 115, 222, 10 @@ -116,11 +116,11 @@ BEGIN GROUPBOX "Hibernar", -1, 6, 41, 240, 32 AUTOCHECKBOX "Permitir &hibernação", IDC_HIBERNATEFILE, 17, 55, 210, 10, WS_TABSTOP GROUPBOX "Espaço em disco para hibernação", -1, 6, 80, 240, 76 - LTEXT "Espaço disp. em disco:", -1, 15, 95, 140, 10 + LTEXT "Espaço disponível em disco:", -1, 15, 95, 140, 10 LTEXT "Desconhecido", IDC_FREESPACE, 160, 95, 80, 10 LTEXT "Espaço em disco necessário para hibernação:", -1, 15, 115, 140, 10 LTEXT "Desconhecido", IDC_SPACEFORHIBERNATEFILE, 160, 115, 80, 10 - LTEXT "Terá de libertar espaço em disco para que o seu computador possa hibernar. ", IDC_TOLESSFREESPACE, 15, 135, 224, 20 + LTEXT "Terá de libertar espaço em disco para que o computador possa hibernar. ", IDC_TOLESSFREESPACE, 15, 135, 224, 20 END IDD_SAVEPOWERSCHEME DIALOGEX 0, 0, 190, 62 @@ -137,7 +137,7 @@ END STRINGTABLE BEGIN IDS_CPLNAME_1 "Opções de energia" - IDS_CPLDESCRIPTION_1 "Defina as configurações de poupança de energia para o seu computador." + IDS_CPLDESCRIPTION_1 "Defina as configurações de poupança de energia para o computador." IDS_PERCENT "%i%%" IDS_SOUND "Som" IDS_TEXT "Texto" @@ -146,11 +146,11 @@ BEGIN IDS_NOACTION "Sem acção" IDS_PowerActionNone1 "Sem acção" IDS_PowerActionUnknown "Desconhecida" - IDS_PowerActionSleep "Stand by" + IDS_PowerActionSleep "Em espera" IDS_PowerActionHibernate "Hibernar" IDS_PowerActionShutdown "Desligar" IDS_PowerActionRestart "Reiniciar" - IDS_PowerActionShutdownOff "Desligar e desligar a energia" + IDS_PowerActionShutdownOff "Desligar a energia" IDS_PowerActionWarmEject "Perguntar o que fazer" IDS_PowerActionNone2 "Nenhum" IDS_TIMEOUT1 "Após 1 min" @@ -169,7 +169,7 @@ BEGIN IDS_TIMEOUT14 "Após 4 hours" IDS_TIMEOUT15 "Após 5 hours" IDS_TIMEOUT16 "Nunca" - IDS_DEL_SCHEME "Tem certeza de que deseja excluir o esquema de energia: ""%s""?" - IDS_DEL_SCHEME_TITLE "Excluir esquema" - IDS_DEL_SCHEME_ERROR "Não é possível excluir o esquema de energia" + IDS_DEL_SCHEME "Pretende eliminar o esquema de energia: ""%s""?" + IDS_DEL_SCHEME_TITLE "Eliminar esquema" + IDS_DEL_SCHEME_ERROR "Não é possível eliminar o esquema de energia" END diff --git a/dll/cpl/sysdm/lang/pt-PT.rc b/dll/cpl/sysdm/lang/pt-PT.rc index 514a42efcf7..256c6627a5a 100644 --- a/dll/cpl/sysdm/lang/pt-PT.rc +++ b/dll/cpl/sysdm/lang/pt-PT.rc @@ -61,14 +61,14 @@ BEGIN GROUPBOX "Arranque e Recuperação", IDC_STATIC, 6, 141, 244, 52 LTEXT "Informação de arranque do sistema, falha do sistema e depuração.", IDC_STATIC, 16, 154, 228, 19 PUSHBUTTON "De&finições", IDC_STAREC, 194, 172, 50, 15 - PUSHBUTTON "Definições de &sistema", IDC_SYSSETTINGS, 6, 202, 80, 15 + PUSHBUTTON "Definições do &sistema", IDC_SYSSETTINGS, 6, 202, 80, 15 PUSHBUTTON "&Variáveis de ambiente", IDC_ENVVAR, 88, 202, 80, 15 PUSHBUTTON "&Relatar erros", IDC_ERRORREPORT, 170, 202, 80, 15 END IDD_SYSSETTINGS DIALOGEX 0, 0, 221, 106 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Definições de sistema" +CAPTION "Definições do sistema" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "Informações de versão", IDC_STATIC, 6, 3, 210, 73 @@ -90,8 +90,8 @@ BEGIN PUSHBUTTON "", IDC_HRDPROFDWN, 232, 79, 15, 14, BS_ICON | WS_DISABLED PUSHBUTTON "&Propriedades", IDC_HRDPROFPROP, 8, 106, 50, 14, WS_DISABLED PUSHBUTTON "&Copiar", IDC_HRDPROFCOPY, 63, 106, 50, 14, WS_DISABLED - PUSHBUTTON "&Renomear", IDC_HRDPROFRENAME, 118, 106, 50, 14, WS_DISABLED - PUSHBUTTON "&Apagar", IDC_HRDPROFDEL, 173, 106, 50, 14, WS_DISABLED + PUSHBUTTON "&Mudar o nome", IDC_HRDPROFRENAME, 118, 106, 50, 14, WS_DISABLED + PUSHBUTTON "&Eliminar", IDC_HRDPROFDEL, 173, 106, 50, 14, WS_DISABLED GROUPBOX "Selecção de perfis de hardware", IDC_STATIC, 7, 130, 240, 75 LTEXT "Quando o ReactOS inicia:", IDC_STATIC, 14, 142, 210, 8 AUTORADIOBUTTON "&Aguardar que eu seleccione um perfil de hardware", IDC_HRDPROFWAIT, 14, 158, 200, 8, WS_GROUP @@ -161,7 +161,7 @@ BEGIN CONTROL "", IDC_USERPROFILE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 6, 66, 244, 85, WS_EX_CLIENTEDGE PUSHBUTTON "Alterar &tipo", IDC_USERPROFILE_CHANGE, 90, 155, 50, 15 - PUSHBUTTON "&Apagar", IDC_USERPROFILE_DELETE, 145, 155, 50, 15 + PUSHBUTTON "&Eliminar", IDC_USERPROFILE_DELETE, 145, 155, 50, 15 PUSHBUTTON "Copiar &para...", IDC_USERPROFILE_COPY, 200, 155, 50, 15 CONTROL "Para criar novas contas de utilizador, abra <A>Contas de Utilizador</A> no Painel de Control.", IDC_USERACCOUNT_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 175, 245, 18 @@ -214,7 +214,7 @@ BEGIN CONTROL "", IDC_STRRECRECUPDWN, "msctls_updown32", UDS_WRAP | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 0, 0, 8, 13 LTEXT "seg.", IDC_STATIC, 223, 70, 18, 8 - LTEXT "Para editar o arquivo de opções de inicialização manualmente, clique em ""Editar"".", IDC_STATIC, 14, 89, 187, 8 + LTEXT "Para editar o ficheiro de opções de iniciação manualmente, clique em ""Editar"".", IDC_STATIC, 14, 89, 187, 8 PUSHBUTTON "&Editar...", IDC_STRRECEDIT, 188, 87, 50, 14 GROUPBOX "Falha do sistema", IDC_STATIC, 7, 111, 238, 140 AUTOCHECKBOX "&Escrever um evento no ficheiro de registo do sistema", IDC_STRRECWRITEEVENT, 14, 124, 190, 10 @@ -352,7 +352,7 @@ BEGIN IDS_USERPROFILE_LOCAL "Local" IDS_USERPROFILE_ROAMING "Roaming" IDS_USERPROFILE_MANDATORY "Obrigatório" - IDS_USERPROFILE_CONFIRM_DELETE "Tem a certeza que deseja excluir o perfil de %s?" + IDS_USERPROFILE_CONFIRM_DELETE "Pretende excluir o perfil de %s?" IDS_USERPROFILE_CONFIRM_DELETE_TITLE "Confirmar a exclusão" IDS_USERPROFILE_ACCOUNT_UNKNOWN "Conta desconhecida" IDS_USERPROFILE_ACCOUNT_DELETED "Conta excluida" @@ -364,10 +364,10 @@ BEGIN IDS_WARNMAXIMUMRANGE "O tamanho máximo do ficheiro de paginação deve ser maior ou igual ao seu tamanho inicial e menor que %lu MB na unidade seleccionada." IDS_PAGEFILE_MB "%lu MB" IDS_PAGEFILE_NONE "Nenhum" - IDS_PAGEFILE_SYSTEM "Gerênciado pelo sistema" + IDS_PAGEFILE_SYSTEM "Gestão efectuada pelo sistema" IDS_INFOREBOOT "Precisa reiniciar o computador para aplicar as alterações." IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Confirmar exclusão do perfil" - IDS_HWPROFILE_CONFIRM_DELETE "Tem certeza de que deseja excluir o perfil de hardware ""%s""?" + IDS_HWPROFILE_CONFIRM_DELETE "Pretende excluir o perfil de hardware ""%s""?" IDS_HWPROFILE_ALREADY_IN_USE "O nome do perfil já está em uso." IDS_HWPROFILE_PROFILE "Perfil" IDS_HWPROFILE_WARNING "Aviso" diff --git a/dll/shellext/netshell/lang/pt-PT.rc b/dll/shellext/netshell/lang/pt-PT.rc index f07d3c993d0..ef77b58669f 100644 --- a/dll/shellext/netshell/lang/pt-PT.rc +++ b/dll/shellext/netshell/lang/pt-PT.rc @@ -109,7 +109,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Instalador do ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Deseja que este computador seja membro de um domínio?\n\ + LTEXT "Pretende que este computador seja membro de um domínio?\n\ (Pode obter esta informação do seu administrador de rede.)", IDC_STATIC, 33, 2, 263, 50 AUTORADIOBUTTON "Não, este computador fará parte de um grupo de &trabalho.", IDC_SELECT_WORKGROUP, 33, 32, 253, 20, WS_TABSTOP | WS_GROUP AUTORADIOBUTTON "Sim, este computador fará parte de um &domínio.", IDC_SELECT_DOMAIN, 33, 47, 253, 20, WS_TABSTOP @@ -150,8 +150,8 @@ BEGIN IDS_NET_STATUS "Estado" IDS_NET_REPAIR "Reparar" IDS_NET_CREATELINK "Criar acesso directo" - IDS_NET_DELETE "Apagar" - IDS_NET_RENAME "Renomear" + IDS_NET_DELETE "Eliminar" + IDS_NET_RENAME "Mudar o nome" IDS_NET_PROPERTIES "Propriedades" IDS_FORMAT_BIT "%u Bit/s" IDS_FORMAT_KBIT "%u KBit/s" @@ -165,10 +165,10 @@ END STRINGTABLE BEGIN - IDS_NETWORKSETTINGSTITLE "Configuração de rede" + IDS_NETWORKSETTINGSTITLE "Definições de rede" IDS_NETWORKSETTINGSSUBTITLE "Instala aplicações de rede necessárias para ligar a outras redes, equipamentos, e à Internet." IDS_NETWORKCOMPONENTTITLE "Componetes de rede" - IDS_NETWORKCOMPONENTSUBTITLE "Determina quais os componentes de rede a utilizar no seu equipamento. Para adicionar novos componentes, clique em Instalar." + IDS_NETWORKCOMPONENTSUBTITLE "Determina quais os componentes de rede a utilizar neste equipamento. Para adicionar novos componentes, clique em Instalar." IDS_NETWORKDOMAINTITLE "Grupo de trabalho ou domínio" IDS_NETWORKDOMAINSUBTITLE "Um domínio é um grupo de computadores gerido por um administrador de rede. Um grupo de trabalho é um grupo de computadores que partilham o mesmo nome." IDS_REACTOS_SETUP "Instalador do ReactOS" diff --git a/dll/win32/netcfgx/lang/pt-PT.rc b/dll/win32/netcfgx/lang/pt-PT.rc index 914a4699d71..a7f278392b6 100644 --- a/dll/win32/netcfgx/lang/pt-PT.rc +++ b/dll/win32/netcfgx/lang/pt-PT.rc @@ -16,7 +16,7 @@ BEGIN CONTROL "&Usar o endereço IP:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12 LTEXT "Endereço IP:", -1, 14, 75, 135, 8 CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75 - 2, 85, 12 - LTEXT "Mascara Sub-rede:", -1, 14, 90, 135, 8 + LTEXT "Máscara Sub-rede:", -1, 14, 90, 135, 8 CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 90 - 2, 85, 12 LTEXT "Gateway padrão:", -1, 14, 105, 135, 8 CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 105 - 2, 85, 12 @@ -41,7 +41,7 @@ BEGIN CONTROL "&Config. do utilizador", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 70, 12 LTEXT "Endereço &IP:", -1, 14, 75, 135, 8 CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12 - LTEXT "Mascara S&ubnet:", -1, 14, 95, 135, 8 + LTEXT "Máscara S&ubnet:", -1, 14, 95, 135, 8 CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 95, 85, 12 LTEXT "&Gateway padrão:", -1, 14, 115, 135, 8 CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 115, 85, 12 @@ -119,7 +119,7 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 96, 15, 85, 12 LTEXT "Endereço IP:", -1, 5, 15, 70, 12 - LTEXT "Mascara Sub-rede:", -1, 5, 30, 70, 12 + LTEXT "Máscara Sub-rede:", -1, 5, 30, 70, 12 CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 96, 30, 85, 12 DEFPUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP PUSHBUTTON "Cancelar", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP @@ -174,7 +174,7 @@ BEGIN PUSHBUTTON "Adicionar", IDC_TCP_ADD, 15, 141, 50, 14, WS_TABSTOP PUSHBUTTON "Remover", IDC_TCP_DEL, 15, 161, 50, 14, WS_TABSTOP GROUPBOX "", -1, 105, 30, 90, 150 - CONTROL "Permiirt todosl", IDC_UDP_ALLOW_ALL, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 115, 30, 70, 12 + CONTROL "Permitir todos", IDC_UDP_ALLOW_ALL, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 115, 30, 70, 12 CONTROL "Permitir só", IDC_UDP_RESTRICT, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 115, 44, 70, 12 CONTROL "", IDC_UDP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 111, 62, 72, 75 PUSHBUTTON "Adicionar", IDC_UDP_ADD, 115, 141, 50, 14, WS_TABSTOP @@ -218,13 +218,13 @@ END STRINGTABLE BEGIN - IDS_NET_CONNECT "Ligação de rede" + IDS_NET_CONNECT "Ligações de rede" IDS_NO_IPADDR_SET "O adaptador requer pelo menos um endereço IP. Por favor, insira um." IDS_NO_SUBMASK_SET "Inseriu um endereço sem máscara de sub-rede. Por favor, adicione uma máscara de sub-rede." IDS_TCPFILTERDESC "A filtragem TCP / IP permite controlar o tipo de tráfego de rede TCP / IP que chega ao seu computador." IDS_TCPFILTER "Filtros TCP/IP" IDS_IPADDR "Endereço IP" - IDS_SUBMASK "Mascara de Sub-rede" + IDS_SUBMASK "Máscara de Sub-rede" IDS_GATEWAY "Gateway" IDS_METRIC "Métrica" IDS_DHCPACTIVE "DHCP habilitado" diff --git a/dll/win32/shell32/lang/pt-PT.rc b/dll/win32/shell32/lang/pt-PT.rc index b8eec0444b2..7000f6734e2 100644 --- a/dll/win32/shell32/lang/pt-PT.rc +++ b/dll/win32/shell32/lang/pt-PT.rc @@ -422,7 +422,7 @@ BEGIN CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20 AUTORADIOBUTTON "&Clique simples para abrir um item", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 170, 10, WS_TABSTOP | WS_GROUP AUTORADIOBUTTON "&Duplo-clique para abrir um item (um clique para seleccionar)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 225, 10 - AUTORADIOBUTTON "Sublinhar os títulos dos ícones mantendo o aspecto do &browser", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 215, 10, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "Sublinhar os títulos dos ícones mantendo o aspecto do &navegador", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 215, 10, WS_TABSTOP | WS_GROUP AUTORADIOBUTTON "Sublinhar os títulos dos ícones apenas quando &aponto para eles", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 215, 10 PUSHBUTTON "&Restaurar predefinições", IDC_FOLDER_OPTIONS_RESTORE, 167, 175, 90, 14, 14, WS_TABSTOP END @@ -487,7 +487,7 @@ CAPTION "Terminar sessão ReactOS" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 - LTEXT "Tem a certeza que deseja terminar a sessão?", -1, 43, 15, 170, 8 + LTEXT "Pretende terminar a sessão?", -1, 43, 15, 170, 8 DEFPUSHBUTTON "&Terminar a sessão", IDOK, 30, 38, 64, 14 PUSHBUTTON "&Cancelar", IDCANCEL, 99, 38, 43, 14 END @@ -512,7 +512,7 @@ CAPTION "Encerrar ReactOS" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_SHELL_DISCONN, IDC_STATIC, 8, 6, 21, 20 - LTEXT "Tem a certeza que deseja encerrar?", -1, 49, 15, 131, 8 + LTEXT "Pretende encerrar o computador?", -1, 49, 15, 131, 8 DEFPUSHBUTTON "&Encerrar", IDOK, 47, 38, 47, 14 PUSHBUTTON "&Cancelar", IDCANCEL, 99, 38, 47, 14 END @@ -656,7 +656,7 @@ CAPTION "Criar nova extensão" STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Extensão de arquivo:", -1, 10, 10, 85, 14 + LTEXT "Extensão de ficheiro:", -1, 10, 10, 85, 14 EDITTEXT IDC_NEWEXT_EDIT, 105, 8, 60, 14 PUSHBUTTON "<< &Avançado", IDC_NEWEXT_ADVANCED, 185, 8, 65, 15 LTEXT "Tipo de ficheiro associado:", IDC_NEWEXT_ASSOC, 10, 34, 85, 14 @@ -687,7 +687,7 @@ BEGIN END IDD_ACTION DIALOG 0, 0, 225, 95 -CAPTION "Nova Acção" +CAPTION "Nova acção" STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" BEGIN @@ -719,7 +719,7 @@ BEGIN GROUPBOX "Icones", IDC_STATIC, 5, 170, 230, 65, WS_TABSTOP LTEXT "Para todas as vistas, excepto miniaturas, pode alterar o ícone padrão 'pasta' para outro ícone.", IDC_STATIC, 15, 180, 210, 25 ICON 0, IDC_FOLDERCUST_ICON, 175, 209, 32, 30 - PUSHBUTTON "Alterar &Icone.", IDC_FOLDERCUST_CHANGE_ICON, 15, 210, 75, 15 + PUSHBUTTON "Alterar &icone.", IDC_FOLDERCUST_CHANGE_ICON, 15, 210, 75, 15 END IDD_LINK_PROBLEM DIALOGEX 0, 0, 250, 140 @@ -728,7 +728,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" BEGIN ICON 0, IDC_LINK_PROBLEM_ICON, 5, 5, 0, 0 - LTEXT "O item '%s' a que este atalho se refere foi alterado ou movido, assim, este atalho deixará de funcionar correctamente.", IDC_LINK_PROBLEM_LABEL1, 35, 5, 210, 35 + LTEXT "O item '%s' a que este atalho se refere foi alterado ou movido. Assim, este atalho deixará de funcionar correctamente.", IDC_LINK_PROBLEM_LABEL1, 35, 5, 210, 35 LTEXT "Correspondência mais próxima com base no nome, tipo, tamanho e data:", IDC_LINK_PROBLEM_LABEL2, 35, 45, 210, 35 LTEXT "Pretende corrigir este atalho para apontar para este destino ou apenas eliminá-lo?", -1, 35, 85, 210, 30 DEFPUSHBUTTON "&Corrigir", IDOK, 55, 120, 60, 15, WS_DISABLED @@ -771,7 +771,7 @@ BEGIN /* special folders descriptions */ IDS_ADMINISTRATIVETOOLS_DESCRIPTION "Definir configurações administrativas para o seu computador." IDS_FOLDER_OPTIONS_DESCRIPTION "Personalize a exibição de ficheiros, pastas e altere a associação de ficheiros." - IDS_FONTS_DESCRIPTION "Adicionar, alterar e gerenciar fontes no seu computador." + IDS_FONTS_DESCRIPTION "Adicionar e alterar tipos de letra no seu computador." IDS_PRINTERS_DESCRIPTION "Lista as impressoras e fax instalados e ajuda-o a adicionar novos equipamentos." /* About shell dialog version string */ @@ -784,7 +784,7 @@ BEGIN IDS_VIEW_DETAILS "&Detalhes" IDS_SELECT "Seleccionar" IDS_OPEN "Abrir" - IDS_CREATELINK "Criar &Atalho" + IDS_CREATELINK "Criar &atalho" IDS_COPY "Copiar" IDS_DELETE "Eliminar" IDS_PROPERTIES "Propriedades" @@ -854,7 +854,7 @@ BEGIN /* Shell folder path default values. See also: dll/win32/userenv/lang */ IDS_PROGRAMS "Menu Iniciar\\Programas" - IDS_PERSONAL "OS Meus Documentos" + IDS_PERSONAL "Os Meus Documentos" IDS_FAVORITES "Favoritos" IDS_STARTUP "Menu Iniciar\\Programas\\Iniciar" IDS_RECENT "Recentes" @@ -880,7 +880,7 @@ BEGIN IDS_COMMON_PICTURES "Os Meus Documentos\\As Minhas Imagens" IDS_COMMON_VIDEO "Os Meus Documentos\\Os Meus Vídeos" IDS_CDBURN_AREA "Definições locais\\Dados de Programas\\Microsoft\\CD Burning" - IDS_NETWORKPLACE "Os Meus Locais da Rede" + IDS_NETWORKPLACE "Os Meus Locais na Rede" IDS_NEWFOLDER "Nova Pasta" @@ -956,7 +956,7 @@ BEGIN IDS_FILE_FOLDER "%u Ficheiros, %u Pastas" IDS_PRINTERS "Impressoras" - IDS_FONTS "Tipos de Letras" + IDS_FONTS "Tipos de letra" IDS_INSTALLNEWFONT "Instalar novo tipo de letra..." IDS_DEFAULT_CLUSTER_SIZE "Tamanho da unidade de atribuição" @@ -964,7 +964,7 @@ BEGIN IDS_SHLEXEC_NOASSOC "Não existe um programa ReactOS configurado para abrir este tipo de ficheiro." - IDS_FILE_DETAILS "Detalhes para extensão '%s'" + IDS_FILE_DETAILS "Detalhes para a extensão '%s'" IDS_FILE_DETAILSADV "Ficheiros com extensão '%s' são do tipo '%s'. Para alterar as definições que afectam todos os ficheiros '%s', clique em Avançado." IDS_FILE_TYPES "Tipos de ficheiro" IDS_COLUMN_EXTENSION "Extensões" @@ -979,16 +979,16 @@ BEGIN IDS_MENU_EMPTY "(Vazio)" IDS_OBJECTS "%d Objetos" - IDS_OBJECTS_SELECTED "%d Objectos Seleccionados" + IDS_OBJECTS_SELECTED "%d Objectos seleccionados" IDS_TITLE_MYCOMP "O Meu Computador" - IDS_TITLE_MYNET "Os Meus Locais da Rede" + IDS_TITLE_MYNET "Os Meus Locais na Rede" IDS_TITLE_BIN_1 "Reciclagem (cheia)" IDS_TITLE_BIN_0 "Reciclagem (vazia)" IDS_ADVANCED_FOLDER "Pastas e ficheiros" IDS_ADVANCED_NET_CRAWLER "Pesquisar automaticamente pastas e impressoras de rede" - IDS_ADVANCED_FOLDER_SIZE_TIP "Mostrar informações de tamanho de arquivo nas informações de pastas" + IDS_ADVANCED_FOLDER_SIZE_TIP "Mostrar informação do tamanho do ficheiro nas informações da pasta" IDS_ADVANCED_FRIENDLY_TREE "Mostrar visualização simples na lista de pastas do Explorador" IDS_ADVANCED_WEB_VIEW_BARRICADE "Mostrar o conteúdo das pastas do sistema" IDS_ADVANCED_SHOW_FULL_PATH_ADDRESS "Mostrar o caminho completo na barra de endereço" @@ -998,31 +998,31 @@ BEGIN IDS_ADVANCED_DONT_SHOW_HIDDEN "Não mostrar ficheiros e pastas ocultos" IDS_ADVANCED_SHOW_HIDDEN "Mostrar ficheiros e pastas ocultos" IDS_ADVANCED_HIDE_FILE_EXT "Ocultar extensões de ficheiros conhecidos" - IDS_ADVANCED_SUPER_HIDDEN "Ocultar ficheiros protegidos do sistema operacional (recomendado)" - IDS_ADVANCED_DESKTOP_PROCESS "Iniciar janelas de pastas num processo separado" + IDS_ADVANCED_SUPER_HIDDEN "Ocultar ficheiros protegidos do sistema operativo (recomendado)" + IDS_ADVANCED_DESKTOP_PROCESS "Iniciar janelas das pastas num processo separado" IDS_ADVANCED_CLASSIC_VIEW_STATE "Lembre-se das configurações de exibição de cada pasta" - IDS_ADVANCED_PERSIST_BROWSERS "Restaurar janelas de pastas anteriores no início de sessão" + IDS_ADVANCED_PERSIST_BROWSERS "Restaurar janelas das pastas anteriores no início de sessão" IDS_ADVANCED_CONTROL_PANEL_IN_MY_COMPUTER "Mostrar painel de controle no meu computador" - IDS_ADVANCED_SHOW_COMP_COLOR "Mostrar ficheiros NTFS criptografados ou compactados em cores" + IDS_ADVANCED_SHOW_COMP_COLOR "Mostrar ficheiros NTFS criptografados ou compactados a cores" IDS_ADVANCED_SHOW_INFO_TIP "Mostrar descrição pop-up para itens de pastas e área de trabalho" IDS_NEWEXT_ADVANCED_LEFT "<< A&vançado" IDS_NEWEXT_ADVANCED_RIGHT "Avança&do >>" IDS_NEWEXT_NEW "<Novo>" IDS_NEWEXT_SPECIFY_EXT "Deve especificar uma extensão." - IDS_NEWEXT_ALREADY_ASSOC "A extensão %s já está associada ao tipo de ficheiros %s. Deseja desassociar %s com %s e criar um novo tipo de ficheiros?" + IDS_NEWEXT_ALREADY_ASSOC "A extensão %s já está associada ao tipo de ficheiro %s. Deseja desassociar %s com %s e criar um novo tipo de ficheiros?" IDS_NEWEXT_EXT_IN_USE "A extensão está em uso" - IDS_REMOVE_EXT "Se remover uma extensão de nome de ficheiros registrado, não poderá abrir ficheiros com esta extensão clicando duas vezes nos ícones.\n\nTem a certeza de que deseja remover esta extensão?" + IDS_REMOVE_EXT "Se remover uma extensão de nome de ficheiro registrado, não mais poderá abrir ficheiros com esta extensão clicando duas vezes no ícone.\n\nPretende remover esta extensão?" IDS_SPECIFY_ACTION "Deve especificar uma acção." - IDS_INVALID_PROGRAM "Não foi possível encontrar o programa especificado. Verifique se o nome e o caminho do ficheiros estão correctos." + IDS_INVALID_PROGRAM "Não foi possível encontrar o programa especificado. Verifique se o nome e o caminho do ficheiro está correcto." IDS_REMOVE_ACTION "Tem a certeza que deseja remover esta acção?" - IDS_ACTION_EXISTS "A acção '%s' já está registrada para este tipo de ficheiros. Digite um nome diferente e tente novamente." + IDS_ACTION_EXISTS "A acção '%s' já está registrada para este tipo de ficheiro. Digite um nome diferente e tente novamente." IDS_EXE_FILTER "Programas\0*.exe\0Todos os tipos\0*.*\0" IDS_EDITING_ACTION "Editar acção para o tipo: " - IDS_NO_ICONS "O ficheiros '%s' não contém ícones.\n\nEscolha um ícone da lista ou especifique um ficheiros diferente." - IDS_FILE_NOT_FOUND "O ficheiros '%s' não foi encontrado." - IDS_LINK_INVALID "O item '%s' a que este atalho se refere foi alterado ou movido, assim, este atalho não mais funcionará correctamente." + IDS_NO_ICONS "O ficheiro '%s' não contém ícones.\n\nEscolha um ícone da lista ou especifique um ficheiro diferente." + IDS_FILE_NOT_FOUND "O ficheiro '%s' não foi encontrado." + IDS_LINK_INVALID "O item '%s' a que este atalho se refere foi alterado ou movido. Assim, este atalho não mais funcionará correctamente." IDS_COPYTOMENU "Copiar para &pasta..." IDS_COPYTOTITLE "Seleccione o local para onde deseja copiar '%s'. De seguida, clique no botão ""Copiar""." IDS_COPYITEMS "Copiar Items" diff --git a/dll/win32/userenv/lang/pt-PT.rc b/dll/win32/userenv/lang/pt-PT.rc index f6f8d8b992b..7f667b4726e 100644 --- a/dll/win32/userenv/lang/pt-PT.rc +++ b/dll/win32/userenv/lang/pt-PT.rc @@ -7,7 +7,7 @@ BEGIN IDS_APPDATA "Dados de Programas" IDS_DESKTOP "Ambiente de trabalho" IDS_FAVORITES "Favoritos" - IDS_MYDOCUMENTS "Meus Documentos" + IDS_MYDOCUMENTS "Os Meus Documentos" IDS_NETHOOD "Ambiente de rede" IDS_PRINTHOOD "Ambiente de impressão" IDS_RECENT "Documentos recentes"

1 year, 9 months

[reactos] 01/01: [FREELDR] Support compiling freeldr as a UEFI loader + Implement UI functions (#5171)

by Justin Miller

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=150f7212736bfb5da500c… commit 150f7212736bfb5da500cbafa58c0671d0cc8122 Author: Justin Miller <justinmiller100(a)gmail.com> AuthorDate: Sun Mar 19 12:13:16 2023 -0700 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Mar 19 20:13:16 2023 +0100 [FREELDR] Support compiling freeldr as a UEFI loader + Implement UI functions (#5171) First batch of changes to implement a UEFI version of freeldr: - Compile freeldr as EFI binary on top of the existing loader. - Stub out various functions so we can create a UEFI machine-type in freeldr. - Implement all of the video output functions so we can display a pretty freeldr BSoD :) --- boot/boot_images.cmake | 14 +- boot/freeldr/freeldr/CMakeLists.txt | 3 + boot/freeldr/freeldr/arch/uefi/stubs.c | 125 +++++++++++ boot/freeldr/freeldr/arch/uefi/ueficon.c | 61 ++++++ boot/freeldr/freeldr/arch/uefi/uefildr.c | 37 ++++ boot/freeldr/freeldr/arch/uefi/uefisetup.c | 60 ++++++ boot/freeldr/freeldr/arch/uefi/uefiutil.c | 38 ++++ boot/freeldr/freeldr/arch/uefi/uefivid.c | 240 ++++++++++++++++++++++ boot/freeldr/freeldr/bootmgr.c | 6 + boot/freeldr/freeldr/freeldr.c | 2 + boot/freeldr/freeldr/include/arch/uefi/machuefi.h | 122 +++++++++++ boot/freeldr/freeldr/include/arch/uefi/uefildr.h | 36 ++++ boot/freeldr/freeldr/lib/fs/fs.c | 4 +- boot/freeldr/freeldr/miscboot.c | 2 + boot/freeldr/freeldr/uefi.cmake | 122 +++++++++++ 15 files changed, 867 insertions(+), 5 deletions(-) diff --git a/boot/boot_images.cmake b/boot/boot_images.cmake index c0c9a957672..6ceb37fee73 100644 --- a/boot/boot_images.cmake +++ b/boot/boot_images.cmake @@ -15,11 +15,9 @@ else() message(FATAL_ERROR "Unknown ARCH '" ${ARCH} "', cannot generate a valid UEFI boot filename.") endif() -# FIXME: this command creates a dummy EFI partition, add EFI/BOOT/boot${EFI_PLATFORM_ID}.efi file -# once ReactOS supports UEFI add_custom_target(efisys - COMMAND native-fatten ${CMAKE_CURRENT_BINARY_DIR}/efisys.bin -format 2880 EFIBOOT -boot ${CMAKE_CURRENT_BINARY_DIR}/freeldr/bootsect/fat.bin -mkdir EFI -mkdir EFI/BOOT - DEPENDS native-fatten fat + COMMAND native-fatten ${CMAKE_CURRENT_BINARY_DIR}/efisys.bin -format 2880 EFIBOOT -boot ${CMAKE_CURRENT_BINARY_DIR}/freeldr/bootsect/fat.bin -mkdir EFI -mkdir EFI/BOOT -add $<TARGET_FILE:uefildr> EFI/BOOT/boot${EFI_PLATFORM_ID}.efi + DEPENDS native-fatten fat uefildr VERBATIM) @@ -162,4 +160,12 @@ add_custom_target(hybridcd DEPENDS bootcd livecd VERBATIM) +# For things like flashing USB drives, we also add the efi file into efi/boot. add_cd_file(TARGET efisys FILE ${CMAKE_CURRENT_BINARY_DIR}/efisys.bin DESTINATION loader NO_CAB NOT_IN_HYBRIDCD FOR bootcd regtest livecd hybridcd) + +add_cd_file( + TARGET uefildr + DESTINATION efi/boot + NO_CAB + NAME_ON_CD boot${EFI_PLATFORM_ID}.efi + FOR livecd hybridcd) diff --git a/boot/freeldr/freeldr/CMakeLists.txt b/boot/freeldr/freeldr/CMakeLists.txt index 740a0a5192c..22b58246ea8 100644 --- a/boot/freeldr/freeldr/CMakeLists.txt +++ b/boot/freeldr/freeldr/CMakeLists.txt @@ -135,3 +135,6 @@ if(ARCH STREQUAL "i386") endif() include(pcat.cmake) +if(NOT ARCH STREQUAL "i386" OR NOT (SARCH STREQUAL "pc98" OR SARCH STREQUAL "xbox")) + include(uefi.cmake) +endif() diff --git a/boot/freeldr/freeldr/arch/uefi/stubs.c b/boot/freeldr/freeldr/arch/uefi/stubs.c new file mode 100644 index 00000000000..b3d574fb00f --- /dev/null +++ b/boot/freeldr/freeldr/arch/uefi/stubs.c @@ -0,0 +1,125 @@ +/* + * PROJECT: Freeldr UEFI Extension + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: UEFI stubs + * COPYRIGHT: Copyright 2022 Justin Miller <justinmiller100(a)gmail.com> + */ + +#include <uefildr.h> + +#include <debug.h> + +/* TODO: Handle this with custom Disk / partition setup */ +UCHAR +DriveMapGetBiosDriveNumber(PCSTR DeviceName) +{ + return 0; +} + +VOID +StallExecutionProcessor(ULONG Microseconds) +{ + +} + +VOID +NTAPI +KeStallExecutionProcessor(ULONG Microseconds) +{ + StallExecutionProcessor(Microseconds); +} + +VOID +UefiVideoGetFontsFromFirmware(PULONG RomFontPointers) +{ + +} + +VOID +UefiVideoSync(VOID) +{ + +} + +PFREELDR_MEMORY_DESCRIPTOR +UefiMemGetMemoryMap(ULONG *MemoryMapSize) +{ + return 0; +} + +VOID +UefiGetExtendedBIOSData(PULONG ExtendedBIOSDataArea, + PULONG ExtendedBIOSDataSize) +{ + +} + +UCHAR +UefiGetFloppyCount(VOID) +{ + return 0; +} + +BOOLEAN +UefiDiskReadLogicalSectors(IN UCHAR DriveNumber, + IN ULONGLONG SectorNumber, + IN ULONG SectorCount, + OUT PVOID Buffer) +{ + return 0; +} + +BOOLEAN +UefiDiskGetDriveGeometry(UCHAR DriveNumber, + PGEOMETRY Geometry) +{ + return 0; +} + +ULONG +UefiDiskGetCacheableBlockCount(UCHAR DriveNumber) +{ + return 0; +} + +BOOLEAN +UefiInitializeBootDevices(VOID) +{ + return 0; +} + +PCONFIGURATION_COMPONENT_DATA +UefiHwDetect(VOID) +{ + return 0; +} + +VOID +UefiPrepareForReactOS(VOID) +{ + +} + +VOID +UefiPcBeep(VOID) +{ + /* Not possible on UEFI, for now */ +} + +BOOLEAN +UefiConsKbHit(VOID) +{ + return FALSE; +} + +int +UefiConsGetCh(void) +{ + return 0; +} + +VOID +UefiHwIdle(VOID) +{ + +} diff --git a/boot/freeldr/freeldr/arch/uefi/ueficon.c b/boot/freeldr/freeldr/arch/uefi/ueficon.c new file mode 100644 index 00000000000..78c67d9c6e8 --- /dev/null +++ b/boot/freeldr/freeldr/arch/uefi/ueficon.c @@ -0,0 +1,61 @@ +/* + * PROJECT: Freeldr UEFI Extension + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: UEFI Console output + * COPYRIGHT: Copyright 2022 Justin Miller <justinmiller100(a)gmail.com> + */ + +#include <uefildr.h> + +#define CHAR_WIDTH 8 +#define CHAR_HEIGHT 16 + +/* GLOBALS ********************************************************************/ + +extern EFI_SYSTEM_TABLE* GlobalSystemTable; +static unsigned CurrentCursorX = 0; +static unsigned CurrentCursorY = 0; +static unsigned CurrentAttr = 0x0f; + +/* FUNCTIONS ******************************************************************/ + +VOID +UefiConsPutChar(int c) +{ + ULONG Width, Height, Unused; + BOOLEAN NeedScroll; + + UefiVideoGetDisplaySize(&Width, &Height, &Unused); + + NeedScroll = (CurrentCursorY >= Height); + if (NeedScroll) + { + UefiVideoScrollUp(); + --CurrentCursorY; + } + if (c == '\r') + { + CurrentCursorX = 0; + } + else if (c == '\n') + { + CurrentCursorX = 0; + + if (!NeedScroll) + ++CurrentCursorY; + } + else if (c == '\t') + { + CurrentCursorX = (CurrentCursorX + 8) & ~7; + } + else + { + UefiVideoPutChar(c, CurrentAttr, CurrentCursorX, CurrentCursorY); + CurrentCursorX++; + } + if (CurrentCursorX >= Width) + { + CurrentCursorX = 0; + CurrentCursorY++; + } +} diff --git a/boot/freeldr/freeldr/arch/uefi/uefildr.c b/boot/freeldr/freeldr/arch/uefi/uefildr.c new file mode 100644 index 00000000000..e06ff9a1c5b --- /dev/null +++ b/boot/freeldr/freeldr/arch/uefi/uefildr.c @@ -0,0 +1,37 @@ +/* + * PROJECT: Freeldr UEFI Extension + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: UEFI Entry point and helpers + * COPYRIGHT: Copyright 2022 Justin Miller <justinmiller100(a)gmail.com> + */ + +#include <uefildr.h> + +#include <debug.h> + +/* GLOBALS ********************************************************************/ + +EFI_HANDLE GlobalImageHandle; +EFI_SYSTEM_TABLE *GlobalSystemTable; + +/* FUNCTIONS ******************************************************************/ + +EFI_STATUS +EfiEntry( + _In_ EFI_HANDLE ImageHandle, + _In_ EFI_SYSTEM_TABLE *SystemTable) +{ + SystemTable->ConOut->OutputString(SystemTable->ConOut, L"UEFI EntryPoint: Starting freeldr from UEFI"); + GlobalImageHandle = ImageHandle; + GlobalSystemTable = SystemTable; + + BootMain(NULL); + + UNREACHABLE; + return 0; +} + +VOID __cdecl Reboot(VOID) +{ + +} diff --git a/boot/freeldr/freeldr/arch/uefi/uefisetup.c b/boot/freeldr/freeldr/arch/uefi/uefisetup.c new file mode 100644 index 00000000000..bd223da465f --- /dev/null +++ b/boot/freeldr/freeldr/arch/uefi/uefisetup.c @@ -0,0 +1,60 @@ +/* + * PROJECT: Freeldr UEFI Extension + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: UEFI Mach Setup + * COPYRIGHT: Copyright 2022 Justin Miller <justinmiller100(a)gmail.com> + */ + +#include <uefildr.h> + +#include <debug.h> +DBG_DEFAULT_CHANNEL(WARNING); + +/* GLOBALS ********************************************************************/ + +extern EFI_SYSTEM_TABLE* GlobalSystemTable; +extern EFI_HANDLE GlobalImageHandle; +BOOLEAN AcpiPresent = FALSE; + +/* FUNCTIONS ******************************************************************/ + +VOID +MachInit(const char *CmdLine) +{ + RtlZeroMemory(&MachVtbl, sizeof(MachVtbl)); + + MachVtbl.ConsPutChar = UefiConsPutChar; + MachVtbl.ConsKbHit = UefiConsKbHit; + MachVtbl.ConsGetCh = UefiConsGetCh; + MachVtbl.VideoClearScreen = UefiVideoClearScreen; + MachVtbl.VideoSetDisplayMode = UefiVideoSetDisplayMode; + MachVtbl.VideoGetDisplaySize = UefiVideoGetDisplaySize; + MachVtbl.VideoGetBufferSize = UefiVideoGetBufferSize; + MachVtbl.VideoGetFontsFromFirmware = UefiVideoGetFontsFromFirmware; + MachVtbl.VideoSetTextCursorPosition = UefiVideoSetTextCursorPosition; + MachVtbl.VideoHideShowTextCursor = UefiVideoHideShowTextCursor; + MachVtbl.VideoPutChar = UefiVideoPutChar; + MachVtbl.VideoCopyOffScreenBufferToVRAM = UefiVideoCopyOffScreenBufferToVRAM; + MachVtbl.VideoIsPaletteFixed = UefiVideoIsPaletteFixed; + MachVtbl.VideoSetPaletteColor = UefiVideoSetPaletteColor; + MachVtbl.VideoGetPaletteColor = UefiVideoGetPaletteColor; + MachVtbl.VideoSync = UefiVideoSync; + MachVtbl.Beep = UefiPcBeep; + MachVtbl.PrepareForReactOS = UefiPrepareForReactOS; + MachVtbl.GetMemoryMap = UefiMemGetMemoryMap; + MachVtbl.GetExtendedBIOSData = UefiGetExtendedBIOSData; + MachVtbl.GetFloppyCount = UefiGetFloppyCount; + MachVtbl.DiskReadLogicalSectors = UefiDiskReadLogicalSectors; + MachVtbl.DiskGetDriveGeometry = UefiDiskGetDriveGeometry; + MachVtbl.DiskGetCacheableBlockCount = UefiDiskGetCacheableBlockCount; + MachVtbl.GetTime = UefiGetTime; + MachVtbl.InitializeBootDevices = UefiInitializeBootDevices; + MachVtbl.HwDetect = UefiHwDetect; + MachVtbl.HwIdle = UefiHwIdle; + + /* Setup GOP */ + if (UefiInitalizeVideo() != EFI_SUCCESS) + { + ERR("Failed to setup GOP\n"); + } +} diff --git a/boot/freeldr/freeldr/arch/uefi/uefiutil.c b/boot/freeldr/freeldr/arch/uefi/uefiutil.c new file mode 100644 index 00000000000..9dafea22b6c --- /dev/null +++ b/boot/freeldr/freeldr/arch/uefi/uefiutil.c @@ -0,0 +1,38 @@ +/* + * PROJECT: Freeldr UEFI Extension + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: UEFI Utils source + * COPYRIGHT: Copyright 2022 Justin Miller <justinmiller100(a)gmail.com> + */ + +#include <uefildr.h> + +#include <debug.h> +DBG_DEFAULT_CHANNEL(WARNING); + +/* GLOBALS ********************************************************************/ + +extern EFI_SYSTEM_TABLE *GlobalSystemTable; + +/* FUNCTIONS ******************************************************************/ + +TIMEINFO* +UefiGetTime(VOID) +{ + static TIMEINFO TimeInfo; + EFI_STATUS Status; + EFI_TIME time = {0}; + + Status = GlobalSystemTable->RuntimeServices->GetTime(&time, NULL); + if (Status != EFI_SUCCESS) + ERR("UefiGetTime: cannot get time status %d\n", Status); + + TimeInfo.Year = time.Year; + TimeInfo.Month = time.Month; + TimeInfo.Day = time.Day; + TimeInfo.Hour = time.Hour; + TimeInfo.Minute = time.Minute; + TimeInfo.Second = time.Second; + return &TimeInfo; +} + diff --git a/boot/freeldr/freeldr/arch/uefi/uefivid.c b/boot/freeldr/freeldr/arch/uefi/uefivid.c new file mode 100644 index 00000000000..5bd869fcfd4 --- /dev/null +++ b/boot/freeldr/freeldr/arch/uefi/uefivid.c @@ -0,0 +1,240 @@ +/* + * PROJECT: Freeldr UEFI Extension + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: UEFI Video output + * COPYRIGHT: Copyright 2022 Justin Miller <justinmiller100(a)gmail.com> + */ + +#include <uefildr.h> + +#include <debug.h> +DBG_DEFAULT_CHANNEL(WARNING); + +#define CHAR_WIDTH 8 +#define CHAR_HEIGHT 16 +#define TOP_BOTTOM_LINES 0 +#define LOWEST_SUPPORTED_RES 1 + +/* GLOBALS ********************************************************************/ + +extern EFI_SYSTEM_TABLE* GlobalSystemTable; +extern EFI_HANDLE GlobalImageHandle; +extern UCHAR BitmapFont8x16[256 * 16]; + +UCHAR MachDefaultTextColor = COLOR_GRAY; +REACTOS_INTERNAL_BGCONTEXT framebufferData; +EFI_GUID EfiGraphicsOutputProtocol = EFI_GRAPHICS_OUTPUT_PROTOCOL_GUID; + +/* FUNCTIONS ******************************************************************/ + +EFI_STATUS +UefiInitalizeVideo(VOID) +{ + EFI_STATUS Status; + EFI_GRAPHICS_OUTPUT_PROTOCOL* gop = NULL; + + RtlZeroMemory(&framebufferData, sizeof(framebufferData)); + Status = GlobalSystemTable->BootServices->LocateProtocol(&EfiGraphicsOutputProtocol, 0, (void**)&gop); + if (Status != EFI_SUCCESS) + { + TRACE("Failed to find GOP with status %d\n", Status); + return Status; + } + + /* We don't need high resolutions for freeldr */ + gop->SetMode(gop, LOWEST_SUPPORTED_RES); + + framebufferData.BaseAddress = (ULONG_PTR)gop->Mode->FrameBufferBase; + framebufferData.BufferSize = gop->Mode->FrameBufferSize; + framebufferData.ScreenWidth = gop->Mode->Info->HorizontalResolution; + framebufferData.ScreenHeight = gop->Mode->Info->VerticalResolution; + framebufferData.PixelsPerScanLine = gop->Mode->Info->PixelsPerScanLine; + framebufferData.PixelFormat = gop->Mode->Info->PixelFormat; + + return Status; +} + +VOID +UefiPrintFramebufferData(VOID) +{ + TRACE("Framebuffer BaseAddress : %X\n", framebufferData.BaseAddress); + TRACE("Framebuffer BufferSize : %X\n", framebufferData.BufferSize); + TRACE("Framebuffer ScreenWidth : %d\n", framebufferData.ScreenWidth); + TRACE("Framebuffer ScreenHeight : %d\n", framebufferData.ScreenHeight); + TRACE("Framebuffer PixelsPerScanLine : %d\n", framebufferData.PixelsPerScanLine); + TRACE("Framebuffer PixelFormat : %d\n", framebufferData.PixelFormat); +} + +static ULONG +UefiVideoAttrToSingleColor(UCHAR Attr) +{ + UCHAR Intensity; + Intensity = (0 == (Attr & 0x08) ? 127 : 255); + + return 0xff000000 | + (0 == (Attr & 0x04) ? 0 : (Intensity << 16)) | + (0 == (Attr & 0x02) ? 0 : (Intensity << 8)) | + (0 == (Attr & 0x01) ? 0 : Intensity); +} + +static VOID +UefiVideoAttrToColors(UCHAR Attr, ULONG *FgColor, ULONG *BgColor) +{ + *FgColor = UefiVideoAttrToSingleColor(Attr & 0xf); + *BgColor = UefiVideoAttrToSingleColor((Attr >> 4) & 0xf); +} + + +static VOID +UefiVideoClearScreenColor(ULONG Color, BOOLEAN FullScreen) +{ + ULONG Delta; + ULONG Line, Col; + PULONG p; + + Delta = (framebufferData.PixelsPerScanLine * 4 + 3) & ~ 0x3; + for (Line = 0; Line < framebufferData.ScreenHeight - (FullScreen ? 0 : 2 * TOP_BOTTOM_LINES); Line++) + { + p = (PULONG) ((char *) framebufferData.BaseAddress + (Line + (FullScreen ? 0 : TOP_BOTTOM_LINES)) * Delta); + for (Col = 0; Col < framebufferData.ScreenWidth; Col++) + { + *p++ = Color; + } + } +} + +VOID +UefiVideoClearScreen(UCHAR Attr) +{ + ULONG FgColor, BgColor; + + UefiVideoAttrToColors(Attr, &FgColor, &BgColor); + UefiVideoClearScreenColor(BgColor, FALSE); +} + +VOID +UefiVideoOutputChar(UCHAR Char, unsigned X, unsigned Y, ULONG FgColor, ULONG BgColor) +{ + PUCHAR FontPtr; + PULONG Pixel; + UCHAR Mask; + unsigned Line; + unsigned Col; + ULONG Delta; + Delta = (framebufferData.PixelsPerScanLine * 4 + 3) & ~ 0x3; + FontPtr = BitmapFont8x16 + Char * 16; + Pixel = (PULONG) ((char *) framebufferData.BaseAddress + + (Y * CHAR_HEIGHT + TOP_BOTTOM_LINES) * Delta + X * CHAR_WIDTH * 4); + + for (Line = 0; Line < CHAR_HEIGHT; Line++) + { + Mask = 0x80; + for (Col = 0; Col < CHAR_WIDTH; Col++) + { + Pixel[Col] = (0 != (FontPtr[Line] & Mask) ? FgColor : BgColor); + Mask = Mask >> 1; + } + Pixel = (PULONG) ((char *) Pixel + Delta); + } +} + +VOID +UefiVideoPutChar(int Ch, UCHAR Attr, unsigned X, unsigned Y) +{ + ULONG FgColor = 0; + ULONG BgColor = 0; + if (Ch != 0) + { + UefiVideoAttrToColors(Attr, &FgColor, &BgColor); + UefiVideoOutputChar(Ch, X, Y, FgColor, BgColor); + } +} + +VOID +UefiVideoGetDisplaySize(PULONG Width, PULONG Height, PULONG Depth) +{ + *Width = framebufferData.ScreenWidth / CHAR_WIDTH; + *Height = (framebufferData.ScreenHeight - 2 * TOP_BOTTOM_LINES) / CHAR_HEIGHT; + *Depth = 0; +} + +VIDEODISPLAYMODE +UefiVideoSetDisplayMode(char *DisplayMode, BOOLEAN Init) +{ + /* We only have one mode, semi-text */ + return VideoTextMode; +} + +ULONG +UefiVideoGetBufferSize(VOID) +{ + return ((framebufferData.ScreenHeight - 2 * TOP_BOTTOM_LINES) / CHAR_HEIGHT * (framebufferData.ScreenWidth / CHAR_WIDTH) * 2); +} + +VOID +UefiVideoCopyOffScreenBufferToVRAM(PVOID Buffer) +{ + PUCHAR OffScreenBuffer = (PUCHAR)Buffer; + + ULONG Col, Line; + for (Line = 0; Line < (framebufferData.ScreenHeight - 2 * TOP_BOTTOM_LINES) / CHAR_HEIGHT; Line++) + { + for (Col = 0; Col < framebufferData.ScreenWidth / CHAR_WIDTH; Col++) + { + UefiVideoPutChar(OffScreenBuffer[0], OffScreenBuffer[1], Col, Line); + OffScreenBuffer += 2; + } + } +} + +VOID +UefiVideoScrollUp(VOID) +{ + ULONG BgColor, Dummy; + ULONG Delta; + Delta = (framebufferData.PixelsPerScanLine * 4 + 3) & ~ 0x3; + ULONG PixelCount = framebufferData.ScreenWidth * CHAR_HEIGHT * + (((framebufferData.ScreenHeight - 2 * TOP_BOTTOM_LINES) / CHAR_HEIGHT) - 1); + PULONG Src = (PULONG)((PUCHAR)framebufferData.BaseAddress + (CHAR_HEIGHT + TOP_BOTTOM_LINES) * Delta); + PULONG Dst = (PULONG)((PUCHAR)framebufferData.BaseAddress + TOP_BOTTOM_LINES * Delta); + + UefiVideoAttrToColors(ATTR(COLOR_WHITE, COLOR_BLACK), &Dummy, &BgColor); + + while (PixelCount--) + *Dst++ = *Src++; + + for (PixelCount = 0; PixelCount < framebufferData.ScreenWidth * CHAR_HEIGHT; PixelCount++) + *Dst++ = BgColor; +} + +VOID +UefiVideoSetTextCursorPosition(UCHAR X, UCHAR Y) +{ + /* We don't have a cursor yet */ +} + +VOID +UefiVideoHideShowTextCursor(BOOLEAN Show) +{ + /* We don't have a cursor yet */ +} + +BOOLEAN +UefiVideoIsPaletteFixed(VOID) +{ + return 0; +} + +VOID +UefiVideoSetPaletteColor(UCHAR Color, UCHAR Red, + UCHAR Green, UCHAR Blue) +{ + /* Not supported */ +} + +VOID +UefiVideoGetPaletteColor(UCHAR Color, UCHAR* Red, + UCHAR* Green, UCHAR* Blue) +{ + /* Not supported */ +} diff --git a/boot/freeldr/freeldr/bootmgr.c b/boot/freeldr/freeldr/bootmgr.c index c866502a6aa..2c837951fec 100644 --- a/boot/freeldr/freeldr/bootmgr.c +++ b/boot/freeldr/freeldr/bootmgr.c @@ -55,11 +55,13 @@ static const struct {"ReactOSSetup", EditCustomBootReactOSSetup, LoadReactOSSetup}, #if defined(_M_IX86) || defined(_M_AMD64) +#ifndef UEFIBOOT {"Drive" , EditCustomBootDisk , LoadAndBootDevice}, {"Partition" , EditCustomBootPartition , LoadAndBootDevice}, {"BootSector" , EditCustomBootSectorFile, LoadAndBootDevice}, {"Linux" , EditCustomBootLinux, LoadAndBootLinux }, #endif +#endif #ifdef _M_IX86 {"WindowsNT40" , EditCustomBootNTOS , LoadAndBootWindows}, #endif @@ -194,8 +196,10 @@ VOID LoadOperatingSystem(IN OperatingSystemItem* OperatingSystem) ASSERT(*BootType); #ifdef _M_IX86 +#ifndef UEFIBOOT /* Install the drive mapper according to this section drive mappings */ DriveMapMapDrivesInSection(SectionId); +#endif #endif /* Find the suitable OS loader to start */ @@ -314,11 +318,13 @@ VOID RunLoader(VOID) } #ifdef _M_IX86 +#ifndef UEFIBOOT /* Load additional SCSI driver (if any) */ if (LoadBootDeviceDriver() != ESUCCESS) { UiMessageBoxCritical("Unable to load additional boot device drivers."); } +#endif #endif if (!IniFileInitialize()) diff --git a/boot/freeldr/freeldr/freeldr.c b/boot/freeldr/freeldr/freeldr.c index 16af2375097..da9f8964fdb 100644 --- a/boot/freeldr/freeldr/freeldr.c +++ b/boot/freeldr/freeldr/freeldr.c @@ -51,8 +51,10 @@ VOID __cdecl BootMain(IN PCCH CmdLine) TRACE("BootMain() called.\n"); +#ifndef UEFIBOOT /* Check if the CPU is new enough */ FrLdrCheckCpuCompatibility(); // FIXME: Should be done inside MachInit! +#endif /* UI pre-initialization */ if (!UiInitialize(FALSE)) diff --git a/boot/freeldr/freeldr/include/arch/uefi/machuefi.h b/boot/freeldr/freeldr/include/arch/uefi/machuefi.h new file mode 100644 index 00000000000..ba878e30972 --- /dev/null +++ b/boot/freeldr/freeldr/include/arch/uefi/machuefi.h @@ -0,0 +1,122 @@ +/* + * PROJECT: Freeldr UEFI Extension + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: UEFI "mach" header + * COPYRIGHT: Copyright 2022 Justin Miller <justinmiller100(a)gmail.com> + */ + +#include <machine.h> + +EFI_STATUS +UefiMachInit(_In_ EFI_HANDLE ImageHandle, + _In_ EFI_SYSTEM_TABLE *SystemTable); + +VOID +UefiConsPutChar(int Ch); + +BOOLEAN +UefiConsKbHit(VOID); + +VOID +UefiConsSetCursor(UINT32 Col, UINT32 Row); + +int +UefiConsGetCh(void); + +EFI_STATUS +UefiInitalizeVideo(VOID); + +VOID +UefiVideoClearScreen(UCHAR Attr); + +VIDEODISPLAYMODE +UefiVideoSetDisplayMode(char *DisplayMode, BOOLEAN Init); + +VOID +UefiVideoGetDisplaySize(PULONG Width, PULONG Height, PULONG Depth); + +ULONG +UefiVideoGetBufferSize(VOID); + +VOID +UefiVideoGetFontsFromFirmware(PULONG RomFontPointers); + +VOID +UefiVideoSetTextCursorPosition(UCHAR X, UCHAR Y); + +VOID +UefiVideoHideShowTextCursor(BOOLEAN Show); + +VOID +UefiVideoOutputChar(UCHAR Char, unsigned X, + unsigned Y, ULONG FgColor, ULONG BgColor); + +VOID +UefiVideoPutChar(int Ch, UCHAR Attr, + unsigned X, unsigned Y); + + +VOID +UefiVideoCopyOffScreenBufferToVRAM(PVOID Buffer); + +BOOLEAN +UefiVideoIsPaletteFixed(VOID); + +VOID +UefiVideoSetPaletteColor(UCHAR Color, UCHAR Red, + UCHAR Green, UCHAR Blue); + +VOID +UefiVideoGetPaletteColor(UCHAR Color, UCHAR* Red, + UCHAR* Green, UCHAR* Blue); + +VOID +UefiVideoSync(VOID); + +VOID +UefiPcBeep(VOID); + +PFREELDR_MEMORY_DESCRIPTOR +UefiMemGetMemoryMap(ULONG *MemoryMapSize); + +VOID +UefiGetExtendedBIOSData(PULONG ExtendedBIOSDataArea, + PULONG ExtendedBIOSDataSize); + +UCHAR +UefiGetFloppyCount(VOID); + +BOOLEAN +UefiDiskReadLogicalSectors(IN UCHAR DriveNumber, + IN ULONGLONG SectorNumber, + IN ULONG SectorCount, + OUT PVOID Buffer); + +BOOLEAN +UefiDiskGetDriveGeometry(UCHAR DriveNumber, + PGEOMETRY Geometry); + +ULONG +UefiDiskGetCacheableBlockCount(UCHAR DriveNumber); + +TIMEINFO* +UefiGetTime(VOID); + +BOOLEAN +UefiInitializeBootDevices(VOID); + +PCONFIGURATION_COMPONENT_DATA +UefiHwDetect(VOID); + +VOID +UefiPrepareForReactOS(VOID); + +VOID +UefiHwIdle(VOID); + +VOID +UefiInitializeFileSystemSupport(_In_ EFI_HANDLE ImageHandle, + _In_ EFI_SYSTEM_TABLE *SystemTable); + +VOID +UefiVideoScrollUp(VOID); diff --git a/boot/freeldr/freeldr/include/arch/uefi/uefildr.h b/boot/freeldr/freeldr/include/arch/uefi/uefildr.h new file mode 100644 index 00000000000..8074a615289 --- /dev/null +++ b/boot/freeldr/freeldr/include/arch/uefi/uefildr.h @@ -0,0 +1,36 @@ +/* + * PROJECT: Freeldr UEFI Extension + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Uefi freeldr core header + * COPYRIGHT: Copyright 2022 Justin Miller <justinmiller100(a)gmail.com> + */ + +#pragma once + +/* INCLUDES ******************************************************************/ +#include <freeldr.h> + +/* UEFI Headers */ +#include <Uefi.h> +#include <DevicePath.h> +#include <LoadedImage.h> +#include <GraphicsOutput.h> +#include <UgaDraw.h> +#include <BlockIo.h> +#include <Acpi.h> +#include <GlobalVariable.h> +#include <debug.h> +#include <machuefi.h> + +//TODO: this version of the struct is temporary +typedef struct _REACTOS_INTERNAL_BGCONTEXT +{ + ULONG_PTR BaseAddress; + ULONG BufferSize; + UINT32 ScreenWidth; + UINT32 ScreenHeight; + UINT32 PixelsPerScanLine; + UINT32 PixelFormat; +} REACTOS_INTERNAL_BGCONTEXT, *PREACTOS_INTERNAL_BGCONTEXT; + +VOID __cdecl BootMain(IN PCCH CmdLine); diff --git a/boot/freeldr/freeldr/lib/fs/fs.c b/boot/freeldr/freeldr/lib/fs/fs.c index 92cb3ef0362..3326b1951d6 100644 --- a/boot/freeldr/freeldr/lib/fs/fs.c +++ b/boot/freeldr/freeldr/lib/fs/fs.c @@ -1,7 +1,7 @@ /* * FreeLoader * Copyright (C) 1998-2003 Brian Palmer <brianp(a)sginet.com> - * Copyright (C) 2008-2009 Herv� Poussineau <hpoussin(a)reactos.org> + * Copyright (C) 2008-2009 Hervé Poussineau <hpoussin(a)reactos.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -160,8 +160,10 @@ ARC_STATUS ArcOpen(CHAR* Path, OPENMODE OpenMode, ULONG* FileId) FileData[DeviceId].FileFuncTable = Ext2Mount(DeviceId); #endif #if defined(_M_IX86) || defined(_M_AMD64) +#ifndef UEFIBOOT if (!FileData[DeviceId].FileFuncTable) FileData[DeviceId].FileFuncTable = PxeMount(DeviceId); +#endif #endif if (!FileData[DeviceId].FileFuncTable) { diff --git a/boot/freeldr/freeldr/miscboot.c b/boot/freeldr/freeldr/miscboot.c index 6aca738b773..445cecc9e3f 100644 --- a/boot/freeldr/freeldr/miscboot.c +++ b/boot/freeldr/freeldr/miscboot.c @@ -339,8 +339,10 @@ LoadAndBootDevice( UiUnInitialize("Booting..."); IniCleanup(); +#ifndef UEFIBOOT /* Boot the loaded sector code */ ChainLoadBiosBootSectorCode(DriveNumber, PartitionNumber); +#endif /* Must not return! */ return ESUCCESS; } diff --git a/boot/freeldr/freeldr/uefi.cmake b/boot/freeldr/freeldr/uefi.cmake new file mode 100644 index 00000000000..21710408dfc --- /dev/null +++ b/boot/freeldr/freeldr/uefi.cmake @@ -0,0 +1,122 @@ +## +## PROJECT: FreeLoader +## LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) +## PURPOSE: Build definitions for UEFI +## COPYRIGHT: Copyright 2023 Justin Miller <justinmiller100(a)gmail.com> +## + +include_directories(BEFORE + ${REACTOS_SOURCE_DIR}/boot/environ/include/efi + ${REACTOS_SOURCE_DIR}/boot/freeldr/freeldr + ${REACTOS_SOURCE_DIR}/boot/freeldr/freeldr/include + ${REACTOS_SOURCE_DIR}/boot/freeldr/freeldr/include/arch/uefi) + +list(APPEND UEFILDR_ARC_SOURCE + ${FREELDR_ARC_SOURCE} + arch/uefi/stubs.c + arch/uefi/uefisetup.c + arch/uefi/uefivid.c + arch/uefi/uefiutil.c + arch/uefi/ueficon.c + arch/vgafont.c) + +if(ARCH STREQUAL "i386") + list(APPEND UEFILDR_COMMON_ASM_SOURCE + arch/i386/i386trap.S) + +elseif(ARCH STREQUAL "amd64") + #TBD +elseif(ARCH STREQUAL "arm") + #TBD +elseif(ARCH STREQUAL "arm64") + #TBD +else() + #TBD +endif() + +add_asm_files(uefifreeldr_common_asm ${FREELDR_COMMON_ASM_SOURCE} ${UEFILDR_COMMON_ASM_SOURCE}) + +add_library(uefifreeldr_common + ${uefifreeldr_common_asm} + ${UEFILDR_ARC_SOURCE} + ${FREELDR_BOOTLIB_SOURCE} + ${FREELDR_BOOTMGR_SOURCE} + ${FREELDR_NTLDR_SOURCE}) + +target_compile_definitions(uefifreeldr_common PRIVATE UEFIBOOT) + +if(CMAKE_C_COMPILER_ID STREQUAL "GNU" OR CMAKE_C_COMPILER_ID STREQUAL "Clang") + # Prevent using SSE (no support in freeldr) + target_compile_options(uefifreeldr_common PUBLIC -mno-sse) +endif() + +set(PCH_SOURCE + ${UEFILDR_ARC_SOURCE} + ${FREELDR_BOOTLIB_SOURCE} + ${FREELDR_BOOTMGR_SOURCE} + ${FREELDR_NTLDR_SOURCE}) + +add_pch(uefifreeldr_common include/arch/uefi/uefildr.h PCH_SOURCE) +add_dependencies(uefifreeldr_common bugcodes asm xdk) + +## GCC builds need this extra thing for some reason... +if(ARCH STREQUAL "i386" AND NOT MSVC) + target_link_libraries(uefifreeldr_common mini_hal) +endif() + + +spec2def(uefildr.exe freeldr.spec) + +list(APPEND UEFILDR_BASE_SOURCE + include/arch/uefi/uefildr.h + arch/uefi/uefildr.c + ${FREELDR_BASE_SOURCE}) + +if(ARCH STREQUAL "i386") + # Must be included together with disk/scsiport.c + list(APPEND UEFILDR_BASE_SOURCE + ${CMAKE_CURRENT_BINARY_DIR}/uefildr.def) +endif() + +add_executable(uefildr ${UEFILDR_BASE_SOURCE}) +set_target_properties(uefildr PROPERTIES SUFFIX ".efi") + +target_compile_definitions(uefildr PRIVATE UEFIBOOT) + +if(MSVC) + target_link_options(uefildr PRIVATE /DYNAMICBASE:NO /NXCOMPAT:NO /ignore:4078 /ignore:4254 /DRIVER) + # We don't need hotpatching + remove_target_compile_option(uefildr "/hotpatch") +else() + target_link_options(uefildr PRIVATE -Wl,--exclude-all-symbols,--file-alignment,0x200,--section-alignment,0x200) + # Strip everything, including rossym data + add_custom_command(TARGET uefildr + POST_BUILD + COMMAND ${CMAKE_STRIP} --remove-section=.rossym $<TARGET_FILE:uefildr> + COMMAND ${CMAKE_STRIP} --strip-all $<TARGET_FILE:uefildr>) +endif() + +if(MSVC) + set_subsystem(uefildr EFI_APPLICATION) +else() + set_subsystem(uefildr 10) +endif() + +set_entrypoint(uefildr EfiEntry) + +if(ARCH STREQUAL "i386") + target_link_libraries(uefildr mini_hal) +endif() + +target_link_libraries(uefildr uefifreeldr_common cportlib blcmlib blrtl libcntpr) + +# dynamic analysis switches +if(STACK_PROTECTOR) + target_sources(uefildr PRIVATE $<TARGET_OBJECTS:gcc_ssp_nt>) +endif() + +if(RUNTIME_CHECKS) + target_link_libraries(uefildr runtmchk) +endif() + +add_dependencies(uefildr xdk)

1 year, 9 months

[reactos] 01/01: [FREELDR] Fix missing exports and .edata section after commit 728694f6. CORE-18880

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=995630cceca4c86dc5158… commit 995630cceca4c86dc51587c30fc8bc7367b0c7ca Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Mar 19 17:46:00 2023 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Mar 19 17:50:55 2023 +0100 [FREELDR] Fix missing exports and .edata section after commit 728694f6. CORE-18880 --- boot/freeldr/freeldr/CMakeLists.txt | 10 +++++----- boot/freeldr/freeldr/pcat.cmake | 6 ------ 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/boot/freeldr/freeldr/CMakeLists.txt b/boot/freeldr/freeldr/CMakeLists.txt index 2297a4b5c7c..740a0a5192c 100644 --- a/boot/freeldr/freeldr/CMakeLists.txt +++ b/boot/freeldr/freeldr/CMakeLists.txt @@ -128,10 +128,10 @@ list(APPEND FREELDR_BASE_SOURCE ntldr/ntldropts.c lib/rtl/libsupp.c) -# if(ARCH STREQUAL "i386") -# # Must be included together with disk/scsiport.c -# list(APPEND FREELDR_BASE_SOURCE -# ${CMAKE_CURRENT_BINARY_DIR}/freeldr_pe.def) -# endif() +if(ARCH STREQUAL "i386") + # Must be included together with disk/scsiport.c + list(APPEND FREELDR_BASE_SOURCE + ${CMAKE_CURRENT_BINARY_DIR}/freeldr_pe.def) +endif() include(pcat.cmake) diff --git a/boot/freeldr/freeldr/pcat.cmake b/boot/freeldr/freeldr/pcat.cmake index a800323c539..24c8e3627f0 100644 --- a/boot/freeldr/freeldr/pcat.cmake +++ b/boot/freeldr/freeldr/pcat.cmake @@ -185,12 +185,6 @@ list(APPEND PCATLDR_BASE_SOURCE ${freeldr_base_asm} ${FREELDR_BASE_SOURCE}) -if(ARCH STREQUAL "i386") - # Must be included together with disk/scsiport.c - list(APPEND FREELDR_BASE_SOURCE - ${CMAKE_CURRENT_BINARY_DIR}/freeldr_pe.def) -endif() - add_executable(freeldr_pe ${PCATLDR_BASE_SOURCE}) set_target_properties(freeldr_pe

1 year, 9 months

[reactos] 01/01: [WS2_32_APITEST] Test overlapping recv overread. CORE-18328

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=996713515bdbf15a4eccc… commit 996713515bdbf15a4ecccc25a656360400942e33 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sun Mar 19 12:39:09 2023 -0400 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Mar 19 12:39:09 2023 -0400 [WS2_32_APITEST] Test overlapping recv overread. CORE-18328 --- modules/rostests/apitests/ws2_32/recv.c | 175 ++++++++++++++++++++++++++++---- 1 file changed, 158 insertions(+), 17 deletions(-) diff --git a/modules/rostests/apitests/ws2_32/recv.c b/modules/rostests/apitests/ws2_32/recv.c index c64fdbbea1d..80ad202a0fc 100644 --- a/modules/rostests/apitests/ws2_32/recv.c +++ b/modules/rostests/apitests/ws2_32/recv.c @@ -132,6 +132,16 @@ static void Test_Overread(void) int ret; int error; int len; + struct + { + char buffer[32]; + DWORD flags; + WSAOVERLAPPED overlapped; + } receivers[4] = { 0 }; + DWORD bytesTransferred; + DWORD flags; + WSABUF wsaBuf; + size_t i; ret = WSAStartup(MAKEWORD(2, 2), &wsaData); if (ret != 0) @@ -141,10 +151,9 @@ static void Test_Overread(void) } ListeningSocket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); - ClientSocket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); - if (ListeningSocket == INVALID_SOCKET || ClientSocket == INVALID_SOCKET) + if (ListeningSocket == INVALID_SOCKET) { - skip("Failed to create sockets, error %d\n", WSAGetLastError()); + skip("Failed to create listening socket, error %d\n", WSAGetLastError()); goto Exit; } @@ -175,6 +184,16 @@ static void Test_Overread(void) } ok(len == sizeof(address), "getsocketname length %d\n", len); + /************************************************************************** + * Test 1: non-overlapped client socket + *************************************************************************/ + ClientSocket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + if (ClientSocket == INVALID_SOCKET) + { + skip("Failed to create client socket, error %d\n", WSAGetLastError()); + goto Exit; + } + ret = connect(ClientSocket, (SOCKADDR *)&address, sizeof(address)); if (ret == SOCKET_ERROR) { @@ -202,38 +221,160 @@ static void Test_Overread(void) memset(buffer, 0, sizeof(buffer)); ret = recv(ClientSocket, buffer, sizeof(buffer), 0); - if (ret == SOCKET_ERROR) - { - skip("Failed to receive from socket (1), error %d\n", WSAGetLastError()); - goto Exit; - } error = WSAGetLastError(); ok(ret == 4, "recv (1) returned %d\n", ret); - ok(error == NO_ERROR, "recv (1) returned error %d\n", ret); + ok(error == NO_ERROR, "recv (1) returned error %d\n", error); buffer[4] = 0; ok(!strcmp(buffer, "blah"), "recv (1) returned data: %s\n", buffer); ret = recv(ClientSocket, buffer, sizeof(buffer), 0); + error = WSAGetLastError(); + ok(ret == 0, "recv (2) returned %d\n", ret); + ok(error == NO_ERROR, "recv (2) returned error %d\n", error); + + ret = recv(ClientSocket, buffer, sizeof(buffer), 0); + error = WSAGetLastError(); + ok(ret == 0, "recv (3) returned %d\n", ret); + ok(error == NO_ERROR, "recv (3) returned error %d\n", error); + + closesocket(ClientSocket); + + /************************************************************************** + * Test 2: overlapped client socket with multiple pending receives + *************************************************************************/ + ClientSocket = WSASocketW(AF_INET, + SOCK_STREAM, + IPPROTO_TCP, + NULL, + 0, + WSA_FLAG_OVERLAPPED); + if (ClientSocket == INVALID_SOCKET) + { + skip("Failed to create overlapped client socket, error %d\n", WSAGetLastError()); + goto Exit; + } + + ret = connect(ClientSocket, (SOCKADDR *)&address, sizeof(address)); if (ret == SOCKET_ERROR) { - skip("Failed to receive from socket (2), error %d\n", WSAGetLastError()); + skip("Failed to connect to socket, error %d\n", WSAGetLastError()); goto Exit; } - error = WSAGetLastError(); - ok(ret == 0, "recv (2) returned %d\n", ret); - ok(error == NO_ERROR, "recv (2) returned error %d\n", ret); - ret = recv(ClientSocket, buffer, sizeof(buffer), 0); + ServerSocket = accept(ListeningSocket, NULL, NULL); + if (ServerSocket == INVALID_SOCKET) + { + skip("Failed to accept client socket, error %d\n", WSAGetLastError()); + goto Exit; + } + + /* Start overlapping receive calls */ + for (i = 0; i < RTL_NUMBER_OF(receivers); i++) + { + wsaBuf.len = sizeof(receivers[i].buffer); + wsaBuf.buf = receivers[i].buffer; + receivers[i].flags = 0; + receivers[i].overlapped.hEvent = WSACreateEvent(); + ret = WSARecv(ClientSocket, + &wsaBuf, + 1, + NULL, + &receivers[i].flags, + &receivers[i].overlapped, + NULL); + error = WSAGetLastError(); + ok(ret == SOCKET_ERROR, "[%Iu] WSARecv returned %d\n", i, ret); + ok(error == WSA_IO_PENDING, "[%Iu] WSARecv returned error %d\n", i, error); + } + + /* They should all be pending */ + for (i = 0; i < RTL_NUMBER_OF(receivers); i++) + { + ret = WSAGetOverlappedResult(ClientSocket, + &receivers[i].overlapped, + &bytesTransferred, + FALSE, + &flags); + error = WSAGetLastError(); + ok(ret == FALSE, "[%Iu] WSAGetOverlappedResult returned %d\n", i, ret); + ok(error == WSA_IO_INCOMPLETE, "[%Iu] WSAGetOverlappedResult returned error %d\n", i, error); + } + + /* Sending some data should complete the first receive */ + ret = send(ServerSocket, "blah", 4, 0); if (ret == SOCKET_ERROR) { - skip("Failed to receive from socket (3), error %d\n", WSAGetLastError()); + skip("Failed to send to socket, error %d\n", WSAGetLastError()); goto Exit; } + + flags = 0x55555555; + bytesTransferred = 0x55555555; + ret = WSAGetOverlappedResult(ClientSocket, + &receivers[0].overlapped, + &bytesTransferred, + FALSE, + &flags); error = WSAGetLastError(); - ok(ret == 0, "recv (3) returned %d\n", ret); - ok(error == NO_ERROR, "recv (3) returned error %d\n", ret); + ok(ret == TRUE, "WSAGetOverlappedResult returned %d\n", ret); + ok(flags == 0, "WSAGetOverlappedResult returned flags 0x%lx\n", flags); + ok(bytesTransferred == 4, "WSAGetOverlappedResult returned %lu bytes\n", bytesTransferred); + receivers[0].buffer[4] = 0; + ok(!strcmp(receivers[0].buffer, "blah"), "WSARecv returned data: %s\n", receivers[0].buffer); + + /* Others should still be in progress */ + for (i = 1; i < RTL_NUMBER_OF(receivers); i++) + { + ret = WSAGetOverlappedResult(ClientSocket, + &receivers[i].overlapped, + &bytesTransferred, + FALSE, + &flags); + error = WSAGetLastError(); + ok(ret == FALSE, "[%Iu] WSAGetOverlappedResult returned %d\n", i, ret); + ok(error == WSA_IO_INCOMPLETE, "[%Iu] WSAGetOverlappedResult returned error %d\n", i, error); + } + + /* Closing the server end should make all receives complete */ + ret = closesocket(ServerSocket); + ServerSocket = INVALID_SOCKET; + ok(ret == 0, "Failed to close socket with %d\n", WSAGetLastError()); + + for (i = 1; i < RTL_NUMBER_OF(receivers); i++) + { + flags = 0x55555555; + bytesTransferred = 0x55555555; + ret = WSAGetOverlappedResult(ClientSocket, + &receivers[i].overlapped, + &bytesTransferred, + FALSE, + &flags); + error = WSAGetLastError(); + ok(ret == TRUE, "[%Iu] WSAGetOverlappedResult returned %d\n", i, ret); + ok(flags == 0, "[%Iu] WSAGetOverlappedResult returned flags 0x%lx\n", i, flags); + ok(bytesTransferred == 0, "[%Iu] WSAGetOverlappedResult returned %lu bytes\n", i, bytesTransferred); + } + + /* Start two more receives -- they should immediately return success */ + ret = recv(ClientSocket, receivers[0].buffer, sizeof(receivers[0].buffer), 0); + error = WSAGetLastError(); + ok(ret == 0, "recv (N+1) returned %d\n", ret); + ok(error == NO_ERROR, "recv (N+1) returned error %d\n", error); + + ret = recv(ClientSocket, receivers[0].buffer, sizeof(receivers[0].buffer), 0); + error = WSAGetLastError(); + ok(ret == 0, "recv (N+2) returned %d\n", ret); + ok(error == NO_ERROR, "recv (N+2) returned error %d\n", error); Exit: + for (i = 0; i < RTL_NUMBER_OF(receivers); i++) + { + if (receivers[i].overlapped.hEvent != NULL) + { + WSACloseEvent(receivers[i].overlapped.hEvent); + } + } + if (ListeningSocket != INVALID_SOCKET) { ret = closesocket(ListeningSocket);

1 year, 9 months

[reactos] 01/01: [WS2_32_APITEST] Add a test for recv overread. CORE-18328

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7ca1d0e161cdbff7b6941… commit 7ca1d0e161cdbff7b694100f73d642e704faf3af Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sun Mar 19 09:26:24 2023 -0400 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Mar 19 10:02:16 2023 -0400 [WS2_32_APITEST] Add a test for recv overread. CORE-18328 --- modules/rostests/apitests/ws2_32/recv.c | 144 +++++++++++++++++++++++++++++++- 1 file changed, 140 insertions(+), 4 deletions(-) diff --git a/modules/rostests/apitests/ws2_32/recv.c b/modules/rostests/apitests/ws2_32/recv.c index 9721280b7a3..c64fdbbea1d 100644 --- a/modules/rostests/apitests/ws2_32/recv.c +++ b/modules/rostests/apitests/ws2_32/recv.c @@ -1,8 +1,11 @@ /* - * PROJECT: ReactOS api tests - * LICENSE: GPL - See COPYING in the top level directory - * PURPOSE: Test for recv - * PROGRAMMERS: Colin Finck + * PROJECT: ReactOS API Tests + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Test for recv + * COPYRIGHT: Copyright 2008 Colin Finck (colin(a)reactos.org) + * Copyright 2010 Timo Kreuzer (timo.kreuzer(a)reactos.org) + * Copyright 2012 Cameron Gutman (cameron.gutman(a)reactos.org) + * Copyright 2023 Thomas Faber (thomas.faber(a)reactos.org) */ #include "ws2_32.h" @@ -118,8 +121,141 @@ int Test_recv() return 1; } +static void Test_Overread(void) +{ + WSADATA wsaData; + SOCKET ListeningSocket = INVALID_SOCKET; + SOCKET ServerSocket = INVALID_SOCKET; + SOCKET ClientSocket = INVALID_SOCKET; + SOCKADDR_IN address; + char buffer[32]; + int ret; + int error; + int len; + + ret = WSAStartup(MAKEWORD(2, 2), &wsaData); + if (ret != 0) + { + skip("Failed to initialize WinSock, error %d\n", ret); + goto Exit; + } + + ListeningSocket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ClientSocket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + if (ListeningSocket == INVALID_SOCKET || ClientSocket == INVALID_SOCKET) + { + skip("Failed to create sockets, error %d\n", WSAGetLastError()); + goto Exit; + } + + /* Bind to random port */ + address.sin_family = AF_INET; + address.sin_addr.s_addr = htonl(INADDR_LOOPBACK); + address.sin_port = 0; + ret = bind(ListeningSocket, (SOCKADDR *)&address, sizeof(address)); + if (ret == SOCKET_ERROR) + { + skip("Failed to bind socket, error %d\n", WSAGetLastError()); + goto Exit; + } + + ret = listen(ListeningSocket, 1); + if (ret == SOCKET_ERROR) + { + skip("Failed to listen on socket, error %d\n", WSAGetLastError()); + goto Exit; + } + + len = sizeof(address); + ret = getsockname(ListeningSocket, (SOCKADDR *)&address, &len); + if (ret == SOCKET_ERROR) + { + skip("Failed to get listening port on socket, error %d\n", WSAGetLastError()); + goto Exit; + } + ok(len == sizeof(address), "getsocketname length %d\n", len); + + ret = connect(ClientSocket, (SOCKADDR *)&address, sizeof(address)); + if (ret == SOCKET_ERROR) + { + skip("Failed to connect to socket, error %d\n", WSAGetLastError()); + goto Exit; + } + + ServerSocket = accept(ListeningSocket, NULL, NULL); + if (ServerSocket == INVALID_SOCKET) + { + skip("Failed to accept client socket, error %d\n", WSAGetLastError()); + goto Exit; + } + + ret = send(ServerSocket, "blah", 4, 0); + if (ret == SOCKET_ERROR) + { + skip("Failed to send to socket, error %d\n", WSAGetLastError()); + goto Exit; + } + + ret = closesocket(ServerSocket); + ServerSocket = INVALID_SOCKET; + ok(ret == 0, "Failed to close socket with %d\n", WSAGetLastError()); + + memset(buffer, 0, sizeof(buffer)); + ret = recv(ClientSocket, buffer, sizeof(buffer), 0); + if (ret == SOCKET_ERROR) + { + skip("Failed to receive from socket (1), error %d\n", WSAGetLastError()); + goto Exit; + } + error = WSAGetLastError(); + ok(ret == 4, "recv (1) returned %d\n", ret); + ok(error == NO_ERROR, "recv (1) returned error %d\n", ret); + buffer[4] = 0; + ok(!strcmp(buffer, "blah"), "recv (1) returned data: %s\n", buffer); + + ret = recv(ClientSocket, buffer, sizeof(buffer), 0); + if (ret == SOCKET_ERROR) + { + skip("Failed to receive from socket (2), error %d\n", WSAGetLastError()); + goto Exit; + } + error = WSAGetLastError(); + ok(ret == 0, "recv (2) returned %d\n", ret); + ok(error == NO_ERROR, "recv (2) returned error %d\n", ret); + + ret = recv(ClientSocket, buffer, sizeof(buffer), 0); + if (ret == SOCKET_ERROR) + { + skip("Failed to receive from socket (3), error %d\n", WSAGetLastError()); + goto Exit; + } + error = WSAGetLastError(); + ok(ret == 0, "recv (3) returned %d\n", ret); + ok(error == NO_ERROR, "recv (3) returned error %d\n", ret); + +Exit: + if (ListeningSocket != INVALID_SOCKET) + { + ret = closesocket(ListeningSocket); + ok(ret == 0, "closesocket (1) failed with %d\n", WSAGetLastError()); + } + if (ClientSocket != INVALID_SOCKET) + { + ret = closesocket(ClientSocket); + ok(ret == 0, "closesocket (2) failed with %d\n", WSAGetLastError()); + } + if (ServerSocket != INVALID_SOCKET) + { + ret = closesocket(ServerSocket); + ok(ret == 0, "closesocket (3) failed with %d\n", WSAGetLastError()); + } + ret = WSACleanup(); + ok(ret == 0, "WSACleanup failed with %d\n", WSAGetLastError()); +} + START_TEST(recv) { Test_recv(); + Test_Overread(); }

1 year, 9 months

[reactos] 01/01: [MSPAINT] Make sizeboxes window-less (#5166)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6b6a045766c2b22a68139… commit 6b6a045766c2b22a68139a9cb702f5510eed97e8 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Mar 19 10:42:10 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Mar 19 10:42:10 2023 +0900 [MSPAINT] Make sizeboxes window-less (#5166) Reduce window controls and integrate to the canvas window. - The sizeboxes are absorbed by canvasWindow. - class CSizeboxWindow is deleted. - Add enum CANVAS_HITTEST. - Add getSizeBoxRect, getSizeBoxHitTest, and drawSizeBoxes helper functions in sizebox.cpp. CORE-18867 --- base/applications/mspaint/canvas.cpp | 319 ++++++++++++++++++++++++-------- base/applications/mspaint/canvas.h | 26 +++ base/applications/mspaint/drawing.cpp | 28 --- base/applications/mspaint/drawing.h | 2 - base/applications/mspaint/globalvar.h | 8 - base/applications/mspaint/main.cpp | 18 -- base/applications/mspaint/mouse.cpp | 15 +- base/applications/mspaint/precomp.h | 18 +- base/applications/mspaint/selection.cpp | 36 ++-- base/applications/mspaint/sizebox.cpp | 192 ++++++++++--------- base/applications/mspaint/sizebox.h | 25 +-- base/applications/mspaint/winproc.cpp | 13 +- 12 files changed, 416 insertions(+), 284 deletions(-) diff --git a/base/applications/mspaint/canvas.cpp b/base/applications/mspaint/canvas.cpp index 49249373ab8..591d1ba670b 100644 --- a/base/applications/mspaint/canvas.cpp +++ b/base/applications/mspaint/canvas.cpp @@ -9,88 +9,104 @@ /* INCLUDES *********************************************************/ #include "precomp.h" -#include <atltypes.h> /* FUNCTIONS ********************************************************/ +CCanvasWindow::CCanvasWindow() + : m_whereHit(HIT_NONE) + , m_ptOrig { 0, 0 } +{ +} + +RECT CCanvasWindow::GetBaseRect() +{ + CRect rcBase = { 0, 0, Zoomed(imageModel.GetWidth()), Zoomed(imageModel.GetHeight()) }; + ::InflateRect(&rcBase, GRIP_SIZE, GRIP_SIZE); + ::OffsetRect(&rcBase, GRIP_SIZE - GetScrollPos(SB_HORZ), GRIP_SIZE - GetScrollPos(SB_VERT)); + return rcBase; +} + +CANVAS_HITTEST CCanvasWindow::HitTest(POINT pt) +{ + RECT rcBase = GetBaseRect(); + return getSizeBoxHitTest(pt, &rcBase); +} + +VOID CCanvasWindow::DoDraw(HDC hDC, RECT& rcClient, RECT& rcPaint) +{ + // We use a memory bitmap to reduce flickering + HDC hdcMem = ::CreateCompatibleDC(hDC); + HBITMAP hbm = ::CreateCompatibleBitmap(hDC, rcClient.right, rcClient.bottom); + HGDIOBJ hbmOld = ::SelectObject(hdcMem, hbm); + + // Fill the background + ::FillRect(hdcMem, &rcPaint, (HBRUSH)(COLOR_APPWORKSPACE + 1)); + + // Draw the sizeboxes + RECT rcBase = GetBaseRect(); + drawSizeBoxes(hdcMem, &rcBase, FALSE, &rcPaint); + + // Transfer the bits + ::BitBlt(hDC, + rcPaint.left, rcPaint.top, + rcPaint.right - rcPaint.left, rcPaint.bottom - rcPaint.top, + hdcMem, rcPaint.left, rcPaint.top, SRCCOPY); + + ::SelectObject(hdcMem, hbmOld); + ::DeleteDC(hdcMem); +} + VOID CCanvasWindow::Update(HWND hwndFrom) { - CRect tempRect; - GetClientRect(&tempRect); - CSize sizeScrollBox(tempRect.Width(), tempRect.Height()); + CRect rcClient; + GetClientRect(&rcClient); + CSize sizePage(rcClient.right, rcClient.bottom); CSize sizeZoomed = { Zoomed(imageModel.GetWidth()), Zoomed(imageModel.GetHeight()) }; CSize sizeWhole = { sizeZoomed.cx + (GRIP_SIZE * 2), sizeZoomed.cy + (GRIP_SIZE * 2) }; /* show/hide the scrollbars */ - ShowScrollBar(SB_HORZ, sizeScrollBox.cx < sizeWhole.cx); - ShowScrollBar(SB_VERT, sizeScrollBox.cy < sizeWhole.cy); + ShowScrollBar(SB_HORZ, sizePage.cx < sizeWhole.cx); + ShowScrollBar(SB_VERT, sizePage.cy < sizeWhole.cy); - if (sizeScrollBox.cx < sizeWhole.cx || sizeScrollBox.cy < sizeWhole.cy) + if (sizePage.cx < sizeWhole.cx || sizePage.cy < sizeWhole.cy) { - GetClientRect(&tempRect); - sizeScrollBox = CSize(tempRect.Width(), tempRect.Height()); + GetClientRect(&rcClient); // Scrollbars might change, get client rectangle again + sizePage = CSize(rcClient.right, rcClient.bottom); } SCROLLINFO si = { sizeof(si), SIF_PAGE | SIF_RANGE }; si.nMin = 0; si.nMax = sizeWhole.cx; - si.nPage = sizeScrollBox.cx; + si.nPage = sizePage.cx; SetScrollInfo(SB_HORZ, &si); si.nMax = sizeWhole.cy; - si.nPage = sizeScrollBox.cy; + si.nPage = sizePage.cy; SetScrollInfo(SB_VERT, &si); - INT dx = -GetScrollPos(SB_HORZ); - INT dy = -GetScrollPos(SB_VERT); - - if (sizeboxLeftTop.IsWindow()) - { - sizeboxLeftTop.MoveWindow(dx, dy, GRIP_SIZE, GRIP_SIZE, TRUE); - sizeboxCenterTop.MoveWindow(dx + GRIP_SIZE + (sizeZoomed.cx - GRIP_SIZE) / 2, - dy, - GRIP_SIZE, GRIP_SIZE, TRUE); - sizeboxRightTop.MoveWindow(dx + GRIP_SIZE + sizeZoomed.cx, - dy, - GRIP_SIZE, GRIP_SIZE, TRUE); - sizeboxLeftCenter.MoveWindow(dx, - dy + GRIP_SIZE + (sizeZoomed.cy - GRIP_SIZE) / 2, - GRIP_SIZE, GRIP_SIZE, TRUE); - sizeboxRightCenter.MoveWindow(dx + GRIP_SIZE + sizeZoomed.cx, - dy + GRIP_SIZE + (sizeZoomed.cy - GRIP_SIZE) / 2, - GRIP_SIZE, GRIP_SIZE, TRUE); - sizeboxLeftBottom.MoveWindow(dx, - dy + GRIP_SIZE + sizeZoomed.cy, - GRIP_SIZE, GRIP_SIZE, TRUE); - sizeboxCenterBottom.MoveWindow(dx + GRIP_SIZE + (sizeZoomed.cx - GRIP_SIZE) / 2, - dy + GRIP_SIZE + sizeZoomed.cy, - GRIP_SIZE, GRIP_SIZE, TRUE); - sizeboxRightBottom.MoveWindow(dx + GRIP_SIZE + sizeZoomed.cx, - dy + GRIP_SIZE + sizeZoomed.cy, - GRIP_SIZE, GRIP_SIZE, TRUE); - } - if (imageArea.IsWindow() && hwndFrom != imageArea.m_hWnd) + { + INT dx = -GetScrollPos(SB_HORZ), dy = -GetScrollPos(SB_VERT); imageArea.MoveWindow(dx + GRIP_SIZE, dy + GRIP_SIZE, sizeZoomed.cx, sizeZoomed.cy, TRUE); + } } LRESULT CCanvasWindow::OnSize(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { if (m_hWnd) - { Update(m_hWnd); - } + return 0; } -LRESULT CCanvasWindow::OnHScroll(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +VOID CCanvasWindow::OnHVScroll(WPARAM wParam, INT fnBar) { SCROLLINFO si; si.cbSize = sizeof(SCROLLINFO); si.fMask = SIF_ALL; - GetScrollInfo(SB_HORZ, &si); + GetScrollInfo(fnBar, &si); switch (LOWORD(wParam)) { case SB_THUMBTRACK: @@ -110,59 +126,193 @@ LRESULT CCanvasWindow::OnHScroll(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& si.nPos += si.nPage; break; } - SetScrollInfo(SB_HORZ, &si); + SetScrollInfo(fnBar, &si); Update(m_hWnd); + Invalidate(FALSE); // FIXME: Flicker +} + +LRESULT CCanvasWindow::OnHScroll(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + OnHVScroll(wParam, SB_HORZ); return 0; } LRESULT CCanvasWindow::OnVScroll(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - SCROLLINFO si; - si.cbSize = sizeof(SCROLLINFO); - si.fMask = SIF_ALL; - GetScrollInfo(SB_VERT, &si); - switch (LOWORD(wParam)) - { - case SB_THUMBTRACK: - case SB_THUMBPOSITION: - si.nPos = HIWORD(wParam); - break; - case SB_LINEUP: - si.nPos -= 5; - break; - case SB_LINEDOWN: - si.nPos += 5; - break; - case SB_PAGEUP: - si.nPos -= si.nPage; - break; - case SB_PAGEDOWN: - si.nPos += si.nPage; - break; - } - SetScrollInfo(SB_VERT, &si); - Update(m_hWnd); + OnHVScroll(wParam, SB_VERT); return 0; } LRESULT CCanvasWindow::OnLButtonDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - switch (toolsModel.GetActiveTool()) + POINT pt = { GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam) }; + CANVAS_HITTEST hit = HitTest(pt); + + if (hit == HIT_NONE || hit == HIT_BORDER) { - case TOOL_BEZIER: - case TOOL_SHAPE: + if (toolsModel.GetActiveTool() == TOOL_BEZIER || + toolsModel.GetActiveTool() == TOOL_SHAPE) + { if (ToolBase::pointSP != 0) { toolsModel.OnCancelDraw(); imageArea.Invalidate(); } + } + + toolsModel.resetTool(); // resets the point-buffer of the polygon and bezier functions + return 0; + } + + if (hit == HIT_INNER) + { + // TODO: In the future, we handle the events of the window-less image area. + return 0; + } + + // Start dragging + m_whereHit = hit; + m_ptOrig = pt; + SetCapture(); + return 0; +} + +LRESULT CCanvasWindow::OnMouseMove(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + if (m_whereHit == HIT_NONE || ::GetCapture() != m_hWnd) + return 0; + + // Dragging now... Calculate the new size + INT cxImage = imageModel.GetWidth(), cyImage = imageModel.GetHeight(); + INT cxDelta = UnZoomed(GET_X_LPARAM(lParam) - m_ptOrig.x); + INT cyDelta = UnZoomed(GET_Y_LPARAM(lParam) - m_ptOrig.y); + switch (m_whereHit) + { + case HIT_UPPER_LEFT: + cxImage -= cxDelta; + cyImage -= cyDelta; + break; + case HIT_UPPER_CENTER: + cyImage -= cyDelta; + break; + case HIT_UPPER_RIGHT: + cxImage += cxDelta; + cyImage -= cyDelta; + break; + case HIT_MIDDLE_LEFT: + cxImage -= cxDelta; + break; + case HIT_MIDDLE_RIGHT: + cxImage += cxDelta; break; + case HIT_LOWER_LEFT: + cxImage -= cxDelta; + cyImage += cyDelta; + break; + case HIT_LOWER_CENTER: + cyImage += cyDelta; + break; + case HIT_LOWER_RIGHT: + cxImage += cxDelta; + cyImage += cyDelta; + break; + default: + return 0; + } + + // Limit bitmap size + cxImage = max(1, cxImage); + cyImage = max(1, cyImage); + cxImage = min(MAXWORD, cxImage); + cyImage = min(MAXWORD, cyImage); + + // Display new size + CString strSize; + strSize.Format(_T("%d x %d"), cxImage, cyImage); + SendMessage(hStatusBar, SB_SETTEXT, 2, (LPARAM) (LPCTSTR) strSize); + return 0; +} + +LRESULT CCanvasWindow::OnLButtonUp(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + ::ReleaseCapture(); + + if (m_whereHit == HIT_NONE) + return 0; + + // Resize the image + INT cxImage = imageModel.GetWidth(), cyImage = imageModel.GetHeight(); + INT cxDelta = UnZoomed(GET_X_LPARAM(lParam) - m_ptOrig.x); + INT cyDelta = UnZoomed(GET_Y_LPARAM(lParam) - m_ptOrig.y); + switch (m_whereHit) + { + case HIT_UPPER_LEFT: + imageModel.Crop(cxImage - cxDelta, cyImage - cyDelta, cxDelta, cyDelta); + break; + case HIT_UPPER_CENTER: + imageModel.Crop(cxImage, cyImage - cyDelta, 0, cyDelta); + break; + case HIT_UPPER_RIGHT: + imageModel.Crop(cxImage + cxDelta, cyImage - cyDelta, 0, cyDelta); + break; + case HIT_MIDDLE_LEFT: + imageModel.Crop(cxImage - cxDelta, cyImage, cxDelta, 0); + break; + case HIT_MIDDLE_RIGHT: + imageModel.Crop(cxImage + cxDelta, cyImage, 0, 0); + break; + case HIT_LOWER_LEFT: + imageModel.Crop(cxImage - cxDelta, cyImage + cyDelta, cxDelta, 0); + break; + case HIT_LOWER_CENTER: + imageModel.Crop(cxImage, cyImage + cyDelta, 0, 0); + break; + case HIT_LOWER_RIGHT: + imageModel.Crop(cxImage + cxDelta, cyImage + cyDelta, 0, 0); + break; default: break; } + // Finish dragging + m_whereHit = HIT_NONE; toolsModel.resetTool(); // resets the point-buffer of the polygon and bezier functions + Update(NULL); + Invalidate(TRUE); + + return 0; +} + +LRESULT CCanvasWindow::OnSetCursor(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + POINT pt; + ::GetCursorPos(&pt); + ScreenToClient(&pt); + + if (!setCursorOnSizeBox(HitTest(pt))) + ::SetCursor(::LoadCursor(NULL, IDC_ARROW)); + + return 0; +} + +LRESULT CCanvasWindow::OnKeyDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + if (wParam == VK_ESCAPE && ::GetCapture() == m_hWnd) + { + // Cancel dragging + m_whereHit = HIT_NONE; + ::ReleaseCapture(); + } + + return 0; +} + +LRESULT CCanvasWindow::OnCancelMode(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + // Cancel dragging + m_whereHit = HIT_NONE; + Invalidate(TRUE); return 0; } @@ -170,3 +320,26 @@ LRESULT CCanvasWindow::OnMouseWheel(UINT nMsg, WPARAM wParam, LPARAM lParam, BOO { return ::SendMessage(GetParent(), nMsg, wParam, lParam); } + +LRESULT CCanvasWindow::OnCaptureChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + SendMessage(hStatusBar, SB_SETTEXT, 2, (LPARAM)_T("")); + return 0; +} + +LRESULT CCanvasWindow::OnEraseBkgnd(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + return TRUE; // do nothing => transparent background +} + +LRESULT CCanvasWindow::OnPaint(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + RECT rcClient; + GetClientRect(&rcClient); + + PAINTSTRUCT ps; + HDC hDC = BeginPaint(&ps); + DoDraw(hDC, rcClient, ps.rcPaint); + EndPaint(&ps); + return 0; +} diff --git a/base/applications/mspaint/canvas.h b/base/applications/mspaint/canvas.h index 22613518857..fe2251ce05a 100644 --- a/base/applications/mspaint/canvas.h +++ b/base/applications/mspaint/canvas.h @@ -15,18 +15,44 @@ public: BEGIN_MSG_MAP(CCanvasWindow) MESSAGE_HANDLER(WM_SIZE, OnSize) + MESSAGE_HANDLER(WM_PAINT, OnPaint) + MESSAGE_HANDLER(WM_MOUSEMOVE, OnMouseMove) MESSAGE_HANDLER(WM_HSCROLL, OnHScroll) MESSAGE_HANDLER(WM_VSCROLL, OnVScroll) + MESSAGE_HANDLER(WM_ERASEBKGND, OnEraseBkgnd) MESSAGE_HANDLER(WM_LBUTTONDOWN, OnLButtonDown) + MESSAGE_HANDLER(WM_KEYDOWN, OnKeyDown) + MESSAGE_HANDLER(WM_LBUTTONUP, OnLButtonUp) + MESSAGE_HANDLER(WM_SETCURSOR, OnSetCursor) MESSAGE_HANDLER(WM_MOUSEWHEEL, OnMouseWheel) + MESSAGE_HANDLER(WM_CANCELMODE, OnCancelMode) + MESSAGE_HANDLER(WM_CAPTURECHANGED, OnCaptureChanged) END_MSG_MAP() + CCanvasWindow(); + VOID Update(HWND hwndFrom); protected: + CANVAS_HITTEST m_whereHit; + POINT m_ptOrig; // The origin of drag start + + CANVAS_HITTEST HitTest(POINT pt); + RECT GetBaseRect(); + VOID DoDraw(HDC hDC, RECT& rcClient, RECT& rcPaint); + VOID OnHVScroll(WPARAM wParam, INT fnBar); + LRESULT OnSize(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnHScroll(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnVScroll(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnEraseBkgnd(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnPaint(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnLButtonDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnMouseMove(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnKeyDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnLButtonUp(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnSetCursor(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnMouseWheel(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnCancelMode(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnCaptureChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); }; diff --git a/base/applications/mspaint/drawing.cpp b/base/applications/mspaint/drawing.cpp index 490ff9a0a62..296a6f57a1e 100644 --- a/base/applications/mspaint/drawing.cpp +++ b/base/applications/mspaint/drawing.cpp @@ -245,34 +245,6 @@ RectSel(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2) SetROP2(hdc, oldRop); } -void -SelectionFrame(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2, COLORREF system_selection_color) -{ - HBRUSH oldBrush; - LOGBRUSH logbrush; - HPEN oldPen = (HPEN) SelectObject(hdc, CreatePen(PS_DOT, 1, system_selection_color)); - - logbrush.lbStyle = BS_HOLLOW; - logbrush.lbColor = 0; - logbrush.lbHatch = 0; - oldBrush = (HBRUSH) SelectObject(hdc, CreateBrushIndirect(&logbrush)); - Rectangle(hdc, x1, y1, x2, y2); /* SEL BOX FRAME */ - DeleteObject(SelectObject(hdc, oldBrush)); - DeleteObject(SelectObject(hdc, oldPen)); - oldPen = (HPEN) SelectObject(hdc, CreatePen(PS_SOLID, 1, system_selection_color)); - oldBrush = (HBRUSH) SelectObject(hdc, CreateSolidBrush(system_selection_color)); - Rectangle(hdc, x1 - 1, y1 - 1, x1 + 2, y1 + 2); - Rectangle(hdc, x2 - 2, y1 - 1, x2 + 2, y1 + 2); - Rectangle(hdc, x1 - 1, y2 - 2, x1 + 2, y2 + 1); - Rectangle(hdc, x2 - 2, y2 - 2, x2 + 2, y2 + 1); - Rectangle(hdc, (x1 + x2) / 2 - 1, y1 - 1, (x1 + x2) / 2 + 2, y1 + 2); - Rectangle(hdc, (x1 + x2) / 2 - 1, y2 - 2, (x1 + x2) / 2 + 2, y2 + 1); - Rectangle(hdc, x1 - 1, (y1 + y2) / 2 - 1, x1 + 2, (y1 + y2) / 2 + 2); - Rectangle(hdc, x2 - 2, (y1 + y2) / 2 - 1, x2 + 1, (y1 + y2) / 2 + 2); - DeleteObject(SelectObject(hdc, oldBrush)); - DeleteObject(SelectObject(hdc, oldPen)); -} - void Text(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2, COLORREF fg, COLORREF bg, LPCTSTR lpchText, HFONT font, LONG style) { diff --git a/base/applications/mspaint/drawing.h b/base/applications/mspaint/drawing.h index 26178a83395..5401168f92c 100644 --- a/base/applications/mspaint/drawing.h +++ b/base/applications/mspaint/drawing.h @@ -32,8 +32,6 @@ void Brush(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2, COLORREF color, LONG sty void RectSel(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2); -void SelectionFrame(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2, COLORREF system_selection_color); - void Text(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2, COLORREF fg, COLORREF bg, LPCTSTR lpchText, HFONT font, LONG style); extern BOOL diff --git a/base/applications/mspaint/globalvar.h b/base/applications/mspaint/globalvar.h index b0099e571f5..3a366c04220 100644 --- a/base/applications/mspaint/globalvar.h +++ b/base/applications/mspaint/globalvar.h @@ -70,14 +70,6 @@ extern CPaletteWindow paletteWindow; extern CCanvasWindow canvasWindow; extern CSelectionWindow selectionWindow; extern CImgAreaWindow imageArea; -extern CSizeboxWindow sizeboxLeftTop; -extern CSizeboxWindow sizeboxCenterTop; -extern CSizeboxWindow sizeboxRightTop; -extern CSizeboxWindow sizeboxLeftCenter; -extern CSizeboxWindow sizeboxRightCenter; -extern CSizeboxWindow sizeboxLeftBottom; -extern CSizeboxWindow sizeboxCenterBottom; -extern CSizeboxWindow sizeboxRightBottom; extern CTextEditWindow textEditWindow; /* VARIABLES declared in dialogs.cpp ********************************/ diff --git a/base/applications/mspaint/main.cpp b/base/applications/mspaint/main.cpp index 933ef86cf6e..82b70d9dba5 100644 --- a/base/applications/mspaint/main.cpp +++ b/base/applications/mspaint/main.cpp @@ -57,14 +57,6 @@ CPaletteWindow paletteWindow; CCanvasWindow canvasWindow; CSelectionWindow selectionWindow; CImgAreaWindow imageArea; -CSizeboxWindow sizeboxLeftTop; -CSizeboxWindow sizeboxCenterTop; -CSizeboxWindow sizeboxRightTop; -CSizeboxWindow sizeboxLeftCenter; -CSizeboxWindow sizeboxRightCenter; -CSizeboxWindow sizeboxLeftBottom; -CSizeboxWindow sizeboxCenterBottom; -CSizeboxWindow sizeboxRightBottom; CTextEditWindow textEditWindow; // get file name extension from filter string @@ -289,16 +281,6 @@ _tWinMain (HINSTANCE hThisInstance, HINSTANCE hPrevInstance, LPTSTR lpszArgument } } - /* creating the size boxes */ - RECT sizeboxPos = {0, 0, GRIP_SIZE, GRIP_SIZE}; - sizeboxLeftTop.Create(canvasWindow, sizeboxPos, NULL, WS_CHILD | WS_VISIBLE); - sizeboxCenterTop.Create(canvasWindow, sizeboxPos, NULL, WS_CHILD | WS_VISIBLE); - sizeboxRightTop.Create(canvasWindow, sizeboxPos, NULL, WS_CHILD | WS_VISIBLE); - sizeboxLeftCenter.Create(canvasWindow, sizeboxPos, NULL, WS_CHILD | WS_VISIBLE); - sizeboxRightCenter.Create(canvasWindow, sizeboxPos, NULL, WS_CHILD | WS_VISIBLE); - sizeboxLeftBottom.Create(canvasWindow, sizeboxPos, NULL, WS_CHILD | WS_VISIBLE); - sizeboxCenterBottom.Create(canvasWindow, sizeboxPos, NULL, WS_CHILD | WS_VISIBLE); - sizeboxRightBottom.Create(canvasWindow, sizeboxPos, NULL, WS_CHILD | WS_VISIBLE); /* placing the size boxes around the image */ imageArea.SendMessage(WM_SIZE, 0, 0); diff --git a/base/applications/mspaint/mouse.cpp b/base/applications/mspaint/mouse.cpp index fda0bc64a81..57f289487c6 100644 --- a/base/applications/mspaint/mouse.cpp +++ b/base/applications/mspaint/mouse.cpp @@ -19,9 +19,13 @@ POINT ToolBase::pointStack[256] = { { 0 } }; void placeSelWin() { - selectionWindow.MoveWindow(Zoomed(selectionModel.GetDestRectLeft()), Zoomed(selectionModel.GetDestRectTop()), - Zoomed(selectionModel.GetDestRectWidth()) + 2 * GRIP_SIZE, - Zoomed(selectionModel.GetDestRectHeight()) + 2 * GRIP_SIZE, TRUE); + CRect rc; + rc.left = Zoomed(selectionModel.GetDestRectLeft()); + rc.top = Zoomed(selectionModel.GetDestRectTop()); + rc.right = rc.left + Zoomed(selectionModel.GetDestRectWidth()); + rc.bottom = rc.top + Zoomed(selectionModel.GetDestRectHeight()); + ::InflateRect(&rc, GRIP_SIZE, GRIP_SIZE); + selectionWindow.MoveWindow(rc.left, rc.top, rc.Width(), rc.Height(), TRUE); selectionWindow.BringWindowToTop(); imageArea.InvalidateRect(NULL, FALSE); } @@ -712,11 +716,6 @@ struct ShapeTool : ToolBase imageModel.ResetToPrevious(); --pointSP; draw(m_bLeftButton, -1, -1, TRUE); - pointSP = 0; - } - else - { - imageModel.Undo(TRUE); } ToolBase::OnFinishDraw(); } diff --git a/base/applications/mspaint/precomp.h b/base/applications/mspaint/precomp.h index 7c1f23acebb..cd24f7f8379 100644 --- a/base/applications/mspaint/precomp.h +++ b/base/applications/mspaint/precomp.h @@ -19,6 +19,7 @@ #include <atlpath.h> #include <atlstr.h> #include <atlwin.h> +#include <atltypes.h> #include <windowsx.h> #include <commdlg.h> #include <commctrl.h> @@ -38,8 +39,22 @@ #define WM_IMAGEMODELIMAGECHANGED (WM_APP + 6) #define WM_SELECTIONMODELREFRESHNEEDED (WM_APP + 7) +enum CANVAS_HITTEST // hit +{ + HIT_NONE = 0, // Nothing hit or outside + HIT_UPPER_LEFT, + HIT_UPPER_CENTER, + HIT_UPPER_RIGHT, + HIT_MIDDLE_LEFT, + HIT_MIDDLE_RIGHT, + HIT_LOWER_LEFT, + HIT_LOWER_CENTER, + HIT_LOWER_RIGHT, + HIT_BORDER, + HIT_INNER, +}; + #include "resource.h" -#include "canvas.h" #include "drawing.h" #include "dib.h" #include "fullscreen.h" @@ -53,6 +68,7 @@ #include "selection.h" #include "selectionmodel.h" #include "sizebox.h" +#include "canvas.h" #include "textedit.h" #include "toolbox.h" #include "toolsettings.h" diff --git a/base/applications/mspaint/selection.cpp b/base/applications/mspaint/selection.cpp index 64d01538216..4a328b0ab1f 100644 --- a/base/applications/mspaint/selection.cpp +++ b/base/applications/mspaint/selection.cpp @@ -33,24 +33,6 @@ void CSelectionWindow::ForceRefreshSelectionContents() int CSelectionWindow::IdentifyCorner(int iXPos, int iYPos, int iWidth, int iHeight) { - POINT pt = { iXPos, iYPos }; - HWND hwndChild = ChildWindowFromPointEx(pt, CWP_SKIPINVISIBLE | CWP_SKIPDISABLED); - if (hwndChild == sizeboxLeftTop) - return ACTION_RESIZE_TOP_LEFT; - if (hwndChild == sizeboxCenterTop) - return ACTION_RESIZE_TOP; - if (hwndChild == sizeboxRightTop) - return ACTION_RESIZE_TOP_RIGHT; - if (hwndChild == sizeboxRightCenter) - return ACTION_RESIZE_RIGHT; - if (hwndChild == sizeboxLeftCenter) - return ACTION_RESIZE_LEFT; - if (hwndChild == sizeboxCenterBottom) - return ACTION_RESIZE_BOTTOM; - if (hwndChild == sizeboxRightBottom) - return ACTION_RESIZE_BOTTOM_RIGHT; - if (hwndChild == sizeboxLeftBottom) - return ACTION_RESIZE_BOTTOM_LEFT; return 0; } @@ -60,10 +42,9 @@ LRESULT CSelectionWindow::OnPaint(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& HDC hDC = BeginPaint(&ps); if (!m_bMoving) { - SelectionFrame(hDC, 1, 1, - Zoomed(selectionModel.GetDestRectWidth()) + (GRIP_SIZE * 2) - 1, - Zoomed(selectionModel.GetDestRectHeight()) + (GRIP_SIZE * 2) - 1, - GetSysColor(COLOR_HIGHLIGHT)); + RECT rcClient; + GetClientRect(&rcClient); + drawSizeBoxes(hDC, &rcClient, TRUE, &ps.rcPaint); } EndPaint(&ps); return 0; @@ -93,7 +74,16 @@ LRESULT CSelectionWindow::OnSysColorChange(UINT nMsg, WPARAM wParam, LPARAM lPar LRESULT CSelectionWindow::OnSetCursor(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - SetCursor(LoadCursor(NULL, IDC_SIZEALL)); + RECT rcClient; + GetClientRect(&rcClient); + + POINT pt; + ::GetCursorPos(&pt); + ScreenToClient(&pt); + + if (!setCursorOnSizeBox(getSizeBoxHitTest(pt, &rcClient))) + ::SetCursor(::LoadCursor(NULL, IDC_SIZEALL)); + return 0; } diff --git a/base/applications/mspaint/sizebox.cpp b/base/applications/mspaint/sizebox.cpp index 2ebbbcc70a3..8f3c5022e6b 100644 --- a/base/applications/mspaint/sizebox.cpp +++ b/base/applications/mspaint/sizebox.cpp @@ -7,117 +7,125 @@ * Katayama Hirofumi MZ */ -/* INCLUDES *********************************************************/ - #include "precomp.h" -/* FUNCTIONS ********************************************************/ - -static BOOL resizing = FALSE; -static short xOrig; -static short yOrig; - -LRESULT CSizeboxWindow::OnSetCursor(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +static LPCWSTR s_cursor_shapes[] = { - if ((m_hWnd == sizeboxLeftTop.m_hWnd) || (m_hWnd == sizeboxRightBottom.m_hWnd)) - SetCursor(LoadCursor(NULL, IDC_SIZENWSE)); - if ((m_hWnd == sizeboxLeftBottom.m_hWnd) || (m_hWnd == sizeboxRightTop.m_hWnd)) - SetCursor(LoadCursor(NULL, IDC_SIZENESW)); - if ((m_hWnd == sizeboxLeftCenter.m_hWnd) || (m_hWnd == sizeboxRightCenter.m_hWnd)) - SetCursor(LoadCursor(NULL, IDC_SIZEWE)); - if ((m_hWnd == sizeboxCenterTop.m_hWnd) || (m_hWnd == sizeboxCenterBottom.m_hWnd)) - SetCursor(LoadCursor(NULL, IDC_SIZENS)); - return 0; -} + IDC_SIZENWSE, IDC_SIZENS, IDC_SIZENESW, + IDC_SIZEWE, IDC_SIZEWE, + IDC_SIZENESW, IDC_SIZENS, IDC_SIZENWSE, +}; -LRESULT CSizeboxWindow::OnLButtonDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) -{ - resizing = TRUE; - xOrig = GET_X_LPARAM(lParam); - yOrig = GET_Y_LPARAM(lParam); - SetCapture(); - return 0; -} +/* FUNCTIONS ********************************************************/ -LRESULT CSizeboxWindow::OnMouseMove(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +BOOL setCursorOnSizeBox(CANVAS_HITTEST hit) { - if (resizing) + if (HIT_UPPER_LEFT <= hit && hit <= HIT_LOWER_RIGHT) { - CString strSize; - short xRel; - short yRel; - int imgXRes = imageModel.GetWidth(); - int imgYRes = imageModel.GetHeight(); - xRel = UnZoomed(GET_X_LPARAM(lParam) - xOrig); - yRel = UnZoomed(GET_Y_LPARAM(lParam) - yOrig); - if (m_hWnd == sizeboxLeftTop.m_hWnd) - strSize.Format(_T("%d x %d"), imgXRes - xRel, imgYRes - yRel); - if (m_hWnd == sizeboxCenterTop.m_hWnd) - strSize.Format(_T("%d x %d"), imgXRes, imgYRes - yRel); - if (m_hWnd == sizeboxRightTop.m_hWnd) - strSize.Format(_T("%d x %d"), imgXRes + xRel, imgYRes - yRel); - if (m_hWnd == sizeboxLeftCenter.m_hWnd) - strSize.Format(_T("%d x %d"), imgXRes - xRel, imgYRes); - if (m_hWnd == sizeboxRightCenter.m_hWnd) - strSize.Format(_T("%d x %d"), imgXRes + xRel, imgYRes); - if (m_hWnd == sizeboxLeftBottom.m_hWnd) - strSize.Format(_T("%d x %d"), imgXRes - xRel, imgYRes + yRel); - if (m_hWnd == sizeboxCenterBottom.m_hWnd) - strSize.Format(_T("%d x %d"), imgXRes, imgYRes + yRel); - if (m_hWnd == sizeboxRightBottom.m_hWnd) - strSize.Format(_T("%d x %d"), imgXRes + xRel, imgYRes + yRel); - SendMessage(hStatusBar, SB_SETTEXT, 2, (LPARAM) (LPCTSTR) strSize); + ::SetCursor(::LoadCursor(NULL, s_cursor_shapes[hit - HIT_UPPER_LEFT])); + return TRUE; } - return 0; + return FALSE; } -LRESULT CSizeboxWindow::OnLButtonUp(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +BOOL getSizeBoxRect(LPRECT prc, CANVAS_HITTEST hit, LPCRECT prcBase) { - if (resizing) + switch (hit) { - short xRel; - short yRel; - int imgXRes = imageModel.GetWidth(); - int imgYRes = imageModel.GetHeight(); - xRel = (GET_X_LPARAM(lParam) - xOrig) * 1000 / toolsModel.GetZoom(); - yRel = (GET_Y_LPARAM(lParam) - yOrig) * 1000 / toolsModel.GetZoom(); - if (m_hWnd == sizeboxLeftTop) - imageModel.Crop(imgXRes - xRel, imgYRes - yRel, xRel, yRel); - if (m_hWnd == sizeboxCenterTop.m_hWnd) - imageModel.Crop(imgXRes, imgYRes - yRel, 0, yRel); - if (m_hWnd == sizeboxRightTop.m_hWnd) - imageModel.Crop(imgXRes + xRel, imgYRes - yRel, 0, yRel); - if (m_hWnd == sizeboxLeftCenter.m_hWnd) - imageModel.Crop(imgXRes - xRel, imgYRes, xRel, 0); - if (m_hWnd == sizeboxRightCenter.m_hWnd) - imageModel.Crop(imgXRes + xRel, imgYRes, 0, 0); - if (m_hWnd == sizeboxLeftBottom.m_hWnd) - imageModel.Crop(imgXRes - xRel, imgYRes + yRel, xRel, 0); - if (m_hWnd == sizeboxCenterBottom.m_hWnd) - imageModel.Crop(imgXRes, imgYRes + yRel, 0, 0); - if (m_hWnd == sizeboxRightBottom.m_hWnd) - imageModel.Crop(imgXRes + xRel, imgYRes + yRel, 0, 0); - SendMessage(hStatusBar, SB_SETTEXT, 2, (LPARAM) _T("")); + case HIT_UPPER_LEFT: + prc->left = prcBase->left; + prc->top = prcBase->top; + break; + case HIT_UPPER_CENTER: + prc->left = (prcBase->left + prcBase->right - GRIP_SIZE) / 2; + prc->top = prcBase->top; + break; + case HIT_UPPER_RIGHT: + prc->left = prcBase->right - GRIP_SIZE; + prc->top = prcBase->top; + break; + case HIT_MIDDLE_LEFT: + prc->left = prcBase->left; + prc->top = (prcBase->top + prcBase->bottom - GRIP_SIZE) / 2; + break; + case HIT_MIDDLE_RIGHT: + prc->left = prcBase->right - GRIP_SIZE; + prc->top = (prcBase->top + prcBase->bottom - GRIP_SIZE) / 2; + break; + case HIT_LOWER_LEFT: + prc->left = prcBase->left; + prc->top = prcBase->bottom - GRIP_SIZE; + break; + case HIT_LOWER_CENTER: + prc->left = (prcBase->left + prcBase->right - GRIP_SIZE) / 2; + prc->top = prcBase->bottom - GRIP_SIZE; + break; + case HIT_LOWER_RIGHT: + prc->left = prcBase->right - GRIP_SIZE; + prc->top = prcBase->bottom - GRIP_SIZE; + break; + case HIT_INNER: + *prc = *prcBase; + ::InflateRect(prc, -GRIP_SIZE, -GRIP_SIZE); + return TRUE; + default: + ::SetRectEmpty(prc); + return FALSE; } - resizing = FALSE; - ReleaseCapture(); - return 0; + + prc->right = prc->left + GRIP_SIZE; + prc->bottom = prc->top + GRIP_SIZE; + return TRUE; } -LRESULT CSizeboxWindow::OnCaptureChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +CANVAS_HITTEST getSizeBoxHitTest(POINT pt, LPCRECT prcBase) { - resizing = FALSE; - return 0; + RECT rc; + + if (!::PtInRect(prcBase, pt)) + return HIT_NONE; + + rc = *prcBase; + ::InflateRect(&rc, -GRIP_SIZE, -GRIP_SIZE); + if (::PtInRect(&rc, pt)) + return HIT_INNER; + + for (INT i = HIT_UPPER_LEFT; i <= HIT_LOWER_RIGHT; ++i) + { + CANVAS_HITTEST hit = (CANVAS_HITTEST)i; + getSizeBoxRect(&rc, hit, prcBase); + if (::PtInRect(&rc, pt)) + return hit; + } + + return HIT_BORDER; } -LRESULT CSizeboxWindow::OnKeyDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +VOID drawSizeBoxes(HDC hdc, LPCRECT prcBase, BOOL bDrawFrame, LPCRECT prcPaint) { - if (wParam == VK_ESCAPE) + CRect rc, rcIntersect; + + if (prcPaint && !::IntersectRect(&rcIntersect, prcPaint, prcBase)) + return; + + if (bDrawFrame) + { + rc = *prcBase; + ::InflateRect(&rc, -GRIP_SIZE / 2, -GRIP_SIZE / 2); + + LOGBRUSH logBrush = { BS_HOLLOW, 0, 0 }; + COLORREF rgbHighlight = ::GetSysColor(COLOR_HIGHLIGHT); + HGDIOBJ oldPen = ::SelectObject(hdc, ::CreatePen(PS_DOT, 1, rgbHighlight)); + HGDIOBJ oldBrush = ::SelectObject(hdc, ::CreateBrushIndirect(&logBrush)); + ::Rectangle(hdc, rc.left, rc.top, rc.right, rc.bottom); + ::DeleteObject(::SelectObject(hdc, oldBrush)); + ::DeleteObject(::SelectObject(hdc, oldPen)); + } + + for (INT i = HIT_UPPER_LEFT; i <= HIT_LOWER_RIGHT; ++i) { - if (GetCapture() == m_hWnd) - { - ReleaseCapture(); - } + getSizeBoxRect(&rc, (CANVAS_HITTEST)i, prcBase); + if (!prcPaint || ::IntersectRect(&rcIntersect, &rc, prcPaint)) + ::FillRect(hdc, &rc, (HBRUSH)(COLOR_HIGHLIGHT + 1)); } - return 0; } diff --git a/base/applications/mspaint/sizebox.h b/base/applications/mspaint/sizebox.h index 551f0e6bfbc..9a6e4234418 100644 --- a/base/applications/mspaint/sizebox.h +++ b/base/applications/mspaint/sizebox.h @@ -9,24 +9,7 @@ #pragma once -class CSizeboxWindow : public CWindowImpl<CSizeboxWindow> -{ -public: - DECLARE_WND_CLASS_EX(_T("Sizebox"), CS_DBLCLKS, COLOR_HIGHLIGHT) - - BEGIN_MSG_MAP(CSizeboxWindow) - MESSAGE_HANDLER(WM_SETCURSOR, OnSetCursor) - MESSAGE_HANDLER(WM_LBUTTONDOWN, OnLButtonDown) - MESSAGE_HANDLER(WM_MOUSEMOVE, OnMouseMove) - MESSAGE_HANDLER(WM_LBUTTONUP, OnLButtonUp) - MESSAGE_HANDLER(WM_CAPTURECHANGED, OnCaptureChanged) - MESSAGE_HANDLER(WM_KEYDOWN, OnKeyDown) - END_MSG_MAP() - - LRESULT OnSetCursor(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnLButtonDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnMouseMove(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnLButtonUp(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnCaptureChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnKeyDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); -}; +BOOL setCursorOnSizeBox(CANVAS_HITTEST hit); +BOOL getSizeBoxRect(LPRECT prc, CANVAS_HITTEST hit, LPCRECT prcBase); +CANVAS_HITTEST getSizeBoxHitTest(POINT pt, LPCRECT prcBase); +VOID drawSizeBoxes(HDC hdc, LPCRECT prcBase, BOOL bDrawFrame = FALSE, LPCRECT prcPaint = NULL); diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp index e121a4f53cf..ee4e9daa87a 100644 --- a/base/applications/mspaint/winproc.cpp +++ b/base/applications/mspaint/winproc.cpp @@ -437,17 +437,10 @@ LRESULT CMainWindow::OnKeyDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH HWND hwndCapture = GetCapture(); if (hwndCapture) { - if (selectionWindow.m_hWnd == hwndCapture || + if (canvasWindow.m_hWnd == hwndCapture || + selectionWindow.m_hWnd == hwndCapture || imageArea.m_hWnd == hwndCapture || - fullscreenWindow.m_hWnd == hwndCapture || - sizeboxLeftTop.m_hWnd == hwndCapture || - sizeboxCenterTop.m_hWnd == hwndCapture || - sizeboxRightTop.m_hWnd == hwndCapture || - sizeboxLeftCenter.m_hWnd == hwndCapture || - sizeboxRightCenter.m_hWnd == hwndCapture || - sizeboxLeftBottom.m_hWnd == hwndCapture || - sizeboxCenterBottom.m_hWnd == hwndCapture || - sizeboxRightBottom.m_hWnd == hwndCapture) + fullscreenWindow.m_hWnd == hwndCapture) { SendMessage(hwndCapture, nMsg, wParam, lParam); }

1 year, 9 months

[reactos] 02/02: [FREELDR] Move platform-specific build targets into dedicated .cmake files. (#5141)

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=728694f60fa7209f4c1c6… commit 728694f60fa7209f4c1c676b571ba58ee4aa4c8a Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Mar 9 17:30:34 2023 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Mar 18 22:40:10 2023 +0100 [FREELDR] Move platform-specific build targets into dedicated .cmake files. (#5141) - Keep the common definitions and file lists in CMakeLists.txt - Move PC-AT & compatibles (PC-98, XBOX) definitions in pcat.cmake - Future UEFI-specific definitions will be in an uefi.cmake --- boot/freeldr/freeldr/CMakeLists.txt | 312 ++++----------------- .../freeldr/freeldr/{CMakeLists.txt => pcat.cmake} | 186 ++++-------- 2 files changed, 112 insertions(+), 386 deletions(-) diff --git a/boot/freeldr/freeldr/CMakeLists.txt b/boot/freeldr/freeldr/CMakeLists.txt index ad37aa7d200..2297a4b5c7c 100644 --- a/boot/freeldr/freeldr/CMakeLists.txt +++ b/boot/freeldr/freeldr/CMakeLists.txt @@ -1,31 +1,40 @@ +## +## PROJECT: FreeLoader +## LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) +## PURPOSE: Common build definitions +## COPYRIGHT: Copyright 2003 Brian Palmer <brianp(a)sginet.com> +## Copyright 2011-2014 Amine Khaldi <amine.khaldi(a)reactos.org> +## Copyright 2011-2014 Timo Kreuzer <timo.kreuzer(a)reactos.org> +## Copyright 2014 Hervé Poussineau <hpoussin(a)reactos.org> +## Copyright 2023 Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> +## if(MSVC) # Explicitly use string pooling add_compile_options("/GF") endif() -spec2def(freeldr_pe.exe freeldr.spec) - -if(ARCH STREQUAL "i386") - CreateBootSectorTarget(frldr16 - ${CMAKE_CURRENT_SOURCE_DIR}/arch/realmode/i386.S - ${CMAKE_CURRENT_BINARY_DIR}/frldr16.bin - F800) -elseif(ARCH STREQUAL "amd64") - CreateBootSectorTarget(frldr16 - ${CMAKE_CURRENT_SOURCE_DIR}/arch/realmode/amd64.S - ${CMAKE_CURRENT_BINARY_DIR}/frldr16.bin - F800) -endif() +#spec2def(freeldr_pe.exe freeldr.spec) include_directories(BEFORE include) -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) -include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/cmlib) -include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/libs) -include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/elf) +include_directories( + ${REACTOS_SOURCE_DIR}/ntoskrnl/include + ${REACTOS_SOURCE_DIR}/sdk/lib/cmlib + ${REACTOS_SOURCE_DIR}/sdk/include/reactos/libs + ${REACTOS_SOURCE_DIR}/sdk/include/reactos/elf) add_definitions(-D_NTHAL_ -D_BLDR_ -D_NTSYSTEM_) +list(APPEND FREELDR_ARC_SOURCE + arcname.c + arch/arcemul.c + arch/archwsup.c + disk/disk.c + disk/partition.c + disk/ramdisk.c) + # disk/scsiport.c + # lib/fs/pxe.c + list(APPEND FREELDR_BOOTLIB_SOURCE lib/arcsupp.c lib/debug.c @@ -47,29 +56,11 @@ list(APPEND FREELDR_BOOTLIB_SOURCE lib/mm/mm.c lib/mm/heap.c) -list(APPEND FREELDR_NTLDR_SOURCE - ${REACTOS_SOURCE_DIR}/ntoskrnl/config/cmboot.c - ntldr/conversion.c - ntldr/registry.c - ntldr/winldr.c - ntldr/wlmemory.c - ntldr/wlregistry.c) - -list(APPEND FREELDR_ARC_SOURCE - arcname.c - arch/drivers/hwide.c - arch/arcemul.c - arch/archwsup.c - disk/disk.c - disk/partition.c - disk/ramdisk.c) - #disk/scsiport.c - list(APPEND FREELDR_BOOTMGR_SOURCE include/freeldr.h cmdline.c custom.c - linuxboot.c + # linuxboot.c miscboot.c options.c oslist.c @@ -82,167 +73,51 @@ list(APPEND FREELDR_BOOTMGR_SOURCE ui/ui.c ui/video.c) -list(APPEND FREELDR_BASE_ASM_SOURCE) +list(APPEND FREELDR_NTLDR_SOURCE + ${REACTOS_SOURCE_DIR}/ntoskrnl/config/cmboot.c + ntldr/conversion.c + ntldr/registry.c + ntldr/winldr.c + ntldr/wlmemory.c + ntldr/wlregistry.c) if(ARCH STREQUAL "i386") - list(APPEND FREELDR_BASE_ASM_SOURCE - arch/i386/multiboot.S) list(APPEND FREELDR_COMMON_ASM_SOURCE - arch/i386/drvmap.S - arch/i386/entry.S - arch/i386/int386.S - arch/i386/pnpbios.S - arch/i386/i386trap.S - arch/i386/linux.S) - - list(APPEND FREELDR_NTLDR_SOURCE - ntldr/arch/i386/winldr.c - ntldr/headless.c) + arch/i386/i386trap.S) + # arch/i386/linux.S list(APPEND FREELDR_ARC_SOURCE - lib/fs/pxe.c + arch/i386/i386bug.c arch/i386/halstub.c arch/i386/ntoskrnl.c - arch/i386/drivemap.c - arch/i386/hwacpi.c - arch/i386/hwapm.c - arch/i386/hwdisk.c - arch/i386/hwpci.c - arch/i386/i386bug.c - arch/i386/i386idt.c disk/scsiport.c) - if(SARCH STREQUAL "pc98" OR SARCH STREQUAL "xbox") - # These machine types require built-in bitmap font - list(APPEND FREELDR_ARC_SOURCE - arch/vgafont.c) - endif() - - if(SARCH STREQUAL "xbox") - list(APPEND FREELDR_ARC_SOURCE - # FIXME: Abstract things better so we don't need to include /pc/* here - arch/i386/pc/machpc.c # machxbox.c depends on it - arch/i386/pc/pcbeep.c # machxbox.c depends on it - arch/i386/pc/pcdisk.c # hwdisk.c depends on it - arch/i386/pc/pchw.c # Many files depends on it - arch/i386/pc/pcmem.c # hwacpi.c/xboxmem.c depends on it - arch/i386/pc/pcvesa.c # machpc.c depends on it - arch/i386/xbox/machxbox.c - arch/i386/xbox/xboxcons.c - arch/i386/xbox/xboxdisk.c - arch/i386/xbox/xboxi2c.c - arch/i386/xbox/xboxmem.c - arch/i386/xbox/xboxrtc.c - arch/i386/xbox/xboxvideo.c) - elseif(SARCH STREQUAL "pc98") - list(APPEND FREELDR_ARC_SOURCE - arch/i386/pc/pcmem.c - arch/i386/pc98/machpc98.c - arch/i386/pc98/pc98beep.c - arch/i386/pc98/pc98cons.c - arch/i386/pc98/pc98disk.c - arch/i386/pc98/pc98hw.c - arch/i386/pc98/pc98mem.c - arch/i386/pc98/pc98rtc.c - arch/i386/pc98/pc98video.c) - else() - list(APPEND FREELDR_ARC_SOURCE - arch/i386/pc/machpc.c - arch/i386/pc/pcbeep.c - arch/i386/pc/pccons.c - arch/i386/pc/pcdisk.c - arch/i386/pc/pchw.c - arch/i386/pc/pcmem.c - arch/i386/pc/pcrtc.c - arch/i386/pc/pcvesa.c - arch/i386/pc/pcvideo.c) - endif() + list(APPEND FREELDR_NTLDR_SOURCE + ntldr/arch/i386/winldr.c + ntldr/headless.c) elseif(ARCH STREQUAL "amd64") list(APPEND FREELDR_COMMON_ASM_SOURCE - arch/amd64/entry.S - arch/amd64/int386.S - arch/amd64/misc.S - arch/amd64/pnpbios.S - arch/amd64/linux.S) - - list(APPEND FREELDR_NTLDR_SOURCE - ntldr/arch/amd64/winldr.c) + arch/amd64/misc.S) + # arch/amd64/linux.S list(APPEND FREELDR_ARC_SOURCE - lib/fs/pxe.c - arch/i386/ntoskrnl.c - arch/i386/drivemap.c - arch/i386/hwacpi.c - arch/i386/hwapm.c - arch/i386/hwdisk.c - arch/i386/hwpci.c arch/i386/i386bug.c - arch/i386/pc/machpc.c - arch/i386/pc/pcbeep.c - arch/i386/pc/pccons.c - arch/i386/pc/pcdisk.c - arch/i386/pc/pchw.c - arch/i386/pc/pcmem.c - arch/i386/pc/pcrtc.c - arch/i386/pc/pcvesa.c - arch/i386/pc/pcvideo.c) + arch/i386/ntoskrnl.c) -elseif(ARCH STREQUAL "arm") - list(APPEND FREELDR_COMMON_ASM_SOURCE - arch/arm/boot.S) + list(APPEND FREELDR_NTLDR_SOURCE + ntldr/arch/amd64/winldr.c) +elseif(ARCH STREQUAL "arm") list(APPEND FREELDR_NTLDR_SOURCE ntldr/arch/arm/winldr.c) - list(APPEND FREELDR_ARC_SOURCE - arch/arm/entry.c - arch/arm/macharm.c) else() -#TBD + #TBD endif() -add_asm_files(freeldr_common_asm ${FREELDR_COMMON_ASM_SOURCE}) - -add_library(freeldr_common - ${freeldr_common_asm} - ${FREELDR_BOOTLIB_SOURCE} - ${FREELDR_ARC_SOURCE} - ${FREELDR_NTLDR_SOURCE} - ${FREELDR_BOOTMGR_SOURCE}) - -if(MSVC AND CMAKE_C_COMPILER_ID STREQUAL "Clang") - # We need to reduce the binary size - target_compile_options(freeldr_common PRIVATE "/Os") -endif() -if(NOT MSVC AND ARCH STREQUAL "i386" AND SARCH STREQUAL "xbox") - # Prevent a warning when doing a memcmp with address 0 - set_source_files_properties(arch/i386/xbox/xboxmem.c PROPERTIES COMPILE_FLAGS "-Wno-nonnull") -endif() -if(CMAKE_C_COMPILER_ID STREQUAL "GNU" OR CMAKE_C_COMPILER_ID STREQUAL "Clang") - # Prevent using SSE (not support in freeldr) - target_compile_options(freeldr_common PUBLIC -mno-sse) -endif() - -set(PCH_SOURCE - ${FREELDR_BOOTLIB_SOURCE} - ${FREELDR_ARC_SOURCE} - ${FREELDR_NTLDR_SOURCE} - ${FREELDR_BOOTMGR_SOURCE}) - -add_pch(freeldr_common include/freeldr.h PCH_SOURCE) -add_dependencies(freeldr_common bugcodes asm xdk) - -## GCC builds need this extra thing for some reason... -if(ARCH STREQUAL "i386" AND NOT MSVC) - target_link_libraries(freeldr_common mini_hal) -endif() - -add_asm_files(freeldr_base_asm ${FREELDR_BASE_ASM_SOURCE}) - list(APPEND FREELDR_BASE_SOURCE - ${freeldr_base_asm} bootmgr.c # This file is compiled with custom definitions freeldr.c ntldr/setupldr.c ## Strangely enough this file is needed in GCC builds @@ -253,91 +128,10 @@ list(APPEND FREELDR_BASE_SOURCE ntldr/ntldropts.c lib/rtl/libsupp.c) -if(ARCH STREQUAL "i386") - # Must be included together with disk/scsiport.c - list(APPEND FREELDR_BASE_SOURCE - ${CMAKE_CURRENT_BINARY_DIR}/freeldr_pe.def) -endif() - -add_executable(freeldr_pe ${FREELDR_BASE_SOURCE}) - -set_target_properties(freeldr_pe - PROPERTIES - ENABLE_EXPORTS TRUE - DEFINE_SYMBOL "") - -if(MSVC) - if(ARCH STREQUAL "arm") - target_link_options(freeldr_pe PRIVATE /ignore:4078 /ignore:4254 /DRIVER) - else() - target_link_options(freeldr_pe PRIVATE /ignore:4078 /ignore:4254 /DYNAMICBASE:NO /FIXED /FILEALIGN:512 /ALIGN:512) - add_linker_script(freeldr_pe freeldr_i386.msvc.lds) - endif() - # We don't need hotpatching - remove_target_compile_option(freeldr_pe "/hotpatch") - remove_target_compile_option(freeldr_common "/hotpatch") -else() - target_link_options(freeldr_pe PRIVATE -Wl,--exclude-all-symbols,--file-alignment,0x200,--section-alignment,0x200) - add_linker_script(freeldr_pe freeldr_gcc.lds) - # Strip everything, including rossym data - add_custom_command(TARGET freeldr_pe - POST_BUILD - COMMAND ${CMAKE_STRIP} --remove-section=.rossym $<TARGET_FILE:freeldr_pe> - COMMAND ${CMAKE_STRIP} --strip-all $<TARGET_FILE:freeldr_pe>) -endif() - -set_image_base(freeldr_pe 0x10000) -set_subsystem(freeldr_pe native) -set_entrypoint(freeldr_pe RealEntryPoint) - -if(ARCH STREQUAL "i386") - target_link_libraries(freeldr_pe mini_hal) -endif() - -target_link_libraries(freeldr_pe freeldr_common cportlib blcmlib blrtl libcntpr) - -# dynamic analysis switches -if(STACK_PROTECTOR) - target_sources(freeldr_pe PRIVATE $<TARGET_OBJECTS:gcc_ssp_nt>) -endif() - -if(RUNTIME_CHECKS) - target_link_libraries(freeldr_pe runtmchk) - target_link_options(freeldr_pe PRIVATE "/MERGE:.rtc=.text") -endif() - -add_dependencies(freeldr_pe asm) - -if(SARCH STREQUAL "pc98") - file(MAKE_DIRECTORY ${REACTOS_BINARY_DIR}/PC98) - add_custom_target(pc98bootfdd - COMMAND native-fatten ${REACTOS_BINARY_DIR}/PC98/ReactOS-98.IMG -format 2880 ROS98BOOT -boot ${CMAKE_BINARY_DIR}/boot/freeldr/bootsect/pc98/fat12fdd.bin -add ${CMAKE_CURRENT_BINARY_DIR}/freeldr.sys FREELDR.SYS -add ${CMAKE_SOURCE_DIR}/boot/bootdata/floppy_pc98.ini FREELDR.INI - DEPENDS native-fatten fat12pc98 freeldr - VERBATIM) -endif() - -if(NOT ARCH STREQUAL "arm") - concatenate_files( - ${CMAKE_CURRENT_BINARY_DIR}/freeldr.sys - ${CMAKE_CURRENT_BINARY_DIR}/frldr16.bin - ${CMAKE_CURRENT_BINARY_DIR}/$<TARGET_FILE_NAME:freeldr_pe>) - add_custom_target(freeldr ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/freeldr.sys) -else() - add_custom_target(freeldr ALL DEPENDS freeldr_pe) -endif() - -# Rename freeldr on livecd to setupldr.sys because isoboot.bin looks for setupldr.sys -add_cd_file(TARGET freeldr FILE ${CMAKE_CURRENT_BINARY_DIR}/freeldr.sys DESTINATION loader NO_CAB FOR bootcd regtest) -add_cd_file(TARGET freeldr FILE ${CMAKE_CURRENT_BINARY_DIR}/freeldr.sys DESTINATION loader NO_CAB NOT_IN_HYBRIDCD FOR livecd hybridcd NAME_ON_CD setupldr.sys) - -if(NOT ARCH STREQUAL "arm") - concatenate_files( - ${CMAKE_CURRENT_BINARY_DIR}/setupldr.sys - ${CMAKE_CURRENT_BINARY_DIR}/frldr16.bin - ${CMAKE_CURRENT_BINARY_DIR}/$<TARGET_FILE_NAME:freeldr_pe>) - add_custom_target(setupldr ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/setupldr.sys) -else() - add_custom_target(setupldr ALL DEPENDS freeldr_pe) -endif() +# if(ARCH STREQUAL "i386") +# # Must be included together with disk/scsiport.c +# list(APPEND FREELDR_BASE_SOURCE +# ${CMAKE_CURRENT_BINARY_DIR}/freeldr_pe.def) +# endif() -add_cd_file(TARGET setupldr FILE ${CMAKE_CURRENT_BINARY_DIR}/setupldr.sys DESTINATION loader NO_CAB FOR bootcd regtest) +include(pcat.cmake) diff --git a/boot/freeldr/freeldr/CMakeLists.txt b/boot/freeldr/freeldr/pcat.cmake similarity index 67% copy from boot/freeldr/freeldr/CMakeLists.txt copy to boot/freeldr/freeldr/pcat.cmake index ad37aa7d200..a800323c539 100644 --- a/boot/freeldr/freeldr/CMakeLists.txt +++ b/boot/freeldr/freeldr/pcat.cmake @@ -1,10 +1,13 @@ - -if(MSVC) - # Explicitly use string pooling - add_compile_options("/GF") -endif() - -spec2def(freeldr_pe.exe freeldr.spec) +## +## PROJECT: FreeLoader +## LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) +## PURPOSE: Build definitions for PC-AT and "compatibles" (NEC PC-98, XBOX) +## COPYRIGHT: Copyright 2003 Brian Palmer <brianp(a)sginet.com> +## Copyright 2011-2014 Amine Khaldi <amine.khaldi(a)reactos.org> +## Copyright 2011-2014 Timo Kreuzer <timo.kreuzer(a)reactos.org> +## Copyright 2014 Hervé Poussineau <hpoussin(a)reactos.org> +## Copyright 2023 Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> +## if(ARCH STREQUAL "i386") CreateBootSectorTarget(frldr16 @@ -18,109 +21,52 @@ elseif(ARCH STREQUAL "amd64") F800) endif() -include_directories(BEFORE include) -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) -include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/cmlib) -include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/libs) -include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/elf) - -add_definitions(-D_NTHAL_ -D_BLDR_ -D_NTSYSTEM_) - -list(APPEND FREELDR_BOOTLIB_SOURCE - lib/arcsupp.c - lib/debug.c - lib/peloader.c - lib/cache/blocklist.c - lib/cache/cache.c - lib/comm/rs232.c - ## add KD support - lib/fs/btrfs.c - lib/fs/ext2.c - lib/fs/fat.c - lib/fs/fs.c - lib/fs/iso.c - lib/fs/ntfs.c - lib/inifile/ini_init.c - lib/inifile/inifile.c - lib/inifile/parse.c - lib/mm/meminit.c - lib/mm/mm.c - lib/mm/heap.c) - -list(APPEND FREELDR_NTLDR_SOURCE - ${REACTOS_SOURCE_DIR}/ntoskrnl/config/cmboot.c - ntldr/conversion.c - ntldr/registry.c - ntldr/winldr.c - ntldr/wlmemory.c - ntldr/wlregistry.c) - -list(APPEND FREELDR_ARC_SOURCE - arcname.c - arch/drivers/hwide.c - arch/arcemul.c - arch/archwsup.c - disk/disk.c - disk/partition.c - disk/ramdisk.c) - #disk/scsiport.c - -list(APPEND FREELDR_BOOTMGR_SOURCE - include/freeldr.h - cmdline.c - custom.c - linuxboot.c - miscboot.c - options.c - oslist.c - ui/directui.c - # ui/gui.c - ui/minitui.c - ui/noui.c - ui/tui.c - ui/tuimenu.c - ui/ui.c - ui/video.c) - -list(APPEND FREELDR_BASE_ASM_SOURCE) + +spec2def(freeldr_pe.exe freeldr.spec) + +list(APPEND PCATLDR_ARC_SOURCE + ${FREELDR_ARC_SOURCE} + arch/drivers/hwide.c) + +list(APPEND PCATLDR_BOOTMGR_SOURCE + ${FREELDR_BOOTMGR_SOURCE} + linuxboot.c) + +list(APPEND PCATLDR_BASE_ASM_SOURCE) if(ARCH STREQUAL "i386") - list(APPEND FREELDR_BASE_ASM_SOURCE + list(APPEND PCATLDR_BASE_ASM_SOURCE arch/i386/multiboot.S) - list(APPEND FREELDR_COMMON_ASM_SOURCE + list(APPEND PCATLDR_COMMON_ASM_SOURCE arch/i386/drvmap.S arch/i386/entry.S arch/i386/int386.S arch/i386/pnpbios.S - arch/i386/i386trap.S + # arch/i386/i386trap.S arch/i386/linux.S) - list(APPEND FREELDR_NTLDR_SOURCE - ntldr/arch/i386/winldr.c - ntldr/headless.c) - - list(APPEND FREELDR_ARC_SOURCE + list(APPEND PCATLDR_ARC_SOURCE + # disk/scsiport.c lib/fs/pxe.c - arch/i386/halstub.c - arch/i386/ntoskrnl.c + # arch/i386/halstub.c + # arch/i386/ntoskrnl.c arch/i386/drivemap.c arch/i386/hwacpi.c arch/i386/hwapm.c arch/i386/hwdisk.c arch/i386/hwpci.c - arch/i386/i386bug.c - arch/i386/i386idt.c - disk/scsiport.c) + # arch/i386/i386bug.c + arch/i386/i386idt.c) if(SARCH STREQUAL "pc98" OR SARCH STREQUAL "xbox") # These machine types require built-in bitmap font - list(APPEND FREELDR_ARC_SOURCE + list(APPEND PCATLDR_ARC_SOURCE arch/vgafont.c) endif() if(SARCH STREQUAL "xbox") - list(APPEND FREELDR_ARC_SOURCE + list(APPEND PCATLDR_ARC_SOURCE # FIXME: Abstract things better so we don't need to include /pc/* here arch/i386/pc/machpc.c # machxbox.c depends on it arch/i386/pc/pcbeep.c # machxbox.c depends on it @@ -135,8 +81,13 @@ if(ARCH STREQUAL "i386") arch/i386/xbox/xboxmem.c arch/i386/xbox/xboxrtc.c arch/i386/xbox/xboxvideo.c) + if(NOT MSVC) + # Prevent a warning when doing a memcmp with address 0 + set_source_files_properties(arch/i386/xbox/xboxmem.c PROPERTIES COMPILE_FLAGS "-Wno-nonnull") + endif() + elseif(SARCH STREQUAL "pc98") - list(APPEND FREELDR_ARC_SOURCE + list(APPEND PCATLDR_ARC_SOURCE arch/i386/pc/pcmem.c arch/i386/pc98/machpc98.c arch/i386/pc98/pc98beep.c @@ -147,7 +98,7 @@ if(ARCH STREQUAL "i386") arch/i386/pc98/pc98rtc.c arch/i386/pc98/pc98video.c) else() - list(APPEND FREELDR_ARC_SOURCE + list(APPEND PCATLDR_ARC_SOURCE arch/i386/pc/machpc.c arch/i386/pc/pcbeep.c arch/i386/pc/pccons.c @@ -160,25 +111,21 @@ if(ARCH STREQUAL "i386") endif() elseif(ARCH STREQUAL "amd64") - list(APPEND FREELDR_COMMON_ASM_SOURCE + list(APPEND PCATLDR_COMMON_ASM_SOURCE arch/amd64/entry.S arch/amd64/int386.S - arch/amd64/misc.S arch/amd64/pnpbios.S arch/amd64/linux.S) - list(APPEND FREELDR_NTLDR_SOURCE - ntldr/arch/amd64/winldr.c) - - list(APPEND FREELDR_ARC_SOURCE + list(APPEND PCATLDR_ARC_SOURCE lib/fs/pxe.c - arch/i386/ntoskrnl.c + # arch/i386/ntoskrnl.c arch/i386/drivemap.c arch/i386/hwacpi.c arch/i386/hwapm.c arch/i386/hwdisk.c arch/i386/hwpci.c - arch/i386/i386bug.c + # arch/i386/i386bug.c arch/i386/pc/machpc.c arch/i386/pc/pcbeep.c arch/i386/pc/pccons.c @@ -190,46 +137,39 @@ elseif(ARCH STREQUAL "amd64") arch/i386/pc/pcvideo.c) elseif(ARCH STREQUAL "arm") - list(APPEND FREELDR_COMMON_ASM_SOURCE + list(APPEND PCATLDR_COMMON_ASM_SOURCE arch/arm/boot.S) - list(APPEND FREELDR_NTLDR_SOURCE - ntldr/arch/arm/winldr.c) - - list(APPEND FREELDR_ARC_SOURCE + list(APPEND PCATLDR_ARC_SOURCE arch/arm/entry.c arch/arm/macharm.c) else() -#TBD + #TBD endif() -add_asm_files(freeldr_common_asm ${FREELDR_COMMON_ASM_SOURCE}) +add_asm_files(freeldr_common_asm ${FREELDR_COMMON_ASM_SOURCE} ${PCATLDR_COMMON_ASM_SOURCE}) add_library(freeldr_common ${freeldr_common_asm} + ${PCATLDR_ARC_SOURCE} ${FREELDR_BOOTLIB_SOURCE} - ${FREELDR_ARC_SOURCE} - ${FREELDR_NTLDR_SOURCE} - ${FREELDR_BOOTMGR_SOURCE}) + ${PCATLDR_BOOTMGR_SOURCE} + ${FREELDR_NTLDR_SOURCE}) if(MSVC AND CMAKE_C_COMPILER_ID STREQUAL "Clang") # We need to reduce the binary size target_compile_options(freeldr_common PRIVATE "/Os") endif() -if(NOT MSVC AND ARCH STREQUAL "i386" AND SARCH STREQUAL "xbox") - # Prevent a warning when doing a memcmp with address 0 - set_source_files_properties(arch/i386/xbox/xboxmem.c PROPERTIES COMPILE_FLAGS "-Wno-nonnull") -endif() if(CMAKE_C_COMPILER_ID STREQUAL "GNU" OR CMAKE_C_COMPILER_ID STREQUAL "Clang") - # Prevent using SSE (not support in freeldr) + # Prevent using SSE (no support in freeldr) target_compile_options(freeldr_common PUBLIC -mno-sse) endif() set(PCH_SOURCE + ${PCATLDR_ARC_SOURCE} ${FREELDR_BOOTLIB_SOURCE} - ${FREELDR_ARC_SOURCE} - ${FREELDR_NTLDR_SOURCE} - ${FREELDR_BOOTMGR_SOURCE}) + ${PCATLDR_BOOTMGR_SOURCE} + ${FREELDR_NTLDR_SOURCE}) add_pch(freeldr_common include/freeldr.h PCH_SOURCE) add_dependencies(freeldr_common bugcodes asm xdk) @@ -239,19 +179,11 @@ if(ARCH STREQUAL "i386" AND NOT MSVC) target_link_libraries(freeldr_common mini_hal) endif() -add_asm_files(freeldr_base_asm ${FREELDR_BASE_ASM_SOURCE}) +add_asm_files(freeldr_base_asm ${PCATLDR_BASE_ASM_SOURCE}) -list(APPEND FREELDR_BASE_SOURCE +list(APPEND PCATLDR_BASE_SOURCE ${freeldr_base_asm} - bootmgr.c # This file is compiled with custom definitions - freeldr.c - ntldr/setupldr.c ## Strangely enough this file is needed in GCC builds - ## even if ${FREELDR_NTLDR_SOURCE} is not added, - ## otherwise we get linking errors with Rtl**Bitmap** APIs. - ## Do not happen on MSVC builds however... - ntldr/inffile.c - ntldr/ntldropts.c - lib/rtl/libsupp.c) + ${FREELDR_BASE_SOURCE}) if(ARCH STREQUAL "i386") # Must be included together with disk/scsiport.c @@ -259,7 +191,7 @@ if(ARCH STREQUAL "i386") ${CMAKE_CURRENT_BINARY_DIR}/freeldr_pe.def) endif() -add_executable(freeldr_pe ${FREELDR_BASE_SOURCE}) +add_executable(freeldr_pe ${PCATLDR_BASE_SOURCE}) set_target_properties(freeldr_pe PROPERTIES

1 year, 9 months

[reactos] 01/02: [FREELDR] Move common x64 runtime-specific ASM helpers to a misc file.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7a2aca423e7a8093bc113… commit 7a2aca423e7a8093bc1132ae3a6efb4c7d131ac2 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Mar 9 17:26:38 2023 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Mar 18 22:40:08 2023 +0100 [FREELDR] Move common x64 runtime-specific ASM helpers to a misc file. Co-authored-by: Justin Miller <justinmiller100(a)gmail.com> --- boot/freeldr/freeldr/CMakeLists.txt | 1 + boot/freeldr/freeldr/arch/amd64/entry.S | 34 ----------------------------- boot/freeldr/freeldr/arch/amd64/misc.S | 38 +++++++++++++++++++++++++++++++++ 3 files changed, 39 insertions(+), 34 deletions(-) diff --git a/boot/freeldr/freeldr/CMakeLists.txt b/boot/freeldr/freeldr/CMakeLists.txt index a295c481202..ad37aa7d200 100644 --- a/boot/freeldr/freeldr/CMakeLists.txt +++ b/boot/freeldr/freeldr/CMakeLists.txt @@ -163,6 +163,7 @@ elseif(ARCH STREQUAL "amd64") list(APPEND FREELDR_COMMON_ASM_SOURCE arch/amd64/entry.S arch/amd64/int386.S + arch/amd64/misc.S arch/amd64/pnpbios.S arch/amd64/linux.S) diff --git a/boot/freeldr/freeldr/arch/amd64/entry.S b/boot/freeldr/freeldr/arch/amd64/entry.S index 758eae4b677..588307984c5 100644 --- a/boot/freeldr/freeldr/arch/amd64/entry.S +++ b/boot/freeldr/freeldr/arch/amd64/entry.S @@ -212,40 +212,6 @@ CallRealMode_return: ///////////////////////////////////////// - -// void __fastfail(unsigned int Code<rcx>); -PUBLIC __fastfail -__fastfail: - // mov ecx, [rsp + 4] - int HEX(29) - -// void __lgdt(void *Source<rcx>); -PUBLIC __lgdt -__lgdt: -#ifdef _USE_ML - lgdt fword ptr [rcx] -#else - lgdt cs:[rcx] -#endif - ret - -// void __ltr(unsigned short Source<rcx>); -PUBLIC __ltr -__ltr: - ltr cx - ret - -// void _sgdt(void *Destination<rcx>); -PUBLIC __sgdt -__sgdt: -#ifdef _USE_ML - sgdt fword ptr [rcx] -#else - sgdt cs:[rcx] -#endif - ret - - /* 64-bit stack pointer */ stack64: .quad STACKADDR diff --git a/boot/freeldr/freeldr/arch/amd64/misc.S b/boot/freeldr/freeldr/arch/amd64/misc.S new file mode 100644 index 00000000000..877d5fd75cb --- /dev/null +++ b/boot/freeldr/freeldr/arch/amd64/misc.S @@ -0,0 +1,38 @@ + +#include <asm.inc> + +.code64 + +// void __fastfail(unsigned int Code<rcx>); +PUBLIC __fastfail +__fastfail: + // mov ecx, [rsp + 4] + int HEX(29) + +// void __lgdt(void *Source<rcx>); +PUBLIC __lgdt +__lgdt: +#ifdef _USE_ML + lgdt fword ptr [rcx] +#else + lgdt cs:[rcx] +#endif + ret + +// void __ltr(unsigned short Source<rcx>); +PUBLIC __ltr +__ltr: + ltr cx + ret + +// void _sgdt(void *Destination<rcx>); +PUBLIC __sgdt +__sgdt: +#ifdef _USE_ML + sgdt fword ptr [rcx] +#else + sgdt cs:[rcx] +#endif + ret + +END

1 year, 9 months

← Newer
1
2
3
4
5
6
7
8
...
14
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 March 2023