January 2009 - Wine-Commits

Paul Vriens : shell32/tests: Fix some test failures on Vista.
by Alexandre Julliard Jan. 6, 2009

Jan. 6, 2009

Module: wine Branch: master Commit: 36bd62c01264f5ba06629a69c0d3af14fd786056 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36bd62c01264f5ba06629a69c… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Jan 6 11:54:27 2009 +0100 shell32/tests: Fix some test failures on Vista. --- dlls/shell32/tests/shlfileop.c | 35 +++++++++++++++++++++++++---------- 1 files changed, 25 insertions(+), 10 deletions(-) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index 5bd3c34..7705292 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -34,8 +34,10 @@ /* Error codes could be pre-Win32 */ #define DE_SAMEFILE 0x71 +#define DE_MANYSRC1DEST 0x72 #define DE_OPCANCELLED 0x75 #define DE_DESTSUBTREE 0x76 +#define DE_INVALIDFILES 0x7C #define DE_DESTSAMETREE 0x7D #define expect_retval(ret, ret_prewin32)\ ok(retval == ret ||\ @@ -667,8 +669,9 @@ static void test_rename(void) shfo.pTo = "a.txt\0"; retval = SHFileOperationA(&shfo); ok(retval == ERROR_GEN_FAILURE || + retval == DE_MANYSRC1DEST || /* Vista */ broken(!retval), /* Win9x */ - "Expected ERROR_GEN_FAILURE, got %d\n", retval); + "Expected ERROR_GEN_FAILURE or DE_MANYSRC1DEST, got %d\n", retval); ok(file_exists("test1.txt"), "Expected test1.txt to exist\n"); ok(file_exists("test2.txt"), "Expected test2.txt to exist\n"); ok(!file_exists("a.txt"), "Expected a.txt to not exist\n"); @@ -677,7 +680,9 @@ static void test_rename(void) shfo.pFrom = "idontexist\0"; shfo.pTo = "newfile\0"; retval = SHFileOperationA(&shfo); - ok(retval == 1026, "Expected 1026, got %d\n", retval); + ok(retval == 1026 || + retval == ERROR_FILE_NOT_FOUND, /* Vista */ + "Expected 1026 or ERROR_FILE_NOT_FOUND, got %d\n", retval); ok(!file_exists("newfile"), "Expected newfile to not exist\n"); /* pTo already exist */ @@ -696,7 +701,9 @@ static void test_rename(void) /* pFrom is empty */ shfo.pFrom = "\0"; retval = SHFileOperationA(&shfo); - ok(retval == ERROR_ACCESS_DENIED, "Expected ERROR_ACCESS_DENIED, got %d\n", retval); + ok(retval == ERROR_ACCESS_DENIED || + retval == ERROR_INVALID_TARGET_HANDLE, /* Vista */ + "Expected ERROR_ACCESS_DENIED or ERROR_INVALID_TARGET_HANDLE, got %d\n", retval); /* pFrom is NULL, commented out because it crashes on nt 4.0 */ #if 0 @@ -1227,8 +1234,9 @@ static void test_copy(void) shfo.fFlags = FOF_NOCONFIRMATION | FOF_SILENT | FOF_NOERRORUI; retval = SHFileOperation(&shfo); ok(retval == 1148 || retval == 1026 || - retval == ERROR_ACCESS_DENIED, /* win2k */ - "Expected 1148, 1026 or ERROR_ACCESS_DENIED, got %d\n", retval); + retval == ERROR_ACCESS_DENIED || /* win2k */ + retval == DE_INVALIDFILES, /* Vista */ + "Unexpected return value, got %d\n", retval); ok(DeleteFileA("one.txt"), "Expected file to exist\n"); if (file_exists("two.txt")) /* Vista and W2K8 (broken or new behavior ?) */ @@ -1275,8 +1283,9 @@ static void test_copy(void) shfo.fFlags = FOF_NOCONFIRMATION | FOF_SILENT | FOF_NOERRORUI; retval = SHFileOperation(&shfo); ok(retval == 1148 || retval == 1026 || - retval == ERROR_ACCESS_DENIED, /* win2k */ - "Expected 1148, 1026 or ERROR_ACCESS_DENIED, got %d\n", retval); + retval == ERROR_ACCESS_DENIED || /* win2k */ + retval == DE_INVALIDFILES, /* Vista */ + "Unexpected return value, got %d\n", retval); ok(DeleteFileA("one.txt"), "Expected file to exist\n"); if (dir_exists("two.txt")) /* Vista and W2K8 (broken or new behavior ?) */ @@ -1782,16 +1791,22 @@ static void test_sh_path_prepare(void) /* file exists, SHPPFW_NONE */ set_curr_dir_path(path, "test1.txt\0"); res = pSHPathPrepareForWriteA(0, 0, path, SHPPFW_NONE); - ok(res == HRESULT_FROM_WIN32(ERROR_DIRECTORY), "res == 0x%08x, expected HRESULT_FROM_WIN32(ERROR_DIRECTORY)\n", res); + ok(res == HRESULT_FROM_WIN32(ERROR_DIRECTORY) || + res == HRESULT_FROM_WIN32(ERROR_INVALID_NAME), /* Vista */ + "Unexpected result : 0x%08x\n", res); /* file exists, SHPPFW_DIRCREATE */ res = pSHPathPrepareForWriteA(0, 0, path, SHPPFW_DIRCREATE); - ok(res == HRESULT_FROM_WIN32(ERROR_DIRECTORY), "res == 0x%08x, expected HRESULT_FROM_WIN32(ERROR_DIRECTORY)\n", res); + ok(res == HRESULT_FROM_WIN32(ERROR_DIRECTORY) || + res == HRESULT_FROM_WIN32(ERROR_INVALID_NAME), /* Vista */ + "Unexpected result : 0x%08x\n", res); /* file exists, SHPPFW_NONE, trailing \ */ set_curr_dir_path(path, "test1.txt\\\0"); res = pSHPathPrepareForWriteA(0, 0, path, SHPPFW_NONE); - ok(res == HRESULT_FROM_WIN32(ERROR_DIRECTORY), "res == 0x%08x, expected HRESULT_FROM_WIN32(ERROR_DIRECTORY)\n", res); + ok(res == HRESULT_FROM_WIN32(ERROR_DIRECTORY) || + res == HRESULT_FROM_WIN32(ERROR_INVALID_NAME), /* Vista */ + "Unexpected result : 0x%08x\n", res); /* relative path exists, SHPPFW_DIRCREATE */ res = pSHPathPrepareForWriteA(0, 0, ".\\testdir2", SHPPFW_DIRCREATE);

1 0

Rob Shearman : widl: Add new function, type_iface_get_stmts.
by Alexandre Julliard Jan. 6, 2009

Jan. 6, 2009

Module: wine Branch: master Commit: 9b139018cffbc0cbe8a7355f98defbf2ccf582dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b139018cffbc0cbe8a7355f9… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Jan 5 23:35:13 2009 +0000 widl: Add new function, type_iface_get_stmts. Use it to retrieve statements contained in interface types. --- tools/widl/client.c | 4 ++-- tools/widl/header.c | 20 ++++++++++---------- tools/widl/parser.y | 6 +++--- tools/widl/proxy.c | 12 ++++++------ tools/widl/server.c | 6 +++--- tools/widl/typegen.c | 6 +++--- tools/widl/typetree.c | 2 +- tools/widl/typetree.h | 6 ++++++ tools/widl/write_msft.c | 4 ++-- 9 files changed, 36 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9b139018cffbc0cbe8a73…

1 0

Rob Shearman : widl: Replace uses of get_func_return_type with type_function_get_rettype.
by Alexandre Julliard Jan. 6, 2009

Jan. 6, 2009

Module: wine Branch: master Commit: 8a976a7d785d256eb93b81f3e05bb66234b3d4a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a976a7d785d256eb93b81f3e… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Jan 5 23:35:24 2009 +0000 widl: Replace uses of get_func_return_type with type_function_get_rettype. Also replace direct accesses into the type structure to get the return type of a function with the same function. --- tools/widl/client.c | 27 +++++++++++++++------------ tools/widl/header.c | 18 +++++++++--------- tools/widl/proxy.c | 19 ++++++++++--------- tools/widl/server.c | 6 +++--- tools/widl/typegen.c | 33 +++++++++++++++++---------------- tools/widl/typetree.h | 6 ++++++ tools/widl/widltypes.h | 5 ----- tools/widl/write_msft.c | 2 +- 8 files changed, 61 insertions(+), 55 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8a976a7d785d256eb93b8…

1 0

Hans Leidekker : setupapi: Implement StringTableLookUpStringEx.
by Alexandre Julliard Jan. 6, 2009

Jan. 6, 2009

Module: wine Branch: master Commit: 18b5366c35f95eb6e7fc6e19c50c371a81d5a980 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18b5366c35f95eb6e7fc6e19c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jan 6 10:38:49 2009 +0100 setupapi: Implement StringTableLookUpStringEx. --- dlls/setupapi/stringtable.c | 49 ++++++++++++++++++++++++------------------ 1 files changed, 28 insertions(+), 21 deletions(-) diff --git a/dlls/setupapi/stringtable.c b/dlls/setupapi/stringtable.c index 2f43c5c..1907fbb 100644 --- a/dlls/setupapi/stringtable.c +++ b/dlls/setupapi/stringtable.c @@ -446,35 +446,40 @@ StringTableGetExtraData(HSTRING_TABLE hStringTable, /************************************************************************** - * StringTableLookUpString [SETUPAPI.@] + * StringTableLookUpStringEx [SETUPAPI.@] * - * Searches a string table for a given string. + * Searches a string table and extra data for a given string. * * PARAMS * hStringTable [I] Handle to the string table * lpString [I] String to be searched for * dwFlags [I] Flags * 1: case sensitive compare + * lpExtraData [O] Pointer to the buffer that receives the extra data + * lpReserved [I/O] Unused * * RETURNS * Success: String ID * Failure: -1 */ DWORD WINAPI -StringTableLookUpString(HSTRING_TABLE hStringTable, - LPWSTR lpString, - DWORD dwFlags) +StringTableLookUpStringEx(HSTRING_TABLE hStringTable, + LPWSTR lpString, + DWORD dwFlags, + LPVOID lpExtraData, + LPDWORD lpReserved) { PSTRING_TABLE pStringTable; DWORD i; - TRACE("%p %s %x\n", hStringTable, debugstr_w(lpString), dwFlags); + TRACE("%p %s %x %p, %p\n", hStringTable, debugstr_w(lpString), dwFlags, + lpExtraData, lpReserved); pStringTable = (PSTRING_TABLE)hStringTable; if (pStringTable == NULL) { ERR("Invalid hStringTable!\n"); - return (DWORD)-1; + return ~0u; } /* Search for existing string in the string table */ @@ -485,46 +490,48 @@ StringTableLookUpString(HSTRING_TABLE hStringTable, if (dwFlags & 1) { if (!lstrcmpW(pStringTable->pSlots[i].pString, lpString)) + { + if (lpExtraData) + memcpy(lpExtraData, pStringTable->pSlots[i].pData, pStringTable->pSlots[i].dwSize); return i + 1; + } } else { if (!lstrcmpiW(pStringTable->pSlots[i].pString, lpString)) + { + if (lpExtraData) + memcpy(lpExtraData, pStringTable->pSlots[i].pData, pStringTable->pSlots[i].dwSize); return i + 1; + } } } } - - return (DWORD)-1; + return ~0u; } /************************************************************************** - * StringTableLookUpStringEx [SETUPAPI.@] + * StringTableLookUpString [SETUPAPI.@] * - * Searches a string table and extra data for a given string. + * Searches a string table for a given string. * * PARAMS * hStringTable [I] Handle to the string table * lpString [I] String to be searched for * dwFlags [I] Flags * 1: case sensitive compare - * lpExtraData [O] Pointer to the buffer that receives the extra data - * lpReserved [I/O] Unused * * RETURNS * Success: String ID - * Failure: -1 + * Failure: ~0u */ DWORD WINAPI -StringTableLookUpStringEx(HSTRING_TABLE hStringTable, - LPWSTR lpString, - DWORD dwFlags, - LPVOID lpExtraData, - LPDWORD lpReserved) +StringTableLookUpString(HSTRING_TABLE hStringTable, + LPWSTR lpString, + DWORD dwFlags) { - FIXME("\n"); - return (DWORD)-1; + return StringTableLookUpStringEx(hStringTable, lpString, dwFlags, NULL, NULL); }

1 0

Rob Shearman : widl: Add a new function, type_pointer_get_ref.
by Alexandre Julliard Jan. 6, 2009

Jan. 6, 2009

Module: wine Branch: master Commit: 67ac03ae4e011ec03fddaf5fe3286ecf2cb89759 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67ac03ae4e011ec03fddaf5fe… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Jan 5 23:34:58 2009 +0000 widl: Add a new function, type_pointer_get_ref. Use it for retrieving the type that a pointer refers to. --- tools/widl/expr.c | 2 +- tools/widl/header.c | 30 ++++++++++++------ tools/widl/header.h | 4 +- tools/widl/parser.y | 14 ++++---- tools/widl/proxy.c | 8 ++-- tools/widl/typegen.c | 74 +++++++++++++++++++++++++++------------------- tools/widl/typelib.c | 9 +++++- tools/widl/typetree.h | 6 ++++ tools/widl/write_msft.c | 12 +++++-- 9 files changed, 99 insertions(+), 60 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=67ac03ae4e011ec03fdda…

1 0

Rob Shearman : widl: Add a new function, type_iface_get_inherit.
by Alexandre Julliard Jan. 6, 2009

Jan. 6, 2009

Module: wine Branch: master Commit: 8fc59d0ead57d32a6e10146464d9fee3688a4663 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fc59d0ead57d32a6e1014646… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Jan 5 23:35:06 2009 +0000 widl: Add a new function, type_iface_get_inherit. Use it for retrieving the parent interface for interfaces. --- tools/widl/header.c | 17 ++++++++++------- tools/widl/proxy.c | 28 +++++++++++++++++++--------- tools/widl/typetree.c | 4 ++-- tools/widl/typetree.h | 6 ++++++ tools/widl/write_msft.c | 21 +++++++++++++-------- 5 files changed, 50 insertions(+), 26 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index 7c784fa..0d24a18 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -628,7 +628,8 @@ static void write_method_macro(FILE *header, const type_t *iface, const char *na const statement_t *stmt; int first_iface = 1; - if (iface->ref) write_method_macro(header, iface->ref, name); + if (type_iface_get_inherit(iface)) + write_method_macro(header, type_iface_get_inherit(iface), name); STATEMENTS_FOR_EACH_FUNC(stmt, iface->details.iface->stmts) { @@ -713,7 +714,8 @@ static void do_write_c_method_def(FILE *header, const type_t *iface, const char const statement_t *stmt; int first_iface = 1; - if (iface->ref) do_write_c_method_def(header, iface->ref, name); + if (type_iface_get_inherit(iface)) + do_write_c_method_def(header, type_iface_get_inherit(iface), name); STATEMENTS_FOR_EACH_FUNC(stmt, iface->details.iface->stmts) { @@ -743,7 +745,7 @@ static void write_c_method_def(FILE *header, const type_t *iface) static void write_c_disp_method_def(FILE *header, const type_t *iface) { - do_write_c_method_def(header, iface->ref, iface->name); + do_write_c_method_def(header, type_iface_get_inherit(iface), iface->name); } static void write_method_proto(FILE *header, const type_t *iface) @@ -924,9 +926,10 @@ static void write_com_interface_end(FILE *header, type_t *iface) write_iface_guid(header, iface); /* C++ interface */ fprintf(header, "#if defined(__cplusplus) && !defined(CINTERFACE)\n"); - if (iface->ref) + if (type_iface_get_inherit(iface)) { - fprintf(header, "interface %s : public %s\n", iface->name, iface->ref->name); + fprintf(header, "interface %s : public %s\n", iface->name, + type_iface_get_inherit(iface)->name); fprintf(header, "{\n"); } else @@ -944,7 +947,7 @@ static void write_com_interface_end(FILE *header, type_t *iface) write_cpp_method_def(header, iface); indentation--; } - if (!iface->ref) + if (!type_iface_get_inherit(iface)) fprintf(header, " END_INTERFACE\n"); fprintf(header, "};\n"); fprintf(header, "#else\n"); @@ -967,7 +970,7 @@ static void write_com_interface_end(FILE *header, type_t *iface) fprintf(header, "#ifdef COBJMACROS\n"); /* dispinterfaces don't have real functions, so don't write macros for them, * only for the interface this interface inherits from, i.e. IDispatch */ - write_method_macro(header, dispinterface ? iface->ref : iface, iface->name); + write_method_macro(header, dispinterface ? type_iface_get_inherit(iface) : iface, iface->name); fprintf(header, "#endif\n"); fprintf(header, "\n"); fprintf(header, "#endif\n"); diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 39f4c2c..0d96ae9 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -194,17 +194,19 @@ int cant_be_null(const var_t *v) static int need_delegation(const type_t *iface) { - return iface->ref && iface->ref->ref && iface->ref->ignore; + return type_iface_get_inherit(iface) && + type_iface_get_inherit(type_iface_get_inherit(iface)) && + type_iface_get_inherit(iface)->ignore; } static int get_delegation_indirect(const type_t *iface, const type_t ** delegate_to) { const type_t * cur_iface; - for (cur_iface = iface; cur_iface != NULL; cur_iface = cur_iface->ref) + for (cur_iface = iface; cur_iface != NULL; cur_iface = type_iface_get_inherit(cur_iface)) if (need_delegation(cur_iface)) { if(delegate_to) - *delegate_to = cur_iface->ref; + *delegate_to = type_iface_get_inherit(cur_iface); return 1; } return 0; @@ -530,7 +532,9 @@ static int count_methods(type_t *iface) const statement_t *stmt; int count = 0; - if (iface->ref) count = count_methods(iface->ref); + if (type_iface_get_inherit(iface)) + count = count_methods(type_iface_get_inherit(iface)); + STATEMENTS_FOR_EACH_FUNC(stmt, iface->details.iface->stmts) { const var_t *func = stmt->u.var; if (!is_callas(func->attrs)) count++; @@ -543,7 +547,9 @@ static int write_proxy_methods(type_t *iface, int skip) const statement_t *stmt; int i = 0; - if (iface->ref) i = write_proxy_methods(iface->ref, need_delegation(iface)); + if (type_iface_get_inherit(iface)) + i = write_proxy_methods(type_iface_get_inherit(iface), + need_delegation(iface)); STATEMENTS_FOR_EACH_FUNC(stmt, iface->details.iface->stmts) { const var_t *func = stmt->u.var; if (!is_callas(func->attrs)) { @@ -561,8 +567,10 @@ static int write_stub_methods(type_t *iface, int skip) const statement_t *stmt; int i = 0; - if (iface->ref) i = write_stub_methods(iface->ref, need_delegation(iface)); - else return i; /* skip IUnknown */ + if (type_iface_get_inherit(iface)) + i = write_stub_methods(type_iface_get_inherit(iface), need_delegation(iface)); + else + return i; /* skip IUnknown */ STATEMENTS_FOR_EACH_FUNC(stmt, iface->details.iface->stmts) { const var_t *func = stmt->u.var; @@ -619,7 +627,9 @@ static void write_proxy(type_t *iface, unsigned int *proc_offset) /* interface didn't have any methods - search in inherited interfaces */ if (midx == -1) { const type_t *inherit_iface; - for (inherit_iface = iface->ref; inherit_iface; inherit_iface = inherit_iface->ref) { + for (inherit_iface = type_iface_get_inherit(iface); + inherit_iface; + inherit_iface = type_iface_get_inherit(inherit_iface)) { STATEMENTS_FOR_EACH_FUNC(stmt, inherit_iface->details.iface->stmts) { const var_t *func = stmt->u.var; int idx = func->type->details.function->idx; @@ -759,7 +769,7 @@ static void build_iface_list( const statement_list_t *stmts, type_t **ifaces[], else if (stmt->type == STMT_TYPE && stmt->u.type->type == RPC_FC_IP) { type_t *iface = stmt->u.type; - if (iface->ref && need_proxy(iface)) + if (type_iface_get_inherit(iface) && need_proxy(iface)) { *ifaces = xrealloc( *ifaces, (*count + 1) * sizeof(*ifaces) ); (*ifaces)[(*count)++] = iface; diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index 83650ee..75f494a 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -86,8 +86,8 @@ static int compute_method_indexes(type_t *iface) if (!iface->details.iface) return 0; - if (iface->ref) - idx = compute_method_indexes(iface->ref); + if (type_iface_get_inherit(iface)) + idx = compute_method_indexes(type_iface_get_inherit(iface)); else idx = 0; diff --git a/tools/widl/typetree.h b/tools/widl/typetree.h index 200d17d..de4dc4b 100644 --- a/tools/widl/typetree.h +++ b/tools/widl/typetree.h @@ -80,6 +80,12 @@ static inline var_list_t *type_union_get_cases(const type_t *type) return type->details.structure->fields; } +static inline type_t *type_iface_get_inherit(const type_t *type) +{ + assert(type->type == RPC_FC_IP); + return type->ref; +} + static inline var_list_t *type_dispiface_get_props(const type_t *type) { assert(type->type == RPC_FC_IP); diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 380710a..4e63769 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -1995,6 +1995,7 @@ static void add_interface_typeinfo(msft_typelib_t *typelib, type_t *interface) msft_typeinfo_t *msft_typeinfo; importinfo_t *ref_importinfo = NULL; int num_parents = 0, num_funcs = 0; + type_t *inherit; const type_t *derived; if (-1 < interface->typelib_idx) @@ -2006,11 +2007,14 @@ static void add_interface_typeinfo(msft_typelib_t *typelib, type_t *interface) /* midl adds the parent interface first, unless the parent itself has no parent (i.e. it stops before IUnknown). */ - if(interface->ref) { - ref_importinfo = find_importinfo(typelib, interface->ref->name); + inherit = type_iface_get_inherit(interface); - if(!ref_importinfo && interface->ref->ref && interface->ref->typelib_idx == -1) - add_interface_typeinfo(typelib, interface->ref); + if(inherit) { + ref_importinfo = find_importinfo(typelib, inherit->name); + + if(!ref_importinfo && type_iface_get_inherit(inherit) && + inherit->typelib_idx == -1) + add_interface_typeinfo(typelib, inherit); } interface->typelib_idx = typelib->typelib_header.nrtypeinfos; @@ -2018,7 +2022,7 @@ static void add_interface_typeinfo(msft_typelib_t *typelib, type_t *interface) msft_typeinfo->typeinfo->size = 4; msft_typeinfo->typeinfo->typekind |= 0x2200; - for (derived = interface->ref; derived; derived = derived->ref) + for (derived = inherit; derived; derived = type_iface_get_inherit(derived)) if (derived->name && !strcmp(derived->name, "IDispatch")) msft_typeinfo->typeinfo->flags |= 0x1000; /* TYPEFLAG_FDISPATCHABLE */ @@ -2026,11 +2030,12 @@ static void add_interface_typeinfo(msft_typelib_t *typelib, type_t *interface) if (!(msft_typeinfo->typeinfo->flags & 0x1000)) /* TYPEFLAG_FDISPATCHABLE */ msft_typeinfo->typeinfo->flags &= ~0x40; /* TYPEFLAG_FDUAL */ - if(interface->ref) - add_impl_type(msft_typeinfo, interface->ref, ref_importinfo); + if(type_iface_get_inherit(interface)) + add_impl_type(msft_typeinfo, type_iface_get_inherit(interface), + ref_importinfo); /* count the number of inherited interfaces and non-local functions */ - for(ref = interface->ref; ref; ref = ref->ref) { + for(ref = inherit; ref; ref = type_iface_get_inherit(ref)) { num_parents++; STATEMENTS_FOR_EACH_FUNC( stmt_func, ref->details.iface->stmts ) { var_t *func = stmt_func->u.var;

1 0

Rob Shearman : widl: Move the ifaces field of the type_t structure to coclass details.
by Alexandre Julliard Jan. 6, 2009

Jan. 6, 2009

Module: wine Branch: master Commit: 8a42bc1f7b615c19d5cb03a8293c3827635bf925 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a42bc1f7b615c19d5cb03a82… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Jan 5 23:34:44 2009 +0000 widl: Move the ifaces field of the type_t structure to coclass details. --- tools/widl/parser.y | 1 - tools/widl/typetree.c | 2 +- tools/widl/typetree.h | 2 +- tools/widl/widltypes.h | 7 ++++++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index b8e1d4d..c9e8844 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1295,7 +1295,6 @@ type_t *make_type(unsigned char type, type_t *ref) t->attrs = NULL; t->orig = NULL; memset(&t->details, 0, sizeof(t->details)); - t->ifaces = NULL; t->typestring_offset = 0; t->ptrdesc = 0; t->declarray = FALSE; diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index 8a42d56..83650ee 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -140,7 +140,7 @@ void type_module_define(type_t *module, statement_list_t *stmts) type_t *type_coclass_define(type_t *coclass, ifref_list_t *ifaces) { - coclass->ifaces = ifaces; + coclass->details.coclass.ifaces = ifaces; coclass->defined = TRUE; return coclass; } diff --git a/tools/widl/typetree.h b/tools/widl/typetree.h index af4d5e6..597531d 100644 --- a/tools/widl/typetree.h +++ b/tools/widl/typetree.h @@ -157,7 +157,7 @@ static inline int type_is_alias(const type_t *type) static inline ifref_list_t *type_coclass_get_ifaces(const type_t *type) { assert(type->type == RPC_FC_COCLASS); - return type->ifaces; + return type->details.coclass.ifaces; } #endif /* WIDL_TYPE_TREE_H */ diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 6835e62..9dd23bf 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -296,6 +296,11 @@ struct array_details expr_t *size_is, *length_is; }; +struct coclass_details +{ + ifref_list_t *ifaces; +}; + struct _type_t { const char *name; unsigned char type; @@ -309,8 +314,8 @@ struct _type_t { struct iface_details *iface; struct module_details *module; struct array_details array; + struct coclass_details coclass; } details; - ifref_list_t *ifaces; /* coclasses */ type_t *orig; /* dup'd types */ unsigned int typestring_offset; unsigned int ptrdesc; /* used for complex structs */

1 0

Rob Shearman : widl: Move creation of module type into a separate function, type_new_module and give it a special FC type.
by Alexandre Julliard Jan. 6, 2009

Jan. 6, 2009

Module: wine Branch: master Commit: 64520ecdc7465d7fa970fb258f222d41b6d158ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=64520ecdc7465d7fa970fb258… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Jan 5 23:34:08 2009 +0000 widl: Move creation of module type into a separate function, type_new_module and give it a special FC type. --- tools/widl/parser.y | 4 ++-- tools/widl/typelib.c | 3 ++- tools/widl/typetree.c | 9 +++++++++ tools/widl/typetree.h | 1 + tools/widl/widltypes.h | 1 + 5 files changed, 15 insertions(+), 3 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 5a42263..bc252e8 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -918,8 +918,8 @@ interfacedec: | dispinterface ';' { $$ = $1; } ; -module: tMODULE aIDENTIFIER { $$ = make_type(0, NULL); $$->name = $2; $$->kind = TKIND_MODULE; } - | tMODULE aKNOWNTYPE { $$ = make_type(0, NULL); $$->name = $2; $$->kind = TKIND_MODULE; } +module: tMODULE aIDENTIFIER { $$ = type_new_module($2); } + | tMODULE aKNOWNTYPE { $$ = type_new_module($2); } ; modulehdr: attributes module { $$ = $2; diff --git a/tools/widl/typelib.c b/tools/widl/typelib.c index e0ef86e..979d3c7 100644 --- a/tools/widl/typelib.c +++ b/tools/widl/typelib.c @@ -209,9 +209,10 @@ unsigned short get_type_vt(type_t *t) case RPC_FC_CVSTRUCT: case RPC_FC_BOGUS_STRUCT: case RPC_FC_COCLASS: + case RPC_FC_MODULE: return VT_USERDEFINED; case 0: - return t->kind == TKIND_PRIMITIVE ? VT_VOID : VT_USERDEFINED; + return VT_VOID; default: error("get_type_vt: unknown type: 0x%02x\n", t->type); } diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index 67c6f8b..47ad1f5 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -70,6 +70,15 @@ type_t *type_new_alias(type_t *t, const char *name) return a; } +type_t *type_new_module(char *name) +{ + type_t *type = make_type(RPC_FC_MODULE, NULL); + type->name = name; + type->kind = TKIND_MODULE; + /* FIXME: register type to detect multiple definitions */ + return type; +} + static int compute_method_indexes(type_t *iface) { int idx; diff --git a/tools/widl/typetree.h b/tools/widl/typetree.h index 24a15ea..a0f819a 100644 --- a/tools/widl/typetree.h +++ b/tools/widl/typetree.h @@ -27,6 +27,7 @@ type_t *type_new_function(var_list_t *args); type_t *type_new_pointer(type_t *ref, attr_list_t *attrs); type_t *type_new_alias(type_t *t, const char *name); +type_t *type_new_module(char *name); void type_interface_define(type_t *iface, type_t *inherit, statement_list_t *stmts); void type_dispinterface_define(type_t *iface, var_list_t *props, func_list_t *methods); void type_dispinterface_define_from_iface(type_t *dispiface, type_t *iface); diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 3f06452..7a55ee7 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -35,6 +35,7 @@ typedef GUID UUID; #define TRUE 1 #define FALSE 0 +#define RPC_FC_MODULE 0xfc #define RPC_FC_COCLASS 0xfd #define RPC_FC_FUNCTION 0xfe

1 0

Rob Shearman : widl: Don' t store typelib kind information in the type structure.
by Alexandre Julliard Jan. 6, 2009

Jan. 6, 2009

Module: wine Branch: master Commit: 1f519e17ccfde8773decbd2f8237bbd240800809 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f519e17ccfde8773decbd2f8… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Jan 5 23:34:23 2009 +0000 widl: Don't store typelib kind information in the type structure. It can trivially be derived from the type field now. --- tools/widl/parser.y | 23 +++++++++-------------- tools/widl/typetree.c | 17 ++++++++--------- tools/widl/typetree.h | 4 ++-- tools/widl/widltypes.h | 2 +- tools/widl/write_msft.c | 34 ++++++++++++++++++++++++++-------- 5 files changed, 46 insertions(+), 34 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index bc252e8..2820f45 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -816,7 +816,7 @@ int_std: tINT { $$ = make_builtin($<str>1); } coclass: tCOCLASS aIDENTIFIER { $$ = make_class($2); } | tCOCLASS aKNOWNTYPE { $$ = find_type($2, 0); - if ($$->kind != TKIND_COCLASS) + if ($$->type != RPC_FC_COCLASS) error_loc("%s was not declared a coclass at %s:%d\n", $2, $$->loc_info.input_name, $$->loc_info.line_number); @@ -844,8 +844,8 @@ coclass_int: m_attributes interfacedec { $$ = make_ifref($2); $$->attrs = $1; } ; -dispinterface: tDISPINTERFACE aIDENTIFIER { $$ = get_type(RPC_FC_IP, $2, 0); $$->kind = TKIND_DISPATCH; } - | tDISPINTERFACE aKNOWNTYPE { $$ = get_type(RPC_FC_IP, $2, 0); $$->kind = TKIND_DISPATCH; } +dispinterface: tDISPINTERFACE aIDENTIFIER { $$ = get_type(RPC_FC_IP, $2, 0); } + | tDISPINTERFACE aKNOWNTYPE { $$ = get_type(RPC_FC_IP, $2, 0); } ; dispinterfacehdr: attributes dispinterface { attr_t *attrs; @@ -882,8 +882,8 @@ inherit: { $$ = NULL; } | ':' aKNOWNTYPE { $$ = find_type_or_error2($2, 0); } ; -interface: tINTERFACE aIDENTIFIER { $$ = get_type(RPC_FC_IP, $2, 0); $$->kind = TKIND_INTERFACE; } - | tINTERFACE aKNOWNTYPE { $$ = get_type(RPC_FC_IP, $2, 0); $$->kind = TKIND_INTERFACE; } +interface: tINTERFACE aIDENTIFIER { $$ = get_type(RPC_FC_IP, $2, 0); } + | tINTERFACE aKNOWNTYPE { $$ = get_type(RPC_FC_IP, $2, 0); } ; interfacehdr: attributes interface { $$.interface = $2; @@ -1293,7 +1293,6 @@ type_t *make_type(unsigned char type, type_t *ref) { type_t *t = alloc_type(); t->name = NULL; - t->kind = TKIND_PRIMITIVE; t->type = type; t->ref = ref; t->attrs = NULL; @@ -1310,6 +1309,7 @@ type_t *make_type(unsigned char type, type_t *ref) t->user_types_registered = FALSE; t->tfswrite = FALSE; t->checked = FALSE; + t->is_alias = FALSE; t->typelib_idx = -1; init_loc_info(&t->loc_info); return t; @@ -1318,7 +1318,6 @@ type_t *make_type(unsigned char type, type_t *ref) static type_t *type_new_enum(char *name, var_list_t *enums) { type_t *t = get_type(RPC_FC_ENUM16, name, tsENUM); - t->kind = TKIND_ENUM; if (enums) { t->details.enumeration = xmalloc(sizeof(*t->details.enumeration)); @@ -1335,7 +1334,6 @@ static type_t *type_new_struct(char *name, int defined, var_list_t *fields) type_t *tag_type = name ? find_type(name, tsSTRUCT) : NULL; type_t *t = make_type(RPC_FC_STRUCT, NULL); t->name = name; - t->kind = TKIND_RECORD; if (defined || (tag_type && tag_type->details.structure)) { if (tag_type && tag_type->details.structure) @@ -1363,7 +1361,6 @@ static type_t *type_new_struct(char *name, int defined, var_list_t *fields) static type_t *type_new_nonencapsulated_union(char *name, var_list_t *fields) { type_t *t = get_type(RPC_FC_NON_ENCAPSULATED_UNION, name, tsUNION); - t->kind = TKIND_UNION; t->details.structure = xmalloc(sizeof(*t->details.structure)); t->details.structure->fields = fields; t->defined = TRUE; @@ -1373,10 +1370,8 @@ static type_t *type_new_nonencapsulated_union(char *name, var_list_t *fields) static type_t *type_new_encapsulated_union(char *name, var_t *switch_field, var_t *union_field, var_list_t *cases) { type_t *t = get_type(RPC_FC_ENCAPSULATED_UNION, name, tsUNION); - t->kind = TKIND_UNION; if (!union_field) union_field = make_var( xstrdup("tagged_union") ); union_field->type = make_type(RPC_FC_NON_ENCAPSULATED_UNION, NULL); - union_field->type->kind = TKIND_UNION; union_field->type->details.structure = xmalloc(sizeof(*union_field->type->details.structure)); union_field->type->details.structure->fields = cases; union_field->type->defined = TRUE; @@ -1706,7 +1701,6 @@ static type_t *make_class(char *name) { type_t *c = make_type(RPC_FC_COCLASS, NULL); c->name = name; - c->kind = TKIND_COCLASS; return c; } @@ -1850,8 +1844,9 @@ static type_t *reg_typedefs(decl_spec_t *decl_spec, declarator_list_t *decls, at /* We must generate names for tagless enum, struct or union. Typedef-ing a tagless enum, struct or union means we want the typedef to be included in a library hence the public attribute. */ - if ((type->kind == TKIND_ENUM || type->kind == TKIND_RECORD - || type->kind == TKIND_UNION) && ! type->name && ! parse_only) + if ((type->type == RPC_FC_ENUM16 || type->type == RPC_FC_ENUM32 || + is_struct(type->type) || is_union(type->type)) && + !type->name && !parse_only) { if (! is_attr(attrs, ATTR_PUBLIC)) attrs = append_attr( attrs, make_attr(ATTR_PUBLIC) ); diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index 47ad1f5..54859be 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -58,23 +58,22 @@ type_t *type_new_pointer(type_t *ref, attr_list_t *attrs) type_t *type_new_alias(type_t *t, const char *name) { - type_t *a = duptype(t, 0); + type_t *a = duptype(t, 0); - a->name = xstrdup(name); - a->kind = TKIND_ALIAS; - a->attrs = NULL; - a->declarray = FALSE; - a->orig = t; - init_loc_info(&a->loc_info); + a->name = xstrdup(name); + a->attrs = NULL; + a->declarray = FALSE; + a->orig = t; + a->is_alias = TRUE; + init_loc_info(&a->loc_info); - return a; + return a; } type_t *type_new_module(char *name) { type_t *type = make_type(RPC_FC_MODULE, NULL); type->name = name; - type->kind = TKIND_MODULE; /* FIXME: register type to detect multiple definitions */ return type; } diff --git a/tools/widl/typetree.h b/tools/widl/typetree.h index a0f819a..0fcfb3a 100644 --- a/tools/widl/typetree.h +++ b/tools/widl/typetree.h @@ -142,7 +142,7 @@ static inline expr_t *type_array_get_variance(const type_t *type) static inline type_t *type_get_real_type(const type_t *type) { - if (type->kind == TKIND_ALIAS) + if (type->is_alias) return type_get_real_type(type->orig); else return (type_t *)type; @@ -150,7 +150,7 @@ static inline type_t *type_get_real_type(const type_t *type) static inline int type_is_alias(const type_t *type) { - return (type->kind == TKIND_ALIAS); + return type->is_alias; } #endif /* WIDL_TYPE_TREE_H */ diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 7a55ee7..6835e62 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -298,7 +298,6 @@ struct array_details struct _type_t { const char *name; - enum type_kind kind; unsigned char type; struct _type_t *ref; attr_list_t *attrs; @@ -324,6 +323,7 @@ struct _type_t { unsigned int user_types_registered : 1; unsigned int tfswrite : 1; /* if the type needs to be written to the TFS */ unsigned int checked : 1; + unsigned int is_alias : 1; /* is the type an alias? */ int sign : 2; }; diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 85dcb0d..d7bbd60 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -2197,24 +2197,42 @@ static void add_module_typeinfo(msft_typelib_t *typelib, type_t *module) static void add_type_typeinfo(msft_typelib_t *typelib, type_t *type) { - switch (type->kind) { - case TKIND_INTERFACE: - case TKIND_DISPATCH: + switch (type->type) { + case RPC_FC_IP: add_interface_typeinfo(typelib, type); break; - case TKIND_RECORD: + case RPC_FC_STRUCT: add_structure_typeinfo(typelib, type); break; - case TKIND_ENUM: + case RPC_FC_ENUM16: + case RPC_FC_ENUM32: add_enum_typeinfo(typelib, type); break; - case TKIND_COCLASS: + case RPC_FC_COCLASS: add_coclass_typeinfo(typelib, type); break; - case TKIND_PRIMITIVE: + case RPC_FC_BYTE: + case RPC_FC_CHAR: + case RPC_FC_USMALL: + case RPC_FC_SMALL: + case RPC_FC_WCHAR: + case RPC_FC_USHORT: + case RPC_FC_SHORT: + case RPC_FC_ULONG: + case RPC_FC_LONG: + case RPC_FC_HYPER: + case RPC_FC_IGNORE: + case RPC_FC_FLOAT: + case RPC_FC_DOUBLE: + case RPC_FC_ERROR_STATUS_T: + case RPC_FC_BIND_PRIMITIVE: + case RPC_FC_RP: + case RPC_FC_UP: + case RPC_FC_OP: + case RPC_FC_FP: break; default: - error("add_entry: unhandled type %d for %s\n", type->kind, type->name); + error("add_entry: unhandled type 0x%x for %s\n", type->type, type->name); break; } }

1 0

Rob Shearman : widl: Add function for getting the interfaces defined by a coclass type.
by Alexandre Julliard Jan. 6, 2009

Jan. 6, 2009

Module: wine Branch: master Commit: 83b1f081176425537fe38c7ad116670b6bc596a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83b1f081176425537fe38c7ad… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Jan 5 23:34:38 2009 +0000 widl: Add function for getting the interfaces defined by a coclass type. Split out the defining of coclass types in the parser into a function. --- tools/widl/parser.y | 5 +---- tools/widl/typetree.c | 7 +++++++ tools/widl/typetree.h | 7 +++++++ tools/widl/write_msft.c | 6 ++++-- 4 files changed, 19 insertions(+), 6 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 2820f45..b8e1d4d 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -830,10 +830,7 @@ coclasshdr: attributes coclass { $$ = $2; ; coclassdef: coclasshdr '{' coclass_ints '}' semicolon_opt - { $$ = $1; - $$->ifaces = $3; - $$->defined = TRUE; - } + { $$ = type_coclass_define($1, $3); } ; coclass_ints: { $$ = NULL; } diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index 54859be..8a42d56 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -137,3 +137,10 @@ void type_module_define(type_t *module, statement_list_t *stmts) module->details.module->stmts = stmts; module->defined = TRUE; } + +type_t *type_coclass_define(type_t *coclass, ifref_list_t *ifaces) +{ + coclass->ifaces = ifaces; + coclass->defined = TRUE; + return coclass; +} diff --git a/tools/widl/typetree.h b/tools/widl/typetree.h index 0fcfb3a..af4d5e6 100644 --- a/tools/widl/typetree.h +++ b/tools/widl/typetree.h @@ -32,6 +32,7 @@ void type_interface_define(type_t *iface, type_t *inherit, statement_list_t *stm void type_dispinterface_define(type_t *iface, var_list_t *props, func_list_t *methods); void type_dispinterface_define_from_iface(type_t *dispiface, type_t *iface); void type_module_define(type_t *module, statement_list_t *stmts); +type_t *type_coclass_define(type_t *coclass, ifref_list_t *ifaces); /* FIXME: shouldn't need to export this */ type_t *duptype(type_t *t, int dupname); @@ -153,4 +154,10 @@ static inline int type_is_alias(const type_t *type) return type->is_alias; } +static inline ifref_list_t *type_coclass_get_ifaces(const type_t *type) +{ + assert(type->type == RPC_FC_COCLASS); + return type->ifaces; +} + #endif /* WIDL_TYPE_TREE_H */ diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index d7bbd60..bf95b13 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -2099,6 +2099,7 @@ static void add_coclass_typeinfo(msft_typelib_t *typelib, type_t *cls) MSFT_RefRecord *ref, *first = NULL, *first_source = NULL; int have_default = 0, have_default_source = 0; const attr_t *attr; + ifref_list_t *ifaces; if (-1 < cls->typelib_idx) return; @@ -2106,13 +2107,14 @@ static void add_coclass_typeinfo(msft_typelib_t *typelib, type_t *cls) cls->typelib_idx = typelib->typelib_header.nrtypeinfos; msft_typeinfo = create_msft_typeinfo(typelib, TKIND_COCLASS, cls->name, cls->attrs); - if (cls->ifaces) LIST_FOR_EACH_ENTRY( iref, cls->ifaces, ifref_t, entry ) num_ifaces++; + ifaces = type_coclass_get_ifaces(cls); + if (ifaces) LIST_FOR_EACH_ENTRY( iref, ifaces, ifref_t, entry ) num_ifaces++; offset = msft_typeinfo->typeinfo->datatype1 = ctl2_alloc_segment(typelib, MSFT_SEG_REFERENCES, num_ifaces * sizeof(*ref), 0); i = 0; - if (cls->ifaces) LIST_FOR_EACH_ENTRY( iref, cls->ifaces, ifref_t, entry ) { + if (ifaces) LIST_FOR_EACH_ENTRY( iref, ifaces, ifref_t, entry ) { if(iref->iface->typelib_idx == -1) add_interface_typeinfo(typelib, iref->iface); ref = (MSFT_RefRecord*) (typelib->typelib_segment_data[MSFT_SEG_REFERENCES] + offset + i * sizeof(*ref));

1 0