wine-commits May 2019

wine-commits@winehq.org

2 participants
1019 discussions

Józef Kucia : vkd3d: Update current framebuffer before pipeline.
by Alexandre Julliard 16 May '19

16 May '19

Module: vkd3d Branch: master Commit: 54dcb2901b01ff6e258fc51ea8f48aec4e81b6bb URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=54dcb2901b01ff6e258fc51… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 15 13:17:54 2019 +0200 vkd3d: Update current framebuffer before pipeline. Framebuffers are created with a render pass from the graphics pipeline. In the next commits, we defer the creation of render passes for graphics pipelines with invalid DSV formats. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index e4221c9..8c7057b 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2787,10 +2787,10 @@ static bool d3d12_command_list_begin_render_pass(struct d3d12_command_list *list return false; } - if (!d3d12_command_list_update_current_framebuffer(list)) - return false; if (!d3d12_command_list_update_current_pipeline(list)) return false; + if (!d3d12_command_list_update_current_framebuffer(list)) + return false; d3d12_command_list_update_descriptors(list, VK_PIPELINE_BIND_POINT_GRAPHICS);

1 0

Andrew Eikum : winebus.sys: Fix report length calculation.
by Alexandre Julliard 15 May '19

15 May '19

Module: wine Branch: master Commit: 042e0625695a82aa71ddf825c693680d5d8aa0dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=042e0625695a82aa71ddf825… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed May 15 14:57:44 2019 -0500 winebus.sys: Fix report length calculation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47188 Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_sdl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 01eb36e..e669b36 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -553,6 +553,7 @@ static BOOL build_mapped_report_descriptor(struct platform_private *ext) descript_size += sizeof(CONTROLLER_TRIGGERS); descript_size += sizeof(CONTROLLER_BUTTONS); descript_size += sizeof(REPORT_HATSWITCH); + descript_size += sizeof(REPORT_PADDING); descript_size += test_haptic(ext); ext->axis_start = 0;

1 0

Martin Storsjo : ntdll: Avoid truncating a nonzero exit code to zero in unix.
by Alexandre Julliard 15 May '19

15 May '19

Module: wine Branch: master Commit: 044461e8a6f4c1a29c1d72119d2ed207e9d0573b URL: https://source.winehq.org/git/wine.git/?a=commit;h=044461e8a6f4c1a29c1d7211… Author: Martin Storsjo <martin(a)martin.st> Date: Tue May 14 22:02:50 2019 +0300 ntdll: Avoid truncating a nonzero exit code to zero in unix. On Windows, the exit codes can use the full 32 bit range, while on unix, they are truncated to the lowest 8 bits. If the intended exit code is nonzero, to indicate failure, but the lower 8 bits are zero (like when winedbg tries to exit with EXCEPTION_WINE_STUB, 80000100), the observed exit code used to be zero, indicating successful execution. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 2 +- dlls/ntdll/ntdll_misc.h | 7 +++++++ dlls/ntdll/process.c | 2 +- dlls/ntdll/thread.c | 4 ++-- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 034b98c..8dae813 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3264,7 +3264,7 @@ void WINAPI RtlExitUserProcess( DWORD status ) NtTerminateProcess( 0, status ); LdrShutdownProcess(); NtTerminateProcess( GetCurrentProcess(), status ); - exit( status ); + exit( get_unix_exit_code( status )); } /****************************************************************** diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 24c61a0..3463ebd 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -247,6 +247,13 @@ static inline struct ntdll_thread_data *ntdll_get_thread_data(void) return (struct ntdll_thread_data *)&NtCurrentTeb()->GdiTebBatch; } +static inline int get_unix_exit_code( NTSTATUS status ) +{ + /* prevent a nonzero exit code to end up truncated to zero in unix */ + if (status && !(status & 0xff)) return 1; + return status; +} + extern mode_t FILE_umask DECLSPEC_HIDDEN; extern HANDLE keyed_event DECLSPEC_HIDDEN; extern SYSTEM_CPU_INFORMATION cpu_info DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index 3ce5aeb..c1570a5 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -88,7 +88,7 @@ NTSTATUS WINAPI NtTerminateProcess( HANDLE handle, LONG exit_code ) self = !ret && reply->self; } SERVER_END_REQ; - if (self && handle) _exit( exit_code ); + if (self && handle) _exit( get_unix_exit_code( exit_code )); return ret; } diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index be46218..46de839 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -291,7 +291,7 @@ static void free_thread_data( TEB *teb ) void abort_thread( int status ) { pthread_sigmask( SIG_BLOCK, &server_block_set, NULL ); - if (interlocked_xchg_add( &nb_threads, -1 ) <= 1) _exit( status ); + if (interlocked_xchg_add( &nb_threads, -1 ) <= 1) _exit( get_unix_exit_code( status )); signal_exit_thread( status ); } @@ -332,7 +332,7 @@ void WINAPI RtlExitUserThread( ULONG status ) { LdrShutdownProcess(); pthread_sigmask( SIG_BLOCK, &server_block_set, NULL ); - signal_exit_process( status ); + signal_exit_process( get_unix_exit_code( status )); } LdrShutdownThread();

1 0

Hans Leidekker : ntdll: Fix breakpoint exception address on 64-bit Linux.
by Alexandre Julliard 15 May '19

15 May '19

Module: wine Branch: master Commit: 4872747b271ffb8f985c6b55c66c49ebc73072a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4872747b271ffb8f985c6b55… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed May 15 14:19:41 2019 +0200 ntdll: Fix breakpoint exception address on 64-bit Linux. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/debugger.c | 10 +++++++++- dlls/ntdll/signal_x86_64.c | 5 ++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index f62a614..bd9d61b 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -638,7 +638,15 @@ static void test_debug_loop(int argc, char **argv) if (!ret) break; if (ev.dwDebugEventCode == EXIT_PROCESS_DEBUG_EVENT) break; - +#if defined(__i386__) || defined(__x86_64__) + if (ev.dwDebugEventCode == EXCEPTION_DEBUG_EVENT && + ev.u.Exception.ExceptionRecord.ExceptionCode == EXCEPTION_BREAKPOINT) + { + BYTE byte = 0; + NtReadVirtualMemory(pi.hProcess, ev.u.Exception.ExceptionRecord.ExceptionAddress, &byte, 1, NULL); + ok(byte == 0xcc, "got %02x\n", byte); + } +#endif ret = ContinueDebugEvent(ev.dwProcessId, ev.dwThreadId, DBG_CONTINUE); ok(ret, "ContinueDebugEvent failed, last error %#x.\n", GetLastError()); if (!ret) break; diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 21e7098..c2151f7 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -3134,7 +3134,10 @@ static void trap_handler( int signal, siginfo_t *siginfo, void *sigcontext ) rec->ExceptionCode = EXCEPTION_SINGLE_STEP; break; case TRAP_BRKPT: /* Breakpoint exception */ - /* Check if this is actuallly icebp instruction */ +#ifdef SI_KERNEL + case SI_KERNEL: +#endif + /* Check if this is actually icebp instruction */ if (((unsigned char *)rec->ExceptionAddress)[-1] == 0xF1) { rec->ExceptionCode = EXCEPTION_SINGLE_STEP;

1 0

André Hentschel : include: Fix ASM_CFI definition.
by Alexandre Julliard 15 May '19

15 May '19

Module: wine Branch: master Commit: f2503a3e0d10bb563bc7ab62c6ff5093e6ad3f15 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2503a3e0d10bb563bc7ab62… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed May 15 21:42:02 2019 +0200 include: Fix ASM_CFI definition. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/asm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wine/asm.h b/include/wine/asm.h index a581b12..44b01c8 100644 --- a/include/wine/asm.h +++ b/include/wine/asm.h @@ -36,7 +36,7 @@ #ifdef __GCC_HAVE_DWARF2_CFI_ASM # define __ASM_CFI(str) str #else -# define __ASM_CFI(str) str +# define __ASM_CFI(str) #endif #ifdef _WIN32

1 0

Dmitry Timoshkov : windowscodecs/tests: Add some tests for IMILBitmap and IMILBitmapScaler interfaces.
by Alexandre Julliard 15 May '19

15 May '19

Module: wine Branch: master Commit: d074fbe723ad582b492e2ea536a8bced3dd396e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d074fbe723ad582b492e2ea5… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed May 15 11:38:11 2019 +0800 windowscodecs/tests: Add some tests for IMILBitmap and IMILBitmapScaler interfaces. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/bitmap.c | 228 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 228 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d074fbe723ad582b492e…

1 0

Dmitry Timoshkov : windowscodecs: Add support for IMILBitmapScaler interface.
by Alexandre Julliard 15 May '19

15 May '19

Module: wine Branch: master Commit: 36095e2dedb264b207fbeae9f7f4b986a895c46e URL: https://source.winehq.org/git/wine.git/?a=commit;h=36095e2dedb264b207fbeae9… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed May 15 11:36:46 2019 +0800 windowscodecs: Add support for IMILBitmapScaler interface. Makes the GOG downloader work. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/scaler.c | 148 +++++++++++++++++++++++++++++++++ dlls/windowscodecs/wincodecs_private.h | 19 +++++ 2 files changed, 167 insertions(+) diff --git a/dlls/windowscodecs/scaler.c b/dlls/windowscodecs/scaler.c index eedc1bb..c6c758d 100644 --- a/dlls/windowscodecs/scaler.c +++ b/dlls/windowscodecs/scaler.c @@ -1,5 +1,6 @@ /* * Copyright 2010 Vincent Povirk for CodeWeavers + * Copyright 2016 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -35,6 +36,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); typedef struct BitmapScaler { IWICBitmapScaler IWICBitmapScaler_iface; LONG ref; + IMILBitmapScaler IMILBitmapScaler_iface; IWICBitmapSource *source; UINT width, height; UINT src_width, src_height; @@ -50,6 +52,11 @@ static inline BitmapScaler *impl_from_IWICBitmapScaler(IWICBitmapScaler *iface) return CONTAINING_RECORD(iface, BitmapScaler, IWICBitmapScaler_iface); } +static inline BitmapScaler *impl_from_IMILBitmapScaler(IMILBitmapScaler *iface) +{ + return CONTAINING_RECORD(iface, BitmapScaler, IMILBitmapScaler_iface); +} + static HRESULT WINAPI BitmapScaler_QueryInterface(IWICBitmapScaler *iface, REFIID iid, void **ppv) { @@ -64,8 +71,13 @@ static HRESULT WINAPI BitmapScaler_QueryInterface(IWICBitmapScaler *iface, REFII { *ppv = &This->IWICBitmapScaler_iface; } + else if (IsEqualIID(&IID_IMILBitmapScaler, iid)) + { + *ppv = &This->IMILBitmapScaler_iface; + } else { + FIXME("unknown interface %s\n", debugstr_guid(iid)); *ppv = NULL; return E_NOINTERFACE; } @@ -380,6 +392,141 @@ static const IWICBitmapScalerVtbl BitmapScaler_Vtbl = { BitmapScaler_Initialize }; +static HRESULT WINAPI IMILBitmapScaler_QueryInterface(IMILBitmapScaler *iface, REFIID iid, + void **ppv) +{ + BitmapScaler *This = impl_from_IMILBitmapScaler(iface); + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); + return IWICBitmapScaler_QueryInterface(&This->IWICBitmapScaler_iface, iid, ppv); +} + +static ULONG WINAPI IMILBitmapScaler_AddRef(IMILBitmapScaler *iface) +{ + BitmapScaler *This = impl_from_IMILBitmapScaler(iface); + return IWICBitmapScaler_AddRef(&This->IWICBitmapScaler_iface); +} + +static ULONG WINAPI IMILBitmapScaler_Release(IMILBitmapScaler *iface) +{ + BitmapScaler *This = impl_from_IMILBitmapScaler(iface); + return IWICBitmapScaler_Release(&This->IWICBitmapScaler_iface); +} + +static HRESULT WINAPI IMILBitmapScaler_GetSize(IMILBitmapScaler *iface, + UINT *width, UINT *height) +{ + BitmapScaler *This = impl_from_IMILBitmapScaler(iface); + + TRACE("(%p,%p,%p)\n", iface, width, height); + + if (!This->source) + return WINCODEC_ERR_NOTINITIALIZED; + + return IWICBitmapScaler_GetSize(&This->IWICBitmapScaler_iface, width, height); +} + +static HRESULT WINAPI IMILBitmapScaler_GetPixelFormat(IMILBitmapScaler *iface, + int *format) +{ + BitmapScaler *This = impl_from_IMILBitmapScaler(iface); + IMILBitmapSource *source; + HRESULT hr; + + TRACE("(%p,%p)\n", iface, format); + + if (!format) return E_INVALIDARG; + + if (!This->source) + return WINCODEC_ERR_NOTINITIALIZED; + + hr = IWICBitmapSource_QueryInterface(This->source, &IID_IMILBitmapSource, (void **)&source); + if (hr == S_OK) + { + hr = source->lpVtbl->GetPixelFormat(source, format); + source->lpVtbl->Release(source); + } + return hr; +} + +static HRESULT WINAPI IMILBitmapScaler_GetResolution(IMILBitmapScaler *iface, + double *dpix, double *dpiy) +{ + BitmapScaler *This = impl_from_IMILBitmapScaler(iface); + + TRACE("(%p,%p,%p)\n", iface, dpix, dpiy); + + if (!This->source) + return WINCODEC_ERR_NOTINITIALIZED; + + return IWICBitmapScaler_GetResolution(&This->IWICBitmapScaler_iface, dpix, dpiy); +} + +static HRESULT WINAPI IMILBitmapScaler_CopyPalette(IMILBitmapScaler *iface, + IWICPalette *palette) +{ + BitmapScaler *This = impl_from_IMILBitmapScaler(iface); + + TRACE("(%p,%p)\n", iface, palette); + + if (!This->source) + return WINCODEC_ERR_NOTINITIALIZED; + + return IWICBitmapScaler_CopyPalette(&This->IWICBitmapScaler_iface, palette); +} + +static HRESULT WINAPI IMILBitmapScaler_CopyPixels(IMILBitmapScaler *iface, + const WICRect *rc, UINT stride, UINT size, BYTE *buffer) +{ + BitmapScaler *This = impl_from_IMILBitmapScaler(iface); + + TRACE("(%p,%p,%u,%u,%p)\n", iface, rc, stride, size, buffer); + + if (!This->source) + return WINCODEC_ERR_NOTINITIALIZED; + + return IWICBitmapScaler_CopyPixels(&This->IWICBitmapScaler_iface, rc, stride, size, buffer); +} + +static HRESULT WINAPI IMILBitmapScaler_unknown1(IMILBitmapScaler *iface, void **ppv) +{ + TRACE("(%p,%p)\n", iface, ppv); + return E_NOINTERFACE; +} + +static HRESULT WINAPI IMILBitmapScaler_Initialize(IMILBitmapScaler *iface, + IMILBitmapSource *mil_source, UINT width, UINT height, + WICBitmapInterpolationMode mode) +{ + BitmapScaler *This = impl_from_IMILBitmapScaler(iface); + IWICBitmapSource *wic_source; + HRESULT hr; + + TRACE("(%p,%p,%u,%u,%u)\n", iface, mil_source, width, height, mode); + + if (!mil_source) return E_INVALIDARG; + + hr = mil_source->lpVtbl->QueryInterface(mil_source, &IID_IWICBitmapSource, (void **)&wic_source); + if (hr == S_OK) + { + hr = IWICBitmapScaler_Initialize(&This->IWICBitmapScaler_iface, wic_source, width, height, mode); + IWICBitmapSource_Release(wic_source); + } + return hr; +} + +static const IMILBitmapScalerVtbl IMILBitmapScaler_Vtbl = { + IMILBitmapScaler_QueryInterface, + IMILBitmapScaler_AddRef, + IMILBitmapScaler_Release, + IMILBitmapScaler_GetSize, + IMILBitmapScaler_GetPixelFormat, + IMILBitmapScaler_GetResolution, + IMILBitmapScaler_CopyPalette, + IMILBitmapScaler_CopyPixels, + IMILBitmapScaler_unknown1, + IMILBitmapScaler_Initialize +}; + HRESULT BitmapScaler_Create(IWICBitmapScaler **scaler) { BitmapScaler *This; @@ -388,6 +535,7 @@ HRESULT BitmapScaler_Create(IWICBitmapScaler **scaler) if (!This) return E_OUTOFMEMORY; This->IWICBitmapScaler_iface.lpVtbl = &BitmapScaler_Vtbl; + This->IMILBitmapScaler_iface.lpVtbl = &IMILBitmapScaler_Vtbl; This->ref = 1; This->source = NULL; This->width = 0; diff --git a/dlls/windowscodecs/wincodecs_private.h b/dlls/windowscodecs/wincodecs_private.h index e66d25b..89bc47e 100644 --- a/dlls/windowscodecs/wincodecs_private.h +++ b/dlls/windowscodecs/wincodecs_private.h @@ -79,6 +79,25 @@ DECLARE_INTERFACE_(IMILBitmap,IMILBitmapSource) }; #undef INTERFACE +#define INTERFACE IMILBitmapScaler +DECLARE_INTERFACE_(IMILBitmapScaler,IMILBitmapSource) +{ + /*** IUnknown methods ***/ + STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID,void **) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; + /*** IWICBitmapSource methods ***/ + STDMETHOD_(HRESULT,GetSize)(THIS_ UINT *,UINT *) PURE; + STDMETHOD_(HRESULT,GetPixelFormat)(THIS_ int *) PURE; + STDMETHOD_(HRESULT,GetResolution)(THIS_ double *,double *) PURE; + STDMETHOD_(HRESULT,CopyPalette)(THIS_ IWICPalette *) PURE; + STDMETHOD_(HRESULT,CopyPixels)(THIS_ const WICRect *,UINT,UINT,BYTE *) PURE; + /*** IMILBitmapScaler methods ***/ + STDMETHOD_(HRESULT,unknown1)(THIS_ void **) PURE; + STDMETHOD_(HRESULT,Initialize)(THIS_ IMILBitmapSource *,UINT,UINT,WICBitmapInterpolationMode) PURE; +}; +#undef INTERFACE + #define INTERFACE IMILUnknown1 DECLARE_INTERFACE_(IMILUnknown1,IUnknown) {

1 0

Dmitry Timoshkov : windowscodecs: Improve compatibility of IMILBitmap interface.
by Alexandre Julliard 15 May '19

15 May '19

Module: wine Branch: master Commit: f6cab98d4b7c423ef9487657b88c6ff6f8eb452f URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6cab98d4b7c423ef9487657… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed May 15 11:36:20 2019 +0800 windowscodecs: Improve compatibility of IMILBitmap interface. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=34764 Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/bitmap.c | 237 +++++++++++++++++++++++---------- dlls/windowscodecs/wincodecs_private.h | 59 ++++++-- 2 files changed, 214 insertions(+), 82 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f6cab98d4b7c423ef948…

1 0

Alexandre Julliard : riched20: Declare thiscall functions as __thiscall.
by Alexandre Julliard 15 May '19

15 May '19

Module: wine Branch: master Commit: f3e45c37a2d1067f2c2898ef4b10530cb3a69018 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3e45c37a2d1067f2c2898ef… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 15 20:07:53 2019 +0200 riched20: Declare thiscall functions as __thiscall. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/txthost.c | 179 ++++++++++++++++++++++-------------------------- dlls/riched20/txtsrv.c | 100 +++++++++++++-------------- 2 files changed, 132 insertions(+), 147 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f3e45c37a2d1067f2c28…

1 0

Alexandre Julliard : include: Define thiscall assembly wrappers globally.
by Alexandre Julliard 15 May '19

15 May '19

Module: wine Branch: master Commit: ee4db2005eaafdab8996527c134c52d9d03e785c URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee4db2005eaafdab8996527c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 15 20:06:32 2019 +0200 include: Define thiscall assembly wrappers globally. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/cxx.h | 23 ----------------------- dlls/msvcrt/cxx.h | 22 ---------------------- dlls/riched20/txthost.c | 29 ----------------------------- dlls/riched20/txtsrv.c | 29 ----------------------------- dlls/vssapi/main.c | 22 ---------------------- include/wine/asm.h | 37 +++++++++++++++++++++++++++++++++++++ 6 files changed, 37 insertions(+), 125 deletions(-) diff --git a/dlls/msvcp90/cxx.h b/dlls/msvcp90/cxx.h index fd69756..e14b7de 100644 --- a/dlls/msvcp90/cxx.h +++ b/dlls/msvcp90/cxx.h @@ -18,29 +18,6 @@ #include "wine/asm.h" -/* Copied from dlls/msvcrt/cxx.h */ -#undef __thiscall -#ifdef __i386__ /* thiscall functions are i386-specific */ - -#define THISCALL(func) __thiscall_ ## func -#define THISCALL_NAME(func) __ASM_NAME("__thiscall_" #func) -#define __thiscall __stdcall -#define DEFINE_THISCALL_WRAPPER(func,args) \ - extern void THISCALL(func)(void); \ - __ASM_GLOBAL_FUNC(__thiscall_ ## func, \ - "popl %eax\n\t" \ - "pushl %ecx\n\t" \ - "pushl %eax\n\t" \ - "jmp " __ASM_NAME(#func) __ASM_STDCALL(args) ) -#else /* __i386__ */ - -#define THISCALL(func) func -#define THISCALL_NAME(func) __ASM_NAME(#func) -#define __thiscall __cdecl -#define DEFINE_THISCALL_WRAPPER(func,args) /* nothing */ - -#endif /* __i386__ */ - #ifdef _WIN64 #define VTABLE_ADD_FUNC(name) "\t.quad " THISCALL_NAME(name) "\n" diff --git a/dlls/msvcrt/cxx.h b/dlls/msvcrt/cxx.h index 75677e2..68783f5 100644 --- a/dlls/msvcrt/cxx.h +++ b/dlls/msvcrt/cxx.h @@ -18,28 +18,6 @@ #include "wine/asm.h" -#undef __thiscall -#ifdef __i386__ /* thiscall functions are i386-specific */ - -#define THISCALL(func) __thiscall_ ## func -#define THISCALL_NAME(func) __ASM_NAME("__thiscall_" #func) -#define __thiscall __stdcall -#define DEFINE_THISCALL_WRAPPER(func,args) \ - extern void THISCALL(func)(void); \ - __ASM_GLOBAL_FUNC(__thiscall_ ## func, \ - "popl %eax\n\t" \ - "pushl %ecx\n\t" \ - "pushl %eax\n\t" \ - "jmp " __ASM_NAME(#func) __ASM_STDCALL(args) ) -#else /* __i386__ */ - -#define THISCALL(func) func -#define THISCALL_NAME(func) __ASM_NAME(#func) -#define __thiscall __cdecl -#define DEFINE_THISCALL_WRAPPER(func,args) /* nothing */ - -#endif /* __i386__ */ - #ifdef _WIN64 #define VTABLE_ADD_FUNC(name) "\t.quad " THISCALL_NAME(name) "\n" diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index ab94503..e4c4e0c 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -500,35 +500,6 @@ DECLSPEC_HIDDEN HRESULT WINAPI ITextHostImpl_TxGetSelectionBarWidth(ITextHost *i } -#ifdef __i386__ /* thiscall functions are i386-specific */ - -#define THISCALL(func) (void *) __thiscall_ ## func -#ifdef _MSC_VER -#define DEFINE_THISCALL_WRAPPER(func,args) \ - __declspec(naked) HRESULT __thiscall_##func(void) \ - { \ - __asm pop eax \ - __asm push ecx \ - __asm push eax \ - __asm jmp func \ - } -#else /* _MSC_VER */ -#define DEFINE_THISCALL_WRAPPER(func,args) \ - extern HRESULT __thiscall_ ## func(void); \ - __ASM_GLOBAL_FUNC(__thiscall_ ## func, \ - "popl %eax\n\t" \ - "pushl %ecx\n\t" \ - "pushl %eax\n\t" \ - "jmp " __ASM_NAME(#func) __ASM_STDCALL(args) ) -#endif /* _MSC_VER */ - -#else /* __i386__ */ - -#define THISCALL(func) func -#define DEFINE_THISCALL_WRAPPER(func,args) /* nothing */ - -#endif /* __i386__ */ - DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetDC,4) DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxReleaseDC,8) DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxShowScrollBar,12) diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index a9ceef4..6777f97 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -34,35 +34,6 @@ #include "wine/debug.h" #include "editstr.h" -#ifdef __i386__ /* thiscall functions are i386-specific */ - -#define THISCALL(func) (void *) __thiscall_ ## func -#ifdef _MSC_VER -#define DEFINE_THISCALL_WRAPPER(func,args) \ - __declspec(naked) HRESULT __thiscall_##func(void) \ - { \ - __asm pop eax \ - __asm push ecx \ - __asm push eax \ - __asm jmp func \ - } -#else /* _MSC_VER */ -#define DEFINE_THISCALL_WRAPPER(func,args) \ - extern HRESULT __thiscall_ ## func(void); \ - __ASM_GLOBAL_FUNC(__thiscall_ ## func, \ - "popl %eax\n\t" \ - "pushl %ecx\n\t" \ - "pushl %eax\n\t" \ - "jmp " __ASM_NAME(#func) __ASM_STDCALL(args) ) -#endif /* _MSC_VER */ - -#else /* __i386__ */ - -#define THISCALL(func) func -#define DEFINE_THISCALL_WRAPPER(func,args) /* nothing */ - -#endif /* __i386__ */ - WINE_DEFAULT_DEBUG_CHANNEL(richedit); typedef struct ITextServicesImpl { diff --git a/dlls/vssapi/main.c b/dlls/vssapi/main.c index 2ebd204..526772a 100644 --- a/dlls/vssapi/main.c +++ b/dlls/vssapi/main.c @@ -28,28 +28,6 @@ WINE_DEFAULT_DEBUG_CHANNEL( vssapi ); -#undef __thiscall -#ifdef __i386__ /* thiscall functions are i386-specific */ - -#define THISCALL(func) __thiscall_ ## func -#define THISCALL_NAME(func) __ASM_NAME("__thiscall_" #func) -#define __thiscall __stdcall -#define DEFINE_THISCALL_WRAPPER(func,args) \ - extern void THISCALL(func)(void); \ - __ASM_GLOBAL_FUNC(__thiscall_ ## func, \ - "popl %eax\n\t" \ - "pushl %ecx\n\t" \ - "pushl %eax\n\t" \ - "jmp " __ASM_NAME(#func) __ASM_STDCALL(args) ) -#else /* __i386__ */ - -#define THISCALL(func) func -#define THISCALL_NAME(func) __ASM_NAME(#func) -#define __thiscall __cdecl -#define DEFINE_THISCALL_WRAPPER(func,args) /* nothing */ - -#endif /* __i386__ */ - struct CVssWriter { void **vtable; diff --git a/include/wine/asm.h b/include/wine/asm.h index f1c50fd..a581b12 100644 --- a/include/wine/asm.h +++ b/include/wine/asm.h @@ -88,4 +88,41 @@ #endif /* __i386__ */ +/* thiscall support */ + +#undef __thiscall +#define __thiscall __stdcall + +#ifdef __i386__ + +# ifdef _MSC_VER +# define DEFINE_THISCALL_WRAPPER(func,args) \ + __declspec(naked) HRESULT __thiscall_##func(void) \ + { __asm { \ + pop eax \ + push ecx \ + push eax \ + jmp func \ + } } +# else /* _MSC_VER */ +# define DEFINE_THISCALL_WRAPPER(func,args) \ + extern void __thiscall_ ## func(void); \ + __ASM_GLOBAL_FUNC( __thiscall_ ## func, \ + "popl %eax\n\t" \ + "pushl %ecx\n\t" \ + "pushl %eax\n\t" \ + "jmp " __ASM_NAME(#func) __ASM_STDCALL(args) ) +# endif /* _MSC_VER */ + +# define THISCALL(func) (void *)__thiscall_ ## func +# define THISCALL_NAME(func) __ASM_NAME("__thiscall_" #func) + +#else /* __i386__ */ + +# define DEFINE_THISCALL_WRAPPER(func,args) /* nothing */ +# define THISCALL(func) func +# define THISCALL_NAME(func) __ASM_NAME(#func) + +#endif /* __i386__ */ + #endif /* __WINE_WINE_ASM_H */

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 May 2019