August 2013 - Wine-Commits - list.winehq.org

Kai Tietz : widl: Allow hexadecimal argument for version-attribute.
by Alexandre Julliard Aug. 19, 2013

Aug. 19, 2013

Module: wine Branch: master Commit: 0d4f6bf2583be65a1c2f2ef2641d268fb249b0d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d4f6bf2583be65a1c2f2ef26… Author: Kai Tietz <ktietz70(a)googlemail.com> Date: Thu Aug 8 16:05:37 2013 +0200 widl: Allow hexadecimal argument for version-attribute. --- tools/widl/parser.y | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 4319b35..c104917 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1111,6 +1111,7 @@ uniondef: tUNION t_ident '{' ne_union_fields '}' version: aNUM { $$ = MAKEVERSION($1, 0); } | aNUM '.' aNUM { $$ = MAKEVERSION($1, $3); } + | aHEXNUM { $$ = $1; } ; %%

1 0

Kai Tietz : widl: Handle default value for public vs hidden attribute.
by Alexandre Julliard Aug. 19, 2013

Aug. 19, 2013

Module: wine Branch: master Commit: 60beb40cb7035969c27cf504b356ce78f64200d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60beb40cb7035969c27cf504b… Author: Kai Tietz <ktietz70(a)googlemail.com> Date: Thu Aug 8 16:04:13 2013 +0200 widl: Handle default value for public vs hidden attribute. --- tools/widl/parser.y | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 86f58a4..4319b35 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1840,11 +1840,12 @@ static type_t *reg_typedefs(decl_spec_t *decl_spec, declarator_list_t *decls, at type_get_type_detect_alias(type) == TYPE_ENCAPSULATED_UNION) && !type->name && !parse_only) { - if (! is_attr(attrs, ATTR_PUBLIC)) + if (! is_attr(attrs, ATTR_PUBLIC) && ! is_attr (attrs, ATTR_HIDDEN)) attrs = append_attr( attrs, make_attr(ATTR_PUBLIC) ); type->name = gen_name(); } - else if (is_attr(attrs, ATTR_UUID) && !is_attr(attrs, ATTR_PUBLIC)) + 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

Kai Tietz : widl: Allow attributes before and after typedef-keyword.
by Alexandre Julliard Aug. 19, 2013

Aug. 19, 2013

Module: wine Branch: master Commit: d8318121a278b9c2ad1cef280a56aa36d6521d26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8318121a278b9c2ad1cef280… Author: Kai Tietz <ktietz70(a)googlemail.com> Date: Thu Aug 8 15:59:27 2013 +0200 widl: Allow attributes before and after typedef-keyword. --- tools/widl/parser.y | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 0b5ebe6..86f58a4 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -122,6 +122,7 @@ 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 *); %} %union { @@ -1093,9 +1094,10 @@ type: tVOID { $$ = type_new_void(); } | tSAFEARRAY '(' type ')' { $$ = make_safearray($3); } ; -typedef: tTYPEDEF m_attributes decl_spec declarator_list - { reg_typedefs($3, $4, check_typedef_attrs($2)); - $$ = make_statement_typedef($4); +typedef: m_attributes tTYPEDEF m_attributes decl_spec declarator_list + { $1 = append_attribs($1, $3); + reg_typedefs($4, $5, check_typedef_attrs($1)); + $$ = make_statement_typedef($5); } ; @@ -2802,6 +2804,14 @@ static statement_list_t *append_statements(statement_list_t *l1, statement_list_ return l1; } +static attr_list_t *append_attribs(attr_list_t *l1, attr_list_t *l2) +{ + if (!l2) return l1; + if (!l1 || l1 == l2) return l2; + list_move_tail (l1, l2); + return l1; +} + static statement_list_t *append_statement(statement_list_t *list, statement_t *stmt) { if (!stmt) return list;

1 0

Kai Tietz : widl: Add RT's namespace keyword to scanner, and parser.
by Alexandre Julliard Aug. 19, 2013

Aug. 19, 2013

Module: wine Branch: master Commit: 499f05433a3d2fc197dfe654f3cea951898d8754 URL: http://source.winehq.org/git/wine.git/?a=commit;h=499f05433a3d2fc197dfe654f… Author: Kai Tietz <ktietz70(a)googlemail.com> Date: Thu Aug 8 15:45:24 2013 +0200 widl: Add RT's namespace keyword to scanner, and parser. --- tools/widl/parser.l | 3 ++- tools/widl/parser.y | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletions(-) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index e806167..fb61e21 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -261,6 +261,7 @@ static const struct keyword keywords[] = { {"long", tLONG}, {"methods", tMETHODS}, {"module", tMODULE}, + {"namespace", tNAMESPACE}, {"pascal", tPASCAL}, {"properties", tPROPERTIES}, {"register", tREGISTER}, @@ -414,7 +415,7 @@ static int kw_token(const char *kw) struct keyword key, *kwp; key.kw = kw; kwp = bsearch(&key, keywords, NKEYWORDS, sizeof(keywords[0]), kw_cmp_func); - if (kwp) { + if (kwp && (do_rt_extension || kwp->token != tNAMESPACE)) { parser_lval.str = xstrdup(kwp->kw); return kwp->token; } diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 579cbc6..0b5ebe6 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -121,6 +121,7 @@ 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 *); %} %union { @@ -202,6 +203,7 @@ static statement_list_t *append_statement(statement_list_t *list, statement_t *s %token tMAYBE tMESSAGE %token tMETHODS %token tMODULE +%token tNAMESPACE %token tNOCODE tNONBROWSABLE %token tNONCREATABLE %token tNONEXTENSIBLE @@ -258,6 +260,7 @@ static statement_list_t *append_statement(statement_list_t *list, statement_t *s %type <type> inherit interface interfacedef interfacedec %type <type> dispinterface dispinterfacehdr dispinterfacedef %type <type> module modulehdr moduledef +%type <type> namespacedef %type <type> base_type int_std %type <type> enumdef structdef uniondef typedecl %type <type> type @@ -315,6 +318,8 @@ input: gbl_statements { fix_incomplete(); ; gbl_statements: { $$ = NULL; } + | gbl_statements namespacedef '{' gbl_statements '}' + { $$ = append_statements($1, $4); } | gbl_statements interfacedec { $$ = append_statement($1, make_statement_reference($2)); } | gbl_statements interfacedef { $$ = append_statement($1, make_statement_type_decl($2)); } | gbl_statements coclass ';' { $$ = $1; @@ -330,6 +335,8 @@ gbl_statements: { $$ = NULL; } imp_statements: { $$ = NULL; } | imp_statements interfacedec { $$ = append_statement($1, make_statement_reference($2)); } + | imp_statements namespacedef '{' imp_statements '}' + { $$ = append_statements($1, $4); } | imp_statements interfacedef { $$ = append_statement($1, make_statement_type_decl($2)); } | imp_statements coclass ';' { $$ = $1; reg_type($2, $2->name, 0); } | imp_statements coclassdef { $$ = append_statement($1, make_statement_type_decl($2)); @@ -801,6 +808,9 @@ coclassdef: coclasshdr '{' coclass_ints '}' semicolon_opt { $$ = type_coclass_define($1, $3); } ; +namespacedef: tNAMESPACE aIDENTIFIER { $$ = NULL; } + ; + coclass_ints: { $$ = NULL; } | coclass_ints coclass_int { $$ = append_ifref( $1, $2 ); } ; @@ -2784,6 +2794,14 @@ static statement_t *make_statement_typedef(declarator_list_t *decls) return stmt; } +static statement_list_t *append_statements(statement_list_t *l1, statement_list_t *l2) +{ + if (!l2) return l1; + if (!l1 || l1 == l2) return l2; + list_move_tail (l1, l2); + return l1; +} + static statement_list_t *append_statement(statement_list_t *list, statement_t *stmt) { if (!stmt) return list;

1 0

Kai Tietz : widl: Allow hidden-attribute on type.
by Alexandre Julliard Aug. 19, 2013

Aug. 19, 2013

Module: wine Branch: master Commit: 94c94260ead202321c32fc24f11d370e757484a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94c94260ead202321c32fc24f… Author: Kai Tietz <ktietz70(a)googlemail.com> Date: Thu Aug 8 16:08:51 2013 +0200 widl: Allow hidden-attribute on type. --- tools/widl/parser.y | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index c104917..8217e2e 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -2055,7 +2055,7 @@ struct allowed_attr allowed_attr[] = /* ATTR_HELPSTRING */ { 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 1, 1, 1, 1, "helpstring" }, /* ATTR_HELPSTRINGCONTEXT */ { 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 1, 1, 1, 1, "helpstringcontext" }, /* ATTR_HELPSTRINGDLL */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, "helpstringdll" }, - /* ATTR_HIDDEN */ { 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, "hidden" }, + /* ATTR_HIDDEN */ { 0, 0, 1, 1, 0, 1, 0, 0, 0, 0, 1, 1, 0, 1, "hidden" }, /* ATTR_ID */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, "id" }, /* ATTR_IDEMPOTENT */ { 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "idempotent" }, /* ATTR_IGNORE */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, "ignore" },

1 0

Andrew Eikum : oleaut32: Correct version byte order.
by Alexandre Julliard Aug. 19, 2013

Aug. 19, 2013

Module: wine Branch: master Commit: f66523abeee8a64facf2c0ea35dc87ce7d5d6d58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f66523abeee8a64facf2c0ea3… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Aug 16 14:40:14 2013 -0500 oleaut32: Correct version byte order. --- dlls/oleaut32/tests/typelib.c | 6 +++++- dlls/oleaut32/typelib.c | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 8c5af1d..40359a2 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -3813,7 +3813,7 @@ static void test_create_typelib_lcid(LCID lcid) HRESULT hr; ICreateTypeLib2 *tl; HANDLE file; - DWORD msft_header[5]; /* five is enough for now */ + DWORD msft_header[7]; DWORD read; GetTempFileNameA( ".", "tlb", 0, filename ); @@ -3825,6 +3825,9 @@ static void test_create_typelib_lcid(LCID lcid) hr = ICreateTypeLib2_SetLcid(tl, lcid); ok(hr == S_OK, "got %08x\n", hr); + hr = ICreateTypeLib2_SetVersion(tl, 3, 4); + ok(hr == S_OK, "got %08x\n", hr); + hr = ICreateTypeLib2_SaveAllChanges(tl); ok(hr == S_OK, "got %08x\n", hr); @@ -3842,6 +3845,7 @@ static void test_create_typelib_lcid(LCID lcid) ok(msft_header[2] == 0xffffffff, "got %08x\n", msft_header[2]); ok(msft_header[3] == (lcid ? lcid : 0x409), "got %08x (lcid %08x)\n", msft_header[3], lcid); ok(msft_header[4] == lcid, "got %08x (lcid %08x)\n", msft_header[4], lcid); + ok(msft_header[6] == 0x00040003, "got %08x\n", msft_header[6]); DeleteFileA(filename); } diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index fa37737..48a698f 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -9703,7 +9703,7 @@ static HRESULT WINAPI ICreateTypeLib2_fnSaveAllChanges(ICreateTypeLib2 *iface) file.header.varflags |= 0x10; if (This->HelpStringDll) file.header.varflags |= HELPDLLFLAG; - file.header.version = (This->ver_major << 16) | This->ver_minor; + file.header.version = (This->ver_minor << 16) | This->ver_major; file.header.flags = This->libflags; file.header.helpstringcontext = 0; /* TODO - SetHelpStringContext not implemented yet */ file.header.helpcontext = This->dwHelpContext;

1 0

Francois Gouget : ntdll/tests: Add a trailing '\n' to an ok() call.
by Alexandre Julliard Aug. 19, 2013

Aug. 19, 2013

Module: wine Branch: master Commit: 1dbc3d092455aaa0fa4cb6633b15c4393f0f01a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1dbc3d092455aaa0fa4cb6633… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Aug 17 10:28:45 2013 +0200 ntdll/tests: Add a trailing '\n' to an ok() call. --- dlls/ntdll/tests/file.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 617a92c..3a1efdd 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -1386,7 +1386,7 @@ static void test_file_disposition_information(void) GetTempFileNameA( ".", "dis", 0, buffer ); handle = CreateFileA(buffer, GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, FILE_FLAG_DELETE_ON_CLOSE, 0); ok( handle != INVALID_HANDLE_VALUE, "failed to create temp file\n" ); - ok( DuplicateHandle( GetCurrentProcess(), handle, GetCurrentProcess(), &handle2, 0, FALSE, DUPLICATE_SAME_ACCESS ), "DuplicateHandle failed" ); + ok( DuplicateHandle( GetCurrentProcess(), handle, GetCurrentProcess(), &handle2, 0, FALSE, DUPLICATE_SAME_ACCESS ), "DuplicateHandle failed\n" ); CloseHandle( handle ); fdi.DoDeleteFile = FALSE; res = pNtSetInformationFile( handle2, &io, &fdi, sizeof fdi, FileDispositionInformation );

1 0

Alexandre Julliard : testbot: Enable storing result files for wine-patches tests.
by Alexandre Julliard Aug. 19, 2013

Aug. 19, 2013

Module: tools Branch: master Commit: f6052bbfaad14c80057ed7659caaa38b7ab5c307 URL: http://source.winehq.org/git/tools.git/?a=commit;h=f6052bbfaad14c80057ed765… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 19 19:22:54 2013 +0200 testbot: Enable storing result files for wine-patches tests. --- testbot/bin/WineSendLog.pl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index 87be910..3c3ff8c 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -449,7 +449,7 @@ EOF } my $Patch = $Job->Patch; - if (0 and defined $Patch->WebPatchId and -d "$DataDir/webpatches") + if (defined $Patch->WebPatchId and -d "$DataDir/webpatches") { my $BaseName = "$DataDir/webpatches/" . $Patch->WebPatchId; if ($Messages)

1 0

Jacek Caban : winetest: Prevent caching winehq snapshot.
by Alexandre Julliard Aug. 19, 2013

Aug. 19, 2013

Module: tools Branch: master Commit: 08e0ef8907c9925bf9480ae1450adfd74507df42 URL: http://source.winehq.org/git/tools.git/?a=commit;h=08e0ef8907c9925bf9480ae1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Aug 18 16:26:02 2013 +0200 winetest: Prevent caching winehq snapshot. --- winetest/tests/winehq_snapshot/.htaccess | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/winetest/tests/winehq_snapshot/.htaccess b/winetest/tests/winehq_snapshot/.htaccess new file mode 100644 index 0000000..44894fd --- /dev/null +++ b/winetest/tests/winehq_snapshot/.htaccess @@ -0,0 +1,9 @@ +<FilesMatch ".(html|htm|js|css)$"> +FileETag None +<ifModule mod_headers.c> +Header unset ETag +Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" +Header set Pragma "no-cache" +Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" +</ifModule> +</FilesMatch>

1 0

Frédéric Delanoy : winedev: Add/fix some ' filename' tags.
by Alexandre Julliard Aug. 19, 2013

Aug. 19, 2013

Module: docs Branch: master Commit: c909823806246b3c4cd77a9ef609db6ccd96b7e6 URL: http://source.winehq.org/git/docs.git/?a=commit;h=c909823806246b3c4cd77a9ef… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Aug 17 09:28:40 2013 +0200 winedev: Add/fix some 'filename' tags. --- en/winedev-architecture.sgml | 8 ++++---- en/winedev-debugger.sgml | 13 +++++++------ en/winedev-documentation.sgml | 18 ++++++++++-------- en/winedev-kernel.sgml | 8 ++++---- en/winedev-multimedia.sgml | 18 +++++++++--------- en/winedev-ole.sgml | 10 +++++----- en/winedev-opengl.sgml | 10 +++++----- en/winedev-testing.sgml | 21 +++++++++++---------- en/winedev-windowing.sgml | 6 +++--- 9 files changed, 58 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/docs.git/?a=commitdiff;h=c909823806246b3c4cd77…

1 0