April 2017 - Wine-commits - list.winehq.org

Ken Thomases : winemac: Don't let child (owned) windows be Cocoa primary full-screen windows.
by Alexandre Julliard 24 Apr '17

24 Apr '17

Module: wine Branch: master Commit: e0ef30e542a66071cb25af3a07afba3262b673bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0ef30e542a66071cb25af3a0… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Apr 24 13:07:15 2017 -0500 winemac: Don't let child (owned) windows be Cocoa primary full-screen windows. They shouldn't get a separate space; they should stick with their parent (owner). Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_window.m | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 9ca40f9..1150322 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -978,7 +978,8 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi NSUInteger style = [self styleMask]; if (behavior & NSWindowCollectionBehaviorParticipatesInCycle && - style & NSResizableWindowMask && !(style & NSUtilityWindowMask) && !maximized) + style & NSResizableWindowMask && !(style & NSUtilityWindowMask) && !maximized && + !(self.parentWindow || self.latentParentWindow)) { behavior |= NSWindowCollectionBehaviorFullScreenPrimary; behavior &= ~NSWindowCollectionBehaviorFullScreenAuxiliary; @@ -1839,6 +1840,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi [latentParentWindow removeChildWineWindow:self]; if ([parent addChildWineWindow:self]) [[WineApplicationController sharedController] adjustWindowLevels]; + [self adjustFullScreenBehavior:[self collectionBehavior]]; } }

1 0

Ken Thomases : winemac: Opt out of macOS 10.12' s automatic window tabbing feature.
by Alexandre Julliard 24 Apr '17

24 Apr '17

Module: wine Branch: master Commit: e49feb63f489141c08a967a9c47930559e1de4f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e49feb63f489141c08a967a9c… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Apr 24 13:07:16 2017 -0500 winemac: Opt out of macOS 10.12's automatic window tabbing feature. It doesn't seem to work well. In full-screen mode, newly-added windows don't always properly resize to fill the screen, so they're not the same size as the windows they're nominally tabbed with. In non-full-screen mode, switching between tabs sometimes causes the windows to grow in height each time. Etc. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_app.m | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 0caca9e..4013e03 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -32,6 +32,15 @@ static NSString* const WineAppWaitQueryResponseMode = @"WineAppWaitQueryResponse int macdrv_err_on; +#if !defined(MAC_OS_X_VERSION_10_12) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_12 +(a)interface NSWindow (WineAutoTabbingExtensions) + + + (void) setAllowsAutomaticWindowTabbing:(BOOL)allows; + +(a)end +#endif + + /*********************************************************************** * WineLocalizedString * @@ -124,6 +133,9 @@ static NSString* WineLocalizedString(unsigned int stringID) [NSNumber numberWithBool:NO], @"ApplePressAndHoldEnabled", nil]; [[NSUserDefaults standardUserDefaults] registerDefaults:defaults]; + + if ([NSWindow respondsToSelector:@selector(setAllowsAutomaticWindowTabbing:)]) + [NSWindow setAllowsAutomaticWindowTabbing:NO]; } }

1 0

Józef Kucia : d3d11: Implement d3d{10, 11}_input_layout_GetDevice().
by Alexandre Julliard 24 Apr '17

24 Apr '17

Module: wine Branch: master Commit: 19f57326948eede76cfebd72ad1ab0d6c66c1cac URL: http://source.winehq.org/git/wine.git/?a=commit;h=19f57326948eede76cfebd72a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 24 12:02:28 2017 +0200 d3d11: Implement d3d{10, 11}_input_layout_GetDevice(). 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> --- dlls/d3d10core/tests/device.c | 2 +- dlls/d3d11/d3d11_private.h | 1 + dlls/d3d11/inputlayout.c | 18 ++++++++++++++++-- dlls/d3d11/tests/d3d11.c | 2 +- 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index f6621e8..e4ab7a4 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -9325,7 +9325,7 @@ static void test_create_input_layout(void) ok(SUCCEEDED(hr), "Failed to create input layout for format %#x, hr %#x.\n", vertex_formats[i], hr); refcount = get_refcount(device); - todo_wine ok(refcount >= expected_refcount, "Got refcount %u, expected >= %u.\n", + ok(refcount >= expected_refcount, "Got refcount %u, expected >= %u.\n", refcount, expected_refcount); ID3D10InputLayout_Release(input_layout); } diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 193a07f..3a9729b 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -254,6 +254,7 @@ struct d3d_input_layout struct wined3d_private_store private_store; struct wined3d_vertex_declaration *wined3d_decl; + ID3D11Device *device; }; HRESULT d3d_input_layout_create(struct d3d_device *device, diff --git a/dlls/d3d11/inputlayout.c b/dlls/d3d11/inputlayout.c index e9c3094..37b6993 100644 --- a/dlls/d3d11/inputlayout.c +++ b/dlls/d3d11/inputlayout.c @@ -151,9 +151,13 @@ static ULONG STDMETHODCALLTYPE d3d11_input_layout_Release(ID3D11InputLayout *ifa if (!refcount) { + ID3D11Device *device = layout->device; + wined3d_mutex_lock(); wined3d_vertex_declaration_decref(layout->wined3d_decl); wined3d_mutex_unlock(); + + ID3D11Device_Release(device); } return refcount; @@ -162,7 +166,11 @@ static ULONG STDMETHODCALLTYPE d3d11_input_layout_Release(ID3D11InputLayout *ifa static void STDMETHODCALLTYPE d3d11_input_layout_GetDevice(ID3D11InputLayout *iface, ID3D11Device **device) { - FIXME("iface %p, device %p stub!\n", iface, device); + struct d3d_input_layout *layout = impl_from_ID3D11InputLayout(iface); + + TRACE("iface %p, device %p.\n", iface, device); + + ID3D11Device_AddRef(*device = layout->device); } static HRESULT STDMETHODCALLTYPE d3d11_input_layout_GetPrivateData(ID3D11InputLayout *iface, @@ -249,7 +257,11 @@ static ULONG STDMETHODCALLTYPE d3d10_input_layout_Release(ID3D10InputLayout *ifa static void STDMETHODCALLTYPE d3d10_input_layout_GetDevice(ID3D10InputLayout *iface, ID3D10Device **device) { - FIXME("iface %p, device %p stub!\n", iface, device); + struct d3d_input_layout *layout = impl_from_ID3D10InputLayout(iface); + + TRACE("iface %p, device %p.\n", iface, device); + + ID3D11Device_QueryInterface(layout->device, &IID_ID3D10Device, (void **)device); } static HRESULT STDMETHODCALLTYPE d3d10_input_layout_GetPrivateData(ID3D10InputLayout *iface, @@ -344,6 +356,8 @@ static HRESULT d3d_input_layout_init(struct d3d_input_layout *layout, struct d3d } wined3d_mutex_unlock(); + ID3D11Device_AddRef(layout->device = &device->ID3D11Device_iface); + return S_OK; } diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index d4a34c6..dfe50c6 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -10321,7 +10321,7 @@ static void test_create_input_layout(void) ok(SUCCEEDED(hr), "Failed to create input layout for format %#x, hr %#x.\n", vertex_formats[i], hr); refcount = get_refcount(device); - todo_wine ok(refcount == expected_refcount, "Got refcount %u, expected %u.\n", + ok(refcount == expected_refcount, "Got refcount %u, expected %u.\n", refcount, expected_refcount); ID3D11InputLayout_Release(input_layout); }

1 0

Józef Kucia : wined3d: Always use core profile GLSL versions.
by Alexandre Julliard 24 Apr '17

24 Apr '17

Module: wine Branch: master Commit: 47b6e3d4e3f21b380620fadd3828ee9f4ece5b75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47b6e3d4e3f21b380620fadd3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 24 12:02:29 2017 +0200 wined3d: Always use core profile GLSL versions. We should not be using any legacy/deprecated syntax anymore. 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> --- dlls/wined3d/glsl_shader.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 0f4e66c..4d585aa 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -365,11 +365,7 @@ static unsigned int shader_glsl_get_version(const struct wined3d_gl_info *gl_inf static void shader_glsl_add_version_declaration(struct wined3d_string_buffer *buffer, const struct wined3d_gl_info *gl_info) { - unsigned int glsl_version = shader_glsl_get_version(gl_info); - if (glsl_version >= 150 && gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) - shader_addline(buffer, "#version %u compatibility\n", glsl_version); - else - shader_addline(buffer, "#version %u\n", glsl_version); + shader_addline(buffer, "#version %u\n", shader_glsl_get_version(gl_info)); } static void shader_glsl_append_imm_vec4(struct wined3d_string_buffer *buffer, const float *values)

1 0

Józef Kucia : wined3d: Introduce wined3d_device_get_cs_uav().
by Alexandre Julliard 24 Apr '17

24 Apr '17

Module: wine Branch: master Commit: 85423a06af34410ed0a76f12975b81e8d47175e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85423a06af34410ed0a76f129… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 24 12:02:30 2017 +0200 wined3d: Introduce wined3d_device_get_cs_uav(). 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> --- dlls/wined3d/device.c | 20 ++++++++++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 3 files changed, 23 insertions(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b5f4bdd..4cf0384 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2862,6 +2862,18 @@ static void wined3d_device_set_pipeline_unordered_access_view(struct wined3d_dev wined3d_unordered_access_view_decref(prev); } +static struct wined3d_unordered_access_view *wined3d_device_get_pipeline_unordered_access_view( + const struct wined3d_device *device, enum wined3d_pipeline pipeline, unsigned int idx) +{ + if (idx >= MAX_UNORDERED_ACCESS_VIEWS) + { + WARN("Invalid UAV index %u.\n", idx); + return NULL; + } + + return device->state.unordered_access_view[pipeline][idx]; +} + void CDECL wined3d_device_set_cs_uav(struct wined3d_device *device, unsigned int idx, struct wined3d_unordered_access_view *uav) { @@ -2870,6 +2882,14 @@ void CDECL wined3d_device_set_cs_uav(struct wined3d_device *device, unsigned int wined3d_device_set_pipeline_unordered_access_view(device, WINED3D_PIPELINE_COMPUTE, idx, uav); } +struct wined3d_unordered_access_view * CDECL wined3d_device_get_cs_uav(const struct wined3d_device *device, + unsigned int idx) +{ + TRACE("device %p, idx %u.\n", device, idx); + + return wined3d_device_get_pipeline_unordered_access_view(device, WINED3D_PIPELINE_COMPUTE, idx); +} + void CDECL wined3d_device_set_unordered_access_view(struct wined3d_device *device, unsigned int idx, struct wined3d_unordered_access_view *uav) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 84ba5d4..92a61e7 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -56,6 +56,7 @@ @ cdecl wined3d_device_get_cs_cb(ptr long) @ cdecl wined3d_device_get_cs_resource_view(ptr long) @ cdecl wined3d_device_get_cs_sampler(ptr long) +@ cdecl wined3d_device_get_cs_uav(ptr long) @ cdecl wined3d_device_get_depth_stencil_view(ptr) @ cdecl wined3d_device_get_device_caps(ptr ptr) @ cdecl wined3d_device_get_display_mode(ptr long ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index e0929ae..31aa143 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2208,6 +2208,8 @@ struct wined3d_buffer * __cdecl wined3d_device_get_cs_cb(const struct wined3d_de struct wined3d_shader_resource_view * __cdecl wined3d_device_get_cs_resource_view(const struct wined3d_device *device, unsigned int idx); struct wined3d_sampler * __cdecl wined3d_device_get_cs_sampler(const struct wined3d_device *device, unsigned int idx); +struct wined3d_unordered_access_view * __cdecl wined3d_device_get_cs_uav(const struct wined3d_device *device, + unsigned int idx); struct wined3d_rendertarget_view * __cdecl wined3d_device_get_depth_stencil_view(const struct wined3d_device *device); HRESULT __cdecl wined3d_device_get_device_caps(const struct wined3d_device *device, WINED3DCAPS *caps); HRESULT __cdecl wined3d_device_get_display_mode(const struct wined3d_device *device, UINT swapchain_idx,

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_CSGetUnorderedAccessViews().
by Alexandre Julliard 24 Apr '17

24 Apr '17

Module: wine Branch: master Commit: 57cd6bc641e9e0f5a21e49e51dc787d2ae514afc URL: http://source.winehq.org/git/wine.git/?a=commit;h=57cd6bc641e9e0f5a21e49e51… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 24 12:02:31 2017 +0200 d3d11: Implement d3d11_immediate_context_CSGetUnorderedAccessViews(). 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> --- dlls/d3d11/device.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 175e271..7df59e1 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2055,7 +2055,27 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_CSGetShaderResources(ID3D1 static void STDMETHODCALLTYPE d3d11_immediate_context_CSGetUnorderedAccessViews(ID3D11DeviceContext *iface, UINT start_slot, UINT view_count, ID3D11UnorderedAccessView **views) { - FIXME("iface %p, start_slot %u, view_count %u, views %p stub!\n", iface, start_slot, view_count, views); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + unsigned int i; + + TRACE("iface %p, start_slot %u, view_count %u, views %p.\n", iface, start_slot, view_count, views); + + wined3d_mutex_lock(); + for (i = 0; i < view_count; ++i) + { + struct wined3d_unordered_access_view *wined3d_view; + struct d3d11_unordered_access_view *view_impl; + + if (!(wined3d_view = wined3d_device_get_cs_uav(device->wined3d_device, start_slot + i))) + { + views[i] = NULL; + continue; + } + + view_impl = wined3d_unordered_access_view_get_parent(wined3d_view); + ID3D11UnorderedAccessView_AddRef(views[i] = &view_impl->ID3D11UnorderedAccessView_iface); + } + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_CSGetShader(ID3D11DeviceContext *iface,

1 0

Józef Kucia : wined3d: Introduce wined3d_device_get_unordered_access_view().
by Alexandre Julliard 24 Apr '17

24 Apr '17

Module: wine Branch: master Commit: c9549b03f567887307a0e798502b6036a2c783fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9549b03f567887307a0e7985… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 24 12:02:32 2017 +0200 wined3d: Introduce wined3d_device_get_unordered_access_view(). 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> --- dlls/wined3d/device.c | 8 ++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 3 files changed, 11 insertions(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4cf0384..645272d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2898,6 +2898,14 @@ void CDECL wined3d_device_set_unordered_access_view(struct wined3d_device *devic wined3d_device_set_pipeline_unordered_access_view(device, WINED3D_PIPELINE_GRAPHICS, idx, uav); } +struct wined3d_unordered_access_view * CDECL wined3d_device_get_unordered_access_view( + const struct wined3d_device *device, unsigned int idx) +{ + TRACE("device %p, idx %u.\n", device, idx); + + return wined3d_device_get_pipeline_unordered_access_view(device, WINED3D_PIPELINE_GRAPHICS, idx); +} + /* Context activation is done by the caller. */ #define copy_and_next(dest, src, size) memcpy(dest, src, size); dest += (size) static HRESULT process_vertices_strided(const struct wined3d_device *device, DWORD dwDestIndex, DWORD dwCount, diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 92a61e7..074d02c 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -96,6 +96,7 @@ @ cdecl wined3d_device_get_texture(ptr long) @ cdecl wined3d_device_get_texture_stage_state(ptr long long) @ cdecl wined3d_device_get_transform(ptr long ptr) +@ cdecl wined3d_device_get_unordered_access_view(ptr long) @ cdecl wined3d_device_get_vertex_declaration(ptr) @ cdecl wined3d_device_get_vertex_shader(ptr) @ cdecl wined3d_device_get_viewport(ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 31aa143..05368bd 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2268,6 +2268,8 @@ DWORD __cdecl wined3d_device_get_texture_stage_state(const struct wined3d_device UINT stage, enum wined3d_texture_stage_state state); void __cdecl wined3d_device_get_transform(const struct wined3d_device *device, enum wined3d_transform_state state, struct wined3d_matrix *matrix); +struct wined3d_unordered_access_view * __cdecl wined3d_device_get_unordered_access_view( + const struct wined3d_device *device, unsigned int idx); struct wined3d_vertex_declaration * __cdecl wined3d_device_get_vertex_declaration(const struct wined3d_device *device); struct wined3d_shader * __cdecl wined3d_device_get_vertex_shader(const struct wined3d_device *device); void __cdecl wined3d_device_get_viewport(const struct wined3d_device *device, struct wined3d_viewport *viewport);

1 0

Jacek Caban : server: Use common get_fd_type implementation for both pipe end implementations.
by Alexandre Julliard 24 Apr '17

24 Apr '17

Module: wine Branch: master Commit: f6b2ccc54b7183ac3e29c0d8b84244cbf2ae3ad0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6b2ccc54b7183ac3e29c0d8b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 24 15:18:14 2017 +0200 server: Use common get_fd_type implementation for both pipe end implementations. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/named_pipe.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/server/named_pipe.c b/server/named_pipe.c index a10ba46..b8ea426 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -153,6 +153,7 @@ static const struct object_ops named_pipe_ops = }; /* common server and client pipe end functions */ +static enum server_fd_type pipe_end_get_fd_type( struct fd *fd ); static obj_handle_t pipe_end_read( struct fd *fd, struct async *async, file_pos_t pos ); static obj_handle_t pipe_end_write( struct fd *fd, struct async *async_data, file_pos_t pos ); static void pipe_end_queue_async( struct fd *fd, struct async *async, int type, int count ); @@ -163,7 +164,6 @@ static void pipe_server_dump( struct object *obj, int verbose ); static struct fd *pipe_server_get_fd( struct object *obj ); static void pipe_server_destroy( struct object *obj); static obj_handle_t pipe_server_flush( struct fd *fd, struct async *async ); -static enum server_fd_type pipe_server_get_fd_type( struct fd *fd ); static obj_handle_t pipe_server_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); static const struct object_ops pipe_server_ops = @@ -192,7 +192,7 @@ static const struct fd_ops pipe_server_fd_ops = { default_fd_get_poll_events, /* get_poll_events */ default_poll_event, /* poll_event */ - pipe_server_get_fd_type, /* get_fd_type */ + pipe_end_get_fd_type, /* get_fd_type */ pipe_end_read, /* read */ pipe_end_write, /* write */ pipe_server_flush, /* flush */ @@ -208,7 +208,6 @@ static struct fd *pipe_client_get_fd( struct object *obj ); static void pipe_client_destroy( struct object *obj ); static obj_handle_t pipe_client_flush( struct fd *fd, struct async *async ); static obj_handle_t pipe_client_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); -static enum server_fd_type pipe_client_get_fd_type( struct fd *fd ); static const struct object_ops pipe_client_ops = { @@ -236,7 +235,7 @@ static const struct fd_ops pipe_client_fd_ops = { default_fd_get_poll_events, /* get_poll_events */ default_poll_event, /* poll_event */ - pipe_client_get_fd_type, /* get_fd_type */ + pipe_end_get_fd_type, /* get_fd_type */ pipe_end_read, /* read */ pipe_end_write, /* write */ pipe_client_flush, /* flush */ @@ -917,12 +916,7 @@ static inline int is_overlapped( unsigned int options ) return !(options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT)); } -static enum server_fd_type pipe_server_get_fd_type( struct fd *fd ) -{ - return FD_TYPE_PIPE; -} - -static enum server_fd_type pipe_client_get_fd_type( struct fd *fd ) +static enum server_fd_type pipe_end_get_fd_type( struct fd *fd ) { return FD_TYPE_PIPE; }

1 0

Jacek Caban : mshtml: Added edge compatibility mode support.
by Alexandre Julliard 24 Apr '17

24 Apr '17

Module: wine Branch: master Commit: cad03646c58382da599537e702246960596adf63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cad03646c58382da599537e70… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 24 15:19:19 2017 +0200 mshtml: Added edge compatibility mode support. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/mutation.c | 9 ++++++++- dlls/mshtml/tests/script.c | 1 + 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index 8c4fc67..84a290e 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -371,10 +371,17 @@ static BOOL parse_ua_compatible(const WCHAR *p, compat_mode_t *r) { int v = 0; + static const WCHAR edgeW[] = {'e','d','g','e',0}; + if(p[0] != 'I' || p[1] != 'E' || p[2] != '=') return FALSE; - p += 3; + + if(!strcmpiW(p, edgeW)) { + *r = COMPAT_MODE_IE11; + return TRUE; + } + while('0' <= *p && *p <= '9') v = v*10 + *(p++)-'0'; if(*p || !v) diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index e8b3d19..41aaa3e 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -3471,6 +3471,7 @@ static void run_js_tests(void) run_script_as_http_with_mode("documentmode.js", "?9", "9"); run_script_as_http_with_mode("documentmode.js", "?10", "10"); run_script_as_http_with_mode("documentmode.js", "?11", "11"); + run_script_as_http_with_mode("documentmode.js", "?11", "edge"); run_script_as_http_with_mode("asyncscriptload.js", NULL, "9"); }

1 0

Jacek Caban : mshtml: Don' t emulate legacy style filters in compatibility mode >= IE10.
by Alexandre Julliard 24 Apr '17

24 Apr '17

Module: wine Branch: master Commit: d25684d5ae4540b87db0d3d1c4c77a24bd3a2a50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d25684d5ae4540b87db0d3d1c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 24 15:20:03 2017 +0200 mshtml: Don't emulate legacy style filters in compatibility mode >= IE10. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 72fc1d3..0c6f3bc 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -341,6 +341,11 @@ static const style_tbl_entry_t *lookup_style_tbl(const WCHAR *name) return NULL; } +static inline compat_mode_t get_style_compat_mode(HTMLStyle *style) +{ + return style->elem && style->elem->node.doc ? style->elem->node.doc->document_mode : COMPAT_MODE_QUIRKS; +} + static LPWSTR fix_px_value(LPCWSTR val) { LPCWSTR ptr = val; @@ -2681,10 +2686,15 @@ static void set_opacity(HTMLStyle *This, const WCHAR *val) static void update_filter(HTMLStyle *This) { - const WCHAR *ptr = This->elem->filter, *ptr2; + const WCHAR *ptr, *ptr2; static const WCHAR alphaW[] = {'a','l','p','h','a'}; + if(get_style_compat_mode(This) >= COMPAT_MODE_IE10) + return; + + ptr = This->elem->filter; + TRACE("%s\n", debugstr_w(ptr)); if(!ptr) { set_opacity(This, emptyW); return;

1 0