December 2022 - Wine-commits

Alexandre Julliard : include: Use proper dllimports for comdlg32 functions.
by Alexandre Julliard 07 Dec '22

07 Dec '22

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 winhttp functions.
by Alexandre Julliard 07 Dec '22

07 Dec '22

Module: wine Branch: master Commit: 19b4814fd3c49b87fbef78a8ed4bfd949880860f URL: https://gitlab.winehq.org/wine/wine/-/commit/19b4814fd3c49b87fbef78a8ed4bfd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 7 13:31:56 2022 +0100 include: Use proper dllimports for winhttp functions. --- dlls/winhttp/Makefile.in | 1 + include/winhttp.h | 101 +++++++++++++++++++++++++---------------------- 2 files changed, 54 insertions(+), 48 deletions(-) diff --git a/dlls/winhttp/Makefile.in b/dlls/winhttp/Makefile.in index 97266fbc92a..360769a0758 100644 --- a/dlls/winhttp/Makefile.in +++ b/dlls/winhttp/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -D_WINHTTP_INTERNAL_ MODULE = winhttp.dll IMPORTLIB = winhttp IMPORTS = uuid jsproxy user32 advapi32 ws2_32 diff --git a/include/winhttp.h b/include/winhttp.h index 930c5891f5e..9408c4cbf65 100644 --- a/include/winhttp.h +++ b/include/winhttp.h @@ -25,7 +25,12 @@ #include <pshpack4.h> #endif -#define WINHTTPAPI +#ifdef _WINHTTP_INTERNAL_ +# define WINHTTPAPI +#else +# define WINHTTPAPI DECLSPEC_IMPORT +#endif + #define BOOLAPI WINHTTPAPI BOOL WINAPI @@ -814,53 +819,53 @@ typedef struct _WINHTTP_WEB_SOCKET_STATUS extern "C" { #endif -BOOL WINAPI WinHttpAddRequestHeaders(HINTERNET,LPCWSTR,DWORD,DWORD); -BOOL WINAPI WinHttpDetectAutoProxyConfigUrl(DWORD,LPWSTR*); -BOOL WINAPI WinHttpCheckPlatform(void); -BOOL WINAPI WinHttpCloseHandle(HINTERNET); -HINTERNET WINAPI WinHttpConnect(HINTERNET,LPCWSTR,INTERNET_PORT,DWORD); -BOOL WINAPI WinHttpCrackUrl(LPCWSTR,DWORD,DWORD,LPURL_COMPONENTS); -DWORD WINAPI WinHttpCreateProxyResolver(HINTERNET,HINTERNET*); -BOOL WINAPI WinHttpCreateUrl(LPURL_COMPONENTS,DWORD,LPWSTR,LPDWORD); -VOID WINAPI WinHttpFreeProxyResult(WINHTTP_PROXY_RESULT*); -VOID WINAPI WinHttpFreeProxyResultEx(WINHTTP_PROXY_RESULT_EX*); -VOID WINAPI WinHttpFreeProxySettings(WINHTTP_PROXY_SETTINGS*); -BOOL WINAPI WinHttpGetDefaultProxyConfiguration(WINHTTP_PROXY_INFO*); -BOOL WINAPI WinHttpGetIEProxyConfigForCurrentUser(WINHTTP_CURRENT_USER_IE_PROXY_CONFIG*); -BOOL WINAPI WinHttpGetProxyForUrl(HINTERNET,LPCWSTR,WINHTTP_AUTOPROXY_OPTIONS*,WINHTTP_PROXY_INFO*); -DWORD WINAPI WinHttpGetProxyForUrlEx(HINTERNET,PCWSTR,WINHTTP_AUTOPROXY_OPTIONS*,DWORD_PTR); -DWORD WINAPI WinHttpGetProxyForUrlEx2(HINTERNET,PCWSTR,WINHTTP_AUTOPROXY_OPTIONS*,DWORD,BYTE*,DWORD_PTR); -DWORD WINAPI WinHttpGetProxyResult(HINTERNET,WINHTTP_PROXY_RESULT*); -DWORD WINAPI WinHttpGetProxyResultEx(HINTERNET,WINHTTP_PROXY_RESULT_EX*); -DWORD WINAPI WinHttpGetProxySettingsVersion(HINTERNET,DWORD*); -DWORD WINAPI WinHttpIsHostInProxyBypassList(const WINHTTP_PROXY_INFO*,PCWSTR,INTERNET_SCHEME,INTERNET_PORT,BOOL*); -HINTERNET WINAPI WinHttpOpen(LPCWSTR,DWORD,LPCWSTR,LPCWSTR,DWORD); -HINTERNET WINAPI WinHttpOpenRequest(HINTERNET,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR*,DWORD); -BOOL WINAPI WinHttpQueryAuthParams(HINTERNET,DWORD,LPVOID*); -BOOL WINAPI WinHttpQueryAuthSchemes(HINTERNET,LPDWORD,LPDWORD,LPDWORD); -BOOL WINAPI WinHttpQueryDataAvailable(HINTERNET,LPDWORD); -BOOL WINAPI WinHttpQueryHeaders(HINTERNET,DWORD,LPCWSTR,LPVOID,LPDWORD,LPDWORD); -BOOL WINAPI WinHttpQueryOption(HINTERNET,DWORD,LPVOID,LPDWORD); -BOOL WINAPI WinHttpReadData(HINTERNET,LPVOID,DWORD,LPDWORD); -DWORD WINAPI WinHttpReadProxySettings(HINTERNET,PCWSTR,BOOL,BOOL,DWORD*,BOOL*,WINHTTP_PROXY_SETTINGS*); -BOOL WINAPI WinHttpReceiveResponse(HINTERNET,LPVOID); -DWORD WINAPI WinHttpResetAutoProxy(HINTERNET,DWORD); -BOOL WINAPI WinHttpSendRequest(HINTERNET,LPCWSTR,DWORD,LPVOID,DWORD,DWORD,DWORD_PTR); -BOOL WINAPI WinHttpSetDefaultProxyConfiguration(WINHTTP_PROXY_INFO*); -BOOL WINAPI WinHttpSetCredentials(HINTERNET,DWORD,DWORD,LPCWSTR,LPCWSTR,LPVOID); -BOOL WINAPI WinHttpSetOption(HINTERNET,DWORD,LPVOID,DWORD); -WINHTTP_STATUS_CALLBACK WINAPI WinHttpSetStatusCallback(HINTERNET,WINHTTP_STATUS_CALLBACK,DWORD,DWORD_PTR); -BOOL WINAPI WinHttpSetTimeouts(HINTERNET,int,int,int,int); -BOOL WINAPI WinHttpTimeFromSystemTime(const SYSTEMTIME *,LPWSTR); -BOOL WINAPI WinHttpTimeToSystemTime(LPCWSTR,SYSTEMTIME*); -DWORD WINAPI WinHttpWebSocketClose(HINTERNET,USHORT,void *,DWORD); -HINTERNET WINAPI WinHttpWebSocketCompleteUpgrade(HINTERNET,DWORD_PTR); -DWORD WINAPI WinHttpWebSocketQueryCloseStatus(HINTERNET,USHORT*,void*,DWORD,DWORD*); -DWORD WINAPI WinHttpWebSocketReceive(HINTERNET,void*,DWORD,DWORD*,WINHTTP_WEB_SOCKET_BUFFER_TYPE*); -DWORD WINAPI WinHttpWebSocketSend(HINTERNET,WINHTTP_WEB_SOCKET_BUFFER_TYPE,void*,DWORD); -DWORD WINAPI WinHttpWebSocketShutdown(HINTERNET,USHORT,void*,DWORD); -BOOL WINAPI WinHttpWriteData(HINTERNET,LPCVOID,DWORD,LPDWORD); -DWORD WINAPI WinHttpWriteProxySettings(HINTERNET,BOOL,WINHTTP_PROXY_SETTINGS*); +WINHTTPAPI BOOL WINAPI WinHttpAddRequestHeaders(HINTERNET,LPCWSTR,DWORD,DWORD); +WINHTTPAPI BOOL WINAPI WinHttpDetectAutoProxyConfigUrl(DWORD,LPWSTR*); +WINHTTPAPI BOOL WINAPI WinHttpCheckPlatform(void); +WINHTTPAPI BOOL WINAPI WinHttpCloseHandle(HINTERNET); +WINHTTPAPI HINTERNET WINAPI WinHttpConnect(HINTERNET,LPCWSTR,INTERNET_PORT,DWORD); +WINHTTPAPI BOOL WINAPI WinHttpCrackUrl(LPCWSTR,DWORD,DWORD,LPURL_COMPONENTS); +WINHTTPAPI DWORD WINAPI WinHttpCreateProxyResolver(HINTERNET,HINTERNET*); +WINHTTPAPI BOOL WINAPI WinHttpCreateUrl(LPURL_COMPONENTS,DWORD,LPWSTR,LPDWORD); +WINHTTPAPI VOID WINAPI WinHttpFreeProxyResult(WINHTTP_PROXY_RESULT*); +WINHTTPAPI VOID WINAPI WinHttpFreeProxyResultEx(WINHTTP_PROXY_RESULT_EX*); +WINHTTPAPI VOID WINAPI WinHttpFreeProxySettings(WINHTTP_PROXY_SETTINGS*); +WINHTTPAPI BOOL WINAPI WinHttpGetDefaultProxyConfiguration(WINHTTP_PROXY_INFO*); +WINHTTPAPI BOOL WINAPI WinHttpGetIEProxyConfigForCurrentUser(WINHTTP_CURRENT_USER_IE_PROXY_CONFIG*); +WINHTTPAPI BOOL WINAPI WinHttpGetProxyForUrl(HINTERNET,LPCWSTR,WINHTTP_AUTOPROXY_OPTIONS*,WINHTTP_PROXY_INFO*); +WINHTTPAPI DWORD WINAPI WinHttpGetProxyForUrlEx(HINTERNET,PCWSTR,WINHTTP_AUTOPROXY_OPTIONS*,DWORD_PTR); +WINHTTPAPI DWORD WINAPI WinHttpGetProxyForUrlEx2(HINTERNET,PCWSTR,WINHTTP_AUTOPROXY_OPTIONS*,DWORD,BYTE*,DWORD_PTR); +WINHTTPAPI DWORD WINAPI WinHttpGetProxyResult(HINTERNET,WINHTTP_PROXY_RESULT*); +WINHTTPAPI DWORD WINAPI WinHttpGetProxyResultEx(HINTERNET,WINHTTP_PROXY_RESULT_EX*); +WINHTTPAPI DWORD WINAPI WinHttpGetProxySettingsVersion(HINTERNET,DWORD*); +WINHTTPAPI DWORD WINAPI WinHttpIsHostInProxyBypassList(const WINHTTP_PROXY_INFO*,PCWSTR,INTERNET_SCHEME,INTERNET_PORT,BOOL*); +WINHTTPAPI HINTERNET WINAPI WinHttpOpen(LPCWSTR,DWORD,LPCWSTR,LPCWSTR,DWORD); +WINHTTPAPI HINTERNET WINAPI WinHttpOpenRequest(HINTERNET,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR*,DWORD); +WINHTTPAPI BOOL WINAPI WinHttpQueryAuthParams(HINTERNET,DWORD,LPVOID*); +WINHTTPAPI BOOL WINAPI WinHttpQueryAuthSchemes(HINTERNET,LPDWORD,LPDWORD,LPDWORD); +WINHTTPAPI BOOL WINAPI WinHttpQueryDataAvailable(HINTERNET,LPDWORD); +WINHTTPAPI BOOL WINAPI WinHttpQueryHeaders(HINTERNET,DWORD,LPCWSTR,LPVOID,LPDWORD,LPDWORD); +WINHTTPAPI BOOL WINAPI WinHttpQueryOption(HINTERNET,DWORD,LPVOID,LPDWORD); +WINHTTPAPI BOOL WINAPI WinHttpReadData(HINTERNET,LPVOID,DWORD,LPDWORD); +WINHTTPAPI DWORD WINAPI WinHttpReadProxySettings(HINTERNET,PCWSTR,BOOL,BOOL,DWORD*,BOOL*,WINHTTP_PROXY_SETTINGS*); +WINHTTPAPI BOOL WINAPI WinHttpReceiveResponse(HINTERNET,LPVOID); +WINHTTPAPI DWORD WINAPI WinHttpResetAutoProxy(HINTERNET,DWORD); +WINHTTPAPI BOOL WINAPI WinHttpSendRequest(HINTERNET,LPCWSTR,DWORD,LPVOID,DWORD,DWORD,DWORD_PTR); +WINHTTPAPI BOOL WINAPI WinHttpSetDefaultProxyConfiguration(WINHTTP_PROXY_INFO*); +WINHTTPAPI BOOL WINAPI WinHttpSetCredentials(HINTERNET,DWORD,DWORD,LPCWSTR,LPCWSTR,LPVOID); +WINHTTPAPI BOOL WINAPI WinHttpSetOption(HINTERNET,DWORD,LPVOID,DWORD); +WINHTTPAPI WINHTTP_STATUS_CALLBACK WINAPI WinHttpSetStatusCallback(HINTERNET,WINHTTP_STATUS_CALLBACK,DWORD,DWORD_PTR); +WINHTTPAPI BOOL WINAPI WinHttpSetTimeouts(HINTERNET,int,int,int,int); +WINHTTPAPI BOOL WINAPI WinHttpTimeFromSystemTime(const SYSTEMTIME *,LPWSTR); +WINHTTPAPI BOOL WINAPI WinHttpTimeToSystemTime(LPCWSTR,SYSTEMTIME*); +WINHTTPAPI DWORD WINAPI WinHttpWebSocketClose(HINTERNET,USHORT,void *,DWORD); +WINHTTPAPI HINTERNET WINAPI WinHttpWebSocketCompleteUpgrade(HINTERNET,DWORD_PTR); +WINHTTPAPI DWORD WINAPI WinHttpWebSocketQueryCloseStatus(HINTERNET,USHORT*,void*,DWORD,DWORD*); +WINHTTPAPI DWORD WINAPI WinHttpWebSocketReceive(HINTERNET,void*,DWORD,DWORD*,WINHTTP_WEB_SOCKET_BUFFER_TYPE*); +WINHTTPAPI DWORD WINAPI WinHttpWebSocketSend(HINTERNET,WINHTTP_WEB_SOCKET_BUFFER_TYPE,void*,DWORD); +WINHTTPAPI DWORD WINAPI WinHttpWebSocketShutdown(HINTERNET,USHORT,void*,DWORD); +WINHTTPAPI BOOL WINAPI WinHttpWriteData(HINTERNET,LPCVOID,DWORD,LPDWORD); +WINHTTPAPI DWORD WINAPI WinHttpWriteProxySettings(HINTERNET,BOOL,WINHTTP_PROXY_SETTINGS*); #ifdef __cplusplus }

1 0

Alexandre Julliard : include: Use proper dllimports for wininet functions.
by Alexandre Julliard 07 Dec '22

07 Dec '22

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 shell32 functions.
by Alexandre Julliard 07 Dec '22

07 Dec '22

Module: wine Branch: master Commit: 55fc5c8ae812fc0fb5424133b8e8dd733572154e URL: https://gitlab.winehq.org/wine/wine/-/commit/55fc5c8ae812fc0fb5424133b8e8dd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 7 13:50:32 2022 +0100 include: Use proper dllimports for shell32 functions. --- dlls/shell32/Makefile.in | 1 + include/shellapi.h | 133 ++++++++++++----------- include/shlobj.h | 274 ++++++++++++++++++++++++----------------------- include/shobjidl.idl | 33 +++--- 4 files changed, 230 insertions(+), 211 deletions(-)

1 0

Alexandre Julliard : include: Use proper dllimports for winsock functions.
by Alexandre Julliard 07 Dec '22

07 Dec '22

Module: wine Branch: master Commit: 7eef69e1fc840929b32d82466c555411a281c9f3 URL: https://gitlab.winehq.org/wine/wine/-/commit/7eef69e1fc840929b32d82466c5554… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 7 14:24:32 2022 +0100 include: Use proper dllimports for winsock functions. --- dlls/winsock.dll16/socket.c | 3 - dlls/ws2_32/Makefile.in | 1 + include/winsock.h | 96 ++++++++++---------- include/winsock2.h | 208 +++++++++++++++++++++++--------------------- 4 files changed, 161 insertions(+), 147 deletions(-)

1 0

Alexandre Julliard : vkd3d: Import upstream release 1.6.
by Alexandre Julliard 07 Dec '22

07 Dec '22

Module: wine Branch: master Commit: 891e2f739f44645934818930fe34ba15b37bbfe1 URL: https://gitlab.winehq.org/wine/wine/-/commit/891e2f739f44645934818930fe34ba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 7 16:41:20 2022 +0100 vkd3d: Import upstream release 1.6. --- libs/vkd3d/AUTHORS | 1 + libs/vkd3d/config.h | 4 +- libs/vkd3d/include/private/vkd3d_common.h | 20 +- libs/vkd3d/include/private/vkd3d_debug.h | 1 + libs/vkd3d/include/private/vkd3d_version.h | 2 +- libs/vkd3d/include/vkd3d.h | 1 + libs/vkd3d/include/vkd3d_shader.h | 12 + libs/vkd3d/libs/vkd3d-common/debug.c | 57 +- libs/vkd3d/libs/vkd3d-common/error.c | 2 +- libs/vkd3d/libs/vkd3d-shader/dxbc.c | 17 +- libs/vkd3d/libs/vkd3d-shader/hlsl.c | 266 ++- libs/vkd3d/libs/vkd3d-shader/hlsl.h | 79 +- libs/vkd3d/libs/vkd3d-shader/hlsl.l | 3 + libs/vkd3d/libs/vkd3d-shader/hlsl.y | 835 +++++++--- libs/vkd3d/libs/vkd3d-shader/hlsl_codegen.c | 430 ++++- libs/vkd3d/libs/vkd3d-shader/hlsl_constant_ops.c | 18 +- libs/vkd3d/libs/vkd3d-shader/hlsl_sm1.c | 11 +- libs/vkd3d/libs/vkd3d-shader/hlsl_sm4.c | 161 +- libs/vkd3d/libs/vkd3d-shader/spirv.c | 1685 ++++++++++---------- libs/vkd3d/libs/vkd3d-shader/vkd3d_shader_main.c | 40 +- .../vkd3d/libs/vkd3d-shader/vkd3d_shader_private.h | 16 +- libs/vkd3d/libs/vkd3d/device.c | 3 +- libs/vkd3d/libs/vkd3d/state.c | 4 +- libs/vkd3d/libs/vkd3d/vkd3d_private.h | 9 - 24 files changed, 2384 insertions(+), 1293 deletions(-)

1 0

Alexandre Julliard : winebuild: Avoid quoting section names.
by Alexandre Julliard 07 Dec '22

07 Dec '22

Module: wine Branch: master Commit: 4b59142f34bbc19b67786c5c4cf29af55487ae03 URL: https://gitlab.winehq.org/wine/wine/-/commit/4b59142f34bbc19b67786c5c4cf29a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 7 10:05:07 2022 +0100 winebuild: Avoid quoting section names. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54060 --- tools/winebuild/import.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 515283fb50f..dfda228c4ec 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1764,20 +1764,20 @@ static void build_windows_import_lib( const char *lib_name, DLLSPEC *spec, struc output( "\t.long 0\n" ); /* UnloadInformationTableRVA */ output( "\t.long 0\n" ); /* TimeDateStamp */ - output( "\n\t.section \".idata$5\"\n" ); + output( "\n\t.section .idata$5\n" ); output( "\t%s 0\n", get_asm_ptr_keyword() ); /* FirstThunk tail */ output( ".L__wine_import_addrs:\n" ); - output( "\n\t.section \".idata$4\"\n" ); + output( "\n\t.section .idata$4\n" ); output( "\t%s 0\n", get_asm_ptr_keyword() ); /* OriginalFirstThunk tail */ output( ".L__wine_import_names:\n" ); /* required to avoid internal linker errors with some binutils versions */ - output( "\n\t.section \".idata$2\"\n" ); + output( "\n\t.section .idata$2\n" ); } else { - output( "\n\t.section \".idata$2\"\n" ); + output( "\n\t.section .idata$2\n" ); output( "%s\n", asm_globl( import_desc ) ); output_rva( ".L__wine_import_names" ); /* OriginalFirstThunk */ output( "\t.long 0\n" ); /* TimeDateStamp */ @@ -1785,10 +1785,10 @@ static void build_windows_import_lib( const char *lib_name, DLLSPEC *spec, struc output_rva( "%s", asm_name( import_name ) ); /* Name */ output_rva( ".L__wine_import_addrs" ); /* FirstThunk */ - output( "\n\t.section \".idata$4\"\n" ); + output( "\n\t.section .idata$4\n" ); output( ".L__wine_import_names:\n" ); /* OriginalFirstThunk head */ - output( "\n\t.section \".idata$5\"\n" ); + output( "\n\t.section .idata$5\n" ); output( ".L__wine_import_addrs:\n" ); /* FirstThunk head */ } @@ -1799,11 +1799,11 @@ static void build_windows_import_lib( const char *lib_name, DLLSPEC *spec, struc new_output_as_file(); - output( "\n\t.section \".idata$4\"\n" ); + output( "\n\t.section .idata$4\n" ); output( "\t%s 0\n", get_asm_ptr_keyword() ); /* OriginalFirstThunk tail */ - output( "\n\t.section \".idata$5\"\n" ); + output( "\n\t.section .idata$5\n" ); output( "\t%s 0\n", get_asm_ptr_keyword() ); /* FirstThunk tail */ - output( "\n\t.section \".idata$7\"\n" ); + output( "\n\t.section .idata$7\n" ); output( "%s\n", asm_globl( import_name ) ); output( "\t%s \"%s\"\n", get_asm_string_keyword(), spec->file_name ); @@ -1891,10 +1891,10 @@ static void build_windows_import_lib( const char *lib_name, DLLSPEC *spec, struc break; } - output( "\n\t.section \".idata$4\"\n" ); + output( "\n\t.section .idata$4\n" ); output_thunk_rva( by_name ? -1 : odp->ordinal, ".L__wine_import_name" ); - output( "\n\t.section \".idata$5\"\n" ); + output( "\n\t.section .idata$5\n" ); output( "%s\n", asm_globl( imp_name ) ); if (is_delay) output( "\t%s .L__wine_delay_import\n", get_asm_ptr_keyword() ); @@ -1903,14 +1903,14 @@ static void build_windows_import_lib( const char *lib_name, DLLSPEC *spec, struc if (by_name) { - output( "\n\t.section \".idata$6\"\n" ); + output( "\n\t.section .idata$6\n" ); output( ".L__wine_import_name:\n" ); output( "\t.short %d\n", odp->hint ); output( "\t%s \"%s\"\n", get_asm_string_keyword(), name ); } /* reference head object to always pull its sections */ - output( "\n\t.section \".idata$7\"\n" ); + output( "\n\t.section .idata$7\n" ); output_rva( "%s", asm_name( import_desc ) ); free( imp_name );

1 0

Alexandre Julliard : winebuild: Put the delay import thunk in a separate section.
by Alexandre Julliard 07 Dec '22

07 Dec '22

Module: wine Branch: master Commit: 1f5c288b4f4c5fc9faadab5e9bbf24cc9e32e64e URL: https://gitlab.winehq.org/wine/wine/-/commit/1f5c288b4f4c5fc9faadab5e9bbf24… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 7 10:05:49 2022 +0100 winebuild: Put the delay import thunk in a separate section. To work around a binutils bug, cf. https://sourceware.org/bugzilla/show_bug.cgi?id=14339 --- tools/winebuild/import.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index dfda228c4ec..ee3c310546b 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1851,6 +1851,7 @@ static void build_windows_import_lib( const char *lib_name, DLLSPEC *spec, struc output( "\tjmp *%s\n", asm_name( imp_name ) ); if (is_delay) { + output( "\n\t.section .text$1\n" ); output( ".L__wine_delay_import:\n" ); output( "\tmov $%s,%%eax\n", asm_name( imp_name ) ); output( "\tjmp %s\n", asm_name( delay_load ) ); @@ -1860,6 +1861,7 @@ static void build_windows_import_lib( const char *lib_name, DLLSPEC *spec, struc output( "\tjmp *%s(%%rip)\n", asm_name( imp_name ) ); if (is_delay) { + output( "\n\t.section .text$1\n" ); output( ".L__wine_delay_import:\n" ); output( "\tlea %s(%%rip),%%rax\n", asm_name( imp_name ) ); output( "\tjmp %s\n", asm_name( delay_load ) ); @@ -1870,6 +1872,7 @@ static void build_windows_import_lib( const char *lib_name, DLLSPEC *spec, struc output( "\tldr PC, [IP]\n" ); if (is_delay) { + output( "\n\t.section .text$1\n" ); output( ".L__wine_delay_import:\n" ); output( "\tldr IP, 1f\n" ); output( "\tldr IP, [IP]\n" ); @@ -1883,6 +1886,7 @@ static void build_windows_import_lib( const char *lib_name, DLLSPEC *spec, struc output( "\tbr x16\n" ); if (is_delay) { + output( "\n\t.section .text$1\n" ); output( ".L__wine_delay_import:\n" ); output( "\tadrp x16, %s\n", arm64_page( asm_name( imp_name ) ) ); output( "\tadd x16, x16, #%s\n", arm64_pageoff( asm_name( imp_name ) ) );

1 0

Alexandre Julliard : include: Use proper dllimports for advapi32 functions.
by Alexandre Julliard 07 Dec '22

07 Dec '22

Module: wine Branch: master Commit: fcf5e8c45ba3f530c32b62b6d17ce74898bebcf5 URL: https://gitlab.winehq.org/wine/wine/-/commit/fcf5e8c45ba3f530c32b62b6d17ce7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 7 10:55:01 2022 +0100 include: Use proper dllimports for advapi32 functions. --- dlls/kernelbase/Makefile.in | 2 +- dlls/sechost/security.c | 2 ++ dlls/sechost/service.c | 1 + include/ntsecapi.h | 68 ++++++++++++++++++++++----------------------- include/sddl.h | 20 ++++++------- include/winbase.h | 4 ++- include/wincred.h | 4 ++- include/wincrypt.h | 4 ++- include/winsvc.h | 7 +++-- 9 files changed, 59 insertions(+), 53 deletions(-)

1 0

Alexandre Julliard : include: Use proper dllimports for lz32 functions.
by Alexandre Julliard 07 Dec '22

07 Dec '22

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