March 2020 - Wine-Commits - list.winehq.org

Zebediah Figura : wined3d: Move the destination blend state to wined3d_blend_state.
by Alexandre Julliard March 12, 2020

March 12, 2020

Module: wine Branch: master Commit: 04e9d574f522b13e0c10b7c23fd142cbd5492f6e URL: https://source.winehq.org/git/wine.git/?a=commit;h=04e9d574f522b13e0c10b7c2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 10 18:06:15 2020 -0500 wined3d: Move the destination blend state to wined3d_blend_state. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 1 - dlls/d3d11/state.c | 1 + dlls/wined3d/device.c | 2 ++ dlls/wined3d/state.c | 7 ++----- include/wine/wined3d.h | 1 + 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index f968f1d971..11265cf1b0 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -740,7 +740,6 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetBlendState(ID3D11Devi { const D3D11_RENDER_TARGET_BLEND_DESC *d = &desc->RenderTarget[0]; - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_DESTBLEND, d->DestBlend); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_BLENDOP, d->BlendOp); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SEPARATEALPHABLENDENABLE, TRUE); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SRCBLENDALPHA, d->SrcBlendAlpha); diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index 1cc579c86a..4d5bd8d94e 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -391,6 +391,7 @@ HRESULT d3d_blend_state_create(struct d3d_device *device, const D3D11_BLEND_DESC wined3d_desc.alpha_to_coverage = desc->AlphaToCoverageEnable; wined3d_desc.enable = desc->RenderTarget[0].BlendEnable; wined3d_desc.src = desc->RenderTarget[0].SrcBlend; + wined3d_desc.dst = desc->RenderTarget[0].DestBlend; /* We cannot fail after creating a wined3d_blend_state object. It * would lead to double free. */ diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 54efdb05a7..d7175284cf 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3583,6 +3583,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, case WINED3D_RS_BLENDFACTOR: case WINED3D_RS_ALPHABLENDENABLE: case WINED3D_RS_SRCBLEND: + case WINED3D_RS_DESTBLEND: set_blend_state = TRUE; break; @@ -3655,6 +3656,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, desc.alpha_to_coverage = TRUE; desc.enable = state->rs[WINED3D_RS_ALPHABLENDENABLE]; desc.src = state->rs[WINED3D_RS_SRCBLEND]; + desc.dst = state->rs[WINED3D_RS_DESTBLEND]; if (wined3d_bitmap_is_set(changed->renderState, WINED3D_RS_BLENDFACTOR)) wined3d_color_from_d3dcolor(&colour, state->rs[WINED3D_RS_BLENDFACTOR]); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index aa85193bdd..8de2945bf5 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -557,8 +557,7 @@ static void state_blend(struct wined3d_context *context, const struct wined3d_st gl_info->gl_ops.gl.p_glEnable(GL_BLEND); checkGLcall("glEnable(GL_BLEND)"); - gl_blend_from_d3d(&src_blend, &dst_blend, b->desc.src, - state->render_states[WINED3D_RS_DESTBLEND], rt_format); + gl_blend_from_d3d(&src_blend, &dst_blend, b->desc.src, b->desc.dst, rt_format); /* Re-apply BLENDOP(ALPHA) because of a possible SEPARATEALPHABLENDENABLE change */ if (!isStateDirty(context, STATE_RENDER(WINED3D_RS_BLENDOP))) @@ -4503,7 +4502,6 @@ const struct wined3d_state_entry_template misc_state_template[] = { STATE_COMPUTE_UNORDERED_ACCESS_VIEW_BINDING, { STATE_COMPUTE_UNORDERED_ACCESS_VIEW_BINDING, state_uav_warn }, WINED3D_GL_EXT_NONE }, { STATE_STREAM_OUTPUT, { STATE_STREAM_OUTPUT, state_so, }, WINED3D_GL_VERSION_3_2 }, { STATE_STREAM_OUTPUT, { STATE_STREAM_OUTPUT, state_so_warn, }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_DESTBLEND), { STATE_BLEND, NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_EDGEANTIALIAS), { STATE_RENDER(WINED3D_RS_EDGEANTIALIAS), state_line_antialias}, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_SEPARATEALPHABLENDENABLE), { STATE_BLEND, NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_SRCBLENDALPHA), { STATE_BLEND, NULL }, WINED3D_GL_EXT_NONE }, @@ -5417,8 +5415,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table) { 1, 1}, { 3, 3}, { 8, 8}, - { 17, 19}, - { 21, 22}, + { 17, 22}, { 27, 27}, { 42, 45}, { 47, 47}, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index d6a9a079d7..3e43264a76 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2031,6 +2031,7 @@ struct wined3d_blend_state_desc BOOL alpha_to_coverage; BOOL enable; enum wined3d_blend src; + enum wined3d_blend dst; }; struct wined3d_rasterizer_state_desc

1 0

Zebediah Figura : wined3d: Move the blend operation to wined3d_blend_state.
by Alexandre Julliard March 12, 2020

March 12, 2020

Module: wine Branch: master Commit: 936310585c533beb50188f4a5d1328983c2c10fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=936310585c533beb50188f4a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 10 18:06:16 2020 -0500 wined3d: Move the blend operation to wined3d_blend_state. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 1 - dlls/d3d11/state.c | 1 + dlls/wined3d/device.c | 2 ++ dlls/wined3d/state.c | 24 +++++++++++------------- include/wine/wined3d.h | 1 + 5 files changed, 15 insertions(+), 14 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 11265cf1b0..8193ec4cf4 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -740,7 +740,6 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetBlendState(ID3D11Devi { const D3D11_RENDER_TARGET_BLEND_DESC *d = &desc->RenderTarget[0]; - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_BLENDOP, d->BlendOp); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SEPARATEALPHABLENDENABLE, TRUE); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SRCBLENDALPHA, d->SrcBlendAlpha); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_DESTBLENDALPHA, d->DestBlendAlpha); diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index 4d5bd8d94e..693bb3df83 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -392,6 +392,7 @@ HRESULT d3d_blend_state_create(struct d3d_device *device, const D3D11_BLEND_DESC wined3d_desc.enable = desc->RenderTarget[0].BlendEnable; wined3d_desc.src = desc->RenderTarget[0].SrcBlend; wined3d_desc.dst = desc->RenderTarget[0].DestBlend; + wined3d_desc.op = desc->RenderTarget[0].BlendOp; /* We cannot fail after creating a wined3d_blend_state object. It * would lead to double free. */ diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d7175284cf..5bb9542891 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3584,6 +3584,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, case WINED3D_RS_ALPHABLENDENABLE: case WINED3D_RS_SRCBLEND: case WINED3D_RS_DESTBLEND: + case WINED3D_RS_BLENDOP: set_blend_state = TRUE; break; @@ -3657,6 +3658,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, desc.enable = state->rs[WINED3D_RS_ALPHABLENDENABLE]; desc.src = state->rs[WINED3D_RS_SRCBLEND]; desc.dst = state->rs[WINED3D_RS_DESTBLEND]; + desc.op = state->rs[WINED3D_RS_BLENDOP]; if (wined3d_bitmap_is_set(changed->renderState, WINED3D_RS_BLENDFACTOR)) wined3d_color_from_d3dcolor(&colour, state->rs[WINED3D_RS_BLENDFACTOR]); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 8de2945bf5..8999ab1696 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -390,11 +390,6 @@ static void state_ambient(struct wined3d_context *context, const struct wined3d_ checkGLcall("glLightModel for MODEL_AMBIENT"); } -static void state_blendop_w(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) -{ - WARN("Unsupported in local OpenGL implementation: glBlendEquation\n"); -} - static GLenum gl_blend_op(const struct wined3d_gl_info *gl_info, enum wined3d_blend_op op) { switch (op) @@ -418,12 +413,18 @@ static GLenum gl_blend_op(const struct wined3d_gl_info *gl_info, enum wined3d_bl } } -static void state_blendop(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) +static void blendop(const struct wined3d_state *state, const struct wined3d_gl_info *gl_info) { - const struct wined3d_gl_info *gl_info = wined3d_context_gl(context)->gl_info; + const struct wined3d_blend_state *b = state->blend_state; GLenum blend_equation_alpha = GL_FUNC_ADD_EXT; GLenum blend_equation = GL_FUNC_ADD_EXT; + if (!gl_info->supported[WINED3D_GL_BLEND_EQUATION]) + { + WARN("Unsupported in local OpenGL implementation: glBlendEquation.\n"); + return; + } + /* BLENDOPALPHA requires GL_EXT_blend_equation_separate, so make sure it is around */ if (state->render_states[WINED3D_RS_BLENDOPALPHA] && !gl_info->supported[EXT_BLEND_EQUATION_SEPARATE]) @@ -432,7 +433,7 @@ static void state_blendop(struct wined3d_context *context, const struct wined3d_ return; } - blend_equation = gl_blend_op(gl_info, state->render_states[WINED3D_RS_BLENDOP]); + blend_equation = gl_blend_op(gl_info, b->desc.op); blend_equation_alpha = gl_blend_op(gl_info, state->render_states[WINED3D_RS_BLENDOPALPHA]); TRACE("blend_equation %#x, blend_equation_alpha %#x.\n", blend_equation, blend_equation_alpha); @@ -559,9 +560,7 @@ static void state_blend(struct wined3d_context *context, const struct wined3d_st gl_blend_from_d3d(&src_blend, &dst_blend, b->desc.src, b->desc.dst, rt_format); - /* Re-apply BLENDOP(ALPHA) because of a possible SEPARATEALPHABLENDENABLE change */ - if (!isStateDirty(context, STATE_RENDER(WINED3D_RS_BLENDOP))) - state_blendop(context, state, STATE_RENDER(WINED3D_RS_BLENDOPALPHA)); + blendop(state, gl_info); if (state->render_states[WINED3D_RS_SEPARATEALPHABLENDENABLE]) { @@ -4649,8 +4648,6 @@ const struct wined3d_state_entry_template misc_state_template[] = { STATE_RENDER(WINED3D_RS_DEBUGMONITORTOKEN), { STATE_RENDER(WINED3D_RS_DEBUGMONITORTOKEN), state_debug_monitor }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE), { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE), state_colorwrite0 }, EXT_DRAW_BUFFERS2 }, { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE), { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE), state_colorwrite }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_BLENDOP), { STATE_RENDER(WINED3D_RS_BLENDOP), state_blendop }, WINED3D_GL_BLEND_EQUATION }, - { STATE_RENDER(WINED3D_RS_BLENDOP), { STATE_RENDER(WINED3D_RS_BLENDOP), state_blendop_w }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE1), { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE1), state_colorwrite1 }, EXT_DRAW_BUFFERS2 }, { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE1), { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE2), { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE2), state_colorwrite2 }, EXT_DRAW_BUFFERS2 }, @@ -5422,6 +5419,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table) { 61, 127}, {149, 150}, {169, 169}, + {171, 171}, {174, 177}, {193, 193}, {195, 197}, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 3e43264a76..1bb8a8ee44 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2032,6 +2032,7 @@ struct wined3d_blend_state_desc BOOL enable; enum wined3d_blend src; enum wined3d_blend dst; + enum wined3d_blend_op op; }; struct wined3d_rasterizer_state_desc

1 0

Zebediah Figura : ntdll: Check for an existing file on the server side.
by Alexandre Julliard March 12, 2020

March 12, 2020

Module: wine Branch: master Commit: ee136f98322179006e434197f17016af2fbff140 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee136f98322179006e434197… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 10 22:38:23 2020 -0500 ntdll: Check for an existing file on the server side. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 16 ++-------------- include/wine/server_protocol.h | 4 +++- server/fd.c | 10 ++++++++-- server/protocol.def | 1 + server/request.h | 3 ++- server/trace.c | 1 + 6 files changed, 17 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 96f8cb38fc..5175e9d5ce 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -2778,18 +2778,12 @@ NTSTATUS WINAPI NtSetInformationFile(HANDLE handle, PIO_STATUS_BLOCK io, if (io->u.Status != STATUS_SUCCESS && io->u.Status != STATUS_NO_SUCH_FILE) break; - if (!info->ReplaceIfExists && io->u.Status == STATUS_SUCCESS) - { - RtlFreeAnsiString( &unix_name ); - io->u.Status = STATUS_OBJECT_NAME_COLLISION; - break; - } - SERVER_START_REQ( set_fd_name_info ) { req->handle = wine_server_obj_handle( handle ); req->rootdir = wine_server_obj_handle( attr.RootDirectory ); req->link = FALSE; + req->replace = info->ReplaceIfExists; wine_server_add_data( req, unix_name.Buffer, unix_name.Length ); io->u.Status = wine_server_call( req ); } @@ -2821,18 +2815,12 @@ NTSTATUS WINAPI NtSetInformationFile(HANDLE handle, PIO_STATUS_BLOCK io, if (io->u.Status != STATUS_SUCCESS && io->u.Status != STATUS_NO_SUCH_FILE) break; - if (!info->ReplaceIfExists && io->u.Status == STATUS_SUCCESS) - { - RtlFreeAnsiString( &unix_name ); - io->u.Status = STATUS_OBJECT_NAME_COLLISION; - break; - } - SERVER_START_REQ( set_fd_name_info ) { req->handle = wine_server_obj_handle( handle ); req->rootdir = wine_server_obj_handle( attr.RootDirectory ); req->link = TRUE; + req->replace = info->ReplaceIfExists; wine_server_add_data( req, unix_name.Buffer, unix_name.Length ); io->u.Status = wine_server_call( req ); } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 3b457df8b0..af4507b5d1 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -5532,7 +5532,9 @@ struct set_fd_name_info_request obj_handle_t handle; obj_handle_t rootdir; int link; + int replace; /* VARARG(filename,string); */ + char __pad_28[4]; }; struct set_fd_name_info_reply { @@ -6704,6 +6706,6 @@ union generic_reply struct resume_process_reply resume_process_reply; }; -#define SERVER_PROTOCOL_VERSION 595 +#define SERVER_PROTOCOL_VERSION 596 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/fd.c b/server/fd.c index 5d80e218b9..c2cb3c96ac 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2325,7 +2325,7 @@ static void set_fd_disposition( struct fd *fd, int unlink ) /* set new name for the fd */ static void set_fd_name( struct fd *fd, struct fd *root, const char *nameptr, - data_size_t len, int create_link ) + data_size_t len, int create_link, int replace ) { struct inode *inode; struct stat st; @@ -2367,6 +2367,12 @@ static void set_fd_name( struct fd *fd, struct fd *root, const char *nameptr, if (!stat( name, &st )) { + if (!replace) + { + set_error( STATUS_OBJECT_NAME_COLLISION ); + goto failed; + } + /* can't replace directories or special files */ if (!S_ISREG( st.st_mode )) { @@ -2695,7 +2701,7 @@ DECL_HANDLER(set_fd_name_info) if ((fd = get_handle_fd_obj( current->process, req->handle, 0 ))) { - set_fd_name( fd, root_fd, get_req_data(), get_req_data_size(), req->link ); + set_fd_name( fd, root_fd, get_req_data(), get_req_data_size(), req->link, req->replace ); release_object( fd ); } if (root_fd) release_object( root_fd ); diff --git a/server/protocol.def b/server/protocol.def index 6c44b2b43f..722993e59c 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3809,6 +3809,7 @@ struct handle_info obj_handle_t handle; /* handle to a file or directory */ obj_handle_t rootdir; /* root directory */ int link; /* link instead of renaming */ + int replace; /* replace an existing file? */ VARARG(filename,string); /* new file name */ @END diff --git a/server/request.h b/server/request.h index 15fcb671bb..a5472dd1c2 100644 --- a/server/request.h +++ b/server/request.h @@ -2377,7 +2377,8 @@ C_ASSERT( sizeof(struct set_fd_disp_info_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct set_fd_name_info_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct set_fd_name_info_request, rootdir) == 16 ); C_ASSERT( FIELD_OFFSET(struct set_fd_name_info_request, link) == 20 ); -C_ASSERT( sizeof(struct set_fd_name_info_request) == 24 ); +C_ASSERT( FIELD_OFFSET(struct set_fd_name_info_request, replace) == 24 ); +C_ASSERT( sizeof(struct set_fd_name_info_request) == 32 ); C_ASSERT( FIELD_OFFSET(struct get_window_layered_info_request, handle) == 12 ); C_ASSERT( sizeof(struct get_window_layered_info_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_window_layered_info_reply, color_key) == 8 ); diff --git a/server/trace.c b/server/trace.c index 79e3f22ee5..95db31b4cb 100644 --- a/server/trace.c +++ b/server/trace.c @@ -4464,6 +4464,7 @@ static void dump_set_fd_name_info_request( const struct set_fd_name_info_request fprintf( stderr, " handle=%04x", req->handle ); fprintf( stderr, ", rootdir=%04x", req->rootdir ); fprintf( stderr, ", link=%d", req->link ); + fprintf( stderr, ", replace=%d", req->replace ); dump_varargs_string( ", filename=", cur_size ); }

1 0

Zebediah Figura : wined3d: Move the source alpha blend function to wined3d_blend_state.
by Alexandre Julliard March 12, 2020

March 12, 2020

Module: wine Branch: master Commit: fc740b872415caaab159cb4a8205c72eb2bc9f41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc740b872415caaab159cb4a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 10 18:06:17 2020 -0500 wined3d: Move the source alpha blend function to wined3d_blend_state. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 1 - dlls/d3d11/state.c | 1 + dlls/wined3d/device.c | 10 ++++++++++ dlls/wined3d/state.c | 5 ++--- include/wine/wined3d.h | 1 + 5 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 8193ec4cf4..42d9ccc3bf 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -741,7 +741,6 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetBlendState(ID3D11Devi const D3D11_RENDER_TARGET_BLEND_DESC *d = &desc->RenderTarget[0]; wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SEPARATEALPHABLENDENABLE, TRUE); - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SRCBLENDALPHA, d->SrcBlendAlpha); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_DESTBLENDALPHA, d->DestBlendAlpha); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_BLENDOPALPHA, d->BlendOpAlpha); } diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index 693bb3df83..231978b8a5 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -393,6 +393,7 @@ HRESULT d3d_blend_state_create(struct d3d_device *device, const D3D11_BLEND_DESC wined3d_desc.src = desc->RenderTarget[0].SrcBlend; wined3d_desc.dst = desc->RenderTarget[0].DestBlend; wined3d_desc.op = desc->RenderTarget[0].BlendOp; + wined3d_desc.src_alpha = desc->RenderTarget[0].SrcBlendAlpha; /* We cannot fail after creating a wined3d_blend_state object. It * would lead to double free. */ diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 5bb9542891..303122c2e0 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3585,6 +3585,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, case WINED3D_RS_SRCBLEND: case WINED3D_RS_DESTBLEND: case WINED3D_RS_BLENDOP: + case WINED3D_RS_SRCBLENDALPHA: set_blend_state = TRUE; break; @@ -3644,6 +3645,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, } if (set_blend_state || changed->alpha_to_coverage + || wined3d_bitmap_is_set(changed->renderState, WINED3D_RS_SEPARATEALPHABLENDENABLE) || wined3d_bitmap_is_set(changed->renderState, WINED3D_RS_ADAPTIVETESS_Y)) { struct wined3d_blend_state *blend_state; @@ -3659,6 +3661,14 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, desc.src = state->rs[WINED3D_RS_SRCBLEND]; desc.dst = state->rs[WINED3D_RS_DESTBLEND]; desc.op = state->rs[WINED3D_RS_BLENDOP]; + if (state->rs[WINED3D_RS_SEPARATEALPHABLENDENABLE]) + { + desc.src_alpha = state->rs[WINED3D_RS_SRCBLENDALPHA]; + } + else + { + desc.src_alpha = state->rs[WINED3D_RS_SRCBLEND]; + } if (wined3d_bitmap_is_set(changed->renderState, WINED3D_RS_BLENDFACTOR)) wined3d_color_from_d3dcolor(&colour, state->rs[WINED3D_RS_BLENDFACTOR]); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 8999ab1696..e0cbf82e14 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -573,8 +573,7 @@ static void state_blend(struct wined3d_context *context, const struct wined3d_st return; } - gl_blend_from_d3d(&src_blend_alpha, &dst_blend_alpha, - state->render_states[WINED3D_RS_SRCBLENDALPHA], + gl_blend_from_d3d(&src_blend_alpha, &dst_blend_alpha, b->desc.src_alpha, state->render_states[WINED3D_RS_DESTBLENDALPHA], rt_format); GL_EXTCALL(glBlendFuncSeparate(src_blend, dst_blend, src_blend_alpha, dst_blend_alpha)); @@ -4503,7 +4502,6 @@ const struct wined3d_state_entry_template misc_state_template[] = { STATE_STREAM_OUTPUT, { STATE_STREAM_OUTPUT, state_so_warn, }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_EDGEANTIALIAS), { STATE_RENDER(WINED3D_RS_EDGEANTIALIAS), state_line_antialias}, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_SEPARATEALPHABLENDENABLE), { STATE_BLEND, NULL }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_SRCBLENDALPHA), { STATE_BLEND, NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_DESTBLENDALPHA), { STATE_BLEND, NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_DESTBLENDALPHA), { STATE_BLEND, NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_BLENDOPALPHA), { STATE_BLEND, NULL }, WINED3D_GL_EXT_NONE }, @@ -5423,6 +5421,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table) {174, 177}, {193, 193}, {195, 197}, + {207, 207}, { 0, 0}, }; static const DWORD simple_states[] = diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 1bb8a8ee44..42dd078ca6 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2033,6 +2033,7 @@ struct wined3d_blend_state_desc enum wined3d_blend src; enum wined3d_blend dst; enum wined3d_blend_op op; + enum wined3d_blend src_alpha; }; struct wined3d_rasterizer_state_desc

1 0

Zebediah Figura : server: Allow renaming a file to the same name.
by Alexandre Julliard March 12, 2020

March 12, 2020

Module: wine Branch: master Commit: 6971fd2d613b773f4d906243c8386a7a909c40ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=6971fd2d613b773f4d906243… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 10 22:38:24 2020 -0500 server: Allow renaming a file to the same name. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/file.c | 8 ++++---- server/fd.c | 21 ++++++++++++++++----- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index a05b124fd2..814353e762 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -2123,8 +2123,8 @@ static void test_file_rename_information(void) U(io).Status = 0xdeadbeef; res = pNtSetInformationFile( handle, &io, fri, sizeof(FILE_RENAME_INFORMATION) + fri->FileNameLength, FileRenameInformation ); - todo_wine ok( U(io).Status == STATUS_SUCCESS, "got io status %#x\n", U(io).Status ); - todo_wine ok( res == STATUS_SUCCESS, "got status %x\n", res ); + ok( U(io).Status == STATUS_SUCCESS, "got io status %#x\n", U(io).Status ); + ok( res == STATUS_SUCCESS, "got status %x\n", res ); ok( GetFileAttributesW( oldpath ) != INVALID_FILE_ATTRIBUTES, "file should exist\n" ); CloseHandle( handle ); @@ -2782,8 +2782,8 @@ static void test_file_link_information(void) fli->ReplaceIfExists = TRUE; U(io).Status = 0xdeadbeef; res = pNtSetInformationFile( handle, &io, fli, sizeof(FILE_LINK_INFORMATION) + fli->FileNameLength, FileLinkInformation ); - todo_wine ok( U(io).Status == STATUS_SUCCESS, "got io status %#x\n", U(io).Status ); - todo_wine ok( res == STATUS_SUCCESS, "got status %x\n", res ); + ok( U(io).Status == STATUS_SUCCESS, "got io status %#x\n", U(io).Status ); + ok( res == STATUS_SUCCESS, "got status %x\n", res ); ok( GetFileAttributesW( oldpath ) != INVALID_FILE_ATTRIBUTES, "file should exist\n" ); CloseHandle( handle ); diff --git a/server/fd.c b/server/fd.c index c2cb3c96ac..524cc7a507 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2328,7 +2328,7 @@ static void set_fd_name( struct fd *fd, struct fd *root, const char *nameptr, data_size_t len, int create_link, int replace ) { struct inode *inode; - struct stat st; + struct stat st, st2; char *name; if (!fd->inode || !fd->unix_name) @@ -2336,6 +2336,12 @@ static void set_fd_name( struct fd *fd, struct fd *root, const char *nameptr, set_error( STATUS_OBJECT_TYPE_MISMATCH ); return; } + if (fd->unix_fd == -1) + { + set_error( fd->no_fd_status ); + return; + } + if (!len || ((nameptr[0] == '/') ^ !root)) { set_error( STATUS_OBJECT_PATH_SYNTAX_BAD ); @@ -2358,8 +2364,7 @@ static void set_fd_name( struct fd *fd, struct fd *root, const char *nameptr, } /* when creating a hard link, source cannot be a dir */ - if (create_link && fd->unix_fd != -1 && - !fstat( fd->unix_fd, &st ) && S_ISDIR( st.st_mode )) + if (create_link && !fstat( fd->unix_fd, &st ) && S_ISDIR( st.st_mode )) { set_error( STATUS_FILE_IS_A_DIRECTORY ); goto failed; @@ -2367,6 +2372,13 @@ static void set_fd_name( struct fd *fd, struct fd *root, const char *nameptr, if (!stat( name, &st )) { + if (!fstat( fd->unix_fd, &st2 ) && st.st_ino == st2.st_ino && st.st_dev == st2.st_dev) + { + if (create_link && !replace) set_error( STATUS_OBJECT_NAME_COLLISION ); + free( name ); + return; + } + if (!replace) { set_error( STATUS_OBJECT_NAME_COLLISION ); @@ -2394,8 +2406,7 @@ static void set_fd_name( struct fd *fd, struct fd *root, const char *nameptr, /* link() expects that the target doesn't exist */ /* rename() cannot replace files with directories */ - if (create_link || (fd->unix_fd != -1 && - !fstat( fd->unix_fd, &st ) && S_ISDIR( st.st_mode ))) + if (create_link || S_ISDIR( st2.st_mode )) { if (unlink( name )) {

1 0

Zebediah Figura : wined3d: Move the destination alpha blend function to wined3d_blend_state.
by Alexandre Julliard March 12, 2020

March 12, 2020

Module: wine Branch: master Commit: 30e44111fee91218a3ab3bbffe9cb2fae368e87f URL: https://source.winehq.org/git/wine.git/?a=commit;h=30e44111fee91218a3ab3bbf… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 10 18:06:18 2020 -0500 wined3d: Move the destination alpha blend function to wined3d_blend_state. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 1 - dlls/d3d11/state.c | 1 + dlls/wined3d/device.c | 3 +++ dlls/wined3d/state.c | 7 ++----- include/wine/wined3d.h | 1 + 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 42d9ccc3bf..be1b6f6f00 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -741,7 +741,6 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetBlendState(ID3D11Devi const D3D11_RENDER_TARGET_BLEND_DESC *d = &desc->RenderTarget[0]; wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SEPARATEALPHABLENDENABLE, TRUE); - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_DESTBLENDALPHA, d->DestBlendAlpha); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_BLENDOPALPHA, d->BlendOpAlpha); } wined3d_device_set_render_state(device->wined3d_device, diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index 231978b8a5..aa94bc2569 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -394,6 +394,7 @@ HRESULT d3d_blend_state_create(struct d3d_device *device, const D3D11_BLEND_DESC wined3d_desc.dst = desc->RenderTarget[0].DestBlend; wined3d_desc.op = desc->RenderTarget[0].BlendOp; wined3d_desc.src_alpha = desc->RenderTarget[0].SrcBlendAlpha; + wined3d_desc.dst_alpha = desc->RenderTarget[0].DestBlendAlpha; /* We cannot fail after creating a wined3d_blend_state object. It * would lead to double free. */ diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 303122c2e0..8ee7f8da34 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3586,6 +3586,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, case WINED3D_RS_DESTBLEND: case WINED3D_RS_BLENDOP: case WINED3D_RS_SRCBLENDALPHA: + case WINED3D_RS_DESTBLENDALPHA: set_blend_state = TRUE; break; @@ -3664,10 +3665,12 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, if (state->rs[WINED3D_RS_SEPARATEALPHABLENDENABLE]) { desc.src_alpha = state->rs[WINED3D_RS_SRCBLENDALPHA]; + desc.dst_alpha = state->rs[WINED3D_RS_DESTBLENDALPHA]; } else { desc.src_alpha = state->rs[WINED3D_RS_SRCBLEND]; + desc.dst_alpha = state->rs[WINED3D_RS_DESTBLEND]; } if (wined3d_bitmap_is_set(changed->renderState, WINED3D_RS_BLENDFACTOR)) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index e0cbf82e14..17adf984c5 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -573,8 +573,7 @@ static void state_blend(struct wined3d_context *context, const struct wined3d_st return; } - gl_blend_from_d3d(&src_blend_alpha, &dst_blend_alpha, b->desc.src_alpha, - state->render_states[WINED3D_RS_DESTBLENDALPHA], rt_format); + gl_blend_from_d3d(&src_blend_alpha, &dst_blend_alpha, b->desc.src_alpha, b->desc.dst_alpha, rt_format); GL_EXTCALL(glBlendFuncSeparate(src_blend, dst_blend, src_blend_alpha, dst_blend_alpha)); checkGLcall("glBlendFuncSeparate"); @@ -4502,8 +4501,6 @@ const struct wined3d_state_entry_template misc_state_template[] = { STATE_STREAM_OUTPUT, { STATE_STREAM_OUTPUT, state_so_warn, }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_EDGEANTIALIAS), { STATE_RENDER(WINED3D_RS_EDGEANTIALIAS), state_line_antialias}, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_SEPARATEALPHABLENDENABLE), { STATE_BLEND, NULL }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_DESTBLENDALPHA), { STATE_BLEND, NULL }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_DESTBLENDALPHA), { STATE_BLEND, NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_BLENDOPALPHA), { STATE_BLEND, NULL }, WINED3D_GL_EXT_NONE }, { STATE_BLEND, { STATE_BLEND, blend }, WINED3D_GL_EXT_NONE }, { STATE_BLEND_FACTOR, { STATE_BLEND_FACTOR, state_blend_factor }, EXT_BLEND_COLOR }, @@ -5421,7 +5418,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table) {174, 177}, {193, 193}, {195, 197}, - {207, 207}, + {207, 208}, { 0, 0}, }; static const DWORD simple_states[] = diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 42dd078ca6..aa1b30556b 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2034,6 +2034,7 @@ struct wined3d_blend_state_desc enum wined3d_blend dst; enum wined3d_blend_op op; enum wined3d_blend src_alpha; + enum wined3d_blend dst_alpha; }; struct wined3d_rasterizer_state_desc

1 0

Zebediah Figura : quartz: Pass an IUnknown pointer to the object creation functions.
by Alexandre Julliard March 12, 2020

March 12, 2020

Module: wine Branch: master Commit: 56a6bc87acbbbee74fb6cd8e77ae61828e274c2d URL: https://source.winehq.org/git/wine.git/?a=commit;h=56a6bc87acbbbee74fb6cd8e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Mar 11 21:10:10 2020 -0500 quartz: Pass an IUnknown pointer to the object creation functions. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/acmwrapper.c | 2 +- dlls/quartz/avidec.c | 2 +- dlls/quartz/dsoundrender.c | 5 ++--- dlls/quartz/filesource.c | 2 +- dlls/quartz/filtergraph.c | 10 +++------- dlls/quartz/filtermapper.c | 26 +++----------------------- dlls/quartz/main.c | 42 +++++++++++++++++++++--------------------- dlls/quartz/memallocator.c | 6 ++---- dlls/quartz/quartz_private.h | 27 +++++++++++++-------------- dlls/quartz/systemclock.c | 2 +- dlls/quartz/videorenderer.c | 6 +++--- dlls/quartz/vmr9.c | 10 +++++----- 12 files changed, 56 insertions(+), 84 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=56a6bc87acbbbee74fb6…

1 0

Zebediah Figura : wine.inf: Manually register qedit.
by Alexandre Julliard March 12, 2020

March 12, 2020

Module: wine Branch: master Commit: ed0f2909ff10a55abeced50f9c3130b12daf320f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed0f2909ff10a55abeced50f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Mar 11 21:10:08 2020 -0500 wine.inf: Manually register qedit. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 1 + 1 file changed, 1 insertion(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index bca478e6d7..8267ef34dc 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2636,6 +2636,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,mshtml.dll,1 11,,msisip.dll,1 11,,qcap.dll,1 +11,,qedit.dll,1 11,,urlmon.dll,1 11,,windowscodecs.dll,1 11,,winegstreamer.dll,1

1 0

Francois Gouget : kernel32/tests: Remove a 100 ms sleep in 'process exit' children.
by Alexandre Julliard March 12, 2020

March 12, 2020

Module: wine Branch: master Commit: 496100b9a734268599d3989de81174ac6feac8c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=496100b9a734268599d3989d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 12 00:34:43 2020 +0100 kernel32/tests: Remove a 100 ms sleep in 'process exit' children. Such a short pause cannot serve any purpose and this shaves off 1 to 2 seconds of run time. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 1d426dd017..c5ff473d30 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -4060,7 +4060,6 @@ START_TEST(process) } else if (!strcmp(myARGV[2], "exit")) { - Sleep(100); return; } else if (!strcmp(myARGV[2], "nested") && myARGC >= 4)

1 0

Zebediah Figura : ntdll/tests: Add tests for linking a file to the same name.
by Alexandre Julliard March 12, 2020

March 12, 2020

Module: wine Branch: master Commit: 5b75d943044feba2ac92f8e05e3827c8ac3e8a4d URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b75d943044feba2ac92f8e0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 10 22:38:22 2020 -0500 ntdll/tests: Add tests for linking a file to the same name. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/file.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index e71f887c2b..a05b124fd2 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -2759,6 +2759,36 @@ static void test_file_link_information(void) HeapFree( GetProcessHeap(), 0, fli ); delete_object( oldpath ); delete_object( newpath ); + + /* oldpath == newpath */ + res = GetTempFileNameW( tmp_path, fooW, 0, oldpath ); + ok( res != 0, "failed to create temp file\n" ); + handle = CreateFileW( oldpath, GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, 0, 0 ); + ok( handle != INVALID_HANDLE_VALUE, "CreateFileW failed\n" ); + + pRtlDosPathNameToNtPathName_U( oldpath, &name_str, NULL, NULL ); + fli = HeapAlloc( GetProcessHeap(), 0, sizeof(FILE_RENAME_INFORMATION) + name_str.Length ); + fli->ReplaceIfExists = FALSE; + fli->RootDirectory = NULL; + fli->FileNameLength = name_str.Length; + memcpy( fli->FileName, name_str.Buffer, name_str.Length ); + pRtlFreeUnicodeString( &name_str ); + + U(io).Status = 0xdeadbeef; + res = pNtSetInformationFile( handle, &io, fli, sizeof(FILE_LINK_INFORMATION) + fli->FileNameLength, FileLinkInformation ); + todo_wine ok( U(io).Status == 0xdeadbeef, "got io status %#x\n", U(io).Status ); + ok( res == STATUS_OBJECT_NAME_COLLISION, "got status %x\n", res ); + + fli->ReplaceIfExists = TRUE; + U(io).Status = 0xdeadbeef; + res = pNtSetInformationFile( handle, &io, fli, sizeof(FILE_LINK_INFORMATION) + fli->FileNameLength, FileLinkInformation ); + todo_wine ok( U(io).Status == STATUS_SUCCESS, "got io status %#x\n", U(io).Status ); + todo_wine ok( res == STATUS_SUCCESS, "got status %x\n", res ); + ok( GetFileAttributesW( oldpath ) != INVALID_FILE_ATTRIBUTES, "file should exist\n" ); + + CloseHandle( handle ); + HeapFree( GetProcessHeap(), 0, fli ); + delete_object( oldpath ); } static void test_file_both_information(void)

1 0