July 2019 - Wine-Devel - list.winehq.org

[PATCH 1/3] ntdll: Fix sysfs path for the product name.
by Hans Leidekker July 2, 2019

July 2, 2019

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/ntdll/nt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 0dc06f971b..2a2bd4fd60 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -2093,7 +2093,7 @@ static NTSTATUS get_firmware_info(SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULONG bios_version_len = get_smbios_string("/sys/class/dmi/id/bios_version", S(bios_version)); bios_date_len = get_smbios_string("/sys/class/dmi/id/bios_date", S(bios_date)); system_vendor_len = get_smbios_string("/sys/class/dmi/id/sys_vendor", S(system_vendor)); - system_product_len = get_smbios_string("/sys/class/dmi/id/product", S(system_product)); + system_product_len = get_smbios_string("/sys/class/dmi/id/product_name", S(system_product)); system_version_len = get_smbios_string("/sys/class/dmi/id/product_version", S(system_version)); system_serial_len = get_smbios_string("/sys/class/dmi/id/product_serial", S(system_serial)); board_vendor_len = get_smbios_string("/sys/class/dmi/id/board_vendor", S(board_vendor)); -- 2.11.0

2 1

[PATCH 3/3] kernel32: Terminate process in unhandled exception handler.
by Jacek Caban July 2, 2019

July 2, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/process.c | 2 +- dlls/kernel32/tests/debugger.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-)

2 1

[PATCH 2/3] server: Fix debug event order in generate_startup_debug_events.
by Jacek Caban July 2, 2019

July 2, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/debugger.c | 2 -- server/debugger.c | 20 +++++++++++++------- 2 files changed, 13 insertions(+), 9 deletions(-)

2 1

Broken WoW builds
by Francois Gouget July 2, 2019

July 2, 2019

So as far as I can tell the following patch broke the WoW builds: commit a1cdcc5290618c00d73e7a71aaa38897ec501138 Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 17 09:28:35 2019 +0200 ntoskrnl: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> That is, after this patch, I get a crash in mountmgr.sys when creating the wineprefix (see attached backtrace). Maybe I'm missing something. Anyway, this is why the TestBot has been failing all patches for a while: all patches are tested against wow32 and wow64 builds but those were unable to run the tests. So for now I have disabled testing on the wow builds. -- Francois Gouget <fgouget(a)codeweavers.com>

2 2

[PATCH 1/3] kernel32/tests: Add more debugger tests.
by Jacek Caban July 2, 2019

July 2, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/debugger.c | 270 ++++++++++++++++++++++++++++++--- 1 file changed, 248 insertions(+), 22 deletions(-)

2 1

[PATCH] msvcrt: Add '-norelay' flag for _vsnprintf().
by Dmitry Timoshkov July 2, 2019

July 2, 2019

Otherwise for instance +relay,+msi log has msi: traces completely messed up. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/msvcrt/msvcrt.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 3dddf8a473..ed1e72c5e1 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1062,7 +1062,7 @@ @ cdecl _vscwprintf(wstr ptr) MSVCRT__vscwprintf @ cdecl _vscwprintf_l(wstr ptr ptr) MSVCRT__vscwprintf_l @ cdecl _vscwprintf_p_l(wstr ptr ptr) MSVCRT__vscwprintf_p_l -@ cdecl _vsnprintf(ptr long str ptr) MSVCRT_vsnprintf +@ cdecl -norelay _vsnprintf(ptr long str ptr) MSVCRT_vsnprintf @ cdecl _vsnprintf_c(ptr long str ptr) MSVCRT_vsnprintf @ cdecl _vsnprintf_c_l(ptr long str ptr ptr) MSVCRT_vsnprintf_l @ cdecl _vsnprintf_l(ptr long str ptr ptr) MSVCRT_vsnprintf_l -- 2.20.1

2 1

[PATCH] kernelbase: Only subtract 2 when strings arent equal.
by Alistair Leslie-Hughes July 2, 2019

July 2, 2019

Restores code remove from commit 2a455ce049d65eeab95895b6b6d52f6e5047537b. Always subtracting 2 means two strings could never be equal, returning 0. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/kernelbase/string.c | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/kernelbase/string.c b/dlls/kernelbase/string.c index 7bea47942e..edc68ed01e 100644 --- a/dlls/kernelbase/string.c +++ b/dlls/kernelbase/string.c @@ -67,34 +67,50 @@ static BOOL char_compare(WORD ch1, WORD ch2, DWORD flags) int WINAPI lstrcmpA( LPCSTR str1, LPCSTR str2 ) { + int ret; if (!str1 && !str2) return 0; if (!str1) return -1; if (!str2) return 1; - return CompareStringA( GetThreadLocale(), LOCALE_USE_CP_ACP, str1, -1, str2, -1 ) - 2; + ret = CompareStringA( GetThreadLocale(), LOCALE_USE_CP_ACP, str1, -1, str2, -1 ); + if (ret) ret -= 2; + + return ret; } int WINAPI lstrcmpW(LPCWSTR str1, LPCWSTR str2) { + int ret; if (!str1 && !str2) return 0; if (!str1) return -1; if (!str2) return 1; - return CompareStringW( GetThreadLocale(), 0, str1, -1, str2, -1 ) - 2; + ret = CompareStringW( GetThreadLocale(), 0, str1, -1, str2, -1 ); + if (ret) ret -= 2; + + return ret; } int WINAPI lstrcmpiA(LPCSTR str1, LPCSTR str2) { + int ret; if (!str1 && !str2) return 0; if (!str1) return -1; if (!str2) return 1; - return CompareStringA( GetThreadLocale(), NORM_IGNORECASE|LOCALE_USE_CP_ACP, str1, -1, str2, -1 ) - 2; + ret = CompareStringA( GetThreadLocale(), NORM_IGNORECASE|LOCALE_USE_CP_ACP, str1, -1, str2, -1 ); + if (ret) ret -= 2; + + return ret; } int WINAPI lstrcmpiW(LPCWSTR str1, LPCWSTR str2) { + int ret; if (!str1 && !str2) return 0; if (!str1) return -1; if (!str2) return 1; - return CompareStringW( GetThreadLocale(), NORM_IGNORECASE, str1, -1, str2, -1 ) - 2; + ret = CompareStringW( GetThreadLocale(), NORM_IGNORECASE, str1, -1, str2, -1 ); + if (ret) ret -= 2; + + return ret; } LPSTR WINAPI KERNELBASE_lstrcpynA( LPSTR dst, LPCSTR src, INT n ) -- 2.17.1

3 3

[PATCH] dwrite: Remove unused functions.
by Nikolay Sivov July 2, 2019

July 2, 2019

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/analyzer.c | 8 -------- dlls/dwrite/font.c | 5 ----- 2 files changed, 13 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 679e1ed0ff..8e58e615e6 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -1394,14 +1394,6 @@ static HRESULT WINAPI dwritetextanalyzer_GetGdiCompatibleGlyphPlacements(IDWrite return hr; } -static inline FLOAT get_cluster_advance(const FLOAT *advances, UINT32 start, UINT32 end) -{ - FLOAT advance = 0.0f; - for (; start < end; start++) - advance += advances[start]; - return advance; -} - static HRESULT apply_cluster_spacing(float leading_spacing, float trailing_spacing, float min_advance_width, unsigned int start, unsigned int end, float const *advances, DWRITE_GLYPH_OFFSET const *offsets, DWRITE_SHAPING_GLYPH_PROPERTIES const *glyph_props, float *modified_advances, diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 5f4abc7ee6..3f11b1d3ad 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -5123,11 +5123,6 @@ static HRESULT WINAPI glyphrunanalysis_GetAlphaTextureBounds(IDWriteGlyphRunAnal return S_OK; } -static inline int get_dib_stride( int width, int bpp ) -{ - return ((width * bpp + 31) >> 3) & ~3; -} - static inline BYTE *get_pixel_ptr(BYTE *ptr, DWRITE_TEXTURE_TYPE type, const RECT *runbounds, const RECT *bounds) { if (type == DWRITE_TEXTURE_CLEARTYPE_3x1) -- 2.20.1

2 1

[PATCH] strmbase: Remove unused function.
by Nikolay Sivov July 2, 2019

July 2, 2019

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/strmbase/pin.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index ebc7a1c16b..4478855ed7 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -347,11 +347,6 @@ static inline BaseOutputPin *impl_BaseOutputPin_from_IPin( IPin *iface ) return CONTAINING_RECORD(iface, BaseOutputPin, pin.IPin_iface); } -static inline BaseOutputPin *impl_BaseOutputPin_from_BasePin( BasePin *iface ) -{ - return CONTAINING_RECORD(iface, BaseOutputPin, pin); -} - HRESULT WINAPI BaseOutputPinImpl_QueryInterface(IPin * iface, REFIID riid, LPVOID * ppv) { BaseOutputPin *This = impl_BaseOutputPin_from_IPin(iface); -- 2.20.1

1 0

[PATCH 1/5] strmbase: Remove unused "ThreadSignal" event.
by Zebediah Figura July 2, 2019

July 2, 2019

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/dsoundrender.c | 1 - dlls/strmbase/renderer.c | 7 ------- include/wine/strmbase.h | 1 - 3 files changed, 9 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index e295e32f669..ee0473478ba 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -737,7 +737,6 @@ static HRESULT WINAPI DSoundRender_Pause(IBaseFilter * iface) ResetEvent(This->blocked); ResetEvent(This->renderer.RenderEvent); } - ResetEvent(This->renderer.ThreadSignal); LeaveCriticalSection(&This->renderer.csRenderLock); return hr; diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index b35011ec641..fa4f0f3c93f 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -281,7 +281,6 @@ HRESULT WINAPI strmbase_renderer_init(BaseRenderer *filter, const IBaseFilterVtb InitializeCriticalSection(&filter->csRenderLock); filter->csRenderLock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__": BaseRenderer.csRenderLock"); filter->evComplete = CreateEventW(NULL, TRUE, TRUE, NULL); - filter->ThreadSignal = CreateEventW(NULL, TRUE, TRUE, NULL); filter->RenderEvent = CreateEventW(NULL, FALSE, FALSE, NULL); filter->pMediaSample = NULL; @@ -306,7 +305,6 @@ void strmbase_renderer_cleanup(BaseRenderer *filter) BaseRendererImpl_ClearPendingSample(filter); CloseHandle(filter->evComplete); - CloseHandle(filter->ThreadSignal); CloseHandle(filter->RenderEvent); QualityControlImpl_Destroy(filter->qcimpl); strmbase_filter_cleanup(&filter->filter); @@ -418,7 +416,6 @@ HRESULT WINAPI BaseRendererImpl_Stop(IBaseFilter * iface) This->pFuncsTable->pfnOnStopStreaming(This); This->filter.state = State_Stopped; SetEvent(This->evComplete); - SetEvent(This->ThreadSignal); SetEvent(This->RenderEvent); } LeaveCriticalSection(&This->csRenderLock); @@ -438,7 +435,6 @@ HRESULT WINAPI BaseRendererImpl_Run(IBaseFilter * iface, REFERENCE_TIME tStart) goto out; SetEvent(This->evComplete); - ResetEvent(This->ThreadSignal); if (This->sink.pin.pConnectedTo) { @@ -496,7 +492,6 @@ HRESULT WINAPI BaseRendererImpl_Pause(IBaseFilter * iface) This->filter.state = State_Paused; } } - ResetEvent(This->ThreadSignal); LeaveCriticalSection(&This->csRenderLock); return S_OK; @@ -559,7 +554,6 @@ HRESULT WINAPI BaseRendererImpl_BeginFlush(BaseRenderer* iface) { TRACE("(%p)\n", iface); BaseRendererImpl_ClearPendingSample(iface); - SetEvent(iface->ThreadSignal); SetEvent(iface->RenderEvent); return S_OK; } @@ -569,7 +563,6 @@ HRESULT WINAPI BaseRendererImpl_EndFlush(BaseRenderer* iface) TRACE("(%p)\n", iface); QualityControlRender_Start(iface->qcimpl, iface->filter.rtStreamStart); RendererPosPassThru_ResetMediaTime(iface->pPosition); - ResetEvent(iface->ThreadSignal); ResetEvent(iface->RenderEvent); return S_OK; } diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index d3df095fde7..5892efcf197 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -541,7 +541,6 @@ typedef struct BaseRendererTag IUnknown *pPosition; CRITICAL_SECTION csRenderLock; HANDLE evComplete; - HANDLE ThreadSignal; HANDLE RenderEvent; IMediaSample *pMediaSample; -- 2.22.0

2 9

[PATCH] ntdll: Correctly fill DataTransferLength in SCSI_PASS_THROUGH and SCSI_PASS_THROUGH_DIRECT.
by Zebediah Figura July 2, 2019

July 2, 2019

From: Zebediah Figura <z.figura12(a)gmail.com> DataTransferLength specifies the number of bytes transferred, but sg_io_hdr_t.resid gives the number of bytes *not* transferred: https://www.tldp.org/HOWTO/SCSI-Generic-HOWTO/x356.html Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47424 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntdll/cdrom.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index 4a3b84d4ad2..f6e3a86e34f 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -1658,7 +1658,7 @@ static NTSTATUS CDROM_ScsiPassThroughDirect(int fd, PSCSI_PASS_THROUGH_DIRECT pP io = ioctl(fd, SG_IO, &cmd); pPacket->ScsiStatus = cmd.status; - pPacket->DataTransferLength = cmd.resid; + pPacket->DataTransferLength -= cmd.resid; pPacket->SenseInfoLength = cmd.sb_len_wr; ret = CDROM_GetStatusCode(io); @@ -1842,7 +1842,7 @@ static NTSTATUS CDROM_ScsiPassThrough(int fd, PSCSI_PASS_THROUGH pPacket) io = ioctl(fd, SG_IO, &cmd); pPacket->ScsiStatus = cmd.status; - pPacket->DataTransferLength = cmd.resid; + pPacket->DataTransferLength -= cmd.resid; pPacket->SenseInfoLength = cmd.sb_len_wr; ret = CDROM_GetStatusCode(io); -- 2.20.1

2 1

[PATCH 5/5] wined3d: Unhook swapchains in swapchain_cleanup().
by Henri Verbeet July 1, 2019

July 1, 2019

So that the hook is properly removed on failure in wined3d_swapchain_create(). This is a somewhat theoretical though, since in practice WINED3D_SWAPCHAIN_HOOK and WINED3D_SWAPCHAIN_IMPLICIT are never used together. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/swapchain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index b75aead1e83..9be6658c83d 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -39,6 +39,7 @@ static void swapchain_cleanup(struct wined3d_swapchain *swapchain) TRACE("Destroying swapchain %p.\n", swapchain); + wined3d_unhook_swapchain(swapchain); wined3d_swapchain_set_gamma_ramp(swapchain, 0, &swapchain->orig_gamma); /* Release the swapchain's draw buffers. Make sure swapchain->back_buffers[0] @@ -121,7 +122,6 @@ ULONG CDECL wined3d_swapchain_decref(struct wined3d_swapchain *swapchain) device = swapchain->device; if (device->swapchain_count && device->swapchains[0] == swapchain) wined3d_device_uninit_3d(device); - wined3d_unhook_swapchain(swapchain); wined3d_cs_finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); swapchain_cleanup(swapchain); -- 2.11.0

1 0

[PATCH 4/5] wined3d: Pass a wined3d_context_gl structure to shader_glsl_generate_ffp_fragment_shader().
by Henri Verbeet July 1, 2019

July 1, 2019

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e6fe7839d02..ed3ff541496 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -9362,13 +9362,13 @@ static void shader_glsl_ffp_fragment_op(struct wined3d_string_buffer *buffer, un /* Context activation is done by the caller. */ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv *priv, - const struct ffp_frag_settings *settings, const struct wined3d_context *context) + const struct ffp_frag_settings *settings, const struct wined3d_context_gl *context_gl) { struct wined3d_string_buffer *tex_reg_name = string_buffer_get(&priv->string_buffers); enum wined3d_cmp_func alpha_test_func = settings->alpha_test_func + 1; struct wined3d_string_buffer *buffer = &priv->shader_buffer; BYTE lum_map = 0, bump_map = 0, tex_map = 0, tss_const_map = 0; - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; const BOOL legacy_syntax = needs_legacy_glsl_syntax(gl_info); BOOL tempreg_used = FALSE, tfactor_used = FALSE; UINT lowest_disabled_stage; @@ -9497,7 +9497,7 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv * if (sampler_type) { if (shader_glsl_use_layout_binding_qualifier(gl_info)) - shader_glsl_append_sampler_binding_qualifier(buffer, context, NULL, stage); + shader_glsl_append_sampler_binding_qualifier(buffer, &context_gl->c, NULL, stage); shader_addline(buffer, "uniform sampler%s ps_sampler%u;\n", sampler_type, stage); } @@ -9795,6 +9795,7 @@ static struct glsl_ffp_vertex_shader *shader_glsl_find_ffp_vertex_shader(struct static struct glsl_ffp_fragment_shader *shader_glsl_find_ffp_fragment_shader(struct shader_glsl_priv *priv, const struct ffp_frag_settings *args, const struct wined3d_context *context) { + const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); struct glsl_ffp_fragment_shader *glsl_desc; const struct ffp_frag_desc *desc; @@ -9805,7 +9806,7 @@ static struct glsl_ffp_fragment_shader *shader_glsl_find_ffp_fragment_shader(str return NULL; glsl_desc->entry.settings = *args; - glsl_desc->id = shader_glsl_generate_ffp_fragment_shader(priv, args, context); + glsl_desc->id = shader_glsl_generate_ffp_fragment_shader(priv, args, context_gl); list_init(&glsl_desc->linked_programs); add_ffp_frag_shader(&priv->ffp_fragment_shaders, &glsl_desc->entry); -- 2.11.0

1 0

[PATCH 3/5] wined3d: Pass a wined3d_context_gl structure to find_glsl_geometry_shader().
by Henri Verbeet July 1, 2019

July 1, 2019

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index a34de176b27..e6fe7839d02 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8633,10 +8633,9 @@ static GLuint find_glsl_domain_shader(const struct wined3d_context_gl *context_g return ret; } -static GLuint find_glsl_geometry_shader(const struct wined3d_context *context, +static GLuint find_glsl_geometry_shader(const struct wined3d_context_gl *context_gl, struct shader_glsl_priv *priv, struct wined3d_shader *shader, const struct gs_compile_args *args) { - const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); struct glsl_gs_compiled_shader *gl_shaders, *new_array; struct glsl_shader_private *shader_data; unsigned int i, new_size; @@ -10174,7 +10173,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const struct gs_compile_args args; find_gs_compile_args(state, gshader, &args, context); - gs_id = find_glsl_geometry_shader(context, priv, gshader, &args); + gs_id = find_glsl_geometry_shader(context_gl, priv, gshader, &args); } /* A pixel shader is not used when rasterization is disabled. */ -- 2.11.0

1 0

[PATCH 2/5] wined3d: Pass a wined3d_context_gl structure to find_glsl_domain_shader().
by Henri Verbeet July 1, 2019

July 1, 2019

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 92a95865f6d..a34de176b27 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8578,10 +8578,9 @@ static GLuint find_glsl_hull_shader(const struct wined3d_context_gl *context_gl, return ret; } -static GLuint find_glsl_domain_shader(const struct wined3d_context *context, +static GLuint find_glsl_domain_shader(const struct wined3d_context_gl *context_gl, struct shader_glsl_priv *priv, struct wined3d_shader *shader, const struct ds_compile_args *args) { - const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); struct glsl_ds_compiled_shader *gl_shaders, *new_array; struct glsl_shader_private *shader_data; unsigned int i, new_size; @@ -10162,7 +10161,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const struct ds_compile_args args; find_ds_compile_args(state, dshader, &args, context); - ds_id = find_glsl_domain_shader(context, priv, dshader, &args); + ds_id = find_glsl_domain_shader(context_gl, priv, dshader, &args); } gshader = state->shader[WINED3D_SHADER_TYPE_GEOMETRY]; -- 2.11.0

1 0

[PATCH 1/5] wined3d: Pass a wined3d_context_gl structure to find_glsl_hull_shader().
by Henri Verbeet July 1, 2019

July 1, 2019

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 8023f7bd2ff..92a95865f6d 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8533,10 +8533,9 @@ static GLuint find_glsl_vertex_shader(const struct wined3d_context_gl *context_g return ret; } -static GLuint find_glsl_hull_shader(const struct wined3d_context *context, +static GLuint find_glsl_hull_shader(const struct wined3d_context_gl *context_gl, struct shader_glsl_priv *priv, struct wined3d_shader *shader) { - const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); struct glsl_hs_compiled_shader *gl_shaders, *new_array; struct glsl_shader_private *shader_data; unsigned int new_size; @@ -10151,7 +10150,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const if (!(context->shader_update_mask & (1u << WINED3D_SHADER_TYPE_HULL)) && ctx_data->glsl_program) hs_id = ctx_data->glsl_program->hs.id; else if (hshader) - hs_id = find_glsl_hull_shader(context, priv, hshader); + hs_id = find_glsl_hull_shader(context_gl, priv, hshader); dshader = state->shader[WINED3D_SHADER_TYPE_DOMAIN]; if (!(context->shader_update_mask & (1u << WINED3D_SHADER_TYPE_DOMAIN)) && ctx_data->glsl_program) -- 2.11.0

1 0

[PATCH v2] user32: Do not call SendMessage() to show a window that is already visible.
by Alexey Prokhin July 1, 2019

July 1, 2019

Based on a patch made by Kimmo Myllyvirta. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=39731 Signed-off-by: Alexey Prokhin <alexey(a)prokhin.ru> --- v2: handle all ShowWindow commands, add a better test case. Supersede 166154 --- dlls/user32/tests/msg.c | 116 ++++++++++++++++++++++++++++++---------- dlls/user32/winpos.c | 64 +++++++++++++++++++--- 2 files changed, 146 insertions(+), 34 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index a5bc1c5518..8aa00d5ba0 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -5041,16 +5041,6 @@ static void test_WM_DEVICECHANGE(HWND hwnd) } } -static DWORD CALLBACK show_window_thread(LPVOID arg) -{ - HWND hwnd = arg; - - /* function will not return if ShowWindow(SW_HIDE) calls SendMessage() */ - ok(ShowWindow(hwnd, SW_HIDE) == FALSE, "ShowWindow(SW_HIDE) expected FALSE\n"); - - return 0; -} - /* Helper function to easier test SetWindowPos messages */ #define test_msg_setpos( expected_list, flags, todo ) \ test_msg_setpos_( (expected_list), (flags), (todo), __FILE__, __LINE__) @@ -5071,8 +5061,6 @@ static void test_msg_setpos_(const struct message *expected_list, UINT flags, BO /* test if we receive the right sequence of messages */ static void test_messages(void) { - DWORD tid; - HANDLE hthread; HWND hwnd, hparent, hchild; HWND hchild2, hbutton; HMENU hmenu; @@ -5111,14 +5099,6 @@ static void test_messages(void) flush_events(); ok_sequence(WmEmptySeq, "ShowWindow(SW_HIDE):overlapped", FALSE); - /* test ShowWindow(SW_HIDE) on a hidden window - multi-threaded */ - hthread = CreateThread(NULL, 0, show_window_thread, hwnd, 0, &tid); - ok(hthread != NULL, "CreateThread failed, error %d\n", GetLastError()); - ok(WaitForSingleObject(hthread, INFINITE) == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); - CloseHandle(hthread); - flush_events(); - ok_sequence(WmEmptySeq, "ShowWindow(SW_HIDE):overlapped", FALSE); - ShowWindow(hwnd, SW_SHOW); flush_events(); ok_sequence(WmShowOverlappedSeq, "ShowWindow(SW_SHOW):overlapped", TRUE); @@ -13180,6 +13160,14 @@ static const struct message WmShowMaximized_3[] = { { 0 } }; +static const char * const sw_cmd_name[13] = +{ + "SW_HIDE", "SW_SHOWNORMAL", "SW_SHOWMINIMIZED", "SW_SHOWMAXIMIZED", + "SW_SHOWNOACTIVATE", "SW_SHOW", "SW_MINIMIZE", "SW_SHOWMINNOACTIVE", + "SW_SHOWNA", "SW_RESTORE", "SW_SHOWDEFAULT", "SW_FORCEMINIMIZE", + "SW_NORMALNA" /* 0xCC */ +}; + static void test_ShowWindow(void) { /* ShowWindow commands in random order */ @@ -13366,13 +13354,6 @@ static void test_ShowWindow(void) for (i = 0; i < ARRAY_SIZE(sw); i++) { - static const char * const sw_cmd_name[13] = - { - "SW_HIDE", "SW_SHOWNORMAL", "SW_SHOWMINIMIZED", "SW_SHOWMAXIMIZED", - "SW_SHOWNOACTIVATE", "SW_SHOW", "SW_MINIMIZE", "SW_SHOWMINNOACTIVE", - "SW_SHOWNA", "SW_RESTORE", "SW_SHOWDEFAULT", "SW_FORCEMINIMIZE", - "SW_NORMALNA" /* 0xCC */ - }; char comment[64]; INT idx; /* index into the above array of names */ @@ -13421,6 +13402,86 @@ if (0) /* FIXME: Wine behaves completely different here */ flush_events(); } +struct show_window_thread_data +{ + const char *comment; + HWND hwnd; + int cmd; + BOOL ret; +}; + +static DWORD CALLBACK show_window_thread(LPVOID arg) +{ + struct show_window_thread_data *d = arg; + BOOL ret; + + /* function will not return if ShowWindow() calls SendMessage() */ + ret = ShowWindow(d->hwnd, d->cmd); + ok(!ret == !d->ret, "%s: expected ret %u, got %u\n", d->comment, d->ret, ret); + + return 0; +} + +static void test_ShowWindow_multithreaded(void) +{ + static const struct + { + INT initial_cmd; /* ShowWindow command to apply before the test */ + INT cmd; /* ShowWindow command to apply in a thread */ + BOOL ret; /* ShowWindow return value */ + } sw[] = { + { SW_HIDE, SW_HIDE, FALSE }, + { SW_RESTORE, SW_SHOW, TRUE }, + { SW_RESTORE, SW_SHOWNOACTIVATE, TRUE }, + { SW_RESTORE, SW_RESTORE, TRUE }, + { SW_RESTORE, SW_SHOWNORMAL, TRUE }, + { SW_RESTORE, SW_SHOWDEFAULT, TRUE }, + { SW_MINIMIZE, SW_SHOW, TRUE }, + { SW_MINIMIZE, SW_SHOWMINNOACTIVE, TRUE }, + { SW_MINIMIZE, SW_MINIMIZE, TRUE }, + { SW_MINIMIZE, SW_SHOWMINIMIZED, TRUE }, + { SW_MINIMIZE, SW_FORCEMINIMIZE, TRUE }, + { SW_SHOWMAXIMIZED, SW_SHOW, TRUE }, + { SW_SHOWMAXIMIZED, SW_SHOWMAXIMIZED, TRUE }, + }; + + DWORD tid; + HANDLE hthread; + HWND hwnd; + int i; + struct show_window_thread_data swtd; + + hwnd = CreateWindowExA(0, "ShowWindowClass", NULL, WS_OVERLAPPEDWINDOW, + 120, 120, 90, 90, + 0, 0, 0, NULL); + assert(hwnd); + + for (i = 0; i < ARRAY_SIZE(sw); ++i) + { + char comment[64]; + sprintf(comment, "%d: ShowWindow(%s)", i+1, sw_cmd_name[sw[i].cmd]); + + ShowWindow(hwnd, sw[i].initial_cmd); + flush_events(); + flush_sequence(); + + swtd.comment = comment; + swtd.hwnd = hwnd; + swtd.cmd = sw[i].cmd; + swtd.ret = sw[i].ret; + hthread = CreateThread(NULL, 0, show_window_thread, &swtd, 0, &tid); + ok(hthread != NULL, "%d: CreateThread failed, error %d\n", i, GetLastError()); + ok(WaitForSingleObject(hthread, 3000) == WAIT_OBJECT_0, "%d: WaitForSingleObject failed\n", i); + CloseHandle(hthread); + + flush_events(); + ok_sequence(WmOptionalPaint, comment, FALSE); + } + + DestroyWindow(hwnd); + flush_events(); +} + static INT_PTR WINAPI test_dlg_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { struct recvd_message msg; @@ -17748,6 +17809,7 @@ START_TEST(msg) test_PostMessage(); test_broadcast(); test_ShowWindow(); + test_ShowWindow_multithreaded(); test_PeekMessage(); test_PeekMessage2(); test_PeekMessage3(); diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 5837c179e4..96f86c4aeb 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -1032,6 +1032,51 @@ UINT WINPOS_MinMaximize( HWND hwnd, UINT cmd, LPRECT rect ) return swpFlags; } +/*********************************************************************** + * is_window_state_changed + * + * A helper function for ShowWindow and ShowWindowAsync for checking if + * a window already has the requested style. + */ +static BOOL is_window_state_changed( LONG style, INT cmd ) +{ + BOOL is_visible = (style & WS_VISIBLE) != 0; + + switch (cmd) { + case SW_HIDE: + if (!is_visible) + return FALSE; + break; + case SW_SHOW: + if (is_visible) + return FALSE; + break; + case SW_SHOWMINNOACTIVE: + case SW_MINIMIZE: + case SW_FORCEMINIMIZE: + case SW_SHOWMINIMIZED: + if (is_visible && (style & WS_MINIMIZE)) + return FALSE; + break; + case SW_SHOWMAXIMIZED: /* same as SW_MAXIMIZE */ + if (is_visible && (style & WS_MAXIMIZE)) + return FALSE; + break; + case SW_SHOWNA: + break; + case SW_SHOWNOACTIVATE: + case SW_RESTORE: + case SW_SHOWNORMAL: /* same as SW_NORMAL: */ + case SW_SHOWDEFAULT: + if (is_visible && !(style & (WS_MINIMIZE | WS_MAXIMIZE))) + return FALSE; + break; + default: + return FALSE; + } + + return TRUE; +} /*********************************************************************** * show_window @@ -1056,7 +1101,6 @@ static BOOL show_window( HWND hwnd, INT cmd ) switch(cmd) { case SW_HIDE: - if (!wasVisible) goto done; showFlag = FALSE; swp |= SWP_HIDEWINDOW | SWP_NOSIZE | SWP_NOMOVE; if (style & WS_CHILD) swp |= SWP_NOACTIVATE | SWP_NOZORDER; @@ -1070,14 +1114,12 @@ static BOOL show_window( HWND hwnd, INT cmd ) case SW_SHOWMINIMIZED: swp |= SWP_SHOWWINDOW | SWP_FRAMECHANGED; swp |= WINPOS_MinMaximize( hwnd, cmd, &newPos ); - if ((style & WS_MINIMIZE) && wasVisible) goto done; break; case SW_SHOWMAXIMIZED: /* same as SW_MAXIMIZE */ if (!wasVisible) swp |= SWP_SHOWWINDOW; swp |= SWP_FRAMECHANGED; swp |= WINPOS_MinMaximize( hwnd, SW_MAXIMIZE, &newPos ); - if ((style & WS_MAXIMIZE) && wasVisible) goto done; break; case SW_SHOWNA: @@ -1085,7 +1127,6 @@ static BOOL show_window( HWND hwnd, INT cmd ) if (style & WS_CHILD) swp |= SWP_NOZORDER; break; case SW_SHOW: - if (wasVisible) goto done; swp |= SWP_SHOWWINDOW | SWP_NOSIZE | SWP_NOMOVE; if (style & WS_CHILD) swp |= SWP_NOACTIVATE | SWP_NOZORDER; break; @@ -1105,7 +1146,6 @@ static BOOL show_window( HWND hwnd, INT cmd ) } else { - if (wasVisible) goto done; swp |= SWP_NOSIZE | SWP_NOMOVE; } if (style & WS_CHILD && !(swp & SWP_STATECHANGED)) swp |= SWP_NOACTIVATE | SWP_NOZORDER; @@ -1114,6 +1154,9 @@ static BOOL show_window( HWND hwnd, INT cmd ) goto done; } + if (!is_window_state_changed( style, cmd )) + goto done; + if ((showFlag != wasVisible || cmd == SW_SHOWNA) && cmd != SW_SHOWMAXIMIZED && !(swp & SWP_STATECHANGED)) { SendMessageW( hwnd, WM_SHOWWINDOW, showFlag, 0 ); @@ -1199,6 +1242,7 @@ done: BOOL WINAPI ShowWindowAsync( HWND hwnd, INT cmd ) { HWND full_handle; + LONG style; if (is_broadcast(hwnd)) { @@ -1209,6 +1253,10 @@ BOOL WINAPI ShowWindowAsync( HWND hwnd, INT cmd ) if ((full_handle = WIN_IsCurrentThread( hwnd ))) return show_window( full_handle, cmd ); + style = GetWindowLongW( hwnd, GWL_STYLE ); + if (!is_window_state_changed( style, cmd )) + return (style & WS_VISIBLE) != 0; + return SendNotifyMessageW( hwnd, WM_WINE_SHOWWINDOW, cmd, 0 ); } @@ -1219,6 +1267,7 @@ BOOL WINAPI ShowWindowAsync( HWND hwnd, INT cmd ) BOOL WINAPI ShowWindow( HWND hwnd, INT cmd ) { HWND full_handle; + LONG style; if (is_broadcast(hwnd)) { @@ -1228,8 +1277,9 @@ BOOL WINAPI ShowWindow( HWND hwnd, INT cmd ) if ((full_handle = WIN_IsCurrentThread( hwnd ))) return show_window( full_handle, cmd ); - if ((cmd == SW_HIDE) && !(GetWindowLongW( hwnd, GWL_STYLE ) & WS_VISIBLE)) - return FALSE; + style = GetWindowLongW( hwnd, GWL_STYLE ); + if (!is_window_state_changed( style, cmd )) + return (style & WS_VISIBLE) != 0; return SendMessageW( hwnd, WM_WINE_SHOWWINDOW, cmd, 0 ); } -- 2.17.2 (Apple Git-113)

2 1

[PATCH 7/7] mshtml: Include URL pathname and query in test traces.
by Jacek Caban July 1, 2019

July 1, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/tests/script.c | 22 +++++++++++----------- dlls/mshtml/tests/winetest.js | 15 ++++++++++++--- 2 files changed, 23 insertions(+), 14 deletions(-)

2 1

[PATCH 6/7] mshtml/tests: Improve tests exception handling.
by Jacek Caban July 1, 2019

July 1, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/tests/winetest.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)

2 1

[PATCH 5/7] mshtml/tests: Rename elements.js to dom.js.
by Jacek Caban July 1, 2019

July 1, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/tests/{elements.js => dom.js} | 0 dlls/mshtml/tests/rsrc.rc | 4 ++-- dlls/mshtml/tests/script.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename dlls/mshtml/tests/{elements.js => dom.js} (100%)

2 1

[PATCH 4/7] mshtml: Add IHTMLDOMRange stub.
by Jacek Caban July 1, 2019

July 1, 2019

From: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- I integrated tests into existing tests to avoid running new document instance. If we need more range tests, it would probably be better in JavaScript anyway. dlls/mshtml/Makefile.in | 2 +- dlls/mshtml/htmldoc.c | 18 +- dlls/mshtml/mshtml_private.h | 3 + dlls/mshtml/{txtrange.c => range.c} | 349 ++++++++++++++++++++++++++++ dlls/mshtml/tests/dom.c | 27 ++- include/mshtml.idl | 88 +++++++ 6 files changed, 483 insertions(+), 4 deletions(-) rename dlls/mshtml/{txtrange.c => range.c} (82%)

2 1

[PATCH 3/7] mshtml/tests: Merge text range tests.
by Jacek Caban July 1, 2019

July 1, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/tests/dom.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-)

1 0

[PATCH 2/7] mshtml/tests: Introduce set_body_html helper.
by Jacek Caban July 1, 2019

July 1, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/tests/dom.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)

1 0

[PATCH 1/7] mshtml/tests: Fix comment tests on recent IE versions.
by Jacek Caban July 1, 2019

July 1, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/tests/dom.c | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-)

1 0

Re: Profiling application under Wine
by Hin-Tak Leung July 1, 2019

July 1, 2019

Hmm, I think wine-mono has been working in 64-bit mode for a while - although you have to invoke wine explicitly as wine64 to hook into it . I think there are some quirks about how wine and wine-mono interacts, in such a way that you cannot do 32-bit + 64-bit switches within the process - i.e. you must do 64-bit wine to get at 64-bit wine-mono. Do you notice any performance difference between using wine-mono and dotnet472 64-bit ? I am going back to wine-mono for your issue, as mono supports setting profiling option via environment variables (catering for exactly this use case, when mono is running embedded inside another process), and you can set WINE_MONO_* variables to pass those along. I am not sure about the exact details so you'll need to look up the relevant docs, but I know this is possible - mono has a built-in profiler, and it is accessible and turned on via environment variables. -------------------------------------------- On Tue, 25/6/19, Chambers, Matthew <matt.chambers42(a)gmail.com> wrote: The application requires dotnet472 and 64-bit at that. I actually had to add that verb to winetricks to get our application to work. I'm definitely getting varying mileage! My question is how to profile it with Windows symbols so I can understand why and either help fix it in Wine or possibly avoid the problem from my application code.

3 3