Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-27 15:22:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

[NDK][ROSLOAD][ROSTESTS][SDK][WINE] Fix and use standard 'ReactOS' casing (#8163)

Browse source
This commit is contained in:
Hermès Bélusca-Maïto 2025-06-22 20:52:21 +02:00
parent d4d04c83db
commit b401f547ae
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0
8 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
base/setup/reactos/lang/et-EE.rc
View file

@ -158,7 +158,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS
CAPTION "ReactOS'i paigalduse lõpetamine" CAPTION "ReactOS'i paigalduse lõpetamine"
FONT 8, "MS Shell Dlg" FONT 8, "MS Shell Dlg"
BEGIN BEGIN
LTEXT "Reactos'i paigaldusviisardi lõpetamine", IDC_FINISHTITLE, 115, 8, 195, 24 LTEXT "ReactOS'i paigaldusviisardi lõpetamine", IDC_FINISHTITLE, 115, 8, 195, 24
LTEXT "ReactOS'i paigaldamise esimene järk on edukalt lõpetatud.", IDC_STATIC, 115, 50, 195, 17 LTEXT "ReactOS'i paigaldamise esimene järk on edukalt lõpetatud.", IDC_STATIC, 115, 50, 195, 17
LTEXT "Vajuta Lõpeta, et arvuti taaskäivitada.", IDC_STATIC, 115, 80, 195, 17 LTEXT "Vajuta Lõpeta, et arvuti taaskäivitada.", IDC_STATIC, 115, 80, 195, 17
CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 115, 110, 195, 8 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 115, 110, 195, 8

2
base/setup/reactos/lang/vi-VN.rc
View file

@ -155,7 +155,7 @@ END
IDD_RESTARTPAGE DIALOGEX 0, 0, 317, 193 IDD_RESTARTPAGE DIALOGEX 0, 0, 317, 193
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "Đang hoàn tất cài đặt Reactos" CAPTION "Đang hoàn tất cài đặt ReactOS"
FONT 8, "MS Shell Dlg" FONT 8, "MS Shell Dlg"
BEGIN BEGIN
LTEXT "Completing the ReactOS Setup Wizard", IDC_FINISHTITLE, 115, 8, 195, 24 LTEXT "Completing the ReactOS Setup Wizard", IDC_FINISHTITLE, 115, 8, 195, 24

2
base/setup/usetup/lang/hu-HU.h
View file

@ -15,7 +15,7 @@ static MUI_ENTRY huHUSetupInitPageEntries[] =
{ {
0, 0,
20, 20,
"K\202rem v\240rjon am\241g a Reactos telep\241t\213 inicializ\240lja mag\240t", "K\202rem v\240rjon am\241g a ReactOS telep\241t\213 inicializ\240lja mag\240t",
TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER, TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER,
TEXT_ID_STATIC TEXT_ID_STATIC
}, },

2
boot/environ/app/rosload/rosload.c
View file

@ -1103,7 +1103,7 @@ OslMain (
LibraryParameters.MinimumAllocationCount = 1024; LibraryParameters.MinimumAllocationCount = 1024;
LibraryParameters.MinimumHeapSize = 2 * 1024 * 1024; LibraryParameters.MinimumHeapSize = 2 * 1024 * 1024;
LibraryParameters.HeapAllocationAttributes = BlMemoryKernelRange; LibraryParameters.HeapAllocationAttributes = BlMemoryKernelRange;
LibraryParameters.FontBaseDirectory = L"\\Reactos\\Boot\\Fonts"; LibraryParameters.FontBaseDirectory = L"\\ReactOS\\Boot\\Fonts";
LibraryParameters.DescriptorCount = 512; LibraryParameters.DescriptorCount = 512;
/* Initialize the boot library */ /* Initialize the boot library */

2
dll/directx/wine/readme.txt
View file

@ -1,5 +1,5 @@
This is Wine DirectX support. This is Wine DirectX support.
It works in Reactos and Windows. It works in ReactOS and Windows.
When ReactOS own ReactX are in-place When ReactOS own ReactX are in-place
this file will be removed from our SVN this file will be removed from our SVN
for now they stay as temporary solutions. for now they stay as temporary solutions.

12
modules/rostests/tests/hivetest/hivetest.c
View file

@ -628,8 +628,8 @@ void test5(void)
NTSTATUS Status; NTSTATUS Status;
dprintf("NtOpenKey : \n"); dprintf("NtOpenKey : \n");
dprintf(" \\Registry\\Machine\\Software\\reactos : "); dprintf(" \\Registry\\Machine\\Software\\ReactOS : ");
RtlRosInitUnicodeStringFromLiteral(&KeyName,L"\\Registry\\Machine\\Software\\reactos"); RtlRosInitUnicodeStringFromLiteral(&KeyName,L"\\Registry\\Machine\\Software\\ReactOS");
InitializeObjectAttributes(&ObjectAttributes, &KeyName, OBJ_CASE_INSENSITIVE InitializeObjectAttributes(&ObjectAttributes, &KeyName, OBJ_CASE_INSENSITIVE
, NULL, NULL); , NULL, NULL);
Status=NtOpenKey( &hKey, KEY_ALL_ACCESS, &ObjectAttributes); Status=NtOpenKey( &hKey, KEY_ALL_ACCESS, &ObjectAttributes);
@ -653,8 +653,8 @@ void test6(void)
ULONG Length,i; ULONG Length,i;
dprintf("Create target key\n"); dprintf("Create target key\n");
dprintf(" Key: \\Registry\\Machine\\SOFTWARE\\Reactos\n"); dprintf(" Key: \\Registry\\Machine\\SOFTWARE\\ReactOS\n");
RtlRosInitUnicodeStringFromLiteral(&KeyName, L"\\Registry\\Machine\\SOFTWARE\\Reactos"); RtlRosInitUnicodeStringFromLiteral(&KeyName, L"\\Registry\\Machine\\SOFTWARE\\ReactOS");
InitializeObjectAttributes(&ObjectAttributes, &KeyName, OBJ_CASE_INSENSITIVE InitializeObjectAttributes(&ObjectAttributes, &KeyName, OBJ_CASE_INSENSITIVE
, NULL, NULL); , NULL, NULL);
Status = NtCreateKey(&hKey, KEY_ALL_ACCESS , &ObjectAttributes Status = NtCreateKey(&hKey, KEY_ALL_ACCESS , &ObjectAttributes
@ -695,9 +695,9 @@ void test6(void)
return; return;
dprintf("Create link value\n"); dprintf("Create link value\n");
dprintf(" Value: SymbolicLinkValue = '\\Registry\\Machine\\SOFTWARE\\Reactos'\n"); dprintf(" Value: SymbolicLinkValue = '\\Registry\\Machine\\SOFTWARE\\ReactOS'\n");
RtlRosInitUnicodeStringFromLiteral(&ValueName, L"SymbolicLinkValue"); RtlRosInitUnicodeStringFromLiteral(&ValueName, L"SymbolicLinkValue");
Status=NtSetValueKey(hKey,&ValueName,0,REG_LINK,(PVOID)L"\\Registry\\Machine\\SOFTWARE\\Reactos",68); Status=NtSetValueKey(hKey,&ValueName,0,REG_LINK,(PVOID)L"\\Registry\\Machine\\SOFTWARE\\ReactOS",68);
dprintf(" NtSetValueKey() called (Status %lx)\n",Status); dprintf(" NtSetValueKey() called (Status %lx)\n",Status);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {

12
modules/rostests/tests/regtest/regtest.c
View file

@ -591,8 +591,8 @@ void test5(void)
NTSTATUS Status; NTSTATUS Status;
dprintf("NtOpenKey : \n"); dprintf("NtOpenKey : \n");
dprintf(" \\Registry\\Machine\\Software\\reactos : "); dprintf(" \\Registry\\Machine\\Software\\ReactOS : ");
RtlRosInitUnicodeStringFromLiteral(&KeyName,L"\\Registry\\Machine\\Software\\reactos"); RtlRosInitUnicodeStringFromLiteral(&KeyName,L"\\Registry\\Machine\\Software\\ReactOS");
InitializeObjectAttributes(&ObjectAttributes, &KeyName, OBJ_CASE_INSENSITIVE InitializeObjectAttributes(&ObjectAttributes, &KeyName, OBJ_CASE_INSENSITIVE
, NULL, NULL); , NULL, NULL);
Status=NtOpenKey( &hKey, KEY_ALL_ACCESS, &ObjectAttributes); Status=NtOpenKey( &hKey, KEY_ALL_ACCESS, &ObjectAttributes);
@ -616,8 +616,8 @@ void test6(void)
ULONG Length,i; ULONG Length,i;
dprintf("Create target key\n"); dprintf("Create target key\n");
dprintf(" Key: \\Registry\\Machine\\SOFTWARE\\Reactos\n"); dprintf(" Key: \\Registry\\Machine\\SOFTWARE\\ReactOS\n");
RtlRosInitUnicodeStringFromLiteral(&KeyName, L"\\Registry\\Machine\\SOFTWARE\\Reactos"); RtlRosInitUnicodeStringFromLiteral(&KeyName, L"\\Registry\\Machine\\SOFTWARE\\ReactOS");
InitializeObjectAttributes(&ObjectAttributes, &KeyName, OBJ_CASE_INSENSITIVE InitializeObjectAttributes(&ObjectAttributes, &KeyName, OBJ_CASE_INSENSITIVE
, NULL, NULL); , NULL, NULL);
Status = NtCreateKey(&hKey, KEY_ALL_ACCESS , &ObjectAttributes Status = NtCreateKey(&hKey, KEY_ALL_ACCESS , &ObjectAttributes
@ -658,9 +658,9 @@ void test6(void)
return; return;
dprintf("Create link value\n"); dprintf("Create link value\n");
dprintf(" Value: SymbolicLinkValue = '\\Registry\\Machine\\SOFTWARE\\Reactos'\n"); dprintf(" Value: SymbolicLinkValue = '\\Registry\\Machine\\SOFTWARE\\ReactOS'\n");
RtlRosInitUnicodeStringFromLiteral(&ValueName, L"SymbolicLinkValue"); RtlRosInitUnicodeStringFromLiteral(&ValueName, L"SymbolicLinkValue");
Status=NtSetValueKey(hKey,&ValueName,0,REG_LINK,(PVOID)L"\\Registry\\Machine\\SOFTWARE\\Reactos",68); Status=NtSetValueKey(hKey,&ValueName,0,REG_LINK,(PVOID)L"\\Registry\\Machine\\SOFTWARE\\ReactOS",68);
dprintf(" NtSetValueKey() called (Status %lx)\n",Status); dprintf(" NtSetValueKey() called (Status %lx)\n",Status);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {

4
sdk/include/ndk/rtlfuncs.h
View file

@ -5165,7 +5165,7 @@ RtlIsValidLocaleName(
// Flags for RtlLocaleNameToLcid / RtlLcidToLocaleName / RtlIsValidLocaleName // Flags for RtlLocaleNameToLcid / RtlLcidToLocaleName / RtlIsValidLocaleName
#define RTL_LOCALE_ALLOW_NEUTRAL_NAMES 0x00000002 // Return locales like "en" or "de" #define RTL_LOCALE_ALLOW_NEUTRAL_NAMES 0x00000002 // Return locales like "en" or "de"
#endif /* Win vista or Reactos Ntdll build */ #endif /* Win Vista or ReactOS Ntdll build */
#if (_WIN32_WINNT >= _WIN32_WINNT_WIN7) || (defined(__REACTOS__) && defined(_NTDLLBUILD_)) #if (_WIN32_WINNT >= _WIN32_WINNT_WIN7) || (defined(__REACTOS__) && defined(_NTDLLBUILD_))
@ -5179,7 +5179,7 @@ BOOLEAN
NTAPI NTAPI
RtlTryAcquireSRWLockExclusive(PRTL_SRWLOCK SRWLock); RtlTryAcquireSRWLockExclusive(PRTL_SRWLOCK SRWLock);
#endif /* Win7 or Reactos Ntdll build */ #endif /* Win7 or ReactOS Ntdll build */
#endif // NTOS_MODE_USER #endif // NTOS_MODE_USER