- Wine-Commits - list.winehq.org

Alexandre Julliard : include: Use proper dllimports for wininet functions.
by Alexandre Julliard Dec. 7, 2022

Dec. 7, 2022

Module: wine Branch: master Commit: 9be166e2517cdfd85c993a6f845c05d46d883c56 URL: https://gitlab.winehq.org/wine/wine/-/commit/9be166e2517cdfd85c993a6f845c05… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 7 14:15:30 2022 +0100 include: Use proper dllimports for wininet functions. --- dlls/wininet/Makefile.in | 1 + include/wininet.h | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/wininet/Makefile.in b/dlls/wininet/Makefile.in index 7e8111f811d..5fbb66be50e 100644 --- a/dlls/wininet/Makefile.in +++ b/dlls/wininet/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -D_WININET_INTERNAL_ MODULE = wininet.dll IMPORTLIB = wininet IMPORTS = $(ZLIB_PE_LIBS) mpr shlwapi shell32 user32 ws2_32 advapi32 diff --git a/include/wininet.h b/include/wininet.h index cef5da15de2..f1c4e312281 100644 --- a/include/wininet.h +++ b/include/wininet.h @@ -23,7 +23,14 @@ extern "C" { #endif -#define INTERNETAPI +#ifndef INTERNETAPI +#ifdef _WININET_INTERNAL_ +# define INTERNETAPI +#else +# define INTERNETAPI DECLSPEC_IMPORT +#endif +#endif + #define BOOLAPI INTERNETAPI BOOL WINAPI typedef LPVOID HINTERNET;

1 0

Alexandre Julliard : include: Use proper dllimports for OLE functions.
by Alexandre Julliard Dec. 7, 2022

Dec. 7, 2022

Module: wine Branch: master Commit: 3de15569fe71b0d64a4440f251bed9b02a1a81dd URL: https://gitlab.winehq.org/wine/wine/-/commit/3de15569fe71b0d64a4440f251bed9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 7 12:01:25 2022 +0100 include: Use proper dllimports for OLE functions. --- dlls/combase/Makefile.in | 1 + dlls/combase/errorinfo.c | 1 + dlls/ole32/Makefile.in | 1 + dlls/oleaut32/Makefile.in | 1 + include/objbase.h | 245 +++++++------- include/ole2.h | 178 +++++------ include/oleauto.h | 794 +++++++++++++++++++++++----------------------- 7 files changed, 606 insertions(+), 615 deletions(-)

1 0

Alexandre Julliard : include: Use proper dllimports for comctl32 functions.
by Alexandre Julliard Dec. 7, 2022

Dec. 7, 2022

Module: wine Branch: master Commit: c63f485379f353a9f24591cbd16fd8eb0f66ed8a URL: https://gitlab.winehq.org/wine/wine/-/commit/c63f485379f353a9f24591cbd16fd8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 7 13:21:39 2022 +0100 include: Use proper dllimports for comctl32 functions. --- dlls/comctl32/Makefile.in | 1 + include/commctrl.h | 215 +++++++++++++++++++++++----------------------- include/prsht.h | 18 ++-- 3 files changed, 122 insertions(+), 112 deletions(-)

1 0

Alexandre Julliard : include: Use proper dllimports for crypt32 functions.
by Alexandre Julliard Dec. 7, 2022

Dec. 7, 2022

Module: wine Branch: master Commit: f9ee565c23869ad279c6da53e80460b53cd8560f URL: https://gitlab.winehq.org/wine/wine/-/commit/f9ee565c23869ad279c6da53e80460… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 7 13:07:52 2022 +0100 include: Use proper dllimports for crypt32 functions. --- dlls/crypt32/Makefile.in | 1 + include/wincrypt.h | 418 ++++++++++++++++++++++++----------------------- 2 files changed, 214 insertions(+), 205 deletions(-)

1 0

Alexandre Julliard : include: Use proper dllimports for comdlg32 functions.
by Alexandre Julliard Dec. 7, 2022

Dec. 7, 2022

Module: wine Branch: master Commit: 83a378f1d18486dead7be729ae1bfa0ac27e7ae9 URL: https://gitlab.winehq.org/wine/wine/-/commit/83a378f1d18486dead7be729ae1bfa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 7 13:30:00 2022 +0100 include: Use proper dllimports for comdlg32 functions. --- dlls/comdlg32/Makefile.in | 1 + include/commdlg.h | 69 +++++++++++++++++++++++++---------------------- 2 files changed, 38 insertions(+), 32 deletions(-) diff --git a/dlls/comdlg32/Makefile.in b/dlls/comdlg32/Makefile.in index f919a266a07..91a12f8a7e4 100644 --- a/dlls/comdlg32/Makefile.in +++ b/dlls/comdlg32/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -D_COMDLG32_ MODULE = comdlg32.dll IMPORTLIB = comdlg32 IMPORTS = uuid shell32 shlwapi comctl32 winspool user32 gdi32 advapi32 diff --git a/include/commdlg.h b/include/commdlg.h index 9b678296516..cd06a8c75a6 100644 --- a/include/commdlg.h +++ b/include/commdlg.h @@ -30,6 +30,14 @@ extern "C" { #include <pshpack1.h> #endif +#ifndef WINCOMMDLGAPI +#ifdef _COMDLG32_ +# define WINCOMMDLGAPI +#else +# define WINCOMMDLGAPI DECLSPEC_IMPORT +#endif +#endif + #ifndef SNDMSG #ifdef __cplusplus #define SNDMSG ::SendMessage @@ -777,40 +785,37 @@ DECLARE_INTERFACE_(IPrintDialogServices,IUnknown) #endif /* STDMETHOD */ -BOOL WINAPI ChooseColorA(LPCHOOSECOLORA lpChCol); -BOOL WINAPI ChooseColorW(LPCHOOSECOLORW lpChCol); -#define ChooseColor WINELIB_NAME_AW(ChooseColor) -DWORD WINAPI CommDlgExtendedError(void); -HWND WINAPI FindTextA(LPFINDREPLACEA lpFind); -HWND WINAPI FindTextW(LPFINDREPLACEW lpFind); -#define FindText WINELIB_NAME_AW(FindText) -short WINAPI GetFileTitleA(LPCSTR lpFile, LPSTR lpTitle, WORD cbBuf); -short WINAPI GetFileTitleW(LPCWSTR lpFile, LPWSTR lpTitle, WORD cbBuf); -#define GetFileTitle WINELIB_NAME_AW(GetFileTitle) -BOOL WINAPI GetOpenFileNameA(LPOPENFILENAMEA ofn); -BOOL WINAPI GetOpenFileNameW(LPOPENFILENAMEW ofn); +WINCOMMDLGAPI BOOL WINAPI ChooseColorA(LPCHOOSECOLORA lpChCol); +WINCOMMDLGAPI BOOL WINAPI ChooseColorW(LPCHOOSECOLORW lpChCol); +#define ChooseColor WINELIB_NAME_AW(ChooseColor) +WINCOMMDLGAPI DWORD WINAPI CommDlgExtendedError(void); +WINCOMMDLGAPI HWND WINAPI FindTextA(LPFINDREPLACEA lpFind); +WINCOMMDLGAPI HWND WINAPI FindTextW(LPFINDREPLACEW lpFind); +#define FindText WINELIB_NAME_AW(FindText) +WINCOMMDLGAPI short WINAPI GetFileTitleA(LPCSTR lpFile, LPSTR lpTitle, WORD cbBuf); +WINCOMMDLGAPI short WINAPI GetFileTitleW(LPCWSTR lpFile, LPWSTR lpTitle, WORD cbBuf); +#define GetFileTitle WINELIB_NAME_AW(GetFileTitle) +WINCOMMDLGAPI BOOL WINAPI GetOpenFileNameA(LPOPENFILENAMEA ofn); +WINCOMMDLGAPI BOOL WINAPI GetOpenFileNameW(LPOPENFILENAMEW ofn); #define GetOpenFileName WINELIB_NAME_AW(GetOpenFileName) -BOOL WINAPI GetSaveFileNameA(LPOPENFILENAMEA ofn); -BOOL WINAPI GetSaveFileNameW(LPOPENFILENAMEW ofn); +WINCOMMDLGAPI BOOL WINAPI GetSaveFileNameA(LPOPENFILENAMEA ofn); +WINCOMMDLGAPI BOOL WINAPI GetSaveFileNameW(LPOPENFILENAMEW ofn); #define GetSaveFileName WINELIB_NAME_AW(GetSaveFileName) -BOOL WINAPI PageSetupDlgA( LPPAGESETUPDLGA ); -BOOL WINAPI PageSetupDlgW( LPPAGESETUPDLGW ); -#define PageSetupDlg WINELIB_NAME_AW(PageSetupDlg) -BOOL WINAPI PrintDlgA( LPPRINTDLGA printdlg); -BOOL WINAPI PrintDlgW( LPPRINTDLGW printdlg); -#define PrintDlg WINELIB_NAME_AW(PrintDlg) -HRESULT WINAPI PrintDlgExA(LPPRINTDLGEXA); -HRESULT WINAPI PrintDlgExW(LPPRINTDLGEXW); -#define PrintDlgEx WINELIB_NAME_AW(PrintDlgEx) -HWND WINAPI ReplaceTextA( LPFINDREPLACEA lpFind); -HWND WINAPI ReplaceTextW( LPFINDREPLACEW lpFind); -#define ReplaceText WINELIB_NAME_AW(ReplaceText) -BOOL WINAPI ChooseFontA(LPCHOOSEFONTA); -BOOL WINAPI ChooseFontW(LPCHOOSEFONTW); -#define ChooseFont WINELIB_NAME_AW(ChooseFont) - -void COMDLG32_SetCommDlgExtendedError(DWORD err); - +WINCOMMDLGAPI BOOL WINAPI PageSetupDlgA( LPPAGESETUPDLGA ); +WINCOMMDLGAPI BOOL WINAPI PageSetupDlgW( LPPAGESETUPDLGW ); +#define PageSetupDlg WINELIB_NAME_AW(PageSetupDlg) +WINCOMMDLGAPI BOOL WINAPI PrintDlgA( LPPRINTDLGA printdlg); +WINCOMMDLGAPI BOOL WINAPI PrintDlgW( LPPRINTDLGW printdlg); +#define PrintDlg WINELIB_NAME_AW(PrintDlg) +WINCOMMDLGAPI HRESULT WINAPI PrintDlgExA(LPPRINTDLGEXA); +WINCOMMDLGAPI HRESULT WINAPI PrintDlgExW(LPPRINTDLGEXW); +#define PrintDlgEx WINELIB_NAME_AW(PrintDlgEx) +WINCOMMDLGAPI HWND WINAPI ReplaceTextA( LPFINDREPLACEA lpFind); +WINCOMMDLGAPI HWND WINAPI ReplaceTextW( LPFINDREPLACEW lpFind); +#define ReplaceText WINELIB_NAME_AW(ReplaceText) +WINCOMMDLGAPI BOOL WINAPI ChooseFontA(LPCHOOSEFONTA); +WINCOMMDLGAPI BOOL WINAPI ChooseFontW(LPCHOOSEFONTW); +#define ChooseFont WINELIB_NAME_AW(ChooseFont) #ifndef _WIN64 #include <poppack.h>

1 0

Alexandre Julliard : include: Use proper dllimports for rpcrt4 functions.
by Alexandre Julliard Dec. 7, 2022

Dec. 7, 2022

Module: wine Branch: master Commit: 9fc9c91bf47948f2f35699fe2956955d609198d5 URL: https://gitlab.winehq.org/wine/wine/-/commit/9fc9c91bf47948f2f35699fe295695… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 7 11:50:06 2022 +0100 include: Use proper dllimports for rpcrt4 functions. --- dlls/rpcrt4/Makefile.in | 2 +- include/rpc.h | 9 ++++++++- include/rpcproxy.h | 40 ++++++++++++++-------------------------- 3 files changed, 23 insertions(+), 28 deletions(-) diff --git a/dlls/rpcrt4/Makefile.in b/dlls/rpcrt4/Makefile.in index 822e6ded35d..2aa2a5376aa 100644 --- a/dlls/rpcrt4/Makefile.in +++ b/dlls/rpcrt4/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DMSWMSG +EXTRADEFS = -D_RPCRT4_ -DMSWMSG MODULE = rpcrt4.dll IMPORTLIB = rpcrt4 IMPORTS = uuid advapi32 diff --git a/include/rpc.h b/include/rpc.h index 9fa1c1ef161..0b029532655 100644 --- a/include/rpc.h +++ b/include/rpc.h @@ -38,9 +38,16 @@ #define __RPC_USER __stdcall #define __RPC_STUB __stdcall #define RPC_ENTRY __stdcall + +#ifndef RPCRTAPI +#if !defined(_RPCRT4_) && !defined(_KRPCENV_) +#define RPCRTAPI DECLSPEC_IMPORT +#else #define RPCRTAPI -typedef LONG RPC_STATUS; +#endif +#endif +typedef LONG RPC_STATUS; typedef void* I_RPC_HANDLE; #include <rpcdce.h> diff --git a/include/rpcproxy.h b/include/rpcproxy.h index 34321d05064..87bb7022629 100644 --- a/include/rpcproxy.h +++ b/include/rpcproxy.h @@ -125,34 +125,22 @@ typedef struct tagCStdPSFactoryBuffer #define STUB_FORWARDING_FUNCTION NdrStubForwardingFunction -ULONG STDMETHODCALLTYPE CStdStubBuffer2_Release(IRpcStubBuffer *This) DECLSPEC_HIDDEN; -ULONG STDMETHODCALLTYPE NdrCStdStubBuffer2_Release(IRpcStubBuffer *This, IPSFactoryBuffer *pPSF); - #define CStdStubBuffer_DELEGATING_METHODS 0, 0, CStdStubBuffer2_Release, 0, 0, 0, 0, 0, 0, 0 - -HRESULT WINAPI - CStdStubBuffer_QueryInterface( IRpcStubBuffer *This, REFIID riid, void **ppvObject ); -ULONG WINAPI - CStdStubBuffer_AddRef( IRpcStubBuffer *This ); -ULONG WINAPI - CStdStubBuffer_Release( IRpcStubBuffer *This ) DECLSPEC_HIDDEN; -ULONG WINAPI - NdrCStdStubBuffer_Release( IRpcStubBuffer *This, IPSFactoryBuffer *pPSF ); -HRESULT WINAPI - CStdStubBuffer_Connect( IRpcStubBuffer *This, IUnknown *pUnkServer ); -void WINAPI - CStdStubBuffer_Disconnect( IRpcStubBuffer *This ); -HRESULT WINAPI - CStdStubBuffer_Invoke( IRpcStubBuffer *This, RPCOLEMESSAGE *pRpcMsg, IRpcChannelBuffer *pRpcChannelBuffer ); -IRpcStubBuffer * WINAPI - CStdStubBuffer_IsIIDSupported( IRpcStubBuffer *This, REFIID riid ); -ULONG WINAPI - CStdStubBuffer_CountRefs( IRpcStubBuffer *This ); -HRESULT WINAPI - CStdStubBuffer_DebugServerQueryInterface( IRpcStubBuffer *This, void **ppv ); -void WINAPI - CStdStubBuffer_DebugServerRelease( IRpcStubBuffer *This, void *pv ); +RPCRTAPI HRESULT WINAPI CStdStubBuffer_QueryInterface( IRpcStubBuffer *This, REFIID riid, void **ppvObject ); +RPCRTAPI ULONG WINAPI CStdStubBuffer_AddRef( IRpcStubBuffer *This ); +RPCRTAPI HRESULT WINAPI CStdStubBuffer_Connect( IRpcStubBuffer *This, IUnknown *pUnkServer ); +RPCRTAPI void WINAPI CStdStubBuffer_Disconnect( IRpcStubBuffer *This ); +RPCRTAPI HRESULT WINAPI CStdStubBuffer_Invoke( IRpcStubBuffer *This, RPCOLEMESSAGE *pRpcMsg, IRpcChannelBuffer *pRpcChannelBuffer ); +RPCRTAPI IRpcStubBuffer * WINAPI CStdStubBuffer_IsIIDSupported( IRpcStubBuffer *This, REFIID riid ); +RPCRTAPI ULONG WINAPI CStdStubBuffer_CountRefs( IRpcStubBuffer *This ); +RPCRTAPI HRESULT WINAPI CStdStubBuffer_DebugServerQueryInterface( IRpcStubBuffer *This, void **ppv ); +RPCRTAPI void WINAPI CStdStubBuffer_DebugServerRelease( IRpcStubBuffer *This, void *pv ); +RPCRTAPI ULONG WINAPI NdrCStdStubBuffer_Release( IRpcStubBuffer *This, IPSFactoryBuffer *pPSF ); +RPCRTAPI ULONG WINAPI NdrCStdStubBuffer2_Release(IRpcStubBuffer *This, IPSFactoryBuffer *pPSF); + +ULONG STDMETHODCALLTYPE CStdStubBuffer_Release( IRpcStubBuffer *This ) DECLSPEC_HIDDEN; +ULONG STDMETHODCALLTYPE CStdStubBuffer2_Release(IRpcStubBuffer *This) DECLSPEC_HIDDEN; #define CStdStubBuffer_METHODS \ CStdStubBuffer_QueryInterface, \

1 0

Alexandre Julliard : include: Use proper dllimports for shlwapi functions.
by Alexandre Julliard Dec. 7, 2022

Dec. 7, 2022

Module: wine Branch: master Commit: 48aec0047751995b3b85fb659575aeb3ed00eec0 URL: https://gitlab.winehq.org/wine/wine/-/commit/48aec0047751995b3b85fb659575ae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 7 11:42:29 2022 +0100 include: Use proper dllimports for shlwapi functions. --- dlls/kernelbase/Makefile.in | 2 +- dlls/shcore/main.c | 1 + dlls/shell32/shell32.spec | 8 +- dlls/shell32/shellord.c | 62 ----- dlls/shlwapi/Makefile.in | 1 + include/shlwapi.h | 658 ++++++++++++++++++++++---------------------- 6 files changed, 340 insertions(+), 392 deletions(-)

1 0

Alexandre Julliard : include: Use proper dllimports for version functions.
by Alexandre Julliard Dec. 7, 2022

Dec. 7, 2022

Module: wine Branch: master Commit: a1f0d535e0b6c7b12f3262a195a798ff35a403ea URL: https://gitlab.winehq.org/wine/wine/-/commit/a1f0d535e0b6c7b12f3262a195a798… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 7 11:07:43 2022 +0100 include: Use proper dllimports for version functions. --- include/winver.h | 49 +++++++++++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/include/winver.h b/include/winver.h index b40a566ea4a..007877e8e4d 100644 --- a/include/winver.h +++ b/include/winver.h @@ -31,30 +31,31 @@ extern "C" { /* function prototypes */ -DWORD WINAPI VerFindFileA(DWORD,LPCSTR,LPCSTR,LPCSTR,LPSTR,PUINT,LPSTR,PUINT); -DWORD WINAPI VerFindFileW(DWORD,LPCWSTR,LPCWSTR,LPCWSTR,LPWSTR,PUINT,LPWSTR,PUINT); -#define VerFindFile WINELIB_NAME_AW(VerFindFile) -DWORD WINAPI VerInstallFileA(DWORD,LPCSTR,LPCSTR,LPCSTR,LPCSTR,LPCSTR,LPSTR,PUINT); -DWORD WINAPI VerInstallFileW(DWORD,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR,LPWSTR,PUINT); -#define VerInstallFile WINELIB_NAME_AW(VerInstallFile) -DWORD WINAPI VerLanguageNameA(DWORD,LPSTR,DWORD); -DWORD WINAPI VerLanguageNameW(DWORD,LPWSTR,DWORD); -#define VerLanguageName WINELIB_NAME_AW(VerLanguageName) -BOOL WINAPI VerQueryValueA(LPCVOID,LPCSTR,LPVOID*,PUINT); -BOOL WINAPI VerQueryValueW(LPCVOID,LPCWSTR,LPVOID*,PUINT); -#define VerQueryValue WINELIB_NAME_AW(VerQueryValue) -DWORD WINAPI GetFileVersionInfoSizeA(LPCSTR,LPDWORD); -DWORD WINAPI GetFileVersionInfoSizeW(LPCWSTR,LPDWORD); -#define GetFileVersionInfoSize WINELIB_NAME_AW(GetFileVersionInfoSize) -BOOL WINAPI GetFileVersionInfoA(LPCSTR,DWORD,DWORD,LPVOID); -BOOL WINAPI GetFileVersionInfoW(LPCWSTR,DWORD,DWORD,LPVOID); -#define GetFileVersionInfo WINELIB_NAME_AW(GetFileVersionInfo) -DWORD WINAPI GetFileVersionInfoSizeExA(DWORD,LPCSTR,LPDWORD); -DWORD WINAPI GetFileVersionInfoSizeExW(DWORD,LPCWSTR,LPDWORD); -#define GetFileVersionInfoSizeEx WINELIB_NAME_AW(GetFileVersionInfoSizeEx) -BOOL WINAPI GetFileVersionInfoExA(DWORD,LPCSTR,DWORD,DWORD,LPVOID); -BOOL WINAPI GetFileVersionInfoExW(DWORD,LPCWSTR,DWORD,DWORD,LPVOID); -#define GetFileVersionInfoEx WINELIB_NAME_AW(GetFileVersionInfoEx) +DWORD WINAPI VerInstallFileA(DWORD,LPCSTR,LPCSTR,LPCSTR,LPCSTR,LPCSTR,LPSTR,PUINT); +DWORD WINAPI VerInstallFileW(DWORD,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR,LPWSTR,PUINT); +#define VerInstallFile WINELIB_NAME_AW(VerInstallFile) + +WINBASEAPI DWORD WINAPI VerFindFileA(DWORD,LPCSTR,LPCSTR,LPCSTR,LPSTR,PUINT,LPSTR,PUINT); +WINBASEAPI DWORD WINAPI VerFindFileW(DWORD,LPCWSTR,LPCWSTR,LPCWSTR,LPWSTR,PUINT,LPWSTR,PUINT); +#define VerFindFile WINELIB_NAME_AW(VerFindFile) +WINBASEAPI DWORD WINAPI VerLanguageNameA(DWORD,LPSTR,DWORD); +WINBASEAPI DWORD WINAPI VerLanguageNameW(DWORD,LPWSTR,DWORD); +#define VerLanguageName WINELIB_NAME_AW(VerLanguageName) +WINBASEAPI BOOL WINAPI VerQueryValueA(LPCVOID,LPCSTR,LPVOID*,PUINT); +WINBASEAPI BOOL WINAPI VerQueryValueW(LPCVOID,LPCWSTR,LPVOID*,PUINT); +#define VerQueryValue WINELIB_NAME_AW(VerQueryValue) +WINBASEAPI DWORD WINAPI GetFileVersionInfoSizeA(LPCSTR,LPDWORD); +WINBASEAPI DWORD WINAPI GetFileVersionInfoSizeW(LPCWSTR,LPDWORD); +#define GetFileVersionInfoSize WINELIB_NAME_AW(GetFileVersionInfoSize) +WINBASEAPI BOOL WINAPI GetFileVersionInfoA(LPCSTR,DWORD,DWORD,LPVOID); +WINBASEAPI BOOL WINAPI GetFileVersionInfoW(LPCWSTR,DWORD,DWORD,LPVOID); +#define GetFileVersionInfo WINELIB_NAME_AW(GetFileVersionInfo) +WINBASEAPI DWORD WINAPI GetFileVersionInfoSizeExA(DWORD,LPCSTR,LPDWORD); +WINBASEAPI DWORD WINAPI GetFileVersionInfoSizeExW(DWORD,LPCWSTR,LPDWORD); +#define GetFileVersionInfoSizeEx WINELIB_NAME_AW(GetFileVersionInfoSizeEx) +WINBASEAPI BOOL WINAPI GetFileVersionInfoExA(DWORD,LPCSTR,DWORD,DWORD,LPVOID); +WINBASEAPI BOOL WINAPI GetFileVersionInfoExW(DWORD,LPCWSTR,DWORD,DWORD,LPVOID); +#define GetFileVersionInfoEx WINELIB_NAME_AW(GetFileVersionInfoEx) #endif /* RC_INVOKED */

1 0

Alexandre Julliard : include: Use proper dllimports for lz32 functions.
by Alexandre Julliard Dec. 7, 2022

Dec. 7, 2022

Module: wine Branch: master Commit: e5ac04db5c1994be74b534ebfde02b081d8ef3ba URL: https://gitlab.winehq.org/wine/wine/-/commit/e5ac04db5c1994be74b534ebfde02b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 7 11:07:33 2022 +0100 include: Use proper dllimports for lz32 functions. --- include/lzexpand.h | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/include/lzexpand.h b/include/lzexpand.h index bc013913bd0..1b261273306 100644 --- a/include/lzexpand.h +++ b/include/lzexpand.h @@ -33,20 +33,20 @@ extern "C" { #define LZERROR_BADVALUE -7 /* -7 */ #define LZERROR_UNKNOWNALG -8 /* -8 */ -VOID WINAPI LZDone(void); -LONG WINAPI CopyLZFile(HFILE,HFILE); -HFILE WINAPI LZOpenFileA(LPSTR,LPOFSTRUCT,WORD); -HFILE WINAPI LZOpenFileW(LPWSTR,LPOFSTRUCT,WORD); -#define LZOpenFile WINELIB_NAME_AW(LZOpenFile) -INT WINAPI LZRead(INT,LPSTR,INT); -INT WINAPI LZStart(void); -void WINAPI LZClose(HFILE); -LONG WINAPI LZCopy(HFILE,HFILE); -HFILE WINAPI LZInit(HFILE); -LONG WINAPI LZSeek(HFILE,LONG,INT); -INT WINAPI GetExpandedNameA(LPSTR,LPSTR); -INT WINAPI GetExpandedNameW(LPWSTR,LPWSTR); -#define GetExpandedName WINELIB_NAME_AW(GetExpandedName) +WINBASEAPI VOID WINAPI LZDone(void); +WINBASEAPI LONG WINAPI CopyLZFile(HFILE,HFILE); +WINBASEAPI HFILE WINAPI LZOpenFileA(LPSTR,LPOFSTRUCT,WORD); +WINBASEAPI HFILE WINAPI LZOpenFileW(LPWSTR,LPOFSTRUCT,WORD); +#define LZOpenFile WINELIB_NAME_AW(LZOpenFile) +WINBASEAPI INT WINAPI LZRead(INT,LPSTR,INT); +WINBASEAPI INT WINAPI LZStart(void); +WINBASEAPI void WINAPI LZClose(HFILE); +WINBASEAPI LONG WINAPI LZCopy(HFILE,HFILE); +WINBASEAPI HFILE WINAPI LZInit(HFILE); +WINBASEAPI LONG WINAPI LZSeek(HFILE,LONG,INT); +WINBASEAPI INT WINAPI GetExpandedNameA(LPSTR,LPSTR); +WINBASEAPI INT WINAPI GetExpandedNameW(LPWSTR,LPWSTR); +#define GetExpandedName WINELIB_NAME_AW(GetExpandedName) #ifdef __cplusplus } /* extern "C" */

1 0

Alexandre Julliard : include: Use proper dllimports for gdi32 functions.
by Alexandre Julliard Dec. 7, 2022

Dec. 7, 2022

Module: wine Branch: master Commit: 402d50d5f9991653c6c4cb9c12522b44da026b39 URL: https://gitlab.winehq.org/wine/wine/-/commit/402d50d5f9991653c6c4cb9c12522b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 7 11:21:07 2022 +0100 include: Use proper dllimports for gdi32 functions. --- dlls/win32u/Makefile.in | 1 + include/wingdi.h | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/win32u/Makefile.in b/dlls/win32u/Makefile.in index 5494e9eb8ca..2cf822401d5 100644 --- a/dlls/win32u/Makefile.in +++ b/dlls/win32u/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINGDIAPI= MODULE = win32u.dll UNIXLIB = win32u.so IMPORTLIB = win32u diff --git a/include/wingdi.h b/include/wingdi.h index 6778c60db79..046009c0e98 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -24,16 +24,20 @@ extern "C" { #endif +#ifndef WINGDIAPI #if defined(_GDI32_) || defined(WINE_UNIX_LIB) #define WINGDIAPI #else -#define WINGDIAPI DECLSPEC_HIDDEN +#define WINGDIAPI DECLSPEC_IMPORT +#endif #endif +#ifndef WGLAPI #ifdef _OPENGL32_ #define WGLAPI #else -#define WGLAPI DECLSPEC_HIDDEN +#define WGLAPI DECLSPEC_IMPORT +#endif #endif typedef struct _ABCFLOAT {

1 0