March 2021 - Wine-Devel - list.winehq.org

[PATCH v2 3/3] mscms: Allow any COLORTYPE translation equally.
by Hans Leidekker March 22, 2021

March 22, 2021

From: Lauri Kenttä <lauri.kentta(a)gmail.com> If we assume that trying a color translation is at least as good as just returning FALSE, then there's no point in cheching COLORTYPE. COLOR is union, so offsetof will be 0 anyway and can be omitted too. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/mscms/liblcms.c | 26 ++------------------------ 1 file changed, 2 insertions(+), 24 deletions(-) diff --git a/dlls/mscms/liblcms.c b/dlls/mscms/liblcms.c index 5dbfc463522..5710fc49b75 100644 --- a/dlls/mscms/liblcms.c +++ b/dlls/mscms/liblcms.c @@ -123,36 +123,14 @@ static BOOL CDECL lcms_translate_bits( void *transform, void *srcbits, BMFORMAT return TRUE; } -static int lcms_offsetof_type( COLORTYPE type ) -{ - switch (type) - { - case COLOR_GRAY: return offsetof(COLOR, gray); - case COLOR_RGB: return offsetof(COLOR, rgb); - case COLOR_CMYK: return offsetof(COLOR, cmyk); - case COLOR_XYZ: return offsetof(COLOR, XYZ); - case COLOR_3_CHANNEL: return offsetof(COLOR, gen3ch); - case COLOR_Lab: return offsetof(COLOR, Lab); - default: break; - } - return -1; -} - static BOOL CDECL lcms_translate_colors( void *transform, COLOR *in, DWORD count, COLORTYPE input_type, COLOR *out, COLORTYPE output_type ) { unsigned int i; - int input_field_offset = lcms_offsetof_type( input_type ); - int output_field_offset = lcms_offsetof_type( output_type ); if (!cmsChangeBuffersFormat( transform, from_type(input_type), from_type(output_type) )) return FALSE; - if (input_field_offset == -1 || output_field_offset == -1) - { - FIXME("unhandled input/output pair: %d/%d\n", input_type, output_type); - return FALSE; - } - for (i = 0; i < count; i++) - cmsDoTransform( transform, (char*)&in[i] + input_field_offset, (char*)&out[i] + output_field_offset, 1 ); + + for (i = 0; i < count; i++) cmsDoTransform( transform, &in[i], &out[i], 1 ); return TRUE; } -- 2.30.2

1 0

[PATCH v2 2/3] mscms: Eliminate duplicate code.
by Hans Leidekker March 22, 2021

March 22, 2021

From: Lauri Kenttä <lauri.kentta(a)gmail.com> v2: Add default case in switch statement. No need to use nested switch statements for all COLORTYPE pairs, since they are all symmetrically either supported or not. Calculate COLOR member offset with offsetof and use that in a single loop to avoid duplicate code. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/mscms/liblcms.c | 85 ++++++++++++-------------------------------- 1 file changed, 23 insertions(+), 62 deletions(-) diff --git a/dlls/mscms/liblcms.c b/dlls/mscms/liblcms.c index 04fae980d26..5dbfc463522 100644 --- a/dlls/mscms/liblcms.c +++ b/dlls/mscms/liblcms.c @@ -123,76 +123,37 @@ static BOOL CDECL lcms_translate_bits( void *transform, void *srcbits, BMFORMAT return TRUE; } +static int lcms_offsetof_type( COLORTYPE type ) +{ + switch (type) + { + case COLOR_GRAY: return offsetof(COLOR, gray); + case COLOR_RGB: return offsetof(COLOR, rgb); + case COLOR_CMYK: return offsetof(COLOR, cmyk); + case COLOR_XYZ: return offsetof(COLOR, XYZ); + case COLOR_3_CHANNEL: return offsetof(COLOR, gen3ch); + case COLOR_Lab: return offsetof(COLOR, Lab); + default: break; + } + return -1; +} + static BOOL CDECL lcms_translate_colors( void *transform, COLOR *in, DWORD count, COLORTYPE input_type, COLOR *out, COLORTYPE output_type ) { unsigned int i; + int input_field_offset = lcms_offsetof_type( input_type ); + int output_field_offset = lcms_offsetof_type( output_type ); if (!cmsChangeBuffersFormat( transform, from_type(input_type), from_type(output_type) )) return FALSE; - - switch (input_type) + if (input_field_offset == -1 || output_field_offset == -1) { - case COLOR_RGB: - switch (output_type) - { - case COLOR_RGB: for (i = 0; i < count; i++) cmsDoTransform( transform, &in[i].rgb, &out[i].rgb, 1 ); return TRUE; - case COLOR_Lab: for (i = 0; i < count; i++) cmsDoTransform( transform, &in[i].rgb, &out[i].Lab, 1 ); return TRUE; - case COLOR_GRAY: for (i = 0; i < count; i++) cmsDoTransform( transform, &in[i].rgb, &out[i].gray, 1 ); return TRUE; - case COLOR_CMYK: for (i = 0; i < count; i++) cmsDoTransform( transform, &in[i].rgb, &out[i].cmyk, 1 ); return TRUE; - case COLOR_XYZ: for (i = 0; i < count; i++) cmsDoTransform( transform, &in[i].rgb, &out[i].XYZ, 1 ); return TRUE; - default: break; - } - break; - case COLOR_Lab: - switch (output_type) - { - case COLOR_RGB: for (i = 0; i < count; i++) cmsDoTransform( transform, &in[i].Lab, &out[i].rgb, 1 ); return TRUE; - case COLOR_Lab: for (i = 0; i < count; i++) cmsDoTransform( transform, &in[i].Lab, &out[i].Lab, 1 ); return TRUE; - case COLOR_GRAY: for (i = 0; i < count; i++) cmsDoTransform( transform, &in[i].Lab, &out[i].gray, 1 ); return TRUE; - case COLOR_CMYK: for (i = 0; i < count; i++) cmsDoTransform( transform, &in[i].Lab, &out[i].cmyk, 1 ); return TRUE; - case COLOR_XYZ: for (i = 0; i < count; i++) cmsDoTransform( transform, &in[i].Lab, &out[i].XYZ, 1 ); return TRUE; - default: break; - } - break; - case COLOR_GRAY: - switch (output_type) - { - case COLOR_RGB: for (i = 0; i < count; i++) cmsDoTransform( transform, &in[i].gray, &out[i].rgb, 1 ); return TRUE; - case COLOR_Lab: for (i = 0; i < count; i++) cmsDoTransform( transform, &in[i].gray, &out[i].Lab, 1 ); return TRUE; - case COLOR_GRAY: for (i = 0; i < count; i++) cmsDoTransform( transform, &in[i].gray, &out[i].gray, 1 ); return TRUE; - case COLOR_CMYK: for (i = 0; i < count; i++) cmsDoTransform( transform, &in[i].gray, &out[i].cmyk, 1 ); return TRUE; - case COLOR_XYZ: for (i = 0; i < count; i++) cmsDoTransform( transform, &in[i].gray, &out[i].XYZ, 1 ); return TRUE; - default: break; - } - break; - case COLOR_CMYK: - switch (output_type) - { - case COLOR_RGB: for (i = 0; i < count; i++) cmsDoTransform( transform, &in[i].cmyk, &out[i].rgb, 1 ); return TRUE; - case COLOR_Lab: for (i = 0; i < count; i++) cmsDoTransform( transform, &in[i].cmyk, &out[i].Lab, 1 ); return TRUE; - case COLOR_GRAY: for (i = 0; i < count; i++) cmsDoTransform( transform, &in[i].cmyk, &out[i].gray, 1 ); return TRUE; - case COLOR_CMYK: for (i = 0; i < count; i++) cmsDoTransform( transform, &in[i].cmyk, &out[i].cmyk, 1 ); return TRUE; - case COLOR_XYZ: for (i = 0; i < count; i++) cmsDoTransform( transform, &in[i].cmyk, &out[i].XYZ, 1 ); return TRUE; - case COLOR_3_CHANNEL: for (i = 0; i < count; i++) cmsDoTransform( transform, &in[i].cmyk, &out[i].gen3ch, 1 ); return TRUE; - default: break; - } - break; - case COLOR_XYZ: - switch (output_type) - { - case COLOR_RGB: for (i = 0; i < count; i++) cmsDoTransform( transform, &in[i].XYZ, &out[i].rgb, 1 ); return TRUE; - case COLOR_Lab: for (i = 0; i < count; i++) cmsDoTransform( transform, &in[i].XYZ, &out[i].Lab, 1 ); return TRUE; - case COLOR_GRAY: for (i = 0; i < count; i++) cmsDoTransform( transform, &in[i].XYZ, &out[i].gray, 1 ); return TRUE; - case COLOR_CMYK: for (i = 0; i < count; i++) cmsDoTransform( transform, &in[i].XYZ, &out[i].cmyk, 1 ); return TRUE; - case COLOR_XYZ: for (i = 0; i < count; i++) cmsDoTransform( transform, &in[i].XYZ, &out[i].XYZ, 1 ); return TRUE; - default: break; - } - break; - default: - break; + FIXME("unhandled input/output pair: %d/%d\n", input_type, output_type); + return FALSE; } - FIXME("unhandled input/output pair: %d/%d\n", input_type, output_type); - return FALSE; + for (i = 0; i < count; i++) + cmsDoTransform( transform, (char*)&in[i] + input_field_offset, (char*)&out[i] + output_field_offset, 1 ); + return TRUE; } static void CDECL lcms_close_transform( void *transform ) -- 2.30.2

1 0

[PATCH v2 1/3] mscms: Support COLOR_CMYK to COLOR_3_CHANNEL translation.
by Hans Leidekker March 22, 2021

March 22, 2021

From: Lauri Kenttä <lauri.kentta(a)gmail.com> It doesn't seem to matter whether COLOR_3_CHANNEL is mapped to TYPE_RGB or TYPE_CMY, so I've left it as TYPE_RGB as is the default. This makes Purple Pen orienteering map app usable (colors, not B/W). Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/mscms/liblcms.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mscms/liblcms.c b/dlls/mscms/liblcms.c index 1f43c359c4a..04fae980d26 100644 --- a/dlls/mscms/liblcms.c +++ b/dlls/mscms/liblcms.c @@ -173,6 +173,7 @@ static BOOL CDECL lcms_translate_colors( void *transform, COLOR *in, DWORD count case COLOR_GRAY: for (i = 0; i < count; i++) cmsDoTransform( transform, &in[i].cmyk, &out[i].gray, 1 ); return TRUE; case COLOR_CMYK: for (i = 0; i < count; i++) cmsDoTransform( transform, &in[i].cmyk, &out[i].cmyk, 1 ); return TRUE; case COLOR_XYZ: for (i = 0; i < count; i++) cmsDoTransform( transform, &in[i].cmyk, &out[i].XYZ, 1 ); return TRUE; + case COLOR_3_CHANNEL: for (i = 0; i < count; i++) cmsDoTransform( transform, &in[i].cmyk, &out[i].gen3ch, 1 ); return TRUE; default: break; } break; -- 2.30.2

1 0

[PATCH] dwrite: Return complete outline data from freetype integration code.
by Nikolay Sivov March 22, 2021

March 22, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- It makes it possible to cache outlines in directwrite format, that always differs at least because of Y axis direction transformation. At the same time user callbacks are not longer called from freetype integration code, which is important for splitting the library. dlls/dwrite/dwrite_private.h | 33 +++++++++- dlls/dwrite/font.c | 71 +++++++++++++++++++- dlls/dwrite/freetype.c | 123 +++++++++++++++++++---------------- 3 files changed, 168 insertions(+), 59 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index fe1a16c8899..47be661555c 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -457,14 +457,43 @@ struct dwrite_glyphbitmap DWRITE_MATRIX *m; }; +enum dwrite_outline_tags +{ + OUTLINE_BEGIN_FIGURE, + OUTLINE_END_FIGURE, + OUTLINE_LINE, + OUTLINE_BEZIER, +}; + +struct dwrite_outline +{ + struct + { + unsigned char *values; + size_t count; + size_t size; + } tags; + + struct + { + D2D1_POINT_2F *values; + size_t count; + size_t size; + } points; +}; + +extern int dwrite_outline_push_tag(struct dwrite_outline *outline, unsigned char tag) DECLSPEC_HIDDEN; +extern int dwrite_outline_push_points(struct dwrite_outline *outline, const D2D1_POINT_2F *points, + unsigned int count) DECLSPEC_HIDDEN; + extern BOOL init_freetype(void) DECLSPEC_HIDDEN; extern void release_freetype(void) DECLSPEC_HIDDEN; extern HRESULT freetype_get_design_glyph_metrics(struct dwrite_fontface *fontface, UINT16 glyph, DWRITE_GLYPH_METRICS *metrics) DECLSPEC_HIDDEN; extern void freetype_notify_cacheremove(IDWriteFontFace5 *fontface) DECLSPEC_HIDDEN; -extern HRESULT freetype_get_glyph_outline(IDWriteFontFace5 *fontface, float emSize, UINT16 glyph, - D2D1_POINT_2F origin, IDWriteGeometrySink *sink) DECLSPEC_HIDDEN; +extern int freetype_get_glyph_outline(IDWriteFontFace5 *fontface, float emSize, UINT16 glyph, + struct dwrite_outline *outline) DECLSPEC_HIDDEN; extern UINT16 freetype_get_glyphcount(IDWriteFontFace5 *fontface) DECLSPEC_HIDDEN; extern void freetype_get_glyph_bbox(struct dwrite_glyphbitmap *bitmap_desc) DECLSPEC_HIDDEN; extern BOOL freetype_get_glyph_bitmap(struct dwrite_glyphbitmap*) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 0167878e912..4c62f2a0e37 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -823,13 +823,50 @@ static void WINAPI dwritefontface_ReleaseFontTable(IDWriteFontFace5 *iface, void IDWriteFontFileStream_ReleaseFileFragment(fontface->stream, table_context); } +int dwrite_outline_push_tag(struct dwrite_outline *outline, unsigned char tag) +{ + if (!dwrite_array_reserve((void **)&outline->tags.values, &outline->tags.size, outline->tags.count + 1, + sizeof(*outline->tags.values))) + { + return 1; + } + + outline->tags.values[outline->tags.count++] = tag; + + return 0; +} + +int dwrite_outline_push_points(struct dwrite_outline *outline, const D2D1_POINT_2F *points, unsigned int count) +{ + if (!dwrite_array_reserve((void **)&outline->points.values, &outline->points.size, outline->points.count + count, + sizeof(*outline->points.values))) + { + return 1; + } + + memcpy(&outline->points.values[outline->points.count], points, sizeof(*points) * count); + outline->points.count += count; + + return 0; +} + +static void apply_outline_point_offset(const D2D1_POINT_2F *src, const D2D1_POINT_2F *offset, + D2D1_POINT_2F *dst) +{ + dst->x = src->x + offset->x; + dst->y = src->y + offset->y; +} + static HRESULT WINAPI dwritefontface_GetGlyphRunOutline(IDWriteFontFace5 *iface, FLOAT emSize, UINT16 const *glyphs, FLOAT const* advances, DWRITE_GLYPH_OFFSET const *offsets, UINT32 count, BOOL is_sideways, BOOL is_rtl, IDWriteGeometrySink *sink) { D2D1_POINT_2F *origins, baseline_origin = { 0 }; + struct dwrite_outline outline = { 0 }; + D2D1_BEZIER_SEGMENT segment; + D2D1_POINT_2F point; DWRITE_GLYPH_RUN run; - unsigned int i; + unsigned int i, j, p; HRESULT hr; TRACE("%p, %.8e, %p, %p, %p, %u, %d, %d, %p.\n", iface, emSize, glyphs, advances, offsets, @@ -863,10 +900,40 @@ static HRESULT WINAPI dwritefontface_GetGlyphRunOutline(IDWriteFontFace5 *iface, for (i = 0; i < count; ++i) { - if (FAILED(hr = freetype_get_glyph_outline(iface, emSize, glyphs[i], origins[i], sink))) + outline.tags.count = outline.points.count = 0; + if (freetype_get_glyph_outline(iface, emSize, glyphs[i], &outline)) + { WARN("Failed to get glyph outline for glyph %u.\n", glyphs[i]); + continue; + } + + for (j = 0, p = 0; j < outline.tags.count; ++j) + { + switch (outline.tags.values[j]) + { + case OUTLINE_BEGIN_FIGURE: + apply_outline_point_offset(&outline.points.values[p++], &origins[i], &point); + ID2D1SimplifiedGeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_FILLED); + break; + case OUTLINE_END_FIGURE: + ID2D1SimplifiedGeometrySink_EndFigure(sink, D2D1_FIGURE_END_CLOSED); + break; + case OUTLINE_LINE: + apply_outline_point_offset(&outline.points.values[p++], &origins[i], &point); + ID2D1SimplifiedGeometrySink_AddLines(sink, &point, 1); + break; + case OUTLINE_BEZIER: + apply_outline_point_offset(&outline.points.values[p++], &origins[i], &segment.point1); + apply_outline_point_offset(&outline.points.values[p++], &origins[i], &segment.point2); + apply_outline_point_offset(&outline.points.values[p++], &origins[i], &segment.point3); + ID2D1SimplifiedGeometrySink_AddBeziers(sink, &segment, 1); + break; + } + } } + heap_free(outline.tags.values); + heap_free(outline.points.values); heap_free(origins); return S_OK; diff --git a/dlls/dwrite/freetype.c b/dlls/dwrite/freetype.c index 83b2ae1bc88..9e4001d11c2 100644 --- a/dlls/dwrite/freetype.c +++ b/dlls/dwrite/freetype.c @@ -296,40 +296,46 @@ HRESULT freetype_get_design_glyph_metrics(struct dwrite_fontface *fontface, UINT return S_OK; } -struct decompose_context { - IDWriteGeometrySink *sink; - D2D1_POINT_2F offset; +struct decompose_context +{ + struct dwrite_outline *outline; BOOL figure_started; BOOL move_to; /* last call was 'move_to' */ FT_Vector origin; /* 'pen' position from last call */ }; -static inline void ft_vector_to_d2d_point(const FT_Vector *v, D2D1_POINT_2F offset, D2D1_POINT_2F *p) +static inline void ft_vector_to_d2d_point(const FT_Vector *v, D2D1_POINT_2F *p) { - p->x = (v->x / 64.0f) + offset.x; - p->y = (v->y / 64.0f) + offset.y; + p->x = v->x / 64.0f; + p->y = v->y / 64.0f; } -static void decompose_beginfigure(struct decompose_context *ctxt) +static int decompose_beginfigure(struct decompose_context *ctxt) { D2D1_POINT_2F point; + int ret; if (!ctxt->move_to) - return; + return 0; - ft_vector_to_d2d_point(&ctxt->origin, ctxt->offset, &point); - ID2D1SimplifiedGeometrySink_BeginFigure(ctxt->sink, point, D2D1_FIGURE_BEGIN_FILLED); + ft_vector_to_d2d_point(&ctxt->origin, &point); + if ((ret = dwrite_outline_push_tag(ctxt->outline, OUTLINE_BEGIN_FIGURE))) return ret; + if ((ret = dwrite_outline_push_points(ctxt->outline, &point, 1))) return ret; ctxt->figure_started = TRUE; ctxt->move_to = FALSE; + + return 0; } static int decompose_move_to(const FT_Vector *to, void *user) { - struct decompose_context *ctxt = (struct decompose_context*)user; + struct decompose_context *ctxt = (struct decompose_context *)user; + int ret; - if (ctxt->figure_started) { - ID2D1SimplifiedGeometrySink_EndFigure(ctxt->sink, D2D1_FIGURE_END_CLOSED); + if (ctxt->figure_started) + { + if ((ret = dwrite_outline_push_tag(ctxt->outline, OUTLINE_END_FIGURE))) return ret; ctxt->figure_started = FALSE; } @@ -340,17 +346,19 @@ static int decompose_move_to(const FT_Vector *to, void *user) static int decompose_line_to(const FT_Vector *to, void *user) { - struct decompose_context *ctxt = (struct decompose_context*)user; + struct decompose_context *ctxt = (struct decompose_context *)user; D2D1_POINT_2F point; + int ret; /* Special case for empty contours, in a way freetype returns them. */ if (ctxt->move_to && !memcmp(to, &ctxt->origin, sizeof(*to))) return 0; - decompose_beginfigure(ctxt); + ft_vector_to_d2d_point(to, &point); - ft_vector_to_d2d_point(to, ctxt->offset, &point); - ID2D1SimplifiedGeometrySink_AddLines(ctxt->sink, &point, 1); + if ((ret = decompose_beginfigure(ctxt))) return ret; + if ((ret = dwrite_outline_push_points(ctxt->outline, &point, 1))) return ret; + if ((ret = dwrite_outline_push_tag(ctxt->outline, OUTLINE_LINE))) return ret; ctxt->origin = *to; return 0; @@ -358,11 +366,13 @@ static int decompose_line_to(const FT_Vector *to, void *user) static int decompose_conic_to(const FT_Vector *control, const FT_Vector *to, void *user) { - struct decompose_context *ctxt = (struct decompose_context*)user; + struct decompose_context *ctxt = (struct decompose_context *)user; D2D1_POINT_2F points[3]; FT_Vector cubic[3]; + int ret; - decompose_beginfigure(ctxt); + if ((ret = decompose_beginfigure(ctxt))) + return ret; /* convert from quadratic to cubic */ @@ -394,10 +404,11 @@ static int decompose_conic_to(const FT_Vector *control, const FT_Vector *to, voi cubic[1].y += (to->y + 1) / 3; cubic[2] = *to; - ft_vector_to_d2d_point(cubic, ctxt->offset, points); - ft_vector_to_d2d_point(cubic + 1, ctxt->offset, points + 1); - ft_vector_to_d2d_point(cubic + 2, ctxt->offset, points + 2); - ID2D1SimplifiedGeometrySink_AddBeziers(ctxt->sink, (D2D1_BEZIER_SEGMENT*)points, 1); + ft_vector_to_d2d_point(cubic, points); + ft_vector_to_d2d_point(cubic + 1, points + 1); + ft_vector_to_d2d_point(cubic + 2, points + 2); + if ((ret = dwrite_outline_push_points(ctxt->outline, points, 3))) return ret; + if ((ret = dwrite_outline_push_tag(ctxt->outline, OUTLINE_BEZIER))) return ret; ctxt->origin = *to; return 0; } @@ -405,22 +416,28 @@ static int decompose_conic_to(const FT_Vector *control, const FT_Vector *to, voi static int decompose_cubic_to(const FT_Vector *control1, const FT_Vector *control2, const FT_Vector *to, void *user) { - struct decompose_context *ctxt = (struct decompose_context*)user; + struct decompose_context *ctxt = (struct decompose_context *)user; D2D1_POINT_2F points[3]; + int ret; - decompose_beginfigure(ctxt); + if ((ret = decompose_beginfigure(ctxt))) + return ret; - ft_vector_to_d2d_point(control1, ctxt->offset, points); - ft_vector_to_d2d_point(control2, ctxt->offset, points + 1); - ft_vector_to_d2d_point(to, ctxt->offset, points + 2); - ID2D1SimplifiedGeometrySink_AddBeziers(ctxt->sink, (D2D1_BEZIER_SEGMENT*)points, 1); + ft_vector_to_d2d_point(control1, points); + ft_vector_to_d2d_point(control2, points + 1); + ft_vector_to_d2d_point(to, points + 2); ctxt->origin = *to; + + if ((ret = dwrite_outline_push_points(ctxt->outline, points, 3))) return ret; + if ((ret = dwrite_outline_push_tag(ctxt->outline, OUTLINE_BEZIER))) return ret; + return 0; } -static void decompose_outline(FT_Outline *outline, D2D1_POINT_2F offset, IDWriteGeometrySink *sink) +static int decompose_outline(FT_Outline *ft_outline, struct dwrite_outline *outline) { - static const FT_Outline_Funcs decompose_funcs = { + static const FT_Outline_Funcs decompose_funcs = + { decompose_move_to, decompose_line_to, decompose_conic_to, @@ -428,19 +445,17 @@ static void decompose_outline(FT_Outline *outline, D2D1_POINT_2F offset, IDWrite 0, 0 }; - struct decompose_context context; + struct decompose_context context = { 0 }; + int ret; - context.sink = sink; - context.offset = offset; - context.figure_started = FALSE; - context.move_to = FALSE; - context.origin.x = 0; - context.origin.y = 0; + context.outline = outline; - pFT_Outline_Decompose(outline, &decompose_funcs, &context); + ret = pFT_Outline_Decompose(ft_outline, &decompose_funcs, &context); - if (context.figure_started) - ID2D1SimplifiedGeometrySink_EndFigure(sink, D2D1_FIGURE_END_CLOSED); + if (!ret && context.figure_started) + ret = dwrite_outline_push_tag(outline, OUTLINE_END_FIGURE); + + return ret; } static void embolden_glyph_outline(FT_Outline *outline, FLOAT emsize) @@ -464,13 +479,13 @@ static void embolden_glyph(FT_Glyph glyph, FLOAT emsize) embolden_glyph_outline(&outline_glyph->outline, emsize); } -HRESULT freetype_get_glyph_outline(IDWriteFontFace5 *fontface, float emSize, UINT16 glyph, - D2D1_POINT_2F origin, IDWriteGeometrySink *sink) +int freetype_get_glyph_outline(IDWriteFontFace5 *fontface, float emSize, UINT16 glyph, + struct dwrite_outline *outline) { FTC_ScalerRec scaler; USHORT simulations; - HRESULT hr = S_OK; FT_Size size; + int ret; simulations = IDWriteFontFace5_GetSimulations(fontface); @@ -482,31 +497,29 @@ HRESULT freetype_get_glyph_outline(IDWriteFontFace5 *fontface, float emSize, UIN scaler.y_res = 0; EnterCriticalSection(&freetype_cs); - if (pFTC_Manager_LookupSize(cache_manager, &scaler, &size) == 0) + if (!(ret = pFTC_Manager_LookupSize(cache_manager, &scaler, &size))) { if (pFT_Load_Glyph(size->face, glyph, FT_LOAD_NO_BITMAP) == 0) { - FT_Outline *outline = &size->face->glyph->outline; + FT_Outline *ft_outline = &size->face->glyph->outline; FT_Matrix m; if (simulations & DWRITE_FONT_SIMULATIONS_BOLD) - embolden_glyph_outline(outline, emSize); + embolden_glyph_outline(ft_outline, emSize); m.xx = 1 << 16; m.xy = simulations & DWRITE_FONT_SIMULATIONS_OBLIQUE ? (1 << 16) / 3 : 0; m.yx = 0; m.yy = -(1 << 16); /* flip Y axis */ - pFT_Outline_Transform(outline, &m); + pFT_Outline_Transform(ft_outline, &m); - decompose_outline(outline, origin, sink); + ret = decompose_outline(ft_outline, outline); } } - else - hr = E_FAIL; LeaveCriticalSection(&freetype_cs); - return hr; + return ret; } UINT16 freetype_get_glyphcount(IDWriteFontFace5 *fontface) @@ -797,10 +810,10 @@ HRESULT freetype_get_design_glyph_metrics(struct dwrite_fontface *fontface, UINT return E_NOTIMPL; } -HRESULT freetype_get_glyph_outline(IDWriteFontFace5 *fontface, float emSize, UINT16 glyph, - D2D1_POINT_2F origin, IDWriteGeometrySink *sink) +int freetype_get_glyph_outline(IDWriteFontFace5 *fontface, float emSize, UINT16 glyph, + struct dwrite_outline *outline) { - return E_NOTIMPL; + return 1; } UINT16 freetype_get_glyphcount(IDWriteFontFace5 *fontface) -- 2.30.2

1 0

[PATCH] mfreadwrite/reader: Consider audio block alignment when creating output buffers for the decoder.
by Nikolay Sivov March 22, 2021

March 22, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- A fix from ec5bd49bf85606a7a4b1a5f4146fbaabf53c1256 applied to the Reader API. dlls/mfreadwrite/reader.c | 44 ++++++++++++++++++++++++++------------- 1 file changed, 29 insertions(+), 15 deletions(-) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index ab959c26165..cb4166265a0 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -105,11 +105,17 @@ enum media_stream_flags STREAM_FLAG_PRESENTED = 0x4, /* Set if stream was selected last time Start() was called. */ }; +struct stream_transform +{ + IMFTransform *transform; + unsigned int min_buffer_size; +}; + struct media_stream { IMFMediaStream *stream; IMFMediaType *current; - IMFTransform *decoder; + struct stream_transform decoder; IMFVideoSampleAllocatorEx *allocator; IMFVideoSampleAllocatorNotify notify_cb; unsigned int id; @@ -643,12 +649,13 @@ static HRESULT source_reader_pull_stream_samples(struct source_reader *reader, s { MFT_OUTPUT_STREAM_INFO stream_info = { 0 }; MFT_OUTPUT_DATA_BUFFER out_buffer; + unsigned int buffer_size; IMFMediaBuffer *buffer; LONGLONG timestamp; DWORD status; HRESULT hr; - if (FAILED(hr = IMFTransform_GetOutputStreamInfo(stream->decoder, 0, &stream_info))) + if (FAILED(hr = IMFTransform_GetOutputStreamInfo(stream->decoder.transform, 0, &stream_info))) { WARN("Failed to get output stream info, hr %#x.\n", hr); return hr; @@ -663,7 +670,9 @@ static HRESULT source_reader_pull_stream_samples(struct source_reader *reader, s if (FAILED(hr = MFCreateSample(&out_buffer.pSample))) break; - if (FAILED(hr = MFCreateAlignedMemoryBuffer(stream_info.cbSize, stream_info.cbAlignment, &buffer))) + buffer_size = max(stream_info.cbSize, stream->decoder.min_buffer_size); + + if (FAILED(hr = MFCreateAlignedMemoryBuffer(buffer_size, stream_info.cbAlignment, &buffer))) { IMFSample_Release(out_buffer.pSample); break; @@ -673,7 +682,7 @@ static HRESULT source_reader_pull_stream_samples(struct source_reader *reader, s IMFMediaBuffer_Release(buffer); } - if (FAILED(hr = IMFTransform_ProcessOutput(stream->decoder, 0, 1, &out_buffer, &status))) + if (FAILED(hr = IMFTransform_ProcessOutput(stream->decoder.transform, 0, 1, &out_buffer, &status))) { if (out_buffer.pSample) IMFSample_Release(out_buffer.pSample); @@ -700,7 +709,7 @@ static HRESULT source_reader_process_sample(struct source_reader *reader, struct LONGLONG timestamp; HRESULT hr; - if (!stream->decoder) + if (!stream->decoder.transform) { timestamp = 0; if (FAILED(IMFSample_GetSampleTime(sample, &timestamp))) @@ -715,7 +724,7 @@ static HRESULT source_reader_process_sample(struct source_reader *reader, struct hr = source_reader_pull_stream_samples(reader, stream); if (hr == MF_E_TRANSFORM_NEED_MORE_INPUT) { - if (FAILED(hr = IMFTransform_ProcessInput(stream->decoder, 0, sample, 0))) + if (FAILED(hr = IMFTransform_ProcessInput(stream->decoder.transform, 0, sample, 0))) { WARN("Transform failed to process input, hr %#x.\n", hr); return hr; @@ -812,7 +821,7 @@ static HRESULT source_reader_media_stream_state_handler(struct source_reader *re stream->state = STREAM_STATE_EOS; stream->flags &= ~STREAM_FLAG_SAMPLE_REQUESTED; - if (stream->decoder && SUCCEEDED(IMFTransform_ProcessMessage(stream->decoder, + if (stream->decoder.transform && SUCCEEDED(IMFTransform_ProcessMessage(stream->decoder.transform, MFT_MESSAGE_COMMAND_DRAIN, 0))) { if ((hr = source_reader_pull_stream_samples(reader, stream)) != MF_E_TRANSFORM_NEED_MORE_INPUT) @@ -1161,8 +1170,8 @@ static void source_reader_flush_stream(struct source_reader *reader, DWORD strea struct media_stream *stream = &reader->streams[stream_index]; source_reader_release_responses(reader, stream); - if (stream->decoder) - IMFTransform_ProcessMessage(stream->decoder, MFT_MESSAGE_COMMAND_FLUSH, 0); + if (stream->decoder.transform) + IMFTransform_ProcessMessage(stream->decoder.transform, MFT_MESSAGE_COMMAND_FLUSH, 0); stream->requests = 0; } @@ -1378,8 +1387,8 @@ static ULONG WINAPI src_reader_Release(IMFSourceReader *iface) IMFMediaStream_Release(stream->stream); if (stream->current) IMFMediaType_Release(stream->current); - if (stream->decoder) - IMFTransform_Release(stream->decoder); + if (stream->decoder.transform) + IMFTransform_Release(stream->decoder.transform); if (stream->allocator) IMFVideoSampleAllocatorEx_Release(stream->allocator); } @@ -1672,8 +1681,10 @@ static HRESULT source_reader_configure_decoder(struct source_reader *reader, DWO IMFMediaType *input_type, IMFMediaType *output_type) { IMFMediaTypeHandler *type_handler; + unsigned int block_alignment = 0; IMFTransform *transform = NULL; IMFMediaType *type = NULL; + GUID major = { 0 }; DWORD flags; HRESULT hr; int i = 0; @@ -1710,12 +1721,15 @@ static HRESULT source_reader_configure_decoder(struct source_reader *reader, DWO if (FAILED(hr = IMFMediaType_CopyAllItems(type, (IMFAttributes *)reader->streams[index].current))) WARN("Failed to copy attributes, hr %#x.\n", hr); + if (SUCCEEDED(IMFMediaType_GetMajorType(type, &major)) && IsEqualGUID(&major, &MFMediaType_Audio)) + IMFMediaType_GetUINT32(type, &MF_MT_AUDIO_BLOCK_ALIGNMENT, &block_alignment); IMFMediaType_Release(type); - if (reader->streams[index].decoder) - IMFTransform_Release(reader->streams[index].decoder); + if (reader->streams[index].decoder.transform) + IMFTransform_Release(reader->streams[index].decoder.transform); - reader->streams[index].decoder = transform; + reader->streams[index].decoder.transform = transform; + reader->streams[index].decoder.min_buffer_size = block_alignment; return S_OK; } @@ -2082,7 +2096,7 @@ static HRESULT WINAPI src_reader_GetServiceForStream(IMFSourceReader *iface, DWO hr = MF_E_INVALIDSTREAMNUMBER; else { - obj = (IUnknown *)reader->streams[index].decoder; + obj = (IUnknown *)reader->streams[index].decoder.transform; if (!obj) hr = E_NOINTERFACE; } break; -- 2.30.2

1 0

[PATCH 1/3] wtsapi32: Avoid calling GetUserNameW() twice in WTSQuerySessionInformationW(WTSUserName).
by Gijs Vermeulen March 21, 2021

March 21, 2021

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/wtsapi32/wtsapi32.c | 40 ++++++++++++++++------------------------ 1 file changed, 16 insertions(+), 24 deletions(-) diff --git a/dlls/wtsapi32/wtsapi32.c b/dlls/wtsapi32/wtsapi32.c index ef3e0d10a0f..ae7a6c195f8 100644 --- a/dlls/wtsapi32/wtsapi32.c +++ b/dlls/wtsapi32/wtsapi32.c @@ -20,6 +20,7 @@ #include "windef.h" #include "winbase.h" #include "winnls.h" +#include "lmcons.h" #include "wtsapi32.h" #include "wine/debug.h" #include "wine/heap.h" @@ -330,41 +331,32 @@ BOOL WINAPI WTSQuerySessionInformationA(HANDLE server, DWORD session_id, WTS_INF /************************************************************ * WTSQuerySessionInformationW (WTSAPI32.@) */ -BOOL WINAPI WTSQuerySessionInformationW( - HANDLE hServer, - DWORD SessionId, - WTS_INFO_CLASS WTSInfoClass, - LPWSTR* Buffer, - DWORD* BytesReturned) +BOOL WINAPI WTSQuerySessionInformationW(HANDLE server, DWORD session_id, WTS_INFO_CLASS class, WCHAR **buffer, DWORD *count) { - /* FIXME: Forward request to winsta.dll::WinStationQueryInformationW */ - FIXME("Stub %p 0x%08x %d %p %p\n", hServer, SessionId, WTSInfoClass, - Buffer, BytesReturned); + TRACE("%p 0x%08x %d %p %p\n", server, session_id, class, buffer, count); - if (!Buffer || !BytesReturned) + if (!buffer || !count) { SetLastError(ERROR_INVALID_USER_BUFFER); return FALSE; } - if (WTSInfoClass == WTSUserName) + if (class == WTSUserName) { + DWORD size = UNLEN + 1; WCHAR *username; - DWORD count = 0; - - GetUserNameW(NULL, &count); - if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) return FALSE; - if (!(username = heap_alloc(count * sizeof(WCHAR)))) return FALSE; - GetUserNameW(username, &count); - *Buffer = username; - *BytesReturned = count * sizeof(WCHAR); + + if (!(username = heap_alloc(size * sizeof(WCHAR)))) return FALSE; + GetUserNameW(username, &size); + *buffer = username; + *count = size * sizeof(WCHAR); return TRUE; } - else - { - *Buffer = NULL; - *BytesReturned = 0; - } + + FIXME("Unimplemented class %d\n", class); + + *buffer = NULL; + *count = 0; return FALSE; } -- 2.31.0

1 2

[PATCH vkd3d 1/3] vkd3d-shader: Get rid of a spurious '\n' in a HLSL compiler message.
by Matteo Bruni March 21, 2021

March 21, 2021

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index afac0ab..4769475 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -755,7 +755,7 @@ static struct list *gen_struct_fields(struct hlsl_ctx *ctx, struct hlsl_type *ty field->semantic = v->semantic; if (v->initializer.args_count) { - hlsl_error(ctx, v->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_SYNTAX, "Illegal initializer on a struct field.\n"); + hlsl_error(ctx, v->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_SYNTAX, "Illegal initializer on a struct field."); free_parse_initializer(&v->initializer); } list_add_tail(list, &field->entry); -- 2.26.2

5 7

[tools] testbot/LogUtils: Don't expect CVS revisions on the test report start lines.
by Francois Gouget March 21, 2021

March 21, 2021

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/LogUtils.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 903afe495..5f7046c13 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -543,7 +543,7 @@ sub ParseWineTestReport($$$) chomp $Line; $Line =~ s/\r+$//; - if ($Line =~ m%^([_.a-z0-9-]+):([_a-z0-9]*) (start|skipped) (?:-|[/_.a-z0-9-]+) (?:-|[.0-9a-f]+)$%) + if ($Line =~ m%^([_.a-z0-9-]+):([_a-z0-9]*) (start|skipped) (?:-|[/_.a-z0-9-]+)%) { my ($Dll, $Unit, $Type) = ($1, $2, $3); -- 2.20.1

1 0

[PATCH 1/4] gdiplus/metafile: Implement DrawEllipse() recording.
by Nikolay Sivov March 21, 2021

March 21, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/gdiplus/gdiplus_private.h | 1 + dlls/gdiplus/graphics.c | 10 ++++++ dlls/gdiplus/metafile.c | 34 ++++++++++++++++++++ dlls/gdiplus/tests/metafile.c | 58 ++++++++++++++++++++++++++++++++++ 4 files changed, 103 insertions(+) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 4bca5b13be9..0b6dfb69b07 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -110,6 +110,7 @@ extern GpStatus METAFILE_DrawDriverString(GpMetafile *metafile, GDIPCONST UINT16 extern GpStatus METAFILE_FillRegion(GpMetafile* metafile, GpBrush* brush, GpRegion* region) DECLSPEC_HIDDEN; extern void METAFILE_Free(GpMetafile *metafile) DECLSPEC_HIDDEN; +extern GpStatus METAFILE_DrawEllipse(GpMetafile *metafile, GpPen *pen, GpRectF *rect) DECLSPEC_HIDDEN; extern void calc_curve_bezier(const GpPointF *pts, REAL tension, REAL *x1, REAL *y1, REAL *x2, REAL *y2) DECLSPEC_HIDDEN; diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 7b4794e3620..b2d0e6bf59b 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2906,6 +2906,7 @@ GpStatus WINGDIPAPI GdipDrawEllipse(GpGraphics *graphics, GpPen *pen, REAL x, { GpPath *path; GpStatus status; + GpRectF rect; TRACE("(%p, %p, %.2f, %.2f, %.2f, %.2f)\n", graphics, pen, x, y, width, height); @@ -2915,6 +2916,15 @@ GpStatus WINGDIPAPI GdipDrawEllipse(GpGraphics *graphics, GpPen *pen, REAL x, if(graphics->busy) return ObjectBusy; + if (graphics->image && graphics->image->type == ImageTypeMetafile) + { + rect.X = x; + rect.Y = y; + rect.Width = width; + rect.Height = height; + return METAFILE_DrawEllipse((GpMetafile *)graphics->image, pen, &rect); + } + status = GdipCreatePath(FillModeAlternate, &path); if (status != Ok) return status; diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 5ff6b113c3d..3e7853ecd50 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -4774,6 +4774,40 @@ GpStatus METAFILE_DrawPath(GpMetafile *metafile, GpPen *pen, GpPath *path) return Ok; } +GpStatus METAFILE_DrawEllipse(GpMetafile *metafile, GpPen *pen, GpRectF *rect) +{ + EmfPlusDrawEllipse *record; + GpStatus stat; + DWORD pen_id; + + if (metafile->metafile_type == MetafileTypeEmf) + { + FIXME("stub!\n"); + return NotImplemented; + } + + stat = METAFILE_AddPenObject(metafile, pen, &pen_id); + if (stat != Ok) return stat; + + stat = METAFILE_AllocateRecord(metafile, sizeof(EmfPlusDrawEllipse), (void **)&record); + if (stat != Ok) return stat; + record->Header.Type = EmfPlusRecordTypeDrawEllipse; + record->Header.Flags = pen_id; + if (is_integer_rect(rect)) + { + record->Header.Flags |= 0x4000; + record->RectData.rect.X = (SHORT)rect->X; + record->RectData.rect.Y = (SHORT)rect->Y; + record->RectData.rect.Width = (SHORT)rect->Width; + record->RectData.rect.Height = (SHORT)rect->Height; + } + else + memcpy(&record->RectData.rectF, rect, sizeof(*rect)); + + METAFILE_WriteRecords(metafile); + return Ok; +} + GpStatus METAFILE_FillPath(GpMetafile *metafile, GpBrush *brush, GpPath *path) { EmfPlusFillPath *fill_path_record; diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index 60659bf3119..fede802b675 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -3536,6 +3536,63 @@ static void test_printer_dc(void) GdipDisposeImage((GpImage *)metafile); } +static const emfplus_record draw_ellipse_records[] = +{ + { EMR_HEADER }, + { EmfPlusRecordTypeHeader }, + { EmfPlusRecordTypeObject, ObjectTypePen << 8 }, + { EmfPlusRecordTypeDrawEllipse, 0x4000 }, + { EMR_SAVEDC, 0, 1 }, + { EMR_SETICMMODE, 0, 1 }, + { EMR_BITBLT, 0, 1 }, + { EMR_RESTOREDC, 0, 1 }, + { EmfPlusRecordTypeEndOfFile }, + { EMR_EOF }, + { 0 } +}; + +static void test_drawellipse(void) +{ + static const GpRectF frame = { 0.0f, 0.0f, 100.0f, 100.0f }; + + GpMetafile *metafile; + GpGraphics *graphics; + HENHMETAFILE hemf; + GpStatus stat; + GpPen *pen; + HDC hdc; + + hdc = CreateCompatibleDC(0); + stat = GdipRecordMetafile(hdc, EmfTypeEmfPlusOnly, &frame, MetafileFrameUnitPixel, description, &metafile); + expect(Ok, stat); + DeleteDC(hdc); + + stat = GdipGetImageGraphicsContext((GpImage *)metafile, &graphics); + expect(Ok, stat); + + stat = GdipCreatePen1((ARGB)0xffff00ff, 10.0f, UnitPixel, &pen); + expect(Ok, stat); + + stat = GdipDrawEllipse(graphics, pen, 1.0f, 1.0f, 16.0f, 32.0f); + expect(Ok, stat); + + stat = GdipDeletePen(pen); + expect(Ok, stat); + + stat = GdipDeleteGraphics(graphics); + expect(Ok, stat); + sync_metafile(&metafile, "draw_ellipse.emf"); + + stat = GdipGetHemfFromMetafile(metafile, &hemf); + expect(Ok, stat); + + check_emfplus(hemf, draw_ellipse_records, "draw ellipse"); + DeleteEnhMetaFile(hemf); + + stat = GdipDisposeImage((GpImage*)metafile); + expect(Ok, stat); +} + START_TEST(metafile) { struct GdiplusStartupInput gdiplusStartupInput; @@ -3590,6 +3647,7 @@ START_TEST(metafile) test_fillregion(); test_lineargradient(); test_printer_dc(); + test_drawellipse(); GdiplusShutdown(gdiplusToken); } -- 2.30.2

2 7

[PATCH v2 1/3] include: Add xact2wb.h
by Vijay Kiran Kamuju March 21, 2021

March 21, 2021

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- include/Makefile.in | 1 + include/xact2wb.h | 149 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 150 insertions(+) create mode 100644 include/xact2wb.h diff --git a/include/Makefile.in b/include/Makefile.in index b2c8ba7f987..2c32c9b5863 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -812,6 +812,7 @@ SOURCES = \ wuapi.idl \ x3daudio.h \ xact3.h \ + xact2wb.h \ xact3wb.h \ xapo.idl \ xapofx.h \ diff --git a/include/xact2wb.h b/include/xact2wb.h new file mode 100644 index 00000000000..2bdc7f5c0dd --- /dev/null +++ b/include/xact2wb.h @@ -0,0 +1,149 @@ +/* + * Copyright (c) 2020 Vijay Kiran Kamuju + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#ifndef __XACT2WB_H__ +#define __XACT2WB_H__ + +#include <pshpack1.h> + +typedef DWORD WAVEBANKOFFSET; + +#define WAVEBANK_HEADER_SIGNATURE 0x444e4257 /* DNBW */ +#define WAVEBANK_HEADER_VERSION 42 +#define WAVEBANK_BANKNAME_LENGTH 64 +#define WAVEBANK_ENTRYNAME_LENGTH 64 + +#define WAVEBANK_TYPE_BUFFER 0x00000000 +#define WAVEBANK_TYPE_STREAMING 0x00000001 +#define WAVEBANK_TYPE_MASK 0x00000001 + +#define WAVEBANK_FLAGS_ENTRYNAMES 0x00010000 +#define WAVEBANK_FLAGS_COMPACT 0x00020000 +#define WAVEBANK_FLAGS_SYNC_DISABLED 0x00040000 +#define WAVEBANK_FLAGS_SEEKTABLES 0x00080000 +#define WAVEBANK_FLAGS_MASK 0x000f0000 + +#define WAVEBANK_DVD_SECTOR_SIZE 2048 +#define WAVEBANK_DVD_BLOCK_SIZE (WAVEBANK_DVD_SECTOR_SIZE * 16) +#define WAVEBANK_ALIGNMENT_MIN 4 +#define WAVEBANK_ALIGNMENT_DVD WAVEBANK_DVD_SECTOR_SIZE + +typedef enum WAVEBANKSEGIDX +{ + WAVEBANK_SEGIDX_BANKDATA = 0, + WAVEBANK_SEGIDX_ENTRYMETADATA, + WAVEBANK_SEGIDX_SEEKTABLES, + WAVEBANK_SEGIDX_ENTRYNAMES, + WAVEBANK_SEGIDX_ENTRYWAVEDATA, + WAVEBANK_SEGIDX_COUNT +} WAVEBANKSEGIDX, *LPWAVEBANKSEGIDX; +typedef const WAVEBANKSEGIDX *LPCWAVEBANKSEGIDX; + +#define WAVEBANKMINIFORMAT_TAG_PCM 0x0 +#define WAVEBANKMINIFORMAT_TAG_XMA 0x1 +#define WAVEBANKMINIFORMAT_TAG_ADPCM 0x2 + +#define WAVEBANKMINIFORMAT_BITDEPTH_8 0x0 +#define WAVEBANKMINIFORMAT_BITDEPTH_16 0x1 + +typedef union WAVEBANKMINIWAVEFORMAT +{ + struct + { + DWORD wFormatTag : 2; + DWORD nChannels : 3; + DWORD nSamplesPerSec : 18; + DWORD wBlockAlign : 8; + DWORD wBitsPerSample : 1; + } DUMMYSTRUCTNAME; + DWORD dwValue; +} WAVEBANKMINIWAVEFORMAT, *LPWAVEBANKMINIWAVEFORMAT; +typedef const WAVEBANKMINIWAVEFORMAT *LPCWAVEBANKMINIWAVEFORMAT; + +typedef struct WAVEBANKREGION +{ + DWORD dwOffset; + DWORD dwLength; +} WAVEBANKREGION, *LPWAVEBANKREGION; +typedef const WAVEBANKREGION *LPCWAVEBANKREGION; + +typedef struct WAVEBANKSAMPLEREGION +{ + DWORD dwStartSample; + DWORD dwTotalSamples; +} WAVEBANKSAMPLEREGION, *LPWAVEBANKSAMPLEREGION; +typedef const WAVEBANKSAMPLEREGION *LPCWAVEBANKSAMPLEREGION; + +typedef struct WAVEBANKHEADER +{ + DWORD dwSignature; + DWORD dwVersion; + DWORD dwHeaderVersion; + WAVEBANKREGION Segments[WAVEBANK_SEGIDX_COUNT]; +} WAVEBANKHEADER, *LPWAVEBANKHEADER; +typedef const WAVEBANKHEADER *LPCWAVEBANKHEADER; + +#define WAVEBANKENTRY_XMASTREAMS_MAX 3 +#define WAVEBANKENTRY_XMACHANNELS_MAX 6 + +#define WAVEBANKENTRY_FLAGS_READAHEAD 0x00000001 +#define WAVEBANKENTRY_FLAGS_LOOPCACHE 0x00000002 +#define WAVEBANKENTRY_FLAGS_REMOVELOOPTAIL 0x00000004 +#define WAVEBANKENTRY_FLAGS_IGNORELOOP 0x00000008 +#define WAVEBANKENTRY_FLAGS_MASK 0x00000008 + +typedef struct WAVEBANKENTRY +{ + union + { + struct + { + DWORD dwFlags : 4; + DWORD Duration : 28; + } DUMMYSTRUCTNAME; + DWORD dwFlagsAndDuration; + } DUMMYUNIONNAME; + + WAVEBANKMINIWAVEFORMAT Format; + WAVEBANKREGION PlayRegion; + WAVEBANKSAMPLEREGION LoopRegion; +} WAVEBANKENTRY, *LPWAVEBANKENTRY; +typedef const WAVEBANKENTRY *LPCWAVEBANKENTRY; + +typedef struct WAVEBANKENTRYCOMPACT +{ + DWORD dwOffset : 21; + DWORD dwLengthDeviation : 11; +} WAVEBANKENTRYCOMPACT, *LPWAVEBANKENTRYCOMPACT; +typedef const WAVEBANKENTRYCOMPACT *LPCWAVEBANKENTRYCOMPACT; + +typedef struct WAVEBANKDATA +{ + DWORD dwFlags; + DWORD dwEntryCount; + CHAR szBankName[WAVEBANK_BANKNAME_LENGTH]; + DWORD dwEntryMetaDataElementSize; + DWORD dwEntryNameElementSize; + DWORD dwAlignment; + WAVEBANKMINIWAVEFORMAT CompactFormat; + FILETIME BuildTime; +} WAVEBANKDATA, *LPWAVEBANKDATA; +typedef const WAVEBANKDATA *LPCWAVEBANKDATA; + +#include <poppack.h> + +#endif /* __XACT2WB_H__ */ -- 2.29.2

1 2