wine-devel March 2019

wine-devel@winehq.org

76 participants
1010 discussions

[PATCH 06/10] wined3d: Add adapter_check_format() to adapter_ops.
by Józef Kucia 29 Mar '19

29 Mar '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 24 +++++++++++++++++ dlls/wined3d/directx.c | 47 +++++++++++++++------------------- dlls/wined3d/wined3d_private.h | 8 ++++++ 3 files changed, 53 insertions(+), 26 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 99073f4fbf59..a076a988eb3e 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4385,10 +4385,34 @@ static void adapter_gl_get_wined3d_caps(const struct wined3d_adapter *adapter, s caps->MaxAnisotropy = gl_info->limits.anisotropy; } +static BOOL adapter_gl_check_format(const struct wined3d_adapter *adapter, + const struct wined3d_format *adapter_format, const struct wined3d_format *rt_format, + const struct wined3d_format *ds_format) +{ + unsigned int i; + + if (wined3d_settings.offscreen_rendering_mode != ORM_BACKBUFFER) + return TRUE; + + for (i = 0; i < adapter->cfg_count; ++i) + { + const struct wined3d_pixel_format *cfg = &adapter->cfgs[i]; + + if (wined3d_check_pixel_format_color(cfg, rt_format) + && wined3d_check_pixel_format_depth(cfg, ds_format)) + { + return TRUE; + } + } + + return FALSE; +} + static const struct wined3d_adapter_ops wined3d_adapter_gl_ops = { wined3d_adapter_gl_create_context, adapter_gl_get_wined3d_caps, + adapter_gl_check_format, }; static BOOL wined3d_adapter_gl_init(struct wined3d_adapter *adapter, diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c978122fc7c7..8e7713858a8e 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1277,7 +1277,7 @@ HRESULT CDECL wined3d_get_adapter_raster_status(const struct wined3d *wined3d, U return WINED3D_OK; } -static BOOL wined3d_check_pixel_format_color(const struct wined3d_pixel_format *cfg, +BOOL wined3d_check_pixel_format_color(const struct wined3d_pixel_format *cfg, const struct wined3d_format *format) { /* Float formats need FBOs. If FBOs are used this function isn't called */ @@ -1297,7 +1297,7 @@ static BOOL wined3d_check_pixel_format_color(const struct wined3d_pixel_format * return TRUE; } -static BOOL wined3d_check_pixel_format_depth(const struct wined3d_pixel_format *cfg, +BOOL wined3d_check_pixel_format_depth(const struct wined3d_pixel_format *cfg, const struct wined3d_format *format) { BOOL lockable = FALSE; @@ -1331,6 +1331,7 @@ HRESULT CDECL wined3d_check_depth_stencil_match(const struct wined3d *wined3d, UINT adapter_idx, enum wined3d_device_type device_type, enum wined3d_format_id adapter_format_id, enum wined3d_format_id render_target_format_id, enum wined3d_format_id depth_stencil_format_id) { + const struct wined3d_format *adapter_format; const struct wined3d_format *rt_format; const struct wined3d_format *ds_format; const struct wined3d_adapter *adapter; @@ -1344,6 +1345,8 @@ HRESULT CDECL wined3d_check_depth_stencil_match(const struct wined3d *wined3d, return WINED3DERR_INVALIDCALL; adapter = wined3d->adapters[adapter_idx]; + + adapter_format = wined3d_get_format(adapter, adapter_format_id, WINED3D_BIND_RENDER_TARGET); rt_format = wined3d_get_format(adapter, render_target_format_id, WINED3D_BIND_RENDER_TARGET); ds_format = wined3d_get_format(adapter, depth_stencil_format_id, WINED3D_BIND_DEPTH_STENCIL); @@ -1358,33 +1361,17 @@ HRESULT CDECL wined3d_check_depth_stencil_match(const struct wined3d *wined3d, return WINED3DERR_NOTAVAILABLE; } - if (wined3d_settings.offscreen_rendering_mode == ORM_BACKBUFFER) + if (adapter->adapter_ops->adapter_check_format(adapter, adapter_format, rt_format, ds_format)) { - const struct wined3d_pixel_format *cfgs; - unsigned int cfg_count; - unsigned int i; - - cfgs = adapter->cfgs; - cfg_count = adapter->cfg_count; - for (i = 0; i < cfg_count; ++i) - { - if (wined3d_check_pixel_format_color(&cfgs[i], rt_format) - && wined3d_check_pixel_format_depth(&cfgs[i], ds_format)) - { - TRACE("Formats match.\n"); - return WINED3D_OK; - } - } - - TRACE("Unsupported format pair: %s and %s.\n", - debug_d3dformat(render_target_format_id), - debug_d3dformat(depth_stencil_format_id)); - - return WINED3DERR_NOTAVAILABLE; + TRACE("Formats match.\n"); + return WINED3D_OK; } - TRACE("Formats match.\n"); - return WINED3D_OK; + TRACE("Unsupported format pair: %s and %s.\n", + debug_d3dformat(render_target_format_id), + debug_d3dformat(depth_stencil_format_id)); + + return WINED3DERR_NOTAVAILABLE; } HRESULT CDECL wined3d_check_device_multisample_type(const struct wined3d *wined3d, UINT adapter_idx, @@ -2336,10 +2323,18 @@ static void adapter_no3d_get_wined3d_caps(const struct wined3d_adapter *adapter, { } +static BOOL adapter_no3d_check_format(const struct wined3d_adapter *adapter, + const struct wined3d_format *adapter_format, const struct wined3d_format *rt_format, + const struct wined3d_format *ds_format) +{ + return TRUE; +} + static const struct wined3d_adapter_ops wined3d_adapter_no3d_ops = { wined3d_adapter_no3d_create_context, adapter_no3d_get_wined3d_caps, + adapter_no3d_check_format, }; static void wined3d_adapter_no3d_init_d3d_info(struct wined3d_adapter *adapter, unsigned int wined3d_creation_flags) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 22e7441ced88..83fc09ddc432 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2680,6 +2680,9 @@ struct wined3d_adapter_ops BOOL (*adapter_create_context)(struct wined3d_context *context, struct wined3d_texture *target, const struct wined3d_format *ds_format); void (*adapter_get_wined3d_caps)(const struct wined3d_adapter *adapter, struct wined3d_caps *caps); + BOOL (*adapter_check_format)(const struct wined3d_adapter *adapter, + const struct wined3d_format *adapter_format, const struct wined3d_format *rt_format, + const struct wined3d_format *ds_format); }; /* The adapter structure */ @@ -4721,4 +4724,9 @@ static inline void wined3d_not_from_cs(struct wined3d_cs *cs) /* The WNDCLASS-Name for the fake window which we use to retrieve the GL capabilities */ #define WINED3D_OPENGL_WINDOW_CLASS_NAME "WineD3D_OpenGL" +BOOL wined3d_check_pixel_format_color(const struct wined3d_pixel_format *cfg, + const struct wined3d_format *format) DECLSPEC_HIDDEN; +BOOL wined3d_check_pixel_format_depth(const struct wined3d_pixel_format *cfg, + const struct wined3d_format *format) DECLSPEC_HIDDEN; + #endif -- 2.19.2

3 2

[PATCH 05/10] wined3d: Always check format flags in wined3d_check_depth_stencil_match().
by Józef Kucia 29 Mar '19

29 Mar '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/directx.c | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 8c405260c6b7..c978122fc7c7 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1335,7 +1335,7 @@ HRESULT CDECL wined3d_check_depth_stencil_match(const struct wined3d *wined3d, const struct wined3d_format *ds_format; const struct wined3d_adapter *adapter; - TRACE("wined3d %p, adapter_idx %u, device_type %s,\n" + TRACE("wined3d %p, adapter_idx %u, device_type %s, " "adapter_format %s, render_target_format %s, depth_stencil_format %s.\n", wined3d, adapter_idx, debug_d3ddevicetype(device_type), debug_d3dformat(adapter_format_id), debug_d3dformat(render_target_format_id), debug_d3dformat(depth_stencil_format_id)); @@ -1346,16 +1346,19 @@ HRESULT CDECL wined3d_check_depth_stencil_match(const struct wined3d *wined3d, adapter = wined3d->adapters[adapter_idx]; rt_format = wined3d_get_format(adapter, render_target_format_id, WINED3D_BIND_RENDER_TARGET); ds_format = wined3d_get_format(adapter, depth_stencil_format_id, WINED3D_BIND_DEPTH_STENCIL); - if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) + + if (!(rt_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_RENDERTARGET)) { - if ((rt_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_RENDERTARGET) - && (ds_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL))) - { - TRACE("Formats match.\n"); - return WINED3D_OK; - } + WARN("Format %s is not render target format.\n", debug_d3dformat(rt_format->id)); + return WINED3DERR_NOTAVAILABLE; } - else + if (!(ds_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL))) + { + WARN("Format %s is not depth/stencil format.\n", debug_d3dformat(ds_format->id)); + return WINED3DERR_NOTAVAILABLE; + } + + if (wined3d_settings.offscreen_rendering_mode == ORM_BACKBUFFER) { const struct wined3d_pixel_format *cfgs; unsigned int cfg_count; @@ -1372,13 +1375,16 @@ HRESULT CDECL wined3d_check_depth_stencil_match(const struct wined3d *wined3d, return WINED3D_OK; } } - } - TRACE("Unsupported format pair: %s and %s.\n", - debug_d3dformat(render_target_format_id), - debug_d3dformat(depth_stencil_format_id)); + TRACE("Unsupported format pair: %s and %s.\n", + debug_d3dformat(render_target_format_id), + debug_d3dformat(depth_stencil_format_id)); - return WINED3DERR_NOTAVAILABLE; + return WINED3DERR_NOTAVAILABLE; + } + + TRACE("Formats match.\n"); + return WINED3D_OK; } HRESULT CDECL wined3d_check_device_multisample_type(const struct wined3d *wined3d, UINT adapter_idx, -- 2.19.2

3 2

[PATCH 04/10] wined3d: Cleanup wined3d_check_surface_capability().
by Józef Kucia 29 Mar '19

29 Mar '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/directx.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c66ed9cd5d33..8c405260c6b7 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1506,23 +1506,15 @@ static BOOL wined3d_check_render_target_format(const struct wined3d_adapter *ada return TRUE; } -static BOOL wined3d_check_surface_capability(const struct wined3d_format *format) +static BOOL wined3d_check_surface_format(const struct wined3d_format *format) { if ((format->flags[WINED3D_GL_RES_TYPE_TEX_2D] | format->flags[WINED3D_GL_RES_TYPE_RB]) & WINED3DFMT_FLAG_BLIT) - { - TRACE("[OK]\n"); return TRUE; - } if ((format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & (WINED3DFMT_FLAG_EXTENSION | WINED3DFMT_FLAG_TEXTURE)) == (WINED3DFMT_FLAG_EXTENSION | WINED3DFMT_FLAG_TEXTURE)) - { - TRACE("[OK]\n"); return TRUE; - } - /* Reject other formats */ - TRACE("[FAILED]\n"); return FALSE; } @@ -1591,9 +1583,9 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad | WINED3D_BIND_DEPTH_STENCIL; if (!(bind_flags & WINED3D_BIND_SHADER_RESOURCE)) { - if (!wined3d_check_surface_capability(format)) + if (!wined3d_check_surface_format(format)) { - TRACE("[FAILED] - Not supported for plain surfaces.\n"); + TRACE("%s is not supported for plain surfaces.\n", debug_d3dformat(format->id)); return WINED3DERR_NOTAVAILABLE; } -- 2.19.2

3 2

[PATCH 03/10] wined3d: Cleanup CheckRenderTargetCapability().
by Józef Kucia 29 Mar '19

29 Mar '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/directx.c | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 612b813f62a2..c66ed9cd5d33 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1463,16 +1463,13 @@ static BOOL wined3d_check_depth_stencil_format(const struct wined3d_adapter *ada return TRUE; } -/* Check the render target capabilities of a format */ -static BOOL CheckRenderTargetCapability(const struct wined3d_adapter *adapter, - const struct wined3d_format *adapter_format, const struct wined3d_format *check_format, +static BOOL wined3d_check_render_target_format(const struct wined3d_adapter *adapter, + const struct wined3d_format *adapter_format, const struct wined3d_format *rt_format, enum wined3d_gl_resource_type gl_type) { - /* Filter out non-RT formats */ - if (!(check_format->flags[gl_type] & WINED3DFMT_FLAG_RENDERTARGET)) + if (!(rt_format->flags[gl_type] & WINED3DFMT_FLAG_RENDERTARGET)) return FALSE; - if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) - return TRUE; + if (wined3d_settings.offscreen_rendering_mode == ORM_BACKBUFFER) { const struct wined3d_pixel_format *cfgs = adapter->cfgs; @@ -1481,11 +1478,12 @@ static BOOL CheckRenderTargetCapability(const struct wined3d_adapter *adapter, /* In backbuffer mode the front and backbuffer share the same WGL * pixelformat. The format must match in RGB, alpha is allowed to be * different. (Only the backbuffer can have alpha.) */ - if (adapter_format->red_size != check_format->red_size - || adapter_format->green_size != check_format->green_size - || adapter_format->blue_size != check_format->blue_size) + if (adapter_format->red_size != rt_format->red_size + || adapter_format->green_size != rt_format->green_size + || adapter_format->blue_size != rt_format->blue_size) { - TRACE("[FAILED]\n"); + TRACE("Render target format %s doesn't match with adapter format %s.\n", + debug_d3dformat(rt_format->id), debug_d3dformat(adapter_format->id)); return FALSE; } @@ -1494,15 +1492,18 @@ static BOOL CheckRenderTargetCapability(const struct wined3d_adapter *adapter, for (i = 0; i < adapter->cfg_count; ++i) { if (cfgs[i].windowDrawable - && wined3d_check_pixel_format_color(&cfgs[i], check_format)) + && wined3d_check_pixel_format_color(&cfgs[i], rt_format)) { TRACE("Pixel format %d is compatible with format %s.\n", - cfgs[i].iPixelFormat, debug_d3dformat(check_format->id)); + cfgs[i].iPixelFormat, debug_d3dformat(rt_format->id)); return TRUE; } } + + return FALSE; } - return FALSE; + + return TRUE; } static BOOL wined3d_check_surface_capability(const struct wined3d_format *format) @@ -1683,7 +1684,7 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad } if ((bind_flags & WINED3D_BIND_RENDER_TARGET) - && !CheckRenderTargetCapability(adapter, adapter_format, format, gl_type)) + && !wined3d_check_render_target_format(adapter, adapter_format, format, gl_type)) { TRACE("Requested WINED3D_BIND_RENDER_TARGET, but format %s is not supported for render targets.\n", debug_d3dformat(check_format_id)); -- 2.19.2

3 2

[PATCH 02/10] wined3d: Always check if format has depth/stencil flags in wined3d_check_depth_stencil_format().
by Józef Kucia 29 Mar '19

29 Mar '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/directx.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 381ed6502847..612b813f62a2 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1434,6 +1434,8 @@ static BOOL wined3d_check_depth_stencil_format(const struct wined3d_adapter *ada { if (!ds_format->depth_size && !ds_format->stencil_size) return FALSE; + if (!(ds_format->flags[gl_type] & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL))) + return FALSE; /* Blacklist formats not supported on Windows */ if (ds_format->id == WINED3DFMT_S1_UINT_D15_UNORM /* Breaks the shadowvol2 dx7 sdk sample */ @@ -1443,13 +1445,7 @@ static BOOL wined3d_check_depth_stencil_format(const struct wined3d_adapter *ada return FALSE; } - if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) - { - /* With FBOs WGL limitations do not apply, but the format needs to be FBO attachable */ - if (ds_format->flags[gl_type] & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL)) - return TRUE; - } - else + if (wined3d_settings.offscreen_rendering_mode == ORM_BACKBUFFER) { unsigned int i; @@ -1460,9 +1456,11 @@ static BOOL wined3d_check_depth_stencil_format(const struct wined3d_adapter *ada && wined3d_check_pixel_format_depth(cfg, ds_format)) return TRUE; } + + return FALSE; } - return FALSE; + return TRUE; } /* Check the render target capabilities of a format */ -- 2.19.2

3 2

[PATCH 01/10] wined3d: Cleanup CheckDepthStencilCapability().
by Józef Kucia 29 Mar '19

29 Mar '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/directx.c | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 45e28719dfe4..381ed6502847 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1428,25 +1428,19 @@ HRESULT CDECL wined3d_check_device_multisample_type(const struct wined3d *wined3 return hr; } -/* Check if the given DisplayFormat + DepthStencilFormat combination is valid for the Adapter */ -static BOOL CheckDepthStencilCapability(const struct wined3d_adapter *adapter, - const struct wined3d_format *display_format, const struct wined3d_format *ds_format, +static BOOL wined3d_check_depth_stencil_format(const struct wined3d_adapter *adapter, + const struct wined3d_format *adapter_format, const struct wined3d_format *ds_format, enum wined3d_gl_resource_type gl_type) { - /* Only allow depth/stencil formats */ - if (!(ds_format->depth_size || ds_format->stencil_size)) + if (!ds_format->depth_size && !ds_format->stencil_size) return FALSE; /* Blacklist formats not supported on Windows */ - switch (ds_format->id) + if (ds_format->id == WINED3DFMT_S1_UINT_D15_UNORM /* Breaks the shadowvol2 dx7 sdk sample */ + || ds_format->id == WINED3DFMT_S4X4_UINT_D24_UNORM) { - case WINED3DFMT_S1_UINT_D15_UNORM: /* Breaks the shadowvol2 dx7 sdk sample */ - case WINED3DFMT_S4X4_UINT_D24_UNORM: - TRACE("[FAILED] - not supported on windows.\n"); - return FALSE; - - default: - break; + TRACE("Format %s is blacklisted.\n", debug_d3dformat(ds_format->id)); + return FALSE; } if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) @@ -1459,11 +1453,10 @@ static BOOL CheckDepthStencilCapability(const struct wined3d_adapter *adapter, { unsigned int i; - /* Walk through all WGL pixel formats to find a match */ for (i = 0; i < adapter->cfg_count; ++i) { const struct wined3d_pixel_format *cfg = &adapter->cfgs[i]; - if (wined3d_check_pixel_format_color(cfg, display_format) + if (wined3d_check_pixel_format_color(cfg, adapter_format) && wined3d_check_pixel_format_depth(cfg, ds_format)) return TRUE; } @@ -1704,7 +1697,7 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad continue; if ((bind_flags & WINED3D_BIND_DEPTH_STENCIL) - && !CheckDepthStencilCapability(adapter, adapter_format, format, gl_type)) + && !wined3d_check_depth_stencil_format(adapter, adapter_format, format, gl_type)) { TRACE("Requested WINED3D_BIND_DEPTH_STENCIL, but format %s is not supported for depth/stencil buffers.\n", debug_d3dformat(check_format_id)); -- 2.19.2

3 2

[PATCH] msi: add MsiSourceListForceResolution{A,W} stub
by Louis Lenders 29 Mar '19

29 Mar '19

Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=46881 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/msi/msi.spec | 4 ++-- dlls/msi/source.c | 18 ++++++++++++++++++ include/msi.h | 4 ++++ 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/msi/msi.spec b/dlls/msi/msi.spec index eeb9ea757c..406a910462 100644 --- a/dlls/msi/msi.spec +++ b/dlls/msi/msi.spec @@ -205,8 +205,8 @@ 209 stdcall MsiSourceListClearAllW(wstr wstr long) 210 stdcall MsiSourceListAddSourceA(str str long str) 211 stdcall MsiSourceListAddSourceW(wstr wstr long wstr) -212 stub MsiSourceListForceResolutionA -213 stub MsiSourceListForceResolutionW +212 stdcall MsiSourceListForceResolutionA(str str long) +213 stdcall MsiSourceListForceResolutionW(wstr wstr long) 214 stdcall MsiIsProductElevatedA(str ptr) 215 stdcall MsiIsProductElevatedW(wstr ptr) 216 stdcall MsiGetShortcutTargetA(str ptr ptr ptr) diff --git a/dlls/msi/source.c b/dlls/msi/source.c index 3640b0dfbd..f79db96f1d 100644 --- a/dlls/msi/source.c +++ b/dlls/msi/source.c @@ -1330,3 +1330,21 @@ UINT WINAPI MsiSourceListClearSourceW(LPCWSTR szProductCodeOrPatchCode, LPCWSTR dwContext, dwOptions, debugstr_w(szSource)); return ERROR_SUCCESS; } + +/****************************************************************** + * MsiSourceListForceResolutionA (MSI.@) + */ +UINT WINAPI MsiSourceListForceResolutionA(const CHAR *product, const CHAR *user, DWORD reserved) +{ + FIXME("(%s %s %x)\n", debugstr_a(product), debugstr_a(user), reserved); + return ERROR_SUCCESS; +} + +/****************************************************************** + * MsiSourceListForceResolutionW (MSI.@) + */ +UINT WINAPI MsiSourceListForceResolutionW(const WCHAR *product, const WCHAR *user, DWORD reserved) +{ + FIXME("(%s %s %x)\n", debugstr_w(product), debugstr_w(user), reserved); + return ERROR_SUCCESS; +} \ No newline at end of file diff --git a/include/msi.h b/include/msi.h index 417b606f61..604331a9e5 100644 --- a/include/msi.h +++ b/include/msi.h @@ -672,6 +672,10 @@ UINT WINAPI MsiSourceListAddMediaDiskA(LPCSTR, LPCSTR, MSIINSTALLCONTEXT, DWORD, UINT WINAPI MsiSourceListAddMediaDiskW(LPCWSTR, LPCWSTR, MSIINSTALLCONTEXT, DWORD, DWORD, LPCWSTR, LPCWSTR); #define MsiSourceListAddMediaDisk WINELIB_NAME_AW(MsiSourceListAddMediaDisk) +UINT WINAPI MsiSourceListForceResolutionA(const CHAR*, const CHAR*, DWORD); +UINT WINAPI MsiSourceListForceResolutionW(const WCHAR*, const WCHAR*, DWORD); +#define MsiSourceListForceResolution WINELIB_NAME_AW(MsiSourceListForceResolution) + UINT WINAPI MsiEnumPatchesA(LPCSTR, DWORD, LPSTR, LPSTR, LPDWORD); UINT WINAPI MsiEnumPatchesW(LPCWSTR, DWORD, LPWSTR, LPWSTR, LPDWORD); #define MsiEnumPatches WINELIB_NAME_AW(MsiEnumPatches) -- 2.20.1

3 2

[PATCH] wer: Fix WER_REPORT_TYPE failures on recent win10 [v2]
by Detlef Riekenberg 29 Mar '19

29 Mar '19

Recent win10 (1709 or older) added checks for WER_REPORT_TYPE and reject invalid values WerReportCreate always succeeded in older dll versions. Example failures (full report with 90 failures after upgrading from win7 to win10) http://test.winehq.org/queue/errksCfJ/report cw1 (1709): http://test.winehq.org/data/829170f3d6b875f7a6f065072cc3334a20ff805e/win10_… Patch v1 was tested: https://testbot.winehq.org/JobDetails.pl?Key=49979 Changes in v2: Sorry, i send the old patch version in v1 without the fix for the test value 42 -- ... bye bye Detlef Signed-off-by: Detlef Riekenberg <wine.dev(a)web.de> --- dlls/wer/main.c | 2 +- dlls/wer/tests/main.c | 26 ++++++++++++++++++++++---- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/dlls/wer/main.c b/dlls/wer/main.c index 75a22a51d0..e4bda46b7d 100644 --- a/dlls/wer/main.c +++ b/dlls/wer/main.c @@ -278,7 +278,7 @@ HRESULT WINAPI WerReportCreate(PCWSTR eventtype, WER_REPORT_TYPE reporttype, PWE } if (phandle) *phandle = NULL; - if (!eventtype || !eventtype[0] || !phandle) { + if (!eventtype || !eventtype[0] || !phandle || (reporttype >= WerReportInvalid)) { return E_INVALIDARG; } diff --git a/dlls/wer/tests/main.c b/dlls/wer/tests/main.c index 11a02fb18e..7fa9a8c67f 100644 --- a/dlls/wer/tests/main.c +++ b/dlls/wer/tests/main.c @@ -1,7 +1,7 @@ /* * Unit test suite for windows error reporting in Vista and above * - * Copyright 2010 Detlef Riekenberg + * Copyright 2010,2019 Detlef Riekenberg * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -207,8 +207,8 @@ static void test_WerReportCreate(void) hr = WerReportCreate(empty, WerReportCritical, NULL, &report); ok(hr == E_INVALIDARG, "got 0x%x and %p(expected E_INVALIDARG)\n", hr, report); - /* WER_REPORT_TYPE is not checked during WerReportCreate */ - for (i = 0; i <= WerReportInvalid + 1; i++) { + /* a valid WER_REPORT_TYPE works */ + for (i = 0; i < WerReportInvalid; i++) { report = (void *) 0xdeadbeef; hr = WerReportCreate(appcrash, i, NULL, &report); ok(hr == S_OK, "%d: got 0x%x and %p (expected S_OK)\n", i, hr, report); @@ -217,9 +217,27 @@ static void test_WerReportCreate(void) ok(hr == S_OK, "%d: got 0x%x for %p (expected S_OK)\n", i, hr, report); } + + /* values for WER_REPORT_TYPE are checked and invalid values are rejected since recent win10, + but older windows versions did not check the report type and WerReportCreate always succeeded */ + + report = (void *) 0xdeadbeef; + hr = WerReportCreate(appcrash, WerReportInvalid, NULL, &report); + ok((hr == E_INVALIDARG) | broken(hr == S_OK), + "%d: got 0x%x and %p (expected E_INVALIDARG or a broken S_OK)\n", i, hr, report); + if (hr == S_OK) { + hr = WerReportCloseHandle(report); + ok(hr == S_OK, "%d: got 0x%x for %p (expected S_OK)\n", i, hr, report); + } + report = (void *) 0xdeadbeef; hr = WerReportCreate(appcrash, 42, NULL, &report); - ok(hr == S_OK, "42: got 0x%x and %p (expected S_OK)\n", hr, report); + ok((hr == E_INVALIDARG) | broken(hr == S_OK), + "%d: got 0x%x and %p (expected E_INVALIDARG or a broken S_OK)\n", i, hr, report); + if (hr == S_OK) { + hr = WerReportCloseHandle(report); + ok(hr == S_OK, "%d: got 0x%x for %p (expected S_OK)\n", i, hr, report); + } /* multiple active reports are possible */ memset(table, 0, sizeof(table)); -- 2.21.0.windows.1

2 1

[PATCH 6/6] mshtml: Alloc proper BSTR size in return_nscstr.
by Jacek Caban 29 Mar '19

29 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/tests/xhr.js | 1 + dlls/mshtml/xmlhttprequest.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)

2 1

[PATCH 5/6] mshtml: Add IHTMLRectCollection implementation.
by Jacek Caban 29 Mar '19

29 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlelem.c | 83 +++++++++++++++++++++++++++++++++-- dlls/mshtml/tests/elements.js | 18 ++++++++ 2 files changed, 98 insertions(+), 3 deletions(-)

2 1

← Newer
1
...
4
5
6
7
8
9
10
...
101
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-devel March 2019