October 2018 - Wine-Commits

Alexandre Julliard : wineconsole: Scale font with system DPI.
by Alexandre Julliard Oct. 10, 2018

Oct. 10, 2018

Module: wine Branch: master Commit: 07111f9691e9eb4827f777979059d5ac08cec5f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=07111f9691e9eb4827f77797… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 10 20:45:14 2018 +0200 wineconsole: Scale font with system DPI. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45955 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineconsole/registry.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/programs/wineconsole/registry.c b/programs/wineconsole/registry.c index 9e7a7b6..e892305 100644 --- a/programs/wineconsole/registry.c +++ b/programs/wineconsole/registry.c @@ -129,14 +129,8 @@ static void WINECON_RegLoadHelper(HKEY hConKey, struct config_data* cfg) int height = HIWORD(val); int width = LOWORD(val); /* A value of zero reflects the default settings */ - if (height != 0) - { - cfg->cell_height = height; - } - if (width != 0) - { - cfg->cell_width = width; - } + if (height != 0) cfg->cell_height = MulDiv( height, GetDpiForSystem(), USER_DEFAULT_SCREEN_DPI ); + if (width != 0) cfg->cell_width = MulDiv( width, GetDpiForSystem(), USER_DEFAULT_SCREEN_DPI ); } count = sizeof(val); @@ -217,8 +211,8 @@ void WINECON_RegLoad(const WCHAR* appname, struct config_data* cfg) cfg->cursor_visible = 1; cfg->exit_on_die = 1; memset(cfg->face_name, 0, sizeof(cfg->face_name)); - cfg->cell_height = 12; - cfg->cell_width = 8; + cfg->cell_height = MulDiv( 12, GetDpiForSystem(), USER_DEFAULT_SCREEN_DPI ); + cfg->cell_width = MulDiv( 8, GetDpiForSystem(), USER_DEFAULT_SCREEN_DPI ); cfg->font_weight = FW_NORMAL; cfg->history_size = 50; cfg->history_nodup = 0; @@ -265,7 +259,7 @@ void WINECON_RegLoad(const WCHAR* appname, struct config_data* cfg) static void WINECON_RegSaveHelper(HKEY hConKey, const struct config_data* cfg) { int i; - DWORD val; + DWORD val, width, height; WCHAR color_name[13]; WINECON_DumpConfig("save", cfg); @@ -291,7 +285,9 @@ static void WINECON_RegSaveHelper(HKEY hConKey, const struct config_data* cfg) RegSetValueExW(hConKey, wszFaceName, 0, REG_SZ, (LPBYTE)&cfg->face_name, sizeof(cfg->face_name)); - val = MAKELONG(cfg->cell_width, cfg->cell_height); + width = MulDiv( cfg->cell_width, USER_DEFAULT_SCREEN_DPI, GetDpiForSystem() ); + height = MulDiv( cfg->cell_height, USER_DEFAULT_SCREEN_DPI, GetDpiForSystem() ); + val = MAKELONG(width, height); RegSetValueExW(hConKey, wszFontSize, 0, REG_DWORD, (LPBYTE)&val, sizeof(val)); val = cfg->font_weight;

1 0

Zebediah Figura : widl: Fix detection of SAFEARRAY pointers when writing array pointers.
by Alexandre Julliard Oct. 10, 2018

Oct. 10, 2018

Module: wine Branch: master Commit: 65610a4c943ede72f8a2a746e5e66109fcb7ca74 URL: https://source.winehq.org/git/wine.git/?a=commit;h=65610a4c943ede72f8a2a746… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Oct 9 18:06:40 2018 -0500 widl: Fix detection of SAFEARRAY pointers when writing array pointers. This code was introduced in 7d1e3691, but that commit did not account for pointers to normal C arrays. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/typelib.c | 4 ++-- tools/widl/write_msft.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/widl/typelib.c b/tools/widl/typelib.c index e8dfcb1..2ebb50e 100644 --- a/tools/widl/typelib.c +++ b/tools/widl/typelib.c @@ -200,10 +200,10 @@ unsigned short get_type_vt(type_t *t) { if (match(type_array_get_element(t)->name, "SAFEARRAY")) return VT_SAFEARRAY; + return VT_PTR; } else - error("get_type_vt: array types not supported\n"); - return VT_PTR; + return VT_CARRAY; case TYPE_INTERFACE: if(match(t->name, "IUnknown")) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 913e1a6..9357fd8 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -1113,7 +1113,7 @@ static int encode_var( if (target_type & 0x80000000) { mix_field = ((target_type >> 16) & 0x3fff) | VT_BYREF; - } else if (is_array(ref)) { + } else if (get_type_vt(ref) == VT_SAFEARRAY) { type_t *element_type = type_alias_get_aliasee(type_array_get_element(ref)); mix_field = get_type_vt(element_type) | VT_ARRAY | VT_BYREF; } else {

1 0

Jacek Caban : mlang: Register codepages info in registry.
by Alexandre Julliard Oct. 10, 2018

Oct. 10, 2018

Module: wine Branch: master Commit: 23c0047c818c20f73fb8244a0227a13581963ffe URL: https://source.winehq.org/git/wine.git/?a=commit;h=23c0047c818c20f73fb8244a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 9 15:55:00 2018 +0200 mlang: Register codepages info in registry. Outlook 2016 requires Codepage key to exist (it doesn't seem to require it to be filled). Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mlang/mlang.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ loader/wine.inf.in | 1 + 2 files changed, 54 insertions(+) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index fc16252..f12df29 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -3928,12 +3928,65 @@ HRESULT WINAPI DllCanUnloadNow(void) return dll_count == 0 ? S_OK : S_FALSE; } +static BOOL register_codepages(void) +{ + const struct mlang_data *family; + const MIME_CP_INFO *info; + HKEY db_key, key; + WCHAR buf[32]; + LSTATUS status; + + static const WCHAR db_key_nameW[] = { + 'M','I','M','E', + '\\','D','a','t','a','b','a','s','e', + '\\','C','o','d','e','p','a','g','e',0}; + static const WCHAR familyW[] = {'F','a','m','i','l','y',0}; + static const WCHAR formatW[] = {'%','u',0}; + + status = RegCreateKeyW(HKEY_CLASSES_ROOT, db_key_nameW, &db_key); + if (status != ERROR_SUCCESS) + return FALSE; + + for (family = mlang_data; family < mlang_data + ARRAY_SIZE(mlang_data); family++) + { + for (info = family->mime_cp_info; info < family->mime_cp_info + family->number_of_cp; info++) + { + sprintfW(buf, formatW, info->cp); + status = RegCreateKeyW(db_key, buf, &key); + if (status != ERROR_SUCCESS) + continue; + + RegSetValueExA(key, "BodyCharset", 0, REG_SZ, (BYTE*)info->body_charset, + strlen(info->body_charset) + 1); + + if (info->cp == family->family_codepage) + { + RegSetValueExA(key, "FixedWidthFont", 0, REG_SZ, (BYTE*)family->fixed_font, + strlen(family->fixed_font) + 1); + RegSetValueExA(key, "ProportionalFont", 0, REG_SZ, (BYTE*)family->proportional_font, + strlen(family->proportional_font) + 1); + } + else + { + RegSetValueExW(key, familyW, 0, REG_DWORD, (BYTE*)&family->family_codepage, + sizeof(family->family_codepage)); + } + + RegCloseKey(key); + } + } + + RegCloseKey(db_key); + return TRUE; +} /*********************************************************************** * DllRegisterServer (MLANG.@) */ HRESULT WINAPI DllRegisterServer(void) { + if(!register_codepages()) + return E_FAIL; return __wine_register_resources( instance ); } diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 5767b29..b6aeb1c 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2508,6 +2508,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,cryptdlg.dll,1 11,,cryptnet.dll,1 11,,devenum.dll,1 +11,,mlang.dll,1 11,,mp3dmod.dll,1 11,,mscoree.dll,1 11,,mshtml.dll,1

1 0

Józef Kucia : wined3d: Set texture swizzle for texture views.
by Alexandre Julliard Oct. 10, 2018

Oct. 10, 2018

Module: wine Branch: master Commit: ecea7a94c94e28e23ddc6ea179f1367435c2eddb URL: https://source.winehq.org/git/wine.git/?a=commit;h=ecea7a94c94e28e23ddc6ea1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Oct 10 14:33:12 2018 +0200 wined3d: Set texture swizzle for texture views. Fixes A8_UNORM views. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 44 ++++++++++++++++++++++-------------------- dlls/wined3d/view.c | 11 ++++++++++- dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 35 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 400d367..2244db5 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -925,6 +925,24 @@ void wined3d_texture_set_swapchain(struct wined3d_texture *texture, struct wined wined3d_resource_update_draw_binding(&texture->resource); } +void wined3d_gl_texture_swizzle_from_color_fixup(GLint swizzle[4], struct color_fixup_desc fixup) +{ + static const GLenum swizzle_source[] = + { + GL_ZERO, /* CHANNEL_SOURCE_ZERO */ + GL_ONE, /* CHANNEL_SOURCE_ONE */ + GL_RED, /* CHANNEL_SOURCE_X */ + GL_GREEN, /* CHANNEL_SOURCE_Y */ + GL_BLUE, /* CHANNEL_SOURCE_Z */ + GL_ALPHA, /* CHANNEL_SOURCE_W */ + }; + + swizzle[0] = swizzle_source[fixup.x_source]; + swizzle[1] = swizzle_source[fixup.y_source]; + swizzle[2] = swizzle_source[fixup.z_source]; + swizzle[3] = swizzle_source[fixup.w_source]; +} + /* Context activation is done by the caller. */ void wined3d_texture_bind(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) @@ -1040,27 +1058,11 @@ void wined3d_texture_bind(struct wined3d_texture *texture, if (!is_identity_fixup(fixup) && can_use_texture_swizzle(gl_info, format)) { - static const GLenum swizzle_source[] = - { - GL_ZERO, /* CHANNEL_SOURCE_ZERO */ - GL_ONE, /* CHANNEL_SOURCE_ONE */ - GL_RED, /* CHANNEL_SOURCE_X */ - GL_GREEN, /* CHANNEL_SOURCE_Y */ - GL_BLUE, /* CHANNEL_SOURCE_Z */ - GL_ALPHA, /* CHANNEL_SOURCE_W */ - }; - struct - { - GLint x, y, z, w; - } - swizzle; - - swizzle.x = swizzle_source[fixup.x_source]; - swizzle.y = swizzle_source[fixup.y_source]; - swizzle.z = swizzle_source[fixup.z_source]; - swizzle.w = swizzle_source[fixup.w_source]; - gl_info->gl_ops.gl.p_glTexParameteriv(target, GL_TEXTURE_SWIZZLE_RGBA, &swizzle.x); - checkGLcall("glTexParameteriv(GL_TEXTURE_SWIZZLE_RGBA)"); + GLint swizzle[4]; + + wined3d_gl_texture_swizzle_from_color_fixup(swizzle, fixup); + gl_info->gl_ops.gl.p_glTexParameteriv(target, GL_TEXTURE_SWIZZLE_RGBA, swizzle); + checkGLcall("set format swizzle"); } } diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index ff28468..b8a3568 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -207,7 +207,7 @@ static void create_texture_view(struct wined3d_gl_view *view, GLenum view_target level_idx, desc->u.texture.level_count, layer_idx, layer_count)); checkGLcall("create texture view"); - if (is_stencil_view_format(&view_format_gl->f)) + if (is_stencil_view_format(view_format)) { static const GLint swizzle[] = {GL_ZERO, GL_RED, GL_ZERO, GL_ZERO}; @@ -226,6 +226,15 @@ static void create_texture_view(struct wined3d_gl_view *view, GLenum view_target context_invalidate_compute_state(context, STATE_COMPUTE_SHADER_RESOURCE_BINDING); context_invalidate_state(context, STATE_GRAPHICS_SHADER_RESOURCE_BINDING); } + else if (!is_identity_fixup(view_format->color_fixup) && can_use_texture_swizzle(gl_info, view_format)) + { + GLint swizzle[4]; + + context_bind_texture(context, view->target, view->name); + wined3d_gl_texture_swizzle_from_color_fixup(swizzle, view_format->color_fixup); + gl_info->gl_ops.gl.p_glTexParameteriv(view->target, GL_TEXTURE_SWIZZLE_RGBA, swizzle); + checkGLcall("set format swizzle"); + } context_release(context); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 20e626c..19945cf 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3390,6 +3390,8 @@ void wined3d_texture_upload_from_texture(struct wined3d_texture *dst_texture, un void wined3d_texture_validate_location(struct wined3d_texture *texture, unsigned int sub_resource_idx, DWORD location) DECLSPEC_HIDDEN; +void wined3d_gl_texture_swizzle_from_color_fixup(GLint swizzle[4], struct color_fixup_desc fixup) DECLSPEC_HIDDEN; + #define WINED3D_LOCATION_DISCARDED 0x00000001 #define WINED3D_LOCATION_SYSMEM 0x00000002 #define WINED3D_LOCATION_USER_MEMORY 0x00000004

1 0

Hans Leidekker : msi: Rename msi_reset_folders to msi_reset_source_folders.
by Alexandre Julliard Oct. 10, 2018

Oct. 10, 2018

Module: wine Branch: master Commit: 14ddb49df278e44fd184a8fd73ff1341ce0885ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=14ddb49df278e44fd184a8fd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 10 16:14:28 2018 +0200 msi: Rename msi_reset_folders to msi_reset_source_folders. It was always called with source parameter set to TRUE. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/action.c | 4 ++-- dlls/msi/appsearch.c | 2 +- dlls/msi/custom.c | 2 +- dlls/msi/dialog.c | 2 +- dlls/msi/msipriv.h | 2 +- dlls/msi/package.c | 16 ++++------------ dlls/msi/upgrade.c | 2 +- 7 files changed, 11 insertions(+), 19 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index f2a038b..8ae9dce 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -368,7 +368,7 @@ UINT msi_parse_command_line( MSIPACKAGE *package, LPCWSTR szCommandLine, r = msi_set_property( package->db, prop, val, -1 ); if (r == ERROR_SUCCESS && !strcmpW( prop, szSourceDir )) - msi_reset_folders( package, TRUE ); + msi_reset_source_folders( package ); msi_free( val ); msi_free( prop ); @@ -486,7 +486,7 @@ UINT msi_set_sourcedir_props(MSIPACKAGE *package, BOOL replace) { UINT r = msi_set_property( package->db, szSourceDir, source, -1 ); if (r == ERROR_SUCCESS) - msi_reset_folders( package, TRUE ); + msi_reset_source_folders( package ); } msi_free( check ); diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index fbed073..8063651 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -1107,7 +1107,7 @@ static UINT iterate_appsearch(MSIRECORD *row, LPVOID param) { r = msi_set_property( package->db, propName, value, -1 ); if (r == ERROR_SUCCESS && !strcmpW( propName, szSourceDir )) - msi_reset_folders( package, TRUE ); + msi_reset_source_folders( package ); msi_free(value); } diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index a0fc3dd..97bde52 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -1408,7 +1408,7 @@ UINT ACTION_CustomAction(MSIPACKAGE *package, const WCHAR *action) len = deformat_string( package, target, &deformated ); rc = msi_set_property( package->db, source, deformated, len ); if (rc == ERROR_SUCCESS && !strcmpW( source, szSourceDir )) - msi_reset_folders( package, TRUE ); + msi_reset_source_folders( package ); msi_free(deformated); break; case 37: /* JScript/VBScript text stored in target column. */ diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index b01374f..6184da8 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -577,7 +577,7 @@ static void msi_dialog_set_property( MSIPACKAGE *package, LPCWSTR property, LPCW { UINT r = msi_set_property( package->db, property, value, -1 ); if (r == ERROR_SUCCESS && !strcmpW( property, szSourceDir )) - msi_reset_folders( package, TRUE ); + msi_reset_source_folders( package ); } static MSIFEATURE *msi_seltree_feature_from_item( HWND hwnd, HTREEITEM hItem ) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 10031d6..1710850 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -1025,7 +1025,7 @@ extern void msi_resolve_target_folder(MSIPACKAGE *package, const WCHAR *name, BO extern WCHAR *msi_normalize_path(const WCHAR *) DECLSPEC_HIDDEN; extern WCHAR *msi_resolve_file_source(MSIPACKAGE *package, MSIFILE *file) DECLSPEC_HIDDEN; extern const WCHAR *msi_get_target_folder(MSIPACKAGE *package, const WCHAR *name) DECLSPEC_HIDDEN; -extern void msi_reset_folders( MSIPACKAGE *package, BOOL source ) DECLSPEC_HIDDEN; +extern void msi_reset_source_folders( MSIPACKAGE *package ) DECLSPEC_HIDDEN; extern MSICOMPONENT *msi_get_loaded_component(MSIPACKAGE *package, const WCHAR *Component) DECLSPEC_HIDDEN; extern MSIFEATURE *msi_get_loaded_feature(MSIPACKAGE *package, const WCHAR *Feature) DECLSPEC_HIDDEN; extern MSIFILE *msi_get_loaded_file(MSIPACKAGE *package, const WCHAR *file) DECLSPEC_HIDDEN; diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 39a0a93..6ac73a3 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -2154,22 +2154,14 @@ end: return r; } -void msi_reset_folders( MSIPACKAGE *package, BOOL source ) +void msi_reset_source_folders( MSIPACKAGE *package ) { MSIFOLDER *folder; LIST_FOR_EACH_ENTRY( folder, &package->folders, MSIFOLDER, entry ) { - if ( source ) - { - msi_free( folder->ResolvedSource ); - folder->ResolvedSource = NULL; - } - else - { - msi_free( folder->ResolvedTarget ); - folder->ResolvedTarget = NULL; - } + msi_free( folder->ResolvedSource ); + folder->ResolvedSource = NULL; } } @@ -2263,7 +2255,7 @@ UINT WINAPI MsiSetPropertyW( MSIHANDLE hInstall, LPCWSTR szName, LPCWSTR szValue ret = msi_set_property( package->db, szName, szValue, -1 ); if (ret == ERROR_SUCCESS && !strcmpW( szName, szSourceDir )) - msi_reset_folders( package, TRUE ); + msi_reset_source_folders( package ); msiobj_release( &package->hdr ); return ret; diff --git a/dlls/msi/upgrade.c b/dlls/msi/upgrade.c index bbc7df6..36d65be 100644 --- a/dlls/msi/upgrade.c +++ b/dlls/msi/upgrade.c @@ -90,7 +90,7 @@ static void append_productcode(MSIPACKAGE* package, LPCWSTR action_property, r = msi_set_property( package->db, action_property, newprop, -1 ); if (r == ERROR_SUCCESS && !strcmpW( action_property, szSourceDir )) - msi_reset_folders( package, TRUE ); + msi_reset_source_folders( package ); TRACE("Found Related Product... %s now %s\n", debugstr_w(action_property), debugstr_w(newprop));

1 0

Zebediah Figura : widl: Handle typedef'd arrays.
by Alexandre Julliard Oct. 10, 2018

Oct. 10, 2018

Module: wine Branch: master Commit: cfab3111c26f96cee1773be66392bfb5bf367226 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cfab3111c26f96cee1773be6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Oct 9 18:06:41 2018 -0500 widl: Handle typedef'd arrays. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/write_msft.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 9357fd8..5585a2f 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -2333,6 +2333,7 @@ static void add_type_typeinfo(msft_typelib_t *typelib, type_t *type) break; case TYPE_BASIC: case TYPE_POINTER: + case TYPE_ARRAY: break; default: error("add_entry: unhandled type 0x%x for %s\n",

1 0

Byeongsik Jeon : gdi32: Remove unnecessary operations.
by Alexandre Julliard Oct. 10, 2018

Oct. 10, 2018

Module: wine Branch: master Commit: 11d68d05a72ad0ac459aa8bce222b1a59e864268 URL: https://source.winehq.org/git/wine.git/?a=commit;h=11d68d05a72ad0ac459aa8bc… Author: Byeongsik Jeon <bsjeon(a)hanmail.net> Date: Tue Oct 9 21:13:26 2018 +0900 gdi32: Remove unnecessary operations. The rgb part works from text rendering to alpha value. The '24' part is an unnecessary operation. Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 2dd2dcd..1d4cf53 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -7422,15 +7422,13 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, { dst[x] = ((unsigned int)src[hmul * x + rgb_interval * 0] << 16) | ((unsigned int)src[hmul * x + rgb_interval * 1] << 8) | - ((unsigned int)src[hmul * x + rgb_interval * 2] << 0) | - ((unsigned int)src[hmul * x + rgb_interval * 1] << 24) ; + ((unsigned int)src[hmul * x + rgb_interval * 2] << 0); } else { dst[x] = ((unsigned int)src[hmul * x + rgb_interval * 2] << 16) | ((unsigned int)src[hmul * x + rgb_interval * 1] << 8) | - ((unsigned int)src[hmul * x + rgb_interval * 0] << 0) | - ((unsigned int)src[hmul * x + rgb_interval * 1] << 24) ; + ((unsigned int)src[hmul * x + rgb_interval * 0] << 0); } } src += src_pitch * vmul;

1 0

Hans Leidekker : msi/tests: Add tests for directory properties.
by Alexandre Julliard Oct. 10, 2018

Oct. 10, 2018

Module: wine Branch: master Commit: 8386157caa9bfaea9a17c2d36e61f8a15138a791 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8386157caa9bfaea9a17c2d3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 10 16:14:30 2018 +0200 msi/tests: Add tests for directory properties. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/msi.c | 108 +++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 100 insertions(+), 8 deletions(-) diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index 015cd65..22698d8 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -348,12 +348,11 @@ static const char spf_install_exec_seq_dat[] = "SetFolderProp\t\t950\n" "SetFolderProp2\t\t960\n" "CostFinalize\t\t1000\n" + "InstallValidate\t\t1400\n" + "InstallInitialize\t\t1500\n" "InstallFiles\t\t4000\n" "InstallServices\t\t5000\n" - "InstallFinalize\t\t6600\n" - "InstallInitialize\t\t1500\n" - "InstallValidate\t\t1400\n" - "LaunchConditions\t\t100"; + "InstallFinalize\t\t6600\n"; static const char spf_install_ui_seq_dat[] = "Action\tCondition\tSequence\n" @@ -364,6 +363,68 @@ static const char spf_install_ui_seq_dat[] = "CostFinalize\t\t1000\n" "ExecuteAction\t\t1100\n"; +static const char spf_directory_dat[] = + "Directory\tDirectory_Parent\tDefaultDir\n" + "s72\tS72\tl255\n" + "Directory\tDirectory\n" + "PARENTDIR\tTARGETDIR\tparent\n" + "CHILDDIR\tPARENTDIR\tchild\n" + "MSITESTDIR\tProgramFilesFolder\tmsitest\n" + "ProgramFilesFolder\tTARGETDIR\t.\n" + "TARGETDIR\t\tSourceDir"; + +static const char spf_component_dat[] = + "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" + "s72\tS38\ts72\ti2\tS255\tS72\n" + "Component\tComponent\n" + "maximus\t{DF2CBABC-3BCC-47E5-A998-448D1C0C895B}\tMSITESTDIR\t0\tUILevel=5\tmaximus\n"; + +static const char spf2_install_exec_seq_dat[] = + "Action\tCondition\tSequence\n" + "s72\tS255\tI2\n" + "InstallExecuteSequence\tAction\n" + "CostInitialize\t\t800\n" + "FileCost\t\t900\n" + "FormatParentFolderCheck\t\t910\n" + "FormatChildFolderCheck\t\t920\n" + "CheckParentFolder\tNOT PARENTDIR=PARENTDIRCHECK\t930\n" + "CheckChildFolder\tNOT CHILDDIR=CHILDDIRCHECK\t940\n" + "FormatParentFolderCheck2\t\t945\n" + "SetParentFolder\t\t950\n" + "CheckParentFolder2\tNOT PARENTDIR=PARENTDIRCHECK\t960\n" + "CheckChildFolder2\tNOT CHILDDIR=CHILDDIRCHECK\t970\n" + "CostFinalize\t\t1000\n" + "FormatParentFolderCheck3\t\t1005\n" + "CheckParentFolder3\tNOT PARENTDIR=PARENTDIRCHECK\t1010\n" + "CheckChildFolder3\tNOT CHILDDIR=CHILDDIRCHECK\t1020\n" + "InstallValidate\t\t1400\n" + "InstallInitialize\t\t1500\n" + "InstallFiles\t\t4000\n" + "CreateShortcuts\t\t4100\n" + "InstallFinalize\t\t6600\n"; + +static const char spf2_custom_action_dat[] = + "Action\tType\tSource\tTarget\tISComments\n" + "s72\ti2\tS64\tS0\tS255\n" + "CustomAction\tAction\n" + "FormatParentFolderCheck\t51\tPARENTDIRCHECK\t[TARGETDIR]parent\\\t\n" + "FormatChildFolderCheck\t51\tCHILDDIRCHECK\t[TARGETDIR]parent\\child\\\t\n" + "CheckParentFolder\t19\tPARENTDIR\tparent prop wrong before set: [PARENTDIR]\t\n" + "CheckChildFolder\t19\tCHILDDIR\tchild prop wrong before set: [CHILDDIR]\t\n" + "FormatParentFolderCheck2\t51\tPARENTDIRCHECK\t[ProgramFilesFolder]msitest\\parent\t\n" + "SetParentFolder\t51\tPARENTDIR\t[PARENTDIRCHECK]\t\n" + "CheckParentFolder2\t19\tPARENTDIR\tparent prop wrong after set: [PARENTDIR]\t\n" + "CheckChildFolder2\t19\tCHILDDIR\tchild prop wrong after set: [CHILDDIR]\t\n" + "FormatParentFolderCheck3\t51\tPARENTDIRCHECK\t[ProgramFilesFolder]msitest\\parent\\\t\n" + "CheckParentFolder3\t19\tPARENTDIR\tparent prop wrong after CostFinalize: [PARENTDIR]\t\n" + "CheckChildFolder3\t19\tCHILDDIR\tchild prop wrong after CostFinalize: [CHILDDIR]\t\n"; + +static const char shortcut_dat[] = + "Shortcut\tDirectory_\tName\tComponent_\tTarget\tArguments\tDescription\tHotkey\tIcon_\tIconIndex\tShowCmd\tWkDir\n" + "s72\ts72\tl128\ts72\ts72\tS255\tL255\tI2\tS72\tI2\tI2\tS72\n" + "Shortcut\tShortcut\n" + "Shortcut\tCHILDDIR\tShortcut\tmaximus\t[#maximus]\t\tShortcut\t\t\t\t\tMSITESTDIR\n"; + static const char sd_file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" @@ -649,6 +710,21 @@ static const msi_table spf_tables[] = ADD_TABLE(spf_install_ui_seq) }; +static const msi_table spf2_tables[] = +{ + ADD_TABLE(spf_component), + ADD_TABLE(spf_directory), + ADD_TABLE(lus_feature), + ADD_TABLE(lus_feature_comp), + ADD_TABLE(lus_file), + ADD_TABLE(lus0_media), + ADD_TABLE(property), + ADD_TABLE(spf2_custom_action), + ADD_TABLE(spf2_install_exec_seq), + ADD_TABLE(spf_install_ui_seq), + ADD_TABLE(shortcut) +}; + static const msi_table sd_tables[] = { ADD_TABLE(directory), @@ -14096,7 +14172,6 @@ error: static void test_setpropertyfolder(void) { UINT r; - CHAR path[MAX_PATH]; if (is_process_limited()) { @@ -14104,9 +14179,6 @@ static void test_setpropertyfolder(void) return; } - lstrcpyA(path, PROG_FILES_DIR); - lstrcatA(path, "\\msitest\\added"); - CreateDirectoryA("msitest", NULL); create_file("msitest\\maximus", 500); @@ -14126,6 +14198,26 @@ static void test_setpropertyfolder(void) ok(delete_pf("msitest\\added", FALSE), "Directory not created\n"); ok(delete_pf("msitest", FALSE), "Directory not created\n"); + CreateDirectoryA("parent", NULL); + CreateDirectoryA("parent\\child", NULL); + create_file("parent\\child\\maximus", 500); + + create_database(msifile, spf2_tables, ARRAY_SIZE(spf2_tables)); + + r = MsiInstallProductA(msifile, "TARGETDIR=c:\\"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + ok(delete_pf("msitest\\maximus", TRUE), "file not installed\n"); + ok(delete_pf("msitest", FALSE), "directory not created\n"); + + ok(DeleteFileA("c:\\parent\\child\\Shortcut.lnk"), "file not installed"); + ok(RemoveDirectoryA("c:\\parent\\child"), "directory not created\n"); + ok(RemoveDirectoryA("c:\\parent"), "directory not created\n"); + + DeleteFileA("parent\\child\\maximus"); + RemoveDirectoryA("parent\\child"); + RemoveDirectoryA("parent"); + error: DeleteFileA(msifile); DeleteFileA("msitest\\maximus");

1 0

Hans Leidekker : msi: Remove unused fields from MSIFOLDER.
by Alexandre Julliard Oct. 10, 2018

Oct. 10, 2018

Module: wine Branch: master Commit: de78ca24a5a2945e7431c1eb9a6e5404bbcfbf5d URL: https://source.winehq.org/git/wine.git/?a=commit;h=de78ca24a5a2945e7431c1eb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 10 16:14:29 2018 +0200 msi: Remove unused fields from MSIFOLDER. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/msipriv.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 1710850..76f532f 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -565,8 +565,6 @@ typedef struct tagMSIFOLDER LPWSTR ResolvedSource; enum folder_state State; BOOL persistent; - INT Cost; - INT Space; } MSIFOLDER; typedef struct tagFolderList

1 0

Alexandre Julliard : wineconsole: Try harder to get a scalable font.
by Alexandre Julliard Oct. 10, 2018

Oct. 10, 2018

Module: wine Branch: master Commit: cf3e22ed6bffd793ff9f2117b28f496622cd531a URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf3e22ed6bffd793ff9f2117… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 10 20:43:02 2018 +0200 wineconsole: Try harder to get a scalable font. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineconsole/user.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/programs/wineconsole/user.c b/programs/wineconsole/user.c index 0b29157..a515501 100644 --- a/programs/wineconsole/user.c +++ b/programs/wineconsole/user.c @@ -338,6 +338,9 @@ BOOL WCUSER_ValidateFontMetric(const struct inner_data* data, const TEXTMETRICW* switch (pass) /* we get increasingly lenient in later passes */ { case 0: + if (type & RASTER_FONTTYPE) return FALSE; + /* fall through */ + case 1: if (type & RASTER_FONTTYPE) { if (tm->tmMaxCharWidth * data->curcfg.win_width >= GetSystemMetrics(SM_CXSCREEN) || @@ -345,10 +348,10 @@ BOOL WCUSER_ValidateFontMetric(const struct inner_data* data, const TEXTMETRICW* return FALSE; } /* fall through */ - case 1: + case 2: if (tm->tmCharSet != DEFAULT_CHARSET && tm->tmCharSet != g_uiDefaultCharset) return FALSE; /* fall through */ - case 2: + case 3: if (tm->tmItalic || tm->tmUnderlined || tm->tmStruckOut) return FALSE; break; } @@ -366,12 +369,13 @@ BOOL WCUSER_ValidateFont(const struct inner_data* data, const LOGFONTW* lf, int { case 0: case 1: + case 2: if (lf->lfCharSet != DEFAULT_CHARSET && lf->lfCharSet != g_uiDefaultCharset) return FALSE; /* fall through */ - case 2: + case 3: if ((lf->lfPitchAndFamily & 3) != FIXED_PITCH) return FALSE; /* fall through */ - case 3: + case 4: if (lf->lfFaceName[0] == '@') return FALSE; break; } @@ -554,7 +558,7 @@ static void WCUSER_SetFontPmt(struct inner_data* data, const WCHAR* font, WINE_WARN("Couldn't match the font from registry... trying to find one\n"); fc.data = data; fc.done = FALSE; - for (fc.pass = 0; fc.pass <= 4; fc.pass++) + for (fc.pass = 0; fc.pass <= 5; fc.pass++) { EnumFontFamiliesW(PRIVATE(data)->hMemDC, NULL, get_first_font_enum, (LPARAM)&fc); if (fc.done) return;

1 0