October 2007 - Wine-Commits

Andrew Talbot : oleaut32: Fix some memory leaks.
by Alexandre Julliard Oct. 2, 2007

Oct. 2, 2007

Module: wine Branch: master Commit: edbcf7c215219d1c51d9a163fef09fb6dcac5161 URL: http://source.winehq.org/git/wine.git/?a=commit;h=edbcf7c215219d1c51d9a163f… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Oct 1 21:33:07 2007 +0100 oleaut32: Fix some memory leaks. --- dlls/oleaut32/tmarshal.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index 1a30aa3..4a5ad89 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -967,6 +967,7 @@ deserialize_param( hres = xbuf_get(buf,(LPBYTE)str,len*sizeof(WCHAR)); if (hres) { ERR("Failed to read BSTR.\n"); + HeapFree(GetProcessHeap(),0,str); return hres; } *bstr = CoTaskMemAlloc(sizeof(BSTR *)); @@ -997,6 +998,7 @@ deserialize_param( hres = xbuf_get(buf,(LPBYTE)str,len*sizeof(WCHAR)); if (hres) { ERR("Failed to read BSTR.\n"); + HeapFree(GetProcessHeap(),0,str); return hres; } *arg = (DWORD)SysAllocStringLen(str,len);

1 0

Maarten Lankhorst : dsound: Fix IDirectSoundBuffer_GetPosition.
by Alexandre Julliard Oct. 2, 2007

Oct. 2, 2007

Module: wine Branch: master Commit: 546447152e8fc828e609e3972e0e31a88b605ea9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=546447152e8fc828e609e3972… Author: Maarten Lankhorst <maarten(a)codeweavers.com> Date: Mon Oct 1 15:07:59 2007 +0200 dsound: Fix IDirectSoundBuffer_GetPosition. --- dlls/dsound/capture.c | 19 ++++++++----------- 1 files changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c index f0b230d..9de2ecd 100644 --- a/dlls/dsound/capture.c +++ b/dlls/dsound/capture.c @@ -919,25 +919,22 @@ IDirectSoundCaptureBufferImpl_GetCurrentPosition( if (hres != DS_OK) WARN("IDsCaptureDriverBuffer_GetPosition failed\n"); } else if (This->device->hwi) { - DWORD pos; + DWORD pos; - EnterCriticalSection(&This->device->lock); - pos = (DWORD_PTR)This->device->pwave[This->device->index].lpData - (DWORD_PTR)This->device->buffer; - TRACE("old This->device->state=%s\n",captureStateString[This->device->state]); + EnterCriticalSection(&This->device->lock); + pos = (DWORD_PTR)This->device->pwave[This->device->index].lpData - (DWORD_PTR)This->device->buffer; if (lpdwCapturePosition) - *lpdwCapturePosition = pos; + *lpdwCapturePosition = (This->device->pwave[This->device->index].dwBufferLength + pos) % This->device->buflen; + if (lpdwReadPosition) + *lpdwReadPosition = pos; + LeaveCriticalSection(&This->device->lock); - if (lpdwReadPosition) - *lpdwReadPosition = (This->device->pwave[This->device->index].dwBufferLength + pos) % This->device->buflen; - LeaveCriticalSection(&This->device->lock); - - if (lpdwCapturePosition) TRACE("*lpdwCapturePosition=%d\n",*lpdwCapturePosition); - if (lpdwReadPosition) TRACE("*lpdwReadPosition=%d\n",*lpdwReadPosition); } else { WARN("no driver\n"); hres = DSERR_NODRIVER; } + TRACE("cappos=%d readpos=%d\n", (lpdwCapturePosition?*lpdwCapturePosition:-1), (lpdwReadPosition?*lpdwReadPosition:-1)); TRACE("returning %08x\n", hres); return hres; }

1 0

Jacek Caban : urlmon: Get rid of no longer needed IHttpNegotiate wrapper.
by Alexandre Julliard Oct. 2, 2007

Oct. 2, 2007

Module: wine Branch: master Commit: 8f6f252ee8ed8ac041279ed758502bedaa08a954 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f6f252ee8ed8ac041279ed75… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 1 14:14:57 2007 +0200 urlmon: Get rid of no longer needed IHttpNegotiate wrapper. --- dlls/urlmon/binding.c | 179 ------------------------------------------------- 1 files changed, 0 insertions(+), 179 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index 894d7b5..eb48bfa 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -46,15 +46,6 @@ typedef struct _task_header_t { } task_header_t; typedef struct { - const IHttpNegotiate2Vtbl *lpHttpNegotiate2Vtbl; - - LONG ref; - - IHttpNegotiate *http_negotiate; - IHttpNegotiate2 *http_negotiate2; -} HttpNegotiate2Wrapper; - -typedef struct { const IStreamVtbl *lpStreamVtbl; LONG ref; @@ -85,7 +76,6 @@ struct Binding { IInternetProtocol *protocol; IServiceProvider *service_provider; ProtocolStream *stream; - HttpNegotiate2Wrapper *httpneg2_wrapper; BINDINFO bindinfo; DWORD bindf; @@ -261,154 +251,6 @@ static void dump_BINDINFO(BINDINFO *bi) ); } -#define HTTPNEG2_THIS(iface) DEFINE_THIS(HttpNegotiate2Wrapper, HttpNegotiate2, iface) - -static HRESULT WINAPI HttpNegotiate2Wrapper_QueryInterface(IHttpNegotiate2 *iface, - REFIID riid, void **ppv) -{ - HttpNegotiate2Wrapper *This = HTTPNEG2_THIS(iface); - - *ppv = NULL; - - if(IsEqualGUID(&IID_IUnknown, riid)) { - TRACE("(IID_IUnknown %p)\n", ppv); - *ppv = HTTPNEG2(This); - }else if(IsEqualGUID(&IID_IHttpNegotiate, riid)) { - TRACE("(IID_IHttpNegotiate %p)\n", ppv); - *ppv = HTTPNEG2(This); - }else if(IsEqualGUID(&IID_IHttpNegotiate2, riid)) { - TRACE("(IID_IHttpNegotiate2 %p)\n", ppv); - *ppv = HTTPNEG2(This); - } - - if(*ppv) { - IHttpNegotiate2_AddRef(HTTPNEG2(This)); - return S_OK; - } - - WARN("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); - return E_NOINTERFACE; -} - -static ULONG WINAPI HttpNegotiate2Wrapper_AddRef(IHttpNegotiate2 *iface) -{ - HttpNegotiate2Wrapper *This = HTTPNEG2_THIS(iface); - LONG ref = InterlockedIncrement(&This->ref); - - TRACE("(%p) ref=%d\n", This, ref); - - return ref; -} - -static ULONG WINAPI HttpNegotiate2Wrapper_Release(IHttpNegotiate2 *iface) -{ - HttpNegotiate2Wrapper *This = HTTPNEG2_THIS(iface); - LONG ref = InterlockedDecrement(&This->ref); - - TRACE("(%p) ref=%d\n", This, ref); - - if(!ref) { - if (This->http_negotiate) - IHttpNegotiate_Release(This->http_negotiate); - if (This->http_negotiate2) - IHttpNegotiate2_Release(This->http_negotiate2); - HeapFree(GetProcessHeap(), 0, This); - - URLMON_UnlockModule(); - } - - return ref; -} - -static HRESULT WINAPI HttpNegotiate2Wrapper_BeginningTransaction(IHttpNegotiate2 *iface, - LPCWSTR szURL, LPCWSTR szHeaders, DWORD dwReserved, LPWSTR *pszAdditionalHeaders) -{ - HttpNegotiate2Wrapper *This = HTTPNEG2_THIS(iface); - - TRACE("(%p)->(%s %s %d %p)\n", This, debugstr_w(szURL), debugstr_w(szHeaders), dwReserved, - pszAdditionalHeaders); - - if(This->http_negotiate) - return IHttpNegotiate_BeginningTransaction(This->http_negotiate, szURL, szHeaders, - dwReserved, pszAdditionalHeaders); - - *pszAdditionalHeaders = NULL; - return S_OK; -} - -static HRESULT WINAPI HttpNegotiate2Wrapper_OnResponse(IHttpNegotiate2 *iface, DWORD dwResponseCode, - LPCWSTR szResponseHeaders, LPCWSTR szRequestHeaders, - LPWSTR *pszAdditionalRequestHeaders) -{ - HttpNegotiate2Wrapper *This = HTTPNEG2_THIS(iface); - LPWSTR szAdditionalRequestHeaders = NULL; - HRESULT hres = S_OK; - - TRACE("(%p)->(%d %s %s %p)\n", This, dwResponseCode, debugstr_w(szResponseHeaders), - debugstr_w(szRequestHeaders), pszAdditionalRequestHeaders); - - /* IHttpNegotiate2_OnResponse expects pszAdditionalHeaders to be non-NULL when it is - * implemented as part of IBindStatusCallback, but it is NULL when called directly from - * IProtocol */ - if(!pszAdditionalRequestHeaders) - pszAdditionalRequestHeaders = &szAdditionalRequestHeaders; - - if(This->http_negotiate) - { - hres = IHttpNegotiate_OnResponse(This->http_negotiate, dwResponseCode, szResponseHeaders, - szRequestHeaders, pszAdditionalRequestHeaders); - if(pszAdditionalRequestHeaders == &szAdditionalRequestHeaders && - szAdditionalRequestHeaders) - CoTaskMemFree(szAdditionalRequestHeaders); - } - else - { - *pszAdditionalRequestHeaders = NULL; - } - - return hres; -} - -static HRESULT WINAPI HttpNegotiate2Wrapper_GetRootSecurityId(IHttpNegotiate2 *iface, - BYTE *pbSecurityId, DWORD *pcbSecurityId, DWORD_PTR dwReserved) -{ - HttpNegotiate2Wrapper *This = HTTPNEG2_THIS(iface); - - TRACE("(%p)->(%p %p %ld)\n", This, pbSecurityId, pcbSecurityId, dwReserved); - - if (This->http_negotiate2) - return IHttpNegotiate2_GetRootSecurityId(This->http_negotiate2, pbSecurityId, - pcbSecurityId, dwReserved); - - /* That's all we have to do here */ - return E_FAIL; -} - -#undef HTTPNEG2_THIS - -static const IHttpNegotiate2Vtbl HttpNegotiate2WrapperVtbl = { - HttpNegotiate2Wrapper_QueryInterface, - HttpNegotiate2Wrapper_AddRef, - HttpNegotiate2Wrapper_Release, - HttpNegotiate2Wrapper_BeginningTransaction, - HttpNegotiate2Wrapper_OnResponse, - HttpNegotiate2Wrapper_GetRootSecurityId -}; - -static HttpNegotiate2Wrapper *create_httpneg2_wrapper(void) -{ - HttpNegotiate2Wrapper *ret = HeapAlloc(GetProcessHeap(), 0, sizeof(HttpNegotiate2Wrapper)); - - ret->lpHttpNegotiate2Vtbl = &HttpNegotiate2WrapperVtbl; - ret->ref = 1; - ret->http_negotiate = NULL; - ret->http_negotiate2 = NULL; - - URLMON_LockModule(); - - return ret; -} - #define STREAM_THIS(iface) DEFINE_THIS(ProtocolStream, Stream, iface) static HRESULT WINAPI ProtocolStream_QueryInterface(IStream *iface, @@ -685,8 +527,6 @@ static ULONG WINAPI Binding_Release(IBinding *iface) IServiceProvider_Release(This->service_provider); if(This->stream) IStream_Release(STREAM(This->stream)); - if(This->httpneg2_wrapper) - IHttpNegotiate2_Release(HTTPNEG2(This->httpneg2_wrapper)); ReleaseBindInfo(&This->bindinfo); This->section.DebugInfo->Spare[0] = 0; @@ -1180,22 +1020,6 @@ static HRESULT WINAPI ServiceProvider_QueryService(IServiceProvider *iface, return hres; } - if(IsEqualGUID(&IID_IHttpNegotiate, guidService) - || IsEqualGUID(&IID_IHttpNegotiate2, guidService)) { - if(!This->httpneg2_wrapper) { - WARN("HttpNegotiate2Wrapper expected to be non-NULL\n"); - } else { - if(IsEqualGUID(&IID_IHttpNegotiate, guidService)) - IBindStatusCallback_QueryInterface(This->callback, riid, - (void **)&This->httpneg2_wrapper->http_negotiate); - else - IBindStatusCallback_QueryInterface(This->callback, riid, - (void **)&This->httpneg2_wrapper->http_negotiate2); - - return IHttpNegotiate2_QueryInterface(HTTPNEG2(This->httpneg2_wrapper), riid, ppv); - } - } - WARN("unknown service %s\n", debugstr_guid(guidService)); return E_NOTIMPL; } @@ -1309,7 +1133,6 @@ static HRESULT Binding_Create(LPCWSTR url, IBindCtx *pbc, REFIID riid, Binding * ret->protocol = NULL; ret->service_provider = NULL; ret->stream = NULL; - ret->httpneg2_wrapper = NULL; ret->mime = NULL; ret->url = NULL; ret->apartment_thread = GetCurrentThreadId(); @@ -1367,8 +1190,6 @@ static HRESULT Binding_Create(LPCWSTR url, IBindCtx *pbc, REFIID riid, Binding * ret->stgmed.u.pstm = STREAM(ret->stream); ret->stgmed.pUnkForRelease = (IUnknown*)BINDING(ret); /* NOTE: Windows uses other IUnknown */ - ret->httpneg2_wrapper = create_httpneg2_wrapper(); - *binding = ret; return S_OK; }

1 0

Jacek Caban : urlmon: Added more RegiterBindStatusCallback tests.
by Alexandre Julliard Oct. 2, 2007

Oct. 2, 2007

Module: wine Branch: master Commit: b090ec13f3c9177dbb3cf52c99dd90d687601f28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b090ec13f3c9177dbb3cf52c9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 1 14:11:11 2007 +0200 urlmon: Added more RegiterBindStatusCallback tests. --- dlls/urlmon/tests/url.c | 257 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 253 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b090ec13f3c9177dbb3cf…

1 0

Stéphane LOEUILLET : Fix substandard wine.desktop file .
by Alexandre Julliard Oct. 2, 2007

Oct. 2, 2007

Module: wine Branch: master Commit: 881e5740c4c8a8207052ce69f146c00f7f0fb5e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=881e5740c4c8a8207052ce69f… Author: Stéphane LOEUILLET <leroutier(a)gmail.com> Date: Sat Sep 29 23:49:36 2007 +0200 Fix substandard wine.desktop file. --- tools/wine.desktop | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/tools/wine.desktop b/tools/wine.desktop index ed09306..ed4982b 100644 --- a/tools/wine.desktop +++ b/tools/wine.desktop @@ -1,8 +1,7 @@ [Desktop Entry] Type=Application -Encoding=UTF-8 Name=Wine Windows Emulator Name[de]=Wine Windows-Emulator Exec=wine %f -MimeType=application/x-ms-dos-executable;application/x-msdos-program;application/x-msdownload;application/exe;application/x-exe;application/dos-exe;vms/exe;application/x-winexe;application/msdos-windows;application/x-msdos-program;application/x-zip-compressed;application/x-executable +MimeType=application/x-ms-dos-executable;application/x-msdos-program;application/x-msdownload;application/exe;application/x-exe;application/dos-exe;vms/exe;application/x-winexe;application/msdos-windows;application/x-zip-compressed;application/x-executable; NoDisplay=true

1 0

Alexandre Julliard : ntdll: Make the heap structure more compatible with the NT layout.
by Alexandre Julliard Oct. 2, 2007

Oct. 2, 2007

Module: wine Branch: master Commit: e599584a68397e280f2e35aae8412fcedb68e3ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=e599584a68397e280f2e35aae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 1 15:32:14 2007 +0200 ntdll: Make the heap structure more compatible with the NT layout. --- dlls/ntdll/heap.c | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index dbe9b77..43d31c3 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -44,10 +44,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(heap); -/* Note: the heap data structures are based on what Pietrek describes in his - * book 'Windows 95 System Programming Secrets'. The layout is not exactly - * the same, but could be easily adapted if it turns out some programs - * require it. +/* Note: the heap data structures are losely based on what Pietrek describes in his + * book 'Windows 95 System Programming Secrets', with some adaptations for + * better compatibility with NT. */ /* FIXME: use SIZE_T for 'size' structure members, but we need to make sure @@ -108,9 +107,9 @@ typedef struct tagSUBHEAP void *base; /* Base address of the sub-heap memory block */ SIZE_T size; /* Size of the whole sub-heap */ SIZE_T commitSize; /* Committed size of the sub-heap */ - DWORD headerSize; /* Size of the heap header */ struct list entry; /* Entry in sub-heap list */ struct tagHEAP *heap; /* Main heap structure */ + DWORD headerSize; /* Size of the heap header */ DWORD magic; /* Magic number */ } SUBHEAP; @@ -118,13 +117,15 @@ typedef struct tagSUBHEAP typedef struct tagHEAP { + DWORD unknown[3]; + DWORD flags; /* Heap flags */ + DWORD force_flags; /* Forced heap flags for debugging */ SUBHEAP subheap; /* First sub-heap */ struct list entry; /* Entry in process heap list */ struct list subheap_list; /* Sub-heap list */ + DWORD magic; /* Magic number */ RTL_CRITICAL_SECTION critSection; /* Critical section for serialization */ FREE_LIST_ENTRY freeList[HEAP_NB_FREE_LISTS]; /* Free lists */ - DWORD flags; /* Heap flags */ - DWORD magic; /* Magic number */ } HEAP; #define HEAP_MAGIC ((DWORD)('H' | ('E'<<8) | ('A'<<16) | ('P'<<24))) @@ -1097,6 +1098,8 @@ HANDLE WINAPI RtlCreateHeap( ULONG flags, PVOID addr, SIZE_T totalSize, SIZE_T c { processHeap = subheap->heap; /* assume the first heap we create is the process main heap */ list_init( &processHeap->entry ); + /* make sure structure alignment is correct */ + assert( (ULONG_PTR)&processHeap->freeList % ALIGNMENT == 0 ); } return (HANDLE)subheap->heap;

1 0

Jacek Caban : urlmon: Wrap callback in RegisterBindStatusCallback.
by Alexandre Julliard Oct. 2, 2007

Oct. 2, 2007

Module: wine Branch: master Commit: b285d562b314ecdfe5fdbf452fc5f480417f7cd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b285d562b314ecdfe5fdbf452… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 1 14:09:32 2007 +0200 urlmon: Wrap callback in RegisterBindStatusCallback. --- dlls/urlmon/bindctx.c | 545 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/urlmon/tests/url.c | 14 +- dlls/urlmon/umon.c | 81 +------- 3 files changed, 553 insertions(+), 87 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b285d562b314ecdfe5fdb…

1 0

Jacek Caban : urlmon: Added IID_IBindStatusCallbackHolder to uuid.
by Alexandre Julliard Oct. 2, 2007

Oct. 2, 2007

Module: wine Branch: master Commit: f185e0499d31011a55d6cae5ee35b8b82e0b8c8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f185e0499d31011a55d6cae5e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 1 14:08:48 2007 +0200 urlmon: Added IID_IBindStatusCallbackHolder to uuid. --- dlls/uuid/uuid.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/uuid/uuid.c b/dlls/uuid/uuid.c index d4943ef..b70f78a 100644 --- a/dlls/uuid/uuid.c +++ b/dlls/uuid/uuid.c @@ -80,6 +80,7 @@ DEFINE_GUID(IID_IDirectPlaySP, 0x0c9f6360,0xcc61,0x11cf,0xac,0xec,0x0 DEFINE_GUID(IID_ISFHelper, 0x1fe68efb,0x1874,0x9812,0x56,0xdc,0x00,0x00,0x00,0x00,0x00,0x00); DEFINE_GUID(IID_IDPLobbySP, 0x5a4e5a20,0x2ced,0x11d0,0xa8,0x89,0x00,0xa0,0xc9,0x05,0x43,0x3c); DEFINE_GUID(IID_IProxyManager, 0x00000008,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); +DEFINE_GUID(IID_IBindStatusCallbackHolder,0x79eac9cc,0xbaf9,0x11ce,0x8c,0x82,0x00,0xaa,0x00,0x4b,0xa9,0x0b); DEFINE_GUID(FMTID_SummaryInformation,0xF29F85E0,0x4FF9,0x1068,0xAB,0x91,0x08,0x00,0x2B,0x27,0xB3,0xD9); DEFINE_GUID(FMTID_DocSummaryInformation,0xD5CDD502,0x2E9C,0x101B,0x93,0x97,0x08,0x00,0x2B,0x2C,0xF9,0xAE);

1 0

Jacek Caban : urlmon: Added more strict QueryInterface tests.
by Alexandre Julliard Oct. 2, 2007

Oct. 2, 2007

Module: wine Branch: master Commit: ef01bdb18a1730fa8318839a75734b1c790a5a7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef01bdb18a1730fa8318839a7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 1 14:10:36 2007 +0200 urlmon: Added more strict QueryInterface tests. --- dlls/urlmon/tests/url.c | 51 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 49 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 595c2ce..36b5dd0 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -20,6 +20,7 @@ */ #include <stdarg.h> +#include <stdio.h> #define COBJMACROS #define CONST_VTABLE @@ -67,6 +68,11 @@ DEFINE_EXPECT(QueryInterface_IServiceProvider); DEFINE_EXPECT(QueryInterface_IHttpNegotiate); +DEFINE_EXPECT(QueryInterface_IBindStatusCallback); +DEFINE_EXPECT(QueryInterface_IBindStatusCallbackHolder); +DEFINE_EXPECT(QueryInterface_IInternetBindInfo); +DEFINE_EXPECT(QueryInterface_IAuthenticate); +DEFINE_EXPECT(QueryInterface_IInternetProtocol); DEFINE_EXPECT(BeginningTransaction); DEFINE_EXPECT(OnResponse); DEFINE_EXPECT(QueryInterface_IHttpNegotiate2); @@ -113,6 +119,8 @@ static BOOL stopped_binding = FALSE, emulate_protocol = FALSE, static DWORD read = 0, bindf = 0; static CHAR mime_type[512]; +extern IID IID_IBindStatusCallbackHolder; + static LPCWSTR urls[] = { WINE_ABOUT_URL, ABOUT_BLANK, @@ -135,6 +143,18 @@ static enum { END_DOWNLOAD } download_state; +static const char *debugstr_guid(REFIID riid) +{ + static char buf[50]; + + sprintf(buf, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", + riid->Data1, riid->Data2, riid->Data3, riid->Data4[0], + riid->Data4[1], riid->Data4[2], riid->Data4[3], riid->Data4[4], + riid->Data4[5], riid->Data4[6], riid->Data4[7]); + + return buf; +} + static void test_CreateURLMoniker(LPCWSTR url1, LPCWSTR url2) { HRESULT hr; @@ -478,6 +498,7 @@ static IHttpNegotiate2 HttpNegotiate = { &HttpNegotiateVtbl }; static HRESULT WINAPI statusclb_QueryInterface(IBindStatusCallback *iface, REFIID riid, void **ppv) { if(IsEqualGUID(&IID_IInternetProtocol, riid)) { + CHECK_EXPECT2(QueryInterface_IInternetProtocol); if(emulate_protocol) { *ppv = &Protocol; return S_OK; @@ -488,6 +509,7 @@ static HRESULT WINAPI statusclb_QueryInterface(IBindStatusCallback *iface, REFII else if (IsEqualGUID(&IID_IServiceProvider, riid)) { CHECK_EXPECT(QueryInterface_IServiceProvider); + return E_NOINTERFACE; } else if (IsEqualGUID(&IID_IHttpNegotiate, riid)) { @@ -501,6 +523,31 @@ static HRESULT WINAPI statusclb_QueryInterface(IBindStatusCallback *iface, REFII *ppv = &HttpNegotiate; return S_OK; } + else if (IsEqualGUID(&IID_IAuthenticate, riid)) + { + CHECK_EXPECT(QueryInterface_IAuthenticate); + return E_NOINTERFACE; + } + else if(IsEqualGUID(&IID_IBindStatusCallback, riid)) + { + CHECK_EXPECT2(QueryInterface_IBindStatusCallback); + *ppv = iface; + return S_OK; + } + else if(IsEqualGUID(&IID_IBindStatusCallbackHolder, riid)) + { + CHECK_EXPECT2(QueryInterface_IBindStatusCallbackHolder); + return E_NOINTERFACE; + } + else if(IsEqualGUID(&IID_IInternetBindInfo, riid)) + { + /* TODO */ + CHECK_EXPECT(QueryInterface_IInternetBindInfo); + } + else + { + ok(0, "unexpected interface %s\n", debugstr_guid(riid)); + } return E_NOINTERFACE; } @@ -851,8 +898,8 @@ static void test_BindToStorage(int protocol, BOOL emul) ok(hres == S_OK, "GetDisplayName failed %08x\n", hres); ok(!lstrcmpW(display_name, urls[test_protocol]), "GetDisplayName got wrong name\n"); - SET_EXPECT(QueryInterface_IServiceProvider); SET_EXPECT(GetBindInfo); + SET_EXPECT(QueryInterface_IInternetProtocol); SET_EXPECT(OnStartBinding); if(emulate_protocol) { SET_EXPECT(Start); @@ -903,8 +950,8 @@ static void test_BindToStorage(int protocol, BOOL emul) DispatchMessage(&msg); } - CHECK_NOT_CALLED(QueryInterface_IServiceProvider); CHECK_CALLED(GetBindInfo); + CHECK_CALLED(QueryInterface_IInternetProtocol); CHECK_CALLED(OnStartBinding); if(emulate_protocol) { CHECK_CALLED(Start);

1 0

Kai Blin : secur32: Remove hardcoded assumption that the SECBUFFER_DATA is always at index 1 for en /decrypting.
by Alexandre Julliard Oct. 2, 2007

Oct. 2, 2007

Module: wine Branch: master Commit: 5afd341aecef9863ee4b7810bd4d4ddaacc2ef7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5afd341aecef9863ee4b7810b… Author: Kai Blin <kai.blin(a)gmail.com> Date: Mon Oct 1 11:57:02 2007 +0200 secur32: Remove hardcoded assumption that the SECBUFFER_DATA is always at index 1 for en/decrypting. --- dlls/secur32/ntlm.c | 45 +++++++++++++++++++++++++++++++++++++-------- 1 files changed, 37 insertions(+), 8 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index 7924156..5041892 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -380,6 +380,26 @@ static int ntlm_GetTokenBufferIndex(PSecBufferDesc pMessage) return -1; } +/************************************************************************* + * ntlm_GetDataBufferIndex + * Calculates the index of the first secbuffer with BufferType == SECBUFFER_DATA + * Returns index if found or -1 if not found. + */ +static int ntlm_GetDataBufferIndex(PSecBufferDesc pMessage) +{ + UINT i; + + TRACE("%p\n", pMessage); + + for( i = 0; i < pMessage->cBuffers; ++i ) + { + if(pMessage->pBuffers[i].BufferType == SECBUFFER_DATA) + return i; + } + + return -1; +} + /*********************************************************************** * InitializeSecurityContextW */ @@ -1609,7 +1629,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_EncryptMessage(PCtxtHandle phContext, ULONG fQOP, PSecBufferDesc pMessage, ULONG MessageSeqNo) { PNegoHelper helper; - int token_idx; + int token_idx, data_idx; TRACE("(%p %d %p %d)\n", phContext, fQOP, pMessage, MessageSeqNo); @@ -1628,6 +1648,9 @@ static SECURITY_STATUS SEC_ENTRY ntlm_EncryptMessage(PCtxtHandle phContext, if((token_idx = ntlm_GetTokenBufferIndex(pMessage)) == -1) return SEC_E_INVALID_TOKEN; + if((data_idx = ntlm_GetDataBufferIndex(pMessage)) ==-1 ) + return SEC_E_INVALID_TOKEN; + if(pMessage->pBuffers[token_idx].cbBuffer < 16) return SEC_E_BUFFER_TOO_SMALL; @@ -1638,8 +1661,8 @@ static SECURITY_STATUS SEC_ENTRY ntlm_EncryptMessage(PCtxtHandle phContext, { ntlm_CreateSignature(helper, pMessage, token_idx, NTLM_SEND, FALSE); SECUR32_arc4Process(helper->crypt.ntlm2.send_a4i, - (BYTE *)pMessage->pBuffers[1].pvBuffer, - pMessage->pBuffers[1].cbBuffer); + (BYTE *)pMessage->pBuffers[data_idx].pvBuffer, + pMessage->pBuffers[data_idx].cbBuffer); if(helper->neg_flags & NTLMSSP_NEGOTIATE_KEY_EXCHANGE) SECUR32_arc4Process(helper->crypt.ntlm2.send_a4i, @@ -1662,8 +1685,9 @@ static SECURITY_STATUS SEC_ENTRY ntlm_EncryptMessage(PCtxtHandle phContext, sig = pMessage->pBuffers[token_idx].pvBuffer; - SECUR32_arc4Process(helper->crypt.ntlm.a4i, pMessage->pBuffers[1].pvBuffer, - pMessage->pBuffers[1].cbBuffer); + SECUR32_arc4Process(helper->crypt.ntlm.a4i, + pMessage->pBuffers[data_idx].pvBuffer, + pMessage->pBuffers[data_idx].cbBuffer); SECUR32_arc4Process(helper->crypt.ntlm.a4i, sig+4, 12); if(helper->neg_flags & NTLMSSP_NEGOTIATE_ALWAYS_SIGN || helper->neg_flags == 0) @@ -1683,7 +1707,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_DecryptMessage(PCtxtHandle phContext, SECURITY_STATUS ret; ULONG ntlmssp_flags_save; PNegoHelper helper; - int token_idx; + int token_idx, data_idx; TRACE("(%p %p %d %p)\n", phContext, pMessage, MessageSeqNo, pfQOP); if(!phContext) @@ -1698,6 +1722,9 @@ static SECURITY_STATUS SEC_ENTRY ntlm_DecryptMessage(PCtxtHandle phContext, if((token_idx = ntlm_GetTokenBufferIndex(pMessage)) == -1) return SEC_E_INVALID_TOKEN; + if((data_idx = ntlm_GetDataBufferIndex(pMessage)) ==-1) + return SEC_E_INVALID_TOKEN; + if(pMessage->pBuffers[token_idx].cbBuffer < 16) return SEC_E_BUFFER_TOO_SMALL; @@ -1706,12 +1733,14 @@ static SECURITY_STATUS SEC_ENTRY ntlm_DecryptMessage(PCtxtHandle phContext, if(helper->neg_flags & NTLMSSP_NEGOTIATE_NTLM2 && helper->neg_flags & NTLMSSP_NEGOTIATE_SEAL) { SECUR32_arc4Process(helper->crypt.ntlm2.recv_a4i, - pMessage->pBuffers[1].pvBuffer, pMessage->pBuffers[1].cbBuffer); + pMessage->pBuffers[data_idx].pvBuffer, + pMessage->pBuffers[data_idx].cbBuffer); } else { SECUR32_arc4Process(helper->crypt.ntlm.a4i, - pMessage->pBuffers[1].pvBuffer, pMessage->pBuffers[1].cbBuffer); + pMessage->pBuffers[data_idx].pvBuffer, + pMessage->pBuffers[data_idx].cbBuffer); } /* Make sure we use a session key for the signature check, EncryptMessage

1 0