vanja/yabridge
1
0
Fork 0
mirror of https://github.com/robbert-vdh/yabridge.git synced 2026-05-09 20:29:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix building under Wine 7.2

Browse Source 
Which isn't out yet, but this already affects the current master branch.
This commit is contained in:
Robbert van der Helm
2022-02-02 13:56:05 +01:00
parent 7a0dcef85f
commit de470d345a
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG.md
+2
View File
@@ -30,6 +30,8 @@ Versioning](https://semver.org/spec/v2.0.0.html).
If you try to process audio from the...audio thread, then they will produce If you try to process audio from the...audio thread, then they will produce
silence and hang afterwards (which a fix in yabridge 3.7.0 previously silence and hang afterwards (which a fix in yabridge 3.7.0 previously
addressed). addressed).
- Fixed building under (the currently upcoming) Wine 7.2 because of definition
changes to Wine's numeric types.
### yabridgectl ### yabridgectl
src/wine-host/xdnd-proxy.cpp
+3 -3
View File
@@ -752,7 +752,7 @@ void CALLBACK dnd_winevent_callback(HWINEVENTHOOK /*hWinEventHook*/,
// Don't handle windows that weren't created in this process, because // Don't handle windows that weren't created in this process, because
// otherwise we obviously cannot access the `IDataObject` object // otherwise we obviously cannot access the `IDataObject` object
uint32_t process_id = 0; DWORD process_id = 0;
GetWindowThreadProcessId(hwnd, &process_id); GetWindowThreadProcessId(hwnd, &process_id);
if (process_id != GetCurrentProcessId()) { if (process_id != GetCurrentProcessId()) {
return; return;
@@ -788,7 +788,7 @@ void CALLBACK dnd_winevent_callback(HWINEVENTHOOK /*hWinEventHook*/,
// With this information we will set up XDND with those file paths, so we // With this information we will set up XDND with those file paths, so we
// can drop the files onto native applications. // can drop the files onto native applications.
std::array<FORMATETC, 16> supported_formats{}; std::array<FORMATETC, 16> supported_formats{};
unsigned int num_formats = 0; ULONG num_formats = 0;
enumerator->Next(supported_formats.size(), supported_formats.data(), enumerator->Next(supported_formats.size(), supported_formats.data(),
&num_formats); &num_formats);
enumerator->Release(); enumerator->Release();
@@ -796,7 +796,7 @@ void CALLBACK dnd_winevent_callback(HWINEVENTHOOK /*hWinEventHook*/,
// NOTE: This DrumCore 3 plugin reports 4294967282 for `num_formats` which // NOTE: This DrumCore 3 plugin reports 4294967282 for `num_formats` which
// is uh a lot more than 16. So to prevent causing a segfault here we // is uh a lot more than 16. So to prevent causing a segfault here we
// need to manually cap `num_formats` to 16. // need to manually cap `num_formats` to 16.
num_formats = std::min(num_formats, static_cast<unsigned int>(16)); num_formats = std::min(num_formats, static_cast<ULONG>(16));
// NOTE: MeldaProduction plugins don't return any supported formats for some // NOTE: MeldaProduction plugins don't return any supported formats for some
// reason, so we'll hardcode a HDROP // reason, so we'll hardcode a HDROP