April 2011 - Wine-commits - list.winehq.org

Francois Gouget : xcopy: Remove a space before a '\n' in the Korean translation.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: b0c48cc5cd07cc09d93756f44cad1f709e8d2fbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0c48cc5cd07cc09d93756f44… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Nov 2 12:10:21 2010 +0100 xcopy: Remove a space before a '\n' in the Korean translation. (cherry picked from commit 6159f516fcbacaa3bcf8757b40201afdbcbe2ddc) --- programs/xcopy/Ko.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/xcopy/Ko.rc b/programs/xcopy/Ko.rc index bb46a36..8a68ebe 100644 --- a/programs/xcopy/Ko.rc +++ b/programs/xcopy/Ko.rc @@ -56,7 +56,7 @@ XCOPY 원본 [대상] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ \n\ Where:\n\ \n\ -[/I] 만약 대상이 존재하지 않는 경우 디렉토리로 가정하고 두개나 더 많은 파일을 \n\ +[/I] 만약 대상이 존재하지 않는 경우 디렉토리로 가정하고 두개나 더 많은 파일을\n\ \t복사\n\ [/S] 디렉토리하고 하위 디렉토리 복사\n\ [/E] 빈 디렉토리를 포함해서 디렉토리와 하위 디렉토리 복사\n\

1 0

Alexandre Julliard : server: Work around Mac OS not being able to set global breakpoint flags.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: f02c1b31ec5096133c15093e73fb7b634c283c87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f02c1b31ec5096133c15093e7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 26 12:41:36 2011 +0100 server: Work around Mac OS not being able to set global breakpoint flags. (cherry picked from commit e7a032c13144058d780b3c563b0f7c612a5223ba) --- server/mach.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/server/mach.c b/server/mach.c index f9490f3..f890321 100644 --- a/server/mach.c +++ b/server/mach.c @@ -211,6 +211,7 @@ void set_thread_context( struct thread *thread, const context_t *context, unsign mach_msg_type_number_t count = sizeof(state) / sizeof(int); mach_msg_type_name_t type; mach_port_t port, process_port = get_process_port( thread->process ); + unsigned int dr7; /* all other regs are handled on the client side */ assert( flags == SERVER_CTX_DEBUG_REGISTERS ); @@ -223,6 +224,9 @@ void set_thread_context( struct thread *thread, const context_t *context, unsign return; } + /* Mac OS doesn't allow setting the global breakpoint flags */ + dr7 = (context->debug.i386_regs.dr7 & ~0xaa) | ((context->debug.i386_regs.dr7 & 0xaa) >> 1); + #if __DARWIN_UNIX03 && defined(_STRUCT_X86_DEBUG_STATE32) state.__dr0 = context->debug.i386_regs.dr0; state.__dr1 = context->debug.i386_regs.dr1; @@ -231,7 +235,7 @@ void set_thread_context( struct thread *thread, const context_t *context, unsign state.__dr4 = 0; state.__dr5 = 0; state.__dr6 = context->debug.i386_regs.dr6; - state.__dr7 = context->debug.i386_regs.dr7; + state.__dr7 = dr7; #else state.dr0 = context->debug.i386_regs.dr0; state.dr1 = context->debug.i386_regs.dr1; @@ -240,7 +244,7 @@ void set_thread_context( struct thread *thread, const context_t *context, unsign state.dr4 = 0; state.dr5 = 0; state.dr6 = context->debug.i386_regs.dr6; - state.dr7 = context->debug.i386_regs.dr7; + state.dr7 = dr7; #endif if (!thread_set_state( port, x86_DEBUG_STATE32, (thread_state_t)&state, count )) {

1 0

Akihiro Sagawa : regedit: Export a decent newline in Unicode format.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: 67e1ee25a3cb0290fade9e252b40a44431cdf893 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67e1ee25a3cb0290fade9e252… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Mar 4 23:00:51 2011 +0900 regedit: Export a decent newline in Unicode format. (cherry picked from commit 3c6de3b3485e8ee3a622ef990c5b9042ad28e237) --- programs/regedit/regproc.c | 25 ++++++++++++++----------- 1 files changed, 14 insertions(+), 11 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index f210879..16931d6 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -23,6 +23,8 @@ #include <limits.h> #include <stdio.h> +#include <fcntl.h> +#include <io.h> #include <windows.h> #include <winnt.h> #include <winreg.h> @@ -970,9 +972,9 @@ static void REGPROC_export_binary(WCHAR **line_buf, DWORD *line_buf_size, DWORD const WCHAR *hex_prefix; const WCHAR hex[] = {'h','e','x',':',0}; WCHAR hex_buf[17]; - const WCHAR concat[] = {'\\','\n',' ',' ',0}; + const WCHAR concat[] = {'\\','\r','\n',' ',' ',0}; DWORD concat_prefix, concat_len; - const WCHAR newline[] = {'\n',0}; + const WCHAR newline[] = {'\r','\n',0}; CHAR* value_multibyte = NULL; if (type == REG_BINARY) { @@ -1081,7 +1083,7 @@ static void export_hkey(FILE *file, HKEY key, DWORD i; BOOL more_data; LONG ret; - WCHAR key_format[] = {'\n','[','%','s',']','\n',0}; + WCHAR key_format[] = {'\r','\n','[','%','s',']','\r','\n',0}; /* get size information and resize the buffers if necessary */ if (RegQueryInfoKeyW(key, NULL, NULL, NULL, NULL, @@ -1151,7 +1153,7 @@ static void export_hkey(FILE *file, HKEY key, REGPROC_export_binary(line_buf, line_buf_size, &line_len, value_type, *val_buf, val_size1, unicode); } else { const WCHAR start[] = {'"',0}; - const WCHAR end[] = {'"','\n',0}; + const WCHAR end[] = {'"','\r','\n',0}; DWORD len; len = lstrlenW(start); @@ -1172,7 +1174,7 @@ static void export_hkey(FILE *file, HKEY key, case REG_DWORD: { - WCHAR format[] = {'d','w','o','r','d',':','%','0','8','x','\n',0}; + WCHAR format[] = {'d','w','o','r','d',':','%','0','8','x','\r','\n',0}; REGPROC_resize_char_buffer(line_buf, line_buf_size, line_len + 15); sprintfW(*line_buf + line_len, format, *((DWORD *)*val_buf)); @@ -1237,19 +1239,20 @@ static void export_hkey(FILE *file, HKEY key, } /****************************************************************************** - * Open file for export. + * Open file in binary mode for export. */ static FILE *REGPROC_open_export_file(WCHAR *file_name, BOOL unicode) { FILE *file; WCHAR dash = '-'; - if (strncmpW(file_name,&dash,1)==0) + if (strncmpW(file_name,&dash,1)==0) { file=stdout; - else + _setmode(_fileno(file), _O_BINARY); + } else { CHAR* file_nameA = GetMultiByteString(file_name); - file = fopen(file_nameA, "w"); + file = fopen(file_nameA, "wb"); if (!file) { perror(""); fprintf(stderr,"%s: Can't open file \"%s\"\n", getAppName(), file_nameA); @@ -1261,12 +1264,12 @@ static FILE *REGPROC_open_export_file(WCHAR *file_name, BOOL unicode) if(unicode) { const BYTE unicode_seq[] = {0xff,0xfe}; - const WCHAR header[] = {'W','i','n','d','o','w','s',' ','R','e','g','i','s','t','r','y',' ','E','d','i','t','o','r',' ','V','e','r','s','i','o','n',' ','5','.','0','0','\n'}; + const WCHAR header[] = {'W','i','n','d','o','w','s',' ','R','e','g','i','s','t','r','y',' ','E','d','i','t','o','r',' ','V','e','r','s','i','o','n',' ','5','.','0','0','\r','\n'}; fwrite(unicode_seq, sizeof(BYTE), sizeof(unicode_seq)/sizeof(unicode_seq[0]), file); fwrite(header, sizeof(WCHAR), sizeof(header)/sizeof(header[0]), file); } else { - fputs("REGEDIT4\n", file); + fputs("REGEDIT4\r\n", file); } return file;

1 0

Eric Pouech : winegcc: Correctly manage the -V option ( gcc expects to be among the first ones, with -b).
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: 547032121cdedcf4df8627bcad830d90e13a2b49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=547032121cdedcf4df8627bca… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Mar 15 21:17:48 2011 +0100 winegcc: Correctly manage the -V option (gcc expects to be among the first ones, with -b). (cherry picked from commit 34acd88a2ecea59c7adf760d69b6c033baaa20d2) --- tools/winegcc/winegcc.c | 49 +++++++++++++++++++++++++++++++++++++--------- 1 files changed, 39 insertions(+), 10 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index dbf66c8..2400601 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -185,6 +185,7 @@ struct options enum target_cpu target_cpu; enum target_platform target_platform; const char *target; + const char *version; int shared; int use_msvcrt; int nostdinc; @@ -282,30 +283,49 @@ static char* get_temp_file(const char* prefix, const char* suffix) return tmp; } +static char* build_tool_name(struct options *opts, const char* base, const char* deflt) +{ + char* str; + + if (opts->target && opts->version) + { + str = strmake("%s-%s-%s", opts->target, base, opts->version); + } + else if (opts->target) + { + str = strmake("%s-%s", opts->target, base); + } + else if (opts->version) + { + str = strmake("%s-%s", base, opts->version); + } + else + str = xstrdup(deflt); + return str; +} + static const strarray* get_translator(struct options *opts) { - const char *str = NULL; + char *str = NULL; strarray *ret; switch(opts->processor) { case proc_cpp: - if (opts->target) str = strmake( "%s-cpp", opts->target ); - else str = CPP; + str = build_tool_name(opts, "cpp", CPP); break; case proc_cc: case proc_as: - if (opts->target) str = strmake( "%s-gcc", opts->target ); - else str = CC; + str = build_tool_name(opts, "gcc", CC); break; case proc_cxx: - if (opts->target) str = strmake( "%s-g++", opts->target ); - else str = CXX; + str = build_tool_name(opts, "g++", CXX); break; default: assert(0); } ret = strarray_fromstring( str, " " ); + free(str); if (opts->force_pointer_size) strarray_add( ret, strmake("-m%u", 8 * opts->force_pointer_size )); return ret; @@ -378,6 +398,8 @@ static void compile(struct options* opts, const char* lang) strarray* comp_args = strarray_alloc(); unsigned int j; int gcc_defs = 0; + char* gcc; + char* gpp; strarray_addall(comp_args, get_translator(opts)); switch(opts->processor) @@ -388,12 +410,16 @@ static void compile(struct options* opts, const char* lang) /* mixing different C and C++ compilers isn't supported in configure anyway */ case proc_cc: case proc_cxx: + gcc = build_tool_name(opts, "gcc", CC); + gpp = build_tool_name(opts, "g++", CXX); for ( j = 0; !gcc_defs && j < comp_args->size; j++ ) { const char *cc = comp_args->base[j]; - gcc_defs = strendswith(cc, "gcc") || strendswith(cc, "g++"); + gcc_defs = strendswith(cc, gcc) || strendswith(cc, gpp); } + free(gcc); + free(gpp); break; } @@ -1099,7 +1125,7 @@ static int is_linker_arg(const char* arg) */ static int is_target_arg(const char* arg) { - return arg[1] == 'b' || arg[2] == 'V'; + return arg[1] == 'b' || arg[1] == 'V'; } @@ -1276,7 +1302,7 @@ int main(int argc, char **argv) raw_linker_arg = 0; if (argv[i][1] == 'c' || argv[i][1] == 'L') raw_compiler_arg = 0; - if (argv[i][1] == 'o' || argv[i][1] == 'b') + if (argv[i][1] == 'o' || argv[i][1] == 'b' || argv[i][1] == 'V') raw_compiler_arg = raw_linker_arg = 0; /* do a bit of semantic analysis */ @@ -1299,6 +1325,9 @@ int main(int argc, char **argv) case 'b': parse_target_option( &opts, option_arg ); break; + case 'V': + opts.version = xstrdup( option_arg ); + break; case 'c': /* compile or assemble */ if (argv[i][2] == 0) opts.compile_only = 1; /* fall through */

1 0

Eric Pouech : winegcc: Check that option argument is within command line parameters.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: 41481f5509f50da9d9232ba4a4c6c28ca116d413 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41481f5509f50da9d9232ba4a… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Mar 26 12:16:51 2011 +0100 winegcc: Check that option argument is within command line parameters. (cherry picked from commit a5cbdcb8bb4dbc7fcf9acc7b8d673ecebe64f496) --- tools/winegcc/winegcc.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 2400601..ea3e527 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1282,7 +1282,11 @@ int main(int argc, char **argv) next_is_arg = 1; break; } - if (next_is_arg) option_arg = argv[i+1]; + if (next_is_arg) + { + if (i + 1 >= argc) error("option -%c requires an argument\n", argv[i][1]); + option_arg = argv[i+1]; + } /* determine what options go 'as is' to the linker & the compiler */ raw_compiler_arg = raw_linker_arg = 0;

1 0

André Hentschel : mountmgr.sys: Handle IOCTL_DISK_GET_DRIVE_GEOMETRY_EX.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: 2b8eadefed6547431ca0ebab969ef3a57e113c3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b8eadefed6547431ca0ebab9… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Mar 9 20:45:18 2011 +0100 mountmgr.sys: Handle IOCTL_DISK_GET_DRIVE_GEOMETRY_EX. (cherry picked from commit 7a90e7a4442a011db17b7f297e7c93af87269bc4) --- dlls/mountmgr.sys/device.c | 20 ++++++++++++++++++++ include/winioctl.h | 7 +++++++ 2 files changed, 27 insertions(+), 0 deletions(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index 8709472..ddff3ab 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -888,6 +888,26 @@ static NTSTATUS WINAPI harddisk_ioctl( DEVICE_OBJECT *device, IRP *irp ) irp->IoStatus.u.Status = STATUS_SUCCESS; break; } + case IOCTL_DISK_GET_DRIVE_GEOMETRY_EX: + { + DISK_GEOMETRY_EX info; + DWORD len = min( sizeof(info), irpsp->Parameters.DeviceIoControl.OutputBufferLength ); + + FIXME("The DISK_PARTITION_INFO and DISK_DETECTION_INFO structures will not be filled\n"); + + info.Geometry.Cylinders.QuadPart = 10000; + info.Geometry.MediaType = (dev->devnum.DeviceType == FILE_DEVICE_DISK) ? FixedMedia : RemovableMedia; + info.Geometry.TracksPerCylinder = 255; + info.Geometry.SectorsPerTrack = 63; + info.Geometry.BytesPerSector = 512; + info.DiskSize.QuadPart = info.Geometry.Cylinders.QuadPart * info.Geometry.TracksPerCylinder * + info.Geometry.SectorsPerTrack * info.Geometry.BytesPerSector; + info.Data[0] = 0; + memcpy( irp->MdlAddress->StartVa, &info, len ); + irp->IoStatus.Information = len; + irp->IoStatus.u.Status = STATUS_SUCCESS; + break; + } case IOCTL_STORAGE_GET_DEVICE_NUMBER: { DWORD len = min( sizeof(dev->devnum), irpsp->Parameters.DeviceIoControl.OutputBufferLength ); diff --git a/include/winioctl.h b/include/winioctl.h index d1c3376..7f04d59 100644 --- a/include/winioctl.h +++ b/include/winioctl.h @@ -264,6 +264,7 @@ #define SMART_GET_VERSION CTL_CODE(IOCTL_DISK_BASE, 0x0020, METHOD_BUFFERED, FILE_READ_ACCESS) #define SMART_SEND_DRIVE_COMMAND CTL_CODE(IOCTL_DISK_BASE, 0x0021, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) #define SMART_RCV_DRIVE_DATA CTL_CODE(IOCTL_DISK_BASE, 0x0022, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) +#define IOCTL_DISK_GET_DRIVE_GEOMETRY_EX CTL_CODE(IOCTL_DISK_BASE, 0x0028, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_VOLUME_BASE ((DWORD)'V') #define IOCTL_VOLUME_GET_VOLUME_DISK_EXTENTS CTL_CODE(IOCTL_VOLUME_BASE, 0, METHOD_BUFFERED, FILE_ANY_ACCESS) @@ -325,6 +326,12 @@ typedef struct _DISK_GEOMETRY { DWORD BytesPerSector; } DISK_GEOMETRY, *PDISK_GEOMETRY; +typedef struct _DISK_GEOMETRY_EX { + DISK_GEOMETRY Geometry; + LARGE_INTEGER DiskSize; + BYTE Data[1]; +} DISK_GEOMETRY_EX, *PDISK_GEOMETRY_EX; + typedef struct _PARTITION_INFORMATION { LARGE_INTEGER StartingOffset; LARGE_INTEGER PartitionLength;

1 0

Aric Stewart : ws2_32: async_send with no buffers does not need to do any work.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: bf9cffedf60fef748e22d58d0ec90c52fd2dfb66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf9cffedf60fef748e22d58d0… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Mar 4 12:09:44 2011 -0600 ws2_32: async_send with no buffers does not need to do any work. (cherry picked from commit f520dec3e1fee260f42f4eb28d033d7b177f94d9) --- dlls/ws2_32/socket.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 8221e72..ec1641a 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1557,6 +1557,12 @@ static NTSTATUS WS2_async_send(void* user, IO_STATUS_BLOCK* iosb, NTSTATUS statu switch (status) { case STATUS_ALERTED: + if ( wsa->n_iovecs <= wsa->first_iovec ) + { + /* Nothing to do */ + status = STATUS_SUCCESS; + break; + } if ((status = wine_server_handle_to_fd( wsa->hSocket, FILE_WRITE_DATA, &fd, NULL ) )) break;

1 0

Alexandre Julliard : winex11: Don' t unmap off-screen windows on PropertyNotify events.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: 0001c27dc80ee7a41839c97e054ff27873a3d857 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0001c27dc80ee7a41839c97e0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 7 15:11:10 2011 +0100 winex11: Don't unmap off-screen windows on PropertyNotify events. (cherry picked from commit b1af55d551cce6bc2690c37b95646cf89827c8d2) --- dlls/winex11.drv/window.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index ef515ee..55dcfdd 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2366,7 +2366,7 @@ void CDECL X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags if (data->mapped) { if (((swp_flags & SWP_HIDEWINDOW) && !(new_style & WS_VISIBLE)) || - (event_type != ConfigureNotify && + (!event_type && !is_window_rect_mapped( rectWindow ) && is_window_rect_mapped( &old_window_rect ))) unmap_window( display, data ); }

1 0

Huw Davies : oleaut32: Fix the typelib marshaler when the vtbl has holes.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: 6d51d3106ba45733e10ea8af52e6912609a4c68b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d51d3106ba45733e10ea8af5… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Feb 24 10:09:36 2011 +0000 oleaut32: Fix the typelib marshaler when the vtbl has holes. (cherry picked from commit ac5e9812fdb6929e0fc3c9f3805223dd6062da62) --- dlls/oleaut32/tmarshal.c | 91 +++++++++++++++++++++++++++++++++------------- 1 files changed, 65 insertions(+), 26 deletions(-) diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index 76b64f1..ce5778b 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -322,48 +322,85 @@ _get_typeinfo_for_iid(REFIID riid, ITypeInfo**ti) { } /* - * Determine the number of functions including all inherited functions. + * Determine the number of functions including all inherited functions + * and well as the size of the vtbl. * Note for non-dual dispinterfaces we simply return the size of IDispatch. */ -static HRESULT num_of_funcs(ITypeInfo *tinfo, unsigned int *num) +static HRESULT num_of_funcs(ITypeInfo *tinfo, unsigned int *num, + unsigned int *vtbl_size) { - HRESULT hres; + HRESULT hr; TYPEATTR *attr; ITypeInfo *tinfo2; + UINT inherited_funcs = 0, i; *num = 0; - hres = ITypeInfo_GetTypeAttr(tinfo, &attr); - if (hres) { - ERR("GetTypeAttr failed with %x\n",hres); - return hres; + if(vtbl_size) *vtbl_size = 0; + + hr = ITypeInfo_GetTypeAttr(tinfo, &attr); + if (hr) + { + ERR("GetTypeAttr failed with %x\n", hr); + return hr; } - if(attr->typekind == TKIND_DISPATCH && (attr->wTypeFlags & TYPEFLAG_FDUAL)) + if(attr->typekind == TKIND_DISPATCH) { - HREFTYPE href; - hres = ITypeInfo_GetRefTypeOfImplType(tinfo, -1, &href); - if(FAILED(hres)) + if(attr->wTypeFlags & TYPEFLAG_FDUAL) { - ERR("Unable to get interface href from dual dispinterface\n"); - goto end; + HREFTYPE href; + + ITypeInfo_ReleaseTypeAttr(tinfo, attr); + hr = ITypeInfo_GetRefTypeOfImplType(tinfo, -1, &href); + if(FAILED(hr)) + { + ERR("Unable to get interface href from dual dispinterface\n"); + return hr; + } + hr = ITypeInfo_GetRefTypeInfo(tinfo, href, &tinfo2); + if(FAILED(hr)) + { + ERR("Unable to get interface from dual dispinterface\n"); + return hr; + } + hr = num_of_funcs(tinfo2, num, vtbl_size); + ITypeInfo_Release(tinfo2); + return hr; } - hres = ITypeInfo_GetRefTypeInfo(tinfo, href, &tinfo2); - if(FAILED(hres)) + else /* non-dual dispinterface */ { - ERR("Unable to get interface from dual dispinterface\n"); - goto end; + /* These will be the size of IDispatchVtbl */ + *num = attr->cbSizeVft / sizeof(void *); + if(vtbl_size) *vtbl_size = attr->cbSizeVft; + ITypeInfo_ReleaseTypeAttr(tinfo, attr); + return hr; } - hres = num_of_funcs(tinfo2, num); - ITypeInfo_Release(tinfo2); } - else + + for (i = 0; i < attr->cImplTypes; i++) { - *num = attr->cbSizeVft / 4; + HREFTYPE href; + ITypeInfo *pSubTypeInfo; + UINT sub_funcs; + + hr = ITypeInfo_GetRefTypeOfImplType(tinfo, i, &href); + if (FAILED(hr)) goto end; + hr = ITypeInfo_GetRefTypeInfo(tinfo, href, &pSubTypeInfo); + if (FAILED(hr)) goto end; + + hr = num_of_funcs(pSubTypeInfo, &sub_funcs, NULL); + ITypeInfo_Release(pSubTypeInfo); + + if(FAILED(hr)) goto end; + inherited_funcs += sub_funcs; } + *num = inherited_funcs + attr->cFuncs; + if(vtbl_size) *vtbl_size = attr->cbSizeVft; + end: ITypeInfo_ReleaseTypeAttr(tinfo, attr); - return hres; + return hr; } #ifdef __i386__ @@ -1687,7 +1724,7 @@ static HRESULT init_proxy_entry_point(TMProxyImpl *proxy, unsigned int num) xasm->lret = 0xc2; xasm->bytestopop = (nrofargs+2)*4; /* pop args, This, iMethod */ xasm->nop = 0x90; - proxy->lpvtbl[num] = xasm; + proxy->lpvtbl[fdesc->oVft / sizeof(void *)] = xasm; #else FIXME("not implemented on non i386\n"); return E_FAIL; @@ -1702,7 +1739,7 @@ PSFacBuf_CreateProxy( { HRESULT hres; ITypeInfo *tinfo; - unsigned int i, nroffuncs; + unsigned int i, nroffuncs, vtbl_size; TMProxyImpl *proxy; TYPEATTR *typeattr; BOOL defer_to_dispatch = FALSE; @@ -1714,7 +1751,9 @@ PSFacBuf_CreateProxy( return hres; } - hres = num_of_funcs(tinfo, &nroffuncs); + hres = num_of_funcs(tinfo, &nroffuncs, &vtbl_size); + TRACE("Got %d funcs, vtbl size %d\n", nroffuncs, vtbl_size); + if (FAILED(hres)) { ERR("Cannot get number of functions for typeinfo %s\n",debugstr_guid(riid)); ITypeInfo_Release(tinfo); @@ -1745,7 +1784,7 @@ PSFacBuf_CreateProxy( InitializeCriticalSection(&proxy->crit); proxy->crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": TMProxyImpl.crit"); - proxy->lpvtbl = HeapAlloc(GetProcessHeap(),0,sizeof(LPBYTE)*nroffuncs); + proxy->lpvtbl = HeapAlloc(GetProcessHeap(), 0, vtbl_size); /* if we derive from IDispatch then defer to its proxy for its methods */ hres = ITypeInfo_GetTypeAttr(tinfo, &typeattr);

1 0

Maarten Lankhorst : mshtml: Make sure system xpcom dll gets loaded.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: 41827e733435212efe981149e2af02538a8d314a URL: http://source.winehq.org/git/wine.git/?a=commit;h=41827e733435212efe981149e… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Feb 23 00:20:33 2011 +0100 mshtml: Make sure system xpcom dll gets loaded. (cherry picked from commit e9a4dee1eb610e567ac4df00368b41282326f03f) --- dlls/mshtml/nsembed.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 56c5d94..2e45931 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -162,13 +162,17 @@ static void set_environment(LPCWSTR gre_path) static BOOL load_xpcom(const PRUnichar *gre_path) { - static const WCHAR strXPCOM[] = {'x','p','c','o','m','.','d','l','l',0}; + static const WCHAR strXPCOM[] = {'\\','x','p','c','o','m','.','d','l','l',0}; + WCHAR file_name[MAX_PATH]; + + strcpyW(file_name, gre_path); + strcatW(file_name, strXPCOM); - TRACE("(%s)\n", debugstr_w(gre_path)); + TRACE("(%s)\n", debugstr_w(file_name)); set_environment(gre_path); - hXPCOM = LoadLibraryW(strXPCOM); + hXPCOM = LoadLibraryExW(file_name, 0, LOAD_WITH_ALTERED_SEARCH_PATH); if(!hXPCOM) { WARN("Could not load XPCOM: %d\n", GetLastError()); return FALSE;

1 0