From 879e1cff637b0c2645a2c0ffff4e90f86d88c654 Mon Sep 17 00:00:00 2001 From: Whindmar Saksit Date: Mon, 18 May 2026 23:30:31 +0200 Subject: [PATCH] [INCLUDE/WINE] Don't use DECLSPEC_IMPORT in shlwapi.h (#9034) This fixes wscript.exe crashing on .wsf files because of delay-loaded shlwapi, the bug was introduced in 6762703 (PR #8419) --- sdk/include/wine/shlwapi.h | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/sdk/include/wine/shlwapi.h b/sdk/include/wine/shlwapi.h index e34346494aa..7ba0053c20a 100644 --- a/sdk/include/wine/shlwapi.h +++ b/sdk/include/wine/shlwapi.h @@ -39,6 +39,16 @@ extern "C" { #endif #endif +#ifdef __REACTOS__ +#if defined(__GNUC__) && !defined(_SHLWAPI_) +# undef WINSHLWAPI +# define WINSHLWAPI /* FIXME: HACK: CORE-6504 */ +#endif +#ifndef __MSABI_LONG +# define __MSABI_LONG(x) x ## l +#endif +#endif // __REACTOS__ + #ifndef NO_SHLWAPI_HTTP WINSHLWAPI HRESULT WINAPI GetAcceptLanguagesA(char *buffer, DWORD *buff_len); @@ -47,11 +57,6 @@ WINSHLWAPI HRESULT WINAPI GetAcceptLanguagesW(WCHAR *buffer, DWORD *buff_len); #endif /* NO_SHLWAPI_HTTP */ -#ifdef __REACTOS__ -#ifndef __MSABI_LONG -# define __MSABI_LONG(x) x ## l -#endif -#endif // __REACTOS__ #ifndef NO_SHLWAPI_REG /* Registry functions */