November 2010 - Wine-commits

Maarten Lankhorst : shell32: Fix pointer truncation in SHGetFileInfoA.
by Alexandre Julliard 29 Nov '10

29 Nov '10

Module: wine Branch: master Commit: e7a6b87c2d8b480632e88f8b761c1b9c5e55f483 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7a6b87c2d8b480632e88f8b7… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Nov 26 20:21:37 2010 +0100 shell32: Fix pointer truncation in SHGetFileInfoA. --- dlls/shell32/shell32_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index 227b63e..af0cb4b 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -675,7 +675,7 @@ DWORD_PTR WINAPI SHGetFileInfoA(LPCSTR path,DWORD dwFileAttributes, INT len; LPWSTR temppath = NULL; LPCWSTR pathW; - DWORD ret; + DWORD_PTR ret; SHFILEINFOW temppsfi; if (flags & SHGFI_PIDL)

1 0

Ken Thomases : msxml3: Fix building on Leopard.
by Alexandre Julliard 29 Nov '10

29 Nov '10

Module: wine Branch: master Commit: a6b38409be3053e0489e24463d7306b8d0eb5fd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6b38409be3053e0489e24463… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Nov 26 17:35:20 2010 -0600 msxml3: Fix building on Leopard. --- dlls/msxml3/msxml_private.h | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 0e7971e..ddb3f1c 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -169,8 +169,8 @@ extern void schemasInit(void); extern void schemasCleanup(void); #ifndef HAVE_XMLFIRSTELEMENTCHILD - static inline xmlNodePtr xmlFirstElementChild(xmlNodePtr parent) - { +static inline xmlNodePtr wine_xmlFirstElementChild(xmlNodePtr parent) +{ xmlNodePtr child; for (child = parent->children; child != NULL; child = child->next) if (child->type == XML_ELEMENT_NODE) @@ -178,6 +178,7 @@ extern void schemasCleanup(void); return child; } +#define xmlFirstElementChild wine_xmlFirstElementChild #endif /* constructors */

1 0

Austin English : msxml3: Bump version information to SP9.
by Alexandre Julliard 29 Nov '10

29 Nov '10

Module: wine Branch: master Commit: baf7a636a94e31ec96a878bd197abe57f7258189 URL: http://source.winehq.org/git/wine.git/?a=commit;h=baf7a636a94e31ec96a878bd1… Author: Austin English <austinenglish(a)gmail.com> Date: Sat Nov 27 08:10:42 2010 -0800 msxml3: Bump version information to SP9. --- dlls/msxml3/version.rc | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/version.rc b/dlls/msxml3/version.rc index 2564bcf..dfb8045 100644 --- a/dlls/msxml3/version.rc +++ b/dlls/msxml3/version.rc @@ -20,9 +20,9 @@ #define WINE_OLESELFREGISTER #define WINE_FILEDESCRIPTION_STR "Wine MSXML 3.0" #define WINE_FILENAME_STR "msxml3.dll" -#define WINE_FILEVERSION 8,30,9926,0 -#define WINE_FILEVERSION_STR "8.30.9926.0" -#define WINE_PRODUCTVERSION 8,30,9926,0 -#define WINE_PRODUCTVERSION_STR "8.30.9926.0" +#define WINE_FILEVERSION 8,90,1101,0 +#define WINE_FILEVERSION_STR "8.90.1101.0" +#define WINE_PRODUCTVERSION 8,90,1101,0 +#define WINE_PRODUCTVERSION_STR "8.90.1101.0" #include "wine/wine_common_ver.rc"

1 0

Jacek Caban : mscoree: Explicitly specify CDECL on imported functions.
by Alexandre Julliard 29 Nov '10

29 Nov '10

Module: wine Branch: master Commit: 90ed396b03f339b134458b8f1e834e326869a515 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90ed396b03f339b134458b8f1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Nov 28 15:00:03 2010 +0100 mscoree: Explicitly specify CDECL on imported functions. --- dlls/mscoree/mscoree_private.h | 42 ++++++++++++++++++++-------------------- 1 files changed, 21 insertions(+), 21 deletions(-) diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 36a4a86..9ece9cc 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -97,27 +97,27 @@ typedef struct loaded_mono HMODULE mono_handle; HMODULE glib_handle; - MonoImage* (*mono_assembly_get_image)(MonoAssembly *assembly); - MonoAssembly* (*mono_assembly_open)(const char *filename, MonoImageOpenStatus *status); - MonoClass* (*mono_class_from_mono_type)(MonoType *type); - MonoClass* (*mono_class_from_name)(MonoImage *image, const char* name_space, const char *name); - MonoMethod* (*mono_class_get_method_from_name)(MonoClass *klass, const char *name, int param_count); - void (*mono_config_parse)(const char *filename); - MonoAssembly* (*mono_domain_assembly_open) (MonoDomain *domain, const char *name); - void (*mono_free)(void *); - void (*mono_install_assembly_preload_hook)(MonoAssemblyPreLoadFunc func, void *user_data); - void (*mono_jit_cleanup)(MonoDomain *domain); - int (*mono_jit_exec)(MonoDomain *domain, MonoAssembly *assembly, int argc, char *argv[]); - MonoDomain* (*mono_jit_init)(const char *file); - int (*mono_jit_set_trace_options)(const char* options); - MonoDomain* (*mono_object_get_domain)(MonoObject *obj); - MonoObject* (*mono_object_new)(MonoDomain *domain, MonoClass *klass); - void* (*mono_object_unbox)(MonoObject *obj); - MonoType* (*mono_reflection_type_from_name)(char *name, MonoImage *image); - MonoObject* (*mono_runtime_invoke)(MonoMethod *method, void *obj, void **params, MonoObject **exc); - void (*mono_runtime_object_init)(MonoObject *this_obj); - void (*mono_set_dirs)(const char *assembly_dir, const char *config_dir); - char* (*mono_stringify_assembly_name)(MonoAssemblyName *aname); + MonoImage* (CDECL *mono_assembly_get_image)(MonoAssembly *assembly); + MonoAssembly* (CDECL *mono_assembly_open)(const char *filename, MonoImageOpenStatus *status); + MonoClass* (CDECL *mono_class_from_mono_type)(MonoType *type); + MonoClass* (CDECL *mono_class_from_name)(MonoImage *image, const char* name_space, const char *name); + MonoMethod* (CDECL *mono_class_get_method_from_name)(MonoClass *klass, const char *name, int param_count); + void (CDECL *mono_config_parse)(const char *filename); + MonoAssembly* (CDECL *mono_domain_assembly_open) (MonoDomain *domain, const char *name); + void (CDECL *mono_free)(void *); + void (CDECL *mono_install_assembly_preload_hook)(MonoAssemblyPreLoadFunc func, void *user_data); + void (CDECL *mono_jit_cleanup)(MonoDomain *domain); + int (CDECL *mono_jit_exec)(MonoDomain *domain, MonoAssembly *assembly, int argc, char *argv[]); + MonoDomain* (CDECL *mono_jit_init)(const char *file); + int (CDECL *mono_jit_set_trace_options)(const char* options); + MonoDomain* (CDECL *mono_object_get_domain)(MonoObject *obj); + MonoObject* (CDECL *mono_object_new)(MonoDomain *domain, MonoClass *klass); + void* (CDECL *mono_object_unbox)(MonoObject *obj); + MonoType* (CDECL *mono_reflection_type_from_name)(char *name, MonoImage *image); + MonoObject* (CDECL *mono_runtime_invoke)(MonoMethod *method, void *obj, void **params, MonoObject **exc); + void (CDECL *mono_runtime_object_init)(MonoObject *this_obj); + void (CDECL *mono_set_dirs)(const char *assembly_dir, const char *config_dir); + char* (CDECL *mono_stringify_assembly_name)(MonoAssemblyName *aname); } loaded_mono; /* loaded runtime interfaces */

1 0

Nikolay Sivov : oleaut32/tests: Some VarDateFromStr() tests.
by Alexandre Julliard 29 Nov '10

29 Nov '10

Module: wine Branch: master Commit: cb0d7276c1fcb0729153df03f60e72cb0234b0b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb0d7276c1fcb0729153df03f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 28 20:52:35 2010 +0300 oleaut32/tests: Some VarDateFromStr() tests. --- dlls/oleaut32/tests/vartype.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 279fd7b..e067352 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -3436,6 +3436,8 @@ static void test_VarDateFromStr(void) DFS("1 2 1970"); EXPECT_DBL(25570.0); DFS("1/2/1970"); EXPECT_DBL(25570.0); DFS("1-2-1970"); EXPECT_DBL(25570.0); + DFS("13-1-1970"); EXPECT_DBL(25581.0); + DFS("1970-1-13"); EXPECT_DBL(25581.0); /* Native fails "1999 January 3, 9AM". I consider that a bug in native */ /* test a non-english data string */ @@ -3443,6 +3445,8 @@ static void test_VarDateFromStr(void) DFS("02.01.1970 00:00:00"); EXPECT_MISMATCH; lcid = MAKELCID(MAKELANGID(LANG_GERMAN,SUBLANG_GERMAN),SORT_DEFAULT); DFS("02.01.1970"); EXPECT_DBL(25570.0); + DFS("02.13.1970"); EXPECT_DBL(25612.0); + DFS("02-13-1970"); EXPECT_DBL(25612.0); DFS("02.01.1970 00:00:00"); EXPECT_DBL(25570.0); lcid = MAKELCID(MAKELANGID(LANG_SPANISH,SUBLANG_SPANISH),SORT_DEFAULT); DFS("02.01.1970"); EXPECT_MISMATCH;

1 0

Paul Vriens : shell32/tests: Use more A-functions to fix Win95 and actually test correctly on Win9x.
by Alexandre Julliard 29 Nov '10

29 Nov '10

Module: wine Branch: master Commit: 5680cf6293cd0575f67fd8eba89eecaa6483b384 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5680cf6293cd0575f67fd8eba… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sun Nov 28 21:03:09 2010 +0100 shell32/tests: Use more A-functions to fix Win95 and actually test correctly on Win9x. --- dlls/shell32/tests/shlfolder.c | 123 ++++++++++++++++++++-------------------- 1 files changed, 61 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5680cf6293cd0575f67fd…

1 0

Jacek Caban : mshtml: Added ICustomDoc::SetUIHandler implementation.
by Alexandre Julliard 29 Nov '10

29 Nov '10

Module: wine Branch: master Commit: 0863625bcc763e3e53aa061551e200510f6d77e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0863625bcc763e3e53aa06155… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 29 00:18:01 2010 +0100 mshtml: Added ICustomDoc::SetUIHandler implementation. --- dlls/mshtml/htmldoc.c | 29 +++++++++++++++++++++++++++-- dlls/mshtml/mshtml_private.h | 1 + 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index f0b7056..803ded3 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -2087,6 +2087,8 @@ static ULONG WINAPI CustomDoc_Release(ICustomDoc *iface) IAdviseSink_Release(This->view_sink); if(This->client) IOleObject_SetClientSite(OLEOBJ(&This->basedoc), NULL); + if(This->hostui) + ICustomDoc_SetUIHandler(CUSTOMDOC(This), NULL); if(This->in_place_active) IOleInPlaceObjectWindowless_InPlaceDeactivate(INPLACEWIN(&This->basedoc)); if(This->ipsite) @@ -2114,8 +2116,31 @@ static ULONG WINAPI CustomDoc_Release(ICustomDoc *iface) static HRESULT WINAPI CustomDoc_SetUIHandler(ICustomDoc *iface, IDocHostUIHandler *pUIHandler) { HTMLDocumentObj *This = CUSTOMDOC_THIS(iface); - FIXME("(%p)->(%p)\n", This, pUIHandler); - return E_NOTIMPL; + IOleCommandTarget *cmdtrg; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, pUIHandler); + + if(This->custom_hostui && This->hostui == pUIHandler) + return S_OK; + + This->custom_hostui = TRUE; + + if(This->hostui) + IDocHostUIHandler_Release(This->hostui); + if(pUIHandler) + IDocHostUIHandler_AddRef(pUIHandler); + This->hostui = pUIHandler; + if(!pUIHandler) + return S_OK; + + hres = IDocHostUIHandler_QueryInterface(pUIHandler, &IID_IOleCommandTarget, (void**)&cmdtrg); + if(SUCCEEDED(hres)) { + FIXME("custom UI handler supports IOleCommandTarget\n"); + IOleCommandTarget_Release(cmdtrg); + } + + return S_OK; } #undef CUSTOMDOC_THIS diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 5af4247..a14ce01 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -411,6 +411,7 @@ struct HTMLDocumentObj { IOleClientSite *client; IDocHostUIHandler *hostui; + BOOL custom_hostui; IOleInPlaceSite *ipsite; IOleInPlaceFrame *frame; IOleInPlaceUIWindow *ip_window;

1 0

Alexandre Julliard : widl: Copy the output buffer management functions from winebuild.
by Alexandre Julliard 29 Nov '10

29 Nov '10

Module: wine Branch: master Commit: 00dda6f68728d1698adb98916c3e5e361c899822 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00dda6f68728d1698adb98916… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 27 11:42:09 2010 +0100 widl: Copy the output buffer management functions from winebuild. --- tools/widl/utils.c | 101 ++++++++++++++++++++++++++++++++++++++++++++++++++++ tools/widl/utils.h | 25 +++++++++++++ 2 files changed, 126 insertions(+), 0 deletions(-) diff --git a/tools/widl/utils.c b/tools/widl/utils.c index 6547774..c0f6de6 100644 --- a/tools/widl/utils.c +++ b/tools/widl/utils.c @@ -234,3 +234,104 @@ char *xstrdup(const char *str) s = xmalloc(strlen(str)+1); return strcpy(s, str); } + +int strendswith(const char* str, const char* end) +{ + int l = strlen(str); + int m = strlen(end); + return l >= m && strcmp(str + l - m, end) == 0; +} + +/******************************************************************* + * buffer management + * + * Function for writing to a memory buffer. + */ + +int byte_swapped = 0; +unsigned char *output_buffer; +size_t output_buffer_pos; +size_t output_buffer_size; + +static void check_output_buffer_space( size_t size ) +{ + if (output_buffer_pos + size >= output_buffer_size) + { + output_buffer_size = max( output_buffer_size * 2, output_buffer_pos + size ); + output_buffer = xrealloc( output_buffer, output_buffer_size ); + } +} + +void init_output_buffer(void) +{ + output_buffer_size = 1024; + output_buffer_pos = 0; + output_buffer = xmalloc( output_buffer_size ); +} + +void flush_output_buffer( const char *name ) +{ + int fd = open( name, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, 0666 ); + if (fd == -1) error( "Error creating %s\n", name ); + if (write( fd, output_buffer, output_buffer_pos ) != output_buffer_pos) + error( "Error writing to %s\n", name ); + close( fd ); + free( output_buffer ); +} + +void put_data( const void *data, size_t size ) +{ + check_output_buffer_space( size ); + memcpy( output_buffer + output_buffer_pos, data, size ); + output_buffer_pos += size; +} + +void put_byte( unsigned char val ) +{ + check_output_buffer_space( 1 ); + output_buffer[output_buffer_pos++] = val; +} + +void put_word( unsigned short val ) +{ + if (byte_swapped) val = (val << 8) | (val >> 8); + put_data( &val, sizeof(val) ); +} + +void put_dword( unsigned int val ) +{ + if (byte_swapped) + val = ((val << 24) | ((val << 8) & 0x00ff0000) | ((val >> 8) & 0x0000ff00) | (val >> 24)); + put_data( &val, sizeof(val) ); +} + +void put_qword( unsigned int val ) +{ + if (byte_swapped) + { + put_dword( 0 ); + put_dword( val ); + } + else + { + put_dword( val ); + put_dword( 0 ); + } +} + +/* pointer-sized word */ +void put_pword( unsigned int val ) +{ + if (pointer_size == 8) put_qword( val ); + else put_dword( val ); +} + +void align_output( unsigned int align ) +{ + size_t size = align - (output_buffer_pos % align); + + if (size == align) return; + check_output_buffer_space( size ); + memset( output_buffer + output_buffer_pos, 0, size ); + output_buffer_pos += size; +} diff --git a/tools/widl/utils.h b/tools/widl/utils.h index 5c440be..da589b9 100644 --- a/tools/widl/utils.h +++ b/tools/widl/utils.h @@ -28,6 +28,7 @@ void *xmalloc(size_t); void *xrealloc(void *, size_t); char *xstrdup(const char *str); +int strendswith(const char* str, const char* end); #ifndef __GNUC__ #define __attribute__(X) @@ -48,10 +49,34 @@ size_t widl_getline(char **linep, size_t *lenp, FILE *fp); UUID *parse_uuid(const char *u); int is_valid_uuid(const char *s); +/* buffer management */ + +extern int byte_swapped; +extern unsigned char *output_buffer; +extern size_t output_buffer_pos; +extern size_t output_buffer_size; + +extern void init_output_buffer(void); +extern void flush_output_buffer( const char *name ); +extern void put_data( const void *data, size_t size ); +extern void put_byte( unsigned char val ); +extern void put_word( unsigned short val ); +extern void put_dword( unsigned int val ); +extern void put_qword( unsigned int val ); +extern void put_pword( unsigned int val ); +extern void align_output( unsigned int align ); + /* typelibs expect the minor version to be stored in the higher bits and * major to be stored in the lower bits */ #define MAKEVERSION(major, minor) ((((minor) & 0xffff) << 16) | ((major) & 0xffff)) #define MAJORVERSION(version) ((version) & 0xffff) #define MINORVERSION(version) (((version) >> 16) & 0xffff) +#ifndef max +#define max(a,b) (((a) > (b)) ? (a) : (b)) +#endif +#ifndef min +#define min(a,b) (((a) < (b)) ? (a) : (b)) +#endif + #endif

1 0

Alexandre Julliard : widl: Use the output buffer functions to write typelibs.
by Alexandre Julliard 29 Nov '10

29 Nov '10

Module: wine Branch: master Commit: 5d3b4fb6cb0d271314317f0c415bb20a75cca78c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d3b4fb6cb0d271314317f0c4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 27 11:54:51 2010 +0100 widl: Use the output buffer functions to write typelibs. --- tools/widl/write_msft.c | 98 ++++++++++++++++++----------------------------- 1 files changed, 37 insertions(+), 61 deletions(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 874d3ad..309145f 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -2408,24 +2408,9 @@ static void set_lib_flags(msft_typelib_t *typelib) return; } -static int ctl2_write_chunk(int fd, void *segment, int length) +static void ctl2_write_segment(msft_typelib_t *typelib, int segment) { - if (write(fd, segment, length) != length) { - close(fd); - return 0; - } - return -1; -} - -static int ctl2_write_segment(msft_typelib_t *typelib, int fd, int segment) -{ - if (write(fd, typelib->typelib_segment_data[segment], typelib->typelib_segdir[segment].length) - != typelib->typelib_segdir[segment].length) { - close(fd); - return 0; - } - - return -1; + put_data(typelib->typelib_segment_data[segment], typelib->typelib_segdir[segment].length); } static void ctl2_finalize_typeinfos(msft_typelib_t *typelib, int filesize) @@ -2455,7 +2440,7 @@ static int ctl2_finalize_segment(msft_typelib_t *typelib, int filepos, int segme } -static void ctl2_write_typeinfos(msft_typelib_t *typelib, int fd) +static void ctl2_write_typeinfos(msft_typelib_t *typelib) { msft_typeinfo_t *typeinfo; int typedata_size; @@ -2467,21 +2452,21 @@ static void ctl2_write_typeinfos(msft_typelib_t *typelib, int fd) typedata_size = typeinfo->func_data[0]; if (typeinfo->var_data) typedata_size += typeinfo->var_data[0]; - ctl2_write_chunk(fd, &typedata_size, sizeof(int)); + put_data(&typedata_size, sizeof(int)); if (typeinfo->func_data) - ctl2_write_chunk(fd, typeinfo->func_data + 1, typeinfo->func_data[0]); + put_data(typeinfo->func_data + 1, typeinfo->func_data[0]); if (typeinfo->var_data) - ctl2_write_chunk(fd, typeinfo->var_data + 1, typeinfo->var_data[0]); + put_data(typeinfo->var_data + 1, typeinfo->var_data[0]); if (typeinfo->func_indices) - ctl2_write_chunk(fd, typeinfo->func_indices, (typeinfo->typeinfo->cElement & 0xffff) * 4); + put_data(typeinfo->func_indices, (typeinfo->typeinfo->cElement & 0xffff) * 4); if (typeinfo->var_indices) - ctl2_write_chunk(fd, typeinfo->var_indices, (typeinfo->typeinfo->cElement >> 16) * 4); + put_data(typeinfo->var_indices, (typeinfo->typeinfo->cElement >> 16) * 4); if (typeinfo->func_names) - ctl2_write_chunk(fd, typeinfo->func_names, (typeinfo->typeinfo->cElement & 0xffff) * 4); + put_data(typeinfo->func_names, (typeinfo->typeinfo->cElement & 0xffff) * 4); if (typeinfo->var_names) - ctl2_write_chunk(fd, typeinfo->var_names, (typeinfo->typeinfo->cElement >> 16) * 4); + put_data(typeinfo->var_names, (typeinfo->typeinfo->cElement >> 16) * 4); if (typeinfo->func_offsets) - ctl2_write_chunk(fd, typeinfo->func_offsets, (typeinfo->typeinfo->cElement & 0xffff) * 4); + put_data(typeinfo->func_offsets, (typeinfo->typeinfo->cElement & 0xffff) * 4); if (typeinfo->var_offsets) { int add = 0, i, offset; if(typeinfo->func_data) @@ -2489,25 +2474,18 @@ static void ctl2_write_typeinfos(msft_typelib_t *typelib, int fd) for(i = 0; i < (typeinfo->typeinfo->cElement >> 16); i++) { offset = typeinfo->var_offsets[i]; offset += add; - ctl2_write_chunk(fd, &offset, 4); + put_data(&offset, 4); } } } } -static int save_all_changes(msft_typelib_t *typelib) +static void save_all_changes(msft_typelib_t *typelib) { - int retval; int filepos; - int fd; chat("save_all_changes(%p)\n", typelib); - retval = TYPE_E_IOERROR; - - fd = open(typelib->typelib->filename, O_CREAT | O_WRONLY | O_TRUNC | O_BINARY, 0666); - if (fd == -1) return retval; - filepos = sizeof(MSFT_Header) + sizeof(MSFT_SegDir); if(typelib->typelib_header.varflags & 0x100) filepos += 4; /* helpstringdll */ filepos += typelib->typelib_header.nrtypeinfos * 4; @@ -2528,33 +2506,31 @@ static int save_all_changes(msft_typelib_t *typelib) ctl2_finalize_typeinfos(typelib, filepos); - if (!ctl2_write_chunk(fd, &typelib->typelib_header, sizeof(typelib->typelib_header))) return retval; + byte_swapped = 0; + init_output_buffer(); + + put_data(&typelib->typelib_header, sizeof(typelib->typelib_header)); if(typelib->typelib_header.varflags & 0x100) - if (!ctl2_write_chunk(fd, &typelib->help_string_dll_offset, sizeof(typelib->help_string_dll_offset))) - return retval; - - if (!ctl2_write_chunk(fd, typelib->typelib_typeinfo_offsets, typelib->typelib_header.nrtypeinfos * 4)) return retval; - if (!ctl2_write_chunk(fd, &typelib->typelib_segdir, sizeof(typelib->typelib_segdir))) return retval; - if (!ctl2_write_segment(typelib, fd, MSFT_SEG_TYPEINFO )) return retval; - if (!ctl2_write_segment(typelib, fd, MSFT_SEG_GUIDHASH )) return retval; - if (!ctl2_write_segment(typelib, fd, MSFT_SEG_GUID )) return retval; - if (!ctl2_write_segment(typelib, fd, MSFT_SEG_REFERENCES )) return retval; - if (!ctl2_write_segment(typelib, fd, MSFT_SEG_IMPORTINFO )) return retval; - if (!ctl2_write_segment(typelib, fd, MSFT_SEG_IMPORTFILES )) return retval; - if (!ctl2_write_segment(typelib, fd, MSFT_SEG_NAMEHASH )) return retval; - if (!ctl2_write_segment(typelib, fd, MSFT_SEG_NAME )) return retval; - if (!ctl2_write_segment(typelib, fd, MSFT_SEG_STRING )) return retval; - if (!ctl2_write_segment(typelib, fd, MSFT_SEG_TYPEDESC )) return retval; - if (!ctl2_write_segment(typelib, fd, MSFT_SEG_ARRAYDESC )) return retval; - if (!ctl2_write_segment(typelib, fd, MSFT_SEG_CUSTDATA )) return retval; - if (!ctl2_write_segment(typelib, fd, MSFT_SEG_CUSTDATAGUID)) return retval; - - ctl2_write_typeinfos(typelib, fd); - - if (close(fd) == -1) return retval; - - retval = S_OK; - return retval; + put_data(&typelib->help_string_dll_offset, sizeof(typelib->help_string_dll_offset)); + + put_data(typelib->typelib_typeinfo_offsets, typelib->typelib_header.nrtypeinfos * 4); + put_data(&typelib->typelib_segdir, sizeof(typelib->typelib_segdir)); + ctl2_write_segment( typelib, MSFT_SEG_TYPEINFO ); + ctl2_write_segment( typelib, MSFT_SEG_GUIDHASH ); + ctl2_write_segment( typelib, MSFT_SEG_GUID ); + ctl2_write_segment( typelib, MSFT_SEG_REFERENCES ); + ctl2_write_segment( typelib, MSFT_SEG_IMPORTINFO ); + ctl2_write_segment( typelib, MSFT_SEG_IMPORTFILES ); + ctl2_write_segment( typelib, MSFT_SEG_NAMEHASH ); + ctl2_write_segment( typelib, MSFT_SEG_NAME ); + ctl2_write_segment( typelib, MSFT_SEG_STRING ); + ctl2_write_segment( typelib, MSFT_SEG_TYPEDESC ); + ctl2_write_segment( typelib, MSFT_SEG_ARRAYDESC ); + ctl2_write_segment( typelib, MSFT_SEG_CUSTDATA ); + ctl2_write_segment( typelib, MSFT_SEG_CUSTDATAGUID ); + + ctl2_write_typeinfos(typelib); + flush_output_buffer( typelib->typelib->filename ); } int create_msft_typelib(typelib_t *typelib)

1 0

Alexandre Julliard : widl: Add a general -o option instead of having a different output name option for each file type .
by Alexandre Julliard 29 Nov '10

29 Nov '10

Module: wine Branch: master Commit: 233814c21ee2098c2d5c71bfc451fee430c2178f URL: http://source.winehq.org/git/wine.git/?a=commit;h=233814c21ee2098c2d5c71bfc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 27 12:33:05 2010 +0100 widl: Add a general -o option instead of having a different output name option for each file type. --- Make.rules.in | 14 +++++++------- tools/widl/widl.c | 28 +++++++++++++++++++++------- tools/widl/widl.man.in | 37 ++++++++++++++----------------------- 3 files changed, 42 insertions(+), 37 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index c5518c1..8aec95d 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -65,22 +65,22 @@ filter: dummy $(LDPATH) $(WRC) $(RCFLAGS) -o $@ $< .idl.h: - $(WIDL) $(IDLFLAGS) -h -H $@ $< + $(WIDL) $(IDLFLAGS) -h -o $@ $< .idl_c.c: - $(WIDL) $(IDLFLAGS) -c -C $@ $< + $(WIDL) $(IDLFLAGS) -c -o $@ $< .idl_i.c: - $(WIDL) $(IDLFLAGS) -u -U $@ $< + $(WIDL) $(IDLFLAGS) -u -o $@ $< .idl_p.c: - $(WIDL) $(IDLFLAGS) -p -P $@ $< + $(WIDL) $(IDLFLAGS) -p -o $@ $< .idl_s.c: - $(WIDL) $(IDLFLAGS) -s -S $@ $< + $(WIDL) $(IDLFLAGS) -s -o $@ $< .idl.tlb: - $(WIDL) $(TARGETFLAGS) $(IDLFLAGS) -t -T $@ $< + $(WIDL) $(TARGETFLAGS) $(IDLFLAGS) -t -o $@ $< .c.ln: $(LINT) -c $(ALLLINTFLAGS) $< || ( $(RM) $@ && exit 1 ) @@ -103,7 +103,7 @@ filter: dummy # Rules for IDL files dlldata.c: $(WIDL) Makefile.in - $(WIDL) $(IDLFLAGS) --dlldata-only --dlldata=$@ $(IDL_P_SRCS) + $(WIDL) $(IDLFLAGS) --dlldata-only -o $@ $(IDL_P_SRCS) # Rule for linting diff --git a/tools/widl/widl.c b/tools/widl/widl.c index c4aa91f..05feae2 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -54,10 +54,8 @@ static const char usage[] = " or: widl [options...] --dlldata-only name1 [name2...]\n" " -b arch Set the target architecture\n" " -c Generate client stub\n" -" -C file Name of client stub file (default is infile_c.c)\n" " -d n Set debug level to 'n'\n" " -D id[=val] Define preprocessor identifier id=val\n" -" --dlldata=file Name of the dlldata file (default is dlldata.c)\n" " -E Preprocess only\n" " -h Generate headers\n" " -H file Name of header file (default is infile.h)\n" @@ -66,17 +64,14 @@ static const char usage[] = " -m32, -m64 Set the kind of typelib to build (Win32 or Win64)\n" " -N Do not preprocess input\n" " --oldnames Use old naming conventions\n" +" -o, --output=NAME Set the output file name\n" " -p Generate proxy\n" -" -P file Name of proxy file (default is infile_p.c)\n" " --prefix-all=p Prefix names of client stubs / server functions with 'p'\n" " --prefix-client=p Prefix names of client stubs with 'p'\n" " --prefix-server=p Prefix names of server functions with 'p'\n" " -s Generate server stub\n" -" -S file Name of server stub file (default is infile_s.c)\n" " -t Generate typelib\n" -" -T file Name of typelib file (default is infile.tlb)\n" " -u Generate interface identifiers file\n" -" -U file Name of interface identifiers file (default is infile_i.c)\n" " -V Print version and exit\n" " -W Enable pedantic warnings\n" " --win32 Only generate 32-bit code\n" @@ -157,12 +152,13 @@ enum { }; static const char short_options[] = - "b:cC:d:D:EhH:I:m:NpP:sS:tT:uU:VW"; + "b:cC:d:D:EhH:I:m:No:pP:sS:tT:uU:VW"; static const struct option long_options[] = { { "dlldata", 1, NULL, DLLDATA_OPTION }, { "dlldata-only", 0, NULL, DLLDATA_ONLY_OPTION }, { "local-stubs", 1, NULL, LOCAL_STUBS_OPTION }, { "oldnames", 0, NULL, OLDNAMES_OPTION }, + { "output", 0, NULL, 'o' }, { "prefix-all", 1, NULL, PREFIX_ALL_OPTION }, { "prefix-client", 1, NULL, PREFIX_CLIENT_OPTION }, { "prefix-server", 1, NULL, PREFIX_SERVER_OPTION }, @@ -486,6 +482,7 @@ int main(int argc,char *argv[]) int optc; int ret = 0; int opti = 0; + char *output_name = NULL; signal( SIGTERM, exit_on_signal ); signal( SIGINT, exit_on_signal ); @@ -577,6 +574,9 @@ int main(int argc,char *argv[]) case 'N': no_preprocess = 1; break; + case 'o': + output_name = xstrdup(optarg); + break; case 'p': do_everything = 0; do_proxies = 1; @@ -621,6 +621,20 @@ int main(int argc,char *argv[]) set_everything(TRUE); } + if (!output_name) output_name = dup_basename(input_name, ".idl"); + + if (!do_everything && + do_header + do_typelib + do_proxies + do_client + do_server + do_idfile + do_dlldata == 1) + { + if (do_header) header_name = output_name; + else if (do_typelib) typelib_name = output_name; + else if (do_proxies) proxy_name = output_name; + else if (do_client) client_name = output_name; + else if (do_server) server_name = output_name; + else if (do_idfile) idfile_name = output_name; + else if (do_dlldata) dlldata_name = output_name; + } + if (!dlldata_name && do_dlldata) dlldata_name = xstrdup("dlldata.c"); diff --git a/tools/widl/widl.man.in b/tools/widl/widl.man.in index 2757cdf..17aa8aa 100644 --- a/tools/widl/widl.man.in +++ b/tools/widl/widl.man.in @@ -31,6 +31,10 @@ will print a help message. .B General options: .IP "\fB-V\fR" Print version number and exit. +.IP "\fB-o, --output=\fIname" +Set the name of the output file. When generating multiple output +files, this sets only the base name of the file; the respective output +files are then named \fIname\fR.h, \fIname\fR_p.c, etc. .IP "\fB-b \fIcpu-manufacturer[-kernel]-os\fR" Set the target architecture when cross-compiling. The target specification is in the standard autoconf format as returned by @@ -38,38 +42,25 @@ config.sub. .PP .B Header options: .IP "\fB-h\fR" -Generate header files. -.IP "\fB-H \fIfile\fR" -Name of header file to generate. The default header -filename is \fIinfile\fR.h. +Generate header files. The default output filename is \fIinfile\fB.h\fR. .IP "\fB--oldnames\fR" Use old naming conventions. .PP .B Type library options: .IP \fB-t\fR -Generate a type library. -.IP "\fB-T \fIfile\fR" -Define the name of the type library to be generated. -The default filename is \fIinfile\fR.tlb. +Generate a type library. The default output filename is \fIinfile\fB.tlb\fR. .IP "\fB-m32, -m64\fR" Generate a Win32, respectively Win64, type library. .PP .B UUID file options: .IP "\fB-u\fR" -Generate a UUID file. -.IP "\fB-U \fIfile\fR" -Define the name of the UUID file to be generated. -The default filename is \fIinfile\fR_i.c. +Generate a UUID file. The default output filename is \fIinfile\fB_i.c\fR. .PP .B Proxy/stub generation options: .IP "\fB-c\fR" -Generate client stub. -.IP "\fB-C \fIfile\fR" -Name of client stub file (default is \fIinfile\fR_c.c) +Generate a client stub file. The default output filename is \fIinfile\fB_c.c\fR. .IP "\fB-p\fR" -Generate proxy. -.IP "\fB-P \fIfile\fR" -Name of proxy file (default is \fIinfile\fR_p.c) +Generate a proxy. The default output filename is \fIinfile\fB_p.c\fR. .IP "\fB--prefix-all=\fIprefix\fR" Prefix to put on the name of both client and server stubs. .IP "\fB--prefix-client=\fIprefix\fR" @@ -77,17 +68,17 @@ Prefix to put on the name of client stubs. .IP "\fB--prefix-server=\fIprefix\fR" Prefix to put on the name of server stubs. .IP "\fB-s\fR" -Generate server stub. -.IP "\fB-S \fIfile\fR" -Name of server stub file (default is \fIinfile\fR_s.c) +Generate a server stub file. The default output filename is +\fIinfile\fB_s.c\fR. .IP "\fB--win32, --win64\fR" Only generate 32-bit, respectively 64-bit code (the default is to generate both 32-bit and 64-bit versions into the same destination file). .PP .B Dlldata file options: -.IP "\fB--dlldata=\fIfile\fR" -Name of the dlldata file (default is dlldata.c) +.IP "\fB--dlldata-only\fI name1 [name2...]" +Regenerate the dlldata file from scratch using the specified proxy +names. The default output filename is \fBdlldata.c\fR. .PP .B Preprocessor options: .IP "\fB-I \fIpath\fR"

1 0