Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [SHELL32] Fixing COpenWithMenu.cpp for handling path strings with spaces (#3449)
by Siavosh Kasravi 06 Feb '21

06 Feb '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bb723c337ac6cfa22f5e7… commit bb723c337ac6cfa22f5e7912c0081ff78423cb5d Author: Siavosh Kasravi <siavoshkc(a)yahoo.com> AuthorDate: Sat Feb 6 17:35:11 2021 +0400 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Feb 6 14:35:11 2021 +0100 [SHELL32] Fixing COpenWithMenu.cpp for handling path strings with spaces (#3449) CORE-17445 Fixing the bug where open with menu where OpenWithMenu does not handle handler's path when there are spaces in the path string, by adding the missing quote marks around %1 when recording the registry entry for file handler. --- dll/win32/shell32/COpenWithMenu.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/shell32/COpenWithMenu.cpp b/dll/win32/shell32/COpenWithMenu.cpp index 3afb60c65f1..ee6828bcbc5 100644 --- a/dll/win32/shell32/COpenWithMenu.cpp +++ b/dll/win32/shell32/COpenWithMenu.cpp @@ -155,7 +155,7 @@ COpenWithList::SApp *COpenWithList::Add(LPCWSTR pwszPath) if (pApp) { - StringCbPrintfW(pApp->wszCmd, sizeof(pApp->wszCmd), L"\"%s\" %%1", pwszPath); + StringCbPrintfW(pApp->wszCmd, sizeof(pApp->wszCmd), L"\"%s\" \"%%1\"", pwszPath); SaveApp(pApp); }

1 0

[reactos] 01/01: [SETUPLIB] Fix 'unlock' copypasta in debug print (#3448)
by Serge Gautherie 05 Feb '21

05 Feb '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=32f7474f38cab052f251a… commit 32f7474f38cab052f251aee9df6546fd6d0500b2 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Fri Feb 5 14:10:15 2021 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Feb 5 16:10:15 2021 +0300 [SETUPLIB] Fix 'unlock' copypasta in debug print (#3448) Addendum to 76ac898. --- base/setup/lib/bootsup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/setup/lib/bootsup.c b/base/setup/lib/bootsup.c index b1e11d108d4..d3aad8ee95e 100644 --- a/base/setup/lib/bootsup.c +++ b/base/setup/lib/bootsup.c @@ -600,7 +600,7 @@ InstallBootCodeToDisk( LockStatus = NtFsControlFile(PartitionHandle, NULL, NULL, NULL, &IoStatusBlock, FSCTL_DISMOUNT_VOLUME, NULL, 0, NULL, 0); if (!NT_SUCCESS(LockStatus)) { - DPRINT1("Unable to unlock the volume after installing boot code. Status 0x%08x. Expect problems.\n", LockStatus); + DPRINT1("Unable to dismount the volume after installing boot code. Status 0x%08x. Expect problems.\n", LockStatus); } LockStatus = NtFsControlFile(PartitionHandle, NULL, NULL, NULL, &IoStatusBlock, FSCTL_UNLOCK_VOLUME, NULL, 0, NULL, 0);

1 0

[reactos] 01/01: [GITHUB] Fix labeler rules, attempt 2
by Victor Perevertkin 05 Feb '21

05 Feb '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dbcd6efedf444a789b3c1… commit dbcd6efedf444a789b3c121dbb819eddbb55ce6d Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Fri Feb 5 14:58:14 2021 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Fri Feb 5 14:58:14 2021 +0300 [GITHUB] Fix labeler rules, attempt 2 --- .github/labeler.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/labeler.yml b/.github/labeler.yml index 8100d1c0a45..98b88afd411 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -1,6 +1,7 @@ # Labelling by the files touched drivers: - - any: ["drivers/**", "sdk/lib/drivers/**"] + - drivers/** + - sdk/lib/drivers/** - any: ["win32ss/drivers/**", "!win32ss/drivers/font/**"] freeldr:

1 0

[reactos] 01/01: [GITHUB] Fix labeler rules
by Victor Perevertkin 05 Feb '21

05 Feb '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d8b8e738444ee32744ad6… commit d8b8e738444ee32744ad6350c426041dce8c54dc Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Fri Feb 5 14:39:25 2021 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Fri Feb 5 14:39:25 2021 +0300 [GITHUB] Fix labeler rules --- .github/labeler.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/labeler.yml b/.github/labeler.yml index 54ec3b6c363..8100d1c0a45 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -1,13 +1,11 @@ # Labelling by the files touched drivers: - - drivers/* - - sdk/lib/drivers/* - - win32ss/drivers/* - - "!win32ss/drivers/font/*" + - any: ["drivers/**", "sdk/lib/drivers/**"] + - any: ["win32ss/drivers/**", "!win32ss/drivers/font/**"] freeldr: - - boot/freeldr/* + - boot/freeldr/** "kernel&hal": - - hal/* - - ntoskrnl/* + - hal/** + - ntoskrnl/**

1 0

[reactos] 01/01: [GITHUB] Fix YAML parsing in labeler.yml
by Victor Perevertkin 05 Feb '21

05 Feb '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2660316022457b6ba6b8a… commit 2660316022457b6ba6b8afebeb7f687d7806ba63 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Fri Feb 5 14:00:51 2021 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Fri Feb 5 14:00:51 2021 +0300 [GITHUB] Fix YAML parsing in labeler.yml --- .github/labeler.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/labeler.yml b/.github/labeler.yml index c17dedd2ebe..54ec3b6c363 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -3,7 +3,7 @@ drivers: - drivers/* - sdk/lib/drivers/* - win32ss/drivers/* - - !win32ss/drivers/font/* + - "!win32ss/drivers/font/*" freeldr: - boot/freeldr/*

1 0

[reactos] 01/01: [GITHUB] Add Labeler action for labelling PRs automatically
by Victor Perevertkin 05 Feb '21

05 Feb '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f7cf2ee32dd710bfe36b3… commit f7cf2ee32dd710bfe36b3be836fbe29d484c692d Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Fri Feb 5 13:41:03 2021 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Fri Feb 5 13:41:03 2021 +0300 [GITHUB] Add Labeler action for labelling PRs automatically --- .github/labeler.yml | 13 +++++++++++++ .github/workflows/labeler.yml | 11 +++++++++++ 2 files changed, 24 insertions(+) diff --git a/.github/labeler.yml b/.github/labeler.yml new file mode 100644 index 00000000000..c17dedd2ebe --- /dev/null +++ b/.github/labeler.yml @@ -0,0 +1,13 @@ +# Labelling by the files touched +drivers: + - drivers/* + - sdk/lib/drivers/* + - win32ss/drivers/* + - !win32ss/drivers/font/* + +freeldr: + - boot/freeldr/* + +"kernel&hal": + - hal/* + - ntoskrnl/* diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml new file mode 100644 index 00000000000..331ddc9b803 --- /dev/null +++ b/.github/workflows/labeler.yml @@ -0,0 +1,11 @@ +name: "Pull Request Labeler" +on: +- pull_request_target + +jobs: + triage: + runs-on: ubuntu-latest + steps: + - uses: actions/labeler@v3 + with: + repo-token: "${{ secrets.GITHUB_TOKEN }}"

1 0

[reactos] 01/01: [NTOS:SE] Do not use a global lock for tokens (#3445)
by George Bișoc 05 Feb '21

05 Feb '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dd4c113594740a4280ed2… commit dd4c113594740a4280ed2ba78705204aee5cd337 Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Fri Feb 5 10:10:19 2021 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Feb 5 12:10:19 2021 +0300 [NTOS:SE] Do not use a global lock for tokens (#3445) In Windows Server 2003 the lock is initialised on a per-token basis, that is, the lock resource is created in SepDuplicateToken() and SepCreateToken() functions. This ensures that the lock initialisation is done locally for the specific token thus avoiding the need of a global lock. --- ntoskrnl/include/internal/tag.h | 1 + ntoskrnl/se/token.c | 74 +++++++++++++++++++++++++++++++++++++---- sdk/include/ndk/setypes.h | 2 +- 3 files changed, 70 insertions(+), 7 deletions(-) diff --git a/ntoskrnl/include/internal/tag.h b/ntoskrnl/include/internal/tag.h index 3e838c81abe..804a1a93dea 100644 --- a/ntoskrnl/include/internal/tag.h +++ b/ntoskrnl/include/internal/tag.h @@ -181,6 +181,7 @@ #define TAG_SE_HANDLES_TAB 'aHeS' #define TAG_SE_DIR_BUFFER 'bDeS' #define TAG_SE_PROXY_DATA 'dPoT' +#define TAG_SE_TOKEN_LOCK 'lTeS' /* LPC Tags */ #define TAG_LPC_MESSAGE 'McpL' diff --git a/ntoskrnl/se/token.c b/ntoskrnl/se/token.c index d7158d7de01..1f12e0109d2 100644 --- a/ntoskrnl/se/token.c +++ b/ntoskrnl/se/token.c @@ -27,7 +27,6 @@ typedef struct _TOKEN_AUDIT_POLICY_INFORMATION /* GLOBALS ********************************************************************/ POBJECT_TYPE SeTokenObjectType = NULL; -ERESOURCE SepTokenLock; // FIXME: Global lock! TOKEN_SOURCE SeSystemTokenSource = {"*SYSTEM*", {0}}; LUID SeSystemAuthenticationId = SYSTEM_LUID; @@ -83,6 +82,59 @@ static const INFORMATION_CLASS_INFO SeTokenInformationClass[] = { /* FUNCTIONS *****************************************************************/ +/** + * @brief + * Creates a lock for the token. + * + * @param[in,out] Token + * A token which lock has to be created. + * + * @return + * STATUS_SUCCESS if the pool allocation and resource initialisation have + * completed successfully, otherwise STATUS_INSUFFICIENT_RESOURCES on a + * pool allocation failure. + */ +static +NTSTATUS +SepCreateTokenLock( + _Inout_ PTOKEN Token) +{ + PAGED_CODE(); + + Token->TokenLock = ExAllocatePoolWithTag(NonPagedPool, + sizeof(ERESOURCE), + TAG_SE_TOKEN_LOCK); + if (Token->TokenLock == NULL) + { + DPRINT1("SepCreateTokenLock(): Failed to allocate memory!\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + ExInitializeResourceLite(Token->TokenLock); + return STATUS_SUCCESS; +} + +/** + * @brief + * Deletes a lock of a token. + * + * @param[in,out] Token + * A token which contains the lock. + * + * @return + * Nothing. + */ +static +VOID +SepDeleteTokenLock( + _Inout_ PTOKEN Token) +{ + PAGED_CODE(); + + ExDeleteResourceLite(Token->TokenLock); + ExFreePoolWithTag(Token->TokenLock, TAG_SE_TOKEN_LOCK); +} + static NTSTATUS SepCompareTokens(IN PTOKEN FirstToken, IN PTOKEN SecondToken, @@ -477,7 +529,13 @@ SepDuplicateToken( AccessToken->TokenType = TokenType; AccessToken->ImpersonationLevel = Level; - AccessToken->TokenLock = &SepTokenLock; // FIXME: Global lock! + /* Initialise the lock for the access token */ + Status = SepCreateTokenLock(AccessToken); + if (!NT_SUCCESS(Status)) + { + ObDereferenceObject(AccessToken); + return Status; + } /* Copy the immutable fields */ RtlCopyLuid(&AccessToken->TokenSource.SourceIdentifier, @@ -491,7 +549,6 @@ SepDuplicateToken( AccessToken->ExpirationTime = Token->ExpirationTime; AccessToken->OriginatingLogonSession = Token->OriginatingLogonSession; - /* Lock the source token and copy the mutable fields */ SepAcquireTokenLockExclusive(Token); @@ -819,6 +876,10 @@ SepDeleteToken(PVOID ObjectBody) if ((AccessToken->TokenFlags & TOKEN_SESSION_NOT_REFERENCED) == 0) SepRmDereferenceLogonSession(&AccessToken->AuthenticationId); + /* Delete the token lock */ + if (AccessToken->TokenLock) + SepDeleteTokenLock(AccessToken); + /* Delete the dynamic information area */ if (AccessToken->DynamicPart) ExFreePoolWithTag(AccessToken->DynamicPart, TAG_TOKEN_DYNAMIC); @@ -833,8 +894,6 @@ SepInitializeTokenImplementation(VOID) UNICODE_STRING Name; OBJECT_TYPE_INITIALIZER ObjectTypeInitializer; - ExInitializeResource(&SepTokenLock); // FIXME: Global lock! - DPRINT("Creating Token Object Type\n"); /* Initialize the Token type */ @@ -976,7 +1035,10 @@ SepCreateToken( AccessToken->TokenType = TokenType; AccessToken->ImpersonationLevel = ImpersonationLevel; - AccessToken->TokenLock = &SepTokenLock; // FIXME: Global lock! + /* Initialise the lock for the access token */ + Status = SepCreateTokenLock(AccessToken); + if (!NT_SUCCESS(Status)) + goto Quit; RtlCopyLuid(&AccessToken->TokenSource.SourceIdentifier, &TokenSource->SourceIdentifier); diff --git a/sdk/include/ndk/setypes.h b/sdk/include/ndk/setypes.h index 55e0d8fdab6..7071ce8ab11 100644 --- a/sdk/include/ndk/setypes.h +++ b/sdk/include/ndk/setypes.h @@ -188,7 +188,7 @@ typedef struct _TOKEN LUID AuthenticationId; /* 0x18 */ LUID ParentTokenId; /* 0x20 */ LARGE_INTEGER ExpirationTime; /* 0x28 */ - struct _ERESOURCE *TokenLock; /* 0x30 */ + PERESOURCE TokenLock; /* 0x30 */ SEP_AUDIT_POLICY AuditPolicy; /* 0x38 */ LUID ModifiedId; /* 0x40 */ ULONG SessionId; /* 0x48 */

1 0

[reactos] 01/01: [NTOS:MM][FASTFAT_NEW] Fix DBG usage, fixes Release build
by Victor Perevertkin 05 Feb '21

05 Feb '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b705df731e98911c744bc… commit b705df731e98911c744bcd18311c2139583c3581 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Fri Feb 5 11:54:10 2021 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Fri Feb 5 11:54:10 2021 +0300 [NTOS:MM][FASTFAT_NEW] Fix DBG usage, fixes Release build --- drivers/filesystems/fastfat_new/fatdata.c | 2 +- ntoskrnl/mm/rmap.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/filesystems/fastfat_new/fatdata.c b/drivers/filesystems/fastfat_new/fatdata.c index 0c92389d98e..1a7ead0cb23 100644 --- a/drivers/filesystems/fastfat_new/fatdata.c +++ b/drivers/filesystems/fastfat_new/fatdata.c @@ -233,7 +233,7 @@ Return Value: DebugTrace(0, DEBUG_TRACE_UNWIND, "FatExceptionFilter %X\n", ExceptionCode); DebugDump("FatExceptionFilter\n", Dbg, NULL ); -#ifdef DBG +#if DBG if( FatBreakOnInterestingExceptionStatus != 0 && ExceptionCode == FatBreakOnInterestingExceptionStatus ) { DbgBreakPoint(); diff --git a/ntoskrnl/mm/rmap.c b/ntoskrnl/mm/rmap.c index cb3f956ef35..a2169eeb54f 100644 --- a/ntoskrnl/mm/rmap.c +++ b/ntoskrnl/mm/rmap.c @@ -406,9 +406,11 @@ MmInsertRmap(PFN_NUMBER Page, PEPROCESS Process, if (current_entry && (current_entry->Address == Address) && (current_entry->Process == Process)) { +#if DBG DbgPrint("MmInsertRmap tries to add a second rmap entry for address %p\n", current_entry->Address); DbgPrint(" current caller %p\n", new_entry->Caller); DbgPrint(" previous caller %p\n", current_entry->Caller); +#endif KeBugCheck(MEMORY_MANAGEMENT); }

1 0

[reactos] 218/218: [MEDIA] Update WINESYNC.txt for d3dx9 DLLs
by Jérôme Gardou 04 Feb '21

04 Feb '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=44eecfaa01e375384112e… commit 44eecfaa01e375384112ee011c7f27eac528a90f Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Tue Jan 5 13:45:12 2021 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Thu Feb 4 16:37:07 2021 +0100 [MEDIA] Update WINESYNC.txt for d3dx9 DLLs --- media/doc/WINESYNC.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media/doc/WINESYNC.txt b/media/doc/WINESYNC.txt index e84eeeac794..e73dccfd1f3 100644 --- a/media/doc/WINESYNC.txt +++ b/media/doc/WINESYNC.txt @@ -26,7 +26,7 @@ dll/directx/wine/d3d8 # Synced to WineStaging-3.3 dll/directx/wine/d3d9 # Synced to WineStaging-3.3 dll/directx/wine/d3dcompiler_43 # Synced to WineStaging-4.18 dll/directx/wine/d3drm # Synced to WineStaging-4.18 -dll/directx/wine/d3dx9_24 => 43 # Synced to WineStaging-4.0 +dll/directx/wine/d3dx9_24 => 43 # Synced to WineStaging-6.0-rc5 dll/directx/wine/d3dxof # Synced to WineStaging-4.18 dll/directx/wine/ddraw # Synced to WineStaging-3.3 dll/directx/wine/devenum # Synced to WineStaging-4.18

1 0

[reactos] 217/218: [WINESYNC]: d3dx9 is now in sync with wine-staging wine-6.0-rc5
by Jérôme Gardou 04 Feb '21

04 Feb '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=236b5f77ab85d9975bc29… commit 236b5f77ab85d9975bc2935fbc46136db9a978e3 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Tue Jan 5 13:22:42 2021 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Thu Feb 4 16:37:07 2021 +0100 [WINESYNC]: d3dx9 is now in sync with wine-staging wine-6.0-rc5 --- sdk/tools/winesync/d3dx9.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/tools/winesync/d3dx9.cfg b/sdk/tools/winesync/d3dx9.cfg index 8e6beefe8fc..1d4d1a3fc76 100644 --- a/sdk/tools/winesync/d3dx9.cfg +++ b/sdk/tools/winesync/d3dx9.cfg @@ -34,4 +34,4 @@ files: include/d3dx9tex.h: sdk/include/dxsdk/d3dx9tex.h include/d3dx9xof.h: sdk/include/dxsdk/d3dx9xof.h tags: - wine: e27a95e92097a601baa9b0e9dd6fcc5013c863fa + wine: wine-6.0-rc5

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