August 2020 - Wine-Commits - list.winehq.org

Alex Henrie : urlmon: Call parse_host in combine_uri to set related parse_data fields.
by Alexandre Julliard Aug. 12, 2020

Aug. 12, 2020

Module: wine Branch: master Commit: c474c1ab3f698ffefa7ff779061620f3af63a69e URL: https://source.winehq.org/git/wine.git/?a=commit;h=c474c1ab3f698ffefa7ff779… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Aug 12 14:09:56 2020 +0200 urlmon: Call parse_host in combine_uri to set related parse_data fields. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49662 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/tests/uri.c | 29 ++++++++++++++++++++++++++++- dlls/urlmon/uri.c | 7 +++---- 2 files changed, 31 insertions(+), 5 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 29a70ad481..b1390a35bf 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -7595,7 +7595,34 @@ static const uri_combine_test uri_combine_tests[] = { {URL_SCHEME_MAILTO,S_OK}, {URLZONE_INVALID,E_NOTIMPL} } - } + }, + { "http://[::1]",0, + "/",Uri_CREATE_ALLOW_RELATIVE, + 0,S_OK,FALSE, + { + {"http://[::1]/",S_OK}, + {"[::1]",S_OK}, + {"http://[::1]/",S_OK}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"::1",S_OK}, + {"",S_FALSE}, + {"/",S_OK}, + {"/",S_OK}, + {"",S_FALSE}, + {"http://[::1]/",S_OK}, + {"http",S_OK}, + {"",S_FALSE}, + {"",S_FALSE} + }, + { + {Uri_HOST_IPV6,S_OK}, + {80,S_OK,FALSE,TRUE}, + {URL_SCHEME_HTTP,S_OK}, + {URLZONE_INVALID,E_NOTIMPL} + } + }, }; typedef struct _uri_parse_test { diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index bec7ce16a5..7f5dc15502 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -3387,7 +3387,7 @@ static HRESULT canonicalize_uri(const parse_data *data, Uri *uri, DWORD flags) { uri->scheme_type = data->scheme_type; if(!canonicalize_hierpart(data, uri, flags, FALSE)) { - ERR("(%p %p %x): Unable to canonicalize the heirpart of the URI\n", data, uri, flags); + ERR("(%p %p %x): Unable to canonicalize the hierpart of the URI\n", data, uri, flags); return E_INVALIDARG; } @@ -6512,9 +6512,8 @@ static HRESULT combine_uri(Uri *base, Uri *relative, DWORD flags, IUri **result, } if(proc_uri->host_start > -1) { - data.host = proc_uri->canon_uri+proc_uri->host_start; - data.host_len = proc_uri->host_len; - data.host_type = proc_uri->host_type; + const WCHAR *host = proc_uri->canon_uri+proc_uri->host_start; + parse_host(&host, &data, 0); } if(proc_uri->has_port) {

1 0

Zebediah Figura : vkd3d-shader: Remove the unused "ctx" field from struct vkd3d_shader_instruction.
by Alexandre Julliard Aug. 12, 2020

Aug. 12, 2020

Module: vkd3d Branch: master Commit: 3244fa3f920a31c65ff3235517e5cf1795ccc872 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3244fa3f920a31c65ff3235… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Aug 11 16:24:36 2020 -0500 vkd3d-shader: Remove the unused "ctx" field from struct vkd3d_shader_instruction. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/vkd3d_shader_private.h | 1 - 1 file changed, 1 deletion(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 21e37da..51e1dd6 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -756,7 +756,6 @@ struct vkd3d_shader_primitive_type struct vkd3d_shader_instruction { - const struct vkd3d_shader_context *ctx; enum VKD3D_SHADER_INSTRUCTION_HANDLER handler_idx; DWORD flags; unsigned int dst_count;

1 0

Zebediah Figura : vkd3d-shader: Rename vkd3d_sm4_immconst_type to vkd3d_sm4_dimension.
by Alexandre Julliard Aug. 12, 2020

Aug. 12, 2020

Module: vkd3d Branch: master Commit: 90eb138f22784313c8915e7beeb8b9e5bf457e75 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=90eb138f22784313c8915e7… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Aug 11 16:05:17 2020 -0500 vkd3d-shader: Rename vkd3d_sm4_immconst_type to vkd3d_sm4_dimension. These bits are used in all register tokens, not just immediate constants. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/dxbc.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 81c1f48..89e3c0e 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -96,8 +96,8 @@ #define VKD3D_SM4_SWIZZLE_TYPE_SHIFT 2 #define VKD3D_SM4_SWIZZLE_TYPE_MASK (0x3u << VKD3D_SM4_SWIZZLE_TYPE_SHIFT) -#define VKD3D_SM4_IMMCONST_TYPE_SHIFT 0 -#define VKD3D_SM4_IMMCONST_TYPE_MASK (0x3u << VKD3D_SM4_IMMCONST_TYPE_SHIFT) +#define VKD3D_SM4_DIMENSION_SHIFT 0 +#define VKD3D_SM4_DIMENSION_MASK (0x3u << VKD3D_SM4_DIMENSION_SHIFT) #define VKD3D_SM4_WRITEMASK_SHIFT 4 #define VKD3D_SM4_WRITEMASK_MASK (0xfu << VKD3D_SM4_WRITEMASK_SHIFT) @@ -396,10 +396,11 @@ enum vkd3d_sm4_swizzle_type VKD3D_SM4_SWIZZLE_SCALAR = 0x2, }; -enum vkd3d_sm4_immconst_type +enum vkd3d_sm4_dimension { - VKD3D_SM4_IMMCONST_SCALAR = 0x1, - VKD3D_SM4_IMMCONST_VEC4 = 0x2, + VKD3D_SM4_DIMENSION_NONE = 0x0, + VKD3D_SM4_DIMENSION_SCALAR = 0x1, + VKD3D_SM4_DIMENSION_VEC4 = 0x2, }; enum vkd3d_sm4_resource_type @@ -1573,12 +1574,11 @@ static bool shader_sm4_read_param(struct vkd3d_sm4_data *priv, const DWORD **ptr if (register_type == VKD3D_SM4_RT_IMMCONST) { - enum vkd3d_sm4_immconst_type immconst_type = - (token & VKD3D_SM4_IMMCONST_TYPE_MASK) >> VKD3D_SM4_IMMCONST_TYPE_SHIFT; + enum vkd3d_sm4_dimension dimension = (token & VKD3D_SM4_DIMENSION_MASK) >> VKD3D_SM4_DIMENSION_SHIFT; - switch (immconst_type) + switch (dimension) { - case VKD3D_SM4_IMMCONST_SCALAR: + case VKD3D_SM4_DIMENSION_SCALAR: param->immconst_type = VKD3D_IMMCONST_SCALAR; if (end - *ptr < 1) { @@ -1589,7 +1589,7 @@ static bool shader_sm4_read_param(struct vkd3d_sm4_data *priv, const DWORD **ptr *ptr += 1; break; - case VKD3D_SM4_IMMCONST_VEC4: + case VKD3D_SM4_DIMENSION_VEC4: param->immconst_type = VKD3D_IMMCONST_VEC4; if (end - *ptr < VKD3D_VEC4_SIZE) { @@ -1601,7 +1601,7 @@ static bool shader_sm4_read_param(struct vkd3d_sm4_data *priv, const DWORD **ptr break; default: - FIXME("Unhandled immediate constant type %#x.\n", immconst_type); + FIXME("Unhandled dimension %#x.\n", dimension); break; } }

1 0

Fabian Maurer : wine.inf: Map the Intl section of win.ini to the registry.
by Alexandre Julliard Aug. 11, 2020

Aug. 11, 2020

Module: wine Branch: master Commit: f3a38b88d66b27954b3cf4ced6af923a9ada7ba9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3a38b88d66b27954b3cf4ce… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Mon Aug 10 23:47:53 2020 +0200 wine.inf: Map the Intl section of win.ini to the registry. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49653 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 1 + 1 file changed, 1 insertion(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 35992a01df..8777377002 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -568,6 +568,7 @@ HKLM,%CurrentVersionNT%\Image File Execution Options,,16 HKLM,%CurrentVersionNT%\IniFileMapping\win.ini,"desktop",,"USR:Control Panel\Desktop" HKLM,%CurrentVersionNT%\IniFileMapping\win.ini,"devices",,"USR:Software\Microsoft\Windows NT\CurrentVersion\Devices" HKLM,%CurrentVersionNT%\IniFileMapping\win.ini,"extensions",,"USR:Software\Microsoft\Windows NT\CurrentVersion\Extensions" +HKLM,%CurrentVersionNT%\IniFileMapping\win.ini,"intl",,"USR:Control Panel\International" HKLM,%CurrentVersionNT%\IniFileMapping\win.ini,"printerports",,"USR:Software\Microsoft\Windows NT\CurrentVersion\PrinterPorts" HKLM,%CurrentVersionNT%\IniFileMapping\win.ini,"sounds",,"USR:Control Panel\Sounds" HKLM,%CurrentVersionNT%\IniFileMapping\win.ini\windows,,,"USR:Software\Microsoft\Windows NT\CurrentVersion\Windows"

1 0

Brendan Shanks : ntdll: Pad HEAP structure so 'flags' offset matches recent Windows.
by Alexandre Julliard Aug. 11, 2020

Aug. 11, 2020

Module: wine Branch: master Commit: fd80e0300cbec55fe637714d3b02128616cdd570 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd80e0300cbec55fe637714d… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Fri Aug 7 11:40:52 2020 -0700 ntdll: Pad HEAP structure so 'flags' offset matches recent Windows. Needed for Red Dead Redemption 2 to pass anti-debugger checks, it accesses 'flags' and 'force_flags' at a fixed offset of the ProcessHeap. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49666 Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/heap.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index f3c76cc82b..1ac0cb2480 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -145,7 +145,13 @@ typedef struct tagSUBHEAP typedef struct tagHEAP { DWORD_PTR unknown1[2]; - DWORD unknown2; + DWORD unknown2[2]; + DWORD_PTR unknown3[4]; + DWORD unknown4; + DWORD_PTR unknown5[2]; + DWORD unknown6[3]; + DWORD_PTR unknown7[2]; + /* For Vista through 10, 'flags' is at offset 0x40 (x86) / 0x70 (x64) */ DWORD flags; /* Heap flags */ DWORD force_flags; /* Forced heap flags for debugging */ SUBHEAP subheap; /* First sub-heap */

1 0

Shawn M. Chapla : gdiplus/tests: Add metafile null frame rect GDI/GDI+ interop test case.
by Alexandre Julliard Aug. 11, 2020

Aug. 11, 2020

Module: wine Branch: master Commit: 14bf19ec5e09931af2c90cbee91bf2164cc3517b URL: https://source.winehq.org/git/wine.git/?a=commit;h=14bf19ec5e09931af2c90cbe… Author: Shawn M. Chapla <schapla(a)codeweavers.com> Date: Mon Aug 10 16:44:36 2020 -0400 gdiplus/tests: Add metafile null frame rect GDI/GDI+ interop test case. Signed-off-by: Shawn M. Chapla <schapla(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/metafile.c | 58 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index 47978d64d8..e047c9a421 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -1374,6 +1374,64 @@ static void test_nullframerect(void) { stat = GdipDisposeImage((GpImage*)metafile); expect(Ok, stat); + + hdc = CreateCompatibleDC(0); + + stat = GdipRecordMetafile(hdc, EmfTypeEmfPlusOnly, NULL, MetafileFrameUnitMillimeter, + description, &metafile); + expect(Ok, stat); + + DeleteDC(hdc); + + stat = GdipGetImageGraphicsContext((GpImage*)metafile, &graphics); + expect(Ok, stat); + + stat = GdipGetDC(graphics, &metafile_dc); + expect(Ok, stat); + + if (stat != Ok) + { + GdipDeleteGraphics(graphics); + GdipDisposeImage((GpImage*)metafile); + return; + } + + hbrush = CreateSolidBrush(0xff0000); + + holdbrush = SelectObject(metafile_dc, hbrush); + + Rectangle(metafile_dc, 25, 25, 75, 75); + + SelectObject(metafile_dc, holdbrush); + + DeleteObject(hbrush); + + stat = GdipReleaseDC(graphics, metafile_dc); + expect(Ok, stat); + + stat = GdipCreateSolidFill((ARGB)0xff0000ff, (GpSolidFill**)&brush); + expect(Ok, stat); + + stat = GdipFillRectangleI(graphics, brush, 20, 40, 10, 70); + expect(Ok, stat); + + stat = GdipDeleteBrush(brush); + expect(Ok, stat); + + stat = GdipDeleteGraphics(graphics); + expect(Ok, stat); + + stat = GdipGetImageBounds((GpImage*)metafile, &bounds, &unit); + expect(Ok, stat); + expect(UnitPixel, unit); + todo_wine expectf_(20.0, bounds.X, 0.05); + todo_wine expectf_(25.0, bounds.Y, 0.05); + todo_wine expectf_(55.0, bounds.Width, 1.00); + todo_wine expectf_(55.0, bounds.Width, 0.05); + todo_wine expectf_(85.0, bounds.Height, 0.05); + + stat = GdipDisposeImage((GpImage*)metafile); + expect(Ok, stat); } static const emfplus_record pagetransform_records[] = {

1 0

Vijay Kiran Kamuju : include: Add missing WAVEBANKENTRY_FLAGS to xact3wb.h.
by Alexandre Julliard Aug. 11, 2020

Aug. 11, 2020

Module: wine Branch: master Commit: f810a1ee8b95fe9aa01300ff0146188b6f79d351 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f810a1ee8b95fe9aa01300ff… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Mon Aug 10 18:14:51 2020 +0200 include: Add missing WAVEBANKENTRY_FLAGS to xact3wb.h. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/xact3wb.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/xact3wb.h b/include/xact3wb.h index 81b1518930..6d157a466f 100644 --- a/include/xact3wb.h +++ b/include/xact3wb.h @@ -105,6 +105,12 @@ typedef const WAVEBANKHEADER *LPCWAVEBANKHEADER; #define WAVEBANKENTRY_XMASTREAMS_MAX 3 #define WAVEBANKENTRY_XMACHANNELS_MAX 6 +#define WAVEBANKENTRY_FLAGS_READAHEAD 0x00000001 +#define WAVEBANKENTRY_FLAGS_LOOPCACHE 0x00000002 +#define WAVEBANKENTRY_FLAGS_REMOVELOOPTAIL 0x00000004 +#define WAVEBANKENTRY_FLAGS_IGNORELOOP 0x00000008 +#define WAVEBANKENTRY_FLAGS_MASK 0x00000008 + typedef struct WAVEBANKENTRY { union

1 0

Vijay Kiran Kamuju : include: Fix the spelling of XACT_WAVE_STREAMING_PARAMETERS in xact3.h.
by Alexandre Julliard Aug. 11, 2020

Aug. 11, 2020

Module: wine Branch: master Commit: 369723014c93c6d14c5415d7a5c9627f9dc8975e URL: https://source.winehq.org/git/wine.git/?a=commit;h=369723014c93c6d14c5415d7… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Tue Aug 11 10:43:02 2020 +0200 include: Fix the spelling of XACT_WAVE_STREAMING_PARAMETERS in xact3.h. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xactengine3_7/xact_dll.c | 2 +- include/xact3.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/xactengine3_7/xact_dll.c b/dlls/xactengine3_7/xact_dll.c index 0ac0d914b3..c5f96decb7 100644 --- a/dlls/xactengine3_7/xact_dll.c +++ b/dlls/xactengine3_7/xact_dll.c @@ -912,7 +912,7 @@ static HRESULT WINAPI IXACT3EngineImpl_CreateInMemoryWaveBank(IXACT3Engine *ifac } static HRESULT WINAPI IXACT3EngineImpl_CreateStreamingWaveBank(IXACT3Engine *iface, - const XACT_STREAMING_PARAMETERS *pParms, + const XACT_WAVEBANK_STREAMING_PARAMETERS *pParms, IXACT3WaveBank **ppWaveBank) { XACT3EngineImpl *This = impl_from_IXACT3Engine(iface); diff --git a/include/xact3.h b/include/xact3.h index 2b4f0e07f3..63eec70736 100644 --- a/include/xact3.h +++ b/include/xact3.h @@ -225,9 +225,9 @@ typedef struct XACT_STREAMING_PARAMETERS DWORD offset; DWORD flags; WORD packetSize; -} XACT_STREAMING_PARAMETERS, *LPXACT_STREAMING_PARAMETERS, XACT_WAVE_STREAMING_PARAMETERS, *LPXACT_WAVE_STREAMING_PARAMETERS; +} XACT_STREAMING_PARAMETERS, *LPXACT_STREAMING_PARAMETERS, XACT_WAVEBANK_STREAMING_PARAMETERS, *LPXACT_WAVEBANK_STREAMING_PARAMETERS; typedef const XACT_STREAMING_PARAMETERS *LPCXACT_STREAMING_PARAMETERS; -typedef const XACT_WAVE_STREAMING_PARAMETERS *LPCXACT_WAVE_STREAMING_PARAMETERS; +typedef const XACT_WAVEBANK_STREAMING_PARAMETERS *LPCXACT_WAVEBANK_STREAMING_PARAMETERS; typedef struct XACT_CUE_PROPERTIES { @@ -674,7 +674,7 @@ DECLARE_INTERFACE_(IXACT3Engine,IUnknown) STDMETHOD(DoWork)(THIS) PURE; STDMETHOD(CreateSoundBank)(THIS_ const void *pvBuffer, DWORD dwSize, DWORD dwFlags, DWORD dwAllocAttributes, IXACT3SoundBank **ppSoundBank) PURE; STDMETHOD(CreateInMemoryWaveBank)(THIS_ const void *pvBuffer, DWORD dwSize, DWORD dwFlags, DWORD dwAllocAttributes, IXACT3WaveBank **ppWaveBank) PURE; - STDMETHOD(CreateStreamingWaveBank)(THIS_ const XACT_WAVE_STREAMING_PARAMETERS *pParams, IXACT3WaveBank **ppWaveBank) PURE; + STDMETHOD(CreateStreamingWaveBank)(THIS_ const XACT_WAVEBANK_STREAMING_PARAMETERS *pParams, IXACT3WaveBank **ppWaveBank) PURE; STDMETHOD(PrepareWave)(THIS_ DWORD dwFlags, PCSTR szWavePath, WORD wStreamingPacketSize, DWORD dwAlignment, DWORD dwPlayOffset, XACTLOOPCOUNT nLoopCount, IXACT3Wave **ppWave) PURE; STDMETHOD(PrepareInMemoryWave)(THIS_ DWORD dwFlags, WAVEBANKENTRY entry, DWORD *pdwSeekTable, BYTE *pbWaveData,

1 0

Shawn M. Chapla : gdiplus: Incorporate GDI frame into metafile auto-frame before scaling.
by Alexandre Julliard Aug. 11, 2020

Aug. 11, 2020

Module: wine Branch: master Commit: 03e9de4920173d3fa955cf28a8d2b60bd3b06261 URL: https://source.winehq.org/git/wine.git/?a=commit;h=03e9de4920173d3fa955cf28… Author: Shawn M. Chapla <schapla(a)codeweavers.com> Date: Mon Aug 10 16:44:37 2020 -0400 gdiplus: Incorporate GDI frame into metafile auto-frame before scaling. Signed-off-by: Shawn M. Chapla <schapla(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 22 +++++++++++++--------- dlls/gdiplus/tests/metafile.c | 8 ++++---- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index e0ff6cae7a..350642e020 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -1652,20 +1652,24 @@ GpStatus METAFILE_GraphicsDeleted(GpMetafile* metafile) BYTE* buffer; UINT buffer_size; + gdi_bounds_rc = header.u.EmfHeader.rclBounds; + if (gdi_bounds_rc.right > gdi_bounds_rc.left && + gdi_bounds_rc.bottom > gdi_bounds_rc.top) + { + GpPointF *af_min = &metafile->auto_frame_min; + GpPointF *af_max = &metafile->auto_frame_max; + + af_min->X = fmin(af_min->X, gdi_bounds_rc.left); + af_min->Y = fmin(af_min->Y, gdi_bounds_rc.top); + af_max->X = fmax(af_max->X, gdi_bounds_rc.right); + af_max->Y = fmax(af_max->Y, gdi_bounds_rc.bottom); + } + bounds_rc.left = floorf(metafile->auto_frame_min.X * x_scale); bounds_rc.top = floorf(metafile->auto_frame_min.Y * y_scale); bounds_rc.right = ceilf(metafile->auto_frame_max.X * x_scale); bounds_rc.bottom = ceilf(metafile->auto_frame_max.Y * y_scale); - gdi_bounds_rc = header.u.EmfHeader.rclBounds; - if (gdi_bounds_rc.right > gdi_bounds_rc.left && gdi_bounds_rc.bottom > gdi_bounds_rc.top) - { - bounds_rc.left = min(bounds_rc.left, gdi_bounds_rc.left); - bounds_rc.top = min(bounds_rc.top, gdi_bounds_rc.top); - bounds_rc.right = max(bounds_rc.right, gdi_bounds_rc.right); - bounds_rc.bottom = max(bounds_rc.bottom, gdi_bounds_rc.bottom); - } - buffer_size = GetEnhMetaFileBits(metafile->hemf, 0, NULL); buffer = heap_alloc(buffer_size); if (buffer) diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index e047c9a421..33fff3f98c 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -1424,11 +1424,11 @@ static void test_nullframerect(void) { stat = GdipGetImageBounds((GpImage*)metafile, &bounds, &unit); expect(Ok, stat); expect(UnitPixel, unit); - todo_wine expectf_(20.0, bounds.X, 0.05); - todo_wine expectf_(25.0, bounds.Y, 0.05); - todo_wine expectf_(55.0, bounds.Width, 1.00); + expectf_(20.0, bounds.X, 0.05); + expectf_(25.0, bounds.Y, 0.05); + expectf_(55.0, bounds.Width, 1.00); todo_wine expectf_(55.0, bounds.Width, 0.05); - todo_wine expectf_(85.0, bounds.Height, 0.05); + expectf_(85.0, bounds.Height, 0.05); stat = GdipDisposeImage((GpImage*)metafile); expect(Ok, stat);

1 0

Hans Leidekker : ws2_32: Avoid a crash in WS_getaddrinfo when the specified service doesn't exist.
by Alexandre Julliard Aug. 11, 2020

Aug. 11, 2020

Module: wine Branch: master Commit: a6d9f46b25a481648a2a06ed8d1594fc59a4e313 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6d9f46b25a481648a2a06ed… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Aug 11 14:11:05 2020 +0200 ws2_32: Avoid a crash in WS_getaddrinfo when the specified service doesn't exist. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49656 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 2 +- dlls/ws2_32/tests/sock.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index eb21e4b4b3..4d2afa946b 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -6787,7 +6787,7 @@ int WINAPI WS_getaddrinfo(LPCSTR nodename, LPCSTR servname, const struct WS_addr result = getaddrinfo(node, servname, punixhints, &unixaires); if (result && (!hints || !(hints->ai_flags & WS_AI_NUMERICHOST)) - && (!strcmp(fqdn, node) || (!strncmp(fqdn, node, hostname_len) && !node[hostname_len]))) + && node && (!strcmp(fqdn, node) || (!strncmp(fqdn, node, hostname_len) && !node[hostname_len]))) { /* If it didn't work it means the host name IP is not in /etc/hosts, try again * by sending a NULL host and avoid sending a NULL servname too because that diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index b7a3fc4453..b523c326d6 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -7778,6 +7778,10 @@ static void test_getaddrinfo(void) ok(0, "test %d: getaddrinfo failed with %d (err %d)\n", i, ret, err); } } + + memset(&hint, 0, sizeof(hint)); + ret = pgetaddrinfo(NULL, "nonexistentservice", &hint, &result); + ok(ret == WSATYPE_NOT_FOUND, "got %d\n", ret); } static void test_ConnectEx(void)

1 0