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

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

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

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

Alistair Leslie-Hughes : dmime: Support more common chunks.
by Alexandre Julliard 07 May '20

07 May '20

Module: wine Branch: master Commit: a897d858e4671e10e64ebf0bc3c0df6cb35944fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=a897d858e4671e10e64ebf0b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu May 7 23:32:02 2020 +0200 dmime: Support more common chunks. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/dmobject.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/dlls/dmime/dmobject.c b/dlls/dmime/dmobject.c index 9ea31ab32a..1c9c1020ba 100644 --- a/dlls/dmime/dmobject.c +++ b/dlls/dmime/dmobject.c @@ -529,15 +529,30 @@ HRESULT dmobj_parsedescriptor(IStream *stream, const struct chunk_entry *riff, while ((hr = stream_next_chunk(stream, &chunk)) == S_OK) { switch (chunk.id) { + case DMUS_FOURCC_CATEGORY_CHUNK: + if ((supported & DMUS_OBJ_CATEGORY) && stream_chunk_get_wstr(stream, &chunk, + desc->wszCategory, sizeof(desc->wszCategory)) == S_OK) + desc->dwValidData |= DMUS_OBJ_CATEGORY; + break; + case DMUS_FOURCC_DATE_CHUNK: + if ((supported & DMUS_OBJ_DATE) && stream_chunk_get_data(stream, &chunk, + &desc->ftDate, sizeof(desc->ftDate)) == S_OK) + desc->dwValidData |= DMUS_OBJ_DATE; + break; + case DMUS_FOURCC_FILE_CHUNK: + if ((supported & DMUS_OBJ_FILENAME) && stream_chunk_get_wstr(stream, &chunk, + desc->wszFileName, sizeof(desc->wszFileName)) == S_OK) + desc->dwValidData |= DMUS_OBJ_FILENAME; + break; case DMUS_FOURCC_GUID_CHUNK: if ((supported & DMUS_OBJ_OBJECT) && stream_chunk_get_data(stream, &chunk, &desc->guidObject, sizeof(desc->guidObject)) == S_OK) desc->dwValidData |= DMUS_OBJ_OBJECT; break; - case DMUS_FOURCC_CATEGORY_CHUNK: - if ((supported & DMUS_OBJ_CATEGORY) && stream_chunk_get_wstr(stream, &chunk, - desc->wszCategory, sizeof(desc->wszCategory)) == S_OK) - desc->dwValidData |= DMUS_OBJ_CATEGORY; + case DMUS_FOURCC_NAME_CHUNK: + if ((supported & DMUS_OBJ_NAME) && stream_chunk_get_wstr(stream, &chunk, + desc->wszName, sizeof(desc->wszName)) == S_OK) + desc->dwValidData |= DMUS_OBJ_NAME; break; case DMUS_FOURCC_VERSION_CHUNK: if ((supported & DMUS_OBJ_VERSION) && stream_chunk_get_data(stream, &chunk,

1 0

Zebediah Figura : quartz: Rename "baseControlWindow" to "window".
by Alexandre Julliard 07 May '20

07 May '20

Module: wine Branch: master Commit: 855f17f3498802f8023213127607f37c3a58b88b URL: https://source.winehq.org/git/wine.git/?a=commit;h=855f17f3498802f802321312… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 6 19:28:48 2020 -0500 quartz: Rename "baseControlWindow" to "window". Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/videorenderer.c | 57 +++++++++++++++++++++++---------------------- dlls/quartz/vmr9.c | 46 ++++++++++++++++++------------------ 2 files changed, 52 insertions(+), 51 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=855f17f3498802f80232…

1 0

Zebediah Figura : quartz: Retrieve the video format directly from the pin.
by Alexandre Julliard 07 May '20

07 May '20

Module: wine Branch: master Commit: 1ba3f252b5d6c8eb082b6517a10596570282bf38 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ba3f252b5d6c8eb082b6517… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 6 19:28:49 2020 -0500 quartz: Retrieve the video format directly from the pin. 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/video.c | 43 ++++++++++++++++++++++++------------------- dlls/quartz/videorenderer.c | 23 ----------------------- dlls/quartz/vmr9.c | 23 ----------------------- 4 files changed, 25 insertions(+), 67 deletions(-) diff --git a/dlls/quartz/quartz_private.h b/dlls/quartz/quartz_private.h index 9c39b642c4..2aca600074 100644 --- a/dlls/quartz/quartz_private.h +++ b/dlls/quartz/quartz_private.h @@ -31,6 +31,7 @@ #include "wingdi.h" #include "winuser.h" #include "dshow.h" +#include "dvdmedia.h" #include "wine/debug.h" #include "wine/heap.h" #include "wine/strmbase.h" @@ -174,7 +175,6 @@ typedef struct tagBaseControlVideo typedef HRESULT (WINAPI *BaseControlVideo_GetSourceRect)(BaseControlVideo* This, RECT *pSourceRect); typedef HRESULT (WINAPI *BaseControlVideo_GetStaticImage)(BaseControlVideo* This, LONG *pBufferSize, LONG *pDIBImage); typedef HRESULT (WINAPI *BaseControlVideo_GetTargetRect)(BaseControlVideo* This, RECT *pTargetRect); -typedef VIDEOINFOHEADER* (WINAPI *BaseControlVideo_GetVideoFormat)(BaseControlVideo* This); typedef HRESULT (WINAPI *BaseControlVideo_IsDefaultSourceRect)(BaseControlVideo* This); typedef HRESULT (WINAPI *BaseControlVideo_IsDefaultTargetRect)(BaseControlVideo* This); typedef HRESULT (WINAPI *BaseControlVideo_SetDefaultSourceRect)(BaseControlVideo* This); @@ -187,7 +187,6 @@ typedef struct BaseControlVideoFuncTable BaseControlVideo_GetSourceRect pfnGetSourceRect; BaseControlVideo_GetStaticImage pfnGetStaticImage; BaseControlVideo_GetTargetRect pfnGetTargetRect; - BaseControlVideo_GetVideoFormat pfnGetVideoFormat; BaseControlVideo_IsDefaultSourceRect pfnIsDefaultSourceRect; BaseControlVideo_IsDefaultTargetRect pfnIsDefaultTargetRect; BaseControlVideo_SetDefaultSourceRect pfnSetDefaultSourceRect; diff --git a/dlls/quartz/video.c b/dlls/quartz/video.c index 11baee261d..213e3ce92d 100644 --- a/dlls/quartz/video.c +++ b/dlls/quartz/video.c @@ -120,9 +120,24 @@ static HRESULT WINAPI basic_video_Invoke(IBasicVideo *iface, DISPID id, REFIID i return hr; } +static const VIDEOINFOHEADER *get_video_format(BaseControlVideo *video) +{ + /* Members of VIDEOINFOHEADER up to bmiHeader are identical to those of + * VIDEOINFOHEADER2. */ + return (const VIDEOINFOHEADER *)video->pPin->mt.pbFormat; +} + +static const BITMAPINFOHEADER *get_bitmap_header(BaseControlVideo *video) +{ + const AM_MEDIA_TYPE *mt = &video->pPin->mt; + if (IsEqualGUID(&mt->formattype, &FORMAT_VideoInfo)) + return &((VIDEOINFOHEADER *)mt->pbFormat)->bmiHeader; + else + return &((VIDEOINFOHEADER2 *)mt->pbFormat)->bmiHeader; +} + static HRESULT WINAPI basic_video_get_AvgTimePerFrame(IBasicVideo *iface, REFTIME *pAvgTimePerFrame) { - VIDEOINFOHEADER *vih; BaseControlVideo *This = impl_from_IBasicVideo(iface); if (!pAvgTimePerFrame) @@ -132,14 +147,12 @@ static HRESULT WINAPI basic_video_get_AvgTimePerFrame(IBasicVideo *iface, REFTIM TRACE("(%p/%p)->(%p)\n", This, iface, pAvgTimePerFrame); - vih = This->pFuncsTable->pfnGetVideoFormat(This); - *pAvgTimePerFrame = vih->AvgTimePerFrame; + *pAvgTimePerFrame = get_video_format(This)->AvgTimePerFrame; return S_OK; } static HRESULT WINAPI basic_video_get_BitRate(IBasicVideo *iface, LONG *pBitRate) { - VIDEOINFOHEADER *vih; BaseControlVideo *This = impl_from_IBasicVideo(iface); TRACE("(%p/%p)->(%p)\n", This, iface, pBitRate); @@ -149,14 +162,12 @@ static HRESULT WINAPI basic_video_get_BitRate(IBasicVideo *iface, LONG *pBitRate if (!This->pPin->peer) return VFW_E_NOT_CONNECTED; - vih = This->pFuncsTable->pfnGetVideoFormat(This); - *pBitRate = vih->dwBitRate; + *pBitRate = get_video_format(This)->dwBitRate; return S_OK; } static HRESULT WINAPI basic_video_get_BitErrorRate(IBasicVideo *iface, LONG *pBitErrorRate) { - VIDEOINFOHEADER *vih; BaseControlVideo *This = impl_from_IBasicVideo(iface); TRACE("(%p/%p)->(%p)\n", This, iface, pBitErrorRate); @@ -166,37 +177,32 @@ static HRESULT WINAPI basic_video_get_BitErrorRate(IBasicVideo *iface, LONG *pBi if (!This->pPin->peer) return VFW_E_NOT_CONNECTED; - vih = This->pFuncsTable->pfnGetVideoFormat(This); - *pBitErrorRate = vih->dwBitErrorRate; + *pBitErrorRate = get_video_format(This)->dwBitErrorRate; return S_OK; } static HRESULT WINAPI basic_video_get_VideoWidth(IBasicVideo *iface, LONG *pVideoWidth) { - VIDEOINFOHEADER *vih; BaseControlVideo *This = impl_from_IBasicVideo(iface); TRACE("(%p/%p)->(%p)\n", This, iface, pVideoWidth); if (!pVideoWidth) return E_POINTER; - vih = This->pFuncsTable->pfnGetVideoFormat(This); - *pVideoWidth = vih->bmiHeader.biWidth; + *pVideoWidth = get_bitmap_header(This)->biWidth; return S_OK; } static HRESULT WINAPI basic_video_get_VideoHeight(IBasicVideo *iface, LONG *pVideoHeight) { - VIDEOINFOHEADER *vih; BaseControlVideo *This = impl_from_IBasicVideo(iface); TRACE("(%p/%p)->(%p)\n", This, iface, pVideoHeight); if (!pVideoHeight) return E_POINTER; - vih = This->pFuncsTable->pfnGetVideoFormat(This); - *pVideoHeight = abs(vih->bmiHeader.biHeight); + *pVideoHeight = abs(get_bitmap_header(This)->biHeight); return S_OK; } @@ -550,16 +556,15 @@ static HRESULT WINAPI basic_video_SetDefaultDestinationPosition(IBasicVideo *ifa static HRESULT WINAPI basic_video_GetVideoSize(IBasicVideo *iface, LONG *pWidth, LONG *pHeight) { - VIDEOINFOHEADER *vih; BaseControlVideo *This = impl_from_IBasicVideo(iface); + const BITMAPINFOHEADER *bitmap_header = get_bitmap_header(This); TRACE("(%p/%p)->(%p, %p)\n", This, iface, pWidth, pHeight); if (!pWidth || !pHeight) return E_POINTER; - vih = This->pFuncsTable->pfnGetVideoFormat(This); - *pHeight = vih->bmiHeader.biHeight; - *pWidth = vih->bmiHeader.biWidth; + *pHeight = bitmap_header->biHeight; + *pWidth = bitmap_header->biWidth; return S_OK; } diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 6e31e19695..b7a82e4faa 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -352,28 +352,6 @@ static HRESULT WINAPI VideoRenderer_GetTargetRect(BaseControlVideo* iface, RECT return S_OK; } -static VIDEOINFOHEADER* WINAPI VideoRenderer_GetVideoFormat(BaseControlVideo* iface) -{ - struct video_renderer *This = impl_from_BaseControlVideo(iface); - AM_MEDIA_TYPE *pmt; - - TRACE("(%p/%p)\n", This, iface); - - pmt = &This->renderer.sink.pin.mt; - if (IsEqualIID(&pmt->formattype, &FORMAT_VideoInfo)) { - return (VIDEOINFOHEADER*)pmt->pbFormat; - } else if (IsEqualIID(&pmt->formattype, &FORMAT_VideoInfo2)) { - static VIDEOINFOHEADER vih; - VIDEOINFOHEADER2 *vih2 = (VIDEOINFOHEADER2*)pmt->pbFormat; - memcpy(&vih,vih2,sizeof(VIDEOINFOHEADER)); - memcpy(&vih.bmiHeader, &vih2->bmiHeader, sizeof(BITMAPINFOHEADER)); - return &vih; - } else { - ERR("Unknown format type %s\n", qzdebugstr_guid(&pmt->formattype)); - return NULL; - } -} - static HRESULT WINAPI VideoRenderer_IsDefaultSourceRect(BaseControlVideo* iface) { struct video_renderer *This = impl_from_BaseControlVideo(iface); @@ -430,7 +408,6 @@ static const BaseControlVideoFuncTable renderer_BaseControlVideoFuncTable = { VideoRenderer_GetSourceRect, VideoRenderer_GetStaticImage, VideoRenderer_GetTargetRect, - VideoRenderer_GetVideoFormat, VideoRenderer_IsDefaultSourceRect, VideoRenderer_IsDefaultTargetRect, VideoRenderer_SetDefaultSourceRect, diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 8fdcb3809b..abca2a03d1 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -772,28 +772,6 @@ static HRESULT WINAPI VMR9_GetTargetRect(BaseControlVideo* This, RECT *pTargetRe return S_OK; } -static VIDEOINFOHEADER* WINAPI VMR9_GetVideoFormat(BaseControlVideo* This) -{ - struct quartz_vmr* pVMR9 = impl_from_BaseControlVideo(This); - AM_MEDIA_TYPE *pmt; - - TRACE("(%p/%p)\n", pVMR9, This); - - pmt = &pVMR9->renderer.sink.pin.mt; - if (IsEqualIID(&pmt->formattype, &FORMAT_VideoInfo)) { - return (VIDEOINFOHEADER*)pmt->pbFormat; - } else if (IsEqualIID(&pmt->formattype, &FORMAT_VideoInfo2)) { - static VIDEOINFOHEADER vih; - VIDEOINFOHEADER2 *vih2 = (VIDEOINFOHEADER2*)pmt->pbFormat; - memcpy(&vih,vih2,sizeof(VIDEOINFOHEADER)); - memcpy(&vih.bmiHeader, &vih2->bmiHeader, sizeof(BITMAPINFOHEADER)); - return &vih; - } else { - ERR("Unknown format type %s\n", qzdebugstr_guid(&pmt->formattype)); - return NULL; - } -} - static HRESULT WINAPI VMR9_IsDefaultSourceRect(BaseControlVideo* This) { struct quartz_vmr* pVMR9 = impl_from_BaseControlVideo(This); @@ -850,7 +828,6 @@ static const BaseControlVideoFuncTable renderer_BaseControlVideoFuncTable = { VMR9_GetSourceRect, VMR9_GetStaticImage, VMR9_GetTargetRect, - VMR9_GetVideoFormat, VMR9_IsDefaultSourceRect, VMR9_IsDefaultTargetRect, VMR9_SetDefaultSourceRect,

1 0

Zebediah Figura : quartz: Get rid of the IsDefault*Rect callbacks.
by Alexandre Julliard 07 May '20

07 May '20

Module: wine Branch: master Commit: 779edf4def4089c12e4be5c21eb5b431f328ff09 URL: https://source.winehq.org/git/wine.git/?a=commit;h=779edf4def4089c12e4be5c2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 6 19:28:50 2020 -0500 quartz: Get rid of the IsDefault*Rect callbacks. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/quartz_private.h | 4 ---- dlls/quartz/video.c | 8 ++++---- dlls/quartz/videorenderer.c | 18 ------------------ dlls/quartz/vmr9.c | 18 ------------------ 4 files changed, 4 insertions(+), 44 deletions(-) diff --git a/dlls/quartz/quartz_private.h b/dlls/quartz/quartz_private.h index 2aca600074..7f2372ce33 100644 --- a/dlls/quartz/quartz_private.h +++ b/dlls/quartz/quartz_private.h @@ -175,8 +175,6 @@ typedef struct tagBaseControlVideo typedef HRESULT (WINAPI *BaseControlVideo_GetSourceRect)(BaseControlVideo* This, RECT *pSourceRect); typedef HRESULT (WINAPI *BaseControlVideo_GetStaticImage)(BaseControlVideo* This, LONG *pBufferSize, LONG *pDIBImage); typedef HRESULT (WINAPI *BaseControlVideo_GetTargetRect)(BaseControlVideo* This, RECT *pTargetRect); -typedef HRESULT (WINAPI *BaseControlVideo_IsDefaultSourceRect)(BaseControlVideo* This); -typedef HRESULT (WINAPI *BaseControlVideo_IsDefaultTargetRect)(BaseControlVideo* This); typedef HRESULT (WINAPI *BaseControlVideo_SetDefaultSourceRect)(BaseControlVideo* This); typedef HRESULT (WINAPI *BaseControlVideo_SetDefaultTargetRect)(BaseControlVideo* This); typedef HRESULT (WINAPI *BaseControlVideo_SetSourceRect)(BaseControlVideo* This, RECT *pSourceRect); @@ -187,8 +185,6 @@ typedef struct BaseControlVideoFuncTable BaseControlVideo_GetSourceRect pfnGetSourceRect; BaseControlVideo_GetStaticImage pfnGetStaticImage; BaseControlVideo_GetTargetRect pfnGetTargetRect; - BaseControlVideo_IsDefaultSourceRect pfnIsDefaultSourceRect; - BaseControlVideo_IsDefaultTargetRect pfnIsDefaultTargetRect; BaseControlVideo_SetDefaultSourceRect pfnSetDefaultSourceRect; BaseControlVideo_SetDefaultTargetRect pfnSetDefaultTargetRect; BaseControlVideo_SetSourceRect pfnSetSourceRect; diff --git a/dlls/quartz/video.c b/dlls/quartz/video.c index 213e3ce92d..2d002d8de4 100644 --- a/dlls/quartz/video.c +++ b/dlls/quartz/video.c @@ -592,16 +592,16 @@ static HRESULT WINAPI basic_video_GetCurrentImage(IBasicVideo *iface, LONG *pBuf static HRESULT WINAPI basic_video_IsUsingDefaultSource(IBasicVideo *iface) { - BaseControlVideo *This = impl_from_IBasicVideo(iface); + FIXME("iface %p, stub!\n", iface); - return This->pFuncsTable->pfnIsDefaultSourceRect(This); + return S_OK; } static HRESULT WINAPI basic_video_IsUsingDefaultDestination(IBasicVideo *iface) { - BaseControlVideo *This = impl_from_IBasicVideo(iface); + FIXME("iface %p, stub!\n", iface); - return This->pFuncsTable->pfnIsDefaultTargetRect(This); + return S_OK; } static const IBasicVideoVtbl basic_video_vtbl = diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index b7a82e4faa..39d1586c77 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -352,22 +352,6 @@ static HRESULT WINAPI VideoRenderer_GetTargetRect(BaseControlVideo* iface, RECT return S_OK; } -static HRESULT WINAPI VideoRenderer_IsDefaultSourceRect(BaseControlVideo* iface) -{ - struct video_renderer *This = impl_from_BaseControlVideo(iface); - FIXME("(%p/%p)->(): stub !!!\n", This, iface); - - return S_OK; -} - -static HRESULT WINAPI VideoRenderer_IsDefaultTargetRect(BaseControlVideo* iface) -{ - struct video_renderer *This = impl_from_BaseControlVideo(iface); - FIXME("(%p/%p)->(): stub !!!\n", This, iface); - - return S_OK; -} - static HRESULT WINAPI VideoRenderer_SetDefaultSourceRect(BaseControlVideo* iface) { struct video_renderer *This = impl_from_BaseControlVideo(iface); @@ -408,8 +392,6 @@ static const BaseControlVideoFuncTable renderer_BaseControlVideoFuncTable = { VideoRenderer_GetSourceRect, VideoRenderer_GetStaticImage, VideoRenderer_GetTargetRect, - VideoRenderer_IsDefaultSourceRect, - VideoRenderer_IsDefaultTargetRect, VideoRenderer_SetDefaultSourceRect, VideoRenderer_SetDefaultTargetRect, VideoRenderer_SetSourceRect, diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index abca2a03d1..c0d6799eec 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -772,22 +772,6 @@ static HRESULT WINAPI VMR9_GetTargetRect(BaseControlVideo* This, RECT *pTargetRe return S_OK; } -static HRESULT WINAPI VMR9_IsDefaultSourceRect(BaseControlVideo* This) -{ - struct quartz_vmr* pVMR9 = impl_from_BaseControlVideo(This); - FIXME("(%p/%p)->(): stub !!!\n", pVMR9, This); - - return S_OK; -} - -static HRESULT WINAPI VMR9_IsDefaultTargetRect(BaseControlVideo* This) -{ - struct quartz_vmr* pVMR9 = impl_from_BaseControlVideo(This); - FIXME("(%p/%p)->(): stub !!!\n", pVMR9, This); - - return S_OK; -} - static HRESULT WINAPI VMR9_SetDefaultSourceRect(BaseControlVideo* This) { struct quartz_vmr* pVMR9 = impl_from_BaseControlVideo(This); @@ -828,8 +812,6 @@ static const BaseControlVideoFuncTable renderer_BaseControlVideoFuncTable = { VMR9_GetSourceRect, VMR9_GetStaticImage, VMR9_GetTargetRect, - VMR9_IsDefaultSourceRect, - VMR9_IsDefaultTargetRect, VMR9_SetDefaultSourceRect, VMR9_SetDefaultTargetRect, VMR9_SetSourceRect,

1 0

Zebediah Figura : quartz: Move the source and destination rectangles to the BaseControlVideo structure.
by Alexandre Julliard 07 May '20

07 May '20

Module: wine Branch: master Commit: 833829cb312a36bf1e7544a43b9e4aec8004d968 URL: https://source.winehq.org/git/wine.git/?a=commit;h=833829cb312a36bf1e7544a4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 6 19:28:51 2020 -0500 quartz: Move the source and destination rectangles to the BaseControlVideo structure. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/quartz_private.h | 10 +- dlls/quartz/video.c | 216 ++++++++++++++----------------------------- dlls/quartz/videorenderer.c | 68 +++----------- dlls/quartz/vmr9.c | 93 ++++++------------- 4 files changed, 111 insertions(+), 276 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=833829cb312a36bf1e75…

1 0

Zebediah Figura : quartz: Merge the BaseControlVideo object into the video_window object.
by Alexandre Julliard 07 May '20

07 May '20

Module: wine Branch: master Commit: 14b7035054a4d72e245824324f0e4db2ecc80e61 URL: https://source.winehq.org/git/wine.git/?a=commit;h=14b7035054a4d72e24582432… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 6 19:28:52 2020 -0500 quartz: Merge the BaseControlVideo object into the video_window object. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/Makefile.in | 1 - dlls/quartz/quartz_private.h | 33 +-- dlls/quartz/video.c | 581 ------------------------------------------- dlls/quartz/videorenderer.c | 59 ++--- dlls/quartz/vmr9.c | 94 +++---- dlls/quartz/window.c | 545 ++++++++++++++++++++++++++++++++++++++++ 6 files changed, 615 insertions(+), 698 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=14b7035054a4d72e2458…

1 0

Zebediah Figura : ntdll/tests: Add tests for RtlSetCurrentEnvironment().
by Alexandre Julliard 07 May '20

07 May '20

Module: wine Branch: master Commit: d98b87a317bf5b38cfc0c14e9369c9c2c20ebb17 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d98b87a317bf5b38cfc0c14e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 6 09:40:26 2020 -0500 ntdll/tests: Add tests for RtlSetCurrentEnvironment(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/env.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/dlls/ntdll/tests/env.c b/dlls/ntdll/tests/env.c index 48c9ed809e..98a9f7bb56 100644 --- a/dlls/ntdll/tests/env.c +++ b/dlls/ntdll/tests/env.c @@ -515,6 +515,72 @@ static void test_process_params(void) } } +static NTSTATUS set_env_var(WCHAR **env, const WCHAR *var, const WCHAR *value) +{ + UNICODE_STRING var_string, value_string; + RtlInitUnicodeString(&var_string, var); + RtlInitUnicodeString(&value_string, value); + return RtlSetEnvironmentVariable(env, &var_string, &value_string); +} + +static void check_env_var_(int line, const char *var, const char *value) +{ + char buffer[20]; + DWORD size = GetEnvironmentVariableA(var, buffer, sizeof(buffer)); + if (value) + { + ok_(__FILE__, line)(size == strlen(value), "wrong size %u\n", size); + ok_(__FILE__, line)(!strcmp(buffer, value), "wrong value %s\n", debugstr_a(buffer)); + } + else + { + ok_(__FILE__, line)(!size, "wrong size %u\n", size); + ok_(__FILE__, line)(GetLastError() == ERROR_ENVVAR_NOT_FOUND, "got error %u\n", GetLastError()); + } +} +#define check_env_var(a, b) check_env_var_(__LINE__, a, b) + +static void test_RtlSetCurrentEnvironment(void) +{ + NTSTATUS status; + WCHAR *old_env, *env, *prev; + BOOL ret; + + status = RtlCreateEnvironment(FALSE, &env); + ok(!status, "got %#x\n", status); + + ret = SetEnvironmentVariableA("testenv1", "heis"); + ok(ret, "got error %u\n", GetLastError()); + ret = SetEnvironmentVariableA("testenv2", "dyo"); + ok(ret, "got error %u\n", GetLastError()); + + status = set_env_var(&env, L"testenv1", L"unus"); + ok(!status, "got %#x\n", status); + status = set_env_var(&env, L"testenv3", L"tres"); + ok(!status, "got %#x\n", status); + + old_env = NtCurrentTeb()->Peb->ProcessParameters->Environment; + + RtlSetCurrentEnvironment(env, &prev); + ok(prev == old_env, "got wrong previous env %p\n", prev); + ok(NtCurrentTeb()->Peb->ProcessParameters->Environment == env, "got wrong current env\n"); + + check_env_var("testenv1", "unus"); + check_env_var("testenv2", NULL); + check_env_var("testenv3", "tres"); + check_env_var("PATH", NULL); + + RtlSetCurrentEnvironment(old_env, NULL); + ok(NtCurrentTeb()->Peb->ProcessParameters->Environment == old_env, "got wrong current env\n"); + + check_env_var("testenv1", "heis"); + check_env_var("testenv2", "dyo"); + check_env_var("testenv3", NULL); + + SetEnvironmentVariableA("testenv1", NULL); + SetEnvironmentVariableA("testenv2", NULL); +} + START_TEST(env) { HMODULE mod = GetModuleHandleA("ntdll.dll"); @@ -535,4 +601,5 @@ START_TEST(env) testSet(); testExpand(); test_process_params(); + test_RtlSetCurrentEnvironment(); }

1 0