Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [EXPLORER] Fix taskbar icon display problem (#4538)
by Thamatip Chitpong 30 Jun '22

30 Jun '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8a3db976a21f5378b4c84… commit 8a3db976a21f5378b4c840219f668404bdf852b1 Author: Thamatip Chitpong <tangaming123456(a)outlook.com> AuthorDate: Thu Jun 30 20:10:47 2022 +0700 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Jun 30 16:10:47 2022 +0300 [EXPLORER] Fix taskbar icon display problem (#4538) - Use SMTO_NOTIMEOUTIFNOTHUNG to get the icon with least timeout. - Replace GCL_* consts with GCLP_* since we're using GetClassLongPtr. Now the icon is correctly displayed for control panel applets. CORE-18137 --- base/shell/explorer/taskswnd.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/base/shell/explorer/taskswnd.cpp b/base/shell/explorer/taskswnd.cpp index e7f224ea136..da260dbc3e2 100644 --- a/base/shell/explorer/taskswnd.cpp +++ b/base/shell/explorer/taskswnd.cpp @@ -491,7 +491,7 @@ public: { HICON hIcon = NULL; #define GET_ICON(type) \ - SendMessageTimeout(hwnd, WM_GETICON, (type), 0, SMTO_ABORTIFHUNG, 100, (PDWORD_PTR)&hIcon) + SendMessageTimeout(hwnd, WM_GETICON, (type), 0, SMTO_NOTIMEOUTIFNOTHUNG, 100, (PDWORD_PTR)&hIcon) LRESULT bAlive = GET_ICON(ICON_SMALL2); if (hIcon) @@ -512,11 +512,11 @@ public: } #undef GET_ICON - hIcon = (HICON)GetClassLongPtr(hwnd, GCL_HICONSM); + hIcon = (HICON)GetClassLongPtr(hwnd, GCLP_HICONSM); if (hIcon) return hIcon; - return (HICON)GetClassLongPtr(hwnd, GCL_HICON); + return (HICON)GetClassLongPtr(hwnd, GCLP_HICON); } INT UpdateTaskItemButton(IN PTASK_ITEM TaskItem)

1 0

[reactos] 01/01: [NTOS:SE] Properly handle dynamic counters in token
by George Bișoc 29 Jun '22

29 Jun '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4471ee4dfaddb2440601f… commit 4471ee4dfaddb2440601fd61c01542b586b7c2d0 Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Tue Jun 21 22:02:22 2022 +0200 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Wed Jun 29 10:06:37 2022 +0200 [NTOS:SE] Properly handle dynamic counters in token On current master, ReactOS faces these problems: - ObCreateObject charges both paged and non paged pool a size of TOKEN structure, not the actual dynamic contents of WHAT IS inside a token. For paged pool charge the size is that of the dynamic area (primary group + default DACL if any). This is basically what DynamicCharged is for. For the non paged pool charge, the actual charge is that of TOKEN structure upon creation. On duplication and filtering however, the paged pool charge size is that of the inherited dynamic charged space from an existing token whereas the non paged pool size is that of the calculated token body length for the new duplicated/filtered token. On current master, we're literally cheating the kernel by charging the wrong amount of quota not taking into account the dynamic contents which they come from UM. - Both DynamicCharged and DynamicAvailable are not fully handled (DynamicAvailable is pretty much poorly handled with some cases still to be taking into account). DynamicCharged is barely handled, like at all. - As a result of these two points above, NtSetInformationToken doesn't check when the caller wants to set up a new default token DACL or primary group if the newly DACL or the said group exceeds the dynamic charged boundary. So what happens is that I'm going to act like a smug bastard fat politician and whack the primary group and DACL of an token however I want to, because why in the hell not? In reality no, the kernel has to punish whoever attempts to do that, although we currently don't. - The dynamic area (aka DynamicPart) only picks up the default DACL but not the primary group as well. Generally the dynamic part is composed of primary group and default DACL, if provided. In addition to that, we aren't returning the dynamic charged and available area in token statistics. SepComputeAvailableDynamicSpace helper is here to accommodate that. Apparently Windows is calculating the dynamic available area rather than just querying the DynamicAvailable field directly from the token. My theory regarding this is like the following: on Windows both TokenDefaultDacl and TokenPrimaryGroup classes are barely used by the system components during startup (LSASS provides both a DACL and primary group when calling NtCreateToken anyway). In fact DynamicAvailable is 0 during token creation, duplication and filtering when inspecting a token with WinDBG. So if an application wants to query token statistics that application will face a dynamic available space of 0. --- ntoskrnl/include/internal/se.h | 11 +++ ntoskrnl/se/token.c | 141 ++++++++++++++++++++++++++++ ntoskrnl/se/tokencls.c | 177 ++++++++++++++++++++++++----------- ntoskrnl/se/tokenlif.c | 207 +++++++++++++++++++++++++++++------------ 4 files changed, 419 insertions(+), 117 deletions(-) diff --git a/ntoskrnl/include/internal/se.h b/ntoskrnl/include/internal/se.h index de65310b331..b81585c64eb 100644 --- a/ntoskrnl/include/internal/se.h +++ b/ntoskrnl/include/internal/se.h @@ -390,6 +390,17 @@ SepRemoveUserGroupToken( _Inout_ PTOKEN Token, _In_ ULONG Index); +ULONG +SepComputeAvailableDynamicSpace( + _In_ ULONG DynamicCharged, + _In_ PSID PrimaryGroup, + _In_opt_ PACL DefaultDacl); + +NTSTATUS +SepRebuildDynamicPartOfToken( + _In_ PTOKEN Token, + _In_ ULONG NewDynamicPartSize); + BOOLEAN NTAPI SeTokenCanImpersonate( diff --git a/ntoskrnl/se/token.c b/ntoskrnl/se/token.c index ad2dd8e806f..33354f2ea8b 100644 --- a/ntoskrnl/se/token.c +++ b/ntoskrnl/se/token.c @@ -636,6 +636,147 @@ SepRemoveUserGroupToken( Token->UserAndGroupCount--; } +/** + * @brief + * Computes the exact available dynamic area of an access + * token whilst querying token statistics. + * + * @param[in] DynamicCharged + * The current charged dynamic area of an access token. + * This must not be 0! + * + * @param[in] PrimaryGroup + * A pointer to a primary group SID. + * + * @param[in] DefaultDacl + * If provided, this pointer points to a default DACL of an + * access token. + * + * @return + * Returns the calculated available dynamic area. + */ +ULONG +SepComputeAvailableDynamicSpace( + _In_ ULONG DynamicCharged, + _In_ PSID PrimaryGroup, + _In_opt_ PACL DefaultDacl) +{ + ULONG DynamicAvailable; + + PAGED_CODE(); + + /* A token's dynamic area is always charged */ + ASSERT(DynamicCharged != 0); + + /* + * Take into account the default DACL if + * the token has one. Otherwise the occupied + * space is just the present primary group. + */ + DynamicAvailable = DynamicCharged - RtlLengthSid(PrimaryGroup); + if (DefaultDacl) + { + DynamicAvailable -= DefaultDacl->AclSize; + } + + return DynamicAvailable; +} + +/** + * @brief + * Re-builds the dynamic part area of an access token + * during an a default DACL or primary group replacement + * within the said token if the said dynamic area can't + * hold the new security content. + * + * @param[in] AccessToken + * A pointer to an access token where its dynamic part + * is to be re-built and expanded based upon the new + * dynamic part size provided by the caller. Dynamic + * part expansion is not always guaranteed. See Remarks + * for further information. + * + * @param[in] NewDynamicPartSize + * The new dynamic part size. + * + * @return + * Returns STATUS_SUCCESS if the function has completed its + * operations successfully. STATUS_INSUFFICIENT_RESOURCES + * is returned if the new dynamic part could not be allocated. + * + * @remarks + * STATUS_SUCCESS does not indicate if the function has re-built + * the dynamic part of a token. If the current dynamic area size + * suffices the new dynamic area length provided by the caller + * then the dynamic area can hold the new security content buffer + * so dynamic part expansion is not necessary. + */ +NTSTATUS +SepRebuildDynamicPartOfToken( + _Inout_ PTOKEN AccessToken, + _In_ ULONG NewDynamicPartSize) +{ + PVOID NewDynamicPart; + PVOID PreviousDynamicPart; + ULONG CurrentDynamicLength; + + PAGED_CODE(); + + /* Sanity checks */ + ASSERT(AccessToken); + ASSERT(NewDynamicPartSize != 0); + + /* + * Compute the exact length of the available + * dynamic part of the access token. + */ + CurrentDynamicLength = AccessToken->DynamicAvailable + RtlLengthSid(AccessToken->PrimaryGroup); + if (AccessToken->DefaultDacl) + { + CurrentDynamicLength += AccessToken->DefaultDacl->AclSize; + } + + /* + * Figure out if the current dynamic part is too small + * to fit new contents inside the said dynamic part. + * Rebuild the dynamic area and expand it if necessary. + */ + if (CurrentDynamicLength < NewDynamicPartSize) + { + NewDynamicPart = ExAllocatePoolWithTag(PagedPool, + NewDynamicPartSize, + TAG_TOKEN_DYNAMIC); + if (NewDynamicPart == NULL) + { + DPRINT1("SepRebuildDynamicPartOfToken(): Insufficient resources to allocate new dynamic part!\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Copy the existing dynamic part */ + PreviousDynamicPart = AccessToken->DynamicPart; + RtlCopyMemory(NewDynamicPart, PreviousDynamicPart, CurrentDynamicLength); + + /* Update the available dynamic area and assign new dynamic */ + AccessToken->DynamicAvailable += NewDynamicPartSize - CurrentDynamicLength; + AccessToken->DynamicPart = NewDynamicPart; + + /* Move the contents (primary group and default DACL) addresses as well */ + AccessToken->PrimaryGroup = (PSID)((ULONG_PTR)AccessToken->DynamicPart + + ((ULONG_PTR)AccessToken->PrimaryGroup - (ULONG_PTR)PreviousDynamicPart)); + if (AccessToken->DefaultDacl != NULL) + { + AccessToken->DefaultDacl = (PACL)((ULONG_PTR)AccessToken->DynamicPart + + ((ULONG_PTR)AccessToken->DefaultDacl - (ULONG_PTR)PreviousDynamicPart)); + } + + /* And discard the previous dynamic part */ + DPRINT("SepRebuildDynamicPartOfToken(): The dynamic part has been re-built with success!\n"); + ExFreePoolWithTag(PreviousDynamicPart, TAG_TOKEN_DYNAMIC); + } + + return STATUS_SUCCESS; +} + /** * @unimplemented * @brief diff --git a/ntoskrnl/se/tokencls.c b/ntoskrnl/se/tokencls.c index 8bb5598ce9e..4810996114e 100644 --- a/ntoskrnl/se/tokencls.c +++ b/ntoskrnl/se/tokencls.c @@ -398,7 +398,7 @@ SeQueryInformationToken( ts->TokenType = Token->TokenType; ts->ImpersonationLevel = Token->ImpersonationLevel; ts->DynamicCharged = Token->DynamicCharged; - ts->DynamicAvailable = Token->DynamicAvailable; + ts->DynamicAvailable = SepComputeAvailableDynamicSpace(Token->DynamicCharged, Token->PrimaryGroup, Token->DefaultDacl); ts->GroupCount = Token->UserAndGroupCount - 1; ts->PrivilegeCount = Token->PrivilegeCount; ts->ModifiedId = Token->ModifiedId; @@ -854,7 +854,7 @@ NtQueryInformationToken( ts->TokenType = Token->TokenType; ts->ImpersonationLevel = Token->ImpersonationLevel; ts->DynamicCharged = Token->DynamicCharged; - ts->DynamicAvailable = Token->DynamicAvailable; + ts->DynamicAvailable = SepComputeAvailableDynamicSpace(Token->DynamicCharged, Token->PrimaryGroup, Token->DefaultDacl); ts->GroupCount = Token->UserAndGroupCount - 1; ts->PrivilegeCount = Token->PrivilegeCount; ts->ModifiedId = Token->ModifiedId; @@ -1116,7 +1116,7 @@ NtQueryInformationToken( * the operation in question. A failure NTSTATUS code is returned otherwise. * * @remarks - * The function is partly implemented, mainly TokenOrigin and TokenDefaultDacl. + * The function is partly implemented, mainly TokenOrigin. */ _Must_inspect_result_ __kernel_entry @@ -1227,8 +1227,9 @@ NtSetInformationToken( if (TokenInformationLength >= sizeof(TOKEN_PRIMARY_GROUP)) { PTOKEN_PRIMARY_GROUP tpg = (PTOKEN_PRIMARY_GROUP)TokenInformation; + ULONG_PTR PrimaryGroup; PSID InputSid = NULL, CapturedSid; - ULONG PrimaryGroupIndex; + ULONG PrimaryGroupIndex, NewDynamicLength; _SEH2_TRY { @@ -1251,17 +1252,73 @@ NtSetInformationToken( /* Lock the token */ SepAcquireTokenLockExclusive(Token); - /* Find the primary group amongst the existing token user and groups */ - Status = SepFindPrimaryGroupAndDefaultOwner(Token, - CapturedSid, - NULL, - &PrimaryGroupIndex, - NULL); + /* + * We can whack the token's primary group only if + * the charged dynamic space boundary allows us + * to do so. Exceeding this boundary and we're + * busted out. + */ + NewDynamicLength = RtlLengthSid(CapturedSid) + + Token->DefaultDacl ? Token->DefaultDacl->AclSize : 0; + if (NewDynamicLength > Token->DynamicCharged) + { + SepReleaseTokenLock(Token); + SepReleaseSid(CapturedSid, PreviousMode, FALSE); + Status = STATUS_ALLOTTED_SPACE_EXCEEDED; + DPRINT1("NtSetInformationToken(): Couldn't assign new primary group, space exceeded (current length %u, new length %lu)\n", + Token->DynamicCharged, NewDynamicLength); + goto Cleanup; + } + + /* + * The dynamic part of the token may require a rebuild + * if the current dynamic area is too small. If not then + * we're pretty much good as is. + */ + Status = SepRebuildDynamicPartOfToken(Token, NewDynamicLength); if (NT_SUCCESS(Status)) { - /* Found it */ - Token->PrimaryGroup = Token->UserAndGroups[PrimaryGroupIndex].Sid; - ExAllocateLocallyUniqueId(&Token->ModifiedId); + /* Find the primary group amongst the existing token user and groups */ + Status = SepFindPrimaryGroupAndDefaultOwner(Token, + CapturedSid, + NULL, + &PrimaryGroupIndex, + NULL); + if (NT_SUCCESS(Status)) + { + /* + * We have found it. Add the length of + * the previous primary group SID to the + * available dynamic area. + */ + Token->DynamicAvailable += RtlLengthSid(Token->PrimaryGroup); + + /* + * Move the default DACL if it's not at the + * head of the dynamic part. + */ + if ((Token->DefaultDacl) && + ((PULONG)(Token->DefaultDacl) != Token->DynamicPart)) + { + RtlMoveMemory(Token->DynamicPart, + Token->DefaultDacl, + RtlLengthSid(Token->PrimaryGroup)); + Token->DefaultDacl = (PACL)(Token->DynamicPart); + } + + /* Take away available space from the dynamic area */ + Token->DynamicAvailable -= RtlLengthSid(Token->UserAndGroups[PrimaryGroupIndex].Sid); + + /* And assign the primary group */ + PrimaryGroup = (ULONG_PTR)(Token->DynamicPart) + Token->DefaultDacl ? + Token->DefaultDacl->AclSize : 0; + RtlCopySid(RtlLengthSid(Token->UserAndGroups[PrimaryGroupIndex].Sid), + (PVOID)PrimaryGroup, + Token->UserAndGroups[PrimaryGroupIndex].Sid); + Token->PrimaryGroup = (PSID)PrimaryGroup; + + ExAllocateLocallyUniqueId(&Token->ModifiedId); + } } /* Unlock the token */ @@ -1309,68 +1366,76 @@ NtSetInformationToken( &CapturedAcl); if (NT_SUCCESS(Status)) { - ULONG DynamicLength; + ULONG NewDynamicLength; + ULONG_PTR Acl; /* Lock the token */ SepAcquireTokenLockExclusive(Token); - // - // NOTE: So far our dynamic area only contains - // the default dacl, so this makes the following - // code pretty simple. The day where it stores - // other data, the code will require adaptations. - // - - DynamicLength = Token->DynamicAvailable; - // Add here any other data length present in the dynamic area... - if (Token->DefaultDacl) - DynamicLength += Token->DefaultDacl->AclSize; - - /* Reallocate the dynamic area if it is too small */ - Status = STATUS_SUCCESS; - if ((DynamicLength < CapturedAcl->AclSize) || - (Token->DynamicPart == NULL)) + /* + * We can whack the token's default DACL only if + * the charged dynamic space boundary allows us + * to do so. Exceeding this boundary and we're + * busted out. + */ + NewDynamicLength = CapturedAcl->AclSize + RtlLengthSid(Token->PrimaryGroup); + if (NewDynamicLength > Token->DynamicCharged) { - PVOID NewDynamicPart; + SepReleaseTokenLock(Token); + SepReleaseAcl(CapturedAcl, PreviousMode, TRUE); + Status = STATUS_ALLOTTED_SPACE_EXCEEDED; + DPRINT1("NtSetInformationToken(): Couldn't assign new default DACL, space exceeded (current length %u, new length %lu)\n", + Token->DynamicCharged, NewDynamicLength); + goto Cleanup; + } - NewDynamicPart = ExAllocatePoolWithTag(PagedPool, - CapturedAcl->AclSize, - TAG_TOKEN_DYNAMIC); - if (NewDynamicPart == NULL) + /* + * The dynamic part of the token may require a rebuild + * if the current dynamic area is too small. If not then + * we're pretty much good as is. + */ + Status = SepRebuildDynamicPartOfToken(Token, NewDynamicLength); + if (NT_SUCCESS(Status)) + { + /* + * Before setting up a new DACL for the + * token object we add up the size of + * the old DACL to the available dynamic + * area + */ + if (Token->DefaultDacl) { - Status = STATUS_INSUFFICIENT_RESOURCES; + Token->DynamicAvailable += Token->DefaultDacl->AclSize; } - else + + /* + * Move the primary group if it's not at the + * head of the dynamic part. + */ + if ((PULONG)(Token->PrimaryGroup) != Token->DynamicPart) { - if (Token->DynamicPart != NULL) - { - // RtlCopyMemory(NewDynamicPart, Token->DynamicPart, DynamicLength); - ExFreePoolWithTag(Token->DynamicPart, TAG_TOKEN_DYNAMIC); - } - Token->DynamicPart = NewDynamicPart; - Token->DynamicAvailable = 0; + RtlMoveMemory(Token->DynamicPart, + Token->PrimaryGroup, + RtlLengthSid(Token->PrimaryGroup)); + Token->PrimaryGroup = (PSID)(Token->DynamicPart); } - } - else - { - Token->DynamicAvailable = DynamicLength - CapturedAcl->AclSize; - } - if (NT_SUCCESS(Status)) - { + /* Take away available space from the dynamic area */ + Token->DynamicAvailable -= CapturedAcl->AclSize; + /* Set the new dacl */ - Token->DefaultDacl = (PVOID)Token->DynamicPart; - RtlCopyMemory(Token->DefaultDacl, + Acl = (ULONG_PTR)(Token->DynamicPart) + RtlLengthSid(Token->PrimaryGroup); + RtlCopyMemory((PVOID)Acl, CapturedAcl, CapturedAcl->AclSize); + Token->DefaultDacl = (PACL)Acl; ExAllocateLocallyUniqueId(&Token->ModifiedId); } - /* Unlock the token */ + /* Unlock the token and release the ACL */ SepReleaseTokenLock(Token); - - ExFreePoolWithTag(CapturedAcl, TAG_ACL); + SepReleaseAcl(CapturedAcl, PreviousMode, TRUE); } } else diff --git a/ntoskrnl/se/tokenlif.c b/ntoskrnl/se/tokenlif.c index c3900c2dce5..9f6e9aef9c8 100644 --- a/ntoskrnl/se/tokenlif.c +++ b/ntoskrnl/se/tokenlif.c @@ -12,6 +12,10 @@ #define NDEBUG #include <debug.h> +/* DEFINES ********************************************************************/ + +#define SE_TOKEN_DYNAMIC_SLIM 500 + /* PRIVATE FUNCTIONS *********************************************************/ /** @@ -121,7 +125,8 @@ SepCreateToken( ULONG PrivilegesLength; ULONG UserGroupsLength; ULONG VariableLength; - ULONG TotalSize; + ULONG DynamicPartSize, TotalSize; + ULONG TokenPagedCharges; ULONG i; PAGED_CODE(); @@ -169,13 +174,34 @@ SepCreateToken( VariableLength = PrivilegesLength + UserGroupsLength; TotalSize = FIELD_OFFSET(TOKEN, VariablePart) + VariableLength; + /* + * A token is considered slim if it has the default dynamic + * contents, or in other words, the primary group and ACL. + * We judge if such contents are default by checking their + * total size if it's over the range. On Windows this range + * is 0x1F4 (aka 500). If the size of the whole dynamic contents + * is over that range then the token is considered fat and + * the token will be charged the whole of its token body length + * plus the dynamic size. + */ + DynamicPartSize = DefaultDacl ? DefaultDacl->AclSize : 0; + DynamicPartSize += RtlLengthSid(PrimaryGroup); + if (DynamicPartSize > SE_TOKEN_DYNAMIC_SLIM) + { + TokenPagedCharges = DynamicPartSize + TotalSize; + } + else + { + TokenPagedCharges = SE_TOKEN_DYNAMIC_SLIM + TotalSize; + } + Status = ObCreateObject(PreviousMode, SeTokenObjectType, ObjectAttributes, PreviousMode, NULL, TotalSize, - 0, + TokenPagedCharges, 0, (PVOID*)&AccessToken); if (!NT_SUCCESS(Status)) @@ -203,6 +229,7 @@ SepCreateToken( AccessToken->ExpirationTime = *ExpirationTime; AccessToken->ModifiedId = ModifiedId; + AccessToken->DynamicCharged = TokenPagedCharges - TotalSize; AccessToken->TokenFlags = TokenFlags & ~TOKEN_SESSION_NOT_REFERENCED; @@ -332,27 +359,48 @@ SepCreateToken( goto Quit; } - AccessToken->PrimaryGroup = AccessToken->UserAndGroups[PrimaryGroupIndex].Sid; + /* + * Now allocate the token's dynamic information area + * and set the data. The dynamic part consists of two + * contents, the primary group SID and the default DACL + * of the token, in this strict order. + */ + AccessToken->DynamicPart = ExAllocatePoolWithTag(PagedPool, + DynamicPartSize, + TAG_TOKEN_DYNAMIC); + if (AccessToken->DynamicPart == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Quit; + } + + /* Unused memory in the dynamic area */ + AccessToken->DynamicAvailable = 0; + + /* + * Assign the primary group to the token + * and put it in the dynamic part as well. + */ + EndMem = (PVOID)AccessToken->DynamicPart; + AccessToken->PrimaryGroup = EndMem; + RtlCopySid(RtlLengthSid(AccessToken->UserAndGroups[PrimaryGroupIndex].Sid), + EndMem, + AccessToken->UserAndGroups[PrimaryGroupIndex].Sid); AccessToken->DefaultOwnerIndex = DefaultOwnerIndex; + EndMem = (PVOID)((ULONG_PTR)EndMem + RtlLengthSid(AccessToken->UserAndGroups[PrimaryGroupIndex].Sid)); - /* Now allocate the token's dynamic information area and set the data */ - AccessToken->DynamicAvailable = 0; // Unused memory in the dynamic area. - AccessToken->DynamicPart = NULL; + /* + * We have assigned a primary group and put it in the + * dynamic part, now it's time to copy the provided + * default DACL (if it's provided to begin with) into + * the DACL field of the token and put it at the end + * tail of the dynamic part too. + */ if (DefaultDacl != NULL) { - AccessToken->DynamicPart = ExAllocatePoolWithTag(PagedPool, - DefaultDacl->AclSize, - TAG_TOKEN_DYNAMIC); - if (AccessToken->DynamicPart == NULL) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - goto Quit; - } - - EndMem = (PVOID)AccessToken->DynamicPart; AccessToken->DefaultDacl = EndMem; - RtlCopyMemory(AccessToken->DefaultDacl, + RtlCopyMemory(EndMem, DefaultDacl, DefaultDacl->AclSize); } @@ -434,7 +482,7 @@ SepDuplicateToken( PVOID EndMem; ULONG PrimaryGroupIndex; ULONG VariableLength; - ULONG TotalSize; + ULONG DynamicPartSize, TotalSize; ULONG PrivilegesIndex, GroupsIndex; PAGED_CODE(); @@ -443,14 +491,22 @@ SepDuplicateToken( VariableLength = Token->VariableLength; TotalSize = FIELD_OFFSET(TOKEN, VariablePart) + VariableLength; + /* + * Compute how much size we need to allocate + * the dynamic part of the newly duplicated + * token. + */ + DynamicPartSize = Token->DefaultDacl ? Token->DefaultDacl->AclSize : 0; + DynamicPartSize += RtlLengthSid(Token->PrimaryGroup); + Status = ObCreateObject(PreviousMode, SeTokenObjectType, ObjectAttributes, PreviousMode, NULL, TotalSize, - 0, - 0, + Token->DynamicCharged, + TotalSize, (PVOID*)&AccessToken); if (!NT_SUCCESS(Status)) { @@ -484,6 +540,7 @@ SepDuplicateToken( AccessToken->ParentTokenId = Token->ParentTokenId; AccessToken->ExpirationTime = Token->ExpirationTime; AccessToken->OriginatingLogonSession = Token->OriginatingLogonSession; + AccessToken->DynamicCharged = Token->DynamicCharged; /* Lock the source token and copy the mutable fields */ SepAcquireTokenLockShared(Token); @@ -584,9 +641,6 @@ SepDuplicateToken( goto Quit; } - AccessToken->PrimaryGroup = AccessToken->UserAndGroups[PrimaryGroupIndex].Sid; - AccessToken->DefaultOwnerIndex = Token->DefaultOwnerIndex; - /* Copy the restricted SIDs */ AccessToken->RestrictedSidCount = 0; AccessToken->RestrictedSids = NULL; @@ -684,31 +738,40 @@ SepDuplicateToken( } } - // - // NOTE: So far our dynamic area only contains - // the default dacl, so this makes the following - // code pretty simple. The day where it stores - // other data, the code will require adaptations. - // - /* Now allocate the token's dynamic information area and set the data */ - AccessToken->DynamicAvailable = 0; // Unused memory in the dynamic area. - AccessToken->DynamicPart = NULL; - if (Token->DynamicPart && Token->DefaultDacl) + AccessToken->DynamicPart = ExAllocatePoolWithTag(PagedPool, + DynamicPartSize, + TAG_TOKEN_DYNAMIC); + if (AccessToken->DynamicPart == NULL) { - AccessToken->DynamicPart = ExAllocatePoolWithTag(PagedPool, - Token->DefaultDacl->AclSize, - TAG_TOKEN_DYNAMIC); - if (AccessToken->DynamicPart == NULL) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - goto Quit; - } + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Quit; + } - EndMem = (PVOID)AccessToken->DynamicPart; + /* Unused memory in the dynamic area */ + AccessToken->DynamicAvailable = 0; + + /* + * Assign the primary group to the token + * and put it in the dynamic part as well. + */ + EndMem = (PVOID)AccessToken->DynamicPart; + AccessToken->PrimaryGroup = EndMem; + RtlCopySid(RtlLengthSid(AccessToken->UserAndGroups[PrimaryGroupIndex].Sid), + EndMem, + AccessToken->UserAndGroups[PrimaryGroupIndex].Sid); + AccessToken->DefaultOwnerIndex = Token->DefaultOwnerIndex; + EndMem = (PVOID)((ULONG_PTR)EndMem + RtlLengthSid(AccessToken->UserAndGroups[PrimaryGroupIndex].Sid)); + + /* + * The existing token has a default DACL only + * if it has an allocated dynamic part. + */ + if (Token->DynamicPart && Token->DefaultDacl) + { AccessToken->DefaultDacl = EndMem; - RtlCopyMemory(AccessToken->DefaultDacl, + RtlCopyMemory(EndMem, Token->DefaultDacl, Token->DefaultDacl->AclSize); } @@ -804,6 +867,7 @@ SepPerformTokenFiltering( NTSTATUS Status; PTOKEN AccessToken; PVOID EndMem; + ULONG DynamicPartSize; ULONG RestrictedSidsLength; ULONG PrivilegesLength; ULONG PrimaryGroupIndex; @@ -863,6 +927,14 @@ SepPerformTokenFiltering( TotalSize = FIELD_OFFSET(TOKEN, VariablePart) + VariableLength; } + /* + * Compute how much size we need to allocate + * the dynamic part of the newly duplicated + * token. + */ + DynamicPartSize = Token->DefaultDacl ? Token->DefaultDacl->AclSize : 0; + DynamicPartSize += RtlLengthSid(Token->PrimaryGroup); + /* Set up a filtered token object */ Status = ObCreateObject(PreviousMode, SeTokenObjectType, @@ -870,8 +942,8 @@ SepPerformTokenFiltering( PreviousMode, NULL, TotalSize, - 0, - 0, + Token->DynamicCharged, + TotalSize, (PVOID*)&AccessToken); if (!NT_SUCCESS(Status)) { @@ -907,6 +979,7 @@ SepPerformTokenFiltering( AccessToken->AuthenticationId = Token->AuthenticationId; AccessToken->ParentTokenId = Token->TokenId; AccessToken->OriginatingLogonSession = Token->OriginatingLogonSession; + AccessToken->DynamicCharged = Token->DynamicCharged; AccessToken->ExpirationTime = Token->ExpirationTime; @@ -1092,28 +1165,40 @@ SepPerformTokenFiltering( goto Quit; } - /* Assign the primary group and default owner index now */ - AccessToken->PrimaryGroup = AccessToken->UserAndGroups[PrimaryGroupIndex].Sid; - AccessToken->DefaultOwnerIndex = Token->DefaultOwnerIndex; - /* Now allocate the token's dynamic information area and set the data */ + AccessToken->DynamicPart = ExAllocatePoolWithTag(PagedPool, + DynamicPartSize, + TAG_TOKEN_DYNAMIC); + if (AccessToken->DynamicPart == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Quit; + } + + /* Unused memory in the dynamic area */ AccessToken->DynamicAvailable = 0; - AccessToken->DynamicPart = NULL; + + /* + * Assign the primary group to the token + * and put it in the dynamic part as well. + */ + EndMem = (PVOID)AccessToken->DynamicPart; + AccessToken->PrimaryGroup = EndMem; + RtlCopySid(RtlLengthSid(AccessToken->UserAndGroups[PrimaryGroupIndex].Sid), + EndMem, + AccessToken->UserAndGroups[PrimaryGroupIndex].Sid); + AccessToken->DefaultOwnerIndex = Token->DefaultOwnerIndex; + EndMem = (PVOID)((ULONG_PTR)EndMem + RtlLengthSid(AccessToken->UserAndGroups[PrimaryGroupIndex].Sid)); + + /* + * The existing token has a default DACL only + * if it has an allocated dynamic part. + */ if (Token->DynamicPart && Token->DefaultDacl) { - AccessToken->DynamicPart = ExAllocatePoolWithTag(PagedPool, - Token->DefaultDacl->AclSize, - TAG_TOKEN_DYNAMIC); - if (AccessToken->DynamicPart == NULL) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - goto Quit; - } - - EndMem = (PVOID)AccessToken->DynamicPart; AccessToken->DefaultDacl = EndMem; - RtlCopyMemory(AccessToken->DefaultDacl, + RtlCopyMemory(EndMem, Token->DefaultDacl, Token->DefaultDacl->AclSize); }

1 0

[reactos] 01/01: [TRACERT] Fix displaying hop address on last ping timeout
by Stanislav Motylkov 28 Jun '22

28 Jun '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=846c9aa1fda75e928745f… commit 846c9aa1fda75e928745f22fac6072d0b924f5ec Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Tue Jun 28 23:36:30 2022 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Tue Jun 28 23:42:09 2022 +0300 [TRACERT] Fix displaying hop address on last ping timeout - Update source file header per coding rules - Store intermediate responses to display the hop address - Add separate function to get response stats from buffer - Add Cleanup label to free resources in a single place - Move local variables around to allow Cleanup goto CORE-18232 --- base/applications/network/tracert/tracert.cpp | 109 +++++++++++++++++++------- 1 file changed, 82 insertions(+), 27 deletions(-) diff --git a/base/applications/network/tracert/tracert.cpp b/base/applications/network/tracert/tracert.cpp index 8081a0ada7d..85b4aeb0908 100644 --- a/base/applications/network/tracert/tracert.cpp +++ b/base/applications/network/tracert/tracert.cpp @@ -1,10 +1,8 @@ /* * PROJECT: ReactOS trace route utility - * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/applications/network/tracert/tracert.cpp + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: Trace network paths through networks * COPYRIGHT: Copyright 2018 Ged Murphy <gedmurphy(a)reactos.org> - * */ #ifdef __REACTOS__ @@ -275,15 +273,13 @@ PrintHopInfo(_In_ PVOID Buffer) return (Status == 0); } -static bool -DecodeResponse( +static ULONG +GetResponseStats( _In_ PVOID ReplyBuffer, - _In_ bool OutputHopAddress, - _Out_ bool& FoundTarget + _Out_ ULONG& RoundTripTime, + _Out_ PVOID& AddressInfo ) { - ULONG RoundTripTime; - PVOID AddressInfo; ULONG Status; if (Info.Family == AF_INET6) @@ -308,6 +304,22 @@ DecodeResponse( AddressInfo = &EchoReplyV4->Address; } + return Status; +} + +static bool +DecodeResponse( + _In_ PVOID ReplyBuffer, + _In_ PVOID LastGoodResponse, + _In_ bool OutputHopAddress, + _Out_ bool& GoodResponse, + _Out_ bool& FoundTarget +) +{ + ULONG RoundTripTime; + PVOID AddressInfo; + ULONG Status = GetResponseStats(ReplyBuffer, RoundTripTime, AddressInfo); + switch (Status) { case IP_SUCCESS: @@ -320,6 +332,7 @@ DecodeResponse( { OutputText(IDS_HOP_ZERO); } + GoodResponse = true; break; case IP_DEST_HOST_UNREACHABLE: @@ -352,6 +365,10 @@ DecodeResponse( if (OutputHopAddress) { + if (Status == IP_REQ_TIMED_OUT && LastGoodResponse) + { + Status = GetResponseStats(LastGoodResponse, RoundTripTime, AddressInfo); + } if (Status == IP_SUCCESS) { FoundTarget = true; @@ -374,18 +391,22 @@ static bool RunTraceRoute() { bool Success = false; + PVOID ReplyBuffer = NULL, LastGoodResponse = NULL; + DWORD ReplySize; + + HANDLE heap = GetProcessHeap(); + bool Quit = false; + ULONG HopCount = 1; + bool FoundTarget = false; + Success = ResolveTarget(); if (!Success) { OutputText(IDS_UNABLE_RESOLVE, Info.HostName); - return false; + goto Cleanup; } - BYTE SendBuffer[PACKET_SIZE]; - - PVOID ReplyBuffer; - - DWORD ReplySize = PACKET_SIZE + SIZEOF_ICMP_ERROR + SIZEOF_IO_STATUS_BLOCK; + ReplySize = PACKET_SIZE + SIZEOF_ICMP_ERROR + SIZEOF_IO_STATUS_BLOCK; if (Info.Family == AF_INET6) { ReplySize += sizeof(ICMPV6_ECHO_REPLY); @@ -399,12 +420,11 @@ RunTraceRoute() #endif } - HANDLE heap = GetProcessHeap(); ReplyBuffer = HeapAlloc(heap, HEAP_ZERO_MEMORY, ReplySize); if (ReplyBuffer == NULL) { - FreeAddrInfoW(Info.Target); - return false; + Success = false; + goto Cleanup; } if (Info.Family == AF_INET6) @@ -417,9 +437,8 @@ RunTraceRoute() } if (Info.hIcmpFile == INVALID_HANDLE_VALUE) { - HeapFree(heap, 0, ReplyBuffer); - FreeAddrInfoW(Info.Target); - return false; + Success = false; + goto Cleanup; } OutputText(IDS_TRACE_INFO, Info.HostName, Info.TargetIP, Info.MaxHops); @@ -427,15 +446,21 @@ RunTraceRoute() IP_OPTION_INFORMATION IpOptionInfo; ZeroMemory(&IpOptionInfo, sizeof(IpOptionInfo)); - bool Quit = false; - ULONG HopCount = 1; - bool FoundTarget = false; while ((HopCount <= Info.MaxHops) && (FoundTarget == false) && (Quit == false)) { OutputText(IDS_HOP_COUNT, HopCount); + if (LastGoodResponse) + { + HeapFree(heap, 0, LastGoodResponse); + LastGoodResponse = NULL; + } + for (int Ping = 1; Ping <= NUM_OF_PINGS; Ping++) { + BYTE SendBuffer[PACKET_SIZE]; + bool GoodResponse = false; + IpOptionInfo.Ttl = static_cast<UCHAR>(HopCount); if (Info.Family == AF_INET6) @@ -473,7 +498,11 @@ RunTraceRoute() Info.Timeout); } - if (DecodeResponse(ReplyBuffer, (Ping == NUM_OF_PINGS), FoundTarget) == false) + if (DecodeResponse(ReplyBuffer, + LastGoodResponse, + (Ping == NUM_OF_PINGS), + GoodResponse, + FoundTarget) == false) { Quit = true; break; @@ -484,6 +513,21 @@ RunTraceRoute() Success = true; break; } + + if (GoodResponse) + { + if (LastGoodResponse) + { + HeapFree(heap, 0, LastGoodResponse); + } + LastGoodResponse = HeapAlloc(heap, HEAP_ZERO_MEMORY, ReplySize); + if (LastGoodResponse == NULL) + { + Success = false; + goto Cleanup; + } + CopyMemory(LastGoodResponse, ReplyBuffer, ReplySize); + } } HopCount++; @@ -492,8 +536,19 @@ RunTraceRoute() OutputText(IDS_TRACE_COMPLETE); - HeapFree(heap, 0, ReplyBuffer); - FreeAddrInfoW(Info.Target); +Cleanup: + if (ReplyBuffer) + { + HeapFree(heap, 0, ReplyBuffer); + } + if (LastGoodResponse) + { + HeapFree(heap, 0, LastGoodResponse); + } + if (Info.Target) + { + FreeAddrInfoW(Info.Target); + } if (Info.hIcmpFile) { IcmpCloseHandle(Info.hIcmpFile);

1 0

[reactos] 01/01: [FREELDR][SDK] Sync copyright years with our banner and boot logo
by Stanislav Motylkov 27 Jun '22

27 Jun '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=35a816a24e3b7b5752a28… commit 35a816a24e3b7b5752a287686c9df833af6d07a9 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Mon Jun 27 21:42:01 2022 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Mon Jun 27 21:42:01 2022 +0300 [FREELDR][SDK] Sync copyright years with our banner and boot logo Addendum to 831e2dea. CORE-18191 --- boot/freeldr/freeldr/include/ver.h | 2 +- sdk/include/reactos/version.rc | 2 +- sdk/include/reactos/wine/wine_common_ver.rc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/boot/freeldr/freeldr/include/ver.h b/boot/freeldr/freeldr/include/ver.h index 0caa11848d0..708b60db939 100644 --- a/boot/freeldr/freeldr/include/ver.h +++ b/boot/freeldr/freeldr/include/ver.h @@ -1,6 +1,6 @@ /* * FreeLoader - * Copyright (C) 1998-2005 Brian Palmer <brianp(a)sginet.com> + * Copyright (C) 2001-2005 Brian Palmer <brianp(a)sginet.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/sdk/include/reactos/version.rc b/sdk/include/reactos/version.rc index 19a2cd30c4b..498c0c788d2 100644 --- a/sdk/include/reactos/version.rc +++ b/sdk/include/reactos/version.rc @@ -19,7 +19,7 @@ #define REACTOS_DEFAULT_STR_COMPANY_NAME "ReactOS Project" #define REACTOS_DEFAULT_STR_DESCRIPTION "ReactOS Core Component" #define REACTOS_DEFAULT_STR_INTERNAL_NAME "" -#define REACTOS_DEFAULT_STR_LEGAL_COPYRIGHT "Copyright 1998-" COPYRIGHT_YEAR " ReactOS Project" +#define REACTOS_DEFAULT_STR_LEGAL_COPYRIGHT "Copyright 1996-" COPYRIGHT_YEAR " ReactOS Project" #define REACTOS_DEFAULT_STR_PRODUCT_NAME "ReactOS Operating System" /* Set defaults for everything, unless overridden */ diff --git a/sdk/include/reactos/wine/wine_common_ver.rc b/sdk/include/reactos/wine/wine_common_ver.rc index abdd698869d..936fd33bc54 100644 --- a/sdk/include/reactos/wine/wine_common_ver.rc +++ b/sdk/include/reactos/wine/wine_common_ver.rc @@ -59,7 +59,7 @@ /* Credit the Wine team */ #define REACTOS_STR_COMPANY_NAME "ReactOS Project/Wine Team\0" -#define REACTOS_STR_LEGAL_COPYRIGHT "Copyright 1998-" COPYRIGHT_YEAR " ReactOS Project, 1993-" COPYRIGHT_YEAR " the Wine project authors\0" +#define REACTOS_STR_LEGAL_COPYRIGHT "Copyright 1996-" COPYRIGHT_YEAR " ReactOS Project, 1993-" COPYRIGHT_YEAR " the Wine project authors\0" #define REACTOS_STR_ORIGINAL_COPYRIGHT "Copyright (c) 1993-" COPYRIGHT_YEAR " the Wine project authors " \ "(see the file AUTHORS for a complete list)"

1 0

[reactos] 01/01: [FREELDR][SDK] Use "ReactOS Project" for consistency
by Stanislav Motylkov 27 Jun '22

27 Jun '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=831e2dea3d1e555d8ed68… commit 831e2dea3d1e555d8ed68459ae9eb8c30528f980 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Mon Jun 27 17:20:04 2022 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Mon Jun 27 21:38:14 2022 +0300 [FREELDR][SDK] Use "ReactOS Project" for consistency CORE-18191 --- boot/freeldr/freeldr/include/ver.h | 4 ++-- sdk/include/reactos/version.rc | 4 ++-- sdk/include/reactos/wine/wine_common_ver.rc | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/boot/freeldr/freeldr/include/ver.h b/boot/freeldr/freeldr/include/ver.h index 8d3088aceba..0caa11848d0 100644 --- a/boot/freeldr/freeldr/include/ver.h +++ b/boot/freeldr/freeldr/include/ver.h @@ -21,9 +21,9 @@ /* Just some stuff */ #define VERSION "FreeLoader v3.0" -#define COPYRIGHT "Copyright (C) 1998-" COPYRIGHT_YEAR " ReactOS Team" +#define COPYRIGHT "Copyright (C) 1996-" COPYRIGHT_YEAR " ReactOS Project" #define AUTHOR_EMAIL "<www.reactos.org>" -#define BY_AUTHOR "by ReactOS Team" +#define BY_AUTHOR "by ReactOS Project" // FreeLoader version defines // diff --git a/sdk/include/reactos/version.rc b/sdk/include/reactos/version.rc index b069ff8ca4f..19a2cd30c4b 100644 --- a/sdk/include/reactos/version.rc +++ b/sdk/include/reactos/version.rc @@ -16,10 +16,10 @@ #include "buildno.h" /* Define some defaults (shouldn't be overwritten by applications */ -#define REACTOS_DEFAULT_STR_COMPANY_NAME "ReactOS Development Team" +#define REACTOS_DEFAULT_STR_COMPANY_NAME "ReactOS Project" #define REACTOS_DEFAULT_STR_DESCRIPTION "ReactOS Core Component" #define REACTOS_DEFAULT_STR_INTERNAL_NAME "" -#define REACTOS_DEFAULT_STR_LEGAL_COPYRIGHT "Copyright 1998-" COPYRIGHT_YEAR " ReactOS Team" +#define REACTOS_DEFAULT_STR_LEGAL_COPYRIGHT "Copyright 1998-" COPYRIGHT_YEAR " ReactOS Project" #define REACTOS_DEFAULT_STR_PRODUCT_NAME "ReactOS Operating System" /* Set defaults for everything, unless overridden */ diff --git a/sdk/include/reactos/wine/wine_common_ver.rc b/sdk/include/reactos/wine/wine_common_ver.rc index e24debc005a..abdd698869d 100644 --- a/sdk/include/reactos/wine/wine_common_ver.rc +++ b/sdk/include/reactos/wine/wine_common_ver.rc @@ -58,8 +58,8 @@ #endif /* WINE_OLESELFREGISTER */ /* Credit the Wine team */ -#define REACTOS_STR_COMPANY_NAME "ReactOS Development Team/Wine Team\0" -#define REACTOS_STR_LEGAL_COPYRIGHT "Copyright 1998-" COPYRIGHT_YEAR " ReactOS Team, 1993-" COPYRIGHT_YEAR " the Wine project authors\0" +#define REACTOS_STR_COMPANY_NAME "ReactOS Project/Wine Team\0" +#define REACTOS_STR_LEGAL_COPYRIGHT "Copyright 1998-" COPYRIGHT_YEAR " ReactOS Project, 1993-" COPYRIGHT_YEAR " the Wine project authors\0" #define REACTOS_STR_ORIGINAL_COPYRIGHT "Copyright (c) 1993-" COPYRIGHT_YEAR " the Wine project authors " \ "(see the file AUTHORS for a complete list)"

1 0

[reactos] 01/01: [INF] Set manufacturer as ReactOS Project for consistency
by Stanislav Motylkov 27 Jun '22

27 Jun '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bbccad0ed60d619e49eb6… commit bbccad0ed60d619e49eb6e5d4e85cf9e0d932e2e Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Mon Jun 27 17:00:18 2022 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Mon Jun 27 17:00:18 2022 +0300 [INF] Set manufacturer as ReactOS Project for consistency Also make it non-localizable. CORE-18191 --- drivers/bus/acpi/acpi.inf | 16 +++------------- drivers/network/dd/e1000/nete1000.inf | 9 +++------ drivers/network/dd/ne2000/netne2000.inf | 18 +++++------------- drivers/network/dd/nvnet/netnv.inf | 6 +++--- drivers/network/dd/pcnet/netpcnet.inf | 22 ++++------------------ drivers/network/dd/rtl8139/netrtl8139.inf | 15 +++------------ drivers/processor/processr/cpu.inf | 11 ++++------- drivers/storage/class/ramdisk/ramdisk.inf | 8 ++++---- drivers/usb/usbstor/usbstor.inf | 12 +++--------- drivers/wdm/audio/drivers/ac97/ac97.inf | 5 ++++- media/inf/NET_NIC.inf | 12 ++++-------- media/inf/audio.inf | 12 ++++-------- media/inf/battery.inf | 20 ++++++++++---------- media/inf/bda.inf | 11 +++-------- media/inf/bth.inf | 11 ++++------- media/inf/c_image.inf | 11 ++++------- media/inf/display.inf | 14 ++++++-------- media/inf/fdc.inf | 15 +++++++-------- media/inf/flpydisk.inf | 16 +++------------- media/inf/hal.inf | 20 ++++++-------------- media/inf/hdc.inf | 12 ++++-------- media/inf/input.inf | 12 ++++-------- media/inf/keyboard.inf | 12 ++++-------- media/inf/ks.inf | 11 +++-------- media/inf/kscaptur.inf | 9 +++------ media/inf/legcydrv.inf | 11 ++++------- media/inf/machine.inf | 12 ++++-------- media/inf/monitor.inf | 15 +++++++-------- media/inf/msmouse.inf | 13 +++++-------- media/inf/nettcpip.inf | 19 ++++--------------- media/inf/ports.inf | 13 +++++-------- media/inf/scsi.inf | 15 +++++++-------- media/inf/unknown.inf | 14 ++++---------- media/inf/usb.inf | 11 +++-------- media/inf/usbport.inf | 14 ++++++-------- media/inf/volume.inf | 8 ++++---- media/inf/wmiacpi.inf | 10 ++++------ modules/rosapps/drivers/green/green.inf | 7 ++++--- win32ss/drivers/miniport/pc98vid/pc98disp.inf | 8 ++++---- win32ss/drivers/miniport/xboxvmp/xboxdisp.inf | 12 +++--------- 40 files changed, 173 insertions(+), 329 deletions(-) diff --git a/drivers/bus/acpi/acpi.inf b/drivers/bus/acpi/acpi.inf index 64693975404..b1b94764d30 100644 --- a/drivers/bus/acpi/acpi.inf +++ b/drivers/bus/acpi/acpi.inf @@ -41,8 +41,10 @@ LoadOrderGroup = Boot Bus Extender ;-------------------------------- STRINGS ------------------------------- [Strings] -ReactOS = "ReactOS Team" +; Non-localizable +ReactOS = "ReactOS Project" +; Localizable GenericMfg = "(Generic system devices)" *PNP0C08.DeviceDesc = "ACPI hardware" @@ -58,8 +60,6 @@ GenericMfg = "(Generische Systemgeräte)" *PNP0C08.DeviceDesc = "ACPI Hardware" [Strings.0a] -ReactOS = "Equipo de ReactOS" - GenericMfg = "(Dispositivos del sistema estándar)" *PNP0C08.DeviceDesc = "Hardware ACPI" @@ -71,8 +71,6 @@ GenericMfg = "(標準システムデバイス)" *PNP0C08.DeviceDesc = "ACPI ハードウェア" [Strings.0415] -ReactOS = "Zespół ReactOS" - GenericMfg = "(Standardowe urządzenia systemowe)" *PNP0C08.DeviceDesc = "Sprzęt ACPI" @@ -81,14 +79,10 @@ GenericMfg = "(Dispositivos de sistema padrão)" *PNP0C08.DeviceDesc = "Hardware ACPI" [Strings.0418] -ReactOS = "Echipa ReactOS" - GenericMfg = "(dispozitiv de sistem generic)" *PNP0C08.DeviceDesc = "Dispozitive ACPI" [Strings.0419] -ReactOS = "Команда ReactOS" - GenericMfg = "(Стандартные системные устройства)" *PNP0C08.DeviceDesc = "Устройства ACPI" @@ -97,14 +91,10 @@ GenericMfg = "(Generické systémové zariadenia)" *PNP0C08.DeviceDesc = "ACPI hardvér" [Strings.041f] -ReactOS = "ReactOS Takımı" - GenericMfg = "(Genel Sistem Aygıtları)" *PNP0C08.DeviceDesc = "ACPI Donanım" [Strings.0422] -ReactOS = "Команда ReactOS" - GenericMfg = "(Стандартні системні пристрої)" *PNP0C08.DeviceDesc = "Пристрої ACPI" diff --git a/drivers/network/dd/e1000/nete1000.inf b/drivers/network/dd/e1000/nete1000.inf index 11f8ba13779..7ae4df0d4f1 100644 --- a/drivers/network/dd/e1000/nete1000.inf +++ b/drivers/network/dd/e1000/nete1000.inf @@ -79,10 +79,12 @@ LoadOrderGroup = NDIS ;-------------------------------- STRINGS ------------------------------- [Strings] -ReactOS = "ReactOS Team" +; Non-localizable +ReactOS = "ReactOS Project" IntelMfg = "Intel" +; Localizable IntelE1000_1000.DeviceDesc = "Intel 82542-based PCI Ethernet Adapter" IntelE1000_1001.DeviceDesc = "Intel 82543GC Fiber PCI Ethernet Adapter" IntelE1000_1004.DeviceDesc = "Intel 82543GC Copper PCI Ethernet Adapter" @@ -122,8 +124,6 @@ IntelE1000_1099.DeviceDesc = "Intel 82546GB Quad Copper PCI Ethernet Adapter" IntelE1000_10B5.DeviceDesc = "Intel 82546GB Quad Copper KSP3 PCI-X Ethernet Adapter" [Strings.0415] -ReactOS = "Zespół ReactOS" - IntelE1000_1000.DeviceDesc = "Karta Intel 82542-based PCI Ethernet Adapter" IntelE1000_1001.DeviceDesc = "Karta Intel 82543GC Fiber PCI Ethernet Adapter" IntelE1000_1004.DeviceDesc = "Karta Intel 82543GC Copper PCI Ethernet Adapter" @@ -163,9 +163,6 @@ IntelE1000_1099.DeviceDesc = "Karta Intel 82546GB Quad Copper PCI Ethernet Adapt IntelE1000_10B5.DeviceDesc = "Karta Intel 82546GB Quad Copper KSP3 PCI-X Ethernet Adapter" [Strings.0a] - -ReactOS = "Equipo de ReactOS" - IntelE1000_1000.DeviceDesc = "Adaptador de Ethernet 82542-based PCI" IntelE1000_1001.DeviceDesc = "Adaptador de Ethernet 82543GC Fiber PCI" IntelE1000_1004.DeviceDesc = "Adaptador de Ethernet 82543GC Copper PCI" diff --git a/drivers/network/dd/ne2000/netne2000.inf b/drivers/network/dd/ne2000/netne2000.inf index fb8a1df3067..0a99dacbcb1 100644 --- a/drivers/network/dd/ne2000/netne2000.inf +++ b/drivers/network/dd/ne2000/netne2000.inf @@ -62,12 +62,15 @@ LoadOrderGroup = NDIS ;-------------------------------- STRINGS ------------------------------- [Strings] -ReactOS = "ReactOS Team" +; Non-localizable +ReactOS = "ReactOS Project" +RealtekMfg = "Realtek Semiconductor Co., Ltd." + +; Localizable GenericMfg = "(Generic network cards)" *PNP80D6.DeviceDesc = "NE2000-compatible Ethernet Adapter" -RealtekMfg = "Realtek Semiconductor Co., Ltd." *RTL8019.DeviceDesc = "Realtek RTL8019AS ISA Ethernet Adapter" PCI\VEN_10EC&DEV_8029.DeviceDesc = "Realtek RTL8029 PCI Ethernet Adapter" @@ -84,8 +87,6 @@ GenericMfg = "(Generische Netzwerkkarten)" *PNP80D6.DeviceDesc = "NE2000 kompatible Netzwerkkarte" [Strings.0a] -ReactOS = "Equipo de ReactOS" - GenericMfg = "(Tarjeta de red estándar)" *PNP80D6.DeviceDesc = "Compatible con NE2000" @@ -98,8 +99,6 @@ GenericMfg = "(標準ネットワークカード)" *PNP80D6.DeviceDesc = "NE2000 互換" [Strings.0415] -ReactOS = "Zespół ReactOS" - GenericMfg = "(Standardowe karty sieciowe)" *PNP80D6.DeviceDesc = "Karta sieciowa kompatybilna z NE2000" @@ -111,14 +110,11 @@ GenericMfg = "(Adaptadores de rede padrão)" *PNP80D6.DeviceDesc = "Compatível com NE2000" [Strings.0418] -ReactOS = "Echipa ReactOS" GenericMfg = "(placă de rețea generică)" *PNP80D6.DeviceDesc = "Compatibile cu NE2000" [Strings.0419] -ReactOS = "Команда ReactOS" - GenericMfg = "(Стандартные сетевые адаптеры)" *PNP80D6.DeviceDesc = "NE2000-совместимый сетевой адаптер" @@ -127,14 +123,10 @@ GenericMfg = "(Generické sieťové karty)" *PNP80D6.DeviceDesc = "NE2000 kompatibilná sieťová karta" [Strings.041f] -ReactOS = "ReactOS Takımı" - GenericMfg = "(Genel Ağ Kartları)" *PNP80D6.DeviceDesc = "NE2000 Uyumlu" [Strings.0422] -ReactOS = "Команда ReactOS" - GenericMfg = "(Стандартні мережеві адаптери)" *PNP80D6.DeviceDesc = "NE2000-сумісний мережевий адаптер" diff --git a/drivers/network/dd/nvnet/netnv.inf b/drivers/network/dd/nvnet/netnv.inf index 31a05e9680b..5b95fe28d73 100644 --- a/drivers/network/dd/nvnet/netnv.inf +++ b/drivers/network/dd/nvnet/netnv.inf @@ -237,10 +237,12 @@ HKR, , TypesSupported, 0x00010001, 7 ;-------------------------------- STRINGS ------------------------------- [Strings] -ReactOS = "ReactOS Team" +; Non-localizable +ReactOS = "ReactOS Project" nVidiaMfg = "nVidia" +; Localizable OM = "Optimization Mode" M1 = "Dynamic" M2 = "CPU" @@ -277,8 +279,6 @@ MCP79.DeviceDesc = "nVidia MCP79 PCI Ethernet Controller" MCP89.DeviceDesc = "nVidia MCP89 PCI Ethernet Controller" [Strings.0419] -ReactOS = "Команда ReactOS" - OM = "Оптимизировать" M1 = "Динамически" M2 = "Нагрузку на ЦП" diff --git a/drivers/network/dd/pcnet/netpcnet.inf b/drivers/network/dd/pcnet/netpcnet.inf index e1e5e13ce2c..2569fc41f06 100644 --- a/drivers/network/dd/pcnet/netpcnet.inf +++ b/drivers/network/dd/pcnet/netpcnet.inf @@ -56,27 +56,13 @@ LoadOrderGroup = NDIS ;-------------------------------- STRINGS ------------------------------- [Strings] -ReactOS = "ReactOS Team" +; Non-localizable +ReactOS = "ReactOS Project" AMDMfg = "Advanced Micro Devices (AMD)" -PCNET.DeviceDesc = "AMD PCnet Am79C970 PCI Ethernet Adapter" -[Strings.0a] -ReactOS = "Equipo de ReactOS" +; Localizable +PCNET.DeviceDesc = "AMD PCnet Am79C970 PCI Ethernet Adapter" [Strings.0415] -ReactOS = "Zespół ReactOS" - PCNET.DeviceDesc = "Karta AMD PCnet Am79C970 PCI Ethernet Adapter" - -[Strings.0418] -ReactOS = "Echipa ReactOS" - -[Strings.0419] -ReactOS = "Команда ReactOS" - -[Strings.041f] -ReactOS = "ReactOS Takımı" - -[Strings.0422] -ReactOS = "Команда ReactOS" diff --git a/drivers/network/dd/rtl8139/netrtl8139.inf b/drivers/network/dd/rtl8139/netrtl8139.inf index 2e50c0a636b..157ab12f59c 100644 --- a/drivers/network/dd/rtl8139/netrtl8139.inf +++ b/drivers/network/dd/rtl8139/netrtl8139.inf @@ -61,7 +61,8 @@ LoadOrderGroup = NDIS ;-------------------------------- STRINGS ------------------------------- [Strings] -ReactOS = "ReactOS Team" +; Non-localizable +ReactOS = "ReactOS Project" RealtekMfg = "Realtek" AcctonMfg = "Accton" @@ -69,6 +70,7 @@ DLinkMfg = "D-Link" LevelOneMfg = "LevelOne" CompaqMfg = "Compaq" +; Localizable Realtek8139.DeviceDesc = "Realtek RTL8139 PCI Ethernet Adapter" AcctonEN1207D.DeviceDesc = "Accton EN-1207D (RTL8139) PCI Ethernet Adapter" DLinkDFE538TX.DeviceDesc = "D-Link DFE-538TX (RTL8139) PCI Ethernet Adapter" @@ -76,8 +78,6 @@ LevelOneFPC0106TX.DeviceDesc = "LevelOne FPC-0106Tx (RTL8139) PCI Ethernet Adapt CompaqHNE300.DeviceDesc = "Compaq HNE-300 (RTL8139C) PCI Ethernet Adapter" [Strings.0a] -ReactOS = "Equipo de ReactOS" - Realtek8139.DeviceDesc = "Adaptador Ethernet Realtek RTL8139 " AcctonEN1207D.DeviceDesc = "Adaptador Ethernet Accton EN-1207D (RTL8139)" DLinkDFE538TX.DeviceDesc = "Adaptador Ethernet D-Link DFE-538TX (RTL8139)" @@ -85,8 +85,6 @@ LevelOneFPC0106TX.DeviceDesc = "Adaptador Ethernet LevelOne FPC-0106Tx (RTL8139) CompaqHNE300.DeviceDesc = "Adaptador Ethernet Compaq HNE-300 (RTL8139C)" [Strings.0415] -ReactOS = "Zespół ReactOS" - Realtek8139.DeviceDesc = "Karta Realtek RTL8139 PCI Ethernet Adapter" AcctonEN1207D.DeviceDesc = "Karta Accton EN-1207D (RTL8139) PCI Ethernet Adapter" DLinkDFE538TX.DeviceDesc = "Karta D-Link DFE-538TX (RTL8139) PCI Ethernet Adapter" @@ -94,20 +92,13 @@ LevelOneFPC0106TX.DeviceDesc = "Karta LevelOne FPC-0106Tx (RTL8139) PCI Ethernet CompaqHNE300.DeviceDesc = "Karta Compaq HNE-300 (RTL8139C) PCI Ethernet Adapter" [Strings.0418] -ReactOS = "Echipa ReactOS" - Realtek8139.DeviceDesc = "Adaptor Ethernet Realtek RTL8139" AcctonEN1207D.DeviceDesc = "Adaptor Ethernet Accton EN-1207D (RTL8139)" DLinkDFE538TX.DeviceDesc = "Adaptor Ethernet D-Link DFE-538TX (RTL8139)" LevelOneFPC0106TX.DeviceDesc = "Adaptor Ethernet LevelOne FPC-0106Tx (RTL8139)" CompaqHNE300.DeviceDesc = "Adaptor Ethernet Compaq HNE-300 (RTL8139C)" -[Strings.0419] -ReactOS = "Команда ReactOS" - [Strings.041f] -ReactOS = "ReactOS Takımı" - Realtek8139.DeviceDesc = "Realtek RTL8139 Ethernet Bağdaştırıcısı" AcctonEN1207D.DeviceDesc = "Accton EN-1207D (RTL8139) Ethernet Bağdaştırıcısı" DLinkDFE538TX.DeviceDesc = "D-Link DFE-538TX (RTL8139) Ethernet Bağdaştırıcısı" diff --git a/drivers/processor/processr/cpu.inf b/drivers/processor/processr/cpu.inf index 23608ebbeb3..754514f4ac3 100644 --- a/drivers/processor/processr/cpu.inf +++ b/drivers/processor/processr/cpu.inf @@ -120,7 +120,10 @@ LoadOrderGroup = Extended Base ;-------------------------------- STRINGS ------------------------------- [Strings] -ReactOS = "ReactOS Team" +; Non-localizable +ReactOS = "ReactOS Project" + +; Localizable ProcessorClassName = "Processors" CyrixMfg = "Cyrix" @@ -268,7 +271,6 @@ IntelProcessor.DeviceDesc = "Intel プロセッサ" Standard = "スタンダードプロセッサ" [Strings.0415] -ReactOS = "Zespół ReactOS" ProcessorClassName = "Procesory" Processor.DeviceDesc = "Procesor" @@ -307,7 +309,6 @@ IntelProcessor.DeviceDesc = "Procesador Intel" Standard = "Processador padrão" [Strings.0418] -ReactOS = "Fundația ReactOS" ProcessorClassName = "Procesoare" Processor.DeviceDesc = "Procesor" @@ -340,7 +341,6 @@ ViaNANOProcessor.DeviceDesc = "Procesor VIA Nano" ViaProcessor.DeviceDesc = "Procesor VIA" [Strings.0419] -ReactOS = "Фонд ReactOS" ProcessorClassName = "Процессоры" Processor.DeviceDesc = "Процессор" @@ -379,7 +379,6 @@ IntelProcessor.DeviceDesc = "Intel procesor" Standard = "Štandardný procesor" [Strings.041f] -ReactOS = "ReactOS Vakfı" ProcessorClassName = "İşlemciler" Processor.DeviceDesc = "İşlemci" @@ -412,7 +411,6 @@ ViaNANOProcessor.DeviceDesc = "VIA Nano İşlemci" ViaProcessor.DeviceDesc = "VIA İşlemci" [Strings.0422] -ReactOS = "Фонд ReactOS" ProcessorClassName = "Процесори" Processor.DeviceDesc = "Процесор" @@ -481,7 +479,6 @@ ViaNANOProcessor.DeviceDesc = "VIA Nano 处理器" ViaProcessor.DeviceDesc = "VIA 处理器" [Strings.0a] -ReactOS = "Equipo de ReactOS" ProcessorClassName = "Procesadores" Processor.DeviceDesc = "Procesador" diff --git a/drivers/storage/class/ramdisk/ramdisk.inf b/drivers/storage/class/ramdisk/ramdisk.inf index 99b9aec03b8..db73ccf7b17 100644 --- a/drivers/storage/class/ramdisk/ramdisk.inf +++ b/drivers/storage/class/ramdisk/ramdisk.inf @@ -55,28 +55,28 @@ AddService = , 2 ;-------------------------------- STRINGS ------------------------------- [Strings] -ReactOS = "ReactOS Team" +; Non-localizable +ReactOS = "ReactOS Project" + +; Localizable RamdiskClassName = "Ramdisk" RamdiskBus.Desc = "RAM disk controller" RamdiskVolume.Desc = "RAM disk device (volume)" Ramdisk.ServiceDesc = "ReactOS RAM Disk Driver" [Strings.040C] -ReactOS = "Equipe ReactOS" RamdiskClassName = "Ramdisk" RamdiskBus.Desc = "Controleur de disque virtuel" RamdiskVolume.Desc = "Disque virtuel (volume)" Ramdisk.ServiceDesc = "Pilote de disque virtuel ReactOS" [Strings.0415] -ReactOS = "Zespół ReactOS" RamdiskClassName = "Ramdisk" RamdiskBus.Desc = "Kontroler dysku RAM" RamdiskVolume.Desc = "Urządzenie dysku RAM (wolumin)" Ramdisk.ServiceDesc = "Sterownik dysku RAM systemu ReactOS" [Strings.0419] -ReactOS = "Команда ReactOS" RamdiskClassName = "RAM-диски" RamdiskBus.Desc = "Контроллер RAM-диска" RamdiskVolume.Desc = "Устройство RAM-диска (том)" diff --git a/drivers/usb/usbstor/usbstor.inf b/drivers/usb/usbstor/usbstor.inf index 8d6df54bebd..40fe8cd940e 100644 --- a/drivers/usb/usbstor/usbstor.inf +++ b/drivers/usb/usbstor/usbstor.inf @@ -43,8 +43,10 @@ ServiceBinary = %12%\usbstor.sys ;-------------------------------- STRINGS ------------------------------- [Strings] -ReactOS = "ReactOS Team" +; Non-localizable +ReactOS = "ReactOS Project" +; Localizable GenericMfg = "(Generic USB devices)" GenericBulkOnlyTransport.DeviceDesc = "USB Storage device" @@ -61,8 +63,6 @@ GenericMfg = "(Generische USB-Geräte)" GenericBulkOnlyTransport.DeviceDesc = "USB Datenträger-Geräte" [Strings.0a] -ReactOS = "Equipo de ReactOS" - GenericMfg = "(Dispositivo USB estándar)" GenericBulkOnlyTransport.DeviceDesc = "Dispositivo de almacenamiento USB" @@ -75,7 +75,6 @@ GenericMfg = "(標準 USB デバイス)" GenericBulkOnlyTransport.DeviceDesc = "USB ストレージデバイス" [Strings.0415] -ReactOS = "Zespół ReactOS" GenericMfg = "(Standardowe urządzenia USB)" GenericBulkOnlyTransport.DeviceDesc = "Urządzenie pamięci masowej USB" @@ -84,12 +83,10 @@ GenericMfg = "(Dispositivo USB padrão)" GenericBulkOnlyTransport.DeviceDesc = "Dispositivo de armazenamento USB" [Strings.0418] -ReactOS = "Echipa ReactOS" GenericMfg = "(dispozitive generice USB)" GenericBulkOnlyTransport.DeviceDesc = "Dispozitiv USB de stocare" [Strings.0419] -ReactOS = "Команда ReactOS" GenericMfg = "(Стандартные устройства USB)" GenericBulkOnlyTransport.DeviceDesc = "Запоминающее устройство USB" @@ -98,13 +95,10 @@ GenericMfg = "(Generické USB zariadenia)" GenericBulkOnlyTransport.DeviceDesc = "USB úložné zariadenie" [Strings.041f] -ReactOS = "ReactOS Takımı" - GenericMfg = "(Genel USB Aygıtları)" GenericBulkOnlyTransport.DeviceDesc = "USB Depolama Aygıtı" [Strings.0422] -ReactOS = "Команда ReactOS" GenericMfg = "(Стандартні пристрої USB)" GenericBulkOnlyTransport.DeviceDesc = "USB-накопичувач" diff --git a/drivers/wdm/audio/drivers/ac97/ac97.inf b/drivers/wdm/audio/drivers/ac97/ac97.inf index 7c3a8350720..e6c8beb1953 100644 --- a/drivers/wdm/audio/drivers/ac97/ac97.inf +++ b/drivers/wdm/audio/drivers/ac97/ac97.inf @@ -334,8 +334,11 @@ AddService = ac97, 0x00000002, ac97_Service_Inst [Strings] -ReactOS="ReactOS Team" +; Non-localizable +ReactOS="ReactOS Project" MfgName="Intel" + +; Localizable DiskDescription="AC'97 WDM Driver Disk" ac97_440MX.DeviceDesc="Intel 82440MX AC'97 Audio Controller" diff --git a/media/inf/NET_NIC.inf b/media/inf/NET_NIC.inf index 2a8d1e17c4b..f4dbccba750 100644 --- a/media/inf/NET_NIC.inf +++ b/media/inf/NET_NIC.inf @@ -25,7 +25,10 @@ HKR, , Installer32, 0, "NetCfgx.dll,NetClassInstaller" HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-08002BE10318}\0000","",0x00010000,"" [Strings] -ReactOS = "ReactOS Team" +; Non-localizable +ReactOS = "ReactOS Project" + +; Localizable DisplayClassName = "Network Adapters" [Strings.0404] @@ -41,7 +44,6 @@ DisplayClassName = "Netzwerkadapter" DisplayClassName = "Προσαρμογείς δικτύου" [Strings.0a] -ReactOS = "Equipo de ReactOS" DisplayClassName = "Adaptadores de red" [Strings.040C] @@ -51,36 +53,30 @@ DisplayClassName = "Cartes réseau" DisplayClassName = "ネットワークアダプタ" [Strings.0415] -ReactOS = "Zespół ReactOS" DisplayClassName = "Karty sieciowe" [Strings.0416] DisplayClassName = "Adaptadores de rede" [Strings.0418] -ReactOS = "Echipa ReactOS" DisplayClassName = "Adaptoare de rețea" [Strings.0419] -ReactOS = "Команда ReactOS" DisplayClassName = "Сетевые адаптеры" [Strings.041B] DisplayClassName = "Sieťové adaptéry" [Strings.041f] -ReactOS = "ReactOS Takımı" DisplayClassName = "Ağ Bağdaştırıcıları" [Strings.0422] -ReactOS = "Команда ReactOS" DisplayClassName = "Мережеві адаптери" [Strings.0427] DisplayClassName = "Tinklo adapteriai" [Strings.0816] -ReactOS = "Equipa ReactOS" DisplayClassName = "Adaptadores de rede" [Strings.0C04] diff --git a/media/inf/audio.inf b/media/inf/audio.inf index 4fa654f813c..d54a4dded00 100644 --- a/media/inf/audio.inf +++ b/media/inf/audio.inf @@ -66,7 +66,10 @@ ServiceBinary = %12%\sysaudio.sys ;-------------------------------- STRINGS ------------------------------- [Strings] -ReactOS = "ReactOS Team" +; Non-localizable +ReactOS = "ReactOS Project" + +; Localizable AUDIOClassName = "Audio & Videocontroller" [Strings.0404] @@ -79,30 +82,24 @@ AUDIOClassName = "Řadiče zvuku a obrazu" AUDIOClassName = "Audio-, Video- und Gamecontroller" [Strings.0a] -ReactOS = "Equipo de ReactOS" AUDIOClassName = "Dispositivos de sonido, vídeo y juegos" [Strings.0415] -ReactOS = "Zespół ReactOS" AUDIOClassName = "Kontrolery audio, wideo i gier" [Strings.0416] AUDIOClassName = "Controladores de som, vídeo e jogo" [Strings.0418] -ReactOS = "Echipa ReactOS" AUDIOClassName = "Dispozitive audio & video" [Strings.0419] -ReactOS = "Команда ReactOS" AUDIOClassName = "Аудио и видео контроллер" [Strings.041f] -ReactOS = "ReactOS Takımı" AUDIOClassName = "Ses ve Video Denetleyicisi" [Strings.0422] -ReactOS = "Команда ReactOS" AUDIOClassName = "Контроллер аудіо та відео" [Strings.0427] @@ -112,7 +109,6 @@ AUDIOClassName = "Garso, vaizdo ir žaidimu irenginiai" AUDIOClassName = "音视频控制器" [Strings.0816] -ReactOS = "Equipa ReactOS" AUDIOClassName = "Controladores de som, vídeo e jogos" [Strings.0C04] diff --git a/media/inf/battery.inf b/media/inf/battery.inf index 0047890ac3b..b4be987fe53 100644 --- a/media/inf/battery.inf +++ b/media/inf/battery.inf @@ -69,10 +69,14 @@ ErrorControl = 1 ServiceBinary = %12%\cmbatt.sys [Strings] -ReactOS = "ReactOS Team" -BatteryClassName = "Batteries" +; Non-localizable +ReactOS = "ReactOS Project" + REG_BINARY = 1 +; Localizable +BatteryClassName = "Batteries" + GenericMfg = "(Generic batteries)" ACPI\PNP0C0A.DeviceDesc = "ACPI-compliant control method battery" ACPI\ACPI0003.DeviceDesc = "AC adapter" @@ -97,7 +101,6 @@ ACPI\PNP0C0A.DeviceDesc = "ACPI-konforme Kontrollmethodenbatterie" ACPI\ACPI0003.DeviceDesc = "Netzteil" [Strings.0a] -ReactOS = "Equipo de ReactOS" BatteryClassName = "Baterías" GenericMfg = "(Baterías genéricas)" @@ -111,7 +114,6 @@ ACPI\PNP0C0A.DeviceDesc = "Batterie à méthode de contrôle compatible ACPI" ACPI\ACPI0003.DeviceDesc = "Adaptateur secteur" [Strings.040D] -ReactOS = "צוות ReactOS" BatteryClassName = "סוללות" GenericMfg = "(סוללות כלליות)" @@ -119,21 +121,20 @@ ACPI\PNP0C0A.DeviceDesc = "ACPI-compliant control method battery" ACPI\ACPI0003.DeviceDesc = "AC adapter" [Strings.0415] -ReactOS = "Zespół ReactOS" BatteryClassName = "Baterie" + GenericMfg = "(Standardowe baterie)" ACPI\PNP0C0A.DeviceDesc = "Bateria zgodna z ACPI" ACPI\ACPI0003.DeviceDesc = "Zasilacz" [Strings.0418] -ReactOS = "Echipa ReactOS" BatteryClassName = "Acumulatori" + GenericMfg = "(acumulator generic)" ACPI\PNP0C0A.DeviceDesc = "Metodă de control acumulator conformă cu ACPI" ACPI\ACPI0003.DeviceDesc = "Adaptor de curent alternativ" [Strings.0419] -ReactOS = "Команда ReactOS" BatteryClassName = "Батареи" GenericMfg = "(Стандартные батареи)" @@ -141,7 +142,6 @@ ACPI\PNP0C0A.DeviceDesc = "Батареи с ACPI-совместимым мет ACPI\ACPI0003.DeviceDesc = "AC адаптер" [Strings.041f] -ReactOS = "ReactOS Takımı" BatteryClassName = "Piller" GenericMfg = "(Genel Piller)" @@ -149,8 +149,8 @@ ACPI\PNP0C0A.DeviceDesc = "ACPI Uyumlu Denetim Yöntemi Pili" ACPI\ACPI0003.DeviceDesc = "AC Adaptörü" [Strings.0422] -ReactOS = "Команда ReactOS" BatteryClassName = "Батареї" + GenericMfg = "(Стандартні батареї)" ACPI\PNP0C0A.DeviceDesc = "Батареї з ACPI-сумісним методом керування" ACPI\ACPI0003.DeviceDesc = "AC адаптер" @@ -161,8 +161,8 @@ ACPI\PNP0C0A.DeviceDesc = "ACPI 兼容控制模式电池" ACPI\ACPI0003.DeviceDesc = "交流适配器" [Strings.0816] -ReactOS = "Equipa ReactOS" BatteryClassName = "Baterias" + GenericMfg = "(Baterias genéricas)" ACPI\PNP0C0A.DeviceDesc = "Método de control de bateria compativel com ACPI" ACPI\ACPI0003.DeviceDesc = "Adaptador de corrente alterna" diff --git a/media/inf/bda.inf b/media/inf/bda.inf index 95c16614625..212212cebd3 100644 --- a/media/inf/bda.inf +++ b/media/inf/bda.inf @@ -138,7 +138,9 @@ PsisDecd.dll,,,COPYFLG_NO_VERSION_DIALOG BdaPlgIn.ax,,,COPYFLG_NO_VERSION_DIALOG [Strings] -ReactOS = "ReactOS Team" +; Non-localizable +ReactOS = "ReactOS Project" + RunOnce="SOFTWARE\Microsoft\Windows\CurrentVersion\RunOnce" ActiveMovieCategories="CLSID\{da4e3da0-d07d-11d0-bd50-00a0c911ce86}\Instance" MediaCategories="SYSTEM\CurrentControlSet\Control\MediaCategories" @@ -192,7 +194,6 @@ Pin.Name.MPE="MPE" Pin.Name.NABTS="NABTS" [Strings.0a] -ReactOS = "Equipo de ReactOS" Category_BdaTuner="Filtro de BDA-Source" Category_BdaComponent="Componente de Receptor de BDA" Category_BdaRenderer="Filtro de playback BDA" @@ -204,7 +205,6 @@ Pin.Name.MPE="MPE" Pin.Name.NABTS="NABTS" [Strings.0415] -ReactOS = "Zespół ReactOS" Category_BdaTuner=" Filtr źródła BDA" Category_BdaComponent="Komponent odbioru BDA" Category_BdaRenderer="Filtr odtwarzania BDA" @@ -216,7 +216,6 @@ Pin.Name.MPE="MPE" Pin.Name.NABTS="NABTS" [Strings.0418] -ReactOS = "Echipa ReactOS" Category_BdaTuner="Filtru sursă BDA" Category_BdaComponent="Componentă receptor BDA" Category_BdaRenderer="Filtru de redare BDA" @@ -225,7 +224,6 @@ PlugIn_BdaCA="Extensie BDA pentru acces condițional" Pin.Name.AtscTS="Transport MPEG2" [Strings.0419] -ReactOS = "Команда ReactOS" Category_BdaTuner="Фильтр источника BDA" Category_BdaComponent="Компонент BDA-приемник" Category_BdaRenderer="Фильтр воспроизводителя BDA" @@ -234,7 +232,6 @@ PlugIn_BdaCA="BDA-плагин условного доступа" Pin.Name.AtscTS="Транспорт MPEG2" [Strings.041f] -ReactOS = "ReactOS Takımı" Category_BdaTuner="BDA-Kaynak Süzgeci" Category_BdaComponent="BDA-Alıcı Bileşeni" Category_BdaRenderer="BDA-Yeniden Çalma Süzgeci" @@ -246,7 +243,6 @@ Pin.Name.MPE="MPE" Pin.Name.NABTS="NABTS" [Strings.0422] -ReactOS = "Команда ReactOS" Category_BdaTuner="Фільтр джерела BDA" Category_BdaComponent="Компонент BDA-приймач" Category_BdaRenderer="Фільтр відтворювача BDA" @@ -266,7 +262,6 @@ PlugIn_BdaCA="BDA 条件接入插件" Pin.Name.AtscTS="MPEG2 传输" [Strings.0816] -ReactOS = "Equipa ReactOS" Category_BdaTuner="Filtro BDA-Source" Category_BdaComponent="Componente Receptor de BDA" Category_BdaRenderer="Filtro playback BDA" diff --git a/media/inf/bth.inf b/media/inf/bth.inf index fbf28321c26..86d5f462c57 100644 --- a/media/inf/bth.inf +++ b/media/inf/bth.inf @@ -58,7 +58,10 @@ fbtusb.sys ;---------------------------------------------------------------; [Strings] -ReactOS="ReactOS Team" +; Non-localizable +ReactOS = "ReactOS Project" + +; Localizable BTUSB.DeviceDesc="Generic USB Bluetooth Radio" BluetoothClassName="Bluetooth Radios" @@ -75,27 +78,22 @@ BTUSB.DeviceDesc="USB-Treiber für Bluetooth-Funkgerät" BluetoothClassName="Bluetooth Funkgeräte" [Strings.0a] -ReactOS = "Equipo de ReactOS" BTUSB.DeviceDesc="Radio Bluetooth USB genérica" BluetoothClassName="Radios Bluetooth" [Strings.0415] -ReactOS = "Zespół ReactOS" BTUSB.DeviceDesc="Standardowy odbiornik radiowy Bluetooth na USB" BluetoothClassName="Odbiorniki radiowe Bluetooth" [Strings.0418] -ReactOS="Echipa ReactOS" BTUSB.DeviceDesc="Radio Bluetooth USB generic" BluetoothClassName="Radiouri Bluetooth" [Strings.0419] -ReactOS="Команда ReactOS" BTUSB.DeviceDesc="Стандартный USB Bluetooth радиомодуль" BluetoothClassName="Радиомодули Bluetooth" [Strings.041f] -ReactOS="ReactOS Takımı" BTUSB.DeviceDesc="Genel USB Bluetooth Radyo" BluetoothClassName="Bluetooth Radyoları" @@ -103,7 +101,6 @@ BluetoothClassName="Bluetooth Radyoları" BTUSB.DeviceDesc="通用 USB 蓝牙无线电" [Strings.0816] -ReactOS = "Equipa ReactOS" BTUSB.DeviceDesc="Rádio Bluetooth USB genérico" BluetoothClassName="Rádios Bluetooth" diff --git a/media/inf/c_image.inf b/media/inf/c_image.inf index b27a1bf52bf..86a24893b12 100644 --- a/media/inf/c_image.inf +++ b/media/inf/c_image.inf @@ -24,34 +24,31 @@ HKR, , Icon, 0, "2" HKR,,Installer32, 0,"sti_ci.dll,ClassInstall" [Strings] -ReactOS = "ReactOS Team" +; Non-localizable +ReactOS = "ReactOS Project" + +; Localizable ImageClassName = "Image" [Strings.0404] ImageClassName = "圖像" [Strings.0a] -ReactOS = "Equipo de ReactOS" ImageClassName = "Imagen" [Strings.0415] -ReactOS = "Zespół ReactOS" ImageClassName = "Obraz" [Strings.0418] -ReactOS = "Echipa ReactOS" ImageClassName = "Imagine" [Strings.0419] -ReactOS = "Команда ReactOS" ImageClassName = "Образ" [Strings.041f] -ReactOS = "ReactOS Takımı" ImageClassName = "Resim" [Strings.0816] -ReactOS = "Equipa ReactOS" ImageClassName = "Imagem" [Strings.0c04] diff --git a/media/inf/display.inf b/media/inf/display.inf index 4b076b834f5..55fd86c792b 100644 --- a/media/inf/display.inf +++ b/media/inf/display.inf @@ -58,7 +58,10 @@ LoadOrderGroup = Video Save ;-------------------------------- STRINGS ------------------------------- [Strings] -ReactOS = "ReactOS Team" +; Non-localizable +ReactOS = "ReactOS Project" + +; Localizable DisplayClassName = "Display Adapters" StdMfg = "(Standard display adapters)" @@ -89,7 +92,6 @@ StdMfg = "(Πρότυποι προσαρμογείς οθόνης)" VGA.DeviceDesc = "VGA-συμβατή κάρτα γραφικών" [Strings.0a] -ReactOS = "Equipo de ReactOS" DisplayClassName = "Adaptadores de pantalla" StdMfg = "(Adaptador de pantalla estándar)" @@ -108,8 +110,8 @@ StdMfg = "(標準ディスプレイアダプタ)" VGA.DeviceDesc = "VGA互換グラフィックカード" [Strings.0415] -ReactOS = "Zespół ReactOS" DisplayClassName = "Karty graficzne" + StdMfg = "(Standardowe karty graficzne)" VGA.DeviceDesc = "Karta graficzna kompatybilna z VGA" @@ -120,13 +122,12 @@ StdMfg = "(Adaptador de vídeo padrão)" VGA.DeviceDesc = "Adaptador de vídeo compatível com VGA" [Strings.0418] -ReactOS = "Echipa ReactOS" DisplayClassName = "Adaptoare grafice" + StdMfg = "(adaptoare grafice standard)" VGA.DeviceDesc = "Placă grafică compatibilă VGA" [Strings.0419] -ReactOS = "Команда ReactOS" DisplayClassName = "Графические адаптеры" StdMfg = "(Стандартные графические адаптеры)" @@ -139,14 +140,12 @@ StdMfg = "(Štandardné grafické karty)" VGA.DeviceDesc = "VGA kompatibilná grafická karta" [Strings.041f] -ReactOS = "ReactOS Takımı" DisplayClassName = "Görüntü Bağdaştırıcıları" StdMfg = "(Standart Görüntü Bağdaştırıcıları)" VGA.DeviceDesc = "VGA Uyumlu Grafik Kartı" [Strings.0422] -ReactOS = "Команда ReactOS" DisplayClassName = "Графічні адаптери" StdMfg = "(Стандартні графічні адаптери)" @@ -163,7 +162,6 @@ StdMfg = "（标准显示适配器）" VGA.DeviceDesc = "VGA 兼容显示卡" [Strings.0816] -ReactOS = "Equipa ReactOS" DisplayClassName = "Adaptadores de vídeo" StdMfg = "(Adaptador de vídeo padrão)" diff --git a/media/inf/fdc.inf b/media/inf/fdc.inf index dd919bfbd98..db8283649e5 100644 --- a/media/inf/fdc.inf +++ b/media/inf/fdc.inf @@ -58,7 +58,10 @@ AddService = , 0x00000002 ;-------------------------------- STRINGS ------------------------------- [Strings] -ReactOS = "ReactOS Team" +; Non-localizable +ReactOS = "ReactOS Project" + +; Localizable FDCClassName = "Floppy disk controllers" GenericMfg = "(Generic floppy disk controllers)" @@ -89,7 +92,6 @@ GenericMfg = "(Γενικοί ελεγκτές δισκέτας)" *PNP0700.DeviceDesc = "Γενικός ελεγκτής δισκέτας" [Strings.0a] -ReactOS = "Equipo de ReactOS" FDCClassName = "Controladores de disquete" GenericMfg = "(Controlador estándar de disquetes)" @@ -108,8 +110,8 @@ GenericMfg = "(標準フロッピーディスクコントローラ)" *PNP0700.DeviceDesc = "標準フロッピーディスクコントローラ" [Strings.0415] -ReactOS = "Zespół ReactOS" FDCClassName = "Kontrolery stacji dyskietek" + GenericMfg = "(Standardowowe kontrolery stacji dyskietek)" *PNP0700.DeviceDesc = "Standardowy kontroler stacji dyskietek" @@ -120,13 +122,12 @@ GenericMfg = "(Unidades de disquete padrão)" *PNP0700.DeviceDesc = "Controlador padrão de disquete" [Strings.0418] -ReactOS = "Echipa ReactOS" FDCClassName = "Dispozitive de control disc flexibil" + GenericMfg = "(dispozitiv generic de control disc flexibil)" *PNP0700.DeviceDesc = "Dispozitiv generic de control disc flexibil" [Strings.0419] -ReactOS = "Команда ReactOS" FDCClassName = "Контроллеры гибких дисков" GenericMfg = "(Стандартные контроллеры гибких дисков)" @@ -139,14 +140,12 @@ GenericMfg = "(Generické radiče disketových mechaník)" *PNP0700.DeviceDesc = "Generický radič disketovej mechaniky" [Strings.041f] -ReactOS = "ReactOS Takımı" FDCClassName = "Disket Denetleyicileri" GenericMfg = "(Genel Disket Denetleyicileri)" *PNP0700.DeviceDesc = "Genel Disket Denetleyicisi" [Strings.0422] -ReactOS = "Команда ReactOS" FDCClassName = "Контроллери гнучких дисків" GenericMfg = "(Стандартні контроллери гнучких дисків)" @@ -163,8 +162,8 @@ GenericMfg = "(通用软盘控制器)" *PNP0700.DeviceDesc = "通用软盘控制器" [Strings.0816] -ReactOS = "Equipa ReactOS" FDCClassName = "Unidades de disquete" + GenericMfg = "(Unidades de disquete padrão)" *PNP0700.DeviceDesc = "Controlador de disquete padrão" diff --git a/media/inf/flpydisk.inf b/media/inf/flpydisk.inf index 0ba41a94344..550615572f3 100644 --- a/media/inf/flpydisk.inf +++ b/media/inf/flpydisk.inf @@ -58,8 +58,10 @@ AddService = , 0x00000002 ;-------------------------------- STRINGS ------------------------------- [Strings] -ReactOS = "ReactOS Team" +; Non-localizable +ReactOS = "ReactOS Project" +; Localizable FloppyClassName = "Floppy disk drives" GenericMfg = "(Generic floppy disk drives)" Floppy.DeviceDesc = "Generic floppy disk drive" @@ -70,42 +72,32 @@ GenericMfg = "（標準軟碟機）" Floppy.DeviceDesc = "標準軟碟機" [Strings.0405] -ReactOS = "ReactOS Team" - FloppyClassName = "Disketové jednotky" GenericMfg = "(Obecné disketové jednotky)" Floppy.DeviceDesc = "Obecná disketová jednotka" [Strings.0a] -ReactOS = "Equipo de ReactOS" - FloppyClassName = "Disqueteras" GenericMfg = "(Disqueteras genéricas)" Floppy.DeviceDesc = "Disquetera genérica" [Strings.0415] -ReactOS = "Zespół ReactOS" - FloppyClassName = "Stacje dyskietek" GenericMfg = "(Standardowe stacje dyskietek)" Floppy.DeviceDesc = "Standardowa stacja dyskietek" [Strings.0418] -ReactOS = "Echipa ReactOS" FloppyClassName = "Unitate de disc flexibil" GenericMfg = "(unități generice de disc flexibil)" Floppy.DeviceDesc = "Unitate de disc flexibil" [Strings.0419] -ReactOS = "Команда ReactOS" FloppyClassName = "Дисководы гибких дисков" GenericMfg = "(Универсальные дисководы гибких дисков)" Floppy.DeviceDesc = "Универсальный дисковод гибких дисков" [Strings.041f] -ReactOS = "ReactOS Takımı" - FloppyClassName = "Disket Sürücüleri" GenericMfg = "(Genel Disket Sürücüleri)" Floppy.DeviceDesc = "Genel Disket Sürücüsü" @@ -115,8 +107,6 @@ GenericMfg = "（通用软盘驱动器）" Floppy.DeviceDesc = "通用软盘驱动器" [Strings.0816] -ReactOS = "Equipa ReactOS" - FloppyClassName = "Controlador disquete" GenericMfg = "(Controlador disquete Genérico)" Floppy.DeviceDesc = "Controlador disquete Genérico" diff --git a/media/inf/hal.inf b/media/inf/hal.inf index f90ba12a10c..7bfadaabb99 100644 --- a/media/inf/hal.inf +++ b/media/inf/hal.inf @@ -46,8 +46,10 @@ AddService = , 0x00000002 ;-------------------------------- STRINGS ------------------------------- [Strings] -ReactOS = "ReactOS Team" +; Non-localizable +ReactOS = "ReactOS Project" +; Localizable ComputerClassName = "Computer" GenericMfg = "(Generic computers)" @@ -83,8 +85,6 @@ xbox.DeviceDesc = "Original Xbox (x86 based)" pc98_up.DeviceDesc = "Uniprocessor NEC PC-98" [Strings.0a] -ReactOS = "Equipo de ReactOS" - ComputerClassName = "Equipo" GenericMfg = "(Equipos genéricos)" @@ -97,8 +97,6 @@ xbox.DeviceDesc = "Original Xbox (x86 based)" pc98_up.DeviceDesc = "Uniprocessor NEC PC-98" [Strings.0415] -ReactOS = "Zespół ReactOS" - ComputerClassName = "Komputer" GenericMfg = "(Komputery standardowe)" @@ -111,8 +109,6 @@ xbox.DeviceDesc = "Oryginalny Xbox (oparty na procesorze x86)" pc98_up.DeviceDesc = "Komputer NEC PC-98" [Strings.0418] -ReactOS = "Echipa ReactOS" - ComputerClassName = "Calculator" GenericMfg = "(calculatoare generice)" @@ -125,8 +121,6 @@ xbox.DeviceDesc = "Original Xbox (x86 based)" pc98_up.DeviceDesc = "Uniprocessor NEC PC-98" [Strings.0419] -ReactOS = "Команда ReactOS" - ComputerClassName = "Компьютер" GenericMfg = "(Универсальный компьютер)" @@ -139,8 +133,6 @@ xbox.DeviceDesc = "Оригинальный Xbox (на базе x86)" pc98_up.DeviceDesc = "Однопроцессорный NEC PC-98" [Strings.041f] -ReactOS = "ReactOS Takımı" - ComputerClassName = "Bilgisayar" GenericMfg = "(Genel Bilgisayarlar)" @@ -153,8 +145,6 @@ xbox.DeviceDesc = "Özgün Xbox (x86 tabanlı)" pc98_up.DeviceDesc = "Tek İşlemcili NEC PC-98" [Strings.0422] -ReactOS = "Команда ReactOS" - ComputerClassName = "Комп'ютер" GenericMfg = "(Стандартний комп'ютер)" @@ -177,13 +167,15 @@ xbox.DeviceDesc = "Original Xbox (x86 based)" pc98_up.DeviceDesc = "Uniprocessor NEC PC-98" [Strings.0816] -ReactOS = "Equipa ReactOS" ComputerClassName = "Computador" + GenericMfg = "(Computador Genérico)" acpipic_up.DeviceDesc = "ACPI Uniprocessor PC" e_isa_up.DeviceDesc = "Standard Uniprocessor PC" + MsftMfg = "Microsoft Corporation" xbox.DeviceDesc = "Original Xbox (x86 based)" + NecMfg = "NEC" pc98_up.DeviceDesc = "Uniprocessor NEC PC-98" diff --git a/media/inf/hdc.inf b/media/inf/hdc.inf index f1efd9fa456..d893de7560c 100644 --- a/media/inf/hdc.inf +++ b/media/inf/hdc.inf @@ -379,7 +379,10 @@ LoadOrderGroup = System Bus Extender ;-------------------------------- STRINGS ------------------------------- [Strings] -ReactOS = "ReactOS Team" +; Non-localizable +ReactOS = "ReactOS Project" + +; Localizable HDCClassName = "IDE ATA/ATAPI controllers" GenericMfg = "(Generic hard disk controllers)" PCI\VEN_1191&DEV_0005.DeviceDesc="Acard ATP850 ATA-33 controller" @@ -1020,7 +1023,6 @@ PCI\CC_0105.DeviceDesc = "Obecný řadič ATA" PCI\CC_0106.DeviceDesc = "Obecný řadič Serial ATA" [Strings.0407] -ReactOS = "ReactOS Team" HDCClassName = "IDE ATA/ATAPI Controller" GenericMfg = "(Generische Festplatten-Controller)" PCI\VEN_1191&DEV_0005.DeviceDesc="Acard ATP850 ATA-33 Controller" @@ -1336,7 +1338,6 @@ PCI\CC_0106.DeviceDesc = "Generischer Serial ATA Controller" [Strings.0a] -ReactOS = "Equipo de ReactOS" HDCClassName = "Controladores IDE ATA/ATAPI genéricos" GenericMfg = "(Controladores de disco duro genéricos)" PCI\VEN_1191&DEV_0005.DeviceDesc="Controlador Acard ATP850 ATA-33" @@ -1651,7 +1652,6 @@ PCI\CC_0105.DeviceDesc = "Controlador ATA genérico" PCI\CC_0106.DeviceDesc = "Controlador Serial ATA genérico" [Strings.0415] -ReactOS = "Zespół ReactOS" HDCClassName = "Kontrolery IDE ATA/ATAPI" GenericMfg = "(Standardowe kontrolery IDE ATA/ATAPI)" PCI\VEN_1191&DEV_0005.DeviceDesc="Kontroler Acard ATP850 ATA-33" @@ -1966,7 +1966,6 @@ PCI\CC_0105.DeviceDesc = "Standardowy kontroler ATA" PCI\CC_0106.DeviceDesc = "Standardowy kontroler Serial ATA" [Strings.0418] -ReactOS = "Echipa ReactOS" HDCClassName = "Dispozitive de control IDE ATA/ATAPI" GenericMfg = "(dispozitive generice de control HDD)" PCI\VEN_1191&DEV_0005.DeviceDesc="Dispozitiv de control Acard ATP850 ATA-33" @@ -2257,7 +2256,6 @@ PCI\CC_0105.DeviceDesc = "Dispozitiv de control ATA generic" PCI\CC_0106.DeviceDesc = "Dispozitiv de control Serial ATA generic" [Strings.0419] -ReactOS = "Команда ReactOS" HDCClassName = "IDE ATA/ATAPI контроллеры" GenericMfg = "(Универсальный контроллер жесткого диска)" PCI\VEN_1191&DEV_0005.DeviceDesc="Acard ATP850 ATA-33 контроллер" @@ -2573,7 +2571,6 @@ PCI\CC_0106.DeviceDesc = "Универсальный Serial ATA контрол ; Turkish [Strings.041f] -ReactOS = "ReactOS Takımı" HDCClassName = "IDE ATA/ATAPI Denetleyicileri" GenericMfg = "(Genel Sabit Disk Denetleyicileri)" PCI\VEN_1191&DEV_0005.DeviceDesc="Acard ATP850 ATA-33 Denetleyicisi" @@ -2888,7 +2885,6 @@ PCI\CC_0105.DeviceDesc = "Genel ATA Denetleyicisi" PCI\CC_0106.DeviceDesc = "Genel Seri ATA Denetleyicisi" [Strings.0422] -ReactOS = "Команда ReactOS" HDCClassName = "Контроллери IDE ATA/ATAPI" GenericMfg = "(Стандартні контроллери жорстких дисків)" PCI\VEN_1191&DEV_0005.DeviceDesc="Контроллер Acard ATP850 ATA-33" diff --git a/media/inf/input.inf b/media/inf/input.inf index 9eecb543b64..c44d046a80b 100644 --- a/media/inf/input.inf +++ b/media/inf/input.inf @@ -74,7 +74,10 @@ ServiceBinary = %12%\hidusb.sys LoadOrderGroup = Extended Base [Strings] -ReactOS = "ReactOS Team" +; Non-localizable +ReactOS = "ReactOS Project" + +; Localizable HID.ClassName = "Human Interface Devices" HID.DeviceDesc = "USB Human Interface Device" @@ -106,7 +109,6 @@ HID_DEVICE = "Zařízení standardu HID" StdMfg = "(Obecná zařízení standardu HID)" [Strings.0a] -ReactOS = "Equipo de ReactOS" HID.ClassName = "Dispositivos de interfaz humana" HID.DeviceDesc = "Dispositivos de interfaz humana USB" @@ -114,7 +116,6 @@ HID_DEVICE = "Dispositivo compatible con otros dispositivos de interf StdMfg = "(Dispositivos de interfaz humana estándar)" [Strings.0415] -ReactOS = "Zespół ReactOS" HID.ClassName = "Urządzenia interfejsu HID" HID.DeviceDesc = "Urządzenie USB interfejsu HID" @@ -123,7 +124,6 @@ StdMfg = "(Standardowe urządzenia HID)" MSMice = "Microsoft" [Strings.0418] -ReactOS = "Echipa ReactOS" HID.ClassName = "Dispozitive de interfațare umană" HID.DeviceDesc = "Dispozitiv USB de interfațare umană" @@ -131,7 +131,6 @@ HID_DEVICE = "Dispozitiv compatibil de interfațare umană" StdMfg = "(dispozitive generice de interfațare umană)" [Strings.0419] -ReactOS = "Команда ReactOS" HID.ClassName = "Устройства HID (Human Interface Devices)" HID.DeviceDesc = "USB HID-совместимое устройство" @@ -140,7 +139,6 @@ StdMfg = "(Стандартные HID-устройства)" MSMice = "Microsoft" [Strings.041f] -ReactOS = "ReactOS Takımı" HID.ClassName = "İnsan Arabirimi Aygıtları" HID.DeviceDesc = "USB İnsan Arabirimi Aygıtı" @@ -148,7 +146,6 @@ HID_DEVICE = "HID Uyumlu Aygıt" StdMfg = "(Standart İnsan Arabirimi Aygıtları)" [Strings.0422] -ReactOS = "Команда ReactOS" HID_DEVICE = "HID-сумісний пристрій" [Strings.0804] @@ -157,7 +154,6 @@ HID_DEVICE = "HID 兼容设备" StdMfg = "(标准人机接口设备)" [Strings.0816] -ReactOS = "Equipa ReactOS" HID.ClassName = "Dispositivos de interface humana" HID.DeviceDesc = "Dispositivos de interface humana USB" diff --git a/media/inf/keyboard.inf b/media/inf/keyboard.inf index c150e903f31..fc5ccd8235b 100644 --- a/media/inf/keyboard.inf +++ b/media/inf/keyboard.inf @@ -99,7 +99,10 @@ LoadOrderGroup = Keyboard Class ;-------------------------------- STRINGS ------------------------------- [Strings] -ReactOS = "ReactOS Team" +; Non-localizable +ReactOS = "ReactOS Project" + +; Localizable KeyboardClassName = "Keyboards" HID.KeyboardDevice = "HID-Keyboard" StdMfg = "(Standard keyboards)" @@ -132,7 +135,6 @@ StdMfg = "(Πρότυπα πληκτρολόγια)" *PNP0303.DeviceDesc = "IBM PC/AT πληκτρολόγιο" [Strings.0a] -ReactOS = "Equipo de ReactOS" KeyboardClassName = "Teclados" StdMfg = "(Teclado estándar)" LocationOverride = "se conecta al puerto de teclado" @@ -150,7 +152,6 @@ StdMfg = "(スタンダードキーボード)" *PNP0303.DeviceDesc = "IBM PC/AT キーボード" [Strings.0415] -ReactOS = "Zespół ReactOS" KeyboardClassName = "Klawiatury" HID.KeyboardDevice = "Klawiatura HID" StdMfg = "(Klawiatury standardowe)" @@ -163,7 +164,6 @@ StdMfg = "(Teclado padrão)" *PNP0303.DeviceDesc = "Teclado IBM PC/AT" [Strings.0418] -ReactOS = "Echipa ReactOS" KeyboardClassName = "Tastaturi" HID.KeyboardDevice = "Tastatură-dispozitiv de interfațare umană" StdMfg = "(tastatură standard)" @@ -171,7 +171,6 @@ LocationOverride = "conectat la portul de tastatură" *PNP0303.DeviceDesc = "Tastatură IBM PC/AT" [Strings.0419] -ReactOS = "Команда ReactOS" KeyboardClassName = "Клавиатуры" HID.KeyboardDevice = "Клавиатура HID" StdMfg = "(Стандартные клавиатуры)" @@ -184,7 +183,6 @@ StdMfg = "(Štandardné klávesnice)" *PNP0303.DeviceDesc = "Klávesnica IBM PC/AT" [Strings.041f] -ReactOS = "ReactOS Takımı" KeyboardClassName = "Klavyeler" HID.KeyboardDevice = "HID Klavyeler" StdMfg = "(Standart Klavyeler)" @@ -192,7 +190,6 @@ LocationOverride = "klavye girişine takılı" *PNP0303.DeviceDesc = "IBM PC/AT Klavye" [Strings.0422] -ReactOS = "Команда ReactOS" KeyboardClassName = "Клавіатури" HID.KeyboardDevice = "HID-Клавіатура" StdMfg = "(Стандартні клавіатури)" @@ -210,7 +207,6 @@ StdMfg = "(标准键盘)" *PNP0303.DeviceDesc = "IBM PC/AT 键盘" [Strings.0816] -ReactOS = "Equipa ReactOS" KeyboardClassName = "Teclados" StdMfg = "(Teclado padrão)" *PNP0303.DeviceDesc = "Teclado IBM PC/AT" diff --git a/media/inf/ks.inf b/media/inf/ks.inf index 535d8529b18..d1cc1a5c41d 100644 --- a/media/inf/ks.inf +++ b/media/inf/ks.inf @@ -344,7 +344,9 @@ HKLM,System\CurrentControlSet\Control\MediaInterfaces\{EC529B00-1A1F-11D1-BAD9-0 [Strings] -ReactOS = "ReactOS Team" +; Non-localizable +ReactOS = "ReactOS Project" + KSSTRING_Clock="{53172480-4791-11D0-A5D6-28DB04C10000}" KSSTRING_Quality="{97EBAACB-95BD-11D0-A3EA-00A0C9223196}" KSSTRING_Server="{3C0D501A-140B-11D1-B40F-00A0C9223196}" @@ -951,7 +953,6 @@ AudFName.Video="Video" AudFName.Peakmeter="Peakmeter" [Strings.0a] -ReactOS = "Equipo de ReactOS" StreamingClass="Dispositivos y filtros de streaming" Proxy.FilterDesc="Proxy de filtrado WDM genérico" Category_CaptureDevices="Dispositivos de captura de streaming WDM" @@ -1103,7 +1104,6 @@ AudFName.VideoMute="Silenciar vídeo" AudFName.Video="Vídeo" [Strings.0415] -ReactOS = "Zespół ReactOS" StreamingClass="Urządzenia/filtry strumieniowe" Proxy.FilterDesc="Standardowy filtr WDM" Category_CaptureDevices="Urządzenia nagrywania strumieniowego WDM" @@ -1256,7 +1256,6 @@ AudFName.Video="Video" AudFName.Peakmeter="Analizator" [Strings.0418] -ReactOS = "Echipa ReactOS" StreamingClass="Filtre/dispozitive de redare în flux" Proxy.FilterDesc="Proxy filtru WDM generic" Category_CaptureDevices="Dispozitive de captură flux WDM" @@ -1408,8 +1407,6 @@ AudFName.Peakmeter="Vârf-metru" ; Turkish [Strings.041f] -ReactOS = "ReactOS Takımı" - StreamingClass="Akış Aygıtları/Süzgeçleri" Proxy.FilterDesc="Genel WDM Süzgeç Vekil Sunucusu" Category_CaptureDevices="WDM Akış Yakalama Aygıtları" @@ -1562,7 +1559,6 @@ AudFName.Video="Video" AudFName.Peakmeter="Tepe Noktası Ölçücüsü" [Strings.0422] -ReactOS = "Команда ReactOS" StreamingClass="Потокові пристрої/фільтри" Proxy.FilterDesc="Стандартний проксі фільтру WDM" Category_CaptureDevices="Пристрої захоплення потоку WDM" @@ -1705,7 +1701,6 @@ AudFName.Video="Відео" AudFName.Peakmeter="Замір рівнів" [Strings.0816] -ReactOS = "Equipa ReactOS" StreamingClass="Dispositivos e filtros de streaming" Proxy.FilterDesc="Proxy de filtro WDM genérico" Category_CaptureDevices="Dispositivos de captura de WDM Streaming" diff --git a/media/inf/kscaptur.inf b/media/inf/kscaptur.inf index 9c4d61c8ee4..d83c1858a79 100644 --- a/media/inf/kscaptur.inf +++ b/media/inf/kscaptur.inf @@ -245,7 +245,9 @@ HKLM,%RunOnce%,"STREAMIP0",,"rundll32.exe streamci,StreamingDeviceSetup %StreamI HKLM,%RunOnce%,"NDISIP0",,"rundll32.exe streamci,StreamingDeviceSetup %NdisIP.DeviceId%,NDISIP,%NdisIP.GUID.BDANetInterface%,%17%\ndisip.inf,NdisIP.Reg" [Strings] -ReactOS = "ReactOS Team" +; Non-localizable +ReactOS = "ReactOS Project" + ActiveMovieCategories="CLSID\{da4e3da0-d07d-11d0-bd50-00a0c911ce86}\Instance" GUID.TvTuner="{A799A800-A46D-11d0-A18C-00A02401DCD4}" GUID.Crossbar="{A799A801-A46D-11d0-A18C-00A02401DCD4}" @@ -384,7 +386,6 @@ Plugin_ISelector="WDM Streaming-ISelector-Schnittstellenhandler" Plugin_PropertyObject="Knotenschnittstellen-Aggregierungshandler" [Strings.0a] -ReactOS = "Equipo de ReactOS" VfWWDMDriverDesc="Dispositivo de captura de vídeo por WDM" Filter_TVAudio="Audio de TV por WDM" @@ -407,7 +408,6 @@ Node.Encoder="Codificador" Node.Multiplexer="Multiplexador" [Strings.0415] -ReactOS = "Zespół ReactOS" Category_CrossbarDevices="Urządzenia strumieniowe Crossbar WDM" Category_TvTunerDevices="Urządzenia strumieniowe odbiornika TV WDM" Category_TvAudioDevices="Urządzenia strumieniowe TV Audio WDM" @@ -456,7 +456,6 @@ Plugin_ISelector="Wtyczka do interfejsu strumienia ISelectorWDM" Plugin_PropertyObject="Node Interfaces-Aggregate handler" [Strings.0418] -ReactOS = "Echipa ReactOS" Category_CrossbarDevices="Dispozitive „crossbar” de flux WDM" Category_TvTunerDevices="Dispozitive receptoare TV de flux WDM" Category_TvAudioDevices="Dispozitive audio TV de flux WDM" @@ -505,7 +504,6 @@ Plugin_ISelector="Rutină interfață flux WDM selector intrare" Plugin_PropertyObject="Rutină interfețe nod agregate" [Strings.041f] -ReactOS = "ReactOS Takımı" Category_CrossbarDevices="WDM Akış-Çubuk-Aygıt" Category_TvTunerDevices="WDM Akış-TV-Alıcı Aygıtlar" Category_TvAudioDevices="WDM Akış-TV-Ses Aygıtları" @@ -554,7 +552,6 @@ Plugin_ISelector="WDM Akış-ISelector-Arayüz İşleyicisi" Plugin_PropertyObject="Bileşen Arayüzler-Öbeklenme İşleyicisi" [Strings.0422] -ReactOS = "Команда ReactOS" Category_CrossbarDevices="Потоково-Перехресний Пристрій WDM" Category_TvTunerDevices="Потокові TV-Приймальні Пристрої WDM" Category_TvAudioDevices="Потокові TV-Аудіо Пристрої WDM" diff --git a/media/inf/legcydrv.inf b/media/inf/legcydrv.inf index 5d81b6c77f5..76cf3d27a24 100644 --- a/media/inf/legcydrv.inf +++ b/media/inf/legcydrv.inf @@ -19,7 +19,10 @@ HKR, , EnumPropPages32, 0, "syssetup.dll,LegacyDriverPropPageProvider" ;-------------------------------- STRINGS ------------------------------- [Strings] -ReactOS = "ReactOS Team" +; Non-localizable +ReactOS = "ReactOS Project" + +; Localizable LegacyDriverClassName = "Non-Plug and Play Drivers" [Strings.0404] @@ -32,27 +35,21 @@ LegacyDriverClassName = "Zařízení nepodporující Plug and Play" LegacyDriverClassName = "Nicht-PnP Treiber" [Strings.0a] -ReactOS = "Equipo de ReactOS" LegacyDriverClassName = "Controladores incompatibles con PnP" [Strings.0415] -ReactOS = "Zespół ReactOS" LegacyDriverClassName = "Sterowniki niezgodne z Plug and Play" [Strings.0418] -ReactOS = "Echipa ReactOS" LegacyDriverClassName = "Modúle pilot de cuplare statică (non-PnP)" [Strings.0419] -ReactOS = "Команда ReactOS" LegacyDriverClassName = "Драйверы устройств не Plug and Play" [Strings.041f] -ReactOS = "ReactOS Takımı" LegacyDriverClassName = "Tak ve Çalıştır Olmayan Sürücüler" [Strings.0816] -ReactOS = "Equipa ReactOS" LegacyDriverClassName = "Controladores incompativeis com PnP" [Strings.0C04] diff --git a/media/inf/machine.inf b/media/inf/machine.inf index 9d0175cd88a..8934b56d70e 100644 --- a/media/inf/machine.inf +++ b/media/inf/machine.inf @@ -163,7 +163,10 @@ LoadOrderGroup = Boot Bus Extender ;-------------------------------- STRINGS ------------------------------- [Strings] -ReactOS = "ReactOS Team" +; Non-localizable +ReactOS = "ReactOS Project" + +; Localizable SystemClassName = "System devices" GenericMfg = "(Generic system devices)" @@ -378,7 +381,6 @@ PCI\VEN_8086&DEV_7190.DeviceDesc = "Intel 82443BX/ZX/DX Pentium(R) II CPU σε P PCI\VEN_8086&DEV_7192.DeviceDesc = "Intel 82443BX/ZX/DX Pentium(R) II CPU σε PCI-Γέφυρα" [Strings.0a] -ReactOS = "Equipo de ReactOS" SystemClassName = "Dispositivos del sistema" GenericMfg = "(Dispositivos del sistema estándar)" @@ -506,7 +508,6 @@ PCI\VEN_8086&DEV_7190.DeviceDesc = "Intel 82443BX/ZX/DX Pentium(R) II CPU to PCI PCI\VEN_8086&DEV_7192.DeviceDesc = "Intel 82443BX/ZX/DX Pentium(R) II CPU to PCI ブリッジ" [Strings.0415] -ReactOS = "Zespół ReactOS" SystemClassName = "Urządzenia systemowe" GenericMfg = "(Standardowe urządzenia systemowe)" @@ -588,7 +589,6 @@ PCI\VEN_8086&DEV_7190.DeviceDesc = "Intel 82443BX/ZX/DX Pentium(R) II Ponte CPU PCI\VEN_8086&DEV_7192.DeviceDesc = "Intel 82443BX/ZX/DX Pentium(R) II Ponte CPU - PCI" [Strings.0418] -ReactOS = "Echipa ReactOS" SystemClassName = "Dispozitive de sistem" GenericMfg = "(dispozitiv generic de sistem)" @@ -633,7 +633,6 @@ PCI\VEN_8086&DEV_7190.DeviceDesc = "Punte Intel 82443BX/ZX/DX Pentium(R) II CPU PCI\VEN_8086&DEV_7192.DeviceDesc = "Punte Intel 82443BX/ZX/DX Pentium(R) II CPU to PCI" [Strings.0419] -ReactOS = "Команда ReactOS" SystemClassName = "Системные устройства" GenericMfg = "(Стандартные системные устройства)" @@ -723,7 +722,6 @@ PCI\VEN_8086&DEV_7190.DeviceDesc = "Most Intel 82443BX/ZX/DX Pentium(R) II CPU n PCI\VEN_8086&DEV_7192.DeviceDesc = "Most Intel 82443BX/ZX/DX Pentium(R) II CPU na PCI" [Strings.041f] -ReactOS = "ReactOS Takımı" SystemClassName = "Sistem Aygıtları" GenericMfg = "(Genel Sistem Aygıtları)" @@ -767,7 +765,6 @@ PCI\VEN_8086&DEV_7190.DeviceDesc = "Intel 82443BX/ZX/DX Pentium(R) II CPU'dan PC PCI\VEN_8086&DEV_7192.DeviceDesc = "Intel 82443BX/ZX/DX Pentium(R) II CPU'dan PCI'ya Köprü" [Strings.0422] -ReactOS = "Команда ReactOS" SystemClassName = "Системні пристрої" GenericMfg = "(Стандартні системні пристрої)" @@ -892,7 +889,6 @@ PCI\VEN_8086&DEV_7190.DeviceDesc = "Intel 82443BX/ZX/DX Pentium(R) II CPU - PCI PCI\VEN_8086&DEV_7192.DeviceDesc = "Intel 82443BX/ZX/DX Pentium(R) II CPU - PCI 桥" [Strings.0816] -ReactOS = "Equipa ReactOS" SystemClassName = "Dispositivos do sistema" GenericMfg = "(Dispositivos do sistema padrão)" diff --git a/media/inf/monitor.inf b/media/inf/monitor.inf index d47ad2e6b46..3ccc18c177a 100644 --- a/media/inf/monitor.inf +++ b/media/inf/monitor.inf @@ -50,7 +50,10 @@ ServiceBinary = %12%\monitor.sys ;-------------------------------- STRINGS ------------------------------- [Strings] -ReactOS = "ReactOS Team" +; Non-localizable +ReactOS = "ReactOS Project" + +; Localizable MonitorClassName = "Monitors" StdMfg = "(Standard monitor types)" @@ -72,11 +75,11 @@ PnPMonitor.DeviceDesc = "Plug and Play monitor" [Strings.0407] MonitorClassName = "Monitore" + StdMfg = "(Generische Monitore)" PnPMonitor.DeviceDesc = "Plug and Play Monitor" [Strings.0a] -ReactOS = "Equipo de ReactOS" MonitorClassName = "Monitores" StdMfg = "(Monitores genéricos)" @@ -84,8 +87,6 @@ DefaultMonitor.DeviceDesc = "Monitor predeterminado" PnPMonitor.DeviceDesc = "Monitor Plug and Play" [Strings.0415] -ReactOS = "Zespół ReactOS" - MonitorClassName = "Monitory" StdMfg = "(Standardowe typy monitorów)" @@ -93,21 +94,20 @@ DefaultMonitor.DeviceDesc = "Domyślny monitor" PnPMonitor.DeviceDesc = "Monitor Plug and Play" [Strings.0418] -ReactOS = "Echipa ReactOS" MonitorClassName = "Ecrane" + StdMfg = "(ecrane de tip standard)" DefaultMonitor.DeviceDesc = "Ecran implicit" PnPMonitor.DeviceDesc = "Ecran cuplare dinamică (PnP)" [Strings.0419] -ReactOS = "Команда ReactOS" MonitorClassName = "Мониторы" + StdMfg = "(Стандартные мониторы)" DefaultMonitor.DeviceDesc = "Модуль подключения монитора" PnPMonitor.DeviceDesc = "Монитор Plug and Play" [Strings.041f] -ReactOS = "ReactOS Takımı" MonitorClassName = "Monitörler" StdMfg = "(Standart Monitör Türleri)" @@ -120,7 +120,6 @@ DefaultMonitor.DeviceDesc = "默认监视器" PnPMonitor.DeviceDesc = "即插即用监视器" [Strings.0816] -ReactOS = "Equipa ReactOS" MonitorClassName = "Monitores" StdMfg = "(Monitores genéricos)" diff --git a/media/inf/msmouse.inf b/media/inf/msmouse.inf index 3a4fc5af642..b485cb9067b 100644 --- a/media/inf/msmouse.inf +++ b/media/inf/msmouse.inf @@ -160,7 +160,10 @@ LoadOrderGroup = Pointer Port ;-------------------------------- STRINGS ------------------------------- [Strings] -ReactOS = "ReactOS Team" +; Non-localizable +ReactOS = "ReactOS Project" + +; Localizable MouseClassName = "Mice and other pointing devices" LocationOverride = "plugged in to PS/2 mouse port" @@ -285,7 +288,6 @@ HID_MOUSE.DeviceDesc = "Ποντίκι HID" *nEC1F00.DeviceDesc = "NEC PC-98 Bus Mouse" [Strings.0a] -ReactOS = "Equipo de ReactOS" MouseClassName = "Ratones y otros dispositivos señaladores" LocationOverride = "se conecta al puerto de ratón PS/2" @@ -358,7 +360,6 @@ HID_MOUSE.DeviceDesc = "HID マウス" *nEC1F00.DeviceDesc = "NEC PC-98 Bus Mouse" [Strings.0415] -ReactOS = "Zespół ReactOS" MouseClassName = "Mysz i inne urządzenia wskazujące" LocationOverride = "podłączone do portu PS/2 dla myszy" @@ -408,9 +409,9 @@ HID_MOUSE.DeviceDesc = "Mouse interno" *nEC1F00.DeviceDesc = "NEC PC-98 Bus Mouse" [Strings.0418] -ReactOS = "Echipa ReactOS" MouseClassName = "Șoricel și alte dispozitive de indicare" LocationOverride = "conectat la portul PS/2 pentru șoricel" + StdMfg = "(șoricel standard)" SERIAL_MOUSE.DeviceDesc = "Șoricel serial standard" PS2_MOUSE.DeviceDesc = "Șoricel PS/2 standard" @@ -433,7 +434,6 @@ HID_MOUSE.DeviceDesc = "Șoricel HID" *nEC1F00.DeviceDesc = "NEC PC-98 Bus Mouse" [Strings.0419] -ReactOS = "Команда ReactOS" MouseClassName = "Мыши и другие указывающие устройства" LocationOverride = "подключено в PS/2 порт мыши" @@ -479,7 +479,6 @@ HID_MOUSE.DeviceDesc = "HID myš" *nEC1F00.DeviceDesc = "NEC PC-98 Bus Mouse" [Strings.041f] -ReactOS = "ReactOS Takımı" MouseClassName = "Fare ve Diğer İşaretçi Aygıtları" LocationOverride = "PS/2 fare girişine takılı" @@ -505,7 +504,6 @@ HID_MOUSE.DeviceDesc = "HID Fare" *nEC1F00.DeviceDesc = "NEC PC-98 Veriyolu Faresi" [Strings.0422] -ReactOS = "Команда ReactOS" MouseClassName = "Миші та інші вказівні пристрої" LocationOverride = "приєднано до порту миші PS/2" @@ -575,7 +573,6 @@ HID_MOUSE.DeviceDesc = "HID 鼠标" *nEC1F00.DeviceDesc = "NEC PC-98 Bus Mouse" [Strings.0816] -ReactOS = "Equipa ReactOS" MouseClassName = "Ratos e outros dispositivos apontadores" LocationOverride = "Ligado à porta PS/2 do rato" diff --git a/media/inf/nettcpip.inf b/media/inf/nettcpip.inf index 23516a9f4e6..95955d1a4ab 100644 --- a/media/inf/nettcpip.inf +++ b/media/inf/nettcpip.inf @@ -293,7 +293,10 @@ HKR,"Parameters","ServiceDll",0x00020000,"%SystemRoot%\system32\dnsrslvr.dll" ;-------------------------------- STRINGS ------------------------------- [Strings] -ReactOS = "ReactOS Team" +; Non-localizable +ReactOS = "ReactOS Project" + +; Localizable MS_TCPIP.DisplayName = "Internet Protocol Version 4 (TCP/IPv4)" DNSCLIENT_NAME = "DNS Client" DNSCLIENT_DESC = "Service that caches local DNS queries" @@ -309,11 +312,7 @@ DHCPCLIENT_NAME = "DHCP 用戶端" DHCPCLIENT_DESC = "嘗試從可用的 DHCP 伺服器中自動取得網路設定" TCPIP_DEF = "傳輸控制協議 / 互聯網協議" -[Strings.0a] -ReactOS = "Equipo de ReactOS" - [Strings.040c] -ReactOS = "Équipe ReactOS" MS_TCPIP.DisplayName = "Protocole Internet Version 4 (TCP/IPv4)" DNSCLIENT_NAME = "Client DNS" DNSCLIENT_DESC = "Service de mise en cache de requêtes DNS locales" @@ -322,7 +321,6 @@ DHCPCLIENT_DESC = "Obtient les paramètres réseau automatiquement depuis un ser TCPIP_DEF = "Transmission Control Protocol/Internet Protocol" [Strings.0415] -ReactOS = "Zespół ReactOS" MS_TCPIP.DisplayName = "Protokół internetowy w wersji 4 (TCP/IPv4)" DNSCLIENT_NAME = "Klient DNS" DNSCLIENT_DESC = "Usługa buforująca lokalne zapytania DNS" @@ -330,11 +328,7 @@ DHCPCLIENT_NAME = "Klient DHCP" DHCPCLIENT_DESC = "Próbuje uzyskać ustawienia sieciowe automatycznie z dostępnego serwera DHCP" TCPIP_DEF = "Protokół kontroli transmisji/Protokół internetowy (TCP/IP)" -[Strings.0418] -ReactOS = "Echipa ReactOS" - [Strings.0419] -ReactOS = "Команда ReactOS" MS_TCPIP.DisplayName = "Протокол Интернета версии 4 (TCP/IPv4)" DNSCLIENT_NAME = "Клиент DNS" DNSCLIENT_DESC = "Служба кэширования локальных DNS запросов" @@ -343,7 +337,6 @@ DHCPCLIENT_DESC = "Автоматически получает настройк TCPIP_DEF = "Протокол контроля передачи/Протокол Интернета (TCP/IP)" [Strings.041f] -ReactOS = "ReactOS Takımı" MS_TCPIP.DisplayName = "Genel Ağ Protokolü Sürüm 4 (TCP/IPv4)" DNSCLIENT_NAME = "DNS İstemcisi" DNSCLIENT_DESC = "Yerel DNS sorgularını önbelleğe alan hizmet" @@ -351,11 +344,7 @@ DHCPCLIENT_NAME = "DHCP İstemcisi" DHCPCLIENT_DESC = "Kullanılabilir bir DHCP sunucusundan otomatik olarak ağ ayarlarını almayı dener" TCPIP_DEF = "Aktarım Denetim Protokolü/Genel Ağ Protokolü" -[Strings.0422] -ReactOS = "Команда ReactOS" - [Strings.0816] -ReactOS = "Equipa ReactOS" MS_TCPIP.DisplayName = "Internet Protocol Version 4 (TCP/IPv4)" DNSCLIENT_NAME = "DNS Client" DNSCLIENT_DESC = "Serviço que armazena em cache consultas DNS locais" diff --git a/media/inf/ports.inf b/media/inf/ports.inf index b713470fd68..91e915300c5 100644 --- a/media/inf/ports.inf +++ b/media/inf/ports.inf @@ -90,7 +90,10 @@ LoadOrderGroup = PNP Filter ;-------------------------------- STRINGS ------------------------------- [Strings] -ReactOS = "ReactOS Team" +; Non-localizable +ReactOS = "ReactOS Project" + +; Localizable PortsClassName = "Serial and parallel ports" StdMfg = "(Standard ports)" @@ -118,7 +121,6 @@ StdMfg = "(Standard-Anschlüsse)" *PNP0401.DeviceDesc = "ECP Druckeranschluss" [Strings.0a] -ReactOS = "Equipo de ReactOS" PortsClassName = "Puertos (COM y LPT)" StdMfg = "(Puertos estándar)" @@ -147,7 +149,6 @@ StdMfg = "(スタンダードポート)" *PNP0401.DeviceDesc = "ECP プリンタポート" [Strings.0415] -ReactOS = "Zespół ReactOS" PortsClassName = "Porty (COM i LPT)" StdMfg = "(Standardowe porty)" @@ -166,8 +167,8 @@ StdMfg = "(Tipos de porta padrão)" *PNP0401.DeviceDesc = "Porta de impressora ECP" [Strings.0418] -ReactOS = "Echipa ReactOS" PortsClassName = "Porturi seriale și paralele" + StdMfg = "(port standard)" *PNP0500.DeviceDesc = "Port de comunicație serial" *PNP0501.DeviceDesc = "Port de comunicație serial" @@ -175,7 +176,6 @@ StdMfg = "(port standard)" *PNP0401.DeviceDesc = "Port de imprimantă ECP" [Strings.0419] -ReactOS = "Команда ReactOS" PortsClassName = "Порты (COM и LPT)" StdMfg = "(Стандартные порты)" @@ -194,7 +194,6 @@ StdMfg = "(Štandardné porty)" *PNP0401.DeviceDesc = "ECP tlačový port" [Strings.041f] -ReactOS = "ReactOS Takımı" PortsClassName = "Seri ve Paralel Bağlantı Noktaları" StdMfg = "(Ölçünlü Girişler)" @@ -204,7 +203,6 @@ StdMfg = "(Ölçünlü Girişler)" *PNP0401.DeviceDesc = "ECP Yazıcı Bağlantı Noktası" [Strings.0422] -ReactOS = "Команди ReactOS" PortsClassName = "Порти (COM і LPT)" StdMfg = "(Стандартні порти)" @@ -230,7 +228,6 @@ StdMfg = "(标准端口)" *PNP0401.DeviceDesc = "ECP 打印机端口" [Strings.0816] -ReactOS = "Equipa ReactOS" PortsClassName = "Portas (COM & LPT)" StdMfg = "(Tipos de porta padrão)" diff --git a/media/inf/scsi.inf b/media/inf/scsi.inf index 4545208195b..3871cd4c0c3 100644 --- a/media/inf/scsi.inf +++ b/media/inf/scsi.inf @@ -70,7 +70,10 @@ LoadOrderGroup = SCSI Miniport ;--------------------------------- Strings --------------------------------- [Strings] -ReactOS = "ReactOS Team" +; Non-localizable +ReactOS = "ReactOS Project" + +; Localizable SCSIClassName = "SCSI and RAID Controllers" GenericMfg = "(Standard SCSI and RAID controllers)" @@ -96,7 +99,6 @@ SCSIClassName = "SCSI und RAID Controller" GenericMfg = "(Standard SCSI und RAID Controller)" [Strings.0a] -ReactOS = "Equipo de ReactOS" SCSIClassName = "Controladores SCSI y RAID" GenericMfg = "(Controladores estándar SCSI y RAID)" @@ -115,8 +117,8 @@ GenericMfg = "(スタンダード SCSI および RAID コントローラ)" PCI\VEN_104B&CC_0100.DeviceDesc = "BusLogic SCSI コントローラ" [Strings.0415] -ReactOS = "Zespół ReactOS" SCSIClassName = "Kontrolery SCSI i RAID" + GenericMfg = "(Standardowe kontrolery SCSI i RAID)" PCI\VEN_104B&CC_0100.DeviceDesc = "Kontroler SCSI BusLogic" @@ -127,13 +129,12 @@ GenericMfg = "(Controladores SCSI e RAID padrão)" PCI\VEN_104B&CC_0100.DeviceDesc = "Controlador SCSI BusLogic" [Strings.0418] -ReactOS = "Echipa ReactOS" SCSIClassName = "Dispozitive de control SCSI și RAID" + GenericMfg = "(dispozitiv standard de control SCSI și RAID)" PCI\VEN_104B&CC_0100.DeviceDesc = "Dispozitiv de control SCSI BusLogic" [Strings.0419] -ReactOS = "Команда ReactOS" SCSIClassName = "SCSI и RAID контроллеры" GenericMfg = "(Стандартные SCSI и RAID контроллеры)" @@ -147,7 +148,6 @@ GenericMfg = "(Štandardné SCSI a RAID radiče)" PCI\VEN_104B&CC_0100.DeviceDesc = "BusLogic SCSI radič" [Strings.041f] -ReactOS = "ReactOS Takımı" SCSIClassName = "SCSI ve RAID Denetleyicileri" GenericMfg = "(Standart SCSI ve RAID Denetleyicileri)" @@ -155,8 +155,8 @@ GEN_SCSIADAPTER.DeviceDesc = "SCSI/RAID Ana Denetleyicisi" PCI\VEN_104B&CC_0100.DeviceDesc = "BusLogic SCSI Denetleyicisi" [Strings.0422] -ReactOS = "Команда ReactOS" SCSIClassName = "SCSI і RAID контроллери" + GenericMfg = "(Стандартні SCSI і RAID контроллери)" PCI\VEN_104B&CC_0100.DeviceDesc = "Контроллер BusLogic SCSI" @@ -171,7 +171,6 @@ GenericMfg = "(标准 SCSI / RAID 控制器)" PCI\VEN_104B&CC_0100.DeviceDesc = "BusLogic SCSI 控制器" [Strings.0816] -ReactOS = "Equipa ReactOS" SCSIClassName = "Controladores SCSI e RAID" GenericMfg = "(Controladores SCSI e RAID padrão)" diff --git a/media/inf/unknown.inf b/media/inf/unknown.inf index edbb96c551f..a54fb795129 100644 --- a/media/inf/unknown.inf +++ b/media/inf/unknown.inf @@ -17,7 +17,10 @@ HKR, , Icon, 0, "-18" ;-------------------------------- STRINGS ------------------------------- [Strings] -ReactOS = "ReactOS Team" +; Non-localizable +ReactOS = "ReactOS Project" + +; Localizable UnknownClassName = "Other Devices" [Strings.0404] @@ -30,39 +33,30 @@ UnknownClassName = "Ostatní zařízení" UnknownClassName = "Andere Geräte" [Strings.0a] -ReactOS = "Equipo de ReactOS" UnknownClassName = "Otros dispositivos" [Strings.040D] -ReactOS = "צוות ReactOS" UnknownClassName = "התקנים אחרים" [Strings.0415] -ReactOS = "Zespół ReactOS" UnknownClassName = "Nieznane urządzenie" [Strings.0418] -ReactOS = "Echipa ReactOS" UnknownClassName = "Alte dispozitive" [Strings.0419] -ReactOS = "Команда ReactOS" UnknownClassName = "Другие устройства" [Strings.041f] -ReactOS = "ReactOS Takımı" UnknownClassName = "Diğer Aygıtlar" [Strings.0422] -ReactOS = "Команда ReactOS" UnknownClassName = "Інші пристрої" [Strings.0804] -ReactOS = "ReactOS Team" UnknownClassName = "其它设备" [Strings.0816] -ReactOS = "Equipa ReactOS" UnknownClassName = "Outros dispositivos" [Strings.0C04] diff --git a/media/inf/usb.inf b/media/inf/usb.inf index 91eb5d9ace0..047ca493f08 100644 --- a/media/inf/usb.inf +++ b/media/inf/usb.inf @@ -58,8 +58,10 @@ LoadOrderGroup = Base ;-------------------------------- STRINGS ------------------------------- [Strings] -ReactOS = "ReactOS Team" +; Non-localizable +ReactOS = "ReactOS Project" +; Localizable GenericMfg = "(Generic USB Hubs)" USB\COMPOSITE.DeviceDesc = "USB Composite Device" USB\CLASS_09.DeviceDesc = "Generic USB Hub" @@ -96,7 +98,6 @@ GenericMfg = "(標準 USBハブ)" USB\CLASS_09.DeviceDesc = "標準 USBハブ" [Strings.0415] -ReactOS = "Zespół ReactOS" GenericMfg = "(Standardowy koncentrator USB)" USB\COMPOSITE.DeviceDesc = "Urządzenie kompozytowe USB" USB\CLASS_09.DeviceDesc = "Standardowy koncentrator USB" @@ -106,13 +107,11 @@ GenericMfg = "(Hub USB padrão)" USB\CLASS_09.DeviceDesc = "Hub USB padrão" [Strings.0418] -ReactOS = "Echipa ReactOS" GenericMfg = "(cuplatori generici USB)" USB\COMPOSITE.DeviceDesc = "Dispozitiv USB compus" USB\CLASS_09.DeviceDesc = "Cuplator USB generic" [Strings.0419] -ReactOS = "Команда ReactOS" GenericMfg = "(Стандартный USB хаб)" USB\COMPOSITE.DeviceDesc = "USB составное устройство" USB\CLASS_09.DeviceDesc = "Стандартный USB хаб" @@ -122,14 +121,11 @@ GenericMfg = "(Generický rozbočovač USB)" USB\CLASS_09.DeviceDesc = "Generický rozbočovač USB" [Strings.041f] -ReactOS = "ReactOS Takımı" - GenericMfg = "(Genel USB Göbekleri)" USB\COMPOSITE.DeviceDesc = "USB Bileşik Aygıt" USB\CLASS_09.DeviceDesc = "Genel USB Göbeği" [Strings.0422] -ReactOS = "Команда ReactOS" GenericMfg = "(Стандартні USB-хаби)" USB\COMPOSITE.DeviceDesc = "Композитний пристрій USB" USB\CLASS_09.DeviceDesc = "Стандартний USB-хаб" @@ -144,7 +140,6 @@ USB\COMPOSITE.DeviceDesc = "USB 聚合设备" USB\CLASS_09.DeviceDesc = "通用 USB 集线器" [Strings.0816] -ReactOS = "Equipa ReactOS" GenericMfg = "(Hub USB padrão)" USB\CLASS_09.DeviceDesc = "Hub USB padrão" diff --git a/media/inf/usbport.inf b/media/inf/usbport.inf index dacedad507c..bc70c5f02c2 100644 --- a/media/inf/usbport.inf +++ b/media/inf/usbport.inf @@ -116,7 +116,10 @@ LoadOrderGroup = Base ;-------------------------------- STRINGS ------------------------------- [Strings] -ReactOS = "ReactOS Team" +; Non-localizable +ReactOS = "ReactOS Project" + +; Localizable USBClassName = "USB Controllers" GenericMfg = "(Generic USB devices)" @@ -164,7 +167,6 @@ PCI\CC_0C0320.DeviceDesc = "EHCI USB-Controller" USB\ROOT_HUB.DeviceDesc = "Root Hub" [Strings.0a] -ReactOS = "Equipo de ReactOS" USBClassName = "Controladores USB" GenericMfg = "(Dispositivo USB estándar)" @@ -200,7 +202,6 @@ PCI\CC_0C0320.DeviceDesc = "EHCI USB コントローラ" USB\ROOT_HUB.DeviceDesc = "ルートハブ" [Strings.0415] -ReactOS = "Zespół ReactOS" USBClassName = "Kontrolery USB" GenericMfg = "(Standardowe urządzenia USB)" @@ -227,19 +228,19 @@ PCI\VEN_8086&DEV_7020&CC_0C0300.DeviceDesc = "Controlador USB Intel 82371SB PIIX PCI\VEN_8086&DEV_7112&CC_0C0300.DeviceDesc = "Controlador USB Intel 82371AB/EB/MB PIIX4" [Strings.0418] -ReactOS = "Echipa ReactOS" USBClassName = "Dispozitive de control USB" + GenericMfg = "(dispozitive generice de control USB)" PCI\CC_0C0300.DeviceDesc = "Dispozitive de control USB UHCI" PCI\CC_0C0310.DeviceDesc = "Dispozitive de control USB OHCI" PCI\CC_0C0320.DeviceDesc = "Dispozitive de control USB EHCI" USB\ROOT_HUB.DeviceDesc = "Cuplator rădăcină" + IntelMfg = "Intel" PCI\VEN_8086&DEV_7020&CC_0C0300.DeviceDesc = "Dispozitiv de control USB Intel 82371SB PIIX3" PCI\VEN_8086&DEV_7112&CC_0C0300.DeviceDesc = "Dispozitiv de contorl USB Intel 82371AB/EB/MB PIIX4" [Strings.0419] -ReactOS = "Команда ReactOS" USBClassName = "Контроллеры USB" GenericMfg = "(Стандартные устройства USB)" @@ -276,7 +277,6 @@ PCI\VEN_8086&DEV_7020&CC_0C0300.DeviceDesc = "Intel 82371SB PIIX3 USB valdiklis" PCI\VEN_8086&DEV_7112&CC_0C0300.DeviceDesc = "Intel 82371AB/EB/MB PIIX4 USB valdiklis" [Strings.041f] -ReactOS = "ReactOS Takımı" USBClassName = "USB Denetleyicileri" GenericMfg = "(Genel USB Aygıtları)" @@ -290,7 +290,6 @@ PCI\VEN_8086&DEV_7020&CC_0C0300.DeviceDesc = "Intel 82371SB PIIX3 USB Denetleyic PCI\VEN_8086&DEV_7112&CC_0C0300.DeviceDesc = "Intel 82371AB/EB/MB PIIX4 USB Denetleyicisi" [Strings.0422] -ReactOS = "Команда ReactOS" USBClassName = "Контроллери USB" GenericMfg = "(Стандартні пристрої USB)" @@ -313,7 +312,6 @@ PCI\VEN_8086&DEV_7020&CC_0C0300.DeviceDesc = "Intel 82371SB PIIX3 USB 控制器" PCI\VEN_8086&DEV_7112&CC_0C0300.DeviceDesc = "Intel 82371AB/EB/MB PIIX4 USB 控制器" [Strings.0816] -ReactOS = "Equipa ReactOS" USBClassName = "Controladores de barramento série universal (USB)" GenericMfg = "(Dispositivo USB padrão)" diff --git a/media/inf/volume.inf b/media/inf/volume.inf index b243c324264..5db870c5248 100644 --- a/media/inf/volume.inf +++ b/media/inf/volume.inf @@ -39,7 +39,10 @@ HKR, , SilentInstall, 0, "1" ;-------------------------------- STRINGS ------------------------------- [Strings] -ReactOS = "ReactOS Team" +; Non-localizable +ReactOS = "ReactOS Project" + +; Localizable VolumeClassName = "Storage volumes" GenericMfg = "(Generic storage volumes)" STORAGE\Volume.DeviceDesc = "Storage volume" @@ -50,19 +53,16 @@ GenericMfg = "（標準存放磁碟區）" STORAGE\Volume.DeviceDesc = "存放磁碟區" [Strings.0419] -ReactOS = "Команда ReactOS" VolumeClassName = "Тома хранения" GenericMfg = "(Стандартные тома хранения)" STORAGE\Volume.DeviceDesc = "Том хранения" [Strings.0816] -ReactOS = "Equipa ReactOS" VolumeClassName = "Volumes de armazenamento" GenericMfg = "(Volumes de armazenamento genérico)" STORAGE\Volume.DeviceDesc = "Volume de armazenamento" [Strings.0804] -ReactOS = "ReactOS Team" VolumeClassName = "存储卷" GenericMfg = "（通用存储卷）" STORAGE\Volume.DeviceDesc = "存储卷" diff --git a/media/inf/wmiacpi.inf b/media/inf/wmiacpi.inf index c61d44d2ec6..e0f18995324 100644 --- a/media/inf/wmiacpi.inf +++ b/media/inf/wmiacpi.inf @@ -32,7 +32,10 @@ AddService = , 0x00000002 ;-------------------------------- STRINGS ------------------------------- [Strings] -ReactOS = "ReactOS Team" +; Non-localizable +ReactOS = "ReactOS Project" + +; Localizable GenericMfg = "(Generic system devices)" *PNP0C14.DeviceDesc = "WMI for ACPI" @@ -48,22 +51,18 @@ GenericMfg = "(Generische Systemgeräte)" *PNP0C14.DeviceDesc = "WMI für ACPI" [Strings.0415] -ReactOS = "Zespół ReactOS" GenericMfg = "(Standardowe urządzenia systemowe)" *PNP0C14.DeviceDesc = "WMI dla ACPI" [Strings.0418] -ReactOS = "Echipa ReactOS" GenericMfg = "(dispozitive generice de sistem)" *PNP0C14.DeviceDesc = "WMI pentru ACPI" [Strings.0419] -ReactOS = "Команда ReactOS" GenericMfg = "(Универсальные системные устройства)" *PNP0C14.DeviceDesc = "WMI для ACPI" [Strings.041f] -ReactOS = "ReactOS Takımı" GenericMfg = "(Genel Sistem Aygıtları)" *PNP0C14.DeviceDesc = "ACPI için WMI" @@ -72,7 +71,6 @@ GenericMfg = "(通用系统设备)" *PNP0C14.DeviceDesc = "ACPI 的 WMI" [Strings.0a] -ReactOS = "Equipo de ReactOS" GenericMfg = "(Dispositivos genéricos del sistema)" *PNP0C14.DeviceDesc = "WMI para ACPI" diff --git a/modules/rosapps/drivers/green/green.inf b/modules/rosapps/drivers/green/green.inf index 2b0b4d63998..c6a37e0870e 100644 --- a/modules/rosapps/drivers/green/green.inf +++ b/modules/rosapps/drivers/green/green.inf @@ -87,10 +87,11 @@ AddService = green, 0x00000002, green_Service_Inst ;-------------------------------- STRINGS ------------------------------- [Strings] -ReactOS = "ReactOS Team" +; Non-localizable +ReactOS = "ReactOS Project" +ReactOSMfg = "(ReactOS Project)" +; Localizable GREEN.DriverDesc = "VT100 server emulator" - -ReactOSMfg = "(ReactOS Team)" KEYBOARD.DeviceDesc = "Keyboard for remote console" SCREEN.DeviceDesc = "Screen for remote console" diff --git a/win32ss/drivers/miniport/pc98vid/pc98disp.inf b/win32ss/drivers/miniport/pc98vid/pc98disp.inf index d67f9882517..42a8f3fd84a 100644 --- a/win32ss/drivers/miniport/pc98vid/pc98disp.inf +++ b/win32ss/drivers/miniport/pc98vid/pc98disp.inf @@ -50,13 +50,13 @@ HKR,, VideoDebugLevel, 0x00010001, 0 ;-------------------------------- STRINGS ------------------------------- [Strings] -ReactOS = "ReactOS Team" - +; Non-localizable +ReactOS = "ReactOS Project" NecMfg = "NEC" + +; Localizable PCI\VEN_1033&DEV_0009.DeviceDesc = "NEC PCI to Core-Graph Bridge" pc98vid.DeviceDesc = "Graphic controller for PC-9821" [Strings.0419] -ReactOS = "Команда ReactOS" - pc98vid.DeviceDesc = "Графический контроллер для PC-9821" diff --git a/win32ss/drivers/miniport/xboxvmp/xboxdisp.inf b/win32ss/drivers/miniport/xboxvmp/xboxdisp.inf index c103ee304c3..a9a4c3d3913 100644 --- a/win32ss/drivers/miniport/xboxvmp/xboxdisp.inf +++ b/win32ss/drivers/miniport/xboxvmp/xboxdisp.inf @@ -47,38 +47,32 @@ HKR,,InstalledDisplayDrivers,0x00010000,framebuf ;-------------------------------- STRINGS ------------------------------- [Strings] -ReactOS = "ReactOS Team" +; Non-localizable +ReactOS = "ReactOS Project" +; Localizable nVidiaMfg = "nVidia Corporation" PCI\VEN_10DE&DEV_02A0.DeviceDesc = "NV2A Xbox Graphics Processing Unit" [Strings.0a] -ReactOS = "Equipo de ReactOS" PCI\VEN_10DE&DEV_02A0.DeviceDesc = "Unidad de procesamiento de gráficos de Xbox NV2A" [Strings.0415] -ReactOS = "Zespół ReactOS" PCI\VEN_10DE&DEV_02A0.DeviceDesc = "Procesor graficzny Xbox NV2A" [Strings.0418] -ReactOS = "Echipa ReactOS" nVidiaMfg = "Corporația nVidia" PCI\VEN_10DE&DEV_02A0.DeviceDesc = "Unitate de procesare grafică Xbox NV2A" [Strings.0419] -ReactOS = "Команда ReactOS" - nVidiaMfg = "Корпорация nVidia" PCI\VEN_10DE&DEV_02A0.DeviceDesc = "Графический процессор NV2A Xbox" [Strings.041f] -ReactOS = "ReactOS Takımı" - nVidiaMfg = "nVidia Ortaklığı" PCI\VEN_10DE&DEV_02A0.DeviceDesc = "NV2A Xbox Çizge İşleme Birimi" [Strings.0422] -ReactOS = "Команда ReactOS" nVidiaMfg = "Корпорація nVidia" PCI\VEN_10DE&DEV_02A0.DeviceDesc = "Графічний процесор NV2A Xbox"

1 0

[reactos] 01/01: [REACTOS] Remove references to ReactOS Foundation (#4557)
by Gary Sims 27 Jun '22

27 Jun '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6881d8c6247c8d27e57c3… commit 6881d8c6247c8d27e57c3a6112bf386204f089be Author: Gary Sims <gary.sims(a)gmail.com> AuthorDate: Thu Jun 23 14:03:45 2022 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Mon Jun 27 16:00:20 2022 +0300 [REACTOS] Remove references to ReactOS Foundation (#4557) See https://reactos.org/wiki/ReactOS_Foundation for more information. CORE-18191 --- boot/boot_images.cmake | 4 ++-- drivers/processor/processr/cpu.inf | 2 +- media/themes/Blackshade/blackshade.msstyles/lang/de-DE.rc | 2 +- media/themes/Blackshade/blackshade.msstyles/lang/en-US.rc | 2 +- media/themes/Blackshade/blackshade.msstyles/lang/it-IT.rc | 2 +- media/themes/Blackshade/blackshade.msstyles/lang/zh-HK.rc | 2 +- media/themes/Blackshade/blackshade.msstyles/lang/zh-TW.rc | 2 +- media/themes/Lautus/lautus.msstyles/lang/de-DE.rc | 2 +- media/themes/Lautus/lautus.msstyles/lang/en-US.rc | 2 +- media/themes/Lautus/lautus.msstyles/lang/it-IT.rc | 2 +- media/themes/Lautus/lautus.msstyles/lang/zh-HK.rc | 2 +- media/themes/Lautus/lautus.msstyles/lang/zh-TW.rc | 2 +- media/themes/Lunar/lunar.msstyles/lang/cs-CZ.rc | 2 +- media/themes/Lunar/lunar.msstyles/lang/de-DE.rc | 2 +- media/themes/Lunar/lunar.msstyles/lang/en-US.rc | 2 +- media/themes/Lunar/lunar.msstyles/lang/it-IT.rc | 2 +- media/themes/Lunar/lunar.msstyles/lang/zh-HK.rc | 2 +- media/themes/Lunar/lunar.msstyles/lang/zh-TW.rc | 2 +- media/themes/Mizu/mizu.msstyles/lang/de-DE.rc | 2 +- media/themes/Mizu/mizu.msstyles/lang/en-US.rc | 2 +- media/themes/Mizu/mizu.msstyles/lang/it-IT.rc | 2 +- media/themes/Mizu/mizu.msstyles/lang/zh-HK.rc | 2 +- media/themes/Mizu/mizu.msstyles/lang/zh-TW.rc | 2 +- media/themes/Modern/modern.msstyles/lang/de-DE.rc | 2 +- media/themes/Modern/modern.msstyles/lang/en-GB.rc | 2 +- media/themes/Modern/modern.msstyles/lang/en-US.rc | 2 +- media/themes/Modern/modern.msstyles/lang/it-IT.rc | 2 +- media/themes/Modern/modern.msstyles/lang/zh-HK.rc | 2 +- media/themes/Modern/modern.msstyles/lang/zh-TW.rc | 2 +- sdk/include/psdk/common.ver | 8 ++++---- sdk/include/psdk/ntverp.h | 6 +++--- 31 files changed, 37 insertions(+), 37 deletions(-) diff --git a/boot/boot_images.cmake b/boot/boot_images.cmake index 9abe78d4245..c0c9a957672 100644 --- a/boot/boot_images.cmake +++ b/boot/boot_images.cmake @@ -56,8 +56,8 @@ ${_efisys_file} 1 ") # ISO image identifier names -set(ISO_MANUFACTURER "ReactOS Foundation") # For both the publisher and the preparer -set(ISO_VOLNAME "ReactOS") # For both the Volume ID and the Volume set ID +set(ISO_MANUFACTURER "ReactOS Project") # For both the publisher and the preparer +set(ISO_VOLNAME "ReactOS") # For both the Volume ID and the Volume set ID # Create user profile directories in the LiveImage diff --git a/drivers/processor/processr/cpu.inf b/drivers/processor/processr/cpu.inf index 0ac52f9b8a6..23608ebbeb3 100644 --- a/drivers/processor/processr/cpu.inf +++ b/drivers/processor/processr/cpu.inf @@ -120,7 +120,7 @@ LoadOrderGroup = Extended Base ;-------------------------------- STRINGS ------------------------------- [Strings] -ReactOS = "ReactOS Foundation" +ReactOS = "ReactOS Team" ProcessorClassName = "Processors" CyrixMfg = "Cyrix" diff --git a/media/themes/Blackshade/blackshade.msstyles/lang/de-DE.rc b/media/themes/Blackshade/blackshade.msstyles/lang/de-DE.rc index a1e73d118f7..9754236a759 100644 --- a/media/themes/Blackshade/blackshade.msstyles/lang/de-DE.rc +++ b/media/themes/Blackshade/blackshade.msstyles/lang/de-DE.rc @@ -28,7 +28,7 @@ STRINGTABLE { 5000, "Black Shade" 5001, "Visueller Stil" -5002, "ReactOS Foundation" +5002, "ReactOS Project" 5003, "Grafiken erstellt durch David Quintana <gigaherz(a)gmail.com>" 5004, "Grafiken veröffentlicht unter CC-BY-SA 4.0" 5005, "https://reactos.org/" diff --git a/media/themes/Blackshade/blackshade.msstyles/lang/en-US.rc b/media/themes/Blackshade/blackshade.msstyles/lang/en-US.rc index cd6562e2bee..a241b92ab1f 100644 --- a/media/themes/Blackshade/blackshade.msstyles/lang/en-US.rc +++ b/media/themes/Blackshade/blackshade.msstyles/lang/en-US.rc @@ -28,7 +28,7 @@ STRINGTABLE { 5000, "Black Shade" 5001, "Visual Style" -5002, "ReactOS Foundation" +5002, "ReactOS Project" 5003, "Images by David Quintana <gigaherz(a)gmail.com>" 5004, "Images released under CC-BY-SA 4.0" 5005, "https://reactos.org/" diff --git a/media/themes/Blackshade/blackshade.msstyles/lang/it-IT.rc b/media/themes/Blackshade/blackshade.msstyles/lang/it-IT.rc index a985f957252..e15d2869fd3 100644 --- a/media/themes/Blackshade/blackshade.msstyles/lang/it-IT.rc +++ b/media/themes/Blackshade/blackshade.msstyles/lang/it-IT.rc @@ -28,7 +28,7 @@ STRINGTABLE { 5000, "Black Shade" 5001, "Stile di visualizzazione" -5002, "ReactOS Foundation" +5002, "ReactOS Project" 5003, "Immagini di David Quintana <gigaherz(a)gmail.com>" 5004, "Immagini rilasciate sotto licenza CC-BY-SA 4.0" 5005, "https://reactos.org/" diff --git a/media/themes/Blackshade/blackshade.msstyles/lang/zh-HK.rc b/media/themes/Blackshade/blackshade.msstyles/lang/zh-HK.rc index 054e4b14cc5..427297a8593 100644 --- a/media/themes/Blackshade/blackshade.msstyles/lang/zh-HK.rc +++ b/media/themes/Blackshade/blackshade.msstyles/lang/zh-HK.rc @@ -35,7 +35,7 @@ STRINGTABLE { 5000, "Black Shade" 5001, "視覺樣式" -5002, "ReactOS Foundation" +5002, "ReactOS Project" 5003, "圖像由 David Quintana <gigaherz(a)gmail.com> 提供" 5004, "圖像以 CC-BY-SA 4.0 條款發行" 5005, "https://reactos.org/" diff --git a/media/themes/Blackshade/blackshade.msstyles/lang/zh-TW.rc b/media/themes/Blackshade/blackshade.msstyles/lang/zh-TW.rc index a328e2e7d58..0690b500474 100644 --- a/media/themes/Blackshade/blackshade.msstyles/lang/zh-TW.rc +++ b/media/themes/Blackshade/blackshade.msstyles/lang/zh-TW.rc @@ -30,7 +30,7 @@ STRINGTABLE { 5000, "Black Shade" 5001, "視覺樣式" -5002, "ReactOS Foundation" +5002, "ReactOS Project" 5003, "圖像由 David Quintana <gigaherz(a)gmail.com> 提供" 5004, "圖像以 CC-BY-SA 4.0 條款發行" 5005, "https://reactos.org/" diff --git a/media/themes/Lautus/lautus.msstyles/lang/de-DE.rc b/media/themes/Lautus/lautus.msstyles/lang/de-DE.rc index 7cc57ec99c1..ab6d54b75a2 100644 --- a/media/themes/Lautus/lautus.msstyles/lang/de-DE.rc +++ b/media/themes/Lautus/lautus.msstyles/lang/de-DE.rc @@ -28,7 +28,7 @@ STRINGTABLE { 5000, "Lautus" 5001, "Visueller Stil" -5002, "ReactOS Foundation" +5002, "ReactOS Project" 5003, "Pisarz, basierend auf Luna Inspirat" 5004, "Veröffentlicht unter GNU/GPL 2.0, 2011" 5005, "https://reactos.org/" diff --git a/media/themes/Lautus/lautus.msstyles/lang/en-US.rc b/media/themes/Lautus/lautus.msstyles/lang/en-US.rc index ec1941d71b3..5accaa0d598 100644 --- a/media/themes/Lautus/lautus.msstyles/lang/en-US.rc +++ b/media/themes/Lautus/lautus.msstyles/lang/en-US.rc @@ -28,7 +28,7 @@ STRINGTABLE { 5000, "Lautus" 5001, "Visual Style" -5002, "ReactOS Foundation" +5002, "ReactOS Project" 5003, "Pisarz, based on Luna Inspirat" 5004, "Released under GNU/GPL 2.0, 2011" 5005, "https://reactos.org/" diff --git a/media/themes/Lautus/lautus.msstyles/lang/it-IT.rc b/media/themes/Lautus/lautus.msstyles/lang/it-IT.rc index 4c14c7f3aae..135f09915a3 100644 --- a/media/themes/Lautus/lautus.msstyles/lang/it-IT.rc +++ b/media/themes/Lautus/lautus.msstyles/lang/it-IT.rc @@ -28,7 +28,7 @@ STRINGTABLE { 5000, "Lautus" 5001, "Stile di visualizzazione" -5002, "ReactOS Foundation" +5002, "ReactOS Project" 5003, "Pisarz, basato on Luna Inspirat" 5004, "Distribuito sotto licenza GNU/GPL 2.0, 2011" 5005, "https://reactos.org/" diff --git a/media/themes/Lautus/lautus.msstyles/lang/zh-HK.rc b/media/themes/Lautus/lautus.msstyles/lang/zh-HK.rc index a9ddcbba725..2de2e207944 100644 --- a/media/themes/Lautus/lautus.msstyles/lang/zh-HK.rc +++ b/media/themes/Lautus/lautus.msstyles/lang/zh-HK.rc @@ -35,7 +35,7 @@ STRINGTABLE { 5000, "Lautus" 5001, "視覺樣式" -5002, "ReactOS Foundation" +5002, "ReactOS Project" 5003, "Pisarz, 基於 Luna Inspirat" 5004, "於 2011 年以 GNU/GPL 2.0 條款發行" 5005, "https://reactos.org/" diff --git a/media/themes/Lautus/lautus.msstyles/lang/zh-TW.rc b/media/themes/Lautus/lautus.msstyles/lang/zh-TW.rc index be45b0342c4..4fa50860235 100644 --- a/media/themes/Lautus/lautus.msstyles/lang/zh-TW.rc +++ b/media/themes/Lautus/lautus.msstyles/lang/zh-TW.rc @@ -30,7 +30,7 @@ STRINGTABLE { 5000, "Lautus" 5001, "視覺樣式" -5002, "ReactOS Foundation" +5002, "ReactOS Project" 5003, "Pisarz, 基於 Luna Inspirat" 5004, "於 2011 年以 GNU/GPL 2.0 條款發行" 5005, "https://reactos.org/" diff --git a/media/themes/Lunar/lunar.msstyles/lang/cs-CZ.rc b/media/themes/Lunar/lunar.msstyles/lang/cs-CZ.rc index 35da196e5df..41713e6e625 100644 --- a/media/themes/Lunar/lunar.msstyles/lang/cs-CZ.rc +++ b/media/themes/Lunar/lunar.msstyles/lang/cs-CZ.rc @@ -28,7 +28,7 @@ STRINGTABLE { 5000, "Lunar" 5001, "Vizuální styl" -5002, "ReactOS Foundation" +5002, "ReactOS Project" 5003, "Cernodile & Illen, založeno na stylu Lautus" 5004, "Vydáno pod licencí GNU/GPL 2.0, 2019" 5005, "https://reactos.org/" diff --git a/media/themes/Lunar/lunar.msstyles/lang/de-DE.rc b/media/themes/Lunar/lunar.msstyles/lang/de-DE.rc index a495b3c51d8..94e5f18c5b3 100644 --- a/media/themes/Lunar/lunar.msstyles/lang/de-DE.rc +++ b/media/themes/Lunar/lunar.msstyles/lang/de-DE.rc @@ -28,7 +28,7 @@ STRINGTABLE { 5000, "Lunar" 5001, "Visueller Stil" -5002, "ReactOS Foundation" +5002, "ReactOS Project" 5003, "Cernodile & Illen, basierend auf Lautus" 5004, "Veröffentlicht unter GNU/GPL 2.0, 2019" 5005, "https://reactos.org/" diff --git a/media/themes/Lunar/lunar.msstyles/lang/en-US.rc b/media/themes/Lunar/lunar.msstyles/lang/en-US.rc index 3154580c2e4..22425feb260 100644 --- a/media/themes/Lunar/lunar.msstyles/lang/en-US.rc +++ b/media/themes/Lunar/lunar.msstyles/lang/en-US.rc @@ -28,7 +28,7 @@ STRINGTABLE { 5000, "Lunar" 5001, "Visual Style" -5002, "ReactOS Foundation" +5002, "ReactOS Project" 5003, "Cernodile & Illen, built on top of Lautus" 5004, "Released under GNU/GPL 2.0, 2019" 5005, "https://reactos.org/" diff --git a/media/themes/Lunar/lunar.msstyles/lang/it-IT.rc b/media/themes/Lunar/lunar.msstyles/lang/it-IT.rc index a1f2f010046..e54c0fae9b8 100644 --- a/media/themes/Lunar/lunar.msstyles/lang/it-IT.rc +++ b/media/themes/Lunar/lunar.msstyles/lang/it-IT.rc @@ -28,7 +28,7 @@ STRINGTABLE { 5000, "Lunar" 5001, "Stile di visualizzazione" -5002, "ReactOS Foundation" +5002, "ReactOS Project" 5003, "Cernodile & Illen, basato su Lautus" 5004, "Distribuito sotto licenza GNU/GPL 2.0, 2019" 5005, "https://reactos.org/" diff --git a/media/themes/Lunar/lunar.msstyles/lang/zh-HK.rc b/media/themes/Lunar/lunar.msstyles/lang/zh-HK.rc index 8d79f12cdcc..e77ee6fa0cd 100644 --- a/media/themes/Lunar/lunar.msstyles/lang/zh-HK.rc +++ b/media/themes/Lunar/lunar.msstyles/lang/zh-HK.rc @@ -35,7 +35,7 @@ STRINGTABLE { 5000, "Lunar" 5001, "視覺樣式" -5002, "ReactOS Foundation" +5002, "ReactOS Project" 5003, "Cernodile & Illen, built on top of Lautus" 5004, "於 2019 年以 GNU/GPL 2.0 條款發行" 5005, "https://reactos.org/" diff --git a/media/themes/Lunar/lunar.msstyles/lang/zh-TW.rc b/media/themes/Lunar/lunar.msstyles/lang/zh-TW.rc index d5905637fd6..b2d87b8cf59 100644 --- a/media/themes/Lunar/lunar.msstyles/lang/zh-TW.rc +++ b/media/themes/Lunar/lunar.msstyles/lang/zh-TW.rc @@ -30,7 +30,7 @@ STRINGTABLE { 5000, "Lunar" 5001, "視覺樣式" -5002, "ReactOS Foundation" +5002, "ReactOS Project" 5003, "Cernodile & Illen, built on top of Lautus" 5004, "於 2019 年以 GNU/GPL 2.0 條款發行" 5005, "https://reactos.org/" diff --git a/media/themes/Mizu/mizu.msstyles/lang/de-DE.rc b/media/themes/Mizu/mizu.msstyles/lang/de-DE.rc index adaa3dae7c9..cfbd75b9105 100644 --- a/media/themes/Mizu/mizu.msstyles/lang/de-DE.rc +++ b/media/themes/Mizu/mizu.msstyles/lang/de-DE.rc @@ -28,7 +28,7 @@ STRINGTABLE { 5000, "Mizu" 5001, "Visueller Stil" -5002, "ReactOS Foundation" +5002, "ReactOS Project" 5003, "Foxlet, basierend auf Lautus" 5004, "Veröffentlicht unter GNU/GPL 2.0, 2019" 5005, "https://reactos.org/" diff --git a/media/themes/Mizu/mizu.msstyles/lang/en-US.rc b/media/themes/Mizu/mizu.msstyles/lang/en-US.rc index 916f53ebac9..dde6a073330 100644 --- a/media/themes/Mizu/mizu.msstyles/lang/en-US.rc +++ b/media/themes/Mizu/mizu.msstyles/lang/en-US.rc @@ -28,7 +28,7 @@ STRINGTABLE { 5000, "Mizu" 5001, "Visual Style" -5002, "ReactOS Foundation" +5002, "ReactOS Project" 5003, "Foxlet, based on Lautus" 5004, "Released under GNU/GPL 2.0, 2019" 5005, "https://reactos.org/" diff --git a/media/themes/Mizu/mizu.msstyles/lang/it-IT.rc b/media/themes/Mizu/mizu.msstyles/lang/it-IT.rc index c1301619897..0153291d362 100644 --- a/media/themes/Mizu/mizu.msstyles/lang/it-IT.rc +++ b/media/themes/Mizu/mizu.msstyles/lang/it-IT.rc @@ -28,7 +28,7 @@ STRINGTABLE { 5000, "Mizu" 5001, "Stile di visualizzazione" -5002, "ReactOS Foundation" +5002, "ReactOS Project" 5003, "Foxlet, basato on Lautus" 5004, "Distribuito sotto licenza GNU/GPL 2.0, 2019" 5005, "https://reactos.org/" diff --git a/media/themes/Mizu/mizu.msstyles/lang/zh-HK.rc b/media/themes/Mizu/mizu.msstyles/lang/zh-HK.rc index 61c0c032d43..ffed892797a 100644 --- a/media/themes/Mizu/mizu.msstyles/lang/zh-HK.rc +++ b/media/themes/Mizu/mizu.msstyles/lang/zh-HK.rc @@ -35,7 +35,7 @@ STRINGTABLE { 5000, "Mizu" 5001, "視覺樣式" -5002, "ReactOS Foundation" +5002, "ReactOS Project" 5003, "Foxlet, 基於 Lautus" 5004, "於 2019 年以 GNU/GPL 2.0 條款發行" 5005, "https://reactos.org/" diff --git a/media/themes/Mizu/mizu.msstyles/lang/zh-TW.rc b/media/themes/Mizu/mizu.msstyles/lang/zh-TW.rc index 017073db0c3..a0dd97260f4 100644 --- a/media/themes/Mizu/mizu.msstyles/lang/zh-TW.rc +++ b/media/themes/Mizu/mizu.msstyles/lang/zh-TW.rc @@ -30,7 +30,7 @@ STRINGTABLE { 5000, "Mizu" 5001, "視覺樣式" -5002, "ReactOS Foundation" +5002, "ReactOS Project" 5003, "Foxlet, 基於 Lautus" 5004, "於 2019 年以 GNU/GPL 2.0 條款發行" 5005, "https://reactos.org/" diff --git a/media/themes/Modern/modern.msstyles/lang/de-DE.rc b/media/themes/Modern/modern.msstyles/lang/de-DE.rc index 69962766e46..e95337fc873 100644 --- a/media/themes/Modern/modern.msstyles/lang/de-DE.rc +++ b/media/themes/Modern/modern.msstyles/lang/de-DE.rc @@ -30,7 +30,7 @@ STRINGTABLE { 5000, "Modern" 5001, "Visueller Stil" -5002, "ReactOS Foundation" +5002, "ReactOS Project" 5003, "Polar, basierend auf win10" 5004, "Veröffentlicht unter GNU/GPL 3.0, 2018" 5005, "https://reactos.org/" diff --git a/media/themes/Modern/modern.msstyles/lang/en-GB.rc b/media/themes/Modern/modern.msstyles/lang/en-GB.rc index c290b81a633..5292475eb4a 100644 --- a/media/themes/Modern/modern.msstyles/lang/en-GB.rc +++ b/media/themes/Modern/modern.msstyles/lang/en-GB.rc @@ -30,7 +30,7 @@ STRINGTABLE { 5000, "Modern" 5001, "Visual Style" -5002, "ReactOS Foundation" +5002, "ReactOS Project" 5003, "Polar, based on win10" 5004, "Released under GNU/GPL 3.0, 2018" 5005, "https://reactos.org/" diff --git a/media/themes/Modern/modern.msstyles/lang/en-US.rc b/media/themes/Modern/modern.msstyles/lang/en-US.rc index c46372dd0ed..9d061a2ffcb 100644 --- a/media/themes/Modern/modern.msstyles/lang/en-US.rc +++ b/media/themes/Modern/modern.msstyles/lang/en-US.rc @@ -30,7 +30,7 @@ STRINGTABLE { 5000, "Modern" 5001, "Visual Style" -5002, "ReactOS Foundation" +5002, "ReactOS Project" 5003, "Polar, based on win10" 5004, "Released under GNU/GPL 3.0, 2018" 5005, "https://reactos.org/" diff --git a/media/themes/Modern/modern.msstyles/lang/it-IT.rc b/media/themes/Modern/modern.msstyles/lang/it-IT.rc index 56e3920cd6b..0b0a440f2c1 100644 --- a/media/themes/Modern/modern.msstyles/lang/it-IT.rc +++ b/media/themes/Modern/modern.msstyles/lang/it-IT.rc @@ -30,7 +30,7 @@ STRINGTABLE { 5000, "Modern" 5001, "Stile di visualizzazione" -5002, "ReactOS Foundation" +5002, "ReactOS Project" 5003, "Polar, basato on win10" 5004, "Distribuito sotto licenza GNU/GPL 3.0, 2018" 5005, "https://reactos.org/" diff --git a/media/themes/Modern/modern.msstyles/lang/zh-HK.rc b/media/themes/Modern/modern.msstyles/lang/zh-HK.rc index 38dc7cc0d56..63073576ae0 100644 --- a/media/themes/Modern/modern.msstyles/lang/zh-HK.rc +++ b/media/themes/Modern/modern.msstyles/lang/zh-HK.rc @@ -37,7 +37,7 @@ STRINGTABLE { 5000, "Modern" 5001, "視覺樣式" -5002, "ReactOS Foundation" +5002, "ReactOS Project" 5003, "Polar, 基於 win10 預設樣式" 5004, "於 2018 年以 GNU/GPL 3.0 條款發行" 5005, "https://reactos.org/" diff --git a/media/themes/Modern/modern.msstyles/lang/zh-TW.rc b/media/themes/Modern/modern.msstyles/lang/zh-TW.rc index b7055c2adde..87a4c839aad 100644 --- a/media/themes/Modern/modern.msstyles/lang/zh-TW.rc +++ b/media/themes/Modern/modern.msstyles/lang/zh-TW.rc @@ -32,7 +32,7 @@ STRINGTABLE { 5000, "Modern" 5001, "視覺樣式" -5002, "ReactOS Foundation" +5002, "ReactOS Project" 5003, "Polar, 基於 win10 預設樣式" 5004, "於 2018 年以 GNU/GPL 3.0 條款發行" 5005, "https://reactos.org/" diff --git a/sdk/include/psdk/common.ver b/sdk/include/psdk/common.ver index 6d079370e58..3163b95b822 100644 --- a/sdk/include/psdk/common.ver +++ b/sdk/include/psdk/common.ver @@ -18,9 +18,9 @@ // #ifndef VER_LEGALCOPYRIGHT_STR #if defined(RC_INVOKED) && !defined(WIN16) -#define VER_LEGALCOPYRIGHT_STR L"\251 ReactOS Foundation. All rights reserved." +#define VER_LEGALCOPYRIGHT_STR L"\251 ReactOS Project. All rights reserved." #else -#define VER_LEGALCOPYRIGHT_STR "Copyright (c) ReactOS Foundation. All rights reserved." +#define VER_LEGALCOPYRIGHT_STR "Copyright (c) ReactOS Project. All rights reserved." #endif #endif @@ -29,9 +29,9 @@ // #ifndef VER_PRODUCTNAME_STR #ifdef RC_INVOKED -#define VER_PRODUCTNAME_STR L"ReactOS\256 Operating System" +#define VER_PRODUCTNAME_STR L"ReactOS Operating System" #else -#define VER_PRODUCTNAME_STR "ReactOS (R) Operating System" +#define VER_PRODUCTNAME_STR "ReactOS Operating System" #endif #endif diff --git a/sdk/include/psdk/ntverp.h b/sdk/include/psdk/ntverp.h index a3fd98808d1..566f14144c0 100644 --- a/sdk/include/psdk/ntverp.h +++ b/sdk/include/psdk/ntverp.h @@ -144,8 +144,8 @@ // Company and Trademarks // #define VER_COMPANYNAME_STR \ - "ReactOS(R) Foundation" + "ReactOS Project" #define VER_PRODUCTNAME_STR \ - "ReactOS(R) Operating System" + "ReactOS Operating System" #define VER_LEGALTRADEMARKS_STR \ - "ReactOS(R) is a registered trademark of the ReactOS Foundation." + "ReactOS is a registered trademark of ReactOS Deutschland e.V."

1 0

[reactos] 01/01: [PROCESSR] Fix INF file formatting only
by Stanislav Motylkov 27 Jun '22

27 Jun '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e1c89ce397dfab6d1049c… commit e1c89ce397dfab6d1049ca1d41717f88e8de7a90 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Mon Jun 27 15:40:50 2022 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Mon Jun 27 15:40:50 2022 +0300 [PROCESSR] Fix INF file formatting only --- drivers/processor/processr/cpu.inf | 137 ++++++++++++++++++------------------- 1 file changed, 68 insertions(+), 69 deletions(-) diff --git a/drivers/processor/processr/cpu.inf b/drivers/processor/processr/cpu.inf index 59d8f1eaf99..0ac52f9b8a6 100644 --- a/drivers/processor/processr/cpu.inf +++ b/drivers/processor/processr/cpu.inf @@ -120,7 +120,6 @@ LoadOrderGroup = Extended Base ;-------------------------------- STRINGS ------------------------------- [Strings] - ReactOS = "ReactOS Foundation" ProcessorClassName = "Processors" @@ -158,6 +157,36 @@ ViaESTProcessor.DeviceDesc = "VIA Esther Processor" ViaNANOProcessor.DeviceDesc = "VIA Nano Processor" ViaProcessor.DeviceDesc = "VIA Processor" +[Strings.0404] +Processor.DeviceDesc = "處理器" +Processor.ServiceDesc = "處理器驅動程式" +CyrixProcessor.DeviceDesc = "Cyrix 6x86 處理器" +IntelProcessor.DeviceDesc = "Intel Pentium 處理器" +IntelMMXProcessor.DeviceDesc = "Intel Pentium MMX 處理器" +IntelPROProcessor.DeviceDesc = "Intel Pentium Pro 處理器" +IntelP2Processor.DeviceDesc = "Intel Pentium II / Celeron 處理器" +IntelP3Processor.DeviceDesc = "Intel Pentium III / Celeron / Xeon 處理器" +IntelMProcessor.DeviceDesc = "Intel Pentium M / Celeron M 處理器" +IntelP4Processor.DeviceDesc = "Intel Pentium 4 / Celeron / Xeon / D 處理器" +IntelAtomProcessor.DeviceDesc = "Intel Atom 處理器" +IntelCoreProcessor.DeviceDesc = "Intel Core Solo/Duo/Ex / Celeron / Xeon / M 處理器" +IntelCoreiXProcessor.DeviceDesc = "Intel Core i* 處理器" +AMDProcessor.DeviceDesc = "AMD 處理器" +AMDK6Processor.DeviceDesc = "AMD K6 處理器" +AMDK62Processor.DeviceDesc = "AMD K6-2 處理器" +AMDK63Processor.DeviceDesc = "AMD K6-III / Geode 處理器" +AMDK7Processor.DeviceDesc = "AMD Athlon / Duron / Geode NX / Sempron 處理器" +AMDK8Processor.DeviceDesc = "AMD Athlon 64 / Turion 64 / Opteron / Sempron 處理器" +AMDPHENProcessor.DeviceDesc = "AMD Athlon 64 X / Turion 64 X / Phenom 處理器" +AMDQProcessor.DeviceDesc = "AMD Athlon 64 Q* / Turion 64 *M / Sempron S* 處理器" +TransmetaProcessor.DeviceDesc = "Transmeta Crusoe 處理器" +Standard = "標準處理器" +ViaC7Processor.DeviceDesc = "VIA C7 處理器" +ViaNEHProcessor.DeviceDesc = "VIA Nehemiah 處理器" +ViaESTProcessor.DeviceDesc = "VIA Esther 處理器" +ViaNANOProcessor.DeviceDesc = "VIA Nano 處理器" +ViaProcessor.DeviceDesc = "VIA 處理器" + [Strings.0405] Processor.DeviceDesc = "Procesor" Processor.ServiceDesc = "Processor driver" @@ -190,6 +219,7 @@ ViaProcessor.DeviceDesc = "Procesor VIA" [Strings.0407] ProcessorClassName = "Prozessoren" + Processor.DeviceDesc = "Prozessor" Processor.ServiceDesc = "Prozessortreiber" CyrixProcessor.DeviceDesc = "Cyrix 6x86 Prozessor" @@ -225,41 +255,7 @@ Processor.ServiceDesc = "Processor driver" IntelProcessor.DeviceDesc = "Επεξεργαστής Intel" Standard = "Πρότυπος επεξεργαστής" -[Strings.0a] -ReactOS = "Equipo de ReactOS" -ProcessorClassName = "Procesadores" - -Processor.DeviceDesc = "Procesador" -Processor.ServiceDesc = "Driver de procesador" -CyrixProcessor.DeviceDesc = "Procesador Cyrix 6x86" -IntelProcessor.DeviceDesc = "Procesador Intel Pentium" -IntelMMXProcessor.DeviceDesc = "Procesador Intel Pentium MMX" -IntelPROProcessor.DeviceDesc = "Procesador Intel Pentium Pro" -IntelP2Processor.DeviceDesc = "Procesador Intel Pentium II / Celeron" -IntelP3Processor.DeviceDesc = "Procesador Intel Pentium III / Celeron / Xeon" -IntelMProcessor.DeviceDesc = "Procesador Intel Pentium M / Celeron M" -IntelP4Processor.DeviceDesc = "Procesador Intel Pentium 4 / Celeron / Xeon / D" -IntelAtomProcessor.DeviceDesc = "Procesador Intel Atom" -IntelCoreProcessor.DeviceDesc = "Procesador Intel Core Solo/Duo/Ex / Celeron / Xeon / M" -IntelCoreiXProcessor.DeviceDesc = "Procesador Intel Core i*" -AMDProcessor.DeviceDesc = "Procesador AMD" -AMDK6Processor.DeviceDesc = "Procesador AMD K6" -AMDK62Processor.DeviceDesc = "Procesador AMD K6-2" -AMDK63Processor.DeviceDesc = "Procesador AMD K6-III / Geode" -AMDK7Processor.DeviceDesc = "Procesador AMD Athlon / Duron / Geode NX / Sempron" -AMDK8Processor.DeviceDesc = "Procesador AMD Athlon 64 / Turion 64 / Opteron / Sempron" -AMDPHENProcessor.DeviceDesc = "Procesador AMD Athlon 64 X / Turion 64 X / Phenom" -AMDQProcessor.DeviceDesc = "Procesador AMD Athlon 64 Q* / Turion 64 *M / Sempron S*" -TransmetaProcessor.DeviceDesc = "Procesador Transmeta Crusoe" -Standard = "Procesador estándar" -ViaC7Processor.DeviceDesc = "Procesador VIA C7" -ViaNEHProcessor.DeviceDesc = "Procesador VIA Nehemiah" -ViaESTProcessor.DeviceDesc = "Procesador VIA Esther" -ViaNANOProcessor.DeviceDesc = "Procesador VIA Nano" -ViaProcessor.DeviceDesc = "Procesador VIA" - - -[Strings.040C] +[Strings.040c] Processor.DeviceDesc = "Processeur" Processor.ServiceDesc = "Processor driver" IntelProcessor.DeviceDesc = "Processeur Intel" @@ -313,6 +309,7 @@ Standard = "Processador padrão" [Strings.0418] ReactOS = "Fundația ReactOS" ProcessorClassName = "Procesoare" + Processor.DeviceDesc = "Procesor" Processor.ServiceDesc = "Modúl-pilot de processor" CyrixProcessor.DeviceDesc = "Procesor Cyrix 6x86" @@ -343,7 +340,6 @@ ViaNANOProcessor.DeviceDesc = "Procesor VIA Nano" ViaProcessor.DeviceDesc = "Procesor VIA" [Strings.0419] - ReactOS = "Фонд ReactOS" ProcessorClassName = "Процессоры" @@ -376,7 +372,7 @@ ViaESTProcessor.DeviceDesc = "VIA Esther процессор" ViaNANOProcessor.DeviceDesc = "VIA Nano процессор" ViaProcessor.DeviceDesc = "VIA процессор" -[Strings.041B] +[Strings.041b] Processor.DeviceDesc = "Procesor" Processor.ServiceDesc = "Processor driver" IntelProcessor.DeviceDesc = "Intel procesor" @@ -418,6 +414,7 @@ ViaProcessor.DeviceDesc = "VIA İşlemci" [Strings.0422] ReactOS = "Фонд ReactOS" ProcessorClassName = "Процесори" + Processor.DeviceDesc = "Процесор" Processor.ServiceDesc = "Processor driver" CyrixProcessor.DeviceDesc = "Процесор Cyrix 6x86" @@ -453,36 +450,6 @@ Processor.ServiceDesc = "Processor driver" IntelProcessor.DeviceDesc = "Intel procesorius" Standard = "Standartinis procesorius" -[Strings.0404] -Processor.DeviceDesc = "處理器" -Processor.ServiceDesc = "處理器驅動程式" -CyrixProcessor.DeviceDesc = "Cyrix 6x86 處理器" -IntelProcessor.DeviceDesc = "Intel Pentium 處理器" -IntelMMXProcessor.DeviceDesc = "Intel Pentium MMX 處理器" -IntelPROProcessor.DeviceDesc = "Intel Pentium Pro 處理器" -IntelP2Processor.DeviceDesc = "Intel Pentium II / Celeron 處理器" -IntelP3Processor.DeviceDesc = "Intel Pentium III / Celeron / Xeon 處理器" -IntelMProcessor.DeviceDesc = "Intel Pentium M / Celeron M 處理器" -IntelP4Processor.DeviceDesc = "Intel Pentium 4 / Celeron / Xeon / D 處理器" -IntelAtomProcessor.DeviceDesc = "Intel Atom 處理器" -IntelCoreProcessor.DeviceDesc = "Intel Core Solo/Duo/Ex / Celeron / Xeon / M 處理器" -IntelCoreiXProcessor.DeviceDesc = "Intel Core i* 處理器" -AMDProcessor.DeviceDesc = "AMD 處理器" -AMDK6Processor.DeviceDesc = "AMD K6 處理器" -AMDK62Processor.DeviceDesc = "AMD K6-2 處理器" -AMDK63Processor.DeviceDesc = "AMD K6-III / Geode 處理器" -AMDK7Processor.DeviceDesc = "AMD Athlon / Duron / Geode NX / Sempron 處理器" -AMDK8Processor.DeviceDesc = "AMD Athlon 64 / Turion 64 / Opteron / Sempron 處理器" -AMDPHENProcessor.DeviceDesc = "AMD Athlon 64 X / Turion 64 X / Phenom 處理器" -AMDQProcessor.DeviceDesc = "AMD Athlon 64 Q* / Turion 64 *M / Sempron S* 處理器" -TransmetaProcessor.DeviceDesc = "Transmeta Crusoe 處理器" -Standard = "標準處理器" -ViaC7Processor.DeviceDesc = "VIA C7 處理器" -ViaNEHProcessor.DeviceDesc = "VIA Nehemiah 處理器" -ViaESTProcessor.DeviceDesc = "VIA Esther 處理器" -ViaNANOProcessor.DeviceDesc = "VIA Nano 處理器" -ViaProcessor.DeviceDesc = "VIA 處理器" - [Strings.0804] Processor.DeviceDesc = "处理器" Processor.ServiceDesc = "处理器驱动程序" @@ -513,6 +480,39 @@ ViaESTProcessor.DeviceDesc = "VIA Esther 处理器" ViaNANOProcessor.DeviceDesc = "VIA Nano 处理器" ViaProcessor.DeviceDesc = "VIA 处理器" +[Strings.0a] +ReactOS = "Equipo de ReactOS" +ProcessorClassName = "Procesadores" + +Processor.DeviceDesc = "Procesador" +Processor.ServiceDesc = "Driver de procesador" +CyrixProcessor.DeviceDesc = "Procesador Cyrix 6x86" +IntelProcessor.DeviceDesc = "Procesador Intel Pentium" +IntelMMXProcessor.DeviceDesc = "Procesador Intel Pentium MMX" +IntelPROProcessor.DeviceDesc = "Procesador Intel Pentium Pro" +IntelP2Processor.DeviceDesc = "Procesador Intel Pentium II / Celeron" +IntelP3Processor.DeviceDesc = "Procesador Intel Pentium III / Celeron / Xeon" +IntelMProcessor.DeviceDesc = "Procesador Intel Pentium M / Celeron M" +IntelP4Processor.DeviceDesc = "Procesador Intel Pentium 4 / Celeron / Xeon / D" +IntelAtomProcessor.DeviceDesc = "Procesador Intel Atom" +IntelCoreProcessor.DeviceDesc = "Procesador Intel Core Solo/Duo/Ex / Celeron / Xeon / M" +IntelCoreiXProcessor.DeviceDesc = "Procesador Intel Core i*" +AMDProcessor.DeviceDesc = "Procesador AMD" +AMDK6Processor.DeviceDesc = "Procesador AMD K6" +AMDK62Processor.DeviceDesc = "Procesador AMD K6-2" +AMDK63Processor.DeviceDesc = "Procesador AMD K6-III / Geode" +AMDK7Processor.DeviceDesc = "Procesador AMD Athlon / Duron / Geode NX / Sempron" +AMDK8Processor.DeviceDesc = "Procesador AMD Athlon 64 / Turion 64 / Opteron / Sempron" +AMDPHENProcessor.DeviceDesc = "Procesador AMD Athlon 64 X / Turion 64 X / Phenom" +AMDQProcessor.DeviceDesc = "Procesador AMD Athlon 64 Q* / Turion 64 *M / Sempron S*" +TransmetaProcessor.DeviceDesc = "Procesador Transmeta Crusoe" +Standard = "Procesador estándar" +ViaC7Processor.DeviceDesc = "Procesador VIA C7" +ViaNEHProcessor.DeviceDesc = "Procesador VIA Nehemiah" +ViaESTProcessor.DeviceDesc = "Procesador VIA Esther" +ViaNANOProcessor.DeviceDesc = "Procesador VIA Nano" +ViaProcessor.DeviceDesc = "Procesador VIA" + [Strings.0c04] Processor.DeviceDesc = "處理器" Processor.ServiceDesc = "處理器驅動程式" @@ -542,4 +542,3 @@ ViaNEHProcessor.DeviceDesc = "VIA Nehemiah 處理器" ViaESTProcessor.DeviceDesc = "VIA Esther 處理器" ViaNANOProcessor.DeviceDesc = "VIA Nano 處理器" ViaProcessor.DeviceDesc = "VIA 處理器" -

1 0

[reactos] 01/01: [CDMAKE] Remove module
by Stanislav Motylkov 27 Jun '22

27 Jun '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c24e09401be57fa270802… commit c24e09401be57fa2708021fbe995c8bfa651d7f6 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sat Jun 25 14:52:03 2022 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Mon Jun 27 15:14:03 2022 +0300 [CDMAKE] Remove module We've been using mkisofs for 5 years now and are not looking back. - Colin Finck --- .../applications/devutils/cdmake/CMakeLists.txt | 2 - .../rosapps/applications/devutils/cdmake/cdmake.c | 2446 -------------------- .../rosapps/applications/devutils/cdmake/config.h | 15 - .../rosapps/applications/devutils/cdmake/dirhash.c | 238 -- .../rosapps/applications/devutils/cdmake/dirhash.h | 50 - .../rosapps/applications/devutils/cdmake/llmsort.c | 113 - .../applications/devutils/cdmake/readme.txt | 96 - 7 files changed, 2960 deletions(-) diff --git a/modules/rosapps/applications/devutils/cdmake/CMakeLists.txt b/modules/rosapps/applications/devutils/cdmake/CMakeLists.txt deleted file mode 100644 index caaeb070884..00000000000 --- a/modules/rosapps/applications/devutils/cdmake/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ - -add_host_tool(cdmake cdmake.c dirhash.c llmsort.c) diff --git a/modules/rosapps/applications/devutils/cdmake/cdmake.c b/modules/rosapps/applications/devutils/cdmake/cdmake.c deleted file mode 100644 index dd05ed51ec6..00000000000 --- a/modules/rosapps/applications/devutils/cdmake/cdmake.c +++ /dev/null @@ -1,2446 +0,0 @@ -/* - * CD-ROM Maker - * by Philip J. Erdelsky - * pje(a)acm.org - * http://alumnus.caltech.edu/~pje/ - * - * http://alumnus.caltech.edu/~pje/cdmake.txt - * - * According to his website, this file was released into the public domain - * by Philip J. Erdelsky. - */ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS CD-ROM Maker - * FILE: tools/cdmake/cdmake.c - * PURPOSE: CD-ROM Premastering Utility - * PROGRAMMERS: Eric Kohl - * Casper S. Hornstrup - * Filip Navara - * Magnus Olsen - * Hermes Belusca-Maito - * - * HISTORY: - * - * ElTorito-Support - * by Eric Kohl - * - * Linux port - * by Casper S. Hornstrup - * chorns(a)users.sourceforge.net - * - * Joliet support - * by Filip Navara - * xnavara(a)volny.cz - * Limitations: - * - No Joliet file name validations - * - Very bad ISO file name generation - * - * Convert long filename to ISO9660 file name by Magnus Olsen - * magnus(a)greatlord.com - */ - -#include <stdio.h> -#include <fcntl.h> -#include <sys/stat.h> -#include <stdarg.h> -#include <stdlib.h> -#include <string.h> -#ifdef _WIN32 -# define WIN32_LEAN_AND_MEAN -# include <windows.h> -# include <io.h> -# include <dos.h> -# ifdef _MSC_VER -# define R_OK 4 -# endif -#else -# if defined(__FreeBSD__) || defined(__APPLE__) -# include <sys/uio.h> -# else -# include <sys/io.h> -# endif // __FreeBSD__ -# include <errno.h> -# include <sys/types.h> -# include <dirent.h> -# include <unistd.h> -# define TRUE 1 -# define FALSE 0 -#endif // _WIN32 -#include <ctype.h> -#include <time.h> -#include "config.h" -#include "dirhash.h" - -// FIXME! FIXME! Do it in a portable way!! -typedef unsigned char BYTE; -typedef unsigned short WORD; -typedef unsigned long DWORD; -typedef int BOOL; - -// file system parameters - -#define MAX_LEVEL 8 -#define MAX_NAME_LENGTH 64 -#define MAX_CDNAME_LENGTH 8 -#define MAX_EXTENSION_LENGTH 10 -#define MAX_CDEXTENSION_LENGTH 3 -#define SECTOR_SIZE 2048 -#define BUFFER_SIZE (8 * SECTOR_SIZE) - -#define HIDDEN_FLAG 1 -#define DIRECTORY_FLAG 2 - - -struct cd_image -{ - FILE *file; - DWORD sector; // sector to receive next byte - int offset; // offset of next byte in sector - int count; // number of bytes in buffer - char filespecs[128]; - BYTE *buffer; -}; - -typedef struct _boot_validation_header -{ - BYTE header_id; - BYTE platform_id; -} BOOT_VALIDATION_HEADER, *PBOOT_VALIDATION_HEADER; - -typedef struct boot_entry -{ - struct boot_entry *next_entry; - BYTE boot_id; - BYTE boot_emu_type; - WORD load_segment; - BYTE system_type; - WORD sector_count; // boot_image_size - DWORD load_rba; // boot_image_sector - // BYTE unused[20]; - char bootimage[512]; -} BOOT_ENTRY, *PBOOT_ENTRY; - -typedef struct boot_header -{ - struct boot_header *next_header; - BYTE header_id; - BYTE platform_id; - WORD num_entries; - // char id_string[28]; - PBOOT_ENTRY entry_list; -} BOOT_HEADER, *PBOOT_HEADER; - -typedef struct date_and_time -{ - BYTE second; - BYTE minute; - BYTE hour; - BYTE day; - BYTE month; - WORD year; -} DATE_AND_TIME, *PDATE_AND_TIME; - -typedef struct directory_record -{ - struct directory_record *next_in_directory; - struct directory_record *next_in_path_table; /* directory record only */ - struct directory_record *next_in_memory; - struct directory_record *first_record; /* directory record only */ - struct directory_record *parent; - BYTE flags; - char name[MAX_NAME_LENGTH+1]; - char name_on_cd[MAX_CDNAME_LENGTH+1]; - char extension[MAX_EXTENSION_LENGTH+1]; - char extension_on_cd[MAX_CDEXTENSION_LENGTH+1]; - char *joliet_name; - const char *orig_name; - DATE_AND_TIME date_and_time; - DWORD sector; - DWORD size; - DWORD joliet_sector; - DWORD joliet_size; - unsigned level; /* directory record only */ - WORD path_table_index; /* directory record only */ -} DIR_RECORD, *PDIR_RECORD; - -typedef enum directory_record_type -{ - DOT_RECORD, - DOT_DOT_RECORD, - SUBDIRECTORY_RECORD, - FILE_RECORD -} DIR_RECORD_TYPE, *PDIR_RECORD_TYPE; - - -PDIR_RECORD sort_linked_list(PDIR_RECORD, - unsigned, int (*)(PDIR_RECORD, PDIR_RECORD)); - - -static char DIRECTORY_TIMESTAMP[] = "~Y$'KOR$.3K&"; - -static struct cd_image cd; -DIR_RECORD root; - -char volume_label[32]; -char source[512]; -char *end_source; - -enum {QUIET, NORMAL, VERBOSE} verbosity; -BOOL show_progress; - -BOOL scan_files_only = FALSE; -// BOOL compute_crc = FALSE; - -/* - * ISO 9660 information - */ -DWORD size_limit; -BOOL accept_punctuation_marks; - -DWORD total_sectors; -DWORD path_table_size; -DWORD little_endian_path_table_sector; -DWORD big_endian_path_table_sector; - - -/* - * Stats - */ -DWORD number_of_files; -DWORD bytes_in_files; -DWORD unused_bytes_at_ends_of_files; -DWORD number_of_directories; -DWORD bytes_in_directories; - -struct target_dir_hash specified_files; - - -/* - * El-Torito boot information - */ -BOOL eltorito; // TRUE/FALSE: bootable/non-bootable CD-ROM -BOOL multi_boot; // TRUE/FALSE: multi/single-boot CD-ROM -DWORD boot_catalog_sector; -BOOT_VALIDATION_HEADER boot_validation_header; -BOOT_ENTRY default_boot_entry; -PBOOT_HEADER boot_header_list; - -/* - * Joliet information - */ -BOOL joliet; -DWORD joliet_path_table_size; -DWORD joliet_little_endian_path_table_sector; -DWORD joliet_big_endian_path_table_sector; - -/* - * UDF information - */ -BOOL make_bridged_udf = TRUE; // TRUE for "UDF-Bridge" (aka. UDF/ISO); FALSE for pure UDF. - - -/*----------------------------------------------------------------------------- -This function edits a 32-bit unsigned number into a comma-delimited form, such -as 4,294,967,295 for the largest possible number, and returns a pointer to a -static buffer containing the result. It suppresses leading zeros and commas, -but optionally pads the result with blanks at the left so the result is always -exactly 13 characters long (excluding the terminating zero). - -CAUTION: A statement containing more than one call on this function, such as -printf("%s, %s", edit_with_commas(a), edit_with_commas(b)), will produce -incorrect results because all calls use the same static bufffer. ------------------------------------------------------------------------------*/ - -static char *edit_with_commas(DWORD x, BOOL pad) -{ - static char s[14]; - unsigned i = 13; - do - { - if (i % 4 == 2) s[--i] = ','; - s[--i] = (char)(x % 10 + '0'); - } while ((x/=10) != 0); - if (pad) - { - while (i > 0) s[--i] = ' '; - } - return s + i; -} - -/*----------------------------------------------------------------------------- -This function releases all allocated memory blocks. ------------------------------------------------------------------------------*/ - -static void release_memory(void) -{ - while (boot_header_list) - { - PBOOT_HEADER next_header = boot_header_list->next_header; - - while (boot_header_list->entry_list) - { - PBOOT_ENTRY next_entry = boot_header_list->entry_list->next_entry; - free(boot_header_list->entry_list); - boot_header_list->entry_list = next_entry; - } - - free(boot_header_list); - boot_header_list = next_header; - } - - while (root.next_in_memory != NULL) - { - PDIR_RECORD next = root.next_in_memory->next_in_memory; - if (joliet) - free(root.next_in_memory->joliet_name); - free(root.next_in_memory); - root.next_in_memory = next; - } - if (joliet) - free(root.joliet_name); - - if (cd.buffer != NULL) - { - free(cd.buffer); - cd.buffer = NULL; - } -} - -/*----------------------------------------------------------------------------- -This function edits and displays an error message and then jumps back to the -error exit point in main(). ------------------------------------------------------------------------------*/ - -static -DECLSPEC_NORETURN -void error_exit(const char* fmt, ...) -{ - va_list arg; - - va_start(arg, fmt); - vprintf(fmt, arg); - va_end(arg); - printf("\n"); - if (cd.file != NULL) - fclose(cd.file); - release_memory(); - exit(1); -} - -/*----------------------------------------------------------------------------- -This function, which is called only on the second pass, and only when the -buffer is not empty, flushes the buffer to the CD-ROM image. ------------------------------------------------------------------------------*/ - -static void flush_buffer(void) -{ - if (fwrite(cd.buffer, cd.count, 1, cd.file) < 1) - error_exit("File write error"); - cd.count = 0; - if (show_progress) - { - printf("\r%s ", - edit_with_commas((total_sectors - cd.sector) * SECTOR_SIZE, TRUE)); - } -} - -/*----------------------------------------------------------------------------- -This function writes a single byte to the CD-ROM image. On the first pass (in -which cd.handle < 0), it does not actually write anything but merely updates -the file pointer as though the byte had been written. ------------------------------------------------------------------------------*/ - -static void write_byte(BYTE x) -{ - if (cd.file != NULL) - { - cd.buffer[cd.count] = x; - if (++cd.count == BUFFER_SIZE) - flush_buffer(); - } - if (++cd.offset == SECTOR_SIZE) - { - cd.sector++; - cd.offset = 0; - } -} - -/*----------------------------------------------------------------------------- -These functions write a word or double word to the CD-ROM image with the -specified endianity. ------------------------------------------------------------------------------*/ - -static void write_little_endian_word(WORD x) -{ - write_byte((BYTE)x); - write_byte((BYTE)(x >> 8)); -} - -static void write_big_endian_word(WORD x) -{ - write_byte((BYTE)(x >> 8)); - write_byte((BYTE)x); -} - -static void write_both_endian_word(WORD x) -{ - write_little_endian_word(x); - write_big_endian_word(x); -} - -static void write_little_endian_dword(DWORD x) -{ - write_byte((BYTE)x); - write_byte((BYTE)(x >> 8)); - write_byte((BYTE)(x >> 16)); - write_byte((BYTE)(x >> 24)); -} - -static void write_big_endian_dword(DWORD x) -{ - write_byte((BYTE)(x >> 24)); - write_byte((BYTE)(x >> 16)); - write_byte((BYTE)(x >> 8)); - write_byte((BYTE)x); -} - -static void write_both_endian_dword(DWORD x) -{ - write_little_endian_dword(x); - write_big_endian_dword(x); -} - -/*----------------------------------------------------------------------------- -This function writes enough zeros to fill out the end of a sector, and leaves -the file pointer at the beginning of the next sector. If the file pointer is -already at the beginning of a sector, it writes nothing. ------------------------------------------------------------------------------*/ - -static void fill_sector(void) -{ - while (cd.offset != 0) - write_byte(0); -} - -/*----------------------------------------------------------------------------- -This function writes a string to the CD-ROM image. The terminating \0 is not -written. ------------------------------------------------------------------------------*/ - -static void write_string(char *s) -{ - while (*s != 0) - write_byte(*s++); -} - -static void write_bytecounted_string(unsigned bytecount, char *s, char padding) -{ - while (*s != 0 && bytecount != 0) - { - write_byte(*s++); - bytecount--; - } - while (bytecount != 0) - { - write_byte(padding); - bytecount--; - } -} - -/*----------------------------------------------------------------------------- -This function writes a ansi string as a big endian unicode string to the CD-ROM -image. The terminating \0 is not written. ------------------------------------------------------------------------------*/ - -static void write_string_as_big_endian_unicode(char *s) -{ - while (*s != 0) - { - write_big_endian_word(*s++); - } -} - -static void write_bytecounted_string_as_big_endian_unicode(unsigned bytecount, char *s, char padding) -{ - unsigned wordcount = bytecount / 2; - - while (*s != 0 && wordcount != 0) - { - write_big_endian_word(*s++); - wordcount--; - } - while (wordcount != 0) - { - write_big_endian_word(padding); - wordcount--; - } - - if (bytecount % 2 != 0) - write_byte(padding); -} - -/*----------------------------------------------------------------------------- -This function writes a block of identical bytes to the CD-ROM image. ------------------------------------------------------------------------------*/ - -static void write_block(unsigned count, BYTE value) -{ - while (count != 0) - { - write_byte(value); - count--; - } -} - -/*----------------------------------------------------------------------------- -This function writes a block of identical big endian words to the CD-ROM image. ------------------------------------------------------------------------------*/ - -static void write_word_block(unsigned count, WORD value) -{ - while (count != 0) - { - write_big_endian_word(value); - count--; - } -} - -/*----------------------------------------------------------------------------- -This function writes a directory record to the CD_ROM image. ------------------------------------------------------------------------------*/ - -static void -write_directory_record(PDIR_RECORD d, - DIR_RECORD_TYPE DirType, - BOOL joliet) -{ - unsigned identifier_size; - unsigned record_size; - - if (joliet) - { - if (DirType == DOT_RECORD || DirType == DOT_DOT_RECORD) - identifier_size = 1; - else - identifier_size = strlen(d->joliet_name) * 2; - } - else - { - switch (DirType) - { - case DOT_RECORD: - case DOT_DOT_RECORD: - identifier_size = 1; - break; - case SUBDIRECTORY_RECORD: - /*printf("Subdir: %s\n", d->name_on_cd);*/ - identifier_size = strlen(d->name_on_cd); - break; - case FILE_RECORD: - /*printf("File: %s.%s -> %s.%s\n", d->name, d->extension, d->name_on_cd, d->extension_on_cd);*/ - identifier_size = strlen(d->name_on_cd) + 2; - if (d->extension_on_cd[0] != 0) - identifier_size += 1 + strlen(d->extension_on_cd); - break; - default: - identifier_size = 1; - break; - } - } - record_size = 33 + identifier_size; - if ((identifier_size & 1) == 0) - record_size++; - if (cd.offset + record_size > SECTOR_SIZE) - fill_sector(); - write_byte((BYTE)record_size); - write_byte(0); // number of sectors in extended attribute record - if (joliet) - { - write_both_endian_dword(d->joliet_sector); - write_both_endian_dword(d->joliet_size); - } - else - { - write_both_endian_dword(d->sector); - write_both_endian_dword(d->size); - } - write_byte((BYTE)(d->date_and_time.year - 1900)); - write_byte(d->date_and_time.month); - write_byte(d->date_and_time.day); - write_byte(d->date_and_time.hour); - write_byte(d->date_and_time.minute); - write_byte(d->date_and_time.second); - write_byte(0); // GMT offset - write_byte(d->flags); - write_byte(0); // file unit size for an interleaved file - write_byte(0); // interleave gap size for an interleaved file - write_both_endian_word(1); // volume sequence number - write_byte((BYTE)identifier_size); - switch (DirType) - { - case DOT_RECORD: - write_byte(0); - break; - case DOT_DOT_RECORD: - write_byte(1); - break; - case SUBDIRECTORY_RECORD: - if (joliet) - write_string_as_big_endian_unicode(d->joliet_name); - else - write_string(d->name_on_cd); - break; - case FILE_RECORD: - if (joliet) - { - write_string_as_big_endian_unicode(d->joliet_name); - } - else - { - write_string(d->name_on_cd); - if (d->extension_on_cd[0] != 0) - { - write_byte('.'); - write_string(d->extension_on_cd); - } - write_string(";1"); - } - break; - } - if ((identifier_size & 1) == 0) - write_byte(0); -} - -/*----------------------------------------------------------------------------- -This function converts the date and time words from an ffblk structure and -puts them into a date_and_time structure. ------------------------------------------------------------------------------*/ - -static void convert_date_and_time(PDATE_AND_TIME dt, time_t *time) -{ - struct tm *timedef; - timedef = gmtime(time); - - dt->second = timedef->tm_sec; - dt->minute = timedef->tm_min; - dt->hour = timedef->tm_hour; - dt->day = timedef->tm_mday; - dt->month = timedef->tm_mon + 1; - dt->year = timedef->tm_year + 1900; -} - -/*----------------------------------------------------------------------------- -This function checks the specified character, if necessary, and -generates an error if it is a punctuation mark other than an underscore. -It also converts small letters to capital letters and returns the -result. ------------------------------------------------------------------------------*/ - -static int check_for_punctuation(int c, const char *name) -{ - c = toupper(c & 0xFF); - if (!accept_punctuation_marks && !isalnum(c) && c != '_') - error_exit("Punctuation mark in %s", name); - return c; -} - -/*----------------------------------------------------------------------------- -This function checks to see if there's a cdname conflict. ------------------------------------------------------------------------------*/ - -#if defined(_WIN32) && !defined(strcasecmp) -#define strcasecmp stricmp -#endif // _WIN32 - -static BOOL cdname_exists(PDIR_RECORD d) -{ - PDIR_RECORD p = d->parent->first_record; - while (p) - { - if ( p != d - && !strcasecmp(p->name_on_cd, d->name_on_cd) - && !strcasecmp(p->extension_on_cd, d->extension_on_cd) ) - return TRUE; - p = p->next_in_directory; - } - return FALSE; -} - -static void parse_filename_into_dirrecord(const char* filename, PDIR_RECORD d, BOOL dir) -{ - const char *s = filename; - char *t = d->name_on_cd; - char *n = d->name; - int joliet_length; - int filename_counter; - filename_counter = 1; - while (*s != 0) - { - if (*s == '.') - { - s++; - break; - } - - if ((size_t)(t-d->name_on_cd) < sizeof(d->name_on_cd)-1) - *t++ = check_for_punctuation(*s, filename); - else if (!joliet) - error_exit("'%s' is not ISO-9660, aborting...", filename); - - if ((size_t)(n-d->name) < sizeof(d->name)-1) - *n++ = *s; - else if (!joliet) - error_exit("'%s' is not ISO-9660, aborting...", filename); - s++; - } - // Check for extension length - if (!joliet && strlen(s) > MAX_EXTENSION_LENGTH) - { - error_exit("'%s' has too long extension, aborting...", filename); - } - *t = 0; - strcpy(d->extension, s); - t = d->extension_on_cd; - while (*s != 0) - { - if ((size_t)(t-d->extension_on_cd) < sizeof(d->extension_on_cd)-1) - *t++ = check_for_punctuation(*s, filename); - else if (!joliet) - error_exit("'%s' is not ISO-9660, aborting...", filename); - s++; - } - *t = 0; - *n = 0; - - if (dir) - { - if (d->extension[0] != 0) - { - if (!joliet) - error_exit("Directory with extension '%s'", filename); - } - d->flags = DIRECTORY_FLAG; - } else - { - d->flags = 0; - } - - filename_counter = 1; - while (cdname_exists(d)) - { - // the file name must be at least 8 chars long - if (strlen(d->name_on_cd)<8) - error_exit("'%s' is a duplicate file name, aborting...", filename); - - if ((d->name_on_cd[8] == '.') && (strlen(d->name_on_cd) < 13)) - error_exit("'%s' is a duplicate file name, aborting...", filename); - - // max 255 times for equal short filename - if (filename_counter>255) - error_exit("'%s' is a duplicate file name, aborting...", filename); - - d->name_on_cd[8] = '~'; - memset(&d->name_on_cd[9],0,5); - sprintf(&d->name_on_cd[9],"%d",filename_counter); - filename_counter++; - } - - if (joliet) - { - joliet_length = strlen(filename); - if (joliet_length > 64) - error_exit("'%s' is not Joliet, aborting...", filename); - d->joliet_name = malloc(joliet_length + 1); - if (d->joliet_name == NULL) - error_exit("Insufficient memory"); - strcpy(d->joliet_name, filename); - } -} - -/*----------------------------------------------------------------------------- -This function creates a new directory record with the information from the -specified ffblk. It links it into the beginning of the directory list -for the specified parent and returns a pointer to the new record. ------------------------------------------------------------------------------*/ - -#ifdef _WIN32 - -/* Win32 version */ -PDIR_RECORD -new_directory_record(struct _finddata_t *f, - PDIR_RECORD parent) -{ - PDIR_RECORD d; - - d = calloc(1, sizeof(*d)); - if (d == NULL) - error_exit("Insufficient memory"); - d->next_in_memory = root.next_in_memory; - root.next_in_memory = d; - - /* I need the parent set before calling parse_filename_into_dirrecord(), - because that functions checks for duplicate file names*/ - d->parent = parent; - parse_filename_into_dirrecord(f->name, d, f->attrib & _A_SUBDIR); - - convert_date_and_time(&d->date_and_time, &f->time_write); - d->flags |= f->attrib & _A_HIDDEN ? HIDDEN_FLAG : 0; - d->size = d->joliet_size = f->size; - d->next_in_directory = parent->first_record; - parent->first_record = d; - return d; -} - -#else - -/* Linux version */ -PDIR_RECORD -new_directory_record(struct dirent *entry, - struct stat *stbuf, - PDIR_RECORD parent) -{ - PDIR_RECORD d; - - d = calloc(1, sizeof(*d)); - if (d == NULL) - error_exit("Insufficient memory"); - d->next_in_memory = root.next_in_memory; - root.next_in_memory = d; - - /* I need the parent set before calling parse_filename_into_dirrecord(), - because that functions checks for duplicate file names*/ - d->parent = parent; -#ifdef HAVE_D_TYPE - parse_filename_into_dirrecord(entry->d_name, d, entry->d_type == DT_DIR); -#else - parse_filename_into_dirrecord(entry->d_name, d, S_ISDIR(stbuf->st_mode)); -#endif - - convert_date_and_time(&d->date_and_time, &stbuf->st_mtime); - d->flags |= entry->d_name[0] == '.' ? HIDDEN_FLAG : 0; - d->size = d->joliet_size = stbuf->st_size; - d->next_in_directory = parent->first_record; - parent->first_record = d; - return d; -} - -#endif - -/*----------------------------------------------------------------------------- -This function compares two directory records according to the ISO9660 rules -for directory sorting and returns a negative value if p is before q, or a -positive value if p is after q. ------------------------------------------------------------------------------*/ - -static int compare_directory_order(PDIR_RECORD p, PDIR_RECORD q) -{ - int n = strcmp(p->name_on_cd, q->name_on_cd); - if (n == 0) - n = strcmp(p->extension_on_cd, q->extension_on_cd); - return n; -} - -/*----------------------------------------------------------------------------- -This function compares two directory records (which must represent -directories) according to the ISO9660 rules for path table sorting and returns -a negative value if p is before q, or a positive vlaue if p is after q. ------------------------------------------------------------------------------*/ - -static int compare_path_table_order(PDIR_RECORD p, PDIR_RECORD q) -{ - int n = p->level - q->level; - if (p == q) - return 0; - if (n == 0) - { - n = compare_path_table_order(p->parent, q->parent); - if (n == 0) - n = compare_directory_order(p, q); - } - return n; -} - -/*----------------------------------------------------------------------------- -This function appends the specified string to the buffer source[]. ------------------------------------------------------------------------------*/ - -static void append_string_to_source(char *s) -{ - while (*s != 0) - *end_source++ = *s++; -} - -/*----------------------------------------------------------------------------- -This function scans all files from the current source[] (which must end in \, -and represents a directory already in the database as d), -and puts the appropriate directory records into the database in memory, with -the specified root. It calls itself recursively to scan all subdirectories. ------------------------------------------------------------------------------*/ - -#ifdef _WIN32 - -static void -make_directory_records(PDIR_RECORD d) -{ - PDIR_RECORD new_d; - struct _finddata_t f; - char *old_end_source; - int findhandle; - - d->first_record = NULL; - strcpy(end_source, "*.*"); - - findhandle = _findfirst(source, &f); - if (findhandle != 0) - { - do - { - if ((f.attrib & (_A_HIDDEN | _A_SUBDIR)) == 0 && f.name[0] != '.') - { - if (strcmp(f.name, DIRECTORY_TIMESTAMP) == 0) - { - convert_date_and_time(&d->date_and_time, &f.time_write); - } - else - { - if (verbosity == VERBOSE) - { - old_end_source = end_source; - strcpy(end_source, f.name); - printf("%d: file %s\n", d->level, source); - end_source = old_end_source; - } - (void) new_directory_record(&f, d); - } - } - } - while (_findnext(findhandle, &f) == 0); - - _findclose(findhandle); - } - - strcpy(end_source, "*.*"); - findhandle = _findfirst(source, &f); - if (findhandle) - { - do - { - if (f.attrib & _A_SUBDIR && f.name[0] != '.') - { - old_end_source = end_source; - append_string_to_source(f.name); - *end_source++ = DIR_SEPARATOR_CHAR; - if (verbosity == VERBOSE) - { - *end_source = 0; - printf("%d: directory %s\n", d->level + 1, source); - } - if (d->level < MAX_LEVEL) - { - new_d = new_directory_record(&f, d); - new_d->next_in_path_table = root.next_in_path_table; - root.next_in_path_table = new_d; - new_d->level = d->level + 1; - make_directory_records(new_d); - } - else - { - error_exit("Directory is nested too deep"); - } - end_source = old_end_source; - } - } - while (_findnext(findhandle, &f) == 0); - - _findclose(findhandle); - } - - // sort directory - d->first_record = sort_linked_list(d->first_record, 0, compare_directory_order); -} - -#else - -/* Linux version */ -static void -make_directory_records(PDIR_RECORD d) -{ - PDIR_RECORD new_d; - DIR *dirp; - struct dirent *entry; - char *old_end_source; - struct stat stbuf; - char buf[MAX_PATH]; - - d->first_record = NULL; - -#ifdef HAVE_D_TYPE - dirp = opendir(source); - if (dirp != NULL) - { - while ((entry = readdir(dirp)) != NULL) - { - if (strcmp(entry->d_name, ".") == 0 || strcmp(entry->d_name, "..") == 0) - continue; // skip self and parent - - if (entry->d_type == DT_REG) // normal file - { - // Check for an absolute path - if (source[0] == DIR_SEPARATOR_CHAR) - { - strcpy(buf, source); - strcat(buf, DIR_SEPARATOR_STRING); - strcat(buf, entry->d_name); - } - else - { - if (!getcwd(buf, sizeof(buf))) - error_exit("Cannot get CWD: %s\n", strerror(errno)); - strcat(buf, DIR_SEPARATOR_STRING); - strcat(buf, source); - strcat(buf, entry->d_name); - } - - if (stat(buf, &stbuf) == -1) - { - error_exit("Cannot access '%s' (%s)\n", buf, strerror(errno)); - return; - } - - if (strcmp(entry->d_name, DIRECTORY_TIMESTAMP) == 0) - { - convert_date_and_time(&d->date_and_time, &stbuf.st_ctime); - } - else - { - if (verbosity == VERBOSE) - { - printf("%d: file %s\n", d->level, buf); - } - (void) new_directory_record(entry, &stbuf, d); - } - } - } - closedir(dirp); - } - else - { - error_exit("Cannot open '%s'\n", source); - return; - } - - dirp = opendir(source); - if (dirp != NULL) - { - while ((entry = readdir(dirp)) != NULL) - { - if (strcmp(entry->d_name, ".") == 0 || strcmp(entry->d_name, "..") == 0) - continue; // skip self and parent - - if (entry->d_type == DT_DIR) // directory - { - old_end_source = end_source; - append_string_to_source(entry->d_name); - *end_source++ = DIR_SEPARATOR_CHAR; - *end_source = 0; - if (verbosity == VERBOSE) - { - printf("%d: directory %s\n", d->level + 1, source); - } - if (d->level < MAX_LEVEL) - { - // Check for an absolute path - if (source[0] == DIR_SEPARATOR_CHAR) - { - strcpy(buf, source); - } - else - { - if (!getcwd(buf, sizeof(buf))) - error_exit("Cannot get CWD: %s\n", strerror(errno)); - strcat(buf, DIR_SEPARATOR_STRING); - strcat(buf, source); - } - - if (stat(buf, &stbuf) == -1) - { - error_exit("Cannot access '%s' (%s)\n", buf, strerror(errno)); - return; - } - new_d = new_directory_record(entry, &stbuf, d); - new_d->next_in_path_table = root.next_in_path_table; - root.next_in_path_table = new_d; - new_d->level = d->level + 1; - make_directory_records(new_d); - } - else - { - error_exit("Directory is nested too deep"); - } - end_source = old_end_source; - *end_source = 0; - } - } - closedir(dirp); - } - else - { - error_exit("Cannot open '%s'\n", source); - return; - } - -#else - - dirp = opendir(source); - if (dirp != NULL) - { - while ((entry = readdir(dirp)) != NULL) - { - if (strcmp(entry->d_name, ".") == 0 || strcmp(entry->d_name, "..") == 0) - continue; // skip self and parent - - // Check for an absolute path - if (source[0] == DIR_SEPARATOR_CHAR) - { - strcpy(buf, source); - strcat(buf, DIR_SEPARATOR_STRING); - strcat(buf, entry->d_name); - } - else - { - if (!getcwd(buf, sizeof(buf))) - error_exit("Cannot get CWD: %s\n", strerror(errno)); - strcat(buf, DIR_SEPARATOR_STRING); - strcat(buf, source); - strcat(buf, entry->d_name); - } - - if (stat(buf, &stbuf) == -1) - { - error_exit("Cannot access '%s' (%s)\n", buf, strerror(errno)); - return; - } - - if (S_ISDIR(stbuf.st_mode)) - { - old_end_source = end_source; - append_string_to_source(entry->d_name); - *end_source++ = DIR_SEPARATOR_CHAR; - *end_source = 0; - if (verbosity == VERBOSE) - { - printf("%d: directory %s\n", d->level + 1, source); - } - - if (d->level < MAX_LEVEL) - { - new_d = new_directory_record(entry, &stbuf, d); - new_d->next_in_path_table = root.next_in_path_table; - root.next_in_path_table = new_d; - new_d->level = d->level + 1; - make_directory_records(new_d); - } - else - { - error_exit("Directory is nested too deep"); - } - - end_source = old_end_source; - *end_source = 0; - } - else if (S_ISREG(stbuf.st_mode)) - { - if (strcmp(entry->d_name, DIRECTORY_TIMESTAMP) == 0) - { - convert_date_and_time(&d->date_and_time, &stbuf.st_ctime); - } - else - { - if (verbosity == VERBOSE) - { - printf("%d: file %s\n", d->level, buf); - } - (void) new_directory_record(entry, &stbuf, d); - } - } - } - closedir(dirp); - } - else - { - error_exit("Cannot open '%s'\n", source); - return; - } - -#endif - - // sort directory - d->first_record = sort_linked_list(d->first_record, 0, compare_directory_order); -} - -#endif - -static PDIR_RECORD -new_empty_dirrecord(PDIR_RECORD d, BOOL directory) -{ - PDIR_RECORD new_d; - new_d = calloc(1, sizeof(*new_d)); - new_d->parent = d; - new_d->level = d->level + 1; - new_d->next_in_directory = d->first_record; - d->first_record = new_d; - new_d->next_in_memory = root.next_in_memory; - root.next_in_memory = new_d; - new_d->date_and_time = d->date_and_time; - if (directory) - { - new_d->flags |= DIRECTORY_FLAG; - new_d->next_in_path_table = root.next_in_path_table; - root.next_in_path_table = new_d; - } - return new_d; -} - -#ifdef _WIN32 -static BOOL -get_cd_file_time(HANDLE handle, PDATE_AND_TIME cd_time_info) -{ - FILETIME file_time; - SYSTEMTIME sys_time; - - if (!GetFileTime(handle, NULL, NULL, &file_time)) - return FALSE; - - FileTimeToSystemTime(&file_time, &sys_time); - memset(cd_time_info, 0, sizeof(*cd_time_info)); - - cd_time_info->year = sys_time.wYear; - cd_time_info->month = sys_time.wMonth; - cd_time_info->day = sys_time.wDay; - cd_time_info->hour = sys_time.wHour; - cd_time_info->minute = sys_time.wMinute; - cd_time_info->second = sys_time.wSecond; - - return TRUE; -} -#endif - -static void -scan_specified_files(PDIR_RECORD d, struct target_dir_entry *dir) -{ - PDIR_RECORD new_d; -#ifdef _WIN32 - HANDLE open_file; - LARGE_INTEGER file_size; -#else - struct stat stbuf; -#endif - struct target_file *file; - struct target_dir_entry *child; - - d->first_record = NULL; - - for (file = dir->head; file; file = file->next) - { - if (strcmp(file->target_name, DIRECTORY_TIMESTAMP) == 0) - { -#ifdef _WIN32 - if ((open_file = CreateFileA(file->source_name, - GENERIC_READ, - FILE_SHARE_READ, - NULL, - OPEN_EXISTING, - FILE_ATTRIBUTE_NORMAL, - NULL)) == INVALID_HANDLE_VALUE) - { - error_exit("Cannot open timestamp file '%s'\n", file->source_name); - } - - if (!get_cd_file_time(open_file, &d->date_and_time)) - { - error_exit("Cannot stat timestamp file '%s'\n", file->source_name); - } - CloseHandle(open_file); -#else - if (stat(file->target_name, &stbuf) == -1) - { - error_exit("Cannot stat timestamp file '%s'\n", file->source_name); - } - convert_date_and_time(&d->date_and_time, &stbuf.st_ctime); -#endif - } - else - { - if (verbosity == VERBOSE) - { - printf("%d: file %s (from %s)\n", - d->level, - file->target_name, - file->source_name); - } - new_d = new_empty_dirrecord(d, FALSE); - parse_filename_into_dirrecord(file->target_name, new_d, FALSE); -#ifdef _WIN32 - if ((open_file = CreateFileA(file->source_name, - GENERIC_READ, - FILE_SHARE_READ, - NULL, - OPEN_EXISTING, - FILE_ATTRIBUTE_NORMAL, - NULL)) == INVALID_HANDLE_VALUE) - { - error_exit("Cannot open file '%s'\n", file->source_name); - } - if (!get_cd_file_time(open_file, &new_d->date_and_time)) - { - error_exit("Cannot stat file '%s'\n", file->source_name); - } - if (!GetFileSizeEx(open_file, &file_size)) - { - error_exit("Cannot get file size of '%s'\n", file->source_name); - } - new_d->size = new_d->joliet_size = file_size.QuadPart; - new_d->orig_name = file->source_name; - CloseHandle(open_file); -#else - if (stat(file->source_name, &stbuf) == -1) - { - error_exit("Cannot find '%s' (target '%s')\n", - file->source_name, - file->target_name); - } - convert_date_and_time(&new_d->date_and_time, &stbuf.st_mtime); - new_d->size = new_d->joliet_size = stbuf.st_size; - new_d->orig_name = file->source_name; -#endif - } - } - - for (child = dir->child; child; child = child->next) - { - if (verbosity == VERBOSE) - { - printf("%d: directory %s\n", d->level, child->case_name); - } - new_d = new_empty_dirrecord(d, TRUE); - parse_filename_into_dirrecord(child->case_name, new_d, TRUE); - scan_specified_files(new_d, child); - } - - /* sort directory */ - d->first_record = sort_linked_list(d->first_record, - 0, - compare_directory_order); - source[0] = 0; - end_source = source; -} - -/*----------------------------------------------------------------------------- -This function loads the file specifications for the file or directory -corresponding to the specified directory record into the source[] buffer. It -is recursive. ------------------------------------------------------------------------------*/ - -static void get_file_specifications(PDIR_RECORD d) -{ - if (d != &root) - { - get_file_specifications(d->parent); - if (d->joliet_name == NULL) - append_string_to_source(d->name); - else - append_string_to_source(d->joliet_name); - - if (((d->flags & DIRECTORY_FLAG) == 0 || joliet) && d->extension[0] != 0) - { - if (d->joliet_name == NULL) - { - *end_source++ = '.'; - append_string_to_source(d->extension); - } - } - if (d->flags & DIRECTORY_FLAG) - *end_source++ = DIR_SEPARATOR_CHAR; - } -} - -static void get_time_string(char *str) -{ - sprintf(str, "%04d%02d%02d%02d%02d%02d00", - root.date_and_time.year, - root.date_and_time.month, - root.date_and_time.day, - root.date_and_time.hour, - root.date_and_time.minute, - root.date_and_time.second); -} - -static BOOL write_from_file(FILE *file, DWORD size) -{ - if (cd.file != NULL) - { - int n; - - fseek(file, 0, SEEK_SET); - while (size > 0) - { - n = BUFFER_SIZE - cd.count; - if ((DWORD)n > size) - n = size; - - if (fread(cd.buffer + cd.count, n, 1, file) < 1) - return FALSE; - - cd.count += n; - if (cd.count == BUFFER_SIZE) - flush_buffer(); - cd.sector += n / SECTOR_SIZE; - cd.offset += n % SECTOR_SIZE; - size -= n; - } - } - else - { - cd.sector += size / SECTOR_SIZE; - cd.offset += size % SECTOR_SIZE; - } - - return TRUE; -} - -static void pass(void) -{ - PDIR_RECORD d, q; - unsigned int index; - unsigned int name_length; - DWORD size; - DWORD number_of_sectors; - char *old_end_source; - FILE *file; - - PBOOT_HEADER header; - PBOOT_ENTRY entry; - - char timestring[17]; - - get_time_string(timestring); - - // first 16 sectors are zeros - write_block(16 * SECTOR_SIZE, 0); - - - // Primary Volume Descriptor - if (make_bridged_udf) - { - write_string("\1CD001\1"); - write_byte(0); - write_bytecounted_string(32, "", ' '); // system identifier - write_bytecounted_string(32, volume_label, ' '); // volume label - - write_block(8, 0); - write_both_endian_dword(total_sectors); - write_block(32, 0); - write_both_endian_word(1); // volume set size - write_both_endian_word(1); // volume sequence number - write_both_endian_word(2048); // sector size - write_both_endian_dword(path_table_size); - write_little_endian_dword(little_endian_path_table_sector); - write_little_endian_dword(0); // second little endian path table - write_big_endian_dword(big_endian_path_table_sector); - write_big_endian_dword(0); // second big endian path table - write_directory_record(&root, DOT_RECORD, FALSE); - - write_bytecounted_string(128, volume_label, ' '); // volume set identifier - write_bytecounted_string(128, PUBLISHER_ID, ' '); // publisher identifier - write_bytecounted_string(128, DATA_PREP_ID, ' '); // data preparer identifier - write_bytecounted_string(128, APP_ID, ' '); // application identifier - - write_bytecounted_string(37, "", ' '); // copyright file identifier - write_bytecounted_string(37, "", ' '); // abstract file identifier - write_bytecounted_string(37, "", ' '); // bibliographic file identifier - - write_string(timestring); // volume creation - write_byte(0); - write_string(timestring); // most recent modification - write_byte(0); - write_string("0000000000000000"); // volume expires - write_byte(0); - write_string("0000000000000000"); // volume is effective - write_byte(0); - write_byte(1); - write_byte(0); - fill_sector(); - } - - // Boot Volume Descriptor - if (eltorito) - { - write_byte(0); // Boot record ID - write_string("CD001\1"); - write_bytecounted_string(32, "EL TORITO SPECIFICATION", 0); // El-Torito identifier - write_block(32, 0); // unused - write_little_endian_dword(boot_catalog_sector); // pointer to boot catalog - fill_sector(); - } - - // Supplementary Volume Descriptor - if (joliet) - { - write_string("\2CD001\1"); - write_byte(0); - write_bytecounted_string_as_big_endian_unicode(32, "", ' '); // system identifier - write_bytecounted_string_as_big_endian_unicode(32, volume_label, ' '); // volume label - - write_block(8, 0); - write_both_endian_dword(total_sectors); - write_string("%/E"); - write_block(29, 0); - write_both_endian_word(1); // volume set size - write_both_endian_word(1); // volume sequence number - write_both_endian_word(2048); // sector size - write_both_endian_dword(joliet_path_table_size); - write_little_endian_dword(joliet_little_endian_path_table_sector); - write_little_endian_dword(0); // second little endian path table - write_big_endian_dword(joliet_big_endian_path_table_sector); - write_big_endian_dword(0); // second big endian path table - write_directory_record(&root, DOT_RECORD, TRUE); - - write_bytecounted_string_as_big_endian_unicode(128, volume_label, ' '); // volume set identifier - write_bytecounted_string_as_big_endian_unicode(128, PUBLISHER_ID, ' '); // publisher identifier - write_bytecounted_string_as_big_endian_unicode(128, DATA_PREP_ID, ' '); // data preparer identifier - write_bytecounted_string_as_big_endian_unicode(128, APP_ID, ' '); // application identifier - - write_bytecounted_string_as_big_endian_unicode(37, "", ' '); // copyright file identifier - write_bytecounted_string_as_big_endian_unicode(37, "", ' '); // abstract file identifier - write_bytecounted_string_as_big_endian_unicode(37, "", ' '); // bibliographic file identifier - - write_string(timestring); // volume creation - write_byte(0); - write_string(timestring); // most recent modification - write_byte(0); - write_string("0000000000000000"); // volume expires - write_byte(0); - write_string("0000000000000000"); // volume is effective - write_byte(0); - write_byte(1); - write_byte(0); - fill_sector(); - } - - // Volume Descriptor Set Terminator - if (make_bridged_udf) - { - write_string("\377CD001\1"); - fill_sector(); - } - - // TODO: Add UDF support! - - // Boot Catalog - if (eltorito) - { - boot_catalog_sector = cd.sector; - - // Validation entry header - write_byte(boot_validation_header.header_id); - write_byte(boot_validation_header.platform_id); - write_little_endian_word(0); // reserved - write_bytecounted_string(24, MANUFACTURER_ID, 0); // Manufacturer identifier - write_little_endian_word(0x62E); // checksum // FIXME: This is hardcoded!! - write_little_endian_word(0xAA55); // signature - - // Default entry - write_byte(default_boot_entry.boot_id); - write_byte(default_boot_entry.boot_emu_type); - write_little_endian_word(default_boot_entry.load_segment); - write_byte(0); // partition type - write_byte(0); // unused - write_little_endian_word(default_boot_entry.sector_count); - write_little_endian_dword(default_boot_entry.load_rba); - write_block(20, 0); // unused - - // Loop through each boot header - header = boot_header_list; - while (header) - { - write_byte(header->header_id); - write_byte(header->platform_id); - write_little_endian_word(header->num_entries); - write_block(28, 0); // Identifier string (unused) - - // Loop through each boot entry - entry = header->entry_list; - while (entry) - { - write_byte(entry->boot_id); - write_byte(entry->boot_emu_type); - write_little_endian_word(entry->load_segment); - write_byte(0); // partition type - write_byte(0); // unused - write_little_endian_word(entry->sector_count); - write_little_endian_dword(entry->load_rba); - write_block(20, 0); // Selection criteria (unused) - - entry = entry->next_entry; - } - - header = header->next_header; - } - - fill_sector(); - } - - - // Boot Images - if (eltorito) - { - default_boot_entry.load_rba = cd.sector; - - file = fopen(default_boot_entry.bootimage, "rb"); - if (file == NULL) - error_exit("Cannot open '%s'\n", default_boot_entry.bootimage); - fseek(file, 0, SEEK_END); - size = ftell(file); - if (size == 0 || (size % 2048)) - { - fclose(file); - error_exit("Invalid boot image size (%lu bytes)\n", size); - } - // Sector count in 512 byte sectors and rounded up - default_boot_entry.sector_count = (size + 511) / 512; - if (!write_from_file(file, size)) - { - fclose(file); - error_exit("Read error in file '%s'\n", default_boot_entry.bootimage); - } - fclose(file); - - // Loop through each boot header - header = boot_header_list; - while (header) - { - // Loop through each boot entry - entry = header->entry_list; - while (entry) - { - entry->load_rba = cd.sector; - - file = fopen(entry->bootimage, "rb"); - if (file == NULL) - error_exit("Cannot open '%s'\n", entry->bootimage); - fseek(file, 0, SEEK_END); - size = ftell(file); - if (size == 0 || (size % 2048)) - { - fclose(file); - error_exit("Invalid boot image size (%lu bytes)\n", size); - } - // Sector count in 512 byte sectors and rounded up - entry->sector_count = (size + 511) / 512; - if (!write_from_file(file, size)) - { - fclose(file); - error_exit("Read error in file '%s'\n", entry->bootimage); - } - fclose(file); - - entry = entry->next_entry; - } - - header = header->next_header; - } - -// fill_sector(); - } - - - // Little Endian Path Table - - little_endian_path_table_sector = cd.sector; - write_byte(1); - write_byte(0); // number of sectors in extended attribute record - write_little_endian_dword(root.sector); - write_little_endian_word(1); - write_byte(0); - write_byte(0); - - index = 1; - root.path_table_index = 1; - for (d = root.next_in_path_table; d != NULL; d = d->next_in_path_table) - { - name_length = strlen(d->name_on_cd); - write_byte((BYTE)name_length); - write_byte(0); // number of sectors in extended attribute record - write_little_endian_dword(d->sector); - write_little_endian_word(d->parent->path_table_index); - write_string(d->name_on_cd); - if (name_length & 1) - write_byte(0); - d->path_table_index = ++index; - } - - path_table_size = (cd.sector - little_endian_path_table_sector) * - SECTOR_SIZE + cd.offset; - fill_sector(); - - - // Big Endian Path Table - - big_endian_path_table_sector = cd.sector; - write_byte(1); - write_byte(0); // number of sectors in extended attribute record - write_big_endian_dword(root.sector); - write_big_endian_word(1); - write_byte(0); - write_byte(0); - - for (d = root.next_in_path_table; d != NULL; d = d->next_in_path_table) - { - name_length = strlen(d->name_on_cd); - write_byte((BYTE)name_length); - write_byte(0); // number of sectors in extended attribute record - write_big_endian_dword(d->sector); - write_big_endian_word(d->parent->path_table_index); - write_string(d->name_on_cd); - if (name_length & 1) - write_byte(0); - } - fill_sector(); - - if (joliet) - { - // Little Endian Path Table - - joliet_little_endian_path_table_sector = cd.sector; - write_byte(1); - write_byte(0); // number of sectors in extended attribute record - write_little_endian_dword(root.joliet_sector); - write_little_endian_word(1); - write_byte(0); - write_byte(0); - - for (d = root.next_in_path_table; d != NULL; d = d->next_in_path_table) - { - name_length = strlen(d->joliet_name) * 2; - write_byte((BYTE)name_length); - write_byte(0); // number of sectors in extended attribute record - write_little_endian_dword(d->joliet_sector); - write_little_endian_word(d->parent->path_table_index); - write_string_as_big_endian_unicode(d->joliet_name); - } - - joliet_path_table_size = (cd.sector - joliet_little_endian_path_table_sector) * - SECTOR_SIZE + cd.offset; - fill_sector(); - - // Big Endian Path Table - - joliet_big_endian_path_table_sector = cd.sector; - write_byte(1); - write_byte(0); // number of sectors in extended attribute record - write_big_endian_dword(root.joliet_sector); - write_big_endian_word(1); - write_byte(0); - write_byte(0); - - for (d = root.next_in_path_table; d != NULL; d = d->next_in_path_table) - { - name_length = strlen(d->joliet_name) * 2; - write_byte((BYTE)name_length); - write_byte(0); // number of sectors in extended attribute record - write_big_endian_dword(d->joliet_sector); - write_big_endian_word(d->parent->path_table_index); - write_string_as_big_endian_unicode(d->joliet_name); - } - fill_sector(); - } - - // TODO: Add UDF support! - -#if 0 - // Boot Images ?? -#endif - - // TODO: Add CRC block for header! - - // Directories and files - for (d = &root; d != NULL; d = d->next_in_path_table) - { - // write directory - d->sector = cd.sector; - write_directory_record(d, DOT_RECORD, FALSE); - write_directory_record(d == &root ? d : d->parent, DOT_DOT_RECORD, FALSE); - for (q = d->first_record; q != NULL; q = q->next_in_directory) - { - write_directory_record(q, - q->flags & DIRECTORY_FLAG ? SUBDIRECTORY_RECORD : FILE_RECORD, - FALSE); - } - fill_sector(); - d->size = (cd.sector - d->sector) * SECTOR_SIZE; - - // write directory for joliet - if (joliet) - { - d->joliet_sector = cd.sector; - write_directory_record(d, DOT_RECORD, TRUE); - write_directory_record(d == &root ? d : d->parent, DOT_DOT_RECORD, TRUE); - for (q = d->first_record; q != NULL; q = q->next_in_directory) - { - write_directory_record(q, - q->flags & DIRECTORY_FLAG ? SUBDIRECTORY_RECORD : FILE_RECORD, - TRUE); - } - fill_sector(); - d->joliet_size = (cd.sector - d->joliet_sector) * SECTOR_SIZE; - bytes_in_directories += d->joliet_size; - } - - number_of_directories++; - bytes_in_directories += d->size; - - // write file data - for (q = d->first_record; q != NULL; q = q->next_in_directory) - { - if ((q->flags & DIRECTORY_FLAG) == 0) - { - q->sector = q->joliet_sector = cd.sector; - size = q->size; - if (cd.file == NULL) - { - number_of_sectors = (size + SECTOR_SIZE - 1) / SECTOR_SIZE; - cd.sector += number_of_sectors; - number_of_files++; - bytes_in_files += size; - unused_bytes_at_ends_of_files += - number_of_sectors * SECTOR_SIZE - size; - } - else - { - const char *file_source; - old_end_source = end_source; - if (!q->orig_name) - { - get_file_specifications(q); - *end_source = 0; - file_source = source; - } - else - { - file_source = q->orig_name; - } - if (verbosity == VERBOSE) - printf("Writing contents of %s\n", file_source); - file = fopen(file_source, "rb"); - if (file == NULL) - error_exit("Cannot open '%s'\n", file_source); - if (!write_from_file(file, size)) - { - fclose(file); - error_exit("Read error in file '%s'\n", file_source); - } - fclose(file); - end_source = old_end_source; - fill_sector(); - } - } - } - } - - // TODO: Add final CRC block! - - total_sectors = (DWORD)cd.sector; -} - -static char HELP[] = - "\n" - "CDMAKE CD-ROM Premastering Utility\n" - "Copyright (C) 1997 Philip J. Erdelsky\n" - "Copyright (C) 2003-2016 ReactOS Team\n" - "\n\n" - "CDMAKE [-vN] [-p] [-s N] [-m] [-j] [-q] " - // "[-x] " - "[-pN] [-eN] [-b bootimage]\n" - " [-bootdata:N#<defaultBootEntry>#<bootEntry1>#...#<bootEntryN>]\n" - " source volume image\n" - "\n" - "Mandatory options:\n" - " source Specifications of base directory containing all files to be\n" - " written to CD-ROM image. Can be a directory, or a path to a\n" - " file list (in which case the path must start with a '@').\n" - " volume Volume label.\n" - " image Image file or device.\n" - "\n" - "General options:\n" - " -vN Verbosity level. Valid values for 'N' are:\n" - " 0: Quiet mode - display nothing but error messages.\n" - " 1: Normal mode (default).\n" - " 2: Verbose mode - display file information as files are\n" - " scanned and written. Overrides the -p option.\n" - " -p Show progress while writing.\n" - " -s N Abort operation before beginning write if image will be larger\n" - " than N megabytes (i.e. 1024*1024*N bytes).\n" - " -q Only scan the source files; do not create an image.\n" - // " -x Compute and encode the AutoCRC value in the image.\n" - "\n" - "ISO 9660 and Joliet options:\n" - " -m Accept punctuation marks other than underscores in names and\n" - " extensions.\n" - " -j Generate Joliet filename records.\n" - "\n" - // "UDF options:\n" - // " Not implemented yet!\n" - // "\n" - "El-Torito boot options:\n" - " -pN Boot platform ID in hex format (default: 00 for a BIOS system).\n" - " -eN Boot media emulation. Valid values for 'N' are:\n" - " 0 (or nothing): No emulation.\n" - " 1: 1.2 MB diskette.\n" - " 2: 1.44MB diskette.\n" - " 3: 2.88MB diskette.\n" - " 4: Hard disk.\n" - " -b bootimage Create a single-boot El-Torito image.\n" - " -bootdata: Create a multi-boot El-Torito image. This option cannot be\n" - " combined with the -b option.\n" - " Syntax:\n" - " -bootdata:N#<defaultBootEntry>#<bootEntry2>#...#<bootEntryN>\n" - " 'N': number of boot entries following.\n" - " defaultBootEntry: The default boot entry, needed in all cases.\n" - " Used by BIOSes which do not support additional boot entries.\n" - " bootEntryX: Additional boot entries.\n" - " - Do not use spaces.\n" - " - Each multi-boot entry must be delimited with a hash symbol (#).\n" - " - Each option for a boot entry must be delimited with a comma (,).\n" - " - Each boot entry must specify the platform ID.\n"; - -/*----------------------------------------------------------------------------- -Program execution starts here. ------------------------------------------------------------------------------*/ - -#if (defined(__GNUC__) || (_MSC_VER < 1900)) -char* strtok_s(char *str, const char *delim, char **ctx) -{ - if (delim == NULL || ctx == NULL || (str == NULL && *ctx == NULL)) - { - return NULL; - } - - if (!str) - str = *ctx; - - while (*str && strchr(delim, *str)) - str++; - if (!*str) - { - *ctx = str; - return NULL; - } - - *ctx = str + 1; - while (**ctx && !strchr(delim, **ctx)) - (*ctx)++; - if (**ctx) - *(*ctx)++ = '\0'; - - return str; -} -#endif - -static void -init_boot_entry(PBOOT_ENTRY boot_entry, - BYTE boot_emu_type, WORD load_segment, - char* bootimage) -{ - boot_entry->boot_id = 0x88; // Bootable entry - boot_entry->boot_emu_type = boot_emu_type; // 0: No emulation, etc... - boot_entry->load_segment = load_segment; // If 0 then use default 0x07C0 - - boot_entry->bootimage[0] = '\0'; - strncpy(boot_entry->bootimage, bootimage, sizeof(boot_entry->bootimage)); - boot_entry->bootimage[sizeof(boot_entry->bootimage)-1] = '\0'; -} - -int main(int argc, char **argv) -{ - time_t timestamp = time(NULL); - int i; - char *t; - - if (argc < 2) - { - puts(HELP); - return 1; - } - - // Initialize CD-ROM write buffer - - cd.file = NULL; - cd.filespecs[0] = 0; - - cd.buffer = malloc(BUFFER_SIZE); - if (cd.buffer == NULL) - error_exit("Insufficient memory"); - - // Initialize root directory - - memset(&root, 0, sizeof(root)); - root.level = 1; - root.flags = DIRECTORY_FLAG; - convert_date_and_time(&root.date_and_time, &timestamp); - - // Initialize parameters - - scan_files_only = FALSE; - make_bridged_udf = TRUE; - // compute_crc = FALSE; - - verbosity = NORMAL; - show_progress = FALSE; - size_limit = 0; - accept_punctuation_marks = FALSE; - source[0] = 0; - volume_label[0] = 0; - - // Initialize boot information - eltorito = FALSE; - multi_boot = FALSE; - boot_validation_header.header_id = 1; // Validation header ID - boot_validation_header.platform_id = 0; // x86/64 BIOS system - init_boot_entry(&default_boot_entry, - 0, // No emulation - 0, // Use default 0x07C0 - ""); - default_boot_entry.sector_count = 0; - default_boot_entry.load_rba = 0; - boot_header_list = NULL; - - // Scan command line arguments - - for (i = 1; i < argc; i++) - { - if (strncmp(argv[i], "-v", 2) == 0) - { - t = argv[i] + 2; - if (*t == 0) // Normal verbosity level. - verbosity = NORMAL; - else // Verbosity level in decimal - verbosity = strtoul(t, NULL, 10); - - // Check for validity - if (verbosity > VERBOSE) - verbosity = NORMAL; - - // Disable by default, unless we are in normal verbosity level. - // If progress is still wanted, use '-p'. - if (verbosity == QUIET || verbosity == VERBOSE) - show_progress = FALSE; - } - else if (strcmp(argv[i], "-p") == 0) - show_progress = TRUE; - else if (strncmp(argv[i], "-s", 2) == 0) - { - t = argv[i] + 2; - if (*t == 0) - { - if (++i < argc) - t = argv[i]; - else - error_exit("Missing size limit parameter"); - } - // size_limit = strtoul(t, NULL, 10); - while (isdigit(*t)) - size_limit = size_limit * 10 + *t++ - '0'; - if (size_limit < 1 || size_limit > 800) - error_exit("Invalid size limit"); - size_limit <<= 9; // convert megabyte to sector count - } - else if (strcmp(argv[i], "-m") == 0) - accept_punctuation_marks = TRUE; - else if (strcmp(argv[i], "-j") == 0) - joliet = TRUE; - else if (strncmp(argv[i], "-e", 2) == 0) - { - // Check whether the multi-boot option '-bootdata:' was already set. - // If so, print an error and bail out. - if (eltorito && multi_boot) - error_exit("Single-boot and multi-boot entries cannot be combined"); - - eltorito = TRUE; - multi_boot = FALSE; - - t = argv[i] + 2; - if (*t == 0) // No emulation - default_boot_entry.boot_emu_type = 0; - else // ID in decimal - default_boot_entry.boot_emu_type = (BYTE)strtoul(t, NULL, 10); - } - else if (strncmp(argv[i], "-p", 2) == 0) - { - // Check whether the multi-boot option '-bootdata:' was already set. - // If so, print an error and bail out. - if (eltorito && multi_boot) - error_exit("Single-boot and multi-boot entries cannot be combined"); - - eltorito = TRUE; - multi_boot = FALSE; - - // Platform ID in hexadecimal - boot_validation_header.platform_id = (BYTE)strtoul(argv[i] + 2, NULL, 16); - } - else if (strcmp(argv[i], "-b") == 0) - { - // Check whether the multi-boot option '-bootdata:' was already set. - // If so, print an error and bail out. - if (eltorito && multi_boot) - error_exit("Single-boot and multi-boot entries cannot be combined"); - - eltorito = TRUE; - multi_boot = FALSE; - - strncpy(default_boot_entry.bootimage, argv[++i], sizeof(default_boot_entry.bootimage)); - default_boot_entry.bootimage[sizeof(default_boot_entry.bootimage)-1] = '\0'; - } - else if (strncmp(argv[i], "-bootdata:", sizeof("-bootdata:") - 1) == 0) - { - char *bootdata, *entry_ctx, *option_ctx; - DWORD num_boot_entries = 0; - - BOOL default_entry = TRUE; // Start by setting the default boot entry - PBOOT_HEADER boot_header = NULL; // Current boot header - PBOOT_ENTRY boot_entry = NULL; // The last boot entry in the current boot header - BYTE platform_id, old_platform_id = 0; - BYTE boot_emu_type; - WORD load_segment; - char bootimage[512]; - - // Check whether the single-boot option '-b' was already set. - // If so, print an error and bail out. - if (eltorito && !multi_boot) - error_exit("Single-boot and multi-boot entries cannot be combined"); - - t = argv[i] + (sizeof("-bootdata:") - 1); - bootdata = strdup(t); - if (bootdata == NULL) - error_exit("Insufficient memory"); - - eltorito = TRUE; - multi_boot = TRUE; - - // FIXME: Paths containing '#' or ',' or ' ' are not yet supported!! - - // Start parsing... - t = strtok_s(bootdata, "#", &entry_ctx); - if (t == NULL) - { - free(bootdata); - error_exit("Malformed bootdata command"); - } - - num_boot_entries = strtoul(t, NULL, 10); - - while (num_boot_entries--) - { - // Reset to default values - platform_id = 0; // x86/64 BIOS system - boot_emu_type = 0; // No emulation - load_segment = 0; // Use default 0x07C0 - bootimage[0] = '\0'; - - t = strtok_s(NULL, "#", &entry_ctx); - if (t == NULL) - { - free(bootdata); - error_exit("Malformed bootdata command"); - } - - t = strtok_s(t, ",", &option_ctx); - while (t != NULL) - { - switch (*t++) - { - case 'b': // Boot sector file - { - char *q; - - // Searches for any of the valid separators: - // '#' starts a new boot entry; - // ',' starts a new boot option; - // ' ' finishes the bootdata command. - q = strpbrk(t, "#, "); - if (!q) q = t + strlen(t); - strncpy(bootimage, t, q - t + 1); - break; - } - - case 'p': // Platform ID - { - // Platform ID in hexadecimal - platform_id = (BYTE)strtoul(t, NULL, 16); - break; - } - - case 'e': // No floppy-disk emulation - { - if (*t == 0) // No emulation - boot_emu_type = 0; - else // ID in decimal - boot_emu_type = (BYTE)strtoul(t, NULL, 10); - - break; - } - - case 't': // Loading segment - { - if (*t == 0) // Not specified: use default 0x07C0 - load_segment = 0; - else // Segment in hexadecimal - load_segment = (BYTE)strtoul(t, NULL, 16); - - break; - } - - default: - free(bootdata); - error_exit("Malformed bootdata command"); - } - - t = strtok_s(NULL, ",", &option_ctx); - } - - // Create a new entry and possibly a boot header - if (default_entry) - { - // Initialize the default boot entry and header - - boot_validation_header.header_id = 1; // Validation header ID - boot_validation_header.platform_id = platform_id; - - init_boot_entry(&default_boot_entry, boot_emu_type, load_segment, bootimage); - - // Default entry is now initialized. - default_entry = FALSE; - } - else - { - // Initialize a new boot entry - PBOOT_ENTRY old_boot_entry = boot_entry; - - boot_entry = calloc(1, sizeof(*boot_entry)); - if (boot_entry == NULL) - error_exit("Insufficient memory"); - // boot_entry->next_entry = NULL; - - init_boot_entry(boot_entry, boot_emu_type, load_segment, bootimage); - - // Create a new boot header if we don't have one yet - if (boot_header == NULL) - { - boot_header = calloc(1, sizeof(*boot_header)); - if (boot_header == NULL) - error_exit("Insufficient memory"); - - boot_header->header_id = 0x91; // So far this is the last boot header - boot_header->platform_id = platform_id; - // boot_header->next_header = NULL; - // boot_header->num_entries = 0; - // boot_header->entry_list = NULL; - - old_boot_entry = NULL; - old_platform_id = platform_id; - - boot_header_list = boot_header; - } - else - { - // Create a new boot header if we change the platform ID - if (old_platform_id != platform_id) - { - PBOOT_HEADER prev_boot_header = boot_header; - - boot_header = calloc(1, sizeof(*boot_header)); - if (boot_header == NULL) - error_exit("Insufficient memory"); - - boot_header->header_id = 0x91; // So far this is the last boot header - boot_header->platform_id = platform_id; - // boot_header->next_header = NULL; - // boot_header->num_entries = 0; - // boot_header->entry_list = NULL; - - old_boot_entry = NULL; - old_platform_id = platform_id; - - // Link into the header list - prev_boot_header->header_id = 0x90; // The previous boot header was not the last one - prev_boot_header->next_header = boot_header; - } - } - - // Add the entry into the header - ++boot_header->num_entries; - if (old_boot_entry == NULL) - boot_header->entry_list = boot_entry; - else - old_boot_entry->next_entry = boot_entry; - } - } - - free(bootdata); - } - else if (strcmp(argv[i], "-q") == 0) - scan_files_only = TRUE; - // else if (strcmp(argv[i], "-x") == 0) - // compute_crc = TRUE; - else if (i + 2 < argc) - { - strcpy(source, argv[i++]); - strncpy(volume_label, argv[i++], sizeof(volume_label) - 1); - strcpy(cd.filespecs, argv[i]); - } - else - error_exit("Missing command line argument"); - } - - if (source[0] == 0) - error_exit("Missing source directory"); - if (volume_label[0] == 0) - error_exit("Missing volume label"); - if (cd.filespecs[0] == 0) - error_exit("Missing image file specifications"); - - if (source[0] != '@') - { - /* set source[] and end_source to source directory, - * with a terminating directory separator */ - end_source = source + strlen(source); - if (end_source[-1] == ':') - *end_source++ = '.'; - if (end_source[-1] != DIR_SEPARATOR_CHAR) - *end_source++ = DIR_SEPARATOR_CHAR; - - /* scan all files and create directory structure in memory */ - make_directory_records(&root); - } - else - { - char *trimmedline, *targetname, *normdir, *srcname, *eq; - char lineread[1024]; - - FILE *f = fopen(source+1, "r"); - if (!f) - { - error_exit("Cannot open CD-ROM file description '%s'\n", source+1); - } - while (fgets(lineread, sizeof(lineread), f)) - { - /* We treat these characters as line endings */ - trimmedline = strtok(lineread, "\t\r\n;"); - eq = strchr(trimmedline, '='); - if (!eq) - { - /* Treat this as a directory name */ - targetname = trimmedline; - normdir = strdup(targetname); - normalize_dirname(normdir); - dir_hash_create_dir(&specified_files, targetname, normdir); - free(normdir); - } - else - { - targetname = strtok(lineread, "="); - srcname = strtok(NULL, ""); - -#ifdef _WIN32 - if (_access(srcname, R_OK) == 0) -#else - if (access(srcname, R_OK) == 0) -#endif - { - if (!dir_hash_add_file(&specified_files, srcname, targetname)) - error_exit("Target '%s' (file '%s') is invalid\n", targetname, srcname); - } - else - error_exit("Cannot access file '%s' (target '%s')\n", srcname, targetname); - } - } - fclose(f); - - /* scan all files and create directory structure in memory */ - scan_specified_files(&root, &specified_files.root); - } - - /* sort path table entries */ - root.next_in_path_table = sort_linked_list(root.next_in_path_table, - 1, - compare_path_table_order); - - // initialize CD-ROM write buffer - - cd.file = NULL; - cd.sector = 0; - cd.offset = 0; - cd.count = 0; - - // make non-writing pass over directory structure to obtain the proper - // sector numbers and offsets and to determine the size of the image - - number_of_files = bytes_in_files = number_of_directories = - bytes_in_directories = unused_bytes_at_ends_of_files = 0; - pass(); - - if (verbosity >= NORMAL) - { - printf("%s bytes ", edit_with_commas(bytes_in_files, TRUE)); - printf("in %s files\n", edit_with_commas(number_of_files, FALSE)); - printf("%s unused bytes at ends of files\n", - edit_with_commas(unused_bytes_at_ends_of_files, TRUE)); - printf("%s bytes ", edit_with_commas(bytes_in_directories, TRUE)); - printf("in %s directories\n", - edit_with_commas(number_of_directories, FALSE)); - printf("%s other bytes\n", edit_with_commas(root.sector * SECTOR_SIZE, TRUE)); - puts("-------------"); - printf("%s total bytes\n", - edit_with_commas(total_sectors * SECTOR_SIZE, TRUE)); - puts("============="); - } - - if (size_limit != 0 && total_sectors > size_limit) - error_exit("Size limit exceeded"); - - if (!scan_files_only) - { - // re-initialize CD-ROM write buffer - - cd.file = fopen(cd.filespecs, "w+b"); - if (cd.file == NULL) - error_exit("Cannot open image file '%s'", cd.filespecs); - cd.sector = 0; - cd.offset = 0; - cd.count = 0; - - - // make writing pass over directory structure - - pass(); - - if (cd.count > 0) - flush_buffer(); - if (show_progress) - printf("\r \n"); - if (fclose(cd.file) != 0) - { - cd.file = NULL; - error_exit("File write error in image file '%s'", cd.filespecs); - } - - if (verbosity >= NORMAL) - puts("CD-ROM image made successfully"); - } - - dir_hash_destroy(&specified_files); - release_memory(); - return 0; -} - -/* EOF */ diff --git a/modules/rosapps/applications/devutils/cdmake/config.h b/modules/rosapps/applications/devutils/cdmake/config.h deleted file mode 100644 index ffb5dabb1f6..00000000000 --- a/modules/rosapps/applications/devutils/cdmake/config.h +++ /dev/null @@ -1,15 +0,0 @@ -#ifndef _WIN32 -#ifndef MAX_PATH -#define MAX_PATH 260 -#endif -#define DIR_SEPARATOR_CHAR '/' -#define DIR_SEPARATOR_STRING "/" -#else -#define DIR_SEPARATOR_CHAR '\\' -#define DIR_SEPARATOR_STRING "\\" -#endif - -#define MANUFACTURER_ID "ReactOS Foundation" -#define PUBLISHER_ID "ReactOS Foundation" -#define DATA_PREP_ID "ReactOS Foundation" -#define APP_ID "CDMAKE CD-ROM Premastering Utility" diff --git a/modules/rosapps/applications/devutils/cdmake/dirhash.c b/modules/rosapps/applications/devutils/cdmake/dirhash.c deleted file mode 100644 index a44bad57e01..00000000000 --- a/modules/rosapps/applications/devutils/cdmake/dirhash.c +++ /dev/null @@ -1,238 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS CD-ROM Maker - * FILE: tools/cdmake/dirhash.c - * PURPOSE: CD-ROM Premastering Utility - Directory names hashing - * PROGRAMMERS: Art Yerkes - */ - -#include <string.h> -#include <stdlib.h> -#include <ctype.h> -#include "config.h" -#include "dirhash.h" - -#ifndef max -#define max(a, b) ((a) > (b) ? (a) : (b)) -#endif - -/* This is the famous DJB hash */ -static unsigned int -djb_hash(const char *name) -{ - unsigned int val = 5381; - int i = 0; - - for (i = 0; name[i]; i++) - { - val = (33 * val) + name[i]; - } - - return val; -} - -static void -split_path(const char *path, char **dirname, char **filename /* OPTIONAL */) -{ - const char *result; - - /* Retrieve the file name */ - char *last_slash_1 = strrchr(path, '/'); - char *last_slash_2 = strrchr(path, '\\'); - - if (last_slash_1 || last_slash_2) - result = max(last_slash_1, last_slash_2) + 1; - else - result = path; - - /* Duplicate the file name for the user if needed */ - if (filename) - *filename = strdup(result); - - /* Remove any trailing directory separators */ - while (result > path && (*(result-1) == '/' || *(result-1) == '\\')) - result--; - - /* Retrieve and duplicate the directory */ - *dirname = malloc(result - path + 1); - if (result > path) - memcpy(*dirname, path, result - path); - (*dirname)[result - path] = '\0'; // NULL-terminate -} - -void normalize_dirname(char *filename) -{ - int i, tgt; - int slash = 1; - - for (i = 0, tgt = 0; filename[i]; i++) - { - if (slash) - { - if (filename[i] != '/' && filename[i] != '\\') - { - filename[tgt++] = toupper(filename[i]); - slash = 0; - } - } - else - { - if (filename[i] == '/' || filename[i] == '\\') - { - slash = 1; - filename[tgt++] = DIR_SEPARATOR_CHAR; - } - else - { - filename[tgt++] = toupper(filename[i]); - } - } - } - filename[tgt] = '\0'; // NULL-terminate -} - -static struct target_dir_entry * -get_entry_by_normname(struct target_dir_hash *dh, const char *norm) -{ - unsigned int hashcode; - struct target_dir_entry *de; - hashcode = djb_hash(norm); - de = dh->buckets[hashcode % NUM_DIR_HASH_BUCKETS]; - while (de && strcmp(de->normalized_name, norm)) - de = de->next_dir_hash_entry; - return de; -} - -static void -delete_entry(struct target_dir_hash *dh, struct target_dir_entry *de) -{ - struct target_dir_entry **ent; - ent = &dh->buckets[de->hashcode % NUM_DIR_HASH_BUCKETS]; - while (*ent && ((*ent) != de)) - ent = &(*ent)->next_dir_hash_entry; - if (*ent) - *ent = (*ent)->next_dir_hash_entry; -} - -struct target_dir_entry * -dir_hash_create_dir(struct target_dir_hash *dh, const char *casename, const char *targetnorm) -{ - struct target_dir_entry *de, *parent_de; - char *parentcase = NULL; - char *case_name = NULL; - char *parentname = NULL; - struct target_dir_entry **ent; - - if (!dh->root.normalized_name) - { - dh->root.normalized_name = strdup(""); - dh->root.case_name = strdup(""); - dh->root.hashcode = djb_hash(""); - dh->buckets[dh->root.hashcode % NUM_DIR_HASH_BUCKETS] = &dh->root; - } - - /* Check whether the directory was already created and just return it if so */ - de = get_entry_by_normname(dh, targetnorm); - if (de) - return de; - - /* - * If *case_name == '\0' after the following call to split_path(...), - * for example in the case where casename == "subdir/dir/", then just - * create the directories "subdir" and "dir" by a recursive call to - * dir_hash_create_dir(...) and return 'parent_de' instead (see after). - * We do not (and we never) create a no-name directory inside it. - */ - split_path(casename, &parentcase, &case_name); - split_path(targetnorm, &parentname, NULL); - parent_de = dir_hash_create_dir(dh, parentcase, parentname); - free(parentname); - free(parentcase); - - /* See the remark above */ - if (!*case_name) - { - free(case_name); - return parent_de; - } - - /* Now create the directory */ - de = calloc(1, sizeof(*de)); - de->parent = parent_de; - de->normalized_name = strdup(targetnorm); - de->case_name = case_name; - de->hashcode = djb_hash(targetnorm); - - de->next = parent_de->child; - parent_de->child = de; - - ent = &dh->buckets[de->hashcode % NUM_DIR_HASH_BUCKETS]; - while (*ent) - ent = &(*ent)->next_dir_hash_entry; - *ent = de; - - return de; -} - -struct target_file * -dir_hash_add_file(struct target_dir_hash *dh, const char *source, const char *target) -{ - struct target_file *tf; - struct target_dir_entry *de; - char *targetdir = NULL; - char *targetfile = NULL; - char *targetnorm; - - /* First create the directory; check whether the file name is valid and bail out if not */ - split_path(target, &targetdir, &targetfile); - if (!*targetfile) - { - free(targetdir); - free(targetfile); - return NULL; - } - targetnorm = strdup(targetdir); - normalize_dirname(targetnorm); - de = dir_hash_create_dir(dh, targetdir, targetnorm); - free(targetnorm); - free(targetdir); - - /* Now add the file */ - tf = calloc(1, sizeof(*tf)); - tf->next = de->head; - de->head = tf; - tf->source_name = strdup(source); - tf->target_name = targetfile; - - return tf; -} - -static void -dir_hash_destroy_dir(struct target_dir_hash *dh, struct target_dir_entry *de) -{ - struct target_file *tf; - struct target_dir_entry *te; - - while ((te = de->child)) - { - de->child = te->next; - dir_hash_destroy_dir(dh, te); - free(te); - } - while ((tf = de->head)) - { - de->head = tf->next; - free(tf->source_name); - free(tf->target_name); - free(tf); - } - - delete_entry(dh, de); - free(de->normalized_name); - free(de->case_name); -} - -void dir_hash_destroy(struct target_dir_hash *dh) -{ - dir_hash_destroy_dir(dh, &dh->root); -} diff --git a/modules/rosapps/applications/devutils/cdmake/dirhash.h b/modules/rosapps/applications/devutils/cdmake/dirhash.h deleted file mode 100644 index d06427f0401..00000000000 --- a/modules/rosapps/applications/devutils/cdmake/dirhash.h +++ /dev/null @@ -1,50 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS CD-ROM Maker - * FILE: tools/cdmake/dirhash.h - * PURPOSE: CD-ROM Premastering Utility - Directory names hashing - * PROGRAMMERS: Art Yerkes - */ - -#ifndef _DIRHASH_H_ -#define _DIRHASH_H_ - -#define NUM_DIR_HASH_BUCKETS 1024 - -struct target_file -{ - struct target_file *next; - char *source_name; - char *target_name; -}; - -struct target_dir_entry -{ - unsigned int hashcode; - struct target_dir_entry *next_dir_hash_entry; - - struct target_dir_entry *next; - struct target_dir_entry *parent; - struct target_dir_entry *child; - struct target_file *head; - char *normalized_name; - char *case_name; -}; - -struct target_dir_hash -{ - struct target_dir_entry *buckets[NUM_DIR_HASH_BUCKETS]; - struct target_dir_entry root; -}; - -void normalize_dirname(char *filename); - -struct target_dir_entry * -dir_hash_create_dir(struct target_dir_hash *dh, const char *casename, const char *targetnorm); - -struct target_file * -dir_hash_add_file(struct target_dir_hash *dh, const char *source, const char *target); - -void dir_hash_destroy(struct target_dir_hash *dh); - -#endif // _DIRHASH_H_ diff --git a/modules/rosapps/applications/devutils/cdmake/llmsort.c b/modules/rosapps/applications/devutils/cdmake/llmsort.c deleted file mode 100644 index 004b9caaa9f..00000000000 --- a/modules/rosapps/applications/devutils/cdmake/llmsort.c +++ /dev/null @@ -1,113 +0,0 @@ -/* - * A Linked-List Memory Sort - * by Philip J. Erdelsky - * pje(a)acm.org - * pje(a)efgh.com - * http://alumnus.caltech.edu/~pje/ - * - * Version taken from: - * http://alumnus.caltech.edu/~pje/cdmake.txt - * - * An extended version can be found at: - * http://alumnus.caltech.edu/~pje/llmsort.html - * http://www.efgh.com/software/llmsort.htm - * - * Public domain; no restrictions on use. - */ - -#include <stdio.h> - -void *sort_linked_list(void *p, unsigned index, int (*compare)(void *, void *)) -{ - unsigned base; - unsigned long block_size; - - struct record - { - struct record *next[1]; - /* other members not directly accessed by this function */ - }; - - struct tape - { - struct record *first, *last; - unsigned long count; - } tape[4]; - - /* Distribute the records alternately to tape[0] and tape[1]. */ - - tape[0].count = tape[1].count = 0L; - tape[0].first = NULL; - base = 0; - while (p != NULL) - { - struct record *next = ((struct record *)p)->next[index]; - ((struct record *)p)->next[index] = tape[base].first; - tape[base].first = ((struct record *)p); - tape[base].count++; - p = next; - base ^= 1; - } - - /* If the list is empty or contains only a single record, then */ - /* tape[1].count == 0L and this part is vacuous. */ - - for (base = 0, block_size = 1L; tape[base+1].count != 0L; - base ^= 2, block_size <<= 1) - { - int dest; - struct tape *tape0, *tape1; - tape0 = tape + base; - tape1 = tape + base + 1; - dest = base ^ 2; - tape[dest].count = tape[dest+1].count = 0; - for (; tape0->count != 0; dest ^= 1) - { - unsigned long n0, n1; - struct tape *output_tape = tape + dest; - n0 = n1 = block_size; - while (1) - { - struct record *chosen_record; - struct tape *chosen_tape; - if (n0 == 0 || tape0->count == 0) - { - if (n1 == 0 || tape1->count == 0) - break; - chosen_tape = tape1; - n1--; - } - else if (n1 == 0 || tape1->count == 0) - { - chosen_tape = tape0; - n0--; - } - else if ((*compare)(tape0->first, tape1->first) > 0) - { - chosen_tape = tape1; - n1--; - } - else - { - chosen_tape = tape0; - n0--; - } - chosen_tape->count--; - chosen_record = chosen_tape->first; - chosen_tape->first = chosen_record->next[index]; - if (output_tape->count == 0) - output_tape->first = chosen_record; - else - output_tape->last->next[index] = chosen_record; - output_tape->last = chosen_record; - output_tape->count++; - } - } - } - - if (tape[base].count > 1L) - tape[base].last->next[index] = NULL; - return tape[base].first; -} - -/* EOF */ diff --git a/modules/rosapps/applications/devutils/cdmake/readme.txt b/modules/rosapps/applications/devutils/cdmake/readme.txt deleted file mode 100644 index 4ddb07389eb..00000000000 --- a/modules/rosapps/applications/devutils/cdmake/readme.txt +++ /dev/null @@ -1,96 +0,0 @@ - CD-ROM Maker - Philip J. Erdelsky - -The CDMAKE utility converts files from DOS/Windows format to ISO9660 -(CD-ROM) format. - -First, gather all the files to be converted and put them into a single -base directory and its subdirectories, arranged just the way you want -them on the CD-ROM. Remember that ISO9660 allows subdirectories to be -nested only eight levels deep. Therefore, if the base directory is -C:\CDROM, - - C:\CDROM\D2\D3\D4\D5\D6\D7\D8\FOO.TXT is permitted, but - - C:\CDROM\D2\D3\D4\D5\D6\D7\D8\D9\FOO.TXT is forbidden. - -Also, ISO9660 does not allow directories to have extensions, although -DOS does. - -Finally, the characters in file and directory names and file extensions -must be letters, digits or underscores. Other punctuation marks -permitted by DOS/Windows are forbidden by ISO9660. You can use the -c -option to override this restriction, but the resulting CD-ROM may not be -readable on systems other than DOS/Windows. - -Files in the base directory will be written to the root directory of the -CD-ROM image. All subdirectories of the base directory will appear as -subdirectories of the root directory of the CD-ROM image. Their -contents, and the contents of their subdirectories, down to the eighth -level, will be faithfully copied to the CD-ROM image. - -System files will not be written to the CD-ROM image. Hidden files will -be written to the CD-ROM image, and will retain their hidden attributes. -Read-only files will be written, and will remain read-only on the -CD-ROM, but this does not distinguish them in any way, because on a -CD-ROM all files are read-only. The archive attribute will be lost. - -File and directory date and time stamps will be preserved in the CD-ROM -image. - -The utility is called up by a command line of the following form: - - CDMAKE [-q] [-v] [-p] [-s N] [-m] [-j] [-b bootimage] source volume image - - source specifications of base directory containing all files to - be written to CD-ROM image - - volume volume label - - image image file or device - - -q quiet mode - display nothing but error messages - - -v verbose mode - display file information as files are - scanned and written - overrides -p option - - -p show progress while writing - - -s N abort operation before beginning write if image will be - larger than N megabytes (i.e. 1024*1024*N bytes) - - -m accept punctuation marks other than underscores in - names and extensions - - -j generates Joliet filename records - - -b bootimage create bootable ElTorito CD-ROM using 'no emulation' mode - - -The utility makes three passes over the source files: - - (1) The scanning pass, in which the names and extensions are - checked for validity, and the names, extensions, sizes, dates, - times and attributes are recorded internally. The files are not - actually read during this pass. - - (2) The layout pass, in which the sizes and positions of - directories, files and other items in the CD-ROM image are - determined. - - (3) The writing pass, in which the files are actually read and the - CD-ROM image is actually written to the specified file or - device. The image is always written sequentially. - -If neither the -q nor the -v option is used, CDMAKE will display the -volume label, size, number of files and directories and the total bytes -in each at the end of the layout pass. - -If the -p option is used, and is not overridden by the -v option, then -during the writing pass, CDMAKE will display the number of bytes still -to be written to the CD-ROM image, updating it frequently. The number -will decrease as the operation progresses, and will reach zero when the -operation is complete. - -The operation of CDMAKE can be aborted by typing Ctrl-C when the utility -is displaying text of any kind.

1 0

[reactos] 01/01: [CRT] Add missing OP_* constants in fpieee.h
by Timo Kreuzer 26 Jun '22

26 Jun '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ba0d16f3b38d74f69b1a8… commit ba0d16f3b38d74f69b1a8179cd1127d69b0f75b9 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Jun 12 20:02:19 2022 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Jun 26 23:08:14 2022 +0200 [CRT] Add missing OP_* constants in fpieee.h --- sdk/include/crt/fpieee.h | 215 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 214 insertions(+), 1 deletion(-) diff --git a/sdk/include/crt/fpieee.h b/sdk/include/crt/fpieee.h index 3fd5d539c38..61ffcdd2981 100644 --- a/sdk/include/crt/fpieee.h +++ b/sdk/include/crt/fpieee.h @@ -26,12 +26,225 @@ extern "C" { } _FPIEEE_FORMAT; typedef enum { - _FpCodeUnspecified,_FpCodeAdd,_FpCodeSubtract,_FpCodeMultiply,_FpCodeDivide,_FpCodeSquareRoot,_FpCodeRemainder,_FpCodeCompare,_FpCodeConvert,_FpCodeRound,_FpCodeTruncate,_FpCodeFloor,_FpCodeCeil,_FpCodeAcos,_FpCodeAsin,_FpCodeAtan,_FpCodeAtan2,_FpCodeCabs,_FpCodeCos,_FpCodeCosh,_FpCodeExp,_FpCodeFabs,_FpCodeFmod,_FpCodeFrexp,_FpCodeHypot,_FpCodeLdexp,_FpCodeLog,_FpCodeLog10,_FpCodeModf,_FpCodePow,_FpCodeSin,_FpCodeSinh,_FpCodeTan,_FpCodeTanh,_FpCodeY0,_FpCodeY1,_FpCodeYn,_FpCodeLogb, [...] + _FpCodeUnspecified, + _FpCodeAdd, + _FpCodeSubtract, + _FpCodeMultiply, + _FpCodeDivide, + _FpCodeSquareRoot, + _FpCodeRemainder, + _FpCodeCompare, + _FpCodeConvert, + _FpCodeRound, + _FpCodeTruncate, + _FpCodeFloor, + _FpCodeCeil, + _FpCodeAcos, + _FpCodeAsin, + _FpCodeAtan, + _FpCodeAtan2, + _FpCodeCabs, + _FpCodeCos, + _FpCodeCosh, + _FpCodeExp, + _FpCodeFabs, + _FpCodeFmod, + _FpCodeFrexp, + _FpCodeHypot, + _FpCodeLdexp, + _FpCodeLog, + _FpCodeLog10, + _FpCodeModf, + _FpCodePow, + _FpCodeSin, + _FpCodeSinh, + _FpCodeTan, + _FpCodeTanh, + _FpCodeY0, + _FpCodeY1, + _FpCodeYn, + _FpCodeLogb, + _FpCodeNextafter, + _FpCodeNegate, + _FpCodeFmin, + _FpCodeFmax, + _FpCodeConvertTrunc, + _XMMIAddps, + _XMMIAddss, + _XMMISubps, + _XMMISubss, + _XMMIMulps, + _XMMIMulss, + _XMMIDivps, + _XMMIDivss, + _XMMISqrtps, + _XMMISqrtss, + _XMMIMaxps, + _XMMIMaxss, + _XMMIMinps, + _XMMIMinss, + _XMMICmpps, + _XMMICmpss, + _XMMIComiss, + _XMMIUComiss, + _XMMICvtpi2ps, + _XMMICvtsi2ss, + _XMMICvtps2pi, + _XMMICvtss2si, + _XMMICvttps2pi, + _XMMICvttss2si, + _XMMIAddsubps, + _XMMIHaddps, + _XMMIHsubps, + _XMMI2Addpd, + _XMMI2Addsd, + _XMMI2Subpd, + _XMMI2Subsd, + _XMMI2Mulpd, + _XMMI2Mulsd, + _XMMI2Divpd, + _XMMI2Divsd, + _XMMI2Sqrtpd, + _XMMI2Sqrtsd, + _XMMI2Maxpd, + _XMMI2Maxsd, + _XMMI2Minpd, + _XMMI2Minsd, + _XMMI2Cmppd, + _XMMI2Cmpsd, + _XMMI2Comisd, + _XMMI2UComisd, + _XMMI2Cvtpd2pi, + _XMMI2Cvtsd2si, + _XMMI2Cvttpd2pi, + _XMMI2Cvttsd2si, + _XMMI2Cvtps2pd, + _XMMI2Cvtss2sd, + _XMMI2Cvtpd2ps, + _XMMI2Cvtsd2ss, + _XMMI2Cvtdq2ps, + _XMMI2Cvttps2dq, + _XMMI2Cvtps2dq, + _XMMI2Cvttpd2dq, + _XMMI2Cvtpd2dq, + _XMMI2Addsubpd, + _XMMI2Haddpd, + _XMMI2Hsubpd, #if defined(__ia64__) _FpCodeFma,_FpCodeFmaSingle,_FpCodeFmaDouble,_FpCodeFms,_FpCodeFmsSingle,_FpCodeFmsDouble,_FpCodeFnma,_FpCodeFnmaSingle,_FpCodeFnmaDouble,_FpCodeFamin,_FpCodeFamax #endif } _FP_OPERATION_CODE; +#ifdef _CRTBLD +#define OP_UNSPEC _FpCodeUnspecified +#define OP_ADD _FpCodeAdd +#define OP_SUB _FpCodeSubtract +#define OP_MUL _FpCodeMultiply +#define OP_DIV _FpCodeDivide +#define OP_REM _FpCodeRemainder +#define OP_COMP _FpCodeCompare +#define OP_CVT _FpCodeConvert +#define OP_RND _FpCodeRound +#define OP_TRUNC _FpCodeTruncate +#define OP_EXP _FpCodeExp +#define OP_POW _FpCodePow +#define OP_LOG _FpCodeLog +#define OP_LOG10 _FpCodeLog10 +#define OP_SINH _FpCodeSinh +#define OP_COSH _FpCodeCosh +#define OP_TANH _FpCodeTanh +#define OP_ASIN _FpCodeAsin +#define OP_ACOS _FpCodeAcos +#define OP_ATAN _FpCodeAtan +#define OP_ATAN2 _FpCodeAtan2 +#define OP_SQRT _FpCodeSquareRoot +#define OP_SIN _FpCodeSin +#define OP_COS _FpCodeCos +#define OP_TAN _FpCodeTan +#define OP_CEIL _FpCodeCeil +#define OP_FLOOR _FpCodeFloor +#define OP_ABS _FpCodeFabs +#define OP_MODF _FpCodeModf +#define OP_LDEXP _FpCodeLdexp +#define OP_CABS _FpCodeCabs +#define OP_HYPOT _FpCodeHypot +#define OP_FMOD _FpCodeFmod +#define OP_FREXP _FpCodeFrexp +#define OP_Y0 _FpCodeY0 +#define OP_Y1 _FpCodeY1 +#define OP_YN _FpCodeYn +#define OP_LOGB _FpCodeLogb +#define OP_NEXTAFTER _FpCodeNextafter +#define OP_ADDPS _XMMIAddps +#define OP_ADDSS _XMMIAddss +#define OP_SUBPS _XMMISubps +#define OP_SUBSS _XMMISubss +#define OP_MULPS _XMMIMulps +#define OP_MULSS _XMMIMulss +#define OP_DIVPS _XMMIDivps +#define OP_DIVSS _XMMIDivss +#define OP_SQRTPS _XMMISqrtps +#define OP_SQRTSS _XMMISqrtss +#define OP_MAXPS _XMMIMaxps +#define OP_MAXSS _XMMIMaxss +#define OP_MINPS _XMMIMinps +#define OP_MINSS _XMMIMinss +#define OP_CMPPS _XMMICmpps +#define OP_CMPSS _XMMICmpss +#define OP_COMISS _XMMIComiss +#define OP_UCOMISS _XMMIUComiss +#define OP_CVTPI2PS _XMMICvtpi2ps +#define OP_CVTSI2SS _XMMICvtsi2ss +#define OP_CVTPS2PI _XMMICvtps2pi +#define OP_CVTSS2SI _XMMICvtss2si +#define OP_CVTTPS2PI _XMMICvttps2pi +#define OP_CVTTSS2SI _XMMICvttss2si +#define OP_ADDSUBPS _XMMIAddsubps +#define OP_HADDPS _XMMIHaddps +#define OP_HSUBPS _XMMIHsubps +#define OP_ROUNDPS _XMMIRoundps +#define OP_ROUNDSS _XMMIRoundss +#define OP_DPPS _XMMIDpps +#define OP_ADDPD _XMMI2Addpd +#define OP_ADDSD _XMMI2Addsd +#define OP_SUBPD _XMMI2Subpd +#define OP_SUBSD _XMMI2Subsd +#define OP_MULPD _XMMI2Mulpd +#define OP_MULSD _XMMI2Mulsd +#define OP_DIVPD _XMMI2Divpd +#define OP_DIVSD _XMMI2Divsd +#define OP_SQRTPD _XMMI2Sqrtpd +#define OP_SQRTSD _XMMI2Sqrtsd +#define OP_MAXPD _XMMI2Maxpd +#define OP_MAXSD _XMMI2Maxsd +#define OP_MINPD _XMMI2Minpd +#define OP_MINSD _XMMI2Minsd +#define OP_CMPPD _XMMI2Cmppd +#define OP_CMPSD _XMMI2Cmpsd +#define OP_COMISD _XMMI2Comisd +#define OP_UCOMISD _XMMI2UComisd +#define OP_CVTPD2PI _XMMI2Cvtpd2pi +#define OP_CVTSD2SI _XMMI2Cvtsd2si +#define OP_CVTTPD2PI _XMMI2Cvttpd2pi +#define OP_CVTTSD2SI _XMMI2Cvttsd2si +#define OP_CVTPS2PD _XMMI2Cvtps2pd +#define OP_CVTSS2SD _XMMI2Cvtss2sd +#define OP_CVTPD2PS _XMMI2Cvtpd2ps +#define OP_CVTSD2SS _XMMI2Cvtsd2ss +#define OP_CVTDQ2PS _XMMI2Cvtdq2ps +#define OP_CVTTPS2DQ _XMMI2Cvttps2dq +#define OP_CVTPS2DQ _XMMI2Cvtps2dq +#define OP_CVTTPD2DQ _XMMI2Cvttpd2dq +#define OP_CVTPD2DQ _XMMI2Cvtpd2dq +#define OP_ADDSUBPD _XMMI2Addsubpd +#define OP_HADDPD _XMMI2Haddpd +#define OP_HSUBPD _XMMI2Hsubpd +#define OP_ROUNDPD _XMMI2Roundpd +#define OP_ROUNDSD _XMMI2Roundsd +#define OP_DPPD _XMMI2Dppd + +#endif /* _CRTBLD */ + typedef enum { _FpRoundNearest,_FpRoundMinusInfinity,_FpRoundPlusInfinity,_FpRoundChopped } _FPIEEE_ROUNDING_MODE;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs