November 2006 - Wine-commits

Markus Amsler : d3d: Remove AddRef from IWineD3DDevice_GetDirect3D.
by Alexandre Julliard 22 Nov '06

22 Nov '06

Module: wine Branch: master Commit: 167b83c28af73803462e92ee4dcb1a95f194a74d URL: http://source.winehq.org/git/wine.git/?a=commit;h=167b83c28af73803462e92ee4… Author: Markus Amsler <markus.amsler(a)oribi.org> Date: Mon Nov 20 10:47:22 2006 +0100 d3d: Remove AddRef from IWineD3DDevice_GetDirect3D. --- dlls/d3d8/device.c | 1 - dlls/d3d9/device.c | 1 - 2 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 68b0dff..e128930 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -139,7 +139,6 @@ static HRESULT WINAPI IDirect3DDevice8Im if (hr == D3D_OK && pWineD3D != NULL) { IWineD3DResource_GetParent((IWineD3DResource *)pWineD3D,(IUnknown **)ppD3D8); - IWineD3DResource_Release((IWineD3DResource *)pWineD3D); } else { FIXME("Call to IWineD3DDevice_GetDirect3D failed\n"); *ppD3D8 = NULL; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 349356b..2ebb677 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -101,7 +101,6 @@ HRESULT WINAPI IDirect3DDevice9Impl_Ge if (hr == D3D_OK && pWineD3D != NULL) { IWineD3DResource_GetParent((IWineD3DResource *)pWineD3D,(IUnknown **)ppD3D9); - IWineD3DResource_Release((IWineD3DResource *)pWineD3D); } else { FIXME("Call to IWineD3DDevice_GetDirect3D failed\n"); *ppD3D9 = NULL;

1 0

Mike McCormack : msi: Only wait for custom actions that don' t have msidbCustomActionTypeContinue specified.
by Alexandre Julliard 22 Nov '06

22 Nov '06

Module: wine Branch: master Commit: b1a16d978d8187433670558de60e4ad4aa871e46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1a16d978d8187433670558de… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Nov 22 17:04:54 2006 +0900 msi: Only wait for custom actions that don't have msidbCustomActionTypeContinue specified. --- dlls/msi/custom.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 2d8aced..a5751cc 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -398,7 +398,7 @@ static UINT process_handle(MSIPACKAGE* p { TRACE("Asynchronous Execution of action %s\n",debugstr_w(Name)); /* asynchronous */ - if (type & msidbCustomActionTypeContinue) + if (!(type & msidbCustomActionTypeContinue)) { if (ProcessHandle) { @@ -406,7 +406,7 @@ static UINT process_handle(MSIPACKAGE* p CloseHandle(ThreadHandle); } else - file_running_action(package, ThreadHandle, FALSE, Name); + file_running_action(package, ThreadHandle, FALSE, Name); } else {

1 0

Mike McCormack : msi: Remove an unused parameter.
by Alexandre Julliard 22 Nov '06

22 Nov '06

Module: wine Branch: master Commit: eb16fd5198772183da49b71c165f5ef40846a150 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb16fd5198772183da49b71c1… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Nov 22 17:04:24 2006 +0900 msi: Remove an unused parameter. --- dlls/msi/custom.c | 25 ++++++++----------------- 1 files changed, 8 insertions(+), 17 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index bbc56a8..4358c81 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -367,9 +367,9 @@ static UINT process_action_return_value( } } -static UINT process_handle(MSIPACKAGE* package, UINT type, +static UINT process_handle(MSIPACKAGE* package, UINT type, HANDLE ThreadHandle, HANDLE ProcessHandle, - LPCWSTR Name, BOOL *finished) + LPCWSTR Name) { UINT rc = ERROR_SUCCESS; @@ -393,8 +393,6 @@ static UINT process_handle(MSIPACKAGE* p CloseHandle(ThreadHandle); if (ProcessHandle) CloseHandle(ProcessHandle); - if (finished) - *finished = TRUE; } else { @@ -416,8 +414,6 @@ static UINT process_handle(MSIPACKAGE* p if (ProcessHandle) CloseHandle(ProcessHandle); } - if (finished) - *finished = FALSE; } return rc; @@ -512,7 +508,6 @@ static UINT HANDLE_CustomType1(MSIPACKAG { WCHAR tmp_file[MAX_PATH]; UINT r = ERROR_SUCCESS; - BOOL finished = FALSE; HANDLE ThreadHandle; r = store_binary_to_temp(package, source, tmp_file); @@ -530,7 +525,7 @@ static UINT HANDLE_CustomType1(MSIPACKAG ThreadHandle = do_msidbCustomActionTypeDll( package, tmp_file, target ); - r = process_handle(package, type, ThreadHandle, NULL, action, &finished ); + r = process_handle(package, type, ThreadHandle, NULL, action); return r; } @@ -547,7 +542,6 @@ static UINT HANDLE_CustomType2(MSIPACKAG WCHAR *cmd; static const WCHAR spc[] = {' ',0}; UINT r = ERROR_SUCCESS; - BOOL finished = FALSE; memset(&si,0,sizeof(STARTUPINFOW)); @@ -585,8 +579,7 @@ static UINT HANDLE_CustomType2(MSIPACKAG return ERROR_SUCCESS; } - r = process_handle(package, type, info.hThread, info.hProcess, action, - &finished); + r = process_handle(package, type, info.hThread, info.hProcess, action); return r; } @@ -608,7 +601,7 @@ static UINT HANDLE_CustomType17(MSIPACKA hThread = do_msidbCustomActionTypeDll( package, file->TargetPath, target ); - return process_handle(package, type, hThread, NULL, action, NULL ); + return process_handle(package, type, hThread, NULL, action); } static UINT HANDLE_CustomType18(MSIPACKAGE *package, LPCWSTR source, @@ -662,8 +655,7 @@ static UINT HANDLE_CustomType18(MSIPACKA } msi_free(cmd); - prc = process_handle(package, type, info.hThread, info.hProcess, action, - NULL); + prc = process_handle(package, type, info.hThread, info.hProcess, action); return prc; } @@ -748,7 +740,7 @@ static UINT HANDLE_CustomType50(MSIPACKA } msi_free(cmd); - return process_handle(package, type, info.hThread, info.hProcess, action, NULL); + return process_handle(package, type, info.hThread, info.hProcess, action); } static UINT HANDLE_CustomType34(MSIPACKAGE *package, LPCWSTR source, @@ -788,8 +780,7 @@ static UINT HANDLE_CustomType34(MSIPACKA } msi_free(deformated); - prc = process_handle(package, type, info.hThread, info.hProcess, action, - NULL); + prc = process_handle(package, type, info.hThread, info.hProcess, action); return prc; }

1 0

Mike McCormack : msi: Split process_action_return_value into two different functions.
by Alexandre Julliard 22 Nov '06

22 Nov '06

Module: wine Branch: master Commit: 2a95a8ae781266e4cfc004dbb3498d24df07112b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a95a8ae781266e4cfc004dbb… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Nov 22 17:04:42 2006 +0900 msi: Split process_action_return_value into two different functions. --- dlls/msi/custom.c | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 4358c81..2d8aced 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -336,21 +336,21 @@ static void file_running_action(MSIPACKA list_add_tail( &package->RunningActions, &action->entry ); } -static UINT process_action_return_value(UINT type, HANDLE ThreadHandle) +static UINT custom_get_process_return( HANDLE process ) { - DWORD rc=0; - - if (type == 2) - { - GetExitCodeProcess(ThreadHandle,&rc); - - if (rc == 0) - return ERROR_SUCCESS; - else - return ERROR_FUNCTION_FAILED; - } + DWORD rc = 0; - GetExitCodeThread(ThreadHandle,&rc); + GetExitCodeProcess( process, &rc ); + if (rc != 0) + return ERROR_FUNCTION_FAILED; + return ERROR_SUCCESS; +} + +static UINT custom_get_thread_return( HANDLE thread ) +{ + DWORD rc = 0; + + GetExitCodeThread( thread, &rc ); switch (rc) { @@ -385,16 +385,16 @@ static UINT process_handle(MSIPACKAGE* p if (!(type & msidbCustomActionTypeContinue)) { if (ProcessHandle) - rc = process_action_return_value(2,ProcessHandle); + rc = custom_get_process_return(ProcessHandle); else - rc = process_action_return_value(1,ThreadHandle); + rc = custom_get_thread_return(ThreadHandle); } CloseHandle(ThreadHandle); if (ProcessHandle) CloseHandle(ProcessHandle); } - else + else { TRACE("Asynchronous Execution of action %s\n",debugstr_w(Name)); /* asynchronous */

1 0

Rob Shearman : rpcrt4: RPC_C_AUTHN_LEVEL_NONE and RPC_C_AUTHN_LEVEL_DEFAULT are
by Alexandre Julliard 22 Nov '06

22 Nov '06

Module: wine Branch: master Commit: 06dd3efe2f645d6c97b8135db53229ef23cfd179 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06dd3efe2f645d6c97b8135db… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Nov 21 13:09:53 2006 +0000 rpcrt4: RPC_C_AUTHN_LEVEL_NONE and RPC_C_AUTHN_LEVEL_DEFAULT are handled at the binding level now instead of the message level, so remove this special handling in RPCRT4_Send. --- dlls/rpcrt4/rpc_message.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/rpcrt4/rpc_message.c b/dlls/rpcrt4/rpc_message.c index 5fb34b0..4f38069 100644 --- a/dlls/rpcrt4/rpc_message.c +++ b/dlls/rpcrt4/rpc_message.c @@ -563,10 +563,7 @@ RPC_STATUS RPCRT4_Send(RpcConnection *Co RPC_STATUS r; SecBuffer out; - if (!Connection->AuthInfo || - Connection->AuthInfo->AuthnLevel == RPC_C_AUTHN_LEVEL_DEFAULT || - Connection->AuthInfo->AuthnLevel == RPC_C_AUTHN_LEVEL_NONE || - SecIsValidHandle(&Connection->ctx)) + if (!Connection->AuthInfo || SecIsValidHandle(&Connection->ctx)) { return RPCRT4_SendAuth(Connection, Header, Buffer, BufferLength, NULL, 0); }

1 0

Marcus Meissner : shell32: Pass number of wide chars, not bytes as last argument to MBtoWC().
by Alexandre Julliard 22 Nov '06

22 Nov '06

Module: wine Branch: master Commit: 267e660bd69667f8042b3c4bc25a01b50f972aab URL: http://source.winehq.org/git/wine.git/?a=commit;h=267e660bd69667f8042b3c4bc… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Nov 21 20:29:06 2006 +0100 shell32: Pass number of wide chars, not bytes as last argument to MBtoWC(). --- dlls/shell32/systray.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/systray.c b/dlls/shell32/systray.c index 29078de..119f17f 100644 --- a/dlls/shell32/systray.c +++ b/dlls/shell32/systray.c @@ -54,18 +54,18 @@ BOOL WINAPI Shell_NotifyIconA(DWORD dwMe nidW.hIcon = pnid->hIcon; /* szTip */ - MultiByteToWideChar(CP_ACP, 0, pnid->szTip, sizeof(pnid->szTip), nidW.szTip, sizeof(nidW.szTip)); + MultiByteToWideChar(CP_ACP, 0, pnid->szTip, -1, nidW.szTip, sizeof(nidW.szTip)/sizeof(WCHAR)); nidW.dwState = pnid->dwState; nidW.dwStateMask = pnid->dwStateMask; /* szInfo */ - MultiByteToWideChar(CP_ACP, 0, pnid->szInfo, sizeof(pnid->szInfo), nidW.szInfo, sizeof(nidW.szInfo)); + MultiByteToWideChar(CP_ACP, 0, pnid->szInfo, -1, nidW.szInfo, sizeof(nidW.szInfo)/sizeof(WCHAR)); nidW.u.uTimeout = pnid->u.uTimeout; /* szInfoTitle */ - MultiByteToWideChar(CP_ACP, 0, pnid->szInfoTitle, sizeof(pnid->szInfoTitle), nidW.szInfoTitle, sizeof(nidW.szInfoTitle)); + MultiByteToWideChar(CP_ACP, 0, pnid->szInfoTitle, -1, nidW.szInfoTitle, sizeof(nidW.szInfoTitle)/sizeof(WCHAR)); nidW.dwInfoFlags = pnid->dwInfoFlags;

1 0

Huw Davies : ole32: CoGetInterfaceAndReleaseStream shouldn' t crash when passed a NULL stream.
by Alexandre Julliard 22 Nov '06

22 Nov '06

Module: wine Branch: master Commit: 1f34fdffeeba80f4c0d37a1d816ef17c362897a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f34fdffeeba80f4c0d37a1d8… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Nov 21 20:40:37 2006 +0000 ole32: CoGetInterfaceAndReleaseStream shouldn't crash when passed a NULL stream. --- dlls/ole32/marshal.c | 1 + dlls/ole32/tests/marshal.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index fa45838..a3ff04e 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -1815,6 +1815,7 @@ HRESULT WINAPI CoGetInterfaceAndReleaseS TRACE("(%p, %s, %p)\n", pStm, debugstr_guid(riid), ppv); + if(!pStm) return E_INVALIDARG; hres = CoUnmarshalInterface(pStm, riid, ppv); IStream_Release(pStm); return hres; diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index 4d0c5cd..e99983a 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -2253,6 +2253,15 @@ static void test_marshal_HENHMETAFILE(vo HENHMETAFILE_UserFree(&flags, &hemf2); } +static void test_CoGetInterfaceAndReleaseStream(void) +{ + HRESULT hr; + IUnknown *pUnk; + + hr = CoGetInterfaceAndReleaseStream(NULL, &IID_IUnknown, (void**)&pUnk); + ok(hr == E_INVALIDARG, "hr %08x\n", hr); +} + START_TEST(marshal) { WNDCLASS wndclass; @@ -2313,6 +2322,8 @@ START_TEST(marshal) test_marshal_HGLOBAL(); test_marshal_HENHMETAFILE(); + test_CoGetInterfaceAndReleaseStream(); + CoUninitialize(); return;

1 0

Huw Davies : ole32: Spelling fixes.
by Alexandre Julliard 22 Nov '06

22 Nov '06

Module: wine Branch: master Commit: 8519a6c49e011894eb1d0b373822b6c896227b89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8519a6c49e011894eb1d0b373… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Nov 21 20:44:54 2006 +0000 ole32: Spelling fixes. --- dlls/ole32/hglobalstream.c | 2 +- dlls/ole32/marshal.c | 8 ++++---- dlls/ole32/memlockbytes.c | 2 +- dlls/ole32/memlockbytes16.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/ole32/hglobalstream.c b/dlls/ole32/hglobalstream.c index ae0ed91..0b7f2ef 100644 --- a/dlls/ole32/hglobalstream.c +++ b/dlls/ole32/hglobalstream.c @@ -49,7 +49,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(storage); /**************************************************************************** * HGLOBALStreamImpl definition. * - * This class imlements the IStream inteface and represents a stream + * This class implements the IStream interface and represents a stream * supported by an HGLOBAL pointer. */ struct HGLOBALStreamImpl diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index a3ff04e..dd50486 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -1755,7 +1755,7 @@ HRESULT WINAPI CoReleaseMarshalData(IStr * PARAMS * riid [I] Identifier of the interface to be marshalled. * pUnk [I] Pointer to IUnknown-derived interface that will be marshalled. - * ppStm [O] Pointer to IStream object that is created and then used to store the marshalled inteface. + * ppStm [O] Pointer to IStream object that is created and then used to store the marshalled interface. * * RETURNS * Success: S_OK @@ -1794,10 +1794,10 @@ HRESULT WINAPI CoMarshalInterThreadInter /*********************************************************************** * CoGetInterfaceAndReleaseStream [OLE32.@] * - * Unmarshalls an inteface from a stream and then releases the stream. + * Unmarshalls an interface from a stream and then releases the stream. * * PARAMS - * pStm [I] Stream that contains the marshalled inteface. + * pStm [I] Stream that contains the marshalled interface. * riid [I] Interface identifier of the object to unmarshall. * ppv [O] Address of pointer where the requested interface object will be stored. * @@ -1806,7 +1806,7 @@ HRESULT WINAPI CoMarshalInterThreadInter * Failure: A COM error code * * SEE ALSO - * CoMarshalInterThreadInterfaceInStream() and CoUnmarshalInteface() + * CoMarshalInterThreadInterfaceInStream() and CoUnmarshalInterface() */ HRESULT WINAPI CoGetInterfaceAndReleaseStream(LPSTREAM pStm, REFIID riid, LPVOID *ppv) diff --git a/dlls/ole32/memlockbytes.c b/dlls/ole32/memlockbytes.c index 77d1b78..ef02011 100644 --- a/dlls/ole32/memlockbytes.c +++ b/dlls/ole32/memlockbytes.c @@ -43,7 +43,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); /****************************************************************************** * HGLOBALLockBytesImpl definition. * - * This class imlements the ILockBytes inteface and represents a byte array + * This class implements the ILockBytes interface and represents a byte array * object supported by an HGLOBAL pointer. */ struct HGLOBALLockBytesImpl diff --git a/dlls/ole32/memlockbytes16.c b/dlls/ole32/memlockbytes16.c index 88d1598..bccb953 100644 --- a/dlls/ole32/memlockbytes16.c +++ b/dlls/ole32/memlockbytes16.c @@ -43,7 +43,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); /****************************************************************************** * HGLOBALLockBytesImpl16 definition. * - * This class imlements the ILockBytes inteface and represents a byte array + * This class implements the ILockBytes interface and represents a byte array * object supported by an HGLOBAL pointer. */ struct HGLOBALLockBytesImpl16

1 0

Dmitry Timoshkov : user32: Restore the len == 0 check which got lost in a previous patch.
by Alexandre Julliard 22 Nov '06

22 Nov '06

Module: wine Branch: master Commit: 53cf91bcedf0c1d6af032b948ef98e6423cbcd52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53cf91bcedf0c1d6af032b948… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Nov 22 15:18:07 2006 +0800 user32: Restore the len == 0 check which got lost in a previous patch. --- dlls/user32/static.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/user32/static.c b/dlls/user32/static.c index 1e6c1d9..3c9292b 100644 --- a/dlls/user32/static.c +++ b/dlls/user32/static.c @@ -682,14 +682,18 @@ static void STATIC_PaintTextfn( HWND hwn } buf_size = 256; - if (!(text = HeapAlloc( GetProcessHeap(), 0, buf_size * sizeof(WCHAR) ))) return; + if (!(text = HeapAlloc( GetProcessHeap(), 0, buf_size * sizeof(WCHAR) ))) + goto no_TextOut; while ((len = InternalGetWindowText( hwnd, text, buf_size )) == buf_size - 1) { buf_size *= 2; - if (!(text = HeapReAlloc( GetProcessHeap(), 0, text, buf_size * sizeof(WCHAR) ))) return; + if (!(text = HeapReAlloc( GetProcessHeap(), 0, text, buf_size * sizeof(WCHAR) ))) + goto no_TextOut; } + if (!len) goto no_TextOut; + if (((style & SS_TYPEMASK) == SS_SIMPLE) && (style & SS_NOPREFIX)) { /* Windows uses the faster ExtTextOut() to draw the text and @@ -703,6 +707,7 @@ static void STATIC_PaintTextfn( HWND hwn DrawTextW( hdc, text, -1, &rc, wFormat ); } +no_TextOut: HeapFree( GetProcessHeap(), 0, text ); if (hFont)

1 0

Rob Shearman : rpcrt4: Allow applications to specify authentication levels other than connect in RpcBindingSetAuthInfoA /W.
by Alexandre Julliard 22 Nov '06

22 Nov '06

Module: wine Branch: master Commit: 20c53a77e287e1b2d0db95a4f50ff76a12da0d13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20c53a77e287e1b2d0db95a4f… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Nov 21 13:09:44 2006 +0000 rpcrt4: Allow applications to specify authentication levels other than connect in RpcBindingSetAuthInfoA/W. Map the default authentication level and service to sane values. Don't create an RpcAuthInfo object if RPC_C_AUTHN_LEVEL_NONE is specified. --- dlls/rpcrt4/rpc_binding.c | 36 ++++++++++++++++++++++++++++++++---- 1 files changed, 32 insertions(+), 4 deletions(-) diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c index c8368ff..7b55f21 100644 --- a/dlls/rpcrt4/rpc_binding.c +++ b/dlls/rpcrt4/rpc_binding.c @@ -1049,9 +1049,23 @@ RpcBindingSetAuthInfoExA( RPC_BINDING_HA TRACE("%p %s %lu %lu %p %lu %p\n", Binding, debugstr_a((const char*)ServerPrincName), AuthnLevel, AuthnSvc, AuthIdentity, AuthzSvr, SecurityQos); - if (AuthnLevel != RPC_C_AUTHN_LEVEL_CONNECT) + if (AuthnSvc == RPC_C_AUTHN_DEFAULT) + AuthnSvc = RPC_C_AUTHN_WINNT; + + /* FIXME: the mapping should probably be retrieved using SSPI somehow */ + if (AuthnLevel == RPC_C_AUTHN_LEVEL_DEFAULT) + AuthnLevel = RPC_C_AUTHN_LEVEL_NONE; + + if ((AuthnLevel == RPC_C_AUTHN_LEVEL_NONE) || (AuthnSvc == RPC_C_AUTHN_NONE)) + { + if (bind->AuthInfo) RpcAuthInfo_Release(bind->AuthInfo); + bind->AuthInfo = NULL; + return RPC_S_OK; + } + + if (AuthnLevel > RPC_C_AUTHN_LEVEL_PKT_PRIVACY) { - FIXME("unsupported AuthnLevel %lu\n", AuthnLevel); + FIXME("unknown AuthnLevel %lu\n", AuthnLevel); return RPC_S_UNKNOWN_AUTHN_LEVEL; } @@ -1121,9 +1135,23 @@ RpcBindingSetAuthInfoExW( RPC_BINDING_HA TRACE("%p %s %lu %lu %p %lu %p\n", Binding, debugstr_w((const WCHAR*)ServerPrincName), AuthnLevel, AuthnSvc, AuthIdentity, AuthzSvr, SecurityQos); - if (AuthnLevel != RPC_C_AUTHN_LEVEL_CONNECT) + if (AuthnSvc == RPC_C_AUTHN_DEFAULT) + AuthnSvc = RPC_C_AUTHN_WINNT; + + /* FIXME: the mapping should probably be retrieved using SSPI somehow */ + if (AuthnLevel == RPC_C_AUTHN_LEVEL_DEFAULT) + AuthnLevel = RPC_C_AUTHN_LEVEL_NONE; + + if ((AuthnLevel == RPC_C_AUTHN_LEVEL_NONE) || (AuthnSvc == RPC_C_AUTHN_NONE)) + { + if (bind->AuthInfo) RpcAuthInfo_Release(bind->AuthInfo); + bind->AuthInfo = NULL; + return RPC_S_OK; + } + + if (AuthnLevel > RPC_C_AUTHN_LEVEL_PKT_PRIVACY) { - FIXME("unsupported AuthnLevel %lu\n", AuthnLevel); + FIXME("unknown AuthnLevel %lu\n", AuthnLevel); return RPC_S_UNKNOWN_AUTHN_LEVEL; }

1 0