December 2008 - Wine-commits

Alexandre Julliard : server: Make module handles always 64-bit.
by Alexandre Julliard 30 Dec '08

30 Dec '08

Module: wine Branch: master Commit: f2c4e09e8082fbc78405c3c999bb3ba412bf7ed6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2c4e09e8082fbc78405c3c99… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 29 16:47:51 2008 +0100 server: Make module handles always 64-bit. --- dlls/kernel32/debugger.c | 6 ++-- dlls/ntdll/loader.c | 6 ++-- dlls/ntdll/process.c | 2 +- dlls/ntdll/server.c | 2 +- dlls/user32/class.c | 10 +++--- dlls/user32/win.c | 10 +++--- include/wine/server.h | 12 +++++++ include/wine/server_protocol.h | 14 ++++---- server/protocol.def | 12 +++--- server/trace.c | 69 +++++++++++++++++++++++++++------------- server/window.c | 2 +- tools/make_requests | 2 +- 12 files changed, 92 insertions(+), 55 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f2c4e09e8082fbc78405c…

1 0

Alexandre Julliard : server: Store module names as client_ptr_t instead of void pointers.
by Alexandre Julliard 30 Dec '08

30 Dec '08

Module: wine Branch: master Commit: 947976f22cb80a0cb14cc3da71622a62f9628968 URL: http://source.winehq.org/git/wine.git/?a=commit;h=947976f22cb80a0cb14cc3da7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 29 17:10:11 2008 +0100 server: Store module names as client_ptr_t instead of void pointers. --- dlls/kernel32/debugger.c | 4 ++-- dlls/ntdll/loader.c | 4 ++-- include/wine/server_protocol.h | 8 ++++---- server/process.h | 2 +- server/protocol.def | 6 +++--- server/trace.c | 18 +++++++++++------- tools/make_requests | 1 + 7 files changed, 24 insertions(+), 19 deletions(-) diff --git a/dlls/kernel32/debugger.c b/dlls/kernel32/debugger.c index 78f282f..b50f0c3 100644 --- a/dlls/kernel32/debugger.c +++ b/dlls/kernel32/debugger.c @@ -91,7 +91,7 @@ BOOL WINAPI WaitForDebugEvent( event->u.CreateProcessInfo.nDebugInfoSize = data.info.create_process.dbg_size; event->u.CreateProcessInfo.lpThreadLocalBase = data.info.create_process.teb; event->u.CreateProcessInfo.lpStartAddress = data.info.create_process.start; - event->u.CreateProcessInfo.lpImageName = data.info.create_process.name; + event->u.CreateProcessInfo.lpImageName = wine_server_get_ptr( data.info.create_process.name ); event->u.CreateProcessInfo.fUnicode = data.info.create_process.unicode; break; case EXIT_THREAD_DEBUG_EVENT: @@ -105,7 +105,7 @@ BOOL WINAPI WaitForDebugEvent( event->u.LoadDll.lpBaseOfDll = wine_server_get_ptr( data.info.load_dll.base ); event->u.LoadDll.dwDebugInfoFileOffset = data.info.load_dll.dbg_offset; event->u.LoadDll.nDebugInfoSize = data.info.load_dll.dbg_size; - event->u.LoadDll.lpImageName = data.info.load_dll.name; + event->u.LoadDll.lpImageName = wine_server_get_ptr( data.info.load_dll.name ); event->u.LoadDll.fUnicode = data.info.load_dll.unicode; break; case UNLOAD_DLL_DEBUG_EVENT: diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index f07a974..560a932 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1451,7 +1451,7 @@ static void load_builtin_callback( void *module, const char *filename ) req->size = nt->OptionalHeader.SizeOfImage; req->dbg_offset = nt->FileHeader.PointerToSymbolTable; req->dbg_size = nt->FileHeader.NumberOfSymbols; - req->name = &wm->ldr.FullDllName.Buffer; + req->name = wine_server_client_ptr( &wm->ldr.FullDllName.Buffer ); wine_server_add_data( req, wm->ldr.FullDllName.Buffer, wm->ldr.FullDllName.Length ); wine_server_call( req ); } @@ -1533,7 +1533,7 @@ static NTSTATUS load_native_dll( LPCWSTR load_path, LPCWSTR name, HANDLE file, req->size = nt->OptionalHeader.SizeOfImage; req->dbg_offset = nt->FileHeader.PointerToSymbolTable; req->dbg_size = nt->FileHeader.NumberOfSymbols; - req->name = &wm->ldr.FullDllName.Buffer; + req->name = wine_server_client_ptr( &wm->ldr.FullDllName.Buffer ); wine_server_add_data( req, wm->ldr.FullDllName.Buffer, wm->ldr.FullDllName.Length ); wine_server_call( req ); } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 766ccce..d538d80 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -75,7 +75,7 @@ struct debug_event_create_process int dbg_size; void *teb; void *start; - void *name; + client_ptr_t name; int unicode; }; struct debug_event_exit @@ -88,7 +88,7 @@ struct debug_event_load_dll mod_handle_t base; int dbg_offset; int dbg_size; - void *name; + client_ptr_t name; int unicode; }; struct debug_event_unload_dll @@ -723,7 +723,7 @@ struct load_dll_request struct request_header __header; obj_handle_t handle; mod_handle_t base; - void* name; + client_ptr_t name; data_size_t size; int dbg_offset; int dbg_size; @@ -5052,6 +5052,6 @@ union generic_reply struct set_window_layered_info_reply set_window_layered_info_reply; }; -#define SERVER_PROTOCOL_VERSION 356 +#define SERVER_PROTOCOL_VERSION 357 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/process.h b/server/process.h index 1f98958..fa80818 100644 --- a/server/process.h +++ b/server/process.h @@ -38,7 +38,7 @@ struct process_dll struct list entry; /* entry in per-process dll list */ struct file *file; /* dll file */ mod_handle_t base; /* dll base address (in process addr space) */ - void *name; /* ptr to ptr to name (in process addr space) */ + client_ptr_t name; /* ptr to ptr to name (in process addr space) */ data_size_t size; /* dll size */ int dbg_offset; /* debug info offset */ int dbg_size; /* debug info size */ diff --git a/server/protocol.def b/server/protocol.def index c2478f1..69d5928 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -91,7 +91,7 @@ struct debug_event_create_process int dbg_size; /* size of debug info */ void *teb; /* thread teb (in debugged process address space) */ void *start; /* thread startup routine */ - void *name; /* image name (optional) */ + client_ptr_t name; /* image name (optional) */ int unicode; /* is it Unicode? */ }; struct debug_event_exit @@ -104,7 +104,7 @@ struct debug_event_load_dll mod_handle_t base; /* base address of the dll */ int dbg_offset; /* offset of debug info in file */ int dbg_size; /* size of debug info */ - void *name; /* image name (optional) */ + client_ptr_t name; /* image name (optional) */ int unicode; /* is it Unicode? */ }; struct debug_event_unload_dll @@ -659,7 +659,7 @@ typedef union @REQ(load_dll) obj_handle_t handle; /* file handle */ mod_handle_t base; /* base address */ - void* name; /* ptr to ptr to name (in process addr space) */ + client_ptr_t name; /* ptr to ptr to name (in process addr space) */ data_size_t size; /* dll size */ int dbg_offset; /* debug info offset */ int dbg_size; /* debug info size */ diff --git a/server/trace.c b/server/trace.c index 8ca23f0..3cafe4a 100644 --- a/server/trace.c +++ b/server/trace.c @@ -459,10 +459,11 @@ static void dump_varargs_debug_event( data_size_t size ) event->info.create_process.file, event->info.create_process.process, event->info.create_process.thread ); dump_uint64( &event->info.create_process.base ); - fprintf( stderr, ",offset=%d,size=%d,teb=%p,start=%p,name=%p,unicode=%d}", + fprintf( stderr, ",offset=%d,size=%d,teb=%p,start=%p,name=", event->info.create_process.dbg_offset, event->info.create_process.dbg_size, - event->info.create_process.teb, event->info.create_process.start, - event->info.create_process.name, event->info.create_process.unicode ); + event->info.create_process.teb, event->info.create_process.start ); + dump_uint64( &event->info.create_process.name ); + fprintf( stderr, ",unicode=%d}", event->info.create_process.unicode ); break; case EXIT_THREAD_DEBUG_EVENT: fprintf( stderr, "{exit_thread,code=%d}", event->info.exit.exit_code ); @@ -473,9 +474,10 @@ static void dump_varargs_debug_event( data_size_t size ) case LOAD_DLL_DEBUG_EVENT: fprintf( stderr, "{load_dll,file=%04x,base", event->info.load_dll.handle ); dump_uint64( &event->info.load_dll.base ); - fprintf( stderr, ",offset=%d,size=%d,name=%p,unicode=%d}", - event->info.load_dll.dbg_offset, event->info.load_dll.dbg_size, - event->info.load_dll.name, event->info.load_dll.unicode ); + fprintf( stderr, ",offset=%d,size=%d,name=", + event->info.load_dll.dbg_offset, event->info.load_dll.dbg_size ); + dump_uint64( &event->info.load_dll.name ); + fprintf( stderr, ",unicode=%d}", event->info.load_dll.unicode ); break; case UNLOAD_DLL_DEBUG_EVENT: fputs( "{unload_dll,base=", stderr ); @@ -1071,7 +1073,9 @@ static void dump_load_dll_request( const struct load_dll_request *req ) fprintf( stderr, " base=" ); dump_uint64( &req->base ); fprintf( stderr, "," ); - fprintf( stderr, " name=%p,", req->name ); + fprintf( stderr, " name=" ); + dump_uint64( &req->name ); + fprintf( stderr, "," ); fprintf( stderr, " size=%u,", req->size ); fprintf( stderr, " dbg_offset=%d,", req->dbg_offset ); fprintf( stderr, " dbg_size=%d,", req->dbg_size ); diff --git a/tools/make_requests b/tools/make_requests index 82ffff0..eeec934 100755 --- a/tools/make_requests +++ b/tools/make_requests @@ -36,6 +36,7 @@ my %formats = "user_handle_t" => [ 4, 4, "%08x" ], "process_id_t" => [ 4, 4, "%04x" ], "thread_id_t" => [ 4, 4, "%04x" ], + "client_ptr_t" => [ 8, 8, "&dump_uint64" ], "mod_handle_t" => [ 8, 8, "&dump_uint64" ], "lparam_t" => [ 8, 8, "&dump_uint64" ], "apc_param_t" => [ 8, 8, "&dump_uint64" ],

1 0

Jacek Caban : tools: Added Wine Gecko 0.9.0 redirection.
by Alexandre Julliard 30 Dec '08

30 Dec '08

Module: tools Branch: master Commit: 8fbd1a2ca902548186c8cdd45ba2c33a492ff75b URL: http://source.winehq.org/git/tools.git/?a=commit;h=8fbd1a2ca902548186c8cdd4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 29 18:22:45 2008 +0100 tools: Added Wine Gecko 0.9.0 redirection. --- winegecko.php | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/winegecko.php b/winegecko.php index 199e568..ce47e6a 100644 --- a/winegecko.php +++ b/winegecko.php @@ -23,7 +23,8 @@ $sFileName = "wine_gecko".($sVersion?'-'.$sVersion:'').".cab"; $aFileSizes = array( 'default'=>5219822, '0.0.1'=>5219822, - '0.1.0'=>5746895 + '0.1.0'=>5746895, + '0.9.0'=>7806669 ); // Exact size of the file:

1 0

Alexandre Julliard : winetest: Add notice about the 64-bit winetest to the test index page.
by Alexandre Julliard 30 Dec '08

30 Dec '08

Module: tools Branch: master Commit: de479eb1da2e0f2dacd9794648132dcf79fe7685 URL: http://source.winehq.org/git/tools.git/?a=commit;h=de479eb1da2e0f2dacd97946… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 29 20:36:10 2008 +0100 winetest: Add notice about the 64-bit winetest to the test index page. --- winetest/build-index | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/winetest/build-index b/winetest/build-index index 259f0aa..2813ae8 100755 --- a/winetest/build-index +++ b/winetest/build-index @@ -267,6 +267,7 @@ print OUT <<"EOF"; </table></div> <div class="navbar"> To run the tests on your Windows machine, download the <a href="/builds/winetest-latest.exe">latest winetest.exe</a> build. +If you have a 64-bit Windows OS, you can also try the <a href="/builds/winetest64-latest.exe">64-bit winetest</a>. </div> </body></html> EOF

1 0

Alexandre Julliard : make-winetest: Add support for building a 64-bit winetest.exe.
by Alexandre Julliard 30 Dec '08

30 Dec '08

Module: tools Branch: master Commit: 1b3b85ead912d35b166711241349fc86749420b7 URL: http://source.winehq.org/git/tools.git/?a=commit;h=1b3b85ead912d35b16671124… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 29 20:35:51 2008 +0100 make-winetest: Add support for building a 64-bit winetest.exe. --- winetest/make-winetest | 28 +++++++++++++++++++++++++--- 1 files changed, 25 insertions(+), 3 deletions(-) diff --git a/winetest/make-winetest b/winetest/make-winetest index d2b155a..994f101 100755 --- a/winetest/make-winetest +++ b/winetest/make-winetest @@ -48,7 +48,8 @@ destdir="/home/winehq/opt/winetest/builds" desturl="http://test.winehq.org/builds" servicedir="/home/winehq/opt/winetest/winehq-builds/winetest" -mingw=i586-mingw32msvc +mingw32=i586-mingw32msvc +mingw64=x86_64-pc-mingw32 logfile=LOG # if the log file exists, either a build is in progress or one has failed @@ -61,7 +62,7 @@ fi (cd wine && git pull) || exit head=$(cd wine && git rev-parse --short=12 HEAD) || exit - if [ -f $destdir/winetest-$head.exe -a $force -eq 0 ] + if [ -f $destdir/winetest-$head.exe -a -f $destdir/winetest64-$head.exe -a $force -eq 0 ] then exit 0 fi @@ -80,7 +81,7 @@ fi test -d build-mingw || (mkdir build-mingw && cd build-mingw && - ../wine/configure --host=$mingw --with-wine-tools=../build-native --without-x --without-freetype) || exit + ../wine/configure --host=$mingw32 --with-wine-tools=../build-native --without-x --without-freetype) || exit (cd build-mingw && make depend && @@ -101,6 +102,27 @@ fi echo "winetest-$head.exe built successfully." + # now the same thing for 64-bit + + test -d build-mingw64 || + (mkdir build-mingw64 && + cd build-mingw64 && + ../wine/configure --host=$mingw64 --with-wine-tools=../build-native --without-x --without-freetype) || exit + + (cd build-mingw64 && + make depend && + make include && + make -C dlls testsubdirs && + cd programs/winetest && + echo "$desturl/winetest64-$head.exe" > tests.url && + uname -a > build.nfo && + make dist) || exit + + mv -f build-mingw64/programs/winetest/winetest-dist.exe $destdir/winetest64-$head.exe + ln -sf winetest64-$head.exe $destdir/winetest64-latest.exe + + echo "winetest64-$head.exe built successfully." + ) >$logfile 2>&1 && rm -f $logfile # if the log file is still here, something failed

1 0

Jacek Caban : cabinet: Make sure that parent directories exist when creating a new directory.
by Alexandre Julliard 29 Dec '08

29 Dec '08

Module: wine Branch: master Commit: edda4637b449cd17a7c091cac867d1e5a6896f2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=edda4637b449cd17a7c091cac… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 29 14:50:26 2008 +0100 cabinet: Make sure that parent directories exist when creating a new directory. --- dlls/cabinet/cabinet_main.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/cabinet/cabinet_main.c b/dlls/cabinet/cabinet_main.c index 35810e3..4748a99 100644 --- a/dlls/cabinet/cabinet_main.c +++ b/dlls/cabinet/cabinet_main.c @@ -237,7 +237,18 @@ static INT_PTR fdi_notify_extract(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION pf /* create the destination directory if it doesn't exist */ if (GetFileAttributesA(szDirectory) == INVALID_FILE_ATTRIBUTES) + { + char *ptr; + + for(ptr = szDirectory + strlen(pDestination->Destination)+1; *ptr; ptr++) { + if(*ptr == '\\') { + *ptr = 0; + CreateDirectoryA(szDirectory, NULL); + *ptr = '\\'; + } + } CreateDirectoryA(szDirectory, NULL); + } hFile = CreateFileA(szFullPath, GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL);

1 0

Rob Shearman : widl: Write the typelib based on the statement list generated in the typelib_t object instead of using hooks in the parser code .
by Alexandre Julliard 29 Dec '08

29 Dec '08

Module: wine Branch: master Commit: 5223d04a7ccf204e2976eae0dfe6cf006ba30c50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5223d04a7ccf204e2976eae0d… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Dec 29 12:06:06 2008 +0000 widl: Write the typelib based on the statement list generated in the typelib_t object instead of using hooks in the parser code. --- tools/widl/parser.y | 25 ++++------------ tools/widl/typelib.c | 15 --------- tools/widl/typelib.h | 2 - tools/widl/widltypes.h | 1 - tools/widl/write_msft.c | 73 +++++++++++++++++++++++++++++------------------ 5 files changed, 51 insertions(+), 65 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 1866a1e..cdb7a3a 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -369,27 +369,23 @@ gbl_statements: { $$ = NULL; } if (!parse_only && do_header) write_coclass_forward($2); } | gbl_statements coclassdef { $$ = append_statement($1, make_statement_type_decl($2)); - add_typelib_entry($2); reg_type($2, $2->name, 0); if (!parse_only && do_header) write_coclass_forward($2); } - | gbl_statements moduledef { $$ = append_statement($1, make_statement_module($2)); - add_typelib_entry($2); - } + | gbl_statements moduledef { $$ = append_statement($1, make_statement_module($2)); } | gbl_statements librarydef { $$ = append_statement($1, make_statement_library($2)); } | gbl_statements statement { $$ = append_statement($1, $2); } ; imp_statements: { $$ = NULL; } - | imp_statements interfacedec { $$ = append_statement($1, make_statement_reference($2)); if (!parse_only) add_typelib_entry($2); } - | imp_statements interfacedef { $$ = append_statement($1, make_statement_type_decl($2)); if (!parse_only) add_typelib_entry($2); } + | imp_statements interfacedec { $$ = append_statement($1, make_statement_reference($2)); } + | imp_statements interfacedef { $$ = append_statement($1, make_statement_type_decl($2)); } | imp_statements coclass ';' { $$ = $1; reg_type($2, $2->name, 0); if (!parse_only && do_header) write_coclass_forward($2); } | imp_statements coclassdef { $$ = append_statement($1, make_statement_type_decl($2)); - if (!parse_only) add_typelib_entry($2); reg_type($2, $2->name, 0); if (!parse_only && do_header) write_coclass_forward($2); } - | imp_statements moduledef { $$ = append_statement($1, make_statement_module($2)); if (!parse_only) add_typelib_entry($2); } + | imp_statements moduledef { $$ = append_statement($1, make_statement_module($2)); } | imp_statements statement { $$ = append_statement($1, $2); } | imp_statements importlib { $$ = append_statement($1, make_statement_importlib($2)); } | imp_statements librarydef { $$ = append_statement($1, make_statement_library($2)); } @@ -644,10 +640,7 @@ enum: ident '=' expr_int_const { $$ = reg_const($1); } ; -enumdef: tENUM t_ident '{' enums '}' { $$ = type_new_enum($2, $4); - if(in_typelib) - add_typelib_entry($$); - } +enumdef: tENUM t_ident '{' enums '}' { $$ = type_new_enum($2, $4); } ; m_exprs: m_expr { $$ = append_expr( NULL, $1 ); } @@ -1048,10 +1041,7 @@ pointer_type: | tPTR { $$ = RPC_FC_FP; } ; -structdef: tSTRUCT t_ident '{' fields '}' { $$ = type_new_struct($2, TRUE, $4); - if(in_typelib) - add_typelib_entry($$); - } +structdef: tSTRUCT t_ident '{' fields '}' { $$ = type_new_struct($2, TRUE, $4); } ; type: tVOID { $$ = find_type_or_error("void", 0); } @@ -1783,7 +1773,6 @@ static typelib_t *make_library(const char *name, const attr_list_t *attrs) typelib->name = xstrdup(name); typelib->filename = NULL; typelib->attrs = attrs; - list_init( &typelib->entries ); list_init( &typelib->importlibs ); return typelib; } @@ -2746,8 +2735,6 @@ static statement_t *process_typedefs(declarator_list_t *decls) if (! parse_only && do_header) write_typedef(type); - if (in_typelib && is_attr(type->attrs, ATTR_PUBLIC)) - add_typelib_entry(type); type_list = &(*type_list)->next; free(decl); diff --git a/tools/widl/typelib.c b/tools/widl/typelib.c index 2706870..446f9a5 100644 --- a/tools/widl/typelib.c +++ b/tools/widl/typelib.c @@ -46,8 +46,6 @@ #include "widltypes.h" #include "typelib_struct.h" -int in_typelib = 0; - static typelib_t *typelib; type_t *duptype(type_t *t, int dupname) @@ -246,7 +244,6 @@ unsigned short get_type_vt(type_t *t) void start_typelib(typelib_t *typelib_type) { - in_typelib++; if (!do_typelib) return; typelib = typelib_type; @@ -255,23 +252,11 @@ void start_typelib(typelib_t *typelib_type) void end_typelib(void) { - in_typelib--; if (!typelib) return; create_msft_typelib(typelib); } -void add_typelib_entry(type_t *t) -{ - typelib_entry_t *entry; - if (!typelib) return; - - chat("add kind %i: %s\n", t->kind, t->name); - entry = xmalloc(sizeof(*entry)); - entry->type = t; - list_add_tail( &typelib->entries, &entry->entry ); -} - static void tlb_read(int fd, void *buf, int count) { if(read(fd, buf, count) < count) diff --git a/tools/widl/typelib.h b/tools/widl/typelib.h index 486dbb4..58bad43 100644 --- a/tools/widl/typelib.h +++ b/tools/widl/typelib.h @@ -21,10 +21,8 @@ #ifndef __WIDL_TYPELIB_H #define __WIDL_TYPELIB_H -extern int in_typelib; extern void start_typelib(typelib_t *typelib_type); extern void end_typelib(void); -extern void add_typelib_entry(type_t *t); extern void add_importlib(const char *name); /* Copied from wtypes.h. Not included directly because that would create a diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 01e6d32..cb670eb 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -387,7 +387,6 @@ struct _typelib_t { char *name; char *filename; const attr_list_t *attrs; - struct list entries; struct list importlibs; statement_list_t *stmts; }; diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 2340216..01e98a6 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -2191,38 +2191,54 @@ static void add_module_typeinfo(msft_typelib_t *typelib, type_t *module) msft_typeinfo->typeinfo->size = idx; } -static void add_entry(msft_typelib_t *typelib, typelib_entry_t *entry) +static void add_entry(msft_typelib_t *typelib, const statement_t *stmt) { - switch(entry->type->kind) { - case TKIND_INTERFACE: - case TKIND_DISPATCH: - add_interface_typeinfo(typelib, entry->type); - break; - - case TKIND_RECORD: - add_structure_typeinfo(typelib, entry->type); - break; - - case TKIND_ENUM: - add_enum_typeinfo(typelib, entry->type); + switch(stmt->type) { + case STMT_LIBRARY: + case STMT_IMPORT: + case STMT_CPPQUOTE: + case STMT_DECLARATION: + /* not included in typelib */ break; - - case TKIND_ALIAS: - add_typedef_typeinfo(typelib, entry->type); + case STMT_IMPORTLIB: + /* not processed here */ break; - - case TKIND_COCLASS: - add_coclass_typeinfo(typelib, entry->type); + case STMT_TYPEDEF: + { + const type_list_t *type_entry = stmt->u.type_list; + for (; type_entry; type_entry = type_entry->next) + if (is_attr(type_entry->type->attrs, ATTR_PUBLIC)) + add_typedef_typeinfo(typelib, type_entry->type); break; - - case TKIND_MODULE: - add_module_typeinfo(typelib, entry->type); + } + case STMT_MODULE: + add_module_typeinfo(typelib, stmt->u.type); break; - - default: - error("add_entry: unhandled type %d\n", entry->type->kind); + case STMT_TYPE: + case STMT_TYPEREF: + { + type_t *type = stmt->u.type; + switch (type->kind) { + case TKIND_INTERFACE: + case TKIND_DISPATCH: + add_interface_typeinfo(typelib, type); + break; + case TKIND_RECORD: + add_structure_typeinfo(typelib, type); + break; + case TKIND_ENUM: + add_enum_typeinfo(typelib, type); + break; + case TKIND_COCLASS: + add_coclass_typeinfo(typelib, type); + break; + default: + error("add_entry: unhandled type %d\n", type->kind); + break; + } break; } + } } static void set_name(msft_typelib_t *typelib) @@ -2497,7 +2513,7 @@ int create_msft_typelib(typelib_t *typelib) { msft_typelib_t *msft; int failed = 0; - typelib_entry_t *entry; + const statement_t *stmt; time_t cur_time; char *time_override; unsigned int version = 5 << 24 | 1 << 16 | 164; /* 5.01.0164 */ @@ -2550,8 +2566,9 @@ int create_msft_typelib(typelib_t *typelib) set_custdata(msft, &midl_time_guid, VT_UI4, &cur_time, &msft->typelib_header.CustomDataOffset); set_custdata(msft, &midl_version_guid, VT_UI4, &version, &msft->typelib_header.CustomDataOffset); - LIST_FOR_EACH_ENTRY( entry, &typelib->entries, typelib_entry_t, entry ) - add_entry(msft, entry); + if (typelib->stmts) + LIST_FOR_EACH_ENTRY( stmt, typelib->stmts, const statement_t, entry ) + add_entry(msft, stmt); save_all_changes(msft); free(msft);

1 0

Rob Shearman : widl: Write the generated file containing IID, DIID, CLSID and LIBID data based on the parsed list of statements instead of using hooks in the parser code .
by Alexandre Julliard 29 Dec '08

29 Dec '08

Module: wine Branch: master Commit: 7d7dd182c12f434069779bbc9f8f116bbb90e205 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d7dd182c12f434069779bbc9… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Dec 29 12:06:12 2008 +0000 widl: Write the generated file containing IID, DIID, CLSID and LIBID data based on the parsed list of statements instead of using hooks in the parser code. --- tools/widl/parser.y | 37 +---------------------- tools/widl/widl.c | 83 ++++++++++++++++++++++++++++++++++++--------------- tools/widl/widl.h | 1 + 3 files changed, 61 insertions(+), 60 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index cdb7a3a..42479dc 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -139,11 +139,6 @@ static type_t *get_type(unsigned char type, char *name, int t); static var_t *reg_const(var_t *var); -static void write_libid(const typelib_t *typelib); -static void write_clsid(type_t *cls); -static void write_diid(type_t *iface); -static void write_iid(type_t *iface); - static char *gen_name(void); static statement_t *process_typedefs(var_list_t *names); static void check_arg(var_t *arg); @@ -354,6 +349,7 @@ static func_list_t *append_func_from_statement(func_list_t *list, statement_t *s input: gbl_statements { fix_incomplete(); check_all_user_types($1); + write_id_data($1); write_proxies($1); write_client($1); write_server($1); @@ -449,7 +445,6 @@ libraryhdr: tLIBRARY aIDENTIFIER { $$ = $2; } library_start: attributes libraryhdr '{' { $$ = make_library($2, check_library_attrs($2, $1)); if (!parse_only) start_typelib($$); if (!parse_only && do_header) write_library($$); - if (!parse_only && do_idfile) write_libid($$); is_inside_library = TRUE; } ; @@ -847,8 +842,6 @@ coclasshdr: attributes coclass { $$ = $2; $$->attrs = check_coclass_attrs($2->name, $1); if (!parse_only && do_header) write_coclass($$); - if (!parse_only && do_idfile) - write_clsid($$); } ; @@ -897,14 +890,12 @@ dispinterfacedef: dispinterfacehdr '{' '}' { $$ = $1; type_dispinterface_define($$, $3, $4); if (!parse_only && do_header) write_interface($$); - if (!parse_only && do_idfile) write_diid($$); is_in_interface = FALSE; } | dispinterfacehdr '{' interface ';' '}' { $$ = $1; type_dispinterface_define_from_iface($$, $3); if (!parse_only && do_header) write_interface($$); - if (!parse_only && do_idfile) write_diid($$); is_in_interface = FALSE; } ; @@ -935,7 +926,6 @@ interfacedef: interfacehdr inherit type_interface_define($$, $2, $4); if (!parse_only && do_header) write_interface($$); if (!parse_only && local_stubs) write_locals(local_stubs, $$, TRUE); - if (!parse_only && do_idfile) write_iid($$); pointer_default = $1.old_pointer_default; is_in_interface = FALSE; } @@ -947,7 +937,6 @@ interfacedef: interfacehdr inherit type_interface_define($$, find_type_or_error2($3, 0), $6); if (!parse_only && do_header) write_interface($$); if (!parse_only && local_stubs) write_locals(local_stubs, $$, TRUE); - if (!parse_only && do_idfile) write_iid($$); pointer_default = $1.old_pointer_default; is_in_interface = FALSE; } @@ -2022,30 +2011,6 @@ var_t *find_const(const char *name, int f) return cur->var; } -static void write_libid(const typelib_t *typelib) -{ - const UUID *uuid = get_attrp(typelib->attrs, ATTR_UUID); - write_guid(idfile, "LIBID", typelib->name, uuid); -} - -static void write_clsid(type_t *cls) -{ - const UUID *uuid = get_attrp(cls->attrs, ATTR_UUID); - write_guid(idfile, "CLSID", cls->name, uuid); -} - -static void write_diid(type_t *iface) -{ - const UUID *uuid = get_attrp(iface->attrs, ATTR_UUID); - write_guid(idfile, "DIID", iface->name, uuid); -} - -static void write_iid(type_t *iface) -{ - const UUID *uuid = get_attrp(iface->attrs, ATTR_UUID); - write_guid(idfile, "IID", iface->name, uuid); -} - static char *gen_name(void) { static const char format[] = "__WIDL_%s_generated_name_%08lX"; diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 3f03f40..cc3b40e 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -343,6 +343,65 @@ void write_dlldata(const statement_list_t *stmts) free_filename_nodes(&filenames); } +static void write_id_data_stmts(const statement_list_t *stmts) +{ + const statement_t *stmt; + if (stmts) LIST_FOR_EACH_ENTRY( stmt, stmts, const statement_t, entry ) + { + if (stmt->type == STMT_TYPE) + { + const type_t *type = stmt->u.type; + if (type->type == RPC_FC_IP) + { + const UUID *uuid; + if (!is_object(type->attrs) && !is_attr(type->attrs, ATTR_DISPINTERFACE)) + continue; + uuid = get_attrp(type->attrs, ATTR_UUID); + write_guid(idfile, is_attr(type->attrs, ATTR_DISPINTERFACE) ? "DIID" : "IID", + type->name, uuid); + } + else if (type->type == RPC_FC_COCLASS) + { + const UUID *uuid = get_attrp(type->attrs, ATTR_UUID); + write_guid(idfile, "CLSID", type->name, uuid); + } + } + else if (stmt->type == STMT_LIBRARY) + { + const UUID *uuid = get_attrp(stmt->u.lib->attrs, ATTR_UUID); + write_guid(idfile, "LIBID", stmt->u.lib->name, uuid); + write_id_data_stmts(stmt->u.lib->stmts); + } + } +} + +void write_id_data(const statement_list_t *stmts) +{ + if (!do_idfile) return; + + idfile_token = make_token(idfile_name); + + idfile = fopen(idfile_name, "w"); + if (! idfile) { + error("Could not open %s for output\n", idfile_name); + return; + } + + fprintf(idfile, "/*** Autogenerated by WIDL %s ", PACKAGE_VERSION); + fprintf(idfile, "from %s - Do not edit ***/\n\n", input_name); + fprintf(idfile, "#include <rpc.h>\n"); + fprintf(idfile, "#include <rpcndr.h>\n\n"); + fprintf(idfile, "#include <initguid.h>\n\n"); + start_cplusplus_guard(idfile); + + write_id_data_stmts(stmts); + + fprintf(idfile, "\n"); + end_cplusplus_guard(idfile); + + fclose(idfile); +} + int main(int argc,char *argv[]) { extern char* optarg; @@ -595,23 +654,6 @@ int main(int argc,char *argv[]) fprintf(local_stubs, "#include \"%s\"\n\n", header_name); } - if (do_idfile) { - idfile_token = make_token(idfile_name); - - idfile = fopen(idfile_name, "w"); - if (! idfile) { - fprintf(stderr, "Could not open %s for output\n", idfile_name); - return 1; - } - - fprintf(idfile, "/*** Autogenerated by WIDL %s ", PACKAGE_VERSION); - fprintf(idfile, "from %s - Do not edit ***/\n\n", input_name); - fprintf(idfile, "#include <rpc.h>\n"); - fprintf(idfile, "#include <rpcndr.h>\n\n"); - fprintf(idfile, "#include <initguid.h>\n\n"); - start_cplusplus_guard(idfile); - } - init_types(); ret = parser_parse(); @@ -633,13 +675,6 @@ int main(int argc,char *argv[]) fclose(local_stubs); } - if (do_idfile) { - fprintf(idfile, "\n"); - end_cplusplus_guard(idfile); - - fclose(idfile); - } - fclose(parser_in); if(ret) { diff --git a/tools/widl/widl.h b/tools/widl/widl.h index 01de04c..d45c157 100644 --- a/tools/widl/widl.h +++ b/tools/widl/widl.h @@ -71,6 +71,7 @@ extern FILE* header; extern FILE* local_stubs; extern FILE* idfile; +extern void write_id_data(const statement_list_t *stmts); extern void write_proxies(const statement_list_t *stmts); extern void write_client(const statement_list_t *stmts); extern void write_server(const statement_list_t *stmts);

1 0

Rob Shearman : widl: Write the local stubs file based on the parsed list of statements, rather than using hooks in the parser code.
by Alexandre Julliard 29 Dec '08

29 Dec '08

Module: wine Branch: master Commit: bf5a9cb61ed888da25cb7b65a05266f1e18dabbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf5a9cb61ed888da25cb7b65a… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Dec 29 12:06:24 2008 +0000 widl: Write the local stubs file based on the parsed list of statements, rather than using hooks in the parser code. --- tools/widl/header.c | 34 +++++++++++++++++++++++++++++++++- tools/widl/header.h | 1 - tools/widl/parser.y | 3 +-- tools/widl/widl.c | 17 ----------------- tools/widl/widl.h | 2 +- 5 files changed, 35 insertions(+), 22 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index 68bf1ec..d06ef4d 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -754,7 +754,7 @@ static void write_method_proto(FILE *header, const type_t *iface) } } -void write_locals(FILE *fp, const type_t *iface, int body) +static void write_locals(FILE *fp, const type_t *iface, int body) { static const char comment[] = "/* WIDL-generated stub. You must provide an implementation for this. */"; @@ -814,6 +814,38 @@ void write_locals(FILE *fp, const type_t *iface, int body) } } +static void write_local_stubs_stmts(FILE *local_stubs, const statement_list_t *stmts) +{ + const statement_t *stmt; + if (stmts) LIST_FOR_EACH_ENTRY( stmt, stmts, const statement_t, entry ) + { + if (stmt->type == STMT_TYPE && stmt->u.type->type == RPC_FC_IP) + write_locals(local_stubs, stmt->u.type, TRUE); + else if (stmt->type == STMT_LIBRARY) + write_local_stubs_stmts(local_stubs, stmt->u.lib->stmts); + } +} + +void write_local_stubs(const statement_list_t *stmts) +{ + FILE *local_stubs; + + if (!local_stubs_name) return; + + local_stubs = fopen(local_stubs_name, "w"); + if (!local_stubs) { + error("Could not open %s for output\n", local_stubs_name); + return; + } + fprintf(local_stubs, "/* call_as/local stubs for %s */\n\n", input_name); + fprintf(local_stubs, "#include <objbase.h>\n"); + fprintf(local_stubs, "#include \"%s\"\n\n", header_name); + + write_local_stubs_stmts(local_stubs, stmts); + + fclose(local_stubs); +} + static void write_function_proto(FILE *header, const type_t *iface, const func_t *fun, const char *prefix) { var_t *def = fun->def; diff --git a/tools/widl/header.h b/tools/widl/header.h index d87ae16..84b652d 100644 --- a/tools/widl/header.h +++ b/tools/widl/header.h @@ -50,7 +50,6 @@ extern void write_array(FILE *h, array_dims_t *v, int field); extern void write_import(const char *fname); extern void write_forward(type_t *iface); extern void write_interface(type_t *iface); -extern void write_locals(FILE *fp, const type_t *iface, int body); extern void write_coclass(type_t *cocl); extern void write_coclass_forward(type_t *cocl); extern void write_typedef(type_t *type); diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 42479dc..1bcfd33 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -354,6 +354,7 @@ input: gbl_statements { fix_incomplete(); write_client($1); write_server($1); write_dlldata($1); + write_local_stubs($1); } ; @@ -925,7 +926,6 @@ interfacedef: interfacehdr inherit '{' int_statements '}' semicolon_opt { $$ = $1.interface; type_interface_define($$, $2, $4); if (!parse_only && do_header) write_interface($$); - if (!parse_only && local_stubs) write_locals(local_stubs, $$, TRUE); pointer_default = $1.old_pointer_default; is_in_interface = FALSE; } @@ -936,7 +936,6 @@ interfacedef: interfacehdr inherit semicolon_opt { $$ = $1.interface; type_interface_define($$, find_type_or_error2($3, 0), $6); if (!parse_only && do_header) write_interface($$); - if (!parse_only && local_stubs) write_locals(local_stubs, $$, TRUE); pointer_default = $1.old_pointer_default; is_in_interface = FALSE; } diff --git a/tools/widl/widl.c b/tools/widl/widl.c index cc3b40e..4f076c3 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -132,8 +132,6 @@ const char *prefix_server = ""; int line_number = 1; FILE *header; -FILE *local_stubs; -FILE *proxy; FILE *idfile; size_t pointer_size = 0; @@ -643,17 +641,6 @@ int main(int argc,char *argv[]) start_cplusplus_guard(header); } - if (local_stubs_name) { - local_stubs = fopen(local_stubs_name, "w"); - if (!local_stubs) { - fprintf(stderr, "Could not open %s for output\n", local_stubs_name); - return 1; - } - fprintf(local_stubs, "/* call_as/local stubs for %s */\n\n", input_name); - fprintf(local_stubs, "#include <objbase.h>\n"); - fprintf(local_stubs, "#include \"%s\"\n\n", header_name); - } - init_types(); ret = parser_parse(); @@ -671,10 +658,6 @@ int main(int argc,char *argv[]) fclose(header); } - if (local_stubs) { - fclose(local_stubs); - } - fclose(parser_in); if(ret) { diff --git a/tools/widl/widl.h b/tools/widl/widl.h index d45c157..c368317 100644 --- a/tools/widl/widl.h +++ b/tools/widl/widl.h @@ -68,13 +68,13 @@ extern int line_number; extern int char_number; extern FILE* header; -extern FILE* local_stubs; extern FILE* idfile; extern void write_id_data(const statement_list_t *stmts); extern void write_proxies(const statement_list_t *stmts); extern void write_client(const statement_list_t *stmts); extern void write_server(const statement_list_t *stmts); +extern void write_local_stubs(const statement_list_t *stmts); extern void write_dlldata(const statement_list_t *stmts); #endif

1 0

Rob Shearman : widl: Generate header files from the parse tree instead of using hooks in the parser .
by Alexandre Julliard 29 Dec '08

29 Dec '08

Module: wine Branch: master Commit: 6b955b514d45d9c953a418e8dcb756f22a2cbdf5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b955b514d45d9c953a418e8d… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Dec 29 12:06:35 2008 +0000 widl: Generate header files from the parse tree instead of using hooks in the parser. --- tools/widl/header.c | 281 ++++++++++++++++++++++++++++++++++++----------- tools/widl/header.h | 11 -- tools/widl/parser.h | 1 + tools/widl/parser.y | 96 ++++++----------- tools/widl/typetree.c | 7 +- tools/widl/typetree.h | 2 +- tools/widl/widl.c | 33 +----- tools/widl/widl.h | 8 +- tools/widl/widltypes.h | 3 +- 9 files changed, 266 insertions(+), 176 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6b955b514d45d9c953a41…

1 0