October 2018 - Wine-commits

Alexandre Julliard : wineconsole: Scale font with system DPI.
by Alexandre Julliard 10 Oct '18

10 Oct '18

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

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

10 Oct '18

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

Zebediah Figura : widl: Correctly generate headers for nested arrays and pointers.
by Alexandre Julliard 09 Oct '18

09 Oct '18

Module: wine Branch: master Commit: 6f971037331fb7455ae562d58af21e708f5b0725 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f971037331fb7455ae562d5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Oct 5 16:57:51 2018 -0500 widl: Correctly generate headers for nested arrays and pointers. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/header.c | 43 +++++++++++++++++++++++++++++++++---------- 1 file changed, 33 insertions(+), 10 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index e0c6d38..7681a3f 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -285,6 +285,15 @@ int needs_space_after(type_t *t) (!is_ptr(t) && (!is_array(t) || !type_array_is_decl_as_ptr(t) || t->name))); } +static void write_pointer_left(FILE *h, type_t *ref) +{ + if (needs_space_after(ref)) + fprintf(h, " "); + if (!type_is_alias(ref) && is_array(ref) && !type_array_is_decl_as_ptr(ref)) + fprintf(h, "("); + fprintf(h, "*"); +} + void write_type_left(FILE *h, type_t *t, enum name_type name_type, int declonly) { const char *name; @@ -341,10 +350,12 @@ void write_type_left(FILE *h, type_t *t, enum name_type name_type, int declonly) else fprintf(h, "union %s", t->name ? t->name : ""); break; case TYPE_POINTER: + { write_type_left(h, type_pointer_get_ref(t), name_type, declonly); - fprintf(h, "%s*", needs_space_after(type_pointer_get_ref(t)) ? " " : ""); + write_pointer_left(h, type_pointer_get_ref(t)); if (is_attr(t->attrs, ATTR_CONST)) fprintf(h, "const "); break; + } case TYPE_ARRAY: if (t->name && type_array_is_decl_as_ptr(t)) fprintf(h, "%s", t->name); @@ -352,7 +363,7 @@ void write_type_left(FILE *h, type_t *t, enum name_type name_type, int declonly) { write_type_left(h, type_array_get_element(t), name_type, declonly); if (type_array_is_decl_as_ptr(t)) - fprintf(h, "%s*", needs_space_after(type_array_get_element(t)) ? " " : ""); + write_pointer_left(h, type_array_get_element(t)); } break; case TYPE_BASIC: @@ -419,23 +430,36 @@ void write_type_left(FILE *h, type_t *t, enum name_type name_type, int declonly) void write_type_right(FILE *h, type_t *t, int is_field) { if (!h) return; + if (type_is_alias(t)) return; switch (type_get_type(t)) { case TYPE_ARRAY: - if (!type_array_is_decl_as_ptr(t)) + { + type_t *elem = type_array_get_element(t); + if (type_array_is_decl_as_ptr(t)) + { + if (!type_is_alias(elem) && is_array(elem) && !type_array_is_decl_as_ptr(elem)) + fprintf(h, ")"); + } + else { if (is_conformant_array(t)) - { fprintf(h, "[%s]", is_field ? "1" : ""); - t = type_array_get_element(t); - } - for ( ; - type_get_type(t) == TYPE_ARRAY && !type_array_is_decl_as_ptr(t); - t = type_array_get_element(t)) + else fprintf(h, "[%u]", type_array_get_dim(t)); } + write_type_right(h, elem, FALSE); break; + } + case TYPE_POINTER: + { + type_t *ref = type_pointer_get_ref(t); + if (!type_is_alias(ref) && is_array(ref) && !type_array_is_decl_as_ptr(ref)) + fprintf(h, ")"); + write_type_right(h, ref, FALSE); + break; + } case TYPE_BITFIELD: fprintf(h, " : %u", type_bitfield_get_bits(t)->cval); break; @@ -450,7 +474,6 @@ void write_type_right(FILE *h, type_t *t, int is_field) case TYPE_COCLASS: case TYPE_FUNCTION: case TYPE_INTERFACE: - case TYPE_POINTER: break; } }

1 0

Zebediah Figura : rpcrt4/tests: Add some tests for nesting arrays and pointers.
by Alexandre Julliard 09 Oct '18

09 Oct '18

Module: wine Branch: master Commit: 935eed8e980a62557b19b3313e32106752b4e4f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=935eed8e980a62557b19b331… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Oct 5 16:57:52 2018 -0500 rpcrt4/tests: Add some tests for nesting arrays and pointers. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/tests/server.c | 14 ++++++++++++++ dlls/rpcrt4/tests/server.idl | 3 +++ 2 files changed, 17 insertions(+) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index b35b71b..1494904 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -861,6 +861,16 @@ void __cdecl s_ip_test(ipu_t *a) ok(hr == S_OK, "got %#x\n", hr); } +int __cdecl s_sum_ptr_array(int *a[2]) +{ + return *a[0] + *a[1]; +} + +int __cdecl s_sum_array_ptr(int (*a)[2]) +{ + return (*a)[0] + (*a)[1]; +} + static void make_cmdline(char buffer[MAX_PATH], const char *test) { @@ -1388,6 +1398,7 @@ array_tests(void) pints_t api[5]; numbers_struct_t *ns; refpint_t rpi[5]; + int i0 = 1, i1 = 2, *ptr_array[2] = {&i0, &i1}, array[2] = {3, 4}; if (!old_windows_version) { @@ -1518,6 +1529,9 @@ array_tests(void) pi[4] = -4; rpi[4] = &pi[4]; ok(sum_complex_array(5, rpi) == 1, "RPC sum_complex_array\n"); HeapFree(GetProcessHeap(), 0, pi); + + ok(sum_ptr_array(ptr_array) == 3, "RPC sum_ptr_array\n"); + ok(sum_array_ptr(&array) == 7, "RPC sum_array_ptr\n"); } void __cdecl s_authinfo_test(unsigned int protseq, int secure) diff --git a/dlls/rpcrt4/tests/server.idl b/dlls/rpcrt4/tests/server.idl index 6aa7382..7d89445 100644 --- a/dlls/rpcrt4/tests/server.idl +++ b/dlls/rpcrt4/tests/server.idl @@ -393,4 +393,7 @@ cpp_quote("#endif") } ipu_t; void ip_test([in] ipu_t *a); + + int sum_ptr_array([in] int *a[2]); + int sum_array_ptr([in] int (*a)[2]); }

1 0

Byeongsik Jeon : gdi32: Improves the subpixel rendering availability for FreeType 2.8.1+.
by Alexandre Julliard 09 Oct '18

09 Oct '18

Module: wine Branch: master Commit: 66e446c5ec5c7f4f072358712151d75305dfbd49 URL: https://source.winehq.org/git/wine.git/?a=commit;h=66e446c5ec5c7f4f07235871… Author: Byeongsik Jeon <bsjeon(a)hanmail.net> Date: Tue Oct 9 14:11:07 2018 +0900 gdi32: Improves the subpixel rendering availability for FreeType 2.8.1+. FreeType 2.8.1+ implemented its own subpixel rendering. So FT_Err_Uniplemented_Feature check is not the reliable way. 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 | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 36a3431..2dd2dcd 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -993,18 +993,22 @@ static BOOL is_hinting_enabled(void) static BOOL is_subpixel_rendering_enabled( void ) { -#ifdef FT_LCD_FILTER_H static int enabled = -1; if (enabled == -1) { - enabled = (pFT_Library_SetLcdFilter && - pFT_Library_SetLcdFilter( NULL, 0 ) != FT_Err_Unimplemented_Feature); + /* FreeType >= 2.8.1 offers LCD-optimezed rendering without lcd filters. */ + if (FT_SimpleVersion >= ((2 << 16) | (8 << 8) | (1 << 0))) + enabled = TRUE; +#ifdef FT_LCD_FILTER_H + else if (pFT_Library_SetLcdFilter && + pFT_Library_SetLcdFilter( NULL, 0 ) != FT_Err_Unimplemented_Feature) + enabled = TRUE; +#endif + else enabled = FALSE; + TRACE("subpixel rendering is %senabled\n", enabled ? "" : "NOT "); } return enabled; -#else - return FALSE; -#endif } @@ -7274,7 +7278,6 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, case WINE_GGO_HBGR_BITMAP: case WINE_GGO_VRGB_BITMAP: case WINE_GGO_VBGR_BITMAP: -#ifdef FT_LCD_FILTER_H { switch (ft_face->glyph->format) { @@ -7360,8 +7363,10 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, if ( needsTransform ) pFT_Outline_Transform (&ft_face->glyph->outline, &transMatTategaki); +#ifdef FT_LCD_FILTER_H if ( pFT_Library_SetLcdFilter ) pFT_Library_SetLcdFilter( library, FT_LCD_FILTER_DEFAULT ); +#endif pFT_Render_Glyph (ft_face->glyph, render_mode); src = ft_face->glyph->bitmap.buffer; @@ -7442,9 +7447,6 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, break; } -#else - return GDI_ERROR; -#endif case GGO_NATIVE: {

1 0

Jacek Caban : mshtml: Support registry configuration for maximal allowed compatibility mode.
by Alexandre Julliard 09 Oct '18

09 Oct '18

Module: wine Branch: master Commit: 5489529f4e20efeec908af38c2f0d1f2974aa59c URL: https://source.winehq.org/git/wine.git/?a=commit;h=5489529f4e20efeec908af38… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 9 12:22:16 2018 +0200 mshtml: Support registry configuration for maximal allowed compatibility mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/main.c | 125 +++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 3 ++ dlls/mshtml/mutation.c | 60 +++++++++++++-------- 3 files changed, 166 insertions(+), 22 deletions(-) diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index 6ce8198..2ba648f 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -36,6 +36,7 @@ #include "rpcproxy.h" #include "shlguid.h" #include "mlang.h" +#include "wininet.h" #include "wine/debug.h" @@ -53,6 +54,14 @@ DWORD mshtml_tls = TLS_OUT_OF_INDEXES; static HINSTANCE shdoclc = NULL; static WCHAR *status_strings[IDS_STATUS_LAST-IDS_STATUS_FIRST+1]; static IMultiLanguage2 *mlang; +static unsigned global_max_compat_mode = COMPAT_MODE_IE11; +static struct list compat_config = LIST_INIT(compat_config); + +typedef struct { + struct list entry; + compat_mode_t max_compat_mode; + WCHAR host[1]; +} compat_config_t; static BOOL ensure_mlang(void) { @@ -109,6 +118,114 @@ BSTR charset_string_from_cp(UINT cp) return SysAllocString(info.wszWebCharset); } +static BOOL read_compat_mode(HKEY key, compat_mode_t *r) +{ + WCHAR version[32]; + DWORD type, size; + LSTATUS status; + + static const WCHAR max_compat_modeW[] = {'M','a','x','C','o','m','p','a','t','M','o','d','e',0}; + + size = sizeof(version); + status = RegQueryValueExW(key, max_compat_modeW, NULL, &type, (BYTE*)version, &size); + if(status != ERROR_SUCCESS || type != REG_SZ) + return FALSE; + + return parse_compat_version(version, r); +} + +static BOOL WINAPI load_compat_settings(INIT_ONCE *once, void *param, void **context) +{ + WCHAR key_name[INTERNET_MAX_HOST_NAME_LENGTH]; + DWORD index = 0, name_size; + compat_config_t *new_entry; + compat_mode_t max_compat_mode; + HKEY key, host_key; + DWORD res; + + static const WCHAR key_nameW[] = { + 'S','o','f','t','w','a','r','e', + '\\','W','i','n','e', + '\\','M','S','H','T','M','L', + '\\','C','o','m','p','a','t','M','o','d','e',0}; + + /* @@ Wine registry key: HKCU\Software\Wine\MSHTML\CompatMode */ + res = RegOpenKeyW(HKEY_CURRENT_USER, key_nameW, &key); + if(res != ERROR_SUCCESS) + return TRUE; + + if(read_compat_mode(key, &max_compat_mode)) { + TRACE("Setting global max compat mode to %u\n", max_compat_mode); + global_max_compat_mode = max_compat_mode; + } + + while(1) { + res = RegEnumKeyW(key, index, key_name, ARRAY_SIZE(key_name)); + if(res == ERROR_NO_MORE_ITEMS) + break; + index++; + if(res != ERROR_SUCCESS) { + WARN("RegEnumKey failed: %u\n", GetLastError()); + continue; + } + + name_size = strlenW(key_name) + 1; + new_entry = heap_alloc(FIELD_OFFSET(compat_config_t, host[name_size])); + if(!new_entry) + continue; + + new_entry->max_compat_mode = COMPAT_MODE_IE11; + memcpy(new_entry->host, key_name, name_size * sizeof(WCHAR)); + list_add_tail(&compat_config, &new_entry->entry); + + res = RegOpenKeyW(key, key_name, &host_key); + if(res != ERROR_SUCCESS) + continue; + + if(read_compat_mode(host_key, &max_compat_mode)) { + TRACE("Setting max compat mode for %s to %u\n", debugstr_w(key_name), max_compat_mode); + new_entry->max_compat_mode = max_compat_mode; + } + + RegCloseKey(host_key); + } + + RegCloseKey(key); + return TRUE; +} + +compat_mode_t get_max_compat_mode(IUri *uri) +{ + compat_config_t *iter; + size_t len, iter_len; + BSTR host; + HRESULT hres; + + static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; + InitOnceExecuteOnce(&init_once, load_compat_settings, NULL, NULL); + + if(!uri) + return global_max_compat_mode; + hres = IUri_GetHost(uri, &host); + if(FAILED(hres)) + return global_max_compat_mode; + len = SysStringLen(host); + + LIST_FOR_EACH_ENTRY(iter, &compat_config, compat_config_t, entry) { + iter_len = strlenW(iter->host); + /* If configured host starts with '.', we also match subdomains */ + if((len == iter_len || (iter->host[0] == '.' && len > iter_len)) + && !memcmp(host + len - iter_len, iter->host, iter_len * sizeof(WCHAR))) { + TRACE("Found max mode %u\n", iter->max_compat_mode); + return iter->max_compat_mode; + } + } + + SysFreeString(host); + TRACE("Using global max mode %u\n", global_max_compat_mode); + return global_max_compat_mode; +} + static void thread_detach(void) { thread_data_t *thread_data; @@ -132,9 +249,17 @@ static void free_strings(void) static void process_detach(void) { + compat_config_t *config; + close_gecko(); release_typelib(); + while(!list_empty(&compat_config)) { + config = LIST_ENTRY(list_head(&compat_config), compat_config_t, entry); + list_remove(&config->entry); + heap_free(config); + } + if(shdoclc) FreeLibrary(shdoclc); if(mshtml_tls != TLS_OUT_OF_INDEXES) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index ddc8df5..89a56bd 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -1167,6 +1167,8 @@ void remove_target_tasks(LONG) DECLSPEC_HIDDEN; HRESULT set_task_timer(HTMLInnerWindow*,LONG,BOOL,IDispatch*,LONG*) DECLSPEC_HIDDEN; HRESULT clear_task_timer(HTMLInnerWindow*,DWORD) DECLSPEC_HIDDEN; +BOOL parse_compat_version(const WCHAR*,compat_mode_t*) DECLSPEC_HIDDEN; + const char *debugstr_mshtml_guid(const GUID*) DECLSPEC_HIDDEN; DEFINE_GUID(CLSID_AboutProtocol, 0x3050F406, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B); @@ -1337,6 +1339,7 @@ static inline VARIANT_BOOL variant_bool(BOOL b) extern void *call_thiscall_func; #endif +compat_mode_t get_max_compat_mode(IUri*) DECLSPEC_HIDDEN; UINT cp_from_charset_string(BSTR) DECLSPEC_HIDDEN; BSTR charset_string_from_cp(UINT) DECLSPEC_HIDDEN; HINSTANCE get_shdoclc(void) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index dd46dd8..1a1cfe3 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -377,6 +377,8 @@ compat_mode_t lock_document_mode(HTMLDocumentNode *doc) static void set_document_mode(HTMLDocumentNode *doc, compat_mode_t document_mode, BOOL lock) { + compat_mode_t max_compat_mode; + if(doc->document_mode_locked) { WARN("attempting to set document mode %d on locked document %p\n", document_mode, doc); return; @@ -384,35 +386,31 @@ static void set_document_mode(HTMLDocumentNode *doc, compat_mode_t document_mode TRACE("%p: %d\n", doc, document_mode); + max_compat_mode = doc->window && doc->window->base.outer_window + ? get_max_compat_mode(doc->window->base.outer_window->uri) + : COMPAT_MODE_IE11; + if(max_compat_mode < document_mode) { + WARN("Tried to set compat mode %u higher than maximal configured %u\n", + document_mode, max_compat_mode); + document_mode = max_compat_mode; + } + doc->document_mode = document_mode; if(lock) lock_document_mode(doc); } -static BOOL parse_ua_compatible(const WCHAR *p, compat_mode_t *r) +BOOL parse_compat_version(const WCHAR *version_string, compat_mode_t *r) { - int v = 0; - - static const WCHAR ie_eqW[] = {'I','E','='}; - static const WCHAR edgeW[] = {'e','d','g','e',0}; + DWORD version = 0; + const WCHAR *p; - TRACE("%s\n", debugstr_w(p)); - - if(strncmpiW(ie_eqW, p, ARRAY_SIZE(ie_eqW))) + for(p = version_string; '0' <= *p && *p <= '9'; p++) + version = version * 10 + *p-'0'; + if(*p || p == version_string) return FALSE; - p += 3; - if(!strcmpiW(p, edgeW)) { - *r = COMPAT_MODE_IE11; - return TRUE; - } - - while('0' <= *p && *p <= '9') - v = v*10 + *(p++)-'0'; - if(*p || !v) - return FALSE; - - switch(v){ + switch(version){ case 5: case 6: *r = COMPAT_MODE_IE5; @@ -430,12 +428,30 @@ static BOOL parse_ua_compatible(const WCHAR *p, compat_mode_t *r) *r = COMPAT_MODE_IE10; break; default: - *r = v < 5 ? COMPAT_MODE_QUIRKS : COMPAT_MODE_IE11; + *r = version < 5 ? COMPAT_MODE_QUIRKS : COMPAT_MODE_IE11; } - return TRUE; } +static BOOL parse_ua_compatible(const WCHAR *p, compat_mode_t *r) +{ + static const WCHAR ie_eqW[] = {'I','E','='}; + static const WCHAR edgeW[] = {'e','d','g','e',0}; + + TRACE("%s\n", debugstr_w(p)); + + if(strncmpiW(ie_eqW, p, ARRAY_SIZE(ie_eqW))) + return FALSE; + p += 3; + + if(!strcmpiW(p, edgeW)) { + *r = COMPAT_MODE_IE11; + return TRUE; + } + + return parse_compat_version(p, r); +} + void process_document_response_headers(HTMLDocumentNode *doc, IBinding *binding) { IWinInetHttpInfo *http_info;

1 0

Alexandre Julliard : opengl32: Update to the current OpenGL spec.
by Alexandre Julliard 09 Oct '18

09 Oct '18

Module: wine Branch: master Commit: d900547f58405935c230b2530b06fff6938318f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d900547f58405935c230b253… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 9 12:59:07 2018 +0200 opengl32: Update to the current OpenGL spec. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opengl32/make_opengl | 4 +- dlls/opengl32/opengl_ext.c | 196 +++++++++++++++++++++++++++++++++++++++++++- dlls/opengl32/opengl_norm.c | 56 ++++++++++++- include/wine/wgl.h | 95 ++++++++++++++++++++- include/wine/wgl_driver.h | 28 ++++++- 5 files changed, 364 insertions(+), 15 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d900547f58405935c230…

1 0

Sebastian Lackner : opengl32: Add wrappers for glDebugMessageCallback to handle calling convention differences.
by Alexandre Julliard 09 Oct '18

09 Oct '18

Module: wine Branch: master Commit: e07230ed4e8302efce99ce1924389c229d90adfd URL: https://source.winehq.org/git/wine.git/?a=commit;h=e07230ed4e8302efce99ce19… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Oct 5 04:20:30 2018 +0000 opengl32: Add wrappers for glDebugMessageCallback to handle calling convention differences. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=38402 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opengl32/make_opengl | 3 +++ dlls/opengl32/opengl_ext.c | 24 +++---------------- dlls/opengl32/tests/opengl.c | 44 ++++++++++++++++++++++++++++++++++ dlls/opengl32/wgl.c | 57 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 107 insertions(+), 21 deletions(-) diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index f2c93ef..f91796e 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -416,6 +416,9 @@ sub needs_wrapper($$) my %funcs = ( "glDebugEntry" => 1, + "glDebugMessageCallback" => 1, + "glDebugMessageCallbackAMD" => 1, + "glDebugMessageCallbackARB" => 1, "glGetIntegerv" => 1, "glGetString" => 1, "glGetStringi" => 1, diff --git a/dlls/opengl32/opengl_ext.c b/dlls/opengl32/opengl_ext.c index 0f4c130..c27af43 100644 --- a/dlls/opengl32/opengl_ext.c +++ b/dlls/opengl32/opengl_ext.c @@ -2327,27 +2327,6 @@ static void WINAPI glCurrentPaletteMatrixARB( GLint index ) funcs->ext.p_glCurrentPaletteMatrixARB( index ); } -static void WINAPI glDebugMessageCallback( GLDEBUGPROC callback, const void *userParam ) -{ - const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; - TRACE( "(%p, %p)\n", callback, userParam ); - funcs->ext.p_glDebugMessageCallback( callback, userParam ); -} - -static void WINAPI glDebugMessageCallbackAMD( GLDEBUGPROCAMD callback, void *userParam ) -{ - const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; - TRACE( "(%p, %p)\n", callback, userParam ); - funcs->ext.p_glDebugMessageCallbackAMD( callback, userParam ); -} - -static void WINAPI glDebugMessageCallbackARB( GLDEBUGPROCARB callback, const void *userParam ) -{ - const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; - TRACE( "(%p, %p)\n", callback, userParam ); - funcs->ext.p_glDebugMessageCallbackARB( callback, userParam ); -} - static void WINAPI glDebugMessageControl( GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; @@ -18686,6 +18665,9 @@ static BOOL WINAPI wglSwapIntervalEXT( int interval ) return funcs->ext.p_wglSwapIntervalEXT( interval ); } +extern void WINAPI glDebugMessageCallback( GLDEBUGPROC callback, const void *userParam ) DECLSPEC_HIDDEN; +extern void WINAPI glDebugMessageCallbackAMD( GLDEBUGPROCAMD callback, void *userParam ) DECLSPEC_HIDDEN; +extern void WINAPI glDebugMessageCallbackARB( GLDEBUGPROCARB callback, const void *userParam ) DECLSPEC_HIDDEN; extern const GLubyte * WINAPI glGetStringi( GLenum name, GLuint index ) DECLSPEC_HIDDEN; extern BOOL WINAPI wglBindTexImageARB( HPBUFFERARB hPbuffer, int iBuffer ) DECLSPEC_HIDDEN; extern HGLRC WINAPI wglCreateContextAttribsARB( HDC hDC, HGLRC hShareContext, const int *attribList ) DECLSPEC_HIDDEN; diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index 8105201..65a5914 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -48,6 +48,11 @@ static HDC (WINAPI *pwglGetPbufferDCARB)(HPBUFFERARB); static BOOL (WINAPI *pwglSwapIntervalEXT)(int interval); static int (WINAPI *pwglGetSwapIntervalEXT)(void); +/* GL_ARB_debug_output */ +static void (WINAPI *pglDebugMessageCallbackARB)(void *, void *); +static void (WINAPI *pglDebugMessageControlARB)(GLenum, GLenum, GLenum, GLsizei, const GLuint *, GLboolean); +static void (WINAPI *pglDebugMessageInsertARB)(GLenum, GLenum, GLuint, GLenum, GLsizei, const char *); + static const char* wgl_extensions = NULL; static void init_functions(void) @@ -80,6 +85,11 @@ static void init_functions(void) GET_PROC(wglSwapIntervalEXT) GET_PROC(wglGetSwapIntervalEXT) + /* GL_ARB_debug_output */ + GET_PROC(glDebugMessageCallbackARB) + GET_PROC(glDebugMessageControlARB) + GET_PROC(glDebugMessageInsertARB) + #undef GET_PROC } @@ -305,6 +315,39 @@ static void test_choosepixelformat(void) pfd.cAuxBuffers = 0; } +static void WINAPI gl_debug_message_callback(GLenum source, GLenum type, GLuint id, GLenum severity, + GLsizei length, const GLchar *message, const void *userParam) +{ + DWORD *count = (DWORD *)userParam; + (*count)++; +} + +static void test_debug_message_callback(void) +{ + static const char testmsg[] = "Hello World"; + DWORD count; + + if (!pglDebugMessageCallbackARB) + { + skip("glDebugMessageCallbackARB not supported\n"); + return; + } + + glEnable(GL_DEBUG_OUTPUT); + glEnable(GL_DEBUG_OUTPUT_SYNCHRONOUS); + + pglDebugMessageCallbackARB(gl_debug_message_callback, &count); + pglDebugMessageControlARB(GL_DONT_CARE, GL_DONT_CARE, GL_DONT_CARE, 0, NULL, GL_TRUE); + + count = 0; + pglDebugMessageInsertARB(GL_DEBUG_SOURCE_APPLICATION, GL_DEBUG_TYPE_OTHER, 0x42424242, + GL_DEBUG_SEVERITY_LOW, sizeof(testmsg), testmsg); + ok(count == 1, "expected count == 1, got %u\n", count); + + glDisable(GL_DEBUG_OUTPUT_SYNCHRONOUS); + glDisable(GL_DEBUG_OUTPUT); +} + static void test_setpixelformat(HDC winhdc) { int res = 0; @@ -1786,6 +1829,7 @@ START_TEST(opengl) } test_choosepixelformat(); + test_debug_message_callback(); test_setpixelformat(hdc); test_destroy(hdc); test_sharelists(hdc); diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 04ace8e..9241005 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -58,6 +58,9 @@ struct opengl_context DWORD tid; /* thread that the context is current in */ HDC draw_dc; /* current drawing DC */ HDC read_dc; /* current reading DC */ + void (CALLBACK *debug_callback)(GLenum, GLenum, GLuint, GLenum, + GLsizei, const GLchar *, const void *); /* debug callback */ + const void *debug_user; /* debug user parameter */ GLubyte *extensions; /* extension string */ GLuint *disabled_exts; /* indices of disabled extensions */ struct wgl_context *drv_ctx; /* driver context */ @@ -1746,6 +1749,60 @@ const GLubyte * WINAPI glGetString( GLenum name ) return ret; } +/* wrapper for glDebugMessageCallback* functions */ +static void gl_debug_message_callback( GLenum source, GLenum type, GLuint id, GLenum severity, + GLsizei length, const GLchar *message,const void *userParam ) +{ + struct wgl_handle *ptr = (struct wgl_handle *)userParam; + if (!ptr->u.context->debug_callback) return; + ptr->u.context->debug_callback( source, type, id, severity, length, message, ptr->u.context->debug_user ); +} + +/*********************************************************************** + * glDebugMessageCallback + */ +void WINAPI glDebugMessageCallback( GLDEBUGPROC callback, const void *userParam ) +{ + struct wgl_handle *ptr = get_current_context_ptr(); + const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; + + TRACE( "(%p, %p)\n", callback, userParam ); + + ptr->u.context->debug_callback = callback; + ptr->u.context->debug_user = userParam; + funcs->ext.p_glDebugMessageCallback( gl_debug_message_callback, ptr ); +} + +/*********************************************************************** + * glDebugMessageCallbackAMD + */ +void WINAPI glDebugMessageCallbackAMD( GLDEBUGPROCAMD callback, void *userParam ) +{ + struct wgl_handle *ptr = get_current_context_ptr(); + const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; + + TRACE( "(%p, %p)\n", callback, userParam ); + + ptr->u.context->debug_callback = callback; + ptr->u.context->debug_user = userParam; + funcs->ext.p_glDebugMessageCallbackAMD( gl_debug_message_callback, ptr ); +} + +/*********************************************************************** + * glDebugMessageCallbackARB + */ +void WINAPI glDebugMessageCallbackARB( GLDEBUGPROCARB callback, const void *userParam ) +{ + struct wgl_handle *ptr = get_current_context_ptr(); + const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; + + TRACE( "(%p, %p)\n", callback, userParam ); + + ptr->u.context->debug_callback = callback; + ptr->u.context->debug_user = userParam; + funcs->ext.p_glDebugMessageCallbackARB( gl_debug_message_callback, ptr ); +} + /*********************************************************************** * OpenGL initialisation routine */

1 0

Alexandre Julliard : ntdll: Add a wrapper to call the unhandled exception filter.
by Alexandre Julliard 09 Oct '18

09 Oct '18

Module: wine Branch: master Commit: da60ea1c337d47b76b50fb7e0cb9ddef788ae5e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da60ea1c337d47b76b50fb7e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 9 14:42:30 2018 +0200 ntdll: Add a wrapper to call the unhandled exception filter. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/exception.c | 10 ++++++++++ dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/signal_arm.c | 2 +- dlls/ntdll/signal_arm64.c | 2 +- dlls/ntdll/signal_i386.c | 2 +- dlls/ntdll/signal_powerpc.c | 4 ++-- dlls/ntdll/signal_x86_64.c | 2 +- 7 files changed, 17 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index f853810..c1ab96a 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -306,6 +306,16 @@ ULONG WINAPI RtlRemoveVectoredExceptionHandler( PVOID handler ) } +/******************************************************************* + * call_unhandled_exception_filter + */ +LONG WINAPI call_unhandled_exception_filter( PEXCEPTION_POINTERS eptr ) +{ + if (!unhandled_exception_filter) return EXCEPTION_CONTINUE_SEARCH; + return unhandled_exception_filter( eptr ); +} + + /************************************************************* * __wine_spec_unimplemented_stub * diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 85ba707..96d9467 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -57,6 +57,7 @@ extern NTSTATUS context_to_server( context_t *to, const CONTEXT *from ) DECLSPEC extern NTSTATUS context_from_server( CONTEXT *to, const context_t *from ) DECLSPEC_HIDDEN; extern NTSTATUS set_thread_context( HANDLE handle, const context_t *context, BOOL *self ) DECLSPEC_HIDDEN; extern NTSTATUS get_thread_context( HANDLE handle, context_t *context, unsigned int flags, BOOL *self ) DECLSPEC_HIDDEN; +extern LONG WINAPI call_unhandled_exception_filter( PEXCEPTION_POINTERS eptr ) DECLSPEC_HIDDEN; /* debug helpers */ extern LPCSTR debugstr_us( const UNICODE_STRING *str ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 1986389..da0c8fb 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -1227,7 +1227,7 @@ static void call_thread_entry_point( LPTHREAD_START_ROUTINE entry, void *arg ) TRACE_(relay)( "\1Starting thread proc %p (arg=%p)\n", entry, arg ); RtlExitUserThread( entry( arg )); } - __EXCEPT(unhandled_exception_filter) + __EXCEPT(call_unhandled_exception_filter) { NtTerminateThread( GetCurrentThread(), GetExceptionCode() ); } diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 5a44914..91a7e3b 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -998,7 +998,7 @@ static void WINAPI call_thread_entry_point( LPTHREAD_START_ROUTINE entry, void * TRACE_(relay)( "\1Starting thread proc %p (arg=%p)\n", entry, arg ); RtlExitUserThread( entry( arg )); } - __EXCEPT(unhandled_exception_filter) + __EXCEPT(call_unhandled_exception_filter) { NtTerminateThread( GetCurrentThread(), GetExceptionCode() ); } diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 384615f..0719c64 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -2653,7 +2653,7 @@ void DECLSPEC_HIDDEN call_thread_func( LPTHREAD_START_ROUTINE entry, void *arg ) TRACE_(relay)( "\1Starting thread proc %p (arg=%p)\n", entry, arg ); RtlExitUserThread( call_thread_func_wrapper( entry, arg )); } - __EXCEPT(unhandled_exception_filter) + __EXCEPT(call_unhandled_exception_filter) { NtTerminateThread( GetCurrentThread(), GetExceptionCode() ); } diff --git a/dlls/ntdll/signal_powerpc.c b/dlls/ntdll/signal_powerpc.c index f5231e7..1c96d62 100644 --- a/dlls/ntdll/signal_powerpc.c +++ b/dlls/ntdll/signal_powerpc.c @@ -648,7 +648,7 @@ static NTSTATUS call_stack_handlers( EXCEPTION_RECORD *rec, CONTEXT *context ) /* hack: call unhandled exception filter directly */ ptrs.ExceptionRecord = rec; ptrs.ContextRecord = context; - unhandled_exception_filter( &ptrs ); + call_unhandled_exception_filter( &ptrs ); return STATUS_UNHANDLED_EXCEPTION; } @@ -1160,7 +1160,7 @@ static void WINAPI call_thread_entry_point( LPTHREAD_START_ROUTINE entry, void * TRACE_(relay)( "\1Starting thread proc %p (arg=%p)\n", entry, arg ); RtlExitUserThread( entry( arg )); } - __EXCEPT(unhandled_exception_filter) + __EXCEPT(call_unhandled_exception_filter) { NtTerminateThread( GetCurrentThread(), GetExceptionCode() ); } diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 4fb80bb..7228adb 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -4370,7 +4370,7 @@ static void WINAPI call_thread_func( LPTHREAD_START_ROUTINE entry, void *arg ) TRACE_(relay)( "\1Starting thread proc %p (arg=%p)\n", entry, arg ); RtlExitUserThread( entry( arg )); } - __EXCEPT(unhandled_exception_filter) + __EXCEPT(call_unhandled_exception_filter) { NtTerminateThread( GetCurrentThread(), GetExceptionCode() ); }

1 0

Alexandre Julliard : ntdll: Implement RtlSetUnhandledExceptionFilter().
by Alexandre Julliard 09 Oct '18

09 Oct '18

Module: wine Branch: master Commit: 03e05c1f578a4d4214593c68430082f0c7d6be2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=03e05c1f578a4d4214593c68… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 9 14:49:54 2018 +0200 ntdll: Implement RtlSetUnhandledExceptionFilter(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 1 + dlls/ntdll/exception.c | 11 +++++++++++ dlls/ntdll/loader.c | 3 --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/ntdll_misc.h | 2 -- dlls/ntdll/thread.c | 1 - include/winternl.h | 3 +++ 7 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 5951501..fc065f1 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -1364,6 +1364,7 @@ void CDECL __wine_kernel_init(void) setbuf(stderr,NULL); kernel32_handle = GetModuleHandleW(kernel32W); IsWow64Process( GetCurrentProcess(), &is_wow64 ); + RtlSetUnhandledExceptionFilter( UnhandledExceptionFilter ); LOCALE_Init(); diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index c1ab96a..59177b7 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -59,6 +59,8 @@ static RTL_CRITICAL_SECTION_DEBUG critsect_debug = }; static RTL_CRITICAL_SECTION vectored_handlers_section = { &critsect_debug, -1, 0, 0, 0, 0 }; +static PRTL_EXCEPTION_FILTER unhandled_exception_filter; + static VECTORED_HANDLER *add_vectored_handler( struct list *handler_list, ULONG first, PVECTORED_EXCEPTION_HANDLER func ) @@ -307,6 +309,15 @@ ULONG WINAPI RtlRemoveVectoredExceptionHandler( PVOID handler ) /******************************************************************* + * RtlSetUnhandledExceptionFilter (NTDLL.@) + */ +void WINAPI RtlSetUnhandledExceptionFilter( PRTL_EXCEPTION_FILTER filter ) +{ + unhandled_exception_filter = filter; +} + + +/******************************************************************* * call_unhandled_exception_filter */ LONG WINAPI call_unhandled_exception_filter( PEXCEPTION_POINTERS eptr ) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index a66a708..31168c0 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3520,9 +3520,6 @@ void __wine_process_init(void) MESSAGE( "wine: could not load kernel32.dll, status %x\n", status ); exit(1); } - RtlInitAnsiString( &func_name, "UnhandledExceptionFilter" ); - LdrGetProcedureAddress( wm->ldr.BaseAddress, &func_name, 0, (void **)&unhandled_exception_filter ); - RtlInitAnsiString( &func_name, "__wine_kernel_init" ); if ((status = LdrGetProcedureAddress( wm->ldr.BaseAddress, &func_name, 0, (void **)&init_func )) != STATUS_SUCCESS) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index d1797b3..247f05f 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -904,6 +904,7 @@ # @ stub RtlSetThreadPoolStartFunc @ stdcall RtlSetTimeZoneInformation(ptr) # @ stub RtlSetTimer +@ stdcall RtlSetUnhandledExceptionFilter(ptr) @ stub RtlSetUnicodeCallouts @ stub RtlSetUserFlagsHeap @ stub RtlSetUserValueHeap diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 96d9467..f4de3cf 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -116,8 +116,6 @@ extern void RELAY_SetupDLL( HMODULE hmod ) DECLSPEC_HIDDEN; extern void SNOOP_SetupDLL( HMODULE hmod ) DECLSPEC_HIDDEN; extern const WCHAR system_dir[] DECLSPEC_HIDDEN; -typedef LONG (WINAPI *PUNHANDLED_EXCEPTION_FILTER)(PEXCEPTION_POINTERS); -extern PUNHANDLED_EXCEPTION_FILTER unhandled_exception_filter DECLSPEC_HIDDEN; extern void (WINAPI *kernel32_start_process)(LPTHREAD_START_ROUTINE,void*) DECLSPEC_HIDDEN; /* redefine these to make sure we don't reference kernel symbols */ diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 3019a74..9b23fbf 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -55,7 +55,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(thread); struct _KUSER_SHARED_DATA *user_shared_data = NULL; static const WCHAR default_windirW[] = {'C',':','\\','w','i','n','d','o','w','s',0}; -PUNHANDLED_EXCEPTION_FILTER unhandled_exception_filter = NULL; void (WINAPI *kernel32_start_process)(LPTHREAD_START_ROUTINE,void*) = NULL; /* info passed to a starting thread */ diff --git a/include/winternl.h b/include/winternl.h index 77c95ec..1cec3cf 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2279,6 +2279,8 @@ typedef struct _SYSTEM_MODULE_INFORMATION #define THREAD_CREATE_FLAGS_ACCESS_CHECK_IN_TARGET 0x00000020 #define THREAD_CREATE_FLAGS_INITIAL_THREAD 0x00000080 +typedef LONG (CALLBACK *PRTL_EXCEPTION_FILTER)(PEXCEPTION_POINTERS); + /*********************************************************************** * Function declarations */ @@ -2813,6 +2815,7 @@ NTSYSAPI void WINAPI RtlSetLastWin32ErrorAndNtStatusFromNtStatus(NTSTATUS); NTSYSAPI NTSTATUS WINAPI RtlSetSaclSecurityDescriptor(PSECURITY_DESCRIPTOR,BOOLEAN,PACL,BOOLEAN); NTSYSAPI NTSTATUS WINAPI RtlSetThreadErrorMode(DWORD,LPDWORD); NTSYSAPI NTSTATUS WINAPI RtlSetTimeZoneInformation(const RTL_TIME_ZONE_INFORMATION*); +NTSYSAPI void WINAPI RtlSetUnhandledExceptionFilter(PRTL_EXCEPTION_FILTER); NTSYSAPI SIZE_T WINAPI RtlSizeHeap(HANDLE,ULONG,const void*); NTSYSAPI NTSTATUS WINAPI RtlSleepConditionVariableCS(RTL_CONDITION_VARIABLE*,RTL_CRITICAL_SECTION*,const LARGE_INTEGER*); NTSYSAPI NTSTATUS WINAPI RtlSleepConditionVariableSRW(RTL_CONDITION_VARIABLE*,RTL_SRWLOCK*,const LARGE_INTEGER*,ULONG);

1 0