From 0d4dd5849af804bbc318be226185b58b581bfa45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Sun, 16 Apr 2017 08:37:50 +0200 Subject: [PATCH] Remove workaround for mingw bug, now fixed upstream --- src/openrct2/platform/windows.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/openrct2/platform/windows.c b/src/openrct2/platform/windows.c index 8ecabb2218..cc528147ab 100644 --- a/src/openrct2/platform/windows.c +++ b/src/openrct2/platform/windows.c @@ -1258,14 +1258,10 @@ bool platform_setup_uri_protocol() HKEY hMuiCacheKey; if (RegCreateKeyW(hRootKey, MUI_CACHE, &hMuiCacheKey) == ERROR_SUCCESS) { swprintf_s(buffer, sizeof(buffer), L"%s.FriendlyAppName", exePath); -#ifdef __MINGW32__ - // mingw-w64 defines RegSetKeyValueW's signature incorrectly - // A fix has already been submitted upstream, this can be be removed after their next release: + // mingw-w64 used to define RegSetKeyValueW's signature incorrectly + // You need at least mingw-w64 5.0 including this commit: // https://sourceforge.net/p/mingw-w64/mingw-w64/ci/da9341980a4b70be3563ac09b5927539e7da21f7/ - RegSetKeyValueW(hMuiCacheKey, NULL, (LPCSTR)buffer, REG_SZ, (LPCSTR)L"OpenRCT2", sizeof(L"OpenRCT2") + 1); -#else RegSetKeyValueW(hMuiCacheKey, NULL, buffer, REG_SZ, L"OpenRCT2", sizeof(L"OpenRCT2") + 1); -#endif } log_verbose("URI protocol setup successful");