Support building with MSVC #151
Merged
Conversation
This file contains 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
strcasecmp is a GNU extension not supported by MSVC. On the other hand the _stricmp name is supported by MinGW. Since our code targets Windows it should be fine to use the MSVC name.
From VS2015+, the subsystem headers fails with "No target architecture" because the target definitions are declared only in windows.h. We only have those includes in one file, so it seems fine to do this.
Our in-tree header is for MinGW and doesn't compile on MSVC. Recent Windows SDK ships headers with the DX12 extensions we need, so unlike MinGW we should not need to use a vendored version.
|
Actually, forgot one change to add dllexport to nvapi_queryinterface. One sec. |
Saancreed
approved these changes
Jan 19, 2024
jp7677
reviewed
Jan 19, 2024
The canonical ABI for COM method calls that return a structure by value is to "pass a hidden first parameter that is the address of an uninitialized structure in which to place the result" [1]. As GCC does not conform to this convention, MinGW goes through length to workaround the ABI issue by adding a wrapper that explicitly takes the hidden return value parameter. This hack is unnecessary on MSVC. Unfortunately, it also means that we need to declare mocks with different argument count. Use ifdef against WIDL_EXPLICIT_AGGREGATE_RETURNS (the macro defined by MinGW to enable the wrappers) to switch to the appropriate version. For MSVC, there are no overloads coming from the ABI hack, so we can use the simpler IMPLEMENT_MOCK macros here. The luid return was also technically wrong (it should write to the pointer argument, not return an unrelated address), but the bug was masked by the MinGW wrapper. Fix it, just in case. [1]: https://devblogs.microsoft.com/oldnewthing/20220113-00/?p=106152
get_supported_arguments will discard the unsupported arguments, however clang-cl recognizes gcc-style arguments too and ends up taking unnecessary arguments.
These are macros commonly used to configure windows.h's behavior. NOMINMAX suppresses the definition of min and max to prevent collision with standard library functions. WIN32_LEAN_AND_MEAN skips definitions of rarely used Win32 APIs to speed up compilation.
Replace ::guid fields with the more standard __uuidof builtin. On MinGW, the GUIDs need to be associated with the interface using __CRT_UUID_DECL. This is not necessary for MSVC which recognize the declspec(uuid) from MIDL_INTERFACE.
The IID_ symbols requires linking to dxguid.lib on MSVC. This is not necessary if __uuidof is used.
Designated initializers require C++20. This was supported by GCC and Clang in older versions as vendor extensions, but not MSVC.
ishitatsuyuki
force-pushed
the
msvc
branch
3 times, most recently
from
53854d4 to
45bce23
Compare
clang-cl (MSVC mode) does not define __GNUC__, but still uses GCC-compatible diagnostic flags. Also add missing guard in nvapi_tests_private.h to suppress MSVC warnings about unknown pragma.
For now, suppress these warnings.
The C++ standard does not allow zero length arrays. Additionally, trying to initialize an unknown-length array with an empty initializer is treated as VLA in MSVC, which is also unsupported. Explicitly initializing as nullptr seems reasonable here.
If the variable is not const or constexpr MSVC complains that the array is a VLA which is unsupported. Instead, initialize the array with a constant length first, then use std::size (C++17 alternative to _countof) to retrieve the array length.
VLAs are not supported by MSVC.
This function has to be exported.
Copied mostly verbatim from DXVK. Also rename the Linux (MinGW) job for clarity.
jp7677
approved these changes
Jan 19, 2024
|
Thanks for the quick review! |
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This is a series to support building dxvk-nvapi on MSVC for fun, diversity and binary size reduction.
In addition to MSVC, cross compiling from Linux with clang-cl is also supported using https://github.com/mstorsjo/msvc-wine and a cross file like https://gist.github.com/ishitatsuyuki/bfa4b4764394f94b19115b182d269f4e.
Most changes are described in the commit message. This is a list of major breaking changes for those who need to rebase:
__CRT_UUID_DECLinstead ofFOO_GUID. The.cppfiles are deleted and the guid field no longer needs to be assigned manually.__uuidofinstead of::guidorIID_.