wine-commits April 2020

wine-commits@winehq.org

2 participants
1016 discussions

Alexandre Julliard : ntdll: Use a Wine-specific field in WINE_MODREF for the .so handle.
by Alexandre Julliard 16 Apr '20

16 Apr '20

Module: wine Branch: master Commit: 3935acd4dafce40a08417cf1edceb7607592eb16 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3935acd4dafce40a08417cf1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 16 12:00:43 2020 +0200 ntdll: Use a Wine-specific field in WINE_MODREF for the .so handle. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index c67e1a3d2b..c32292d453 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -121,6 +121,7 @@ typedef struct _wine_modref LDR_MODULE ldr; dev_t dev; ino_t ino; + void *so_handle; int alloc_deps; int nDeps; struct _wine_modref **deps; @@ -585,7 +586,7 @@ static WINE_MODREF *find_so_module( void *handle ) LDR_MODULE *mod = CONTAINING_RECORD( entry, LDR_MODULE, InLoadOrderModuleList ); WINE_MODREF *wm = CONTAINING_RECORD( mod, WINE_MODREF, ldr ); - if (mod->Flags & LDR_WINE_INTERNAL && mod->SectionHandle == handle) return wm; + if (wm->so_handle == handle) return wm; } return NULL; } @@ -2806,7 +2807,7 @@ static NTSTATUS load_so_dll( LPCWSTR load_path, const UNICODE_STRING *nt_name, TRACE_(loaddll)( "Loaded %s at %p: builtin\n", debugstr_w(info.wm->ldr.FullDllName.Buffer), info.wm->ldr.BaseAddress ); info.wm->ldr.LoadCount = 1; - info.wm->ldr.SectionHandle = handle; + info.wm->so_handle = handle; } } else if (!info.wm) @@ -2829,7 +2830,7 @@ static NTSTATUS load_so_dll( LPCWSTR load_path, const UNICODE_STRING *nt_name, { TRACE_(loaddll)( "Loaded %s at %p: builtin\n", debugstr_w(info.wm->ldr.FullDllName.Buffer), info.wm->ldr.BaseAddress ); info.wm->ldr.LoadCount = 1; - info.wm->ldr.SectionHandle = handle; + info.wm->so_handle = handle; } *pwm = info.wm; @@ -3760,7 +3761,7 @@ static void free_modref( WINE_MODREF *wm ) free_tls_slot( &wm->ldr ); RtlReleaseActivationContext( wm->ldr.ActivationContext ); - if ((wm->ldr.Flags & LDR_WINE_INTERNAL) && wm->ldr.SectionHandle) dlclose( wm->ldr.SectionHandle ); + if (wm->so_handle) dlclose( wm->so_handle ); NtUnmapViewOfSection( NtCurrentProcess(), wm->ldr.BaseAddress ); if (cached_modref == wm) cached_modref = NULL; RtlFreeUnicodeString( &wm->ldr.FullDllName );

1 0

Alexandre Julliard : ntdll: Load .so builtin modules without using libwine.
by Alexandre Julliard 16 Apr '20

16 Apr '20

Module: wine Branch: master Commit: 0a3e42e2719e8306b67f14b5a4b3a868f336bb82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a3e42e2719e8306b67f14b5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 16 10:26:13 2020 +0200 ntdll: Load .so builtin modules without using libwine. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 273 +++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 229 insertions(+), 44 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0a3e42e2719e8306b67f…

1 0

Alexandre Julliard : winebuild: Set page size to 4096 also on ARM64.
by Alexandre Julliard 16 Apr '20

16 Apr '20

Module: wine Branch: master Commit: 593c38cb95fc18383664dc63cf397be5a7175be5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=593c38cb95fc18383664dc63… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 16 10:40:56 2020 +0200 winebuild: Set page size to 4096 also on ARM64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/utils.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index be87708048..669520711c 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -1015,19 +1015,7 @@ unsigned int get_alignment(unsigned int align) /* return the page size for the target CPU */ unsigned int get_page_size(void) { - switch(target_cpu) - { - case CPU_x86: - case CPU_x86_64: - case CPU_POWERPC: - case CPU_ARM: - return 0x1000; - case CPU_ARM64: - return 0x10000; - } - /* unreached */ - assert(0); - return 0; + return 0x1000; /* same on all platforms */ } /* return the size of a pointer on the target CPU */

1 0

Zebediah Figura : winegstreamer: Delay-load mfplat.
by Alexandre Julliard 16 Apr '20

16 Apr '20

Module: wine Branch: master Commit: 5d0e10b77c0ef262b059318f149841b6c999703e URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d0e10b77c0ef262b059318f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 16 00:33:59 2020 -0500 winegstreamer: Delay-load mfplat. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/Makefile.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winegstreamer/Makefile.in b/dlls/winegstreamer/Makefile.in index 097edf273f..337c1086e6 100644 --- a/dlls/winegstreamer/Makefile.in +++ b/dlls/winegstreamer/Makefile.in @@ -1,5 +1,6 @@ MODULE = winegstreamer.dll -IMPORTS = strmiids uuid ole32 mfplat mfuuid +IMPORTS = strmiids uuid ole32 mfuuid +DELAYIMPORTS = mfplat EXTRAINCL = $(GSTREAMER_CFLAGS) EXTRALIBS = $(GSTREAMER_LIBS) $(PTHREAD_LIBS) PARENTSRC = ../strmbase

1 0

Zebediah Figura : winegstreamer: Remove some unused imports.
by Alexandre Julliard 16 Apr '20

16 Apr '20

Module: wine Branch: master Commit: ecac569df231d7a0f8b11ca7cf8803642986fefb URL: https://source.winehq.org/git/wine.git/?a=commit;h=ecac569df231d7a0f8b11ca7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 16 00:33:58 2020 -0500 winegstreamer: Remove some unused imports. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winegstreamer/Makefile.in b/dlls/winegstreamer/Makefile.in index 2364ac84dc..097edf273f 100644 --- a/dlls/winegstreamer/Makefile.in +++ b/dlls/winegstreamer/Makefile.in @@ -1,5 +1,5 @@ MODULE = winegstreamer.dll -IMPORTS = strmiids uuid winmm msacm32 msvfw32 ole32 oleaut32 user32 gdi32 advapi32 mfplat mfuuid +IMPORTS = strmiids uuid ole32 mfplat mfuuid EXTRAINCL = $(GSTREAMER_CFLAGS) EXTRALIBS = $(GSTREAMER_LIBS) $(PTHREAD_LIBS) PARENTSRC = ../strmbase

1 0

Michael Stefaniuc : oledb32: Remove redundant NULL check before CoTaskMemFree().
by Alexandre Julliard 16 Apr '20

16 Apr '20

Module: wine Branch: master Commit: c0041d70c46be6f7a69a61c0143c9c603cd6760f URL: https://source.winehq.org/git/wine.git/?a=commit;h=c0041d70c46be6f7a69a61c0… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Apr 16 00:08:28 2020 +0200 oledb32: Remove redundant NULL check before CoTaskMemFree(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/dslocator.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/oledb32/dslocator.c b/dlls/oledb32/dslocator.c index 8a7f2d134c..86a334bea0 100644 --- a/dlls/oledb32/dslocator.c +++ b/dlls/oledb32/dslocator.c @@ -72,8 +72,7 @@ static void destroy_datasource(struct datasource *data) CoTaskMemFree(data->propinfoset->rgPropertyInfos); CoTaskMemFree(data->propinfoset); } - if (data->description) - CoTaskMemFree(data->description); + CoTaskMemFree(data->description); if (data->provider) IDBProperties_Release(data->provider);

1 0

Nikolay Sivov : mfplat: Fix subtype test condition for MFInitMediaTypeFromWaveFormatEx().
by Alexandre Julliard 15 Apr '20

15 Apr '20

Module: wine Branch: master Commit: f6c131f5f3937daf7dd562a0ff6a6f1c0b6fb2b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6c131f5f3937daf7dd562a0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 15 16:47:37 2020 +0300 mfplat: Fix subtype test condition for MFInitMediaTypeFromWaveFormatEx(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mediatype.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index ddbffd5441..620e144d34 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -2128,7 +2128,7 @@ HRESULT WINAPI MFInitMediaTypeFromWaveFormatEx(IMFMediaType *mediatype, const WA if (format->wFormatTag == WAVE_FORMAT_EXTENSIBLE) { - mediatype_set_guid(mediatype, &MF_MT_SUBTYPE, &wfex->SubFormat, &hr); + memcpy(&subtype, &wfex->SubFormat, sizeof(subtype)); if (wfex->dwChannelMask) mediatype_set_uint32(mediatype, &MF_MT_AUDIO_CHANNEL_MASK, wfex->dwChannelMask, &hr); @@ -2140,10 +2140,10 @@ HRESULT WINAPI MFInitMediaTypeFromWaveFormatEx(IMFMediaType *mediatype, const WA { memcpy(&subtype, &MFAudioFormat_Base, sizeof(subtype)); subtype.Data1 = format->wFormatTag; - mediatype_set_guid(mediatype, &MF_MT_SUBTYPE, &subtype, &hr); mediatype_set_uint32(mediatype, &MF_MT_AUDIO_PREFER_WAVEFORMATEX, 1, &hr); } + mediatype_set_guid(mediatype, &MF_MT_SUBTYPE, &subtype, &hr); if (format->nChannels) mediatype_set_uint32(mediatype, &MF_MT_AUDIO_NUM_CHANNELS, format->nChannels, &hr);

1 0

Dmitry Timoshkov : schedsvc/tests: Fix compilation with recent gcc/clang versions.
by Alexandre Julliard 15 Apr '20

15 Apr '20

Module: wine Branch: master Commit: 1d785798605c01dcfc8a2f9f6ecc24bc21351029 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d785798605c01dcfc8a2f9f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Apr 15 21:43:42 2020 +0800 schedsvc/tests: Fix compilation with recent gcc/clang versions. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/schedsvc/tests/atsvcapi.c | 6 +++--- dlls/schedsvc/tests/rpcapi.c | 6 +++--- dlls/taskschd/task.c | 4 ++-- include/wine/atsvc.idl | 2 +- include/wine/schrpc.idl | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/schedsvc/tests/atsvcapi.c b/dlls/schedsvc/tests/atsvcapi.c index d7d48a122c..f10c9d0723 100644 --- a/dlls/schedsvc/tests/atsvcapi.c +++ b/dlls/schedsvc/tests/atsvcapi.c @@ -31,7 +31,7 @@ #define JOB_ADD_CURRENT_DATE 0x08 #define JOB_NONINTERACTIVE 0x10 -extern handle_t rpc_handle; +extern handle_t atsvc_handle; static int test_failures, test_skipped; @@ -69,7 +69,7 @@ START_TEST(atsvcapi) hr = RpcStringBindingComposeA(NULL, ncalrpc, NULL, NULL, NULL, &binding_str); ok(hr == RPC_S_OK, "RpcStringBindingCompose error %#x\n", hr); - hr = RpcBindingFromStringBindingA(binding_str, &rpc_handle); + hr = RpcBindingFromStringBindingA(binding_str, &atsvc_handle); ok(hr == RPC_S_OK, "RpcBindingFromStringBinding error %#x\n", hr); hr = RpcStringFreeA(&binding_str); ok(hr == RPC_S_OK, "RpcStringFree error %#x\n", hr); @@ -173,7 +173,7 @@ skip_tests_delete: skip_tests: SetUnhandledExceptionFilter(old_exception_filter); - hr = RpcBindingFree(&rpc_handle); + hr = RpcBindingFree(&atsvc_handle); ok(hr == RPC_S_OK, "RpcBindingFree error %#x\n", hr); } diff --git a/dlls/schedsvc/tests/rpcapi.c b/dlls/schedsvc/tests/rpcapi.c index 9d9557fe1c..b791a047dc 100644 --- a/dlls/schedsvc/tests/rpcapi.c +++ b/dlls/schedsvc/tests/rpcapi.c @@ -25,7 +25,7 @@ #include "wine/test.h" -extern handle_t rpc_handle; +extern handle_t schrpc_handle; static LONG CALLBACK rpc_exception_filter(EXCEPTION_POINTERS *ptrs) { @@ -103,7 +103,7 @@ START_TEST(rpcapi) hr = RpcStringBindingComposeA(NULL, ncalrpc, NULL, NULL, NULL, &binding_str); ok(hr == RPC_S_OK, "RpcStringBindingCompose error %#x\n", hr); - hr = RpcBindingFromStringBindingA(binding_str, &rpc_handle); + hr = RpcBindingFromStringBindingA(binding_str, &schrpc_handle); ok(hr == RPC_S_OK, "RpcBindingFromStringBinding error %#x\n", hr); hr = RpcStringFreeA(&binding_str); ok(hr == RPC_S_OK, "RpcStringFree error %#x\n", hr); @@ -537,7 +537,7 @@ todo_wine MIDL_user_free(path); } - hr = RpcBindingFree(&rpc_handle); + hr = RpcBindingFree(&schrpc_handle); ok(hr == RPC_S_OK, "RpcBindingFree error %#x\n", hr); } diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index b75cfff8af..8d81a18b3f 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -3843,7 +3843,7 @@ static HRESULT WINAPI TaskService_Connect(ITaskService *iface, VARIANT server, V DWORD len; HRESULT hr; RPC_WSTR binding_str; - extern handle_t rpc_handle; + extern handle_t schrpc_handle; TRACE("%p,%s,%s,%s,%s\n", iface, debugstr_variant(&server), debugstr_variant(&user), debugstr_variant(&domain), debugstr_variant(&password)); @@ -3882,7 +3882,7 @@ static HRESULT WINAPI TaskService_Connect(ITaskService *iface, VARIANT server, V hr = RpcStringBindingComposeW(NULL, ncalrpc, NULL, NULL, NULL, &binding_str); if (hr != RPC_S_OK) return hr; - hr = RpcBindingFromStringBindingW(binding_str, &rpc_handle); + hr = RpcBindingFromStringBindingW(binding_str, &schrpc_handle); RpcStringFreeW(&binding_str); if (hr != RPC_S_OK) return hr; diff --git a/include/wine/atsvc.idl b/include/wine/atsvc.idl index e95e6cf110..5e7121d016 100644 --- a/include/wine/atsvc.idl +++ b/include/wine/atsvc.idl @@ -23,7 +23,7 @@ import "ocidl.idl"; [ uuid(1ff70682-0a51-30e8-076d-740be8cee98b), - implicit_handle(handle_t rpc_handle), + implicit_handle(handle_t atsvc_handle), version(1.0), pointer_default(unique) ] diff --git a/include/wine/schrpc.idl b/include/wine/schrpc.idl index 4af709d8dd..944f283081 100644 --- a/include/wine/schrpc.idl +++ b/include/wine/schrpc.idl @@ -26,7 +26,7 @@ import "ocidl.idl"; [ uuid(86d35949-83c9-4044-b424-db363231fd0c), - implicit_handle(handle_t rpc_handle), + implicit_handle(handle_t schrpc_handle), version(1.0), pointer_default(unique) ]

1 0

Jacek Caban : winnt.h: Add __readgsqword declaration.
by Alexandre Julliard 15 Apr '20

15 Apr '20

Module: wine Branch: master Commit: 6ba6aac5a3c7df59705d198c5625f7c676a1ce27 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ba6aac5a3c7df59705d198c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 15 19:36:05 2020 +0200 winnt.h: Add __readgsqword declaration. pragma intrinsic is meant only as an addition to C declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnt.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/winnt.h b/include/winnt.h index a948ad001a..057f178845 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -2667,6 +2667,7 @@ static FORCEINLINE struct _TEB * WINAPI NtCurrentTeb(void) return teb; } #elif defined(__x86_64__) && defined(_MSC_VER) +unsigned __int64 __readgsqword(unsigned long); #pragma intrinsic(__readgsqword) static FORCEINLINE struct _TEB * WINAPI NtCurrentTeb(void) {

1 0

Jacek Caban : include: Fix DECLSPEC_NORETURN usage.
by Alexandre Julliard 15 Apr '20

15 Apr '20

Module: wine Branch: master Commit: 944ef25f1f1047fc617e19aa6847c5867702a927 URL: https://source.winehq.org/git/wine.git/?a=commit;h=944ef25f1f1047fc617e19aa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 15 18:27:22 2020 +0200 include: Fix DECLSPEC_NORETURN usage. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/eh.h | 4 ++-- include/msvcrt/process.h | 10 +++++----- include/msvcrt/stdlib.h | 8 ++++---- include/wine/exception.h | 6 +++--- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/include/msvcrt/eh.h b/include/msvcrt/eh.h index 9f070e3953..4e23a9e5e5 100644 --- a/include/msvcrt/eh.h +++ b/include/msvcrt/eh.h @@ -40,8 +40,8 @@ terminate_function __cdecl set_terminate(terminate_function func); unexpected_function __cdecl set_unexpected(unexpected_function func); _se_translator_function __cdecl set_se_translator(_se_translator_function func); -void __cdecl terminate(void) DECLSPEC_NORETURN; -void __cdecl unexpected(void) DECLSPEC_NORETURN; +_ACRTIMP DECLSPEC_NORETURN void __cdecl terminate(void); +_ACRTIMP DECLSPEC_NORETURN void __cdecl unexpected(void); #include <poppack.h> diff --git a/include/msvcrt/process.h b/include/msvcrt/process.h index 80be0e5bf6..2307b7990d 100644 --- a/include/msvcrt/process.h +++ b/include/msvcrt/process.h @@ -31,8 +31,8 @@ typedef unsigned int (__stdcall *_beginthreadex_start_routine_t)(void *); uintptr_t __cdecl _beginthread(_beginthread_start_routine_t,unsigned int,void*); uintptr_t __cdecl _beginthreadex(void*,unsigned int,_beginthreadex_start_routine_t,void*,unsigned int,unsigned int*); intptr_t __cdecl _cwait(int*,intptr_t,int); -void __cdecl _endthread(void) DECLSPEC_NORETURN; -void __cdecl _endthreadex(unsigned int) DECLSPEC_NORETURN; +_ACRTIMP DECLSPEC_NORETURN void __cdecl _endthread(void); +_ACRTIMP DECLSPEC_NORETURN void __cdecl _endthreadex(unsigned int); intptr_t WINAPIV _execl(const char*,const char*,...); intptr_t WINAPIV _execle(const char*,const char*,...); intptr_t WINAPIV _execlp(const char*,const char*,...); @@ -53,9 +53,9 @@ intptr_t __cdecl _spawnvpe(int,const char*,const char* const *,const char* cons void __cdecl _c_exit(void); void __cdecl _cexit(void); -void __cdecl _exit(int) DECLSPEC_NORETURN; -void __cdecl abort(void) DECLSPEC_NORETURN; -void __cdecl exit(int) DECLSPEC_NORETURN; +_ACRTIMP DECLSPEC_NORETURN void __cdecl _exit(int); +_ACRTIMP DECLSPEC_NORETURN void __cdecl abort(void); +_ACRTIMP DECLSPEC_NORETURN void __cdecl exit(int); _ACRTIMP DECLSPEC_NORETURN void __cdecl quick_exit(int); int __cdecl system(const char*); diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index 2ce4789350..ef60428a6a 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -182,9 +182,9 @@ errno_t __cdecl _ui64toa_s(unsigned __int64,char*,size_t,int); char* __cdecl _ultoa(__msvcrt_ulong,char*,int); errno_t __cdecl _ultoa_s(__msvcrt_ulong,char*,size_t,int); -void __cdecl _Exit(int) DECLSPEC_NORETURN; -void __cdecl _exit(int) DECLSPEC_NORETURN; -void __cdecl abort(void) DECLSPEC_NORETURN; +_ACRTIMP DECLSPEC_NORETURN void __cdecl _Exit(int); +_ACRTIMP DECLSPEC_NORETURN void __cdecl _exit(int); +_ACRTIMP DECLSPEC_NORETURN void __cdecl abort(void); int __cdecl abs(int); int __cdecl atexit(void (__cdecl *)(void)); double __cdecl atof(const char*); @@ -198,7 +198,7 @@ div_t __cdecl div(int,int); ldiv_t __cdecl ldiv(__msvcrt_long,__msvcrt_long); #endif lldiv_t __cdecl lldiv(__int64,__int64); -void __cdecl exit(int) DECLSPEC_NORETURN; +_ACRTIMP DECLSPEC_NORETURN void __cdecl exit(int); void __cdecl free(void*); char* __cdecl getenv(const char*); __msvcrt_long __cdecl labs(__msvcrt_long); diff --git a/include/wine/exception.h b/include/wine/exception.h index 90ce30d6a2..4bf4c7e6d9 100644 --- a/include/wine/exception.h +++ b/include/wine/exception.h @@ -105,9 +105,9 @@ typedef struct { int reg; } __wine_jmp_buf; extern int __cdecl __attribute__ ((__nothrow__,__returns_twice__)) __wine_setjmpex( __wine_jmp_buf *buf, EXCEPTION_REGISTRATION_RECORD *frame ) DECLSPEC_HIDDEN; -extern void __cdecl __wine_longjmp( __wine_jmp_buf *buf, int retval ) DECLSPEC_HIDDEN DECLSPEC_NORETURN; -extern void __cdecl __wine_rtl_unwind( EXCEPTION_REGISTRATION_RECORD* frame, EXCEPTION_RECORD *record, - void (*target)(void) ) DECLSPEC_HIDDEN DECLSPEC_NORETURN; +extern void DECLSPEC_NORETURN __cdecl __wine_longjmp( __wine_jmp_buf *buf, int retval ) DECLSPEC_HIDDEN; +extern void DECLSPEC_NORETURN __cdecl __wine_rtl_unwind( EXCEPTION_REGISTRATION_RECORD* frame, EXCEPTION_RECORD *record, + void (*target)(void) ) DECLSPEC_HIDDEN; extern DWORD __cdecl __wine_exception_handler( EXCEPTION_RECORD *record, EXCEPTION_REGISTRATION_RECORD *frame, CONTEXT *context,

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2020