wine-commits May 2020

wine-commits@winehq.org

1 participants
743 discussions

Nikolay Sivov : qmgr: Make SetMaximumDownloadTime() succeed.
by Alexandre Julliard 08 May '20

08 May '20

Module: wine Branch: master Commit: 2f454fa3750c7fcfa4a0898cfeeafe9a842e612b URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f454fa3750c7fcfa4a0898c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 8 15:40:22 2020 +0300 qmgr: Make SetMaximumDownloadTime() succeed. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qmgr/job.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/qmgr/job.c b/dlls/qmgr/job.c index 6f2c4d61ca..2ba65cbc29 100644 --- a/dlls/qmgr/job.c +++ b/dlls/qmgr/job.c @@ -902,7 +902,7 @@ static HRESULT WINAPI BackgroundCopyJob_GetOwnerElevationState(IBackgroundCopyJo static HRESULT WINAPI BackgroundCopyJob_SetMaximumDownloadTime(IBackgroundCopyJob4 *iface, ULONG timeout) { FIXME("%p, %u.\n", iface, timeout); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI BackgroundCopyJob_GetMaximumDownloadTime(IBackgroundCopyJob4 *iface, ULONG *timeout)

1 0

Vijay Kiran Kamuju : msasn1: Add stub for ASN1_CloseDecoder function.
by Alexandre Julliard 08 May '20

08 May '20

Module: wine Branch: master Commit: 9bf81247849ea77721d60a8bb155eb61b5cca985 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9bf81247849ea77721d60a8b… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Fri May 8 11:43:50 2020 +0200 msasn1: Add stub for ASN1_CloseDecoder function. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msasn1/main.c | 5 +++++ dlls/msasn1/msasn1.spec | 2 +- dlls/msasn1/tests/asn1.c | 10 ++++++++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/msasn1/main.c b/dlls/msasn1/main.c index 435dd0e2e1..c96be7d07d 100644 --- a/dlls/msasn1/main.c +++ b/dlls/msasn1/main.c @@ -185,3 +185,8 @@ ASN1error_e WINAPI ASN1_CreateDecoder(ASN1module_t module, ASN1decoding_t *decod return ASN1_SUCCESS; } + +void WINAPI ASN1_CloseDecoder(ASN1decoding_t decoder) +{ + FIXME("(%p): Stub!\n", decoder); +} diff --git a/dlls/msasn1/msasn1.spec b/dlls/msasn1/msasn1.spec index 5ec3f08d52..f98a4a62d7 100644 --- a/dlls/msasn1/msasn1.spec +++ b/dlls/msasn1/msasn1.spec @@ -216,7 +216,7 @@ @ stub ASN1PEREncUnsignedShort @ stub ASN1PEREncZero @ stub ASN1PERFreeSeqOf -@ stub ASN1_CloseDecoder +@ stdcall ASN1_CloseDecoder(ptr) @ stub ASN1_CloseEncoder2 @ stdcall ASN1_CloseEncoder(ptr) @ stdcall ASN1_CloseModule(ptr) diff --git a/dlls/msasn1/tests/asn1.c b/dlls/msasn1/tests/asn1.c index 017124d229..6bd95352ed 100644 --- a/dlls/msasn1/tests/asn1.c +++ b/dlls/msasn1/tests/asn1.c @@ -261,6 +261,7 @@ static void test_CreateDecoder(void) ok(!decoder->pos,"Got incorrect pos = %p.\n",decoder->pos); ok(decoder->eRule == ASN1_BER_RULE_DER,"Got incorrect eRule = %08x.\n",decoder->eRule); ok(decoder->dwFlags == ASN1DECODE_NOASSERT,"Got incorrect dwFlags = %08x.\n",decoder->dwFlags); + ASN1_CloseDecoder(decoder); ret = ASN1_CreateDecoder(mod, &decoder, buf, 0, NULL); ok(ASN1_SUCCEEDED(ret),"Got error code %d.\n",ret); @@ -276,6 +277,7 @@ static void test_CreateDecoder(void) ok(decoder->pos==buf,"Got incorrect pos = %s.\n",decoder->pos); ok(decoder->eRule == ASN1_BER_RULE_DER,"Got incorrect eRule = %08x.\n",decoder->eRule); ok(decoder->dwFlags == (ASN1DECODE_NOASSERT|ASN1DECODE_SETBUFFER), "Got incorrect dwFlags = %08x.\n",decoder->dwFlags); + ASN1_CloseDecoder(decoder); ret = ASN1_CreateDecoder(mod, &decoder, buf, 2, NULL); ok(ASN1_SUCCEEDED(ret),"Got error code %d.\n",ret); @@ -291,6 +293,7 @@ static void test_CreateDecoder(void) ok(decoder->pos==buf,"Got incorrect pos = %p.\n",decoder->pos); ok(decoder->eRule == ASN1_BER_RULE_DER,"Got incorrect eRule = %08x.\n",decoder->eRule); ok(decoder->dwFlags == (ASN1DECODE_NOASSERT|ASN1DECODE_SETBUFFER),"Got incorrect dwFlags = %08x.\n",decoder->dwFlags); + ASN1_CloseDecoder(decoder); ret = ASN1_CreateDecoder(mod, &decoder, buf, 4, NULL); ok(ASN1_SUCCEEDED(ret),"Got error code %d.\n",ret); @@ -306,14 +309,17 @@ static void test_CreateDecoder(void) ok(decoder->pos==buf,"Got incorrect pos = %p.\n",decoder->pos); ok(decoder->eRule == ASN1_BER_RULE_DER,"Got incorrect rule = %08x.\n",decoder->eRule); ok(decoder->dwFlags == (ASN1DECODE_NOASSERT|ASN1DECODE_SETBUFFER),"Got incorrect dwFlags = %08x.\n",decoder->dwFlags); + ASN1_CloseDecoder(decoder); ASN1_CloseModule(mod); mod = ASN1_CreateModule(ASN1_THIS_VERSION, ASN1_BER_RULE_DER, ASN1FLAGS_NONE, 1, encfn, decfn, freefn, size, name); ret = ASN1_CreateDecoder(mod, &decoder, buf, 0, NULL); ok(decoder->dwFlags == ASN1DECODE_SETBUFFER,"Got incorrect dwFlags = %08x.\n",decoder->dwFlags); + ASN1_CloseDecoder(decoder); ret = ASN1_CreateDecoder(mod, &decoder, buf, 4, NULL); ok(decoder->dwFlags == ASN1DECODE_SETBUFFER,"Got incorrect dwFlags = %08x.\n",decoder->dwFlags); + ASN1_CloseDecoder(decoder); ASN1_CloseModule(mod); mod = ASN1_CreateModule(ASN1_THIS_VERSION, ASN1_PER_RULE_ALIGNED, ASN1FLAGS_NOASSERT, 1, encfn, decfn, freefn, size, name); @@ -331,6 +337,7 @@ static void test_CreateDecoder(void) ok(decoder->pos==buf,"Got incorrect pos = %s.\n",decoder->pos); ok(decoder->eRule == ASN1_PER_RULE_ALIGNED,"Got incorrect eRule = %08x.\n",decoder->eRule); ok(decoder->dwFlags == (ASN1DECODE_NOASSERT|ASN1DECODE_SETBUFFER),"Got incorrect dwFlags = %08x.\n",decoder->dwFlags); + ASN1_CloseDecoder(decoder); ret = ASN1_CreateDecoder(mod, &decoder, buf, 4, NULL); ok(!!decoder,"Decoder creation failed.\n"); @@ -345,14 +352,17 @@ static void test_CreateDecoder(void) ok(decoder->pos==buf,"Got incorrect pos = %p.\n",decoder->pos); ok(decoder->eRule == ASN1_PER_RULE_ALIGNED,"Got incorrect rule = %08x.\n",decoder->eRule); ok(decoder->dwFlags == (ASN1FLAGS_NOASSERT|ASN1DECODE_SETBUFFER),"Got incorrect dwFlags = %08x.\n",decoder->dwFlags); + ASN1_CloseDecoder(decoder); ASN1_CloseModule(mod); mod = ASN1_CreateModule(ASN1_THIS_VERSION, ASN1_PER_RULE_ALIGNED, ASN1FLAGS_NONE, 1, encfn, decfn, freefn, size, name); ret = ASN1_CreateDecoder(mod, &decoder, buf, 0, NULL); ok(decoder->dwFlags == ASN1DECODE_SETBUFFER,"Got incorrect dwFlags = %08x.\n",decoder->dwFlags); + ASN1_CloseDecoder(decoder); ret = ASN1_CreateDecoder(mod, &decoder, buf, 4, NULL); ok(decoder->dwFlags == ASN1DECODE_SETBUFFER,"Got incorrect dwFlags = %08x.\n",decoder->dwFlags); + ASN1_CloseDecoder(decoder); ASN1_CloseModule(mod); }

1 0

Vijay Kiran Kamuju : msasn1: Add partial implementation of ASN1_CreateDecoder.
by Alexandre Julliard 08 May '20

08 May '20

Module: wine Branch: master Commit: fc2c1b5d6079960eb53009f57cffb9b6bbbcda80 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc2c1b5d6079960eb53009f5… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Fri May 8 11:39:46 2020 +0200 msasn1: Add partial implementation of ASN1_CreateDecoder. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msasn1/main.c | 43 ++++++++++++++++ dlls/msasn1/msasn1.spec | 2 +- dlls/msasn1/tests/asn1.c | 129 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 173 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fc2c1b5d6079960eb530…

1 0

Vijay Kiran Kamuju : msasn1: Add stub for ASN1_CloseEncoder function.
by Alexandre Julliard 08 May '20

08 May '20

Module: wine Branch: master Commit: 85dbf7b0144e29ab33274b252f59a278608c278e URL: https://source.winehq.org/git/wine.git/?a=commit;h=85dbf7b0144e29ab33274b25… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Fri May 8 11:36:44 2020 +0200 msasn1: Add stub for ASN1_CloseEncoder function. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msasn1/main.c | 5 +++++ dlls/msasn1/msasn1.spec | 2 +- dlls/msasn1/tests/asn1.c | 10 ++++++++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/msasn1/main.c b/dlls/msasn1/main.c index 5c9c6a5c86..f6ad865282 100644 --- a/dlls/msasn1/main.c +++ b/dlls/msasn1/main.c @@ -137,3 +137,8 @@ ASN1error_e WINAPI ASN1_CreateEncoder(ASN1module_t module, ASN1encoding_t *encod return ASN1_SUCCESS; } + +void WINAPI ASN1_CloseEncoder(ASN1encoding_t encoder) +{ + FIXME("(%p): Stub!\n", encoder); +} diff --git a/dlls/msasn1/msasn1.spec b/dlls/msasn1/msasn1.spec index d79128344f..4ebc8f32ef 100644 --- a/dlls/msasn1/msasn1.spec +++ b/dlls/msasn1/msasn1.spec @@ -218,7 +218,7 @@ @ stub ASN1PERFreeSeqOf @ stub ASN1_CloseDecoder @ stub ASN1_CloseEncoder2 -@ stub ASN1_CloseEncoder +@ stdcall ASN1_CloseEncoder(ptr) @ stdcall ASN1_CloseModule(ptr) @ stub ASN1_CreateDecoder @ stub ASN1_CreateDecoderEx diff --git a/dlls/msasn1/tests/asn1.c b/dlls/msasn1/tests/asn1.c index e0ffbcd623..9d2c4231f7 100644 --- a/dlls/msasn1/tests/asn1.c +++ b/dlls/msasn1/tests/asn1.c @@ -118,6 +118,7 @@ static void test_CreateEncoder(void) ok(!encoder->cbExtraHeader,"Got incorrect cbExtraHeader = %u.\n",encoder->cbExtraHeader); ok(encoder->eRule == ASN1_BER_RULE_DER,"Got incorrect eRule = %08x.\n",encoder->eRule); ok(encoder->dwFlags == ASN1ENCODE_NOASSERT,"Got incorrect dwFlags = %08x.\n",encoder->dwFlags); + ASN1_CloseEncoder(encoder); ret = ASN1_CreateEncoder(mod, &encoder, buf, 0, NULL); ok(ASN1_SUCCEEDED(ret),"Got error code %d.\n",ret); @@ -134,6 +135,7 @@ static void test_CreateEncoder(void) ok(!encoder->cbExtraHeader,"Got incorrect cbExtraHeader = %u.\n",encoder->cbExtraHeader); ok(encoder->eRule == ASN1_BER_RULE_DER,"Got incorrect eRule = %08x.\n",encoder->eRule); ok(encoder->dwFlags == ASN1ENCODE_NOASSERT,"Got incorrect dwFlags = %08x.\n",encoder->dwFlags); + ASN1_CloseEncoder(encoder); ret = ASN1_CreateEncoder(mod, &encoder, buf, 2, NULL); ok(ASN1_SUCCEEDED(ret),"Got error code %d.\n",ret); @@ -150,6 +152,7 @@ static void test_CreateEncoder(void) ok(!encoder->cbExtraHeader,"Got incorrect cbExtraHeader = %u.\n",encoder->cbExtraHeader); ok(encoder->eRule == ASN1_BER_RULE_DER,"Got incorrect eRule = %08x.\n",encoder->eRule); ok(encoder->dwFlags == (ASN1ENCODE_NOASSERT|ASN1ENCODE_SETBUFFER),"Got incorrect dwFlags = %08x.\n",encoder->dwFlags); + ASN1_CloseEncoder(encoder); ret = ASN1_CreateEncoder(mod, &encoder, buf, 4, NULL); ok(ASN1_SUCCEEDED(ret),"Got error code %d.\n",ret); @@ -166,14 +169,17 @@ static void test_CreateEncoder(void) ok(!encoder->cbExtraHeader,"Got incorrect cbExtraHeader = %u.\n",encoder->cbExtraHeader); ok(encoder->eRule == ASN1_BER_RULE_DER,"Got incorrect rule = %08x.\n",encoder->eRule); ok(encoder->dwFlags == (ASN1ENCODE_NOASSERT|ASN1ENCODE_SETBUFFER),"Got incorrect dwFlags = %08x.\n",encoder->dwFlags); + ASN1_CloseEncoder(encoder); ASN1_CloseModule(mod); mod = ASN1_CreateModule(ASN1_THIS_VERSION, ASN1_BER_RULE_DER, ASN1FLAGS_NONE, 1, encfn, decfn, freefn, size, name); ret = ASN1_CreateEncoder(mod, &encoder, buf, 0, NULL); ok(encoder->dwFlags == 0,"Got incorrect dwFlags = %08x.\n",encoder->dwFlags); + ASN1_CloseEncoder(encoder); ret = ASN1_CreateEncoder(mod, &encoder, buf, 4, NULL); ok(encoder->dwFlags == ASN1ENCODE_SETBUFFER,"Got incorrect dwFlags = %08x.\n",encoder->dwFlags); + ASN1_CloseEncoder(encoder); ASN1_CloseModule(mod); mod = ASN1_CreateModule(ASN1_THIS_VERSION, ASN1_PER_RULE_ALIGNED, ASN1FLAGS_NOASSERT, 1, encfn, decfn, freefn, size, name); @@ -192,6 +198,7 @@ static void test_CreateEncoder(void) ok(!encoder->cbExtraHeader,"Got incorrect cbExtraHeader = %u.\n",encoder->cbExtraHeader); ok(encoder->eRule == ASN1_PER_RULE_ALIGNED,"Got incorrect eRule = %08x.\n",encoder->eRule); ok(encoder->dwFlags == ASN1ENCODE_NOASSERT,"Got incorrect dwFlags = %08x.\n",encoder->dwFlags); + ASN1_CloseEncoder(encoder); ret = ASN1_CreateEncoder(mod, &encoder, buf, 4, NULL); ok(!!encoder,"Encoder creation failed.\n"); @@ -207,14 +214,17 @@ static void test_CreateEncoder(void) ok(!encoder->cbExtraHeader,"Got incorrect cbExtraHeader = %u.\n",encoder->cbExtraHeader); ok(encoder->eRule == ASN1_PER_RULE_ALIGNED,"Got incorrect rule = %08x.\n",encoder->eRule); ok(encoder->dwFlags == (ASN1FLAGS_NOASSERT|ASN1ENCODE_SETBUFFER),"Got incorrect dwFlags = %08x.\n",encoder->dwFlags); + ASN1_CloseEncoder(encoder); ASN1_CloseModule(mod); mod = ASN1_CreateModule(ASN1_THIS_VERSION, ASN1_PER_RULE_ALIGNED, ASN1FLAGS_NONE, 1, encfn, decfn, freefn, size, name); ret = ASN1_CreateEncoder(mod, &encoder, buf, 0, NULL); ok(encoder->dwFlags == 0,"Got incorrect dwFlags = %08x.\n",encoder->dwFlags); + ASN1_CloseEncoder(encoder); ret = ASN1_CreateEncoder(mod, &encoder, buf, 4, NULL); ok(encoder->dwFlags == ASN1ENCODE_SETBUFFER,"Got incorrect dwFlags = %08x.\n",encoder->dwFlags); + ASN1_CloseEncoder(encoder); ASN1_CloseModule(mod); }

1 0

Vijay Kiran Kamuju : msasn1: Add partial implementation of ASN1_CreateEncoder.
by Alexandre Julliard 08 May '20

08 May '20

Module: wine Branch: master Commit: 8b0e26779558ee36ae0cfc1071c113995cf0a79d URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b0e26779558ee36ae0cfc10… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Thu May 7 15:59:30 2020 +0200 msasn1: Add partial implementation of ASN1_CreateEncoder. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msasn1/main.c | 46 ++++++++++++++ dlls/msasn1/msasn1.spec | 2 +- dlls/msasn1/tests/asn1.c | 161 +++++++++++++++++++++++++++++++++++++++++++---- 3 files changed, 195 insertions(+), 14 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8b0e26779558ee36ae0c…

1 0

Bernhard Übelacker : server: Save whole input history line again.
by Alexandre Julliard 08 May '20

08 May '20

Module: wine Branch: master Commit: 54b237bcef7db689c97a3c3dfa7c88d567eac564 URL: https://source.winehq.org/git/wine.git/?a=commit;h=54b237bcef7db689c97a3c3d… Author: Bernhard Übelacker <bernhardu(a)mailbox.org> Date: Fri May 8 11:44:54 2020 +0200 server: Save whole input history line again. Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/console.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/console.c b/server/console.c index 5feb1c2ba7..302be6a1c1 100644 --- a/server/console.c +++ b/server/console.c @@ -1680,7 +1680,7 @@ DECL_HANDLER(append_console_input_history) struct console_input *console; if (!(console = console_input_get( req->handle, FILE_WRITE_PROPERTIES ))) return; - console_input_append_hist( console, get_req_data(), get_req_data_size() / sizeof(WCHAR) ); + console_input_append_hist( console, get_req_data(), get_req_data_size() ); release_object( console ); }

1 0

Vincent Povirk : gdiplus: Support character offsets in GDI32_GdipDrawDriverString.
by Alexandre Julliard 08 May '20

08 May '20

Module: wine Branch: master Commit: 3250a17e208852fc0fbcac897a69d56010796c1f URL: https://source.winehq.org/git/wine.git/?a=commit;h=3250a17e208852fc0fbcac89… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu May 7 21:08:46 2020 -0500 gdiplus: Support character offsets in GDI32_GdipDrawDriverString. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 66 ++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 52 insertions(+), 14 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 04c5501deb..72075e02fb 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2242,7 +2242,7 @@ void get_log_fontW(const GpFont *font, GpGraphics *graphics, LOGFONTW *lf) static void get_font_hfont(GpGraphics *graphics, GDIPCONST GpFont *font, GDIPCONST GpStringFormat *format, HFONT *hfont, - GDIPCONST GpMatrix *matrix) + LOGFONTW *lfw_return, GDIPCONST GpMatrix *matrix) { HDC hdc = CreateCompatibleDC(0); GpPointF pt[3]; @@ -2300,6 +2300,9 @@ static void get_font_hfont(GpGraphics *graphics, GDIPCONST GpFont *font, *hfont = CreateFontIndirectW(&lfw); + if (lfw_return) + *lfw_return = lfw; + DeleteDC(hdc); DeleteObject(unscaled_font); } @@ -5371,7 +5374,7 @@ GpStatus WINGDIPAPI GdipMeasureCharacterRanges(GpGraphics* graphics, if (scaled_rect.Width >= 1 << 23) scaled_rect.Width = 1 << 23; if (scaled_rect.Height >= 1 << 23) scaled_rect.Height = 1 << 23; - get_font_hfont(graphics, font, stringFormat, &gdifont, NULL); + get_font_hfont(graphics, font, stringFormat, &gdifont, NULL, NULL); oldfont = SelectObject(hdc, gdifont); for (i=0; i<stringFormat->range_count; i++) @@ -5505,7 +5508,7 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, if (scaled_rect.Width >= 1 << 23) scaled_rect.Width = 1 << 23; if (scaled_rect.Height >= 1 << 23) scaled_rect.Height = 1 << 23; - get_font_hfont(graphics, font, format, &gdifont, NULL); + get_font_hfont(graphics, font, format, &gdifont, NULL, NULL); oldfont = SelectObject(hdc, gdifont); bounds->X = rect->X; @@ -5692,7 +5695,7 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string SelectClipRgn(hdc, rgn); } - get_font_hfont(graphics, font, format, &gdifont, NULL); + get_font_hfont(graphics, font, format, &gdifont, NULL, NULL); SelectObject(hdc, gdifont); args.graphics = graphics; @@ -6990,7 +6993,7 @@ GpStatus WINGDIPAPI GdipMeasureDriverString(GpGraphics *graphics, GDIPCONST UINT if (flags & unsupported_flags) FIXME("Ignoring flags %x\n", flags & unsupported_flags); - get_font_hfont(graphics, font, NULL, &hfont, matrix); + get_font_hfont(graphics, font, NULL, &hfont, NULL, matrix); hdc = CreateCompatibleDC(0); SelectObject(hdc, hfont); @@ -7075,20 +7078,30 @@ static GpStatus GDI32_GdipDrawDriverString(GpGraphics *graphics, GDIPCONST UINT1 GDIPCONST GpBrush *brush, GDIPCONST PointF *positions, INT flags, GDIPCONST GpMatrix *matrix) { - static const INT unsupported_flags = ~(DriverStringOptionsRealizedAdvance|DriverStringOptionsCmapLookup); INT save_state; - GpPointF pt; + GpPointF pt, *real_positions=NULL; + INT *eto_positions=NULL; HFONT hfont; + LOGFONTW lfw; UINT eto_flags=0; GpStatus status; HRGN hrgn; - if (flags & unsupported_flags) - FIXME("Ignoring flags %x\n", flags & unsupported_flags); - if (!(flags & DriverStringOptionsCmapLookup)) eto_flags |= ETO_GLYPH_INDEX; + if (!(flags & DriverStringOptionsRealizedAdvance) && length > 1) + { + real_positions = heap_alloc(sizeof(*real_positions) * length); + eto_positions = heap_alloc(sizeof(*eto_positions) * 2 * (length - 1)); + if (!real_positions || !eto_positions) + { + heap_free(real_positions); + heap_free(eto_positions); + return OutOfMemory; + } + } + save_state = SaveDC(graphics->hdc); SetBkMode(graphics->hdc, TRANSPARENT); SetTextColor(graphics->hdc, get_gdi_brush_color(brush)); @@ -7104,14 +7117,37 @@ static GpStatus GDI32_GdipDrawDriverString(GpGraphics *graphics, GDIPCONST UINT1 pt = positions[0]; gdip_transform_points(graphics, WineCoordinateSpaceGdiDevice, CoordinateSpaceWorld, &pt, 1); - get_font_hfont(graphics, font, format, &hfont, matrix); + get_font_hfont(graphics, font, format, &hfont, &lfw, matrix); + + if (!(flags & DriverStringOptionsRealizedAdvance) && length > 1) + { + GpMatrix rotation; + INT i; + + eto_flags |= ETO_PDY; + + memcpy(real_positions, positions, sizeof(PointF) * length); + + gdip_transform_points(graphics, WineCoordinateSpaceGdiDevice, CoordinateSpaceWorld, real_positions, length); + + GdipSetMatrixElements(&rotation, 1.0, 0.0, 0.0, 1.0, 0.0, 0.0); + GdipRotateMatrix(&rotation, lfw.lfEscapement / 10.0, MatrixOrderAppend); + GdipTransformMatrixPoints(&rotation, real_positions, length); + + for (i = 0; i < (length - 1); i++) + { + eto_positions[i*2] = gdip_round(real_positions[i+1].X) - gdip_round(real_positions[i].X); + eto_positions[i*2+1] = gdip_round(real_positions[i].Y) - gdip_round(real_positions[i+1].Y); + } + } + SelectObject(graphics->hdc, hfont); SetTextAlign(graphics->hdc, TA_BASELINE|TA_LEFT); gdi_transform_acquire(graphics); - ExtTextOutW(graphics->hdc, gdip_round(pt.X), gdip_round(pt.Y), eto_flags, NULL, text, length, NULL); + ExtTextOutW(graphics->hdc, gdip_round(pt.X), gdip_round(pt.Y), eto_flags, NULL, text, length, eto_positions); gdi_transform_release(graphics); @@ -7119,6 +7155,9 @@ static GpStatus GDI32_GdipDrawDriverString(GpGraphics *graphics, GDIPCONST UINT1 DeleteObject(hfont); + heap_free(real_positions); + heap_free(eto_positions); + return Ok; } @@ -7182,7 +7221,7 @@ static GpStatus SOFTWARE_GdipDrawDriverString(GpGraphics *graphics, GDIPCONST UI heap_free(real_positions); } - get_font_hfont(graphics, font, format, &hfont, matrix); + get_font_hfont(graphics, font, format, &hfont, NULL, matrix); hdc = CreateCompatibleDC(0); SelectObject(hdc, hfont); @@ -7346,7 +7385,6 @@ static GpStatus draw_driver_string(GpGraphics *graphics, GDIPCONST UINT16 *text, length = lstrlenW(text); if (graphics->hdc && !graphics->alpha_hdc && - ((flags & DriverStringOptionsRealizedAdvance) || length <= 1) && brush->bt == BrushTypeSolidColor && (((GpSolidFill*)brush)->color & 0xff000000) == 0xff000000) stat = GDI32_GdipDrawDriverString(graphics, text, length, font, format,

1 0

Zebediah Figura : quartz/tests: Add tests for IBasicVideo.
by Alexandre Julliard 08 May '20

08 May '20

Module: wine Branch: master Commit: 79c78b79512bd6e3319aacc81591d275bf539f2b URL: https://source.winehq.org/git/wine.git/?a=commit;h=79c78b79512bd6e3319aacc8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 7 20:50:25 2020 -0500 quartz/tests: Add tests for IBasicVideo. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/videorenderer.c | 427 ++++++++++++++++++++++++++++++++++++ dlls/quartz/tests/vmr7.c | 450 ++++++++++++++++++++++++++++++++++++++ dlls/quartz/tests/vmr9.c | 450 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 1327 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=79c78b79512bd6e3319a…

1 0

Zebediah Figura : quartz: Implement IBasicVideo::IsUsingDefaultSource().
by Alexandre Julliard 08 May '20

08 May '20

Module: wine Branch: master Commit: 8f6d4b1c5fe2720473c2d3d4a250dfdbc833bee0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f6d4b1c5fe2720473c2d3d4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 7 20:50:24 2020 -0500 quartz: Implement IBasicVideo::IsUsingDefaultSource(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/window.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/window.c b/dlls/quartz/window.c index efafb70daa..a5ff4979ef 100644 --- a/dlls/quartz/window.c +++ b/dlls/quartz/window.c @@ -1155,9 +1155,16 @@ static HRESULT WINAPI basic_video_GetCurrentImage(IBasicVideo *iface, LONG *size static HRESULT WINAPI basic_video_IsUsingDefaultSource(IBasicVideo *iface) { - FIXME("iface %p, stub!\n", iface); + struct video_window *window = impl_from_IBasicVideo(iface); + const BITMAPINFOHEADER *bitmap_header = get_bitmap_header(window); - return S_OK; + TRACE("window %p.\n", window); + + if (!window->src.left && !window->src.top + && window->src.right == bitmap_header->biWidth + && window->src.bottom == bitmap_header->biHeight) + return S_OK; + return S_FALSE; } static HRESULT WINAPI basic_video_IsUsingDefaultDestination(IBasicVideo *iface)

1 0

Zebediah Figura : quartz: Resize the destination rect only if we are using the default destination rect.
by Alexandre Julliard 08 May '20

08 May '20

Module: wine Branch: master Commit: 82420a8d3c8ea39193d1bcfc6f2ca68635a9e54d URL: https://source.winehq.org/git/wine.git/?a=commit;h=82420a8d3c8ea39193d1bcfc… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 7 20:50:23 2020 -0500 quartz: Resize the destination rect only if we are using the default destination rect. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/quartz_private.h | 3 ++- dlls/quartz/window.c | 16 +++++++++++++--- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/quartz_private.h b/dlls/quartz/quartz_private.h index 33cfb5671f..5c391481f2 100644 --- a/dlls/quartz/quartz_private.h +++ b/dlls/quartz/quartz_private.h @@ -94,9 +94,10 @@ struct video_window IBasicVideo IBasicVideo_iface; RECT src, dst; + BOOL default_dst; - HWND hwnd; BOOL AutoShow; + HWND hwnd; HWND hwndDrain; HWND hwndOwner; struct strmbase_filter *pFilter; diff --git a/dlls/quartz/window.c b/dlls/quartz/window.c index ada6b99ddb..efafb70daa 100644 --- a/dlls/quartz/window.c +++ b/dlls/quartz/window.c @@ -68,7 +68,8 @@ static LRESULT CALLBACK WndProcW(HWND hwnd, UINT message, WPARAM wparam, LPARAM } break; case WM_SIZE: - GetClientRect(window->hwnd, &window->dst); + if (window->default_dst) + GetClientRect(window->hwnd, &window->dst); break; } @@ -926,6 +927,7 @@ static HRESULT WINAPI basic_video_put_DestinationLeft(IBasicVideo *iface, LONG l TRACE("window %p, left %d.\n", window, left); + window->default_dst = FALSE; OffsetRect(&window->dst, left - window->dst.left, 0); return S_OK; } @@ -952,6 +954,7 @@ static HRESULT WINAPI basic_video_put_DestinationWidth(IBasicVideo *iface, LONG if (width <= 0) return E_INVALIDARG; + window->default_dst = FALSE; window->dst.right = window->dst.left + width; return S_OK; } @@ -975,6 +978,7 @@ static HRESULT WINAPI basic_video_put_DestinationTop(IBasicVideo *iface, LONG to TRACE("window %p, top %d.\n", window, top); + window->default_dst = FALSE; OffsetRect(&window->dst, 0, top - window->dst.top); return S_OK; } @@ -1001,6 +1005,7 @@ static HRESULT WINAPI basic_video_put_DestinationHeight(IBasicVideo *iface, LONG if (height <= 0) return E_INVALIDARG; + window->default_dst = FALSE; window->dst.bottom = window->dst.top + height; return S_OK; } @@ -1073,6 +1078,7 @@ static HRESULT WINAPI basic_video_SetDestinationPosition(IBasicVideo *iface, if (width <= 0 || height <= 0) return E_INVALIDARG; + window->default_dst = FALSE; SetRect(&window->dst, left, top, left + width, top + height); return S_OK; } @@ -1100,6 +1106,7 @@ static HRESULT WINAPI basic_video_SetDefaultDestinationPosition(IBasicVideo *ifa TRACE("window %p.\n", window); + window->default_dst = TRUE; GetClientRect(window->hwnd, &window->dst); return S_OK; } @@ -1155,9 +1162,11 @@ static HRESULT WINAPI basic_video_IsUsingDefaultSource(IBasicVideo *iface) static HRESULT WINAPI basic_video_IsUsingDefaultDestination(IBasicVideo *iface) { - FIXME("iface %p, stub!\n", iface); + struct video_window *window = impl_from_IBasicVideo(iface); - return S_OK; + TRACE("window %p.\n", window); + + return window->default_dst ? S_OK : S_FALSE; } static const IBasicVideoVtbl basic_video_vtbl = @@ -1216,6 +1225,7 @@ void video_window_init(struct video_window *window, const IVideoWindowVtbl *vtbl window->ops = ops; window->IVideoWindow_iface.lpVtbl = vtbl; window->IBasicVideo_iface.lpVtbl = &basic_video_vtbl; + window->default_dst = TRUE; window->AutoShow = OATRUE; window->pFilter = owner; window->pPin = pin;

1 0

← Newer
1
...
55
56
57
58
59
60
61
...
75
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2020