winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
August 2013
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
2 participants
461 discussions
Start a n
N
ew thread
Kai Tietz : widl: Allow attributes before and after typedef-keyword.
by Alexandre Julliard
19 Aug '13
19 Aug '13
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
0
0
Kai Tietz : widl: Add RT's namespace keyword to scanner, and parser.
by Alexandre Julliard
19 Aug '13
19 Aug '13
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
0
0
Kai Tietz : widl: New option --rt for enabling rt' s specific language extensions.
by Alexandre Julliard
19 Aug '13
19 Aug '13
Module: wine Branch: master Commit: 5ff7af708dd74e571622fe65a3f73039cc0cbd65 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=5ff7af708dd74e571622fe65a…
Author: Kai Tietz <ktietz70(a)googlemail.com> Date: Thu Aug 8 12:29:33 2013 +0200 widl: New option --rt for enabling rt's specific language extensions. --- tools/widl/widl.c | 7 +++++++ tools/widl/widl.h | 1 + tools/widl/widl.man.in | 3 +++ 3 files changed, 11 insertions(+), 0 deletions(-) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index cad1d6c..2ff1977 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -72,6 +72,7 @@ static const char usage[] = " --prefix-client=p Prefix names of client stubs with 'p'\n" " --prefix-server=p Prefix names of server functions with 'p'\n" " -r Generate registration script\n" +" --rt Enable WinRT's language extensions for IDL\n" " -s Generate server stub\n" " -t Generate typelib\n" " -u Generate interface identifiers file\n" @@ -113,6 +114,7 @@ int do_win32 = 1; int do_win64 = 1; int win32_packing = 8; int win64_packing = 8; +int do_rt_extension = 0; static enum stub_mode stub_mode = MODE_Os; char *input_name; @@ -152,6 +154,7 @@ enum { PREFIX_CLIENT_OPTION, PREFIX_SERVER_OPTION, PRINT_HELP, + RT_OPTION, WIN32_OPTION, WIN64_OPTION, WIN32_ALIGN_OPTION, @@ -171,6 +174,7 @@ static const struct option long_options[] = { { "prefix-all", 1, NULL, PREFIX_ALL_OPTION }, { "prefix-client", 1, NULL, PREFIX_CLIENT_OPTION }, { "prefix-server", 1, NULL, PREFIX_SERVER_OPTION }, + { "rt", 0, NULL, RT_OPTION }, { "win32", 0, NULL, WIN32_OPTION }, { "win64", 0, NULL, WIN64_OPTION }, { "win32-align", 1, NULL, WIN32_ALIGN_OPTION }, @@ -542,6 +546,9 @@ int main(int argc,char *argv[]) case PRINT_HELP: fprintf(stderr, "%s", usage); return 0; + case RT_OPTION: + do_rt_extension = 1; + break; case WIN32_OPTION: do_win32 = 1; do_win64 = 0; diff --git a/tools/widl/widl.h b/tools/widl/widl.h index 6551fa0..91054ad 100644 --- a/tools/widl/widl.h +++ b/tools/widl/widl.h @@ -49,6 +49,7 @@ extern int do_win32; extern int do_win64; extern int win32_packing; extern int win64_packing; +extern int do_rt_extension; extern char *input_name; extern char *header_name; diff --git a/tools/widl/widl.man.in b/tools/widl/widl.man.in index 473bfac..c5f0205 100644 --- a/tools/widl/widl.man.in +++ b/tools/widl/widl.man.in @@ -82,6 +82,9 @@ Only generate 32-bit or 64-bit code respectively (the default is to generate both 32-bit and 64-bit versions into the same destination file). .PP +.IP "\fB--rt\fR" +Enable additional language extensions for IDL to support WinRT. +.PP .B Registration script options: .IP "\fB-r\fR" Generate a registration script. The default output filename is
1
0
0
0
Andrew Eikum : oleaut32: Assign MEMBERIDs to vardescs without one.
by Alexandre Julliard
19 Aug '13
19 Aug '13
Module: wine Branch: master Commit: b6bfd6d32e0abc0363c4c64b11769a6dc10a9d15 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=b6bfd6d32e0abc0363c4c64b1…
Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Aug 16 14:40:22 2013 -0500 oleaut32: Assign MEMBERIDs to vardescs without one. --- dlls/oleaut32/tests/typelib.c | 4 ++++ dlls/oleaut32/typelib.c | 27 +++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 40359a2..d12181c 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -4032,6 +4032,7 @@ static void test_SetVarHelpContext(void) ok(hr == TYPE_E_ELEMENTNOTFOUND, "got %08x\n", hr); memset(&desc, 0, sizeof(desc)); + desc.memid = MEMBERID_NIL; desc.elemdescVar.tdesc.vt = VT_INT; desc.varkind = VAR_CONST; @@ -4067,6 +4068,7 @@ static void test_SetVarHelpContext(void) hr = ITypeInfo_GetVarDesc(ti, 0, &pdesc); ok(hr == S_OK, "got %08x\n", hr); + ok(pdesc->memid == 0x40000000, "got wrong memid: %x\n", pdesc->memid); ok(pdesc->elemdescVar.tdesc.vt == VT_INT, "got wrong vardesc type: %u\n", pdesc->elemdescVar.tdesc.vt); ok(pdesc->varkind == VAR_CONST, "got wrong varkind: %u\n", pdesc->varkind); ok(V_VT(U(pdesc)->lpvarValue) == VT_INT, "got wrong value type: %u\n", V_VT(U(pdesc)->lpvarValue)); @@ -4191,6 +4193,7 @@ static void test_SetVarDocString(void) ok(hr == E_INVALIDARG, "got %08x\n", hr); memset(&desc, 0, sizeof(desc)); + desc.memid = MEMBERID_NIL; desc.elemdescVar.tdesc.vt = VT_INT; desc.varkind = VAR_CONST; @@ -4229,6 +4232,7 @@ static void test_SetVarDocString(void) hr = ITypeInfo_GetVarDesc(ti, 0, &pdesc); ok(hr == S_OK, "got %08x\n", hr); + ok(pdesc->memid == 0x40000000, "got wrong memid: %x\n", pdesc->memid); ok(pdesc->elemdescVar.tdesc.vt == VT_INT, "got wrong vardesc type: %u\n", pdesc->elemdescVar.tdesc.vt); ok(pdesc->varkind == VAR_CONST, "got wrong varkind: %u\n", pdesc->varkind); ok(V_VT(U(pdesc)->lpvarValue) == VT_INT, "got wrong value type: %u\n", V_VT(U(pdesc)->lpvarValue)); diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 4cccbac..118e1f0 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -10737,6 +10737,33 @@ static HRESULT WINAPI ICreateTypeInfo2_fnLayOut(ICreateTypeInfo2 *iface) if (user_vft > This->cbSizeVft) This->cbSizeVft = user_vft + This->pTypeLib->ptr_size; + for(i = 0; i < This->cVars; ++i){ + TLBVarDesc *var_desc = &This->vardescs[i]; + if(var_desc->vardesc.memid == MEMBERID_NIL){ + UINT j = 0; + BOOL reset = FALSE; + TLBVarDesc *iter; + + var_desc->vardesc.memid = 0x40000000 + (depth << 16) + i; + + iter = This->vardescs; + while (j < This->cVars) { + if (iter != var_desc && iter->vardesc.memid == var_desc->vardesc.memid) { + if (!reset) { + var_desc->vardesc.memid = 0x40000000 + (depth << 16) + This->cVars; + reset = TRUE; + } else + ++var_desc->vardesc.memid; + iter = This->vardescs; + j = 0; + } else { + ++iter; + ++j; + } + } + } + } + ITypeInfo_Release(tinfo); return hres; }
1
0
0
0
Andrew Eikum : oleaut32: Run LayOut on typeinfos that require it before saving.
by Alexandre Julliard
19 Aug '13
19 Aug '13
Module: wine Branch: master Commit: 341ff65b95e61b8c2580ec2d54fab8ab0416f26c URL:
http://source.winehq.org/git/wine.git/?a=commit;h=341ff65b95e61b8c2580ec2d5…
Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Aug 16 14:40:17 2013 -0500 oleaut32: Run LayOut on typeinfos that require it before saving. --- dlls/oleaut32/typelib.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 48a698f..4cccbac 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -9689,9 +9689,14 @@ static HRESULT WINAPI ICreateTypeLib2_fnSaveAllChanges(ICreateTypeLib2 *iface) HANDLE outfile; HRESULT hres; DWORD *junk; + UINT i; TRACE("%p\n", This); + for(i = 0; i < This->TypeInfoCount; ++i) + if(This->typeinfos[i]->needs_layout) + ICreateTypeInfo2_LayOut(&This->typeinfos[i]->ICreateTypeInfo2_iface); + memset(&file, 0, sizeof(file)); file.header.magic1 = 0x5446534D;
1
0
0
0
Andrew Eikum : oleaut32: Correct version byte order.
by Alexandre Julliard
19 Aug '13
19 Aug '13
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
0
0
Alexandre Julliard : kernel32: Don't call from A to W function in Get/ SetCurrentDirectory.
by Alexandre Julliard
19 Aug '13
19 Aug '13
Module: wine Branch: master Commit: fe64e21e3b6f923c55dee50c866005293fe2a9b8 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=fe64e21e3b6f923c55dee50c8…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Aug 18 19:57:05 2013 +0200 kernel32: Don't call from A to W function in Get/SetCurrentDirectory. --- dlls/kernel32/path.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 5cd3c4b..3ee0dd6 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -1502,10 +1502,9 @@ UINT WINAPI GetCurrentDirectoryA( UINT buflen, LPSTR buf ) return 0; } - ret = GetCurrentDirectoryW(MAX_PATH, bufferW); - + ret = RtlGetCurrentDirectory_U( sizeof(bufferW), bufferW ); if (!ret) return 0; - if (ret > MAX_PATH) + if (ret > sizeof(bufferW)) { SetLastError(ERROR_FILENAME_EXCED_RANGE); return 0; @@ -1524,12 +1523,8 @@ BOOL WINAPI SetCurrentDirectoryW( LPCWSTR dir ) RtlInitUnicodeString( &dirW, dir ); status = RtlSetCurrentDirectory_U( &dirW ); - if (status != STATUS_SUCCESS) - { - SetLastError( RtlNtStatusToDosError(status) ); - return FALSE; - } - return TRUE; + if (status != STATUS_SUCCESS) SetLastError( RtlNtStatusToDosError(status) ); + return !status; } @@ -1539,9 +1534,14 @@ BOOL WINAPI SetCurrentDirectoryW( LPCWSTR dir ) BOOL WINAPI SetCurrentDirectoryA( LPCSTR dir ) { WCHAR *dirW; + UNICODE_STRING strW; + NTSTATUS status; if (!(dirW = FILE_name_AtoW( dir, FALSE ))) return FALSE; - return SetCurrentDirectoryW( dirW ); + RtlInitUnicodeString( &strW, dirW ); + status = RtlSetCurrentDirectory_U( &strW ); + if (status != STATUS_SUCCESS) SetLastError( RtlNtStatusToDosError(status) ); + return !status; }
1
0
0
0
Alexandre Julliard : testbot: Enable storing result files for wine-patches tests.
by Alexandre Julliard
19 Aug '13
19 Aug '13
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
0
0
Jacek Caban : winetest: Prevent caching winehq snapshot.
by Alexandre Julliard
19 Aug '13
19 Aug '13
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
0
0
Frédéric Delanoy : winedev: Use 'replaceable' tags for data placeholders.
by Alexandre Julliard
19 Aug '13
19 Aug '13
Module: docs Branch: master Commit: f0d643aad55c32e34521be1c241ea17a92337ede URL:
http://source.winehq.org/git/docs.git/?a=commit;h=f0d643aad55c32e34521be1c2…
Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Aug 17 09:28:41 2013 +0200 winedev: Use 'replaceable' tags for data placeholders. --- en/winedev-coding.sgml | 25 ++-- en/winedev-debugger.sgml | 407 +++++++++++++++++++---------------------- en/winedev-debugging.sgml | 34 ++-- en/winedev-documentation.sgml | 4 +- en/winedev-kernel.sgml | 99 +++++----- en/winedev-multimedia.sgml | 10 +- en/winedev-ole.sgml | 14 +- en/winedev-otherdebug.sgml | 34 ++-- en/winedev-testing.sgml | 2 +- 9 files changed, 302 insertions(+), 327 deletions(-) Diff:
http://source.winehq.org/git/docs.git/?a=commitdiff;h=f0d643aad55c32e34521b…
1
0
0
0
← Newer
1
...
28
29
30
31
32
33
34
...
47
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
Results per page:
10
25
50
100
200