support both cimfs and cimwriter dlls #2587
Open
+1,169
−538
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
anmaxvl
force-pushed
the
cimfs-backward-compat
branch
3 times, most recently
from
2ccfeab to
47570f0
Compare
The PR introducing cimwriter.dll was a breaking change, which is fixed in this PR. Add both cimfs.dll and cimwriter.dll syscalls and only use cimwriter.dll when present. Signed-off-by: Maksim An <maksiman@microsoft.com>
anmaxvl
force-pushed
the
cimfs-backward-compat
branch
from
47570f0 to
36bea94
Compare
helsaawy
reviewed
Jan 14, 2026
Contributor
helsaawy
left a comment
helsaawy
left a comment
There was a problem hiding this comment.
nits in comments; but LGTM overall
| ) | ||
|
|
||
| // Type aliases | ||
| type g = guid.GUID |
Contributor
There was a problem hiding this comment.
I know its already called g elsewhere, but can we do
Suggested change
| type g = guid.GUID | |
| type GUID = guid.GUID |
| //sys CimMergeMountVerifiedImage(numCimPaths uint32, backingImagePaths *ImagePath, flags uint32, volumeID *g, hashSize uint16, hash *byte) (hr error) = cimfs.CimMergeMountVerifiedImage | ||
|
|
||
| // CimFsSupported checks if cimfs.dll is present on the system. | ||
| func CimFsSupported() bool { |
Contributor
There was a problem hiding this comment.
nit: avoid stutter here (cimfs.CimFsSupported()) and with cimwriter (cimwriter.CimWriterSupported())
Suggested change
| func CimFsSupported() bool { | |
| func Supported() bool { |
| //sys CimSealImage(blockCimPath string, hashSize *uint64, fixedHeaderSize *uint64, hash *byte) (hr error) = cimfs.CimSealImage? | ||
| //sys CimGetVerificationInformation(blockCimPath string, isSealed *uint32, hashSize *uint64, signatureSize *uint64, fixedHeaderSize *uint64, hash *byte, signature *byte) (hr error) = cimfs.CimGetVerificationInformation? | ||
| //sys CimMountVerifiedImage(imagePath string, fsName string, flags uint32, volumeID *g, hashSize uint16, hash *byte) (hr error) = cimfs.CimMountVerifiedImage? | ||
| //sys CimMergeMountVerifiedImage(numCimPaths uint32, backingImagePaths *ImagePath, flags uint32, volumeID *g, hashSize uint16, hash *byte) (hr error) = cimfs.CimMergeMountVerifiedImage |
Contributor
There was a problem hiding this comment.
carried over from internal/winapi/cimfs.go, but CimMergeMountVerifiedImage is the declaration without a ?:
Suggested change
| //sys CimMergeMountVerifiedImage(numCimPaths uint32, backingImagePaths *ImagePath, flags uint32, volumeID *g, hashSize uint16, hash *byte) (hr error) = cimfs.CimMergeMountVerifiedImage | |
| //sys CimMergeMountVerifiedImage(numCimPaths uint32, backingImagePaths *ImagePath, flags uint32, volumeID *g, hashSize uint16, hash *byte) (hr error) = cimfs.CimMergeMountVerifiedImage? |
| //sys CimGetVerificationInformation(blockCimPath string, isSealed *uint32, hashSize *uint64, signatureSize *uint64, fixedHeaderSize *uint64, hash *byte, signature *byte) (hr error) = cimfs.CimGetVerificationInformation? | ||
| //sys CimMountVerifiedImage(imagePath string, fsName string, flags uint32, volumeID *g, hashSize uint16, hash *byte) (hr error) = cimfs.CimMountVerifiedImage? | ||
| //sys CimMergeMountVerifiedImage(numCimPaths uint32, backingImagePaths *CimFsImagePath, flags uint32, volumeID *g, hashSize uint16, hash *byte) (hr error) = cimfs.CimMergeMountVerifiedImage | ||
|
|
Contributor
There was a problem hiding this comment.
you could probably do something like the below to simplify a lot the boilerplate for picking between the cimfs and cimwriter (playground):
func pick[F any](cwFn, cFn F) F {
if cimwriter.CimWriterSupported() {
return cwFn
}
return cFn
}
func CimCreateImage(imagePath string, oldFSName *uint16, newFSName *uint16, cimFSHandle *types.FsHandle) error {
return pick(
cimwriter.CimCreateImage,
cimfs.CimCreateImage,
)(imagePath, oldFSName, newFSName, cimFSHandle)
}
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The PR introducing cimwriter.dll was a breaking change, which is fixed in this PR.
Add both cimfs.dll and cimwriter.dll syscalls and only use cimwriter.dll when present.