April 2008 - Wine-Commits - list.winehq.org

Aric Stewart : imm32: Keep track of context associations between HWND and HIMC.
by Alexandre Julliard April 2, 2008

April 2, 2008

Module: wine Branch: master Commit: dd0c9300f99a9cc4a2ce1178a6fa7e40afe2dc8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd0c9300f99a9cc4a2ce1178a… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Apr 2 08:48:22 2008 -0500 imm32: Keep track of context associations between HWND and HIMC. --- dlls/imm32/imm.c | 55 ++++++++++++++++++++++++++++++++++++++++------------- 1 files changed, 41 insertions(+), 14 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index ab57bce..4ba1d63 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -110,6 +110,7 @@ static UINT WM_MSIME_RECONVERT; static UINT WM_MSIME_QUERYPOSITION; static UINT WM_MSIME_DOCUMENTFEED; +static const WCHAR szwWineIMCProperty[] = {'W','i','n','e','I','m','m','H','I','M','C','P','r','o','p','e','r','t','y',0}; /* * prototypes */ @@ -623,12 +624,10 @@ static HIMCC updateResultStr(HIMCC old, LPWSTR resultstr, DWORD len) */ HIMC WINAPI ImmAssociateContext(HWND hWnd, HIMC hIMC) { + HIMC old = NULL; InputContextData *data = (InputContextData*)hIMC; - WARN("(%p, %p): semi-stub\n", hWnd, hIMC); - - if (!hIMC) - return NULL; + TRACE("(%p, %p):\n", hWnd, hIMC); /* * WINE SPECIFIC! MAY CONFLICT @@ -642,9 +641,30 @@ HIMC WINAPI ImmAssociateContext(HWND hWnd, HIMC hIMC) /* * If already associated just return */ - if (data->IMC.hWnd == hWnd) + if (hIMC && data->IMC.hWnd == hWnd) return hIMC; + if (hWnd) + { + old = (HIMC)RemovePropW(hWnd,szwWineIMCProperty); + + if (old == NULL) + old = (HIMC)root_context; + else if (old == (HIMC)-1) + old = NULL; + + if (hIMC != (HIMC)root_context) + { + if (hIMC == NULL) /* Meaning disable imm for that window*/ + SetPropW(hWnd,szwWineIMCProperty,(HANDLE)-1); + else + SetPropW(hWnd,szwWineIMCProperty,(HANDLE)hIMC); + } + } + + if (!hIMC) + return old; + if (IsWindow(data->IMC.hWnd)) { /* @@ -663,11 +683,7 @@ HIMC WINAPI ImmAssociateContext(HWND hWnd, HIMC hIMC) SendMessageW(data->IMC.hWnd, WM_IME_SETCONTEXT, TRUE, ISC_SHOWUIALL); } - /* - * TODO: We need to keep track of the old context associated - * with a window and return it for now we will return NULL; - */ - return NULL; + return old; } /*********************************************************************** @@ -1176,13 +1192,24 @@ BOOL WINAPI ImmGetCompositionWindow(HIMC hIMC, LPCOMPOSITIONFORM lpCompForm) */ HIMC WINAPI ImmGetContext(HWND hWnd) { + HIMC rc = NULL; + TRACE("%p\n", hWnd); - if (!root_context) - return NULL; + rc = (HIMC)GetPropW(hWnd,szwWineIMCProperty); + if (rc == (HIMC)-1) + rc = NULL; + else if (rc == NULL) + rc = (HIMC)root_context; + + if (rc) + { + InputContextData *data = (InputContextData*)rc; + data->IMC.hWnd = hWnd; + } + TRACE("returning %p\n", rc); - root_context->IMC.hWnd = hWnd; - return (HIMC)root_context; + return rc; } /***********************************************************************

1 0

Paul Vriens : setupapi/tests: No need to use GetProcAddress as all functions exist on all platforms.
by Alexandre Julliard April 2, 2008

April 2, 2008

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

Paul Vriens : shlwapi/tests: Turn printf into trace or skip.
by Alexandre Julliard April 2, 2008

April 2, 2008

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

Herve Chanal : wordpad: A nicer icon.
by Alexandre Julliard April 2, 2008

April 2, 2008

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

Rob Shearman : widl: Turn on verbose errors, which gives a little more information in the case of a syntax error.
by Alexandre Julliard April 2, 2008

April 2, 2008

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

Rob Shearman : widl: Add a newline between function prototypes for non-object interfaces.
by Alexandre Julliard April 2, 2008

April 2, 2008

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

Rob Shearman : widl: Fix the writing out of function pointers with more than one level of indirection .
by Alexandre Julliard April 2, 2008

April 2, 2008

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

Rob Shearman : widl: Support __fastcall and __pascal calling conventions.
by Alexandre Julliard April 2, 2008

April 2, 2008

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

Rob Shearman : widl: Support parsing calling conventions for function identifiers.
by Alexandre Julliard April 2, 2008

April 2, 2008

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

Rob Shearman : widl: Store function and function pointer types completely within type_t type.
by Alexandre Julliard April 2, 2008

April 2, 2008

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