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

[PATCH 3/3] wineps.drv: PostScript header should be written by StartDoc instead of StartPage.
by Dmitry Timoshkov 13 Feb '19

13 Feb '19

Otherwise a being created file has wrong signature if an application directly injects PostScript code. This patch fixes printing from Adobe PageMaker. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/gdi32/tests/dc.c | 1 - dlls/wineps.drv/escape.c | 18 ++++++++++++++---- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 82cf200f4c..2d9ef1dd88 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -1433,7 +1433,6 @@ static void print_something(HDC hdc) while (*p == '\r' || *p == '\n') p++; } -todo_wine ok(p && !memcmp(p, psadobe, sizeof(psadobe)), "wrong signature: %.14s\n", p ? p : buf); DeleteFileA(file_name); diff --git a/dlls/wineps.drv/escape.c b/dlls/wineps.drv/escape.c index db73c057ef..12967223ff 100644 --- a/dlls/wineps.drv/escape.c +++ b/dlls/wineps.drv/escape.c @@ -412,15 +412,14 @@ INT PSDRV_StartPage( PHYSDEV dev ) { PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); + TRACE("%p\n", dev->hdc); + if(!physDev->job.OutOfPage) { FIXME("Already started a page?\n"); return 1; } - if(physDev->job.PageNo++ == 0) { - if(!PSDRV_WriteHeader( dev, physDev->job.doc_name )) - return 0; - } + physDev->job.PageNo++; if(!PSDRV_WriteNewPage( dev )) return 0; @@ -436,6 +435,8 @@ INT PSDRV_EndPage( PHYSDEV dev ) { PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); + TRACE("%p\n", dev->hdc); + if(physDev->job.OutOfPage) { FIXME("Already ended a page?\n"); return 1; @@ -498,6 +499,13 @@ INT PSDRV_StartDoc( PHYSDEV dev, const DOCINFOW *doc ) ClosePrinter(physDev->job.hprinter); return 0; } + + if (!PSDRV_WriteHeader( dev, doc->lpszDocName )) { + WARN("Failed to write header\n"); + ClosePrinter(physDev->job.hprinter); + return 0; + } + physDev->job.banding = FALSE; physDev->job.OutOfPage = TRUE; physDev->job.PageNo = 0; @@ -516,6 +524,8 @@ INT PSDRV_EndDoc( PHYSDEV dev ) PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); INT ret = 1; + TRACE("%p\n", dev->hdc); + if(!physDev->job.id) { FIXME("hJob == 0. Now what?\n"); return 0; -- 2.20.1

1 0

[PATCH 1/3] wineps.drv: Add stubs for escapes required by Adobe PageMaker.
by Dmitry Timoshkov 13 Feb '19

13 Feb '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/gdi32/tests/dc.c | 7 ------- dlls/wineps.drv/escape.c | 41 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 3179c97e46..82cf200f4c 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -1402,9 +1402,7 @@ static void print_something(HDC hdc) strcpy(buf, "deadbeef"); ret = ExtEscape(hdc, DOWNLOADHEADER, 0, NULL, sizeof(buf), buf ); -todo_wine ok(ret == 1, "DOWNLOADHEADER failed\n"); -todo_wine ok(strcmp(buf, "deadbeef") != 0, "DOWNLOADHEADER failed\n"); strcpy(buf + 2, "\n% ===> after DOWNLOADHEADER <===\n"); @@ -1464,22 +1462,18 @@ static void test_pscript_printer_dc(void) query = DOWNLOADFACE; ret = Escape(hdc, QUERYESCSUPPORT, sizeof(query), (LPCSTR)&query, NULL); -todo_wine ok(ret == 1, "DOWNLOADFACE is not supported\n"); query = OPENCHANNEL; ret = Escape(hdc, QUERYESCSUPPORT, sizeof(query), (LPCSTR)&query, NULL); -todo_wine ok(ret == 1, "OPENCHANNEL is not supported\n"); query = DOWNLOADHEADER; ret = Escape(hdc, QUERYESCSUPPORT, sizeof(query), (LPCSTR)&query, NULL); -todo_wine ok(ret == 1, "DOWNLOADHEADER is not supported\n"); query = CLOSECHANNEL; ret = Escape(hdc, QUERYESCSUPPORT, sizeof(query), (LPCSTR)&query, NULL); -todo_wine ok(ret == 1, "CLOSECHANNEL is not supported\n"); query = POSTSCRIPT_PASSTHROUGH; @@ -1487,7 +1481,6 @@ todo_wine ok(ret == 1, "POSTSCRIPT_PASSTHROUGH is not supported\n"); ret = ExtEscape(hdc, GETFACENAME, 0, NULL, sizeof(buf), buf); -todo_wine ok(ret == 1, "GETFACENAME failed\n"); trace("face name: %s\n", buf); diff --git a/dlls/wineps.drv/escape.c b/dlls/wineps.drv/escape.c index 43bbe18bb5..44d790b298 100644 --- a/dlls/wineps.drv/escape.c +++ b/dlls/wineps.drv/escape.c @@ -97,14 +97,55 @@ INT PSDRV_ExtEscape( PHYSDEV dev, INT nEscape, INT cbInput, LPCVOID in_data, case CLIP_TO_PATH: case END_PATH: /*case DRAWPATTERNRECT:*/ + + /* PageMaker checks for it */ + case DOWNLOADHEADER: + + /* PageMaker doesn't check for DOWNLOADFACE and GETFACENAME but + * uses them, they are supposed to be supported by any PS printer. + */ + case DOWNLOADFACE: + + /* PageMaker checks for these as a part of process of detecting + * a "fully compatible" PS printer, but doesn't actually use them. + */ + case OPENCHANNEL: + case CLOSECHANNEL: return TRUE; + /* Windows PS driver reports 0, but still supports this escape */ + case GETFACENAME: + return FALSE; /* suppress the FIXME below */ + default: FIXME("QUERYESCSUPPORT(%d) - not supported.\n", num); return FALSE; } } + case OPENCHANNEL: + FIXME("OPENCHANNEL: stub\n"); + return 1; + + case CLOSECHANNEL: + FIXME("CLOSECHANNEL: stub\n"); + return 1; + + case DOWNLOADHEADER: + FIXME("DOWNLOADHEADER: stub\n"); + /* should return name of the downloaded procset */ + *(char *)out_data = 0; + return 1; + + case GETFACENAME: + FIXME("GETFACENAME: stub\n"); + lstrcpynA(out_data, "Courier", cbOutput); + return 1; + + case DOWNLOADFACE: + FIXME("DOWNLOADFACE: stub\n"); + return 1; + case MFCOMMENT: { FIXME("MFCOMMENT(%p, %d)\n", in_data, cbInput); -- 2.20.1

1 0

[PATCH] xmllite/tests: Test complete writer output for UTF-16 case.
by Nikolay Sivov 13 Feb '19

13 Feb '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/xmllite/tests/writer.c | 37 ++++++++++++------------------------- 1 file changed, 12 insertions(+), 25 deletions(-) diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index 1c6689a00d..13d67becbe 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -49,16 +49,18 @@ static void check_output_raw(IStream *stream, const void *expected, SIZE_T size, SIZE_T content_size; HGLOBAL hglobal; HRESULT hr; - char *ptr; + WCHAR *ptr; hr = GetHGlobalFromStream(stream, &hglobal); ok_(__FILE__, line)(hr == S_OK, "Failed to get the stream handle, hr %#x.\n", hr); content_size = GlobalSize(hglobal); - ok_(__FILE__, line)(size <= content_size, "Unexpected test output size.\n"); + ok_(__FILE__, line)(size == content_size, "Unexpected test output size %ld.\n", content_size); ptr = GlobalLock(hglobal); if (size <= content_size) ok_(__FILE__, line)(!memcmp(expected, ptr, size), "Unexpected output content.\n"); + if (size != content_size && *ptr == 0xfeff) + ok_(__FILE__, line)(0, "Content: %s.\n", wine_dbgstr_wn(ptr, content_size / sizeof(WCHAR))); GlobalUnlock(hglobal); } @@ -719,11 +721,14 @@ static void test_omitxmldeclaration(void) static void test_bom(void) { + static const WCHAR piW[] = {0xfeff,'<','?','x','m','l',' ','v','e','r','s','i','o','n','=','"','1','.','0','"','?','>'}; + static const WCHAR aopenW[] = {0xfeff,'<','a'}; + static const WCHAR afullW[] = {0xfeff,'<','a',' ','/','>'}; static const WCHAR versionW[] = {'v','e','r','s','i','o','n','=','"','1','.','0','"',0}; static const WCHAR utf16W[] = {'u','t','f','-','1','6',0}; static const WCHAR xmlW[] = {'x','m','l',0}; + static const WCHAR bomW[] = {0xfeff}; IXmlWriterOutput *output; - unsigned char *ptr; IXmlWriter *writer; IStream *stream; HGLOBAL hglobal; @@ -750,12 +755,7 @@ static void test_bom(void) hr = IXmlWriter_Flush(writer); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = GetHGlobalFromStream(stream, &hglobal); - ok(hr == S_OK, "got 0x%08x\n", hr); - - ptr = GlobalLock(hglobal); - ok(ptr[0] == 0xff && ptr[1] == 0xfe, "got %x,%x\n", ptr[0], ptr[1]); - GlobalUnlock(hglobal); + CHECK_OUTPUT_RAW(stream, bomW, sizeof(bomW)); IStream_Release(stream); IUnknown_Release(output); @@ -776,12 +776,7 @@ static void test_bom(void) hr = IXmlWriter_Flush(writer); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = GetHGlobalFromStream(stream, &hglobal); - ok(hr == S_OK, "got 0x%08x\n", hr); - - ptr = GlobalLock(hglobal); - ok(ptr[0] == 0xff && ptr[1] == 0xfe, "got %x,%x\n", ptr[0], ptr[1]); - GlobalUnlock(hglobal); + CHECK_OUTPUT_RAW(stream, piW, sizeof(piW)); IUnknown_Release(output); IStream_Release(stream); @@ -802,12 +797,7 @@ static void test_bom(void) hr = IXmlWriter_Flush(writer); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = GetHGlobalFromStream(stream, &hglobal); - ok(hr == S_OK, "got 0x%08x\n", hr); - - ptr = GlobalLock(hglobal); - ok(ptr[0] == 0xff && ptr[1] == 0xfe, "got %x,%x\n", ptr[0], ptr[1]); - GlobalUnlock(hglobal); + CHECK_OUTPUT_RAW(stream, aopenW, sizeof(aopenW)); IUnknown_Release(output); IStream_Release(stream); @@ -833,10 +823,7 @@ static void test_bom(void) hr = GetHGlobalFromStream(stream, &hglobal); ok(hr == S_OK, "got 0x%08x\n", hr); - ptr = GlobalLock(hglobal); - ok(ptr[0] == 0xff && ptr[1] == 0xfe && ptr[2] == '<', "Unexpected output: %#x,%#x,%#x\n", - ptr[0], ptr[1], ptr[2]); - GlobalUnlock(hglobal); + CHECK_OUTPUT_RAW(stream, afullW, sizeof(afullW)); IUnknown_Release(output); IStream_Release(stream); -- 2.20.1

1 0

[PATCH] dwrite: Use more appropriate allocation helpers.
by Nikolay Sivov 13 Feb '19

13 Feb '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/analyzer.c | 20 ++++++++++---------- dlls/dwrite/bidi.c | 2 +- dlls/dwrite/font.c | 22 +++++++++++----------- dlls/dwrite/layout.c | 32 ++++++++++++++++---------------- dlls/dwrite/main.c | 7 ++++--- 5 files changed, 42 insertions(+), 41 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 0d8305dbef..ca6dca1e4d 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -448,7 +448,7 @@ static HRESULT analyze_linebreaks(const WCHAR *text, UINT32 count, DWRITE_LINE_B short *break_class; int i, j; - break_class = heap_alloc(count*sizeof(short)); + break_class = heap_calloc(count, sizeof(*break_class)); if (!break_class) return E_OUTOFMEMORY; @@ -937,8 +937,8 @@ static HRESULT WINAPI dwritetextanalyzer_AnalyzeBidi(IDWriteTextAnalyzer2 *iface if (FAILED(hr)) return hr; - levels = heap_alloc(length*sizeof(*levels)); - explicit = heap_alloc(length*sizeof(*explicit)); + levels = heap_calloc(length, sizeof(*levels)); + explicit = heap_calloc(length, sizeof(*explicit)); if (!levels || !explicit) { hr = E_OUTOFMEMORY; @@ -1013,7 +1013,7 @@ static HRESULT WINAPI dwritetextanalyzer_AnalyzeLineBreakpoints(IDWriteTextAnaly if (len < length) { UINT32 read; - buff = heap_alloc(length*sizeof(WCHAR)); + buff = heap_calloc(length, sizeof(*buff)); if (!buff) return E_OUTOFMEMORY; memcpy(buff, text, len*sizeof(WCHAR)); @@ -1032,7 +1032,7 @@ static HRESULT WINAPI dwritetextanalyzer_AnalyzeLineBreakpoints(IDWriteTextAnaly text = buff; } - breakpoints = heap_alloc(length*sizeof(*breakpoints)); + breakpoints = heap_calloc(length, sizeof(*breakpoints)); if (!breakpoints) { hr = E_OUTOFMEMORY; goto done; @@ -1176,7 +1176,7 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphs(IDWriteTextAnalyzer2 *iface, if (max_glyph_count < length) return E_NOT_SUFFICIENT_BUFFER; - string = heap_alloc(sizeof(WCHAR)*length); + string = heap_calloc(length, sizeof(*string)); if (!string) return E_OUTOFMEMORY; @@ -1432,7 +1432,7 @@ static HRESULT apply_cluster_spacing(float leading_spacing, float trailing_spaci break; } - deltas = heap_alloc((end - start + 1) * sizeof(*deltas)); + deltas = heap_calloc(end - start + 1, sizeof(*deltas)); if (!deltas) return E_OUTOFMEMORY; @@ -1677,7 +1677,7 @@ static HRESULT WINAPI dwritetextanalyzer1_GetTextComplexity(IDWriteTextAnalyzer2 /* fetch indices */ if (*is_simple && indices) { - UINT32 *codepoints = heap_alloc(*len_read*sizeof(UINT32)); + UINT32 *codepoints = heap_calloc(*len_read, sizeof(*codepoints)); if (!codepoints) return E_OUTOFMEMORY; @@ -2305,7 +2305,7 @@ static HRESULT WINAPI fontfallbackbuilder_AddMapping(IDWriteFontFallbackBuilder struct fallback_mapping *mappings; if (fallbackbuilder->mappings_capacity == 0) { - if ((mappings = heap_alloc(sizeof(*fallbackbuilder->mappings) * 16))) + if ((mappings = heap_calloc(16, sizeof(*mappings)))) fallbackbuilder->mappings_capacity = 16; } else { @@ -2321,7 +2321,7 @@ static HRESULT WINAPI fontfallbackbuilder_AddMapping(IDWriteFontFallbackBuilder mapping = &fallbackbuilder->mappings[fallbackbuilder->mappings_count++]; - mapping->ranges = heap_alloc(sizeof(*mapping->ranges) * ranges_count); + mapping->ranges = heap_calloc(ranges_count, sizeof(*mapping->ranges)); memcpy(mapping->ranges, ranges, sizeof(*mapping->ranges) * ranges_count); mapping->ranges_count = ranges_count; mapping->families = heap_alloc_zero(sizeof(*mapping->families) * families_count); diff --git a/dlls/dwrite/bidi.c b/dlls/dwrite/bidi.c index d4ee2ca0f7..1369316d22 100644 --- a/dlls/dwrite/bidi.c +++ b/dlls/dwrite/bidi.c @@ -964,7 +964,7 @@ static HRESULT bidi_compute_isolating_runs_set(UINT8 baselevel, UINT8 *classes, HRESULT hr = S_OK; Run *runs; - runs = heap_alloc(count * sizeof(Run)); + runs = heap_calloc(count, sizeof(*runs)); if (!runs) return E_OUTOFMEMORY; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index f50133d18c..948c1dfa05 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -2227,7 +2227,7 @@ static HRESULT WINAPI dwritefontfamily_GetMatchingFonts(IDWriteFontFamily1 *ifac return E_OUTOFMEMORY; /* Allocate as many as family has, not all of them will be necessary used. */ - fonts->fonts = heap_alloc(sizeof(*fonts->fonts) * This->data->font_count); + fonts->fonts = heap_calloc(This->data->font_count, sizeof(*fonts->fonts)); if (!fonts->fonts) { heap_free(fonts); return E_OUTOFMEMORY; @@ -2718,7 +2718,7 @@ static HRESULT init_font_collection(struct dwrite_fontcollection *collection, BO collection->ref = 1; collection->family_count = 0; collection->family_alloc = is_system ? 30 : 5; - collection->family_data = heap_alloc(sizeof(*collection->family_data) * collection->family_alloc); + collection->family_data = heap_calloc(collection->family_alloc, sizeof(*collection->family_data)); if (!collection->family_data) return E_OUTOFMEMORY; @@ -3567,7 +3567,7 @@ static HRESULT init_fontfamily_data(IDWriteLocalizedStrings *familyname, struct data->has_oblique_face = 0; data->has_italic_face = 0; - data->fonts = heap_alloc(sizeof(*data->fonts)*data->font_alloc); + data->fonts = heap_calloc(data->font_alloc, sizeof(*data->fonts)); if (!data->fonts) { heap_free(data); return E_OUTOFMEMORY; @@ -5475,8 +5475,8 @@ HRESULT create_glyphrunanalysis(const struct glyphrunanalysis_desc *desc, IDWrit SetRectEmpty(&analysis->bounds); analysis->run = *desc->run; IDWriteFontFace_AddRef(analysis->run.fontFace); - analysis->glyphs = heap_alloc(desc->run->glyphCount * sizeof(*analysis->glyphs)); - analysis->origins = heap_alloc(desc->run->glyphCount * sizeof(*analysis->origins)); + analysis->glyphs = heap_calloc(desc->run->glyphCount, sizeof(*analysis->glyphs)); + analysis->origins = heap_calloc(desc->run->glyphCount, sizeof(*analysis->origins)); if (!analysis->glyphs || !analysis->origins) { heap_free(analysis->glyphs); @@ -5814,12 +5814,12 @@ HRESULT create_colorglyphenum(float originX, float originY, const DWRITE_GLYPH_R return DWRITE_E_NOCOLOR; } - colorglyphenum->advances = heap_alloc(run->glyphCount * sizeof(FLOAT)); - colorglyphenum->color_advances = heap_alloc(run->glyphCount * sizeof(FLOAT)); - colorglyphenum->glyphindices = heap_alloc(run->glyphCount * sizeof(UINT16)); + colorglyphenum->advances = heap_calloc(run->glyphCount, sizeof(*colorglyphenum->advances)); + colorglyphenum->color_advances = heap_calloc(run->glyphCount, sizeof(*colorglyphenum->color_advances)); + colorglyphenum->glyphindices = heap_calloc(run->glyphCount, sizeof(*colorglyphenum->glyphindices)); if (run->glyphOffsets) { - colorglyphenum->offsets = heap_alloc(run->glyphCount * sizeof(*colorglyphenum->offsets)); - colorglyphenum->color_offsets = heap_alloc(run->glyphCount * sizeof(*colorglyphenum->color_offsets)); + colorglyphenum->offsets = heap_calloc(run->glyphCount, sizeof(*colorglyphenum->offsets)); + colorglyphenum->color_offsets = heap_calloc(run->glyphCount, sizeof(*colorglyphenum->color_offsets)); memcpy(colorglyphenum->offsets, run->glyphOffsets, run->glyphCount * sizeof(*run->glyphOffsets)); } @@ -6311,7 +6311,7 @@ static HRESULT WINAPI inmemoryfontfileloader_CreateInMemoryFontFileReference(IDW } else { loader->capacity = 16; - loader->streams = heap_alloc(loader->capacity * sizeof(*loader->streams)); + loader->streams = heap_calloc(loader->capacity, sizeof(*loader->streams)); } } diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index f27fe9fbec..de79fd4c7f 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -594,7 +594,7 @@ static HRESULT layout_update_breakpoints_range(struct dwrite_textlayout *layout, after = before = DWRITE_BREAK_CONDITION_NEUTRAL; if (!layout->actual_breakpoints) { - layout->actual_breakpoints = heap_alloc(sizeof(DWRITE_LINE_BREAKPOINT)*layout->len); + layout->actual_breakpoints = heap_calloc(layout->len, sizeof(*layout->actual_breakpoints)); if (!layout->actual_breakpoints) return E_OUTOFMEMORY; memcpy(layout->actual_breakpoints, layout->nominal_breakpoints, sizeof(DWRITE_LINE_BREAKPOINT)*layout->len); @@ -933,15 +933,15 @@ static HRESULT layout_shape_run(struct dwrite_textlayout *layout, struct regular range = get_layout_range_by_pos(layout, run->descr.textPosition); run->descr.localeName = range->locale; - run->clustermap = heap_alloc(run->descr.stringLength * sizeof(*run->clustermap)); + run->clustermap = heap_calloc(run->descr.stringLength, sizeof(*run->clustermap)); max_count = 3 * run->descr.stringLength / 2 + 16; - run->glyphs = heap_alloc(max_count * sizeof(*run->glyphs)); + run->glyphs = heap_calloc(max_count, sizeof(*run->glyphs)); if (!run->clustermap || !run->glyphs) return E_OUTOFMEMORY; - text_props = heap_alloc(run->descr.stringLength * sizeof(*text_props)); - glyph_props = heap_alloc(max_count * sizeof(*glyph_props)); + text_props = heap_calloc(run->descr.stringLength, sizeof(*text_props)); + glyph_props = heap_calloc(max_count, sizeof(*glyph_props)); if (!text_props || !glyph_props) { heap_free(text_props); heap_free(glyph_props); @@ -960,8 +960,8 @@ static HRESULT layout_shape_run(struct dwrite_textlayout *layout, struct regular max_count = run->glyphcount; - run->glyphs = heap_alloc(max_count * sizeof(*run->glyphs)); - glyph_props = heap_alloc(max_count * sizeof(*glyph_props)); + run->glyphs = heap_calloc(max_count, sizeof(*run->glyphs)); + glyph_props = heap_calloc(max_count, sizeof(*glyph_props)); if (!run->glyphs || !glyph_props) { hr = E_OUTOFMEMORY; break; @@ -983,8 +983,8 @@ static HRESULT layout_shape_run(struct dwrite_textlayout *layout, struct regular run->run.glyphIndices = run->glyphs; run->descr.clusterMap = run->clustermap; - run->advances = heap_alloc(run->glyphcount * sizeof(*run->advances)); - run->offsets = heap_alloc(run->glyphcount * sizeof(*run->offsets)); + run->advances = heap_calloc(run->glyphcount, sizeof(*run->advances)); + run->offsets = heap_calloc(run->glyphcount, sizeof(*run->offsets)); if (!run->advances || !run->offsets) return E_OUTOFMEMORY; @@ -1034,8 +1034,8 @@ static HRESULT layout_compute_runs(struct dwrite_textlayout *layout) /* Cluster data arrays are allocated once, assuming one text position per cluster. */ if (!layout->clustermetrics && layout->len) { - layout->clustermetrics = heap_alloc(layout->len*sizeof(*layout->clustermetrics)); - layout->clusters = heap_alloc(layout->len*sizeof(*layout->clusters)); + layout->clustermetrics = heap_calloc(layout->len, sizeof(*layout->clustermetrics)); + layout->clusters = heap_calloc(layout->len, sizeof(*layout->clusters)); if (!layout->clustermetrics || !layout->clusters) { heap_free(layout->clustermetrics); heap_free(layout->clusters); @@ -1122,7 +1122,7 @@ static HRESULT layout_compute(struct dwrite_textlayout *layout) if (!layout->nominal_breakpoints) { IDWriteTextAnalyzer *analyzer; - layout->nominal_breakpoints = heap_alloc(layout->len * sizeof(*layout->nominal_breakpoints)); + layout->nominal_breakpoints = heap_calloc(layout->len, sizeof(*layout->nominal_breakpoints)); if (!layout->nominal_breakpoints) return E_OUTOFMEMORY; @@ -1291,7 +1291,7 @@ static HRESULT layout_add_effective_run(struct dwrite_textlayout *layout, const length = layout->clusters[last_cluster].position - layout->clusters[first_cluster].position + layout->clustermetrics[last_cluster].length; - run->clustermap = heap_alloc(sizeof(UINT16)*length); + run->clustermap = heap_calloc(length, sizeof(*run->clustermap)); if (!run->clustermap) { heap_free(run); return E_OUTOFMEMORY; @@ -1386,8 +1386,8 @@ static HRESULT layout_set_line_metrics(struct dwrite_textlayout *layout, DWRITE_ if (!layout->line_alloc) { layout->line_alloc = 5; - layout->linemetrics = heap_alloc(layout->line_alloc * sizeof(*layout->linemetrics)); - layout->lines = heap_alloc(layout->line_alloc * sizeof(*layout->lines)); + layout->linemetrics = heap_calloc(layout->line_alloc, sizeof(*layout->linemetrics)); + layout->lines = heap_calloc(layout->line_alloc, sizeof(*layout->lines)); if (!layout->linemetrics || !layout->lines) { heap_free(layout->linemetrics); heap_free(layout->lines); @@ -5787,7 +5787,7 @@ HRESULT create_typography(IDWriteTypography **ret) typography->allocated = 2; typography->count = 0; - typography->features = heap_alloc(typography->allocated*sizeof(DWRITE_FONT_FEATURE)); + typography->features = heap_calloc(typography->allocated, sizeof(*typography->features)); if (!typography->features) { heap_free(typography); return E_OUTOFMEMORY; diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 522bac84fe..1816fbc8f1 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -483,13 +483,14 @@ HRESULT clone_localizedstring(IDWriteLocalizedStrings *iface, IDWriteLocalizedSt return S_FALSE; strings = impl_from_IDWriteLocalizedStrings(iface); - strings_clone = heap_alloc(sizeof(struct localizedstrings)); - if (!strings_clone) return E_OUTOFMEMORY; + strings_clone = heap_alloc(sizeof(*strings_clone)); + if (!strings_clone) + return E_OUTOFMEMORY; strings_clone->IDWriteLocalizedStrings_iface.lpVtbl = &localizedstringsvtbl; strings_clone->ref = 1; strings_clone->count = strings->count; - strings_clone->data = heap_alloc(sizeof(struct localizedpair) * strings_clone->count); + strings_clone->data = heap_calloc(strings_clone->count, sizeof(*strings_clone->data)); if (!strings_clone->data) { heap_free(strings_clone); return E_OUTOFMEMORY; -- 2.20.1

1 0

[PATCH] [setupapi] Add stub for CM_Get_Sibling
by Vijay Kiran Kamuju 13 Feb '19

13 Feb '19

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/setupapi/setupapi.spec | 2 +- dlls/setupapi/stubs.c | 10 ++++++++++ include/cfgmgr32.h | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 844bb21ecc..cea6daca3f 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -123,7 +123,7 @@ @ stub CM_Get_Res_Des_Data_Ex @ stub CM_Get_Res_Des_Data_Size @ stub CM_Get_Res_Des_Data_Size_Ex -@ stub CM_Get_Sibling +@ stdcall CM_Get_Sibling(ptr long long) @ stdcall CM_Get_Sibling_Ex(ptr long long ptr) @ stdcall CM_Get_Version() @ stub CM_Get_Version_Ex diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index 61ce005212..abc0faadb8 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -500,6 +500,16 @@ CONFIGRET WINAPI CM_Get_Class_Registry_PropertyW(LPGUID class, ULONG prop, PULON return CR_FAILURE; } +/*********************************************************************** + * CM_Get_Sibling (SETUPAPI.@) + */ +CONFIGRET WINAPI CM_Get_Sibling_Ex( + PDEVINST pdnDevInst, DEVINST DevInst, ULONG ulFlags) +{ + FIXME("%p 0x%08x 0x%08x: stub\n", pdnDevInst, DevInst, ulFlags); + return CR_FAILURE; +} + /*********************************************************************** * CM_Get_Sibling_Ex (SETUPAPI.@) */ diff --git a/include/cfgmgr32.h b/include/cfgmgr32.h index b8def604aa..d32a518551 100644 --- a/include/cfgmgr32.h +++ b/include/cfgmgr32.h @@ -205,6 +205,7 @@ CMAPI CONFIGRET WINAPI CM_Get_Device_ID_List_ExW(PCWSTR,PWCHAR,ULONG,ULONG,HMACH #define CM_Get_Device_ID_List_Ex WINELIB_NAME_AW(CM_Get_Device_ID_List_Ex) CMAPI CONFIGRET WINAPI CM_Get_Device_ID_Size(PULONG,DEVINST,ULONG); CMAPI CONFIGRET WINAPI CM_Get_Device_ID_Size_Ex(PULONG,DEVINST,ULONG,HMACHINE); +CMAPI CONFIGRET WINAPI CM_Get_Sibling(PDEVINST pdnDevInst, DEVINST DevInst, ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Get_Sibling_Ex(PDEVINST pdnDevInst, DEVINST DevInst, ULONG ulFlags, HMACHINE hMachine); CMAPI WORD WINAPI CM_Get_Version(void); CMAPI CONFIGRET WINAPI CM_Locate_DevNodeA(PDEVINST,DEVINSTID_A,ULONG); -- 2.20.1

2 1

[crypt32] add CMSG_SIGNER_UNAUTH_ATTR_PARAM implementation
by Vijay Kiran Kamuju 13 Feb '19

13 Feb '19

fixes https://bugs.winehq.org/show_bug.cgi?id=37837

1 0

[PATCH] vbscript: Allow "Safe Keywords" to also be an id
by Brendan McGrath 13 Feb '19

13 Feb '19

"Safe Keywords" include: - Default - Error - Explicit - Property - Step Signed-off-by: Brendan McGrath <brendan(a)redmandi.com> --- This patch just addresses the "Safe Keywords" and not the keywords that can be used after a 'dot'. Therefore this does not address bug 46318. dlls/vbscript/lex.c | 10 ++++++---- dlls/vbscript/parser.y | 21 ++++++++++++--------- dlls/vbscript/tests/lang.vbs | 21 +++++++++++++++++++++ 3 files changed, 39 insertions(+), 13 deletions(-) diff --git a/dlls/vbscript/lex.c b/dlls/vbscript/lex.c index 571854db58..751fdb2aa5 100644 --- a/dlls/vbscript/lex.c +++ b/dlls/vbscript/lex.c @@ -156,7 +156,7 @@ static inline BOOL is_identifier_char(WCHAR c) return isalnumW(c) || c == '_'; } -static int check_keyword(parser_ctx_t *ctx, const WCHAR *word) +static int check_keyword(parser_ctx_t *ctx, const WCHAR *word, const WCHAR **lval) { const WCHAR *p1 = ctx->ptr; const WCHAR *p2 = word; @@ -173,18 +173,20 @@ static int check_keyword(parser_ctx_t *ctx, const WCHAR *word) if(*p2 || (p1 < ctx->end && is_identifier_char(*p1))) return 1; + if(lval) + *lval = word; ctx->ptr = p1; return 0; } -static int check_keywords(parser_ctx_t *ctx) +static int check_keywords(parser_ctx_t *ctx, const WCHAR **lval) { int min = 0, max = ARRAY_SIZE(keywords)-1, r, i; while(min <= max) { i = (min+max)/2; - r = check_keyword(ctx, keywords[i].word); + r = check_keyword(ctx, keywords[i].word, lval); if(!r) return keywords[i].token; @@ -412,7 +414,7 @@ static int parse_next_token(void *lval, parser_ctx_t *ctx) return parse_numeric_literal(ctx, lval); if(isalphaW(c)) { - int ret = check_keywords(ctx); + int ret = check_keywords(ctx, lval); if(!ret) return parse_identifier(ctx, lval); if(ret != tREM) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 020109998e..b81d791966 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -71,8 +71,6 @@ static class_decl_t *add_dim_prop(parser_ctx_t*,class_decl_t*,dim_decl_t*,unsign static statement_t *link_statements(statement_t*,statement_t*); -static const WCHAR propertyW[] = {'p','r','o','p','e','r','t','y',0}; - #define STORAGE_IS_PRIVATE 1 #define STORAGE_IS_DEFAULT 2 @@ -108,17 +106,18 @@ static const WCHAR propertyW[] = {'p','r','o','p','e','r','t','y',0}; %token tTRUE tFALSE %token tNOT tAND tOR tXOR tEQV tIMP tNEQ %token tIS tLTEQ tGTEQ tMOD -%token tCALL tDIM tSUB tFUNCTION tPROPERTY tGET tLET tCONST +%token tCALL tDIM tSUB tFUNCTION tGET tLET tCONST %token tIF tELSE tELSEIF tEND tTHEN tEXIT -%token tWHILE tWEND tDO tLOOP tUNTIL tFOR tTO tSTEP tEACH tIN +%token tWHILE tWEND tDO tLOOP tUNTIL tFOR tTO tEACH tIN %token tSELECT tCASE %token tBYREF tBYVAL -%token tOPTION tEXPLICIT +%token tOPTION %token tSTOP %token tNOTHING tEMPTY tNULL -%token tCLASS tSET tNEW tPUBLIC tPRIVATE tDEFAULT tME -%token tERROR tNEXT tON tRESUME tGOTO +%token tCLASS tSET tNEW tPUBLIC tPRIVATE tME +%token tNEXT tON tRESUME tGOTO %token <string> tIdentifier tString +%token <string> tDEFAULT tERROR tEXPLICIT tPROPERTY tSTEP %token <lng> tLong tShort %token <dbl> tDouble @@ -443,10 +442,14 @@ ArgumentDecl | tBYREF Identifier EmptyBrackets_opt { $$ = new_argument_decl(ctx, $2, TRUE); } | tBYVAL Identifier EmptyBrackets_opt { $$ = new_argument_decl(ctx, $2, FALSE); } -/* 'property' may be both keyword and identifier, depending on context */ +/* these keywords may also be an identifier, depending on context */ Identifier : tIdentifier { $$ = $1; } - | tPROPERTY { $$ = propertyW; } + | tDEFAULT { $$ = $1; } + | tERROR { $$ = $1; } + | tEXPLICIT { $$ = $1; } + | tPROPERTY { $$ = $1; } + | tSTEP { $$ = $1; } /* Most statements accept both new line and ':' as separators */ StSep diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 2af77bdfcc..515dad94c5 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -1345,4 +1345,25 @@ end class set x = new RegExp Call ok(x.Global = false, "x.Global = " & x.Global) +' test keywords that can also be a declared identifier +Dim default +default = "xx" +Call ok(default = "xx", "default = " & default & " expected ""xx""") + +Dim error +error = "xx" +Call ok(error = "xx", "error = " & error & " expected ""xx""") + +Dim explicit +explicit = "xx" +Call ok(explicit = "xx", "explicit = " & explicit & " expected ""xx""") + +Dim property +property = "xx" +Call ok(property = "xx", "property = " & property & " expected ""xx""") + +Dim step +step = "xx" +Call ok(step = "xx", "step = " & step & " expected ""xx""") + reportSuccess() -- 2.17.1

2 2

[PATCH v2] windowscodecs/tests: Add IWICBitmapEncoderInfo test
by Alistair Leslie-Hughes 13 Feb '19

13 Feb '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/windowscodecs/tests/converter.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index 1cfa29b..72b625d 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -1217,6 +1217,8 @@ static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* cls if (hglobal && SUCCEEDED(hr)) { + IWICBitmapEncoderInfo *info; + if (palette) { hr = IWICBitmapEncoder_SetPalette(encoder, palette); @@ -1233,6 +1235,20 @@ static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* cls hr = S_OK; } + hr = IWICBitmapEncoder_GetEncoderInfo(encoder, &info); + ok(hr == S_OK || hr == WINCODEC_ERR_COMPONENTNOTFOUND, "wrong error %#x\n", hr); + if (SUCCEEDED(hr)) + { + CLSID clsid; + + hr = IWICBitmapEncoderInfo_GetCLSID(info, &clsid); + ok(hr == S_OK, "wrong error %#x\n", hr); + ok(!IsEqualGUID(&clsid_encoder, &clsid), "wrong CLSID %s (%s)\n", + wine_dbgstr_guid(clsid_encoder), wine_dbgstr_guid(&clsid)); + + IWICBitmapEncoderInfo_Release(info); + } + i=0; while (SUCCEEDED(hr) && srcs[i]) { -- 1.9.1

2 3

[PATCH v2] wined3d: Correct indices for contained states in wined3d_stateblock_apply().
by Zebediah Figura 13 Feb '19

13 Feb '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/stateblock.c | 49 ++++++++++++++++++++++----------------- 1 file changed, 28 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 1ae0f35bff..fed32f2b9f 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1030,21 +1030,24 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock) /* Vertex Shader Constants. */ for (i = 0; i < stateblock->num_contained_vs_consts_f; ++i) { - state->vs_consts_f[i] = stateblock->stateblock_state.vs_consts_f[i]; - wined3d_device_set_vs_consts_f(device, stateblock->contained_vs_consts_f[i], - 1, &stateblock->stateblock_state.vs_consts_f[stateblock->contained_vs_consts_f[i]]); + unsigned int idx = stateblock->contained_vs_consts_f[i]; + + state->vs_consts_f[idx] = stateblock->stateblock_state.vs_consts_f[idx]; + wined3d_device_set_vs_consts_f(device, idx, 1, &stateblock->stateblock_state.vs_consts_f[idx]); } for (i = 0; i < stateblock->num_contained_vs_consts_i; ++i) { - state->vs_consts_i[i] = stateblock->stateblock_state.vs_consts_i[i]; - wined3d_device_set_vs_consts_i(device, stateblock->contained_vs_consts_i[i], - 1, &stateblock->stateblock_state.vs_consts_i[stateblock->contained_vs_consts_i[i]]); + unsigned int idx = stateblock->contained_vs_consts_i[i]; + + state->vs_consts_i[idx] = stateblock->stateblock_state.vs_consts_i[idx]; + wined3d_device_set_vs_consts_i(device, idx, 1, &stateblock->stateblock_state.vs_consts_i[idx]); } for (i = 0; i < stateblock->num_contained_vs_consts_b; ++i) { - state->vs_consts_b[i] = stateblock->stateblock_state.vs_consts_b[i]; - wined3d_device_set_vs_consts_b(device, stateblock->contained_vs_consts_b[i], - 1, &stateblock->stateblock_state.vs_consts_b[stateblock->contained_vs_consts_b[i]]); + unsigned int idx = stateblock->contained_vs_consts_b[i]; + + state->vs_consts_b[idx] = stateblock->stateblock_state.vs_consts_b[idx]; + wined3d_device_set_vs_consts_b(device, idx, 1, &stateblock->stateblock_state.vs_consts_b[idx]); } apply_lights(device, &stateblock->state); @@ -1062,29 +1065,33 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock) /* Pixel Shader Constants. */ for (i = 0; i < stateblock->num_contained_ps_consts_f; ++i) { - state->ps_consts_f[i] = stateblock->stateblock_state.ps_consts_f[i]; - wined3d_device_set_ps_consts_f(device, stateblock->contained_ps_consts_f[i], - 1, &stateblock->stateblock_state.ps_consts_f[stateblock->contained_ps_consts_f[i]]); + unsigned int idx = stateblock->contained_ps_consts_f[i]; + + state->ps_consts_f[idx] = stateblock->stateblock_state.ps_consts_f[idx]; + wined3d_device_set_ps_consts_f(device, idx, 1, &stateblock->stateblock_state.ps_consts_f[idx]); } for (i = 0; i < stateblock->num_contained_ps_consts_i; ++i) { - state->ps_consts_i[i] = stateblock->stateblock_state.ps_consts_i[i]; - wined3d_device_set_ps_consts_i(device, stateblock->contained_ps_consts_i[i], - 1, &stateblock->stateblock_state.ps_consts_i[stateblock->contained_ps_consts_i[i]]); + unsigned int idx = stateblock->contained_ps_consts_i[i]; + + state->ps_consts_i[idx] = stateblock->stateblock_state.ps_consts_i[idx]; + wined3d_device_set_ps_consts_i(device, idx, 1, &stateblock->stateblock_state.ps_consts_i[idx]); } for (i = 0; i < stateblock->num_contained_ps_consts_b; ++i) { - state->ps_consts_b[i] = stateblock->stateblock_state.ps_consts_b[i]; - wined3d_device_set_ps_consts_b(device, stateblock->contained_ps_consts_b[i], - 1, &stateblock->stateblock_state.ps_consts_b[stateblock->contained_ps_consts_b[i]]); + unsigned int idx = stateblock->contained_ps_consts_b[i]; + + state->ps_consts_b[idx] = stateblock->stateblock_state.ps_consts_b[idx]; + wined3d_device_set_ps_consts_b(device, idx, 1, &stateblock->stateblock_state.ps_consts_b[idx]); } /* Render states. */ for (i = 0; i < stateblock->num_contained_render_states; ++i) { - state->rs[i] = stateblock->stateblock_state.rs[i]; - wined3d_device_set_render_state(device, stateblock->contained_render_states[i], - stateblock->stateblock_state.rs[stateblock->contained_render_states[i]]); + enum wined3d_render_state rs = stateblock->contained_render_states[i]; + + state->rs[rs] = stateblock->stateblock_state.rs[rs]; + wined3d_device_set_render_state(device, rs, stateblock->stateblock_state.rs[rs]); } /* Texture states. */ -- 2.20.1

1 0

[PATCH] oleaut32/tests: Floating point numeric constants are by default doubles
by Michael Stefaniuc 12 Feb '19

12 Feb '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/oleaut32/tests/vartest.c | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index f235a75e86..62b4852c54 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -2715,8 +2715,7 @@ static void test_VarSub(void) ok(hres == S_OK && V_VT(&result) == VT_CY, "VarSub: expected coerced type VT_CY, got %s!\n", vtstr(V_VT(&result))); hres = VarR8FromCy(V_CY(&result), &r); - ok(hres == S_OK && EQ_DOUBLE(r, 4702.0), - "VarSub: CY value %f, expected %f\n", r, (double)4720); + ok(hres == S_OK && EQ_DOUBLE(r, 4702.0), "VarSub: CY value %f, expected %f\n", r, 4720.0); hres = pVarSub(&left, &dec, &result); ok(hres == S_OK && V_VT(&result) == VT_DECIMAL, @@ -5533,12 +5532,12 @@ static void test_VarMul(void) hres = pVarMul(&cy, &right, &result); ok(hres == S_OK && V_VT(&result) == VT_CY, "VarMul: expected coerced type VT_CY, got %s!\n", vtstr(V_VT(&result))); hres = VarR8FromCy(V_CY(&result), &r); - ok(hres == S_OK && EQ_DOUBLE(r, 42399.0), "VarMul: CY value %f, expected %f\n", r, (double)42399); + ok(hres == S_OK && EQ_DOUBLE(r, 42399.0), "VarMul: CY value %f, expected %f\n", r, 42399.0); hres = pVarMul(&left, &dec, &result); ok(hres == S_OK && V_VT(&result) == VT_DECIMAL, "VarMul: expected coerced type VT_DECIMAL, got %s!\n", vtstr(V_VT(&result))); hres = VarR8FromDec(&V_DECIMAL(&result), &r); - ok(hres == S_OK && EQ_DOUBLE(r, 46.2), "VarMul: DECIMAL value %f, expected %f\n", r, (double)46.2); + ok(hres == S_OK && EQ_DOUBLE(r, 46.2), "VarMul: DECIMAL value %f, expected %f\n", r, 46.2); SysFreeString(lbstr); SysFreeString(rbstr); @@ -5704,7 +5703,7 @@ static void test_VarAdd(void) hres = pVarAdd(&left, &right, &result); ok(hres == S_OK && V_VT(&result) == VT_BSTR, "VarAdd: expected coerced type VT_BSTR, got %s!\n", vtstr(V_VT(&result))); hres = VarR8FromStr(V_BSTR(&result), 0, 0, &r); - ok(hres == S_OK && EQ_DOUBLE(r, 1212.0), "VarAdd: BSTR value %f, expected %f\n", r, (double)1212); + ok(hres == S_OK && EQ_DOUBLE(r, 1212.0), "VarAdd: BSTR value %f, expected %f\n", r, 1212.0); VariantClear(&result); /* Manuly test some VT_CY and VT_DECIMAL variants */ @@ -5724,12 +5723,12 @@ static void test_VarAdd(void) hres = pVarAdd(&cy, &right, &result); ok(hres == S_OK && V_VT(&result) == VT_CY, "VarAdd: expected coerced type VT_CY, got %s!\n", vtstr(V_VT(&result))); hres = VarR8FromCy(V_CY(&result), &r); - ok(hres == S_OK && EQ_DOUBLE(r, 4720.0), "VarAdd: CY value %f, expected %f\n", r, (double)4720); + ok(hres == S_OK && EQ_DOUBLE(r, 4720.0), "VarAdd: CY value %f, expected %f\n", r, 4720.0); hres = pVarAdd(&left, &dec, &result); ok(hres == S_OK && V_VT(&result) == VT_DECIMAL, "VarAdd: expected coerced type VT_DECIMAL, got %s!\n", vtstr(V_VT(&result))); hres = VarR8FromDec(&V_DECIMAL(&result), &r); - ok(hres == S_OK && EQ_DOUBLE(r, -15.2), "VarAdd: DECIMAL value %f, expected %f\n", r, (double)-15.2); + ok(hres == S_OK && EQ_DOUBLE(r, -15.2), "VarAdd: DECIMAL value %f, expected %f\n", r, -15.2); VariantClear(&result); SysFreeString(lbstr); @@ -7994,40 +7993,37 @@ static void test_VarDiv(void) ok(hres == S_OK && V_VT(&result) == VT_R8, "VARDIV: expected coerced type VT_R8, got %s!\n", vtstr(V_VT(&result))); ok(hres == S_OK && EQ_DOUBLE(V_R8(&result), 1.0), - "VARDIV: CY value %f, expected %f\n", V_R8(&result), (double)1.0); + "VARDIV: CY value %f, expected %f\n", V_R8(&result), 1.0); hres = pVarDiv(&cy, &right, &result); ok(hres == S_OK && V_VT(&result) == VT_R8, "VARDIV: expected coerced type VT_R8, got %s!\n", vtstr(V_VT(&result))); ok(hres == S_OK && EQ_DOUBLE(V_R8(&result), 5000.0), - "VARDIV: CY value %f, expected %f\n", V_R8(&result), (double)5000.0); + "VARDIV: CY value %f, expected %f\n", V_R8(&result), 5000.0); hres = pVarDiv(&left, &cy, &result); ok(hres == S_OK && V_VT(&result) == VT_R8, "VARDIV: expected coerced type VT_R8, got %s!\n", vtstr(V_VT(&result))); ok(hres == S_OK && EQ_DOUBLE(V_R8(&result), 0.01), - "VARDIV: CY value %f, expected %f\n", V_R8(&result), (double)0.01); + "VARDIV: CY value %f, expected %f\n", V_R8(&result), 0.01); hres = pVarDiv(&left, &dec, &result); ok(hres == S_OK && V_VT(&result) == VT_DECIMAL, "VARDIV: expected coerced type VT_DECIMAL, got %s!\n", vtstr(V_VT(&result))); hres = VarR8FromDec(&V_DECIMAL(&result), &r); - ok(hres == S_OK && EQ_DOUBLE(r, 50.0), - "VARDIV: DECIMAL value %f, expected %f\n", r, (double)50.0); + ok(hres == S_OK && EQ_DOUBLE(r, 50.0), "VARDIV: DECIMAL value %f, expected %f\n", r, 50.0); hres = pVarDiv(&dec, &dec, &result); ok(hres == S_OK && V_VT(&result) == VT_DECIMAL, "VARDIV: expected coerced type VT_DECIMAL, got %s!\n", vtstr(V_VT(&result))); hres = VarR8FromDec(&V_DECIMAL(&result), &r); - ok(hres == S_OK && EQ_DOUBLE(r, 1.0), - "VARDIV: DECIMAL value %f, expected %f\n", r, (double)1.0); + ok(hres == S_OK && EQ_DOUBLE(r, 1.0), "VARDIV: DECIMAL value %f, expected %f\n", r, 1.0); hres = pVarDiv(&dec, &right, &result); ok(hres == S_OK && V_VT(&result) == VT_DECIMAL, "VARDIV: expected coerced type VT_DECIMAL, got %s!\n", vtstr(V_VT(&result))); hres = VarR8FromDec(&V_DECIMAL(&result), &r); - ok(hres == S_OK && EQ_DOUBLE(r, 1.0), - "VARDIV: DECIMAL value %f, expected %f\n", r, (double)1.0); + ok(hres == S_OK && EQ_DOUBLE(r, 1.0), "VARDIV: DECIMAL value %f, expected %f\n", r, 1.0); /* Check for division by zero and overflow */ V_VT(&left) = VT_R8; -- 2.20.1

1 0