wine-commits May 2020

wine-commits@winehq.org

1 participants
743 discussions

Zebediah Figura : quartz/vmr9: Track the IVMRSurfaceAllocatorNotify9 reference count separately.
by Alexandre Julliard 05 May '20

05 May '20

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/tests: Add tests for the separate reference count of IVMRSurfaceAllocatorNotify9.
by Alexandre Julliard 05 May '20

05 May '20

Module: wine Branch: master Commit: 05adf7bed26ffe2dc388e6c496efd4c825ff721f URL: https://source.winehq.org/git/wine.git/?a=commit;h=05adf7bed26ffe2dc388e6c4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 4 18:05:21 2020 -0500 quartz/tests: Add tests for the separate reference count of IVMRSurfaceAllocatorNotify9. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr9.c | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 54e9b53afb..4994829641 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -2769,7 +2769,7 @@ static D3DFORMAT allocator_format; static DWORD allocator_accept_flags; static IDirect3DSurface9 *allocator_surfaces[5]; static IVMRSurfaceAllocatorNotify9 *allocator_notify; -static unsigned int allocator_got_PresentImage; +static unsigned int allocator_got_PresentImage, allocator_got_TerminateDevice; static HRESULT WINAPI presenter_QueryInterface(IVMRImagePresenter9 *iface, REFIID iid, void **out) { @@ -2882,6 +2882,7 @@ static HRESULT WINAPI allocator_TerminateDevice(IVMRSurfaceAllocator9 *iface, DW if (winetest_debug > 1) trace("TerminateDevice()\n"); ok(cookie == 0xabacab, "Got cookie %#lx.\n", cookie); /* Don't dereference the surfaces here, to mimic How to Survive. */ + ++allocator_got_TerminateDevice; return E_NOTIMPL; } @@ -3253,6 +3254,32 @@ static void test_clipping_window(void) DestroyWindow(window); } +static void test_surface_allocator_notify_refcount(void) +{ + IBaseFilter *filter = create_vmr9(VMR9Mode_Renderless); + IVMRSurfaceAllocatorNotify9 *notify; + HRESULT hr; + ULONG ref; + + allocator_got_TerminateDevice = 0; + + set_mixing_mode(filter, 2); + + IBaseFilter_QueryInterface(filter, &IID_IVMRSurfaceAllocatorNotify9, (void **)&notify); + + hr = IVMRSurfaceAllocatorNotify9_AdviseSurfaceAllocator(notify, 0xabacab, &allocator_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ref = IBaseFilter_Release(filter); + todo_wine 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); + + ref = IVMRSurfaceAllocatorNotify9_Release(notify); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(vmr9) { IBaseFilter *filter; @@ -3284,6 +3311,7 @@ START_TEST(vmr9) test_renderless_formats(); test_mixing_mode(); test_clipping_window(); + test_surface_allocator_notify_refcount(); CoUninitialize(); }

1 0

Philip Rebohle : winevulkan: Update to VK spec version spec 1.2.140.
by Alexandre Julliard 05 May '20

05 May '20

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

Philip Rebohle : winevulkan: Avoid adding duplicate enum aliases.
by Alexandre Julliard 05 May '20

05 May '20

Module: wine Branch: master Commit: 4465ecfe0e3fa9fa14518abd1907193adb154957 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4465ecfe0e3fa9fa14518abd… Author: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Date: Mon May 4 22:12:10 2020 +0200 winevulkan: Avoid adding duplicate enum aliases. VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ID_PROPERTIES_KHR is being defined multiple times by the current vk.xml. 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 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index e24dac9901..ccc3f228b0 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -395,7 +395,9 @@ class VkEnum(object): if not value.is_alias() and v.value == value.value: LOGGER.debug("Adding duplicate enum value {0} to {1}".format(v, self.name)) return - self.values.append(value) + # Avoid adding duplicate aliases multiple times + if not any(x.name == value.name for x in self.values): + self.values.append(value) def definition(self): if self.is_alias():

1 0

Philip Rebohle : winevulkan: Support struct forward-declarations as base types.
by Alexandre Julliard 05 May '20

05 May '20

Module: wine Branch: master Commit: 727441cc24d54d9a6623d523788d4011c526ba94 URL: https://source.winehq.org/git/wine.git/?a=commit;h=727441cc24d54d9a6623d523… Author: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Date: Mon May 4 20:29:58 2020 +0200 winevulkan: Support struct forward-declarations as base types. Some types are basically forward-declared structs now, such as ANativeWindow. 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 | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 5d9889620e..e24dac9901 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -253,7 +253,10 @@ class VkBaseType(object): def definition(self): # Definition is similar for alias or non-alias as type # is already set to alias. - return "typedef {0} {1};\n".format(self.type, self.name) + if not self.type is None: + return "typedef {0} {1};\n".format(self.type, self.name) + else: + return "struct {0};\n".format(self.name) def is_alias(self): return bool(self.alias) @@ -2953,7 +2956,9 @@ class VkRegistry(object): if type_info["category"] == "basetype": name = t.find("name").text - _type = t.find("type").text + _type = None + if not t.find("type") is None: + _type = t.find("type").text basetype = VkBaseType(name, _type) base_types.append(basetype) type_info["data"] = basetype

1 0

Vijay Kiran Kamuju : msasn1/tests: Add initial tests.
by Alexandre Julliard 04 May '20

04 May '20

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 04 May '20

04 May '20

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 04 May '20

04 May '20

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 : include: Introduce WINE_USE_LONG macro.
by Alexandre Julliard 04 May '20

04 May '20

Module: wine Branch: master Commit: 0a09fdfa1fa82502921e48c4f4f7275b6ed2479e URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a09fdfa1fa82502921e48c4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 4 16:25:36 2020 +0200 include: Introduce WINE_USE_LONG macro. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/guiddef.h | 2 +- include/ntdef.h | 2 +- include/windef.h | 4 ++-- include/winnt.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/guiddef.h b/include/guiddef.h index 1871910efa..546c450043 100644 --- a/include/guiddef.h +++ b/include/guiddef.h @@ -30,7 +30,7 @@ typedef struct #else typedef struct _GUID { -#ifdef _MSC_VER +#ifdef WINE_USE_LONG unsigned long Data1; #else unsigned int Data1; diff --git a/include/ntdef.h b/include/ntdef.h index d85aa6feb5..069e86575b 100644 --- a/include/ntdef.h +++ b/include/ntdef.h @@ -53,7 +53,7 @@ typedef enum _WAIT_TYPE { #define BASETYPES typedef unsigned char UCHAR, *PUCHAR; typedef unsigned short USHORT, *PUSHORT; -#ifdef _MSC_VER +#ifdef WINE_USE_LONG typedef unsigned long ULONG, *PULONG; #else typedef unsigned int ULONG, *PULONG; diff --git a/include/windef.h b/include/windef.h index 436ac6afd8..7ece7c8628 100644 --- a/include/windef.h +++ b/include/windef.h @@ -241,7 +241,7 @@ extern "C" { #define BASETYPES typedef unsigned char UCHAR, *PUCHAR; typedef unsigned short USHORT, *PUSHORT; -#ifdef _MSC_VER +#ifdef WINE_USE_LONG typedef unsigned long ULONG, *PULONG; #else typedef unsigned int ULONG, *PULONG; @@ -257,7 +257,7 @@ typedef int INT, *PINT, *LPINT; typedef unsigned int UINT, *PUINT; typedef float FLOAT, *PFLOAT; typedef char *PSZ; -#ifdef _MSC_VER +#ifdef WINE_USE_LONG typedef long *LPLONG; typedef unsigned long DWORD, *PDWORD, *LPDWORD; #else diff --git a/include/winnt.h b/include/winnt.h index 883794cde8..cc2099086d 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -452,7 +452,7 @@ typedef VOID *PVOID64; typedef BYTE BOOLEAN, *PBOOLEAN; typedef char CHAR, *PCHAR; typedef short SHORT, *PSHORT; -#ifdef _MSC_VER +#ifdef WINE_USE_LONG typedef long LONG, *PLONG; #else typedef int LONG, *PLONG;

1 0

Jacek Caban : winegcc: Add support for msvc target.
by Alexandre Julliard 04 May '20

04 May '20

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@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

← Newer
1
...
65
66
67
68
69
70
71
...
75
Older →

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 2020