diff --git a/CHANGELOG.md b/CHANGELOG.md index f5259fa1..c3a86d8b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 silence and hang afterwards (which a fix in yabridge 3.7.0 previously addressed). +- Fixed building under (the currently upcoming) Wine 7.2 because of definition + changes to Wine's numeric types. ### yabridgectl diff --git a/src/wine-host/xdnd-proxy.cpp b/src/wine-host/xdnd-proxy.cpp index 318941ad..042a06fb 100644 --- a/src/wine-host/xdnd-proxy.cpp +++ b/src/wine-host/xdnd-proxy.cpp @@ -752,7 +752,7 @@ void CALLBACK dnd_winevent_callback(HWINEVENTHOOK /*hWinEventHook*/, // Don't handle windows that weren't created in this process, because // otherwise we obviously cannot access the `IDataObject` object - uint32_t process_id = 0; + DWORD process_id = 0; GetWindowThreadProcessId(hwnd, &process_id); if (process_id != GetCurrentProcessId()) { 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 // can drop the files onto native applications. std::array supported_formats{}; - unsigned int num_formats = 0; + ULONG num_formats = 0; enumerator->Next(supported_formats.size(), supported_formats.data(), &num_formats); enumerator->Release(); @@ -796,7 +796,7 @@ void CALLBACK dnd_winevent_callback(HWINEVENTHOOK /*hWinEventHook*/, // 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 // need to manually cap `num_formats` to 16. - num_formats = std::min(num_formats, static_cast(16)); + num_formats = std::min(num_formats, static_cast(16)); // NOTE: MeldaProduction plugins don't return any supported formats for some // reason, so we'll hardcode a HDROP