Ros-diffs July 2021

ros-diffs@reactos.org

18 participants
142 discussions

[reactos] 03/05: [REACTOS] Fix a number of MSVC warnings

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5d8e834897781944dcaf8… commit 5d8e834897781944dcaf80de6c3df9c2c51212c7 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Tue Jun 29 18:50:15 2021 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Fri Jul 23 22:03:48 2021 +0200 [REACTOS] Fix a number of MSVC warnings --- base/applications/sndvol32/dialog.c | 2 +- base/services/wkssvc/wkssvc.c | 11 ++----- base/setup/lib/utils/osdetect.c | 2 +- base/setup/lib/utils/regutil.c | 4 +-- base/setup/usetup/cmdcons.c | 2 +- base/setup/usetup/mui.c | 6 ++-- base/setup/usetup/progress.c | 4 +-- base/setup/usetup/spapisup/cabinet.c | 6 ++-- base/setup/usetup/usetup.c | 2 +- base/shell/cmd/cmdinput.c | 4 +-- base/system/services/config.c | 9 +++++- dll/win32/aclui/sidcache.c | 9 +++++- dll/win32/advapi32/misc/hwprofiles.c | 8 ++--- dll/win32/advapi32/reg/reg.c | 2 +- dll/win32/kernel32/client/vdm.c | 16 +++++++--- dll/win32/lsasrv/lookup.c | 13 +++++++-- dll/win32/lsasrv/privileges.c | 4 +-- dll/win32/msgina/gui.c | 8 ++--- dll/win32/msv1_0/msv1_0.c | 10 +++++-- dll/win32/msv1_0/precomp.h | 1 + dll/win32/ntmarta/ntmarta.c | 18 ++++++++++-- dll/win32/shell32/CShellLink.cpp | 14 +++++++-- dll/win32/shell32/folders/CPrinterFolder.cpp | 12 ++++++-- dll/win32/syssetup/security.c | 34 ++++++++++++++++++---- drivers/filesystems/fastfat_new/fatstruc.h | 1 + drivers/filesystems/npfs/main.c | 2 +- drivers/input/kbdclass/kbdclass.c | 4 +-- drivers/input/mouclass/mouclass.c | 4 +-- drivers/storage/floppy/floppy/ioctl.c | 4 +-- .../applications/explorer-old/shell/ntobjfs.cpp | 2 +- modules/rosapps/applications/fraginator/Unfrag.cpp | 2 +- modules/rosapps/applications/net/netreg/netreg.cpp | 6 ++-- .../applications/net/roshttpd/include/httpd.h | 2 +- modules/rosapps/applications/notevil/notevil.c | 10 +++---- .../applications/screensavers/cylfrac/cylfrac.c | 6 ++-- modules/rostests/apitests/atl/SubclassWindow.cpp | 1 + sdk/include/ddk/acpiioct.h | 2 +- sdk/include/psdk/intsafe.h | 2 ++ sdk/lib/crt/string/wtoi64.c | 4 +-- sdk/lib/drivers/ip/network/loopback.c | 2 +- subsystems/mvdm/ntvdm/dos/dem.c | 2 +- win32ss/printing/providers/localspl/tools.c | 2 +- win32ss/user/user32/windows/class.c | 2 +- 43 files changed, 175 insertions(+), 86 deletions(-) diff --git a/base/applications/sndvol32/dialog.c b/base/applications/sndvol32/dialog.c index 1fac34d7bab..71f1e8abdc6 100644 --- a/base/applications/sndvol32/dialog.c +++ b/base/applications/sndvol32/dialog.c @@ -338,7 +338,7 @@ LoadDialog( LPWORD Offset; WORD FontSize; WCHAR FontName[100]; - WORD Length; + SIZE_T Length; int width; DWORD units = GetDialogBaseUnits(); diff --git a/base/services/wkssvc/wkssvc.c b/base/services/wkssvc/wkssvc.c index d1e5b87840a..61472132fe1 100644 --- a/base/services/wkssvc/wkssvc.c +++ b/base/services/wkssvc/wkssvc.c @@ -73,7 +73,8 @@ static DWORD ServiceInit(VOID) { - LSA_STRING ProcessName, PackageName; + LSA_STRING ProcessName = RTL_CONSTANT_STRING("Workstation"); + LSA_STRING PackageName = RTL_CONSTANT_STRING(MSV1_0_PACKAGE_NAME); LSA_OPERATIONAL_MODE Mode; HANDLE hThread; NTSTATUS Status; @@ -84,10 +85,6 @@ ServiceInit(VOID) VersionInfo.dwOSVersionInfoSize = sizeof(VersionInfo); GetVersionExW(&VersionInfo); - ProcessName.Buffer = "Workstation"; - ProcessName.Length = strlen(ProcessName.Buffer); - ProcessName.MaximumLength = ProcessName.Length + 1; - Status = LsaRegisterLogonProcess(&ProcessName, &LsaHandle, &Mode); @@ -97,10 +94,6 @@ ServiceInit(VOID) return 1; } - PackageName.Buffer = MSV1_0_PACKAGE_NAME; - PackageName.Length = strlen(PackageName.Buffer); - PackageName.MaximumLength = PackageName.Length + 1; - Status = LsaLookupAuthenticationPackage(LsaHandle, &PackageName, &LsaAuthenticationPackage); diff --git a/base/setup/lib/utils/osdetect.c b/base/setup/lib/utils/osdetect.c index d191c58998e..0ee246c60b1 100644 --- a/base/setup/lib/utils/osdetect.c +++ b/base/setup/lib/utils/osdetect.c @@ -320,7 +320,7 @@ CheckForValidPEAndVendor( RtlStringCbCopyNW(VendorName->Buffer, VendorName->MaximumLength, pvData, BufLen * sizeof(WCHAR)); - VendorName->Length = wcslen(VendorName->Buffer) * sizeof(WCHAR); + VendorName->Length = (USHORT)wcslen(VendorName->Buffer) * sizeof(WCHAR); Success = TRUE; } diff --git a/base/setup/lib/utils/regutil.c b/base/setup/lib/utils/regutil.c index 60e0e9fd956..012acc03d5e 100644 --- a/base/setup/lib/utils/regutil.c +++ b/base/setup/lib/utils/regutil.c @@ -78,7 +78,7 @@ CreateNestedKey(PHANDLE KeyHandle, break; } *Ptr = (WCHAR)0; - LocalKeyName.Length = wcslen(LocalKeyName.Buffer) * sizeof(WCHAR); + LocalKeyName.Length = (Ptr - LocalKeyName.Buffer) * sizeof(WCHAR); Status = NtCreateKey(&LocalKeyHandle, KEY_CREATE_SUB_KEY, @@ -110,7 +110,7 @@ CreateNestedKey(PHANDLE KeyHandle, NtClose(LocalKeyHandle); LocalKeyName.Buffer[LocalKeyName.Length / sizeof(WCHAR)] = L'\\'; - LocalKeyName.Length = wcslen(LocalKeyName.Buffer) * sizeof(WCHAR); + LocalKeyName.Length = (USHORT)wcslen(LocalKeyName.Buffer) * sizeof(WCHAR); Status = NtCreateKey(&LocalKeyHandle, KEY_ALL_ACCESS, diff --git a/base/setup/usetup/cmdcons.c b/base/setup/usetup/cmdcons.c index 0307c11ca1d..e1cd5c74e3f 100644 --- a/base/setup/usetup/cmdcons.c +++ b/base/setup/usetup/cmdcons.c @@ -1026,7 +1026,7 @@ ReadCommand( { /* If this character insertion will cause screen scrolling, * adjust the saved origin of the command prompt. */ - tempscreen = strlen(str + current) + curx; + tempscreen = (USHORT)strlen(str + current) + curx; if ((tempscreen % State->maxx) == (State->maxx - 1) && (tempscreen / State->maxx) + cury == (State->maxy - 1)) { diff --git a/base/setup/usetup/mui.c b/base/setup/usetup/mui.c index d1e6599c461..365576e58f4 100644 --- a/base/setup/usetup/mui.c +++ b/base/setup/usetup/mui.c @@ -140,7 +140,7 @@ MUIClearPage( CONSOLE_ClearStyledText(entry[index].X, entry[index].Y, entry[index].Flags, - strlen(entry[index].Buffer)); + (USHORT)strlen(entry[index].Buffer)); index++; } } @@ -347,7 +347,7 @@ MUIClearText( CONSOLE_ClearTextXY( entry[Index].X, entry[Index].Y, - (ULONG)strlen(entry[Index].Buffer)); + (USHORT)strlen(entry[Index].Buffer)); /* Increment the index and loop over next entires with the same ID */ Index++; @@ -404,7 +404,7 @@ MUIClearStyledText( entry[Index].X, entry[Index].Y, Flags, - (ULONG)strlen(entry[Index].Buffer)); + (USHORT)strlen(entry[Index].Buffer)); /* Increment the index and loop over next entires with the same ID */ Index++; diff --git a/base/setup/usetup/progress.c b/base/setup/usetup/progress.c index 1d095aeb6d0..aa1f81d3e8c 100644 --- a/base/setup/usetup/progress.c +++ b/base/setup/usetup/progress.c @@ -240,7 +240,7 @@ DrawProgressBar( if (Bar->UpdateProgressProc && Bar->UpdateProgressProc(Bar, TRUE, TextBuffer, ARRAYSIZE(TextBuffer))) { - coPos.X = Bar->Left + (Bar->Width - strlen(TextBuffer) + 1) / 2; + coPos.X = Bar->Left + (Bar->Width - (USHORT)strlen(TextBuffer) + 1) / 2; coPos.Y = Bar->Top; WriteConsoleOutputCharacterA(StdOutput, TextBuffer, @@ -383,7 +383,7 @@ ProgressSetStep( if (Bar->UpdateProgressProc && Bar->UpdateProgressProc(Bar, FALSE, TextBuffer, ARRAYSIZE(TextBuffer))) { - coPos.X = Bar->Left + (Bar->Width - strlen(TextBuffer) + 1) / 2; + coPos.X = Bar->Left + (Bar->Width - (USHORT)strlen(TextBuffer) + 1) / 2; coPos.Y = Bar->Top; WriteConsoleOutputCharacterA(StdOutput, TextBuffer, diff --git a/base/setup/usetup/spapisup/cabinet.c b/base/setup/usetup/spapisup/cabinet.c index 46ae4e5d5d5..c9efdbc5431 100644 --- a/base/setup/usetup/spapisup/cabinet.c +++ b/base/setup/usetup/spapisup/cabinet.c @@ -981,6 +981,7 @@ CabinetExtractFile( PCFFOLDER CurrentFolder; LARGE_INTEGER MaxDestFileSize; LONG InputLength, OutputLength; + SIZE_T StringLength; char Chunk[512]; if (wcscmp(Search->Cabinet, CabinetContext->CabinetName) != 0) @@ -1039,8 +1040,9 @@ CabinetExtractFile( { RtlInitAnsiString(&AnsiString, Search->File->FileName); wcscpy(DestName, CabinetContext->DestPath); - UnicodeString.MaximumLength = sizeof(DestName) - wcslen(DestName) * sizeof(WCHAR); - UnicodeString.Buffer = DestName + wcslen(DestName); + StringLength = wcslen(DestName); + UnicodeString.MaximumLength = sizeof(DestName) - (USHORT)StringLength * sizeof(WCHAR); + UnicodeString.Buffer = DestName + StringLength; UnicodeString.Length = 0; RtlAnsiStringToUnicodeString(&UnicodeString, &AnsiString, FALSE); diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index 520b257846d..16a520cbd84 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -1907,7 +1907,7 @@ ShowPartitionSizeInputBox(SHORT Left, coPos.X = Left + 2; coPos.Y = Top + 2; strcpy(Buffer, MUIGetString(STRING_PARTITIONSIZE)); - iLeft = coPos.X + strlen(Buffer) + 1; + iLeft = coPos.X + (USHORT)strlen(Buffer) + 1; iTop = coPos.Y; WriteConsoleOutputCharacterA(StdOutput, diff --git a/base/shell/cmd/cmdinput.c b/base/shell/cmd/cmdinput.c index e609c5ac354..e1c7c16dba8 100644 --- a/base/shell/cmd/cmdinput.c +++ b/base/shell/cmd/cmdinput.c @@ -96,7 +96,7 @@ * 30-Apr-2004 (Filip Navara <xnavara(a)volny.cz>) * Fixed problems when the screen was scrolled away. * - * 28-September-2007 (Herv� Poussineau) + * 28-September-2007 (Hervé Poussineau) * Added history possibilities to right key. */ @@ -142,7 +142,7 @@ BOOL ReadCommand(LPTSTR str, INT maxlen) SHORT orgy; SHORT curx; /*current x/y cursor position*/ SHORT cury; - SHORT tempscreen; + SIZE_T tempscreen; INT count; /*used in some for loops*/ INT current = 0; /*the position of the cursor in the string (str)*/ INT charcount = 0;/*chars in the string (str)*/ diff --git a/base/system/services/config.c b/base/system/services/config.c index db1b0dafc79..ce976356277 100644 --- a/base/system/services/config.c +++ b/base/system/services/config.c @@ -476,9 +476,16 @@ ScmSetServicePassword( UNICODE_STRING Password; NTSTATUS Status; DWORD dwError = ERROR_SUCCESS; + SIZE_T ServiceNameLength; RtlZeroMemory(&ObjectAttributes, sizeof(OBJECT_ATTRIBUTES)); + ServiceNameLength = wcslen(pszServiceName); + if (ServiceNameLength > (UNICODE_STRING_MAX_CHARS - 4)) + { + return ERROR_INVALID_PARAMETER; + } + Status = LsaOpenPolicy(NULL, &ObjectAttributes, POLICY_CREATE_SECRET, @@ -486,7 +493,7 @@ ScmSetServicePassword( if (!NT_SUCCESS(Status)) return RtlNtStatusToDosError(Status); - ServiceName.Length = (wcslen(pszServiceName) + 4) * sizeof(WCHAR); + ServiceName.Length = ((USHORT)ServiceNameLength + 4) * sizeof(WCHAR); ServiceName.MaximumLength = ServiceName.Length + sizeof(WCHAR); ServiceName.Buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, diff --git a/dll/win32/aclui/sidcache.c b/dll/win32/aclui/sidcache.c index e68cf9320b4..1c9c7264dd9 100644 --- a/dll/win32/aclui/sidcache.c +++ b/dll/win32/aclui/sidcache.c @@ -176,11 +176,18 @@ OpenLSAPolicyHandle(IN LPWSTR SystemName, LSA_OBJECT_ATTRIBUTES LsaObjectAttributes = {0}; LSA_UNICODE_STRING LsaSystemName, *psn; NTSTATUS Status; + SIZE_T NameLength; if (SystemName != NULL && SystemName[0] != L'\0') { + NameLength = wcslen(SystemName); + if (NameLength > UNICODE_STRING_MAX_CHARS) + { + return FALSE; + } + LsaSystemName.Buffer = SystemName; - LsaSystemName.Length = wcslen(SystemName) * sizeof(WCHAR); + LsaSystemName.Length = NameLength * sizeof(WCHAR); LsaSystemName.MaximumLength = LsaSystemName.Length + sizeof(WCHAR); psn = &LsaSystemName; } diff --git a/dll/win32/advapi32/misc/hwprofiles.c b/dll/win32/advapi32/misc/hwprofiles.c index 980001d999b..88a0188cf33 100644 --- a/dll/win32/advapi32/misc/hwprofiles.c +++ b/dll/win32/advapi32/misc/hwprofiles.c @@ -42,8 +42,8 @@ GetCurrentHwProfileA(LPHW_PROFILE_INFOA lpHwProfileInfo) lpHwProfileInfo->dwDockInfo = ProfileInfo.dwDockInfo; /* Convert the profile GUID to ANSI */ - StringU.Buffer = (PWCHAR)ProfileInfo.szHwProfileGuid; - StringU.Length = wcslen(ProfileInfo.szHwProfileGuid) * sizeof(WCHAR); + StringU.Buffer = ProfileInfo.szHwProfileGuid; + StringU.Length = (USHORT)wcslen(ProfileInfo.szHwProfileGuid) * sizeof(WCHAR); StringU.MaximumLength = HW_PROFILE_GUIDLEN * sizeof(WCHAR); StringA.Buffer = (PCHAR)&lpHwProfileInfo->szHwProfileGuid; StringA.Length = 0; @@ -58,8 +58,8 @@ GetCurrentHwProfileA(LPHW_PROFILE_INFOA lpHwProfileInfo) } /* Convert the profile name to ANSI */ - StringU.Buffer = (PWCHAR)ProfileInfo.szHwProfileName; - StringU.Length = wcslen(ProfileInfo.szHwProfileName) * sizeof(WCHAR); + StringU.Buffer = ProfileInfo.szHwProfileName; + StringU.Length = (USHORT)wcslen(ProfileInfo.szHwProfileName) * sizeof(WCHAR); StringU.MaximumLength = MAX_PROFILE_LEN * sizeof(WCHAR); StringA.Buffer = (PCHAR)&lpHwProfileInfo->szHwProfileName; StringA.Length = 0; diff --git a/dll/win32/advapi32/reg/reg.c b/dll/win32/advapi32/reg/reg.c index 36aa3b867ae..3d739fb9d4f 100644 --- a/dll/win32/advapi32/reg/reg.c +++ b/dll/win32/advapi32/reg/reg.c @@ -961,7 +961,7 @@ CreateNestedKey(PHKEY KeyHandle, } *Ptr = (WCHAR)0; - LocalKeyName.Length = wcslen(LocalKeyName.Buffer) * sizeof(WCHAR); + LocalKeyName.Length = (USHORT)wcslen(LocalKeyName.Buffer) * sizeof(WCHAR); Status = NtCreateKey(&LocalKeyHandle, KEY_CREATE_SUB_KEY, diff --git a/dll/win32/kernel32/client/vdm.c b/dll/win32/kernel32/client/vdm.c index ff6e7851295..07022d8740b 100644 --- a/dll/win32/kernel32/client/vdm.c +++ b/dll/win32/kernel32/client/vdm.c @@ -105,7 +105,7 @@ BaseCheckVDM(IN ULONG BinaryType, PWCHAR CurrentDir = NULL; PWCHAR ShortAppName = NULL; PWCHAR ShortCurrentDir = NULL; - ULONG Length; + SIZE_T Length; PCHAR AnsiCmdLine = NULL; PCHAR AnsiAppName = NULL; PCHAR AnsiCurDirectory = NULL; @@ -283,16 +283,24 @@ BaseCheckVDM(IN ULONG BinaryType, goto Cleanup; } + /* Make sure that the command line isn't too long */ + Length = wcslen(CommandLine); + if (Length > UNICODE_STRING_MAX_CHARS - 1) + { + Status = STATUS_INVALID_PARAMETER; + goto Cleanup; + } + /* Setup the input parameters */ CheckVdm->ConsoleHandle = NtCurrentPeb()->ProcessParameters->ConsoleHandle; CheckVdm->BinaryType = BinaryType; CheckVdm->CodePage = CP_ACP; CheckVdm->dwCreationFlags = CreationFlags; CheckVdm->CurDrive = CurrentDirectory[0] - L'A'; - CheckVdm->CmdLen = wcslen(CommandLine) + 1; - CheckVdm->AppLen = wcslen(ShortAppName) + 1; + CheckVdm->CmdLen = (USHORT)Length + 1; + CheckVdm->AppLen = (USHORT)wcslen(ShortAppName) + 1; CheckVdm->PifLen = 0; // TODO: PIF file support! - CheckVdm->CurDirectoryLen = wcslen(ShortCurrentDir) + 1; + CheckVdm->CurDirectoryLen = (USHORT)wcslen(ShortCurrentDir) + 1; CheckVdm->EnvLen = AnsiEnvironment->Length; CheckVdm->DesktopLen = (StartupInfo->lpDesktop != NULL) ? (wcslen(StartupInfo->lpDesktop) + 1) : 0; CheckVdm->TitleLen = (StartupInfo->lpTitle != NULL) ? (wcslen(StartupInfo->lpTitle) + 1) : 0; diff --git a/dll/win32/lsasrv/lookup.c b/dll/win32/lsasrv/lookup.c index f593f2b86ae..7d39169f0a4 100644 --- a/dll/win32/lsasrv/lookup.c +++ b/dll/win32/lsasrv/lookup.c @@ -96,9 +96,18 @@ LsapCreateSid(PSID_IDENTIFIER_AUTHORITY IdentifierAuthority, PSID *SidPtr) { PWELL_KNOWN_SID SidEntry; + SIZE_T AccountNameLength, DomainNameLength; PULONG p; ULONG i; + AccountNameLength = wcslen(AccountName); + DomainNameLength = wcslen(DomainName); + if ((AccountNameLength > UNICODE_STRING_MAX_CHARS) || + (DomainNameLength > UNICODE_STRING_MAX_CHARS)) + { + return FALSE; + } + SidEntry = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WELL_KNOWN_SID)); if (SidEntry == NULL) return FALSE; @@ -126,7 +135,7 @@ LsapCreateSid(PSID_IDENTIFIER_AUTHORITY IdentifierAuthority, // RtlInitUnicodeString(&SidEntry->AccountName, // AccountName); - SidEntry->AccountName.Length = wcslen(AccountName) * sizeof(WCHAR); + SidEntry->AccountName.Length = (USHORT)AccountNameLength * sizeof(WCHAR); SidEntry->AccountName.MaximumLength = SidEntry->AccountName.Length + sizeof(WCHAR); SidEntry->AccountName.Buffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, SidEntry->AccountName.MaximumLength); @@ -142,7 +151,7 @@ LsapCreateSid(PSID_IDENTIFIER_AUTHORITY IdentifierAuthority, // RtlInitUnicodeString(&SidEntry->DomainName, // DomainName); - SidEntry->DomainName.Length = wcslen(DomainName) * sizeof(WCHAR); + SidEntry->DomainName.Length = (USHORT)DomainNameLength * sizeof(WCHAR); SidEntry->DomainName.MaximumLength = SidEntry->DomainName.Length + sizeof(WCHAR); SidEntry->DomainName.Buffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, SidEntry->DomainName.MaximumLength); diff --git a/dll/win32/lsasrv/privileges.c b/dll/win32/lsasrv/privileges.c index bb2b36f883f..5f6314481af 100644 --- a/dll/win32/lsasrv/privileges.c +++ b/dll/win32/lsasrv/privileges.c @@ -99,7 +99,7 @@ LsarpLookupPrivilegeName(PLUID Value, if (NameBuffer == NULL) return STATUS_NO_MEMORY; - NameBuffer->Length = wcslen(WellKnownPrivileges[Priv].Name) * sizeof(WCHAR); + NameBuffer->Length = (USHORT)wcslen(WellKnownPrivileges[Priv].Name) * sizeof(WCHAR); NameBuffer->MaximumLength = NameBuffer->Length + sizeof(WCHAR); NameBuffer->Buffer = MIDL_user_allocate(NameBuffer->MaximumLength); @@ -354,7 +354,7 @@ LsapLookupAccountRightName(ULONG RightValue, if (NameBuffer == NULL) return STATUS_NO_MEMORY; - NameBuffer->Length = wcslen(WellKnownRights[i].Name) * sizeof(WCHAR); + NameBuffer->Length = (USHORT)wcslen(WellKnownRights[i].Name) * sizeof(WCHAR); NameBuffer->MaximumLength = NameBuffer->Length + sizeof(WCHAR); NameBuffer->Buffer = MIDL_user_allocate(NameBuffer->MaximumLength); diff --git a/dll/win32/msgina/gui.c b/dll/win32/msgina/gui.c index 106a4ebcb96..e4f5abcc70f 100644 --- a/dll/win32/msgina/gui.c +++ b/dll/win32/msgina/gui.c @@ -580,7 +580,7 @@ DoChangePassword( Ptr = (LPWSTR)((ULONG_PTR)RequestBuffer + sizeof(MSV1_0_CHANGEPASSWORD_REQUEST)); /* Pack the domain name */ - RequestBuffer->DomainName.Length = wcslen(Domain) * sizeof(WCHAR); + RequestBuffer->DomainName.Length = (USHORT)wcslen(Domain) * sizeof(WCHAR); RequestBuffer->DomainName.MaximumLength = RequestBuffer->DomainName.Length + sizeof(WCHAR); RequestBuffer->DomainName.Buffer = Ptr; @@ -591,7 +591,7 @@ DoChangePassword( Ptr = (LPWSTR)((ULONG_PTR)Ptr + RequestBuffer->DomainName.MaximumLength); /* Pack the user name */ - RequestBuffer->AccountName.Length = wcslen(UserName) * sizeof(WCHAR); + RequestBuffer->AccountName.Length = (USHORT)wcslen(UserName) * sizeof(WCHAR); RequestBuffer->AccountName.MaximumLength = RequestBuffer->AccountName.Length + sizeof(WCHAR); RequestBuffer->AccountName.Buffer = Ptr; @@ -602,7 +602,7 @@ DoChangePassword( Ptr = (LPWSTR)((ULONG_PTR)Ptr + RequestBuffer->AccountName.MaximumLength); /* Pack the old password */ - RequestBuffer->OldPassword.Length = wcslen(OldPassword) * sizeof(WCHAR); + RequestBuffer->OldPassword.Length = (USHORT)wcslen(OldPassword) * sizeof(WCHAR); RequestBuffer->OldPassword.MaximumLength = RequestBuffer->OldPassword.Length + sizeof(WCHAR); RequestBuffer->OldPassword.Buffer = Ptr; @@ -613,7 +613,7 @@ DoChangePassword( Ptr = (LPWSTR)((ULONG_PTR)Ptr + RequestBuffer->OldPassword.MaximumLength); /* Pack the new password */ - RequestBuffer->NewPassword.Length = wcslen(NewPassword1) * sizeof(WCHAR); + RequestBuffer->NewPassword.Length = (USHORT)wcslen(NewPassword1) * sizeof(WCHAR); RequestBuffer->NewPassword.MaximumLength = RequestBuffer->NewPassword.Length + sizeof(WCHAR); RequestBuffer->NewPassword.Buffer = Ptr; diff --git a/dll/win32/msv1_0/msv1_0.c b/dll/win32/msv1_0/msv1_0.c index a6c9fd75225..2ab923213a3 100644 --- a/dll/win32/msv1_0/msv1_0.c +++ b/dll/win32/msv1_0/msv1_0.c @@ -102,18 +102,24 @@ BuildInteractiveProfileBuffer(IN PLSA_CLIENT_REQUEST ClientRequest, PVOID ClientBaseAddress = NULL; LPWSTR Ptr; ULONG BufferLength; + USHORT ComputerNameLength; NTSTATUS Status = STATUS_SUCCESS; *ProfileBuffer = NULL; *ProfileBufferLength = 0; + if (UIntPtrToUShort(wcslen(ComputerName), &ComputerNameLength) != S_OK) + { + return STATUS_INVALID_PARAMETER; + } + BufferLength = sizeof(MSV1_0_INTERACTIVE_PROFILE) + UserInfo->All.FullName.Length + sizeof(WCHAR) + UserInfo->All.HomeDirectory.Length + sizeof(WCHAR) + UserInfo->All.HomeDirectoryDrive.Length + sizeof(WCHAR) + UserInfo->All.ScriptPath.Length + sizeof(WCHAR) + UserInfo->All.ProfilePath.Length + sizeof(WCHAR) + - ((wcslen(ComputerName) + 3) * sizeof(WCHAR)); + ((ComputerNameLength + 3) * sizeof(WCHAR)); LocalBuffer = DispatchTable.AllocateLsaHeap(BufferLength); if (LocalBuffer == NULL) @@ -204,7 +210,7 @@ BuildInteractiveProfileBuffer(IN PLSA_CLIENT_REQUEST ClientRequest, Ptr = (LPWSTR)((ULONG_PTR)Ptr + LocalBuffer->HomeDirectoryDrive.MaximumLength); - LocalBuffer->LogonServer.Length = (wcslen(ComputerName) + 2) * sizeof(WCHAR); + LocalBuffer->LogonServer.Length = (ComputerNameLength + 2) * sizeof(WCHAR); LocalBuffer->LogonServer.MaximumLength = LocalBuffer->LogonServer.Length + sizeof(WCHAR); LocalBuffer->LogonServer.Buffer = (LPWSTR)((ULONG_PTR)ClientBaseAddress + (ULONG_PTR)Ptr - (ULONG_PTR)LocalBuffer); wcscpy(Ptr, L"\\"); diff --git a/dll/win32/msv1_0/precomp.h b/dll/win32/msv1_0/precomp.h index 99aeda9d36e..462fb56a401 100644 --- a/dll/win32/msv1_0/precomp.h +++ b/dll/win32/msv1_0/precomp.h @@ -8,6 +8,7 @@ #include <windef.h> #include <winbase.h> #include <winreg.h> +#include <intsafe.h> #define NTOS_MODE_USER #include <ndk/cmfuncs.h> #include <ndk/kefuncs.h> diff --git a/dll/win32/ntmarta/ntmarta.c b/dll/win32/ntmarta/ntmarta.c index 7eea9a8302a..c519feabb94 100644 --- a/dll/win32/ntmarta/ntmarta.c +++ b/dll/win32/ntmarta/ntmarta.c @@ -403,12 +403,19 @@ AccpOpenLSAPolicyHandle(IN LPWSTR SystemName, { LSA_OBJECT_ATTRIBUTES LsaObjectAttributes = {0}; LSA_UNICODE_STRING LsaSystemName, *psn; + SIZE_T SystemNameLength; NTSTATUS Status; if (SystemName != NULL && SystemName[0] != L'\0') { + SystemNameLength = wcslen(SystemName); + if (SystemNameLength > UNICODE_STRING_MAX_CHARS) + { + return ERROR_INVALID_PARAMETER; + } + LsaSystemName.Buffer = SystemName; - LsaSystemName.Length = wcslen(SystemName) * sizeof(WCHAR); + LsaSystemName.Length = (USHORT)SystemNameLength * sizeof(WCHAR); LsaSystemName.MaximumLength = LsaSystemName.Length + sizeof(WCHAR); psn = &LsaSystemName; } @@ -498,10 +505,17 @@ AccpLookupSidByName(IN LSA_HANDLE PolicyHandle, PLSA_REFERENCED_DOMAIN_LIST ReferencedDomains = NULL; PLSA_TRANSLATED_SID2 TranslatedSid = NULL; DWORD SidLen; + SIZE_T NameLength; DWORD Ret = ERROR_SUCCESS; + NameLength = wcslen(Name); + if (NameLength > UNICODE_STRING_MAX_CHARS) + { + return ERROR_INVALID_PARAMETER; + } + LsaNames[0].Buffer = Name; - LsaNames[0].Length = wcslen(Name) * sizeof(WCHAR); + LsaNames[0].Length = (USHORT)NameLength * sizeof(WCHAR); LsaNames[0].MaximumLength = LsaNames[0].Length + sizeof(WCHAR); Status = LsaLookupNames2(PolicyHandle, diff --git a/dll/win32/shell32/CShellLink.cpp b/dll/win32/shell32/CShellLink.cpp index cd5d74e2c3f..5fc8ab41867 100644 --- a/dll/win32/shell32/CShellLink.cpp +++ b/dll/win32/shell32/CShellLink.cpp @@ -784,16 +784,24 @@ HRESULT STDMETHODCALLTYPE CShellLink::Load(IStream *stm) */ static HRESULT Stream_WriteString(IStream* stm, LPCWSTR str) { - USHORT len = wcslen(str) + 1; // FIXME: Possible overflows? + SIZE_T length; + USHORT len; DWORD count; + length = wcslen(str) + 1; + if (length > MAXUSHORT) + { + return E_INVALIDARG; + } + + len = (USHORT)length; HRESULT hr = stm->Write(&len, sizeof(len), &count); if (FAILED(hr)) return hr; - len *= sizeof(WCHAR); + length *= sizeof(WCHAR); - hr = stm->Write(str, len, &count); + hr = stm->Write(str, (ULONG)length, &count); if (FAILED(hr)) return hr; diff --git a/dll/win32/shell32/folders/CPrinterFolder.cpp b/dll/win32/shell32/folders/CPrinterFolder.cpp index 83290cce1aa..0f437ea5cef 100644 --- a/dll/win32/shell32/folders/CPrinterFolder.cpp +++ b/dll/win32/shell32/folders/CPrinterFolder.cpp @@ -102,17 +102,25 @@ static LPITEMIDLIST _ILCreatePrinterItem(PRINTER_INFO_4W *pi) PIDLPrinterStruct * p; int size0 = (char*)&tmp.u.cprinter.szName - (char*)&tmp.u.cprinter; int size = size0; + SIZE_T cchPrinterName, cchServerName; + + cchPrinterName = wcslen(pi->pPrinterName); + cchServerName = wcslen(pi->pServerName); + if ((cchPrinterName + cchServerName) > (MAXUSHORT - 2)) + { + return NULL; + } tmp.type = 0x00; tmp.u.cprinter.dummy = 0xFF; if (pi->pPrinterName) - tmp.u.cprinter.offsServer = wcslen(pi->pPrinterName) + 1; + tmp.u.cprinter.offsServer = cchPrinterName + 1; else tmp.u.cprinter.offsServer = 1; size += tmp.u.cprinter.offsServer * sizeof(WCHAR); if (pi->pServerName) - size += (wcslen(pi->pServerName) + 1) * sizeof(WCHAR); + size += (cchServerName + 1) * sizeof(WCHAR); else size += sizeof(WCHAR); diff --git a/dll/win32/syssetup/security.c b/dll/win32/syssetup/security.c index 1a784edc5b5..bae8bf8660a 100644 --- a/dll/win32/syssetup/security.c +++ b/dll/win32/syssetup/security.c @@ -38,10 +38,20 @@ SetAccountsDomainSid( SAM_HANDLE DomainHandle = NULL; DOMAIN_NAME_INFORMATION DomainNameInfo; + SIZE_T DomainNameLength = 0; NTSTATUS Status; DPRINT("SYSSETUP: SetAccountsDomainSid\n"); + if (DomainName != NULL) + { + DomainNameLength = wcslen(DomainName); + if (DomainNameLength > UNICODE_STRING_MAX_CHARS) + { + return STATUS_INVALID_PARAMETER; + } + } + memset(&ObjectAttributes, 0, sizeof(LSA_OBJECT_ATTRIBUTES)); ObjectAttributes.Length = sizeof(LSA_OBJECT_ATTRIBUTES); @@ -69,7 +79,7 @@ SetAccountsDomainSid( else { Info.DomainName.Buffer = (LPWSTR)DomainName; - Info.DomainName.Length = wcslen(DomainName) * sizeof(WCHAR); + Info.DomainName.Length = DomainNameLength * sizeof(WCHAR); Info.DomainName.MaximumLength = Info.DomainName.Length + sizeof(WCHAR); } @@ -81,7 +91,7 @@ SetAccountsDomainSid( else { Info.DomainName.Buffer = (LPWSTR)DomainName; - Info.DomainName.Length = wcslen(DomainName) * sizeof(WCHAR); + Info.DomainName.Length = DomainNameLength * sizeof(WCHAR); Info.DomainName.MaximumLength = Info.DomainName.Length + sizeof(WCHAR); Info.DomainSid = DomainSid; } @@ -99,7 +109,7 @@ SetAccountsDomainSid( LsaClose(PolicyHandle); - DomainNameInfo.DomainName.Length = wcslen(DomainName) * sizeof(WCHAR); + DomainNameInfo.DomainName.Length = DomainNameLength * sizeof(WCHAR); DomainNameInfo.DomainName.MaximumLength = DomainNameInfo.DomainName.Length + sizeof(WCHAR); DomainNameInfo.DomainName.Buffer = (LPWSTR)DomainName; @@ -147,10 +157,20 @@ SetPrimaryDomain(LPCWSTR DomainName, POLICY_PRIMARY_DOMAIN_INFO Info; LSA_OBJECT_ATTRIBUTES ObjectAttributes; LSA_HANDLE PolicyHandle; + SIZE_T DomainNameLength = 0; NTSTATUS Status; DPRINT1("SYSSETUP: SetPrimaryDomain()\n"); + if (DomainName != NULL) + { + DomainNameLength = wcslen(DomainName); + if (DomainNameLength > UNICODE_STRING_MAX_CHARS) + { + return STATUS_INVALID_PARAMETER; + } + } + memset(&ObjectAttributes, 0, sizeof(LSA_OBJECT_ATTRIBUTES)); ObjectAttributes.Length = sizeof(LSA_OBJECT_ATTRIBUTES); @@ -178,7 +198,7 @@ SetPrimaryDomain(LPCWSTR DomainName, else { Info.Name.Buffer = (LPWSTR)DomainName; - Info.Name.Length = wcslen(DomainName) * sizeof(WCHAR); + Info.Name.Length = DomainNameLength * sizeof(WCHAR); Info.Name.MaximumLength = Info.Name.Length + sizeof(WCHAR); } @@ -190,7 +210,7 @@ SetPrimaryDomain(LPCWSTR DomainName, else { Info.Name.Buffer = (LPWSTR)DomainName; - Info.Name.Length = wcslen(DomainName) * sizeof(WCHAR); + Info.Name.Length = DomainNameLength * sizeof(WCHAR); Info.Name.MaximumLength = Info.Name.Length + sizeof(WCHAR); Info.Sid = DomainSid; } @@ -1251,6 +1271,8 @@ SetNewAccountName( if (dwLength == 0) return; + ASSERT(dwLength <= UNICODE_STRING_MAX_CHARS); + pszName = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwLength * sizeof(WCHAR)); if (pszName == NULL) { @@ -1280,7 +1302,7 @@ SetNewAccountName( goto done; } - NameInfo.UserName.Length = wcslen(pszName) * sizeof(WCHAR); + NameInfo.UserName.Length = (USHORT)wcslen(pszName) * sizeof(WCHAR); NameInfo.UserName.MaximumLength = NameInfo.UserName.Length + sizeof(WCHAR); NameInfo.UserName.Buffer = pszName; NameInfo.FullName.Length = 0; diff --git a/drivers/filesystems/fastfat_new/fatstruc.h b/drivers/filesystems/fastfat_new/fatstruc.h index ccf6572d0b0..d12721febbe 100644 --- a/drivers/filesystems/fastfat_new/fatstruc.h +++ b/drivers/filesystems/fastfat_new/fatstruc.h @@ -20,6 +20,7 @@ Abstract: typedef PVOID PBCB; //**** Bcb's are now part of the cache module #ifdef __REACTOS__ +#undef __volatile #define __volatile volatile #endif diff --git a/drivers/filesystems/npfs/main.c b/drivers/filesystems/npfs/main.c index 7aeff7767a0..13b94bada0d 100644 --- a/drivers/filesystems/npfs/main.c +++ b/drivers/filesystems/npfs/main.c @@ -42,7 +42,7 @@ NpReadAlias( { PNPFS_QUERY_VALUE_CONTEXT QueryContext = Context; PWSTR CurrentString; - USHORT Length; + SIZE_T Length; PNPFS_ALIAS CurrentAlias; UNICODE_STRING TempString; PUNICODE_STRING CurrentTargetName; diff --git a/drivers/input/kbdclass/kbdclass.c b/drivers/input/kbdclass/kbdclass.c index 8ed1b68f5c8..86f354c3240 100644 --- a/drivers/input/kbdclass/kbdclass.c +++ b/drivers/input/kbdclass/kbdclass.c @@ -4,7 +4,7 @@ * FILE: drivers/kbdclass/kbdclass.c * PURPOSE: Keyboard class driver * - * PROGRAMMERS: Herv� Poussineau (hpoussin(a)reactos.org) + * PROGRAMMERS: Hervé Poussineau (hpoussin(a)reactos.org) */ #include "kbdclass.h" @@ -321,7 +321,7 @@ CreateClassDeviceObject( DriverExtension = IoGetDriverObjectExtension(DriverObject, DriverObject); DeviceNameU.Length = 0; DeviceNameU.MaximumLength = - wcslen(L"\\Device\\") * sizeof(WCHAR) /* "\Device\" */ + (USHORT)wcslen(L"\\Device\\") * sizeof(WCHAR) /* "\Device\" */ + DriverExtension->DeviceBaseName.Length /* "KeyboardClass" */ + 4 * sizeof(WCHAR) /* Id between 0 and 9999 */ + sizeof(UNICODE_NULL); /* Final NULL char */ diff --git a/drivers/input/mouclass/mouclass.c b/drivers/input/mouclass/mouclass.c index c12ecd5dd65..dc694b4f9c3 100644 --- a/drivers/input/mouclass/mouclass.c +++ b/drivers/input/mouclass/mouclass.c @@ -4,7 +4,7 @@ * FILE: drivers/mouclass/mouclass.c * PURPOSE: Mouse class driver * - * PROGRAMMERS: Herv� Poussineau (hpoussin(a)reactos.org) + * PROGRAMMERS: Hervé Poussineau (hpoussin(a)reactos.org) */ #include "mouclass.h" @@ -297,7 +297,7 @@ CreateClassDeviceObject( DriverExtension = IoGetDriverObjectExtension(DriverObject, DriverObject); DeviceNameU.Length = 0; DeviceNameU.MaximumLength = - wcslen(L"\\Device\\") * sizeof(WCHAR) /* "\Device\" */ + (USHORT)wcslen(L"\\Device\\") * sizeof(WCHAR) /* "\Device\" */ + DriverExtension->DeviceBaseName.Length /* "PointerClass" */ + 4 * sizeof(WCHAR) /* Id between 0 and 9999 */ + sizeof(UNICODE_NULL); /* Final NULL char */ diff --git a/drivers/storage/floppy/floppy/ioctl.c b/drivers/storage/floppy/floppy/ioctl.c index e6073a95299..11875e51838 100644 --- a/drivers/storage/floppy/floppy/ioctl.c +++ b/drivers/storage/floppy/floppy/ioctl.c @@ -266,7 +266,7 @@ DeviceIoctlPassive(PDRIVE_INFO DriveInfo, PIRP Irp) } UniqueId = Irp->AssociatedIrp.SystemBuffer; - UniqueId->UniqueIdLength = wcslen(&DriveInfo->DeviceNameBuffer[0]) * sizeof(WCHAR); + UniqueId->UniqueIdLength = (USHORT)wcslen(&DriveInfo->DeviceNameBuffer[0]) * sizeof(WCHAR); if(OutputLength < FIELD_OFFSET(MOUNTDEV_UNIQUE_ID, UniqueId) + UniqueId->UniqueIdLength) { @@ -291,7 +291,7 @@ DeviceIoctlPassive(PDRIVE_INFO DriveInfo, PIRP Irp) } Name = Irp->AssociatedIrp.SystemBuffer; - Name->NameLength = wcslen(&DriveInfo->DeviceNameBuffer[0]) * sizeof(WCHAR); + Name->NameLength = (USHORT)wcslen(&DriveInfo->DeviceNameBuffer[0]) * sizeof(WCHAR); if(OutputLength < FIELD_OFFSET(MOUNTDEV_NAME, Name) + Name->NameLength) { diff --git a/modules/rosapps/applications/explorer-old/shell/ntobjfs.cpp b/modules/rosapps/applications/explorer-old/shell/ntobjfs.cpp index ee6fd12d25d..fa75e065d6f 100644 --- a/modules/rosapps/applications/explorer-old/shell/ntobjfs.cpp +++ b/modules/rosapps/applications/explorer-old/shell/ntobjfs.cpp @@ -140,7 +140,7 @@ struct UnicodeString : public RtlUnicodeString { UnicodeString(size_t len, LPWSTR buffer) { - alloc_len = len; + alloc_len = (WORD)len; string_ptr = buffer; } diff --git a/modules/rosapps/applications/fraginator/Unfrag.cpp b/modules/rosapps/applications/fraginator/Unfrag.cpp index 0675021501b..4ea5a97f9e1 100644 --- a/modules/rosapps/applications/fraginator/Unfrag.cpp +++ b/modules/rosapps/applications/fraginator/Unfrag.cpp @@ -233,7 +233,7 @@ extern "C" int wmain (int argc, wchar_t **argv) // Now set back to the beginning ScreenInfo.dwCursorPosition.X = 0; - ScreenInfo.dwCursorPosition.Y -= Drives.size(); + ScreenInfo.dwCursorPosition.Y -= (USHORT)Drives.size(); SetConsoleCursorPosition (Screen, ScreenInfo.dwCursorPosition); for (size_t d = 0; d < Drives.size (); d++) diff --git a/modules/rosapps/applications/net/netreg/netreg.cpp b/modules/rosapps/applications/net/netreg/netreg.cpp index 35f0221698e..38145870194 100644 --- a/modules/rosapps/applications/net/netreg/netreg.cpp +++ b/modules/rosapps/applications/net/netreg/netreg.cpp @@ -182,10 +182,10 @@ private: } string present_value( DWORD type, const char *data, DWORD len ) { - switch( type ) { - default: + //switch( type ) { + //default: return bindump( data, len ); - } + //} } void process_valid_request( HKEY open_reg_key, string key_name ) { diff --git a/modules/rosapps/applications/net/roshttpd/include/httpd.h b/modules/rosapps/applications/net/roshttpd/include/httpd.h index ff85940c837..41a273f73ee 100644 --- a/modules/rosapps/applications/net/roshttpd/include/httpd.h +++ b/modules/rosapps/applications/net/roshttpd/include/httpd.h @@ -67,7 +67,7 @@ public: virtual BOOL Stop(); virtual LPCServerClientSocket OnGetSocket(LPCServerSocket lpServerSocket); virtual LPCServerClientThread OnGetThread(LPCServerClientSocket Socket); - virtual void OnAccept(const LPCServerClientThread lpThread); + virtual void OnAccept(LPCServerClientThread lpThread); private: HTTPdState State; }; diff --git a/modules/rosapps/applications/notevil/notevil.c b/modules/rosapps/applications/notevil/notevil.c index 8c9cdce4cd6..1859d936cb1 100644 --- a/modules/rosapps/applications/notevil/notevil.c +++ b/modules/rosapps/applications/notevil/notevil.c @@ -44,25 +44,25 @@ WriteStringAt(LPWSTR lpString, WORD wColor) { DWORD cWritten = 0; - WORD wLen; + DWORD dwLen; if (!lpString || *lpString == 0) return; - wLen = wcslen(lpString); + dwLen = (DWORD)wcslen(lpString); /* Don't bother writing text when erasing */ if (wColor) { WriteConsoleOutputCharacterW(ScreenBuffer, lpString, - wLen, + dwLen, xy, &cWritten); } FillConsoleOutputAttribute(ScreenBuffer, wColor, - wLen, + dwLen, xy, &cWritten); } @@ -103,7 +103,7 @@ DisplayTitle(VOID) LPWSTR szTitle = L"ReactOS Coders Console Parade"; COORD xy; - xy.X = (ScreenBufferInfo.dwSize.X - wcslen(szTitle)) / 2; + xy.X = (ScreenBufferInfo.dwSize.X - (USHORT)wcslen(szTitle)) / 2; xy.Y = ScreenBufferInfo.dwSize.Y / 2; WriteStringAt(szTitle, xy, diff --git a/modules/rosapps/applications/screensavers/cylfrac/cylfrac.c b/modules/rosapps/applications/screensavers/cylfrac/cylfrac.c index be0bb417d24..d2f2326a425 100644 --- a/modules/rosapps/applications/screensavers/cylfrac/cylfrac.c +++ b/modules/rosapps/applications/screensavers/cylfrac/cylfrac.c @@ -106,8 +106,8 @@ void DrawScene(HWND hwnd, HDC dc, int ticks) angle += ticks * 0.01; colorh += ticks * 0.003; if (colorh > 360.0) colorh -= 360.0; - HLStoRGB(colorh, 1.0, 0.7, &rval, &gval, &bval); - DrawCylinder(lvls, angle, 0.2); + HLStoRGB(colorh, 1.0f, 0.7f, &rval, &gval, &bval); + DrawCylinder(lvls, angle, 0.2f); SwapBuffers(dc); EndPaint(hwnd, &ps); } @@ -134,7 +134,7 @@ void MyPixelFormat(HDC dc) void InitGL(HWND hwnd) { - GLfloat lightpos[4] = {2.0, 2.0, -2.0, 0.7}; + GLfloat lightpos[4] = {2.0f, 2.0f, -2.0f, 0.7f}; GLfloat ca = 1.0; dc = GetDC(hwnd); MyPixelFormat(dc); diff --git a/modules/rostests/apitests/atl/SubclassWindow.cpp b/modules/rostests/apitests/atl/SubclassWindow.cpp index 14b114ea44d..51a99053a4f 100644 --- a/modules/rostests/apitests/atl/SubclassWindow.cpp +++ b/modules/rostests/apitests/atl/SubclassWindow.cpp @@ -8,6 +8,7 @@ #ifdef HAVE_APITEST #include <apitest.h> #define ATLASSUME(x) /*empty*/ + #undef ATLASSERT #define ATLASSERT(x) /*empty*/ #else #include "atltest.h" diff --git a/sdk/include/ddk/acpiioct.h b/sdk/include/ddk/acpiioct.h index c5bb6d6294e..cb10a4dbf20 100644 --- a/sdk/include/ddk/acpiioct.h +++ b/sdk/include/ddk/acpiioct.h @@ -159,7 +159,7 @@ typedef ACPI_ENUM_CHILDREN_OUTPUT_BUFFER UNALIGNED *PACPI_ENUM_CHILDREN_OUTPUT_B #define ACPI_METHOD_SET_ARGUMENT_STRING( Argument, StrData ) \ { Argument->Type = ACPI_METHOD_ARGUMENT_STRING; \ - Argument->DataLength = strlen((PCHAR)StrData) + sizeof(UCHAR); \ + Argument->DataLength = (USHORT)strlen((PCHAR)StrData) + sizeof(UCHAR); \ RtlCopyMemory(&Argument->Data[0],(PUCHAR)StrData,Argument->DataLength); } #define ACPI_METHOD_SET_ARGUMENT_BUFFER( Argument, BuffData, BuffLength ) \ diff --git a/sdk/include/psdk/intsafe.h b/sdk/include/psdk/intsafe.h index 6404ed33663..6e78f6b0e89 100644 --- a/sdk/include/psdk/intsafe.h +++ b/sdk/include/psdk/intsafe.h @@ -46,9 +46,11 @@ typedef _Return_type_success_(return >= 0) long NTSTATUS; #ifndef _HRESULT_DEFINED typedef _Return_type_success_(return >= 0) long HRESULT; #endif +#ifndef SUCCEEDED #define SUCCEEDED(hr) (((HRESULT)(hr)) >= 0) #define FAILED(hr) (((HRESULT)(hr)) < 0) #define S_OK ((HRESULT)0L) +#endif #define INTSAFE_RESULT HRESULT #define INTSAFE_SUCCESS S_OK #define INTSAFE_E_ARITHMETIC_OVERFLOW ((HRESULT)0x80070216L) diff --git a/sdk/lib/crt/string/wtoi64.c b/sdk/lib/crt/string/wtoi64.c index 15a4bae0225..59409933c95 100644 --- a/sdk/lib/crt/string/wtoi64.c +++ b/sdk/lib/crt/string/wtoi64.c @@ -6,7 +6,7 @@ */ __int64 CDECL _wtoi64_l(const wchar_t *str, _locale_t locale) { - ULONGLONG RunningTotal = 0; + LONGLONG RunningTotal = 0; BOOL bMinus = FALSE; while (iswctype((int)*str, _SPACE)) { @@ -191,7 +191,7 @@ unsigned __int64 CDECL _wcstoui64_l(const wchar_t *nptr, if(endptr) *endptr = (wchar_t*)nptr; - return negative ? -ret : ret; + return negative ? -(__int64)ret : ret; } /********************************************************************* diff --git a/sdk/lib/drivers/ip/network/loopback.c b/sdk/lib/drivers/ip/network/loopback.c index c859ac7d2a8..815abebb05b 100644 --- a/sdk/lib/drivers/ip/network/loopback.c +++ b/sdk/lib/drivers/ip/network/loopback.c @@ -124,7 +124,7 @@ NDIS_STATUS LoopRegisterAdapter( Loopback->Name.Buffer = L"Loopback"; Loopback->Name.MaximumLength = Loopback->Name.Length = - wcslen(Loopback->Name.Buffer) * sizeof(WCHAR); + (USHORT)wcslen(Loopback->Name.Buffer) * sizeof(WCHAR); AddrInitIPv4(&Loopback->Unicast, LOOPBACK_ADDRESS_IPv4); AddrInitIPv4(&Loopback->Netmask, LOOPBACK_ADDRMASK_IPv4); diff --git a/subsystems/mvdm/ntvdm/dos/dem.c b/subsystems/mvdm/ntvdm/dos/dem.c index d1edc10d2fe..dcb78174d06 100644 --- a/subsystems/mvdm/ntvdm/dos/dem.c +++ b/subsystems/mvdm/ntvdm/dos/dem.c @@ -1131,7 +1131,7 @@ static VOID WINAPI DosInitialize(LPWORD Stack) /* Get the DOS BIOS file name (NULL-terminated) */ // FIXME: Isn't it possible to use some DS:SI instead?? LPCSTR DosBiosFileName = (LPCSTR)SEG_OFF_TO_PTR(getCS(), getIP()); - setIP(getIP() + strlen(DosBiosFileName) + 1); // Skip it + setIP(getIP() + (USHORT)strlen(DosBiosFileName) + 1); // Skip it DPRINT("DosInitialize('%s')\n", DosBiosFileName); diff --git a/win32ss/printing/providers/localspl/tools.c b/win32ss/printing/providers/localspl/tools.c index 764877d664e..e5920721719 100644 --- a/win32ss/printing/providers/localspl/tools.c +++ b/win32ss/printing/providers/localspl/tools.c @@ -109,7 +109,7 @@ LONG copy_servername_from_name(LPCWSTR name, LPWSTR target) FIXME("found %s\n", debugstr_wn(server, serverlen)); - if (serverlen > MAX_COMPUTERNAME_LENGTH) return -serverlen; + if (serverlen > MAX_COMPUTERNAME_LENGTH) return -(LONG)serverlen; if (target) { diff --git a/win32ss/user/user32/windows/class.c b/win32ss/user/user32/windows/class.c index 0acf11b4b40..3602c2c1d72 100644 --- a/win32ss/user/user32/windows/class.c +++ b/win32ss/user/user32/windows/class.c @@ -111,7 +111,7 @@ ClassNameToVersion( ERR("Couldn't get atom name for atom %x !\n", LOWORD((DWORD_PTR)lpszClass)); return NULL; } - SectionName.Length = wcslen(SectionNameBuf) * sizeof(WCHAR); + SectionName.Length = (USHORT)wcslen(SectionNameBuf) * sizeof(WCHAR); TRACE("ClassNameToVersion got name %wZ from atom\n", &SectionName); } else

3 years, 5 months

[reactos] 02/05: [USETUP] Fix invalid use of character count instead of byte count

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b1c6c91d1f93f4bdf5455… commit b1c6c91d1f93f4bdf5455895736b6055047c2cd4 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Wed Jul 21 10:26:42 2021 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Fri Jul 23 22:03:48 2021 +0200 [USETUP] Fix invalid use of character count instead of byte count --- base/setup/usetup/spapisup/cabinet.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/base/setup/usetup/spapisup/cabinet.c b/base/setup/usetup/spapisup/cabinet.c index 8d8391a3250..46ae4e5d5d5 100644 --- a/base/setup/usetup/spapisup/cabinet.c +++ b/base/setup/usetup/spapisup/cabinet.c @@ -628,6 +628,7 @@ CabinetOpen( OBJECT_ATTRIBUTES ObjectAttributes; IO_STATUS_BLOCK IoStatusBlock; UNICODE_STRING FileName; + USHORT StringLength; NTSTATUS NtStatus; if (CabinetContext->FileOpen) @@ -732,11 +733,14 @@ CabinetOpen( the same directory as the current */ wcscpy(CabinetContext->CabinetPrev, CabinetContext->CabinetName); RemoveFileName(CabinetContext->CabinetPrev); - CabinetNormalizePath(CabinetContext->CabinetPrev, 256); + CabinetNormalizePath(CabinetContext->CabinetPrev, sizeof(CabinetContext->CabinetPrev)); RtlInitAnsiString(&astring, (LPSTR)Buffer); - ustring.Length = wcslen(CabinetContext->CabinetPrev); - ustring.Buffer = CabinetContext->CabinetPrev + ustring.Length; - ustring.MaximumLength = sizeof(CabinetContext->CabinetPrev) - ustring.Length; + + /* Initialize ustring with the remaining buffer */ + StringLength = (USHORT)wcslen(CabinetContext->CabinetPrev) * sizeof(WCHAR); + ustring.Buffer = CabinetContext->CabinetPrev + StringLength; + ustring.MaximumLength = sizeof(CabinetContext->CabinetPrev) - StringLength; + ustring.Length = 0; RtlAnsiStringToUnicodeString(&ustring, &astring, FALSE); Buffer += astring.Length + 1; @@ -762,9 +766,12 @@ CabinetOpen( RemoveFileName(CabinetContext->CabinetNext); CabinetNormalizePath(CabinetContext->CabinetNext, 256); RtlInitAnsiString(&astring, (LPSTR)Buffer); - ustring.Length = wcslen(CabinetContext->CabinetNext); - ustring.Buffer = CabinetContext->CabinetNext + ustring.Length; - ustring.MaximumLength = sizeof(CabinetContext->CabinetNext) - ustring.Length; + + /* Initialize ustring with the remaining buffer */ + StringLength = (USHORT)wcslen(CabinetContext->CabinetNext) * sizeof(WCHAR); + ustring.Buffer = CabinetContext->CabinetNext + StringLength; + ustring.MaximumLength = sizeof(CabinetContext->CabinetNext) - StringLength; + ustring.Length = 0; RtlAnsiStringToUnicodeString(&ustring, &astring, FALSE); Buffer += astring.Length + 1;

3 years, 5 months

[reactos] 01/05: [PSDK][NDK] Use hex to define MIN/MAX constants like in native SDK

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a3763c61dcd579798bd15… commit a3763c61dcd579798bd1548c6e82091fa94b91df Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Tue Jun 29 10:57:43 2021 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Fri Jul 23 22:03:48 2021 +0200 [PSDK][NDK] Use hex to define MIN/MAX constants like in native SDK This fixes use of unary minus operator on unsigned type warning. --- ntoskrnl/ke/wait.c | 2 +- sdk/include/ndk/umtypes.h | 12 ++++++------ sdk/include/xdk/ntbasedef.h | 12 ++++++------ 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/ntoskrnl/ke/wait.c b/ntoskrnl/ke/wait.c index 26869fdd7de..bc9b4e3115b 100644 --- a/ntoskrnl/ke/wait.c +++ b/ntoskrnl/ke/wait.c @@ -470,7 +470,7 @@ KeWaitForSingleObject(IN PVOID Object, (Thread == CurrentObject->OwnerThread)) { /* Just unwait this guy and exit */ - if (CurrentObject->Header.SignalState != (LONG)MINLONG) + if (CurrentObject->Header.SignalState != MINLONG) { /* It has a normal signal state. Unwait and return */ KiSatisfyMutantWait(CurrentObject, Thread); diff --git a/sdk/include/ndk/umtypes.h b/sdk/include/ndk/umtypes.h index 82b32eae971..3037151b6b0 100644 --- a/sdk/include/ndk/umtypes.h +++ b/sdk/include/ndk/umtypes.h @@ -108,12 +108,12 @@ Author: // // Limits // -#define MINCHAR (-128) -#define MAXCHAR 127 -#define MINSHORT (-32768) -#define MAXSHORT 32767 -#define MINLONG (-2147483648) -#define MAXLONG 2147483647 +#define MINCHAR 0x80 +#define MAXCHAR 0x7f +#define MINSHORT 0x8000 +#define MAXSHORT 0x7fff +#define MINLONG 0x80000000 +#define MAXLONG 0x7fffffff #define MAXUCHAR 0xff #define MAXUSHORT 0xffff #define MAXULONG 0xffffffff diff --git a/sdk/include/xdk/ntbasedef.h b/sdk/include/xdk/ntbasedef.h index 204d3164eaf..0071d7352e9 100644 --- a/sdk/include/xdk/ntbasedef.h +++ b/sdk/include/xdk/ntbasedef.h @@ -735,12 +735,12 @@ extern "C++" { \ #define COMPILETIME_OR_5FLAGS(a,b,c,d,e) ((UINT)(a)|(UINT)(b)|(UINT)(c)|(UINT)(d)|(UINT)(e)) /* Type Limits */ -#define MINCHAR (-128) -#define MAXCHAR 127 -#define MINSHORT (-32768) -#define MAXSHORT 32767 -#define MINLONG (-2147483648) -#define MAXLONG 2147483647 +#define MINCHAR 0x80 +#define MAXCHAR 0x7f +#define MINSHORT 0x8000 +#define MAXSHORT 0x7fff +#define MINLONG 0x80000000 +#define MAXLONG 0x7fffffff $if(_NTDEF_) #define MAXUCHAR 0xff #define MAXUSHORT 0xffff

3 years, 5 months

[reactos] 01/01: [KMTESTS:NTOS_IO] Fix check of spinlocks in case of checked builds

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2289deb8497c6022fbb20… commit 2289deb8497c6022fbb2044a818fbdb826ed5a1b Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Fri Jul 23 17:38:22 2021 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Fri Jul 23 17:40:57 2021 +0200 [KMTESTS:NTOS_IO] Fix check of spinlocks in case of checked builds Down back to zero failures --- modules/rostests/kmtests/ntos_io/IoInterrupt.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/rostests/kmtests/ntos_io/IoInterrupt.c b/modules/rostests/kmtests/ntos_io/IoInterrupt.c index 4184e16dfdf..6003384789e 100644 --- a/modules/rostests/kmtests/ntos_io/IoInterrupt.c +++ b/modules/rostests/kmtests/ntos_io/IoInterrupt.c @@ -14,6 +14,8 @@ { \ if (KmtIsMultiProcessorBuild) \ ok_eq_ulongptr(*(Lock), (Locked) != 0); \ + else if (KmtIsCheckedBuild) \ + ok_eq_bool(*(Lock) != 0, (Locked) != 0); \ else \ ok_eq_ulongptr(*(Lock), 0); \ } while (0)

3 years, 5 months

[reactos] 01/01: [EVENTVWR] Update other languages RCs also CORE-17699

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=59e1b7848ba4731162e16… commit 59e1b7848ba4731162e16aa2424d91854ffa78cd Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Fri Jul 23 01:37:17 2021 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Fri Jul 23 01:37:17 2021 +0200 [EVENTVWR] Update other languages RCs also CORE-17699 Use a capital letter for the /L parameter because the Shells default font in the help dialog makes a small L look like a small I. MS also often does use that trick to differentiate. --- base/applications/mscutils/eventvwr/lang/bg-BG.rc | 4 ++-- base/applications/mscutils/eventvwr/lang/cs-CZ.rc | 4 ++-- base/applications/mscutils/eventvwr/lang/el-GR.rc | 4 ++-- base/applications/mscutils/eventvwr/lang/en-US.rc | 4 ++-- base/applications/mscutils/eventvwr/lang/es-ES.rc | 4 ++-- base/applications/mscutils/eventvwr/lang/fr-FR.rc | 4 ++-- base/applications/mscutils/eventvwr/lang/he-IL.rc | 4 ++-- base/applications/mscutils/eventvwr/lang/it-IT.rc | 4 ++-- base/applications/mscutils/eventvwr/lang/ja-JP.rc | 4 ++-- base/applications/mscutils/eventvwr/lang/ko-KR.rc | 4 ++-- base/applications/mscutils/eventvwr/lang/no-NO.rc | 4 ++-- base/applications/mscutils/eventvwr/lang/pl-PL.rc | 4 ++-- base/applications/mscutils/eventvwr/lang/pt-BR.rc | 4 ++-- base/applications/mscutils/eventvwr/lang/pt-PT.rc | 4 ++-- base/applications/mscutils/eventvwr/lang/ro-RO.rc | 4 ++-- base/applications/mscutils/eventvwr/lang/ru-RU.rc | 4 ++-- base/applications/mscutils/eventvwr/lang/sk-SK.rc | 4 ++-- base/applications/mscutils/eventvwr/lang/sq-AL.rc | 4 ++-- base/applications/mscutils/eventvwr/lang/sv-SE.rc | 4 ++-- base/applications/mscutils/eventvwr/lang/tr-TR.rc | 4 ++-- base/applications/mscutils/eventvwr/lang/uk-UA.rc | 4 ++-- base/applications/mscutils/eventvwr/lang/zh-CN.rc | 4 ++-- base/applications/mscutils/eventvwr/lang/zh-TW.rc | 4 ++-- 23 files changed, 46 insertions(+), 46 deletions(-) diff --git a/base/applications/mscutils/eventvwr/lang/bg-BG.rc b/base/applications/mscutils/eventvwr/lang/bg-BG.rc index 8c0f17dcb8c..49f505a37f9 100644 --- a/base/applications/mscutils/eventvwr/lang/bg-BG.rc +++ b/base/applications/mscutils/eventvwr/lang/bg-BG.rc @@ -164,13 +164,13 @@ BEGIN /* Please note that explicit TAB characters '\t' are used to fix the alignment of the message in the MessageBox */ IDS_USAGE "ReactOS Event Viewer\n\ \n\ -EventVwr [computer name] [/l:<event log file>] [/?]\n\ +EventVwr [computer name] [/L:<event log file>] [/?]\n\ \n\ ""computer name"" : Specifies the remote computer where to connect\n\ \tto retrieve the events to display. If no name is specified, the\n\ \tlocal computer is used.\n\ \n\ -/l:<event log file> : Specifies which event log file to open.\n\ +/L:<event log file> : Specifies which event log file to open.\n\ \tOnly files in the .evt format (NT ≤ 5.2) are supported.\n\ \n\ /? : Displays this help message.\n\ diff --git a/base/applications/mscutils/eventvwr/lang/cs-CZ.rc b/base/applications/mscutils/eventvwr/lang/cs-CZ.rc index d81bdeb866e..c1cf32d9c0e 100644 --- a/base/applications/mscutils/eventvwr/lang/cs-CZ.rc +++ b/base/applications/mscutils/eventvwr/lang/cs-CZ.rc @@ -164,13 +164,13 @@ BEGIN /* Please note that explicit TAB characters '\t' are used to fix the alignment of the message in the MessageBox */ IDS_USAGE "ReactOS Event Viewer\n\ \n\ -EventVwr [computer name] [/l:<event log file>] [/?]\n\ +EventVwr [computer name] [/L:<event log file>] [/?]\n\ \n\ ""computer name"" : Specifies the remote computer where to connect\n\ \tto retrieve the events to display. If no name is specified, the\n\ \tlocal computer is used.\n\ \n\ -/l:<event log file> : Specifies which event log file to open.\n\ +/L:<event log file> : Specifies which event log file to open.\n\ \tOnly files in the .evt format (NT ≤ 5.2) are supported.\n\ \n\ /? : Displays this help message.\n\ diff --git a/base/applications/mscutils/eventvwr/lang/el-GR.rc b/base/applications/mscutils/eventvwr/lang/el-GR.rc index 7a3f50ade65..98c06eaf73f 100644 --- a/base/applications/mscutils/eventvwr/lang/el-GR.rc +++ b/base/applications/mscutils/eventvwr/lang/el-GR.rc @@ -166,13 +166,13 @@ BEGIN /* Please note that explicit TAB characters '\t' are used to fix the alignment of the message in the MessageBox */ IDS_USAGE "ReactOS Event Viewer\n\ \n\ -EventVwr [computer name] [/l:<event log file>] [/?]\n\ +EventVwr [computer name] [/L:<event log file>] [/?]\n\ \n\ ""computer name"" : Specifies the remote computer where to connect\n\ \tto retrieve the events to display. If no name is specified, the\n\ \tlocal computer is used.\n\ \n\ -/l:<event log file> : Specifies which event log file to open.\n\ +/L:<event log file> : Specifies which event log file to open.\n\ \tOnly files in the .evt format (NT ≤ 5.2) are supported.\n\ \n\ /? : Displays this help message.\n\ diff --git a/base/applications/mscutils/eventvwr/lang/en-US.rc b/base/applications/mscutils/eventvwr/lang/en-US.rc index 7c0ab9ad289..f665eb9f00d 100644 --- a/base/applications/mscutils/eventvwr/lang/en-US.rc +++ b/base/applications/mscutils/eventvwr/lang/en-US.rc @@ -172,13 +172,13 @@ BEGIN /* Please note that explicit TAB characters '\t' are used to fix the alignment of the message in the MessageBox */ IDS_USAGE "ReactOS Event Viewer\n\ \n\ -EventVwr [computer name] [/l:<event log file>] [/?]\n\ +EventVwr [computer name] [/L:<event log file>] [/?]\n\ \n\ ""computer name"" : Specifies the remote computer where to connect\n\ \tto retrieve the events to display. If no name is specified, the\n\ \tlocal computer is used.\n\ \n\ -/l:<event log file> : Specifies which event log file to open.\n\ +/L:<event log file> : Specifies which event log file to open.\n\ \tOnly files in the .evt format (NT ≤ 5.2) are supported.\n\ \n\ /? : Displays this help message.\n\ diff --git a/base/applications/mscutils/eventvwr/lang/es-ES.rc b/base/applications/mscutils/eventvwr/lang/es-ES.rc index 61b25f5f5a6..4efb08fed21 100644 --- a/base/applications/mscutils/eventvwr/lang/es-ES.rc +++ b/base/applications/mscutils/eventvwr/lang/es-ES.rc @@ -166,13 +166,13 @@ BEGIN /* Please note that explicit TAB characters '\t' are used to fix the alignment of the message in the MessageBox */ IDS_USAGE "ReactOS Event Viewer\n\ \n\ -EventVwr [computer name] [/l:<event log file>] [/?]\n\ +EventVwr [computer name] [/L:<event log file>] [/?]\n\ \n\ ""computer name"" : Specifies the remote computer where to connect\n\ \tto retrieve the events to display. If no name is specified, the\n\ \tlocal computer is used.\n\ \n\ -/l:<event log file> : Specifies which event log file to open.\n\ +/L:<event log file> : Specifies which event log file to open.\n\ \tOnly files in the .evt format (NT ≤ 5.2) are supported.\n\ \n\ /? : Displays this help message.\n\ diff --git a/base/applications/mscutils/eventvwr/lang/fr-FR.rc b/base/applications/mscutils/eventvwr/lang/fr-FR.rc index 72ae329631f..b11cf16b5af 100644 --- a/base/applications/mscutils/eventvwr/lang/fr-FR.rc +++ b/base/applications/mscutils/eventvwr/lang/fr-FR.rc @@ -166,13 +166,13 @@ BEGIN /* Please note that explicit TAB characters '\t' are used to fix the alignment of the message in the MessageBox */ IDS_USAGE "Visionneuse d'événements ReactOS\n\ \n\ -EventVwr [nom ordinateur] [/l:<fichier journal>] [/?]\n\ +EventVwr [nom ordinateur] [/L:<fichier journal>] [/?]\n\ \n\ ""nom ordinateur"" : Spécifie l'ordinateur distant auquel se connecter\n\ \tpour récupérer les événements à afficher. Si aucun nom n'est spécifié,\n\ \tl'ordinateur local est utilisé.\n\ \n\ -/l:<fichier journal> : Spécifie quel fichier journal ouvrir.\n\ +/L:<fichier journal> : Spécifie quel fichier journal ouvrir.\n\ \tSeuls les fichiers au format .evt (NT ≤ 5.2) sont supportés.\n\ \n\ /? : Affiche ce message d'aide.\n\ diff --git a/base/applications/mscutils/eventvwr/lang/he-IL.rc b/base/applications/mscutils/eventvwr/lang/he-IL.rc index cc3aeafe816..557b3a77c79 100644 --- a/base/applications/mscutils/eventvwr/lang/he-IL.rc +++ b/base/applications/mscutils/eventvwr/lang/he-IL.rc @@ -166,13 +166,13 @@ BEGIN /* Please note that explicit TAB characters '\t' are used to fix the alignment of the message in the MessageBox */ IDS_USAGE "ReactOS Event Viewer\n\ \n\ -EventVwr [computer name] [/l:<event log file>] [/?]\n\ +EventVwr [computer name] [/L:<event log file>] [/?]\n\ \n\ ""computer name"" : Specifies the remote computer where to connect\n\ \tto retrieve the events to display. If no name is specified, the\n\ \tlocal computer is used.\n\ \n\ -/l:<event log file> : Specifies which event log file to open.\n\ +/L:<event log file> : Specifies which event log file to open.\n\ \tOnly files in the .evt format (NT ≤ 5.2) are supported.\n\ \n\ /? : Displays this help message.\n\ diff --git a/base/applications/mscutils/eventvwr/lang/it-IT.rc b/base/applications/mscutils/eventvwr/lang/it-IT.rc index 9ab86233288..3d49badbcff 100644 --- a/base/applications/mscutils/eventvwr/lang/it-IT.rc +++ b/base/applications/mscutils/eventvwr/lang/it-IT.rc @@ -166,13 +166,13 @@ BEGIN /* Please note that explicit TAB characters '\t' are used to fix the alignment of the message in the MessageBox */ IDS_USAGE "ReactOS Event Viewer\n\ \n\ -EventVwr [computer name] [/l:<event log file>] [/?]\n\ +EventVwr [computer name] [/L:<event log file>] [/?]\n\ \n\ ""computer name"" : Specifies the remote computer where to connect\n\ \tto retrieve the events to display. If no name is specified, the\n\ \tlocal computer is used.\n\ \n\ -/l:<event log file> : Specifies which event log file to open.\n\ +/L:<event log file> : Specifies which event log file to open.\n\ \tOnly files in the .evt format (NT ≤ 5.2) are supported.\n\ \n\ /? : Displays this help message.\n\ diff --git a/base/applications/mscutils/eventvwr/lang/ja-JP.rc b/base/applications/mscutils/eventvwr/lang/ja-JP.rc index 36b294476ee..e48481ba65b 100644 --- a/base/applications/mscutils/eventvwr/lang/ja-JP.rc +++ b/base/applications/mscutils/eventvwr/lang/ja-JP.rc @@ -166,13 +166,13 @@ BEGIN /* Please note that explicit TAB characters '\t' are used to fix the alignment of the message in the MessageBox */ IDS_USAGE "ReactOS Event Viewer\n\ \n\ -EventVwr [computer name] [/l:<event log file>] [/?]\n\ +EventVwr [computer name] [/L:<event log file>] [/?]\n\ \n\ ""computer name"" : Specifies the remote computer where to connect\n\ \tto retrieve the events to display. If no name is specified, the\n\ \tlocal computer is used.\n\ \n\ -/l:<event log file> : Specifies which event log file to open.\n\ +/L:<event log file> : Specifies which event log file to open.\n\ \tOnly files in the .evt format (NT ≤ 5.2) are supported.\n\ \n\ /? : Displays this help message.\n\ diff --git a/base/applications/mscutils/eventvwr/lang/ko-KR.rc b/base/applications/mscutils/eventvwr/lang/ko-KR.rc index fd59e816a82..583a450872c 100644 --- a/base/applications/mscutils/eventvwr/lang/ko-KR.rc +++ b/base/applications/mscutils/eventvwr/lang/ko-KR.rc @@ -166,13 +166,13 @@ BEGIN /* Please note that explicit TAB characters '\t' are used to fix the alignment of the message in the MessageBox */ IDS_USAGE "ReactOS Event Viewer\n\ \n\ -EventVwr [computer name] [/l:<event log file>] [/?]\n\ +EventVwr [computer name] [/L:<event log file>] [/?]\n\ \n\ ""computer name"" : Specifies the remote computer where to connect\n\ \tto retrieve the events to display. If no name is specified, the\n\ \tlocal computer is used.\n\ \n\ -/l:<event log file> : Specifies which event log file to open.\n\ +/L:<event log file> : Specifies which event log file to open.\n\ \tOnly files in the .evt format (NT ≤ 5.2) are supported.\n\ \n\ /? : Displays this help message.\n\ diff --git a/base/applications/mscutils/eventvwr/lang/no-NO.rc b/base/applications/mscutils/eventvwr/lang/no-NO.rc index 3d4c5510fc3..38e370bf3fb 100644 --- a/base/applications/mscutils/eventvwr/lang/no-NO.rc +++ b/base/applications/mscutils/eventvwr/lang/no-NO.rc @@ -164,13 +164,13 @@ BEGIN /* Please note that explicit TAB characters '\t' are used to fix the alignment of the message in the MessageBox */ IDS_USAGE "ReactOS Event Viewer\n\ \n\ -EventVwr [computer name] [/l:<event log file>] [/?]\n\ +EventVwr [computer name] [/L:<event log file>] [/?]\n\ \n\ ""computer name"" : Specifies the remote computer where to connect\n\ \tto retrieve the events to display. If no name is specified, the\n\ \tlocal computer is used.\n\ \n\ -/l:<event log file> : Specifies which event log file to open.\n\ +/L:<event log file> : Specifies which event log file to open.\n\ \tOnly files in the .evt format (NT ≤ 5.2) are supported.\n\ \n\ /? : Displays this help message.\n\ diff --git a/base/applications/mscutils/eventvwr/lang/pl-PL.rc b/base/applications/mscutils/eventvwr/lang/pl-PL.rc index d5776b7d000..b442a3a7260 100644 --- a/base/applications/mscutils/eventvwr/lang/pl-PL.rc +++ b/base/applications/mscutils/eventvwr/lang/pl-PL.rc @@ -168,13 +168,13 @@ BEGIN /* Please note that explicit TAB characters '\t' are used to fix the alignment of the message in the MessageBox */ IDS_USAGE "Podgląd zdarzeń ReactOS\n\ \n\ -EventVwr [nazwa komputera] [/l:<plik dziennika>] [/?]\n\ +EventVwr [nazwa komputera] [/L:<plik dziennika>] [/?]\n\ \n\ ""nazwa kopmutera"" : Określa komputer zdalny, z którym należy się połączyć,\n\ \taby otrzymać zdarzenia do wyświetlenia. Jeśli nazwa nie jest określona,\n\ \tzostanie użyty komputer lokalny.\n\ \n\ -/l:<plik dziennika> : Określa plik dziennika do otwarcia.\n\ +/L:<plik dziennika> : Określa plik dziennika do otwarcia.\n\ \tObsługiwane są tylko pliki w formacie .evt (NT ≤ 5.2).\n\ \n\ /? : Wyświetla tę pomoc/sposób użycia.\n\ diff --git a/base/applications/mscutils/eventvwr/lang/pt-BR.rc b/base/applications/mscutils/eventvwr/lang/pt-BR.rc index 0928635bbe0..9519a59a710 100644 --- a/base/applications/mscutils/eventvwr/lang/pt-BR.rc +++ b/base/applications/mscutils/eventvwr/lang/pt-BR.rc @@ -166,13 +166,13 @@ BEGIN /* Please note that explicit TAB characters '\t' are used to fix the alignment of the message in the MessageBox */ IDS_USAGE "ReactOS Event Viewer\n\ \n\ -EventVwr [computer name] [/l:<event log file>] [/?]\n\ +EventVwr [computer name] [/L:<event log file>] [/?]\n\ \n\ ""computer name"" : Specifies the remote computer where to connect\n\ \tto retrieve the events to display. If no name is specified, the\n\ \tlocal computer is used.\n\ \n\ -/l:<event log file> : Specifies which event log file to open.\n\ +/L:<event log file> : Specifies which event log file to open.\n\ \tOnly files in the .evt format (NT ≤ 5.2) are supported.\n\ \n\ /? : Displays this help message.\n\ diff --git a/base/applications/mscutils/eventvwr/lang/pt-PT.rc b/base/applications/mscutils/eventvwr/lang/pt-PT.rc index 5e5f06808a9..5b04e08b2cd 100644 --- a/base/applications/mscutils/eventvwr/lang/pt-PT.rc +++ b/base/applications/mscutils/eventvwr/lang/pt-PT.rc @@ -166,13 +166,13 @@ BEGIN /* Please note that explicit TAB characters '\t' are used to fix the alignment of the message in the MessageBox */ IDS_USAGE "Visualizador de eventos ReactOS\n\ \n\ -EventVwr [nome do computador] [/l:<event log file>] [/?]\n\ +EventVwr [nome do computador] [/L:<event log file>] [/?]\n\ \n\ ""nome do computador"" : Especifica o computador remoto a ligar\n\ \tpara obter os eventos a exibir. Se nenhum nome for especificado, será\n\ \tutilizado o computador local.\n\ \n\ -/l:<event log file> : Especifica o ficheiro de eventos a abrir.\n\ +/L:<event log file> : Especifica o ficheiro de eventos a abrir.\n\ \tSómente ficheiros no formato .evt (NT ≤ 5.2) é suportado.\n\ \n\ /? : Mostra esta mensagem de ajuda.\n\ diff --git a/base/applications/mscutils/eventvwr/lang/ro-RO.rc b/base/applications/mscutils/eventvwr/lang/ro-RO.rc index d58eef4cd48..249c2223fec 100644 --- a/base/applications/mscutils/eventvwr/lang/ro-RO.rc +++ b/base/applications/mscutils/eventvwr/lang/ro-RO.rc @@ -169,13 +169,13 @@ BEGIN /* Please note that explicit TAB characters '\t' are used to fix the alignment of the message in the MessageBox */ IDS_USAGE "Inspector de Evenimente ReactOS\n\ \n\ -EventVwr [nume calculator] [/l:<fișier jurnal de evenimente>] [/?]\n\ +EventVwr [nume calculator] [/L:<fișier jurnal de evenimente>] [/?]\n\ \n\ ""nume calculator"" : Specifică calculatorul la distanță de la care\n\ \tvor fi preluate evenimentele afișate. Dacă nu e furnizat un\n\ \tnume de calculator, va fi utilizat calculatorul local.\n\ \n\ -/l:<fișier jurnal de evenimente> : Specifică deschiderea unui fișier.\n\ +/L:<fișier jurnal de evenimente> : Specifică deschiderea unui fișier.\n\ \tSunt acceptate doar fișierele în format .evt (NT ≤ 5.2)\n\ \n\ /? : Afișează acest mesaj cu informații de utilizare.\n\ diff --git a/base/applications/mscutils/eventvwr/lang/ru-RU.rc b/base/applications/mscutils/eventvwr/lang/ru-RU.rc index 2707591fb6d..bb730cb644c 100644 --- a/base/applications/mscutils/eventvwr/lang/ru-RU.rc +++ b/base/applications/mscutils/eventvwr/lang/ru-RU.rc @@ -166,13 +166,13 @@ BEGIN /* Please note that explicit TAB characters '\t' are used to fix the alignment of the message in the MessageBox */ IDS_USAGE "ReactOS Event Viewer\n\ \n\ -EventVwr [computer name] [/l:<event log file>] [/?]\n\ +EventVwr [computer name] [/L:<event log file>] [/?]\n\ \n\ ""computer name"" : Specifies the remote computer where to connect\n\ \tto retrieve the events to display. If no name is specified, the\n\ \tlocal computer is used.\n\ \n\ -/l:<event log file> : Specifies which event log file to open.\n\ +/L:<event log file> : Specifies which event log file to open.\n\ \tOnly files in the .evt format (NT ≤ 5.2) are supported.\n\ \n\ /? : Displays this help message.\n\ diff --git a/base/applications/mscutils/eventvwr/lang/sk-SK.rc b/base/applications/mscutils/eventvwr/lang/sk-SK.rc index fd82f2a3224..5964bcc74ee 100644 --- a/base/applications/mscutils/eventvwr/lang/sk-SK.rc +++ b/base/applications/mscutils/eventvwr/lang/sk-SK.rc @@ -169,13 +169,13 @@ BEGIN /* Please note that explicit TAB characters '\t' are used to fix the alignment of the message in the MessageBox */ IDS_USAGE "ReactOS Event Viewer\n\ \n\ -EventVwr [computer name] [/l:<event log file>] [/?]\n\ +EventVwr [computer name] [/L:<event log file>] [/?]\n\ \n\ ""computer name"" : Specifies the remote computer where to connect\n\ \tto retrieve the events to display. If no name is specified, the\n\ \tlocal computer is used.\n\ \n\ -/l:<event log file> : Specifies which event log file to open.\n\ +/L:<event log file> : Specifies which event log file to open.\n\ \tOnly files in the .evt format (NT ≤ 5.2) are supported.\n\ \n\ /? : Displays this help message.\n\ diff --git a/base/applications/mscutils/eventvwr/lang/sq-AL.rc b/base/applications/mscutils/eventvwr/lang/sq-AL.rc index b15aa7a76a7..35248447b83 100644 --- a/base/applications/mscutils/eventvwr/lang/sq-AL.rc +++ b/base/applications/mscutils/eventvwr/lang/sq-AL.rc @@ -172,13 +172,13 @@ BEGIN /* Please note that explicit TAB characters '\t' are used to fix the alignment of the message in the MessageBox */ IDS_USAGE "ReactOS Event Viewer\n\ \n\ -EventVwr [computer name] [/l:<event log file>] [/?]\n\ +EventVwr [computer name] [/L:<event log file>] [/?]\n\ \n\ ""computer name"" : Specifies the remote computer where to connect\n\ \tto retrieve the events to display. If no name is specified, the\n\ \tlocal computer is used.\n\ \n\ -/l:<event log file> : Specifies which event log file to open.\n\ +/L:<event log file> : Specifies which event log file to open.\n\ \tOnly files in the .evt format (NT ≤ 5.2) are supported.\n\ \n\ /? : Displays this help message.\n\ diff --git a/base/applications/mscutils/eventvwr/lang/sv-SE.rc b/base/applications/mscutils/eventvwr/lang/sv-SE.rc index 8b49756f82c..18b2e2f9b5a 100644 --- a/base/applications/mscutils/eventvwr/lang/sv-SE.rc +++ b/base/applications/mscutils/eventvwr/lang/sv-SE.rc @@ -166,13 +166,13 @@ BEGIN /* Please note that explicit TAB characters '\t' are used to fix the alignment of the message in the MessageBox */ IDS_USAGE "ReactOS Event Viewer\n\ \n\ -EventVwr [computer name] [/l:<event log file>] [/?]\n\ +EventVwr [computer name] [/L:<event log file>] [/?]\n\ \n\ ""computer name"" : Specifies the remote computer where to connect\n\ \tto retrieve the events to display. If no name is specified, the\n\ \tlocal computer is used.\n\ \n\ -/l:<event log file> : Specifies which event log file to open.\n\ +/L:<event log file> : Specifies which event log file to open.\n\ \tOnly files in the .evt format (NT ≤ 5.2) are supported.\n\ \n\ /? : Displays this help message.\n\ diff --git a/base/applications/mscutils/eventvwr/lang/tr-TR.rc b/base/applications/mscutils/eventvwr/lang/tr-TR.rc index f3e9612e7ab..51c422cfad0 100644 --- a/base/applications/mscutils/eventvwr/lang/tr-TR.rc +++ b/base/applications/mscutils/eventvwr/lang/tr-TR.rc @@ -172,13 +172,13 @@ BEGIN /* Please note that explicit TAB characters '\t' are used to fix the alignment of the message in the MessageBox */ IDS_USAGE "ReactOS Event Viewer\n\ \n\ -EventVwr [computer name] [/l:<event log file>] [/?]\n\ +EventVwr [computer name] [/L:<event log file>] [/?]\n\ \n\ ""computer name"" : Specifies the remote computer where to connect\n\ \tto retrieve the events to display. If no name is specified, the\n\ \tlocal computer is used.\n\ \n\ -/l:<event log file> : Specifies which event log file to open.\n\ +/L:<event log file> : Specifies which event log file to open.\n\ \tOnly files in the .evt format (NT ≤ 5.2) are supported.\n\ \n\ /? : Displays this help message.\n\ diff --git a/base/applications/mscutils/eventvwr/lang/uk-UA.rc b/base/applications/mscutils/eventvwr/lang/uk-UA.rc index 67fdb14f99e..4dea849badd 100644 --- a/base/applications/mscutils/eventvwr/lang/uk-UA.rc +++ b/base/applications/mscutils/eventvwr/lang/uk-UA.rc @@ -166,13 +166,13 @@ BEGIN /* Please note that explicit TAB characters '\t' are used to fix the alignment of the message in the MessageBox */ IDS_USAGE "ReactOS Event Viewer\n\ \n\ -EventVwr [computer name] [/l:<event log file>] [/?]\n\ +EventVwr [computer name] [/L:<event log file>] [/?]\n\ \n\ ""computer name"" : Specifies the remote computer where to connect\n\ \tto retrieve the events to display. If no name is specified, the\n\ \tlocal computer is used.\n\ \n\ -/l:<event log file> : Specifies which event log file to open.\n\ +/L:<event log file> : Specifies which event log file to open.\n\ \tOnly files in the .evt format (NT ≤ 5.2) are supported.\n\ \n\ /? : Displays this help message.\n\ diff --git a/base/applications/mscutils/eventvwr/lang/zh-CN.rc b/base/applications/mscutils/eventvwr/lang/zh-CN.rc index d4d4bf3a668..62d1143ee39 100644 --- a/base/applications/mscutils/eventvwr/lang/zh-CN.rc +++ b/base/applications/mscutils/eventvwr/lang/zh-CN.rc @@ -166,13 +166,13 @@ BEGIN /* Please note that explicit TAB characters '\t' are used to fix the alignment of the message in the MessageBox */ IDS_USAGE "ReactOS Event Viewer\n\ \n\ -EventVwr [computer name] [/l:<event log file>] [/?]\n\ +EventVwr [computer name] [/L:<event log file>] [/?]\n\ \n\ ""computer name"" : Specifies the remote computer where to connect\n\ \tto retrieve the events to display. If no name is specified, the\n\ \tlocal computer is used.\n\ \n\ -/l:<event log file> : Specifies which event log file to open.\n\ +/L:<event log file> : Specifies which event log file to open.\n\ \tOnly files in the .evt format (NT ≤ 5.2) are supported.\n\ \n\ /? : Displays this help message.\n\ diff --git a/base/applications/mscutils/eventvwr/lang/zh-TW.rc b/base/applications/mscutils/eventvwr/lang/zh-TW.rc index ff4e3d26026..5a8336545ec 100644 --- a/base/applications/mscutils/eventvwr/lang/zh-TW.rc +++ b/base/applications/mscutils/eventvwr/lang/zh-TW.rc @@ -167,13 +167,13 @@ BEGIN /* Please note that explicit TAB characters '\t' are used to fix the alignment of the message in the MessageBox */ IDS_USAGE "ReactOS Event Viewer\n\ \n\ -EventVwr [computer name] [/l:<event log file>] [/?]\n\ +EventVwr [computer name] [/L:<event log file>] [/?]\n\ \n\ ""computer name"" : Specifies the remote computer where to connect\n\ \tto retrieve the events to display. If no name is specified, the\n\ \tlocal computer is used.\n\ \n\ -/l:<event log file> : Specifies which event log file to open.\n\ +/L:<event log file> : Specifies which event log file to open.\n\ \tOnly files in the .evt format (NT ≤ 5.2) are supported.\n\ \n\ /? : Displays this help message.\n\

3 years, 5 months

[reactos] 01/01: [EVENTVWR] Update de-DE.rc CORE-17699

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=95f64a200fe64862dc703… commit 95f64a200fe64862dc70335e8db00144370503fa Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Fri Jul 23 01:23:36 2021 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Fri Jul 23 01:23:36 2021 +0200 [EVENTVWR] Update de-DE.rc CORE-17699 --- base/applications/mscutils/eventvwr/lang/de-DE.rc | 124 +++++++++++----------- 1 file changed, 62 insertions(+), 62 deletions(-) diff --git a/base/applications/mscutils/eventvwr/lang/de-DE.rc b/base/applications/mscutils/eventvwr/lang/de-DE.rc index 15d7513c4bd..6ed1d1dcadc 100644 --- a/base/applications/mscutils/eventvwr/lang/de-DE.rc +++ b/base/applications/mscutils/eventvwr/lang/de-DE.rc @@ -1,4 +1,4 @@ -/* German translation by Daniel Reimer */ +/* German translation by Daniel Reimer and Joachim Henze */ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL @@ -6,20 +6,20 @@ IDM_EVENTVWR MENU BEGIN POPUP "&Protokoll" BEGIN - MENUITEM "&Open...", IDM_OPEN_EVENTLOG - MENUITEM "Save &Event Log as...", IDM_SAVE_EVENTLOG - MENUITEM "&Close", IDM_CLOSE_EVENTLOG + MENUITEM "Ö&ffnen...", IDM_OPEN_EVENTLOG + MENUITEM "&Speichern unter...", IDM_SAVE_EVENTLOG + MENUITEM "Sc&hließen", IDM_CLOSE_EVENTLOG MENUITEM SEPARATOR MENUITEM "&Alle Ereignisse löschen", IDM_CLEAR_EVENTS - MENUITEM "&Rename\tF2", IDM_RENAME_EVENTLOG - MENUITEM "Log Se&ttings...", IDM_EVENTLOG_SETTINGS + MENUITEM "&Umbenennen\tF2", IDM_RENAME_EVENTLOG + MENUITEM "Eigens&chaften...", IDM_EVENTLOG_SETTINGS MENUITEM SEPARATOR MENUITEM "B&eenden", IDM_EXIT END POPUP "&Ansicht" BEGIN - MENUITEM "&Newest first", IDM_LIST_NEWEST - MENUITEM "&Oldest first", IDM_LIST_OLDEST + MENUITEM "&Neuere zuerst", IDM_LIST_NEWEST + MENUITEM "Ä&ltere zuerst", IDM_LIST_OLDEST MENUITEM SEPARATOR MENUITEM "&Details...\tEnter", IDM_EVENT_DETAILS MENUITEM SEPARATOR @@ -27,10 +27,10 @@ BEGIN END POPUP "&Optionen" BEGIN - MENUITEM "Event details &view", IDM_EVENT_DETAILS_VIEW - MENUITEM "&Grid lines", IDM_LIST_GRID_LINES + MENUITEM "Detail&vorschau", IDM_EVENT_DETAILS_VIEW + MENUITEM "&Gitternetzlinien", IDM_LIST_GRID_LINES MENUITEM SEPARATOR - MENUITEM "&Save settings on exit", IDM_SAVE_SETTINGS + MENUITEM "&Einstellungen beim Beenden speichern", IDM_SAVE_SETTINGS END POPUP "&Hilfe" BEGIN @@ -44,12 +44,12 @@ IDM_EVENTWR_CTX MENU BEGIN POPUP "" BEGIN - MENUITEM "&Open Event Log...", IDM_OPEN_EVENTLOG - MENUITEM "&Save Event Log as...", IDM_SAVE_EVENTLOG + MENUITEM "Ö&ffnen...", IDM_OPEN_EVENTLOG + MENUITEM "&Speichern unter...", IDM_SAVE_EVENTLOG MENUITEM SEPARATOR - MENUITEM "&Clear all Events", IDM_CLEAR_EVENTS - MENUITEM "&Rename\tF2", IDM_RENAME_EVENTLOG - MENUITEM "Log Se&ttings...", IDM_EVENTLOG_SETTINGS + MENUITEM "Sc&hließen", IDM_CLEAR_EVENTS + MENUITEM "&Umbenennen\tF2", IDM_RENAME_EVENTLOG + MENUITEM "Eigens&chaften...", IDM_EVENTLOG_SETTINGS END END @@ -111,73 +111,73 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "General" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "&Display name:", IDC_STATIC, 7, 9, 60, 8 + LTEXT "&Anzeigename:", IDC_STATIC, 7, 9, 60, 8 EDITTEXT IDC_DISPLAYNAME, 67, 7, 178, 12, ES_LEFT | ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP - LTEXT "&Log name:", IDC_STATIC, 7, 25, 60, 8 + LTEXT "&Protokollname:", IDC_STATIC, 7, 25, 60, 8 EDITTEXT IDC_LOGNAME, 67, 23, 178, 12, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP - LTEXT "Log &file:", IDC_STATIC, 7, 41, 60, 8 + LTEXT "&Dateiname:", IDC_STATIC, 7, 41, 60, 8 EDITTEXT IDC_LOGFILE, 67, 39, 178, 12, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP - LTEXT "Size:", IDC_STATIC, 7, 57, 60, 8 + LTEXT "Größe:", IDC_STATIC, 7, 57, 60, 8 EDITTEXT IDC_SIZE_LABEL, 67, 57, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Created:", IDC_STATIC, 7, 69, 60, 8 + LTEXT "Erstellt:", IDC_STATIC, 7, 69, 60, 8 EDITTEXT IDC_CREATED_LABEL, 67, 69, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Modified:", IDC_STATIC, 7, 81, 60, 8 + LTEXT "Geändert:", IDC_STATIC, 7, 81, 60, 8 EDITTEXT IDC_MODIFIED_LABEL, 67, 81, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Accessed:", IDC_STATIC, 7, 93, 60, 8 + LTEXT "Letzter Zugriff:", IDC_STATIC, 7, 93, 60, 8 EDITTEXT IDC_ACCESSED_LABEL, 67, 93, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - GROUPBOX "Log size", IDC_STATIC, 7, 106, 238, 99 - LTEXT "&Maximum log size:", IDC_STATIC, 17, 122, 58, 8 + GROUPBOX "Protokollgröße", IDC_STATIC, 7, 106, 238, 99 + LTEXT "&Maximal:", IDC_STATIC, 17, 122, 58, 8 EDITTEXT IDC_EDIT_MAXLOGSIZE, 80, 119, 40, 14, ES_LEFT | ES_NUMBER | WS_GROUP CONTROL "", IDC_UPDOWN_MAXLOGSIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_NOTHOUSANDS | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 120, 119, 10, 14 LTEXT "KB", IDC_STATIC, 130, 122, 20, 8 - LTEXT "When maximum log size is reached:", IDC_STATIC, 17, 140, 219, 8 - CONTROL "&Overwrite events as needed", IDC_OVERWRITE_AS_NEEDED, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 17, 155, 219, 10 - CONTROL "O&verwrite events older than", IDC_OVERWRITE_OLDER_THAN, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 17, 168, 102, 10 - EDITTEXT IDC_EDIT_EVENTS_AGE, 122, 165, 35, 14, ES_LEFT | ES_NUMBER | WS_GROUP + LTEXT "Wenn die maximale Protokollgröße erreicht ist:", IDC_STATIC, 17, 140, 219, 8 + CONTROL "&Ereignisse nach Bedarf überschreiben", IDC_OVERWRITE_AS_NEEDED, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 17, 155, 219, 10 + CONTROL "E&reignisse überschreiben, die älter als", IDC_OVERWRITE_OLDER_THAN, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 17, 168, 142, 10 + EDITTEXT IDC_EDIT_EVENTS_AGE, 166, 165, 35, 14, ES_LEFT | ES_NUMBER | WS_GROUP CONTROL "", IDC_UPDOWN_EVENTS_AGE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | - UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 157, 165, 10, 14 - LTEXT "days", IDC_STATIC, 162, 168, 20, 8 - CONTROL "Do &not overwrite events\n(clear log manually)", IDC_NO_OVERWRITE, "Button", BS_AUTORADIOBUTTON | BS_MULTILINE | WS_GROUP | WS_TABSTOP, 17, 180, 143, 20 - PUSHBUTTON "&Restore Defaults", IDC_RESTOREDEFAULTS, 166, 183, 70, 14 - AUTOCHECKBOX "Using a lo&w-speed connection", IDC_LOW_SPEED_CONNECTION, 7, 217, 167, 10 - PUSHBUTTON "&Clear Log", ID_CLEARLOG, 195, 213, 50, 14 + UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 197, 165, 10, 14 + LTEXT "Tage sind", IDC_STATIC, 202, 168, 40, 8 + CONTROL "Erei&gnisse nie überschreiben\n(Protokoll manuell löschen)", IDC_NO_OVERWRITE, "Button", BS_AUTORADIOBUTTON | BS_MULTILINE | WS_GROUP | WS_TABSTOP, 17, 180, 143, 20 + PUSHBUTTON "Wie&derherstellen", IDC_RESTOREDEFAULTS, 166, 183, 70, 14 + AUTOCHECKBOX "&Niedrige Übertragungsrate", IDC_LOW_SPEED_CONNECTION, 7, 217, 167, 10 + PUSHBUTTON "Protokoll &löschen", ID_CLEARLOG, 180, 213, 65, 14 END STRINGTABLE BEGIN IDS_COPYRIGHT "Copyright (C) 2007 Marc Piulachs (marc.piulachs(a)codexchange.net)" IDS_APP_TITLE "Ereignisanzeige" - IDS_APP_TITLE_EX "%s - %s Log on \\\\" - IDS_STATUS_MSG "%s has %lu event(s) (listed: %lu)" + IDS_APP_TITLE_EX "%s - %s auf \\\\" + IDS_STATUS_MSG "%s enthält %lu Ereignisse (angezeigt: %lu)" IDS_LOADING_WAIT "Ereignis-Protokolle werden geladen. Bitte warten..." - IDS_NO_ITEMS "There are no items to show in this view." // "No events in this log." - IDS_EVENTLOG_SYSTEM "System Logs" - IDS_EVENTLOG_APP "Application Logs" - IDS_EVENTLOG_USER "User Logs" + IDS_NO_ITEMS "In diesem Protokoll gibt es keine Treffer." // "No events in this log." + IDS_EVENTLOG_SYSTEM "Systemprotokolle" + IDS_EVENTLOG_APP "Anwendungsprotokolle" + IDS_EVENTLOG_USER "Benutzerprotokolle" IDS_SAVE_FILTER "Ereignisprotokoll (*.evt)\0*.evt\0" IDS_CLEAREVENTS_MSG "Möchten Sie dieses Protokoll vor dem Löschen speichern?" - IDS_RESTOREDEFAULTS "Do you want to restore all settings for this log to their default values?" - IDS_EVENTSTRINGIDNOTFOUND "Die Bezeichnung für die Ereignis-ID ( %lu ) in der Quelle ( %s ) kann nicht gefunden werden. Es könnte sein, dass der Lokale Computer die notwendigen Registry Einträge oder Nachrichten DLLs, um Nachrichten von Remoten Computern anzuzeigen, nicht besitzt.\n\nThe following information is part of the event:\n\n" + IDS_RESTOREDEFAULTS "Möchten Sie alle Einstellungen für dieses Protokoll wieder auf die Standardwerte zurücksetzen?" + IDS_EVENTSTRINGIDNOTFOUND "Die Bezeichnung für die Ereignis-ID ( %lu ) in der Quelle ( %s ) kann nicht gefunden werden. Es könnte sein, dass der lokale Computer die notwendigen Registry Einträge oder Nachrichten DLLs, um Nachrichten entfernter Computer anzuzeigen, nicht besitzt.\n\nDas Ereignis enthält folgende Informationen:\n\n" END STRINGTABLE BEGIN /* Please note that explicit TAB characters '\t' are used to fix the alignment of the message in the MessageBox */ - IDS_USAGE "ReactOS Event Viewer\n\ + IDS_USAGE "ReactOS Ereignisanzeige\n\ \n\ -EventVwr [computer name] [/l:<event log file>] [/?]\n\ +EventVwr [Computername] [/L:<Protokolldateiname>] [/?]\n\ \n\ -""computer name"" : Specifies the remote computer where to connect\n\ -\tto retrieve the events to display. If no name is specified, the\n\ -\tlocal computer is used.\n\ +""Computername"" : Wenn sie einen anderen Computernamen\n\ +\tangeben, werden die Ereignisse über das Netzwerk bezogen und angezeigt.\n\ +\tWird kein Name angegeben, wird der lokale Computer verwendet.\n\ \n\ -/l:<event log file> : Specifies which event log file to open.\n\ -\tOnly files in the .evt format (NT ≤ 5.2) are supported.\n\ +/L:<Protokolldateiname> : Bestimmt das anzuzeigende Protokoll.\n\ +\tNur Dateien im .evt Format (NT ≤ 5.2) werden unterstützt.\n\ \n\ -/? : Displays this help message.\n\ +/? : zeigt diesen Hilfetext an.\n\ " - IDS_EVENTLOGFILE "Event Log File" + IDS_EVENTLOGFILE "Ereignisprotokoll" END STRINGTABLE @@ -193,8 +193,8 @@ END STRINGTABLE BEGIN - IDS_BYTES_FORMAT "bytes" // "%s bytes" - // "%1!ls! (%2!ls! bytes)" + IDS_BYTES_FORMAT "Bytes" // "%s Bytes" + // "%1!ls! (%2!ls! Bytes)" END STRINGTABLE @@ -211,15 +211,15 @@ END STRINGTABLE BEGIN - IDS_COPY "Event Type: %s\r\n\ -Event Source: %s\r\n\ -Event Category: %s\r\n\ -Event ID: %s\r\n\ -Date: %s\r\n\ -Time: %s\r\n\ -User: %s\r\n\ + IDS_COPY "Typ: %s\r\n\ +Quelle: %s\r\n\ +Kategorie: %s\r\n\ +Ereignis-ID: %s\r\n\ +Datum: %s\r\n\ +Zeit: %s\r\n\ +Benutzer: %s\r\n\ Computer: %s\r\n\ -Description:\r\n%s" +Beschreibung:\r\n%s" END STRINGTABLE

3 years, 5 months

[reactos] 02/02: [CRT] Remove checkstk_ms from build (it was unused)

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7100a24fc314f4fe0ae58… commit 7100a24fc314f4fe0ae58520f405d2fb4f88f3e2 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Jul 17 15:47:24 2021 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Jul 20 23:13:03 2021 +0200 [CRT] Remove checkstk_ms from build (it was unused) --- sdk/lib/crt/except/except.cmake | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/sdk/lib/crt/except/except.cmake b/sdk/lib/crt/except/except.cmake index 47ba7a43b88..7bc56b8078e 100644 --- a/sdk/lib/crt/except/except.cmake +++ b/sdk/lib/crt/except/except.cmake @@ -3,10 +3,6 @@ if(ARCH STREQUAL "i386") list(APPEND LIBCNTPR_EXCEPT_ASM_SOURCE except/i386/chkstk_asm.s ) - if(NOT MSVC) - list(APPEND LIBCNTPR_EXCEPT_ASM_SOURCE - except/i386/chkstk_ms.s) - endif() list(APPEND CRT_EXCEPT_ASM_SOURCE except/i386/chkesp.s except/i386/prolog.s @@ -65,16 +61,10 @@ list(APPEND CRT_EXCEPT_SOURCE if(ARCH STREQUAL "i386") list(APPEND CHKSTK_ASM_SOURCE except/i386/chkstk_asm.s) - if(NOT MSVC) - list(APPEND CHKSTK_ASM_SOURCE except/i386/chkstk_ms.s) - endif() elseif(ARCH STREQUAL "amd64") list(APPEND CHKSTK_ASM_SOURCE except/amd64/chkstk_ms.s) elseif(ARCH STREQUAL "arm") list(APPEND CHKSTK_ASM_SOURCE except/arm/chkstk_asm.s) - if(NOT MSVC) - list(APPEND CHKSTK_ASM_SOURCE except/arm/chkstk_ms.s) - endif() elseif(ARCH STREQUAL "powerpc") list(APPEND CHKSTK_ASM_SOURCE except/powerpc/chkstk_asm.s) endif()

3 years, 5 months

[reactos] 01/02: [CRT] Refactor CMake files

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8c4aff39a891f67cac045… commit 8c4aff39a891f67cac045eff9a02f93a150663fe Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Jul 17 14:53:17 2021 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Jul 20 23:13:03 2021 +0200 [CRT] Refactor CMake files --- sdk/lib/crt/CMakeLists.txt | 74 ++--- sdk/lib/crt/conio/conio.cmake | 10 + sdk/lib/crt/crt.cmake | 627 ++---------------------------------- sdk/lib/crt/direct/direct.cmake | 16 + sdk/lib/crt/except/except.cmake | 85 +++++ sdk/lib/crt/float/float.cmake | 42 +++ sdk/lib/crt/libcntpr.cmake | 255 ++------------- sdk/lib/crt/math/math.cmake | 189 +++++++++++ sdk/lib/crt/mbstring/mbstring.cmake | 63 ++++ sdk/lib/crt/mem/mem.cmake | 32 ++ sdk/lib/crt/misc/misc.cmake | 29 ++ sdk/lib/crt/printf/printf.cmake | 50 +++ sdk/lib/crt/process/process.cmake | 12 + sdk/lib/crt/search/search.cmake | 10 + sdk/lib/crt/setjmp/setjmp.cmake | 18 ++ sdk/lib/crt/startup/startup.cmake | 29 ++ sdk/lib/crt/stdio/stdio.cmake | 22 ++ sdk/lib/crt/stdlib/stdlib.cmake | 49 +++ sdk/lib/crt/string/string.cmake | 128 ++++++++ sdk/lib/crt/time/time.cmake | 41 +++ sdk/lib/crt/wine/wine.cmake | 26 ++ sdk/lib/crt/wstring/wstring.cmake | 17 + 22 files changed, 937 insertions(+), 887 deletions(-) diff --git a/sdk/lib/crt/CMakeLists.txt b/sdk/lib/crt/CMakeLists.txt index 24d4205fbd0..3ade9c84877 100644 --- a/sdk/lib/crt/CMakeLists.txt +++ b/sdk/lib/crt/CMakeLists.txt @@ -1,28 +1,28 @@ include_directories(include) +#include_directories(.) add_definitions(-D_CRTBLD) -if(ARCH STREQUAL "i386") - list(APPEND CHKSTK_ASM_SOURCE except/i386/chkstk_asm.s) - if(NOT MSVC) - list(APPEND CHKSTK_SOURCE except/i386/chkstk_ms.s) - endif() -elseif(ARCH STREQUAL "amd64") - list(APPEND CHKSTK_ASM_SOURCE except/amd64/chkstk_ms.s) -elseif(ARCH STREQUAL "arm") - list(APPEND CHKSTK_ASM_SOURCE except/arm/chkstk_asm.s) - if(NOT MSVC) - list(APPEND CHKSTK_SOURCE except/arm/chkstk_ms.s) - endif() -elseif(ARCH STREQUAL "powerpc") - list(APPEND CHKSTK_ASM_SOURCE except/powerpc/chkstk_asm.s) -endif() - -add_asm_files(chkstk_lib_asm ${CHKSTK_ASM_SOURCE}) -add_library(chkstk ${CHKSTK_SOURCE} ${chkstk_lib_asm}) -set_target_properties(chkstk PROPERTIES LINKER_LANGUAGE "C") -add_dependencies(chkstk asm) +include(conio/conio.cmake) +include(direct/direct.cmake) +include(except/except.cmake) +include(float/float.cmake) +include(math/math.cmake) +include(mbstring/mbstring.cmake) +include(mem/mem.cmake) +include(misc/misc.cmake) +include(printf/printf.cmake) +include(process/process.cmake) +include(search/search.cmake) +include(setjmp/setjmp.cmake) +include(startup/startup.cmake) +include(stdio/stdio.cmake) +include(stdlib/stdlib.cmake) +include(string/string.cmake) +include(time/time.cmake) +include(wine/wine.cmake) +include(wstring/wstring.cmake) include(crt.cmake) include(libcntpr.cmake) @@ -45,37 +45,3 @@ add_library(user32_wsprintf add_dependencies(user32_wsprintf psdk) target_compile_definitions(user32_wsprintf PRIVATE _USER32_WSPRINTF) - -add_library(memcmp mem/memcmp.c) -add_dependencies(memcmp psdk) - -add_library(getopt misc/getopt.c) -target_compile_definitions(getopt PRIVATE _DLL __USE_CRTIMP) -add_dependencies(getopt psdk) - -add_library(strtol - string/ctype.c - string/iswctype.c - string/strtoi64.c - string/strtol.c - string/strtoul.c - string/strtoull.c - string/wctype.c) -target_compile_definitions(strtol PRIVATE _LIBCNT_) -add_dependencies(strtol psdk) - - -if(ARCH STREQUAL "i386") - list(APPEND ATAN2_ASM_SOURCE math/i386/atan2_asm.s) -elseif(ARCH STREQUAL "amd64") - list(APPEND ATAN2_ASM_SOURCE math/amd64/atan2.S) -elseif(ARCH STREQUAL "arm") - list(APPEND ATAN2_ASM_SOURCE math/arm/atan2.s) -endif() - -add_asm_files(atan2_asm ${ATAN2_ASM_SOURCE}) -add_library(atan2 ${atan2_asm}) -set_target_properties(atan2 PROPERTIES LINKER_LANGUAGE "C") -add_dependencies(atan2 asm) - - diff --git a/sdk/lib/crt/conio/conio.cmake b/sdk/lib/crt/conio/conio.cmake new file mode 100644 index 00000000000..1a5aafb7fdb --- /dev/null +++ b/sdk/lib/crt/conio/conio.cmake @@ -0,0 +1,10 @@ + +list(APPEND CRT_CONIO_SOURCE + conio/cgets.c + conio/cputs.c + conio/getch.c + conio/getche.c + conio/kbhit.c + conio/putch.c + conio/ungetch.c +) diff --git a/sdk/lib/crt/crt.cmake b/sdk/lib/crt/crt.cmake index f3b9160a9b5..91f9d4a074e 100644 --- a/sdk/lib/crt/crt.cmake +++ b/sdk/lib/crt/crt.cmake @@ -1,611 +1,42 @@ list(APPEND CRT_SOURCE - conio/cgets.c - conio/cputs.c - conio/getch.c - conio/getche.c - conio/kbhit.c - conio/putch.c - conio/ungetch.c - direct/chdir.c - direct/chdrive.c - direct/getcwd.c - direct/getdcwd.c - direct/getdfree.c - direct/getdrive.c - direct/mkdir.c - direct/rmdir.c - direct/wchdir.c - direct/wgetcwd.c - direct/wgetdcwd.c - direct/wmkdir.c - direct/wrmdir.c - except/matherr.c - except/stack.c - float/chgsign.c - float/copysign.c - float/fpclass.c - float/fpecode.c - float/isnan.c - float/nafter.c - float/scalb.c + ${CRT_CONIO_SOURCE} + ${CRT_DIRECT_SOURCE} + ${CRT_EXCEPT_SOURCE} + ${CRT_FLOAT_SOURCE} locale/locale.c - math/abs.c - math/acos.c - math/adjust.c - math/asin.c - math/cabs.c - math/cosf.c - math/cosh.c - math/div.c - math/fdivbug.c - math/frexp.c - math/huge_val.c - math/hypot.c - math/ieee754/j0_y0.c - math/ieee754/j1_y1.c - math/ieee754/jn_yn.c - math/j0_y0.c - math/j1_y1.c - math/jn_yn.c - math/labs.c - math/ldiv.c - math/logf.c - math/modf.c - math/powf.c - math/rand.c - math/s_modf.c - math/sinf.c - math/sinh.c - math/tanh.c - mbstring/_setmbcp.c - mbstring/hanzen.c - mbstring/ischira.c - mbstring/iskana.c - mbstring/iskmoji.c - mbstring/iskpun.c - mbstring/islead.c - mbstring/islwr.c - mbstring/ismbal.c - mbstring/ismbaln.c - mbstring/ismbc.c - mbstring/ismbgra.c - mbstring/ismbkaln.c - mbstring/ismblead.c - mbstring/ismbpri.c - mbstring/ismbpun.c - mbstring/ismbtrl.c - mbstring/isuppr.c - mbstring/jistojms.c - mbstring/jmstojis.c - mbstring/mbbtype.c - mbstring/mbccpy.c - mbstring/mbclen.c - mbstring/mbscat.c - mbstring/mbschr.c - mbstring/mbscmp.c - mbstring/mbscoll.c - mbstring/mbscpy.c - mbstring/mbscspn.c - mbstring/mbsdec.c - mbstring/mbsdup.c - mbstring/mbsicmp.c - mbstring/mbsicoll.c - mbstring/mbsinc.c - mbstring/mbslen.c - mbstring/mbslwr.c - mbstring/mbsncat.c - mbstring/mbsnccnt.c - mbstring/mbsncmp.c - mbstring/mbsncoll.c - mbstring/mbsncpy.c - mbstring/mbsnextc.c - mbstring/mbsnicmp.c - mbstring/mbsnicoll.c - mbstring/mbsninc.c - mbstring/mbsnset.c - mbstring/mbspbrk.c - mbstring/mbsrchr.c - mbstring/mbsrev.c - mbstring/mbsset.c - mbstring/mbsspn.c - mbstring/mbsspnp.c - mbstring/mbsstr.c - mbstring/mbstok.c - mbstring/mbstrlen.c - mbstring/mbsupr.c - mem/memcmp.c - mem/memccpy.c - mem/memicmp.c - misc/__crt_MessageBoxA.c - misc/amsg.c - misc/assert.c - misc/environ.c - misc/fltused.c - misc/getargs.c - misc/i10output.c - misc/initterm.c - misc/lock.c - misc/purecall.c - misc/stubs.c - misc/tls.c - printf/_cprintf.c - printf/_cwprintf.c - printf/_scprintf.c - printf/_scwprintf.c - printf/_snprintf.c - printf/_snprintf_s.c - printf/_snwprintf.c - printf/_snwprintf_s.c - printf/_vcprintf.c - printf/_vcwprintf.c - printf/_vscprintf.c - printf/_vscwprintf.c - printf/_vsnprintf.c - printf/_vsnprintf_s.c - printf/_vsnwprintf.c - printf/_vsnwprintf_s.c - printf/_vsprintf_p.c - printf/fprintf.c - printf/fprintf_s.c - printf/fwprintf.c - printf/fwprintf_s.c - printf/printf.c - printf/printf_s.c - printf/sprintf.c - printf/sprintf_s.c - printf/streamout.c - printf/swprintf.c - printf/swprintf_s.c - printf/vfprintf.c - printf/vfprintf_s.c - printf/vfwprintf.c - printf/vfwprintf_s.c - printf/vprintf.c - printf/vprintf_s.c - printf/vsprintf.c - printf/vsprintf_s.c - printf/vswprintf.c - printf/vswprintf_s.c - printf/vwprintf.c - printf/vwprintf_s.c - printf/wprintf.c - printf/wprintf_s.c - printf/wstreamout.c - process/_cwait.c - process/_system.c - process/dll.c - process/process.c - process/procid.c - process/thread.c - process/threadid.c - process/threadx.c - process/wprocess.c - search/bsearch.c - search/lfind.c - search/lsearch.c + ${CRT_MATH_SOURCE} + ${CRT_MBSTRING_SOURCE} + ${CRT_MEM_SOURCE} + ${CRT_MISC_SOURCE} + ${CRT_PRINTF_SOURCE} + ${CRT_PROCESS_SOURCE} + ${CRT_SEARCH_SOURCE} signal/signal.c signal/xcptinfo.c - startup/crtexe.c - startup/wcrtexe.c - startup/crt_handler.c - startup/crtdll.c - startup/_newmode.c - startup/wildcard.c - startup/tlssup.c - startup/mingw_helpers.c - startup/natstart.c - startup/charmax.c - #startup/merr.c - startup/atonexit.c - #startup/txtmode.c - startup/pesect.c - startup/tlsmcrt.c - startup/tlsthrd.c - startup/tlsmthread.c - startup/cinitexe.c - startup/gs_support.c - startup/dll_argv.c - startup/dllargv.c - startup/wdllargv.c - startup/crt0_c.c - startup/crt0_w.c - startup/dllentry.c - startup/reactos.c - stdio/_flsbuf.c - stdio/_flswbuf.c - stdio/access.c - stdio/file.c - stdio/find.c - stdio/find64.c - stdio/findi64.c - stdio/fmode.c - stdio/perror.c - stdio/popen.c - stdio/stat.c - stdio/stat64.c - stdio/waccess.c - stdio/wfind.c - stdio/wfind64.c - stdio/wfindi64.c - stdio/wpopen.c - stdio/wstat.c - stdio/wstat64.c - stdlib/_exit.c - stdlib/_set_abort_behavior.c - stdlib/abort.c - stdlib/atexit.c - stdlib/ecvt.c - stdlib/errno.c - stdlib/fcvt.c - stdlib/fcvtbuf.c - stdlib/fullpath.c - stdlib/gcvt.c - stdlib/getenv.c - stdlib/makepath.c - stdlib/makepath_s.c - stdlib/mbtowc.c - stdlib/mbstowcs.c - stdlib/obsol.c - stdlib/putenv.c - stdlib/qsort.c - stdlib/rot.c - stdlib/senv.c - stdlib/swab.c - stdlib/wfulpath.c - stdlib/wputenv.c - stdlib/wsenv.c - stdlib/wmakpath.c - stdlib/wmakpath_s.c - string/_mbsnlen.c - string/_mbstrnlen.c - string/_splitpath.c - string/_splitpath_s.c - string/_wcslwr_s.c - string/_wsplitpath.c - string/_wsplitpath_s.c - string/atof.c - string/atoi.c - string/atoi64.c - string/atol.c - string/ctype.c - string/iswctype.c - string/is_wctype.c - string/itoa.c - string/itow.c - string/mbstowcs_s.c - string/scanf.c - string/strcoll.c - string/strcspn.c - string/strdup.c - string/strerror.c - string/stricmp.c - string/string.c - string/strlwr.c - string/strncoll.c - string/strnicmp.c - string/strpbrk.c - string/strrev.c - string/strset.c - string/strspn.c - string/strstr.c - string/strtod.c - string/strtoi64.c - string/strtok.c - string/strtok_s.c - string/strtol.c - string/strtoul.c - string/strtoull.c - string/strupr.c - string/strxfrm.c - string/wcs.c - string/wcstol.c - string/wcstombs_s.c - string/wcstoul.c - string/wctype.c - string/wtof.c - string/wtoi.c - string/wtoi64.c - string/wtol.c - string/winesup.c + ${CRT_STARTUP_SOURCE} + ${CRT_STDIO_SOURCE} + ${CRT_STDLIB_SOURCE} + ${CRT_STRING_SOURCE} sys_stat/systime.c - time/asctime.c - time/clock.c - time/ctime32.c - time/ctime64.c - time/ctime.c - time/difftime32.c - time/difftime64.c - time/difftime.c - time/ftime32.c - time/ftime64.c - time/ftime.c - time/futime32.c - time/futime64.c - time/futime.c - time/gmtime.c - time/localtime32.c - time/localtime64.c - time/localtime.c - time/mktime.c - time/strdate.c - time/strftime.c - time/strtime.c - time/time32.c - time/time64.c - time/time.c - time/timezone.c - time/utime32.c - time/utime64.c - time/utime.c - time/wasctime.c - time/wctime32.c - time/wctime64.c - time/wctime.c - time/wstrdate.c - time/wstrtime.c - time/wutime32.c - time/wutime64.c - time/wutime.c - wstring/wcscoll.c - wstring/wcscspn.c - wstring/wcsicmp.c - wstring/wcslwr.c - wstring/wcsnicmp.c - wstring/wcsspn.c - wstring/wcsstr.c - wstring/wcstok.c - wstring/wcsupr.c - wstring/wcsxfrm.c) - -list(APPEND CRT_WINE_SOURCE - wine/cpp.c - wine/except.c - wine/heap.c - wine/undname.c) - -if(ARCH STREQUAL "i386") - list(APPEND CRT_ASM_SOURCE - except/i386/chkesp.s - except/i386/prolog.s - math/i386/alldiv_asm.s - math/i386/alldvrm_asm.s - math/i386/allmul_asm.s - math/i386/allrem_asm.s - math/i386/allshl_asm.s - math/i386/allshr_asm.s - math/i386/atan_asm.s - math/i386/aulldiv_asm.s - math/i386/aulldvrm_asm.s - math/i386/aullrem_asm.s - math/i386/aullshr_asm.s - math/i386/ceil_asm.s - math/i386/ceilf.S - math/i386/cos_asm.s - math/i386/fabs_asm.s - math/i386/floor_asm.s - math/i386/floorf.S - math/i386/ftol_asm.s - math/i386/ftol2_asm.s - math/i386/log_asm.s - math/i386/log10_asm.s - math/i386/pow_asm.s - math/i386/sin_asm.s - math/i386/sqrt_asm.s - math/i386/tan_asm.s - math/i386/atan2_asm.s - math/i386/exp_asm.s - math/i386/fmod_asm.s - math/i386/fmodf_asm.s - mem/i386/memchr_asm.s - mem/i386/memmove_asm.s - mem/i386/memset_asm.s - misc/i386/readcr4.S - setjmp/i386/setjmp.s - string/i386/strcat_asm.s - string/i386/strchr_asm.s - string/i386/strcmp_asm.s - string/i386/strcpy_asm.s - string/i386/strlen_asm.s - string/i386/strncat_asm.s - string/i386/strncmp_asm.s - string/i386/strncpy_asm.s - string/i386/strnlen_asm.s - string/i386/strrchr_asm.s - string/i386/wcscat_asm.s - string/i386/wcschr_asm.s - string/i386/wcscmp_asm.s - string/i386/wcscpy_asm.s - string/i386/wcslen_asm.s - string/i386/wcsncat_asm.s - string/i386/wcsncmp_asm.s - string/i386/wcsncpy_asm.s - string/i386/wcsnlen_asm.s - string/i386/wcsrchr_asm.s) - - list(APPEND CRT_SOURCE - float/i386/clearfp.c - float/i386/cntrlfp.c - float/i386/fpreset.c - float/i386/logb.c - float/i386/statfp.c - math/i386/ci.c - math/i386/cicos.c - math/i386/cilog.c - math/i386/cipow.c - math/i386/cisin.c - math/i386/cisqrt.c - math/i386/ldexp.c) - list(APPEND CRT_WINE_SOURCE - wine/except_i386.c) - if(MSVC) - list(APPEND CRT_ASM_SOURCE - except/i386/cpp.s) - endif() - if(USE_CLANG_CL) - list(APPEND CRT_ASM_SOURCE - stdlib/clang-alias.s) - endif() -elseif(ARCH STREQUAL "amd64") - list(APPEND CRT_ASM_SOURCE - except/amd64/seh.s - float/amd64/clearfp.S - float/amd64/getsetfpcw.S - float/amd64/fpreset.S - float/amd64/logb.S - # math/amd64/acos.S - # math/amd64/acosf.S - math/amd64/atan.S - math/amd64/atan2.S - math/amd64/ceil.S - # math/amd64/ceilf.S - math/amd64/exp.S - math/amd64/fabs.S - math/amd64/floor.S - # math/amd64/floorf.S - math/amd64/fmod.S - # math/amd64/fmodf.S - math/amd64/ldexp.S - math/amd64/log.S - math/amd64/log10.S - math/amd64/pow.S - math/amd64/sqrt.S - # math/amd64/sqrtf.S - math/amd64/tan.S - setjmp/amd64/setjmp.s) - - list(APPEND CRT_SOURCE - except/amd64/ehandler.c - float/i386/cntrlfp.c - float/i386/statfp.c) - list(APPEND CRT_WINE_SOURCE - wine/except_x86_64.c) - if(MSVC) - list(APPEND CRT_ASM_SOURCE - except/amd64/cpp.s) - if (CMAKE_C_COMPILER_ID STREQUAL "Clang") - list(APPEND CRT_ASM_SOURCE - stdlib/clang-alias.s) - endif() - endif() -elseif(ARCH STREQUAL "arm") - list(APPEND CRT_SOURCE - except/arm/ehandler.c - math/fabsf.c - math/sqrt.c - math/arm/__rt_sdiv.c - math/arm/__rt_sdiv64_worker.c - math/arm/__rt_udiv.c - math/arm/__rt_udiv64_worker.c - ) - list(APPEND CRT_WINE_SOURCE - wine/except_arm.c - ) - list(APPEND CRT_ASM_SOURCE - except/arm/_abnormal_termination.s - except/arm/_except_handler2.s - except/arm/_except_handler3.s - except/arm/_global_unwind2.s - except/arm/_local_unwind2.s - except/arm/chkstk_asm.s - float/arm/_clearfp.s - float/arm/_controlfp.s - float/arm/_fpreset.s - float/arm/_statusfp.s - math/arm/atan.s - math/arm/atan2.s - math/arm/ceil.s - math/arm/exp.s - math/arm/fabs.s - math/arm/fmod.s - math/arm/floor.s - math/arm/ldexp.s - math/arm/log.s - math/arm/log10.s - math/arm/pow.s - math/arm/tan.s - math/arm/_logb.s - math/arm/__dtoi64.s - math/arm/__dtou64.s - math/arm/__i64tod.s - math/arm/__i64tos.s - math/arm/__stoi64.s - math/arm/__stou64.s - math/arm/__u64tod.s - math/arm/__u64tos.s - math/arm/__rt_sdiv64.s - math/arm/__rt_srsh.s - math/arm/__rt_udiv64.s - setjmp/arm/setjmp.s - ) - if(MSVC) - list(APPEND CRT_ASM_SOURCE - except/arm/cpp.s) - endif() -endif() - -if(NOT ARCH STREQUAL "i386") - list(APPEND CRT_SOURCE - math/_chgsignf.c - math/_copysignf.c - math/_hypotf.c - math/acosf.c - math/asinf.c - math/atan2f.c - math/atanf.c - math/ceilf.c - math/cos.c - math/coshf.c - math/expf.c - math/floorf.c - math/fmodf.c - math/log10f.c - math/modff.c - math/sin.c - math/sinhf.c - math/sqrtf.c - math/tanf.c - math/tanhf.c - math/stubs.c - mem/memchr.c - mem/memcpy.c - mem/memmove.c - mem/memset.c - string/strcat.c - string/strchr.c - string/strcmp.c - string/strcpy.c - string/strlen.c - string/strncat.c - string/strncmp.c - string/strncpy.c - string/strnlen.c - string/strrchr.c - string/wcscat.c - string/wcschr.c - string/wcscmp.c - string/wcscpy.c - string/wcslen.c - string/wcsncat.c - string/wcsncmp.c - string/wcsncpy.c - string/wcsnlen.c - string/wcsrchr.c) -endif() - -# includes for wine code -include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) + ${CRT_TIME_SOURCE} + ${CRT_WINE_SOURCE} + ${CRT_WSTRING_SOURCE} +) + +list(APPEND CRT_ASM_SOURCE + ${CRT_EXCEPT_ASM_SOURCE} + ${CRT_FLOAT_ASM_SOURCE} + ${CRT_MATH_ASM_SOURCE} + ${CRT_SETJMP_ASM_SOURCE} + ${CRT_STDLIB_ASM_SOURCE} + ${CRT_STRING_ASM_SOURCE} +) set_source_files_properties(${CRT_ASM_SOURCE} PROPERTIES COMPILE_DEFINITIONS "__MINGW_IMPORT=extern;USE_MSVCRT_PREFIX;_MSVCRT_LIB_;_MSVCRT_;_MT;CRTDLL") add_asm_files(crt_asm ${CRT_ASM_SOURCE}) -if(USE_CLANG_CL) - # clang-cl is missing pragma function support - # https://bugs.llvm.org/show_bug.cgi?id=35116 - set_property(SOURCE stdlib/rot.c APPEND_STRING PROPERTY COMPILE_FLAGS " /fallback") -endif() - -add_library(crt ${CRT_SOURCE} ${CRT_WINE_SOURCE} ${crt_asm}) +add_library(crt ${CRT_SOURCE} ${crt_asm}) target_link_libraries(crt chkstk ${PSEH_LIB}) target_compile_definitions(crt PRIVATE __MINGW_IMPORT=extern diff --git a/sdk/lib/crt/direct/direct.cmake b/sdk/lib/crt/direct/direct.cmake new file mode 100644 index 00000000000..f713f6f00dd --- /dev/null +++ b/sdk/lib/crt/direct/direct.cmake @@ -0,0 +1,16 @@ + +list(APPEND CRT_DIRECT_SOURCE + direct/chdir.c + direct/chdrive.c + direct/getcwd.c + direct/getdcwd.c + direct/getdfree.c + direct/getdrive.c + direct/mkdir.c + direct/rmdir.c + direct/wchdir.c + direct/wgetcwd.c + direct/wgetdcwd.c + direct/wmkdir.c + direct/wrmdir.c +) diff --git a/sdk/lib/crt/except/except.cmake b/sdk/lib/crt/except/except.cmake new file mode 100644 index 00000000000..47ba7a43b88 --- /dev/null +++ b/sdk/lib/crt/except/except.cmake @@ -0,0 +1,85 @@ + +if(ARCH STREQUAL "i386") + list(APPEND LIBCNTPR_EXCEPT_ASM_SOURCE + except/i386/chkstk_asm.s + ) + if(NOT MSVC) + list(APPEND LIBCNTPR_EXCEPT_ASM_SOURCE + except/i386/chkstk_ms.s) + endif() + list(APPEND CRT_EXCEPT_ASM_SOURCE + except/i386/chkesp.s + except/i386/prolog.s + ) + if(MSVC) + list(APPEND CRT_EXCEPT_ASM_SOURCE + except/i386/cpp.s) + endif() +elseif(ARCH STREQUAL "amd64") + list(APPEND LIBCNTPR_EXCEPT_SOURCE + except/amd64/ehandler.c + ) + list(APPEND LIBCNTPR_EXCEPT_ASM_SOURCE + except/amd64/chkstk_ms.s + except/amd64/seh.s + ) + list(APPEND CRT_EXCEPT_ASM_SOURCE + except/amd64/seh.s + ) + if(MSVC) + list(APPEND CRT_EXCEPT_ASM_SOURCE + except/amd64/cpp.s) + endif() +elseif(ARCH STREQUAL "arm") + list(APPEND LIBCNTPR_EXCEPT_SOURCE + except/arm/ehandler.c + ) + list(APPEND LIBCNTPR_EXCEPT_ASM_SOURCE + except/arm/__jump_unwind.s + except/arm/_abnormal_termination.s + except/arm/_except_handler2.s + except/arm/_except_handler3.s + except/arm/_global_unwind2.s + except/arm/_local_unwind2.s + except/arm/chkstk_asm.s + ) + list(APPEND CRT_EXCEPT_ASM_SOURCE + except/arm/_abnormal_termination.s + except/arm/_except_handler2.s + except/arm/_except_handler3.s + except/arm/_global_unwind2.s + except/arm/_local_unwind2.s + except/arm/chkstk_asm.s + ) + if(MSVC) + list(APPEND CRT_EXCEPT_ASM_SOURCE + except/arm/cpp.s) + endif() +endif() + +list(APPEND CRT_EXCEPT_SOURCE + ${LIBCNTPR_EXCEPT_SOURCE} + except/matherr.c + except/stack.c +) + +if(ARCH STREQUAL "i386") + list(APPEND CHKSTK_ASM_SOURCE except/i386/chkstk_asm.s) + if(NOT MSVC) + list(APPEND CHKSTK_ASM_SOURCE except/i386/chkstk_ms.s) + endif() +elseif(ARCH STREQUAL "amd64") + list(APPEND CHKSTK_ASM_SOURCE except/amd64/chkstk_ms.s) +elseif(ARCH STREQUAL "arm") + list(APPEND CHKSTK_ASM_SOURCE except/arm/chkstk_asm.s) + if(NOT MSVC) + list(APPEND CHKSTK_ASM_SOURCE except/arm/chkstk_ms.s) + endif() +elseif(ARCH STREQUAL "powerpc") + list(APPEND CHKSTK_ASM_SOURCE except/powerpc/chkstk_asm.s) +endif() + +add_asm_files(chkstk_lib_asm ${CHKSTK_ASM_SOURCE}) +add_library(chkstk ${CHKSTK_SOURCE} ${chkstk_lib_asm}) +set_target_properties(chkstk PROPERTIES LINKER_LANGUAGE "C") +add_dependencies(chkstk asm) diff --git a/sdk/lib/crt/float/float.cmake b/sdk/lib/crt/float/float.cmake new file mode 100644 index 00000000000..5693f11e186 --- /dev/null +++ b/sdk/lib/crt/float/float.cmake @@ -0,0 +1,42 @@ + +list(APPEND LIBCNTPR_FLOAT_SOURCE + float/isnan.c +) + +list(APPEND CRT_FLOAT_SOURCE + ${LIBCNTPR_FLOAT_SOURCE} + float/chgsign.c + float/copysign.c + float/fpclass.c + float/fpecode.c + float/nafter.c + float/scalb.c +) + +if(ARCH STREQUAL "i386") + list(APPEND CRT_FLOAT_SOURCE + float/i386/clearfp.c + float/i386/cntrlfp.c + float/i386/fpreset.c + float/i386/logb.c + float/i386/statfp.c + ) +elseif(ARCH STREQUAL "amd64") + list(APPEND CRT_FLOAT_SOURCE + float/i386/cntrlfp.c + float/i386/statfp.c + ) + list(APPEND CRT_FLOAT_ASM_SOURCE + float/amd64/clearfp.S + float/amd64/getsetfpcw.S + float/amd64/fpreset.S + float/amd64/logb.S + ) +elseif(ARCH STREQUAL "arm") + list(APPEND CRT_FLOAT_ASM_SOURCE + float/arm/_clearfp.s + float/arm/_controlfp.s + float/arm/_fpreset.s + float/arm/_statusfp.s + ) +endif() diff --git a/sdk/lib/crt/libcntpr.cmake b/sdk/lib/crt/libcntpr.cmake index 178a18cd704..4105cbe4155 100644 --- a/sdk/lib/crt/libcntpr.cmake +++ b/sdk/lib/crt/libcntpr.cmake @@ -1,241 +1,26 @@ list(APPEND LIBCNTPR_SOURCE - float/isnan.c - math/abs.c - math/div.c - math/labs.c - math/rand_nt.c - mbstring/mbstrlen.c - mem/memccpy.c - mem/memcmp.c - mem/memicmp.c - misc/fltused.c - printf/_snprintf.c - printf/_snwprintf.c - printf/_vscprintf.c - printf/_vscwprintf.c - printf/_vsnprintf.c - printf/_vsnwprintf.c - printf/sprintf.c - printf/streamout.c - printf/swprintf.c - printf/vprintf.c - printf/vsprintf.c - printf/vswprintf.c - printf/wstreamout.c - search/bsearch.c - search/lfind.c - stdlib/qsort.c - string/_splitpath.c - string/_wsplitpath.c - string/ctype.c - string/iswctype.c - string/is_wctype.c - string/scanf.c - string/strcspn.c - string/stricmp.c - string/strnicmp.c - string/strlwr.c - string/strrev.c - string/strset.c - string/strstr.c - string/strupr.c - string/strpbrk.c - string/strspn.c - string/atoi64.c - string/atoi.c - string/atol.c - string/itoa.c - string/itow.c - string/mbstowcs_nt.c - string/strtoi64.c - string/strtol.c - string/strtoul.c - string/strtoull.c - string/wcs.c - string/wcstol.c - string/wcstombs_nt.c - string/wcstoul.c - string/wctype.c - string/wtoi64.c - string/wtoi.c - string/wtol.c - string/winesup.c - wstring/wcsicmp.c - wstring/wcslwr.c - wstring/wcsnicmp.c - wstring/wcsupr.c - wstring/wcscspn.c - wstring/wcsspn.c - wstring/wcsstr.c) + ${LIBCNTPR_EXCEPT_SOURCE} + ${LIBCNTPR_FLOAT_SOURCE} + ${LIBCNTPR_MATH_SOURCE} + ${LIBCNTPR_MBSTRING_SOURCE} + ${LIBCNTPR_MEM_SOURCE} + ${LIBCNTPT_MISC_SOURCE} + ${LIBCNTPR_PRINTF_SOURCE} + ${LIBCNTPR_SEARCH_SOURCE} + ${LIBCNTPR_STDLIB_SOURCE} + ${LIBCNTPR_STRING_SOURCE} + ${LIBCNTPR_WSTRING_SOURCE} +) -if(ARCH STREQUAL "i386") - list(APPEND LIBCNTPR_ASM_SOURCE - except/i386/chkstk_asm.s - setjmp/i386/setjmp.s - math/i386/alldiv_asm.s - math/i386/alldvrm_asm.s - math/i386/allmul_asm.s - math/i386/allrem_asm.s - math/i386/allshl_asm.s - math/i386/allshr_asm.s - math/i386/atan_asm.s - math/i386/atan2_asm.s - math/i386/aulldiv_asm.s - math/i386/aulldvrm_asm.s - math/i386/aullrem_asm.s - math/i386/aullshr_asm.s - math/i386/ceil_asm.s - math/i386/cos_asm.s - math/i386/fabs_asm.s - math/i386/floor_asm.s - math/i386/ftol_asm.s - math/i386/ftol2_asm.s - math/i386/log_asm.s - math/i386/log10_asm.s - math/i386/pow_asm.s - math/i386/sin_asm.s - math/i386/sqrt_asm.s - math/i386/tan_asm.s - misc/i386/readcr4.S) - - list(APPEND LIBCNTPR_SOURCE - math/i386/ci.c - math/i386/cicos.c - math/i386/cilog.c - math/i386/cipow.c - math/i386/cisin.c - math/i386/cisqrt.c - math/i386/ldexp.c) - if(NOT MSVC) - list(APPEND LIBCNTPR_SOURCE except/i386/chkstk_ms.s) - endif() -elseif(ARCH STREQUAL "amd64") - list(APPEND LIBCNTPR_ASM_SOURCE - except/amd64/chkstk_ms.s - except/amd64/seh.s - setjmp/amd64/setjmp.s - math/amd64/atan.S - math/amd64/atan2.S - math/amd64/ceil.S - math/amd64/exp.S - math/amd64/fabs.S - math/amd64/floor.S - math/amd64/floorf.S - math/amd64/fmod.S - math/amd64/ldexp.S - math/amd64/log.S - math/amd64/log10.S - math/amd64/pow.S - math/amd64/sqrt.S - math/amd64/tan.S) - list(APPEND LIBCNTPR_SOURCE - except/amd64/ehandler.c - math/cos.c - math/sin.c) -elseif(ARCH STREQUAL "arm") - list(APPEND LIBCNTPR_SOURCE - except/arm/chkstk_asm.s - except/arm/__jump_unwind.s - math/sqrt.c - math/arm/__rt_sdiv.c - math/arm/__rt_sdiv64_worker.c - math/arm/__rt_udiv.c - math/arm/__rt_udiv64_worker.c - ) - list(APPEND LIBCNTPR_ASM_SOURCE - except/arm/_abnormal_termination.s - except/arm/_except_handler2.s - except/arm/_except_handler3.s - except/arm/_global_unwind2.s - except/arm/_local_unwind2.s - except/arm/chkstk_asm.s - except/arm/ehandler.c - float/arm/_clearfp.s - float/arm/_controlfp.s - float/arm/_fpreset.s - float/arm/_statusfp.s - math/arm/atan.s - math/arm/atan2.s - math/arm/ceil.s - math/arm/exp.s - math/arm/fabs.s - math/arm/fmod.s - math/arm/floor.s - math/arm/ldexp.s - math/arm/log.s - math/arm/log10.s - math/arm/pow.s - math/arm/tan.s - math/arm/__dtoi64.s - math/arm/__dtou64.s - math/arm/__i64tod.s - math/arm/__i64tos.s - math/arm/__stoi64.s - math/arm/__stou64.s - math/arm/__u64tod.s - math/arm/__u64tos.s - math/arm/__rt_sdiv64.s - math/arm/__rt_srsh.s - math/arm/__rt_udiv64.s - setjmp/arm/setjmp.s - ) -endif() - -if(ARCH STREQUAL "i386") - list(APPEND LIBCNTPR_ASM_SOURCE - mem/i386/memchr_asm.s - mem/i386/memmove_asm.s - mem/i386/memset_asm.s - string/i386/strcat_asm.s - string/i386/strchr_asm.s - string/i386/strcmp_asm.s - string/i386/strcpy_asm.s - string/i386/strlen_asm.s - string/i386/strncat_asm.s - string/i386/strncmp_asm.s - string/i386/strncpy_asm.s - string/i386/strnlen_asm.s - string/i386/strrchr_asm.s - string/i386/wcscat_asm.s - string/i386/wcschr_asm.s - string/i386/wcscmp_asm.s - string/i386/wcscpy_asm.s - string/i386/wcslen_asm.s - string/i386/wcsncat_asm.s - string/i386/wcsncmp_asm.s - string/i386/wcsncpy_asm.s - string/i386/wcsnlen_asm.s - string/i386/wcsrchr_asm.s) -else() - list(APPEND LIBCNTPR_SOURCE - math/cos.c - math/sin.c - mem/memchr.c - mem/memcpy.c - mem/memmove.c - mem/memset.c - string/strcat.c - string/strchr.c - string/strcmp.c - string/strcpy.c - string/strlen.c - string/strncat.c - string/strncmp.c - string/strncpy.c - string/strnlen.c - string/strrchr.c - string/wcscat.c - string/wcschr.c - string/wcscmp.c - string/wcscpy.c - string/wcslen.c - string/wcsncat.c - string/wcsncmp.c - string/wcsncpy.c - string/wcsnlen.c - string/wcsrchr.c) -endif() +list(APPEND LIBCNTPR_ASM_SOURCE + ${LIBCNTPR_EXCEPT_ASM_SOURCE} + ${LIBCNTPR_FLOAT_ASM_SOURCE} + ${LIBCNTPR_MATH_ASM_SOURCE} + ${LIBCNTPR_MEM_ASM_SOURCE} + ${LIBCNTPR_SETJMP_ASM_SOURCE} + ${LIBCNTPR_STRING_ASM_SOURCE} +) set_source_files_properties(${LIBCNTPR_ASM_SOURCE} PROPERTIES COMPILE_DEFINITIONS "NO_RTL_INLINES;_NTSYSTEM_;_NTDLLBUILD_;_LIBCNT_;__CRT__NO_INLINE;CRTDLL") add_asm_files(libcntpr_asm ${LIBCNTPR_ASM_SOURCE}) diff --git a/sdk/lib/crt/math/math.cmake b/sdk/lib/crt/math/math.cmake new file mode 100644 index 00000000000..a11c62ccb3f --- /dev/null +++ b/sdk/lib/crt/math/math.cmake @@ -0,0 +1,189 @@ + +list(APPEND LIBCNTPR_MATH_SOURCE + math/abs.c + math/div.c + math/labs.c +) + +if(ARCH STREQUAL "i386") + list(APPEND LIBCNTPR_MATH_SOURCE + math/i386/ci.c + math/i386/cicos.c + math/i386/cilog.c + math/i386/cipow.c + math/i386/cisin.c + math/i386/cisqrt.c + math/i386/ldexp.c + ) + list(APPEND LIBCNTPR_MATH_ASM_SOURCE + math/i386/alldiv_asm.s + math/i386/alldvrm_asm.s + math/i386/allmul_asm.s + math/i386/allrem_asm.s + math/i386/allshl_asm.s + math/i386/allshr_asm.s + math/i386/atan_asm.s + math/i386/atan2_asm.s + math/i386/aulldiv_asm.s + math/i386/aulldvrm_asm.s + math/i386/aullrem_asm.s + math/i386/aullshr_asm.s + math/i386/ceil_asm.s + math/i386/cos_asm.s + math/i386/fabs_asm.s + math/i386/floor_asm.s + math/i386/ftol_asm.s + math/i386/ftol2_asm.s + math/i386/log_asm.s + math/i386/log10_asm.s + math/i386/pow_asm.s + math/i386/sin_asm.s + math/i386/sqrt_asm.s + math/i386/tan_asm.s + ) + list(APPEND CRT_MATH_ASM_SOURCE + math/i386/ceilf.S + math/i386/floorf.S + math/i386/exp_asm.s + math/i386/fmod_asm.s + math/i386/fmodf_asm.s + ) +elseif(ARCH STREQUAL "amd64") + list(APPEND LIBCNTPR_MATH_SOURCE + math/cos.c + math/sin.c + ) + list(APPEND LIBCNTPR_MATH_ASM_SOURCE + math/amd64/atan.S + math/amd64/atan2.S + math/amd64/ceil.S + math/amd64/exp.S + math/amd64/fabs.S + math/amd64/floor.S + math/amd64/floorf.S + math/amd64/fmod.S + math/amd64/ldexp.S + math/amd64/log.S + math/amd64/log10.S + math/amd64/pow.S + math/amd64/sqrt.S + math/amd64/tan.S + ) +elseif(ARCH STREQUAL "arm") + list(APPEND LIBCNTPR_MATH_SOURCE + math/cos.c + math/sin.c + math/sqrt.c + math/arm/__rt_sdiv.c + math/arm/__rt_sdiv64_worker.c + math/arm/__rt_udiv.c + math/arm/__rt_udiv64_worker.c + ) + list(APPEND CRT_MATH_SOURCE + math/fabsf.c + ) + list(APPEND LIBCNTPR_MATH_ASM_SOURCE + math/arm/atan.s + math/arm/atan2.s + math/arm/ceil.s + math/arm/exp.s + math/arm/fabs.s + math/arm/fmod.s + math/arm/floor.s + math/arm/ldexp.s + math/arm/log.s + math/arm/log10.s + math/arm/pow.s + math/arm/tan.s + math/arm/__dtoi64.s + math/arm/__dtou64.s + math/arm/__i64tod.s + math/arm/__i64tos.s + math/arm/__stoi64.s + math/arm/__stou64.s + math/arm/__u64tod.s + math/arm/__u64tos.s + math/arm/__rt_sdiv64.s + math/arm/__rt_srsh.s + math/arm/__rt_udiv64.s + ) + list(APPEND CRT_MATH_ASM_SOURCE + math/arm/_logb.s + ) +endif() + +if(NOT ARCH STREQUAL "i386") + list(APPEND CRT_MATH_SOURCE + math/_chgsignf.c + math/_copysignf.c + math/_hypotf.c + math/acosf.c + math/asinf.c + math/atan2f.c + math/atanf.c + math/ceilf.c + math/cos.c + math/coshf.c + math/expf.c + math/floorf.c + math/fmodf.c + math/log10f.c + math/modff.c + math/sin.c + math/sinhf.c + math/sqrtf.c + math/tanf.c + math/tanhf.c + math/stubs.c + ) +endif() + +list(APPEND CRT_MATH_SOURCE + ${LIBCNTPR_MATH_SOURCE} + math/acos.c + math/adjust.c + math/asin.c + math/cabs.c + math/cosf.c + math/cosh.c + math/fdivbug.c + math/frexp.c + math/huge_val.c + math/hypot.c + math/ieee754/j0_y0.c + math/ieee754/j1_y1.c + math/ieee754/jn_yn.c + math/j0_y0.c + math/j1_y1.c + math/jn_yn.c + math/ldiv.c + math/logf.c + math/modf.c + math/powf.c + math/rand.c + math/s_modf.c + math/sinf.c + math/sinh.c + math/tanh.c +) + +list(APPEND CRT_MATH_ASM_SOURCE + ${LIBCNTPR_MATH_ASM_SOURCE} +) + +list(APPEND LIBCNTPR_MATH_SOURCE + math/rand_nt.c +) + +if(ARCH STREQUAL "i386") + list(APPEND ATAN2_ASM_SOURCE math/i386/atan2_asm.s) +elseif(ARCH STREQUAL "amd64") + list(APPEND ATAN2_ASM_SOURCE math/amd64/atan2.S) +elseif(ARCH STREQUAL "arm") + list(APPEND ATAN2_ASM_SOURCE math/arm/atan2.s) +endif() + +add_asm_files(atan2_asm ${ATAN2_ASM_SOURCE}) +add_library(atan2 ${atan2_asm}) +set_target_properties(atan2 PROPERTIES LINKER_LANGUAGE "C") +add_dependencies(atan2 asm) diff --git a/sdk/lib/crt/mbstring/mbstring.cmake b/sdk/lib/crt/mbstring/mbstring.cmake new file mode 100644 index 00000000000..6851ccef550 --- /dev/null +++ b/sdk/lib/crt/mbstring/mbstring.cmake @@ -0,0 +1,63 @@ + +list(APPEND LIBCNTPR_MBSTRING_SOURCE + mbstring/mbstrlen.c +) + +list(APPEND CRT_MBSTRING_SOURCE + ${LIBCNTPR_MBSTRING_SOURCE} + mbstring/_setmbcp.c + mbstring/hanzen.c + mbstring/ischira.c + mbstring/iskana.c + mbstring/iskmoji.c + mbstring/iskpun.c + mbstring/islead.c + mbstring/islwr.c + mbstring/ismbal.c + mbstring/ismbaln.c + mbstring/ismbc.c + mbstring/ismbgra.c + mbstring/ismbkaln.c + mbstring/ismblead.c + mbstring/ismbpri.c + mbstring/ismbpun.c + mbstring/ismbtrl.c + mbstring/isuppr.c + mbstring/jistojms.c + mbstring/jmstojis.c + mbstring/mbbtype.c + mbstring/mbccpy.c + mbstring/mbclen.c + mbstring/mbscat.c + mbstring/mbschr.c + mbstring/mbscmp.c + mbstring/mbscoll.c + mbstring/mbscpy.c + mbstring/mbscspn.c + mbstring/mbsdec.c + mbstring/mbsdup.c + mbstring/mbsicmp.c + mbstring/mbsicoll.c + mbstring/mbsinc.c + mbstring/mbslen.c + mbstring/mbslwr.c + mbstring/mbsncat.c + mbstring/mbsnccnt.c + mbstring/mbsncmp.c + mbstring/mbsncoll.c + mbstring/mbsncpy.c + mbstring/mbsnextc.c + mbstring/mbsnicmp.c + mbstring/mbsnicoll.c + mbstring/mbsninc.c + mbstring/mbsnset.c + mbstring/mbspbrk.c + mbstring/mbsrchr.c + mbstring/mbsrev.c + mbstring/mbsset.c + mbstring/mbsspn.c + mbstring/mbsspnp.c + mbstring/mbsstr.c + mbstring/mbstok.c + mbstring/mbsupr.c +) diff --git a/sdk/lib/crt/mem/mem.cmake b/sdk/lib/crt/mem/mem.cmake new file mode 100644 index 00000000000..cc5d04a5a66 --- /dev/null +++ b/sdk/lib/crt/mem/mem.cmake @@ -0,0 +1,32 @@ + +list(APPEND LIBCNTPR_MEM_SOURCE + mem/memccpy.c + mem/memcmp.c + mem/memicmp.c +) + +if(ARCH STREQUAL "i386") + list(APPEND LIBCNTPR_MEM_ASM_SOURCE + mem/i386/memchr_asm.s + mem/i386/memmove_asm.s + mem/i386/memset_asm.s + ) + list(APPEND CRT_MEM_ASM_SOURCE + ${LIBCNTPR_MEM_ASM_SOURCE} + ) +else() + list(APPEND LIBCNTPR_MEM_SOURCE + mem/memchr.c + mem/memcpy.c + mem/memmove.c + mem/memset.c + ) +endif() + +list(APPEND CRT_MEM_SOURCE + ${LIBCNTPR_MEM_SOURCE} +) + +# Needed by ext2fs. Should use RtlCompareMemory instead? +add_library(memcmp mem/memcmp.c) +add_dependencies(memcmp psdk) diff --git a/sdk/lib/crt/misc/misc.cmake b/sdk/lib/crt/misc/misc.cmake new file mode 100644 index 00000000000..18abea274c1 --- /dev/null +++ b/sdk/lib/crt/misc/misc.cmake @@ -0,0 +1,29 @@ + +list(APPEND LIBCNTPT_MISC_SOURCE + misc/fltused.c +) + +if(ARCH STREQUAL "i386") + list(APPEND LIBCNTPR_ASM_SOURCE + misc/i386/readcr4.S + ) +endif() + +list(APPEND CRT_MISC_SOURCE + ${LIBCNTPT_MISC_SOURCE} + misc/__crt_MessageBoxA.c + misc/amsg.c + misc/assert.c + misc/environ.c + misc/getargs.c + misc/i10output.c + misc/initterm.c + misc/lock.c + misc/purecall.c + misc/stubs.c + misc/tls.c +) + +add_library(getopt misc/getopt.c) +target_compile_definitions(getopt PRIVATE _DLL __USE_CRTIMP) +add_dependencies(getopt psdk) diff --git a/sdk/lib/crt/printf/printf.cmake b/sdk/lib/crt/printf/printf.cmake new file mode 100644 index 00000000000..7b68b88e360 --- /dev/null +++ b/sdk/lib/crt/printf/printf.cmake @@ -0,0 +1,50 @@ + +list(APPEND LIBCNTPR_PRINTF_SOURCE + printf/_snprintf.c + printf/_snwprintf.c + printf/_vscprintf.c + printf/_vscwprintf.c + printf/_vsnprintf.c + printf/_vsnwprintf.c + printf/sprintf.c + printf/streamout.c + printf/swprintf.c + printf/vprintf.c + printf/vsprintf.c + printf/vswprintf.c + printf/wstreamout.c +) + +list(APPEND CRT_PRINTF_SOURCE + ${LIBCNTPR_PRINTF_SOURCE} + printf/_cprintf.c + printf/_cwprintf.c + printf/_scprintf.c + printf/_scwprintf.c + printf/_snprintf_s.c + printf/_snwprintf_s.c + printf/_vcprintf.c + printf/_vcwprintf.c + printf/_vsnprintf_s.c + printf/_vsnwprintf_s.c + printf/_vsprintf_p.c + printf/fprintf.c + printf/fprintf_s.c + printf/fwprintf.c + printf/fwprintf_s.c + printf/printf.c + printf/printf_s.c + printf/sprintf_s.c + printf/swprintf_s.c + printf/vfprintf.c + printf/vfprintf_s.c + printf/vfwprintf.c + printf/vfwprintf_s.c + printf/vprintf_s.c + printf/vsprintf_s.c + printf/vswprintf_s.c + printf/vwprintf.c + printf/vwprintf_s.c + printf/wprintf.c + printf/wprintf_s.c +) diff --git a/sdk/lib/crt/process/process.cmake b/sdk/lib/crt/process/process.cmake new file mode 100644 index 00000000000..d84b3484c7d --- /dev/null +++ b/sdk/lib/crt/process/process.cmake @@ -0,0 +1,12 @@ + +list(APPEND CRT_PROCESS_SOURCE + process/_cwait.c + process/_system.c + process/dll.c + process/process.c + process/procid.c + process/thread.c + process/threadid.c + process/threadx.c + process/wprocess.c +) diff --git a/sdk/lib/crt/search/search.cmake b/sdk/lib/crt/search/search.cmake new file mode 100644 index 00000000000..066088c2cfa --- /dev/null +++ b/sdk/lib/crt/search/search.cmake @@ -0,0 +1,10 @@ + +list(APPEND LIBCNTPR_SEARCH_SOURCE + search/bsearch.c + search/lfind.c +) + +list(APPEND CRT_SEARCH_SOURCE + ${LIBCNTPR_SEARCH_SOURCE} + search/lsearch.c +) diff --git a/sdk/lib/crt/setjmp/setjmp.cmake b/sdk/lib/crt/setjmp/setjmp.cmake new file mode 100644 index 00000000000..05ff378f7b5 --- /dev/null +++ b/sdk/lib/crt/setjmp/setjmp.cmake @@ -0,0 +1,18 @@ + +if(ARCH STREQUAL "i386") + list(APPEND LIBCNTPR_SETJMP_ASM_SOURCE + setjmp/i386/setjmp.s + ) +elseif(ARCH STREQUAL "amd64") + list(APPEND LIBCNTPR_SETJMP_ASM_SOURCE + setjmp/amd64/setjmp.s + ) +elseif(ARCH STREQUAL "arm") + list(APPEND LIBCNTPR_SETJMP_ASM_SOURCE + setjmp/arm/setjmp.s + ) +endif() + +list(APPEND CRT_SETJMP_ASM_SOURCE + ${LIBCNTPR_SETJMP_ASM_SOURCE} +) diff --git a/sdk/lib/crt/startup/startup.cmake b/sdk/lib/crt/startup/startup.cmake new file mode 100644 index 00000000000..b2d3070c12d --- /dev/null +++ b/sdk/lib/crt/startup/startup.cmake @@ -0,0 +1,29 @@ + +list(APPEND CRT_STARTUP_SOURCE + startup/crtexe.c + startup/wcrtexe.c + startup/crt_handler.c + startup/crtdll.c + startup/_newmode.c + startup/wildcard.c + startup/tlssup.c + startup/mingw_helpers.c + startup/natstart.c + startup/charmax.c + #startup/merr.c + startup/atonexit.c + #startup/txtmode.c + startup/pesect.c + startup/tlsmcrt.c + startup/tlsthrd.c + startup/tlsmthread.c + startup/cinitexe.c + startup/gs_support.c + startup/dll_argv.c + startup/dllargv.c + startup/wdllargv.c + startup/crt0_c.c + startup/crt0_w.c + startup/dllentry.c + startup/reactos.c +) diff --git a/sdk/lib/crt/stdio/stdio.cmake b/sdk/lib/crt/stdio/stdio.cmake new file mode 100644 index 00000000000..7b2974a2ae8 --- /dev/null +++ b/sdk/lib/crt/stdio/stdio.cmake @@ -0,0 +1,22 @@ + +list(APPEND CRT_STDIO_SOURCE + stdio/_flsbuf.c + stdio/_flswbuf.c + stdio/access.c + stdio/file.c + stdio/find.c + stdio/find64.c + stdio/findi64.c + stdio/fmode.c + stdio/perror.c + stdio/popen.c + stdio/stat.c + stdio/stat64.c + stdio/waccess.c + stdio/wfind.c + stdio/wfind64.c + stdio/wfindi64.c + stdio/wpopen.c + stdio/wstat.c + stdio/wstat64.c +) diff --git a/sdk/lib/crt/stdlib/stdlib.cmake b/sdk/lib/crt/stdlib/stdlib.cmake new file mode 100644 index 00000000000..5325319f839 --- /dev/null +++ b/sdk/lib/crt/stdlib/stdlib.cmake @@ -0,0 +1,49 @@ + +list(APPEND LIBCNTPR_STDLIB_SOURCE + stdlib/qsort.c +) + +list(APPEND CRT_STDLIB_SOURCE + ${LIBCNTPR_STDLIB_SOURCE} + stdlib/_exit.c + stdlib/_set_abort_behavior.c + stdlib/abort.c + stdlib/atexit.c + stdlib/ecvt.c + stdlib/errno.c + stdlib/fcvt.c + stdlib/fcvtbuf.c + stdlib/fullpath.c + stdlib/gcvt.c + stdlib/getenv.c + stdlib/makepath.c + stdlib/makepath_s.c + stdlib/mbtowc.c + stdlib/mbstowcs.c + stdlib/obsol.c + stdlib/putenv.c + stdlib/rot.c + stdlib/senv.c + stdlib/swab.c + stdlib/wfulpath.c + stdlib/wputenv.c + stdlib/wsenv.c + stdlib/wmakpath.c + stdlib/wmakpath_s.c +) + +if(USE_CLANG_CL) + # clang-cl is missing pragma function support + # https://bugs.llvm.org/show_bug.cgi?id=35116 + set_property(SOURCE stdlib/rot.c APPEND_STRING PROPERTY COMPILE_FLAGS " /fallback") + + if(ARCH STREQUAL "i386") + list(APPEND CRT_STDLIB_ASM_SOURCE + stdlib/clang-alias.s + ) + elseif(ARCH STREQUAL "amd64") + list(APPEND CRT_STDLIB_ASM_SOURCE + stdlib/clang-alias.s + ) + endif() +endif() diff --git a/sdk/lib/crt/string/string.cmake b/sdk/lib/crt/string/string.cmake new file mode 100644 index 00000000000..e7e95c8a1b6 --- /dev/null +++ b/sdk/lib/crt/string/string.cmake @@ -0,0 +1,128 @@ + +list(APPEND LIBCNTPR_STRING_SOURCE + string/_splitpath.c + string/_wsplitpath.c + string/ctype.c + string/iswctype.c + string/is_wctype.c + string/scanf.c + string/strcspn.c + string/stricmp.c + string/strnicmp.c + string/strlwr.c + string/strrev.c + string/strset.c + string/strstr.c + string/strupr.c + string/strpbrk.c + string/strspn.c + string/atoi64.c + string/atoi.c + string/atol.c + string/itoa.c + string/itow.c + string/strtoi64.c + string/strtol.c + string/strtoul.c + string/strtoull.c + string/wcs.c + string/wcstol.c + string/wcstoul.c + string/wctype.c + string/wtoi64.c + string/wtoi.c + string/wtol.c + string/winesup.c +) + +if(ARCH STREQUAL "i386") + list(APPEND LIBCNTPR_STRING_ASM_SOURCE + string/i386/strcat_asm.s + string/i386/strchr_asm.s + string/i386/strcmp_asm.s + string/i386/strcpy_asm.s + string/i386/strlen_asm.s + string/i386/strncat_asm.s + string/i386/strncmp_asm.s + string/i386/strncpy_asm.s + string/i386/strnlen_asm.s + string/i386/strrchr_asm.s + string/i386/wcscat_asm.s + string/i386/wcschr_asm.s + string/i386/wcscmp_asm.s + string/i386/wcscpy_asm.s + string/i386/wcslen_asm.s + string/i386/wcsncat_asm.s + string/i386/wcsncmp_asm.s + string/i386/wcsncpy_asm.s + string/i386/wcsnlen_asm.s + string/i386/wcsrchr_asm.s + ) +else() + list(APPEND LIBCNTPR_STRING_SOURCE + string/strcat.c + string/strchr.c + string/strcmp.c + string/strcpy.c + string/strlen.c + string/strncat.c + string/strncmp.c + string/strncpy.c + string/strnlen.c + string/strrchr.c + string/wcscat.c + string/wcschr.c + string/wcscmp.c + string/wcscpy.c + string/wcslen.c + string/wcsncat.c + string/wcsncmp.c + string/wcsncpy.c + string/wcsnlen.c + string/wcsrchr.c + ) +endif() + +list(APPEND CRT_STRING_SOURCE + ${LIBCNTPR_STRING_SOURCE} + string/_mbsnlen.c + string/_mbstrnlen.c + string/_splitpath_s.c + string/_wcslwr_s.c + string/_wsplitpath_s.c + string/atof.c + string/mbstowcs_s.c + string/strcoll.c + string/strdup.c + string/strerror.c + string/string.c + string/strncoll.c + string/strtod.c + string/strtok.c + string/strtok_s.c + string/strtoul.c + string/strxfrm.c + string/wcstombs_s.c + string/wtof.c +) + +list(APPEND CRT_STRING_ASM_SOURCE + ${LIBCNTPR_STRING_ASM_SOURCE} +) + +list(APPEND LIBCNTPR_STRING_SOURCE + string/mbstowcs_nt.c + string/wcstombs_nt.c +) + +# Used by acpi.sys +add_library(strtol + string/ctype.c + string/iswctype.c + string/strtoi64.c + string/strtol.c + string/strtoul.c + string/strtoull.c + string/wctype.c) +target_compile_definitions(strtol PRIVATE _LIBCNT_) +add_dependencies(strtol psdk) diff --git a/sdk/lib/crt/time/time.cmake b/sdk/lib/crt/time/time.cmake new file mode 100644 index 00000000000..f6459f55538 --- /dev/null +++ b/sdk/lib/crt/time/time.cmake @@ -0,0 +1,41 @@ + +list(APPEND CRT_TIME_SOURCE + time/asctime.c + time/clock.c + time/ctime32.c + time/ctime64.c + time/ctime.c + time/difftime32.c + time/difftime64.c + time/difftime.c + time/ftime32.c + time/ftime64.c + time/ftime.c + time/futime32.c + time/futime64.c + time/futime.c + time/gmtime.c + time/localtime32.c + time/localtime64.c + time/localtime.c + time/mktime.c + time/strdate.c + time/strftime.c + time/strtime.c + time/time32.c + time/time64.c + time/time.c + time/timezone.c + time/utime32.c + time/utime64.c + time/utime.c + time/wasctime.c + time/wctime32.c + time/wctime64.c + time/wctime.c + time/wstrdate.c + time/wstrtime.c + time/wutime32.c + time/wutime64.c + time/wutime.c +) diff --git a/sdk/lib/crt/wine/wine.cmake b/sdk/lib/crt/wine/wine.cmake new file mode 100644 index 00000000000..6a4346d64e3 --- /dev/null +++ b/sdk/lib/crt/wine/wine.cmake @@ -0,0 +1,26 @@ + +list(APPEND CRT_WINE_SOURCE + wine/cpp.c + wine/except.c + wine/heap.c + wine/undname.c +) + +if(ARCH STREQUAL "i386") + list(APPEND CRT_WINE_SOURCE + wine/except_i386.c + ) +elseif(ARCH STREQUAL "amd64") + list(APPEND CRT_WINE_SOURCE + wine/except_x86_64.c + ) +elseif(ARCH STREQUAL "arm") + list(APPEND CRT_WINE_SOURCE + wine/except_arm.c + ) +endif() + +# includes for wine code +include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) + +#set_source_files_properties(${CRT_WINE_SOURCE} PROPERTIES INCLUDE_DIRECTORIES) diff --git a/sdk/lib/crt/wstring/wstring.cmake b/sdk/lib/crt/wstring/wstring.cmake new file mode 100644 index 00000000000..e636367cf11 --- /dev/null +++ b/sdk/lib/crt/wstring/wstring.cmake @@ -0,0 +1,17 @@ + +list(APPEND LIBCNTPR_WSTRING_SOURCE + wstring/wcsicmp.c + wstring/wcslwr.c + wstring/wcsnicmp.c + wstring/wcsupr.c + wstring/wcscspn.c + wstring/wcsspn.c + wstring/wcsstr.c +) + +list(APPEND CRT_WSTRING_SOURCE + ${LIBCNTPR_WSTRING_SOURCE} + wstring/wcscoll.c + wstring/wcstok.c + wstring/wcsxfrm.c +)

3 years, 5 months

[reactos] 03/03: [HAL/APIC] Make the real time clock more precise

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3e1454c739ca7f59d4ce6… commit 3e1454c739ca7f59d4ce686a5b6a8aa9c22d0e7e Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Fri Jul 16 11:42:45 2021 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Mon Jul 19 23:05:03 2021 +0200 [HAL/APIC] Make the real time clock more precise The interval time is now calculated in 0.1ns precision and a running fraction on the 100ns interval is updated on each clock interrupt. Also adjust minimum, maximum and default clock rate to what Windows uses. --- hal/halx86/apic/rtctimer.c | 99 +++++++++++++++++++++++++++------------------- 1 file changed, 59 insertions(+), 40 deletions(-) diff --git a/hal/halx86/apic/rtctimer.c b/hal/halx86/apic/rtctimer.c index 4c0b27dbc06..50b50248366 100644 --- a/hal/halx86/apic/rtctimer.c +++ b/hal/halx86/apic/rtctimer.c @@ -18,56 +18,62 @@ /* GLOBALS ********************************************************************/ -BOOLEAN HalpClockSetMSRate; -UCHAR HalpNextMSRate; -UCHAR HalpCurrentRate = 9; /* Initial rate 9: 128 Hz / 7.8 ms */ -ULONG HalpCurrentTimeIncrement; -static UCHAR RtcMinimumClockRate = 8; /* Minimum rate 8: 256 Hz / 3.9 ms */ -static UCHAR RtcMaximumClockRate = 12; /* Maximum rate 12: 16 Hz / 62.5 ms */ +static const UCHAR RtcMinimumClockRate = 6; /* Minimum rate 6: 1024 Hz / 0.97 ms */ +static const UCHAR RtcMaximumClockRate = 10; /* Maximum rate 10: 64 Hz / 15.6 ms */ +static UCHAR HalpCurrentClockRate = 10; /* Initial rate 10: 64 Hz / 15.6 ms */ +static ULONG HalpCurrentTimeIncrement; +static ULONG HalpMinimumTimeIncrement; +static ULONG HalpMaximumTimeIncrement; +static ULONG HalpCurrentFractionalIncrement; +static ULONG HalpRunningFraction; +static BOOLEAN HalpSetClockRate; +static UCHAR HalpNextClockRate; /*! \brief Converts the CMOS RTC rate into the time increment in 100ns intervals. - Rate Freqency Interval (ms) Result - ------------------------------------- + Rate Frequency Interval (ms) Precise increment (0.1ns) + ------------------------------------------------------ 0 disabled - 1 32768 0.03052 305 - 2 16384 0.06103 610 - 3 8192 0.12207 1221 - 4 4096 0.24414 2441 - 5 2048 0.48828 4883 - 6 1024 0.97656 9766 - 7 512 1.95313 19531 - 8 256 3.90625 39063 - 9 128 7.8125 78125 - 10 64 15.6250 156250 - 11 32 31.25 312500 - 12 16 62.5 625000 - 13 8 125 1250000 - 14 4 250 2500000 - 15 2 500 5000000 + 1 32768 0.03052 305,175 + 2 16384 0.06103 610,351 + 3 8192 0.12207 1,220,703 + 4 4096 0.24414 2,441,406 + 5 2048 0.48828 4,882,812 + 6 1024 0.97656 9,765,625 <- minimum + 7 512 1.95313 19,531,250 + 8 256 3.90625 39,062,500 + 9 128 7.8125 78,125,000 + 10 64 15.6250 156,250,000 <- maximum / default + 11 32 31.25 312,500,000 + 12 16 62.5 625,000,000 + 13 8 125 1,250,000,000 + 14 4 250 2,500,000,000 + 15 2 500 5,000,000,000 */ FORCEINLINE ULONG -RtcClockRateToIncrement(UCHAR Rate) +RtcClockRateToPreciseIncrement(UCHAR Rate) { /* Calculate frequency */ - ULONG Freqency = 32768 >> (Rate - 1); + ULONG Frequency = 32768 >> (Rate - 1); - /* Calculate interval in 100ns interval: Interval = (1 / Frequency) * 10000000 - This formula will round properly, instead of truncating. */ - return (10000000 + (Freqency/2)) / Freqency; + /* Calculate interval in 0.1ns interval: Interval = (1 / Frequency) * 10,000,000,000 */ + return 10000000000ULL / Frequency; } VOID RtcSetClockRate(UCHAR ClockRate) { UCHAR RegisterA; + ULONG PreciseIncrement; /* Update the global values */ - HalpCurrentRate = ClockRate; - HalpCurrentTimeIncrement = RtcClockRateToIncrement(ClockRate); + HalpCurrentClockRate = ClockRate; + PreciseIncrement = RtcClockRateToPreciseIncrement(ClockRate); + HalpCurrentTimeIncrement = PreciseIncrement / 1000; + HalpCurrentFractionalIncrement = PreciseIncrement % 1000; /* Acquire CMOS lock */ HalpAcquireCmosSpinLock(); @@ -113,14 +119,17 @@ HalpInitializeClock(VOID) HalpReleaseCmosSpinLock(); /* Set initial rate */ - RtcSetClockRate(HalpCurrentRate); + RtcSetClockRate(HalpCurrentClockRate); /* Restore interrupt state */ __writeeflags(EFlags); + /* Calculate minumum and maximum increment */ + HalpMinimumTimeIncrement = RtcClockRateToPreciseIncrement(RtcMinimumClockRate) / 1000; + HalpMaximumTimeIncrement = RtcClockRateToPreciseIncrement(RtcMaximumClockRate) / 1000; + /* Notify the kernel about the maximum and minimum increment */ - KeSetTimeIncrement(RtcClockRateToIncrement(RtcMaximumClockRate), - RtcClockRateToIncrement(RtcMinimumClockRate)); + KeSetTimeIncrement(HalpMaximumTimeIncrement, HalpMinimumTimeIncrement); /* Enable the timer interrupt */ HalEnableSystemInterrupt(APIC_CLOCK_VECTOR, CLOCK_LEVEL, Latched); @@ -155,14 +164,22 @@ HalpClockInterruptHandler(IN PKTRAP_FRAME TrapFrame) /* Save increment */ LastIncrement = HalpCurrentTimeIncrement; + /* Check if the running fraction has accounted for 100 ns */ + HalpRunningFraction += HalpCurrentFractionalIncrement; + if (HalpRunningFraction >= 1000) + { + LastIncrement++; + HalpRunningFraction -= 1000; + } + /* Check if someone changed the time rate */ - if (HalpClockSetMSRate) + if (HalpSetClockRate) { /* Set new clock rate */ - RtcSetClockRate(HalpNextMSRate); + RtcSetClockRate(HalpNextClockRate); /* We're done */ - HalpClockSetMSRate = FALSE; + HalpSetClockRate = FALSE; } /* Update the system time -- on x86 the kernel will exit this trap */ @@ -174,18 +191,20 @@ NTAPI HalSetTimeIncrement(IN ULONG Increment) { UCHAR Rate; + ULONG CurrentIncrement; /* Lookup largest value below given Increment */ for (Rate = RtcMinimumClockRate; Rate <= RtcMaximumClockRate; Rate++) { /* Check if this is the largest rate possible */ - if (RtcClockRateToIncrement(Rate + 1) > Increment) break; + CurrentIncrement = RtcClockRateToPreciseIncrement(Rate + 1) / 1000; + if (Increment > CurrentIncrement) break; } /* Set the rate and tell HAL we want to change it */ - HalpNextMSRate = Rate; - HalpClockSetMSRate = TRUE; + HalpNextClockRate = Rate; + HalpSetClockRate = TRUE; /* Return the real increment */ - return RtcClockRateToIncrement(Rate); + return RtcClockRateToPreciseIncrement(Rate) / 1000; }

3 years, 5 months

[reactos] 02/03: [HAL/APIC] Fix clock initialization

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=aa3ef4c6326abba7d2617… commit aa3ef4c6326abba7d261798c42918d88d3a1eedb Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Fri Jul 16 11:45:39 2021 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Mon Jul 19 23:05:03 2021 +0200 [HAL/APIC] Fix clock initialization Previously we enabled the timer interrupt, before the kernel was notified of our time increment, so when a clock interrupt happened, it would increment the tick count, but add 0 to the system time, resulting in an invalid state, in which timers would be inserted into the wrong timer table slot. Fixes CORE-16253 --- hal/halx86/apic/apic.c | 4 ++-- hal/halx86/apic/rtctimer.c | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/hal/halx86/apic/apic.c b/hal/halx86/apic/apic.c index 9f204bded55..69f1841642c 100644 --- a/hal/halx86/apic/apic.c +++ b/hal/halx86/apic/apic.c @@ -463,12 +463,12 @@ ApicInitializeIOApic(VOID) HalpVectorToIndex[Vector] = APIC_FREE_VECTOR; } - /* Enable the timer interrupt */ + /* Enable the timer interrupt (but keep it masked) */ ReDirReg.Vector = APIC_CLOCK_VECTOR; ReDirReg.DeliveryMode = APIC_MT_Fixed; ReDirReg.DestinationMode = APIC_DM_Physical; ReDirReg.TriggerMode = APIC_TGM_Edge; - ReDirReg.Mask = 0; + ReDirReg.Mask = 1; ReDirReg.Destination = ApicRead(APIC_ID); ApicWriteIORedirectionEntry(APIC_CLOCK_INDEX, ReDirReg); } diff --git a/hal/halx86/apic/rtctimer.c b/hal/halx86/apic/rtctimer.c index f4761c5d31f..4c0b27dbc06 100644 --- a/hal/halx86/apic/rtctimer.c +++ b/hal/halx86/apic/rtctimer.c @@ -122,6 +122,8 @@ HalpInitializeClock(VOID) KeSetTimeIncrement(RtcClockRateToIncrement(RtcMaximumClockRate), RtcClockRateToIncrement(RtcMinimumClockRate)); + /* Enable the timer interrupt */ + HalEnableSystemInterrupt(APIC_CLOCK_VECTOR, CLOCK_LEVEL, Latched); DPRINT1("Clock initialized\n"); }

3 years, 5 months

← Newer
1
2
3
4
5
6
7
8
...
15
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 2021