Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 07/09: [WINESYNC] Use the same 'winesync' author as for all the other commits the script generates.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1d92196d2afbe210328e1… commit 1d92196d2afbe210328e1147229da62b121ccb5f Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Sep 12 13:21:36 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Dec 18 22:21:39 2023 +0100 [WINESYNC] Use the same 'winesync' author as for all the other commits the script generates. This now correctly sets the commit author as 'winesync' (before it was the committer's developer name) for the following types of commits: `[WINESYNC]: revert wine-staging patchset for <MODULE_NAME>` and `[WINESYNC]: <MODULE_NAME> is now in sync with wine-staging <WINE_TAG>` --- sdk/tools/winesync/winesync.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/sdk/tools/winesync/winesync.py b/sdk/tools/winesync/winesync.py index 63cafd60a2b..7335a8a37ac 100644 --- a/sdk/tools/winesync/winesync.py +++ b/sdk/tools/winesync/winesync.py @@ -46,6 +46,9 @@ class wine_sync: self.wine_staging_repo = pygit2.Repository(self.wine_staging_src) self.reactos_repo = pygit2.Repository(self.reactos_src) + # the standard author signature we will use + self.winesync_author_signature = pygit2.Signature('winesync', 'ros-dev(a)reactos.org') + # read the index from the reactos tree self.reactos_index = self.reactos_repo.index self.reactos_index.read() @@ -245,8 +248,9 @@ class wine_sync: else: commit_msg += f'wine commit id {str(wine_commit.id)} by {wine_commit.author.name} <{wine_commit.author.email}>' - self.reactos_repo.create_commit('HEAD', - pygit2.Signature('winesync', 'ros-dev(a)reactos.org'), + self.reactos_repo.create_commit( + 'HEAD', + self.winesync_author_signature, self.reactos_repo.default_signature, commit_msg, self.reactos_index.write_tree(), @@ -310,7 +314,7 @@ class wine_sync: self.reactos_repo.create_commit( 'HEAD', - self.reactos_repo.default_signature, + self.winesync_author_signature, self.reactos_repo.default_signature, f'[WINESYNC]: revert wine-staging patchset for {self.module}', self.reactos_index.write_tree(), @@ -376,7 +380,7 @@ class wine_sync: self.reactos_index.write() self.reactos_repo.create_commit( 'HEAD', - self.reactos_repo.default_signature, + self.winesync_author_signature, self.reactos_repo.default_signature, f'[WINESYNC]: {self.module} is now in sync with wine-staging {wine_tag}', self.reactos_index.write_tree(),

1 year, 11 months

[reactos] 06/09: [WINESYNC] Make the wine-staging tag optional, in which case Wine-Staging is not used.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f8569465ce3979f3ab47b… commit f8569465ce3979f3ab47b46fe50de7b6ffa0de1e Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Sep 6 12:57:15 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Dec 18 22:21:38 2023 +0100 [WINESYNC] Make the wine-staging tag optional, in which case Wine-Staging is not used. --- sdk/tools/winesync/winesync.py | 49 ++++++++++++++++++++++++------------------ 1 file changed, 28 insertions(+), 21 deletions(-) diff --git a/sdk/tools/winesync/winesync.py b/sdk/tools/winesync/winesync.py index 2e769afaf49..63cafd60a2b 100644 --- a/sdk/tools/winesync/winesync.py +++ b/sdk/tools/winesync/winesync.py @@ -58,7 +58,11 @@ class wine_sync: self.staged_patch_dir = posixpath.join('sdk', 'tools', 'winesync', self.module + '_staging') def create_or_checkout_wine_branch(self, wine_tag, wine_staging_tag): - wine_branch_name = 'winesync-' + wine_tag + '-' + wine_staging_tag + # build the wine branch name + wine_branch_name = 'winesync-' + wine_tag + if wine_staging_tag: + wine_branch_name += '-' + wine_staging_tag + branch = self.wine_repo.lookup_branch(wine_branch_name) if branch is None: # get our target commits @@ -68,29 +72,32 @@ class wine_sync: if isinstance(wine_target_commit, pygit2.Commit): wine_target_commit = wine_target_commit.id - wine_staging_target_commit = self.wine_staging_repo.revparse_single(wine_staging_tag) - if isinstance(wine_staging_target_commit, pygit2.Tag): - wine_staging_target_commit = wine_staging_target_commit.target - if isinstance(wine_staging_target_commit, pygit2.Commit): - wine_staging_target_commit = wine_staging_target_commit.id + # do the same for the wine-staging tree + if wine_staging_tag: + wine_staging_target_commit = self.wine_staging_repo.revparse_single(wine_staging_tag) + if isinstance(wine_staging_target_commit, pygit2.Tag): + wine_staging_target_commit = wine_staging_target_commit.target + if isinstance(wine_staging_target_commit, pygit2.Commit): + wine_staging_target_commit = wine_staging_target_commit.id self.wine_repo.branches.local.create(wine_branch_name, self.wine_repo.revparse_single('HEAD')) self.wine_repo.checkout(self.wine_repo.lookup_branch(wine_branch_name)) self.wine_repo.reset(wine_target_commit, pygit2.GIT_RESET_HARD) # do the same for the wine-staging tree - self.wine_staging_repo.branches.local.create(wine_branch_name, self.wine_staging_repo.revparse_single('HEAD')) - self.wine_staging_repo.checkout(self.wine_staging_repo.lookup_branch(wine_branch_name)) - self.wine_staging_repo.reset(wine_staging_target_commit, pygit2.GIT_RESET_HARD) - - # run the wine-staging script - if subprocess.call(['python', self.wine_staging_src + '/staging/patchinstall.py', 'DESTDIR=' + self.wine_src, '--all', '--backend=git-am']): - # the new script failed (it doesn't exist?), try the old one - subprocess.call(['bash', '-c', self.wine_staging_src + '/patches/patchinstall.sh DESTDIR=' + self.wine_src + ' --all --backend=git-am']) - - # delete the branch we created - self.wine_staging_repo.checkout(self.wine_staging_repo.lookup_branch('master')) - self.wine_staging_repo.branches.delete(wine_branch_name) + if wine_staging_tag: + self.wine_staging_repo.branches.local.create(wine_branch_name, self.wine_staging_repo.revparse_single('HEAD')) + self.wine_staging_repo.checkout(self.wine_staging_repo.lookup_branch(wine_branch_name)) + self.wine_staging_repo.reset(wine_staging_target_commit, pygit2.GIT_RESET_HARD) + + # run the wine-staging script + if subprocess.call(['python', self.wine_staging_src + '/staging/patchinstall.py', 'DESTDIR=' + self.wine_src, '--all', '--backend=git-am']): + # the new script failed (it doesn't exist?), try the old one + subprocess.call(['bash', '-c', self.wine_staging_src + '/patches/patchinstall.sh DESTDIR=' + self.wine_src + ' --all --backend=git-am']) + + # delete the branch we created + self.wine_staging_repo.checkout(self.wine_staging_repo.lookup_branch('master')) + self.wine_staging_repo.branches.delete(wine_branch_name) else: self.wine_repo.checkout(self.wine_repo.lookup_branch(wine_branch_name)) @@ -379,9 +386,9 @@ class wine_sync: def main(): parser = argparse.ArgumentParser() - parser.add_argument('module', help='The module you want to sync. <module>.cfg must exist in the current directory') - parser.add_argument('wine_tag', help='The wine tag or commit id to sync to') - parser.add_argument('wine_staging_tag', help='The wine staging tag or commit id to pick wine staged patches from') + parser.add_argument('module', help='The module you want to sync. <module>.cfg must exist in the current directory.') + parser.add_argument('wine_tag', help='The wine tag or commit id to sync to.') + parser.add_argument('wine_staging_tag', nargs='?', default=None, help='The optional wine staging tag or commit id to pick wine staged patches from.') args = parser.parse_args()

1 year, 11 months

[reactos] 05/09: [WINESYNC] Elegantly handle empty 'files' and 'directories' lists.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7f8d2d14b76807b0d4231… commit 7f8d2d14b76807b0d42311283f44098e41733504 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Sep 5 22:06:30 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Dec 18 22:21:37 2023 +0100 [WINESYNC] Elegantly handle empty 'files' and 'directories' lists. Expand on Timo's commit 4b5a55516. We may encounter cases where either the 'directories' or 'files' lists in the .cfg YAML files are empty, and we don't want the script to throw an exception in that case. Furthermore, explicitly check for such empty lists when calling PyGit2 index.add_all(...) function, because if it's called on a None or empty list, _all_ untracked files in the selected git repository get added, which is not what we want there. --- sdk/tools/winesync/winesync.py | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/sdk/tools/winesync/winesync.py b/sdk/tools/winesync/winesync.py index 680b4cfc4d6..2e769afaf49 100644 --- a/sdk/tools/winesync/winesync.py +++ b/sdk/tools/winesync/winesync.py @@ -99,7 +99,7 @@ class wine_sync: # Helper function for resolving wine tree path to reactos one # Note: it doesn't care about the fact that the file actually exists or not def wine_to_reactos_path(self, wine_path): - if wine_path in self.module_cfg['files']: + if self.module_cfg['files'] and (wine_path in self.module_cfg['files']): # we have a direct mapping return self.module_cfg['files'][wine_path] @@ -107,11 +107,8 @@ class wine_sync: # root files should have a direct mapping return None - if self.module_cfg['directories'] is None: - return None - wine_dir, wine_file = os.path.split(wine_path) - if wine_dir in self.module_cfg['directories']: + if self.module_cfg['directories'] and (wine_dir in self.module_cfg['directories']): # we have a mapping for the directory return posixpath.join(self.module_cfg['directories'][wine_dir], wine_file) @@ -295,8 +292,13 @@ class wine_sync: if not has_patches: return True - self.reactos_index.add_all([f for f in self.module_cfg['files'].values()]) - self.reactos_index.add_all([f'{d}/*.*' for d in self.module_cfg['directories'].values()]) + # Note: these path lists may be empty or None, in which case + # we should not call index.add_all(), otherwise we would add + # any untracked file present in the repository. + if self.module_cfg['files']: + self.reactos_index.add_all([f for f in self.module_cfg['files'].values()]) + if self.module_cfg['directories']: + self.reactos_index.add_all([f'{d}/*.*' for d in self.module_cfg['directories'].values()]) self.reactos_index.write() self.reactos_repo.create_commit(

1 year, 11 months

[reactos] 04/09: [WINESYNC] Allow using the "new" Wine-Staging patchinstall.py script.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=67ca439d06a8ad7f00cb4… commit 67ca439d06a8ad7f00cb42ea839c3cadcbec0ea1 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Sep 5 17:59:33 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Dec 18 22:21:36 2023 +0100 [WINESYNC] Allow using the "new" Wine-Staging patchinstall.py script. Wine-Staging switched to staging/patchinstall.py , removing the deprecated patches/patchinstall.sh in Feb.16, 2023 commit https://github.com/wine-staging/wine-staging/commit/c1b4af92f74d7bd330003d3… just before the v8.2 release. In order to maintain interoperability between older and newer Wine-Staging versions, try to run first the new script; if it fails, fall back to the older script. --- sdk/tools/winesync/winesync.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sdk/tools/winesync/winesync.py b/sdk/tools/winesync/winesync.py index 652e4233e23..680b4cfc4d6 100644 --- a/sdk/tools/winesync/winesync.py +++ b/sdk/tools/winesync/winesync.py @@ -84,7 +84,9 @@ class wine_sync: self.wine_staging_repo.reset(wine_staging_target_commit, pygit2.GIT_RESET_HARD) # run the wine-staging script - subprocess.call(['bash', '-c', self.wine_staging_src + '/patches/patchinstall.sh DESTDIR=' + self.wine_src + ' --all --backend=git-am']) + if subprocess.call(['python', self.wine_staging_src + '/staging/patchinstall.py', 'DESTDIR=' + self.wine_src, '--all', '--backend=git-am']): + # the new script failed (it doesn't exist?), try the old one + subprocess.call(['bash', '-c', self.wine_staging_src + '/patches/patchinstall.sh DESTDIR=' + self.wine_src + ' --all --backend=git-am']) # delete the branch we created self.wine_staging_repo.checkout(self.wine_staging_repo.lookup_branch('master'))

1 year, 11 months

[reactos] 03/09: [WINESYNC] Explicitly use posix paths for git file manipulations.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=454901ab0b485b4d28aee… commit 454901ab0b485b4d28aee169cacd2762e8e1324a Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Sep 7 18:09:32 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Dec 18 22:21:35 2023 +0100 [WINESYNC] Explicitly use posix paths for git file manipulations. Whenever using git, be it on Windows CMD, git-bash on Windows, or in *nix systems, git appears to always use posix-like paths internally. So, enforce them with posixpath when building/concatenating paths that are going to be passed to pygit2 functions. Otherwise, exceptions like the following one happens: ``` File "./winesync.py", line 296, in revert_staged_patchset self.reactos_index.remove(os.path.join(self.staged_patch_dir, patch_file_name)) [... skipped ...] OSError: index does not contain sdk\tools\winesync\setupapi_staging\0002-wine-staging-4.0-setupapi_winetest.patch at stage 0 ``` (The git index actually contains the specified path, but in "posix" form with slash-separators.) On *nix platforms, these changes should not matter. --- sdk/tools/winesync/winesync.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/sdk/tools/winesync/winesync.py b/sdk/tools/winesync/winesync.py index a517fa6bb12..652e4233e23 100644 --- a/sdk/tools/winesync/winesync.py +++ b/sdk/tools/winesync/winesync.py @@ -2,6 +2,7 @@ import sys import os +import posixpath import string import argparse import subprocess @@ -54,7 +55,7 @@ class wine_sync: with open(module + '.cfg', 'r') as file_input: self.module_cfg = yaml.safe_load(file_input) - self.staged_patch_dir = os.path.join('sdk', 'tools', 'winesync', self.module + '_staging') + self.staged_patch_dir = posixpath.join('sdk', 'tools', 'winesync', self.module + '_staging') def create_or_checkout_wine_branch(self, wine_tag, wine_staging_tag): wine_branch_name = 'winesync-' + wine_tag + '-' + wine_staging_tag @@ -110,7 +111,7 @@ class wine_sync: wine_dir, wine_file = os.path.split(wine_path) if wine_dir in self.module_cfg['directories']: # we have a mapping for the directory - return os.path.join(self.module_cfg['directories'][wine_dir], wine_file) + return posixpath.join(self.module_cfg['directories'][wine_dir], wine_file) # no match return None @@ -228,7 +229,7 @@ class wine_sync: os.mkdir(os.path.join(self.reactos_src, self.staged_patch_dir)) with open(patch_path, 'w') as file_output: file_output.write(complete_patch) - self.reactos_index.add(os.path.join(self.staged_patch_dir, patch_file_name)) + self.reactos_index.add(posixpath.join(self.staged_patch_dir, patch_file_name)) self.reactos_index.write() @@ -264,7 +265,7 @@ class wine_sync: def revert_staged_patchset(self): # revert all of this in one commit - staged_patch_dir_path = os.path.join(self.reactos_src, self.staged_patch_dir) + staged_patch_dir_path = posixpath.join(self.reactos_src, self.staged_patch_dir) if not os.path.isdir(staged_patch_dir_path): return True @@ -285,7 +286,7 @@ class wine_sync: print('Please check, remove the offending patch with git rm, and relaunch this script') return False - self.reactos_index.remove(os.path.join(self.staged_patch_dir, patch_file_name)) + self.reactos_index.remove(posixpath.join(self.staged_patch_dir, patch_file_name)) self.reactos_index.write() os.remove(patch_path)

1 year, 11 months

[reactos] 02/09: [WINESYNC] Fix some apparent problems with commits manipulation with pygit2.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e638ff59d1f1aafd70395… commit e638ff59d1f1aafd7039569fe2f94c625d01989e Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Nov 3 23:44:23 2021 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Dec 18 22:21:34 2023 +0100 [WINESYNC] Fix some apparent problems with commits manipulation with pygit2. --- sdk/tools/winesync/winesync.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/sdk/tools/winesync/winesync.py b/sdk/tools/winesync/winesync.py index d221e600bfd..a517fa6bb12 100644 --- a/sdk/tools/winesync/winesync.py +++ b/sdk/tools/winesync/winesync.py @@ -64,10 +64,14 @@ class wine_sync: wine_target_commit = self.wine_repo.revparse_single(wine_tag) if isinstance(wine_target_commit, pygit2.Tag): wine_target_commit = wine_target_commit.target + if isinstance(wine_target_commit, pygit2.Commit): + wine_target_commit = wine_target_commit.id wine_staging_target_commit = self.wine_staging_repo.revparse_single(wine_staging_tag) if isinstance(wine_staging_target_commit, pygit2.Tag): wine_staging_target_commit = wine_staging_target_commit.target + if isinstance(wine_staging_target_commit, pygit2.Commit): + wine_staging_target_commit = wine_staging_target_commit.id self.wine_repo.branches.local.create(wine_branch_name, self.wine_repo.revparse_single('HEAD')) self.wine_repo.checkout(self.wine_repo.lookup_branch(wine_branch_name)) @@ -306,16 +310,18 @@ class wine_sync: wine_target_commit = self.wine_repo.revparse_single(wine_tag) if isinstance(wine_target_commit, pygit2.Tag): wine_target_commit = wine_target_commit.target + if isinstance(wine_target_commit, pygit2.Commit): + wine_target_commit = wine_target_commit.id # print(f'wine target commit is {wine_target_commit}') # get the wine commit id where we left in_staging = False wine_last_sync = self.wine_repo.revparse_single(self.module_cfg['tags']['wine']) - if (isinstance(wine_last_sync, pygit2.Tag)): + if isinstance(wine_last_sync, pygit2.Tag): if not self.revert_staged_patchset(): return wine_last_sync = wine_last_sync.target - if (isinstance(wine_last_sync, pygit2.Commit)): + if isinstance(wine_last_sync, pygit2.Commit): wine_last_sync = wine_last_sync.id # create a branch to keep things clean

1 year, 11 months

[reactos] 01/09: [WINESYNC] Minor formatting.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d566273583802831bc7ee… commit d566273583802831bc7ee66edfcb036b41314b62 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Sep 7 20:23:46 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Dec 18 22:21:33 2023 +0100 [WINESYNC] Minor formatting. --- sdk/tools/winesync/winesync.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sdk/tools/winesync/winesync.py b/sdk/tools/winesync/winesync.py index d596a5dd710..d221e600bfd 100644 --- a/sdk/tools/winesync/winesync.py +++ b/sdk/tools/winesync/winesync.py @@ -35,7 +35,7 @@ class wine_sync: self.reactos_src = input('Please enter the path to the reactos git tree: ') self.wine_src = input('Please enter the path to the wine git tree: ') self.wine_staging_src = input('Please enter the path to the wine-staging git tree: ') - config['repos'] = { 'reactos' : self.reactos_src, + config['repos'] = { 'reactos': self.reactos_src, 'wine': self.wine_src, 'wine-staging': self.wine_staging_src } with open('winesync.cfg', 'w') as file_output: @@ -89,8 +89,8 @@ class wine_sync: return wine_branch_name - # helper function for resolving wine tree path to reactos one - # Note : it doesn't care about the fact that the file actually exists or not + # Helper function for resolving wine tree path to reactos one + # Note: it doesn't care about the fact that the file actually exists or not def wine_to_reactos_path(self, wine_path): if wine_path in self.module_cfg['files']: # we have a direct mapping @@ -133,7 +133,7 @@ class wine_sync: # check if we should care new_reactos_path = self.wine_to_reactos_path(delta.new_file.path) if not new_reactos_path is None: - warning_message += 'file ' + delta.new_file.path + ' is added to the wine tree !\n' + warning_message += 'file ' + delta.new_file.path + ' is added to the wine tree!\n' old_reactos_path = '/dev/null' else: old_reactos_path = None @@ -141,12 +141,12 @@ class wine_sync: # check if we should care old_reactos_path = self.wine_to_reactos_path(delta.old_file.path) if not old_reactos_path is None: - warning_message += 'file ' + delta.old_file.path + ' is removed from the wine tree !\n' + warning_message += 'file ' + delta.old_file.path + ' is removed from the wine tree!\n' new_reactos_path = '/dev/null' else: new_reactos_path = None elif delta.new_file.path.endswith('Makefile.in'): - warning_message += 'file ' + delta.new_file.path + ' was modified !\n' + warning_message += 'file ' + delta.new_file.path + ' was modified!\n' # no need to warn that those are ignored, we just did. continue else: @@ -210,7 +210,7 @@ class wine_sync: print('Applied patches from wine commit ' + str(wine_commit.id)) if ignored_files: - warning_message += 'WARNING : some files were ignored: ' + ' '.join(ignored_files) + '\n' + warning_message += 'WARNING: some files were ignored: ' + ' '.join(ignored_files) + '\n' if not in_staging: self.module_cfg['tags']['wine'] = str(wine_commit.id)

1 year, 11 months

[reactos] 01/01: [NTOS:KE/x64] Implement initial IPI code

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1831bc6add7219198e184… commit 1831bc6add7219198e184568525f09d73553782e Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Nov 26 12:23:55 2023 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Mon Dec 18 23:16:39 2023 +0200 [NTOS:KE/x64] Implement initial IPI code --- ntoskrnl/ke/amd64/ipi.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++++ ntoskrnl/ke/ipi.c | 4 ++++ ntoskrnl/ntos.cmake | 1 + 3 files changed, 55 insertions(+) diff --git a/ntoskrnl/ke/amd64/ipi.c b/ntoskrnl/ke/amd64/ipi.c new file mode 100644 index 00000000000..86c044c7d03 --- /dev/null +++ b/ntoskrnl/ke/amd64/ipi.c @@ -0,0 +1,50 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: IPI code for x64 + * COPYRIGHT: Copyright 2023 Timo Kreuzer <timo.kreuzer(a)reactos.org> + */ + +/* INCLUDES *******************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <debug.h> + +/* FUNCTIONS *****************************************************************/ + +VOID +FASTCALL +KiIpiSend( + _In_ KAFFINITY TargetSet, + _In_ ULONG IpiRequest) +{ + /* Check if we can send the IPI directly */ + if (IpiRequest == IPI_APC) + { + HalSendSoftwareInterrupt(TargetSet, APC_LEVEL); + } + else if (IpiRequest == IPI_DPC) + { + HalSendSoftwareInterrupt(TargetSet, DISPATCH_LEVEL); + } + else if (IpiRequest == IPI_FREEZE) + { + /* On x64 the freeze IPI is an NMI */ + HalSendNMI(TargetSet); + } + else + { + ASSERT(FALSE); + } +} + +ULONG_PTR +NTAPI +KeIpiGenericCall( + _In_ PKIPI_BROADCAST_WORKER Function, + _In_ ULONG_PTR Argument) +{ + __debugbreak(); + return 0; +} diff --git a/ntoskrnl/ke/ipi.c b/ntoskrnl/ke/ipi.c index 841087d1daa..b81a22ac2c6 100644 --- a/ntoskrnl/ke/ipi.c +++ b/ntoskrnl/ke/ipi.c @@ -18,6 +18,8 @@ extern KSPIN_LOCK KiReverseStallIpiLock; /* PRIVATE FUNCTIONS *********************************************************/ +#ifndef _M_AMD64 + VOID NTAPI KiIpiGenericCallTarget(IN PKIPI_CONTEXT PacketContext, @@ -270,3 +272,5 @@ KeIpiGenericCall(IN PKIPI_BROADCAST_WORKER Function, KeLowerIrql(OldIrql); return Status; } + +#endif // !_M_AMD64 diff --git a/ntoskrnl/ntos.cmake b/ntoskrnl/ntos.cmake index 26a1e07b17e..473e0455966 100644 --- a/ntoskrnl/ntos.cmake +++ b/ntoskrnl/ntos.cmake @@ -351,6 +351,7 @@ elseif(ARCH STREQUAL "amd64") ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/amd64/cpu.c ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/amd64/except.c ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/amd64/interrupt.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/amd64/ipi.c ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/amd64/irql.c ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/amd64/kiinit.c ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/amd64/krnlinit.c

1 year, 11 months

[reactos] 04/04: [USERENV] Use RegCopyTreeW from advapi32_vista

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e6201ea61e435c68f1254… commit e6201ea61e435c68f125416d94d59ec5a39593b8 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Thu Dec 14 20:01:29 2023 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Mon Dec 18 23:14:14 2023 +0200 [USERENV] Use RegCopyTreeW from advapi32_vista --- dll/win32/userenv/CMakeLists.txt | 2 +- dll/win32/userenv/registry.c | 226 +-------------------------------------- 2 files changed, 3 insertions(+), 225 deletions(-) diff --git a/dll/win32/userenv/CMakeLists.txt b/dll/win32/userenv/CMakeLists.txt index 28b272697b5..8e372f16001 100644 --- a/dll/win32/userenv/CMakeLists.txt +++ b/dll/win32/userenv/CMakeLists.txt @@ -24,6 +24,6 @@ add_library(userenv MODULE set_module_type(userenv win32dll) target_link_libraries(userenv uuid) -add_importlibs(userenv advapi32 user32 msvcrt kernel32 ntdll) +add_importlibs(userenv advapi32 advapi32_vista user32 msvcrt kernel32 ntdll) add_pch(userenv precomp.h "${PCH_SKIP_SOURCE}") add_cd_file(TARGET userenv DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/userenv/registry.c b/dll/win32/userenv/registry.c index a7fc4fee49c..326832a1164 100644 --- a/dll/win32/userenv/registry.c +++ b/dll/win32/userenv/registry.c @@ -29,6 +29,8 @@ #define NDEBUG #include <debug.h> +LSTATUS WINAPI RegCopyTreeW(_In_ HKEY, _In_opt_ LPCWSTR, _In_ HKEY); + /* FUNCTIONS ***************************************************************/ static @@ -38,7 +40,6 @@ CopyKey(HKEY hDstKey, { LONG Error; -#if (_WIN32_WINNT >= 0x0600) Error = RegCopyTreeW(hSrcKey, NULL, hDstKey); @@ -49,229 +50,6 @@ CopyKey(HKEY hDstKey, } return TRUE; - -#else - FILETIME LastWrite; - DWORD dwSubKeys; - DWORD dwValues; - DWORD dwType; - DWORD dwMaxSubKeyNameLength; - DWORD dwSubKeyNameLength; - DWORD dwMaxValueNameLength; - DWORD dwValueNameLength; - DWORD dwMaxValueLength; - DWORD dwValueLength; - DWORD dwDisposition; - DWORD i; - LPWSTR lpNameBuffer; - LPBYTE lpDataBuffer; - HKEY hDstSubKey; - HKEY hSrcSubKey; - - DPRINT ("CopyKey() called\n"); - - Error = RegQueryInfoKey(hSrcKey, - NULL, - NULL, - NULL, - &dwSubKeys, - &dwMaxSubKeyNameLength, - NULL, - &dwValues, - &dwMaxValueNameLength, - &dwMaxValueLength, - NULL, - NULL); - if (Error != ERROR_SUCCESS) - { - DPRINT1("RegQueryInfoKey() failed (Error %lu)\n", Error); - SetLastError((DWORD)Error); - return FALSE; - } - - dwMaxSubKeyNameLength++; - dwMaxValueNameLength++; - - DPRINT("dwSubKeys %lu\n", dwSubKeys); - DPRINT("dwMaxSubKeyNameLength %lu\n", dwMaxSubKeyNameLength); - DPRINT("dwValues %lu\n", dwValues); - DPRINT("dwMaxValueNameLength %lu\n", dwMaxValueNameLength); - DPRINT("dwMaxValueLength %lu\n", dwMaxValueLength); - - /* Copy subkeys */ - if (dwSubKeys != 0) - { - lpNameBuffer = HeapAlloc(GetProcessHeap(), - 0, - dwMaxSubKeyNameLength * sizeof(WCHAR)); - if (lpNameBuffer == NULL) - { - DPRINT1("Buffer allocation failed\n"); - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - - for (i = 0; i < dwSubKeys; i++) - { - dwSubKeyNameLength = dwMaxSubKeyNameLength; - Error = RegEnumKeyExW(hSrcKey, - i, - lpNameBuffer, - &dwSubKeyNameLength, - NULL, - NULL, - NULL, - &LastWrite); - if (Error != ERROR_SUCCESS) - { - DPRINT1("Subkey enumeration failed (Error %lu)\n", Error); - HeapFree(GetProcessHeap(), - 0, - lpNameBuffer); - SetLastError((DWORD)Error); - return FALSE; - } - - Error = RegCreateKeyExW(hDstKey, - lpNameBuffer, - 0, - NULL, - REG_OPTION_NON_VOLATILE, - KEY_WRITE, - NULL, - &hDstSubKey, - &dwDisposition); - if (Error != ERROR_SUCCESS) - { - DPRINT1("Subkey creation failed (Error %lu)\n", Error); - HeapFree(GetProcessHeap(), - 0, - lpNameBuffer); - SetLastError((DWORD)Error); - return FALSE; - } - - Error = RegOpenKeyExW(hSrcKey, - lpNameBuffer, - 0, - KEY_READ, - &hSrcSubKey); - if (Error != ERROR_SUCCESS) - { - DPRINT1("Error: %lu\n", Error); - RegCloseKey(hDstSubKey); - HeapFree(GetProcessHeap(), - 0, - lpNameBuffer); - SetLastError((DWORD)Error); - return FALSE; - } - - if (!CopyKey(hDstSubKey, - hSrcSubKey)) - { - DPRINT1("Error: %lu\n", GetLastError()); - RegCloseKey (hSrcSubKey); - RegCloseKey (hDstSubKey); - HeapFree(GetProcessHeap(), - 0, - lpNameBuffer); - return FALSE; - } - - RegCloseKey(hSrcSubKey); - RegCloseKey(hDstSubKey); - } - - HeapFree(GetProcessHeap(), - 0, - lpNameBuffer); - } - - /* Copy values */ - if (dwValues != 0) - { - lpNameBuffer = HeapAlloc(GetProcessHeap(), - 0, - dwMaxValueNameLength * sizeof(WCHAR)); - if (lpNameBuffer == NULL) - { - DPRINT1("Buffer allocation failed\n"); - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - - lpDataBuffer = HeapAlloc(GetProcessHeap(), - 0, - dwMaxValueLength); - if (lpDataBuffer == NULL) - { - DPRINT1("Buffer allocation failed\n"); - HeapFree(GetProcessHeap(), - 0, - lpNameBuffer); - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - - for (i = 0; i < dwValues; i++) - { - dwValueNameLength = dwMaxValueNameLength; - dwValueLength = dwMaxValueLength; - Error = RegEnumValueW(hSrcKey, - i, - lpNameBuffer, - &dwValueNameLength, - NULL, - &dwType, - lpDataBuffer, - &dwValueLength); - if (Error != ERROR_SUCCESS) - { - DPRINT1("Error: %lu\n", Error); - HeapFree(GetProcessHeap(), - 0, - lpDataBuffer); - HeapFree(GetProcessHeap(), - 0, - lpNameBuffer); - SetLastError((DWORD)Error); - return FALSE; - } - - Error = RegSetValueExW(hDstKey, - lpNameBuffer, - 0, - dwType, - lpDataBuffer, - dwValueLength); - if (Error != ERROR_SUCCESS) - { - DPRINT1("Error: %lu\n", Error); - HeapFree(GetProcessHeap(), - 0, - lpDataBuffer); - HeapFree(GetProcessHeap(), - 0, - lpNameBuffer); - SetLastError((DWORD)Error); - return FALSE; - } - } - - HeapFree(GetProcessHeap(), - 0, - lpDataBuffer); - - HeapFree(GetProcessHeap(), - 0, - lpNameBuffer); - } - - DPRINT("CopyKey() done\n"); - - return TRUE; -#endif }

1 year, 11 months

[reactos] 03/04: [SERVICES] Use RegCopyTreeW from advapi32_vista

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0db5d8a3886166e025947… commit 0db5d8a3886166e0259478df8702a22a1b86168c Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Thu Dec 14 20:01:18 2023 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Mon Dec 18 23:14:14 2023 +0200 [SERVICES] Use RegCopyTreeW from advapi32_vista --- base/system/services/CMakeLists.txt | 2 +- base/system/services/controlset.c | 343 +-------------------------- dll/win32/advapi32_vista/advapi32_vista.spec | 1 + 3 files changed, 4 insertions(+), 342 deletions(-) diff --git a/base/system/services/CMakeLists.txt b/base/system/services/CMakeLists.txt index ba38f656da2..7961dd54ce1 100644 --- a/base/system/services/CMakeLists.txt +++ b/base/system/services/CMakeLists.txt @@ -23,6 +23,6 @@ add_executable(services ${SOURCE} services.rc) target_link_libraries(services ${PSEH_LIB}) set_module_type(services win32gui UNICODE) -add_importlibs(services userenv user32 advapi32 rpcrt4 msvcrt kernel32 ntdll) +add_importlibs(services userenv user32 advapi32 advapi32_vista rpcrt4 msvcrt kernel32 ntdll) add_pch(services services.h SOURCE) add_cd_file(TARGET services DESTINATION reactos/system32 FOR all) diff --git a/base/system/services/controlset.c b/base/system/services/controlset.c index b387ffd335c..e9fdc967e12 100644 --- a/base/system/services/controlset.c +++ b/base/system/services/controlset.c @@ -14,6 +14,8 @@ #define NDEBUG #include <debug.h> +LSTATUS WINAPI RegCopyTreeW(_In_ HKEY, _In_opt_ LPCWSTR, _In_ HKEY); +LSTATUS WINAPI RegDeleteTreeW(_In_ HKEY, _In_opt_ LPCWSTR); /* GLOBALS *******************************************************************/ @@ -22,337 +24,6 @@ static BOOL bBootAccepted = FALSE; /* FUNCTIONS *****************************************************************/ -#if (_WIN32_WINNT < 0x0600) -static -DWORD -ScmCopyTree( - HKEY hSrcKey, - HKEY hDstKey) -{ - DWORD dwSubKeys; - DWORD dwValues; - DWORD dwType; - DWORD dwMaxSubKeyNameLength; - DWORD dwSubKeyNameLength; - DWORD dwMaxValueNameLength; - DWORD dwValueNameLength; - DWORD dwMaxValueLength; - DWORD dwValueLength; - DWORD dwDisposition; - DWORD i; - LPWSTR lpNameBuffer; - LPBYTE lpDataBuffer; - HKEY hDstSubKey; - HKEY hSrcSubKey; - DWORD dwError; - - DPRINT("ScmCopyTree()\n"); - - dwError = RegQueryInfoKey(hSrcKey, - NULL, - NULL, - NULL, - &dwSubKeys, - &dwMaxSubKeyNameLength, - NULL, - &dwValues, - &dwMaxValueNameLength, - &dwMaxValueLength, - NULL, - NULL); - if (dwError != ERROR_SUCCESS) - { - DPRINT1("RegQueryInfoKey() failed (Error %lu)\n", dwError); - return dwError; - } - - dwMaxSubKeyNameLength++; - dwMaxValueNameLength++; - - DPRINT("dwSubKeys %lu\n", dwSubKeys); - DPRINT("dwMaxSubKeyNameLength %lu\n", dwMaxSubKeyNameLength); - DPRINT("dwValues %lu\n", dwValues); - DPRINT("dwMaxValueNameLength %lu\n", dwMaxValueNameLength); - DPRINT("dwMaxValueLength %lu\n", dwMaxValueLength); - - /* Copy subkeys */ - if (dwSubKeys != 0) - { - lpNameBuffer = HeapAlloc(GetProcessHeap(), - 0, - dwMaxSubKeyNameLength * sizeof(WCHAR)); - if (lpNameBuffer == NULL) - { - DPRINT1("Buffer allocation failed\n"); - return ERROR_NOT_ENOUGH_MEMORY; - } - - for (i = 0; i < dwSubKeys; i++) - { - dwSubKeyNameLength = dwMaxSubKeyNameLength; - dwError = RegEnumKeyExW(hSrcKey, - i, - lpNameBuffer, - &dwSubKeyNameLength, - NULL, - NULL, - NULL, - NULL); - if (dwError != ERROR_SUCCESS) - { - DPRINT1("Subkey enumeration failed (Error %lu)\n", dwError); - HeapFree(GetProcessHeap(), - 0, - lpNameBuffer); - return dwError; - } - - dwError = RegCreateKeyExW(hDstKey, - lpNameBuffer, - 0, - NULL, - REG_OPTION_NON_VOLATILE, - KEY_WRITE, - NULL, - &hDstSubKey, - &dwDisposition); - if (dwError != ERROR_SUCCESS) - { - DPRINT1("Subkey creation failed (Error %lu)\n", dwError); - HeapFree(GetProcessHeap(), - 0, - lpNameBuffer); - return dwError; - } - - dwError = RegOpenKeyExW(hSrcKey, - lpNameBuffer, - 0, - KEY_READ, - &hSrcSubKey); - if (dwError != ERROR_SUCCESS) - { - DPRINT1("Error: %lu\n", dwError); - RegCloseKey(hDstSubKey); - HeapFree(GetProcessHeap(), - 0, - lpNameBuffer); - return dwError; - } - - dwError = ScmCopyTree(hSrcSubKey, - hDstSubKey); - if (dwError != ERROR_SUCCESS) - { - DPRINT1("Error: %lu\n", dwError); - RegCloseKey (hSrcSubKey); - RegCloseKey (hDstSubKey); - HeapFree(GetProcessHeap(), - 0, - lpNameBuffer); - return dwError; - } - - RegCloseKey(hSrcSubKey); - RegCloseKey(hDstSubKey); - } - - HeapFree(GetProcessHeap(), - 0, - lpNameBuffer); - } - - /* Copy values */ - if (dwValues != 0) - { - lpNameBuffer = HeapAlloc(GetProcessHeap(), - 0, - dwMaxValueNameLength * sizeof(WCHAR)); - if (lpNameBuffer == NULL) - { - DPRINT1("Buffer allocation failed\n"); - return ERROR_NOT_ENOUGH_MEMORY; - } - - /* RegSetValueExW tries to read behind the maximum length, so give it space for that */ - lpDataBuffer = HeapAlloc(GetProcessHeap(), - HEAP_ZERO_MEMORY, - dwMaxValueLength + sizeof(WCHAR)); - if (lpDataBuffer == NULL) - { - DPRINT1("Buffer allocation failed\n"); - HeapFree(GetProcessHeap(), - 0, - lpNameBuffer); - return ERROR_NOT_ENOUGH_MEMORY; - } - - for (i = 0; i < dwValues; i++) - { - dwValueNameLength = dwMaxValueNameLength; - dwValueLength = dwMaxValueLength; - dwError = RegEnumValueW(hSrcKey, - i, - lpNameBuffer, - &dwValueNameLength, - NULL, - &dwType, - lpDataBuffer, - &dwValueLength); - if (dwError != ERROR_SUCCESS) - { - DPRINT1("Error: %lu\n", dwError); - HeapFree(GetProcessHeap(), - 0, - lpDataBuffer); - HeapFree(GetProcessHeap(), - 0, - lpNameBuffer); - return dwError; - } - - dwError = RegSetValueExW(hDstKey, - lpNameBuffer, - 0, - dwType, - lpDataBuffer, - dwValueLength); - if (dwError != ERROR_SUCCESS) - { - DPRINT1("Error: %lu\n", dwError); - HeapFree(GetProcessHeap(), - 0, - lpDataBuffer); - HeapFree(GetProcessHeap(), - 0, - lpNameBuffer); - return dwError; - } - } - - HeapFree(GetProcessHeap(), - 0, - lpDataBuffer); - - HeapFree(GetProcessHeap(), - 0, - lpNameBuffer); - } - - DPRINT("ScmCopyTree() done\n"); - - return ERROR_SUCCESS; -} - - -DWORD -ScmDeleteTree( - HKEY hKey, - PCWSTR pszSubKey) -{ - DWORD dwMaxSubkeyLength, dwMaxValueLength; - DWORD dwMaxLength, dwSize; - PWSTR pszName = NULL; - HKEY hSubKey = NULL; - DWORD dwError; - - if (pszSubKey != NULL) - { - dwError = RegOpenKeyExW(hKey, pszSubKey, 0, KEY_READ, &hSubKey); - if (dwError != ERROR_SUCCESS) - return dwError; - } - else - { - hSubKey = hKey; - } - - /* Get highest length for keys, values */ - dwError = RegQueryInfoKeyW(hSubKey, - NULL, - NULL, - NULL, - NULL, - &dwMaxSubkeyLength, - NULL, - NULL, - &dwMaxValueLength, - NULL, - NULL, - NULL); - if (dwError != ERROR_SUCCESS) - goto done; - - dwMaxSubkeyLength++; - dwMaxValueLength++; - dwMaxLength = max(dwMaxSubkeyLength, dwMaxValueLength); - - /* Allocate a buffer for key and value names */ - pszName = HeapAlloc(GetProcessHeap(), - 0, - dwMaxLength * sizeof(WCHAR)); - if (pszName == NULL) - { - dwError = ERROR_NOT_ENOUGH_MEMORY; - goto done; - } - - /* Recursively delete all the subkeys */ - while (TRUE) - { - dwSize = dwMaxLength; - if (RegEnumKeyExW(hSubKey, - 0, - pszName, - &dwSize, - NULL, - NULL, - NULL, - NULL)) - break; - - dwError = ScmDeleteTree(hSubKey, pszName); - if (dwError != ERROR_SUCCESS) - goto done; - } - - if (pszSubKey != NULL) - { - dwError = RegDeleteKeyW(hKey, pszSubKey); - } - else - { - while (TRUE) - { - dwSize = dwMaxLength; - if (RegEnumValueW(hKey, - 0, - pszName, - &dwSize, - NULL, - NULL, - NULL, - NULL)) - break; - - dwError = RegDeleteValueW(hKey, pszName); - if (dwError != ERROR_SUCCESS) - goto done; - } - } - -done: - if (pszName != NULL) - HeapFree(GetProcessHeap(), 0, pszName); - - if (pszSubKey != NULL) - RegCloseKey(hSubKey); - - return dwError; -} -#endif - - static DWORD ScmGetControlSetValues( @@ -546,14 +217,9 @@ ScmCopyControlSet( goto done; /* Copy the source control set to the destination control set */ -#if (_WIN32_WINNT >= 0x0600) dwError = RegCopyTreeW(hSourceControlSetKey, NULL, hDestinationControlSetKey); -#else - dwError = ScmCopyTree(hSourceControlSetKey, - hDestinationControlSetKey); -#endif if (dwError != ERROR_SUCCESS) goto done; @@ -595,13 +261,8 @@ ScmDeleteControlSet( return dwError; /* Delete the control set */ -#if (_WIN32_WINNT >= 0x0600) dwError = RegDeleteTreeW(hControlSetKey, NULL); -#else - dwError = ScmDeleteTree(hControlSetKey, - NULL); -#endif /* Open the system key */ RegCloseKey(hControlSetKey); diff --git a/dll/win32/advapi32_vista/advapi32_vista.spec b/dll/win32/advapi32_vista/advapi32_vista.spec index 969207292f6..9ca09897481 100644 --- a/dll/win32/advapi32_vista/advapi32_vista.spec +++ b/dll/win32/advapi32_vista/advapi32_vista.spec @@ -1,4 +1,5 @@ +@ stdcall RegCopyTreeW(ptr wstr ptr) @ stdcall RegDeleteTreeA(long str) @ stdcall RegDeleteTreeW(long wstr) @ stdcall RegSetKeyValueW(long wstr wstr long ptr long)

1 year, 11 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs