November 2018 - Wine-commits

Alexandre Julliard : Wine release 3.20
by Alexandre Julliard 09 Nov '18

09 Nov '18

Module: website Branch: master Commit: ac539bc51cbf03386354f3ec26c3eef053ff306a URL: https://source.winehq.org/git/website.git/?a=commit;h=ac539bc51cbf03386354f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 9 21:12:37 2018 +0100 Wine release 3.20 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2018110901.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2018110901.xml b/news/en/2018110901.xml new file mode 100644 index 0000000..9cd4475 --- /dev/null +++ b/news/en/2018110901.xml @@ -0,0 +1,17 @@ +<news> +<date>November 9, 2018</date> +<title>Wine 3.20 Released</title> +<body> + The Wine development release 3.20 is now available. + <a href="{$root}/announce/3.20">What's new</a> in this release: +<ul> + <li>Async interfaces and ACF files in the IDL compiler.</li> + <li>Support for substorage transforms in MSI.</li> + <li>RPC/COM marshalling fixes.</li> + <li>Support for Unicode requests in WinHTTP.</li> + <li>Shell Autocomplete optimizations.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/3.x/wine-3.20.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-3.20 : Alexandre Julliard : Release 3.20
by Alexandre Julliard 09 Nov '18

09 Nov '18

Module: wine Branch: refs/tags/wine-3.20 Tag: a161057591a9b7671a48870bf04549c93c1614c1 URL: https://source.winehq.org/git/wine.git/?a=tag;h=a161057591a9b7671a48870bf04… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 9 21:10:17 2018 +0100 Release 3.20

1 0

Hans Leidekker : msi: Support substorage transforms in MsiDatabaseApplyTransform.
by Alexandre Julliard 09 Nov '18

09 Nov '18

Module: wine Branch: master Commit: ef86011ba40ef90eefb5e54059d907753ec8d694 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef86011ba40ef90eefb5e540… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Nov 9 14:50:34 2018 +0100 msi: Support substorage transforms in MsiDatabaseApplyTransform. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=40206 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/msiquery.c | 68 +++++++++++++++++++++++++++-------------------------- 1 file changed, 35 insertions(+), 33 deletions(-) diff --git a/dlls/msi/msiquery.c b/dlls/msi/msiquery.c index 701a347..db5660a 100644 --- a/dlls/msi/msiquery.c +++ b/dlls/msi/msiquery.c @@ -824,50 +824,55 @@ MSIHANDLE WINAPI MsiGetLastErrorRecord( void ) return 0; } -UINT MSI_DatabaseApplyTransformW( MSIDATABASE *db, - LPCWSTR szTransformFile, int iErrorCond ) +UINT MSI_DatabaseApplyTransformW( MSIDATABASE *db, const WCHAR *transform, int error_cond ) { - HRESULT r; + HRESULT hr; UINT ret = ERROR_FUNCTION_FAILED; - IStorage *stg = NULL; + IStorage *stg; STATSTG stat; - TRACE("%p %s %d\n", db, debugstr_w(szTransformFile), iErrorCond); + TRACE( "%p %s %08x\n", db, debugstr_w(transform), error_cond ); - r = StgOpenStorage( szTransformFile, NULL, - STGM_DIRECT|STGM_READ|STGM_SHARE_DENY_WRITE, NULL, 0, &stg); - if ( FAILED(r) ) + if (*transform == ':') { - WARN("failed to open transform 0x%08x\n", r); - return ret; + hr = IStorage_OpenStorage( db->storage, transform + 1, NULL, STGM_SHARE_EXCLUSIVE, NULL, 0, &stg ); + if (FAILED( hr )) + { + WARN( "failed to open substorage transform 0x%08x\n", hr ); + return ERROR_FUNCTION_FAILED; + } + } + else + { + hr = StgOpenStorage( transform, NULL, STGM_DIRECT|STGM_READ|STGM_SHARE_DENY_WRITE, NULL, 0, &stg ); + if (FAILED( hr )) + { + WARN( "failed to open file transform 0x%08x\n", hr ); + return ERROR_FUNCTION_FAILED; + } } - r = IStorage_Stat( stg, &stat, STATFLAG_NONAME ); - if ( FAILED( r ) ) - goto end; - - if ( !IsEqualGUID( &stat.clsid, &CLSID_MsiTransform ) ) - goto end; - - if( TRACE_ON( msi ) ) - enum_stream_names( stg ); + hr = IStorage_Stat( stg, &stat, STATFLAG_NONAME ); + if (FAILED( hr )) goto end; + if (!IsEqualGUID( &stat.clsid, &CLSID_MsiTransform )) goto end; + if (TRACE_ON( msi )) enum_stream_names( stg ); ret = msi_table_apply_transform( db, stg ); end: IStorage_Release( stg ); - return ret; } -UINT WINAPI MsiDatabaseApplyTransformW( MSIHANDLE hdb, - LPCWSTR szTransformFile, int iErrorCond) +UINT WINAPI MsiDatabaseApplyTransformW( MSIHANDLE hdb, const WCHAR *transform, int error_cond ) { MSIDATABASE *db; UINT r; + if (error_cond) FIXME( "ignoring error conditions\n" ); + db = msihandle2msiinfo( hdb, MSIHANDLETYPE_DATABASE ); - if( !db ) + if (!db) { MSIHANDLE remote; @@ -879,27 +884,24 @@ UINT WINAPI MsiDatabaseApplyTransformW( MSIHANDLE hdb, return ERROR_SUCCESS; } - r = MSI_DatabaseApplyTransformW( db, szTransformFile, iErrorCond ); + r = MSI_DatabaseApplyTransformW( db, transform, error_cond ); msiobj_release( &db->hdr ); return r; } -UINT WINAPI MsiDatabaseApplyTransformA( MSIHANDLE hdb, - LPCSTR szTransformFile, int iErrorCond) +UINT WINAPI MsiDatabaseApplyTransformA( MSIHANDLE hdb, const char *transform, int error_cond ) { - LPWSTR wstr; + WCHAR *wstr; UINT ret; - TRACE("%d %s %d\n", hdb, debugstr_a(szTransformFile), iErrorCond); + TRACE( "%d %s %08x\n", hdb, debugstr_a(transform), error_cond ); - wstr = strdupAtoW( szTransformFile ); - if( szTransformFile && !wstr ) + wstr = strdupAtoW( transform ); + if (transform && !wstr) return ERROR_NOT_ENOUGH_MEMORY; - ret = MsiDatabaseApplyTransformW( hdb, wstr, iErrorCond); - + ret = MsiDatabaseApplyTransformW( hdb, wstr, error_cond ); msi_free( wstr ); - return ret; }

1 0

Alexandre Julliard : Release 3.20.
by Alexandre Julliard 09 Nov '18

09 Nov '18

Module: wine Branch: master Commit: e9e12bda62fee68e9fbac5849f7ad1e199ee38b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9e12bda62fee68e9fbac584… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 9 21:10:16 2018 +0100 Release 3.20. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 684 +++++++++++++++++++++++++++++++------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 356 insertions(+), 348 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e9e12bda62fee68e9fba…

1 0

Hans Leidekker : rsaenh: Fix a memory leak (Valgrind).
by Alexandre Julliard 09 Nov '18

09 Nov '18

Module: wine Branch: master Commit: 633779b4728f635646f4f8d8bbd940cec3feeb48 URL: https://source.winehq.org/git/wine.git/?a=commit;h=633779b4728f635646f4f8d8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Nov 9 14:54:59 2018 +0100 rsaenh: Fix a memory leak (Valgrind). Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rsaenh/rsaenh.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index bc10fc7..c22b3dc 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -3628,17 +3628,18 @@ BOOL WINAPI RSAENH_CPGetHashParam(HCRYPTPROV hProv, HCRYPTHASH hHash, DWORD dwPa &pCryptHash->tpPRFParams.blobSeed, pbData, *pdwDataLen); } - if ( pbData == NULL ) { - *pdwDataLen = pCryptHash->dwHashSize; - return TRUE; - } - - if (pbData && (pCryptHash->dwState != RSAENH_HASHSTATE_FINISHED)) + if (pCryptHash->dwState != RSAENH_HASHSTATE_FINISHED) { finalize_hash(pCryptHash); pCryptHash->dwState = RSAENH_HASHSTATE_FINISHED; } + if (!pbData) + { + *pdwDataLen = pCryptHash->dwHashSize; + return TRUE; + } + return copy_param(pbData, pdwDataLen, pCryptHash->abHashValue, pCryptHash->dwHashSize);

1 0

Hans Leidekker : winhttp/tests: Avoid an invalid write in asynchronous mode (Valgrind).
by Alexandre Julliard 09 Nov '18

09 Nov '18

Module: wine Branch: master Commit: 165000d4573f3b46c4dd791c33ce7db443c19537 URL: https://source.winehq.org/git/wine.git/?a=commit;h=165000d4573f3b46c4dd791c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Nov 9 14:55:00 2018 +0100 winhttp/tests: Avoid an invalid write in asynchronous mode (Valgrind). Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/tests/notification.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c index 086f2e7..510d9e7 100644 --- a/dlls/winhttp/tests/notification.c +++ b/dlls/winhttp/tests/notification.c @@ -920,7 +920,7 @@ static const struct notification read_allow_close_test[] = static void _read_request_data(struct test_request *req, struct info *info, const char *expected_data, BOOL closing_connection, unsigned line) { char buffer[1024]; - DWORD read, len; + DWORD len; BOOL ret; if (closing_connection) @@ -937,8 +937,7 @@ static void _read_request_data(struct test_request *req, struct info *info, cons setup_test( info, winhttp_read_data, line ); memset(buffer, '?', sizeof(buffer)); - read = 0xdeadbeef; - ret = WinHttpReadData( req->request, buffer, sizeof(buffer), &read ); + ret = WinHttpReadData( req->request, buffer, sizeof(buffer), NULL ); ok(ret, "failed to read data %u\n", GetLastError()); WaitForSingleObject( info->wait, INFINITE );

1 0

Michael Stefaniuc : appwiz.cpl: Use the ARRAY_SIZE() macro.
by Alexandre Julliard 09 Nov '18

09 Nov '18

Module: wine Branch: master Commit: 68a47a8b067bc451a5bffce30f23a35b12109ee9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=68a47a8b067bc451a5bffce3… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Nov 9 19:03:40 2018 +0100 appwiz.cpl: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/appwiz.cpl/addons.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 4e87467..c34101f 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -636,14 +636,14 @@ static void append_url_params( WCHAR *url ) DWORD len = strlenW(url); memcpy(url+len, arch_formatW, sizeof(arch_formatW)); - len += sizeof(arch_formatW)/sizeof(WCHAR); + len += ARRAY_SIZE(arch_formatW); len += MultiByteToWideChar(CP_ACP, 0, ARCH_STRING, sizeof(ARCH_STRING), url+len, size/sizeof(WCHAR)-len)-1; memcpy(url+len, v_formatW, sizeof(v_formatW)); - len += sizeof(v_formatW)/sizeof(WCHAR); + len += ARRAY_SIZE(v_formatW); len += MultiByteToWideChar(CP_ACP, 0, addon->version, -1, url+len, size/sizeof(WCHAR)-len)-1; memcpy(url+len, winevW, sizeof(winevW)); - len += sizeof(winevW)/sizeof(WCHAR); + len += ARRAY_SIZE(winevW); MultiByteToWideChar(CP_ACP, 0, PACKAGE_VERSION, -1, url+len, size/sizeof(WCHAR)-len); } @@ -717,9 +717,9 @@ static void run_winebrowser(const WCHAR *url) url_len = strlenW(url); - len = GetSystemDirectoryW(app, MAX_PATH-sizeof(winebrowserW)/sizeof(WCHAR)); + len = GetSystemDirectoryW(app, MAX_PATH - ARRAY_SIZE(winebrowserW)); memcpy(app+len, winebrowserW, sizeof(winebrowserW)); - len += sizeof(winebrowserW)/sizeof(WCHAR) -1; + len += ARRAY_SIZE(winebrowserW) - 1; args = heap_alloc((len+1+url_len)*sizeof(WCHAR)); if(!args)

1 0

Jacek Caban : widl: Write type string for serialized types.
by Alexandre Julliard 09 Nov '18

09 Nov '18

Module: wine Branch: master Commit: ed1176566536e933c612cb561b1ad11f3623b2ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed1176566536e933c612cb56… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 9 13:51:10 2018 +0100 widl: Write type string for serialized types. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/typegen.c | 55 +++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 42 insertions(+), 13 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 8b23c63..27ba60f 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -3680,25 +3680,54 @@ static int write_embedded_types(FILE *file, const attr_list_t *attrs, type_t *ty static void process_tfs_iface(type_t *iface, FILE *file, int indent, unsigned int *offset) { - const statement_t *stmt_func; + const statement_list_t *stmts = type_iface_get_stmts(iface); + const statement_t *stmt; var_t *var; current_iface = iface; - STATEMENTS_FOR_EACH_FUNC( stmt_func, type_iface_get_stmts(iface) ) + if (stmts) LIST_FOR_EACH_ENTRY( stmt, stmts, statement_t, entry ) { - const var_t *func = stmt_func->u.var; - current_func = func; - if (is_local(func->attrs)) continue; + switch(stmt->type) + { + case STMT_DECLARATION: + { + const var_t *func = stmt->u.var; + + if(stmt->u.var->stgclass != STG_NONE + || type_get_type_detect_alias(stmt->u.var->type) != TYPE_FUNCTION) + continue; - var = type_function_get_retval(func->type); - if (!is_void(var->type)) - var->typestring_offset = write_type_tfs( file, 2, func->attrs, var->type, func->name, - TYPE_CONTEXT_PARAM, offset); + current_func = func; + if (is_local(func->attrs)) continue; - if (type_get_function_args(func->type)) - LIST_FOR_EACH_ENTRY( var, type_get_function_args(func->type), var_t, entry ) - var->typestring_offset = write_type_tfs( file, 2, var->attrs, var->type, var->name, - TYPE_CONTEXT_TOPLEVELPARAM, offset ); + var = type_function_get_retval(func->type); + if (!is_void(var->type)) + var->typestring_offset = write_type_tfs( file, 2, func->attrs, var->type, func->name, + TYPE_CONTEXT_PARAM, offset); + + if (type_get_function_args(func->type)) + LIST_FOR_EACH_ENTRY( var, type_get_function_args(func->type), var_t, entry ) + var->typestring_offset = write_type_tfs( file, 2, var->attrs, var->type, var->name, + TYPE_CONTEXT_TOPLEVELPARAM, offset ); + break; + + } + case STMT_TYPEDEF: + { + const type_list_t *type_entry; + for (type_entry = stmt->u.type_list; type_entry; type_entry = type_entry->next) + { + if (is_attr(type_entry->type->attrs, ATTR_ENCODE) + || is_attr(type_entry->type->attrs, ATTR_DECODE)) + type_entry->type->typestring_offset = write_type_tfs( file, 2, + type_entry->type->attrs, type_entry->type, type_entry->type->name, + TYPE_CONTEXT_CONTAINER, offset); + } + break; + } + default: + break; + } } }

1 0

Jacek Caban : widl: Preprocess and attempt to parse provided ACF file.
by Alexandre Julliard 09 Nov '18

09 Nov '18

Module: wine Branch: master Commit: d6b76df314b8d7b265276a68ebeb1266933306ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6b76df314b8d7b265276a68… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 9 13:51:00 2018 +0100 widl: Preprocess and attempt to parse provided ACF file. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.l | 45 ++++++++++++++++++++++++++++++++++++++++++--- tools/widl/parser.y | 9 +++++++-- 2 files changed, 49 insertions(+), 5 deletions(-) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 342109e..3cbf4ff 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -76,6 +76,8 @@ static int cbufalloc = 0; static int kw_token(const char *kw); static int attr_token(const char *kw); +static void switch_to_acf(void); + static warning_list_t *disabled_warnings = NULL; #define MAX_IMPORT_DEPTH 20 @@ -225,9 +227,14 @@ SAFEARRAY{ws}*/\( return tSAFEARRAY; <INITIAL,ATTR>\.\.\. return ELLIPSIS; <INITIAL,ATTR>. return yytext[0]; <<EOF>> { - if (import_stack_ptr) - return aEOF; - else yyterminate(); + if (import_stack_ptr) + return aEOF; + if (acf_name) + { + switch_to_acf(); + return aACF; + } + yyterminate(); } %% @@ -563,6 +570,38 @@ void abort_import(void) unlink(import_stack[ptr].temp_name); } +static void switch_to_acf(void) +{ + int ptr = import_stack_ptr; + int ret, fd; + char *name; + FILE *f; + + assert(import_stack_ptr == 0); + + input_name = acf_name; + acf_name = NULL; + line_number = 1; + + name = xstrdup( "widl.XXXXXX" ); + if((fd = mkstemps( name, 0 )) == -1) + error("Could not generate a temp name from %s\n", name); + + temp_name = name; + if (!(f = fdopen(fd, "wt"))) + error("Could not open fd %s for writing\n", name); + + ret = wpp_parse(input_name, f); + fclose(f); + if (ret) exit(1); + + if((f = fopen(temp_name, "r")) == NULL) + error_loc("Unable to open %s\n", temp_name); + + import_stack[ptr].state = YY_CURRENT_BUFFER; + yy_switch_to_buffer(yy_create_buffer(f, YY_BUF_SIZE)); +} + static void warning_disable(int warning) { warning_t *warning_entry; diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 757d796..542ee43 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -173,7 +173,7 @@ static typelib_t *current_typelib; %token <dbl> aDOUBLE %token <str> aSTRING aWSTRING aSQSTRING %token <uuid> aUUID -%token aEOF +%token aEOF aACF %token SHL SHR %token MEMBERPTR %token EQUALITY INEQUALITY @@ -321,7 +321,7 @@ static typelib_t *current_typelib; %% -input: gbl_statements { fix_incomplete(); +input: gbl_statements m_acf { fix_incomplete(); check_statements($1, FALSE); check_all_user_types($1); write_header($1); @@ -336,6 +336,8 @@ input: gbl_statements { fix_incomplete(); } ; +m_acf: /* empty */ | aACF acf_statements + gbl_statements: { $$ = NULL; } | gbl_statements namespacedef '{' { push_namespace($2); } gbl_statements '}' { pop_namespace($2); $$ = append_statements($1, $5); } @@ -1150,6 +1152,9 @@ version: | aHEXNUM { $$ = $1; } ; +acf_statements + : /* empty */ + %% static void decl_builtin_basic(const char *name, enum type_basic_type type)

1 0

Jacek Caban : widl: Add -acf command line option.
by Alexandre Julliard 09 Nov '18

09 Nov '18

Module: wine Branch: master Commit: 1db0ad9798fe58450d298435eaeb80586b57dfac URL: https://source.winehq.org/git/wine.git/?a=commit;h=1db0ad9798fe58450d298435… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 9 14:16:51 2018 +0100 widl: Add -acf command line option. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/widl.c | 17 ++++++++++++----- tools/widl/widl.h | 1 + tools/widl/widl.man.in | 2 ++ 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 3baebd0..410efb4 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -51,6 +51,7 @@ static const char usage[] = "Usage: widl [options...] infile.idl\n" " or: widl [options...] --dlldata-only name1 [name2...]\n" +" --acf=file Use ACF file\n" " -app_config Ignored, present for midl compatibility\n" " -b arch Set the target architecture\n" " -c Generate client stub\n" @@ -122,6 +123,7 @@ static enum stub_mode stub_mode = MODE_Os; char *input_name; char *input_idl_name; +char *acf_name; char *header_name; char *local_stubs_name; char *header_token; @@ -151,6 +153,8 @@ time_t now; enum { OLDNAMES_OPTION = CHAR_MAX + 1, + ACF_OPTION, + APP_CONFIG_OPTION, DLLDATA_OPTION, DLLDATA_ONLY_OPTION, LOCAL_STUBS_OPTION, @@ -160,17 +164,18 @@ enum { PRINT_HELP, RT_NS_PREFIX, RT_OPTION, + ROBUST_OPTION, WIN32_OPTION, WIN64_OPTION, WIN32_ALIGN_OPTION, - WIN64_ALIGN_OPTION, - APP_CONFIG_OPTION, - ROBUST_OPTION + WIN64_ALIGN_OPTION }; static const char short_options[] = "b:cC:d:D:EhH:I:m:No:O:pP:rsS:tT:uU:VW"; static const struct option long_options[] = { + { "acf", 1, NULL, ACF_OPTION }, + { "app_config", 0, NULL, APP_CONFIG_OPTION }, { "dlldata", 1, NULL, DLLDATA_OPTION }, { "dlldata-only", 0, NULL, DLLDATA_ONLY_OPTION }, { "help", 0, NULL, PRINT_HELP }, @@ -187,7 +192,6 @@ static const struct option long_options[] = { { "win64", 0, NULL, WIN64_OPTION }, { "win32-align", 1, NULL, WIN32_ALIGN_OPTION }, { "win64-align", 1, NULL, WIN64_ALIGN_OPTION }, - { "app_config", 0, NULL, APP_CONFIG_OPTION }, { NULL, 0, NULL, 0 } }; @@ -613,10 +617,13 @@ int main(int argc,char *argv[]) if(win64_packing != 2 && win64_packing != 4 && win64_packing != 8) error("Packing must be one of 2, 4 or 8\n"); break; + case ACF_OPTION: + acf_name = xstrdup(optarg); + break; case APP_CONFIG_OPTION: /* widl does not distinguish between app_mode and default mode, but we ignore this option for midl compatibility */ - break; + break; case ROBUST_OPTION: /* FIXME: Support robust option */ break; diff --git a/tools/widl/widl.h b/tools/widl/widl.h index 7530f9f..118e224 100644 --- a/tools/widl/widl.h +++ b/tools/widl/widl.h @@ -54,6 +54,7 @@ extern int use_abi_namespace; extern char *input_name; extern char *input_idl_name; +extern char *acf_name; extern char *header_name; extern char *header_token; extern char *local_stubs_name; diff --git a/tools/widl/widl.man.in b/tools/widl/widl.man.in index d8b665e..7d89db3 100644 --- a/tools/widl/widl.man.in +++ b/tools/widl/widl.man.in @@ -121,6 +121,8 @@ number. For the meaning of values, see the \fBDEBUG\fR section. .B Miscellaneous options: .IP "\fB-app_config\fR" Ignored, present for midl compatibility. +.IP "\fB--acf=\fIfile\fR" +Use specified application configuration file. .IP "\fB--local-stubs=\fIfile\fR" Generate empty stubs for call_as/local methods in an object interface and write them to \fIfile\fR.

1 0