November 2007 - Wine-commits

Alistair Leslie-Hughes : msxml: Test for insertBefore with a NULL output parameter.
by Alexandre Julliard 15 Nov '07

15 Nov '07

Module: wine Branch: master Commit: 9c657b26af7b171dc311a49723e138bc218354d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c657b26af7b171dc311a4972… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Nov 14 16:07:14 2007 +1100 msxml: Test for insertBefore with a NULL output parameter. --- dlls/msxml3/tests/domdoc.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index ecedf06..60d7acf 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -1038,9 +1038,14 @@ static void test_create(void) ok( r == S_OK, "returns %08x\n", r ); ok( node == child, "%p %p\n", node, child ); IXMLDOMNode_Release( child ); - IXMLDOMNode_Release( node ); + V_VT(&var) = VT_NULL; + V_DISPATCH(&var) = (IDispatch*)node; + r = IXMLDOMNode_insertBefore( root, node, var, NULL ); + ok( r == S_OK, "returns %08x\n", r ); + IXMLDOMNode_Release( node ); + r = IXMLDOMNode_QueryInterface( root, &IID_IXMLDOMElement, (LPVOID*)&element ); ok( r == S_OK, "returns %08x\n", r );

1 0

Alexandre Julliard : wine.inf: Some dlls need to be registered before the others.
by Alexandre Julliard 15 Nov '07

15 Nov '07

Module: wine Branch: master Commit: 75b7ddaa3ca61f3511cc173eaf01d6ebe3deb476 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75b7ddaa3ca61f3511cc173ea… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 15 11:30:15 2007 +0100 wine.inf: Some dlls need to be registered before the others. --- tools/wine.inf | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index 338dbd2..36f9847 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -2148,6 +2148,11 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"Name",,"Uzbekistan" HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" [RegisterDllsSection] +;;some dlls have to be registered first +11,,ole32.dll,1 +11,,oleaut32.dll,1 +11,,shell32.dll,1 + 11,,amstream.dll,1 11,,atl.dll,1 11,,avifil32.dll,1 @@ -2187,13 +2192,10 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,msimtf.dll,1 11,,msxml3.dll,1 11,,objsel.dll,1 -11,,ole32.dll,1 -11,,oleaut32.dll,1 11,,qcap.dll,1 11,,quartz.dll,1 11,,rsaenh.dll,1 11,,shdocvw.dll,1 -11,,shell32.dll,1 11,,urlmon.dll,1 11,,wintrust.dll,1

1 0

Alexandre Julliard : wine.inf: Register inetcomm.dll.
by Alexandre Julliard 15 Nov '07

15 Nov '07

Module: wine Branch: master Commit: a97d6556a42ed3119aaf3f312a6a436a59db9fa0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a97d6556a42ed3119aaf3f312… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 15 11:31:17 2007 +0100 wine.inf: Register inetcomm.dll. --- tools/wine.inf | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index 36f9847..e4afa30 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -2182,6 +2182,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,hhctrl.ocx,1 11,,hlink.dll,1 11,,iexplore.exe,1 +11,,inetcomm.dll,1 11,,infosoft.dll,1 11,,inseng.dll,1 11,,itss.dll,1

1 0

James Hawkins : msi: Simplify ready_media.
by Alexandre Julliard 15 Nov '07

15 Nov '07

Module: wine Branch: master Commit: bb747e4fbe6619fa0e862102cc26456118355c67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb747e4fbe6619fa0e862102c… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Nov 15 02:58:21 2007 -0600 msi: Simplify ready_media. --- dlls/msi/files.c | 54 ++++++++++++++++++++++++++---------------------------- 1 files changed, 26 insertions(+), 28 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 0c27a90..5375641 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -596,9 +596,7 @@ static UINT load_media_info(MSIPACKAGE *package, MSIFILE *file, struct media_inf static UINT ready_media(MSIPACKAGE *package, MSIFILE *file, struct media_info *mi) { - UINT rc = ERROR_SUCCESS, type; - BOOL found = TRUE; - LPWSTR source_dir; + UINT rc = ERROR_SUCCESS; /* media info for continuous cabinet is already loaded */ if (mi->is_continuous) @@ -611,41 +609,41 @@ static UINT ready_media(MSIPACKAGE *package, MSIFILE *file, struct media_info *m return ERROR_FUNCTION_FAILED; } - if (mi->volume_label && mi->disk_id > 1) + /* package should be downloaded */ + if (file->IsCompressed && + GetFileAttributesW(mi->source) == INVALID_FILE_ATTRIBUTES && + package->BaseURL && UrlIsW(package->BaseURL, URLIS_URL)) { - source_dir = msi_dup_property(package, cszSourceDir); - PathStripToRootW(source_dir); - type = GetDriveTypeW(source_dir); - - if (type == DRIVE_CDROM || type == DRIVE_REMOVABLE) - found = source_matches_volume(mi, source_dir); - - if (!found) - found = GetFileAttributesW(mi->cabinet) != INVALID_FILE_ATTRIBUTES; - - msi_free(source_dir); + return download_remote_cabinet(package, mi); } - if (file->IsCompressed && - GetFileAttributesW(mi->source) == INVALID_FILE_ATTRIBUTES) + /* check volume matches, change media if not */ + if (mi->volume_label && mi->disk_id > 1) { - found = FALSE; + LPWSTR source = msi_dup_property(package, cszSourceDir); + BOOL matches; + UINT type; - if (package->BaseURL && UrlIsW(package->BaseURL, URLIS_URL)) + PathStripToRootW(source); + type = GetDriveTypeW(source); + matches = source_matches_volume(mi, source); + msi_free(source); + + if ((type == DRIVE_CDROM || type == DRIVE_REMOVABLE) && !matches) { - rc = download_remote_cabinet(package, mi); - if (rc == ERROR_SUCCESS && - GetFileAttributesW(mi->source) != INVALID_FILE_ATTRIBUTES) - { - found = TRUE; - } + rc = msi_change_media(package, mi); + if (rc != ERROR_SUCCESS) + return rc; } } - if (!found) - rc = msi_change_media(package, mi); + if (mi->cabinet && GetFileAttributesW(mi->cabinet) == INVALID_FILE_ATTRIBUTES) + { + ERR("Cabinet not found: %s\n", debugstr_w(mi->cabinet)); + return ERROR_INSTALL_FAILURE; + } - return rc; + return ERROR_SUCCESS; } static UINT get_file_target(MSIPACKAGE *package, LPCWSTR file_key,

1 0

James Hawkins : msi: Add tests for situations involving missing cabinets.
by Alexandre Julliard 15 Nov '07

15 Nov '07

Module: wine Branch: master Commit: 0023759a4bbe5feb2799d130cebeb5b36de21c4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0023759a4bbe5feb2799d130c… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Nov 15 02:59:17 2007 -0600 msi: Add tests for situations involving missing cabinets. --- dlls/msi/tests/install.c | 94 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 94 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 871b2c9..fd2ff66 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -530,6 +530,35 @@ static const CHAR mov_move_file_dat[] = "FileKey\tComponent_\tSourceName\tDestNa "wildcardnodest\taugustus\tbudd*\t\tSourceDir\tMSITESTDIR\t1\n" "singlenodest\taugustus\tb?r\t\tSourceDir\tMSITESTDIR\t1\n"; +static const CHAR mc_component_dat[] = "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" + "s72\tS38\ts72\ti2\tS255\tS72\n" + "Component\tComponent\n" + "maximus\t\tMSITESTDIR\t0\t1\tmaximus\n" + "augustus\t\tMSITESTDIR\t0\t1\taugustus\n" + "caesar\t\tMSITESTDIR\t0\t1\tcaesar\n" + "gaius\t\tMSITESTDIR\t0\tGAIUS=1\tgaius\n"; + +static const CHAR mc_file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" + "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" + "File\tFile\n" + "maximus\tmaximus\tmaximus\t500\t\t\t16384\t1\n" + "augustus\taugustus\taugustus\t500\t\t\t0\t2\n" + "caesar\tcaesar\tcaesar\t500\t\t\t16384\t3\n" + "gaius\tgaius\tgaius\t500\t\t\t16384\t4"; + +static const CHAR mc_media_dat[] = "DiskId\tLastSequence\tDiskPrompt\tCabinet\tVolumeLabel\tSource\n" + "i2\ti4\tL64\tS255\tS32\tS72\n" + "Media\tDiskId\n" + "1\t1\t\ttest1.cab\tDISK1\t\n" + "2\t2\t\ttest2.cab\tDISK2\t\n" + "3\t3\t\ttest3.cab\tDISK3\t\n" + "4\t4\t\ttest3.cab\tDISK3\t\n"; + +static const CHAR mc_file_hash_dat[] = "File_\tOptions\tHashPart1\tHashPart2\tHashPart3\tHashPart4\n" + "s72\ti2\ti4\ti4\ti4\ti4\n" + "MsiFileHash\tFile_\n" + "caesar\t0\t1477005400\t-2141257985\t284379198\t21485139"; + typedef struct _msi_table { const CHAR *filename; @@ -793,6 +822,19 @@ static const msi_table mov_tables[] = ADD_TABLE(registry), }; +static const msi_table mc_tables[] = +{ + ADD_TABLE(mc_component), + ADD_TABLE(directory), + ADD_TABLE(cc_feature), + ADD_TABLE(cie_feature_comp), + ADD_TABLE(mc_file), + ADD_TABLE(install_exec_seq), + ADD_TABLE(mc_media), + ADD_TABLE(property), + ADD_TABLE(mc_file_hash), +}; + /* cabinet definitions */ /* make the max size large so there is only one cab file */ @@ -3472,6 +3514,57 @@ static void test_movefiles(void) RemoveDirectory("msitest"); DeleteFile(msifile); } + +static void test_missingcab(void) +{ + UINT r; + + CreateDirectoryA("msitest", NULL); + create_file("msitest\\augustus", 500); + create_file("maximus", 500); + + create_database(msifile, mc_tables, sizeof(mc_tables) / sizeof(msi_table)); + + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); + + create_cab_file("test1.cab", MEDIA_SIZE, "maximus\0"); + + create_pf("msitest", FALSE); + create_pf("msitest\\caesar", TRUE); + + r = MsiInstallProductA(msifile, NULL); + todo_wine + { + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n"); + } + ok(delete_pf("msitest\\caesar", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); + ok(!delete_pf("msitest\\gaius", TRUE), "File installed\n"); + ok(delete_pf("msitest", FALSE), "File not installed\n"); + + create_pf("msitest", FALSE); + create_pf("msitest\\caesar", TRUE); + create_pf("msitest\\gaius", TRUE); + + r = MsiInstallProductA(msifile, "GAIUS=1"); + todo_wine + { + ok(r == ERROR_INSTALL_FAILURE, "Expected ERROR_INSTALL_FAILURE, got %u\n", r); + ok(!delete_pf("msitest\\maximus", TRUE), "File installed\n"); + } + ok(!delete_pf("msitest\\augustus", TRUE), "File installed\n"); + ok(delete_pf("msitest\\caesar", TRUE), "File removed\n"); + ok(delete_pf("msitest\\gaius", TRUE), "File removed\n"); + ok(delete_pf("msitest", FALSE), "File not installed\n"); + + DeleteFile("msitest\\augustus"); + RemoveDirectory("msitest"); + DeleteFile("maximus"); + DeleteFile("test1.cab"); + DeleteFile(msifile); +} + START_TEST(install) { DWORD len; @@ -3512,6 +3605,7 @@ START_TEST(install) test_adminprops(); test_removefiles(); test_movefiles(); + test_missingcab(); SetCurrentDirectoryA(prev_path); }

1 0

James Hawkins : msi: Only check the presence of the cabinet if the file is compressed.
by Alexandre Julliard 15 Nov '07

15 Nov '07

Module: wine Branch: master Commit: b1507aee989b168e8c08d0202ac60e467db25871 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1507aee989b168e8c08d0202… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Nov 15 03:01:06 2007 -0600 msi: Only check the presence of the cabinet if the file is compressed. --- dlls/msi/files.c | 3 ++- dlls/msi/tests/install.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 5375641..812f2b0 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -637,7 +637,8 @@ static UINT ready_media(MSIPACKAGE *package, MSIFILE *file, struct media_info *m } } - if (mi->cabinet && GetFileAttributesW(mi->cabinet) == INVALID_FILE_ATTRIBUTES) + if (file->IsCompressed && mi->cabinet && + GetFileAttributesW(mi->cabinet) == INVALID_FILE_ATTRIBUTES) { ERR("Cabinet not found: %s\n", debugstr_w(mi->cabinet)); return ERROR_INSTALL_FAILURE; diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index fd2ff66..a11ef21 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -3536,8 +3536,8 @@ static void test_missingcab(void) todo_wine { ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n"); } + ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n"); ok(delete_pf("msitest\\caesar", TRUE), "File not installed\n"); ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); ok(!delete_pf("msitest\\gaius", TRUE), "File installed\n"); @@ -3552,8 +3552,8 @@ static void test_missingcab(void) { ok(r == ERROR_INSTALL_FAILURE, "Expected ERROR_INSTALL_FAILURE, got %u\n", r); ok(!delete_pf("msitest\\maximus", TRUE), "File installed\n"); + ok(!delete_pf("msitest\\augustus", TRUE), "File installed\n"); } - ok(!delete_pf("msitest\\augustus", TRUE), "File installed\n"); ok(delete_pf("msitest\\caesar", TRUE), "File removed\n"); ok(delete_pf("msitest\\gaius", TRUE), "File removed\n"); ok(delete_pf("msitest", FALSE), "File not installed\n");

1 0

Huw Davies : inetcomm: Add a stub MimeBody implementation.
by Alexandre Julliard 15 Nov '07

15 Nov '07

Module: wine Branch: master Commit: c396411a5bd4dfd69d0f1c6471fb9214a38013ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=c396411a5bd4dfd69d0f1c647… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Nov 14 12:44:19 2007 +0000 inetcomm: Add a stub MimeBody implementation. --- dlls/inetcomm/inetcomm_private.h | 2 + dlls/inetcomm/mimeole.c | 483 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 485 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c396411a5bd4dfd69d0f1…

1 0

Huw Davies : inetcomm: Add a class factory for MimeBody.
by Alexandre Julliard 15 Nov '07

15 Nov '07

Module: wine Branch: master Commit: cc3fcf0a2d87d26a6373c458a439193090cc4d80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc3fcf0a2d87d26a6373c458a… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Nov 14 16:39:02 2007 +0000 inetcomm: Add a class factory for MimeBody. --- dlls/inetcomm/inetcomm_main.c | 97 ++++++++++++++++++++++++++++++++++++++++- 1 files changed, 95 insertions(+), 2 deletions(-) diff --git a/dlls/inetcomm/inetcomm_main.c b/dlls/inetcomm/inetcomm_main.c index 952efcb..81303b3 100644 --- a/dlls/inetcomm/inetcomm_main.c +++ b/dlls/inetcomm/inetcomm_main.c @@ -25,6 +25,9 @@ #include "windef.h" #include "winbase.h" #include "winnt.h" +#include "winuser.h" +#include "ole2.h" +#include "mimeole.h" #include "inetcomm_private.h" @@ -54,14 +57,104 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return TRUE; } +/****************************************************************************** + * ClassFactory + */ +typedef struct +{ + const struct IClassFactoryVtbl *lpVtbl; + HRESULT (*create_object)(IUnknown *, void **); +} cf; + +static inline cf *impl_from_IClassFactory( IClassFactory *iface ) +{ + return (cf *)((char*)iface - FIELD_OFFSET(cf, lpVtbl)); +} + +static HRESULT WINAPI cf_QueryInterface( IClassFactory *iface, REFIID riid, LPVOID *ppobj ) +{ + if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IClassFactory)) + { + IClassFactory_AddRef( iface ); + *ppobj = iface; + return S_OK; + } + + FIXME("interface %s not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI cf_AddRef( IClassFactory *iface ) +{ + return 2; +} + +static ULONG WINAPI cf_Release( IClassFactory *iface ) +{ + return 1; +} + +static HRESULT WINAPI cf_CreateInstance( IClassFactory *iface, LPUNKNOWN pOuter, + REFIID riid, LPVOID *ppobj ) +{ + cf *This = impl_from_IClassFactory( iface ); + HRESULT r; + IUnknown *punk; + + TRACE("%p %s %p\n", pOuter, debugstr_guid(riid), ppobj ); + + *ppobj = NULL; + + r = This->create_object( pOuter, (LPVOID*) &punk ); + if (FAILED(r)) + return r; + + r = IUnknown_QueryInterface( punk, riid, ppobj ); + IUnknown_Release( punk ); + + return r; +} + +static HRESULT WINAPI cf_LockServer( IClassFactory *iface, BOOL dolock) +{ + FIXME("(%p)->(%d),stub!\n",iface,dolock); + return S_OK; +} + +static const struct IClassFactoryVtbl cf_vtbl = +{ + cf_QueryInterface, + cf_AddRef, + cf_Release, + cf_CreateInstance, + cf_LockServer +}; + +static cf mime_body_cf = { &cf_vtbl, MimeBody_create }; + /*********************************************************************** * DllGetClassObject (INETCOMM.@) */ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) { - FIXME("\n\tCLSID:\t%s,\n\tIID:\t%s\n",debugstr_guid(rclsid),debugstr_guid(iid)); - return CLASS_E_CLASSNOTAVAILABLE; + IClassFactory *cf = NULL; + + TRACE("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(iid), ppv ); + + if( IsEqualCLSID( rclsid, &CLSID_IMimeBody )) + { + cf = (IClassFactory*) &mime_body_cf.lpVtbl; + } + + if ( !cf ) + { + FIXME("\n\tCLSID:\t%s,\n\tIID:\t%s\n",debugstr_guid(rclsid),debugstr_guid(iid)); + return CLASS_E_CLASSNOTAVAILABLE; + } + + return IClassFactory_QueryInterface( cf, iid, ppv ); } /***********************************************************************

1 0

Huw Davies : inetcomm: Add a test for MimeBody.
by Alexandre Julliard 15 Nov '07

15 Nov '07

Module: wine Branch: master Commit: 288196a49aa8dc5d9e0752c49c0432a2346af6f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=288196a49aa8dc5d9e0752c49… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Nov 14 16:39:50 2007 +0000 inetcomm: Add a test for MimeBody. --- dlls/inetcomm/tests/mimeole.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index eebb783..156884e 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -22,6 +22,9 @@ #include "windows.h" #include "ole2.h" +#include "ocidl.h" + +#include "initguid.h" #include "mimeole.h" #include <stdio.h> @@ -52,10 +55,27 @@ static void test_CreateSecurity(void) IMimeSecurity_Release(sec); } +static void test_CreateBody(void) +{ + HRESULT hr; + IMimeBody *body; + HBODY handle = (void *)0xdeadbeef; + + hr = CoCreateInstance(&CLSID_IMimeBody, NULL, CLSCTX_INPROC_SERVER, &IID_IMimeBody, (void**)&body); + ok(hr == S_OK, "ret %08x\n", hr); + + hr = IMimeBody_GetHandle(body, &handle); + ok(hr == MIME_E_NO_DATA, "ret %08x\n", hr); + ok(handle == NULL, "handle %p\n", handle); + + IMimeBody_Release(body); +} + START_TEST(mimeole) { OleInitialize(NULL); test_CreateVirtualStream(); test_CreateSecurity(); + test_CreateBody(); OleUninitialize(); }

1 0

Rob Shearman : ole32: Intialise some out parameters in ProxyCliSec_QueryBlanket.
by Alexandre Julliard 15 Nov '07

15 Nov '07

Module: wine Branch: master Commit: 33abd94d35338b64588ee9ebeae52642b419dfe9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33abd94d35338b64588ee9ebe… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Nov 14 17:23:24 2007 +0000 ole32: Intialise some out parameters in ProxyCliSec_QueryBlanket. --- dlls/ole32/marshal.c | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index d918347..fcfbd64 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -511,15 +511,31 @@ static HRESULT WINAPI ProxyCliSec_QueryBlanket(IClientSecurity *iface, IUnknown *pProxy, DWORD *pAuthnSvc, DWORD *pAuthzSvc, - OLECHAR **pServerPrincName, + OLECHAR **ppServerPrincName, DWORD *pAuthnLevel, DWORD *pImpLevel, void **pAuthInfo, DWORD *pCapabilities) { FIXME("(%p, %p, %p, %p, %p, %p, %p, %p): stub\n", pProxy, pAuthnSvc, - pAuthzSvc, pServerPrincName, pAuthnLevel, pImpLevel, pAuthInfo, + pAuthzSvc, ppServerPrincName, pAuthnLevel, pImpLevel, pAuthInfo, pCapabilities); + + if (pAuthnSvc) + *pAuthnSvc = 0; + if (pAuthzSvc) + *pAuthzSvc = 0; + if (ppServerPrincName) + *ppServerPrincName = NULL; + if (pAuthnLevel) + *pAuthnLevel = RPC_C_AUTHN_LEVEL_DEFAULT; + if (pImpLevel) + *pImpLevel = RPC_C_IMP_LEVEL_DEFAULT; + if (pAuthInfo) + *pAuthInfo = NULL; + if (pCapabilities) + *pCapabilities = EOAC_NONE; + return E_NOTIMPL; }

1 0