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
April 2008
----- 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
4 participants
1278 discussions
Start a n
N
ew thread
Alexandre Julliard : wordpad: Display the larger icon in the about box.
by Alexandre Julliard
02 Apr '08
02 Apr '08
Module: wine Branch: master Commit: a54ac90000ec9ecfde1ca2600d22b8c0e3e1c5fa URL:
http://source.winehq.org/git/wine.git/?a=commit;h=a54ac90000ec9ecfde1ca2600…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 2 20:05:33 2008 +0200 wordpad: Display the larger icon in the about box. --- programs/wordpad/wordpad.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 2df6ea7..b03ae2e 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -883,7 +883,7 @@ static void DialogOpenFile(void) static void dialog_about(void) { HINSTANCE hInstance = (HINSTANCE)GetWindowLongPtr(hMainWnd, GWLP_HINSTANCE); - HICON icon = LoadIconW(hInstance, MAKEINTRESOURCEW(IDI_WORDPAD)); + HICON icon = LoadImageW(hInstance, MAKEINTRESOURCEW(IDI_WORDPAD), IMAGE_ICON, 48, 48, LR_SHARED); ShellAboutW(hMainWnd, wszAppTitle, 0, icon); }
1
0
0
0
Herve Chanal : wordpad: A nicer icon.
by Alexandre Julliard
02 Apr '08
02 Apr '08
Module: wine Branch: master Commit: a4e01d67b5e2b380ff9f0ae1105d5ed5fb21e60e URL:
http://source.winehq.org/git/wine.git/?a=commit;h=a4e01d67b5e2b380ff9f0ae11…
Author: Herve Chanal <chanal_herve(a)yahoo.fr> Date: Wed Apr 2 15:46:53 2008 +0200 wordpad: A nicer icon. --- programs/wordpad/Makefile.in | 2 + programs/wordpad/wordpad.ico | Bin 2238 -> 15086 bytes programs/wordpad/wordpad.svg | 930 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 932 insertions(+), 0 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=a4e01d67b5e2b380ff9f0…
1
0
0
0
Paul Vriens : shlwapi/tests: Turn printf into trace or skip.
by Alexandre Julliard
02 Apr '08
02 Apr '08
Module: wine Branch: master Commit: 428543d9eab687147feb7a4a13f22b3e2e62ee03 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=428543d9eab687147feb7a4a1…
Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Wed Apr 2 16:51:11 2008 +0200 shlwapi/tests: Turn printf into trace or skip. --- dlls/shlwapi/tests/istream.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/shlwapi/tests/istream.c b/dlls/shlwapi/tests/istream.c index df83786..8eac740 100644 --- a/dlls/shlwapi/tests/istream.c +++ b/dlls/shlwapi/tests/istream.c @@ -192,7 +192,7 @@ static void test_SHCreateStreamOnFileA(DWORD mode) ULONG refcount; static const char * test_file = "c:\\test.txt"; - printf("SHCreateStreamOnFileA: testing mode %d\n", mode); + trace("SHCreateStreamOnFileA: testing mode %d\n", mode); /* invalid arguments */ @@ -287,7 +287,7 @@ static void test_SHCreateStreamOnFileW(DWORD mode) ULONG refcount; static const WCHAR test_file[] = { 'c', ':', '\\', 't', 'e', 's', 't', '.', 't', 'x', 't' }; - printf("SHCreateStreamOnFileW: testing mode %d\n", mode); + trace("SHCreateStreamOnFileW: testing mode %d\n", mode); /* invalid arguments */ @@ -384,7 +384,7 @@ static void test_SHCreateStreamOnFileEx(DWORD mode, DWORD stgm) ULONG refcount; static const WCHAR test_file[] = { 'c', ':', '\\', 't', 'e', 's', 't', '.', 't', 'x', 't' }; - printf("SHCreateStreamOnFileEx: testing mode %d, STGM flags %08x\n", mode, stgm); + trace("SHCreateStreamOnFileEx: testing mode %d, STGM flags %08x\n", mode, stgm); /* invalid arguments */ @@ -415,7 +415,7 @@ static void test_SHCreateStreamOnFileEx(DWORD mode, DWORD stgm) "SHCreateStreamOnFileEx: expected E_INVALIDARG or HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), got 0x%08x\n", ret); if (ret == E_INVALIDARG) { - printf("SHCreateStreamOnFileEx: STGM_TRANSACTED not supported in this configuration... skipping.\n"); + skip("SHCreateStreamOnFileEx: STGM_TRANSACTED not supported in this configuration.\n"); return; } } else { @@ -554,13 +554,13 @@ START_TEST(istream) pSHCreateStreamOnFileEx = (void*)GetProcAddress(hShlwapi, "SHCreateStreamOnFileEx"); if (!pSHCreateStreamOnFileA) - printf("SHCreateStreamOnFileA not found... those tests will be skipped.\n"); + skip("SHCreateStreamOnFileA not found.\n"); if (!pSHCreateStreamOnFileW) - printf("SHCreateStreamOnFileW not found... those tests will be skipped.\n"); + skip("SHCreateStreamOnFileW not found.\n"); if (!pSHCreateStreamOnFileEx) - printf("SHCreateStreamOnFileEx not found... those tests will be skipped.\n"); + skip("SHCreateStreamOnFileEx not found.\n"); for (i = 0; i != sizeof(stgm_access)/sizeof(stgm_access[0]); i++) { if (pSHCreateStreamOnFileA)
1
0
0
0
Paul Vriens : setupapi/tests: No need to use GetProcAddress as all functions exist on all platforms.
by Alexandre Julliard
02 Apr '08
02 Apr '08
Module: wine Branch: master Commit: c535a27670e55b74f934d05122423b879fbc389b URL:
http://source.winehq.org/git/wine.git/?a=commit;h=c535a27670e55b74f934d0512…
Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Wed Apr 2 14:44:32 2008 +0200 setupapi/tests: No need to use GetProcAddress as all functions exist on all platforms. --- dlls/setupapi/tests/query.c | 94 ++++++++++++++++--------------------------- 1 files changed, 35 insertions(+), 59 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=c535a27670e55b74f934d…
1
0
0
0
Rob Shearman : widl: Turn on verbose errors, which gives a little more information in the case of a syntax error.
by Alexandre Julliard
02 Apr '08
02 Apr '08
Module: wine Branch: master Commit: f7f31150eea61387be75321cfd98596ad591d386 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=f7f31150eea61387be75321cf…
Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Apr 2 12:56:47 2008 +0100 widl: Turn on verbose errors, which gives a little more information in the case of a syntax error. --- tools/widl/parser.y | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 0f22c65..46418a3 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -63,6 +63,8 @@ # endif #endif +#define YYERROR_VERBOSE + unsigned char pointer_default = RPC_FC_UP; static int is_object_interface = FALSE;
1
0
0
0
Rob Shearman : widl: Fix the writing out of function pointers with more than one level of indirection .
by Alexandre Julliard
02 Apr '08
02 Apr '08
Module: wine Branch: master Commit: bfde2c2e7980c6ca6cd39a48c0e20f140ed3275c URL:
http://source.winehq.org/git/wine.git/?a=commit;h=bfde2c2e7980c6ca6cd39a48c…
Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Apr 2 12:56:38 2008 +0100 widl: Fix the writing out of function pointers with more than one level of indirection. --- tools/widl/header.c | 30 +++++++++++++++++++++--------- tools/widl/parser.y | 8 ++------ 2 files changed, 23 insertions(+), 15 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index 9fe5082..a568bb4 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -296,24 +296,36 @@ void write_type_right(FILE *h, type_t *t, int is_field) void write_type_v(FILE *h, type_t *t, int is_field, int declonly, const char *fmt, va_list args) { + type_t *pt; + int ptr_level = 0; + if (!h) return; - if (t->type == RPC_FC_FUNCTION) { - const char *callconv = get_attrp(t->attrs, ATTR_CALLCONV); + for (pt = t; is_ptr(pt); pt = pt->ref, ptr_level++) + ; + + if (pt->type == RPC_FC_FUNCTION) { + int i; + const char *callconv = get_attrp(pt->attrs, ATTR_CALLCONV); if (!callconv) callconv = ""; - write_type_left(h, t->ref, declonly); - fprintf(h, " (%s *", callconv); + write_type_left(h, pt->ref, declonly); + fputc(' ', h); + if (ptr_level) fputc('(', h); + fprintf(h, "%s ", callconv); + for (i = 0; i < ptr_level; i++) + fputc('*', h); } else write_type_left(h, t, declonly); if (fmt) { if (needs_space_after(t)) - fprintf(h, " "); + fputc(' ', h); vfprintf(h, fmt, args); } - if (t->type == RPC_FC_FUNCTION) { - fprintf(h, ")("); - write_args(h, t->fields_or_args, NULL, 0, FALSE); - fprintf(h, ")"); + if (pt->type == RPC_FC_FUNCTION) { + if (ptr_level) fputc(')', h); + fputc('(', h); + write_args(h, pt->fields_or_args, NULL, 0, FALSE); + fputc(')', h); } else write_type_right(h, t, is_field); } diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 155e026..0f22c65 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1375,8 +1375,6 @@ static void set_type(var_t *v, type_t *type, const pident_t *pident, array_dims_ if (pident && pident->is_func) { int func_ptr_level = pident->func_ptr_level; - /* function pointers always have one implicit level of pointer */ - if (func_ptr_level == 1) func_ptr_level = 0; v->type = make_type(RPC_FC_FUNCTION, v->type); v->type->fields_or_args = pident->args; if (pident->callconv) @@ -1738,12 +1736,8 @@ static type_t *reg_typedefs(type_t *type, pident_list_t *pidents, attr_list_t *a } if (pident->is_func) { int func_ptr_level = pident->func_ptr_level; - /* function pointers always have one implicit level of pointer */ - if (func_ptr_level == 1) func_ptr_level = 0; cur = make_type(RPC_FC_FUNCTION, cur); cur->fields_or_args = pident->args; - for (; func_ptr_level > 0; func_ptr_level--) - cur = make_type(pointer_default, cur); if (pident->callconv) cur->attrs = append_attr(NULL, make_attrp(ATTR_CALLCONV, pident->callconv)); else if (is_object_interface) { @@ -1751,6 +1745,8 @@ static type_t *reg_typedefs(type_t *type, pident_list_t *pidents, attr_list_t *a if (!stdmethodcalltype) stdmethodcalltype = strdup("STDMETHODCALLTYPE"); cur->attrs = append_attr(NULL, make_attrp(ATTR_CALLCONV, stdmethodcalltype)); } + for (; func_ptr_level > 0; func_ptr_level--) + cur = make_type(pointer_default, cur); } cur = alias(cur, name->name); cur->attrs = attrs;
1
0
0
0
Rob Shearman : widl: Add a newline between function prototypes for non-object interfaces.
by Alexandre Julliard
02 Apr '08
02 Apr '08
Module: wine Branch: master Commit: 5a378905bedb264ad1667d1ecbb0067b065bddbb URL:
http://source.winehq.org/git/wine.git/?a=commit;h=5a378905bedb264ad1667d1ec…
Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Apr 2 12:56:27 2008 +0100 widl: Add a newline between function prototypes for non-object interfaces. --- tools/widl/header.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index d2f7ae4..9fe5082 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -871,7 +871,7 @@ static void write_function_proto(const type_t *iface, const func_t *fun, const c write_args(header, fun->args, iface->name, 0, TRUE); else fprintf(header, " void"); - fprintf(header, ");\n"); + fprintf(header, ");\n\n"); } static void write_function_protos(const type_t *iface)
1
0
0
0
Rob Shearman : widl: Support __fastcall and __pascal calling conventions.
by Alexandre Julliard
02 Apr '08
02 Apr '08
Module: wine Branch: master Commit: 35ba23bd48b718c22dec69e047405d6156d875dd URL:
http://source.winehq.org/git/wine.git/?a=commit;h=35ba23bd48b718c22dec69e04…
Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Apr 2 12:56:21 2008 +0100 widl: Support __fastcall and __pascal calling conventions. Support the synonyms for these and existing calling conventions. --- tools/widl/parser.l | 8 ++++++++ tools/widl/parser.y | 4 ++++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 3bcdc26..66110b6 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -186,13 +186,19 @@ static const struct keyword keywords[] = { {"FALSE", tFALSE}, {"TRUE", tTRUE}, {"__cdecl", tCDECL}, + {"__fastcall", tFASTCALL}, + {"__pascal", tPASCAL}, {"__int64", tINT64}, {"__stdcall", tSTDCALL}, + {"_cdecl", tCDECL}, + {"_fastcall", tFASTCALL}, + {"_pascal", tPASCAL}, {"_stdcall", tSTDCALL}, {"boolean", tBOOLEAN}, {"byte", tBYTE}, {"callback", tCALLBACK}, {"case", tCASE}, + {"cdecl", tCDECL}, {"char", tCHAR}, {"coclass", tCOCLASS}, {"code", tCODE}, @@ -217,11 +223,13 @@ static const struct keyword keywords[] = { {"long", tLONG}, {"methods", tMETHODS}, {"module", tMODULE}, + {"pascal", tPASCAL}, {"properties", tPROPERTIES}, {"short", tSHORT}, {"signed", tSIGNED}, {"sizeof", tSIZEOF}, {"small", tSMALL}, + {"stdcall", tSTDCALL}, {"struct", tSTRUCT}, {"switch", tSWITCH}, {"typedef", tTYPEDEF}, diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 685322a..155e026 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -181,6 +181,7 @@ static void check_all_user_types(ifref_list_t *ifaces); %token tENTRY tENUM tERRORSTATUST %token tEXPLICITHANDLE tEXTERN %token tFALSE +%token tFASTCALL %token tFLOAT %token tHANDLE %token tHANDLET @@ -208,6 +209,7 @@ static void check_all_user_types(ifref_list_t *ifaces); %token tOBJECT tODL tOLEAUTOMATION %token tOPTIONAL %token tOUT +%token tPASCAL %token tPOINTERDEFAULT %token tPROPERTIES %token tPROPGET tPROPPUT tPROPPUTREF @@ -520,6 +522,8 @@ uuid_string: ; callconv: tCDECL { $$ = $<str>1; } + | tFASTCALL { $$ = $<str>1; } + | tPASCAL { $$ = $<str>1; } | tSTDCALL { $$ = $<str>1; } ;
1
0
0
0
Rob Shearman : widl: Support parsing calling conventions for function identifiers.
by Alexandre Julliard
02 Apr '08
02 Apr '08
Module: wine Branch: master Commit: d97f3205bac5dd26bb0cf6eceb68925484430398 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=d97f3205bac5dd26bb0cf6ece…
Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Apr 2 12:56:13 2008 +0100 widl: Support parsing calling conventions for function identifiers. Support automatically setting the calling convention to STDMETHODCALLTYPE if it is part of an object interface. Write out the calling convention in write_type_v. --- tools/widl/header.c | 27 ++++++++++++++------------- tools/widl/parser.y | 43 +++++++++++++++++++++++++++++++++++-------- tools/widl/widltypes.h | 2 ++ 3 files changed, 51 insertions(+), 21 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index 08964cb..d2f7ae4 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -298,13 +298,24 @@ void write_type_v(FILE *h, type_t *t, int is_field, int declonly, { if (!h) return; - write_type_left(h, t, declonly); + if (t->type == RPC_FC_FUNCTION) { + const char *callconv = get_attrp(t->attrs, ATTR_CALLCONV); + if (!callconv) callconv = ""; + write_type_left(h, t->ref, declonly); + fprintf(h, " (%s *", callconv); + } else + write_type_left(h, t, declonly); if (fmt) { if (needs_space_after(t)) fprintf(h, " "); vfprintf(h, fmt, args); } - write_type_right(h, t, is_field); + if (t->type == RPC_FC_FUNCTION) { + fprintf(h, ")("); + write_args(h, t->fields_or_args, NULL, 0, FALSE); + fprintf(h, ")"); + } else + write_type_right(h, t, is_field); } void write_type_def_or_decl(FILE *f, type_t *t, int field, const char *fmt, ...) @@ -690,17 +701,7 @@ void write_args(FILE *h, const var_list_t *args, const char *name, int method, i } else fprintf(h, ","); } - if (arg->type->type == RPC_FC_FUNCTION) - { - write_type_decl_left(h, arg->type->ref); - fprintf(h, " (STDMETHODCALLTYPE *"); - write_name(h,arg); - fprintf(h, ")("); - write_args(h, arg->type->fields_or_args, NULL, 0, FALSE); - fprintf(h, ")"); - } - else - write_type_decl(h, arg->type, "%s", arg->name); + write_type_decl(h, arg->type, "%s", arg->name); count++; } if (do_indent) indentation--; diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 5e54daa..685322a 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -64,6 +64,7 @@ #endif unsigned char pointer_default = RPC_FC_UP; +static int is_object_interface = FALSE; typedef struct list typelist_t; struct typenode { @@ -265,7 +266,7 @@ static void check_all_user_types(ifref_list_t *ifaces); %type <func_list> int_statements dispint_meths %type <type> coclass coclasshdr coclassdef %type <num> pointer_type version -%type <str> libraryhdr +%type <str> libraryhdr callconv %type <uuid> uuid_string %type <num> import_start @@ -518,8 +519,8 @@ uuid_string: $$ = parse_uuid($1); } ; -callconv: - | tSTDCALL +callconv: tCDECL { $$ = $<str>1; } + | tSTDCALL { $$ = $<str>1; } ; cases: { $$ = NULL; } @@ -653,11 +654,11 @@ s_field: m_attributes type pident array { $$ = $3->var; ; funcdef: - m_attributes type callconv pident { var_t *v = $4->var; - var_list_t *args = $4->args; + m_attributes type pident { var_t *v = $3->var; + var_list_t *args = $3->args; v->attrs = $1; - set_type(v, $2, $4, NULL, FALSE); - free($4); + set_type(v, $2, $3, NULL, FALSE); + free($3); $$ = make_func(v, args); if (is_attr(v->attrs, ATTR_IN)) { error_loc("inapplicable attribute [in] for function '%s'\n",$$->def->name); @@ -757,6 +758,7 @@ dispinterface: tDISPINTERFACE aIDENTIFIER { $$ = get_type(0, $2, 0); $$->kind = ; dispinterfacehdr: attributes dispinterface { attr_t *attrs; + is_object_interface = TRUE; $$ = $2; if ($$->defined) error_loc("multiple definition error\n"); attrs = make_attr(ATTR_DISPINTERFACE); @@ -806,6 +808,7 @@ interfacehdr: attributes interface { $$.interface = $2; $$.old_pointer_default = pointer_default; if (is_attr($1, ATTR_POINTERDEFAULT)) pointer_default = get_attrv($1, ATTR_POINTERDEFAULT); + is_object_interface = is_object($1); if ($2->defined) error_loc("multiple definition error\n"); $2->attrs = $1; $2->defined = TRUE; @@ -863,10 +866,19 @@ moduledef: modulehdr '{' int_statements '}' pident: '*' pident %prec PPTR { $$ = $2; $$->ptr_level++; } | tCONST pident { $$ = $2; /* FIXME */ } + | callconv pident { $$ = $2; + if ($$->callconv) parser_warning("multiple calling conventions %s, %s for function %s\n", $$->callconv, $1, $$->var->name); + $$->callconv = $1; + } | direct_ident ; -func_ident: direct_ident '(' m_args ')' { $$ = $1; $1->args = $3; $1->is_func = TRUE; } +func_ident: direct_ident '(' m_args ')' + { $$ = $1; + $1->args = $3; + $1->is_func = TRUE; + } + ; direct_ident: ident { $$ = make_pident($1); } | '(' pident ')' { $$ = $2; } @@ -1363,6 +1375,13 @@ static void set_type(var_t *v, type_t *type, const pident_t *pident, array_dims_ if (func_ptr_level == 1) func_ptr_level = 0; v->type = make_type(RPC_FC_FUNCTION, v->type); v->type->fields_or_args = pident->args; + if (pident->callconv) + v->type->attrs = append_attr(NULL, make_attrp(ATTR_CALLCONV, pident->callconv)); + else if (is_object_interface) { + static char *stdmethodcalltype; + if (!stdmethodcalltype) stdmethodcalltype = strdup("STDMETHODCALLTYPE"); + v->type->attrs = append_attr(NULL, make_attrp(ATTR_CALLCONV, stdmethodcalltype)); + } for (; func_ptr_level > 0; func_ptr_level--) v->type = make_type(ptr_type, v->type); } @@ -1542,6 +1561,7 @@ static pident_t *make_pident(var_t *var) p->ptr_level = 0; p->func_ptr_level = 0; p->args = NULL; + p->callconv = NULL; return p; } @@ -1720,6 +1740,13 @@ static type_t *reg_typedefs(type_t *type, pident_list_t *pidents, attr_list_t *a cur->fields_or_args = pident->args; for (; func_ptr_level > 0; func_ptr_level--) cur = make_type(pointer_default, cur); + if (pident->callconv) + cur->attrs = append_attr(NULL, make_attrp(ATTR_CALLCONV, pident->callconv)); + else if (is_object_interface) { + static char *stdmethodcalltype; + if (!stdmethodcalltype) stdmethodcalltype = strdup("STDMETHODCALLTYPE"); + cur->attrs = append_attr(NULL, make_attrp(ATTR_CALLCONV, stdmethodcalltype)); + } } cur = alias(cur, name->name); cur->attrs = attrs; diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index d8f4c69..259049e 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -70,6 +70,7 @@ enum attr_type ATTR_AUTO_HANDLE, ATTR_BINDABLE, ATTR_CALLAS, + ATTR_CALLCONV, /* calling convention pseudo-attribute */ ATTR_CASE, ATTR_CONTEXTHANDLE, ATTR_CONTROL, @@ -250,6 +251,7 @@ struct _pident_t { /* levels of indirection for function pointers */ int func_ptr_level; var_list_t *args; + char *callconv; /* parser-internal */ struct list entry;
1
0
0
0
Rob Shearman : widl: Store function and function pointer types completely within type_t type.
by Alexandre Julliard
02 Apr '08
02 Apr '08
Module: wine Branch: master Commit: 6a0c5a4fe9beb9de0c4689ee3cb08c48d0c3ac12 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=6a0c5a4fe9beb9de0c4689ee3…
Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Apr 2 12:55:53 2008 +0100 widl: Store function and function pointer types completely within type_t type. --- tools/widl/header.c | 14 ++++---- tools/widl/parser.y | 71 ++++++++++++++++++++++++++++++---------------- tools/widl/typegen.c | 62 ++++++++++++++++++++-------------------- tools/widl/widltypes.h | 10 ++++-- tools/widl/write_msft.c | 12 ++++---- 5 files changed, 97 insertions(+), 72 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=6a0c5a4fe9beb9de0c468…
1
0
0
0
← Newer
1
...
116
117
118
119
120
121
122
...
128
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
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
Results per page:
10
25
50
100
200