wine-commits July 2017

wine-commits@winehq.org

2 participants
632 discussions

Józef Kucia : wined3d: Do not pass LOD to texelFetch( ) for buffer resources.
by Alexandre Julliard 20 Jul '17

20 Jul '17

Module: wine Branch: stable Commit: 3588c533b043bbab1938801d6518bb43776570db URL: http://source.winehq.org/git/wine.git/?a=commit;h=3588c533b043bbab1938801d6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 26 13:07:32 2017 +0100 wined3d: Do not pass LOD to texelFetch() for buffer resources. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 65089c395dbb44eb4f2bf8a7722092254d277549) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index a8d208e..fedc216 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4908,10 +4908,12 @@ static void shader_glsl_resinfo(const struct wined3d_shader_instruction *ins) /* FIXME: The current implementation does not handle multisample textures correctly. */ static void shader_glsl_ld(const struct wined3d_shader_instruction *ins) { + const struct wined3d_shader_reg_maps *reg_maps = ins->ctx->reg_maps; unsigned int resource_idx, sampler_idx, sampler_bind_idx; struct glsl_src_param coord_param, lod_param; struct glsl_sample_function sample_function; DWORD flags = WINED3D_GLSL_SAMPLE_LOAD; + BOOL has_lod_param; if (wined3d_shader_instruction_has_texel_offset(ins)) flags |= WINED3D_GLSL_SAMPLE_OFFSET; @@ -4919,12 +4921,20 @@ static void shader_glsl_ld(const struct wined3d_shader_instruction *ins) resource_idx = ins->src[1].reg.idx[0].offset; sampler_idx = WINED3D_SAMPLER_DEFAULT; + if (resource_idx >= ARRAY_SIZE(reg_maps->resource_info)) + { + ERR("Invalid resource index %u.\n", resource_idx); + return; + } + has_lod_param = reg_maps->resource_info[resource_idx].type != WINED3D_SHADER_RESOURCE_BUFFER; + shader_glsl_get_sample_function(ins->ctx, resource_idx, sampler_idx, flags, &sample_function); shader_glsl_add_src_param(ins, &ins->src[0], sample_function.coord_mask, &coord_param); shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_3, &lod_param); - sampler_bind_idx = shader_glsl_find_sampler(&ins->ctx->reg_maps->sampler_map, resource_idx, sampler_idx); + sampler_bind_idx = shader_glsl_find_sampler(&reg_maps->sampler_map, resource_idx, sampler_idx); shader_glsl_gen_sample_code(ins, sampler_bind_idx, &sample_function, ins->src[1].swizzle, - NULL, NULL, lod_param.param_str, &ins->texel_offset, "%s", coord_param.param_str); + NULL, NULL, has_lod_param ? lod_param.param_str : NULL, &ins->texel_offset, + "%s", coord_param.param_str); shader_glsl_release_sample_function(ins->ctx, &sample_function); }

1 0

Józef Kucia : wined3d: Add initial support for shader buffer views.
by Alexandre Julliard 20 Jul '17

20 Jul '17

Module: wine Branch: stable Commit: fca9de2553d870e157d7aad8d87815e7e5d81de1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fca9de2553d870e157d7aad8d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 26 13:07:31 2017 +0100 wined3d: Add initial support for shader buffer views. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 81878178303ed52a18330fdb668c7d1dc1c02ade) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/buffer.c | 2 +- dlls/wined3d/view.c | 51 +++++++++++++++++++++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 53 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 6883b40..7d0552b 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -567,7 +567,7 @@ static BOOL wined3d_buffer_prepare_location(struct wined3d_buffer *buffer, } } -static BOOL wined3d_buffer_load_location(struct wined3d_buffer *buffer, +BOOL wined3d_buffer_load_location(struct wined3d_buffer *buffer, struct wined3d_context *context, DWORD location) { const struct wined3d_gl_info *gl_info = context->gl_info; diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 18b7180..c63d913 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -121,6 +121,35 @@ static void create_texture_view(struct wined3d_gl_view *view, GLenum view_target context_release(context); } +static void create_buffer_texture(struct wined3d_gl_view *view, + struct wined3d_buffer *buffer, const struct wined3d_format *view_format) +{ + const struct wined3d_gl_info *gl_info; + struct wined3d_context *context; + + context = context_acquire(buffer->resource.device, NULL); + gl_info = context->gl_info; + if (!gl_info->supported[ARB_TEXTURE_BUFFER_OBJECT]) + { + FIXME("OpenGL implementation does not support buffer textures.\n"); + context_release(context); + return; + } + + wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_BUFFER); + + view->target = GL_TEXTURE_BUFFER; + gl_info->gl_ops.gl.p_glGenTextures(1, &view->name); + + context_bind_texture(context, GL_TEXTURE_BUFFER, view->name); + GL_EXTCALL(glTexBuffer(GL_TEXTURE_BUFFER, view_format->glInternal, buffer->buffer_object)); + checkGLcall("Create buffer texture"); + + context_invalidate_state(context, STATE_SHADER_RESOURCE_BINDING); + + context_release(context); +} + ULONG CDECL wined3d_rendertarget_view_incref(struct wined3d_rendertarget_view *view) { ULONG refcount = InterlockedIncrement(&view->refcount); @@ -415,7 +444,27 @@ static HRESULT wined3d_shader_resource_view_init(struct wined3d_shader_resource_ if (resource->type == WINED3D_RTYPE_BUFFER) { - FIXME("Buffer shader resource views not supported.\n"); + struct wined3d_buffer *buffer = buffer_from_resource(resource); + + if (desc->format_id == WINED3DFMT_UNKNOWN) + { + FIXME("Structured buffer views not supported.\n"); + } + else if (desc->flags & WINED3D_VIEW_BUFFER_RAW) + { + FIXME("Raw buffer views not supported.\n"); + } + else + { + /* FIXME: Support for buffer offsets can be implemented using ARB_texture_buffer_range. */ + if (desc->u.buffer.start_idx + || desc->u.buffer.count * view_format->byte_count != buffer->resource.size) + { + FIXME("Ignoring buffer range %u-%u.\n", desc->u.buffer.start_idx, desc->u.buffer.count); + } + + create_buffer_texture(&view->gl_view, buffer, view_format); + } } else { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a94aa64..3579e21 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3265,6 +3265,8 @@ DWORD wined3d_buffer_get_memory(struct wined3d_buffer *buffer, void wined3d_buffer_invalidate_location(struct wined3d_buffer *buffer, DWORD location) DECLSPEC_HIDDEN; void wined3d_buffer_load(struct wined3d_buffer *buffer, struct wined3d_context *context, const struct wined3d_state *state) DECLSPEC_HIDDEN; +BOOL wined3d_buffer_load_location(struct wined3d_buffer *buffer, + struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; BYTE *wined3d_buffer_load_sysmem(struct wined3d_buffer *buffer, struct wined3d_context *context) DECLSPEC_HIDDEN; HRESULT wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_offset, struct wined3d_buffer *src_buffer, unsigned int src_offset, unsigned int size) DECLSPEC_HIDDEN;

1 0

Józef Kucia : wined3d: Create dummy buffer textures.
by Alexandre Julliard 20 Jul '17

20 Jul '17

Module: wine Branch: stable Commit: cd55047c5eec29ffdcf4cfda1195176e00157572 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd55047c5eec29ffdcf4cfda1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 26 13:07:30 2017 +0100 wined3d: Create dummy buffer textures. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e800093706e7b56ae1df73182ec52f906295a975) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/context.c | 7 +++++++ dlls/wined3d/device.c | 26 ++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 34 insertions(+) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 6112b40..4243152 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1545,6 +1545,9 @@ void context_bind_dummy_textures(const struct wined3d_device *device, const stru if (gl_info->supported[EXT_TEXTURE_ARRAY]) gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_2D_ARRAY, device->dummy_textures.tex_2d_array); + if (gl_info->supported[ARB_TEXTURE_BUFFER_OBJECT]) + gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_BUFFER, device->dummy_textures.tex_buffer); + checkGLcall("Bind dummy textures"); } } @@ -2444,6 +2447,10 @@ void context_bind_texture(struct wined3d_context *context, GLenum target, GLuint gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_3D, device->dummy_textures.tex_3d); checkGLcall("glBindTexture"); break; + case GL_TEXTURE_BUFFER: + gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_BUFFER, device->dummy_textures.tex_buffer); + checkGLcall("glBindTexture"); + break; default: ERR("Unexpected texture target %#x.\n", old_texture_type); } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3a24e29..6aca567 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -769,6 +769,29 @@ static void create_dummy_textures(struct wined3d_device *device, struct wined3d_ checkGLcall("glTexImage3D"); } + if (gl_info->supported[ARB_TEXTURE_BUFFER_OBJECT]) + { + GLuint buffer; + + GL_EXTCALL(glGenBuffers(1, &buffer)); + GL_EXTCALL(glBindBuffer(GL_TEXTURE_BUFFER, buffer)); + GL_EXTCALL(glBufferData(GL_TEXTURE_BUFFER, sizeof(color), &color, GL_STATIC_DRAW)); + GL_EXTCALL(glBindBuffer(GL_TEXTURE_BUFFER, 0)); + checkGLcall("Create buffer object"); + + gl_info->gl_ops.gl.p_glGenTextures(1, &device->dummy_textures.tex_buffer); + checkGLcall("glGenTextures"); + TRACE("Dummy buffer texture given name %u.\n", device->dummy_textures.tex_buffer); + + gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_BUFFER, device->dummy_textures.tex_buffer); + checkGLcall("glBindTexture"); + GL_EXTCALL(glTexBuffer(GL_TEXTURE_BUFFER, GL_RGBA8, buffer)); + checkGLcall("glTexBuffer"); + + GL_EXTCALL(glDeleteBuffers(1, &buffer)); + checkGLcall("glDeleteBuffers"); + } + context_bind_dummy_textures(device, context); } @@ -777,6 +800,9 @@ static void destroy_dummy_textures(struct wined3d_device *device, struct wined3d { const struct wined3d_gl_info *gl_info = context->gl_info; + if (gl_info->supported[ARB_TEXTURE_BUFFER_OBJECT]) + gl_info->gl_ops.gl.p_glDeleteTextures(1, &device->dummy_textures.tex_buffer); + if (gl_info->supported[EXT_TEXTURE_ARRAY]) gl_info->gl_ops.gl.p_glDeleteTextures(1, &device->dummy_textures.tex_2d_array); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2fb410b..a94aa64 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2592,6 +2592,7 @@ struct wined3d_device GLuint tex_3d; GLuint tex_cube; GLuint tex_2d_array; + GLuint tex_buffer; } dummy_textures; /* Default sampler used to emulate the direct resource access without using wined3d_sampler */

1 0

Józef Kucia : wined3d: Add ARB_texture_buffer_object extension.
by Alexandre Julliard 20 Jul '17

20 Jul '17

Module: wine Branch: stable Commit: d2819469f8dbb128b1f77ef174ad6661b1acb47c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2819469f8dbb128b1f77ef17… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 26 13:07:29 2017 +0100 wined3d: Add ARB_texture_buffer_object extension. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 83057194569d014f01f79a6f7f93604c1ab52f76) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/directx.c | 6 ++++++ dlls/wined3d/wined3d_gl.h | 1 + 2 files changed, 7 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 7954248..fbae9c1 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -154,6 +154,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_stencil_texturing", ARB_STENCIL_TEXTURING }, {"GL_ARB_sync", ARB_SYNC }, {"GL_ARB_texture_border_clamp", ARB_TEXTURE_BORDER_CLAMP }, + {"GL_ARB_texture_buffer_object", ARB_TEXTURE_BUFFER_OBJECT }, {"GL_ARB_texture_compression", ARB_TEXTURE_COMPRESSION }, {"GL_ARB_texture_compression_bptc", ARB_TEXTURE_COMPRESSION_BPTC }, {"GL_ARB_texture_compression_rgtc", ARB_TEXTURE_COMPRESSION_RGTC }, @@ -2788,6 +2789,8 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) USE_GL_FUNC(glGetSynciv) USE_GL_FUNC(glIsSync) USE_GL_FUNC(glWaitSync) + /* GL_ARB_texture_buffer_object */ + USE_GL_FUNC(glTexBufferARB) /* GL_ARB_texture_compression */ USE_GL_FUNC(glCompressedTexImage2DARB) USE_GL_FUNC(glCompressedTexImage3DARB) @@ -3160,6 +3163,7 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) USE_GL_FUNC(glShaderSource) /* OpenGL 2.0 */ USE_GL_FUNC(glStencilFuncSeparate) /* OpenGL 2.0 */ USE_GL_FUNC(glStencilOpSeparate) /* OpenGL 2.0 */ + USE_GL_FUNC(glTexBuffer) /* OpenGL 3.1 */ USE_GL_FUNC(glTexImage3D) /* OpenGL 1.2 */ USE_GL_FUNC(glTexSubImage3D) /* OpenGL 1.2 */ USE_GL_FUNC(glUniform1f) /* OpenGL 2.0 */ @@ -3281,6 +3285,7 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) MAP_GL_FUNCTION(glLinkProgram, glLinkProgramARB); MAP_GL_FUNCTION(glMapBuffer, glMapBufferARB); MAP_GL_FUNCTION_CAST(glShaderSource, glShaderSourceARB); + MAP_GL_FUNCTION(glTexBuffer, glTexBufferARB); MAP_GL_FUNCTION_CAST(glTexImage3D, glTexImage3DEXT); MAP_GL_FUNCTION(glTexSubImage3D, glTexSubImage3DEXT); MAP_GL_FUNCTION(glUniform1f, glUniform1fARB); @@ -3625,6 +3630,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, DWORD {ARB_COPY_BUFFER, MAKEDWORD_VERSION(3, 1)}, {ARB_DRAW_INSTANCED, MAKEDWORD_VERSION(3, 1)}, + {ARB_TEXTURE_BUFFER_OBJECT, MAKEDWORD_VERSION(3, 1)}, {ARB_UNIFORM_BUFFER_OBJECT, MAKEDWORD_VERSION(3, 1)}, {EXT_TEXTURE_SNORM, MAKEDWORD_VERSION(3, 1)}, /* We don't need or want GL_ARB_texture_rectangle (core in 3.1). */ diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index cb1647c..84c49c3 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -87,6 +87,7 @@ enum wined3d_gl_extension ARB_STENCIL_TEXTURING, ARB_SYNC, ARB_TEXTURE_BORDER_CLAMP, + ARB_TEXTURE_BUFFER_OBJECT, ARB_TEXTURE_COMPRESSION, ARB_TEXTURE_COMPRESSION_BPTC, ARB_TEXTURE_COMPRESSION_RGTC,

1 0

Sebastian Lackner : mmdevapi: Use InitOnce to initialize audio drivers.
by Alexandre Julliard 20 Jul '17

20 Jul '17

Module: wine Branch: stable Commit: db393739a7f6646da896a9f23a0b9262e49e55b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db393739a7f6646da896a9f23… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Feb 17 09:34:25 2017 +0100 mmdevapi: Use InitOnce to initialize audio drivers. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit db0518507a595fbad33e47c1afe54edcf6a50b5d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mmdevapi/main.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/mmdevapi/main.c b/dlls/mmdevapi/main.c index 110c802..4246758 100644 --- a/dlls/mmdevapi/main.c +++ b/dlls/mmdevapi/main.c @@ -109,7 +109,7 @@ static BOOL load_driver(const WCHAR *name, DriverFuncs *driver) return TRUE; } -static BOOL init_driver(void) +static BOOL WINAPI init_driver(INIT_ONCE *once, void *param, void **context) { static const WCHAR drv_value[] = {'A','u','d','i','o',0}; @@ -120,9 +120,6 @@ static BOOL init_driver(void) HKEY key; WCHAR reg_list[256], *p, *next, *driver_list = default_list; - if(drvs.module) - return TRUE; - if(RegOpenKeyW(HKEY_CURRENT_USER, drv_keyW, &key) == ERROR_SUCCESS){ DWORD size = sizeof(reg_list); @@ -276,10 +273,11 @@ static IClassFactoryImpl MMDEVAPI_CF[] = { HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { + static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; unsigned int i = 0; TRACE("(%s, %s, %p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); - if(!init_driver()){ + if(!InitOnceExecuteOnce(&init_once, init_driver, NULL, NULL)) { ERR("Driver initialization failed\n"); return E_FAIL; }

1 0

Alex Henrie : user32: Translate WM_(NC) XBUTTONUP to WM_APPCOMMAND in DefWindowProc.
by Alexandre Julliard 20 Jul '17

20 Jul '17

Module: wine Branch: stable Commit: 5e5661324016aec2fcdd5af369bf6bd08d2b894a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e5661324016aec2fcdd5af36… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Feb 22 23:17:07 2017 -0700 user32: Translate WM_(NC)XBUTTONUP to WM_APPCOMMAND in DefWindowProc. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 2799be180439a09588888b0ce5854faef8fe4a4a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/defwnd.c | 9 +++++++++ dlls/user32/tests/msg.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index e62f021..6fbaf1e 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -291,6 +291,15 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa */ break; + case WM_XBUTTONUP: + case WM_NCXBUTTONUP: + if (HIWORD(wParam) == XBUTTON1 || HIWORD(wParam) == XBUTTON2) + { + SendMessageW(hwnd, WM_APPCOMMAND, (WPARAM)hwnd, + MAKELPARAM(LOWORD(wParam), FAPPCOMMAND_MOUSE | HIWORD(wParam))); + } + break; + case WM_CONTEXTMENU: if (GetWindowLongW( hwnd, GWL_STYLE ) & WS_CHILD) SendMessageW( GetParent(hwnd), msg, wParam, lParam ); diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index cd757b8..eba949b 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -14308,6 +14308,18 @@ static const struct message NCRBUTTONDOWNSeq[] = { 0 } }; +static const struct message NCXBUTTONUPSeq1[] = +{ + { WM_APPCOMMAND, sent|lparam, /*hwnd*/0, MAKELPARAM(0, FAPPCOMMAND_MOUSE | APPCOMMAND_BROWSER_BACKWARD) }, + { 0 } +}; + +static const struct message NCXBUTTONUPSeq2[] = +{ + { WM_APPCOMMAND, sent|lparam, /*hwnd*/0, MAKELPARAM(0, FAPPCOMMAND_MOUSE | APPCOMMAND_BROWSER_FORWARD) }, + { 0 } +}; + struct rbuttonup_thread_data { HWND hwnd; @@ -14367,6 +14379,22 @@ static void test_defwinproc(void) DefWindowProcA( hwnd, WM_NCRBUTTONDOWN, HTCAPTION, MAKELPARAM(x, y)); ok_sequence(NCRBUTTONDOWNSeq, "WM_NCRBUTTONDOWN on caption", FALSE); + res = DefWindowProcA(hwnd, WM_NCXBUTTONUP, 0, MAKELPARAM(x, y)); + ok(!res, "WM_NCXBUTTONUP returned %ld\n", res); + ok_sequence(WmEmptySeq, "WM_NCXBUTTONUP without button", FALSE); + + res = DefWindowProcA(hwnd, WM_NCXBUTTONUP, MAKEWPARAM(0, XBUTTON1), MAKELPARAM(x, y)); + ok(!res, "WM_NCXBUTTONUP returned %ld\n", res); + ok_sequence(NCXBUTTONUPSeq1, "WM_NCXBUTTONUP with XBUTTON1", FALSE); + + res = DefWindowProcA(hwnd, WM_NCXBUTTONUP, MAKEWPARAM(0, XBUTTON2), MAKELPARAM(x, y)); + ok(!res, "WM_NCXBUTTONUP returned %ld\n", res); + ok_sequence(NCXBUTTONUPSeq2, "WM_NCXBUTTONUP with XBUTTON2", FALSE); + + res = DefWindowProcA(hwnd, WM_NCXBUTTONUP, MAKEWPARAM(0, 3), MAKELPARAM(x, y)); + ok(!res, "WM_NCXBUTTONUP returned %ld\n", res); + ok_sequence(WmEmptySeq, "WM_NCXBUTTONUP with invalid button", FALSE); + SetEvent( data.wndproc_finished ); WaitForSingleObject( thread, 1000 ); CloseHandle( data.wndproc_finished );

1 0

Nikolay Sivov : regedit: Sort each of top level branches separately.
by Alexandre Julliard 20 Jul '17

20 Jul '17

Module: wine Branch: stable Commit: 8c54035a62ab902d8f8cd5d6bfc9aa4db5b5e171 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c54035a62ab902d8f8cd5d6b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 17 18:09:53 2017 +0300 regedit: Sort each of top level branches separately. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a9bae9629c7496724fa5ed7fac222441df082024) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/regedit/treeview.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/programs/regedit/treeview.c b/programs/regedit/treeview.c index 89afddd..f94041a 100644 --- a/programs/regedit/treeview.c +++ b/programs/regedit/treeview.c @@ -465,6 +465,17 @@ static BOOL RefreshTreeItem(HWND hwndTV, HTREEITEM hItem) return TRUE; } +static void treeview_sort_item(HWND hWnd, HTREEITEM item) +{ + HTREEITEM child = (HTREEITEM)SendMessageW(hWnd, TVM_GETNEXTITEM, TVGN_CHILD, (LPARAM)item); + + while (child != NULL) { + treeview_sort_item(hWnd, child); + child = (HTREEITEM)SendMessageW(hWnd, TVM_GETNEXTITEM, TVGN_NEXT, (LPARAM)child); + } + SendMessageW(hWnd, TVM_SORTCHILDREN, 0, (LPARAM)item); +} + BOOL RefreshTreeView(HWND hwndTV) { HTREEITEM hItem; @@ -481,12 +492,12 @@ BOOL RefreshTreeView(HWND hwndTV) hItem = (HTREEITEM)SendMessageW(hwndTV, TVM_GETNEXTITEM, TVGN_CHILD, (LPARAM)hRoot); while (hItem) { RefreshTreeItem(hwndTV, hItem); + treeview_sort_item(hwndTV, hItem); hItem = (HTREEITEM)SendMessageW(hwndTV, TVM_GETNEXTITEM, TVGN_NEXT, (LPARAM)hItem); } SendMessageW(hwndTV, WM_SETREDRAW, TRUE, 0); InvalidateRect(hwndTV, NULL, FALSE); - SendMessageW(hwndTV, TVM_SORTCHILDREN, TRUE, (LPARAM)hSelectedItem); SetCursor(hcursorOld); /* We reselect the currently selected node, this will prompt a refresh of the listview. */

1 0

Hugh McMaster : regedit: Sort treeview children on refresh.
by Alexandre Julliard 20 Jul '17

20 Jul '17

Module: wine Branch: stable Commit: c866c19090fed0d2c62f9f39b22acebbc49c1dcb URL: http://source.winehq.org/git/wine.git/?a=commit;h=c866c19090fed0d2c62f9f39b… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Feb 9 11:12:14 2017 +0000 regedit: Sort treeview children on refresh. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7073e27fbd61c7d2eeff8e4e3ccf1dfa0eca581b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/regedit/treeview.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/regedit/treeview.c b/programs/regedit/treeview.c index f081c16..89afddd 100644 --- a/programs/regedit/treeview.c +++ b/programs/regedit/treeview.c @@ -486,6 +486,7 @@ BOOL RefreshTreeView(HWND hwndTV) SendMessageW(hwndTV, WM_SETREDRAW, TRUE, 0); InvalidateRect(hwndTV, NULL, FALSE); + SendMessageW(hwndTV, TVM_SORTCHILDREN, TRUE, (LPARAM)hSelectedItem); SetCursor(hcursorOld); /* We reselect the currently selected node, this will prompt a refresh of the listview. */

1 0

Piotr Caban : msvcr110: Add _Lock_shared_ptr_spin_lock implementation.
by Alexandre Julliard 20 Jul '17

20 Jul '17

Module: wine Branch: stable Commit: 2ceee36e0185378f336570371773b198ed267942 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ceee36e0185378f336570371… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 28 11:21:12 2017 +0100 msvcr110: Add _Lock_shared_ptr_spin_lock implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 26d30c63154c5fb3258fd6d24959c12052999c7f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcr110/msvcr110.spec | 4 ++-- dlls/msvcrt/lock.c | 21 +++++++++++++++++++++ 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index a73f18d..768bf8b 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -854,7 +854,7 @@ @ cdecl _Gettnames() @ extern _HUGE MSVCRT__HUGE @ cdecl _IsExceptionObjectToBeDestroyed(ptr) -@ stub _Lock_shared_ptr_spin_lock +@ cdecl _Lock_shared_ptr_spin_lock() @ stub -arch=i386 _NLG_Dispatch2 @ stub -arch=arm,win64 __NLG_Dispatch2 @ stub -arch=i386 _NLG_Return @@ -863,7 +863,7 @@ @ stub -arch=win64 _SetImageBase @ stub -arch=win64 _SetThrowImageBase @ cdecl _Strftime(str long str ptr ptr) -@ stub _Unlock_shared_ptr_spin_lock +@ cdecl _Unlock_shared_ptr_spin_lock() @ cdecl _W_Getdays() @ cdecl _W_Getmonths() @ cdecl _W_Gettnames() diff --git a/dlls/msvcrt/lock.c b/dlls/msvcrt/lock.c index d81967c..308c6fc 100644 --- a/dlls/msvcrt/lock.c +++ b/dlls/msvcrt/lock.c @@ -912,6 +912,27 @@ MSVCRT_bool __thiscall _ReentrantBlockingLock__TryAcquire(_ReentrantBlockingLock } #endif +#if _MSVCR_VER == 110 +static LONG shared_ptr_lock; + +void __cdecl _Lock_shared_ptr_spin_lock(void) +{ + LONG l = 0; + + while(InterlockedCompareExchange(&shared_ptr_lock, 1, 0) != 0) { + if(l++ == 1000) { + Sleep(0); + l = 0; + } + } +} + +void __cdecl _Unlock_shared_ptr_spin_lock(void) +{ + shared_ptr_lock = 0; +} +#endif + /********************************************************************** * msvcrt_free_locks (internal) *

1 0

Piotr Caban : ucrtbase: Add __initialize_lconv_for_unsigned_char implementation.
by Alexandre Julliard 20 Jul '17

20 Jul '17

Module: wine Branch: stable Commit: b561a262b26fa53d4db415264e6362ed004603f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b561a262b26fa53d4db415264… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Feb 22 14:37:45 2017 +0100 ucrtbase: Add __initialize_lconv_for_unsigned_char implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7b0a58f217db73e3664ca4f7d5adf492ce91d015) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/api-ms-win-crt-locale-l1-1-0/api-ms-win-crt-locale-l1-1-0.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-crt-locale-l1-1-0/api-ms-win-crt-locale-l1-1-0.spec b/dlls/api-ms-win-crt-locale-l1-1-0/api-ms-win-crt-locale-l1-1-0.spec index 60c588b..12bbbe6 100644 --- a/dlls/api-ms-win-crt-locale-l1-1-0/api-ms-win-crt-locale-l1-1-0.spec +++ b/dlls/api-ms-win-crt-locale-l1-1-0/api-ms-win-crt-locale-l1-1-0.spec @@ -3,7 +3,7 @@ @ cdecl ___lc_locale_name_func() ucrtbase.___lc_locale_name_func @ cdecl ___mb_cur_max_func() ucrtbase.___mb_cur_max_func @ cdecl ___mb_cur_max_l_func(ptr) ucrtbase.___mb_cur_max_l_func -@ stub __initialize_lconv_for_unsigned_char +@ cdecl __initialize_lconv_for_unsigned_char() ucrtbase.__initialize_lconv_for_unsigned_char @ cdecl __pctype_func() ucrtbase.__pctype_func @ stub __pwctype_func @ cdecl _configthreadlocale(long) ucrtbase._configthreadlocale diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 5da253b..c75d75e 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -91,7 +91,7 @@ @ cdecl __dstbias() MSVCRT___p__dstbias @ cdecl __fpe_flt_rounds() @ cdecl __fpecode() -@ stub __initialize_lconv_for_unsigned_char +@ cdecl __initialize_lconv_for_unsigned_char() __lconv_init @ stub __intrinsic_abnormal_termination @ cdecl -arch=i386,x86_64,arm -norelay __intrinsic_setjmp(ptr) MSVCRT__setjmp @ stub __intrinsic_setjmpex

1 0

← Newer
1
...
18
19
20
21
22
23
24
...
64
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-commits July 2017