November 2015 - Wine-commits

Dmitry Timoshkov : widl: Avoid adding duplicate type definitions if tag and typedef names are the same.
by Alexandre Julliard 05 Nov '15

05 Nov '15

Module: wine Branch: master Commit: f7581c763d5789a165527c12d1bc2bf1368c4f7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7581c763d5789a165527c12d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Nov 3 13:28:53 2015 +0800 widl: Avoid adding duplicate type definitions if tag and typedef names are the same. Fix handing of the following .idl snippet: typedef [uuid(b14b6bb5-904e-4ff9-b247-bd361f7a0001)] struct g { int g1; } g; [uuid(b14b6bb5-904e-4ff9-b247-bd361f7a0002)] interface test_iface : IUnknown { HRESULT test([in] g *ptr); } Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/write_msft.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index daa0366..3cbae92 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -2181,7 +2181,7 @@ static void add_union_typeinfo(msft_typelib_t *typelib, type_t *tunion) static void add_typedef_typeinfo(msft_typelib_t *typelib, type_t *tdef) { msft_typeinfo_t *msft_typeinfo = NULL; - int alignment, datatype1, datatype2, size; + int alignment, datatype1, datatype2, size, duplicate = 0; type_t *type; if (-1 < tdef->typelib_idx) @@ -2194,6 +2194,8 @@ static void add_typedef_typeinfo(msft_typelib_t *typelib, type_t *tdef) tdef->typelib_idx = typelib->typelib_header.nrtypeinfos; msft_typeinfo = create_msft_typeinfo(typelib, TKIND_ALIAS, tdef->name, tdef->attrs); } + else + duplicate = 1; encode_type(typelib, get_type_vt(type), type, &datatype1, &size, &alignment, &datatype2); @@ -2205,6 +2207,10 @@ static void add_typedef_typeinfo(msft_typelib_t *typelib, type_t *tdef) msft_typeinfo->typeinfo->datatype2 = datatype2; msft_typeinfo->typeinfo->typekind |= (alignment << 11 | alignment << 6); } + + /* avoid adding duplicate type definitions */ + if (duplicate) + tdef->typelib_idx = type->typelib_idx; } static void add_coclass_typeinfo(msft_typelib_t *typelib, type_t *cls)

1 0

Dmitry Timoshkov : widl: Attribute uuid() takes precedence over 'hidden'.
by Alexandre Julliard 05 Nov '15

05 Nov '15

Module: wine Branch: master Commit: 3cd67463bf0bd41b8fe5e8d811683129fcaea6f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cd67463bf0bd41b8fe5e8d81… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Nov 3 13:30:42 2015 +0800 widl: Attribute uuid() takes precedence over 'hidden'. This means that definition like [uuid(016fe2ec-b2c8-45f8-b23b-39e53a753900),hidden] typedef struct _m { int m1; } m; makes both '_m' and 'm' appear in the typelib, and the tests confirm that. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.y | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index b42b4a2..e7f2ead 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -123,7 +123,6 @@ static statement_t *make_statement_importlib(const char *str); static statement_t *make_statement_module(type_t *type); static statement_t *make_statement_typedef(var_list_t *names); static statement_t *make_statement_import(const char *str); -static statement_t *make_statement_typedef(var_list_t *names); static statement_list_t *append_statement(statement_list_t *list, statement_t *stmt); static statement_list_t *append_statements(statement_list_t *, statement_list_t *); static attr_list_t *append_attribs(attr_list_t *, attr_list_t *); @@ -1881,22 +1880,20 @@ static type_t *reg_typedefs(decl_spec_t *decl_spec, declarator_list_t *decls, at const declarator_t *decl; type_t *type = decl_spec->type; + if (is_attr(attrs, ATTR_UUID) && !is_attr(attrs, ATTR_PUBLIC)) + attrs = append_attr( attrs, make_attr(ATTR_PUBLIC) ); + /* We must generate names for tagless enum, struct or union. Typedef-ing a tagless enum, struct or union means we want the typedef to be included in a library hence the public attribute. */ - if ((type_get_type_detect_alias(type) == TYPE_ENUM || - type_get_type_detect_alias(type) == TYPE_STRUCT || - type_get_type_detect_alias(type) == TYPE_UNION || - type_get_type_detect_alias(type) == TYPE_ENCAPSULATED_UNION) && - !type->name) + if (type_get_type_detect_alias(type) == TYPE_ENUM || + type_get_type_detect_alias(type) == TYPE_STRUCT || + type_get_type_detect_alias(type) == TYPE_UNION || + type_get_type_detect_alias(type) == TYPE_ENCAPSULATED_UNION) { - if (! is_attr(attrs, ATTR_PUBLIC) && ! is_attr (attrs, ATTR_HIDDEN)) - attrs = append_attr( attrs, make_attr(ATTR_PUBLIC) ); - type->name = gen_name(); + if (!type->name) + type->name = gen_name(); } - else if (is_attr(attrs, ATTR_UUID) && !is_attr(attrs, ATTR_PUBLIC) - && !is_attr(attrs, ATTR_HIDDEN)) - attrs = append_attr( attrs, make_attr(ATTR_PUBLIC) ); LIST_FOR_EACH_ENTRY( decl, decls, const declarator_t, entry ) {

1 0

Dmitry Timoshkov : widl: Avoid generating duplicate typelib entries for structure tag names.
by Alexandre Julliard 05 Nov '15

05 Nov '15

Module: wine Branch: master Commit: ded915aa7c450429a74f136efa35a1b58d83a63f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ded915aa7c450429a74f136ef… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Nov 3 13:32:01 2015 +0800 widl: Avoid generating duplicate typelib entries for structure tag names. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/typetree.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index 5925d40..e316614 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -300,7 +300,12 @@ type_t *type_new_enum(const char *name, struct namespace *namespace, int defined type_t *type_new_struct(char *name, struct namespace *namespace, int defined, var_list_t *fields) { type_t *tag_type = name ? find_type(name, namespace, tsSTRUCT) : NULL; - type_t *t = make_type(TYPE_STRUCT); + type_t *t; + + /* avoid creating duplicate typelib type entries */ + if (tag_type && do_typelib) return tag_type; + + t = make_type(TYPE_STRUCT); t->name = name; t->namespace = namespace;

1 0

Dmitry Timoshkov : widl: Attributes of the alias are supposed to replace attributes of a tag in the typelib.
by Alexandre Julliard 05 Nov '15

05 Nov '15

Module: wine Branch: master Commit: 58b0788a2d0b7303adbafca5e3038455e49f1b8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=58b0788a2d0b7303adbafca5e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Nov 3 13:32:13 2015 +0800 widl: Attributes of the alias are supposed to replace attributes of a tag in the typelib. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/typelib.c | 2 +- tools/widl/parser.y | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 1d13b89..e8b2cb4 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -4297,7 +4297,7 @@ static const type_info info[] = { }, { "cc", - "{00000000-0000-0000-0000-000000000000}", + "{016fe2ec-b2c8-45f8-b23b-39e53a75396c}", /*kind*/ TKIND_ENUM, /*flags*/ 0, /*align*/ 4, /*size*/ 4, /*#vtbl*/ 0, /*#func*/ 0 }, diff --git a/tools/widl/parser.y b/tools/widl/parser.y index e7f2ead..7de7567 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1893,6 +1893,10 @@ static type_t *reg_typedefs(decl_spec_t *decl_spec, declarator_list_t *decls, at { if (!type->name) type->name = gen_name(); + + /* replace existing attributes when generating a typelib */ + if (do_typelib) + type->attrs = attrs; } LIST_FOR_EACH_ENTRY( decl, decls, const declarator_t, entry )

1 0

Dmitry Timoshkov : widl: Ignore assignment of a duplicate uuid.
by Alexandre Julliard 05 Nov '15

05 Nov '15

Module: wine Branch: master Commit: 42c328ddf4b12e556ef95853cda6d5fa0328f39d URL: http://source.winehq.org/git/wine.git/?a=commit;h=42c328ddf4b12e556ef95853c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Nov 3 13:32:22 2015 +0800 widl: Ignore assignment of a duplicate uuid. MSDN KB285146 article describes this behaviour, and the tests confirm that. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/write_msft.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 3cbae92..7396944 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -494,10 +494,22 @@ static int ctl2_alloc_guid( MSFT_GuidEntry *guid_space; int hash_key; + chat("adding uuid {%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}\n", + guid->guid.Data1, guid->guid.Data2, guid->guid.Data3, + guid->guid.Data4[0], guid->guid.Data4[1], guid->guid.Data4[2], guid->guid.Data4[3], + guid->guid.Data4[4], guid->guid.Data4[5], guid->guid.Data4[6], guid->guid.Data4[7]); + hash_key = ctl2_hash_guid(&guid->guid); offset = ctl2_find_guid(typelib, hash_key, &guid->guid); - if (offset != -1) return offset; + if (offset != -1) + { + warning("duplicate uuid {%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}\n", + guid->guid.Data1, guid->guid.Data2, guid->guid.Data3, + guid->guid.Data4[0], guid->guid.Data4[1], guid->guid.Data4[2], guid->guid.Data4[3], + guid->guid.Data4[4], guid->guid.Data4[5], guid->guid.Data4[6], guid->guid.Data4[7]); + return -1; + } offset = ctl2_alloc_segment(typelib, MSFT_SEG_GUID, sizeof(MSFT_GuidEntry), 0);

1 0

Dmitry Timoshkov : oleaut32/tests: Add a bunch of new tests for typelib generation.
by Alexandre Julliard 05 Nov '15

05 Nov '15

Module: wine Branch: master Commit: fa567adfb7edd7040dd8bbf33267f1ec3fa2d6b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa567adfb7edd7040dd8bbf33… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Nov 3 13:32:38 2015 +0800 oleaut32/tests: Add a bunch of new tests for typelib generation. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/test_tlb.idl | 59 +++++++++ dlls/oleaut32/tests/typelib.c | 259 ++++++++++++++++++++++++++++++++++++--- 2 files changed, 298 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fa567adfb7edd7040dd8b…

1 0

Alexandre Julliard : x3daudio1_7: Remove unused debug channel.
by Alexandre Julliard 05 Nov '15

05 Nov '15

Module: wine Branch: master Commit: 97e7affe32b9c25e43d86775ee70703031ab21cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=97e7affe32b9c25e43d86775e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 5 18:54:24 2015 +0900 x3daudio1_7: Remove unused debug channel. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/x3daudio1_7/main.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/x3daudio1_7/main.c b/dlls/x3daudio1_7/main.c index 7f64112..5d1a5a5 100644 --- a/dlls/x3daudio1_7/main.c +++ b/dlls/x3daudio1_7/main.c @@ -15,6 +15,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + #include "config.h" #include <stdarg.h> @@ -22,10 +23,6 @@ #include "winbase.h" #include "x3daudio.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(x3daudio); - BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) { switch (reason)

1 0

Alex Henrie : winex11: Avoid double initialization of variables in OpenGL functions.
by Alexandre Julliard 05 Nov '15

05 Nov '15

Module: wine Branch: master Commit: 6479e32cf0ee235d7dcbd4c353785367c39ca12f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6479e32cf0ee235d7dcbd4c35… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Nov 3 22:15:15 2015 -0700 winex11: Avoid double initialization of variables in OpenGL functions. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/opengl.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 7b8ba82..99befde 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -997,7 +997,7 @@ static int ConvertAttribWGLtoGLX(const int* iWGLAttr, int* oGLXAttr, struct wgl_ static int get_render_type_from_fbconfig(Display *display, GLXFBConfig fbconfig) { - int render_type=0, render_type_bit; + int render_type, render_type_bit; pglXGetFBConfigAttrib(display, fbconfig, GLX_RENDER_TYPE, &render_type_bit); switch(render_type_bit) { @@ -1015,6 +1015,7 @@ static int get_render_type_from_fbconfig(Display *display, GLXFBConfig fbconfig) break; default: ERR("Unknown render_type: %x\n", render_type_bit); + render_type = 0; } return render_type; } @@ -1787,7 +1788,7 @@ static BOOL glxdrv_wglCopyContext(struct wgl_context *src, struct wgl_context *d */ static struct wgl_context *glxdrv_wglCreateContext( HDC hdc ) { - struct wgl_context *ret = NULL; + struct wgl_context *ret; struct gl_drawable *gl; if (!(gl = get_gl_drawable( WindowFromDC( hdc ), hdc ))) @@ -2037,7 +2038,7 @@ static const GLubyte *wglGetString(GLenum name) static struct wgl_context *X11DRV_wglCreateContextAttribsARB( HDC hdc, struct wgl_context *hShareContext, const int* attribList ) { - struct wgl_context *ret = NULL; + struct wgl_context *ret; struct gl_drawable *gl; int err = 0; @@ -2134,8 +2135,8 @@ static const char *X11DRV_wglGetExtensionsStringARB(HDC hdc) static struct wgl_pbuffer *X11DRV_wglCreatePbufferARB( HDC hdc, int iPixelFormat, int iWidth, int iHeight, const int *piAttribList ) { - struct wgl_pbuffer* object = NULL; - const struct wgl_pixel_format *fmt = NULL; + struct wgl_pbuffer* object; + const struct wgl_pixel_format *fmt; int attribs[256]; int nAttribs = 0; @@ -2507,7 +2508,7 @@ static BOOL X11DRV_wglChoosePixelFormatARB( HDC hdc, const int *piAttribIList, c { int attribs[256]; int nAttribs = 0; - GLXFBConfig* cfgs = NULL; + GLXFBConfig* cfgs; int nCfgs = 0; int it; int fmt_id; @@ -2613,7 +2614,7 @@ static BOOL X11DRV_wglGetPixelFormatAttribivARB( HDC hdc, int iPixelFormat, int UINT nAttributes, const int *piAttributes, int *piValues ) { UINT i; - const struct wgl_pixel_format *fmt = NULL; + const struct wgl_pixel_format *fmt; int hTest; int tmp; int curGLXAttr = 0; @@ -3029,7 +3030,7 @@ static BOOL X11DRV_wglSwapIntervalEXT(int interval) { struct wgl_context *ctx = NtCurrentTeb()->glContext; struct gl_drawable *gl; - BOOL ret = TRUE; + BOOL ret; TRACE("(%d)\n", interval);

1 0

Alex Henrie : opengl32: Avoid double initialization of variables in WGL functions.
by Alexandre Julliard 05 Nov '15

05 Nov '15

Module: wine Branch: master Commit: 268070d9a8fc3210ac3ffe2e6a9943dbd89c042b URL: http://source.winehq.org/git/wine.git/?a=commit;h=268070d9a8fc3210ac3ffe2e6… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Nov 3 22:06:13 2015 -0700 opengl32: Avoid double initialization of variables in WGL functions. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opengl32/wgl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index acfb243..ee2ae25 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -1057,7 +1057,7 @@ BOOL WINAPI wglGetPixelFormatAttribfvARB( HDC hdc, int format, int layer, UINT c */ HPBUFFERARB WINAPI wglCreatePbufferARB( HDC hdc, int format, int width, int height, const int *attribs ) { - HPBUFFERARB ret = 0; + HPBUFFERARB ret; struct wgl_pbuffer *pbuffer; struct opengl_funcs *funcs = get_dc_funcs( hdc ); @@ -1749,7 +1749,7 @@ GLint WINAPI glDebugEntry( GLint unknown1, GLint unknown2 ) static GLubyte *filter_extensions_list(const char *extensions, const char *disabled) { - char *p, *str = NULL; + char *p, *str; const char *end; p = str = HeapAlloc(GetProcessHeap(), 0, strlen(extensions) + 2); @@ -1785,7 +1785,7 @@ static GLuint *filter_extensions_index(const char *disabled) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; const char *ext, *end, *gl_ext; - GLuint *disabled_exts = NULL, *new_disabled_exts; + GLuint *disabled_exts, *new_disabled_exts; unsigned int i = 0, j, disabled_size; GLint extensions_count;

1 0

Alex Henrie : opengl32: Define the 2D identity matrix once, at the top of the file.
by Alexandre Julliard 05 Nov '15

05 Nov '15

Module: wine Branch: master Commit: 56c045c68e37583414c175199e01644751e76e36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56c045c68e37583414c175199… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Nov 3 22:03:47 2015 -0700 opengl32: Define the 2D identity matrix once, at the top of the file. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opengl32/wgl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index ee2ae25..42bf920 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -92,6 +92,8 @@ static CRITICAL_SECTION_DEBUG critsect_debug = }; static CRITICAL_SECTION wgl_section = { &critsect_debug, -1, 0, 0, 0, 0 }; +static const MAT2 identity = { {0,1},{0,0},{0,0},{0,1} }; + static inline struct opengl_funcs *get_dc_funcs( HDC hdc ) { struct opengl_funcs *funcs = __wine_get_wgl_driver( hdc, WINE_WGL_DRIVER_VERSION ); @@ -1212,7 +1214,6 @@ static BOOL wglUseFontBitmaps_common( HDC hdc, DWORD first, DWORD count, DWORD l funcs->gl.p_glPixelStorei(GL_UNPACK_ALIGNMENT, 4); for (glyph = first; glyph < first + count; glyph++) { - static const MAT2 identity = { {0,1},{0,0},{0,0},{0,1} }; unsigned int needed_size, height, width, width_int; if (unicode) @@ -1479,7 +1480,6 @@ static BOOL wglUseFontOutlines_common(HDC hdc, { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; UINT glyph; - const MAT2 identity = {{0,1},{0,0},{0,0},{0,1}}; GLUtesselator *tess = NULL; LOGFONTW lf; HFONT old_font, unscaled_font;

1 0