Ros-diffs July 2023

ros-diffs@reactos.org

26 participants
189 discussions

[reactos] 01/02: [DDK:IDE] Add SAL2 annotations

by Dmitry Borisov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=293fc8dc34bbc965f7160… commit 293fc8dc34bbc965f7160e7f4325da26e5ca8c4e Author: Dmitry Borisov <di.sean(a)protonmail.com> AuthorDate: Sat Jan 14 17:17:38 2023 +0600 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sun Jul 16 13:20:30 2023 +0300 [DDK:IDE] Add SAL2 annotations --- sdk/include/ddk/ide.h | 54 +++++++++++++++++++++++++-------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/sdk/include/ddk/ide.h b/sdk/include/ddk/ide.h index 7b99cedf43b..4f3ea9f4650 100644 --- a/sdk/include/ddk/ide.h +++ b/sdk/include/ddk/ide.h @@ -6,7 +6,7 @@ * This file is part of the w32api package. * * Contributors: - * Created by Herv� Poussineau <hpoussin(a)reactos.org> + * Created by Hervé Poussineau <hpoussin(a)reactos.org> * * THIS SOFTWARE IS NOT COPYRIGHTED * @@ -201,29 +201,29 @@ typedef enum typedef IDE_CHANNEL_STATE (NTAPI *PCIIDE_CHANNEL_ENABLED)( - IN PVOID DeviceExtension, - IN ULONG Channel); + _In_ PVOID DeviceExtension, + _In_ ULONG Channel); typedef BOOLEAN (NTAPI *PCIIDE_SYNC_ACCESS_REQUIRED)( - IN PVOID DeviceExtension); + _In_ PVOID DeviceExtension); typedef NTSTATUS (NTAPI *PCIIDE_TRANSFER_MODE_SELECT_FUNC)( - IN PVOID DeviceExtension, - IN OUT PPCIIDE_TRANSFER_MODE_SELECT XferMode); + _In_ PVOID DeviceExtension, + _Inout_ PPCIIDE_TRANSFER_MODE_SELECT XferMode); typedef ULONG (NTAPI *PCIIDE_USEDMA_FUNC)( - IN PVOID DeviceExtension, - IN PUCHAR CdbCommand, - IN PUCHAR Slave); + _In_ PVOID DeviceExtension, + _In_ PUCHAR CdbCommand, + _In_ PUCHAR Slave); typedef NTSTATUS (NTAPI *PCIIDE_UDMA_MODES_SUPPORTED)( - IN IDENTIFY_DATA IdentifyData, - OUT PULONG BestXferMode, - OUT PULONG CurrentXferMode); + _In_ IDENTIFY_DATA IdentifyData, + _Out_ PULONG BestXferMode, + _Out_ PULONG CurrentXferMode); typedef struct _IDE_CONTROLLER_PROPERTIES { @@ -243,30 +243,30 @@ typedef struct _IDE_CONTROLLER_PROPERTIES typedef NTSTATUS (NTAPI *PCONTROLLER_PROPERTIES)( - IN PVOID DeviceExtension, - IN PIDE_CONTROLLER_PROPERTIES ControllerProperties); + _In_ PVOID DeviceExtension, + _In_ PIDE_CONTROLLER_PROPERTIES ControllerProperties); NTSTATUS NTAPI PciIdeXInitialize( - IN PDRIVER_OBJECT DriverObject, - IN PUNICODE_STRING RegistryPath, - IN PCONTROLLER_PROPERTIES HwGetControllerProperties, - IN ULONG ExtensionSize); + _In_ PDRIVER_OBJECT DriverObject, + _In_ PUNICODE_STRING RegistryPath, + _In_ PCONTROLLER_PROPERTIES HwGetControllerProperties, + _In_ ULONG ExtensionSize); NTSTATUS NTAPI PciIdeXGetBusData( - IN PVOID DeviceExtension, - IN PVOID Buffer, - IN ULONG ConfigDataOffset, - IN ULONG BufferLength); + _In_ PVOID DeviceExtension, + _Out_writes_bytes_all_(BufferLength) PVOID Buffer, + _In_ ULONG ConfigDataOffset, + _In_ ULONG BufferLength); NTSTATUS NTAPI PciIdeXSetBusData( - IN PVOID DeviceExtension, - IN PVOID Buffer, - IN PVOID DataMask, - IN ULONG ConfigDataOffset, - IN ULONG BufferLength); + _In_ PVOID DeviceExtension, + _In_reads_bytes_(BufferLength) PVOID Buffer, + _In_reads_bytes_(BufferLength) PVOID DataMask, + _In_ ULONG ConfigDataOffset, + _In_ ULONG BufferLength); /* Bit field values for * PCIIDE_TRANSFER_MODE_SELECT.DeviceTransferModeSupported and

1 year, 5 months

[reactos] 01/01: [ADVAPI32] "Minimally" improve the SaferComputeTokenFromLevel() stub. (#5435) CORE-14015, CORE-6942

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d3101db2c7164f2e03314… commit d3101db2c7164f2e033143bc8d2dc8deaf735e1a Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Jul 13 17:14:19 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Jul 15 20:50:16 2023 +0200 [ADVAPI32] "Minimally" improve the SaferComputeTokenFromLevel() stub. (#5435) CORE-14015, CORE-6942 This makes Windows 2003 CMD.EXE to start batch files again. Addendum to commit 17d42ae2a (r58868). Replaces PR #3084 by freely importing and adapting Wine patch https://github.com/wine-mirror/wine/commit/17110a0a890d2bacb5b348bd9bb3cef1… ``` advapi32: Improve the SaferComputeTokenFromLevel stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47274 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> ``` --- dll/win32/advapi32/sec/safer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/win32/advapi32/sec/safer.c b/dll/win32/advapi32/sec/safer.c index 3905db18cea..31755dbadb2 100644 --- a/dll/win32/advapi32/sec/safer.c +++ b/dll/win32/advapi32/sec/safer.c @@ -155,8 +155,8 @@ SaferComputeTokenFromLevel( _Inout_opt_ PVOID pReserved) { FIXME("(%p, %p, %p, 0x%lx, %p) stub\n", LevelHandle, InAccessToken, OutAccessToken, dwFlags, pReserved); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + *OutAccessToken = (dwFlags & SAFER_TOKEN_NULL_IF_EQUAL) ? NULL : UlongToHandle(0xdeadf00d); + return TRUE; }

1 year, 5 months

[reactos] 02/02: [NTOS:KE/x64] Calculate the CPU frequency on AMD64

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e2a587c2efc18e76b80a3… commit e2a587c2efc18e76b80a39db41452f3f5616ab97 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Wed Jul 12 15:28:48 2023 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sat Jul 15 20:50:12 2023 +0300 [NTOS:KE/x64] Calculate the CPU frequency on AMD64 This should be performed early enough before CM initialization, but after the TSC has been initialized and calibrated by HAL. Based on existing i386 kiinit code. CORE-17971 CORE-14922 --- ntoskrnl/ke/amd64/krnlinit.c | 86 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 86 insertions(+) diff --git a/ntoskrnl/ke/amd64/krnlinit.c b/ntoskrnl/ke/amd64/krnlinit.c index a946d92801c..9391219c25b 100644 --- a/ntoskrnl/ke/amd64/krnlinit.c +++ b/ntoskrnl/ke/amd64/krnlinit.c @@ -30,6 +30,89 @@ KiInitializeKernel(IN PKPROCESS InitProcess, IN PLOADER_PARAMETER_BLOCK LoaderBlock); +CODE_SEG("INIT") +VOID +KiCalculateCpuFrequency( + IN PKPRCB Prcb) +{ + if (Prcb->FeatureBits & KF_RDTSC) + { + ULONG Sample = 0; + CPU_INFO CpuInfo; + KI_SAMPLE_MAP Samples[10]; + PKI_SAMPLE_MAP CurrentSample = Samples; + + /* Start sampling loop */ + for (;;) + { + /* Do a dummy CPUID to start the sample */ + KiCpuId(&CpuInfo, 0); + + /* Fill out the starting data */ + CurrentSample->PerfStart = KeQueryPerformanceCounter(NULL); + CurrentSample->TSCStart = __rdtsc(); + CurrentSample->PerfFreq.QuadPart = -50000; + + /* Sleep for this sample */ + KeStallExecutionProcessor(CurrentSample->PerfFreq.QuadPart * -1 / 10); + + /* Do another dummy CPUID */ + KiCpuId(&CpuInfo, 0); + + /* Fill out the ending data */ + CurrentSample->PerfEnd = + KeQueryPerformanceCounter(&CurrentSample->PerfFreq); + CurrentSample->TSCEnd = __rdtsc(); + + /* Calculate the differences */ + CurrentSample->PerfDelta = CurrentSample->PerfEnd.QuadPart - + CurrentSample->PerfStart.QuadPart; + CurrentSample->TSCDelta = CurrentSample->TSCEnd - + CurrentSample->TSCStart; + + /* Compute CPU Speed */ + CurrentSample->MHz = (ULONG)((CurrentSample->TSCDelta * + CurrentSample-> + PerfFreq.QuadPart + 500000) / + (CurrentSample->PerfDelta * + 1000000)); + + /* Check if this isn't the first sample */ + if (Sample) + { + /* Check if we got a good precision within 1MHz */ + if ((CurrentSample->MHz == CurrentSample[-1].MHz) || + (CurrentSample->MHz == CurrentSample[-1].MHz + 1) || + (CurrentSample->MHz == CurrentSample[-1].MHz - 1)) + { + /* We did, stop sampling */ + break; + } + } + + /* Move on */ + CurrentSample++; + Sample++; + + if (Sample == RTL_NUMBER_OF(Samples)) + { + /* No luck. Average the samples and be done */ + ULONG TotalMHz = 0; + while (Sample--) + { + TotalMHz += Samples[Sample].MHz; + } + CurrentSample[-1].MHz = TotalMHz / RTL_NUMBER_OF(Samples); + DPRINT1("Sampling CPU frequency failed. Using average of %lu MHz\n", CurrentSample[-1].MHz); + break; + } + } + + /* Save the CPU Speed */ + Prcb->MHz = CurrentSample[-1].MHz; + } +} + VOID NTAPI KiInitializeHandBuiltThread( @@ -105,6 +188,9 @@ KiSystemStartupBootStack(VOID) } } + /* Calculate the CPU frequency */ + KiCalculateCpuFrequency(Prcb); + /* Raise to Dispatch */ KfRaiseIrql(DISPATCH_LEVEL);

1 year, 5 months

[reactos] 01/02: [SYSDM] Do not leave empty line if no CPU frequency detected

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1896383eb0c3d5f0aad95… commit 1896383eb0c3d5f0aad958330fd3b5acdb6fad58 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Wed Jul 12 15:00:06 2023 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sat Jul 15 20:50:07 2023 +0300 [SYSDM] Do not leave empty line if no CPU frequency detected CORE-17971 --- dll/cpl/sysdm/general.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dll/cpl/sysdm/general.c b/dll/cpl/sysdm/general.c index 9448f6d3415..1e65bc5ecd1 100644 --- a/dll/cpl/sysdm/general.c +++ b/dll/cpl/sysdm/general.c @@ -412,7 +412,7 @@ static VOID MakeFloatValueString(DOUBLE* dFloatValue, LPTSTR szOutput, LPTSTR sz } } -static VOID SetProcSpeed(HWND hwnd, HKEY hKey, LPTSTR Value, UINT uID) +static BOOL SetProcSpeed(HWND hwnd, HKEY hKey, LPTSTR Value, UINT uID) { TCHAR szBuf[64], szHz[16]; DWORD BufSize = sizeof(DWORD); @@ -432,7 +432,7 @@ static VOID SetProcSpeed(HWND hwnd, HKEY hKey, LPTSTR Value, UINT uID) { if (!LoadString(hApplet, IDS_MEGAHERTZ, szHz, _countof(szHz))) { - return; + return FALSE; } StringCchPrintf(szBuf, _countof(szBuf), _T("%lu %s"), ppi.CurrentMhz, szHz); } @@ -441,13 +441,16 @@ static VOID SetProcSpeed(HWND hwnd, HKEY hKey, LPTSTR Value, UINT uID) double flt = ppi.CurrentMhz / 1000.0; if (!LoadString(hApplet, IDS_GIGAHERTZ, szHz, _countof(szHz))) { - return; + return FALSE; } MakeFloatValueString(&flt, szBuf, szHz); } SetDlgItemText(hwnd, uID, szBuf); + return TRUE; } + + return FALSE; } static VOID GetSystemInformation(HWND hwnd) @@ -511,8 +514,8 @@ static VOID GetSystemInformation(HWND hwnd) CurMachineLine + 1); } - SetProcSpeed(hwnd, hKey, _T("~MHz"), CurMachineLine); - CurMachineLine++; + if (SetProcSpeed(hwnd, hKey, _T("~MHz"), CurMachineLine)) + CurMachineLine++; RegCloseKey(hKey); }

1 year, 5 months

[reactos] 01/01: [BOOTDATA] Show Explorer status bar by default (#5443)

by Carl J. Bialorucki

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4f542ebd8d6318a1ca2f0… commit 4f542ebd8d6318a1ca2f0f4755b88c5a6eecb198 Author: Carl J. Bialorucki <cbialo2(a)outlook.com> AuthorDate: Sat Jul 15 11:06:30 2023 -0600 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Jul 15 20:06:30 2023 +0300 [BOOTDATA] Show Explorer status bar by default (#5443) Enable the explorer status bar by default, which the vast majority of our community voted for. Set `HKCU\Software\Microsoft\Internet Explorer\Main\StatusBarOther` to 1 in hivedef.inf. This will show the status bar by default. CORE-19028 CORE-19010 --- boot/bootdata/hivedef.inf | 1 + 1 file changed, 1 insertion(+) diff --git a/boot/bootdata/hivedef.inf b/boot/bootdata/hivedef.inf index 6774bbc2a0b..484c4cbbb7b 100644 --- a/boot/bootdata/hivedef.inf +++ b/boot/bootdata/hivedef.inf @@ -1899,6 +1899,7 @@ HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced","StartMenuLog ; "Hidden" to be changed to 2 if we later want to have "Hide hidden files by default" HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced","Hidden",0x00010003,1 HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced","ShowSuperHidden",0x00010003,0 +HKCU,"SOFTWARE\Microsoft\Internet Explorer\Main","StatusBarOther",0x00010003,1 ; ComDlg32 HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\ComDlg32",,0x00000012

1 year, 5 months

[reactos] 01/01: [SHELL32] Fix detail view in My Computer showing Comment in 'Total Size' column (#5438) CORE-19000

by Doug Lyons

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=035790dda5c8847ef0067… commit 035790dda5c8847ef0067b8c4bf92c4ab21044c5 Author: Doug Lyons <douglyons(a)douglyons.com> AuthorDate: Sat Jul 15 11:14:35 2023 -0500 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Jul 15 18:14:35 2023 +0200 [SHELL32] Fix detail view in My Computer showing Comment in 'Total Size' column (#5438) CORE-19000 Fixes the regression of 0.4.15-dev-5526-g 4c25af5b --- dll/win32/shell32/folders/CDrivesFolder.cpp | 52 +++++++++++++++++------------ 1 file changed, 31 insertions(+), 21 deletions(-) diff --git a/dll/win32/shell32/folders/CDrivesFolder.cpp b/dll/win32/shell32/folders/CDrivesFolder.cpp index 8dbdc48779d..24df6235f4a 100644 --- a/dll/win32/shell32/folders/CDrivesFolder.cpp +++ b/dll/win32/shell32/folders/CDrivesFolder.cpp @@ -572,8 +572,6 @@ static const shvheader MyComputerSFHeader[] = { {IDS_SHV_COLUMN_COMMENTS, SHCOLSTATE_TYPE_STR, LVCFMT_LEFT, 10}, }; -#define MYCOMPUTERSHELLVIEWCOLUMNS 5 - static const DWORD dwComputerAttributes = SFGAO_CANRENAME | SFGAO_CANDELETE | SFGAO_HASPROPSHEET | SFGAO_DROPTARGET | SFGAO_FILESYSANCESTOR | SFGAO_FOLDER | SFGAO_HASSUBFOLDER; @@ -752,28 +750,29 @@ HRESULT WINAPI CDrivesFolder::CompareIDs(LPARAM lParam, PCUIDLIST_RELATIVE pidl1 if (_ILIsSpecialFolder(pidl1) || _ILIsSpecialFolder(pidl2)) return m_regFolder->CompareIDs(lParam, pidl1, pidl2); - if (!_ILIsDrive(pidl1) || !_ILIsDrive(pidl2) || LOWORD(lParam) >= MYCOMPUTERSHELLVIEWCOLUMNS) + UINT iColumn = LOWORD(lParam); + if (!_ILIsDrive(pidl1) || !_ILIsDrive(pidl2) || iColumn >= _countof(MyComputerSFHeader)) return E_INVALIDARG; CHAR* pszDrive1 = _ILGetDataPointer(pidl1)->u.drive.szDriveName; CHAR* pszDrive2 = _ILGetDataPointer(pidl2)->u.drive.szDriveName; int result; - switch(LOWORD(lParam)) + switch (MyComputerSFHeader[iColumn].colnameid) { - case 0: /* name */ + case IDS_SHV_COLUMN_NAME: { result = stricmp(pszDrive1, pszDrive2); hres = MAKE_COMPARE_HRESULT(result); break; } - case 1: /* Type */ + case IDS_SHV_COLUMN_TYPE: { /* We want to return immediately because SHELL32_CompareDetails also compares children. */ return SHELL32_CompareDetails(this, lParam, pidl1, pidl2); } - case 2: /* Size */ - case 3: /* Size Available */ + case IDS_SHV_COLUMN_DISK_CAPACITY: + case IDS_SHV_COLUMN_DISK_AVAILABLE: { ULARGE_INTEGER Drive1Available, Drive1Total, Drive2Available, Drive2Total; @@ -796,11 +795,10 @@ HRESULT WINAPI CDrivesFolder::CompareIDs(LPARAM lParam, PCUIDLIST_RELATIVE pidl1 hres = MAKE_COMPARE_HRESULT(Diff.QuadPart); break; } - case 4: /* comments */ + case IDS_SHV_COLUMN_COMMENTS: hres = MAKE_COMPARE_HRESULT(0); break; - default: - return E_INVALIDARG; + DEFAULT_UNREACHABLE; } if (HRESULT_CODE(hres) == 0) @@ -1117,7 +1115,7 @@ HRESULT WINAPI CDrivesFolder::GetDefaultColumnState(UINT iColumn, DWORD * pcsFla { TRACE ("(%p)\n", this); - if (!pcsFlags || iColumn >= MYCOMPUTERSHELLVIEWCOLUMNS) + if (!pcsFlags || iColumn >= _countof(MyComputerSFHeader)) return E_INVALIDARG; *pcsFlags = MyComputerSFHeader[iColumn].pcsFlags; return S_OK; @@ -1135,7 +1133,7 @@ HRESULT WINAPI CDrivesFolder::GetDetailsOf(PCUITEMID_CHILD pidl, UINT iColumn, S TRACE ("(%p)->(%p %i %p)\n", this, pidl, iColumn, psd); - if (!psd || iColumn >= MYCOMPUTERSHELLVIEWCOLUMNS) + if (!psd || iColumn >= _countof(MyComputerSFHeader)) return E_INVALIDARG; if (!pidl) @@ -1146,7 +1144,18 @@ HRESULT WINAPI CDrivesFolder::GetDetailsOf(PCUITEMID_CHILD pidl, UINT iColumn, S } else if (!_ILIsDrive(pidl)) { - return m_regFolder->GetDetailsOf(pidl, iColumn, psd); + switch (MyComputerSFHeader[iColumn].colnameid) + { + case IDS_SHV_COLUMN_NAME: + case IDS_SHV_COLUMN_TYPE: + return m_regFolder->GetDetailsOf(pidl, iColumn, psd); + case IDS_SHV_COLUMN_DISK_CAPACITY: + case IDS_SHV_COLUMN_DISK_AVAILABLE: + return SHSetStrRet(&psd->str, ""); /* blank col */ + case IDS_SHV_COLUMN_COMMENTS: + return m_regFolder->GetDetailsOf(pidl, 2, psd); /* 2 = comments */ + DEFAULT_UNREACHABLE; + } } else { @@ -1156,19 +1165,19 @@ HRESULT WINAPI CDrivesFolder::GetDetailsOf(PCUITEMID_CHILD pidl, UINT iColumn, S if (DriveType > DRIVE_RAMDISK) DriveType = DRIVE_FIXED; - switch (iColumn) + switch (MyComputerSFHeader[iColumn].colnameid) { - case 0: /* name */ + case IDS_SHV_COLUMN_NAME: hr = GetDisplayNameOf(pidl, SHGDN_NORMAL | SHGDN_INFOLDER, &psd->str); break; - case 1: /* type */ + case IDS_SHV_COLUMN_TYPE: if (DriveType == DRIVE_REMOVABLE && !IsDriveFloppyA(pszDrive)) hr = SHSetStrRet(&psd->str, IDS_DRIVE_REMOVABLE); else hr = SHSetStrRet(&psd->str, iDriveTypeIds[DriveType]); break; - case 2: /* total size */ - case 3: /* free size */ + case IDS_SHV_COLUMN_DISK_CAPACITY: + case IDS_SHV_COLUMN_DISK_AVAILABLE: psd->str.cStr[0] = 0x00; psd->str.uType = STRRET_CSTR; if (GetVolumeInformationA(pszDrive, NULL, 0, NULL, NULL, NULL, NULL, 0)) @@ -1181,9 +1190,10 @@ HRESULT WINAPI CDrivesFolder::GetDetailsOf(PCUITEMID_CHILD pidl, UINT iColumn, S } hr = S_OK; break; - case 4: /* FIXME: comments */ - hr = SHSetStrRet(&psd->str, ""); + case IDS_SHV_COLUMN_COMMENTS: + hr = SHSetStrRet(&psd->str, ""); /* FIXME: comments */ break; + DEFAULT_UNREACHABLE; } }

1 year, 5 months

[reactos] 01/01: [REGEDIT] Improve Romanian (ro-RO) translation (#5439)

by Andrei Miloiu

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4057264a193d290e1ef6d… commit 4057264a193d290e1ef6d26a32d91570e13923e3 Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Sat Jul 15 18:08:26 2023 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Jul 15 18:08:26 2023 +0300 [REGEDIT] Improve Romanian (ro-RO) translation (#5439) --- base/applications/regedit/lang/ro-RO.rc | 36 +++++++++++++++++---------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/base/applications/regedit/lang/ro-RO.rc b/base/applications/regedit/lang/ro-RO.rc index cca1bf234f8..3dc4fe0b3be 100644 --- a/base/applications/regedit/lang/ro-RO.rc +++ b/base/applications/regedit/lang/ro-RO.rc @@ -31,17 +31,19 @@ Opțiuni:\n\ Compatibil cu orice alt comutator. Ignorat.\n\ /R:user.dat Locația fișierului user.dat urmează să fie modificată.\n\ Compatibil cu orice alt comutator. Ignorat.\n\ - /C Importă conținutul unui fișier de regiștri.\n\ - /D Șterge o cheie de regiștrii specificată.\n\ - /E Exportă conținutul unei cheie de regiștri specificată într-un fișier.\n\ - Dacă nu este nicio cheie specificată, toți regiștrii sunt exportați.\n\ + /C Importă conținutul unui fișier de registru.\n\ + /D Șterge o cheie de registru specificată.\n\ + /E Exportă conținutul unei chei de registru specificată într-un\n\ + fișier. Dacă nu este nicio cheie specificată, este exportat\n\ + întregul registru.\n\ /S Modul silențios. Nu sunt afișate mesaje.\n\ /V Lansează interfața grafică (GUI) în modul avansat. Ignorat.\n\ /? Afișează informații și părăsește programul.\n\ - [filename] Locația fișierului ce conține informații despre regiștri ce urmează\n\ - să fie importați. Când e folosit cu [/E], această opțiune specifică\n\ - locația fișierului în care informațiile despre regiștri vor fi exportate.\n\ - [reg_key] Cheie de regiștri ce urmează să fie modificată.\n\ + [filename] Locația fișierului ce conține informații despre registrul ce\n\ + urmează să fie importat. Când e folosit cu [/E], această\n\ + opțiune specifică locația fișierului în care informațiile\n\ + despre registru vor fi exportate.\n\ + [reg_key] Cheie de registru ce urmează să fie modificată.\n\ \n\ Exemple de utilizări:\n\ regedit ""import.reg""\n\ @@ -50,7 +52,7 @@ Exemple de utilizări:\n\ STRING_INVALID_SWITCH "regedit: Comutatorul este nevalid sau nerecunoscut [%1]\n" STRING_HELP "Scrieți ""regedit /?"" pentru ajutor.\n" STRING_NO_FILENAME "regedit: Niciun nume de fișier nu a fost specificat.\n" - STRING_NO_REG_KEY "regedit: Nicio cheie de regiștri nu a fost specificată pentru ștergere.\n" + STRING_NO_REG_KEY "regedit: Nicio cheie de registru nu a fost specificată pentru ștergere.\n" STRING_FILE_NOT_FOUND "regedit: Fișierul '%1' nu a fost găsit.\n" STRING_CANNOT_OPEN_FILE "regedit: Fișierul '%1' nu a putut fi deschis.\n" STRING_UNHANDLED_ACTION "regedit: Acțiune necontrolată.\n" @@ -58,16 +60,16 @@ Exemple de utilizări:\n\ STRING_INVALID_HEX "regedit: Valoare hexazecimală nevalidă.\n" STRING_CSV_HEX_ERROR "regedit: Datele hexazecimale nu au putut fi transformate. O valoare nevalidă a fost întâlnită la '%1'.\n" STRING_ESCAPE_SEQUENCE "regedit: Secvență de evadare nerecunoscută [\\%1!c!]\n" - STRING_UNKNOWN_DATA_FORMAT "regedit: Tipul de date de regiștri [0x%1!x!] nesuportat\n" + STRING_UNKNOWN_DATA_FORMAT "regedit: Tipul de date de registru [0x%1!x!] e nesuportat\n" STRING_UNEXPECTED_EOL "regedit: Capăt de linie neașteptat în '%1'.\n" STRING_UNRECOGNIZED_LINE "regedit: Linia '%1' nu a fost recunoscută.\n" - STRING_SETVALUE_FAILED "regedit: Valoarea de regiștri '%1' nu a putut fi adăugată la '%2'.\n" - STRING_OPEN_KEY_FAILED "regedit: Cheia de regiștri '%1' nu a putut fi deschisă.\n" - STRING_UNSUPPORTED_TYPE "regedit: Tipul de date de regiștri [0x%1!x!] nesuportat a apărut în '%2'.\n" - STRING_EXPORT_AS_BINARY "regedit: Valoarea de regiștri '%1' va fi exportată ca date binare.\n" + STRING_SETVALUE_FAILED "regedit: Valoarea de registru '%1' nu a putut fi adăugată la '%2'.\n" + STRING_OPEN_KEY_FAILED "regedit: Cheia de registru '%1' nu a putut fi deschisă.\n" + STRING_UNSUPPORTED_TYPE "regedit: Tipul de date de registru [0x%1!x!] nesuportat a apărut în '%2'.\n" + STRING_EXPORT_AS_BINARY "regedit: Valoarea de registru '%1' va fi exportată ca date binare.\n" STRING_INVALID_SYSTEM_KEY "regedit: Cheia de sistem [%1] este nevalidă\n" - STRING_REG_KEY_NOT_FOUND "regedit: '%1' nu a putut fi exportat. Cheia de regiștri specificată nu a fost găsită.\n" - STRING_DELETE_FAILED "regedit: Cheia de regiștri nu a putut fi ștearsă '%1'.\n" + STRING_REG_KEY_NOT_FOUND "regedit: '%1' nu a putut fi exportat. Cheia de registru specificată nu a fost găsită.\n" + STRING_DELETE_FAILED "regedit: Cheia de registru nu a putut fi ștearsă '%1'.\n" STRING_UNKNOWN_TYPE "Tip necunoscut" STRING_INVALID_LINE_SYNTAX, "regedit: Linia conține sintaxă nevalidă.\n" END @@ -608,7 +610,7 @@ END /* *STRINGTABLE *BEGIN - * ID_HELP_HELPTOPICS "Deschide Ajutor pentru Editorul de regiștri." + * ID_HELP_HELPTOPICS "Deschide Ajutor pentru Editorul de registru." * ID_HELP_ABOUT "Afișează informații despre program, numărul versiunii și marca înregistrată." *END */

1 year, 5 months

[reactos] 01/01: [CODEBASE] Fix "uknown" / "unkown" etc. typos.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3854a5d8e93d2c50153bd… commit 3854a5d8e93d2c50153bda26ea378e65cc4241fa Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Jul 15 14:12:14 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Jul 15 14:19:04 2023 +0200 [CODEBASE] Fix "uknown" / "unkown" etc. typos. Only done in our own code, not in 3rd-party or in PSDK headers (official ones also have such typos in defines...) (NOTE: apparent "Uknown" typo in dll/cpl/sysdm/smbios.c is on-purpose: typo by the manufacturer.) --- base/applications/sndrec32/audio_format.cpp | 2 +- dll/win32/shell32/folders/CControlPanelFolder.cpp | 2 +- dll/win32/shell32/folders/CDrivesFolder.cpp | 2 +- dll/win32/shell32/folders/CRegFolder.cpp | 2 +- hal/halx86/legacy/bussupp.c | 2 +- modules/rosapps/applications/sysutils/regexpl/RegistryKey.cpp | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/base/applications/sndrec32/audio_format.cpp b/base/applications/sndrec32/audio_format.cpp index 20fffc0e2de..7710dce9ea5 100644 --- a/base/applications/sndrec32/audio_format.cpp +++ b/base/applications/sndrec32/audio_format.cpp @@ -12,7 +12,7 @@ _AUDIO_NAMESPACE_START_ /* Standard audio formats (declared as externs in `audio_format.hpp') */ -audio_format UNNKOWN_FORMAT(0, 0, 0); +audio_format UNKNOWN_FORMAT(0, 0, 0); audio_format A44100_16BIT_STEREO(44100, 16, 2); audio_format A44100_16BIT_MONO(44100, 16, 1); diff --git a/dll/win32/shell32/folders/CControlPanelFolder.cpp b/dll/win32/shell32/folders/CControlPanelFolder.cpp index ff62b2e964f..be71cc8f714 100644 --- a/dll/win32/shell32/folders/CControlPanelFolder.cpp +++ b/dll/win32/shell32/folders/CControlPanelFolder.cpp @@ -411,7 +411,7 @@ HRESULT WINAPI CControlPanelFolder::GetAttributesOf(UINT cidl, PCUITEMID_CHILD_A else if (_ILIsSpecialFolder(*apidl)) m_regFolder->GetAttributesOf(1, apidl, rgfInOut); else - ERR("Got an unkown pidl here!\n"); + ERR("Got an unknown pidl here!\n"); apidl++; cidl--; } diff --git a/dll/win32/shell32/folders/CDrivesFolder.cpp b/dll/win32/shell32/folders/CDrivesFolder.cpp index 16b6b701f5b..8dbdc48779d 100644 --- a/dll/win32/shell32/folders/CDrivesFolder.cpp +++ b/dll/win32/shell32/folders/CDrivesFolder.cpp @@ -666,7 +666,7 @@ HRESULT WINAPI CDrivesFolder::ParseDisplayName(HWND hwndOwner, LPBC pbc, LPOLEST else if (_ILIsSpecialFolder(pidlTemp)) m_regFolder->GetAttributesOf(1, &pidlTemp, pdwAttributes); else - ERR("Got an unkown pidl here!\n"); + ERR("Got an unknown pidl here!\n"); } } diff --git a/dll/win32/shell32/folders/CRegFolder.cpp b/dll/win32/shell32/folders/CRegFolder.cpp index 464d00fe55b..eea529de235 100644 --- a/dll/win32/shell32/folders/CRegFolder.cpp +++ b/dll/win32/shell32/folders/CRegFolder.cpp @@ -510,7 +510,7 @@ HRESULT WINAPI CRegFolder::GetAttributesOf(UINT cidl, PCUITEMID_CHILD_ARRAY apid if (_ILIsSpecialFolder(*apidl)) GetGuidItemAttributes(*apidl, rgfInOut); else - ERR("Got an unkown pidl here!\n"); + ERR("Got an unknown pidl here!\n"); apidl++; cidl--; } diff --git a/hal/halx86/legacy/bussupp.c b/hal/halx86/legacy/bussupp.c index 6f91c3b7280..d6d7c99d174 100644 --- a/hal/halx86/legacy/bussupp.c +++ b/hal/halx86/legacy/bussupp.c @@ -355,7 +355,7 @@ HalpAllocateAndInitPciBusHandler(IN ULONG PciType, default: /* Invalid type */ - DbgPrint("HAL: Unnkown PCI type\n"); + DbgPrint("HAL: Unknown PCI type\n"); } /* Return the bus handler */ diff --git a/modules/rosapps/applications/sysutils/regexpl/RegistryKey.cpp b/modules/rosapps/applications/sysutils/regexpl/RegistryKey.cpp index d3d6ec83483..483ef0a25f8 100644 --- a/modules/rosapps/applications/sysutils/regexpl/RegistryKey.cpp +++ b/modules/rosapps/applications/sysutils/regexpl/RegistryKey.cpp @@ -489,7 +489,7 @@ const TCHAR * CRegistryKey::GetValueTypeName(DWORD dwType) case REG_RESOURCE_REQUIREMENTS_LIST: return _T("REG_RESOURCE_REQUIREMENTS_LIST"); default: - return _T("Unkown Type"); + return _T("Unknown Type"); } }

1 year, 5 months

[reactos] 01/01: [NETSH] Update header for English (en-US) translation

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=47fecc2952c87ab1a938a… commit 47fecc2952c87ab1a938ad2a0a2c9665dee24170 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sat Jul 15 14:44:07 2023 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sat Jul 15 14:44:07 2023 +0300 [NETSH] Update header for English (en-US) translation Derived from and addendum to d8f9f7f25. --- base/applications/network/netsh/lang/en-US.rc | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/base/applications/network/netsh/lang/en-US.rc b/base/applications/network/netsh/lang/en-US.rc index 1fd6654e247..cb05841e99d 100644 --- a/base/applications/network/netsh/lang/en-US.rc +++ b/base/applications/network/netsh/lang/en-US.rc @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS NetSh + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: English (United States) resource file + * TRANSLATOR: Copyright 2023 Eric Kohl <eric.kohl(a)reactos.org> + */ + LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US /* Basic application information */

1 year, 5 months

[reactos] 01/01: [NETSH] Append missing newline for MSVC

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=95bf5872eecd43cef8571… commit 95bf5872eecd43cef85716774b79a4121d6d4069 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Jul 15 13:18:38 2023 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Jul 15 13:18:38 2023 +0200 [NETSH] Append missing newline for MSVC --- base/applications/network/netsh/resource.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/network/netsh/resource.h b/base/applications/network/netsh/resource.h index e3875fd655c..651a9cd60b4 100644 --- a/base/applications/network/netsh/resource.h +++ b/base/applications/network/netsh/resource.h @@ -34,4 +34,4 @@ #define IDS_HLP_GROUP_ADD 320 #define IDS_HLP_GROUP_DELETE 321 -#define IDS_HLP_GROUP_SHOW 322 \ No newline at end of file +#define IDS_HLP_GROUP_SHOW 322

1 year, 5 months

← Newer
1
...
5
6
7
8
9
10
11
...
19
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2023