September 2006 - Wine-commits

Robert Shearman : ole32: Add a test for OleLoad.
by Alexandre Julliard 07 Sep '06

07 Sep '06

Module: wine Branch: master Commit: 03510be55be240aede90d113007dc8e3f14f3625 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=03510be55be240aede90d11… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu Aug 31 17:19:34 2006 +0100 ole32: Add a test for OleLoad. --- dlls/ole32/tests/ole2.c | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index e9055ce..c7a3023 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -759,6 +759,37 @@ static void test_OleCreate(IStorage *pSt trace("end\n"); } +static void test_OleLoad(IStorage *pStorage) +{ + HRESULT hr; + IOleObject *pObject; + + static const char *methods_oleload[] = + { + "OleObject_QueryInterface", + "OleObject_AddRef", + "OleObject_QueryInterface", + "OleObject_AddRef", + "OleObject_GetMiscStatus", + "OleObject_QueryInterface", + "OleObjectPersistStg_AddRef", + "OleObjectPersistStg_Load", + "OleObjectPersistStg_Release", + "OleObject_SetClientSite", + "OleObject_Release", + "OleObject_QueryInterface", + "OleObject_Release", + NULL + }; + + expected_method_list = methods_oleload; + trace("OleLoad:\n"); + hr = OleLoad(pStorage, &IID_IOleObject, (IOleClientSite *)0xdeadbeef, (void **)&pObject); + ok_ole_success(hr, "OleLoad"); + IOleObject_Release(pObject); + ok(!*expected_method_list, "Method sequence starting from %s not called\n", *expected_method_list); +} + START_TEST(ole2) { DWORD dwRegister; @@ -780,6 +811,8 @@ START_TEST(ole2) ok_ole_success(hr, "IStorage_Stat"); ok(IsEqualCLSID(&CLSID_Equation3, &statstg.clsid), "Wrong CLSID in storage\n"); + test_OleLoad(pStorage); + IStorage_Release(pStorage); hr = CoRevokeClassObject(dwRegister);

1 0

Robert Shearman : ole32: Do a QueryInterface for IOleLink in OleLoad, like native does.
by Alexandre Julliard 07 Sep '06

07 Sep '06

Module: wine Branch: master Commit: d0b4717cdb156f237c52624be33412bcb9f6a7d7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d0b4717cdb156f237c52624… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu Aug 31 17:18:36 2006 +0100 ole32: Do a QueryInterface for IOleLink in OleLoad, like native does. --- dlls/ole32/ole2.c | 25 +++++++++++++++++++------ 1 files changed, 19 insertions(+), 6 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 8f0629c..c6df7ed 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -1007,12 +1007,13 @@ HRESULT WINAPI OleLoad( } } - /* - * Initialize the object with it's IPersistStorage interface. - */ - hres = IOleObject_QueryInterface(pUnk, - &IID_IPersistStorage, - (void**)&persistStorage); + if (SUCCEEDED(hres)) + /* + * Initialize the object with it's IPersistStorage interface. + */ + hres = IOleObject_QueryInterface(pUnk, + &IID_IPersistStorage, + (void**)&persistStorage); if (SUCCEEDED(hres)) { @@ -1034,6 +1035,18 @@ HRESULT WINAPI OleLoad( if (pOleObject) IOleObject_Release(pOleObject); + if (SUCCEEDED(hres)) + { + IOleLink *pOleLink; + HRESULT hres1; + hres1 = IUnknown_QueryInterface(pUnk, &IID_IOleLink, (void **)&pOleLink); + if (SUCCEEDED(hres1)) + { + FIXME("handle OLE link\n"); + IOleLink_Release(pOleLink); + } + } + if (FAILED(hres)) { IUnknown_Release(pUnk);

1 0

Robert Shearman : ole32: Re-order the function calls in OleLoad to match native.
by Alexandre Julliard 07 Sep '06

07 Sep '06

Module: wine Branch: master Commit: 4ad8da53f5946965a1461f38be956ec58a9b0c25 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4ad8da53f5946965a1461f3… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu Aug 31 17:17:55 2006 +0100 ole32: Re-order the function calls in OleLoad to match native. Call IOleObject_GetMiscStatus like OleCreate and native do. --- dlls/ole32/ole2.c | 50 ++++++++++++++++++++++++++++++++++---------------- 1 files changed, 34 insertions(+), 16 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index e2d9d9d..8f0629c 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -952,12 +952,15 @@ HRESULT WINAPI OleLoad( LPVOID* ppvObj) { IPersistStorage* persistStorage = NULL; - IOleObject* oleObject = NULL; + IUnknown* pUnk; + IOleObject* pOleObject = NULL; STATSTG storageInfo; HRESULT hres; TRACE("(%p,%p,%p,%p)\n", pStg, riid, pClientSite, ppvObj); + *ppvObj = NULL; + /* * TODO, Conversion ... OleDoAutoConvert */ @@ -973,8 +976,8 @@ HRESULT WINAPI OleLoad( hres = CoCreateInstance(&storageInfo.clsid, NULL, CLSCTX_INPROC_HANDLER, - &IID_IOleObject, - (void**)&oleObject); + riid, + (void**)&pUnk); /* * If that fails, as it will most times, load the default @@ -984,8 +987,8 @@ HRESULT WINAPI OleLoad( { hres = OleCreateDefaultHandler(&storageInfo.clsid, NULL, - &IID_IOleObject, - (void**)&oleObject); + riid, + (void**)&pUnk); } /* @@ -994,35 +997,50 @@ HRESULT WINAPI OleLoad( if (FAILED(hres)) return hres; - /* - * Inform the new object of it's client site. - */ - hres = IOleObject_SetClientSite(oleObject, pClientSite); + if (pClientSite) + { + hres = IUnknown_QueryInterface(pUnk, &IID_IOleObject, (void **)&pOleObject); + if (SUCCEEDED(hres)) + { + DWORD dwStatus; + hres = IOleObject_GetMiscStatus(pOleObject, DVASPECT_CONTENT, &dwStatus); + } + } /* * Initialize the object with it's IPersistStorage interface. */ - hres = IOleObject_QueryInterface(oleObject, + hres = IOleObject_QueryInterface(pUnk, &IID_IPersistStorage, (void**)&persistStorage); if (SUCCEEDED(hres)) { - IPersistStorage_Load(persistStorage, pStg); + hres = IPersistStorage_Load(persistStorage, pStg); IPersistStorage_Release(persistStorage); persistStorage = NULL; } - /* - * Return the requested interface to the caller. - */ - hres = IOleObject_QueryInterface(oleObject, riid, ppvObj); + if (SUCCEEDED(hres) && pClientSite) + /* + * Inform the new object of it's client site. + */ + hres = IOleObject_SetClientSite(pOleObject, pClientSite); /* * Cleanup interfaces used internally */ - IOleObject_Release(oleObject); + if (pOleObject) + IOleObject_Release(pOleObject); + + if (FAILED(hres)) + { + IUnknown_Release(pUnk); + pUnk = NULL; + } + + *ppvObj = pUnk; return hres; }

1 0

Robert Shearman : ole32: Call IRunnableObject_Run and IOleCache_Cache from OleCreate if the render option is specified as draw or format .
by Alexandre Julliard 07 Sep '06

07 Sep '06

Module: wine Branch: master Commit: 53be8cc861461e5635854befdf1e4eb74f92add1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=53be8cc861461e5635854be… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu Aug 31 17:16:28 2006 +0100 ole32: Call IRunnableObject_Run and IOleCache_Cache from OleCreate if the render option is specified as draw or format. This is documented on MSDN and is confirmed by tests. --- dlls/ole32/ole2.c | 25 ++++++++++++++++++++++++- 1 files changed, 24 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 4d7c17b..e2d9d9d 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -2341,7 +2341,30 @@ HRESULT WINAPI OleCreate( if (pOleObject) IOleObject_Release(pOleObject); - + + if (((renderopt == OLERENDER_DRAW) || (renderopt == OLERENDER_FORMAT)) && + SUCCEEDED(hres)) + { + IRunnableObject *pRunnable; + IOleCache *pOleCache; + + hres = IUnknown_QueryInterface(pUnk, &IID_IRunnableObject, (void **)&pRunnable); + if (SUCCEEDED(hres)) + { + hres = IRunnableObject_Run(pRunnable, NULL); + IRunnableObject_Release(pRunnable); + } + + if (SUCCEEDED(hres)) + hres = IUnknown_QueryInterface(pUnk, &IID_IOleCache, (void **)&pOleCache); + if (SUCCEEDED(hres)) + { + DWORD dwConnection; + hres = IOleCache_Cache(pOleCache, pFormatEtc, ADVF_PRIMEFIRST, &dwConnection); + IOleCache_Release(pOleCache); + } + } + if (FAILED(hres)) { IUnknown_Release(pUnk);

1 0

Robert Shearman : ole32: Add tests for OleCreate.
by Alexandre Julliard 07 Sep '06

07 Sep '06

Module: wine Branch: master Commit: da321acf0e5efbc22ce075888cba161d29cf4f05 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=da321acf0e5efbc22ce0758… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu Aug 31 17:17:03 2006 +0100 ole32: Add tests for OleCreate. --- dlls/ole32/tests/Makefile.in | 1 dlls/ole32/tests/ole2.c | 789 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 790 insertions(+), 0 deletions(-) create mode 100644 dlls/ole32/tests/ole2.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=da321acf0e5efbc22ce…

1 0

Robert Shearman : ole32: Re-structure OleCreate to match to order of calls that native does.
by Alexandre Julliard 07 Sep '06

07 Sep '06

Module: wine Branch: master Commit: ccb634fdee50936c35880a6cffd70e0bcd946b5a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ccb634fdee50936c35880a6… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu Aug 31 17:14:38 2006 +0100 ole32: Re-structure OleCreate to match to order of calls that native does. Get rid of hres1 since all failures are returned. Cleanup pUnk on failure and make sure to return NULL in ppvObj. --- dlls/ole32/ole2.c | 45 +++++++++++++++++++++++++++------------------ 1 files changed, 27 insertions(+), 18 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index a5354cc..4ae9619 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -2299,8 +2299,9 @@ HRESULT WINAPI OleCreate( LPSTORAGE pStg, LPVOID* ppvObj) { - HRESULT hres, hres1; + HRESULT hres; IUnknown * pUnk = NULL; + IOleObject *pOleObject = NULL; FIXME("\n\t%s\n\t%s semi-stub!\n", debugstr_guid(rclsid), debugstr_guid(riid)); @@ -2309,29 +2310,37 @@ HRESULT WINAPI OleCreate( if (SUCCEEDED(hres)) hres = IStorage_SetClass(pStg, rclsid); + if (pClientSite && SUCCEEDED(hres)) + hres = IUnknown_QueryInterface(pUnk, &IID_IOleObject, (LPVOID*)&pOleObject); + if (SUCCEEDED(hres)) { - if (pClientSite) + IPersistStorage * pPS; + if (SUCCEEDED((hres = IUnknown_QueryInterface(pUnk, &IID_IPersistStorage, (LPVOID*)&pPS)))) { - IOleObject * pOE; - IPersistStorage * pPS; - if (SUCCEEDED((hres = IUnknown_QueryInterface( pUnk, &IID_IOleObject, (LPVOID*)&pOE)))) - { - TRACE("trying to set clientsite %p\n", pClientSite); - hres1 = IOleObject_SetClientSite(pOE, pClientSite); - TRACE("-- result 0x%08lx\n", hres1); - IOleObject_Release(pOE); - } - if (SUCCEEDED((hres = IUnknown_QueryInterface( pUnk, &IID_IPersistStorage, (LPVOID*)&pPS)))) - { - TRACE("trying to set stg %p\n", pStg); - hres1 = IPersistStorage_InitNew(pPS, pStg); - TRACE("-- result 0x%08lx\n", hres1); - IPersistStorage_Release(pPS); - } + TRACE("trying to set stg %p\n", pStg); + hres = IPersistStorage_InitNew(pPS, pStg); + TRACE("-- result 0x%08lx\n", hres); + IPersistStorage_Release(pPS); } } + if (pClientSite && SUCCEEDED(hres)) + { + TRACE("trying to set clientsite %p\n", pClientSite); + hres = IOleObject_SetClientSite(pOleObject, pClientSite); + TRACE("-- result 0x%08lx\n", hres); + } + + if (pOleObject) + IOleObject_Release(pOleObject); + + if (FAILED(hres)) + { + IUnknown_Release(pUnk); + pUnk = NULL; + } + *ppvObj = pUnk; TRACE("-- %p\n", pUnk);

1 0

Robert Shearman : ole32: Call IOleObject_GetMiscStatus in OleCreate if a client site is passed in.
by Alexandre Julliard 07 Sep '06

07 Sep '06

Module: wine Branch: master Commit: 6da80a8898dab86285a3478962139298e88f5bb7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6da80a8898dab86285a3478… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu Aug 31 17:15:15 2006 +0100 ole32: Call IOleObject_GetMiscStatus in OleCreate if a client site is passed in. --- dlls/ole32/ole2.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 4ae9619..4d7c17b 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -2311,7 +2311,14 @@ HRESULT WINAPI OleCreate( hres = IStorage_SetClass(pStg, rclsid); if (pClientSite && SUCCEEDED(hres)) + { hres = IUnknown_QueryInterface(pUnk, &IID_IOleObject, (LPVOID*)&pOleObject); + if (SUCCEEDED(hres)) + { + DWORD dwStatus; + hres = IOleObject_GetMiscStatus(pOleObject, DVASPECT_CONTENT, &dwStatus); + } + } if (SUCCEEDED(hres)) {

1 0

Robert Shearman : ole32: Set the storage's class ID in OleCreate.
by Alexandre Julliard 07 Sep '06

07 Sep '06

Module: wine Branch: master Commit: aaa26b2702759530768685f4176b9075c225f1e9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=aaa26b2702759530768685f… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu Aug 31 17:13:45 2006 +0100 ole32: Set the storage's class ID in OleCreate. --- dlls/ole32/ole2.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 164970d..a5354cc 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -2304,7 +2304,12 @@ HRESULT WINAPI OleCreate( FIXME("\n\t%s\n\t%s semi-stub!\n", debugstr_guid(rclsid), debugstr_guid(riid)); - if (SUCCEEDED((hres = CoCreateInstance(rclsid, 0, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER|CLSCTX_LOCAL_SERVER , riid, (LPVOID*)&pUnk)))) + hres = CoCreateInstance(rclsid, 0, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER|CLSCTX_LOCAL_SERVER , riid, (LPVOID*)&pUnk); + + if (SUCCEEDED(hres)) + hres = IStorage_SetClass(pStg, rclsid); + + if (SUCCEEDED(hres)) { if (pClientSite) {

1 0

Mike McCormack : msi: Implement MsiDatabaseExport.
by Alexandre Julliard 07 Sep '06

07 Sep '06

Module: wine Branch: master Commit: 6991563d81011c415505baeeef55b5162f7d2f84 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6991563d81011c415505bae… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Aug 31 19:52:03 2006 +0900 msi: Implement MsiDatabaseExport. --- dlls/msi/database.c | 132 ++++++++++++++++++++++++++++++++++++++++++++++++++- dlls/msi/tests/db.c | 2 - 2 files changed, 129 insertions(+), 5 deletions(-) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index 609db23..b92d3bf 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -287,18 +287,144 @@ end: return r; } +static UINT msi_export_record( HANDLE handle, MSIRECORD *row, UINT start ) +{ + UINT i, count, len, r = ERROR_SUCCESS; + const char *sep; + char *buffer; + DWORD sz; + + len = 0x100; + buffer = msi_alloc( len ); + if ( !buffer ) + return ERROR_OUTOFMEMORY; + + count = MSI_RecordGetFieldCount( row ); + for ( i=start; i<=count; i++ ) + { + sz = len; + r = MSI_RecordGetStringA( row, i, buffer, &sz ); + if (r == ERROR_MORE_DATA) + { + char *p = msi_realloc( buffer, sz + 1 ); + if (!p) + break; + len = sz + 1; + buffer = p; + } + sz = len; + r = MSI_RecordGetStringA( row, i, buffer, &sz ); + if (r != ERROR_SUCCESS) + break; + + if (!WriteFile( handle, buffer, sz, &sz, NULL )) + { + r = ERROR_FUNCTION_FAILED; + break; + } + + sep = (i < count) ? "\t" : "\r\n"; + if (!WriteFile( handle, sep, strlen(sep), &sz, NULL )) + { + r = ERROR_FUNCTION_FAILED; + break; + } + } + msi_free( buffer ); + return r; +} + +static UINT msi_export_row( MSIRECORD *row, void *arg ) +{ + return msi_export_record( arg, row, 1 ); +} + UINT MSI_DatabaseExport( MSIDATABASE *db, LPCWSTR table, LPCWSTR folder, LPCWSTR file ) { - FIXME("%p %s %s %s\n", db, debugstr_w(table), + static const WCHAR query[] = { + 's','e','l','e','c','t',' ','*',' ','f','r','o','m',' ','%','s',0 }; + static const WCHAR szbs[] = { '\\', 0 }; + MSIRECORD *rec = NULL; + MSIQUERY *view = NULL; + LPWSTR filename; + HANDLE handle; + UINT len, r; + + TRACE("%p %s %s %s\n", db, debugstr_w(table), debugstr_w(folder), debugstr_w(file) ); if( folder == NULL || file == NULL ) return ERROR_INVALID_PARAMETER; - - return ERROR_CALL_NOT_IMPLEMENTED; + + len = lstrlenW(folder) + lstrlenW(file) + 2; + filename = msi_alloc(len * sizeof (WCHAR)); + if (!filename) + return ERROR_OUTOFMEMORY; + + lstrcpyW( filename, folder ); + lstrcatW( filename, szbs ); + lstrcatW( filename, file ); + + handle = CreateFileW( filename, GENERIC_READ | GENERIC_WRITE, 0, + NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL ); + msi_free( filename ); + if (handle == INVALID_HANDLE_VALUE) + return ERROR_FUNCTION_FAILED; + + r = MSI_OpenQuery( db, &view, query, table ); + if (r == ERROR_SUCCESS) + { + /* write out row 1, the column names */ + r = MSI_ViewGetColumnInfo(view, MSICOLINFO_NAMES, &rec); + if (r == ERROR_SUCCESS) + { + msi_export_record( handle, rec, 1 ); + msiobj_release( &rec->hdr ); + } + + /* write out row 2, the column types */ + r = MSI_ViewGetColumnInfo(view, MSICOLINFO_TYPES, &rec); + if (r == ERROR_SUCCESS) + { + msi_export_record( handle, rec, 1 ); + msiobj_release( &rec->hdr ); + } + + /* write out row 3, the table name + keys */ + r = MSI_DatabaseGetPrimaryKeys( db, table, &rec ); + if (r == ERROR_SUCCESS) + { + MSI_RecordSetStringW( rec, 0, table ); + msi_export_record( handle, rec, 0 ); + msiobj_release( &rec->hdr ); + } + + /* write out row 4 onwards, the data */ + r = MSI_IterateRecords( view, 0, msi_export_row, handle ); + msiobj_release( &view->hdr ); + } + + CloseHandle( handle ); + + return r; } +/*********************************************************************** + * MsiExportDatabaseW [MSI.@] + * + * Writes a file containing the table data as tab separated ASCII. + * + * The format is as follows: + * + * row1 : colname1 <tab> colname2 <tab> .... colnameN <cr> <lf> + * row2 : coltype1 <tab> coltype2 <tab> .... coltypeN <cr> <lf> + * row3 : tablename <tab> key1 <tab> key2 <tab> ... keyM <cr> <lf> + * + * Followed by the data, starting at row 1 with one row per line + * + * row4 : data <tab> data <tab> data <tab> ... data <cr> <lf> + */ UINT WINAPI MsiDatabaseExportW( MSIHANDLE handle, LPCWSTR szTable, LPCWSTR szFolder, LPCWSTR szFilename ) { diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index b61e643..52e7fdf 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -856,7 +856,6 @@ static void test_msiexport(void) GetCurrentDirectory(MAX_PATH, path); - todo_wine { r = MsiDatabaseExport(hdb, "phone", path, file); ok(r == ERROR_SUCCESS, "MsiDatabaseExport failed\n"); @@ -880,7 +879,6 @@ static void test_msiexport(void) ok( length == strlen(expected), "length of data wrong\n"); ok( !lstrcmp(buffer, expected), "data doesn't match\n"); - } DeleteFile(msifile); }

1 0

Robert Shearman : rpcrt4: Raise an exception if IRpcChannelBuffer_GetBuffer fails.
by Alexandre Julliard 07 Sep '06

07 Sep '06

Module: wine Branch: master Commit: a6e545a27ce0acfb5f5db325fbd445ee9e27ae38 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a6e545a27ce0acfb5f5db32… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu Aug 31 17:14:34 2006 +0100 rpcrt4: Raise an exception if IRpcChannelBuffer_GetBuffer fails. Make StdProxy_GetIID and StdProxy_GetChannel return void. Don't bother checking for This and pRpcChannelBuffer being NULL as native doesn't. --- dlls/rpcrt4/cproxy.c | 25 ++++++++++++------------- 1 files changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/rpcrt4/cproxy.c b/dlls/rpcrt4/cproxy.c index 280dbe1..da5deb9 100644 --- a/dlls/rpcrt4/cproxy.c +++ b/dlls/rpcrt4/cproxy.c @@ -284,24 +284,22 @@ static const IRpcProxyBufferVtbl StdProx StdProxy_Disconnect }; -static HRESULT StdProxy_GetChannel(LPVOID iface, +static void StdProxy_GetChannel(LPVOID iface, LPRPCCHANNELBUFFER *ppChannel) { ICOM_THIS_MULTI(StdProxyImpl,PVtbl,iface); TRACE("(%p)->GetChannel(%p) %s\n",This,ppChannel,This->name); *ppChannel = This->pChannel; - return S_OK; } -static HRESULT StdProxy_GetIID(LPVOID iface, +static void StdProxy_GetIID(LPVOID iface, const IID **ppiid) { ICOM_THIS_MULTI(StdProxyImpl,PVtbl,iface); TRACE("(%p)->GetIID(%p) %s\n",This,ppiid,This->name); *ppiid = This->piid; - return S_OK; } HRESULT WINAPI IUnknown_QueryInterface_Proxy(LPUNKNOWN iface, @@ -336,16 +334,12 @@ void WINAPI NdrProxyInitialize(void *Thi PMIDL_STUB_DESC pStubDescriptor, unsigned int ProcNum) { - HRESULT hr; - TRACE("(%p,%p,%p,%p,%d)\n", This, pRpcMsg, pStubMsg, pStubDescriptor, ProcNum); NdrClientInitializeNew(pRpcMsg, pStubMsg, pStubDescriptor, ProcNum); - if (This) StdProxy_GetChannel(This, &pStubMsg->pRpcChannelBuffer); - if (pStubMsg->pRpcChannelBuffer) { - hr = IRpcChannelBuffer_GetDestCtx(pStubMsg->pRpcChannelBuffer, - &pStubMsg->dwDestContext, - &pStubMsg->pvDestContext); - } + StdProxy_GetChannel(This, &pStubMsg->pRpcChannelBuffer); + IRpcChannelBuffer_GetDestCtx(pStubMsg->pRpcChannelBuffer, + &pStubMsg->dwDestContext, + &pStubMsg->pvDestContext); TRACE("channel=%p\n", pStubMsg->pRpcChannelBuffer); } @@ -361,10 +355,15 @@ void WINAPI NdrProxyGetBuffer(void *This TRACE("(%p,%p)\n", This, pStubMsg); pStubMsg->RpcMsg->BufferLength = pStubMsg->BufferLength; pStubMsg->dwStubPhase = PROXY_GETBUFFER; - hr = StdProxy_GetIID(This, &riid); + StdProxy_GetIID(This, &riid); hr = IRpcChannelBuffer_GetBuffer(pStubMsg->pRpcChannelBuffer, (RPCOLEMESSAGE*)pStubMsg->RpcMsg, riid); + if (FAILED(hr)) + { + RpcRaiseException(hr); + return; + } pStubMsg->BufferStart = pStubMsg->RpcMsg->Buffer; pStubMsg->BufferEnd = pStubMsg->BufferStart + pStubMsg->BufferLength; pStubMsg->Buffer = pStubMsg->BufferStart;

1 0