October 2018 - Wine-Devel - list.winehq.org

[PATCH 1/3] msi: Rename msi_reset_folders to msi_reset_source_folders.
by Hans Leidekker Oct. 10, 2018

Oct. 10, 2018

It was always called with source parameter set to TRUE. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msi/action.c | 4 ++-- dlls/msi/appsearch.c | 2 +- dlls/msi/custom.c | 2 +- dlls/msi/dialog.c | 2 +- dlls/msi/msipriv.h | 2 +- dlls/msi/package.c | 16 ++++------------ dlls/msi/upgrade.c | 2 +- 7 files changed, 11 insertions(+), 19 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index f2a038bc41..8ae9dce57a 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -368,7 +368,7 @@ UINT msi_parse_command_line( MSIPACKAGE *package, LPCWSTR szCommandLine, r = msi_set_property( package->db, prop, val, -1 ); if (r == ERROR_SUCCESS && !strcmpW( prop, szSourceDir )) - msi_reset_folders( package, TRUE ); + msi_reset_source_folders( package ); msi_free( val ); msi_free( prop ); @@ -486,7 +486,7 @@ UINT msi_set_sourcedir_props(MSIPACKAGE *package, BOOL replace) { UINT r = msi_set_property( package->db, szSourceDir, source, -1 ); if (r == ERROR_SUCCESS) - msi_reset_folders( package, TRUE ); + msi_reset_source_folders( package ); } msi_free( check ); diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index fbed073bd4..806365191d 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -1107,7 +1107,7 @@ static UINT iterate_appsearch(MSIRECORD *row, LPVOID param) { r = msi_set_property( package->db, propName, value, -1 ); if (r == ERROR_SUCCESS && !strcmpW( propName, szSourceDir )) - msi_reset_folders( package, TRUE ); + msi_reset_source_folders( package ); msi_free(value); } diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index a0fc3dd350..97bde52a29 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -1408,7 +1408,7 @@ UINT ACTION_CustomAction(MSIPACKAGE *package, const WCHAR *action) len = deformat_string( package, target, &deformated ); rc = msi_set_property( package->db, source, deformated, len ); if (rc == ERROR_SUCCESS && !strcmpW( source, szSourceDir )) - msi_reset_folders( package, TRUE ); + msi_reset_source_folders( package ); msi_free(deformated); break; case 37: /* JScript/VBScript text stored in target column. */ diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index b01374f5e1..6184da84f1 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -577,7 +577,7 @@ static void msi_dialog_set_property( MSIPACKAGE *package, LPCWSTR property, LPCW { UINT r = msi_set_property( package->db, property, value, -1 ); if (r == ERROR_SUCCESS && !strcmpW( property, szSourceDir )) - msi_reset_folders( package, TRUE ); + msi_reset_source_folders( package ); } static MSIFEATURE *msi_seltree_feature_from_item( HWND hwnd, HTREEITEM hItem ) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 10031d61de..1710850ebe 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -1025,7 +1025,7 @@ extern void msi_resolve_target_folder(MSIPACKAGE *package, const WCHAR *name, BO extern WCHAR *msi_normalize_path(const WCHAR *) DECLSPEC_HIDDEN; extern WCHAR *msi_resolve_file_source(MSIPACKAGE *package, MSIFILE *file) DECLSPEC_HIDDEN; extern const WCHAR *msi_get_target_folder(MSIPACKAGE *package, const WCHAR *name) DECLSPEC_HIDDEN; -extern void msi_reset_folders( MSIPACKAGE *package, BOOL source ) DECLSPEC_HIDDEN; +extern void msi_reset_source_folders( MSIPACKAGE *package ) DECLSPEC_HIDDEN; extern MSICOMPONENT *msi_get_loaded_component(MSIPACKAGE *package, const WCHAR *Component) DECLSPEC_HIDDEN; extern MSIFEATURE *msi_get_loaded_feature(MSIPACKAGE *package, const WCHAR *Feature) DECLSPEC_HIDDEN; extern MSIFILE *msi_get_loaded_file(MSIPACKAGE *package, const WCHAR *file) DECLSPEC_HIDDEN; diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 39a0a939b7..6ac73a3a3f 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -2154,22 +2154,14 @@ end: return r; } -void msi_reset_folders( MSIPACKAGE *package, BOOL source ) +void msi_reset_source_folders( MSIPACKAGE *package ) { MSIFOLDER *folder; LIST_FOR_EACH_ENTRY( folder, &package->folders, MSIFOLDER, entry ) { - if ( source ) - { - msi_free( folder->ResolvedSource ); - folder->ResolvedSource = NULL; - } - else - { - msi_free( folder->ResolvedTarget ); - folder->ResolvedTarget = NULL; - } + msi_free( folder->ResolvedSource ); + folder->ResolvedSource = NULL; } } @@ -2263,7 +2255,7 @@ UINT WINAPI MsiSetPropertyW( MSIHANDLE hInstall, LPCWSTR szName, LPCWSTR szValue ret = msi_set_property( package->db, szName, szValue, -1 ); if (ret == ERROR_SUCCESS && !strcmpW( szName, szSourceDir )) - msi_reset_folders( package, TRUE ); + msi_reset_source_folders( package ); msiobj_release( &package->hdr ); return ret; diff --git a/dlls/msi/upgrade.c b/dlls/msi/upgrade.c index bbc7df6eec..36d65be8fe 100644 --- a/dlls/msi/upgrade.c +++ b/dlls/msi/upgrade.c @@ -90,7 +90,7 @@ static void append_productcode(MSIPACKAGE* package, LPCWSTR action_property, r = msi_set_property( package->db, action_property, newprop, -1 ); if (r == ERROR_SUCCESS && !strcmpW( action_property, szSourceDir )) - msi_reset_folders( package, TRUE ); + msi_reset_source_folders( package ); TRACE("Found Related Product... %s now %s\n", debugstr_w(action_property), debugstr_w(newprop)); -- 2.11.0

1 0

[PATCH v2 1/2] gdi32: Remove unnecessary operations.
by Byeongsik Jeon Oct. 10, 2018

Oct. 10, 2018

The rgb part works from text rendering to alpha value. The '24' part is an unnecessary operation. Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> --- v2: Separated into two patches by Huw Davies's comment. dlls/gdi32/freetype.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index b95d223138..4a65a9f6c3 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -7422,15 +7422,13 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, { dst[x] = ((unsigned int)src[hmul * x + rgb_interval * 0] << 16) | ((unsigned int)src[hmul * x + rgb_interval * 1] << 8) | - ((unsigned int)src[hmul * x + rgb_interval * 2] << 0) | - ((unsigned int)src[hmul * x + rgb_interval * 1] << 24) ; + ((unsigned int)src[hmul * x + rgb_interval * 2] << 0); } else { dst[x] = ((unsigned int)src[hmul * x + rgb_interval * 2] << 16) | ((unsigned int)src[hmul * x + rgb_interval * 1] << 8) | - ((unsigned int)src[hmul * x + rgb_interval * 0] << 0) | - ((unsigned int)src[hmul * x + rgb_interval * 1] << 24) ; + ((unsigned int)src[hmul * x + rgb_interval * 0] << 0); } } src += src_pitch * vmul; -- 2.19.1

2 3

Unable to compile MFC application with libwine
by Jelle De Loecker Oct. 10, 2018

Oct. 10, 2018

Greetings, I've been following the Winelib User Guide (https://wiki.winehq.org/Winelib_User%27s_Guide) in order to compile an old Visual Studio C++ game. The code is from about 1999, fyi. I'm using winemaker to create my Makefile, like so: winemaker --lower-uppercase --mfc "Kipdola.dsp" This seems to work fine, but when I try to `make` it I get this error: stdafx.h:14:10: fatal error: afxwin.h: No such file or directory #include <afxwin.h> `stdafx.h` is a file in my project's folder, and it then tries to include `afxwin.h` (which I assume is an MFC file), but fails. The guide isn't entirely clear on where these files should come from, but after some googling I came to realize I had to supply these myself in some way. So I installed Vistual Studio 6 in my main `.wine` prefix. This didn't really help, though. I still get the same error. I see the Makefile has this declaration in the "Common settings" section: INCLUDE_PATH = $(MFC_INCLUDE_PATH) I don't think this `MFC_INCLUDE_PATH` has been defined anywhere, so I tried to compile it like this: MFC_INCLUDE_PATH=/home/skerit/VC98/MFC/INCLUDE/ make But I still got the same error. (And yes, I also ran `winemaker` in THAT include folder, as all files were uppercased) I also tried to change the include statement to `#include "afxwin.h"`, but that also did nothing. So does anyone know where it's going wrong and what I can do to fix it? Greetings, Jelle De Loecker

1 0

[PATCH 1/2] widl: Fix detection of SAFEARRAY pointers when writing array pointers.
by Zebediah Figura Oct. 9, 2018

Oct. 9, 2018

This code was introduced in 7d1e3691, but that commit did not account for pointers to normal C arrays. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- tools/widl/typelib.c | 4 ++-- tools/widl/write_msft.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/widl/typelib.c b/tools/widl/typelib.c index e8dfcb1..2ebb50e 100644 --- a/tools/widl/typelib.c +++ b/tools/widl/typelib.c @@ -200,10 +200,10 @@ unsigned short get_type_vt(type_t *t) { if (match(type_array_get_element(t)->name, "SAFEARRAY")) return VT_SAFEARRAY; + return VT_PTR; } else - error("get_type_vt: array types not supported\n"); - return VT_PTR; + return VT_CARRAY; case TYPE_INTERFACE: if(match(t->name, "IUnknown")) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 913e1a6..9357fd8 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -1113,7 +1113,7 @@ static int encode_var( if (target_type & 0x80000000) { mix_field = ((target_type >> 16) & 0x3fff) | VT_BYREF; - } else if (is_array(ref)) { + } else if (get_type_vt(ref) == VT_SAFEARRAY) { type_t *element_type = type_alias_get_aliasee(type_array_get_element(ref)); mix_field = get_type_vt(element_type) | VT_ARRAY | VT_BYREF; } else { -- 2.7.4

1 1

[PATCH 4/7] wined3d: Implement depth bias clamp.
by Henri Verbeet Oct. 9, 2018

Oct. 9, 2018

From: Zebediah Figura <z.figura12(a)gmail.com> Based on a patch by Michael Müller. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d11/state.c | 1 + dlls/wined3d/adapter_gl.c | 8 +++++++- dlls/wined3d/state.c | 18 ++++++++++++++++-- dlls/wined3d/wined3d_gl.h | 1 + include/wine/wined3d.h | 1 + 5 files changed, 26 insertions(+), 3 deletions(-) diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index c36b87fbbd3..6de35029556 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -1081,6 +1081,7 @@ static HRESULT d3d_rasterizer_state_init(struct d3d_rasterizer_state *state, str wined3d_desc.front_ccw = desc->FrontCounterClockwise; wined3d_desc.depth_clip = desc->DepthClipEnable; + wined3d_desc.depth_bias_clamp = desc->DepthBiasClamp; /* We cannot fail after creating a wined3d_rasterizer_state object. It * would lead to double free. */ diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index b62c86a8d0c..16a26b88ba6 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -103,6 +103,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_pixel_buffer_object", ARB_PIXEL_BUFFER_OBJECT }, {"GL_ARB_point_parameters", ARB_POINT_PARAMETERS }, {"GL_ARB_point_sprite", ARB_POINT_SPRITE }, + {"GL_ARB_polygon_offset_clamp", ARB_POLYGON_OFFSET_CLAMP }, {"GL_ARB_provoking_vertex", ARB_PROVOKING_VERTEX }, {"GL_ARB_query_buffer_object", ARB_QUERY_BUFFER_OBJECT }, {"GL_ARB_sample_shading", ARB_SAMPLE_SHADING }, @@ -1254,7 +1255,9 @@ static enum wined3d_feature_level feature_level_from_caps(const struct wined3d_g shader_model = min(shader_model, max(shader_caps->hs_version, 4)); shader_model = min(shader_model, max(shader_caps->ds_version, 4)); - if (gl_info->supported[WINED3D_GL_VERSION_3_2] && gl_info->supported[ARB_SAMPLER_OBJECTS]) + if (gl_info->supported[WINED3D_GL_VERSION_3_2] + && gl_info->supported[ARB_POLYGON_OFFSET_CLAMP] + && gl_info->supported[ARB_SAMPLER_OBJECTS]) { if (shader_model >= 5 && gl_info->supported[ARB_DRAW_INDIRECT] @@ -2172,6 +2175,8 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) /* GL_ARB_point_parameters */ USE_GL_FUNC(glPointParameterfARB) USE_GL_FUNC(glPointParameterfvARB) + /* GL_ARB_polgyon_offset_clamp */ + USE_GL_FUNC(glPolygonOffsetClamp) /* GL_ARB_provoking_vertex */ USE_GL_FUNC(glProvokingVertex) /* GL_ARB_sample_shading */ @@ -3316,6 +3321,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, {ARB_SHADER_TEXTURE_IMAGE_SAMPLES, MAKEDWORD_VERSION(4, 5)}, {ARB_PIPELINE_STATISTICS_QUERY, MAKEDWORD_VERSION(4, 6)}, + {ARB_POLYGON_OFFSET_CLAMP, MAKEDWORD_VERSION(4, 6)}, {ARB_TEXTURE_FILTER_ANISOTROPIC, MAKEDWORD_VERSION(4, 6)}, }; struct wined3d_driver_info *driver_info = &adapter->driver_info; diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 3b2f84538db..375bc6562ab 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1775,7 +1775,7 @@ static void state_depthbias(struct wined3d_context *context, const struct wined3 || state->render_states[WINED3D_RS_DEPTHBIAS]) { const struct wined3d_rendertarget_view *depth = state->fb->depth_stencil; - float factor, units, scale; + float factor, units, scale, clamp; union { @@ -1783,6 +1783,7 @@ static void state_depthbias(struct wined3d_context *context, const struct wined3 float f; } scale_bias, const_bias; + clamp = state->rasterizer_state ? state->rasterizer_state->desc.depth_bias_clamp : 0.0f; scale_bias.d = state->render_states[WINED3D_RS_SLOPESCALEDEPTHBIAS]; const_bias.d = state->render_states[WINED3D_RS_DEPTHBIAS]; @@ -1811,7 +1812,16 @@ static void state_depthbias(struct wined3d_context *context, const struct wined3 } gl_info->gl_ops.gl.p_glEnable(GL_POLYGON_OFFSET_FILL); - gl_info->gl_ops.gl.p_glPolygonOffset(factor, units); + if (gl_info->supported[ARB_POLYGON_OFFSET_CLAMP]) + { + gl_info->gl_ops.ext.p_glPolygonOffsetClamp(factor, units, clamp); + } + else + { + if (clamp != 0.0f) + WARN("Ignoring depth bias clamp %.8e.\n", clamp); + gl_info->gl_ops.gl.p_glPolygonOffset(factor, units); + } } else { @@ -4345,6 +4355,8 @@ static void rasterizer(struct wined3d_context *context, const struct wined3d_sta gl_info->gl_ops.gl.p_glFrontFace(mode); checkGLcall("glFrontFace"); + if (!isStateDirty(context, STATE_RENDER(WINED3D_RS_DEPTHBIAS))) + state_depthbias(context, state, STATE_RENDER(WINED3D_RS_DEPTHBIAS)); depth_clip(state->rasterizer_state, gl_info); } @@ -4357,6 +4369,8 @@ static void rasterizer_cc(struct wined3d_context *context, const struct wined3d_ gl_info->gl_ops.gl.p_glFrontFace(mode); checkGLcall("glFrontFace"); + if (!isStateDirty(context, STATE_RENDER(WINED3D_RS_DEPTHBIAS))) + state_depthbias(context, state, STATE_RENDER(WINED3D_RS_DEPTHBIAS)); depth_clip(state->rasterizer_state, gl_info); } diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 2a985da9faf..a02073c28af 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -89,6 +89,7 @@ enum wined3d_gl_extension ARB_PIXEL_BUFFER_OBJECT, ARB_POINT_PARAMETERS, ARB_POINT_SPRITE, + ARB_POLYGON_OFFSET_CLAMP, ARB_PROVOKING_VERTEX, ARB_QUERY_BUFFER_OBJECT, ARB_SAMPLE_SHADING, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 8197a8682ae..c62d3640e58 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2012,6 +2012,7 @@ struct wined3d_blend_state_desc struct wined3d_rasterizer_state_desc { BOOL front_ccw; + float depth_bias_clamp; BOOL depth_clip; }; -- 2.11.0

3 2

[PATCH vkd3d 4/7] tests: Clear RTV outside pipeline statistics query.
by Józef Kucia Oct. 9, 2018

Oct. 9, 2018

From: Józef Kucia <jkucia(a)codeweavers.com> On RADV additional vertices generated by clears are also counted. The Vulkan spec allows this behavior: "Rendering operations such as clears, MSAA resolves, attachment load/store operations, and blits may count towards the results of queries." Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index dd842bc461ae..73f4da96686a 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -16898,11 +16898,11 @@ static void test_query_pipeline_statistics(void) ID3D12GraphicsCommandList_ResolveQueryData(command_list, query_heap, D3D12_QUERY_TYPE_PIPELINE_STATISTICS, 0, 1, resource, 0); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + /* Second query: draw something simple. */ ID3D12GraphicsCommandList_BeginQuery(command_list, query_heap, D3D12_QUERY_TYPE_PIPELINE_STATISTICS, 1); - ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); - ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); -- 2.18.0

3 3

[v3 PATCH] wincodecs/icoformat: Improve input data validation on decoder initialization.
by Nikolay Sivov Oct. 9, 2018

Oct. 9, 2018

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v3: simplify further dlls/windowscodecs/icoformat.c | 34 ++++- dlls/windowscodecs/tests/icoformat.c | 207 ++++++++++++++++++--------- 2 files changed, 173 insertions(+), 68 deletions(-) diff --git a/dlls/windowscodecs/icoformat.c b/dlls/windowscodecs/icoformat.c index 5e38ee0d0f..dc08fd5576 100644 --- a/dlls/windowscodecs/icoformat.c +++ b/dlls/windowscodecs/icoformat.c @@ -511,6 +511,9 @@ static HRESULT WINAPI IcoDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p LARGE_INTEGER seek; HRESULT hr; ULONG bytesread; + STATSTG statstg; + unsigned int i; + TRACE("(%p,%p,%x)\n", iface, pIStream, cacheOptions); EnterCriticalSection(&This->lock); @@ -527,14 +530,41 @@ static HRESULT WINAPI IcoDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p hr = IStream_Read(pIStream, &This->header, sizeof(ICONHEADER), &bytesread); if (FAILED(hr)) goto end; - if (bytesread != sizeof(ICONHEADER) || - This->header.idReserved != 0 || + + if (bytesread != sizeof(ICONHEADER)) + { + hr = WINCODEC_ERR_STREAMREAD; + goto end; + } + + if (This->header.idReserved != 0 || This->header.idType != 1) { hr = E_FAIL; goto end; } + hr = IStream_Stat(pIStream, &statstg, STATFLAG_NONAME); + if (FAILED(hr)) + { + WARN("Stat() failed, hr %#x.\n", hr); + goto end; + } + + for (i = 0; i < This->header.idCount; i++) + { + ICONDIRENTRY direntry; + + hr = IStream_Read(pIStream, &direntry, sizeof(direntry), &bytesread); + if (FAILED(hr)) goto end; + + if (bytesread != sizeof(direntry) || (direntry.dwDIBSize + direntry.dwDIBOffset > statstg.cbSize.QuadPart)) + { + hr = WINCODEC_ERR_BADIMAGE; + goto end; + } + } + This->initialized = TRUE; This->stream = pIStream; IStream_AddRef(pIStream); diff --git a/dlls/windowscodecs/tests/icoformat.c b/dlls/windowscodecs/tests/icoformat.c index c53739dbd6..38db51c376 100644 --- a/dlls/windowscodecs/tests/icoformat.c +++ b/dlls/windowscodecs/tests/icoformat.c @@ -26,72 +26,114 @@ #include "wincodec.h" #include "wine/test.h" -static unsigned char testico_bad_icondirentry_size[] = { - /* ICONDIR */ - 0, 0, /* reserved */ - 1, 0, /* type */ - 1, 0, /* count */ +#include "pshpack1.h" + +struct ICONHEADER +{ + WORD idReserved; + WORD idType; + WORD idCount; +}; + +struct ICONDIRENTRY +{ + BYTE bWidth; + BYTE bHeight; + BYTE bColorCount; + BYTE bReserved; + WORD wPlanes; + WORD wBitCount; + DWORD dwDIBSize; + DWORD dwDIBOffset; +}; + +struct test_ico +{ + struct ICONHEADER header; + struct ICONDIRENTRY direntry; + BITMAPINFOHEADER bmi; + unsigned char data[512]; +}; + +static const struct test_ico ico_1 = +{ + /* ICONHEADER */ + { + 0, /* reserved */ + 1, /* type */ + 1, /* count */ + }, /* ICONDIRENTRY */ - 2, /* width */ - 2, /* height */ - 2, /* colorCount */ - 0, /* reserved */ - 1,0, /* planes */ - 8,0, /* bitCount */ - (40+2*4+16*16+16*4) & 0xFF,((40+2*4+16*16+16*4) >> 8) & 0xFF,0,0, /* bytesInRes */ - 22,0,0,0, /* imageOffset */ + { + 16, /* width */ + 16, /* height */ + 2, /* color count */ + 0, /* reserved */ + 1, /* planes */ + 8, /* bitcount*/ + 40 + 2*4 + 16 * 16 + 16 * 4, /* data size */ + 22 /* data offset */ + }, /* BITMAPINFOHEADER */ - 40,0,0,0, /* header size */ - 16,0,0,0, /* width */ - 2*16,0,0,0, /* height (XOR+AND rows) */ - 1,0, /* planes */ - 8,0, /* bit count */ - 0,0,0,0, /* compression */ - 0,0,0,0, /* sizeImage */ - 0,0,0,0, /* x pels per meter */ - 0,0,0,0, /* y pels per meter */ - 2,0,0,0, /* clrUsed */ - 0,0,0,0, /* clrImportant */ - /* palette */ - 0,0,0,0, - 0xFF,0xFF,0xFF,0, - /* XOR mask */ - 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,1,0,0,0,0,0,0,0,0,0,0,0,1,0,0, - 0,1,0,0,0,0,0,0,0,0,0,0,0,1,0,0, - 0,1,0,0,0,0,0,0,0,0,0,0,0,1,0,0, - 0,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0, - 0,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0, - 0,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0, - 0,0,0,1,0,0,0,0,0,0,0,1,0,0,0,0, - 0,0,0,1,0,0,0,0,0,0,0,1,0,0,0,0, - 0,0,0,1,0,0,0,1,0,0,0,1,0,0,0,0, - 0,0,0,0,1,0,1,0,1,0,1,0,0,0,0,0, - 0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, - /* AND mask */ - 0,0,0,0, - 0,0,0,0, - 0,0,0,0, - 0,0,0,0, - 0,0,0,0, - 0,0,0,0, - 0,0,0,0, - 0,0,0,0, - 0,0,0,0, - 0,0,0,0, - 0,0,0,0, - 0,0,0,0, - 0,0,0,0, - 0,0,0,0, - 0,0,0,0, - 0,0,0,0 + { + sizeof(BITMAPINFOHEADER), /* header size */ + 16, /* width */ + 2*16, /* height (XOR+AND rows) */ + 1, /* planes */ + 8, /* bit count */ + 0, /* compression */ + 0, /* sizeImage */ + 0, /* x pels per meter */ + 0, /* y pels per meter */ + 2, /* clrUsed */ + 0, /* clrImportant */ + }, + { + /* palette */ + 0,0,0,0, + 0xFF,0xFF,0xFF,0, + /* XOR mask */ + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,1,0,0,0,0,0,0,0,0,0,0,0,1,0,0, + 0,1,0,0,0,0,0,0,0,0,0,0,0,1,0,0, + 0,1,0,0,0,0,0,0,0,0,0,0,0,1,0,0, + 0,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0, + 0,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0, + 0,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0, + 0,0,0,1,0,0,0,0,0,0,0,1,0,0,0,0, + 0,0,0,1,0,0,0,0,0,0,0,1,0,0,0,0, + 0,0,0,1,0,0,0,1,0,0,0,1,0,0,0,0, + 0,0,0,0,1,0,1,0,1,0,1,0,0,0,0,0, + 0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + /* AND mask */ + 0,0,0,0, + 0,0,0,0, + 0,0,0,0, + 0,0,0,0, + 0,0,0,0, + 0,0,0,0, + 0,0,0,0, + 0,0,0,0, + 0,0,0,0, + 0,0,0,0, + 0,0,0,0, + 0,0,0,0, + 0,0,0,0, + 0,0,0,0, + 0,0,0,0, + 0,0,0,0 + } }; -static void test_bad_icondirentry_size(void) +#include "poppack.h" + +#define test_ico_data(a, b, c) test_ico_data_(a, b, c, 0, __LINE__) +#define test_ico_data_todo(a, b, c) test_ico_data_(a, b, c, 1, __LINE__) +static void test_ico_data_(void *data, DWORD data_size, HRESULT init_hr, int todo, unsigned int line) { IWICBitmapDecoder *decoder; IWICImagingFactory *factory; @@ -108,8 +150,7 @@ static void test_bad_icondirentry_size(void) ok(hr == S_OK, "CreateStream failed, hr=%x\n", hr); if (SUCCEEDED(hr)) { - hr = IWICStream_InitializeFromMemory(icostream, testico_bad_icondirentry_size, - sizeof(testico_bad_icondirentry_size)); + hr = IWICStream_InitializeFromMemory(icostream, data, data_size); ok(hr == S_OK, "InitializeFromMemory failed, hr=%x\n", hr); if (SUCCEEDED(hr)) @@ -123,7 +164,8 @@ static void test_bad_icondirentry_size(void) { hr = IWICBitmapDecoder_Initialize(decoder, (IStream*)icostream, WICDecodeMetadataCacheOnDemand); - ok(hr == S_OK, "Initialize failed, hr=%x\n", hr); + todo_wine_if(todo) + ok_(__FILE__, line)(hr == init_hr, "Initialize failed, hr=%x\n", hr); if (SUCCEEDED(hr)) { @@ -163,11 +205,44 @@ static void test_bad_icondirentry_size(void) IWICImagingFactory_Release(factory); } +static void test_decoder(void) +{ + struct test_ico ico; + + /* Icon size specified in ICONDIRENTRY does not match bitmap header. */ + ico = ico_1; + ico.direntry.bWidth = 2; + ico.direntry.bHeight = 2; + test_ico_data(&ico, sizeof(ico), S_OK); + + /* Invalid DIRENTRY data size/offset. */ + ico = ico_1; + ico.direntry.dwDIBOffset = sizeof(ico); + test_ico_data(&ico, sizeof(ico), WINCODEC_ERR_BADIMAGE); + + ico = ico_1; + ico.direntry.dwDIBSize = sizeof(ico); + test_ico_data(&ico, sizeof(ico), WINCODEC_ERR_BADIMAGE); + + /* Header fields validation. */ + ico = ico_1; + ico.header.idReserved = 1; + test_ico_data_todo(&ico, sizeof(ico), S_OK); + ico.header.idReserved = 0; + ico.header.idType = 100; + test_ico_data_todo(&ico, sizeof(ico), S_OK); + + /* Premature end of data. */ + ico = ico_1; + test_ico_data(&ico, sizeof(ico.header) - 1, WINCODEC_ERR_STREAMREAD); + test_ico_data(&ico, sizeof(ico.header) + sizeof(ico.direntry) - 1, WINCODEC_ERR_BADIMAGE); +} + START_TEST(icoformat) { CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); - test_bad_icondirentry_size(); + test_decoder(); CoUninitialize(); } -- 2.19.1

2 1

[PATCH v2] quartz/filtergraph: Iterate over all source pins in ExploreGraph().
by Zebediah Figura Oct. 9, 2018

Oct. 9, 2018

From: Brendan McGrath <brendan(a)redmandi.com> Resent with some tweaks in code style. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/filtergraph.c | 93 +++++++---------------------------------------- 1 file changed, 14 insertions(+), 79 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index ead6036..56da3ad 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1002,68 +1002,6 @@ static HRESULT GetFilterInfo(IMoniker* pMoniker, VARIANT* pvar) return hr; } -static HRESULT GetInternalConnections(IBaseFilter* pfilter, IPin* pinputpin, IPin*** pppins, ULONG* pnb) -{ - HRESULT hr; - ULONG nb = 0; - - TRACE("(%p, %p, %p, %p)\n", pfilter, pinputpin, pppins, pnb); - hr = IPin_QueryInternalConnections(pinputpin, NULL, &nb); - if (hr == S_OK) { - /* Rendered input */ - } else if (hr == S_FALSE) { - *pppins = CoTaskMemAlloc(sizeof(IPin*)*nb); - hr = IPin_QueryInternalConnections(pinputpin, *pppins, &nb); - if (hr != S_OK) { - WARN("Error (%x)\n", hr); - } - } else if (hr == E_NOTIMPL) { - /* Input connected to all outputs */ - IEnumPins* penumpins; - IPin* ppin; - int i = 0; - TRACE("E_NOTIMPL\n"); - hr = IBaseFilter_EnumPins(pfilter, &penumpins); - if (FAILED(hr)) { - WARN("filter Enumpins failed (%x)\n", hr); - return hr; - } - i = 0; - /* Count output pins */ - while(IEnumPins_Next(penumpins, 1, &ppin, &nb) == S_OK) { - PIN_DIRECTION pindir; - IPin_QueryDirection(ppin, &pindir); - if (pindir == PINDIR_OUTPUT) - i++; - IPin_Release(ppin); - } - *pppins = CoTaskMemAlloc(sizeof(IPin*)*i); - /* Retrieve output pins */ - IEnumPins_Reset(penumpins); - i = 0; - while(IEnumPins_Next(penumpins, 1, &ppin, &nb) == S_OK) { - PIN_DIRECTION pindir; - IPin_QueryDirection(ppin, &pindir); - if (pindir == PINDIR_OUTPUT) - (*pppins)[i++] = ppin; - else - IPin_Release(ppin); - } - IEnumPins_Release(penumpins); - nb = i; - if (FAILED(hr)) { - WARN("Next failed (%x)\n", hr); - return hr; - } - } else if (FAILED(hr)) { - WARN("Cannot get internal connection (%x)\n", hr); - return hr; - } - - *pnb = nb; - return S_OK; -} - /* Attempt to connect one of the output pins on filter to sink. Helper for * FilterGraph2_Connect(). */ static HRESULT connect_output_pin(IFilterGraphImpl *graph, IBaseFilter *filter, IPin *sink) @@ -2111,12 +2049,12 @@ static HRESULT ExploreGraph(IFilterGraphImpl* pGraph, IPin* pOutputPin, fnFoundF { IAMFilterMiscFlags *flags; IMediaSeeking *seeking; + IEnumPins *enumpins; + PIN_DIRECTION dir; HRESULT hr; IPin* pInputPin; - IPin** ppPins; - ULONG nb; - ULONG i; PIN_INFO PinInfo; + IPin *pin; TRACE("%p %p\n", pGraph, pOutputPin); PinInfo.pFilter = NULL; @@ -2126,26 +2064,23 @@ static HRESULT ExploreGraph(IFilterGraphImpl* pGraph, IPin* pOutputPin, fnFoundF if (SUCCEEDED(hr)) { hr = IPin_QueryPinInfo(pInputPin, &PinInfo); - if (SUCCEEDED(hr)) - hr = GetInternalConnections(PinInfo.pFilter, pInputPin, &ppPins, &nb); IPin_Release(pInputPin); } if (SUCCEEDED(hr)) - { - if (nb) - { - for(i = 0; i < nb; i++) - { - /* Explore the graph downstream from this pin - * FIXME: We should prevent exploring from a pin more than once. This can happens when - * several input pins are connected to the same output (a MUX for instance). */ - ExploreGraph(pGraph, ppPins[i], FoundFilter, data); - IPin_Release(ppPins[i]); - } + hr = IBaseFilter_EnumPins(PinInfo.pFilter, &enumpins); - CoTaskMemFree(ppPins); + if (SUCCEEDED(hr)) + { + while (IEnumPins_Next(enumpins, 1, &pin, NULL) == S_OK) + { + IPin_QueryDirection(pin, &dir); + if (dir == PINDIR_OUTPUT) + ExploreGraph(pGraph, pin, FoundFilter, data); + IPin_Release(pin); } + + IEnumPins_Release(enumpins); TRACE("Doing stuff with filter %p\n", PinInfo.pFilter); if (SUCCEEDED(IBaseFilter_QueryInterface(PinInfo.pFilter, -- 2.7.4

1 0

[PATCH v5 2/2] hidclass.sys: use IoRegisterDeviceInterface
by Aric Stewart Oct. 9, 2018

Oct. 9, 2018

Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/hidclass.sys/device.c | 60 ++++++++++++++++------------------------------ dlls/hidclass.sys/hid.h | 2 +- dlls/hidclass.sys/pnp.c | 4 +--- 3 files changed, 22 insertions(+), 44 deletions(-)

2 4

Compiling WineTest.exe on Debian 9
by Francois Gouget Oct. 9, 2018

Oct. 9, 2018

Since the custom dialog control data user32 test was added [1] it's no longer possible to compile WineTest.exe on Debian 9: one gets the following compilation error. ../../.././../wine-native/tools/winegcc/winegcc -o user32_test.exe -B../../.././../wine-native/tools/winebuild \ --sysroot=../../.. -b i686-w64-mingw32 -fasynchronous-unwind-tables broadcast.o class.o \ clipboard.o combo.o cursoricon.o dce.o dde.o dialog.o edit.o generated.o input.o listbox.o menu.o \ monitor.o msg.o resource.o scroll.o static.o sysparams.o text.o uitools.o win.o winstation.o \ wsprintf.o resource.res testlist.o ../../../dlls/user32/libuser32.a ../../../dlls/gdi32/libgdi32.a \ ../../../dlls/advapi32/libadvapi32.a /usr/bin/i686-w64-mingw32-windres: dialog control data: not enough binary data The reason is that the binutils-mingw-w64-{i686,x86-64} packages on Debian 9 are too old; it only has binutils 2.28-5+7.4+b4. Unfortunately no recent version of binutils was backported and the version available in Debian Testing has seen major packaging changes that make it impossible to backport. The solution is to apply Dmitry's binutils patch [2] to the 2.28 package and rebuild it on Debian 9. This is what I did for the TestBot. I then created a Debian bug report [3] but since this is Debian Stable there is little hope it will be fixed. So I also uploaded the resulting packages to my website for anyone who needs them. http://fgouget.free.fr/tmp/binutils-mingw-w64/binutils-mingw-w64_2.28-5+7.4… http://fgouget.free.fr/tmp/binutils-mingw-w64/binutils-mingw-w64_7.4+w1_amd… http://fgouget.free.fr/tmp/binutils-mingw-w64/binutils-mingw-w64_7.4+w1_amd… http://fgouget.free.fr/tmp/binutils-mingw-w64/binutils-mingw-w64_7.4+w1.dsc http://fgouget.free.fr/tmp/binutils-mingw-w64/binutils-mingw-w64_7.4+w1.tar… http://fgouget.free.fr/tmp/binutils-mingw-w64/binutils-mingw-w64-i686_2.28-… http://fgouget.free.fr/tmp/binutils-mingw-w64/binutils-mingw-w64-i686-dbgsy… http://fgouget.free.fr/tmp/binutils-mingw-w64/binutils-mingw-w64-x86-64_2.2… http://fgouget.free.fr/tmp/binutils-mingw-w64/binutils-mingw-w64-x86-64-dbg… [1] https://source.winehq.org/git/wine.git/commit/606b0272776ec2a4e6146aa29a993… [2] https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commit;h=6bb2170… [3] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=910650 -- Francois Gouget <fgouget(a)codeweavers.com>

3 3