wine-commits November 2018

wine-commits@winehq.org

2 participants
951 discussions

Michael Stefaniuc : libs/port: Avoid an ARRAY_SIZE-like macro.
by Alexandre Julliard 08 Nov '18

08 Nov '18

Module: wine Branch: master Commit: a0d4401ddc710b06297b906d937ff503a668dda8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0d4401ddc710b06297b906d… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Nov 7 22:31:46 2018 +0100 libs/port: Avoid an ARRAY_SIZE-like macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/port/cptable.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libs/port/cptable.c b/libs/port/cptable.c index 03264f3..73000c2 100644 --- a/libs/port/cptable.c +++ b/libs/port/cptable.c @@ -175,8 +175,6 @@ static const union cptable * const cptables[72] = /* ### cpmap end ### */ /* Everything above this line is generated automatically by make_unicode */ -#define NB_CODEPAGES (sizeof(cptables)/sizeof(cptables[0])) - static int cmp_codepage( const void *codepage, const void *entry ) { @@ -189,7 +187,7 @@ const union cptable *wine_cp_get_table( unsigned int codepage ) { const union cptable **res; - if (!(res = bsearch( &codepage, cptables, NB_CODEPAGES, + if (!(res = bsearch( &codepage, cptables, ARRAY_SIZE( cptables ), sizeof(cptables[0]), cmp_codepage ))) return NULL; return *res; } @@ -198,6 +196,6 @@ const union cptable *wine_cp_get_table( unsigned int codepage ) /* enum valid codepages */ const union cptable *wine_cp_enum_table( unsigned int index ) { - if (index >= NB_CODEPAGES) return NULL; + if (index >= ARRAY_SIZE( cptables )) return NULL; return cptables[index]; }

1 0

Józef Kucia : include: Avoid bitfields in public structures.
by Alexandre Julliard 08 Nov '18

08 Nov '18

Module: vkd3d Branch: master Commit: bf227d4a2887a00c52ece0e8cd7c63dc3f0a68e5 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=bf227d4a2887a00c52ece0e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Nov 8 17:19:32 2018 +0100 include: Avoid bitfields in public structures. 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> --- include/private/vkd3d_common.h | 2 ++ include/vkd3d_shader.h | 7 ++++--- libs/vkd3d-shader/vkd3d_shader_main.c | 3 +++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/include/private/vkd3d_common.h b/include/private/vkd3d_common.h index d097f3d..d942acf 100644 --- a/include/private/vkd3d_common.h +++ b/include/private/vkd3d_common.h @@ -28,6 +28,8 @@ #define STATIC_ASSERT(e) extern void __VKD3D_STATIC_ASSERT__(int [(e) ? 1 : -1]) +#define MEMBER_SIZE(t, m) sizeof(((t *)0)->m) + static inline size_t align(size_t addr, size_t alignment) { return (addr + (alignment - 1)) & ~(alignment - 1); diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 20ed0fb..c0d1f65 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -365,6 +365,7 @@ enum vkd3d_root_signature_version int vkd3d_shader_serialize_root_signature(const struct vkd3d_root_signature_desc *root_signature, enum vkd3d_root_signature_version version, struct vkd3d_shader_code *dxbc); +/* FIXME: Add support for 64 UAV bind slots. */ #define VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS 8 struct vkd3d_shader_scan_info @@ -372,9 +373,9 @@ struct vkd3d_shader_scan_info enum vkd3d_shader_structure_type type; void *next; - unsigned int uav_read_mask : VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS; - unsigned int uav_counter_mask : VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS; - unsigned int sampler_comparison_mode_mask; + unsigned int uav_read_mask; /* VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS */ + unsigned int uav_counter_mask; /* VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS */ + unsigned int sampler_comparison_mode_mask; /* 16 */ }; int vkd3d_shader_scan_dxbc(const struct vkd3d_shader_code *dxbc, diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 5e292c7..37aee0f 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -18,6 +18,9 @@ #include "vkd3d_shader_private.h" +STATIC_ASSERT(MEMBER_SIZE(struct vkd3d_shader_scan_info, uav_counter_mask) * CHAR_BIT >= VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS); +STATIC_ASSERT(MEMBER_SIZE(struct vkd3d_shader_scan_info, uav_read_mask) * CHAR_BIT >= VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS); + struct vkd3d_shader_parser { struct vkd3d_shader_desc shader_desc;

1 0

Józef Kucia : include: Add STATIC_ASSERT() macro.
by Alexandre Julliard 08 Nov '18

08 Nov '18

Module: vkd3d Branch: master Commit: 41ca2469b28a7e93484538e287e0a6c39102c776 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=41ca2469b28a7e93484538e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Nov 8 17:19:31 2018 +0100 include: Add STATIC_ASSERT() macro. 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> --- include/private/vkd3d_common.h | 2 ++ libs/vkd3d-shader/dxbc.c | 2 +- libs/vkd3d-shader/spirv.c | 6 +++--- tests/d3d12.c | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/include/private/vkd3d_common.h b/include/private/vkd3d_common.h index 2e3873b..d097f3d 100644 --- a/include/private/vkd3d_common.h +++ b/include/private/vkd3d_common.h @@ -26,6 +26,8 @@ #define DIV_ROUND_UP(a, b) ((a) % (b) == 0 ? (a) / (b) : (a) / (b) + 1) +#define STATIC_ASSERT(e) extern void __VKD3D_STATIC_ASSERT__(int [(e) ? 1 : -1]) + static inline size_t align(size_t addr, size_t alignment) { return (addr + (alignment - 1)) & ~(alignment - 1); diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index eb1729c..7b03448 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -1788,7 +1788,7 @@ static void read_dword(const char **ptr, DWORD *d) static void read_float(const char **ptr, float *f) { - assert(sizeof(float) == sizeof(DWORD)); /* FIXME: use static assert */ + STATIC_ASSERT(sizeof(float) == sizeof(DWORD)); read_dword(ptr, (DWORD *)f); } diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index c9634ed..1655bf3 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -6897,10 +6897,10 @@ static void vkd3d_dxbc_compiler_emit_shader_epilogue_function(struct vkd3d_dxbc_ unsigned int i, count; DWORD variable_idx; - function_id = compiler->epilogue_function_id; + STATIC_ASSERT(ARRAY_SIZE(compiler->private_output_variable) == ARRAY_SIZE(param_id)); + STATIC_ASSERT(ARRAY_SIZE(compiler->private_output_variable) == ARRAY_SIZE(param_type_id)); - assert(ARRAY_SIZE(compiler->private_output_variable) == ARRAY_SIZE(param_id)); - assert(ARRAY_SIZE(compiler->private_output_variable) == ARRAY_SIZE(param_type_id)); + function_id = compiler->epilogue_function_id; void_id = vkd3d_spirv_get_op_type_void(builder); type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_FLOAT, 4); diff --git a/tests/d3d12.c b/tests/d3d12.c index b50723b..c855e9c 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -7786,7 +7786,7 @@ static void test_shader_instructions(void) }, }; - assert(sizeof(tests->input) == sizeof(uint_tests->input)); + STATIC_ASSERT(sizeof(tests->input) == sizeof(uint_tests->input)); memset(&desc, 0, sizeof(desc)); desc.rt_format = DXGI_FORMAT_R32G32B32A32_FLOAT;

1 0

Józef Kucia : include: Use angle-bracket includes consistently.
by Alexandre Julliard 08 Nov '18

08 Nov '18

Module: vkd3d Branch: master Commit: be462a932fd97a5237e3889a838449514840d4d7 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=be462a932fd97a5237e3889… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Nov 8 17:19:30 2018 +0100 include: Use angle-bracket includes consistently. 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> --- include/vkd3d.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/vkd3d.h b/include/vkd3d.h index 0965309..3d560b5 100644 --- a/include/vkd3d.h +++ b/include/vkd3d.h @@ -22,8 +22,8 @@ #include <vkd3d_types.h> #ifndef VKD3D_NO_WIN32_TYPES -# include "vkd3d_windows.h" -# include "vkd3d_d3d12.h" +# include <vkd3d_windows.h> +# include <vkd3d_d3d12.h> #endif /* VKD3D_NO_WIN32_TYPES */ #ifndef VKD3D_NO_VULKAN_H

1 0

Józef Kucia : include: Move vkd3d_result to common header.
by Alexandre Julliard 08 Nov '18

08 Nov '18

Module: vkd3d Branch: master Commit: f732501a1449da66b2c6aaf5ab3bf77f5cf67d9c URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f732501a1449da66b2c6aaf… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Nov 8 17:19:29 2018 +0100 include: Move vkd3d_result to common header. 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> --- Makefile.am | 1 + include/vkd3d.h | 4 ++-- include/vkd3d_shader.h | 16 ++-------------- include/vkd3d_types.h | 44 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 49 insertions(+), 16 deletions(-) diff --git a/Makefile.am b/Makefile.am index 1116718..c2a20c6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,6 +20,7 @@ vkd3d_public_headers = \ include/vkd3d_dxgibase.h \ include/vkd3d_dxgiformat.h \ include/vkd3d_shader.h \ + include/vkd3d_types.h \ include/vkd3d_utils.h \ include/vkd3d_windows.h diff --git a/include/vkd3d.h b/include/vkd3d.h index de80542..0965309 100644 --- a/include/vkd3d.h +++ b/include/vkd3d.h @@ -19,6 +19,8 @@ #ifndef __VKD3D_H #define __VKD3D_H +#include <vkd3d_types.h> + #ifndef VKD3D_NO_WIN32_TYPES # include "vkd3d_windows.h" # include "vkd3d_d3d12.h" @@ -32,8 +34,6 @@ extern "C" { #endif /* __cplusplus */ -#define VKD3D_FORCE_32_BIT_ENUM(name) name##_FORCE_32BIT = 0x7fffffff - enum vkd3d_structure_type { VKD3D_STRUCTURE_TYPE_INSTANCE_CREATE_INFO, diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index f96e505..20ed0fb 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -19,12 +19,12 @@ #ifndef __VKD3D_SHADER_H #define __VKD3D_SHADER_H +#include <vkd3d_types.h> + #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ -#define VKD3D_FORCE_32_BIT_ENUM(name) name##_FORCE_32BIT = 0x7fffffff - enum vkd3d_shader_structure_type { VKD3D_SHADER_STRUCTURE_TYPE_SHADER_INTERFACE, @@ -34,18 +34,6 @@ enum vkd3d_shader_structure_type VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_STRUCTURE_TYPE), }; -enum vkd3d_result -{ - VKD3D_OK = 0, - VKD3D_ERROR = -1, /* unspecified failure */ - VKD3D_ERROR_OUT_OF_MEMORY = -2, - VKD3D_ERROR_INVALID_ARGUMENT = -3, - VKD3D_ERROR_INVALID_SHADER = -4, - VKD3D_ERROR_NOT_IMPLEMENTED = -5, - - VKD3D_FORCE_32_BIT_ENUM(VKD3D_RESULT), -}; - enum vkd3d_shader_compiler_option { VKD3D_SHADER_STRIP_DEBUG = 0x00000001, diff --git a/include/vkd3d_types.h b/include/vkd3d_types.h new file mode 100644 index 0000000..34c6674 --- /dev/null +++ b/include/vkd3d_types.h @@ -0,0 +1,44 @@ +/* + * Copyright 2016-2018 Józef Kucia for CodeWeavers + * + * 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 + */ + +#ifndef __VKD3D_TYPES_H +#define __VKD3D_TYPES_H + +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + +#define VKD3D_FORCE_32_BIT_ENUM(name) name##_FORCE_32BIT = 0x7fffffff + +enum vkd3d_result +{ + VKD3D_OK = 0, + VKD3D_ERROR = -1, /* unspecified failure */ + VKD3D_ERROR_OUT_OF_MEMORY = -2, + VKD3D_ERROR_INVALID_ARGUMENT = -3, + VKD3D_ERROR_INVALID_SHADER = -4, + VKD3D_ERROR_NOT_IMPLEMENTED = -5, + + VKD3D_FORCE_32_BIT_ENUM(VKD3D_RESULT), +}; + +#ifdef __cplusplus +} +#endif /* __cplusplus */ + +#endif /* __VKD3D_TYPES_H */

1 0

Józef Kucia : vkd3d: Handle VKD3D_ERROR_INVALID_SHADER in hresult_from_vkd3d_result().
by Alexandre Julliard 08 Nov '18

08 Nov '18

Module: vkd3d Branch: master Commit: 4d149b6f896dc4c3bde02fd55edc6bb5adaac636 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=4d149b6f896dc4c3bde02fd… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Nov 8 17:19:28 2018 +0100 vkd3d: Handle VKD3D_ERROR_INVALID_SHADER in hresult_from_vkd3d_result(). 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/utils.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c index 05d15b2..a242444 100644 --- a/libs/vkd3d/utils.c +++ b/libs/vkd3d/utils.c @@ -410,6 +410,7 @@ HRESULT hresult_from_vkd3d_result(int vkd3d_result) case VKD3D_ERROR_OUT_OF_MEMORY: return E_OUTOFMEMORY; case VKD3D_ERROR_INVALID_ARGUMENT: + case VKD3D_ERROR_INVALID_SHADER: return E_INVALIDARG; case VKD3D_ERROR_NOT_IMPLEMENTED: return E_NOTIMPL;

1 0

Louis Lenders : ntoskrnl.exe: Add stub for KeSetTargetProcessorDpc.
by Alexandre Julliard 07 Nov '18

07 Nov '18

Module: wine Branch: master Commit: 52ed78883898bb10e1c8af85804f389928a976c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=52ed78883898bb10e1c8af85… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Tue Nov 6 13:10:17 2018 +0100 ntoskrnl.exe: Add stub for KeSetTargetProcessorDpc. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46040 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 8 ++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/ntddk.h | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 4a5ac16..e9e3afa 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2845,6 +2845,14 @@ VOID WINAPI KeInitializeDpc(PRKDPC Dpc, PKDEFERRED_ROUTINE DeferredRoutine, PVOI } /*********************************************************************** + * KeSetTargetProcessorDpc (NTOSKRNL.EXE.@) + */ +VOID WINAPI KeSetTargetProcessorDpc(PRKDPC dpc, CCHAR number) +{ + FIXME("%p, %d stub\n", dpc, number); +} + +/*********************************************************************** * READ_REGISTER_BUFFER_UCHAR (NTOSKRNL.EXE.@) */ VOID WINAPI READ_REGISTER_BUFFER_UCHAR(PUCHAR Register, PUCHAR Buffer, ULONG Count) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 76d8fb3..5987c52 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -620,7 +620,7 @@ @ stdcall KeSetPriorityThread(ptr long) @ stub KeSetProfileIrql @ stdcall KeSetSystemAffinityThread(long) -@ stub KeSetTargetProcessorDpc +@ stdcall KeSetTargetProcessorDpc(ptr long) @ stub KeSetTimeIncrement @ stub KeSetTimer @ stdcall KeSetTimerEx(ptr int64 long ptr) diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h index e76ccc9..fdf035d 100644 --- a/include/ddk/ntddk.h +++ b/include/ddk/ntddk.h @@ -214,6 +214,7 @@ NTSTATUS WINAPI IoQueryDeviceDescription(PINTERFACE_TYPE,PULONG,PCONFIGURATION_ PCONFIGURATION_TYPE,PULONG,PIO_QUERY_DEVICE_ROUTINE,PVOID); void WINAPI IoRegisterDriverReinitialization(PDRIVER_OBJECT,PDRIVER_REINITIALIZE,PVOID); NTSTATUS WINAPI IoRegisterShutdownNotification(PDEVICE_OBJECT); +void WINAPI KeSetTargetProcessorDpc(PRKDPC,CCHAR); BOOLEAN WINAPI MmIsAddressValid(void *); NTSTATUS WINAPI PsSetLoadImageNotifyRoutine(PLOAD_IMAGE_NOTIFY_ROUTINE); void WINAPI RtlInitializeGenericTableAvl(PRTL_AVL_TABLE,PRTL_AVL_COMPARE_ROUTINE,PRTL_AVL_ALLOCATE_ROUTINE, PRTL_AVL_FREE_ROUTINE,void *);

1 0

Alexandre Julliard : mscoree/tests: Fix some uninitialized buffers.
by Alexandre Julliard 07 Nov '18

07 Nov '18

Module: wine Branch: master Commit: 6427276c275bdbda6312d36666e792a35d2c5e8f URL: https://source.winehq.org/git/wine.git/?a=commit;h=6427276c275bdbda6312d366… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 7 19:33:38 2018 +0100 mscoree/tests: Fix some uninitialized buffers. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/tests/comtest.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/mscoree/tests/comtest.c b/dlls/mscoree/tests/comtest.c index 5d6f23e..eec5d9a 100644 --- a/dlls/mscoree/tests/comtest.c +++ b/dlls/mscoree/tests/comtest.c @@ -186,6 +186,8 @@ static void prepare_and_run_test(const char *dll_source, run_type run) ULONG_PTR cookie; HANDLE handle_context = 0; + path_manifest_exe[0] = path_manifest_dll[0] = path_dll_source[0] = 0; + GetTempPathA(MAX_PATH, path_tmp); GetTempPathA(MAX_PATH, path_tmp_manifest); PathAppendA(path_tmp_manifest, "manifests");

1 0

Jacek Caban : widl: Generate async interface table.
by Alexandre Julliard 07 Nov '18

07 Nov '18

Module: wine Branch: master Commit: 824d51358511621616570b66a436034dac2f5140 URL: https://source.winehq.org/git/wine.git/?a=commit;h=824d51358511621616570b66… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 7 16:15:22 2018 +0100 widl: Generate async interface table. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/proxy.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index a6c3c32..4c7d85d 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -895,6 +895,7 @@ static void write_proxy_routines(const statement_list_t *stmts) unsigned int proc_offset = 0; char *file_id = proxy_token; int i, count, have_baseiid = 0; + unsigned int table_version; type_t **interfaces; const type_t * delegate_to; @@ -1006,6 +1007,26 @@ static void write_proxy_routines(const statement_list_t *stmts) fprintf(proxy, "}\n"); fprintf(proxy, "\n"); + table_version = get_stub_mode() == MODE_Oif ? 2 : 1; + for (i = 0; i < count; i++) + { + if (interfaces[i]->details.iface->async_iface != interfaces[i]) continue; + if (table_version != 6) + { + fprintf(proxy, "static const IID *_AsyncInterfaceTable[] =\n"); + fprintf(proxy, "{\n"); + table_version = 6; + } + fprintf(proxy, " &IID_%s,\n", interfaces[i]->name); + fprintf(proxy, " (IID*)(LONG_PTR)-1,\n"); + } + if (table_version == 6) + { + fprintf(proxy, " 0\n"); + fprintf(proxy, "};\n"); + fprintf(proxy, "\n"); + } + fprintf(proxy, "const ExtendedProxyFileInfo %s_ProxyFileInfo DECLSPEC_HIDDEN =\n", file_id); fprintf(proxy, "{\n"); fprintf(proxy, " (const PCInterfaceProxyVtblList*)_%s_ProxyVtblList,\n", file_id); @@ -1015,8 +1036,8 @@ static void write_proxy_routines(const statement_list_t *stmts) else fprintf(proxy, " 0,\n"); fprintf(proxy, " _%s_IID_Lookup,\n", file_id); fprintf(proxy, " %d,\n", count); - fprintf(proxy, " %d,\n", get_stub_mode() == MODE_Oif ? 2 : 1); - fprintf(proxy, " 0,\n"); + fprintf(proxy, " %u,\n", table_version); + fprintf(proxy, " %s,\n", table_version == 6 ? "_AsyncInterfaceTable" : "0"); fprintf(proxy, " 0,\n"); fprintf(proxy, " 0,\n"); fprintf(proxy, " 0\n");

1 0

Jacek Caban : widl: Support async interfaces proxy.
by Alexandre Julliard 07 Nov '18

07 Nov '18

Module: wine Branch: master Commit: 89a1dade805debfe558b5a0366cde9c75612d2a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=89a1dade805debfe558b5a03… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 7 16:14:56 2018 +0100 widl: Support async interfaces proxy. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/proxy.c | 19 ++++++++++++++++--- tools/widl/typegen.c | 3 +++ 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 12424d9..a6c3c32 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -736,7 +736,9 @@ static void write_proxy(type_t *iface, unsigned int *proc_offset) print_proxy( "},\n"); print_proxy( "{\n"); indent++; - print_proxy( "CStdStubBuffer_%s\n", need_delegation_indirect(iface) ? "DELEGATING_METHODS" : "METHODS"); + print_proxy( "%s_%s\n", + iface->details.iface->async_iface == iface ? "CStdAsyncStubBuffer" : "CStdStubBuffer", + need_delegation_indirect(iface) ? "DELEGATING_METHODS" : "METHODS"); indent--; print_proxy( "}\n"); indent--; @@ -832,8 +834,13 @@ static void write_proxy_stmts(const statement_list_t *stmts, unsigned int *proc_ { if (stmt->type == STMT_TYPE && type_get_type(stmt->u.type) == TYPE_INTERFACE) { - if (need_proxy(stmt->u.type)) - write_proxy(stmt->u.type, proc_offset); + type_t *iface = stmt->u.type; + if (need_proxy(iface)) + { + write_proxy(iface, proc_offset); + if (iface->details.iface->async_iface) + write_proxy(iface->details.iface->async_iface, proc_offset); + } } } } @@ -861,6 +868,12 @@ static void build_iface_list( const statement_list_t *stmts, type_t **ifaces[], { *ifaces = xrealloc( *ifaces, (*count + 1) * sizeof(**ifaces) ); (*ifaces)[(*count)++] = iface; + if (iface->details.iface->async_iface) + { + iface = iface->details.iface->async_iface; + *ifaces = xrealloc( *ifaces, (*count + 1) * sizeof(**ifaces) ); + (*ifaces)[(*count)++] = iface; + } } } } diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 10e6eba..8b23c63 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1381,6 +1381,7 @@ static void write_proc_func_header( FILE *file, int indent, const type_t *iface, if (is_attr( func->attrs, ATTR_NOTIFY )) ext_flags |= 0x08; /* HasNotify */ if (is_attr( func->attrs, ATTR_NOTIFYFLAG )) ext_flags |= 0x10; /* HasNotify2 */ + if (iface == iface->details.iface->async_iface) oi2_flags |= 0x20; size = get_function_buffer_size( func, PASS_IN ); print_file( file, indent, "NdrFcShort(0x%x),\t/* client buffer = %u */\n", size, size ); @@ -1479,6 +1480,8 @@ static void for_each_iface(const statement_list_t *stmts, iface = stmt->u.type; if (!pred(iface)) continue; proc(iface, file, indent, offset); + if (iface->details.iface->async_iface) + proc(iface->details.iface->async_iface, file, indent, offset); } }

1 0

← Newer
1
...
80
81
82
83
84
85
86
...
96
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 November 2018