August 2009 - Wine-Commits - list.winehq.org

Alexandre Julliard : winebuild: Add support for creating a fake dll at compile time.
by Alexandre Julliard Aug. 14, 2009

Aug. 14, 2009

Module: wine Branch: master Commit: ef4a3c3c2dce3f7c9b702762bacb346aa1a6fef0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef4a3c3c2dce3f7c9b702762b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 14 14:16:38 2009 +0200 winebuild: Add support for creating a fake dll at compile time. --- tools/winebuild/build.h | 3 + tools/winebuild/main.c | 13 +++ tools/winebuild/res32.c | 103 +++++++++++++++++++ tools/winebuild/spec16.c | 10 ++ tools/winebuild/spec32.c | 201 ++++++++++++++++++++++++++++++++++++++ tools/winebuild/winebuild.man.in | 5 + 6 files changed, 335 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ef4a3c3c2dce3f7c9b702…

1 0

Alexandre Julliard : winebuild: Compute the resource offsets while building the resource tree.
by Alexandre Julliard Aug. 14, 2009

Aug. 14, 2009

Module: wine Branch: master Commit: 99037aa9cc6c506029be8486956b838e961450f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99037aa9cc6c506029be84869… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 14 14:11:34 2009 +0200 winebuild: Compute the resource offsets while building the resource tree. --- tools/winebuild/res32.c | 120 +++++++++++++++++++++++------------------------ 1 files changed, 59 insertions(+), 61 deletions(-) diff --git a/tools/winebuild/res32.c b/tools/winebuild/res32.c index 78de2ac..2f84f5a 100644 --- a/tools/winebuild/res32.c +++ b/tools/winebuild/res32.c @@ -50,6 +50,7 @@ struct resource struct string_id name; const void *data; unsigned int data_size; + unsigned int data_offset; unsigned short mem_options; unsigned short lang; }; @@ -58,8 +59,9 @@ struct resource struct res_name { const struct string_id *name; /* name */ - const struct resource *res; /* resource */ + struct resource *res; /* resource */ int nb_languages; /* number of languages */ + unsigned int dir_offset; /* offset of directory in resource dir */ unsigned int name_offset; /* offset of name in resource dir */ }; @@ -70,6 +72,7 @@ struct res_type struct res_name *names; /* names array */ unsigned int nb_names; /* total number of names */ unsigned int nb_id_names; /* number of names that have a numeric id */ + unsigned int dir_offset; /* offset of directory in resource dir */ unsigned int name_offset; /* offset of type name in resource dir */ }; @@ -106,7 +109,7 @@ static inline int strcmpW( const WCHAR *str1, const WCHAR *str2 ) return *str1 - *str2; } -static struct res_name *add_name( struct res_type *type, const struct resource *res ) +static struct res_name *add_name( struct res_type *type, struct resource *res ) { struct res_name *name; type->names = xrealloc( type->names, (type->nb_names + 1) * sizeof(*type->names) ); @@ -118,7 +121,7 @@ static struct res_name *add_name( struct res_type *type, const struct resource * return name; } -static struct res_type *add_type( struct res_tree *tree, const struct resource *res ) +static struct res_type *add_type( struct res_tree *tree, struct resource *res ) { struct res_type *type; tree->types = xrealloc( tree->types, (tree->nb_types + 1) * sizeof(*tree->types) ); @@ -284,12 +287,13 @@ static char *format_res_string( const struct string_id *str ) } /* build the 3-level (type,name,language) resource tree */ -static struct res_tree *build_resource_tree( DLLSPEC *spec ) +static struct res_tree *build_resource_tree( DLLSPEC *spec, unsigned int *dir_size ) { - unsigned int i; + unsigned int i, k, n, offset, data_offset; struct res_tree *tree; struct res_type *type = NULL; struct res_name *name = NULL; + struct resource *res; qsort( spec->resources, spec->nb_resources, sizeof(*spec->resources), cmp_res ); @@ -317,6 +321,48 @@ static struct res_tree *build_resource_tree( DLLSPEC *spec ) } else name->nb_languages++; } + + /* compute the offsets */ + + offset = RESDIR_SIZE( tree->nb_types ); + for (i = 0, type = tree->types; i < tree->nb_types; i++, type++) + { + type->dir_offset = offset; + offset += RESDIR_SIZE( type->nb_names ); + for (n = 0, name = type->names; n < type->nb_names; n++, name++) + { + name->dir_offset = offset; + offset += RESDIR_SIZE( name->nb_languages ); + } + } + data_offset = offset; + offset += spec->nb_resources * RESOURCE_DATA_ENTRY_SIZE; + + for (i = 0, type = tree->types; i < tree->nb_types; i++, type++) + { + if (type->type->str) + { + type->name_offset = offset | 0x80000000; + offset += (strlenW(type->type->str)+1) * sizeof(WCHAR); + } + else type->name_offset = type->type->id; + + for (n = 0, name = type->names; n < type->nb_names; n++, name++) + { + if (name->name->str) + { + name->name_offset = offset | 0x80000000; + offset += (strlenW(name->name->str)+1) * sizeof(WCHAR); + } + else name->name_offset = name->name->id; + for (k = 0, res = name->res; k < name->nb_languages; k++, res++) + { + unsigned int entry_offset = (res - spec->resources) * RESOURCE_DATA_ENTRY_SIZE; + res->data_offset = data_offset + entry_offset; + } + } + } + if (dir_size) *dir_size = (offset + 3) & ~3; return tree; } @@ -356,7 +402,7 @@ static inline void output_res_dir( unsigned int nb_names, unsigned int nb_ids ) void output_resources( DLLSPEC *spec ) { int k, nb_id_types; - unsigned int i, n, offset, data_offset; + unsigned int i, n; struct res_tree *tree; struct res_type *type; struct res_name *name; @@ -364,42 +410,7 @@ void output_resources( DLLSPEC *spec ) if (!spec->nb_resources) return; - tree = build_resource_tree( spec ); - - /* compute the offsets */ - - offset = RESDIR_SIZE( tree->nb_types ); - for (i = 0, type = tree->types; i < tree->nb_types; i++, type++) - { - offset += RESDIR_SIZE( type->nb_names ); - for (n = 0, name = type->names; n < type->nb_names; n++, name++) - offset += RESDIR_SIZE( name->nb_languages ); - } - offset += spec->nb_resources * RESOURCE_DATA_ENTRY_SIZE; - - for (i = nb_id_types = 0, type = tree->types; i < tree->nb_types; i++, type++) - { - if (type->type->str) - { - type->name_offset = offset | 0x80000000; - offset += (strlenW(type->type->str)+1) * sizeof(WCHAR); - } - else - { - type->name_offset = type->type->id; - nb_id_types++; - } - - for (n = 0, name = type->names; n < type->nb_names; n++, name++) - { - if (name->name->str) - { - name->name_offset = offset | 0x80000000; - offset += (strlenW(name->name->str)+1) * sizeof(WCHAR); - } - else name->name_offset = name->name->id; - } - } + tree = build_resource_tree( spec, NULL ); /* output the resource directories */ @@ -408,44 +419,31 @@ void output_resources( DLLSPEC *spec ) output( "\t.align %d\n", get_alignment(get_ptr_size()) ); output( ".L__wine_spec_resources:\n" ); + for (i = nb_id_types = 0, type = tree->types; i < tree->nb_types; i++, type++) + if (!type->type->str) nb_id_types++; + output_res_dir( tree->nb_types - nb_id_types, nb_id_types ); /* dump the type directory */ - offset = RESDIR_SIZE( tree->nb_types ); for (i = 0, type = tree->types; i < tree->nb_types; i++, type++) - { output( "\t.long 0x%08x,0x%08x\n", - type->name_offset, offset | 0x80000000 ); - offset += RESDIR_SIZE( type->nb_names ); - for (n = 0, name = type->names; n < type->nb_names; n++, name++) - offset += RESDIR_SIZE( name->nb_languages ); - } - - data_offset = offset; - offset = RESDIR_SIZE( tree->nb_types ); + type->name_offset, type->dir_offset | 0x80000000 ); /* dump the names and languages directories */ for (i = 0, type = tree->types; i < tree->nb_types; i++, type++) { output_res_dir( type->nb_names - type->nb_id_names, type->nb_id_names ); - offset += RESDIR_SIZE( type->nb_names ); for (n = 0, name = type->names; n < type->nb_names; n++, name++) - { output( "\t.long 0x%08x,0x%08x\n", - name->name_offset, offset | 0x80000000 ); - offset += RESDIR_SIZE( name->nb_languages ); - } + name->name_offset, name->dir_offset | 0x80000000 ); for (n = 0, name = type->names; n < type->nb_names; n++, name++) { output_res_dir( 0, name->nb_languages ); for (k = 0, res = name->res; k < name->nb_languages; k++, res++) - { - unsigned int entry_offset = (res - spec->resources) * RESOURCE_DATA_ENTRY_SIZE; - output( "\t.long 0x%08x,0x%08x\n", res->lang, data_offset + entry_offset ); - } + output( "\t.long 0x%08x,0x%08x\n", res->lang, res->data_offset ); } }

1 0

Alexandre Julliard : winebuild: Add helper functions for writing binary data to a file.
by Alexandre Julliard Aug. 14, 2009

Aug. 14, 2009

Module: wine Branch: master Commit: 47497cb26a4667db874e96942d3a3af173886260 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47497cb26a4667db874e96942… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 14 13:26:09 2009 +0200 winebuild: Add helper functions for writing binary data to a file. --- tools/winebuild/build.h | 12 +++++++ tools/winebuild/res32.c | 63 +++++++---------------------------- tools/winebuild/utils.c | 83 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 108 insertions(+), 50 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index f9e9b1d..ad57122 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -270,11 +270,23 @@ extern const char *input_buffer_filename; extern const unsigned char *input_buffer; extern size_t input_buffer_pos; extern size_t input_buffer_size; +extern unsigned char *output_buffer; +extern size_t output_buffer_pos; +extern size_t output_buffer_size; extern void init_input_buffer( const char *file ); +extern void init_output_buffer(void); +extern void flush_output_buffer(void); extern unsigned char get_byte(void); extern unsigned short get_word(void); extern unsigned int get_dword(void); +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 ); /* global variables */ diff --git a/tools/winebuild/res32.c b/tools/winebuild/res32.c index 3f9303f..78de2ac 100644 --- a/tools/winebuild/res32.c +++ b/tools/winebuild/res32.c @@ -80,9 +80,6 @@ struct res_tree unsigned int nb_types; /* total number of types */ }; -static unsigned char *file_out_pos; /* current position in output resource file */ -static unsigned char *file_out_end; /* end of output buffer */ - /* size of a resource directory with n entries */ #define RESOURCE_DIR_SIZE (4 * sizeof(unsigned int)) #define RESOURCE_DIR_ENTRY_SIZE (2 * sizeof(unsigned int)) @@ -152,25 +149,6 @@ static void get_string( struct string_id *str ) } } -/* put a word into the resource file */ -static void put_word( unsigned short val ) -{ - if (byte_swapped) val = (val << 8) | (val >> 8); - *(unsigned short *)file_out_pos = val; - file_out_pos += sizeof(unsigned short); - assert( file_out_pos <= file_out_end ); -} - -/* put a dword into the resource file */ -static void put_dword( unsigned int val ) -{ - if (byte_swapped) - val = ((val << 24) | ((val << 8) & 0x00ff0000) | ((val >> 8) & 0x0000ff00) | (val >> 24)); - *(unsigned int *)file_out_pos = val; - file_out_pos += sizeof(unsigned int); - assert( file_out_pos <= file_out_end ); -} - /* put a string into the resource file */ static void put_string( const struct string_id *str ) { @@ -516,26 +494,15 @@ static unsigned int get_resource_header_size( const struct resource *res ) /* output the resources into a .o file */ void output_res_o_file( DLLSPEC *spec ) { - unsigned int i, total_size; - unsigned char *data; + unsigned int i; char *res_file = NULL; int fd, err; if (!spec->nb_resources) fatal_error( "--resources mode needs at least one resource file as input\n" ); if (!output_file_name) fatal_error( "No output file name specified\n" ); - total_size = 32; /* header */ - - for (i = 0; i < spec->nb_resources; i++) - { - total_size += (get_resource_header_size( &spec->resources[i] ) + 3) & ~3; - total_size += (spec->resources[i].data_size + 3) & ~3; - } - data = xmalloc( total_size ); - byte_swapped = 0; - file_out_pos = data; - file_out_end = data + total_size; + init_output_buffer(); put_dword( 0 ); /* ResSize */ put_dword( 32 ); /* HeaderSize */ @@ -557,34 +524,30 @@ void output_res_o_file( DLLSPEC *spec ) put_dword( (header_size + 3) & ~3 ); put_string( &spec->resources[i].type ); put_string( &spec->resources[i].name ); - if ((unsigned long)file_out_pos & 2) put_word( 0 ); + align_output( 4 ); put_dword( 0 ); put_word( spec->resources[i].mem_options ); put_word( spec->resources[i].lang ); put_dword( 0 ); put_dword( 0 ); - memcpy( file_out_pos, spec->resources[i].data, spec->resources[i].data_size ); - file_out_pos += spec->resources[i].data_size; - while ((unsigned long)file_out_pos & 3) *file_out_pos++ = 0; + put_data( spec->resources[i].data, spec->resources[i].data_size ); + align_output( 4 ); } - assert( file_out_pos == file_out_end ); /* if the output file name is a .res too, don't run the results through windres */ if (strendswith( output_file_name, ".res")) { - if ((fd = open( output_file_name, O_WRONLY|O_CREAT|O_TRUNC, 0666 )) == -1) - fatal_error( "Cannot create %s\n", output_file_name ); + flush_output_buffer(); + return; } - else - { - res_file = get_temp_file_name( output_file_name, ".res" ); - if ((fd = open( res_file, O_WRONLY|O_CREAT|O_TRUNC, 0600 )) == -1) - fatal_error( "Cannot create %s\n", res_file ); - } - if (write( fd, data, total_size ) != total_size) + + res_file = get_temp_file_name( output_file_name, ".res" ); + if ((fd = open( res_file, O_WRONLY|O_CREAT|O_TRUNC|O_BINARY, 0600 )) == -1) + fatal_error( "Cannot create %s\n", res_file ); + if (write( fd, output_buffer, output_buffer_pos ) != output_buffer_pos) fatal_error( "Error writing to %s\n", res_file ); close( fd ); - free( data ); + free( output_buffer ); if (res_file) { diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 2b6cec7..d11bd32 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -387,6 +387,18 @@ const char *input_buffer_filename; const unsigned char *input_buffer; size_t input_buffer_pos; size_t input_buffer_size; +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_input_buffer( const char *file ) { @@ -411,6 +423,20 @@ void init_input_buffer( const char *file ) byte_swapped = 0; } +void init_output_buffer(void) +{ + output_buffer_size = 1024; + output_buffer_pos = 0; + output_buffer = xmalloc( output_buffer_size ); +} + +void flush_output_buffer(void) +{ + if (fwrite( output_buffer, 1, output_buffer_pos, output_file ) != output_buffer_pos) + fatal_error( "Error writing to %s\n", output_file_name ); + free( output_buffer ); +} + unsigned char get_byte(void) { if (input_buffer_pos >= input_buffer_size) @@ -443,6 +469,63 @@ unsigned int get_dword(void) return ret; } +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 (get_ptr_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; +} + /* output a standard header for generated files */ void output_standard_file_header(void) {

1 0

Alexandre Julliard : winebuild: Add helper functions for reading binary data from a file.
by Alexandre Julliard Aug. 14, 2009

Aug. 14, 2009

Module: wine Branch: master Commit: b935cc210c707fe729e1f62c21edff888a8f834d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b935cc210c707fe729e1f62c2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 14 13:22:26 2009 +0200 winebuild: Add helper functions for reading binary data from a file. --- tools/winebuild/build.h | 13 +++++++ tools/winebuild/res16.c | 85 ++++++---------------------------------------- tools/winebuild/res32.c | 85 +++++++++++------------------------------------ tools/winebuild/utils.c | 73 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 117 insertions(+), 139 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b935cc210c707fe729e1f…

1 0

Jacek Caban : msxml3: Optimize bstr_from_xmlChar implementation.
by Alexandre Julliard Aug. 14, 2009

Aug. 14, 2009

Module: wine Branch: master Commit: 7447145d647c8d8eccb3f5b536ad7c55488298d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7447145d647c8d8eccb3f5b53… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 14 12:23:05 2009 +0200 msxml3: Optimize bstr_from_xmlChar implementation. --- dlls/msxml3/msxml_private.h | 15 ++++++++++++++- dlls/msxml3/node.c | 19 ------------------- 2 files changed, 14 insertions(+), 20 deletions(-) diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 917543d..357810d 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -59,7 +59,6 @@ xmlNodePtr xmlNodePtr_from_domnode( IXMLDOMNode *iface, xmlElementType type ); /* helpers */ extern xmlChar *xmlChar_from_wchar( LPWSTR str ); -extern BSTR bstr_from_xmlChar( const xmlChar *buf ); extern LONG xmldoc_add_ref( xmlDocPtr doc ); extern LONG xmldoc_release( xmlDocPtr doc ); @@ -87,6 +86,20 @@ static inline xmlnode *impl_from_IXMLDOMNode( IXMLDOMNode *iface ) extern HRESULT DOMDocument_create_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument2 **document); +static inline BSTR bstr_from_xmlChar(const xmlChar *str) +{ + BSTR ret = NULL; + + if(str) { + DWORD len = MultiByteToWideChar(CP_UTF8, 0, (LPCSTR)str, -1, NULL, 0); + ret = SysAllocStringLen(NULL, len-1); + if(ret) + MultiByteToWideChar( CP_UTF8, 0, (LPCSTR)str, -1, ret, len); + } + + return ret; +} + #endif void* libxslt_handle; diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 19fa4c5..1841e6e 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -247,25 +247,6 @@ static HRESULT WINAPI xmlnode_get_nodeName( return S_OK; } -BSTR bstr_from_xmlChar( const xmlChar *buf ) -{ - DWORD len; - LPWSTR str; - BSTR bstr; - - if ( !buf ) - return NULL; - - len = MultiByteToWideChar( CP_UTF8, 0, (LPCSTR) buf, -1, NULL, 0 ); - str = HeapAlloc( GetProcessHeap(), 0, len * sizeof (WCHAR) ); - if ( !str ) - return NULL; - MultiByteToWideChar( CP_UTF8, 0, (LPCSTR) buf, -1, str, len ); - bstr = SysAllocString( str ); - HeapFree( GetProcessHeap(), 0, str ); - return bstr; -} - static HRESULT WINAPI xmlnode_get_nodeValue( IXMLDOMNode *iface, VARIANT* value)

1 0

Alistair Leslie-Hughes : msxml3: Register missing MXXMLWriter interfaces.
by Alexandre Julliard Aug. 14, 2009

Aug. 14, 2009

Module: wine Branch: master Commit: 489c1a8d437ef3fea01595c5f00fdd92ef756181 URL: http://source.winehq.org/git/wine.git/?a=commit;h=489c1a8d437ef3fea01595c5f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Aug 12 14:32:06 2009 +1000 msxml3: Register missing MXXMLWriter interfaces. --- dlls/msxml3/regsvr.c | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/regsvr.c b/dlls/msxml3/regsvr.c index 9ca8afe..c8ae753 100644 --- a/dlls/msxml3/regsvr.c +++ b/dlls/msxml3/regsvr.c @@ -572,6 +572,22 @@ static struct regsvr_coclass const coclass_list[] = { "Msxml2.SAXXMLReader", "3.0" }, + { &CLSID_MXXMLWriter, + "IMXWriter interface", + NULL, + "msxml3.dll", + "Both", + "Msxml2.MXXMLWriter", + "3.0" + }, + { &CLSID_MXXMLWriter30, + "IMXWriter interface 3.0", + NULL, + "msxml3.dll", + "Both", + "Msxml2.MXXMLWriter", + "3.0" + }, { NULL } /* list terminator */ }; @@ -671,6 +687,16 @@ static struct progid const progid_list[] = { &CLSID_SAXXMLReader30, NULL }, + { "Msxml2.MXXMLWriter", + "MXXMLWriter", + &CLSID_MXXMLWriter, + "Msxml2.MXXMLWriter.3.0" + }, + { "Msxml2.MXXMLWriter.3.0", + "MXXMLWriter 3.0", + &CLSID_MXXMLWriter30, + NULL + }, { NULL } /* list terminator */ };

1 0

Alistair Leslie-Hughes : msxml3: IXMLDOMElement doesn' t support IObjectIdentity.
by Alexandre Julliard Aug. 14, 2009

Aug. 14, 2009

Module: wine Branch: master Commit: e00425e6c44633e023a30f40bf6e611770dff34c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e00425e6c44633e023a30f40b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Aug 12 20:47:26 2009 +1000 msxml3: IXMLDOMElement doesn't support IObjectIdentity. --- dlls/msxml3/dispex.c | 3 +++ dlls/msxml3/tests/domdoc.c | 4 ++++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/dispex.c b/dlls/msxml3/dispex.c index ab9d909..59d8878 100644 --- a/dlls/msxml3/dispex.c +++ b/dlls/msxml3/dispex.c @@ -634,6 +634,9 @@ BOOL dispex_query_interface(DispatchEx *This, REFIID riid, void **ppv) }else if(IsEqualGUID(&IID_UndocumentedScriptIface, riid)) { TRACE("(%p)->(IID_UndocumentedScriptIface %p) returning NULL\n", This, ppv); *ppv = NULL; + }else if (IsEqualGUID(&IID_IObjectIdentity, riid)) { + TRACE("IID_IObjectIdentity not supported returning NULL\n"); + *ppv = NULL; }else { return FALSE; } diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 18b9576..0eddb38 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -514,8 +514,12 @@ static void test_domdoc( void ) ok( r == S_OK, "should be a document element\n"); if( element ) { + IObjectIdentity *ident; BSTR tag = NULL; + r = IXMLDOMElement_QueryInterface( element, &IID_IObjectIdentity, (LPVOID*)&ident ); + ok( r == E_NOINTERFACE, "ret %08x\n", r); + /* check if the tag is correct */ r = IXMLDOMElement_get_tagName( element, &tag ); ok( r == S_OK, "couldn't get tag name\n");

1 0

Alistair Leslie-Hughes : shdocvw: Add basic support for InPlaceDeactivate.
by Alexandre Julliard Aug. 14, 2009

Aug. 14, 2009

Module: wine Branch: master Commit: a1ab2df19a8b7cc773c0b4cac81193be4dfca3ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1ab2df19a8b7cc773c0b4cac… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Aug 12 15:52:35 2009 +1000 shdocvw: Add basic support for InPlaceDeactivate. --- dlls/shdocvw/oleobject.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/oleobject.c b/dlls/shdocvw/oleobject.c index c42aa91..3657a7a 100644 --- a/dlls/shdocvw/oleobject.c +++ b/dlls/shdocvw/oleobject.c @@ -623,7 +623,13 @@ static HRESULT WINAPI OleInPlaceObject_InPlaceDeactivate(IOleInPlaceObject *ifac { WebBrowser *This = INPLACEOBJ_THIS(iface); FIXME("(%p)\n", This); - return E_NOTIMPL; + + if(This->inplace) { + IOleInPlaceSite_Release(This->inplace); + This->inplace = NULL; + } + + return S_OK; } static HRESULT WINAPI OleInPlaceObject_UIDeactivate(IOleInPlaceObject *iface)

1 0

Piotr Caban : jscript: Inherit Math from Object.
by Alexandre Julliard Aug. 14, 2009

Aug. 14, 2009

Module: wine Branch: master Commit: c368ab5ba7ac51c1568d0eb7bac7b629964de650 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c368ab5ba7ac51c1568d0eb7b… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Fri Aug 14 11:58:54 2009 +0200 jscript: Inherit Math from Object. --- dlls/jscript/math.c | 16 +++++++++++++++- dlls/jscript/tests/api.js | 1 + 2 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/math.c b/dlls/jscript/math.c index b172ffd..8fea484 100644 --- a/dlls/jscript/math.c +++ b/dlls/jscript/math.c @@ -602,5 +602,19 @@ static const builtin_info_t Math_info = { HRESULT create_math(script_ctx_t *ctx, DispatchEx **ret) { - return create_dispex(ctx, &Math_info, NULL, ret); + DispatchEx *math; + HRESULT hres; + + math = heap_alloc_zero(sizeof(DispatchEx)); + if(!math) + return E_OUTOFMEMORY; + + hres = init_dispex_from_constr(math, ctx, &Math_info, ctx->object_constr); + if(FAILED(hres)) { + heap_free(math); + return hres; + } + + *ret = math; + return S_OK; } diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 7273309..5d97224 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1394,5 +1394,6 @@ testObjectInherit(new Boolean(true), false, true, false); testObjectInherit(new Array(), false, false, true); testObjectInherit(new Error(), false, true, true); testObjectInherit(testObjectInherit, false, true, true); +testObjectInherit(Math, true, true, true); reportSuccess();

1 0

Piotr Caban : jscript: Added RegExp.source implementation.
by Alexandre Julliard Aug. 14, 2009

Aug. 14, 2009

Module: wine Branch: master Commit: 6b8fef873c10294526e9f7d99860274e50a8703f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b8fef873c10294526e9f7d99… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Fri Aug 14 11:58:44 2009 +0200 jscript: Added RegExp.source implementation. --- dlls/jscript/regexp.c | 20 ++++++++++++++++++-- dlls/jscript/tests/regexp.js | 8 ++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c index 5fe99ab..cc38c49 100644 --- a/dlls/jscript/regexp.c +++ b/dlls/jscript/regexp.c @@ -3427,8 +3427,24 @@ HRESULT regexp_match(DispatchEx *dispex, const WCHAR *str, DWORD len, BOOL gflag static HRESULT RegExp_source(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + + switch(flags) { + case DISPATCH_PROPERTYGET: { + RegExpInstance *This = (RegExpInstance*)dispex; + + V_VT(retv) = VT_BSTR; + V_BSTR(retv) = SysAllocString(This->str); + if(!V_BSTR(retv)) + return E_OUTOFMEMORY; + break; + } + default: + FIXME("Unimplemnted flags %x\n", flags); + return E_NOTIMPL; + } + + return S_OK; } static HRESULT RegExp_global(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/tests/regexp.js b/dlls/jscript/tests/regexp.js index 4344dfe..4d6e60d 100644 --- a/dlls/jscript/tests/regexp.js +++ b/dlls/jscript/tests/regexp.js @@ -208,4 +208,12 @@ ok(r.length === 2, "r.length = " + r.length); ok(r[0] === "1", "r[0] = " + r[0]); ok(r[1] === "2", "r[1] = " + r[1]); +var re; + +re = /abc[^d]/g; +ok(re.source === "abc[^d]", "re.source = '" + re.source + "', expected 'abc[^d]'"); + +re = /a\bc[^d]/g; +ok(re.source === "a\\bc[^d]", "re.source = '" + re.source + "', expected 'a\\bc[^d]'"); + reportSuccess();

1 0