February 2019 - Wine-Devel - list.winehq.org

[PATCH] d3dx11_42: Share source with d3dx11_43.
by Andrey Gusev Feb. 1, 2019

Feb. 1, 2019

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/d3dx11_42/Makefile.in | 3 +- dlls/d3dx11_42/d3dx11_42.c | 55 -------------------------- dlls/d3dx11_42/d3dx11_42.spec | 20 +++++----- dlls/d3dx11_43/Makefile.in | 3 +- dlls/d3dx11_43/{d3dx11_43.c => main.c} | 12 +----- tools/make_specfiles | 4 -- 6 files changed, 16 insertions(+), 81 deletions(-) delete mode 100644 dlls/d3dx11_42/d3dx11_42.c rename dlls/d3dx11_43/{d3dx11_43.c => main.c} (84%) diff --git a/dlls/d3dx11_42/Makefile.in b/dlls/d3dx11_42/Makefile.in index d20f6600ec..4a8fd0baba 100644 --- a/dlls/d3dx11_42/Makefile.in +++ b/dlls/d3dx11_42/Makefile.in @@ -1,10 +1,11 @@ +EXTRADEFS = -DD3DX11_SDK_VERSION=42 MODULE = d3dx11_42.dll IMPORTS = d3dcompiler PARENTSRC = ../d3dx11_43 C_SRCS = \ async.c \ - d3dx11_42.c \ + main.c \ texture.c RC_SRCS = version.rc diff --git a/dlls/d3dx11_42/d3dx11_42.c b/dlls/d3dx11_42/d3dx11_42.c deleted file mode 100644 index 823ebf4727..0000000000 --- a/dlls/d3dx11_42/d3dx11_42.c +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright 2013 Detlef Riekenberg - * - * 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 "config.h" -#include "wine/port.h" -#include <stdarg.h> - -#define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "objbase.h" -#include "d3dx11.h" - -BOOL WINAPI DllMain(HINSTANCE hdll, DWORD reason, LPVOID reserved) -{ - switch (reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hdll); - } - - return TRUE; -} - -/*********************************************************************** - * D3DX11CheckVersion - * - * Checks whether we are compiling against the correct d3d and d3dx library. - */ -BOOL WINAPI D3DX11CheckVersion(UINT d3dsdkversion, UINT d3dxsdkversion) -{ - if ((d3dsdkversion == D3D11_SDK_VERSION) && (d3dxsdkversion == 42)) - return TRUE; - - return FALSE; -} diff --git a/dlls/d3dx11_42/d3dx11_42.spec b/dlls/d3dx11_42/d3dx11_42.spec index cb1f7805ff..dde8821a30 100644 --- a/dlls/d3dx11_42/d3dx11_42.spec +++ b/dlls/d3dx11_42/d3dx11_42.spec @@ -6,30 +6,30 @@ @ stub D3DX11CompileFromResourceW @ stub D3DX11ComputeNormalMap @ stub D3DX11CreateAsyncCompilerProcessor -@ stdcall D3DX11CreateAsyncFileLoaderA(str ptr) d3dx11_43.D3DX11CreateAsyncFileLoaderA -@ stdcall D3DX11CreateAsyncFileLoaderW(wstr ptr) d3dx11_43.D3DX11CreateAsyncFileLoaderW -@ stdcall D3DX11CreateAsyncMemoryLoader(ptr long ptr) d3dx11_43.D3DX11CreateAsyncMemoryLoader -@ stdcall D3DX11CreateAsyncResourceLoaderA(long str ptr) d3dx11_43.D3DX11CreateAsyncResourceLoaderA -@ stdcall D3DX11CreateAsyncResourceLoaderW(long wstr ptr) d3dx11_43.D3DX11CreateAsyncResourceLoaderW +@ stdcall D3DX11CreateAsyncFileLoaderA(str ptr) +@ stdcall D3DX11CreateAsyncFileLoaderW(wstr ptr) +@ stdcall D3DX11CreateAsyncMemoryLoader(ptr long ptr) +@ stdcall D3DX11CreateAsyncResourceLoaderA(long str ptr) +@ stdcall D3DX11CreateAsyncResourceLoaderW(long wstr ptr) @ stub D3DX11CreateAsyncShaderPreprocessProcessor @ stub D3DX11CreateAsyncShaderResourceViewProcessor @ stub D3DX11CreateAsyncTextureInfoProcessor @ stub D3DX11CreateAsyncTextureProcessor @ stub D3DX11CreateShaderResourceViewFromFileA @ stub D3DX11CreateShaderResourceViewFromFileW -@ stdcall D3DX11CreateShaderResourceViewFromMemory(ptr ptr long ptr ptr ptr ptr) d3dx11_43.D3DX11CreateShaderResourceViewFromMemory +@ stdcall D3DX11CreateShaderResourceViewFromMemory(ptr ptr long ptr ptr ptr ptr) @ stub D3DX11CreateShaderResourceViewFromResourceA @ stub D3DX11CreateShaderResourceViewFromResourceW -@ stdcall D3DX11CreateTextureFromFileA(ptr str ptr ptr ptr ptr) d3dx11_43.D3DX11CreateTextureFromFileA -@ stdcall D3DX11CreateTextureFromFileW(ptr wstr ptr ptr ptr ptr) d3dx11_43.D3DX11CreateTextureFromFileW +@ stdcall D3DX11CreateTextureFromFileA(ptr str ptr ptr ptr ptr) +@ stdcall D3DX11CreateTextureFromFileW(ptr wstr ptr ptr ptr ptr) @ stdcall D3DX11CreateTextureFromMemory(ptr ptr long ptr ptr ptr ptr) @ stub D3DX11CreateTextureFromResourceA @ stub D3DX11CreateTextureFromResourceW @ stub D3DX11CreateThreadPump -@ stdcall D3DX11FilterTexture(ptr ptr long long) d3dx11_43.D3DX11FilterTexture +@ stdcall D3DX11FilterTexture(ptr ptr long long) @ stub D3DX11GetImageInfoFromFileA @ stub D3DX11GetImageInfoFromFileW -@ stdcall D3DX11GetImageInfoFromMemory(ptr long ptr ptr ptr) d3dx11_43.D3DX11GetImageInfoFromMemory +@ stdcall D3DX11GetImageInfoFromMemory(ptr long ptr ptr ptr) @ stub D3DX11GetImageInfoFromResourceA @ stub D3DX11GetImageInfoFromResourceW @ stub D3DX11LoadTextureFromTexture diff --git a/dlls/d3dx11_43/Makefile.in b/dlls/d3dx11_43/Makefile.in index d5c5b45548..c64d03750b 100644 --- a/dlls/d3dx11_43/Makefile.in +++ b/dlls/d3dx11_43/Makefile.in @@ -1,10 +1,11 @@ +EXTRADEFS = -DD3DX11_SDK_VERSION=43 MODULE = d3dx11_43.dll IMPORTLIB = d3dx11 IMPORTS = d3dcompiler C_SRCS = \ async.c \ - d3dx11_43.c \ + main.c \ texture.c RC_SRCS = version.rc diff --git a/dlls/d3dx11_43/d3dx11_43.c b/dlls/d3dx11_43/main.c similarity index 84% rename from dlls/d3dx11_43/d3dx11_43.c rename to dlls/d3dx11_43/main.c index 4bf49986f5..b1bf969f18 100644 --- a/dlls/d3dx11_43/d3dx11_43.c +++ b/dlls/d3dx11_43/main.c @@ -48,17 +48,9 @@ BOOL WINAPI DllMain(HINSTANCE hdll, DWORD reason, LPVOID reserved) return TRUE; } -/*********************************************************************** - * D3DX11CheckVersion - * - * Checks whether we are compiling against the correct d3d and d3dx library. - */ -BOOL WINAPI D3DX11CheckVersion(UINT d3dsdkversion, UINT d3dxsdkversion) +BOOL WINAPI D3DX11CheckVersion(UINT d3d_sdk_ver, UINT d3dx_sdk_ver) { - if ((d3dsdkversion == D3D11_SDK_VERSION) && (d3dxsdkversion == 43)) - return TRUE; - - return FALSE; + return d3d_sdk_ver == D3D11_SDK_VERSION && d3dx_sdk_ver == D3DX11_SDK_VERSION; } HRESULT WINAPI D3DX11FilterTexture(ID3D11DeviceContext *context, ID3D11Resource *texture, UINT src_level, UINT filter) diff --git a/tools/make_specfiles b/tools/make_specfiles index edc317d71c..7666c3ceeb 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -91,10 +91,6 @@ my @dll_groups = "d3dx10_34", "d3dx10_33", ], - [ - "d3dx11_43", - "d3dx11_42", - ], [ "xinput1_3", "xinput1_4", -- 2.20.1

2 1

[PATCH 1/4] dwrite: Implement single adjustment, GPOS lookup 1.
by Nikolay Sivov Feb. 1, 2019

Feb. 1, 2019

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/analyzer.c | 4 + dlls/dwrite/dwrite_private.h | 2 + dlls/dwrite/opentype.c | 305 +++++++++++++++++++++++++++++++++++ 3 files changed, 311 insertions(+) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 7f15c91279..1fc8f98d16 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -1316,7 +1316,9 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphPlacements(IDWriteTextAnalyzer2 context.u.pos.glyphs = glyphs; context.u.pos.glyph_props = glyph_props; context.glyph_count = glyph_count; + context.emsize = emSize; context.advances = advances; + context.offsets = offsets; context.language_tag = get_opentype_language(locale); hr = shape_get_positions(&context, scriptprops->scripttags, scriptprops->ops->gpos_features); @@ -1378,7 +1380,9 @@ static HRESULT WINAPI dwritetextanalyzer_GetGdiCompatibleGlyphPlacements(IDWrite context.u.pos.glyphs = glyphs; context.u.pos.glyph_props = glyph_props; context.glyph_count = glyph_count; + context.emsize = emSize * ppdip; context.advances = advances; + context.offsets = offsets; context.language_tag = get_opentype_language(locale); hr = shape_get_positions(&context, scriptprops->scripttags, scriptprops->ops->gpos_features); diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 5a6cd4b16b..355a826563 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -393,7 +393,9 @@ struct scriptshaping_context } u; unsigned int glyph_count; + float emsize; float *advances; + DWRITE_GLYPH_OFFSET *offsets; }; struct shaping_font_ops diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 8cc74638b0..8cc45e4c10 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -489,6 +489,18 @@ enum gpos_lookup_type GPOS_LOOKUP_EXTENSION_POSITION = 9, }; +enum gpos_value_format +{ + GPOS_VALUE_X_PLACEMENT = 0x1, + GPOS_VALUE_Y_PLACEMENT = 0x2, + GPOS_VALUE_X_ADVANCE = 0x4, + GPOS_VALUE_Y_ADVANCE = 0x8, + GPOS_VALUE_X_PLACEMENT_DEVICE = 0x10, + GPOS_VALUE_Y_PLACEMENT_DEVICE = 0x20, + GPOS_VALUE_X_ADVANCE_DEVICE = 0x40, + GPOS_VALUE_Y_ADVANCE_DEVICE = 0x80, +}; + enum OPENTYPE_PLATFORM_ID { OPENTYPE_PLATFORM_UNICODE = 0, @@ -526,6 +538,54 @@ struct ot_lookup_table WORD subtable[1]; }; +#define GLYPH_NOT_COVERED ((unsigned int)~0u) + +struct ot_coverage_format1 +{ + WORD format; + WORD glyph_count; + WORD glyphs[1]; +}; + +struct ot_coverage_range +{ + WORD start_glyph; + WORD end_glyph; + WORD startcoverage_index; +}; + +struct ot_coverage_format2 +{ + WORD format; + WORD range_count; + struct ot_coverage_range ranges[1]; +}; + +struct ot_gpos_device_table +{ + WORD start_size; + WORD end_size; + WORD format; + WORD values[1]; +}; + +struct ot_gpos_singlepos_format1 +{ + WORD format; + WORD coverage; + WORD value_format; + WORD value[1]; +}; + +struct ot_gpos_singlepos_format2 +{ + WORD format; + WORD coverage; + WORD value_format; + WORD value_count; + WORD values[1]; +}; + typedef struct { WORD SubstFormat; WORD Coverage; @@ -2635,6 +2695,201 @@ static unsigned int opentype_layout_get_glyph_class(const struct dwrite_fonttabl return glyph_class; } +struct coverage_compare_format1_context +{ + UINT16 glyph; + const UINT16 *table_base; + unsigned int *coverage_index; +}; + +static int coverage_compare_format1(const void *left, const void *right) +{ + const struct coverage_compare_format1_context *context = left; + UINT16 glyph = GET_BE_WORD(*(UINT16 *)right); + int ret; + + ret = context->glyph - glyph; + if (!ret) + *context->coverage_index = (UINT16 *)right - context->table_base; + + return ret; +} + +static int coverage_compare_format2(const void *g, const void *r) +{ + const struct ot_coverage_range *range = r; + UINT16 glyph = *(UINT16 *)g; + + if (glyph < GET_BE_WORD(range->start_glyph)) + return -1; + else if (glyph > GET_BE_WORD(range->end_glyph)) + return 1; + else + return 0; +} + +static unsigned int opentype_layout_is_glyph_covered(const struct dwrite_fonttable *table, DWORD coverage, + UINT16 glyph) +{ + WORD format = table_read_be_word(table, coverage), count; + + count = table_read_be_word(table, coverage + 2); + + if (format == 1) + { + const struct ot_coverage_format1 *format1 = table_read_ensure(table, coverage, + FIELD_OFFSET(struct ot_coverage_format1, glyphs[count])); + struct coverage_compare_format1_context context; + unsigned int coverage_index = GLYPH_NOT_COVERED; + + if (format1) + { + context.glyph = glyph; + context.table_base = format1->glyphs; + context.coverage_index = &coverage_index; + + bsearch(&context, format1->glyphs, count, sizeof(glyph), coverage_compare_format1); + } + + return coverage_index; + } + else if (format == 2) + { + const struct ot_coverage_format2 *format2 = table_read_ensure(table, coverage, + FIELD_OFFSET(struct ot_coverage_format2, ranges[count])); + if (format2) + { + const struct ot_coverage_range *range = bsearch(&glyph, format2->ranges, count, + sizeof(struct ot_coverage_range), coverage_compare_format2); + return range && glyph <= GET_BE_WORD(range->end_glyph) ? + GET_BE_WORD(range->startcoverage_index) + glyph - GET_BE_WORD(range->start_glyph) : + GLYPH_NOT_COVERED; + } + } + else + WARN("Unknown coverage format %u.\n", format); + + return -1; +} + +static inline unsigned int dwrite_popcount(unsigned int x) +{ +#ifdef HAVE___BUILTIN_POPCOUNT + return __builtin_popcount(x); +#else + x -= x >> 1 & 0x55555555; + x = (x & 0x33333333) + (x >> 2 & 0x33333333); + return ((x + (x >> 4)) & 0x0f0f0f0f) * 0x01010101 >> 24; +#endif +} + +static float opentype_scale_gpos_be_value(WORD value, float emsize, UINT16 upem) +{ + return (short)GET_BE_WORD(value) * emsize / upem; +} + +static int opentype_layout_gpos_get_dev_value(const struct scriptshaping_context *context, unsigned int offset) +{ + const struct scriptshaping_cache *cache = context->cache; + unsigned int start_size, end_size, format, value_word; + unsigned int index, ppem, mask; + int value; + + if (!offset) + return 0; + + start_size = table_read_be_word(&cache->gpos.table, offset); + end_size = table_read_be_word(&cache->gpos.table, offset + FIELD_OFFSET(struct ot_gpos_device_table, end_size)); + + ppem = context->emsize; + if (ppem < start_size || ppem > end_size) + return 0; + + format = table_read_be_word(&cache->gpos.table, offset + FIELD_OFFSET(struct ot_gpos_device_table, format)); + + if (format < 1 || format > 3) + return 0; + + index = ppem - start_size; + + value_word = table_read_be_word(&cache->gpos.table, offset + + FIELD_OFFSET(struct ot_gpos_device_table, values[index >> (4 - format)])); + mask = 0xffff >> (16 - (1 << format)); + + value = (value_word >> ((index % (4 - format)) * (1 << format))) & mask; + + if ((unsigned int)value >= ((mask + 1) >> 1)) + value -= mask + 1; + + return value; +} + +static void opentype_layout_apply_gpos_value(struct scriptshaping_context *context, unsigned int table_offset, + WORD value_format, const WORD *values, unsigned int glyph) +{ + const struct scriptshaping_cache *cache = context->cache; + DWRITE_GLYPH_OFFSET *offset = &context->offsets[glyph]; + float *advance = &context->advances[glyph]; + + if (!value_format) + return; + + if (value_format & GPOS_VALUE_X_PLACEMENT) + { + offset->advanceOffset += opentype_scale_gpos_be_value(*values, context->emsize, cache->upem); + values++; + } + if (value_format & GPOS_VALUE_Y_PLACEMENT) + { + offset->ascenderOffset += opentype_scale_gpos_be_value(*values, context->emsize, cache->upem); + values++; + } + if (value_format & GPOS_VALUE_X_ADVANCE) + { + *advance += opentype_scale_gpos_be_value(*values, context->emsize, cache->upem); + values++; + } + if (value_format & GPOS_VALUE_Y_ADVANCE) + { + values++; + } + if (value_format & GPOS_VALUE_X_PLACEMENT_DEVICE) + { + offset->advanceOffset += opentype_layout_gpos_get_dev_value(context, table_offset + GET_BE_WORD(*values)); + values++; + } + if (value_format & GPOS_VALUE_Y_PLACEMENT_DEVICE) + { + offset->ascenderOffset += opentype_layout_gpos_get_dev_value(context, table_offset + GET_BE_WORD(*values)); + values++; + } + if (value_format & GPOS_VALUE_X_ADVANCE_DEVICE) + { + *advance += opentype_layout_gpos_get_dev_value(context, table_offset + GET_BE_WORD(*values)); + values++; + } + if (value_format & GPOS_VALUE_Y_ADVANCE_DEVICE) + { + values++; + } +} + +static unsigned int opentype_layout_get_gpos_subtable(const struct scriptshaping_cache *cache, + unsigned int lookup_offset, unsigned int subtable) +{ + WORD lookup_type = table_read_be_word(&cache->gpos.table, lookup_offset); + unsigned int subtable_offset = table_read_be_word(&cache->gpos.table, lookup_offset + + FIELD_OFFSET(struct ot_lookup_table, subtable[subtable])); + if (lookup_type == GPOS_LOOKUP_EXTENSION_POSITION) + { + const struct ot_gpos_extensionpos_format1 *format1 = table_read_ensure(&cache->gpos.table, + lookup_offset + subtable_offset, sizeof(*format1)); + subtable_offset += GET_BE_DWORD(format1->extension_offset); + } + + return lookup_offset + subtable_offset; +} + struct lookup { unsigned int offset; @@ -2677,6 +2932,56 @@ static BOOL glyph_iterator_match(const struct glyph_iterator *iter) static BOOL opentype_layout_apply_gpos_single_adjustment(struct scriptshaping_context *context, struct glyph_iterator *iter, const struct lookup *lookup) { + struct scriptshaping_cache *cache = context->cache; + WORD format, value_format, value_len, coverage; + unsigned int i; + + for (i = 0; i < lookup->subtable_count; ++i) + { + unsigned int subtable_offset = opentype_layout_get_gpos_subtable(cache, lookup->offset, i); + unsigned int coverage_index; + + format = table_read_be_word(&cache->gpos.table, subtable_offset); + + coverage = table_read_be_word(&cache->gpos.table, subtable_offset + + FIELD_OFFSET(struct ot_gpos_singlepos_format1, coverage)); + value_format = table_read_be_word(&cache->gpos.table, subtable_offset + + FIELD_OFFSET(struct ot_gpos_singlepos_format1, value_format)); + value_len = dwrite_popcount(value_format); + + if (format == 1) + { + const struct ot_gpos_singlepos_format1 *format1 = table_read_ensure(&cache->gpos.table, subtable_offset, + FIELD_OFFSET(struct ot_gpos_singlepos_format1, value[value_len])); + + coverage_index = opentype_layout_is_glyph_covered(&cache->gpos.table, subtable_offset + coverage, + context->u.pos.glyphs[iter->pos]); + if (coverage_index == GLYPH_NOT_COVERED) + continue; + + opentype_layout_apply_gpos_value(context, subtable_offset, value_format, format1->value, iter->pos); + break; + } + else if (format == 2) + { + WORD value_count = table_read_be_word(&cache->gpos.table, subtable_offset + + FIELD_OFFSET(struct ot_gpos_singlepos_format2, value_count)); + const struct ot_gpos_singlepos_format2 *format2 = table_read_ensure(&cache->gpos.table, subtable_offset, + FIELD_OFFSET(struct ot_gpos_singlepos_format2, values) + value_count * value_len * sizeof(WORD)); + + coverage_index = opentype_layout_is_glyph_covered(&cache->gpos.table, subtable_offset + coverage, + context->u.pos.glyphs[iter->pos]); + if (coverage_index == GLYPH_NOT_COVERED || coverage_index >= value_count) + continue; + + opentype_layout_apply_gpos_value(context, subtable_offset, value_format, + &format2->values[coverage_index * value_len], iter->pos); + break; + } + else + WARN("Unknown single adjustment format %u.\n", format); + } + return FALSE; } -- 2.20.1

1 3

[PATCH] secur32: Ignore spurious callbacks on macOS.
by Hans Leidekker Feb. 1, 2019

Feb. 1, 2019

For unknown reasons Mojave will sometimes call the schan_push_adapter callback during an SSLRead call. This confuses our code which is only prepared to handle schan_pull_adapter callbacks in this context. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/secur32/schannel_macosx.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/dlls/secur32/schannel_macosx.c b/dlls/secur32/schannel_macosx.c index bd080dcb41..29d2f65172 100644 --- a/dlls/secur32/schannel_macosx.c +++ b/dlls/secur32/schannel_macosx.c @@ -181,10 +181,17 @@ enum { }; #endif +enum schan_mode { + schan_mode_NONE, + schan_mode_READ, + schan_mode_WRITE, + schan_mode_HANDSHAKE, +}; struct mac_session { SSLContextRef context; struct schan_transport *transport; + enum schan_mode mode; CRITICAL_SECTION cs; }; @@ -634,6 +641,12 @@ static OSStatus schan_pull_adapter(SSLConnectionRef transport, void *buff, TRACE("(%p/%p, %p, %p/%lu)\n", s, s->transport, buff, buff_len, *buff_len); + if (s->mode != schan_mode_READ && s->mode != schan_mode_HANDSHAKE) + { + WARN("called in mode %u\n", s->mode); + return noErr; + } + status = schan_pull(s->transport, buff, buff_len); if (status == 0) { @@ -693,6 +706,12 @@ static OSStatus schan_push_adapter(SSLConnectionRef transport, const void *buff, TRACE("(%p/%p, %p, %p/%lu)\n", s, s->transport, buff, buff_len, *buff_len); + if (s->mode != schan_mode_WRITE && s->mode != schan_mode_HANDSHAKE) + { + WARN("called in mode %u\n", s->mode); + return noErr; + } + status = schan_push(s->transport, buff, buff_len); if (status == 0) { @@ -787,6 +806,8 @@ BOOL schan_imp_create_session(schan_imp_session *session, schan_credentials *cre goto fail; } + s->mode = schan_mode_NONE; + TRACE(" -> %p/%p\n", s, s->context); *session = (schan_imp_session)s; @@ -837,7 +858,10 @@ SECURITY_STATUS schan_imp_handshake(schan_imp_session session) TRACE("(%p/%p)\n", s, s->context); + s->mode = schan_mode_HANDSHAKE; status = SSLHandshake(s->context); + s->mode = schan_mode_NONE; + if (status == noErr) { TRACE("Handshake completed\n"); @@ -1096,8 +1120,13 @@ SECURITY_STATUS schan_imp_send(schan_imp_session session, const void *buffer, TRACE("(%p/%p, %p, %p/%lu)\n", s, s->context, buffer, length, *length); EnterCriticalSection(&s->cs); + s->mode = schan_mode_WRITE; + status = SSLWrite(s->context, buffer, *length, length); + + s->mode = schan_mode_NONE; LeaveCriticalSection(&s->cs); + if (status == noErr) TRACE("Wrote %lu bytes\n", *length); else if (status == errSSLWouldBlock) @@ -1128,8 +1157,13 @@ SECURITY_STATUS schan_imp_recv(schan_imp_session session, void *buffer, TRACE("(%p/%p, %p, %p/%lu)\n", s, s->context, buffer, length, *length); EnterCriticalSection(&s->cs); + s->mode = schan_mode_READ; + status = SSLRead(s->context, buffer, *length, length); + + s->mode = schan_mode_NONE; LeaveCriticalSection(&s->cs); + if (status == noErr || status == errSSLClosedGraceful) TRACE("Read %lu bytes\n", *length); else if (status == errSSLWouldBlock) -- 2.11.0

1 0

[PATCH] winhttp/tests: Add a couple of return value tests (Coverity).
by Nikolay Sivov Feb. 1, 2019

Feb. 1, 2019

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/winhttp/tests/winhttp.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 91a9d539aa..3a28acf913 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -3206,6 +3206,7 @@ static void test_multiple_reads(int port) char *buf = HeapAlloc( GetProcessHeap(), 0, len + 1 ); ret = WinHttpReadData( req, buf, len, &bytes_read ); + ok(ret, "WinHttpReadData failed: %u.\n", GetLastError()); ok( len == bytes_read, "only got %u of %u available\n", bytes_read, len ); HeapFree( GetProcessHeap(), 0, buf ); @@ -4699,6 +4700,7 @@ static void test_chunked_read(void) char *buf = HeapAlloc( GetProcessHeap(), 0, len + 1 ); ret = WinHttpReadData( req, buf, len, &bytes_read ); + ok(ret, "WinHttpReadData failed: %u.\n", GetLastError()); buf[bytes_read] = 0; trace( "WinHttpReadData -> %d %u\n", ret, bytes_read ); -- 2.20.1

2 1

[PATCH v3] winetest: Add GUI to display results of individual tests.
by Isira Seneviratne Feb. 1, 2019

Feb. 1, 2019

1 0

[PATCH vkd3d v2 5/5] tests: Add SetName() tests.
by Zhiyi Zhang Feb. 1, 2019

Feb. 1, 2019

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- tests/d3d12.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 1b6b917..6afce71 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -2740,7 +2740,7 @@ static void test_create_fence(void) ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); } -static void test_private_data(void) +static void test_ID3D12Object(void) { D3D12_DESCRIPTOR_HEAP_DESC descriptor_heap_desc; D3D12_QUERY_HEAP_DESC query_heap_desc; @@ -2763,6 +2763,8 @@ static void test_private_data(void) static const GUID test_guid2 = {0x2e5afac2, 0x87b5, 0x4c10, {0x9b, 0x4b, 0x89, 0xd7, 0xd1, 0x12, 0xe7, 0x2b}}; static const DWORD data[] = {1, 2, 3, 4}; + static const WCHAR deadbeefW[] = {'d', 'e', 'a', 'd', 'b', 'e', 'e', 'f', 0}; + static const WCHAR emptyW[] = {0}; static const GUID *tests[] = { &IID_ID3D12CommandAllocator, @@ -2994,6 +2996,15 @@ static void test_private_data(void) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); } + hr = ID3D12Object_SetName(object, NULL); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + hr = ID3D12Object_SetName(object, emptyW); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + hr = ID3D12Object_SetName(object, deadbeefW); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ID3D12Object_Release(object); refcount = IUnknown_Release(test_object); @@ -24042,7 +24053,7 @@ START_TEST(d3d12) run_test(test_create_compute_pipeline_state); run_test(test_create_graphics_pipeline_state); run_test(test_create_fence); - run_test(test_private_data); + run_test(test_ID3D12Object); run_test(test_multithread_private_data); run_test(test_reset_command_allocator); run_test(test_cpu_signal_fence); -- 2.15.2 (Apple Git-101.1)

1 0

[PATCH v2] winetest: Add GUI to display results of individual tests.
by Isira Seneviratne Feb. 1, 2019

Feb. 1, 2019

2 1