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

Nikolay Sivov : dwrite: Add matching callback support for iterators.
by Alexandre Julliard 29 May '20

29 May '20

Module: wine Branch: master Commit: 4d233368824910f6096ab282bacea6c8f220d763 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d233368824910f6096ab282… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 29 19:01:06 2020 +0300 dwrite: Add matching callback support for iterators. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 67 +++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 61 insertions(+), 6 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 05fc38bad3..468368bcc0 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -3466,12 +3466,26 @@ struct ot_lookup unsigned int flags; }; +enum iterator_match +{ + /* First two to fit matching callback result. */ + ITER_NO = 0, + ITER_YES = 1, + ITER_MAYBE, +}; + +typedef BOOL (*p_match_func)(UINT16 glyph, UINT16 glyph_data, const void *match_data); + struct glyph_iterator { struct scriptshaping_context *context; unsigned int flags; unsigned int pos; unsigned int len; + unsigned int mask; + p_match_func match_func; + const UINT16 *glyph_data; + const void *match_data; }; static void glyph_iterator_init(struct scriptshaping_context *context, unsigned int flags, unsigned int pos, @@ -3481,6 +3495,10 @@ static void glyph_iterator_init(struct scriptshaping_context *context, unsigned iter->flags = flags; iter->pos = pos; iter->len = len; + iter->mask = ~0u; /* TODO: input sequences should be using actual mask */ + iter->match_func = NULL; + iter->match_data = NULL; + iter->glyph_data = NULL; } struct ot_gdef_mark_glyph_sets @@ -3535,21 +3553,48 @@ static BOOL lookup_is_glyph_match(const struct scriptshaping_context *context, u return TRUE; } -static BOOL glyph_iterator_match(const struct glyph_iterator *iter) +static enum iterator_match glyph_iterator_may_skip(const struct glyph_iterator *iter) +{ + if (!lookup_is_glyph_match(iter->context, iter->pos, iter->flags)) + return ITER_YES; + + return ITER_NO; +} + +static enum iterator_match glyph_iterator_may_match(const struct glyph_iterator *iter) { - return lookup_is_glyph_match(iter->context, iter->pos, iter->flags); + if (!(iter->mask & iter->context->glyph_infos[iter->pos].mask)) + return ITER_NO; + + if (iter->match_func) + return !!iter->match_func(iter->context->u.buffer.glyphs[iter->pos], *iter->glyph_data, iter->match_data); + + return ITER_MAYBE; } static BOOL glyph_iterator_next(struct glyph_iterator *iter) { + enum iterator_match skip, match; + while (iter->pos + iter->len < iter->context->glyph_count) { ++iter->pos; - if (glyph_iterator_match(iter)) + + skip = glyph_iterator_may_skip(iter); + if (skip == ITER_YES) + continue; + + match = glyph_iterator_may_match(iter); + if (match == ITER_YES || (match == ITER_MAYBE && skip == ITER_NO)) { --iter->len; + if (iter->glyph_data) + ++iter->glyph_data; return TRUE; } + + if (skip == ITER_NO) + return FALSE; } return FALSE; @@ -3557,17 +3602,27 @@ static BOOL glyph_iterator_next(struct glyph_iterator *iter) static BOOL glyph_iterator_prev(struct glyph_iterator *iter) { - if (!iter->pos) - return FALSE; + enum iterator_match skip, match; while (iter->pos > iter->len - 1) { --iter->pos; - if (glyph_iterator_match(iter)) + + skip = glyph_iterator_may_skip(iter); + if (skip == ITER_YES) + continue; + + match = glyph_iterator_may_match(iter); + if (match == ITER_YES || (match == ITER_MAYBE && skip == ITER_NO)) { --iter->len; + if (iter->glyph_data) + ++iter->glyph_data; return TRUE; } + + if (skip == ITER_NO) + return FALSE; } return FALSE;

1 0

Nikolay Sivov : dwrite: Use iterator matching for chain substitution.
by Alexandre Julliard 29 May '20

29 May '20

Module: wine Branch: master Commit: a1d1647131b4038485ed20e484df6c8aba1b200a URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1d1647131b4038485ed20e4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 29 19:01:07 2020 +0300 dwrite: Use iterator matching for chain substitution. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 105 +++++++++++++++++++++++++++++++------------------ 1 file changed, 67 insertions(+), 38 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 468368bcc0..198da43f2c 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -3474,7 +3474,24 @@ enum iterator_match ITER_MAYBE, }; -typedef BOOL (*p_match_func)(UINT16 glyph, UINT16 glyph_data, const void *match_data); +struct match_context; +struct match_data +{ + const struct match_context *mc; + unsigned int subtable_offset; +}; + +typedef BOOL (*p_match_func)(UINT16 glyph, UINT16 glyph_data, const struct match_data *match_data); + +struct match_context +{ + struct scriptshaping_context *context; + unsigned int backtrack_offset; + unsigned int input_offset; + unsigned int lookahead_offset; + p_match_func match_func; + unsigned int mask; +}; struct glyph_iterator { @@ -3485,7 +3502,7 @@ struct glyph_iterator unsigned int mask; p_match_func match_func; const UINT16 *glyph_data; - const void *match_data; + const struct match_data *match_data; }; static void glyph_iterator_init(struct scriptshaping_context *context, unsigned int flags, unsigned int pos, @@ -3495,7 +3512,7 @@ static void glyph_iterator_init(struct scriptshaping_context *context, unsigned iter->flags = flags; iter->pos = pos; iter->len = len; - iter->mask = ~0u; /* TODO: input sequences should be using actual mask */ + iter->mask = ~0u; iter->match_func = NULL; iter->match_data = NULL; iter->glyph_data = NULL; @@ -3508,6 +3525,13 @@ struct ot_gdef_mark_glyph_sets DWORD offsets[1]; }; +static BOOL opentype_match_coverage_func(UINT16 glyph, UINT16 glyph_data, const struct match_data *data) +{ + const struct match_context *mc = data->mc; + return opentype_layout_is_glyph_covered(&mc->context->table->table, data->subtable_offset + GET_BE_WORD(glyph_data), glyph) + != GLYPH_NOT_COVERED; +} + static BOOL opentype_layout_mark_set_covers(const struct scriptshaping_cache *cache, unsigned int set_index, UINT16 glyph) { @@ -4947,32 +4971,32 @@ static BOOL opentype_layout_apply_gsub_lig_substitution(struct scriptshaping_con return FALSE; } -#define CHAIN_CONTEXT_MAX_LENGTH 64 +#define GLYPH_CONTEXT_MAX_LENGTH 64 -static BOOL opentype_layout_context_match_input(struct scriptshaping_context *context, unsigned int subtable_offset, - unsigned int count, const UINT16 *input, unsigned int *end_offset, unsigned int *match_positions) +static BOOL opentype_layout_context_match_input(const struct match_context *mc, unsigned int count, const UINT16 *input, + unsigned int *end_offset, unsigned int *match_positions) { + struct match_data match_data = { .mc = mc, .subtable_offset = mc->input_offset }; + struct scriptshaping_context *context = mc->context; struct glyph_iterator iter; unsigned int i; - UINT16 glyph; - if (count > CHAIN_CONTEXT_MAX_LENGTH) + if (count > GLYPH_CONTEXT_MAX_LENGTH) return FALSE; match_positions[0] = context->cur; glyph_iterator_init(context, 0, context->cur, count - 1, &iter); + iter.mask = mc->mask; + iter.match_func = mc->match_func; + iter.match_data = &match_data; + iter.glyph_data = input; for (i = 1; i < count; ++i) { if (!glyph_iterator_next(&iter)) return FALSE; - /* TODO: this only covers Format3 substitution */ - glyph = context->u.subst.glyphs[iter.pos]; - if (opentype_layout_is_glyph_covered(&context->table->table, subtable_offset + GET_BE_WORD(input[i]), glyph) == GLYPH_NOT_COVERED) - return FALSE; - match_positions[i] = iter.pos; } @@ -4981,23 +5005,23 @@ static BOOL opentype_layout_context_match_input(struct scriptshaping_context *co return TRUE; } -static BOOL opentype_layout_context_match_backtrack(struct scriptshaping_context *context, unsigned int subtable_offset, - unsigned int count, const UINT16 *backtrack, unsigned int *match_start) +static BOOL opentype_layout_context_match_backtrack(const struct match_context *mc, unsigned int count, + const UINT16 *backtrack, unsigned int *match_start) { + struct match_data match_data = { .mc = mc, .subtable_offset = mc->backtrack_offset }; + struct scriptshaping_context *context = mc->context; struct glyph_iterator iter; unsigned int i; - UINT16 glyph; glyph_iterator_init(context, 0, context->cur, count, &iter); + iter.match_func = mc->match_func; + iter.match_data = &match_data; + iter.glyph_data = backtrack; for (i = 0; i < count; ++i) { if (!glyph_iterator_prev(&iter)) return FALSE; - - glyph = context->u.subst.glyphs[iter.pos]; - if (opentype_layout_is_glyph_covered(&context->table->table, subtable_offset + GET_BE_WORD(backtrack[i]), glyph) == GLYPH_NOT_COVERED) - return FALSE; } *match_start = iter.pos; @@ -5005,23 +5029,23 @@ static BOOL opentype_layout_context_match_backtrack(struct scriptshaping_context return TRUE; } -static BOOL opentype_layout_context_match_lookahead(struct scriptshaping_context *context, unsigned int subtable_offset, - unsigned int count, const UINT16 *lookahead, unsigned int offset, unsigned int *end_index) +static BOOL opentype_layout_context_match_lookahead(const struct match_context *mc, unsigned int count, + const UINT16 *lookahead, unsigned int offset, unsigned int *end_index) { + struct match_data match_data = { .mc = mc, .subtable_offset = mc->lookahead_offset }; + struct scriptshaping_context *context = mc->context; struct glyph_iterator iter; unsigned int i; - UINT16 glyph; glyph_iterator_init(context, 0, context->cur + offset - 1, count, &iter); + iter.match_func = mc->match_func; + iter.match_data = &match_data; + iter.glyph_data = lookahead; for (i = 0; i < count; ++i) { if (!glyph_iterator_next(&iter)) return FALSE; - - glyph = context->u.subst.glyphs[iter.pos]; - if (opentype_layout_is_glyph_covered(&context->table->table, subtable_offset + GET_BE_WORD(lookahead[i]), glyph) == GLYPH_NOT_COVERED) - return FALSE; } *end_index = iter.pos; @@ -5071,7 +5095,7 @@ static BOOL opentype_layout_context_gsub_apply_lookup(struct scriptshaping_conte if (delta > 0) { - if (delta + count > CHAIN_CONTEXT_MAX_LENGTH) + if (delta + count > GLYPH_CONTEXT_MAX_LENGTH) break; } else @@ -5097,22 +5121,23 @@ static BOOL opentype_layout_context_gsub_apply_lookup(struct scriptshaping_conte return TRUE; } -static BOOL opentype_layout_apply_gsub_chain_context_lookup(struct scriptshaping_context *context, unsigned int subtable_offset, - unsigned int backtrack_count, const UINT16 *backtrack, unsigned int input_count, const UINT16 *input, - unsigned int lookahead_count, const UINT16 *lookahead, unsigned int lookup_count, const UINT16 *lookup_records) +static BOOL opentype_layout_apply_gsub_chain_context_lookup(unsigned int backtrack_count, const UINT16 *backtrack, + unsigned int input_count, const UINT16 *input, unsigned int lookahead_count, const UINT16 *lookahead, + unsigned int lookup_count, const UINT16 *lookup_records, const struct match_context *mc) { unsigned int start_index = 0, match_length = 0, end_index = 0; - unsigned int match_positions[CHAIN_CONTEXT_MAX_LENGTH]; + unsigned int match_positions[GLYPH_CONTEXT_MAX_LENGTH]; - return opentype_layout_context_match_input(context, subtable_offset, input_count, input, &match_length, match_positions) && - opentype_layout_context_match_backtrack(context, subtable_offset, backtrack_count, backtrack, &start_index) && - opentype_layout_context_match_lookahead(context, subtable_offset, lookahead_count, lookahead, input_count, &end_index) && - opentype_layout_context_gsub_apply_lookup(context, input_count, match_positions, lookup_count, lookup_records, match_length); + return opentype_layout_context_match_input(mc, input_count, input, &match_length, match_positions) && + opentype_layout_context_match_backtrack(mc, backtrack_count, backtrack, &start_index) && + opentype_layout_context_match_lookahead(mc, lookahead_count, lookahead, input_count, &end_index) && + opentype_layout_context_gsub_apply_lookup(mc->context, input_count, match_positions, lookup_count, lookup_records, match_length); } static BOOL opentype_layout_apply_gsub_chain_context_substitution(struct scriptshaping_context *context, const struct lookup *lookup, unsigned int subtable_offset) { + struct match_context mc = { .context = context, .mask = lookup->mask }; const struct dwrite_fonttable *table = &context->table->table; unsigned int coverage_index = GLYPH_NOT_COVERED; UINT16 glyph, format, coverage; @@ -5176,8 +5201,12 @@ static BOOL opentype_layout_apply_gsub_chain_context_substitution(struct scripts if (coverage_index == GLYPH_NOT_COVERED) return FALSE; - ret = opentype_layout_apply_gsub_chain_context_lookup(context, subtable_offset, backtrack_count, backtrack, - input_count, input + 1, lookahead_count, lookahead, lookup_count, lookup_records); + mc.backtrack_offset = subtable_offset; + mc.input_offset = subtable_offset; + mc.lookahead_offset = subtable_offset; + mc.match_func = opentype_match_coverage_func; + ret = opentype_layout_apply_gsub_chain_context_lookup(backtrack_count, backtrack, input_count, input + 1, + lookahead_count, lookahead, lookup_count, lookup_records, &mc); } else WARN("Unknown chaining contextual substitution format %u.\n", format);

1 0

Jacek Caban : gdiplus/tests: Introduce compare_uint helper.
by Alexandre Julliard 29 May '20

29 May '20

Module: wine Branch: master Commit: 10257a9417323f87094eda18fb4122f02a36aad4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=10257a9417323f87094eda18… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 27 23:55:22 2020 +0200 gdiplus/tests: Introduce compare_uint helper. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Esme Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/image.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index de6fad093d..b17323cb75 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -39,15 +39,21 @@ static GpStatus (WINGDIPAPI *pGdipInitializePalette)(ColorPalette*,PaletteType,I #define expect(expected, got) ok((got) == (expected), "Expected %d, got %d\n", (UINT)(expected), (UINT)(got)) #define expectf(expected, got) ok(fabs((expected) - (got)) < 0.0001, "Expected %f, got %f\n", (expected), (got)) +static BOOL compare_uint(unsigned int x, unsigned int y, unsigned int max_diff) +{ + unsigned int diff = x > y ? x - y : y - x; + return diff <= max_diff; +} + static BOOL color_match(ARGB c1, ARGB c2, BYTE max_diff) { - if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff) return FALSE; + if (!compare_uint(c1 & 0xff, c2 & 0xff, max_diff)) return FALSE; c1 >>= 8; c2 >>= 8; - if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff) return FALSE; + if (!compare_uint(c1 & 0xff, c2 & 0xff, max_diff)) return FALSE; c1 >>= 8; c2 >>= 8; - if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff) return FALSE; + if (!compare_uint(c1 & 0xff, c2 & 0xff, max_diff)) return FALSE; c1 >>= 8; c2 >>= 8; - if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff) return FALSE; + if (!compare_uint(c1 & 0xff, c2 & 0xff, max_diff)) return FALSE; return TRUE; }

1 0

Serge Gautherie : mscoree: RegQueryValueExW() wants bytes, not chars.
by Alexandre Julliard 29 May '20

29 May '20

Module: wine Branch: master Commit: e4e5eda3d9afcb5360747ddd97e6bf4fdc0c1c0f URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4e5eda3d9afcb5360747ddd… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Thu May 28 04:30:37 2020 +0200 mscoree: RegQueryValueExW() wants bytes, not chars. Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Esme Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/metahost.c | 2 +- dlls/mscoree/mscoree_main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 9a299662e3..7702994252 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -477,7 +477,7 @@ static BOOL get_install_root(LPWSTR install_dir) if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, dotnet_key, 0, KEY_READ, &key)) return FALSE; - len = MAX_PATH; + len = MAX_PATH * sizeof(WCHAR); if (RegQueryValueExW(key, install_root, 0, NULL, (LPBYTE)install_dir, &len)) { RegCloseKey(key); diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 81fe5610b7..4679d79e66 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -80,7 +80,7 @@ static BOOL get_install_root(LPWSTR install_dir) if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, dotnet_key, 0, KEY_READ, &key)) return FALSE; - len = MAX_PATH; + len = MAX_PATH * sizeof(WCHAR); if (RegQueryValueExW(key, install_root, 0, NULL, (LPBYTE)install_dir, &len)) { RegCloseKey(key);

1 0

Ziqing Hui : windowscodecs: Get DDS parameters when initialize.
by Alexandre Julliard 29 May '20

29 May '20

Module: wine Branch: master Commit: ab0d2b1434d8f81e1f291cc10115e5cef7f1d3b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab0d2b1434d8f81e1f291cc1… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu May 28 13:08:39 2020 +0800 windowscodecs: Get DDS parameters when initialize. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/ddsformat.c | 100 ++++++++++++++++++++++++++--------------- 1 file changed, 64 insertions(+), 36 deletions(-) diff --git a/dlls/windowscodecs/ddsformat.c b/dlls/windowscodecs/ddsformat.c index de4cd1ea01..7341147245 100644 --- a/dlls/windowscodecs/ddsformat.c +++ b/dlls/windowscodecs/ddsformat.c @@ -93,6 +93,18 @@ typedef struct { DWORD miscFlags2; } DDS_HEADER_DXT10; +typedef struct dds_info { + UINT width; + UINT height; + UINT depth; + UINT mip_levels; + UINT array_size; + UINT frame_count; + DXGI_FORMAT format; + WICDdsDimension dimension; + WICDdsAlphaMode alpha_mode; +} dds_info; + typedef struct DdsDecoder { IWICBitmapDecoder IWICBitmapDecoder_iface; IWICDdsDecoder IWICDdsDecoder_iface; @@ -102,6 +114,7 @@ typedef struct DdsDecoder { CRITICAL_SECTION lock; DDS_HEADER header; DDS_HEADER_DXT10 header_dxt10; + dds_info info; } DdsDecoder; typedef struct DdsFrameDecode { @@ -175,6 +188,45 @@ static WICDdsAlphaMode get_alpha_mode_from_fourcc(DWORD fourcc) } } +static void get_dds_info(dds_info* info, DDS_HEADER *header, DDS_HEADER_DXT10 *header_dxt10) +{ + int i; + UINT depth; + + info->width = header->width; + info->height = header->height; + info->depth = 1; + info->mip_levels = 1; + info->array_size = 1; + if (header->depth) info->depth = header->depth; + if (header->mipMapCount) info->mip_levels = header->mipMapCount; + + if (has_extended_header(header)) { + if (header_dxt10->arraySize) info->array_size = header_dxt10->arraySize; + info->format = header_dxt10->dxgiFormat; + info->dimension = get_dimension(NULL, header_dxt10); + info->alpha_mode = header_dxt10->miscFlags2 & 0x00000008; + } else { + info->format = get_format_from_fourcc(header->ddspf.fourCC); + info->dimension = get_dimension(header, NULL); + info->alpha_mode = get_alpha_mode_from_fourcc(header->ddspf.fourCC); + } + + /* get frame count */ + if (info->depth == 1) { + info->frame_count = info->array_size * info->mip_levels; + } else { + info->frame_count = 0; + depth = info->depth; + for (i = 0; i < info->mip_levels; i++) + { + info->frame_count += depth; + if (depth > 1) depth /= 2; + } + info->frame_count *= info->array_size; + } +} + static inline DdsDecoder *impl_from_IWICBitmapDecoder(IWICBitmapDecoder *iface) { return CONTAINING_RECORD(iface, DdsDecoder, IWICBitmapDecoder_iface); @@ -497,6 +549,8 @@ static HRESULT WINAPI DdsDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p } } + get_dds_info(&This->info, &This->header, &This->header_dxt10); + This->initialized = TRUE; This->stream = pIStream; IStream_AddRef(pIStream); @@ -571,33 +625,17 @@ static HRESULT WINAPI DdsDecoder_GetFrameCount(IWICBitmapDecoder *iface, UINT *pCount) { DdsDecoder *This = impl_from_IWICBitmapDecoder(iface); - UINT arraySize = 1, mipMapCount = 1, depth = 1; - int i; if (!pCount) return E_INVALIDARG; if (!This->initialized) return WINCODEC_ERR_WRONGSTATE; EnterCriticalSection(&This->lock); - if (This->header.mipMapCount) mipMapCount = This->header.mipMapCount; - if (This->header.depth) depth = This->header.depth; - if (has_extended_header(&This->header) && This->header_dxt10.arraySize) arraySize = This->header_dxt10.arraySize; - - if (depth == 1) { - *pCount = arraySize * mipMapCount; - } else { - *pCount = 0; - for (i = 0; i < mipMapCount; i++) - { - *pCount += depth; - if (depth > 1) depth /= 2; - } - *pCount *= arraySize; - } + *pCount = This->info.frame_count; LeaveCriticalSection(&This->lock); - TRACE("(%p) <-- %d\n", iface, *pCount); + TRACE("(%p) -> %d\n", iface, *pCount); return S_OK; } @@ -667,24 +705,14 @@ static HRESULT WINAPI DdsDecoder_Dds_GetParameters(IWICDdsDecoder *iface, goto end; } - parameters->Width = This->header.width; - parameters->Height = This->header.height; - parameters->Depth = 1; - parameters->MipLevels = 1; - parameters->ArraySize = 1; - if (This->header.depth) parameters->Depth = This->header.depth; - if (This->header.mipMapCount) parameters->MipLevels = This->header.mipMapCount; - - if (has_extended_header(&This->header)) { - if (This->header_dxt10.arraySize) parameters->ArraySize = This->header_dxt10.arraySize; - parameters->DxgiFormat = This->header_dxt10.dxgiFormat; - parameters->Dimension = get_dimension(NULL, &This->header_dxt10); - parameters->AlphaMode = This->header_dxt10.miscFlags2 & 0x00000008; - } else { - parameters->DxgiFormat = get_format_from_fourcc(This->header.ddspf.fourCC); - parameters->Dimension = get_dimension(&This->header, NULL); - parameters->AlphaMode = get_alpha_mode_from_fourcc(This->header.ddspf.fourCC); - } + parameters->Width = This->info.width; + parameters->Height = This->info.height; + parameters->Depth = This->info.depth; + parameters->MipLevels = This->info.mip_levels; + parameters->ArraySize = This->info.array_size; + parameters->DxgiFormat = This->info.format; + parameters->Dimension = This->info.dimension; + parameters->AlphaMode = This->info.alpha_mode; TRACE("(%p) -> (%dx%d depth=%d mipLevels=%d arraySize=%d dxgiFormat=0x%x dimension=0x%x alphaMode=0x%x)\n", iface, parameters->Width, parameters->Height, parameters->Depth, parameters->MipLevels,

1 0

Ziqing Hui : windowscodecs: Implement DdsFrameDecode_GetSize().
by Alexandre Julliard 29 May '20

29 May '20

Module: wine Branch: master Commit: 9a6108cf438808e93b1e5a66a56a2c72444fa6c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a6108cf438808e93b1e5a66… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu May 28 13:09:09 2020 +0800 windowscodecs: Implement DdsFrameDecode_GetSize(). Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/ddsformat.c | 9 +++++++-- dlls/windowscodecs/tests/ddsformat.c | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/windowscodecs/ddsformat.c b/dlls/windowscodecs/ddsformat.c index 333f015820..20017788a0 100644 --- a/dlls/windowscodecs/ddsformat.c +++ b/dlls/windowscodecs/ddsformat.c @@ -299,9 +299,14 @@ static ULONG WINAPI DdsFrameDecode_Release(IWICBitmapFrameDecode *iface) static HRESULT WINAPI DdsFrameDecode_GetSize(IWICBitmapFrameDecode *iface, UINT *puiWidth, UINT *puiHeight) { - FIXME("(%p,%p,%p): stub.\n", iface, puiWidth, puiHeight); + DdsFrameDecode *This = impl_from_IWICBitmapFrameDecode(iface); - return E_NOTIMPL; + *puiWidth = This->width; + *puiHeight = This->height; + + TRACE("(%p) -> (%d,%d)\n", iface, *puiWidth, *puiHeight); + + return S_OK; } static HRESULT WINAPI DdsFrameDecode_GetPixelFormat(IWICBitmapFrameDecode *iface, diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index e31ca576fc..c7f56307d7 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -383,7 +383,7 @@ static void test_dds_decoder_frame_size(IWICBitmapDecoder *decoder, IWICBitmapFr if (hr != S_OK) goto end; hr = IWICBitmapFrameDecode_GetSize(frame_decode, &width, &height); - todo_wine ok (hr == S_OK, "%d: GetSize failed for frame %d, hr=%x\n", i, frame_index, hr); + ok (hr == S_OK, "%d: GetSize failed for frame %d, hr=%x\n", i, frame_index, hr); if (hr != S_OK) goto end; depth = params.Depth;

1 0

Ziqing Hui : windowscodecs: Implement DdsDecoder_Dds_GetFrame().
by Alexandre Julliard 29 May '20

29 May '20

Module: wine Branch: master Commit: 870b08b7fd59bd37dc66f7322019618e0e494595 URL: https://source.winehq.org/git/wine.git/?a=commit;h=870b08b7fd59bd37dc66f732… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu May 28 13:08:55 2020 +0800 windowscodecs: Implement DdsDecoder_Dds_GetFrame(). DdsDecoder_GetFrame() is implemented on top of DdsDecoder_Dds_GetFrame(). Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/ddsformat.c | 80 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 72 insertions(+), 8 deletions(-) diff --git a/dlls/windowscodecs/ddsformat.c b/dlls/windowscodecs/ddsformat.c index 7341147245..333f015820 100644 --- a/dlls/windowscodecs/ddsformat.c +++ b/dlls/windowscodecs/ddsformat.c @@ -121,8 +121,12 @@ typedef struct DdsFrameDecode { IWICBitmapFrameDecode IWICBitmapFrameDecode_iface; IWICDdsFrameDecode IWICDdsFrameDecode_iface; LONG ref; + UINT width; + UINT height; } DdsFrameDecode; +static HRESULT WINAPI DdsDecoder_Dds_GetFrame(IWICDdsDecoder *, UINT, UINT, UINT, IWICBitmapFrameDecode **); + static inline BOOL has_extended_header(DDS_HEADER *header) { return (header->ddspf.flags & DDPF_FOURCC) && @@ -643,15 +647,35 @@ static HRESULT WINAPI DdsDecoder_GetFrameCount(IWICBitmapDecoder *iface, static HRESULT WINAPI DdsDecoder_GetFrame(IWICBitmapDecoder *iface, UINT index, IWICBitmapFrameDecode **ppIBitmapFrame) { - HRESULT hr; - DdsFrameDecode *frame_decode; + DdsDecoder *This = impl_from_IWICBitmapDecoder(iface); + UINT frame_per_texture, array_index, mip_level, slice_index, depth; - FIXME("(%p,%u,%p)\n", iface, index, ppIBitmapFrame); + TRACE("(%p,%u,%p)\n", iface, index, ppIBitmapFrame); - hr = DdsFrameDecode_CreateInstance(&frame_decode); - if (hr == S_OK) *ppIBitmapFrame = &frame_decode->IWICBitmapFrameDecode_iface; + if (!ppIBitmapFrame) return E_INVALIDARG; - return hr; + EnterCriticalSection(&This->lock); + + if (!This->initialized) { + LeaveCriticalSection(&This->lock); + return WINCODEC_ERR_WRONGSTATE; + } + + frame_per_texture = This->info.frame_count / This->info.array_size; + array_index = index / frame_per_texture; + slice_index = index % frame_per_texture; + depth = This->info.depth; + mip_level = 0; + while (slice_index >= depth) + { + slice_index -= depth; + mip_level++; + if (depth > 1) depth /= 2; + } + + LeaveCriticalSection(&This->lock); + + return DdsDecoder_Dds_GetFrame(&This->IWICDdsDecoder_iface, array_index, mip_level, slice_index, ppIBitmapFrame); } static const IWICBitmapDecoderVtbl DdsDecoder_Vtbl = { @@ -730,9 +754,49 @@ static HRESULT WINAPI DdsDecoder_Dds_GetFrame(IWICDdsDecoder *iface, UINT arrayIndex, UINT mipLevel, UINT sliceIndex, IWICBitmapFrameDecode **bitmapFrame) { - TRACE("(%p,%u,%u,%u,%p): Stub.\n", iface, arrayIndex, mipLevel, sliceIndex, bitmapFrame); + DdsDecoder *This = impl_from_IWICDdsDecoder(iface); + HRESULT hr; + UINT width = 0, height = 0; + int j; + DdsFrameDecode *frame_decode; - return E_NOTIMPL; + TRACE("(%p,%u,%u,%u,%p)\n", iface, arrayIndex, mipLevel, sliceIndex, bitmapFrame); + + if (!bitmapFrame) return E_INVALIDARG; + + EnterCriticalSection(&This->lock); + + if (!This->initialized) { + hr = WINCODEC_ERR_WRONGSTATE; + goto end; + } + + if (arrayIndex >= This->info.array_size || mipLevel >= This->info.mip_levels || sliceIndex >= This->info.depth) { + hr = E_INVALIDARG; + goto end; + } + + width = This->info.width; + height = This->info.height; + for (j = 0; j < mipLevel; j++) + { + if (width > 1) width /= 2; + if (height > 1) height /= 2; + } + + hr = DdsFrameDecode_CreateInstance(&frame_decode); + if (hr != S_OK) goto end; + + frame_decode->width = width; + frame_decode->height = height; + *bitmapFrame = &frame_decode->IWICBitmapFrameDecode_iface; + + hr = S_OK; + +end: + LeaveCriticalSection(&This->lock); + + return hr; } static const IWICDdsDecoderVtbl DdsDecoder_Dds_Vtbl = {

1 0

Paul Gofman : ntoskrnl.exe: Fix ObRegisterCallbacks() function parameter definition.
by Alexandre Julliard 29 May '20

29 May '20

Module: wine Branch: master Commit: 4ae92fdaf653c8746284ecc8840a24e8ee5cb8ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ae92fdaf653c8746284ecc8… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri May 29 10:53:04 2020 +0300 ntoskrnl.exe: Fix ObRegisterCallbacks() function parameter definition. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 4 ++-- include/ddk/wdm.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index d50eac6c82..3cb5591920 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2807,9 +2807,9 @@ void FASTCALL ObfDereferenceObject( void *obj ) /*********************************************************************** * ObRegisterCallbacks (NTOSKRNL.EXE.@) */ -NTSTATUS WINAPI ObRegisterCallbacks(POB_CALLBACK_REGISTRATION *callBack, void **handle) +NTSTATUS WINAPI ObRegisterCallbacks(POB_CALLBACK_REGISTRATION callback, void **handle) { - FIXME( "stub: %p %p\n", callBack, handle ); + FIXME( "callback %p, handle %p.\n", callback, handle ); if(handle) *handle = UlongToHandle(0xdeadbeaf); diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 38a3098994..a67377352d 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1749,7 +1749,7 @@ static inline void *MmGetSystemAddressForMdlSafe(MDL *mdl, ULONG priority) void FASTCALL ObfReferenceObject(void*); void WINAPI ObDereferenceObject(void*); USHORT WINAPI ObGetFilterVersion(void); -NTSTATUS WINAPI ObRegisterCallbacks(POB_CALLBACK_REGISTRATION*, void**); +NTSTATUS WINAPI ObRegisterCallbacks(POB_CALLBACK_REGISTRATION, void**); NTSTATUS WINAPI ObReferenceObjectByHandle(HANDLE,ACCESS_MASK,POBJECT_TYPE,KPROCESSOR_MODE,PVOID*,POBJECT_HANDLE_INFORMATION); NTSTATUS WINAPI ObReferenceObjectByName(UNICODE_STRING*,ULONG,ACCESS_STATE*,ACCESS_MASK,POBJECT_TYPE,KPROCESSOR_MODE,void*,void**); NTSTATUS WINAPI ObReferenceObjectByPointer(void*,ACCESS_MASK,POBJECT_TYPE,KPROCESSOR_MODE);

1 0

Paul Gofman : ntoskrnl.exe: Return STATUS_SUCCESS from ExCreateCallback() stub.
by Alexandre Julliard 29 May '20

29 May '20

Module: wine Branch: master Commit: 1cad86fced2b8eb32dcc1e2d58858f45e8135ea3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1cad86fced2b8eb32dcc1e2d… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri May 29 10:53:05 2020 +0300 ntoskrnl.exe: Return STATUS_SUCCESS from ExCreateCallback() stub. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 3cb5591920..09d4796ad4 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2059,7 +2059,7 @@ NTSTATUS WINAPI ExCreateCallback(PCALLBACK_OBJECT *obj, POBJECT_ATTRIBUTES attr, { FIXME("(%p, %p, %u, %u): stub\n", obj, attr, create, allow_multiple); - return STATUS_NOT_IMPLEMENTED; + return STATUS_SUCCESS; }

1 0

Paul Gofman : ntoskrnl.exe: Add stub for ExRegisterCallback() function.
by Alexandre Julliard 29 May '20

29 May '20

Module: wine Branch: master Commit: 7bc99ae1254f467a23b46756dce40a15494f0758 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7bc99ae1254f467a23b46756… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri May 29 10:53:06 2020 +0300 ntoskrnl.exe: Add stub for ExRegisterCallback() function. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 2 ++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 09d4796ad4..f0892141c2 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2062,6 +2062,14 @@ NTSTATUS WINAPI ExCreateCallback(PCALLBACK_OBJECT *obj, POBJECT_ATTRIBUTES attr, return STATUS_SUCCESS; } +void * WINAPI ExRegisterCallback(PCALLBACK_OBJECT callback_object, + PCALLBACK_FUNCTION callback_function, void *callback_context) +{ + FIXME("callback_object %p, callback_function %p, callback_context %p stub.\n", + callback_object, callback_function, callback_context); + + return (void *)0xdeadbeef; +} /*********************************************************************** * ExFreePool (NTOSKRNL.EXE.@) @@ -3046,6 +3054,7 @@ PVOID WINAPI MmGetSystemRoutineAddress(PUNICODE_STRING SystemRoutineName) if (!pFunc) { hMod = GetModuleHandleW( halW ); + if (hMod) pFunc = GetProcAddress( hMod, routineNameA.Buffer ); } RtlFreeAnsiString( &routineNameA ); diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index dd7ff73bee..dcec2375df 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -183,7 +183,7 @@ @ stub ExRaiseException @ stub ExRaiseHardError @ stub ExRaiseStatus -@ stub ExRegisterCallback +@ stdcall ExRegisterCallback(ptr ptr ptr) @ stub ExReinitializeResourceLite @ stdcall ExReleaseResourceForThreadLite(ptr long) @ extern ExSemaphoreObjectType diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index a67377352d..282ea14b77 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1356,6 +1356,7 @@ typedef void * (NTAPI *PALLOCATE_FUNCTION)(POOL_TYPE, SIZE_T, ULONG); typedef void * (NTAPI *PALLOCATE_FUNCTION_EX)(POOL_TYPE, SIZE_T, ULONG, PLOOKASIDE_LIST_EX); typedef void (NTAPI *PFREE_FUNCTION)(void *); typedef void (NTAPI *PFREE_FUNCTION_EX)(void *, PLOOKASIDE_LIST_EX); +typedef void (NTAPI *PCALLBACK_FUNCTION)(void *, void *, void *); #ifdef _WIN64 #define LOOKASIDE_ALIGN DECLSPEC_CACHEALIGN @@ -1627,6 +1628,7 @@ PSLIST_ENTRY WINAPI ExInterlockedPushEntrySList(PSLIST_HEADER,PSLIST_ENTRY,PKSPI LIST_ENTRY * WINAPI ExInterlockedRemoveHeadList(LIST_ENTRY*,KSPIN_LOCK*); BOOLEAN WINAPI ExIsResourceAcquiredExclusiveLite(ERESOURCE*); ULONG WINAPI ExIsResourceAcquiredSharedLite(ERESOURCE*); +void * WINAPI ExRegisterCallback(PCALLBACK_OBJECT,PCALLBACK_FUNCTION,void*); void FASTCALL ExReleaseFastMutexUnsafe(PFAST_MUTEX); void WINAPI ExReleaseResourceForThreadLite(ERESOURCE*,ERESOURCE_THREAD); ULONG WINAPI ExSetTimerResolution(ULONG,BOOLEAN);

1 0