May 2020 - Wine-Commits - list.winehq.org

Zebediah Figura : quartz/vmr9: Track the IVMRSurfaceAllocatorNotify9 reference count separately.
by Alexandre Julliard May 5, 2020

May 5, 2020

Module: wine Branch: master Commit: 9181a12e620bccd5642e5ee521623897649c5638 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9181a12e620bccd5642e5ee5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 4 18:05:22 2020 -0500 quartz/vmr9: Track the IVMRSurfaceAllocatorNotify9 reference count separately. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr9.c | 4 ++-- dlls/quartz/vmr9.c | 41 ++++++++++++++++++++++++++++++++++------- 2 files changed, 36 insertions(+), 9 deletions(-) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 4994829641..c0fb6a6f34 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -3271,10 +3271,10 @@ static void test_surface_allocator_notify_refcount(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ref = IBaseFilter_Release(filter); - todo_wine ok(!ref, "Got outstanding refcount %d.\n", ref); + ok(!ref, "Got outstanding refcount %d.\n", ref); todo_wine ok(allocator_got_TerminateDevice == 1, "Got %u calls to TerminateDevice().\n", allocator_got_TerminateDevice); - todo_wine ok(allocator_refcount == 1, "Got outstanding refcount %d.\n", allocator_refcount); + ok(allocator_refcount == 1, "Got outstanding refcount %d.\n", allocator_refcount); ref = IVMRSurfaceAllocatorNotify9_Release(notify); ok(!ref, "Got outstanding refcount %d.\n", ref); diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 93fc3417e7..a8f88e3d04 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -56,6 +56,12 @@ struct quartz_vmr IVMRWindowlessControl IVMRWindowlessControl_iface; IVMRWindowlessControl9 IVMRWindowlessControl9_iface; + /* Devil May Cry 3 releases the last IBaseFilter reference while still + * holding an IVMRSurfaceAllocatorNotify9 reference, and depends on + * IVMRSurfaceAllocator9::TerminateDevice() being called as a result. + * Native uses a separate reference count for IVMRSurfaceAllocatorNotify9. */ + LONG IVMRSurfaceAllocatorNotify9_refcount; + IOverlay IOverlay_iface; IVMRSurfaceAllocatorEx9 *allocator; @@ -571,12 +577,23 @@ static HRESULT WINAPI VMR9_BreakConnect(struct strmbase_renderer *This) return hr; } +static void vmr_free(struct quartz_vmr *filter) +{ + free(filter); + InterlockedDecrement(&object_locks); +} + static void vmr_destroy(struct strmbase_renderer *iface) { struct quartz_vmr *filter = impl_from_IBaseFilter(&iface->filter.IBaseFilter_iface); video_window_cleanup(&filter->baseControlWindow); + /* Devil May Cry 3 releases the IVMRSurfaceAllocatorNotify9 interface from + * TerminateDevice(). Artificially increase the reference count so that we + * don't free the filter yet. */ + InterlockedIncrement(&filter->renderer.filter.refcount); + if (filter->allocator) IVMRSurfaceAllocatorEx9_Release(filter->allocator); if (filter->presenter) @@ -592,9 +609,8 @@ static void vmr_destroy(struct strmbase_renderer *iface) CloseHandle(filter->run_event); FreeLibrary(filter->hD3d9); strmbase_renderer_cleanup(&filter->renderer); - free(filter); - - InterlockedDecrement(&object_locks); + if (!filter->IVMRSurfaceAllocatorNotify9_refcount) + vmr_free(filter); } static HRESULT vmr_query_interface(struct strmbase_renderer *iface, REFIID iid, void **out) @@ -2044,14 +2060,25 @@ static HRESULT WINAPI VMR9SurfaceAllocatorNotify_QueryInterface(IVMRSurfaceAlloc static ULONG WINAPI VMR9SurfaceAllocatorNotify_AddRef(IVMRSurfaceAllocatorNotify9 *iface) { - struct quartz_vmr *This = impl_from_IVMRSurfaceAllocatorNotify9(iface); - return IUnknown_AddRef(This->renderer.filter.outer_unk); + struct quartz_vmr *filter = impl_from_IVMRSurfaceAllocatorNotify9(iface); + ULONG refcount = InterlockedIncrement(&filter->IVMRSurfaceAllocatorNotify9_refcount); + + TRACE("%p increasing refcount to %u.\n", iface, refcount); + + return refcount; } static ULONG WINAPI VMR9SurfaceAllocatorNotify_Release(IVMRSurfaceAllocatorNotify9 *iface) { - struct quartz_vmr *This = impl_from_IVMRSurfaceAllocatorNotify9(iface); - return IUnknown_Release(This->renderer.filter.outer_unk); + struct quartz_vmr *filter = impl_from_IVMRSurfaceAllocatorNotify9(iface); + ULONG refcount = InterlockedDecrement(&filter->IVMRSurfaceAllocatorNotify9_refcount); + + TRACE("%p decreasing refcount to %u.\n", iface, refcount); + + if (!refcount && !filter->renderer.filter.refcount) + vmr_free(filter); + + return refcount; } static HRESULT WINAPI VMR9SurfaceAllocatorNotify_AdviseSurfaceAllocator(IVMRSurfaceAllocatorNotify9 *iface, DWORD_PTR id, IVMRSurfaceAllocator9 *alloc)

1 0

Zebediah Figura : quartz/vmr9: Call IVMRSurfaceAllocator9::TerminateDevice() when destroying the filter.
by Alexandre Julliard May 5, 2020

May 5, 2020

Module: wine Branch: master Commit: e7ed2798e863c2ac56aabf654c61c912e31a4a7f URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7ed2798e863c2ac56aabf65… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 4 18:05:23 2020 -0500 quartz/vmr9: Call IVMRSurfaceAllocator9::TerminateDevice() when destroying the filter. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr9.c | 2 +- dlls/quartz/vmr9.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index c0fb6a6f34..5c08868fc0 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -3272,7 +3272,7 @@ static void test_surface_allocator_notify_refcount(void) ref = IBaseFilter_Release(filter); ok(!ref, "Got outstanding refcount %d.\n", ref); - todo_wine ok(allocator_got_TerminateDevice == 1, "Got %u calls to TerminateDevice().\n", + ok(allocator_got_TerminateDevice == 1, "Got %u calls to TerminateDevice().\n", allocator_got_TerminateDevice); ok(allocator_refcount == 1, "Got outstanding refcount %d.\n", allocator_refcount); diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index a8f88e3d04..4fd3e70b96 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -595,7 +595,10 @@ static void vmr_destroy(struct strmbase_renderer *iface) InterlockedIncrement(&filter->renderer.filter.refcount); if (filter->allocator) + { + IVMRSurfaceAllocatorEx9_TerminateDevice(filter->allocator, filter->cookie); IVMRSurfaceAllocatorEx9_Release(filter->allocator); + } if (filter->presenter) IVMRImagePresenter9_Release(filter->presenter);

1 0

Philip Rebohle : winevulkan: Update to VK spec version spec 1.2.140.
by Alexandre Julliard May 5, 2020

May 5, 2020

Module: wine Branch: master Commit: d2f552d1508dbabb595eae23db9e5c157eaf9b41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2f552d1508dbabb595eae23… Author: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Date: Mon May 4 20:30:00 2020 +0200 winevulkan: Update to VK spec version spec 1.2.140. Signed-off-by: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 2 +- dlls/winevulkan/vulkan_thunks.c | 47 + dlls/winevulkan/vulkan_thunks.h | 8 + dlls/winevulkan/winevulkan.json | 2 +- include/wine/vulkan.h | 3067 ++++++++++++++++++++------------------- 5 files changed, 1628 insertions(+), 1498 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d2f552d1508dbabb595e…

1 0

Jacek Caban : wineboot: Use __cpuid from intrin.h.
by Alexandre Julliard May 5, 2020

May 5, 2020

Module: wine Branch: master Commit: d0a57cf98849a0f318ba4202a9f22c3c9533a172 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d0a57cf98849a0f318ba4202… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 5 02:52:46 2020 +0200 wineboot: Use __cpuid from intrin.h. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineboot/wineboot.c | 59 +++++++++----------------------------------- 1 file changed, 12 insertions(+), 47 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 54e48d0310..ac0b04d6d8 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -57,6 +57,7 @@ #include <fcntl.h> #include <stdio.h> #include <stdlib.h> +#include <intrin.h> #include <sys/stat.h> #include <unistd.h> #include <windows.h> @@ -195,44 +196,7 @@ static DWORD set_reg_value_dword( HKEY hkey, const WCHAR *name, DWORD value ) #if defined(__i386__) || defined(__x86_64__) -#if defined(_MSC_VER) -static void do_cpuid( unsigned int ax, unsigned int *p ) -{ - __cpuid( p, ax ); -} -#elif defined(__i386__) -extern void __cdecl do_cpuid( unsigned int ax, unsigned int *p ); -__ASM_GLOBAL_FUNC( do_cpuid, - "pushl %esi\n\t" - "pushl %ebx\n\t" - "movl 12(%esp),%eax\n\t" - "movl 16(%esp),%esi\n\t" - "cpuid\n\t" - "movl %eax,(%esi)\n\t" - "movl %ebx,4(%esi)\n\t" - "movl %ecx,8(%esi)\n\t" - "movl %edx,12(%esi)\n\t" - "popl %ebx\n\t" - "popl %esi\n\t" - "ret" ) -#else -extern void __cdecl do_cpuid( unsigned int ax, unsigned int *p ); -__ASM_GLOBAL_FUNC( do_cpuid, - "pushq %rsi\n\t" - "pushq %rbx\n\t" - "movq %rcx,%rax\n\t" - "movq %rdx,%rsi\n\t" - "cpuid\n\t" - "movl %eax,(%rsi)\n\t" - "movl %ebx,4(%rsi)\n\t" - "movl %ecx,8(%rsi)\n\t" - "movl %edx,12(%rsi)\n\t" - "popq %rbx\n\t" - "popq %rsi\n\t" - "ret" ) -#endif - -static void regs_to_str( unsigned int *regs, unsigned int len, WCHAR *buffer ) +static void regs_to_str( int *regs, unsigned int len, WCHAR *buffer ) { unsigned int i; unsigned char *p = (unsigned char *)regs; @@ -259,18 +223,19 @@ static void get_identifier( WCHAR *buf, size_t size, const WCHAR *arch ) { static const WCHAR fmtW[] = {'%','s',' ','F','a','m','i','l','y',' ','%','u',' ','M','o','d','e','l', ' ','%','u',' ','S','t','e','p','p','i','n','g',' ','%','u',0}; - unsigned int regs[4] = {0, 0, 0, 0}, family, model, stepping; + unsigned int family, model, stepping; + int regs[4] = {0, 0, 0, 0}; - do_cpuid( 1, regs ); + __cpuid( regs, 1 ); model = get_model( regs[0], &stepping, &family ); swprintf( buf, size, fmtW, arch, family, model, stepping ); } static void get_vendorid( WCHAR *buf ) { - unsigned int tmp, regs[4] = {0, 0, 0, 0}; + int tmp, regs[4] = {0, 0, 0, 0}; - do_cpuid( 0, regs ); + __cpuid( regs, 0 ); tmp = regs[2]; /* swap edx and ecx */ regs[2] = regs[3]; regs[3] = tmp; @@ -280,17 +245,17 @@ static void get_vendorid( WCHAR *buf ) static void get_namestring( WCHAR *buf ) { - unsigned int regs[4] = {0, 0, 0, 0}; + int regs[4] = {0, 0, 0, 0}; int i; - do_cpuid( 0x80000000, regs ); + __cpuid( regs, 0x80000000 ); if (regs[0] >= 0x80000004) { - do_cpuid( 0x80000002, regs ); + __cpuid( regs, 0x80000002 ); regs_to_str( regs, 16, buf ); - do_cpuid( 0x80000003, regs ); + __cpuid( regs, 0x80000003 ); regs_to_str( regs, 16, buf + 16 ); - do_cpuid( 0x80000004, regs ); + __cpuid( regs, 0x80000004 ); regs_to_str( regs, 16, buf + 32 ); } for (i = lstrlenW(buf) - 1; i >= 0 && buf[i] == ' '; i--) buf[i] = 0;

1 0

Zebediah Figura : quartz/vmr9: Add a stub IVMRMixerBitmap9 interface.
by Alexandre Julliard May 5, 2020

May 5, 2020

Module: wine Branch: master Commit: 913e6ef805a7a3813cb1e15573ce8d948174d632 URL: https://source.winehq.org/git/wine.git/?a=commit;h=913e6ef805a7a3813cb1e155… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 4 18:05:24 2020 -0500 quartz/vmr9: Add a stub IVMRMixerBitmap9 interface. Needed by Sniper Fury and Modern Combat 5. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr9.c | 2 +- dlls/quartz/vmr9.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 5c08868fc0..189b7d4f89 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -231,7 +231,7 @@ static void test_common_interfaces(IBaseFilter *filter) todo_wine check_interface(filter, &IID_IVMRAspectRatioControl9, TRUE); todo_wine check_interface(filter, &IID_IVMRDeinterlaceControl9, TRUE); check_interface(filter, &IID_IVMRFilterConfig9, TRUE); - todo_wine check_interface(filter, &IID_IVMRMixerBitmap9, TRUE); + check_interface(filter, &IID_IVMRMixerBitmap9, TRUE); check_interface(filter, &IID_IBasicAudio, FALSE); check_interface(filter, &IID_IDirectDrawVideo, FALSE); diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 4fd3e70b96..8ef8fc07e3 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -39,6 +39,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); +static inline const char *debugstr_normalized_rect(const VMR9NormalizedRect *rect) +{ + if (!rect) return "(null)"; + return wine_dbg_sprintf("(%.8e,%.8e)-(%.8e,%.8e)", rect->left, rect->top, rect->right, rect->bottom); +} + struct quartz_vmr { struct strmbase_renderer renderer; @@ -49,6 +55,7 @@ struct quartz_vmr IAMFilterMiscFlags IAMFilterMiscFlags_iface; IVMRFilterConfig IVMRFilterConfig_iface; IVMRFilterConfig9 IVMRFilterConfig9_iface; + IVMRMixerBitmap9 IVMRMixerBitmap9_iface; IVMRMonitorConfig IVMRMonitorConfig_iface; IVMRMonitorConfig9 IVMRMonitorConfig9_iface; IVMRSurfaceAllocatorNotify IVMRSurfaceAllocatorNotify_iface; @@ -632,6 +639,8 @@ static HRESULT vmr_query_interface(struct strmbase_renderer *iface, REFIID iid, *out = &filter->IVMRFilterConfig_iface; else if (IsEqualGUID(iid, &IID_IVMRFilterConfig9)) *out = &filter->IVMRFilterConfig9_iface; + else if (IsEqualGUID(iid, &IID_IVMRMixerBitmap9) && is_vmr9(filter)) + *out = &filter->IVMRMixerBitmap9_iface; else if (IsEqualGUID(iid, &IID_IVMRMonitorConfig)) *out = &filter->IVMRMonitorConfig_iface; else if (IsEqualGUID(iid, &IID_IVMRMonitorConfig9)) @@ -2254,6 +2263,63 @@ static const IVMRSurfaceAllocatorNotify9Vtbl VMR9_SurfaceAllocatorNotify_Vtbl = VMR9SurfaceAllocatorNotify_NotifyEvent }; +static inline struct quartz_vmr *impl_from_IVMRMixerBitmap9(IVMRMixerBitmap9 *iface) +{ + return CONTAINING_RECORD(iface, struct quartz_vmr, IVMRMixerBitmap9_iface); +} + +static HRESULT WINAPI mixer_bitmap9_QueryInterface(IVMRMixerBitmap9 *iface, REFIID iid, void **out) +{ + struct quartz_vmr *filter = impl_from_IVMRMixerBitmap9(iface); + return IUnknown_QueryInterface(filter->renderer.filter.outer_unk, iid, out); +} + +static ULONG WINAPI mixer_bitmap9_AddRef(IVMRMixerBitmap9 *iface) +{ + struct quartz_vmr *filter = impl_from_IVMRMixerBitmap9(iface); + return IUnknown_AddRef(filter->renderer.filter.outer_unk); +} + +static ULONG WINAPI mixer_bitmap9_Release(IVMRMixerBitmap9 *iface) +{ + struct quartz_vmr *filter = impl_from_IVMRMixerBitmap9(iface); + return IUnknown_Release(filter->renderer.filter.outer_unk); +} + +static HRESULT WINAPI mixer_bitmap9_SetAlphaBitmap(IVMRMixerBitmap9 *iface, + const VMR9AlphaBitmap *bitmap) +{ + FIXME("iface %p, bitmap %p, stub!\n", iface, bitmap); + TRACE("dwFlags %#x, hdc %p, pDDS %p, rSrc %s, rDest %s, fAlpha %.8e, clrSrcKey #%06x, dwFilterMode %#x.\n", + bitmap->dwFlags, bitmap->hdc, bitmap->pDDS, wine_dbgstr_rect(&bitmap->rSrc), + debugstr_normalized_rect(&bitmap->rDest), bitmap->fAlpha, bitmap->clrSrcKey, bitmap->dwFilterMode); + return E_NOTIMPL; +} + +static HRESULT WINAPI mixer_bitmap9_UpdateAlphaBitmapParameters(IVMRMixerBitmap9 *iface, + const VMR9AlphaBitmap *bitmap) +{ + FIXME("iface %p, bitmap %p, stub!\n", iface, bitmap); + return E_NOTIMPL; +} + +static HRESULT WINAPI mixer_bitmap9_GetAlphaBitmapParameters(IVMRMixerBitmap9 *iface, + VMR9AlphaBitmap *bitmap) +{ + FIXME("iface %p, bitmap %p, stub!\n", iface, bitmap); + return E_NOTIMPL; +} + +static const IVMRMixerBitmap9Vtbl mixer_bitmap9_vtbl = +{ + mixer_bitmap9_QueryInterface, + mixer_bitmap9_AddRef, + mixer_bitmap9_Release, + mixer_bitmap9_SetAlphaBitmap, + mixer_bitmap9_UpdateAlphaBitmapParameters, + mixer_bitmap9_GetAlphaBitmapParameters, +}; + static inline struct quartz_vmr *impl_from_IOverlay(IOverlay *iface) { return CONTAINING_RECORD(iface, struct quartz_vmr, IOverlay_iface); @@ -2379,6 +2445,7 @@ static HRESULT vmr_create(IUnknown *outer, IUnknown **out, const CLSID *clsid) object->IAMFilterMiscFlags_iface.lpVtbl = &IAMFilterMiscFlags_Vtbl; object->IVMRFilterConfig_iface.lpVtbl = &VMR7_FilterConfig_Vtbl; object->IVMRFilterConfig9_iface.lpVtbl = &VMR9_FilterConfig_Vtbl; + object->IVMRMixerBitmap9_iface.lpVtbl = &mixer_bitmap9_vtbl; object->IVMRMonitorConfig_iface.lpVtbl = &VMR7_MonitorConfig_Vtbl; object->IVMRMonitorConfig9_iface.lpVtbl = &VMR9_MonitorConfig_Vtbl; object->IVMRSurfaceAllocatorNotify_iface.lpVtbl = &VMR7_SurfaceAllocatorNotify_Vtbl;

1 0

Vijay Kiran Kamuju : msasn1/tests: Add initial tests.
by Alexandre Julliard May 4, 2020

May 4, 2020

Module: wine Branch: master Commit: 4e2ad334b5881af7661be4d6df3c51aae92ca4a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e2ad334b5881af7661be4d6… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Wed Apr 29 19:45:01 2020 +0200 msasn1/tests: Add initial tests. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/msasn1/tests/Makefile.in | 5 ++++ dlls/msasn1/tests/asn1.c | 58 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 65 insertions(+) diff --git a/configure b/configure index b94c0ce7aa..3da5851930 100755 --- a/configure +++ b/configure @@ -20760,6 +20760,7 @@ wine_fn_config_makefile dlls/msado15 enable_msado15 wine_fn_config_makefile dlls/msado15/tests enable_tests wine_fn_config_makefile dlls/msadp32.acm enable_msadp32_acm wine_fn_config_makefile dlls/msasn1 enable_msasn1 +wine_fn_config_makefile dlls/msasn1/tests enable_tests wine_fn_config_makefile dlls/mscat32 enable_mscat32 wine_fn_config_makefile dlls/mscms enable_mscms wine_fn_config_makefile dlls/mscms/tests enable_tests diff --git a/configure.ac b/configure.ac index 3d0c88fd9d..27db99f304 100644 --- a/configure.ac +++ b/configure.ac @@ -3438,6 +3438,7 @@ WINE_CONFIG_MAKEFILE(dlls/msado15) WINE_CONFIG_MAKEFILE(dlls/msado15/tests) WINE_CONFIG_MAKEFILE(dlls/msadp32.acm) WINE_CONFIG_MAKEFILE(dlls/msasn1) +WINE_CONFIG_MAKEFILE(dlls/msasn1/tests) WINE_CONFIG_MAKEFILE(dlls/mscat32) WINE_CONFIG_MAKEFILE(dlls/mscms) WINE_CONFIG_MAKEFILE(dlls/mscms/tests) diff --git a/dlls/msasn1/tests/Makefile.in b/dlls/msasn1/tests/Makefile.in new file mode 100644 index 0000000000..395ef933c0 --- /dev/null +++ b/dlls/msasn1/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = msasn1.dll +IMPORTS = msasn1 + +C_SRCS = \ + asn1.c diff --git a/dlls/msasn1/tests/asn1.c b/dlls/msasn1/tests/asn1.c new file mode 100644 index 0000000000..19019fc72b --- /dev/null +++ b/dlls/msasn1/tests/asn1.c @@ -0,0 +1,58 @@ +/* + * Copyright 2020 Vijay Kiran Kamuju + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include <stdio.h> + +#include "windef.h" +#include "winbase.h" +#include "msasn1.h" +#include "wine/test.h" + +static void test_CreateModule(void) +{ + const ASN1GenericFun_t encfn[] = { NULL }; + const ASN1GenericFun_t decfn[] = { NULL }; + const ASN1FreeFun_t freefn[] = { NULL }; + const ASN1uint32_t size[] = { 0 }; + ASN1magic_t name = 0x61736e31; + ASN1module_t mod; + + mod = ASN1_CreateModule(0, 0, 0, 0, NULL, NULL, NULL, NULL, 0); + ok(!mod, "Expected Failure.\n"); + + mod = ASN1_CreateModule(0, 0, 0, 0, encfn, NULL, NULL, NULL, 0); + ok(!mod, "Expected Failure.\n"); + + mod = ASN1_CreateModule(0, 0, 0, 0, encfn, decfn, NULL, NULL, 0); + ok(!mod, "Expected Failure.\n"); + + mod = ASN1_CreateModule(0, 0, 0, 0, encfn, decfn, freefn, NULL, 0); + ok(!mod, "Expected Failure.\n"); + + mod = ASN1_CreateModule(0, 0, 0, 0, encfn, decfn, freefn, size, 0); + todo_wine ok(!!mod, "Failed to create module.\n"); + + mod = ASN1_CreateModule(ASN1_THIS_VERSION, ASN1_BER_RULE_DER, ASN1FLAGS_NOASSERT, 1, encfn, decfn, freefn, size, name); + todo_wine ok(!!mod, "Failed to create module.\n"); +} + +START_TEST(asn1) +{ + test_CreateModule(); +}

1 0

Vijay Kiran Kamuju : msasn1: Add ASN1_CreateModule stub implementation.
by Alexandre Julliard May 4, 2020

May 4, 2020

Module: wine Branch: master Commit: 48aefd2a0409d8c2a8474eb110992ac2532b6a78 URL: https://source.winehq.org/git/wine.git/?a=commit;h=48aefd2a0409d8c2a8474eb1… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Wed Apr 29 19:43:06 2020 +0200 msasn1: Add ASN1_CreateModule stub implementation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=38020 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msasn1/main.c | 19 +++++++++++++++++++ dlls/msasn1/msasn1.spec | 2 +- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/msasn1/main.c b/dlls/msasn1/main.c index 7ca0eac63e..90c4a8a9c9 100644 --- a/dlls/msasn1/main.c +++ b/dlls/msasn1/main.c @@ -23,6 +23,10 @@ #include "winbase.h" #include "msasn1.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msasn1); + BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) { @@ -37,3 +41,18 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) return TRUE; } + +ASN1module_t WINAPI ASN1_CreateModule(ASN1uint32_t ver, ASN1encodingrule_e rule, ASN1uint32_t flags, + ASN1uint32_t pdu, const ASN1GenericFun_t encoder[], + const ASN1GenericFun_t decoder[], const ASN1FreeFun_t freemem[], + const ASN1uint32_t size[], ASN1magic_t magic) +{ + ASN1module_t module = NULL; + + FIXME("(%08x %08x %08x %u %p %p %p %p %u): Stub!\n", ver, rule, flags, pdu, encoder, decoder, freemem, size, magic); + + if (!encoder || !decoder || !freemem || !size) + return module; + + return module; +} diff --git a/dlls/msasn1/msasn1.spec b/dlls/msasn1/msasn1.spec index 165839964d..ca6a461c65 100644 --- a/dlls/msasn1/msasn1.spec +++ b/dlls/msasn1/msasn1.spec @@ -223,7 +223,7 @@ @ stub ASN1_CreateDecoder @ stub ASN1_CreateDecoderEx @ stub ASN1_CreateEncoder -@ stub ASN1_CreateModule +@ stdcall ASN1_CreateModule(long long long long ptr ptr ptr ptr long) @ stub ASN1_Decode @ stub ASN1_Encode @ stub ASN1_FreeDecoded

1 0

Vijay Kiran Kamuju : include: Add related ASN1encoding_s and ASN1decoding_s structs.
by Alexandre Julliard May 4, 2020

May 4, 2020

Module: wine Branch: master Commit: 7e9bee3a8dc145426d97271e99e689af81fb30a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e9bee3a8dc145426d97271e… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Wed Apr 29 19:38:33 2020 +0200 include: Add related ASN1encoding_s and ASN1decoding_s structs. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msasn1.h | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 69 insertions(+), 4 deletions(-) diff --git a/include/msasn1.h b/include/msasn1.h index 89a6255a5f..dd0bcb5b3d 100644 --- a/include/msasn1.h +++ b/include/msasn1.h @@ -43,6 +43,11 @@ typedef ASN1uint16_t ASN1choice_t; typedef ASN1uint32_t ASN1magic_t; typedef ASN1ztcharstring_t ASN1objectdescriptor_t; +#define ASN1_MAKE_VERSION(major,minor) (((major) << 16) | (minor)) +#define ASN1_THIS_VERSION ASN1_MAKE_VERSION(1,0) + +#define ASN1DECFREE_NON_PDU_ID ((ASN1uint32_t)-1) + typedef void (WINAPI *ASN1FreeFun_t)(void *data); typedef void (WINAPI *ASN1GenericFun_t)(void); @@ -64,6 +69,30 @@ typedef struct tagASN1BerFunArr_t { const ASN1BerDecFun_t *apfnDecoder; } ASN1BerFunArr_t; +enum +{ + ASN1FLAGS_NONE = 0x00000000, + ASN1FLAGS_NOASSERT = 0x00001000 +}; + +enum +{ + ASN1ENCODE_APPEND = 0x00000001, + ASN1ENCODE_REUSEBUFFER = 0x00000004, + ASN1ENCODE_SETBUFFER = 0x00000008, + ASN1ENCODE_ALLOCATEBUFFER = 0x00000010, + ASN1ENCODE_NOASSERT = ASN1FLAGS_NOASSERT +}; + +enum +{ + ASN1DECODE_APPENDED = 0x00000001, + ASN1DECODE_REWINDBUFFER = 0x00000004, + ASN1DECODE_SETBUFFER = 0x00000008, + ASN1DECODE_AUTOFREEBUFFER = 0x00000010, + ASN1DECODE_NOASSERT = ASN1FLAGS_NOASSERT +}; + typedef struct tagASN1bitstring_t { ASN1uint32_t length; @@ -128,6 +157,9 @@ typedef enum tagASN1error_e ASN1_WRN_NOEOD = 1002, } ASN1error_e; +#define ASN1_SUCCEEDED(ret) (((int)(ret)) >= 0) +#define ASN1_FAILED(ret) (((int)(ret)) < 0) + typedef struct tagASN1generalizedtime_t { ASN1uint16_t year; @@ -147,19 +179,52 @@ typedef struct tagASN1intx_t ASN1octet_t *value; } ASN1intx_t; -typedef struct tagASN1module_t { +typedef struct tagASN1module_t +{ ASN1magic_t nModuleName; ASN1encodingrule_e eRule; ASN1uint32_t dwFlags; ASN1uint32_t cPDUs; const ASN1FreeFun_t *apfnFreeMemory; const ASN1uint32_t *acbStructSize; - union { - ASN1PerFunArr_t PER; - ASN1BerFunArr_t BER; + union + { + ASN1PerFunArr_t PER; + ASN1BerFunArr_t BER; }; } *ASN1module_t; +struct ASN1encoding_s +{ + ASN1magic_t magic; + ASN1uint32_t version; + ASN1module_t module; + ASN1octet_t *buf; + ASN1uint32_t size; + ASN1uint32_t len; + ASN1error_e err; + ASN1uint32_t bit; + ASN1octet_t *pos; + ASN1uint32_t cbExtraHeader; + ASN1encodingrule_e eRule; + ASN1uint32_t dwFlags; +}; + +struct ASN1decoding_s +{ + ASN1magic_t magic; + ASN1uint32_t version; + ASN1module_t module; + ASN1octet_t *buf; + ASN1uint32_t size; + ASN1uint32_t len; + ASN1error_e err; + ASN1uint32_t bit; + ASN1octet_t *pos; + ASN1encodingrule_e eRule; + ASN1uint32_t dwFlags; +}; + typedef struct ASN1objectidentifier_s { struct ASN1objectidentifier_s *next;

1 0

Jacek Caban : winegcc: Add support for msvc target.
by Alexandre Julliard May 4, 2020

May 4, 2020

Module: wine Branch: master Commit: 35a7ed0c787dc5db9cc8d0a6c194433c0e6fcd6b URL: https://source.winehq.org/git/wine.git/?a=commit;h=35a7ed0c787dc5db9cc8d0a6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 4 15:24:55 2020 +0200 winegcc: Add support for msvc target. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 37 ++++++++++++++++++++++++++++++++----- 1 file changed, 32 insertions(+), 5 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 95e3913500..89f8eca5c2 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -487,7 +487,6 @@ static strarray *get_link_args( struct options *opts, const char *output_name ) strarray_add( flags, strmake( "-Wl,-soname,%s.so", output_name )); break; - case PLATFORM_WINDOWS: case PLATFORM_MINGW: case PLATFORM_CYGWIN: if (opts->shared || opts->win16_app) @@ -515,6 +514,24 @@ static strarray *get_link_args( struct options *opts, const char *output_name ) strarray_addall( link_args, flags ); return link_args; + case PLATFORM_WINDOWS: + if (opts->shared || opts->win16_app) + { + strarray_add( flags, "-shared" ); + strarray_add( flags, "-Wl,-kill-at" ); + } + if (opts->unicode_app) strarray_add( flags, "-municode" ); + if (opts->nodefaultlibs || opts->use_msvcrt) strarray_add( flags, "-nodefaultlibs" ); + if (opts->nostartfiles || opts->use_msvcrt) strarray_add( flags, "-nostartfiles" ); + if (opts->image_base) strarray_add( flags, strmake("-Wl,-base:%s", opts->image_base )); + if (opts->subsystem) + strarray_add( flags, strmake("-Wl,-subsystem:%s", opts->subsystem )); + else + strarray_add( flags, strmake("-Wl,-subsystem:%s", opts->gui_app ? "windows" : "console" )); + + strarray_addall( link_args, flags ); + return link_args; + default: if (opts->image_base) { @@ -1298,16 +1315,26 @@ static void build(struct options* opts) entry_point = opts->target_cpu == CPU_x86 ? "DllMainCRTStartup(a)12" : "DllMainCRTStartup"; if (is_pe && entry_point) - strarray_add(link_args, strmake("-Wl,--entry,%s%s", - is_pe && opts->target_cpu == CPU_x86 ? "_" : "", - entry_point)); + { + if (opts->target_platform == PLATFORM_WINDOWS) + strarray_add(link_args, strmake("-Wl,-entry:%s", entry_point)); + else + strarray_add(link_args, strmake("-Wl,--entry,%s%s", + is_pe && opts->target_cpu == CPU_x86 ? "_" : "", + entry_point)); + } strarray_add(link_args, spec_o_name); if (is_pe) { for (j = 0; j < opts->delayimports->size; j++) - strarray_add(link_args, strmake("-Wl,-delayload,%s", opts->delayimports->base[j])); + { + if (opts->target_platform == PLATFORM_WINDOWS) + strarray_add(link_args, strmake("-Wl,-delayload:%s", opts->delayimports->base[j])); + else + strarray_add(link_args, strmake("-Wl,-delayload,%s",opts->delayimports->base[j])); + } } for ( j = 0; j < files->size; j++ )

1 0

Jacek Caban : winegcc: Use libgcc only on mingw target.
by Alexandre Julliard May 4, 2020

May 4, 2020

Module: wine Branch: master Commit: 66aa39d95986f19f9c4ba172d8d910908dcb03cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=66aa39d95986f19f9c4ba172… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 4 15:20:48 2020 +0200 winegcc: Use libgcc only on mingw target. It's not available for msvc, but we get all we need from importlibs there. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 2be8b508fb..95e3913500 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1282,7 +1282,7 @@ static void build(struct options* opts) /* link everything together now */ link_args = get_link_args( opts, output_name ); - if ((opts->nodefaultlibs || opts->use_msvcrt) && is_pe) + if ((opts->nodefaultlibs || opts->use_msvcrt) && opts->target_platform == PLATFORM_MINGW) { libgcc = find_libgcc(opts->prefix, link_args); if (!libgcc) libgcc = "-lgcc";

1 0