wine-commits October 2018

wine-commits@winehq.org

1 participants
602 discussions

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

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

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

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

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 : widl: Properly handle nesting of pointers and arrays when parsing.
by Alexandre Julliard 09 Oct '18

09 Oct '18

Module: wine Branch: master Commit: f12cc887f8a584a5931d11b189a26ad62d598709 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f12cc887f8a584a5931d11b1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Oct 5 16:57:50 2018 -0500 widl: Properly handle nesting of pointers and arrays when parsing. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/header.h | 1 - tools/widl/parser.y | 120 +++++++++++++++++++++++++++---------------------- tools/widl/widltypes.h | 2 - 3 files changed, 66 insertions(+), 57 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f12cc887f8a584a5931d…

1 0

Zebediah Figura : widl: The default pointer attribute for an array is always ref.
by Alexandre Julliard 09 Oct '18

09 Oct '18

Module: wine Branch: master Commit: 8f463a575ddce64b51db7df59d344faf01d0ab01 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f463a575ddce64b51db7df5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Oct 5 16:57:49 2018 -0500 widl: The default pointer attribute for an array is always ref. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.y | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 1fe7129..36a5fae 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1552,10 +1552,12 @@ static var_t *declare_var(attr_list_t *attrs, decl_spec_t *decl_spec, const decl ptype = &v->type; if (arr) LIST_FOR_EACH_ENTRY_REV(dim, arr, expr_t, entry) { + /* An array is always a reference pointer unless explicitly marked otherwise + * (regardless of what the default pointer attribute is). */ *ptype = type_new_array(NULL, *ptype, FALSE, dim->is_const ? dim->cval : 0, dim->is_const ? NULL : dim, NULL, - pointer_default); + FC_RP); } ptype = &v->type;

1 0

Zebediah Figura : widl: Remove dead code.
by Alexandre Julliard 09 Oct '18

09 Oct '18

Module: wine Branch: master Commit: 8118a45a6aacea24d1c4de1b52e00b968e598dde URL: https://source.winehq.org/git/wine.git/?a=commit;h=8118a45a6aacea24d1c4de1b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Oct 5 16:57:48 2018 -0500 widl: Remove dead code. MIDL doesn't warn on this, and it's not a particularly salient mistake to make. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.y | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 3b99d93..1fe7129 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1552,18 +1552,6 @@ static var_t *declare_var(attr_list_t *attrs, decl_spec_t *decl_spec, const decl ptype = &v->type; if (arr) LIST_FOR_EACH_ENTRY_REV(dim, arr, expr_t, entry) { - if (dim->is_const) - { - /* FIXME: should use a type_memsize that allows us to pass in a pointer size */ - if (0) - { - unsigned int size = type_memsize(v->type); - - if (0xffffffffu / size < dim->cval) - error_loc("%s: total array size is too large\n", v->name); - } - } - *ptype = type_new_array(NULL, *ptype, FALSE, dim->is_const ? dim->cval : 0, dim->is_const ? NULL : dim, NULL,

1 0

Zebediah Figura : widl: Check for positive array dimension when parsing array.
by Alexandre Julliard 09 Oct '18

09 Oct '18

Module: wine Branch: master Commit: a2d0038045233a1830c61c4816304c33e2f92087 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a2d0038045233a1830c61c48… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Oct 5 16:57:47 2018 -0500 widl: Check for positive array dimension when parsing array. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.y | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 53a5ec0..3b99d93 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -468,8 +468,8 @@ arg: attributes decl_spec m_any_declarator { if ($2->stgclass != STG_NONE && $ ; array: '[' expr ']' { $$ = $2; - if (!$$->is_const) - error_loc("array dimension is not an integer constant\n"); + if (!$$->is_const || $$->cval <= 0) + error_loc("array dimension is not a positive integer constant\n"); } | '[' '*' ']' { $$ = make_expr(EXPR_VOID); } | '[' ']' { $$ = make_expr(EXPR_VOID); } @@ -1554,9 +1554,6 @@ static var_t *declare_var(attr_list_t *attrs, decl_spec_t *decl_spec, const decl { if (dim->is_const) { - if (dim->cval <= 0) - error_loc("%s: array dimension must be positive\n", v->name); - /* FIXME: should use a type_memsize that allows us to pass in a pointer size */ if (0) {

1 0

Zebediah Figura : widl: Allow all dimensions of an array to be sizeless.
by Alexandre Julliard 09 Oct '18

09 Oct '18

Module: wine Branch: master Commit: bd37ddfa967136cbaee7102ae147bdd411dd605f URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd37ddfa967136cbaee7102a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Oct 5 16:57:46 2018 -0500 widl: Allow all dimensions of an array to be sizeless. MIDL achieves this by setting the size of the inner arrays to a constant value. widl actually already handles this (but uses 0 instead of 1.) Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.y | 7 ------- 1 file changed, 7 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index bf715c8..53a5ec0 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1456,7 +1456,6 @@ static var_t *declare_var(attr_list_t *attrs, decl_spec_t *decl_spec, const decl var_t *v = decl->var; expr_list_t *sizes = get_attrp(attrs, ATTR_SIZEIS); expr_list_t *lengs = get_attrp(attrs, ATTR_LENGTHIS); - int sizeless; expr_t *dim; type_t **ptype; array_dims_t *arr = decl ? decl->array : NULL; @@ -1551,12 +1550,8 @@ static var_t *declare_var(attr_list_t *attrs, decl_spec_t *decl_spec, const decl v->name); ptype = &v->type; - sizeless = FALSE; if (arr) LIST_FOR_EACH_ENTRY_REV(dim, arr, expr_t, entry) { - if (sizeless) - error_loc("%s: only the first array dimension can be unspecified\n", v->name); - if (dim->is_const) { if (dim->cval <= 0) @@ -1571,8 +1566,6 @@ static var_t *declare_var(attr_list_t *attrs, decl_spec_t *decl_spec, const decl error_loc("%s: total array size is too large\n", v->name); } } - else - sizeless = TRUE; *ptype = type_new_array(NULL, *ptype, FALSE, dim->is_const ? dim->cval : 0,

1 0

← Newer
1
...
43
44
45
46
47
48
49
...
61
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2018