October 2018 - Wine-Commits

Jacek Caban : msvcrt: Use memmove to copy memory in wmemcpy_s.
by Alexandre Julliard Oct. 5, 2018

Oct. 5, 2018

Module: wine Branch: master Commit: be56a83fd00cdaf9583a973b1e041f47c5277768 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be56a83fd00cdaf9583a973b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 5 16:38:48 2018 +0200 msvcrt: Use memmove to copy memory in wmemcpy_s. Fixes memory corruption in Outlook 2016. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr100/tests/msvcr100.c | 14 +++++++++++++- dlls/msvcrt/heap.c | 2 +- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/msvcr100/tests/msvcr100.c b/dlls/msvcr100/tests/msvcr100.c index db5a4cb..594ac28 100644 --- a/dlls/msvcr100/tests/msvcr100.c +++ b/dlls/msvcr100/tests/msvcr100.c @@ -371,7 +371,7 @@ static BOOL init(void) static void test_wmemcpy_s(void) { - static wchar_t dest[8]; + static wchar_t dest[8], buf[32]; static const wchar_t tiny[] = {'T',0,'I','N','Y',0}; static const wchar_t big[] = {'a','t','o','o','l','o','n','g','s','t','r','i','n','g',0}; const wchar_t XX = 0x5858; /* two 'X' bytes */ @@ -434,6 +434,18 @@ static void test_wmemcpy_s(void) okwchars(dest, XX, XX, XX, XX, XX, XX, XX, XX); CHECK_CALLED(invalid_parameter_handler); + ret = p_wmemcpy_s(buf, ARRAY_SIZE(buf), big, ARRAY_SIZE(big)); + ok(!ret, "wmemcpy_s returned %d\n", ret); + ok(!memcmp(buf, big, sizeof(big)), "unexpected buf\n"); + + ret = p_wmemcpy_s(buf + 1, ARRAY_SIZE(buf) - 1, buf, ARRAY_SIZE(big)); + ok(!ret, "wmemcpy_s returned %d\n", ret); + ok(!memcmp(buf + 1, big, sizeof(big)), "unexpected buf\n"); + + ret = p_wmemcpy_s(buf, ARRAY_SIZE(buf), buf + 1, ARRAY_SIZE(big)); + ok(!ret, "wmemcpy_s returned %d\n", ret); + ok(!memcmp(buf, big, sizeof(big)), "unexpected buf\n"); + ok(p_set_invalid_parameter_handler(NULL) == test_invalid_parameter_handler, "Cannot reset invalid parameter handler\n"); } diff --git a/dlls/msvcrt/heap.c b/dlls/msvcrt/heap.c index b4f11d8..a780896 100644 --- a/dlls/msvcrt/heap.c +++ b/dlls/msvcrt/heap.c @@ -826,7 +826,7 @@ int CDECL wmemcpy_s(MSVCRT_wchar_t *dest, MSVCRT_size_t numberOfElements, return MSVCRT_ERANGE; } - memcpy(dest, src, sizeof(MSVCRT_wchar_t)*count); + memmove(dest, src, sizeof(MSVCRT_wchar_t)*count); return 0; } #endif

1 0

Nikolay Sivov : gdiplus: Fix input string tracing in GdipMeasureCharacterRanges().
by Alexandre Julliard Oct. 5, 2018

Oct. 5, 2018

Module: wine Branch: master Commit: 062411d69d290e85f70936bdc2dcc84751d67e80 URL: https://source.winehq.org/git/wine.git/?a=commit;h=062411d69d290e85f70936bd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Sep 29 00:54:38 2018 +0300 gdiplus: Fix input string tracing in GdipMeasureCharacterRanges(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 2d23085..3216a3e 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -5298,7 +5298,7 @@ GpStatus WINGDIPAPI GdipMeasureCharacterRanges(GpGraphics* graphics, RectF scaled_rect; REAL margin_x; - TRACE("(%p %s %d %p %s %p %d %p)\n", graphics, debugstr_w(string), + TRACE("(%p %s %d %p %s %p %d %p)\n", graphics, debugstr_wn(string, length), length, font, debugstr_rectf(layoutRect), stringFormat, regionCount, regions); if (!(graphics && string && font && layoutRect && stringFormat && regions))

1 0

Józef Kucia : wined3d: Drop support for pre-parsed shader DXBC chunks.
by Alexandre Julliard Oct. 5, 2018

Oct. 5, 2018

Module: wine Branch: master Commit: d0798a745873bf07f940380c0dad005fd0cc17b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d0798a745873bf07f940380c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Oct 5 14:10:19 2018 +0200 wined3d: Drop support for pre-parsed shader DXBC chunks. Accept only full DXBC. 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> --- dlls/d3d11/shader.c | 6 -- dlls/d3d8/shader.c | 8 -- dlls/d3d9/shader.c | 8 -- dlls/wined3d/shader.c | 195 +++++++++++------------------------------ dlls/wined3d/wined3d_private.h | 7 +- include/wine/wined3d.h | 11 --- 6 files changed, 55 insertions(+), 180 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d0798a745873bf07f940…

1 0

Józef Kucia : d3d11: Pass full DXBC to wined3d.
by Alexandre Julliard Oct. 5, 2018

Oct. 5, 2018

Module: wine Branch: master Commit: 800720dad226647ad27548a8f658a8de720c5cde URL: https://source.winehq.org/git/wine.git/?a=commit;h=800720dad226647ad27548a8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Oct 5 14:10:18 2018 +0200 d3d11: Pass full DXBC to wined3d. 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> --- dlls/d3d11/shader.c | 264 ++++++++++------------------------------------------ 1 file changed, 49 insertions(+), 215 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=800720dad226647ad275…

1 0

Józef Kucia : wined3d: Accept full DXBC.
by Alexandre Julliard Oct. 5, 2018

Oct. 5, 2018

Module: wine Branch: master Commit: 72ea1419d5ac71f69b339728372f93609cdf8b1a URL: https://source.winehq.org/git/wine.git/?a=commit;h=72ea1419d5ac71f69b339728… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Oct 5 14:10:17 2018 +0200 wined3d: Accept full DXBC. In order to make it easier to add shader backends based on external libraries, e.g. vkd3d-shader. Additionally, allows us to easily parse additional DXBC chunks in wined3d. 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> --- dlls/wined3d/shader.c | 105 ++++++++----- dlls/wined3d/shader_sm4.c | 329 +++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 9 +- include/wine/wined3d.h | 1 + 4 files changed, 404 insertions(+), 40 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=72ea1419d5ac71f69b33…

1 0

Nikolay Sivov : d2d1: Add a helper to set error state.
by Alexandre Julliard Oct. 5, 2018

Oct. 5, 2018

Module: wine Branch: master Commit: c4c5353820267d8814e49d73607c98948995e06c URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4c5353820267d8814e49d73… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 5 10:23:22 2018 +0300 d2d1: Add a helper to set error state. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/device.c | 47 +++++++++++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 22 deletions(-) diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index bfd1494..1e42051 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -195,6 +195,13 @@ static void d2d_device_context_draw(struct d2d_device_context *render_target, en WARN("Failed to apply stateblock, hr %#x.\n", hr); } +static void d2d_device_context_set_error(struct d2d_device_context *context, HRESULT code) +{ + context->error.code = code; + context->error.tag1 = context->drawing_state.tag1; + context->error.tag2 = context->drawing_state.tag2; +} + static inline struct d2d_device_context *impl_from_IUnknown(IUnknown *iface) { return CONTAINING_RECORD(iface, struct d2d_device_context, IUnknown_iface); @@ -969,23 +976,21 @@ static void STDMETHODCALLTYPE d2d_device_context_FillGeometry(ID2D1DeviceContext { const struct d2d_geometry *geometry_impl = unsafe_impl_from_ID2D1Geometry(geometry); struct d2d_brush *opacity_brush_impl = unsafe_impl_from_ID2D1Brush(opacity_brush); - struct d2d_device_context *render_target = impl_from_ID2D1DeviceContext(iface); + struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface); struct d2d_brush *brush_impl = unsafe_impl_from_ID2D1Brush(brush); TRACE("iface %p, geometry %p, brush %p, opacity_brush %p.\n", iface, geometry, brush, opacity_brush); - if (FAILED(render_target->error.code)) + if (FAILED(context->error.code)) return; if (opacity_brush && brush_impl->type != D2D_BRUSH_TYPE_BITMAP) { - render_target->error.code = D2DERR_INCOMPATIBLE_BRUSH_TYPES; - render_target->error.tag1 = render_target->drawing_state.tag1; - render_target->error.tag2 = render_target->drawing_state.tag2; + d2d_device_context_set_error(context, D2DERR_INCOMPATIBLE_BRUSH_TYPES); return; } - d2d_device_context_fill_geometry(render_target, geometry_impl, brush_impl, opacity_brush_impl); + d2d_device_context_fill_geometry(context, geometry_impl, brush_impl, opacity_brush_impl); } static void STDMETHODCALLTYPE d2d_device_context_FillMesh(ID2D1DeviceContext *iface, @@ -1076,7 +1081,7 @@ static void STDMETHODCALLTYPE d2d_device_context_DrawBitmap(ID2D1DeviceContext * if (interpolation_mode != D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR && interpolation_mode != D2D1_BITMAP_INTERPOLATION_MODE_LINEAR) { - context->error.code = E_INVALIDARG; + d2d_device_context_set_error(context, E_INVALIDARG); return; } @@ -1341,7 +1346,7 @@ static void STDMETHODCALLTYPE d2d_device_context_DrawGlyphRun(ID2D1DeviceContext D2D1_POINT_2F baseline_origin, const DWRITE_GLYPH_RUN *glyph_run, ID2D1Brush *brush, DWRITE_MEASURING_MODE measuring_mode) { - struct d2d_device_context *render_target = impl_from_ID2D1DeviceContext(iface); + struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface); DWRITE_TEXT_ANTIALIAS_MODE antialias_mode = DWRITE_TEXT_ANTIALIAS_MODE_GRAYSCALE; IDWriteRenderingParams *rendering_params; DWRITE_RENDERING_MODE rendering_mode; @@ -1350,12 +1355,12 @@ static void STDMETHODCALLTYPE d2d_device_context_DrawGlyphRun(ID2D1DeviceContext TRACE("iface %p, baseline_origin %s, glyph_run %p, brush %p, measuring_mode %#x.\n", iface, debug_d2d_point_2f(&baseline_origin), glyph_run, brush, measuring_mode); - rendering_params = render_target->text_rendering_params ? render_target->text_rendering_params - : render_target->default_text_rendering_params; + rendering_params = context->text_rendering_params ? context->text_rendering_params + : context->default_text_rendering_params; rendering_mode = IDWriteRenderingParams_GetRenderingMode(rendering_params); - switch (render_target->drawing_state.textAntialiasMode) + switch (context->drawing_state.textAntialiasMode) { case D2D1_TEXT_ANTIALIAS_MODE_ALIASED: if (rendering_mode == DWRITE_RENDERING_MODE_CLEARTYPE_NATURAL @@ -1363,29 +1368,29 @@ static void STDMETHODCALLTYPE d2d_device_context_DrawGlyphRun(ID2D1DeviceContext || rendering_mode == DWRITE_RENDERING_MODE_CLEARTYPE_GDI_NATURAL || rendering_mode == DWRITE_RENDERING_MODE_CLEARTYPE_GDI_CLASSIC) { - render_target->error.code = E_INVALIDARG; + d2d_device_context_set_error(context, E_INVALIDARG); } break; case D2D1_TEXT_ANTIALIAS_MODE_CLEARTYPE: if (rendering_mode == DWRITE_RENDERING_MODE_ALIASED || rendering_mode == DWRITE_RENDERING_MODE_OUTLINE) { - render_target->error.code = E_INVALIDARG; + d2d_device_context_set_error(context, E_INVALIDARG); } break; case D2D1_TEXT_ANTIALIAS_MODE_GRAYSCALE: if (rendering_mode == DWRITE_RENDERING_MODE_ALIASED) - render_target->error.code = E_INVALIDARG; + d2d_device_context_set_error(context, E_INVALIDARG); break; default: ; } - if (FAILED(render_target->error.code)) + if (FAILED(context->error.code)) return; rendering_mode = DWRITE_RENDERING_MODE_DEFAULT; - switch (render_target->drawing_state.textAntialiasMode) + switch (context->drawing_state.textAntialiasMode) { case D2D1_TEXT_ANTIALIAS_MODE_DEFAULT: if (IDWriteRenderingParams_GetClearTypeLevel(rendering_params) > 0.0f) @@ -1404,7 +1409,7 @@ static void STDMETHODCALLTYPE d2d_device_context_DrawGlyphRun(ID2D1DeviceContext if (rendering_mode == DWRITE_RENDERING_MODE_DEFAULT) { if (FAILED(hr = IDWriteFontFace_GetRecommendedRenderingMode(glyph_run->fontFace, glyph_run->fontEmSize, - max(render_target->desc.dpiX, render_target->desc.dpiY) / 96.0f, + max(context->desc.dpiX, context->desc.dpiY) / 96.0f, measuring_mode, rendering_params, &rendering_mode))) { ERR("Failed to get recommended rendering mode, hr %#x.\n", hr); @@ -1413,9 +1418,9 @@ static void STDMETHODCALLTYPE d2d_device_context_DrawGlyphRun(ID2D1DeviceContext } if (rendering_mode == DWRITE_RENDERING_MODE_OUTLINE) - d2d_device_context_draw_glyph_run_outline(render_target, baseline_origin, glyph_run, brush); + d2d_device_context_draw_glyph_run_outline(context, baseline_origin, glyph_run, brush); else - d2d_device_context_draw_glyph_run_bitmap(render_target, baseline_origin, glyph_run, brush, + d2d_device_context_draw_glyph_run_bitmap(context, baseline_origin, glyph_run, brush, rendering_mode, measuring_mode, antialias_mode); } @@ -2053,9 +2058,7 @@ static void STDMETHODCALLTYPE d2d_device_context_SetTarget(ID2D1DeviceContext *i if (!(bitmap_impl->options & D2D1_BITMAP_OPTIONS_TARGET)) { - context->error.code = D2DERR_INVALID_TARGET; - context->error.tag1 = context->drawing_state.tag1; - context->error.tag2 = context->drawing_state.tag2; + d2d_device_context_set_error(context, D2DERR_INVALID_TARGET); return; }

1 0

Józef Kucia : winevulkan: Update vk.xml to 1.1.86.
by Alexandre Julliard Oct. 5, 2018

Oct. 5, 2018

Module: wine Branch: master Commit: 5d071ce03dc3e21b69832515a95054856095103d URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d071ce03dc3e21b69832515… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Oct 5 16:55:20 2018 +0200 winevulkan: Update vk.xml to 1.1.86. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 2 +- dlls/winevulkan/vulkan_thunks.c | 151 +++ dlls/winevulkan/vulkan_thunks.h | 47 + include/wine/vulkan.h | 2673 +++++++++++++++++++++++---------------- 4 files changed, 1811 insertions(+), 1062 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5d071ce03dc3e21b6983…

1 0

Józef Kucia : winevulkan: Check if conversion is required for pNext chains.
by Alexandre Julliard Oct. 5, 2018

Oct. 5, 2018

Module: wine Branch: master Commit: 94a4dadd9a05d6da8688e17187583fa6a11a6e04 URL: https://source.winehq.org/git/wine.git/?a=commit;h=94a4dadd9a05d6da8688e171… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Oct 5 16:55:18 2018 +0200 winevulkan: Check if conversion is required for pNext chains. Unhandled conversions are only logged for now. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 41 +++++++++++++++++++++++++++++++++++++---- 1 file changed, 37 insertions(+), 4 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index ae90905..ce14c78 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -1028,9 +1028,12 @@ class VkMember(object): # Collect any conversion for any member structs. struct = self.type_info["data"] for m in struct: + m.needs_struct_extensions_conversion() if m.needs_conversion(): conversions.extend(m.get_conversions()) + struct.needs_struct_extensions_conversion() + struct = self.type_info["data"] direction = Direction.OUTPUT if struct.returnedonly else Direction.INPUT if self.is_dynamic_array(): @@ -1119,6 +1122,13 @@ class VkMember(object): # though none of this type have been encountered yet. return False + def needs_struct_extensions_conversion(self): + if not self.is_struct(): + return False + + struct = self.type_info["data"] + return struct.needs_struct_extensions_conversion() + def set_type_info(self, type_info): """ Helper function to set type information from the type registry. This is needed, because not all type data is available at time of @@ -1356,6 +1366,10 @@ class VkParam(object): if not self.is_struct(): return None + self.struct.needs_struct_extensions_conversion() + for m in self.struct: + m.needs_struct_extensions_conversion() + if not self.needs_conversion(): return None @@ -1485,14 +1499,16 @@ class VkParam(object): class VkStruct(Sequence): """ Class which represents the type union and struct. """ - def __init__(self, name, members, returnedonly, alias=None, union=False): + def __init__(self, name, members, returnedonly, structextends, alias=None, union=False): self.name = name self.members = members self.returnedonly = returnedonly + self.structextends = structextends self.required = False self.alias = alias self.union = union self.type_info = None # To be set later. + self.struct_extensions = [] def __getitem__(self, i): return self.members[i] @@ -1503,7 +1519,7 @@ class VkStruct(Sequence): @staticmethod def from_alias(struct, alias): name = struct.attrib.get("name") - return VkStruct(name, alias.members, alias.returnedonly, alias=alias) + return VkStruct(name, alias.members, alias.returnedonly, alias.structextends, alias=alias) @staticmethod def from_xml(struct): @@ -1511,18 +1527,21 @@ class VkStruct(Sequence): # know which one we are dealing with later on for code generation. union = True if struct.attrib["category"] == "union" else False - name = struct.attrib.get("name", None) + name = struct.attrib.get("name") # 'Output' structures for which data is filled in by the API are # marked as 'returnedonly'. returnedonly = True if struct.attrib.get("returnedonly") else False + structextends = struct.attrib.get("structextends") + structextends = structextends.split(",") if structextends else [] + members = [] for member in struct.findall("member"): vk_member = VkMember.from_xml(member) members.append(vk_member) - return VkStruct(name, members, returnedonly, union=union) + return VkStruct(name, members, returnedonly, structextends, union=union) @staticmethod def decouple_structs(structs): @@ -1648,6 +1667,16 @@ class VkStruct(Sequence): return False + def needs_struct_extensions_conversion(self): + """ Checks if structure extensions in pNext chain need conversion. """ + + for e in self.struct_extensions: + if e.required and e.needs_conversion(): + LOGGER.error("Unhandled pNext chain conversion for {0}".format(e.name)) + return True + + return False + def set_type_info(self, types): """ Helper function to set type information from the type registry. This is needed, because not all type data is available at time of @@ -2756,6 +2785,10 @@ class VkRegistry(object): for struct in structs: struct.set_type_info(self.types) + for structextend in struct.structextends: + s = self.types[structextend]["data"] + s.struct_extensions.append(struct) + # Guarantee everything is sorted, so code generation doesn't have # to deal with this. self.base_types = sorted(base_types, key=lambda base_type: base_type.name)

1 0

Stefan Dösinger : include: Add check macros needed for VS2017.
by Alexandre Julliard Oct. 5, 2018

Oct. 5, 2018

Module: wine Branch: master Commit: 7fb58748e6789787e7579f8f75f3cb5337a87e8c URL: https://source.winehq.org/git/wine.git/?a=commit;h=7fb58748e6789787e7579f8f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Oct 5 13:43:38 2018 +0100 include: Add check macros needed for VS2017. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/sal.h | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/include/sal.h b/include/sal.h index 6eb0a6c..c8b4491 100644 --- a/include/sal.h +++ b/include/sal.h @@ -19,6 +19,11 @@ #ifndef __WINE_SAL_H__ #define __WINE_SAL_H__ + +#define _Always_(exp) + +#define _At_buffer_(a, b, c, d) + #define _Check_return_ #define _Deref_out_ @@ -26,6 +31,11 @@ #define _Deref_out_opt_z_ #define _Deref_post_opt_cap_(count) #define _Deref_post_opt_valid_ +#define _Deref_post_valid_ +#define _Deref_post_z_ +#define _Deref_prepost_opt_z_ + +#define _Field_range_(min, max) #define _In_ #define _In_bytecount_(count) @@ -33,15 +43,23 @@ #define _In_opt_ #define _In_opt_count_(count) #define _In_opt_z_ +#define _In_range_(min, max) #define _In_reads_(count) #define _In_reads_bytes_(count) +#define _In_reads_bytes_opt_(count) #define _In_reads_opt_z_(count) +#define _In_reads_or_z_(count) +#define _In_reads_or_z_opt_(count) #define _In_reads_z_(count) #define _In_z_ #define _Inout_ #define _Inout_cap_(count) #define _Inout_opt_ +#define _Inout_opt_z_ +#define _Inout_updates_(count) +#define _Inout_updates_bytes_(count) +#define _Inout_updates_opt_(count) #define _Inout_updates_z_(count) #define _Inout_z_ #define _Inout_z_bytecap_(count) @@ -60,35 +78,61 @@ #define _Out_opt_z_cap_(count) #define _Out_opt_z_cap_post_count_(count1, count2) #define _Out_writes_(count) +#define _Out_writes_bytes_(count) +#define _Out_writes_bytes_all_(count) +#define _Out_writes_bytes_all_opt_(count) +#define _Out_writes_bytes_opt_(count) #define _Out_writes_bytes_to_(count1, count2) +#define _Out_writes_bytes_to_opt_(count1, count2) #define _Out_writes_opt_(count) #define _Out_writes_opt_z_(count) #define _Out_writes_to_(count1, count2) +#define _Out_writes_to_opt_(count1, count2) #define _Out_writes_z_(count) #define _Out_z_cap_(count) #define _Out_z_cap_c_(count) #define _Out_z_cap_post_count_(count1, count2) #define _Outptr_result_buffer_(count) +#define _Outptr_result_buffer_maybenull_(count) +#define _Outptr_result_maybenull_ #define _Outptr_result_maybenull_z_ +#define _Outptr_result_z_ +#define _Param_(p) + +#define _Post_equal_to_(exp) #define _Post_invalid_ +#define _Post_maybez_ +#define _Post_readable_size_(count) +#define _Post_satisfies_(exp) #define _Post_writable_byte_size_(count) #define _Post_z_ #define _Pre_maybenull_ #define _Pre_notnull_ +#define _Pre_opt_z_ #define _Pre_writable_size_(count) +#define _Pre_z_ #define _Printf_format_string_ +#define _Printf_format_string_params_(count) #define _Ret_maybenull_ #define _Ret_maybenull_z_ +#define _Ret_notnull_ #define _Ret_opt_ #define _Ret_opt_z_cap_(count) #define _Ret_writes_bytes_maybenull_(count) #define _Ret_z_ +#define _Scanf_format_string_ +#define _Scanf_format_string_params_(count) +#define _Scanf_s_format_string_ +#define _Scanf_s_format_string_params_(count) + #define _Success_(exp) +#define _When_(exp1, exp2) + #endif

1 0

Tag vkd3d-1.1 : Alexandre Julliard : Release 1.1
by Alexandre Julliard Oct. 5, 2018

Oct. 5, 2018

Module: vkd3d Branch: refs/tags/vkd3d-1.1 Tag: e32712ca96b0305ec4ecf7f445379e20d31c5402 URL: https://source.winehq.org/git/vkd3d.git/?a=tag;h=e32712ca96b0305ec4ecf7f445… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 5 13:48:18 2018 -0500 Release 1.1

1 0