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

Matteo Bruni : wined3d: Implement source fixups in the GLSL blitter.
by Alexandre Julliard April 16, 2018

April 16, 2018

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

Henri Verbeet : wined3d: Get rid of the "numberedArraysLoaded" field in struct wined3d_context.
by Alexandre Julliard April 16, 2018

April 16, 2018

Module: wine Branch: master Commit: 70c5dc64fc02408c6f7233c996e0ffdc5dc4a5a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=70c5dc64fc02408c6f7233c9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 16 18:17:30 2018 +0430 wined3d: Get rid of the "numberedArraysLoaded" field in struct wined3d_context. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/state.c | 4 +--- dlls/wined3d/wined3d_private.h | 9 +++++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 5a37fad..5bcd244 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4346,10 +4346,9 @@ static void streamsrc(struct wined3d_context *context, const struct wined3d_stat && !use_vs(state) && !context->use_immediate_mode_draw; if (isStateDirty(context, STATE_VDECL)) return; - if (context->numberedArraysLoaded && !load_numbered) + if (context->numbered_array_mask && !load_numbered) { unload_numbered_arrays(context); - context->numberedArraysLoaded = FALSE; context->numbered_array_mask = 0; } else if (context->namedArraysLoaded) @@ -4362,7 +4361,6 @@ static void streamsrc(struct wined3d_context *context, const struct wined3d_stat { TRACE("Loading numbered arrays\n"); load_numbered_arrays(context, &context->stream_info, state); - context->numberedArraysLoaded = TRUE; } else if (load_named) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 24d9232..7e6a87f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1883,7 +1883,7 @@ struct wined3d_context DWORD last_was_vshader : 1; DWORD last_was_normal : 1; DWORD namedArraysLoaded : 1; - DWORD numberedArraysLoaded : 1; + DWORD last_was_ffp_blit : 1; DWORD last_was_blit : 1; DWORD last_was_ckey : 1; DWORD fog_coord : 1; @@ -1892,6 +1892,7 @@ struct wined3d_context DWORD current : 1; DWORD destroyed : 1; DWORD valid : 1; + DWORD texShaderBumpMap : 8; /* MAX_TEXTURES, 8 */ DWORD lastWasPow2Texture : 8; /* MAX_TEXTURES, 8 */ DWORD fixed_function_usage_map : 8; /* MAX_TEXTURES, 8 */ @@ -1900,6 +1901,7 @@ struct wined3d_context DWORD rebind_fbo : 1; DWORD needs_set : 1; DWORD hdc_is_private : 1; + DWORD hdc_has_format : 1; /* only meaningful if hdc_is_private */ DWORD update_shader_resource_bindings : 1; DWORD update_compute_shader_resource_bindings : 1; @@ -1911,11 +1913,10 @@ struct wined3d_context DWORD transform_feedback_paused : 1; DWORD shader_update_mask : 6; /* WINED3D_SHADER_TYPE_COUNT, 6 */ DWORD clip_distance_mask : 8; /* MAX_CLIP_DISTANCES, 8 */ - DWORD last_was_ffp_blit : 1; - DWORD padding : 8; + DWORD padding : 9; DWORD constant_update_mask; - DWORD numbered_array_mask; + DWORD numbered_array_mask; GLenum tracking_parm; /* Which source is tracking current colour */ GLenum untracked_materials[2]; UINT blit_w, blit_h;

1 0

Matteo Bruni : wined3d: Use staging resources to blit from CPU resources in the GLSL blitter.
by Alexandre Julliard April 16, 2018

April 16, 2018

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

Nikolay Sivov : wined3d: Add support for setting multiple viewports.
by Alexandre Julliard April 16, 2018

April 16, 2018

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

Matteo Bruni : wined3d: Remove unused return values from the YUV shader generation helpers in the ARBfp blitter.
by Alexandre Julliard April 16, 2018

April 16, 2018

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

Gijs Vermeulen : tdh: Add version resource.
by Alexandre Julliard April 16, 2018

April 16, 2018

Module: wine Branch: master Commit: 59b979e4e1ffc0dce7377f7492d031f8d0243433 URL: https://source.winehq.org/git/wine.git/?a=commit;h=59b979e4e1ffc0dce7377f74… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Sun Apr 15 03:21:32 2018 +0200 tdh: Add version resource. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/tdh/Makefile.in | 2 ++ dlls/tdh/version.rc | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/dlls/tdh/Makefile.in b/dlls/tdh/Makefile.in index 0a4693f..8979549 100644 --- a/dlls/tdh/Makefile.in +++ b/dlls/tdh/Makefile.in @@ -2,3 +2,5 @@ MODULE = tdh.dll C_SRCS = \ tdh_main.c + +RC_SRCS = version.rc diff --git a/dlls/tdh/version.rc b/dlls/tdh/version.rc new file mode 100644 index 0000000..b18f50c --- /dev/null +++ b/dlls/tdh/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2018 Gijs Vermeulen + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "Wine Event Trace Helper Library" +#define WINE_FILENAME_STR "tdh.dll" +#define WINE_FILEVERSION 10,0,16299,15 +#define WINE_FILEVERSION_STR "10.0.16299.15" +#define WINE_PRODUCTVERSION 10,0,16299,15 +#define WINE_PRODUCTVERSION_STR "10.0.16299.15" + +#include "wine/wine_common_ver.rc"

1 0

Louis Lenders : shell32: Update specs for SHGetSetFolderCustomSettings to behaviour above win2003.
by Alexandre Julliard April 16, 2018

April 16, 2018

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

Zebediah Figura : msi: Stop vending WineMsiRemotePackage.
by Alexandre Julliard April 16, 2018

April 16, 2018

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

Zebediah Figura : msi: Convert the IWineMsiRemote* remote interfaces to RPC stubs.
by Alexandre Julliard April 16, 2018

April 16, 2018

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

Jactry Zeng : riched20: Check para before use in ME_PrevRun.
by Alexandre Julliard April 16, 2018

April 16, 2018

Module: wine Branch: master Commit: ea7186348f48a749ab28ecc405fb56601c56e4f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea7186348f48a749ab28ecc4… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Fri Apr 13 15:56:44 2018 +0800 riched20: Check para before use in ME_PrevRun. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/list.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/riched20/list.c b/dlls/riched20/list.c index 58b64e8..8c4f0de 100644 --- a/dlls/riched20/list.c +++ b/dlls/riched20/list.c @@ -97,7 +97,7 @@ BOOL ME_PrevRun(ME_DisplayItem **para, ME_DisplayItem **run, BOOL all_para) { if (p->type == diParagraph) { if (!all_para) return FALSE; - if (p->member.para.prev_para->type == diParagraph) + if (para && p->member.para.prev_para->type == diParagraph) *para = p->member.para.prev_para; } else if (p->type == diRun) { *run = p;

1 0