April 2015 - Wine-Commits - list.winehq.org

Hans Leidekker : fusion: Fix insufficient buffer size handling in IAssemblyName::GetDisplayName.
by Alexandre Julliard April 10, 2015

April 10, 2015

Module: wine Branch: master Commit: 2eda884bd70c48605a2a857ebe7cb1c7f7ab4948 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2eda884bd70c48605a2a857eb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 10 12:57:15 2015 +0200 fusion: Fix insufficient buffer size handling in IAssemblyName::GetDisplayName. --- dlls/fusion/asmname.c | 16 ++++++++++------ dlls/fusion/tests/asmname.c | 17 +++++++++++++++++ 2 files changed, 27 insertions(+), 6 deletions(-) diff --git a/dlls/fusion/asmname.c b/dlls/fusion/asmname.c index c417a23..f7a9452 100644 --- a/dlls/fusion/asmname.c +++ b/dlls/fusion/asmname.c @@ -228,12 +228,10 @@ static HRESULT WINAPI IAssemblyNameImpl_GetDisplayName(IAssemblyName *iface, LPDWORD pccDisplayName, DWORD dwDisplayFlags) { + static const WCHAR equals[] = {'=',0}; IAssemblyNameImpl *name = impl_from_IAssemblyName(iface); - WCHAR verstr[30]; + WCHAR verstr[30], *cultureval = NULL; DWORD size; - LPWSTR cultureval = 0; - - static const WCHAR equals[] = {'=',0}; TRACE("(%p, %p, %p, %d)\n", iface, szDisplayName, pccDisplayName, dwDisplayFlags); @@ -243,9 +241,15 @@ static HRESULT WINAPI IAssemblyNameImpl_GetDisplayName(IAssemblyName *iface, if (!name->displayname || !*name->displayname) return FUSION_E_INVALID_NAME; - size = min(*pccDisplayName, lstrlenW(name->displayname) + 1); + size = strlenW(name->displayname) + 1; + + if (*pccDisplayName < size) + { + *pccDisplayName = size; + return E_NOT_SUFFICIENT_BUFFER; + } - lstrcpynW(szDisplayName, name->displayname, size); + if (szDisplayName) strcpyW(szDisplayName, name->displayname); *pccDisplayName = size; return S_OK; diff --git a/dlls/fusion/tests/asmname.c b/dlls/fusion/tests/asmname.c index 68309f2..e415c3a9 100644 --- a/dlls/fusion/tests/asmname.c +++ b/dlls/fusion/tests/asmname.c @@ -508,6 +508,23 @@ static void test_CreateAssemblyNameObject(void) ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); ok(name != NULL, "Expected non-NULL name\n"); + size = 0; + hr = IAssemblyName_GetDisplayName(name, NULL, &size, 0); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "got %08x\n", hr); + ok(size == 5, "got %u\n", size); + + size = 3; + hr = IAssemblyName_GetDisplayName(name, NULL, &size, 0); + ok(hr == E_NOT_SUFFICIENT_BUFFER || broken(hr == E_INVALIDARG), "got %08x\n", hr); + ok(size == 5 || broken(size == 3), "got %u\n", size); + + size = 3; + str[0] = 'a'; + hr = IAssemblyName_GetDisplayName(name, str, &size, 0); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "got %08x\n", hr); + ok(str[0] == 'a', "got %c\n", str[0]); + ok(size == 5, "got %u\n", size); + size = MAX_PATH; hr = IAssemblyName_GetDisplayName(name, str, &size, ASM_DISPLAYF_FULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);

1 0

Stefan Dösinger : wined3d: Move alpha test states to the fragment pipeline.
by Alexandre Julliard April 10, 2015

April 10, 2015

Module: wine Branch: master Commit: 5c7707dc775235ec98ada59dc196c33ca2000600 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c7707dc775235ec98ada59dc… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Apr 9 22:48:16 2015 +0200 wined3d: Move alpha test states to the fragment pipeline. This will allow some color keying cleanups. For Core Contexts we'll have to emulate alpha testing in shaders anyway. --- dlls/wined3d/arb_program_shader.c | 4 ++++ dlls/wined3d/ati_fragment_shader.c | 4 ++++ dlls/wined3d/glsl_shader.c | 4 ++++ dlls/wined3d/nvidia_texture_shader.c | 4 ++++ dlls/wined3d/state.c | 14 +++++++------- dlls/wined3d/wined3d_private.h | 2 ++ 6 files changed, 25 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5c7707dc775235ec98ada…

1 0

Hans Leidekker : msi: Assume that file patches from registered MSI patches have already been applied.
by Alexandre Julliard April 10, 2015

April 10, 2015

Module: wine Branch: master Commit: d263c91ce28b39102770c03d65ecab0d71a97e3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d263c91ce28b39102770c03d6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 10 12:58:26 2015 +0200 msi: Assume that file patches from registered MSI patches have already been applied. --- dlls/msi/files.c | 14 +++++++++++++- dlls/msi/msipriv.h | 1 + dlls/msi/patch.c | 2 ++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 3116754..ca758dd 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -448,6 +448,17 @@ static MSIFILEPATCH *find_filepatch( MSIPACKAGE *package, UINT disk_id, const WC return NULL; } +static BOOL is_registered_patch_media( MSIPACKAGE *package, UINT disk_id ) +{ + MSIPATCHINFO *patch; + + LIST_FOR_EACH_ENTRY( patch, &package->patches, MSIPATCHINFO, entry ) + { + if (patch->disk_id == disk_id && patch->registered) return TRUE; + } + return FALSE; +} + static BOOL patchfiles_cb(MSIPACKAGE *package, LPCWSTR file, DWORD action, LPWSTR *path, DWORD *attrs, PVOID user) { @@ -457,7 +468,8 @@ static BOOL patchfiles_cb(MSIPACKAGE *package, LPCWSTR file, DWORD action, { MSICOMPONENT *comp; - if (!(patch = find_filepatch( package, patch->disk_id, file ))) return FALSE; + if (is_registered_patch_media( package, patch->disk_id ) || + !(patch = find_filepatch( package, patch->disk_id, file ))) return FALSE; comp = patch->File->Component; comp->Action = msi_get_component_action( package, comp ); diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 5a8c24f..9bec75f 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -193,6 +193,7 @@ typedef struct tagMSIPATCHINFO LPWSTR localfile; MSIPATCHSTATE state; BOOL delete_on_close; + BOOL registered; UINT disk_id; } MSIPATCHINFO; diff --git a/dlls/msi/patch.c b/dlls/msi/patch.c index b7bf2ef..5456359 100644 --- a/dlls/msi/patch.c +++ b/dlls/msi/patch.c @@ -918,6 +918,7 @@ static UINT msi_apply_patch_package( MSIPACKAGE *package, const WCHAR *file ) goto done; r = ERROR_OUTOFMEMORY; + patch->registered = FALSE; if (!(patch->filename = strdupW( file ))) goto done; if (!(patch->localfile = strdupW( localfile ))) goto done; @@ -1034,6 +1035,7 @@ UINT msi_apply_registered_patch( MSIPACKAGE *package, LPCWSTR patch_code ) msiobj_release( &patch_db->hdr ); return r; } + patch_info->registered = TRUE; patch_info->localfile = strdupW( patch_file ); if (!patch_info->localfile) {

1 0

Hans Leidekker : msi: Take the component action into account for file patches.
by Alexandre Julliard April 10, 2015

April 10, 2015

Module: wine Branch: master Commit: e4fd6265ebc18a152b4c24f0bd7c8d44ad8ace16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4fd6265ebc18a152b4c24f0b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 10 12:58:01 2015 +0200 msi: Take the component action into account for file patches. --- dlls/msi/files.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index d1e3ecf..3116754 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -455,8 +455,19 @@ static BOOL patchfiles_cb(MSIPACKAGE *package, LPCWSTR file, DWORD action, if (action == MSICABEXTRACT_BEGINEXTRACT) { + MSICOMPONENT *comp; + if (!(patch = find_filepatch( package, patch->disk_id, file ))) return FALSE; + comp = patch->File->Component; + comp->Action = msi_get_component_action( package, comp ); + if (!comp->Enabled || comp->Action != INSTALLSTATE_LOCAL) + { + TRACE("file %s component %s not installed or disabled\n", + debugstr_w(patch->File->File), debugstr_w(comp->Component)); + return FALSE; + } + patch->path = msi_create_temp_file( package->db ); *path = strdupW( patch->path ); *attrs = patch->File->Attributes;

1 0

Stefan Dösinger : wined3d: Simplify alpha test and color keying in GLSL.
by Alexandre Julliard April 10, 2015

April 10, 2015

Module: wine Branch: master Commit: c5c713721285282c1ed466d287435a88b7b533ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5c713721285282c1ed466d28… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Apr 9 22:48:17 2015 +0200 wined3d: Simplify alpha test and color keying in GLSL. --- dlls/wined3d/glsl_shader.c | 35 +++++++++++++++++++++++++++++++++-- dlls/wined3d/state.c | 3 --- 2 files changed, 33 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index c67243f..1a1b6b0 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7572,6 +7572,37 @@ static void glsl_fragment_pipe_invalidate_constants(struct wined3d_context *cont context->constant_update_mask |= WINED3D_SHADER_CONST_FFP_PS; } +static void glsl_fragment_pipe_alpha_test(struct wined3d_context *context, + const struct wined3d_state *state, DWORD state_id) +{ + const struct wined3d_gl_info *gl_info = context->gl_info; + int glParm; + float ref; + + TRACE("context %p, state %p, state_id %#x.\n", context, state, state_id); + + if (state->render_states[WINED3D_RS_ALPHATESTENABLE]) + { + gl_info->gl_ops.gl.p_glEnable(GL_ALPHA_TEST); + checkGLcall("glEnable GL_ALPHA_TEST"); + } + else + { + gl_info->gl_ops.gl.p_glDisable(GL_ALPHA_TEST); + checkGLcall("glDisable GL_ALPHA_TEST"); + return; + } + + ref = ((float)state->render_states[WINED3D_RS_ALPHAREF]) / 255.0f; + glParm = wined3d_gl_compare_func(state->render_states[WINED3D_RS_ALPHAFUNC]); + + if (glParm) + { + gl_info->gl_ops.gl.p_glAlphaFunc(glParm, ref); + checkGLcall("glAlphaFunc"); + } +} + static const struct StateEntryTemplate glsl_fragment_pipe_state_template[] = { {STATE_VDECL, {STATE_VDECL, glsl_fragment_pipe_vdecl }, WINED3D_GL_EXT_NONE }, @@ -7651,8 +7682,8 @@ static const struct StateEntryTemplate glsl_fragment_pipe_state_template[] = {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), glsl_fragment_pipe_shader }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_ALPHAFUNC), {STATE_RENDER(WINED3D_RS_ALPHATESTENABLE), NULL }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_ALPHAREF), {STATE_RENDER(WINED3D_RS_ALPHATESTENABLE), NULL }, WINED3D_GL_EXT_NONE }, - {STATE_RENDER(WINED3D_RS_ALPHATESTENABLE), {STATE_RENDER(WINED3D_RS_ALPHATESTENABLE), state_alpha_test }, WINED3D_GL_EXT_NONE }, - {STATE_RENDER(WINED3D_RS_COLORKEYENABLE), {STATE_RENDER(WINED3D_RS_ALPHATESTENABLE), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_RENDER(WINED3D_RS_ALPHATESTENABLE), {STATE_RENDER(WINED3D_RS_ALPHATESTENABLE), glsl_fragment_pipe_alpha_test }, WINED3D_GL_EXT_NONE }, + {STATE_RENDER(WINED3D_RS_COLORKEYENABLE), {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_FOGENABLE), {STATE_RENDER(WINED3D_RS_FOGENABLE), glsl_fragment_pipe_fog }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_FOGTABLEMODE), {STATE_RENDER(WINED3D_RS_FOGENABLE), NULL }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_FOGVERTEXMODE), {STATE_RENDER(WINED3D_RS_FOGENABLE), NULL }, WINED3D_GL_EXT_NONE }, diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index edf1e71..b3ac4f1 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -528,9 +528,6 @@ void state_alpha_test(struct wined3d_context *context, const struct wined3d_stat context_apply_state(context, state, STATE_TEXTURESTAGE(0, WINED3D_TSS_ALPHA_OP)); context->last_was_ckey = enable_ckey; - if (context->d3d_info->shader_color_key) - enable_ckey = FALSE; - if (state->render_states[WINED3D_RS_ALPHATESTENABLE] || (state->render_states[WINED3D_RS_COLORKEYENABLE] && enable_ckey)) {

1 0

Hans Leidekker : fusion: Support buffer size queries in IAssemblyName:: GetName.
by Alexandre Julliard April 10, 2015

April 10, 2015

Module: wine Branch: master Commit: 382b72d729cdd3e5f61e924b9cfff2bab332b98e URL: http://source.winehq.org/git/wine.git/?a=commit;h=382b72d729cdd3e5f61e924b9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 10 12:56:48 2015 +0200 fusion: Support buffer size queries in IAssemblyName::GetName. --- dlls/fusion/asmname.c | 19 ++++++++++++------- dlls/fusion/tests/asmname.c | 35 +++++++++++++++++++++++++++++++---- 2 files changed, 43 insertions(+), 11 deletions(-) diff --git a/dlls/fusion/asmname.c b/dlls/fusion/asmname.c index f892f2b..c417a23 100644 --- a/dlls/fusion/asmname.c +++ b/dlls/fusion/asmname.c @@ -369,19 +369,24 @@ static HRESULT WINAPI IAssemblyNameImpl_GetName(IAssemblyName *iface, WCHAR *pwzName) { IAssemblyNameImpl *name = impl_from_IAssemblyName(iface); + DWORD len; TRACE("(%p, %p, %p)\n", iface, lpcwBuffer, pwzName); - if (!name->name) + if (name->name) + len = strlenW(name->name) + 1; + else + len = 0; + + if (*lpcwBuffer < len) { - *pwzName = '\0'; - *lpcwBuffer = 0; - return S_OK; + *lpcwBuffer = len; + return E_NOT_SUFFICIENT_BUFFER; } + if (!name->name) lpcwBuffer[0] = 0; + else strcpyW(pwzName, name->name); - lstrcpyW(pwzName, name->name); - *lpcwBuffer = lstrlenW(pwzName) + 1; - + *lpcwBuffer = len; return S_OK; } diff --git a/dlls/fusion/tests/asmname.c b/dlls/fusion/tests/asmname.c index a075288..68309f2 100644 --- a/dlls/fusion/tests/asmname.c +++ b/dlls/fusion/tests/asmname.c @@ -421,12 +421,12 @@ static void test_CreateAssemblyNameObject(void) broken(hr == E_INVALIDARG), /* .NET 1.x */ "Expected FUSION_E_INVALID_NAME, got %08x\n", hr); + str[0] = 'a'; size = MAX_PATH; - str[0] = '\0'; hr = IAssemblyName_GetName(name, &size, str); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok(!str[0], "Expected empty name\n"); - ok(size == 0, "Expected 0, got %d\n", size); + ok(hr == S_OK, "got %08x\n", hr); + ok(str[0] == 'a', "got %c\n", str[0]); + ok(!size, "got %u\n", size); hi = 0xbeefcace; lo = 0xcafebabe; @@ -457,6 +457,26 @@ static void test_CreateAssemblyNameObject(void) broken(hr == S_OK), /* .NET 1.x */ "Expected FUSION_E_INVALID_NAME, got %08x\n", hr); + size = 0; + hr = IAssemblyName_GetName(name, &size, NULL); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "got %08x\n", hr); + ok(size == 1, "got %u\n", size); + + if (0) /* crash */ + { + str[0] = '\0'; + hr = IAssemblyName_GetName(name, NULL, str); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "got %08x\n", hr); + ok(!str[0], "got %c\n", str[0]); + } + + size = 0; + str[0] = '\0'; + hr = IAssemblyName_GetName(name, &size, str); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "got %08x\n", hr); + ok(!str[0], "got %c\n", str[0]); + ok(size == 1, "got %u\n", size); + size = MAX_PATH; str[0] = '\0'; hr = IAssemblyName_GetName(name, &size, str); @@ -494,6 +514,13 @@ static void test_CreateAssemblyNameObject(void) ok_aw("wine", str); ok(size == 5, "Expected 5, got %d\n", size); + size = 0; + str[0] = 0; + hr = IAssemblyName_GetName(name, &size, str); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "got %08x\n", hr); + ok(!str[0], "got %c\n", str[0]); + ok(size == 5, "got %u\n", size); + size = MAX_PATH; str[0] = '\0'; hr = IAssemblyName_GetName(name, &size, str);

1 0

Stefan Dösinger : wined3d: Match blitter and fragment processing color keying capabilities.
by Alexandre Julliard April 10, 2015

April 10, 2015

Module: wine Branch: master Commit: f4b6874491df5b4d89012231cd9e7813c7d0e105 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4b6874491df5b4d89012231c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Apr 9 22:48:15 2015 +0200 wined3d: Match blitter and fragment processing color keying capabilities. This is necessary if e.g. the nvts or ffp fragment processing pipeline is selected for debugging purposes on a GPU that otherwise supports the ARB program blitter. --- dlls/wined3d/arb_program_shader.c | 11 +++++++++-- dlls/wined3d/directx.c | 3 ++- dlls/wined3d/surface.c | 22 +++++++++++++++------- dlls/wined3d/utils.c | 5 +++-- dlls/wined3d/wined3d_private.h | 6 ++++-- 5 files changed, 33 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 5d7d975..e7c5ea2 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7716,7 +7716,8 @@ static void arbfp_blit_unset(const struct wined3d_gl_info *gl_info) checkGLcall("glDisable(GL_FRAGMENT_PROGRAM_ARB)"); } -static BOOL arbfp_blit_supported(const struct wined3d_gl_info *gl_info, enum wined3d_blit_op blit_op, +static BOOL arbfp_blit_supported(const struct wined3d_gl_info *gl_info, + const struct wined3d_d3d_info *d3d_info, enum wined3d_blit_op blit_op, const RECT *src_rect, DWORD src_usage, enum wined3d_pool src_pool, const struct wined3d_format *src_format, const RECT *dst_rect, DWORD dst_usage, enum wined3d_pool dst_pool, const struct wined3d_format *dst_format) { @@ -7727,8 +7728,14 @@ static BOOL arbfp_blit_supported(const struct wined3d_gl_info *gl_info, enum win switch (blit_op) { - case WINED3D_BLIT_OP_COLOR_BLIT: case WINED3D_BLIT_OP_COLOR_BLIT_CKEY: + if (!d3d_info->shader_color_key) + { + /* The conversion modifies the alpha channel so the color key might no longer match. */ + TRACE("Color keying not supported with converted textures.\n"); + return FALSE; + } + case WINED3D_BLIT_OP_COLOR_BLIT: break; default: diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 1539476..01048fd 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4378,7 +4378,8 @@ static BOOL CheckSurfaceCapability(const struct wined3d_adapter *adapter, if (CheckDepthStencilCapability(adapter, adapter_format, check_format)) return TRUE; /* If opengl can't process the format natively, the blitter may be able to convert it */ - if (adapter->blitter->blit_supported(&adapter->gl_info, WINED3D_BLIT_OP_COLOR_BLIT, + if (adapter->blitter->blit_supported(&adapter->gl_info, &adapter->d3d_info, + WINED3D_BLIT_OP_COLOR_BLIT, NULL, WINED3D_POOL_DEFAULT, 0, check_format, NULL, WINED3D_POOL_DEFAULT, 0, adapter_format)) { diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 5bcbfd4..5094af3 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1050,7 +1050,7 @@ static HRESULT wined3d_surface_depth_fill(struct wined3d_surface *surface, const struct wined3d_device *device = resource->device; const struct blit_shader *blitter; - blitter = wined3d_select_blitter(&device->adapter->gl_info, WINED3D_BLIT_OP_DEPTH_FILL, + blitter = wined3d_select_blitter(&device->adapter->gl_info, &device->adapter->d3d_info, WINED3D_BLIT_OP_DEPTH_FILL, NULL, 0, 0, NULL, rect, resource->usage, resource->pool, resource->format); if (!blitter) { @@ -3445,7 +3445,7 @@ HRESULT surface_color_fill(struct wined3d_surface *s, const RECT *rect, const st struct wined3d_device *device = s->resource.device; const struct blit_shader *blitter; - blitter = wined3d_select_blitter(&device->adapter->gl_info, WINED3D_BLIT_OP_COLOR_FILL, + blitter = wined3d_select_blitter(&device->adapter->gl_info, &device->adapter->d3d_info, WINED3D_BLIT_OP_COLOR_FILL, NULL, 0, 0, NULL, rect, s->resource.usage, s->resource.pool, s->resource.format); if (!blitter) { @@ -3463,6 +3463,7 @@ static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RE struct wined3d_device *device = dst_surface->resource.device; const struct wined3d_surface *rt = wined3d_rendertarget_view_get_surface(device->fb.render_targets[0]); const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; + const struct wined3d_d3d_info *d3d_info = &device->adapter->d3d_info; struct wined3d_swapchain *src_swapchain, *dst_swapchain; TRACE("dst_surface %p, dst_rect %s, src_surface %p, src_rect %s, flags %#x, blt_fx %p, filter %s.\n", @@ -3591,7 +3592,7 @@ static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RE TRACE("Blt from surface %p to rendertarget %p\n", src_surface, dst_surface); - if (!device->blitter->blit_supported(gl_info, WINED3D_BLIT_OP_COLOR_BLIT, + if (!device->blitter->blit_supported(gl_info, d3d_info, WINED3D_BLIT_OP_COLOR_BLIT, src_rect, src_surface->resource.usage, src_surface->resource.pool, src_surface->resource.format, dst_rect, dst_surface->resource.usage, dst_surface->resource.pool, dst_surface->resource.format)) { @@ -4318,14 +4319,20 @@ static void ffp_blit_unset(const struct wined3d_gl_info *gl_info) } } -static BOOL ffp_blit_supported(const struct wined3d_gl_info *gl_info, enum wined3d_blit_op blit_op, +static BOOL ffp_blit_supported(const struct wined3d_gl_info *gl_info, + const struct wined3d_d3d_info *d3d_info, enum wined3d_blit_op blit_op, const RECT *src_rect, DWORD src_usage, enum wined3d_pool src_pool, const struct wined3d_format *src_format, const RECT *dst_rect, DWORD dst_usage, enum wined3d_pool dst_pool, const struct wined3d_format *dst_format) { switch (blit_op) { - case WINED3D_BLIT_OP_COLOR_BLIT: case WINED3D_BLIT_OP_COLOR_BLIT_CKEY: + if (d3d_info->shader_color_key) + { + TRACE("Color keying requires converted textures.\n"); + return FALSE; + } + case WINED3D_BLIT_OP_COLOR_BLIT: if (src_pool == WINED3D_POOL_SYSTEM_MEM || dst_pool == WINED3D_POOL_SYSTEM_MEM) return FALSE; @@ -4447,7 +4454,8 @@ static void cpu_blit_unset(const struct wined3d_gl_info *gl_info) { } -static BOOL cpu_blit_supported(const struct wined3d_gl_info *gl_info, enum wined3d_blit_op blit_op, +static BOOL cpu_blit_supported(const struct wined3d_gl_info *gl_info, + const struct wined3d_d3d_info *d3d_info, enum wined3d_blit_op blit_op, const RECT *src_rect, DWORD src_usage, enum wined3d_pool src_pool, const struct wined3d_format *src_format, const RECT *dst_rect, DWORD dst_usage, enum wined3d_pool dst_pool, const struct wined3d_format *dst_format) { @@ -5367,7 +5375,7 @@ HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const REC return WINED3D_OK; } - if (arbfp_blit.blit_supported(&device->adapter->gl_info, blit_op, + if (arbfp_blit.blit_supported(&device->adapter->gl_info, &device->adapter->d3d_info, blit_op, &src_rect, src_surface->resource.usage, src_surface->resource.pool, src_surface->resource.format, &dst_rect, dst_surface->resource.usage, dst_surface->resource.pool, dst_surface->resource.format)) { diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 4d9f88a..2f21b29 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4194,7 +4194,8 @@ const struct wine_rb_functions wined3d_ffp_vertex_program_rb_functions = wined3d_ffp_vertex_program_key_compare, }; -const struct blit_shader *wined3d_select_blitter(const struct wined3d_gl_info *gl_info, enum wined3d_blit_op blit_op, +const struct blit_shader *wined3d_select_blitter(const struct wined3d_gl_info *gl_info, + const struct wined3d_d3d_info *d3d_info, enum wined3d_blit_op blit_op, const RECT *src_rect, DWORD src_usage, enum wined3d_pool src_pool, const struct wined3d_format *src_format, const RECT *dst_rect, DWORD dst_usage, enum wined3d_pool dst_pool, const struct wined3d_format *dst_format) { @@ -4208,7 +4209,7 @@ const struct blit_shader *wined3d_select_blitter(const struct wined3d_gl_info *g for (i = 0; i < sizeof(blitters) / sizeof(*blitters); ++i) { - if (blitters[i]->blit_supported(gl_info, blit_op, + if (blitters[i]->blit_supported(gl_info, d3d_info, blit_op, src_rect, src_usage, src_pool, src_format, dst_rect, dst_usage, dst_pool, dst_format)) return blitters[i]; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 155b171..7747c55 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1340,7 +1340,8 @@ struct blit_shader HRESULT (*set_shader)(void *blit_priv, struct wined3d_context *context, const struct wined3d_surface *surface, const struct wined3d_color_key *color_key); void (*unset_shader)(const struct wined3d_gl_info *gl_info); - BOOL (*blit_supported)(const struct wined3d_gl_info *gl_info, enum wined3d_blit_op blit_op, + BOOL (*blit_supported)(const struct wined3d_gl_info *gl_info, + const struct wined3d_d3d_info *d3d_info, enum wined3d_blit_op blit_op, const RECT *src_rect, DWORD src_usage, enum wined3d_pool src_pool, const struct wined3d_format *src_format, const RECT *dst_rect, DWORD dst_usage, enum wined3d_pool dst_pool, const struct wined3d_format *dst_format); HRESULT (*color_fill)(struct wined3d_device *device, struct wined3d_surface *dst_surface, @@ -1353,7 +1354,8 @@ extern const struct blit_shader ffp_blit DECLSPEC_HIDDEN; extern const struct blit_shader arbfp_blit DECLSPEC_HIDDEN; extern const struct blit_shader cpu_blit DECLSPEC_HIDDEN; -const struct blit_shader *wined3d_select_blitter(const struct wined3d_gl_info *gl_info, enum wined3d_blit_op blit_op, +const struct blit_shader *wined3d_select_blitter(const struct wined3d_gl_info *gl_info, + const struct wined3d_d3d_info *d3d_info, enum wined3d_blit_op blit_op, const RECT *src_rect, DWORD src_usage, enum wined3d_pool src_pool, const struct wined3d_format *src_format, const RECT *dst_rect, DWORD dst_usage, enum wined3d_pool dst_pool, const struct wined3d_format *dst_format) DECLSPEC_HIDDEN;

1 0

Stefan Dösinger : wined3d: Allow ARB blits from converted surfaces.
by Alexandre Julliard April 10, 2015

April 10, 2015

Module: wine Branch: master Commit: 439076d591fbf7f4e830be447c1abdbf6472a0a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=439076d591fbf7f4e830be447… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Apr 9 22:48:12 2015 +0200 wined3d: Allow ARB blits from converted surfaces. --- dlls/wined3d/arb_program_shader.c | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 091ae1d..79439f5 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7572,13 +7572,6 @@ static HRESULT arbfp_blit_set(void *blit_priv, struct wined3d_context *context, struct arbfp_blit_type type; struct arbfp_blit_desc *desc; - if (surface->container->flags & WINED3D_TEXTURE_CONVERTED) - { - gl_info->gl_ops.gl.p_glEnable(gl_texture_type); - checkGLcall("glEnable(gl_texture_type)"); - return WINED3D_OK; - } - if (is_complex_fixup(surface->resource.format->color_fixup)) fixup = get_complex_fixup(surface->resource.format->color_fixup); else @@ -7644,8 +7637,6 @@ static HRESULT arbfp_blit_set(void *blit_priv, struct wined3d_context *context, if (!shader) { FIXME("Unsupported complex fixup %#x, not setting a shader\n", fixup); - gl_info->gl_ops.gl.p_glEnable(gl_texture_type); - checkGLcall("glEnable(gl_texture_type)"); return E_NOTIMPL; } @@ -7686,18 +7677,6 @@ static void arbfp_blit_unset(const struct wined3d_gl_info *gl_info) { gl_info->gl_ops.gl.p_glDisable(GL_FRAGMENT_PROGRAM_ARB); checkGLcall("glDisable(GL_FRAGMENT_PROGRAM_ARB)"); - gl_info->gl_ops.gl.p_glDisable(GL_TEXTURE_2D); - checkGLcall("glDisable(GL_TEXTURE_2D)"); - if (gl_info->supported[ARB_TEXTURE_CUBE_MAP]) - { - gl_info->gl_ops.gl.p_glDisable(GL_TEXTURE_CUBE_MAP_ARB); - checkGLcall("glDisable(GL_TEXTURE_CUBE_MAP_ARB)"); - } - if (gl_info->supported[ARB_TEXTURE_RECTANGLE]) - { - gl_info->gl_ops.gl.p_glDisable(GL_TEXTURE_RECTANGLE_ARB); - checkGLcall("glDisable(GL_TEXTURE_RECTANGLE_ARB)"); - } } static BOOL arbfp_blit_supported(const struct wined3d_gl_info *gl_info, enum wined3d_blit_op blit_op,

1 0

Stefan Dösinger : wined3d: Set color keys through the command stream.
by Alexandre Julliard April 10, 2015

April 10, 2015

Module: wine Branch: master Commit: 82db5954c49d9de1db3dad200d6dc39316820698 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82db5954c49d9de1db3dad200… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Apr 9 22:48:11 2015 +0200 wined3d: Set color keys through the command stream. --- dlls/wined3d/cs.c | 84 ++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/state.c | 4 +- dlls/wined3d/surface.c | 16 ++++---- dlls/wined3d/texture.c | 81 ++++++++++++++-------------------------- dlls/wined3d/utils.c | 4 +- dlls/wined3d/wined3d_private.h | 25 +++++++++---- 6 files changed, 140 insertions(+), 74 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=82db5954c49d9de1db3da…

1 0

Bruno Jesus : include: Update iptypes.h with the old XP IP_ADAPTER_ADDRESSES structure.
by Alexandre Julliard April 10, 2015

April 10, 2015

Module: wine Branch: master Commit: fbde8fc0f0f6d341a8ef7eef2b30e67238a40979 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbde8fc0f0f6d341a8ef7eef2… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Apr 10 00:35:51 2015 -0300 include: Update iptypes.h with the old XP IP_ADAPTER_ADDRESSES structure. --- include/iptypes.h | 37 ++++++++++++++++++++++++++++++++++--- 1 file changed, 34 insertions(+), 3 deletions(-) diff --git a/include/iptypes.h b/include/iptypes.h index 997388e..fc9f860 100644 --- a/include/iptypes.h +++ b/include/iptypes.h @@ -199,7 +199,7 @@ typedef IP_ADAPTER_GATEWAY_ADDRESS_LH *PIP_ADAPTER_GATEWAY_ADDRESS; #define IP_ADAPTER_IPV6_ENABLED 0x100 #define IP_ADAPTER_IPV6_MANAGE_ADDRESS_CONFIG 0x200 -typedef struct _IP_ADAPTER_ADDRESSES { +typedef struct _IP_ADAPTER_ADDRESSES_LH { union { ULONGLONG Alignment; struct { @@ -207,7 +207,7 @@ typedef struct _IP_ADAPTER_ADDRESSES { DWORD IfIndex; } DUMMYSTRUCTNAME; } DUMMYUNIONNAME; - struct _IP_ADAPTER_ADDRESSES *Next; + struct _IP_ADAPTER_ADDRESSES_LH *Next; PCHAR AdapterName; PIP_ADAPTER_UNICAST_ADDRESS FirstUnicastAddress; PIP_ADAPTER_ANYCAST_ADDRESS FirstAnycastAddress; @@ -241,7 +241,38 @@ typedef struct _IP_ADAPTER_ADDRESSES { BYTE Dhcpv6ClientDuid[MAX_DHCPV6_DUID_LENGTH]; ULONG Dhcpv6ClientDuidLength; ULONG Dhcpv6Iaid; -} IP_ADAPTER_ADDRESSES, *PIP_ADAPTER_ADDRESSES; +} IP_ADAPTER_ADDRESSES_LH, *PIP_ADAPTER_ADDRESSES_LH; + +typedef struct _IP_ADAPTER_ADDRESSES_XP { + union { + ULONGLONG Alignment; + struct { + ULONG Length; + DWORD IfIndex; + } DUMMYSTRUCTNAME; + } DUMMYUNIONNAME; + struct _IP_ADAPTER_ADDRESSES_XP *Next; + PCHAR AdapterName; + PIP_ADAPTER_UNICAST_ADDRESS FirstUnicastAddress; + PIP_ADAPTER_ANYCAST_ADDRESS FirstAnycastAddress; + PIP_ADAPTER_MULTICAST_ADDRESS FirstMulticastAddress; + PIP_ADAPTER_DNS_SERVER_ADDRESS FirstDnsServerAddress; + PWCHAR DnsSuffix; + PWCHAR Description; + PWCHAR FriendlyName; + BYTE PhysicalAddress[MAX_ADAPTER_ADDRESS_LENGTH]; + DWORD PhysicalAddressLength; + DWORD Flags; + DWORD Mtu; + DWORD IfType; + IF_OPER_STATUS OperStatus; + DWORD Ipv6IfIndex; + DWORD ZoneIndices[16]; + PIP_ADAPTER_PREFIX FirstPrefix; +} IP_ADAPTER_ADDRESSES_XP, *PIP_ADAPTER_ADDRESSES_XP; + +#define IP_ADAPTER_ADDRESSES IP_ADAPTER_ADDRESSES_LH +#define PIP_ADAPTER_ADDRESSES PIP_ADAPTER_ADDRESSES_LH #define GAA_FLAG_SKIP_UNICAST 0x00000001 #define GAA_FLAG_SKIP_ANYCAST 0x00000002

1 0

Andrew Eikum : shell32: Add more knownfolders.
by Alexandre Julliard April 10, 2015

April 10, 2015

Module: wine Branch: master Commit: c6b999b90181744261f964ce24ae1d1870d3571e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6b999b90181744261f964ce2… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Apr 9 15:28:26 2015 -0500 shell32: Add more knownfolders. --- dlls/shell32/shellpath.c | 347 ++++++++++++++++++++++++++++++++++++++--- dlls/shell32/tests/shellpath.c | 40 ++--- 2 files changed, 347 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c6b999b90181744261f96…

1 0

Stefan Dösinger : wined3d: Implement color keying in the glsl fragment pipeline.
by Alexandre Julliard April 10, 2015

April 10, 2015

Module: wine Branch: master Commit: 5d51c97d07b57307912267996586d05528f652a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d51c97d07b57307912267996… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Apr 10 12:05:54 2015 +0200 wined3d: Implement color keying in the glsl fragment pipeline. --- dlls/ddraw/tests/ddraw1.c | 22 ++++++---------------- dlls/ddraw/tests/ddraw2.c | 22 ++++++---------------- dlls/ddraw/tests/ddraw4.c | 22 ++++++---------------- dlls/ddraw/tests/ddraw7.c | 22 ++++++---------------- dlls/wined3d/arb_program_shader.c | 25 +++++++++---------------- dlls/wined3d/cs.c | 3 +++ dlls/wined3d/directx.c | 1 + dlls/wined3d/glsl_shader.c | 29 +++++++++++++++++++++++++++-- dlls/wined3d/state.c | 3 +++ dlls/wined3d/texture.c | 18 ++++++++++++------ dlls/wined3d/utils.c | 9 +++++++++ dlls/wined3d/wined3d_private.h | 10 +++++++--- 12 files changed, 95 insertions(+), 91 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5d51c97d07b5730791226…

1 0

Aaryaman Vasishta : d3drm: Add more interfaces to be queried from IDirect3DRMFrame2::QueryInterface.
by Alexandre Julliard April 10, 2015

April 10, 2015

Module: wine Branch: master Commit: 1b1d77268f725f12e175c3a919e8b981e6d199b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b1d77268f725f12e175c3a91… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Thu Apr 9 19:59:33 2015 +0530 d3drm: Add more interfaces to be queried from IDirect3DRMFrame2::QueryInterface. --- dlls/d3drm/frame.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index ea7cfc8..39c2e7b 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -472,6 +472,8 @@ static HRESULT WINAPI d3drm_frame2_QueryInterface(IDirect3DRMFrame2 *iface, REFI if (IsEqualGUID(riid, &IID_IDirect3DRMFrame2) || IsEqualGUID(riid, &IID_IDirect3DRMFrame) + || IsEqualGUID(riid, &IID_IDirect3DRMObject) + || IsEqualGUID(riid, &IID_IDirect3DRMVisual) || IsEqualGUID(riid, &IID_IUnknown)) { *out = &frame->IDirect3DRMFrame2_iface;

1 0

Aaryaman Vasishta : d3drm: Fix IDirect3DRMFrame2:: QueryInterface returning incorrect HRESULT.
by Alexandre Julliard April 10, 2015

April 10, 2015

Module: wine Branch: master Commit: 415b7c1feca042a416120d68f356e9862dcd1ba6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=415b7c1feca042a416120d68f… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Thu Apr 9 19:59:32 2015 +0530 d3drm: Fix IDirect3DRMFrame2::QueryInterface returning incorrect HRESULT. --- dlls/d3drm/frame.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 20acf56..ea7cfc8 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -483,8 +483,8 @@ static HRESULT WINAPI d3drm_frame2_QueryInterface(IDirect3DRMFrame2 *iface, REFI else { *out = NULL; - WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); - return E_NOINTERFACE; + WARN("%s not implemented, returning CLASS_E_CLASSNOTAVAILABLE.\n", debugstr_guid(riid)); + return CLASS_E_CLASSNOTAVAILABLE; } IUnknown_AddRef((IUnknown *)*out);

1 0

Maxime Lombard : wined3d: Add support for Nvidia GTX 970M.
by Alexandre Julliard April 10, 2015

April 10, 2015

Module: wine Branch: master Commit: 086d2af6299be6fd17d2c36ddbdf120faf7fefad URL: http://source.winehq.org/git/wine.git/?a=commit;h=086d2af6299be6fd17d2c36dd… Author: Maxime Lombard <berillions(a)gmail.com> Date: Thu Apr 9 20:09:23 2015 +0200 wined3d: Add support for Nvidia GTX 970M. --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 13061f4..9412adb 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1271,6 +1271,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX780, "NVIDIA GeForce GTX 780", DRIVER_NVIDIA_GEFORCE8, 3072}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX780TI, "NVIDIA GeForce GTX 780 Ti", DRIVER_NVIDIA_GEFORCE8, 3072}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX970, "NVIDIA GeForce GTX 970", DRIVER_NVIDIA_GEFORCE8, 4096}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX970M, "NVIDIA GeForce GTX 970M", DRIVER_NVIDIA_GEFORCE8, 3072}, /* AMD cards */ {HW_VENDOR_AMD, CARD_AMD_RAGE_128PRO, "ATI Rage Fury", DRIVER_AMD_RAGE_128PRO, 16 }, @@ -1698,6 +1699,7 @@ static const struct wined3d_renderer_table cards_nvidia_binary[] = { /* Direct 3D 11 */ + {"GTX 970M", CARD_NVIDIA_GEFORCE_GTX970M}, /* GeForce 900 - highend mobile*/ {"GTX 970", CARD_NVIDIA_GEFORCE_GTX970}, /* GeForce 900 - highend */ {"GTX 780 Ti", CARD_NVIDIA_GEFORCE_GTX780TI}, /* Geforce 700 - highend */ {"GTX 780", CARD_NVIDIA_GEFORCE_GTX780}, /* Geforce 700 - highend */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5d736dd..f9e0100 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1575,6 +1575,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX780 = 0x1004, CARD_NVIDIA_GEFORCE_GTX780TI = 0x100a, CARD_NVIDIA_GEFORCE_GTX970 = 0x13c2, + CARD_NVIDIA_GEFORCE_GTX970M = 0x13d8, CARD_VMWARE_SVGA3D = 0x0405,

1 0

Mark Harmstone : uxtheme: Fix a copy-paste error which mean that GetThemeString would always fail.
by Alexandre Julliard April 10, 2015

April 10, 2015

Module: wine Branch: master Commit: a1c3b30f491f978206e5caa2f03f636e9c2d85d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1c3b30f491f978206e5caa2f… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Thu Apr 9 23:45:51 2015 +0100 uxtheme: Fix a copy-paste error which mean that GetThemeString would always fail. --- dlls/uxtheme/property.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/uxtheme/property.c b/dlls/uxtheme/property.c index 146649e..9dffbdd 100644 --- a/dlls/uxtheme/property.c +++ b/dlls/uxtheme/property.c @@ -210,7 +210,7 @@ HRESULT WINAPI GetThemeString(HTHEME hTheme, int iPartId, int iStateId, if(!hTheme) return E_HANDLE; - if(!(tp = MSSTYLES_FindProperty(hTheme, iPartId, iStateId, TMT_FILENAME, iPropId))) + if(!(tp = MSSTYLES_FindProperty(hTheme, iPartId, iStateId, TMT_STRING, iPropId))) return E_PROP_ID_UNSUPPORTED; return MSSTYLES_GetPropertyString(tp, pszBuff, cchMaxBuffChars); }

1 0

Marcus Meissner : wininet: Avoid memory leak in error exit (Coverity).
by Alexandre Julliard April 10, 2015

April 10, 2015

Module: wine Branch: master Commit: c1c06a9093d98c22256c649934dee0bc9c8e62bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1c06a9093d98c22256c64993… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu Apr 9 18:59:57 2015 +0200 wininet: Avoid memory leak in error exit (Coverity). --- dlls/wininet/cookie.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index af9dcdf..4784b33 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -341,8 +341,10 @@ static BOOL load_persistent_cookie(LPCWSTR domain, LPCWSTR path) UnlockUrlCacheEntryStream(cookie, 0); cookie_container = get_cookie_container(domain, path, TRUE); - if(!cookie_container) + if(!cookie_container) { + heap_free(str); return FALSE; + } GetSystemTimeAsFileTime(&time); for(pbeg=str; pbeg && *pbeg; name=data=NULL) {

1 0

Stefan Dösinger : wined3d: Implement color keying in arbfp_blit.
by Alexandre Julliard April 10, 2015

April 10, 2015

Module: wine Branch: master Commit: 2d56694445a58ee94d8ac46eac569bec3f53f161 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d56694445a58ee94d8ac46ea… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Apr 10 12:05:53 2015 +0200 wined3d: Implement color keying in arbfp_blit. --- dlls/wined3d/arb_program_shader.c | 68 +++++++++++++++++++++++++++++++++------ dlls/wined3d/surface.c | 51 +++++++++++++++++++---------- dlls/wined3d/swapchain.c | 2 +- dlls/wined3d/wined3d_private.h | 7 ++-- 4 files changed, 99 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2d56694445a58ee94d8ac…

1 0

Mark Harmstone : uxtheme: Fix colour errors in UXTHEME_StretchBlt.
by Alexandre Julliard April 9, 2015

April 9, 2015

Module: wine Branch: master Commit: c6b4b4b93e6c6bccda06aacd557537a51bec836e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6b4b4b93e6c6bccda06aacd5… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Wed Apr 8 07:43:36 2015 +0100 uxtheme: Fix colour errors in UXTHEME_StretchBlt. --- dlls/uxtheme/draw.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c index 19df3c8..8a9397d 100644 --- a/dlls/uxtheme/draw.c +++ b/dlls/uxtheme/draw.c @@ -293,22 +293,33 @@ static inline BOOL UXTHEME_StretchBlt(HDC hdcDst, int nXOriginDst, int nYOriginD 255, /* SourceConstantAlpha */ AC_SRC_ALPHA /* AlphaFormat */ }; + + BOOL ret = TRUE; + int old_stretch_mode; + POINT old_brush_org; + + old_stretch_mode = SetStretchBltMode(hdcDst, HALFTONE); + SetBrushOrgEx(hdcDst, nXOriginDst, nYOriginDst, &old_brush_org); + if (transparent == ALPHABLEND_BINARY) { /* Ensure we don't pass any negative values to TransparentBlt */ - return TransparentBlt(hdcDst, nXOriginDst, nYOriginDst, abs(nWidthDst), abs(nHeightDst), + ret = TransparentBlt(hdcDst, nXOriginDst, nYOriginDst, abs(nWidthDst), abs(nHeightDst), hdcSrc, nXOriginSrc, nYOriginSrc, abs(nWidthSrc), abs(nHeightSrc), transcolor); - } - if ((transparent == ALPHABLEND_NONE) || + } else if ((transparent == ALPHABLEND_NONE) || !AlphaBlend(hdcDst, nXOriginDst, nYOriginDst, nWidthDst, nHeightDst, hdcSrc, nXOriginSrc, nYOriginSrc, nWidthSrc, nHeightSrc, blendFunc)) { - return StretchBlt(hdcDst, nXOriginDst, nYOriginDst, nWidthDst, nHeightDst, + ret = StretchBlt(hdcDst, nXOriginDst, nYOriginDst, nWidthDst, nHeightDst, hdcSrc, nXOriginSrc, nYOriginSrc, nWidthSrc, nHeightSrc, SRCCOPY); } - return TRUE; + + SetBrushOrgEx(hdcDst, old_brush_org.x, old_brush_org.y, NULL); + SetStretchBltMode(hdcDst, old_stretch_mode); + + return ret; } /***********************************************************************

1 0

Mark Harmstone : comctl32: Fix drawing of buddy background for updown controls.
by Alexandre Julliard April 9, 2015

April 9, 2015

Module: wine Branch: master Commit: b0a9fb6b0d52d2251b91b3e1d676bb65f485809b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0a9fb6b0d52d2251b91b3e1d… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Tue Mar 31 23:39:07 2015 +0100 comctl32: Fix drawing of buddy background for updown controls. --- dlls/comctl32/updown.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/updown.c b/dlls/comctl32/updown.c index 28dd5e3..d188408 100644 --- a/dlls/comctl32/updown.c +++ b/dlls/comctl32/updown.c @@ -366,12 +366,18 @@ static BOOL UPDOWN_SetBuddyInt (const UPDOWN_INFO *infoPtr) */ static BOOL UPDOWN_DrawBuddyBackground (const UPDOWN_INFO *infoPtr, HDC hdc) { - RECT br; + RECT br, r; HTHEME buddyTheme = GetWindowTheme (infoPtr->Buddy); if (!buddyTheme) return FALSE; - GetClientRect (infoPtr->Buddy, &br); - MapWindowPoints (infoPtr->Buddy, infoPtr->Self, (POINT*)&br, 2); + GetWindowRect (infoPtr->Buddy, &br); + MapWindowPoints (NULL, infoPtr->Self, (POINT*)&br, 2); + GetClientRect (infoPtr->Self, &r); + + if (infoPtr->dwStyle & UDS_ALIGNLEFT) + br.left = r.left; + else if (infoPtr->dwStyle & UDS_ALIGNRIGHT) + br.right = r.right; /* FIXME: take disabled etc. into account */ DrawThemeBackground (buddyTheme, hdc, 0, 0, &br, NULL); return TRUE;

1 0

Jianqiu Zhang : include: Add declaration for FILE_FS_FULL_SIZE_INFORMATION.
by Alexandre Julliard April 9, 2015

April 9, 2015

Module: wine Branch: master Commit: 047698bf7d0d7e38dc4cf971745ef93c4b786de0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=047698bf7d0d7e38dc4cf9717… Author: Jianqiu Zhang <zhangjianqiu13(a)gmail.com> Date: Mon Mar 30 11:18:17 2015 +0800 include: Add declaration for FILE_FS_FULL_SIZE_INFORMATION. --- include/winioctl.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/include/winioctl.h b/include/winioctl.h index fb78821..269f771 100644 --- a/include/winioctl.h +++ b/include/winioctl.h @@ -439,6 +439,20 @@ typedef struct _FILE_FS_ATTRIBUTE_INFORMATION { WCHAR FileSystemName[1]; } FILE_FS_ATTRIBUTE_INFORMATION, *PFILE_FS_ATTRIBUTE_INFORMATION; +/*FileFsControlInformation = 6 */ +/* + unknown + */ + +/*FileFsFullSizeInformation = 7 */ +typedef struct _FILE_FS_FULL_SIZE_INFORMATION { + LARGE_INTEGER TotalAllocationUnits; + LARGE_INTEGER CallerAvailableAllocationUnits; + LARGE_INTEGER ActualAvailableAllocationUnits; + ULONG SectorsPerAllocationUnit; + ULONG BytesPerSector; +} FILE_FS_FULL_SIZE_INFORMATION, *PFILE_FS_FULL_SIZE_INFORMATION; + typedef struct _FILE_PIPE_WAIT_FOR_BUFFER { LARGE_INTEGER Timeout; ULONG NameLength;

1 0

Andrew Eikum : shell32: Allocate returned array in IKnownFolderManager:: GetFolderIds.
by Alexandre Julliard April 9, 2015

April 9, 2015

Module: wine Branch: master Commit: e4868d563574853d40ca04adfc28db1c19ca9dbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4868d563574853d40ca04adf… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Apr 8 10:59:33 2015 -0500 shell32: Allocate returned array in IKnownFolderManager::GetFolderIds. --- dlls/shell32/shellpath.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index d853274..731ea2f 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -4178,7 +4178,8 @@ static HRESULT WINAPI foldermanager_GetFolderIds( TRACE("%p, %p\n", ppKFId, pCount); - *ppKFId = fm->ids; + *ppKFId = CoTaskMemAlloc(fm->num_ids * sizeof(KNOWNFOLDERID)); + memcpy(*ppKFId, fm->ids, fm->num_ids * sizeof(KNOWNFOLDERID)); *pCount = fm->num_ids; return S_OK; }

1 0

Bruno Jesus : secur32: Don' t try to set an empty target name in schan_InitializeSecurityContextW.
by Alexandre Julliard April 9, 2015

April 9, 2015

Module: wine Branch: master Commit: 0fbbb1297d4fc14e71ff76379ba0b80382e97edc URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fbbb1297d4fc14e71ff76379… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Apr 8 23:54:36 2015 -0300 secur32: Don't try to set an empty target name in schan_InitializeSecurityContextW. Based on original patch by Nikos Mavrogiannopoulos. --- dlls/secur32/schannel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 12d4c8d..c6cc4d1 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -825,7 +825,7 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( return SEC_E_INTERNAL_ERROR; } - if (pszTargetName) + if (pszTargetName && *pszTargetName) { UINT len = WideCharToMultiByte( CP_UNIXCP, 0, pszTargetName, -1, NULL, 0, NULL, NULL ); char *target = HeapAlloc( GetProcessHeap(), 0, len );

1 0

Mark Harmstone : include: Add SM_CXPADDEDBORDER to winuser.h.
by Alexandre Julliard April 9, 2015

April 9, 2015

Module: wine Branch: master Commit: cb8545ab98fae56e89b88be3dfdc7c717297d8ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb8545ab98fae56e89b88be3d… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Wed Apr 8 23:41:52 2015 +0100 include: Add SM_CXPADDEDBORDER to winuser.h. --- include/winuser.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/winuser.h b/include/winuser.h index 3d9b937..e9804a9 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -982,6 +982,7 @@ WINUSERAPI BOOL WINAPI SetSysColors(INT,const INT*,const COLORREF*); #define SM_SERVERR2 89 #define SM_CMETRICS 90 #define SM_MOUSEHORIZONTALWHEELPRESENT 91 +#define SM_CXPADDEDBORDER 92 #define SM_REMOTESESSION 0x1000 #define SM_SHUTTINGDOWN 0x2000

1 0

Bruno Jesus : ws2_32: Restore the local socket address that was bound with filter for getsockname ().
by Alexandre Julliard April 9, 2015

April 9, 2015

Module: wine Branch: master Commit: 61ed82fc8685af0cf55de4b547a38e3e5893dd99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61ed82fc8685af0cf55de4b54… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Apr 9 00:09:29 2015 -0300 ws2_32: Restore the local socket address that was bound with filter for getsockname(). --- dlls/ws2_32/socket.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++-- dlls/ws2_32/tests/sock.c | 1 - 2 files changed, 66 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 6903909..bfcc755 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3218,6 +3218,61 @@ int WINAPI WS_getpeername(SOCKET s, struct WS_sockaddr *name, int *namelen) return res; } +/* When binding to an UDP address with filter support the getsockname call on the socket + * will always return 0.0.0.0 instead of the filtered interface address. This function + * checks if the socket is interface-bound on UDP and return the correct address. + * This is required because applications often do a bind() with port zero followed by a + * getsockname() to retrieve the port and address acquired. + */ +static void interface_bind_check(int fd, struct sockaddr_in *addr) +{ +#if !defined(IP_BOUND_IF) && !defined(LINUX_BOUND_IF) + return; +#else + int ifindex; + socklen_t len = sizeof(ifindex); + + /* Check for IPv4, address 0.0.0.0 and UDP socket */ + if (addr->sin_family != AF_INET || addr->sin_addr.s_addr != 0) + return; + if (getsockopt(fd, SOL_SOCKET, SO_TYPE, &ifindex, &len) || ifindex != SOCK_DGRAM) + return; + + ifindex = -1; + len = sizeof(ifindex); +#if defined(IP_BOUND_IF) + getsockopt(fd, IPPROTO_IP, IP_BOUND_IF, &ifindex, &len); +#elif defined(LINUX_BOUND_IF) + getsockopt(fd, IPPROTO_IP, IP_UNICAST_IF, &ifindex, &len); + if (ifindex > 0) ifindex = ntohl(ifindex); +#endif + if (ifindex > 0) + { + PIP_ADAPTER_INFO adapters, adapter; + DWORD adap_size; + + if (GetAdaptersInfo(NULL, &adap_size) != ERROR_BUFFER_OVERFLOW) + return; + adapters = HeapAlloc(GetProcessHeap(), 0, adap_size); + if (adapters && GetAdaptersInfo(adapters, &adap_size) == NO_ERROR) + { + /* Search the IPv4 adapter list for the appropriate bound interface */ + for (adapter = adapters; adapter != NULL; adapter = adapter->Next) + { + in_addr_t adapter_addr; + if (adapter->Index != ifindex) continue; + + adapter_addr = inet_addr(adapter->IpAddressList.IpAddress.String); + addr->sin_addr.s_addr = adapter_addr; + TRACE("reporting interface address from adapter %d\n", ifindex); + break; + } + } + HeapFree(GetProcessHeap(), 0, adapters); + } +#endif +} + /*********************************************************************** * getsockname (WS2_32.6) */ @@ -3255,8 +3310,17 @@ int WINAPI WS_getsockname(SOCKET s, struct WS_sockaddr *name, int *namelen) } else { - res = 0; - TRACE("=> %s\n", debugstr_sockaddr(name)); + interface_bind_check(fd, (struct sockaddr_in*) &uaddr); + if (ws_sockaddr_u2ws(&uaddr.addr, name, namelen) != 0) + { + /* The buffer was too small */ + SetLastError(WSAEFAULT); + } + else + { + res = 0; + TRACE("=> %s\n", debugstr_sockaddr(name)); + } } release_sock_fd( s, fd ); } diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 8690579..8b69cf6 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4238,7 +4238,6 @@ static void test_getsockname(void) ok(ret == 0, "getsockname failed with %d\n", GetLastError()); strcpy(ipstr, inet_ntoa(sa_get.sin_addr)); trace("testing bind on interface %s\n", ipstr); -todo_wine ok(sa_get.sin_addr.s_addr == sa_set.sin_addr.s_addr, "address does not match: %s != %s", ipstr, inet_ntoa(sa_set.sin_addr));

1 0