wine-commits April 2018

wine-commits@winehq.org

2 participants
542 discussions

Matteo Bruni : wined3d: Use staging resources to blit from CPU resources in the ARBfp blitter.
by Alexandre Julliard 16 Apr '18

16 Apr '18

Module: wine Branch: master Commit: 8e1451c51028eb919e5ffdbea4d7a92ea13085f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e1451c51028eb919e5ffdbe… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Apr 16 18:17:29 2018 +0430 wined3d: Use staging resources to blit from CPU resources in the ARBfp blitter. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 49 +++++++++++++++++++++++++++++++++++---- 1 file changed, 44 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index ea07c3b..7d3f547 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7789,9 +7789,11 @@ static DWORD arbfp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bl const struct wined3d_color_key *color_key, enum wined3d_texture_filter_type filter) { struct wined3d_device *device = dst_texture->resource.device; + struct wined3d_texture *staging_texture = NULL; struct wined3d_arbfp_blitter *arbfp_blitter; struct wined3d_color_key alpha_test_key; struct wined3d_blitter *next; + unsigned int src_level; RECT s, d; TRACE("blitter %p, op %#x, context %p, src_texture %p, src_sub_resource_idx %u, src_location %s, src_rect %s, " @@ -7816,14 +7818,45 @@ static DWORD arbfp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bl arbfp_blitter = CONTAINING_RECORD(blitter, struct wined3d_arbfp_blitter, blitter); - /* Now load the surface */ - if (wined3d_settings.offscreen_rendering_mode != ORM_FBO + if (!(src_texture->resource.access & WINED3D_RESOURCE_ACCESS_GPU)) + { + struct wined3d_resource_desc desc; + struct wined3d_box upload_box; + HRESULT hr; + + TRACE("Source texture is not GPU accessible, creating a staging texture.\n"); + + src_level = src_sub_resource_idx % src_texture->level_count; + desc.resource_type = WINED3D_RTYPE_TEXTURE_2D; + desc.format = src_texture->resource.format->id; + desc.multisample_type = src_texture->resource.multisample_type; + desc.multisample_quality = src_texture->resource.multisample_quality; + desc.usage = WINED3DUSAGE_PRIVATE; + desc.access = WINED3D_RESOURCE_ACCESS_GPU; + desc.width = wined3d_texture_get_level_width(src_texture, src_level); + desc.height = wined3d_texture_get_level_height(src_texture, src_level); + desc.depth = 1; + desc.size = 0; + + if (FAILED(hr = wined3d_texture_create(device, &desc, 1, 1, 0, + NULL, NULL, &wined3d_null_parent_ops, &staging_texture))) + { + ERR("Failed to create staging texture, hr %#x.\n", hr); + return dst_location; + } + + wined3d_box_set(&upload_box, 0, 0, desc.width, desc.height, 0, desc.depth); + wined3d_texture_upload_from_texture(staging_texture, 0, 0, 0, 0, + src_texture, src_sub_resource_idx, &upload_box); + + src_texture = staging_texture; + src_sub_resource_idx = 0; + } + else if (wined3d_settings.offscreen_rendering_mode != ORM_FBO && (src_texture->sub_resources[src_sub_resource_idx].locations - & (WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_DRAWABLE)) - == WINED3D_LOCATION_DRAWABLE + & (WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_DRAWABLE)) == WINED3D_LOCATION_DRAWABLE && !wined3d_resource_is_offscreen(&src_texture->resource)) { - unsigned int src_level = src_sub_resource_idx % src_texture->level_count; /* Without FBO blits transferring from the drawable to the texture is * expensive, because we have to flip the data in sysmem. Since we can @@ -7833,12 +7866,15 @@ static DWORD arbfp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bl texture2d_load_fb_texture(src_texture, src_sub_resource_idx, FALSE, context); s = *src_rect; + src_level = src_sub_resource_idx % src_texture->level_count; s.top = wined3d_texture_get_level_height(src_texture, src_level) - s.top; s.bottom = wined3d_texture_get_level_height(src_texture, src_level) - s.bottom; src_rect = &s; } else + { wined3d_texture_load(src_texture, context, FALSE); + } context_apply_ffp_blit_state(context, device); @@ -7889,6 +7925,9 @@ static DWORD arbfp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bl if (dst_texture->swapchain && (dst_texture->swapchain->front_buffer == dst_texture)) context->gl_info->gl_ops.gl.p_glFlush(); + if (staging_texture) + wined3d_texture_decref(staging_texture); + return dst_location; }

1 0

Matteo Bruni : wined3d: Use staging resources to blit from CPU resources in the GLSL blitter.
by Alexandre Julliard 16 Apr '18

16 Apr '18

Module: wine Branch: master Commit: 29d506939e485963694404313fb44020e0da5e40 URL: https://source.winehq.org/git/wine.git/?a=commit;h=29d506939e48596369440431… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Apr 16 18:17:28 2018 +0430 wined3d: Use staging resources to blit from CPU resources in the GLSL blitter. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 49 ++++++++++++++++++++++++++++---- dlls/wined3d/surface.c | 64 ++++++------------------------------------ dlls/wined3d/texture.c | 46 ++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 3 ++ 4 files changed, 100 insertions(+), 62 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=29d506939e4859636944…

1 0

Matteo Bruni : wined3d: Implement source fixups in the GLSL blitter.
by Alexandre Julliard 16 Apr '18

16 Apr '18

Module: wine Branch: master Commit: aa59d40a18b0754b6468c3dd71f8db8d02357d30 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa59d40a18b0754b6468c3dd… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Apr 16 18:17:27 2018 +0430 wined3d: Implement source fixups in the GLSL blitter. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e27b0ff..e839369 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -12270,8 +12270,8 @@ static GLuint glsl_blitter_generate_program(struct wined3d_glsl_blitter *blitter "\n" "void main()\n" "{\n"; + struct wined3d_string_buffer *buffer, *string; GLuint program, vshader_id, fshader_id; - struct wined3d_string_buffer *buffer; const char *tex_type, *swizzle, *ptr; unsigned int i; @@ -12314,9 +12314,14 @@ static GLuint glsl_blitter_generate_program(struct wined3d_glsl_blitter *blitter declare_in_varying(gl_info, buffer, FALSE, "vec3 out_texcoord;\n"); if (!needs_legacy_glsl_syntax(gl_info)) shader_addline(buffer, "out vec4 ps_out[1];\n"); + shader_addline(buffer, fshader_header); - shader_addline(buffer, " %s[0] = texture%s(sampler, out_texcoord.%s);\n", - get_fragment_output(gl_info), needs_legacy_glsl_syntax(gl_info) ? tex_type : "", swizzle); + string = string_buffer_get(&blitter->string_buffers); + string_buffer_sprintf(string, "%s[0]", get_fragment_output(gl_info)); + shader_addline(buffer, " %s = texture%s(sampler, out_texcoord.%s);\n", + string->buffer, needs_legacy_glsl_syntax(gl_info) ? tex_type : "", swizzle); + shader_glsl_color_correction_ext(buffer, string->buffer, WINED3DSP_WRITEMASK_ALL, args->fixup); + string_buffer_release(&blitter->string_buffers, string); shader_addline(buffer, "}\n"); ptr = buffer->buffer; @@ -12436,9 +12441,9 @@ static BOOL glsl_blitter_supported(enum wined3d_blit_op blit_op, const struct wi return FALSE; } - if (!is_identity_fixup(src_format->color_fixup)) + if (is_complex_fixup(src_format->color_fixup)) { - TRACE("Source fixups are not supported.\n"); + TRACE("Complex source fixups are not supported.\n"); return FALSE; }

1 0

Matteo Bruni : wined3d: Remove unused return values from the YUV shader generation helpers in the ARBfp blitter.
by Alexandre Julliard 16 Apr '18

16 Apr '18

Module: wine Branch: master Commit: 40496c9083a0b1aaa12159879bfa604ff5b3106b URL: https://source.winehq.org/git/wine.git/?a=commit;h=40496c9083a0b1aaa1215987… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Apr 16 18:17:26 2018 +0430 wined3d: Remove unused return values from the YUV shader generation helpers in the ARBfp blitter. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 52 ++++++++++++--------------------------- 1 file changed, 16 insertions(+), 36 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 2b796cd..ea07c3b 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -6936,8 +6936,8 @@ static void arbfp_blitter_destroy(struct wined3d_blitter *blitter, struct wined3 heap_free(arbfp_blitter); } -static BOOL gen_planar_yuv_read(struct wined3d_string_buffer *buffer, const struct arbfp_blit_type *type, - char *luminance) +static void gen_planar_yuv_read(struct wined3d_string_buffer *buffer, + const struct arbfp_blit_type *type, char *luminance) { char chroma; const char *tex, *texinstr = "TXP"; @@ -6985,13 +6985,12 @@ static BOOL gen_planar_yuv_read(struct wined3d_string_buffer *buffer, const stru shader_addline(buffer, "FLR texcrd.x, texcrd.x;\n"); shader_addline(buffer, "ADD texcrd.x, texcrd.x, coef.y;\n"); - /* Divide the x coordinate by 0.5 and get the fraction. This gives 0.25 and 0.75 for the - * even and odd pixels respectively - */ + /* Multiply the x coordinate by 0.5 and get the fraction. This gives 0.25 + * and 0.75 for the even and odd pixels respectively. */ shader_addline(buffer, "MUL texcrd2, texcrd, coef.y;\n"); shader_addline(buffer, "FRC texcrd2, texcrd2;\n"); - /* Sample Pixel 1 */ + /* Sample Pixel 1. */ shader_addline(buffer, "%s luminance, texcrd, texture[0], %s;\n", texinstr, tex); /* Put the value into either of the chroma values */ @@ -7020,12 +7019,10 @@ static BOOL gen_planar_yuv_read(struct wined3d_string_buffer *buffer, const stru /* This gives the correctly filtered luminance value */ shader_addline(buffer, "TEX luminance, fragment.texcoord[0], texture[0], %s;\n", tex); - - return TRUE; } -static BOOL gen_yv12_read(struct wined3d_string_buffer *buffer, const struct arbfp_blit_type *type, - char *luminance) +static void gen_yv12_read(struct wined3d_string_buffer *buffer, + const struct arbfp_blit_type *type, char *luminance) { const char *tex; static const float yv12_coef[] @@ -7087,7 +7084,6 @@ static BOOL gen_yv12_read(struct wined3d_string_buffer *buffer, const struct arb */ if (type->res_type == WINED3D_GL_RES_TYPE_TEX_2D) { - shader_addline(buffer, "RCP chroma.w, size.y;\n"); shader_addline(buffer, "MUL texcrd2.y, texcrd.y, size.y;\n"); @@ -7095,7 +7091,7 @@ static BOOL gen_yv12_read(struct wined3d_string_buffer *buffer, const struct arb shader_addline(buffer, "FLR texcrd2.y, texcrd2.y;\n"); shader_addline(buffer, "MAD texcrd.y, texcrd.y, yv12_coef.y, yv12_coef.x;\n"); - /* Read odd lines from the right side(add size * 0.5 to the x coordinate */ + /* Read odd lines from the right side (add size * 0.5 to the x coordinate). */ shader_addline(buffer, "ADD texcrd2.x, texcrd2.y, yv12_coef.y;\n"); /* To avoid 0.5 == 0.5 comparisons */ shader_addline(buffer, "FRC texcrd2.x, texcrd2.x;\n"); shader_addline(buffer, "SGE texcrd2.x, texcrd2.x, coef.y;\n"); @@ -7109,11 +7105,11 @@ static BOOL gen_yv12_read(struct wined3d_string_buffer *buffer, const struct arb } else { - /* Read from [size - size+size/4] */ + /* The y coordinate for V is in the range [size, size + size / 4). */ shader_addline(buffer, "FLR texcrd.y, texcrd.y;\n"); shader_addline(buffer, "MAD texcrd.y, texcrd.y, coef.w, size.y;\n"); - /* Read odd lines from the right side(add size * 0.5 to the x coordinate */ + /* Read odd lines from the right side (add size * 0.5 to the x coordinate). */ shader_addline(buffer, "ADD texcrd2.x, texcrd.y, yv12_coef.y;\n"); /* To avoid 0.5 == 0.5 comparisons */ shader_addline(buffer, "FRC texcrd2.x, texcrd2.x;\n"); shader_addline(buffer, "SGE texcrd2.x, texcrd2.x, coef.y;\n"); @@ -7169,12 +7165,10 @@ static BOOL gen_yv12_read(struct wined3d_string_buffer *buffer, const struct arb shader_addline(buffer, "TEX luminance, texcrd, texture[0], %s;\n", tex); } *luminance = 'a'; - - return TRUE; } -static BOOL gen_nv12_read(struct wined3d_string_buffer *buffer, const struct arbfp_blit_type *type, - char *luminance) +static void gen_nv12_read(struct wined3d_string_buffer *buffer, + const struct arbfp_blit_type *type, char *luminance) { const char *tex; static const float nv12_coef[] @@ -7250,7 +7244,7 @@ static BOOL gen_nv12_read(struct wined3d_string_buffer *buffer, const struct arb } else { - /* Read from [size - size+size/2] */ + /* The y coordinate for chroma is in the range [size, size + size / 2). */ shader_addline(buffer, "MAD texcrd.y, texcrd.y, coef.y, size.y;\n"); shader_addline(buffer, "FLR texcrd.x, texcrd.x;\n"); @@ -7305,8 +7299,6 @@ static BOOL gen_nv12_read(struct wined3d_string_buffer *buffer, const struct arb shader_addline(buffer, "TEX luminance, texcrd, texture[0], %s;\n", tex); } *luminance = 'a'; - - return TRUE; } /* Context activation is done by the caller. */ @@ -7472,27 +7464,15 @@ static GLuint gen_yuv_shader(const struct wined3d_gl_info *gl_info, const struct { case COMPLEX_FIXUP_UYVY: case COMPLEX_FIXUP_YUY2: - if (!gen_planar_yuv_read(&buffer, type, &luminance_component)) - { - string_buffer_free(&buffer); - return 0; - } + gen_planar_yuv_read(&buffer, type, &luminance_component); break; case COMPLEX_FIXUP_YV12: - if (!gen_yv12_read(&buffer, type, &luminance_component)) - { - string_buffer_free(&buffer); - return 0; - } + gen_yv12_read(&buffer, type, &luminance_component); break; case COMPLEX_FIXUP_NV12: - if (!gen_nv12_read(&buffer, type, &luminance_component)) - { - string_buffer_free(&buffer); - return 0; - } + gen_nv12_read(&buffer, type, &luminance_component); break; default:

1 0

Nikolay Sivov : wined3d: Add support for setting multiple viewports.
by Alexandre Julliard 16 Apr '18

16 Apr '18

Module: wine Branch: master Commit: 853f6538e4415c146ce56e8839b9bcd3bccff4fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=853f6538e4415c146ce56e88… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 14 12:12:38 2018 +0300 wined3d: Add support for setting multiple viewports. Signed-off-by: Nikolay Sivov <nsivov(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 | 4 +- dlls/d3d8/device.c | 2 +- dlls/d3d9/device.c | 2 +- dlls/ddraw/device.c | 2 +- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/cs.c | 35 +++++++++------ dlls/wined3d/device.c | 52 +++++++++++++--------- dlls/wined3d/glsl_shader.c | 44 ++++++++++++++----- dlls/wined3d/state.c | 92 +++++++++++++++++++++++++++++---------- dlls/wined3d/stateblock.c | 12 +++-- dlls/wined3d/utils.c | 17 ++++---- dlls/wined3d/wined3d.spec | 2 +- dlls/wined3d/wined3d_private.h | 29 +++++++----- include/wine/wined3d.h | 5 ++- 14 files changed, 202 insertions(+), 98 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=853f6538e4415c146ce5…

1 0

Zebediah Figura : msi: Convert the IWineMsiRemote* remote interfaces to RPC stubs.
by Alexandre Julliard 16 Apr '18

16 Apr '18

Module: wine Branch: master Commit: 8bfb4e8b6209d02a18be3299717b1f38db7045fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=8bfb4e8b6209d02a18be3299… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Apr 15 20:52:10 2018 -0500 msi: Convert the IWineMsiRemote* remote interfaces to RPC stubs. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/Makefile.in | 4 +- dlls/msi/cond.y | 13 +-- dlls/msi/custom.c | 117 ++------------------ dlls/msi/database.c | 121 ++------------------- dlls/msi/dialog.c | 5 +- dlls/msi/format.c | 11 +- dlls/msi/handle.c | 30 +++--- dlls/msi/install.c | 149 ++++++++------------------ dlls/msi/msi.c | 17 ++- dlls/msi/msi_main.c | 7 -- dlls/msi/msipriv.h | 7 +- dlls/msi/msiquery.c | 41 +++----- dlls/msi/msiserver.idl | 64 ----------- dlls/msi/package.c | 281 +++++++++++-------------------------------------- dlls/msi/suminfo.c | 14 ++- dlls/msi/winemsi.idl | 70 ++++++++++++ 16 files changed, 258 insertions(+), 693 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8bfb4e8b6209d02a18be…

1 0

Zebediah Figura : msi: Allocate the remote handle on the server side.
by Alexandre Julliard 16 Apr '18

16 Apr '18

Module: wine Branch: master Commit: b9b459810f646c48bdac981a066f0102acb9201c URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9b459810f646c48bdac981a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Apr 15 20:52:09 2018 -0500 msi: Allocate the remote handle on the server side. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/custom.c | 17 ++++++++--------- dlls/msi/msipriv.h | 4 +++- dlls/msi/msiserver.idl | 3 +-- dlls/msi/package.c | 12 ++---------- 4 files changed, 14 insertions(+), 22 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 851c503..def36e3 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -490,7 +490,7 @@ static void handle_msi_break( LPCWSTR target ) DebugBreak(); } -static UINT get_action_info( const GUID *guid, INT *type, MSIHANDLE *handle, +static UINT get_action_info( const GUID *guid, INT *type, BSTR *dll, BSTR *funcname, IWineMsiRemotePackage **package ) { @@ -513,7 +513,7 @@ static UINT get_action_info( const GUID *guid, INT *type, MSIHANDLE *handle, return ERROR_FUNCTION_FAILED; } - r = IWineMsiRemoteCustomAction_GetActionInfo( rca, guid, type, handle, dll, funcname, package ); + r = IWineMsiRemoteCustomAction_GetActionInfo( rca, guid, type, dll, funcname, package ); IWineMsiRemoteCustomAction_Release( rca ); if (FAILED(r)) { @@ -550,7 +550,7 @@ static inline UINT CUSTOMPROC_wrapper( MsiCustomActionEntryPoint proc, MSIHANDLE static DWORD ACTION_CallDllFunction( const GUID *guid ) { MsiCustomActionEntryPoint fn; - MSIHANDLE hPackage, handle; + MSIHANDLE hPackage; HANDLE hModule; LPSTR proc; UINT r = ERROR_FUNCTION_FAILED; @@ -560,7 +560,7 @@ static DWORD ACTION_CallDllFunction( const GUID *guid ) TRACE("%s\n", debugstr_guid( guid )); - r = get_action_info( guid, &type, &handle, &dll, &function, &remote_package ); + r = get_action_info( guid, &type, &dll, &function, &remote_package ); if (r != ERROR_SUCCESS) return r; @@ -579,7 +579,6 @@ static DWORD ACTION_CallDllFunction( const GUID *guid ) hPackage = alloc_msi_remote_handle( (IUnknown *)remote_package ); if (hPackage) { - IWineMsiRemotePackage_SetMsiHandle( remote_package, handle ); TRACE("calling %s\n", debugstr_w( function ) ); handle_msi_break( function ); @@ -608,7 +607,6 @@ static DWORD ACTION_CallDllFunction( const GUID *guid ) IWineMsiRemotePackage_Release( remote_package ); SysFreeString( dll ); SysFreeString( function ); - MsiCloseHandle( handle ); return r; } @@ -1428,21 +1426,22 @@ static ULONG WINAPI mcr_Release( IWineMsiRemoteCustomAction *iface ) } static HRESULT WINAPI mcr_GetActionInfo( IWineMsiRemoteCustomAction *iface, LPCGUID custom_action_guid, - INT *type, MSIHANDLE *handle, BSTR *dll, BSTR *func, IWineMsiRemotePackage **remote_package ) + INT *type, BSTR *dll, BSTR *func, IWineMsiRemotePackage **remote_package ) { msi_custom_action_info *info; + MSIHANDLE handle; info = find_action_by_guid( custom_action_guid ); if (!info) return E_FAIL; *type = info->type; - *handle = alloc_msihandle( &info->package->hdr ); + handle = alloc_msihandle( &info->package->hdr ); *dll = SysAllocString( info->source ); *func = SysAllocString( info->target ); release_custom_action_data( info ); - return create_msi_remote_package( NULL, (LPVOID *)remote_package ); + return create_msi_remote_package( handle, remote_package ); } static const IWineMsiRemoteCustomActionVtbl msi_custom_remote_vtbl = diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index ea65e2a..54acbc7 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -38,6 +38,8 @@ #include "wine/list.h" #include "wine/debug.h" +#include "msiserver.h" + static const BOOL is_64bit = sizeof(void *) > sizeof(int); BOOL is_wow64 DECLSPEC_HIDDEN; @@ -733,7 +735,7 @@ UINT msi_strcpy_to_awstring(const WCHAR *, int, awstring *, DWORD *) DECLSPEC_HI /* msi server interface */ extern HRESULT create_msi_custom_remote( IUnknown *pOuter, LPVOID *ppObj ) DECLSPEC_HIDDEN; -extern HRESULT create_msi_remote_package( IUnknown *pOuter, LPVOID *ppObj ) DECLSPEC_HIDDEN; +extern HRESULT create_msi_remote_package( MSIHANDLE handle, IWineMsiRemotePackage **package ) DECLSPEC_HIDDEN; extern HRESULT create_msi_remote_database( IUnknown *pOuter, LPVOID *ppObj ) DECLSPEC_HIDDEN; extern IUnknown *msi_get_remote(MSIHANDLE handle) DECLSPEC_HIDDEN; diff --git a/dlls/msi/msiserver.idl b/dlls/msi/msiserver.idl index e734690..704f6ea 100644 --- a/dlls/msi/msiserver.idl +++ b/dlls/msi/msiserver.idl @@ -56,7 +56,6 @@ interface IWineMsiRemoteDatabase : IUnknown ] interface IWineMsiRemotePackage : IUnknown { - HRESULT SetMsiHandle( [in] MSIHANDLE handle ); HRESULT GetActiveDatabase( [out] MSIHANDLE *handle ); HRESULT GetProperty( [in] BSTR property, [out, size_is(*size)] BSTR value, [in, out] DWORD *size ); HRESULT SetProperty( [in] BSTR property, [in] BSTR value ); @@ -88,7 +87,7 @@ interface IWineMsiRemotePackage : IUnknown ] interface IWineMsiRemoteCustomAction : IUnknown { - HRESULT GetActionInfo( [in] LPCGUID guid, [out] INT *type, [out] MSIHANDLE *handle, [out] BSTR *dllname, + HRESULT GetActionInfo( [in] LPCGUID guid, [out] INT *type, [out] BSTR *dllname, [out] BSTR *function, [out] IWineMsiRemotePackage **package ); } diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 5aa3dd0..2d11ea8 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -2561,13 +2561,6 @@ static ULONG WINAPI mrp_Release( IWineMsiRemotePackage *iface ) return r; } -static HRESULT WINAPI mrp_SetMsiHandle( IWineMsiRemotePackage *iface, MSIHANDLE handle ) -{ - msi_remote_package_impl* This = impl_from_IWineMsiRemotePackage( iface ); - This->package = handle; - return S_OK; -} - static HRESULT WINAPI mrp_GetActiveDatabase( IWineMsiRemotePackage *iface, MSIHANDLE *handle ) { msi_remote_package_impl* This = impl_from_IWineMsiRemotePackage( iface ); @@ -2756,7 +2749,6 @@ static const IWineMsiRemotePackageVtbl msi_remote_package_vtbl = mrp_QueryInterface, mrp_AddRef, mrp_Release, - mrp_SetMsiHandle, mrp_GetActiveDatabase, mrp_GetProperty, mrp_SetProperty, @@ -2780,7 +2772,7 @@ static const IWineMsiRemotePackageVtbl msi_remote_package_vtbl = mrp_EnumComponentCosts }; -HRESULT create_msi_remote_package( IUnknown *pOuter, LPVOID *ppObj ) +HRESULT create_msi_remote_package( MSIHANDLE handle, IWineMsiRemotePackage **ppObj ) { msi_remote_package_impl* This; @@ -2789,7 +2781,7 @@ HRESULT create_msi_remote_package( IUnknown *pOuter, LPVOID *ppObj ) return E_OUTOFMEMORY; This->IWineMsiRemotePackage_iface.lpVtbl = &msi_remote_package_vtbl; - This->package = 0; + This->package = handle; This->refs = 1; *ppObj = &This->IWineMsiRemotePackage_iface;

1 0

Zebediah Figura : msi: Stop vending WineMsiRemotePackage.
by Alexandre Julliard 16 Apr '18

16 Apr '18

Module: wine Branch: master Commit: d26336a944e0b516e56dd69fa06543404402b45f URL: https://source.winehq.org/git/wine.git/?a=commit;h=d26336a944e0b516e56dd69f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Apr 15 20:52:08 2018 -0500 msi: Stop vending WineMsiRemotePackage. Since we return it from WineMsiRemoteCustomAction::GetActionInfo(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/msi_main.c | 7 ------- dlls/msi/msiserver.idl | 5 ----- 2 files changed, 12 deletions(-) diff --git a/dlls/msi/msi_main.c b/dlls/msi/msi_main.c index 3143118..9f5b2c4 100644 --- a/dlls/msi/msi_main.c +++ b/dlls/msi/msi_main.c @@ -167,7 +167,6 @@ static const IClassFactoryVtbl MsiCF_Vtbl = static IClassFactoryImpl MsiServer_CF = { { &MsiCF_Vtbl }, create_msiserver }; static IClassFactoryImpl WineMsiCustomRemote_CF = { { &MsiCF_Vtbl }, create_msi_custom_remote }; -static IClassFactoryImpl WineMsiRemotePackage_CF = { { &MsiCF_Vtbl }, create_msi_remote_package }; /****************************************************************** * DllGetClassObject [MSI.@] @@ -188,12 +187,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) return S_OK; } - if ( IsEqualCLSID (rclsid, &CLSID_WineMsiRemotePackage) ) - { - *ppv = &WineMsiRemotePackage_CF; - return S_OK; - } - if( IsEqualCLSID (rclsid, &CLSID_MsiServerMessage) || IsEqualCLSID (rclsid, &CLSID_MsiServer) || IsEqualCLSID (rclsid, &CLSID_PSFactoryBuffer) || diff --git a/dlls/msi/msiserver.idl b/dlls/msi/msiserver.idl index 5052602..e734690 100644 --- a/dlls/msi/msiserver.idl +++ b/dlls/msi/msiserver.idl @@ -187,11 +187,6 @@ coclass MsiServerX3 { interface IMsiServer; } ] coclass WineMsiRemoteCustomAction { interface WineMsiRemoteCustomAction; } -[ - uuid(902b3592-9d08-4dfd-a593-d07c52546421) -] -coclass WineMsiRemotePackage { interface WineMsiRemotePackage; } - [ uuid(000C1092-0000-0000-C000-000000000046), version(1.0) ] library WindowsInstaller {

1 0

Louis Lenders : shell32: Update specs for SHGetSetFolderCustomSettings to behaviour above win2003.
by Alexandre Julliard 16 Apr '18

16 Apr '18

Module: wine Branch: master Commit: 62a84f6a3cf15d19d42a9c56e47b336323e53fd4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=62a84f6a3cf15d19d42a9c56… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Wed Apr 11 22:09:01 2018 +0200 shell32: Update specs for SHGetSetFolderCustomSettings to behaviour above win2003. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.spec | 2 +- dlls/shell32/shlfolder.c | 6 +++--- include/shlobj.h | 17 ++++++++++++++++- 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index 91e4f6b..837abd3 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -259,7 +259,7 @@ 701 stdcall CDefFolderMenu_Create2(ptr ptr long ptr ptr ptr long ptr ptr) 704 stdcall -noname GUIDFromStringW(wstr ptr) - 709 stdcall SHGetSetFolderCustomSettings(ptr str long) + 709 stdcall SHGetSetFolderCustomSettings(ptr wstr long) 714 stdcall @(ptr) SHELL32_714 # PathIsTemporaryW 723 stdcall -noname SHCreateSessionKey(long ptr) 727 stdcall SHGetImageList(long ptr ptr) diff --git a/dlls/shell32/shlfolder.c b/dlls/shell32/shlfolder.c index f4df6f5..9143f1e 100644 --- a/dlls/shell32/shlfolder.c +++ b/dlls/shell32/shlfolder.c @@ -607,11 +607,11 @@ HRESULT WINAPI SHOpenFolderAndSelectItems( PCIDLIST_ABSOLUTE pidlFolder, UINT ci /*********************************************************************** * SHGetSetFolderCustomSettings * - * Only in XP (up to SP2) and Server 2003 + * Only Unicode above Server 2003 */ -HRESULT WINAPI SHGetSetFolderCustomSettings( LPSHFOLDERCUSTOMSETTINGS fcs, LPCSTR path, DWORD flag ) +HRESULT WINAPI SHGetSetFolderCustomSettings( LPSHFOLDERCUSTOMSETTINGS fcs, PCWSTR path, DWORD flag ) { - FIXME("%p %s 0x%x: stub\n", fcs, path, flag); + FIXME("%p %s 0x%x: stub\n", fcs, debugstr_w(path), flag); return E_NOTIMPL; } diff --git a/include/shlobj.h b/include/shlobj.h index 7cdb4f8..9d6dcdd 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -1475,6 +1475,21 @@ int WINAPI SHCreateDirectoryExW(HWND, LPCWSTR, LPSECURITY_ATTRIBUTES); /**************************************************************************** * SHGetSetFolderCustomSettings API */ + +#define FCS_READ 0x00000001 +#define FCS_FORCEWRITE 0x00000002 +#define FCS_WRITE (FCS_READ | FCS_FORCEWRITE) + +#define FCS_FLAG_DRAGDROP 0x00000002 + +#define FCSM_VIEWID 0x00000001 +#define FCSM_WEBVIEWTEMPLATE 0x00000002 +#define FCSM_INFOTIP 0x00000004 +#define FCSM_CLSID 0x00000008 +#define FCSM_ICONFILE 0x00000010 +#define FCSM_LOGO 0x00000020 +#define FCSM_FLAGS 0x00000040 + typedef struct { DWORD dwSize; DWORD dwMask; @@ -1493,7 +1508,7 @@ typedef struct { DWORD cchLogo; } SHFOLDERCUSTOMSETTINGS, *LPSHFOLDERCUSTOMSETTINGS; -HRESULT WINAPI SHGetSetFolderCustomSettings(LPSHFOLDERCUSTOMSETTINGS pfcs, LPCSTR pszPath, DWORD dwReadWrite); +HRESULT WINAPI SHGetSetFolderCustomSettings(LPSHFOLDERCUSTOMSETTINGS pfcs, PCWSTR pszPath, DWORD dwReadWrite); /**************************************************************************** * SHGetSpecialFolderLocation API

1 0

Alexandre Julliard : winedump: Print the thunk address for imports instead of the name address.
by Alexandre Julliard 16 Apr '18

16 Apr '18

Module: wine Branch: master Commit: 26a410990481bcb8000d0bbd718e9ad67d2b6467 URL: https://source.winehq.org/git/wine.git/?a=commit;h=26a410990481bcb8000d0bbd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 16 10:32:54 2018 +0200 winedump: Print the thunk address for imports instead of the name address. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/pe.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index 54250e4..1d5b825 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -1205,10 +1205,10 @@ static void dump_image_thunk_data64(const IMAGE_THUNK_DATA64 *il) } } -static void dump_image_thunk_data32(const IMAGE_THUNK_DATA32 *il, int offset) +static void dump_image_thunk_data32(const IMAGE_THUNK_DATA32 *il, int offset, DWORD thunk_rva) { const IMAGE_IMPORT_BY_NAME* iibn; - for (; il->u1.Ordinal; il++) + for (; il->u1.Ordinal; il++, thunk_rva += sizeof(DWORD)) { if (IMAGE_SNAP_BY_ORDINAL32(il->u1.Ordinal)) printf(" %4u <by ordinal>\n", IMAGE_ORDINAL32(il->u1.Ordinal)); @@ -1218,7 +1218,7 @@ static void dump_image_thunk_data32(const IMAGE_THUNK_DATA32 *il, int offset) if (!iibn) printf("Can't grab import by name info, skipping to next ordinal\n"); else - printf(" %4u %s %x\n", iibn->Hint, iibn->Name, (DWORD)il->u1.AddressOfData); + printf(" %4u %s %x\n", iibn->Hint, iibn->Name, thunk_rva); } } } @@ -1258,7 +1258,7 @@ static void dump_dir_imported_functions(void) if(PE_nt_headers->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR64_MAGIC) dump_image_thunk_data64((const IMAGE_THUNK_DATA64*)il); else - dump_image_thunk_data32(il, 0); + dump_image_thunk_data32(il, 0, importDesc->FirstThunk); printf("\n"); } importDesc++; @@ -1331,6 +1331,7 @@ static void dump_dir_delay_imported_functions(void) printf(" grAttrs %08x offset %08lx %s\n", importDesc->Attributes.AllAttributes, Offset(importDesc), (const char *)RVA(importDesc->DllNameRVA - offset, sizeof(DWORD))); printf(" Hint/Name Table: %08x\n", importDesc->ImportNameTableRVA); + printf(" Address Table: %08x\n", importDesc->ImportAddressTableRVA); printf(" TimeDateStamp: %08X (%s)\n", importDesc->TimeDateStamp, get_time_str(importDesc->TimeDateStamp)); @@ -1345,7 +1346,7 @@ static void dump_dir_delay_imported_functions(void) if (PE_nt_headers->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR64_MAGIC) dump_image_thunk_data64((const IMAGE_THUNK_DATA64 *)il); else - dump_image_thunk_data32(il, offset); + dump_image_thunk_data32(il, offset, importDesc->ImportAddressTableRVA); printf("\n"); } importDesc++;

1 0

← Newer
1
...
27
28
29
30
31
32
33
...
55
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2018