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

Emmanuel Maillard : winecoreaudio: Implement MIDIIn_GetNumDevs and MIDIIn_GetDevCaps.
by Alexandre Julliard 27 Apr '07

27 Apr '07

Module: wine Branch: master Commit: 63bc986882e7e72e5a26706f2b60ae07c6b1d307 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63bc986882e7e72e5a26706f2… Author: Emmanuel Maillard <mahanuu(a)free.fr> Date: Thu Apr 26 21:42:10 2007 +0200 winecoreaudio: Implement MIDIIn_GetNumDevs and MIDIIn_GetDevCaps. --- dlls/winecoreaudio.drv/midi.c | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index 17b4367..6ee1beb 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -652,6 +652,28 @@ static DWORD MIDIIn_Close(WORD wDevID) return ret; } +static DWORD MIDIIn_GetDevCaps(WORD wDevID, LPMIDIINCAPSW lpCaps, DWORD dwSize) +{ + TRACE("wDevID=%d lpCaps=%p dwSize=%d\n", wDevID, lpCaps, dwSize); + + if (lpCaps == NULL) { + WARN("Invalid Parameter\n"); + return MMSYSERR_INVALPARAM; + } + + if (wDevID >= MIDIIn_NumDevs) { + WARN("bad device ID : %d\n", wDevID); + return MMSYSERR_BADDEVICEID; + } + memcpy(lpCaps, &sources[wDevID].caps, min(dwSize, sizeof(*lpCaps))); + return MMSYSERR_NOERROR; +} + +static DWORD MIDIIn_GetNumDevs(void) +{ + TRACE("\n"); + return MIDIIn_NumDevs; +} /* * MIDI In Mach message handling @@ -782,8 +804,14 @@ DWORD WINAPI CoreAudio_midMessage(UINT wDevID, UINT wMsg, DWORD dwUser, DWORD dw case MIDM_ADDBUFFER: case MIDM_PREPARE: case MIDM_UNPREPARE: + TRACE("Unsupported message\n"); + return MMSYSERR_NOTSUPPORTED; + case MIDM_GETDEVCAPS: + return MIDIIn_GetDevCaps(wDevID, (LPMIDIINCAPSW) dwParam1, dwParam2); case MIDM_GETNUMDEVS: + return MIDIIn_GetNumDevs(); + case MIDM_START: case MIDM_STOP: case MIDM_RESET:

1 0

Ben Taylor : wineoss: Fix to compile on Solaris 10.
by Alexandre Julliard 27 Apr '07

27 Apr '07

Module: wine Branch: master Commit: 09208ca4fffa198c757a6b8654448c746dacf445 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09208ca4fffa198c757a6b865… Author: Ben Taylor <sol11x86(a)comcast.net> Date: Thu Apr 26 13:22:11 2007 +0000 wineoss: Fix to compile on Solaris 10. --- dlls/wineoss.drv/mixer.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/wineoss.drv/mixer.c b/dlls/wineoss.drv/mixer.c index a28305b..22f580f 100644 --- a/dlls/wineoss.drv/mixer.c +++ b/dlls/wineoss.drv/mixer.c @@ -159,11 +159,17 @@ static const char * getIoctlCommand(int command) IOCTL_TO_STR(SOUND_MIXER_DIGITAL1); IOCTL_TO_STR(SOUND_MIXER_DIGITAL2); IOCTL_TO_STR(SOUND_MIXER_DIGITAL3); +#ifdef SOUND_MIXER_PHONEIN IOCTL_TO_STR(SOUND_MIXER_PHONEIN); +#endif +#ifdef SOUND_MIXER_PHONEOUT IOCTL_TO_STR(SOUND_MIXER_PHONEOUT); +#endif IOCTL_TO_STR(SOUND_MIXER_VIDEO); IOCTL_TO_STR(SOUND_MIXER_RADIO); +#ifdef SOUND_MIXER_MONITOR IOCTL_TO_STR(SOUND_MIXER_MONITOR); +#endif } #undef IOCTL_TO_STR sprintf(str, "UNKNOWN(%08x)", command);

1 0

Marcus Meissner : msi: Do not mark the tables const.
by Alexandre Julliard 27 Apr '07

27 Apr '07

Module: wine Branch: master Commit: ff40f3d2d3e3a6013db468d5834d5209f4fb7452 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff40f3d2d3e3a6013db468d58… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu Apr 26 22:05:54 2007 +0200 msi: Do not mark the tables const. --- dlls/msi/table.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 0d96793..64ddcab 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -91,13 +91,16 @@ static const WCHAR szColumns[] = { '_','C','o','l','u','m','n','s',0 }; static const WCHAR szNumber[] = { 'N','u','m','b','e','r',0 }; static const WCHAR szType[] = { 'T','y','p','e',0 }; -static const MSICOLUMNINFO _Columns_cols[4] = { +/* These tables are written into (the .hash_table part). + * Do not mark them const. + */ +static MSICOLUMNINFO _Columns_cols[4] = { { szColumns, 1, szTable, MSITYPE_VALID | MSITYPE_STRING | 64, 0 }, { szColumns, 2, szNumber, MSITYPE_VALID | 2, 2 }, { szColumns, 3, szName, MSITYPE_VALID | MSITYPE_STRING | 64, 4 }, { szColumns, 4, szType, MSITYPE_VALID | 2, 6 }, }; -static const MSICOLUMNINFO _Tables_cols[1] = { +static MSICOLUMNINFO _Tables_cols[1] = { { szTables, 1, szName, MSITYPE_VALID | MSITYPE_STRING | 64, 0 }, }; @@ -780,12 +783,12 @@ static UINT get_table( MSIDATABASE *db, LPCWSTR name, MSITABLE **table_ret ) /* these two tables are special - we know the column types already */ if( !lstrcmpW( name, szColumns ) ) { - table->colinfo = (MSICOLUMNINFO *)_Columns_cols; + table->colinfo = _Columns_cols; table->col_count = sizeof(_Columns_cols)/sizeof(_Columns_cols[0]); } else if( !lstrcmpW( name, szTables ) ) { - table->colinfo = (MSICOLUMNINFO *)_Tables_cols; + table->colinfo = _Tables_cols; table->col_count = sizeof(_Tables_cols)/sizeof(_Tables_cols[0]); } else

1 0

appdb/include application_queue.php
by WineHQ 27 Apr '07

27 Apr '07

ChangeSet ID: 31109 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/04/26 19:13:28 Modified files: include : application_queue.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> application_queue, only delete version if it exists. application_queue::delete() should check that the version object exists because when moving a duplicate application is deleted before the application Patch: http://cvs.winehq.org/patch.py?id=31109 Old revision New revision Changes Path 1.1 1.2 +8 -2 appdb/include/application_queue.php Index: appdb/include/application_queue.php diff -u -p appdb/include/application_queue.php:1.1 appdb/include/application_queue.php:1.2 --- appdb/include/application_queue.php:1.1 27 Apr 2007 0:13:28 -0000 +++ appdb/include/application_queue.php 27 Apr 2007 0:13:28 -0000 @@ -120,8 +120,14 @@ class application_queue if(!$this->oApp->delete()) $bSuccess = FALSE; - if(!$this->oVersionQueue->delete()) - $bSuccess = FALSE; + /* When deleting a duplicate app in the application queue, the version is moved + to another app and so when application_queue::delete() is called there is + no version child to delete, so check if the versionId is valid */ + if($this->oVersionQueue->oVersion->iVersionId) + { + if(!$this->oVersionQueue->delete()) + $bSuccess = FALSE; + } return $bSuccess; }

1 0

appdb/include version.php
by WineHQ 27 Apr '07

27 Apr '07

ChangeSet ID: 31108 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/04/26 19:06:07 Modified files: include : version.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Return from version::delete() if there isn't a valid version id Patch: http://cvs.winehq.org/patch.py?id=31108 Old revision New revision Changes Path 1.124 1.125 +4 -0 appdb/include/version.php Index: appdb/include/version.php diff -u -p appdb/include/version.php:1.124 appdb/include/version.php:1.125 --- appdb/include/version.php:1.124 27 Apr 2007 0: 6: 7 -0000 +++ appdb/include/version.php 27 Apr 2007 0: 6: 7 -0000 @@ -215,6 +215,10 @@ class Version { */ function delete($bSilent=false) { + /* We need the versionId to continue */ + if(!$this->iVersionId) + return; + /* is the current user allowed to delete this version? */ if(!$_SESSION['current']->canDeleteVersion($this)) return false;

1 0

Dmitry Timoshkov : user32: Windows doesn' t redraw a window if it is being just moved.
by Alexandre Julliard 26 Apr '07

26 Apr '07

Module: wine Branch: master Commit: 8723b12f985e3719d1aa03831517d5d0200275eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=8723b12f985e3719d1aa03831… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Apr 26 23:29:10 2007 +0900 user32: Windows doesn't redraw a window if it is being just moved. --- dlls/user32/tests/msg.c | 33 ++++++++++++++++++++++++++++++--- dlls/user32/winpos.c | 6 +++++- 2 files changed, 35 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index f0e4747..a6daf82 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -192,14 +192,30 @@ static const struct message WmSWP_ResizePopupSeq[] = { */ static const struct message WmSWP_MoveSeq[] = { { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOACTIVATE|SWP_NOSIZE }, - { WM_NCPAINT, sent|optional }, - { WM_GETTEXT, sent|defwinproc|optional }, - { WM_ERASEBKGND, sent|optional }, { WM_WINDOWPOSCHANGED, sent|wparam, SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOCLIENTSIZE }, { WM_MOVE, sent|defwinproc|wparam, 0 }, { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, { 0 } }; +/* Resize with SetWindowPos(SWP_NOZORDER) + * for a visible overlapped window + * SWP_NOZORDER is stripped by the logging code + */ +static const struct message WmSWP_ResizeNoZOrder[] = { + { WM_WINDOWPOSCHANGING, sent|wparam, 0/*SWP_NOZORDER*/ }, + { WM_GETMINMAXINFO, sent|defwinproc }, + { WM_NCCALCSIZE, sent|wparam, 1 }, + { WM_NCPAINT, sent }, + { WM_GETTEXT, sent|defwinproc|optional }, + { WM_ERASEBKGND, sent|parent|optional }, /* FIXME: remove optional once Wine is fixed */ + { WM_WINDOWPOSCHANGED, sent|wparam, /*SWP_NOZORDER|*/SWP_NOMOVE|SWP_NOCLIENTMOVE }, + { WM_SIZE, sent|defwinproc|wparam, 0 }, + { WM_NCCALCSIZE, sent|wparam|optional, 1 }, /* Win9x doesn't send it */ + { WM_NCPAINT, sent|optional }, /* Win9x doesn't send it */ + { WM_GETTEXT, sent|defwinproc|optional }, /* Win9x doesn't send it */ + { WM_ERASEBKGND, sent|optional }, /* Win9x doesn't send it */ + { 0 } +}; /* SetWindowPos(SWP_NOSIZE|SWP_NOMOVE|SWP_NOACTIVATE| SWP_NOZORDER|SWP_FRAMECHANGED) @@ -334,6 +350,9 @@ static const struct message WmShowMinOverlappedSeq[] = { { HCBT_MINMAX, hook|lparam, 0, SW_MINIMIZE }, { HCBT_SETFOCUS, hook }, { WM_KILLFOCUS, sent }, + { WM_IME_SETCONTEXT, sent|wparam|optional, 0 }, + { WM_IME_NOTIFY, sent|wparam|optional|defwinproc, 1 }, + { WM_GETTEXT, sent|optional }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOCOPYBITS|SWP_SHOWWINDOW|SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_STATECHANGED }, { WM_GETMINMAXINFO, sent|defwinproc }, { WM_NCCALCSIZE, sent|wparam, TRUE }, @@ -3760,8 +3779,16 @@ static void test_messages(void) /* test resizing and moving */ SetWindowPos( hwnd, 0, 0, 0, 300, 300, SWP_NOMOVE|SWP_NOACTIVATE ); ok_sequence(WmSWP_ResizeSeq, "SetWindowPos:Resize", FALSE ); + flush_events(); + flush_sequence(); SetWindowPos( hwnd, 0, 200, 200, 0, 0, SWP_NOSIZE|SWP_NOACTIVATE ); ok_sequence(WmSWP_MoveSeq, "SetWindowPos:Move", FALSE ); + flush_events(); + flush_sequence(); + SetWindowPos( hwnd, 0, 200, 200, 250, 250, SWP_NOZORDER ); + ok_sequence(WmSWP_ResizeNoZOrder, "SetWindowPos:WmSWP_ResizeNoZOrder", FALSE ); + flush_events(); + flush_sequence(); /* popups don't get WM_GETMINMAXINFO */ SetWindowLongW( hwnd, GWL_STYLE, WS_VISIBLE|WS_POPUP ); diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 1bfd16b..adf897e 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -40,6 +40,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(win); +#define SWP_AGG_NOGEOMETRYCHANGE \ + (SWP_NOSIZE | SWP_NOCLIENTSIZE | SWP_NOZORDER) #define SWP_AGG_NOPOSCHANGE \ (SWP_NOSIZE | SWP_NOMOVE | SWP_NOCLIENTSIZE | SWP_NOCLIENTMOVE | SWP_NOZORDER) #define SWP_AGG_STATUSFLAGS \ @@ -1602,7 +1604,9 @@ BOOL USER_SetWindowPos( WINDOWPOS * winpos ) &newWindowRect, &newClientRect, orig_flags, valid_rects )) return FALSE; - if (!(orig_flags & SWP_SHOWWINDOW)) + /* Windows doesn't redraw a window if it is being just moved */ + if (!(orig_flags & SWP_SHOWWINDOW) && + (winpos->flags & SWP_AGG_STATUSFLAGS) != SWP_AGG_NOGEOMETRYCHANGE) { UINT rdw_flags = RDW_FRAME | RDW_ERASE; if ( !(orig_flags & SWP_DEFERERASE) ) rdw_flags |= RDW_ERASENOW;

1 0

Dan Hipschman : rpcrt4: Add a testcase for RPCs with fixed-size arrays.
by Alexandre Julliard 26 Apr '07

26 Apr '07

Module: wine Branch: master Commit: ba17c25e62970340a67d0e15d818694d87143fcb URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba17c25e62970340a67d0e15d… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Wed Apr 25 18:22:10 2007 -0700 rpcrt4: Add a testcase for RPCs with fixed-size arrays. --- dlls/rpcrt4/tests/server.c | 9 +++++++++ dlls/rpcrt4/tests/server.idl | 1 + 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index 9fef738..51c570e 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -108,6 +108,12 @@ s_square_half_long(long x, long *y) return x * x; } +int +s_sum_fixed_array(int a[5]) +{ + return a[0] + a[1] + a[2] + a[3] + a[4]; +} + void s_stop(void) { @@ -147,6 +153,7 @@ static void basic_tests(void) { static char string[] = "I am a string"; + static int f[5] = {1, 3, 0, -2, -4}; static vector_t a = {1, 3, 7}; double u, v; float s, t; @@ -183,6 +190,8 @@ basic_tests(void) q = square_half_long(3, &r); ok(q == 9, "RPC square_half_long\n"); ok(r == 1, "RPC square_half_long\n"); + + ok(sum_fixed_array(f) == -2, "RPC sum_fixed_array\n"); } static void diff --git a/dlls/rpcrt4/tests/server.idl b/dlls/rpcrt4/tests/server.idl index d42a3a9..c122870 100644 --- a/dlls/rpcrt4/tests/server.idl +++ b/dlls/rpcrt4/tests/server.idl @@ -41,5 +41,6 @@ interface IServer double square_half(double x, [out] double *y); float square_half_float(float x, [out] float *y); long square_half_long(long x, [out] long *y); + int sum_fixed_array(int a[5]); void stop(void); }

1 0

Alexandre Julliard : make_makefiles: Avoid duplicate .gitignore entries.
by Alexandre Julliard 26 Apr '07

26 Apr '07

Module: wine Branch: master Commit: 74bd17e998252af9c5084491b5090a66d0e818ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=74bd17e998252af9c5084491b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 26 16:42:15 2007 +0200 make_makefiles: Avoid duplicate .gitignore entries. --- .gitignore | 1 - tools/make_makefiles | 6 ++++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 0e63048..ecdb9d2 100644 --- a/.gitignore +++ b/.gitignore @@ -442,7 +442,6 @@ dlls/rpcrt4/librpcrt4.def dlls/rpcrt4/tests/*.ok dlls/rpcrt4/tests/rpcrt4_crosstest.exe dlls/rpcrt4/tests/server.h -dlls/rpcrt4/tests/server.h dlls/rpcrt4/tests/server_c.c dlls/rpcrt4/tests/server_s.c dlls/rpcrt4/tests/testlist.c diff --git a/tools/make_makefiles b/tools/make_makefiles index 90f9220..513b5b1 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -625,11 +625,13 @@ sub update_gitignore(@) # prepend a slash to paths that don't have one @ignores = map { $_ =~ s/^([^\/]+)$/\/$1/; $_; } @ignores; - push @ignores, @_; + # get rid of duplicates + my %ignores = (); + foreach my $i (@ignores, @_) { $ignores{$i} = 1; } replace_in_file( ".gitignore", undef, undef, "# Automatically generated by make_makefiles; DO NOT EDIT!!\n", - join("\n", sort @ignores), "\n" ); + join("\n", sort keys %ignores), "\n" ); }

1 0

Huw Davies : oleaut32: Don't try to free the typeinfo if get_funcdesc fails .
by Alexandre Julliard 26 Apr '07

26 Apr '07

Module: wine Branch: master Commit: b8a50daec73ad0160163a1a0cecae4f387bade53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8a50daec73ad0160163a1a0c… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Apr 25 11:23:03 2007 +0100 oleaut32: Don't try to free the typeinfo if get_funcdesc fails. --- dlls/oleaut32/tmarshal.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index 8e3b0bc..46faf62 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -1289,7 +1289,6 @@ xCall(LPVOID retptr, int method, TMProxyImpl *tpinfo /*, args */) hres = _get_funcdesc(tpinfo->tinfo,method,&tinfo,&fdesc,&iname,&fname); if (hres) { ERR("Did not find typeinfo/funcdesc entry for method %d!\n",method); - ITypeInfo_Release(tinfo); LeaveCriticalSection(&tpinfo->crit); return E_FAIL; } @@ -1702,11 +1701,11 @@ PSFacBuf_CreateProxy( int nrofargs; ITypeInfo *tinfo2; hres = _get_funcdesc(tinfo,i,&tinfo2,&fdesc,NULL,NULL); - ITypeInfo_Release(tinfo2); if (hres) { ERR("GetFuncDesc %x should not fail here.\n",hres); return hres; } + ITypeInfo_Release(tinfo2); /* some args take more than 4 byte on the stack */ nrofargs = 0; for (j=0;j<fdesc->cParams;j++)

1 0

Huw Davies : oleaut32: Rewrite get_funcdesc to avoid using the funcdesc' s oVft member so that it works correctly for non-dual dispinterfaces.
by Alexandre Julliard 26 Apr '07

26 Apr '07

Module: wine Branch: master Commit: 294b3ebba1261669e5360c6ed204cb1d83d4e1fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=294b3ebba1261669e5360c6ed… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 26 11:56:44 2007 +0100 oleaut32: Rewrite get_funcdesc to avoid using the funcdesc's oVft member so that it works correctly for non-dual dispinterfaces. --- dlls/oleaut32/tmarshal.c | 109 ++++++++++++++++++++++++---------------------- 1 files changed, 57 insertions(+), 52 deletions(-) diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index 46faf62..7d0637e 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -1198,63 +1198,68 @@ deserialize_param( } } -/* Searches function, also in inherited interfaces */ -static HRESULT -_get_funcdesc( - ITypeInfo *tinfo, int iMethod, ITypeInfo **tactual, const FUNCDESC **fdesc, BSTR *iname, BSTR *fname) +/* Retrieves a function's funcdesc, searching back into inherited interfaces. */ +static HRESULT get_funcdesc(ITypeInfo *tinfo, int iMethod, ITypeInfo **tactual, const FUNCDESC **fdesc, + BSTR *iname, BSTR *fname, UINT *num) { - int i = 0, j = 0; - HRESULT hres; + HRESULT hr; + UINT i, impl_types; + UINT inherited_funcs = 0; + TYPEATTR *attr; if (fname) *fname = NULL; if (iname) *iname = NULL; + if (num) *num = 0; + *tactual = NULL; - while (1) { - hres = ITypeInfoImpl_GetInternalFuncDesc(tinfo, i, fdesc); + hr = ITypeInfo_GetTypeAttr(tinfo, &attr); + if (FAILED(hr)) + { + ERR("GetTypeAttr failed with %x\n",hr); + return hr; + } + impl_types = attr->cImplTypes; + ITypeInfo_ReleaseTypeAttr(tinfo, attr); - if (hres) { - ITypeInfo *tinfo2; - HREFTYPE href; - TYPEATTR *attr; + for (i = 0; i < impl_types; i++) + { + HREFTYPE href; + ITypeInfo *pSubTypeInfo; + UINT sub_funcs; - hres = ITypeInfo_GetTypeAttr(tinfo, &attr); - if (hres) { - ERR("GetTypeAttr failed with %x\n",hres); - return hres; - } - /* Not found, so look in inherited ifaces. */ - for (j=0;j<attr->cImplTypes;j++) { - hres = ITypeInfo_GetRefTypeOfImplType(tinfo, j, &href); - if (hres) { - ERR("Did not find a reftype for interface offset %d?\n",j); - break; - } - hres = ITypeInfo_GetRefTypeInfo(tinfo, href, &tinfo2); - if (hres) { - ERR("Did not find a typeinfo for reftype %d?\n",href); - continue; - } - hres = _get_funcdesc(tinfo2,iMethod,tactual,fdesc,iname,fname); - ITypeInfo_Release(tinfo2); - if (!hres) { - ITypeInfo_ReleaseTypeAttr(tinfo, attr); - return S_OK; - } - } - ITypeInfo_ReleaseTypeAttr(tinfo, attr); - return hres; - } - if (((*fdesc)->oVft/4) == iMethod) { - if (fname) - ITypeInfo_GetDocumentation(tinfo,(*fdesc)->memid,fname,NULL,NULL,NULL); - if (iname) - ITypeInfo_GetDocumentation(tinfo,-1,iname,NULL,NULL,NULL); - *tactual = tinfo; - ITypeInfo_AddRef(*tactual); - return S_OK; - } - i++; + hr = ITypeInfo_GetRefTypeOfImplType(tinfo, i, &href); + if (FAILED(hr)) return hr; + hr = ITypeInfo_GetRefTypeInfo(tinfo, href, &pSubTypeInfo); + if (FAILED(hr)) return hr; + + hr = get_funcdesc(pSubTypeInfo, iMethod, tactual, fdesc, iname, fname, &sub_funcs); + inherited_funcs += sub_funcs; + ITypeInfo_Release(pSubTypeInfo); + if(SUCCEEDED(hr)) return hr; } + if(iMethod < inherited_funcs) + { + ERR("shouldn't be here\n"); + return E_INVALIDARG; + } + + for(i = inherited_funcs; i <= iMethod; i++) + { + hr = ITypeInfoImpl_GetInternalFuncDesc(tinfo, i - inherited_funcs, fdesc); + if(FAILED(hr)) + { + if(num) *num = i; + return hr; + } + } + + /* found it. We don't care about num so zero it */ + if(num) *num = 0; + *tactual = tinfo; + ITypeInfo_AddRef(*tactual); + if (fname) ITypeInfo_GetDocumentation(tinfo,(*fdesc)->memid,fname,NULL,NULL,NULL); + if (iname) ITypeInfo_GetDocumentation(tinfo,-1,iname,NULL,NULL,NULL); + return S_OK; } static inline BOOL is_in_elem(const ELEMDESC *elem) @@ -1286,7 +1291,7 @@ xCall(LPVOID retptr, int method, TMProxyImpl *tpinfo /*, args */) EnterCriticalSection(&tpinfo->crit); - hres = _get_funcdesc(tpinfo->tinfo,method,&tinfo,&fdesc,&iname,&fname); + hres = get_funcdesc(tpinfo->tinfo,method,&tinfo,&fdesc,&iname,&fname,NULL); if (hres) { ERR("Did not find typeinfo/funcdesc entry for method %d!\n",method); LeaveCriticalSection(&tpinfo->crit); @@ -1700,7 +1705,7 @@ PSFacBuf_CreateProxy( /* nrofargs without This */ int nrofargs; ITypeInfo *tinfo2; - hres = _get_funcdesc(tinfo,i,&tinfo2,&fdesc,NULL,NULL); + hres = get_funcdesc(tinfo,i,&tinfo2,&fdesc,NULL,NULL,NULL); if (hres) { ERR("GetFuncDesc %x should not fail here.\n",hres); return hres; @@ -1916,7 +1921,7 @@ TMStubImpl_Invoke( memcpy(buf.base, xmsg->Buffer, xmsg->cbBuffer); buf.curoff = 0; - hres = _get_funcdesc(This->tinfo,xmsg->iMethod,&tinfo,&fdesc,&iname,NULL); + hres = get_funcdesc(This->tinfo,xmsg->iMethod,&tinfo,&fdesc,&iname,NULL,NULL); if (hres) { ERR("GetFuncDesc on method %d failed with %x\n",xmsg->iMethod,hres); return hres;

1 0