wine-commits May 2015

wine-commits@winehq.org

2 participants
428 discussions

Daniel Lehman : msvcr120: Add erf functions.
by Alexandre Julliard 29 May '15

29 May '15

Module: wine Branch: master Commit: e89813fe3cf80e9d4aea13a5f1f651cce4b12c8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e89813fe3cf80e9d4aea13a5f… Author: Daniel Lehman <dlehman(a)esri.com> Date: Thu May 21 09:25:48 2015 -0700 msvcr120: Add erf functions. --- configure | 2 ++ configure.ac | 2 ++ dlls/msvcr120/msvcr120.spec | 6 +++--- dlls/msvcr120_app/msvcr120_app.spec | 6 +++--- dlls/msvcrt/math.c | 34 ++++++++++++++++++++++++++++++++++ include/config.h.in | 6 ++++++ 6 files changed, 50 insertions(+), 6 deletions(-) diff --git a/configure b/configure index 28e6c19..c571b48 100755 --- a/configure +++ b/configure @@ -16572,6 +16572,8 @@ fi for ac_func in \ cbrt \ cbrtf \ + erf \ + erff \ exp2 \ exp2f \ llrint \ diff --git a/configure.ac b/configure.ac index 88eb77b..c61a975 100644 --- a/configure.ac +++ b/configure.ac @@ -2590,6 +2590,8 @@ fi AC_CHECK_FUNCS(\ cbrt \ cbrtf \ + erf \ + erff \ exp2 \ exp2f \ llrint \ diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 1d1196d..1a1470e 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2119,12 +2119,12 @@ @ stub ctanhl @ stub ctanl @ cdecl -ret64 div(long long) MSVCRT_div -@ stub erf +@ cdecl erf(double) MSVCR120_erf @ stub erfc @ stub erfcf @ stub erfcl -@ stub erff -@ stub erfl +@ cdecl erff(double) MSVCR120_erff +@ cdecl erfl(double) MSVCR120_erfl @ cdecl exit(long) MSVCRT_exit @ cdecl exp(double) MSVCRT_exp @ cdecl exp2(double) MSVCR120_exp2 diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 7f6be1d..f47f906 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1788,12 +1788,12 @@ @ stub ctanhl @ stub ctanl @ cdecl -ret64 div(long long) msvcr120.div -@ stub erf +@ cdecl erf(double) msvcr120.erf @ stub erfc @ stub erfcf @ stub erfcl -@ stub erff -@ stub erfl +@ cdecl erff(double) msvcr120.erff +@ cdecl erfl(double) msvcr120.erfl @ cdecl exit(long) msvcr120.exit @ cdecl exp(double) msvcr120.exp @ cdecl exp2(double) msvcr120.exp2 diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 6779430..162dcfb 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2607,6 +2607,40 @@ short CDECL MSVCR120__ldtest(LDOUBLE *x) } /********************************************************************* + * erff (MSVCR120.@) + */ +float CDECL MSVCR120_erff(float x) +{ +#ifdef HAVE_ERFF + return erff(x); +#else + FIXME( "not implemented\n" ); + return 0.0f; +#endif +} + +/********************************************************************* + * erf (MSVCR120.@) + */ +double CDECL MSVCR120_erf(double x) +{ +#ifdef HAVE_ERF + return erf(x); +#else + FIXME( "not implemented\n" ); + return 0.0; +#endif +} + +/********************************************************************* + * erfl (MSVCR120.@) + */ +LDOUBLE CDECL MSVCR120_erfl(LDOUBLE x) +{ + return MSVCR120_erf(x); +} + +/********************************************************************* * fmaxf (MSVCR120.@) */ float CDECL MSVCR120_fmaxf(float x, float y) diff --git a/include/config.h.in b/include/config.h.in index bcc6eb9..0f435d1 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -111,6 +111,12 @@ /* Define to 1 if you have the `epoll_create' function. */ #undef HAVE_EPOLL_CREATE +/* Define to 1 if you have the `erf' function. */ +#undef HAVE_ERF + +/* Define to 1 if you have the `erff' function. */ +#undef HAVE_ERFF + /* Define to 1 if you have the `exp2' function. */ #undef HAVE_EXP2

1 0

Damjan Jovanovic : qcap: Implement the SmartTee media type functions.
by Alexandre Julliard 29 May '15

29 May '15

Module: wine Branch: master Commit: 9bf73a043abfeb7e12bd325366fc22f35cd776fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bf73a043abfeb7e12bd32536… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu May 28 19:04:34 2015 +0200 qcap: Implement the SmartTee media type functions. --- dlls/qcap/smartteefilter.c | 70 ++++++++++++++++++++++++++++++++++------ dlls/qcap/tests/smartteefilter.c | 12 +++---- 2 files changed, 66 insertions(+), 16 deletions(-) diff --git a/dlls/qcap/smartteefilter.c b/dlls/qcap/smartteefilter.c index bf68398..9af2e9a 100644 --- a/dlls/qcap/smartteefilter.c +++ b/dlls/qcap/smartteefilter.c @@ -261,9 +261,13 @@ static const IPinVtbl SmartTeeFilterInputVtbl = { static HRESULT WINAPI SmartTeeFilterInput_CheckMediaType(BasePin *base, const AM_MEDIA_TYPE *pmt) { SmartTeeFilter *This = impl_from_BasePin(base); - FIXME("(%p, AM_MEDIA_TYPE(%p)): stub\n", This, pmt); + TRACE("(%p, AM_MEDIA_TYPE(%p))\n", This, pmt); dump_AM_MEDIA_TYPE(pmt); - return E_NOTIMPL; + if (!pmt) + return VFW_E_TYPE_NOT_ACCEPTED; + /* We'll take any media type, but the output pins will later + * struggle to connect downstream. */ + return S_OK; } static LONG WINAPI SmartTeeFilterInput_GetMediaTypeVersion(BasePin *base) @@ -274,8 +278,18 @@ static LONG WINAPI SmartTeeFilterInput_GetMediaTypeVersion(BasePin *base) static HRESULT WINAPI SmartTeeFilterInput_GetMediaType(BasePin *base, int iPosition, AM_MEDIA_TYPE *amt) { SmartTeeFilter *This = impl_from_BasePin(base); - FIXME("(%p)->(%d, %p): stub\n", This, iPosition, amt); - return S_FALSE; + HRESULT hr; + TRACE("(%p)->(%d, %p)\n", This, iPosition, amt); + if (iPosition) + return S_FALSE; + EnterCriticalSection(&This->filter.csFilter); + if (This->input->pin.pConnectedTo) { + CopyMediaType(amt, &This->input->pin.mtCurrent); + hr = S_OK; + } else + hr = S_FALSE; + LeaveCriticalSection(&This->filter.csFilter); + return hr; } static HRESULT WINAPI SmartTeeFilterInput_Receive(BaseInputPin *base, IMediaSample *pSample) @@ -307,6 +321,20 @@ static ULONG WINAPI SmartTeeFilterCapture_Release(IPin *iface) return IBaseFilter_Release(&This->filter.IBaseFilter_iface); } +static HRESULT WINAPI SmartTeeFilterCapture_EnumMediaTypes(IPin *iface, IEnumMediaTypes **ppEnum) +{ + SmartTeeFilter *This = impl_from_IPin(iface); + HRESULT hr; + TRACE("(%p)->(%p)\n", This, ppEnum); + EnterCriticalSection(&This->filter.csFilter); + if (This->input->pin.pConnectedTo) { + hr = BasePinImpl_EnumMediaTypes(iface, ppEnum); + } else + hr = VFW_E_NOT_CONNECTED; + LeaveCriticalSection(&This->filter.csFilter); + return hr; +} + static const IPinVtbl SmartTeeFilterCaptureVtbl = { BaseOutputPinImpl_QueryInterface, SmartTeeFilterCapture_AddRef, @@ -320,7 +348,7 @@ static const IPinVtbl SmartTeeFilterCaptureVtbl = { BasePinImpl_QueryDirection, BasePinImpl_QueryId, BasePinImpl_QueryAccept, - BasePinImpl_EnumMediaTypes, + SmartTeeFilterCapture_EnumMediaTypes, BasePinImpl_QueryInternalConnections, BaseOutputPinImpl_EndOfStream, BaseOutputPinImpl_BeginFlush, @@ -338,8 +366,12 @@ static LONG WINAPI SmartTeeFilterCapture_GetMediaTypeVersion(BasePin *base) static HRESULT WINAPI SmartTeeFilterCapture_GetMediaType(BasePin *base, int iPosition, AM_MEDIA_TYPE *amt) { SmartTeeFilter *This = impl_from_BasePin(base); - FIXME("(%p, %d, %p): stub\n", This, iPosition, amt); - return E_NOTIMPL; + TRACE("(%p, %d, %p)\n", This, iPosition, amt); + if (iPosition == 0) { + CopyMediaType(amt, &This->input->pin.mtCurrent); + return S_OK; + } else + return S_FALSE; } static HRESULT WINAPI SmartTeeFilterCapture_DecideBufferSize(BaseOutputPin *base, IMemAllocator *alloc, @@ -381,6 +413,20 @@ static ULONG WINAPI SmartTeeFilterPreview_Release(IPin *iface) return IBaseFilter_Release(&This->filter.IBaseFilter_iface); } +static HRESULT WINAPI SmartTeeFilterPreview_EnumMediaTypes(IPin *iface, IEnumMediaTypes **ppEnum) +{ + SmartTeeFilter *This = impl_from_IPin(iface); + HRESULT hr; + TRACE("(%p)->(%p)\n", This, ppEnum); + EnterCriticalSection(&This->filter.csFilter); + if (This->input->pin.pConnectedTo) { + hr = BasePinImpl_EnumMediaTypes(iface, ppEnum); + } else + hr = VFW_E_NOT_CONNECTED; + LeaveCriticalSection(&This->filter.csFilter); + return hr; +} + static const IPinVtbl SmartTeeFilterPreviewVtbl = { BaseOutputPinImpl_QueryInterface, SmartTeeFilterPreview_AddRef, @@ -394,7 +440,7 @@ static const IPinVtbl SmartTeeFilterPreviewVtbl = { BasePinImpl_QueryDirection, BasePinImpl_QueryId, BasePinImpl_QueryAccept, - BasePinImpl_EnumMediaTypes, + SmartTeeFilterPreview_EnumMediaTypes, BasePinImpl_QueryInternalConnections, BaseOutputPinImpl_EndOfStream, BaseOutputPinImpl_BeginFlush, @@ -412,8 +458,12 @@ static LONG WINAPI SmartTeeFilterPreview_GetMediaTypeVersion(BasePin *base) static HRESULT WINAPI SmartTeeFilterPreview_GetMediaType(BasePin *base, int iPosition, AM_MEDIA_TYPE *amt) { SmartTeeFilter *This = impl_from_BasePin(base); - FIXME("(%p, %d, %p): stub\n", This, iPosition, amt); - return E_NOTIMPL; + TRACE("(%p, %d, %p)\n", This, iPosition, amt); + if (iPosition == 0) { + CopyMediaType(amt, &This->input->pin.mtCurrent); + return S_OK; + } else + return S_FALSE; } static HRESULT WINAPI SmartTeeFilterPreview_DecideBufferSize(BaseOutputPin *base, IMemAllocator *alloc, ALLOCATOR_PROPERTIES *ppropInputRequest) diff --git a/dlls/qcap/tests/smartteefilter.c b/dlls/qcap/tests/smartteefilter.c index 78378e2..1255887 100644 --- a/dlls/qcap/tests/smartteefilter.c +++ b/dlls/qcap/tests/smartteefilter.c @@ -1010,13 +1010,13 @@ static HRESULT WINAPI SourcePin_Connect(IPin *iface, IPin *pReceivePin, const AM if (pmt && !IsEqualGUID(&pmt->formattype, &GUID_NULL)) return VFW_E_TYPE_NOT_ACCEPTED; hr = IPin_ReceiveConnection(pReceivePin, &This->IPin_iface, &This->mediaType); - todo_wine ok(SUCCEEDED(hr), "SmartTeeFilter's Input pin's IPin_ReceiveConnection() failed with 0x%08x\n", hr); + ok(SUCCEEDED(hr), "SmartTeeFilter's Input pin's IPin_ReceiveConnection() failed with 0x%08x\n", hr); if (SUCCEEDED(hr)) { EnterCriticalSection(&This->cs); hr = IPin_QueryInterface(pReceivePin, &IID_IMemInputPin, (void**)&This->memInputPin); if (SUCCEEDED(hr)) { hr = IMemInputPin_GetAllocator(This->memInputPin, &This->allocator); - ok(SUCCEEDED(hr), "couldn't get allocator from SmartTeeFilter, hr=0x%08x\n", hr); + todo_wine ok(SUCCEEDED(hr), "couldn't get allocator from SmartTeeFilter, hr=0x%08x\n", hr); if (SUCCEEDED(hr)) { ALLOCATOR_PROPERTIES requested, actual; ZeroMemory(&requested, sizeof(ALLOCATOR_PROPERTIES)); @@ -1307,9 +1307,9 @@ static void test_smart_tee_filter_in_graph(IBaseFilter *smartTeeFilter, IPin *in } hr = IGraphBuilder_Connect(graphBuilder, capturePin, &captureSinkFilter->IPin_iface); - todo_wine ok(hr == VFW_E_NOT_CONNECTED, "connecting Capture pin without first connecting Input pin returned 0x%08x\n", hr); + ok(hr == VFW_E_NOT_CONNECTED, "connecting Capture pin without first connecting Input pin returned 0x%08x\n", hr); hr = IGraphBuilder_Connect(graphBuilder, previewPin, &previewSinkFilter->IPin_iface); - todo_wine ok(hr == VFW_E_NOT_CONNECTED, "connecting Preview pin without first connecting Input pin returned 0x%08x\n", hr); + ok(hr == VFW_E_NOT_CONNECTED, "connecting Preview pin without first connecting Input pin returned 0x%08x\n", hr); sourceFilter = create_SourceFilter(); if (sourceFilter == NULL) { @@ -1502,9 +1502,9 @@ static void test_smart_tee_filter(void) IEnumMediaTypes_Release(enumMediaTypes); enumMediaTypes = NULL; hr = IPin_EnumMediaTypes(capturePin, &enumMediaTypes); - todo_wine ok(hr == VFW_E_NOT_CONNECTED, "IPin_EnumMediaTypes() failed, hr=0x%08x\n", hr); + ok(hr == VFW_E_NOT_CONNECTED, "IPin_EnumMediaTypes() failed, hr=0x%08x\n", hr); hr = IPin_EnumMediaTypes(previewPin, &enumMediaTypes); - todo_wine ok(hr == VFW_E_NOT_CONNECTED, "IPin_EnumMediaTypes() failed, hr=0x%08x\n", hr); + ok(hr == VFW_E_NOT_CONNECTED, "IPin_EnumMediaTypes() failed, hr=0x%08x\n", hr); hr = IPin_QueryInternalConnections(inputPin, NULL, &nPin); ok(hr == E_NOTIMPL, "IPin_QueryInternalConnections() returned hr=0x%08x\n", hr);

1 0

Damjan Jovanovic : qcap: Implement a stubbed SmartTee filter.
by Alexandre Julliard 29 May '15

29 May '15

Module: wine Branch: master Commit: cdd40604693e81334de167b52562782e53a820c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdd40604693e81334de167b52… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu May 28 19:04:29 2015 +0200 qcap: Implement a stubbed SmartTee filter. --- dlls/qcap/Makefile.in | 1 + dlls/qcap/qcap_main.c | 2 +- dlls/qcap/smartteefilter.c | 497 +++++++++++++++++++++++++++++++++++++++ dlls/qcap/tests/smartteefilter.c | 26 +- 4 files changed, 512 insertions(+), 14 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cdd40604693e81334de16…

1 0

Damjan Jovanovic : qcap/tests: Test SmartTee filter aggregation.
by Alexandre Julliard 29 May '15

29 May '15

Module: wine Branch: master Commit: e6307f1a4ba827b5f06fbe9c59013bb60e6cf276 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6307f1a4ba827b5f06fbe9c5… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu May 28 19:04:24 2015 +0200 qcap/tests: Test SmartTee filter aggregation. --- dlls/qcap/tests/smartteefilter.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/qcap/tests/smartteefilter.c b/dlls/qcap/tests/smartteefilter.c index 126d798..83bcff9 100644 --- a/dlls/qcap/tests/smartteefilter.c +++ b/dlls/qcap/tests/smartteefilter.c @@ -1532,12 +1532,28 @@ end: IEnumMediaTypes_Release(enumMediaTypes); } +static void test_smart_tee_filter_aggregation(void) +{ + SourceFilter *sourceFilter = create_SourceFilter(); + if (sourceFilter) { + IUnknown *unknown = NULL; + HRESULT hr = CoCreateInstance(&CLSID_SmartTee, (IUnknown*)&sourceFilter->IBaseFilter_iface, + CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&unknown); + todo_wine ok(SUCCEEDED(hr), "SmartTee filter doesn't support aggregation, hr=0x%08x\n", hr); + if (unknown) + IUnknown_Release(unknown); + IBaseFilter_Release(&sourceFilter->IBaseFilter_iface); + } else + ok(0, "out of memory allocating SourceFilter for test\n"); +} + START_TEST(smartteefilter) { if (SUCCEEDED(CoInitialize(NULL))) { event = CreateEventW(NULL, FALSE, FALSE, NULL); if (event) { + test_smart_tee_filter_aggregation(); test_smart_tee_filter(); CloseHandle(event); } else

1 0

Damjan Jovanovic : qcap/tests: Add media tests for the SmartTee filter.
by Alexandre Julliard 29 May '15

29 May '15

Module: wine Branch: master Commit: d126fd53f7e2427071a70784178206eff0e21e8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d126fd53f7e2427071a707841… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu May 28 19:04:18 2015 +0200 qcap/tests: Add media tests for the SmartTee filter. --- dlls/qcap/tests/smartteefilter.c | 772 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 758 insertions(+), 14 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d126fd53f7e2427071a70…

1 0

Damjan Jovanovic : qcap/tests: Add many more SmartTee filter tests.
by Alexandre Julliard 29 May '15

29 May '15

Module: wine Branch: master Commit: 5405c0feebd1e94e9812dc8d7cc71a2720c65449 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5405c0feebd1e94e9812dc8d7… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu May 28 19:04:07 2015 +0200 qcap/tests: Add many more SmartTee filter tests. --- dlls/qcap/tests/Makefile.in | 3 +- dlls/qcap/tests/qcap.c | 73 ---- dlls/qcap/tests/smartteefilter.c | 806 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 808 insertions(+), 74 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5405c0feebd1e94e9812d…

1 0

Damjan Jovanovic : qcap/tests: Fix SmartTeeFilter reference leaks from the pins in its test.
by Alexandre Julliard 29 May '15

29 May '15

Module: wine Branch: master Commit: 6bc6b0bf71bd23fef8962c4e6be936454cd1ecab URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bc6b0bf71bd23fef8962c4e6… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu May 28 19:03:03 2015 +0200 qcap/tests: Fix SmartTeeFilter reference leaks from the pins in its test. --- dlls/qcap/tests/qcap.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/qcap/tests/qcap.c b/dlls/qcap/tests/qcap.c index 19177bd..39737f4 100644 --- a/dlls/qcap/tests/qcap.c +++ b/dlls/qcap/tests/qcap.c @@ -127,6 +127,7 @@ static void test_smart_tee_filter(void) while (IEnumPins_Next(enumPins, 1, &pin, NULL) == S_OK) { PIN_INFO pinInfo; + memset(&pinInfo, 0, sizeof(pinInfo)); hr = IPin_QueryPinInfo(pin, &pinInfo); ok(SUCCEEDED(hr), "QueryPinInfo failed, hr=%08x\n", hr); if (FAILED(hr)) @@ -154,6 +155,8 @@ static void test_smart_tee_filter(void) ok(0, "pin %d isn't supposed to exist\n", pinNumber); endwhile: + if (pinInfo.pFilter) + IBaseFilter_Release(pinInfo.pFilter); IPin_Release(pin); pinNumber++; }

1 0

Alexandre Julliard : krnl386.exe: Release the Win16 lock when loading a 32-bit dll.
by Alexandre Julliard 29 May '15

29 May '15

Module: wine Branch: master Commit: 3a2e7d1a3dbf42a0385e5c0f64d79e9ea054252e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a2e7d1a3dbf42a0385e5c0f6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 29 15:02:45 2015 +0900 krnl386.exe: Release the Win16 lock when loading a 32-bit dll. --- dlls/krnl386.exe16/ne_module.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/krnl386.exe16/ne_module.c b/dlls/krnl386.exe16/ne_module.c index c0e1a98..70f8a46 100644 --- a/dlls/krnl386.exe16/ne_module.c +++ b/dlls/krnl386.exe16/ne_module.c @@ -981,8 +981,11 @@ static HINSTANCE16 MODULE_LoadModule16( LPCSTR libname, BOOL implicit, BOOL lib_ if (strlen(basename) < sizeof(dllname)-6) { + DWORD count; char *q; + ReleaseThunkLock( &count ); + strcpy( dllname, basename ); q = strrchr( dllname, '.' ); if (!q) strcat( dllname, ".dll" ); @@ -1011,6 +1014,7 @@ static HINSTANCE16 MODULE_LoadModule16( LPCSTR libname, BOOL implicit, BOOL lib_ { WARN( "couldn't load owner %s for 16-bit dll %s\n", main_module, dllname ); FreeLibrary( mod32 ); + RestoreThunkLock( count ); return ERROR_FILE_NOT_FOUND; } /* check if module was loaded native */ @@ -1023,6 +1027,7 @@ static HINSTANCE16 MODULE_LoadModule16( LPCSTR libname, BOOL implicit, BOOL lib_ } } } + RestoreThunkLock( count ); /* loading the 32-bit library can have the side effect of loading the module */ /* if so, simply incr the ref count and return the module */

1 0

André Hentschel : ntdll: Fix returning from various ARM assembler functions.
by Alexandre Julliard 29 May '15

29 May '15

Module: wine Branch: master Commit: c13be7446e52f2bc8d4779a00d32f7952451be5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c13be7446e52f2bc8d4779a00… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu May 28 22:39:01 2015 +0200 ntdll: Fix returning from various ARM assembler functions. --- dlls/ntdll/signal_arm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 113139f..0c51c49 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -283,7 +283,7 @@ __ASM_STDCALL_FUNC( RtlCaptureContext, 4, "str PC, [r0, #0x40]\n\t" /* context->Pc */ "mrs r1, CPSR\n\t" "str r1, [r0, #0x44]\n\t" /* context->Cpsr */ - "mov PC, LR\n" + "bx lr" ) @@ -920,7 +920,7 @@ void signal_free_thread( TEB *teb ) extern void set_tpidrurw( TEB *teb ); __ASM_GLOBAL_FUNC( set_tpidrurw, "mcr p15, 0, r0, c13, c0, 2\n\t" /* TEB -> TPIDRURW */ - "blx lr" ) + "bx lr" ) #else void set_tpidrurw( TEB *teb ) {

1 0

André Hentschel : ntdll: Add stub for __chkstk on ARM.
by Alexandre Julliard 29 May '15

29 May '15

Module: wine Branch: master Commit: a18f84c0b122a324cc050cf23a0b3d0622c7de92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a18f84c0b122a324cc050cf23… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu May 28 22:38:53 2015 +0200 ntdll: Add stub for __chkstk on ARM. --- dlls/kernel32/kernel32.spec | 2 +- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/signal_arm.c | 6 ++++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 8f6a13e..d5e95c1 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1629,7 +1629,7 @@ @ stdcall WriteTapemark(ptr long long long) @ stdcall ZombifyActCtx(ptr) @ stdcall -arch=x86_64 -private __C_specific_handler(ptr long ptr ptr) ntdll.__C_specific_handler -@ stdcall -arch=x86_64 -private -norelay __chkstk() ntdll.__chkstk +@ stdcall -arch=arm,x86_64 -private -norelay __chkstk() ntdll.__chkstk @ stub _DebugOut @ stub _DebugPrintf @ stdcall _hread(long ptr long) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 6d86157..191115b 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1271,7 +1271,7 @@ @ cdecl -private -arch=i386 _CIsin() NTDLL__CIsin @ cdecl -private -arch=i386 _CIsqrt() NTDLL__CIsqrt @ stdcall -arch=x86_64 __C_specific_handler(ptr long ptr ptr) -@ stdcall -private -arch=x86_64 -norelay __chkstk() +@ stdcall -private -arch=arm,x86_64 -norelay __chkstk() @ cdecl -private __isascii(long) NTDLL___isascii @ cdecl -private __iscsym(long) NTDLL___iscsym @ cdecl -private __iscsymf(long) NTDLL___iscsymf diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index bdb27af..113139f 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -247,6 +247,12 @@ static inline void restore_fpu( CONTEXT *context, const ucontext_t *sigcontext ) FIXME("not implemented\n"); } +/************************************************************************** + * __chkstk (NTDLL.@) + * + * Should check if we can decrement SP by the value provided in r4, but we shouldn't need that. + */ +__ASM_GLOBAL_FUNC( __chkstk, "bx lr" ) /*********************************************************************** * RtlCaptureContext (NTDLL.@)

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 2015