wine-commits September 2007

wine-commits@winehq.org

7 participants
787 discussions

Juan Lang : rsaenh: Validate pad byte when decrypting a block cipher.
by Alexandre Julliard 12 Sep '07

12 Sep '07

Module: wine Branch: master Commit: f0d2766fdc945fc967e5efbedbab9e022baabf4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0d2766fdc945fc967e5efbed… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Sep 11 12:44:26 2007 -0700 rsaenh: Validate pad byte when decrypting a block cipher. --- dlls/rsaenh/rsaenh.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 4002f27..3318da6 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -2080,7 +2080,16 @@ BOOL WINAPI RSAENH_CPDecrypt(HCRYPTPROV hProv, HCRYPTKEY hKey, HCRYPTHASH hHash, } memcpy(in, out, pCryptKey->dwBlockLen); } - if (Final) *pdwDataLen -= pbData[*pdwDataLen-1]; + if (Final) { + if (pbData[*pdwDataLen-1] && + pbData[*pdwDataLen-1] <= pCryptKey->dwBlockLen && + pbData[*pdwDataLen-1] < *pdwDataLen) + *pdwDataLen -= pbData[*pdwDataLen-1]; + else { + SetLastError(NTE_BAD_DATA); + return FALSE; + } + } } else if (GET_ALG_TYPE(pCryptKey->aiAlgid) == ALG_TYPE_STREAM) { encrypt_stream_impl(pCryptKey->aiAlgid, &pCryptKey->context, pbData, *pdwDataLen);

1 0

Maarten Lankhorst : winealsa: Add a timer check to capture to see if play notifications have been triggered .
by Alexandre Julliard 12 Sep '07

12 Sep '07

Module: wine Branch: master Commit: 894cf6dbafadca570080a04dfe1dfb0d41427b3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=894cf6dbafadca570080a04df… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Sep 11 18:19:53 2007 +0200 winealsa: Add a timer check to capture to see if play notifications have been triggered. --- dlls/winealsa.drv/dscapture.c | 47 ++++++++++++++++++++++++++++++++++++++++- 1 files changed, 46 insertions(+), 1 deletions(-) diff --git a/dlls/winealsa.drv/dscapture.c b/dlls/winealsa.drv/dscapture.c index 8e409d7..8c2d9f5 100644 --- a/dlls/winealsa.drv/dscapture.c +++ b/dlls/winealsa.drv/dscapture.c @@ -56,6 +56,10 @@ #ifdef HAVE_ALSA +/* Notify timer checks every 10 ms with a resolution of 2 ms */ +#define DS_TIME_DEL 10 +#define DS_TIME_RES 2 + WINE_DEFAULT_DEBUG_CHANNEL(dsalsa); typedef struct IDsCaptureDriverBufferImpl IDsCaptureDriverBufferImpl; @@ -74,7 +78,8 @@ typedef struct IDsCaptureDriverNotifyImpl LONG ref; IDsCaptureDriverBufferImpl *buffer; DSBPOSITIONNOTIFY *notifies; - DWORD nrofnotifies; + DWORD nrofnotifies, playpos; + UINT timerID; } IDsCaptureDriverNotifyImpl; struct IDsCaptureDriverBufferImpl @@ -122,6 +127,35 @@ static void Capture_CheckNotify(IDsCaptureDriverNotifyImpl *This, DWORD from, DW } } +static void CALLBACK Capture_Notify(UINT timerID, UINT msg, DWORD_PTR dwUser, DWORD_PTR dw1, DWORD_PTR dw2) +{ + IDsCaptureDriverBufferImpl *This = (IDsCaptureDriverBufferImpl *)dwUser; + DWORD last_playpos, playpos; + PIDSCDRIVERBUFFER iface = (PIDSCDRIVERBUFFER)This; + + /* **** */ + EnterCriticalSection(&This->pcm_crst); + + IDsDriverBuffer_GetPosition(iface, &playpos, NULL); + last_playpos = This->notify->playpos; + This->notify->playpos = playpos; + + if (snd_pcm_state(This->pcm) != SND_PCM_STATE_RUNNING || last_playpos == playpos || !This->notify->nrofnotifies || !This->notify->notifies) + goto done; + + if (playpos < last_playpos) + { + Capture_CheckNotify(This->notify, last_playpos, This->mmap_buflen_bytes); + if (playpos) + Capture_CheckNotify(This->notify, 0, playpos); + } + else Capture_CheckNotify(This->notify, last_playpos, playpos - last_playpos); + +done: + LeaveCriticalSection(&This->pcm_crst); + /* **** */ +} + static HRESULT WINAPI IDsCaptureDriverNotifyImpl_QueryInterface(PIDSDRIVERNOTIFY iface, REFIID riid, LPVOID *ppobj) { IDsCaptureDriverNotifyImpl *This = (IDsCaptureDriverNotifyImpl *)iface; @@ -159,6 +193,11 @@ static ULONG WINAPI IDsCaptureDriverNotifyImpl_Release(PIDSDRIVERNOTIFY iface) if (!refCount) { This->buffer->notify = NULL; + if (This->timerID) + { + timeKillEvent(This->timerID); + timeEndPeriod(DS_TIME_RES); + } HeapFree(GetProcessHeap(), 0, This->notifies); HeapFree(GetProcessHeap(), 0, This); TRACE("(%p) released\n", This); @@ -204,6 +243,12 @@ static HRESULT WINAPI IDsCaptureDriverNotifyImpl_SetNotificationPositions(PIDSDR This->nrofnotifies = howmuch; IDsDriverBuffer_GetPosition((PIDSCDRIVERBUFFER)This->buffer, &This->playpos, NULL); + if (!This->timerID) + { + timeBeginPeriod(DS_TIME_RES); + This->timerID = timeSetEvent(DS_TIME_DEL, DS_TIME_RES, Capture_Notify, (DWORD_PTR)This->buffer, TIME_PERIODIC | TIME_KILL_SYNCHRONOUS); + } + LeaveCriticalSection(&This->buffer->pcm_crst); /* **** */

1 0

Maarten Lankhorst : winealsa: Add support for capture notification positions.
by Alexandre Julliard 12 Sep '07

12 Sep '07

Module: wine Branch: master Commit: a8da3e7f607319cdf770f48e4a81db3c7f150830 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8da3e7f607319cdf770f48e4… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Sep 11 18:14:57 2007 +0200 winealsa: Add support for capture notification positions. --- dlls/winealsa.drv/dscapture.c | 78 +++++++++++++++++++++++++++++++++++++++- 1 files changed, 76 insertions(+), 2 deletions(-) diff --git a/dlls/winealsa.drv/dscapture.c b/dlls/winealsa.drv/dscapture.c index aa57772..8e409d7 100644 --- a/dlls/winealsa.drv/dscapture.c +++ b/dlls/winealsa.drv/dscapture.c @@ -73,6 +73,8 @@ typedef struct IDsCaptureDriverNotifyImpl const IDsDriverNotifyVtbl *lpVtbl; LONG ref; IDsCaptureDriverBufferImpl *buffer; + DSBPOSITIONNOTIFY *notifies; + DWORD nrofnotifies; } IDsCaptureDriverNotifyImpl; struct IDsCaptureDriverBufferImpl @@ -95,6 +97,31 @@ struct IDsCaptureDriverBufferImpl snd_pcm_uframes_t mmap_buflen_frames, mmap_pos; }; +static void Capture_CheckNotify(IDsCaptureDriverNotifyImpl *This, DWORD from, DWORD len) +{ + unsigned i; + for (i = 0; i < This->nrofnotifies; ++i) { + LPDSBPOSITIONNOTIFY event = This->notifies + i; + DWORD offset = event->dwOffset; + TRACE("checking %d, position %d, event = %p\n", i, offset, event->hEventNotify); + + if (offset == DSBPN_OFFSETSTOP) { + if (!from && !len) { + SetEvent(event->hEventNotify); + TRACE("signalled event %p (%d)\n", event->hEventNotify, i); + return; + } + else return; + } + + if (offset >= from && offset < (from + len)) + { + TRACE("signalled event %p (%d)\n", event->hEventNotify, i); + SetEvent(event->hEventNotify); + } + } +} + static HRESULT WINAPI IDsCaptureDriverNotifyImpl_QueryInterface(PIDSDRIVERNOTIFY iface, REFIID riid, LPVOID *ppobj) { IDsCaptureDriverNotifyImpl *This = (IDsCaptureDriverNotifyImpl *)iface; @@ -132,6 +159,7 @@ static ULONG WINAPI IDsCaptureDriverNotifyImpl_Release(PIDSDRIVERNOTIFY iface) if (!refCount) { This->buffer->notify = NULL; + HeapFree(GetProcessHeap(), 0, This->notifies); HeapFree(GetProcessHeap(), 0, This); TRACE("(%p) released\n", This); } @@ -140,11 +168,46 @@ static ULONG WINAPI IDsCaptureDriverNotifyImpl_Release(PIDSDRIVERNOTIFY iface) static HRESULT WINAPI IDsCaptureDriverNotifyImpl_SetNotificationPositions(PIDSDRIVERNOTIFY iface, DWORD howmuch, LPCDSBPOSITIONNOTIFY notify) { + DWORD len = howmuch * sizeof(DSBPOSITIONNOTIFY); + unsigned i; + LPVOID notifies; IDsCaptureDriverNotifyImpl *This = (IDsCaptureDriverNotifyImpl *)iface; TRACE("(%p,0x%08x,%p)\n",This,howmuch,notify); - FIXME("stub\n"); - return DSERR_UNSUPPORTED; + if (!notify) { + WARN("invalid parameter\n"); + return DSERR_INVALIDPARAM; + } + + if (TRACE_ON(dsalsa)) + for (i=0;i<howmuch; ++i) + TRACE("notify at %d to %p\n", notify[i].dwOffset, notify[i].hEventNotify); + + /* **** */ + EnterCriticalSection(&This->buffer->pcm_crst); + + /* Make an internal copy of the caller-supplied array. + * Replace the existing copy if one is already present. */ + if (This->notifies) + notifies = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, This->notifies, len); + else + notifies = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); + + if (!notifies) + { + LeaveCriticalSection(&This->buffer->pcm_crst); + /* **** */ + return DSERR_OUTOFMEMORY; + } + This->notifies = notifies; + memcpy(This->notifies, notify, len); + This->nrofnotifies = howmuch; + IDsDriverBuffer_GetPosition((PIDSCDRIVERBUFFER)This->buffer, &This->playpos, NULL); + + LeaveCriticalSection(&This->buffer->pcm_crst); + /* **** */ + + return S_OK; } static const IDsDriverNotifyVtbl dscdnvt = @@ -660,6 +723,14 @@ static HRESULT WINAPI IDsCaptureDriverBufferImpl_Start(PIDSCDRIVERBUFFER iface, FIXME("Non-looping buffers are not properly supported!\n"); CommitAll(This, TRUE); + if (This->notify && This->notify->nrofnotifies && This->notify->notifies) + { + DWORD playpos = realpos_to_fakepos(This, This->mmap_pos); + if (playpos) + Capture_CheckNotify(This->notify, 0, playpos); + This->notify->playpos = playpos; + } + /* **** */ LeaveCriticalSection(&This->pcm_crst); return DS_OK; @@ -676,6 +747,9 @@ static HRESULT WINAPI IDsCaptureDriverBufferImpl_Stop(PIDSCDRIVERBUFFER iface) snd_pcm_drop(This->pcm); snd_pcm_prepare(This->pcm); + if (This->notify && This->notify->notifies && This->notify->nrofnotifies) + Capture_CheckNotify(This->notify, 0, 0); + /* **** */ LeaveCriticalSection(&This->pcm_crst); return DS_OK;

1 0

Maarten Lankhorst : winealsa: Add stubs for IDsCaptureDriverNotify.
by Alexandre Julliard 12 Sep '07

12 Sep '07

Module: wine Branch: master Commit: 30dee3a87a27ddd14ed59a66f400a9cef3376ea7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30dee3a87a27ddd14ed59a66f… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Sep 11 17:52:35 2007 +0200 winealsa: Add stubs for IDsCaptureDriverNotify. --- dlls/winealsa.drv/dscapture.c | 116 +++++++++++++++++++++++++++++++++++++--- 1 files changed, 107 insertions(+), 9 deletions(-) diff --git a/dlls/winealsa.drv/dscapture.c b/dlls/winealsa.drv/dscapture.c index d872e9b..aa57772 100644 --- a/dlls/winealsa.drv/dscapture.c +++ b/dlls/winealsa.drv/dscapture.c @@ -58,25 +58,29 @@ WINE_DEFAULT_DEBUG_CHANNEL(dsalsa); -typedef struct IDsCaptureDriverImpl IDsCaptureDriverImpl; typedef struct IDsCaptureDriverBufferImpl IDsCaptureDriverBufferImpl; -struct IDsCaptureDriverImpl +typedef struct IDsCaptureDriverImpl { - /* IUnknown fields */ const IDsCaptureDriverVtbl *lpVtbl; LONG ref; - - /* IDsCaptureDriverImpl fields */ IDsCaptureDriverBufferImpl* capture_buffer; UINT wDevID; -}; +} IDsCaptureDriverImpl; + +typedef struct IDsCaptureDriverNotifyImpl +{ + const IDsDriverNotifyVtbl *lpVtbl; + LONG ref; + IDsCaptureDriverBufferImpl *buffer; +} IDsCaptureDriverNotifyImpl; struct IDsCaptureDriverBufferImpl { const IDsCaptureDriverBufferVtbl *lpVtbl; LONG ref; - IDsCaptureDriverImpl* drv; + IDsCaptureDriverImpl *drv; + IDsCaptureDriverNotifyImpl *notify; CRITICAL_SECTION pcm_crst; LPBYTE mmap_buffer, presented_buffer; @@ -91,6 +95,66 @@ struct IDsCaptureDriverBufferImpl snd_pcm_uframes_t mmap_buflen_frames, mmap_pos; }; +static HRESULT WINAPI IDsCaptureDriverNotifyImpl_QueryInterface(PIDSDRIVERNOTIFY iface, REFIID riid, LPVOID *ppobj) +{ + IDsCaptureDriverNotifyImpl *This = (IDsCaptureDriverNotifyImpl *)iface; + TRACE("(%p,%s,%p)\n",This,debugstr_guid(riid),ppobj); + + if ( IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IDsDriverNotify) ) { + IDsDriverNotify_AddRef(iface); + *ppobj = This; + return DS_OK; + } + + FIXME( "Unknown IID %s\n", debugstr_guid(riid)); + + *ppobj = 0; + return E_NOINTERFACE; +} + +static ULONG WINAPI IDsCaptureDriverNotifyImpl_AddRef(PIDSDRIVERNOTIFY iface) +{ + IDsCaptureDriverNotifyImpl *This = (IDsCaptureDriverNotifyImpl *)iface; + ULONG refCount = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref was %d\n", This, refCount - 1); + + return refCount; +} + +static ULONG WINAPI IDsCaptureDriverNotifyImpl_Release(PIDSDRIVERNOTIFY iface) +{ + IDsCaptureDriverNotifyImpl *This = (IDsCaptureDriverNotifyImpl *)iface; + ULONG refCount = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref was %d\n", This, refCount + 1); + + if (!refCount) { + This->buffer->notify = NULL; + HeapFree(GetProcessHeap(), 0, This); + TRACE("(%p) released\n", This); + } + return refCount; +} + +static HRESULT WINAPI IDsCaptureDriverNotifyImpl_SetNotificationPositions(PIDSDRIVERNOTIFY iface, DWORD howmuch, LPCDSBPOSITIONNOTIFY notify) +{ + IDsCaptureDriverNotifyImpl *This = (IDsCaptureDriverNotifyImpl *)iface; + TRACE("(%p,0x%08x,%p)\n",This,howmuch,notify); + + FIXME("stub\n"); + return DSERR_UNSUPPORTED; +} + +static const IDsDriverNotifyVtbl dscdnvt = +{ + IDsCaptureDriverNotifyImpl_QueryInterface, + IDsCaptureDriverNotifyImpl_AddRef, + IDsCaptureDriverNotifyImpl_Release, + IDsCaptureDriverNotifyImpl_SetNotificationPositions, +}; + #if 0 /** Convert the position an application sees into a position ALSA sees */ static snd_pcm_uframes_t fakepos_to_realpos(const IDsCaptureDriverBufferImpl* This, DWORD fakepos) @@ -302,8 +366,37 @@ static int CreateMMAP(IDsCaptureDriverBufferImpl* pdbi) static HRESULT WINAPI IDsCaptureDriverBufferImpl_QueryInterface(PIDSCDRIVERBUFFER iface, REFIID riid, LPVOID *ppobj) { - /* IDsCaptureDriverBufferImpl *This = (IDsCaptureDriverBufferImpl *)iface; */ - FIXME("(): stub!\n"); + IDsCaptureDriverBufferImpl *This = (IDsCaptureDriverBufferImpl *)iface; + if ( IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IDsCaptureDriverBuffer) ) { + IDsCaptureDriverBuffer_AddRef(iface); + *ppobj = (LPVOID)iface; + return DS_OK; + } + + if ( IsEqualGUID( &IID_IDsDriverNotify, riid ) ) { + if (!This->notify) + { + This->notify = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDsCaptureDriverNotifyImpl)); + if (!This->notify) + return DSERR_OUTOFMEMORY; + This->notify->lpVtbl = &dscdnvt; + This->notify->buffer = This; + + /* Keep a lock on IDsDriverNotify for ourself, so it is destroyed when the buffer is */ + IDsDriverNotify_AddRef((PIDSDRIVERNOTIFY)This->notify); + } + IDsDriverNotify_AddRef((PIDSDRIVERNOTIFY)This->notify); + *ppobj = (LPVOID)This->notify; + return DS_OK; + } + + if ( IsEqualGUID( &IID_IDsDriverPropertySet, riid ) ) { + FIXME("Unsupported interface IID_IDsDriverPropertySet\n"); + return E_FAIL; + } + + FIXME("(): Unknown interface %s\n", debugstr_guid(riid)); return DSERR_UNSUPPORTED; } @@ -327,6 +420,9 @@ static ULONG WINAPI IDsCaptureDriverBufferImpl_Release(PIDSCDRIVERBUFFER iface) if (refCount) return refCount; + EnterCriticalSection(&This->pcm_crst); + if (This->notify) + IDsDriverNotify_Release((PIDSDRIVERNOTIFY)This->notify); TRACE("mmap buffer %p destroyed\n", This->mmap_buffer); This->drv->capture_buffer = NULL; @@ -563,6 +659,7 @@ static HRESULT WINAPI IDsCaptureDriverBufferImpl_Start(PIDSCDRIVERBUFFER iface, * what it does right now is fill the buffer once.. ALSA size */ FIXME("Non-looping buffers are not properly supported!\n"); CommitAll(This, TRUE); + /* **** */ LeaveCriticalSection(&This->pcm_crst); return DS_OK; @@ -578,6 +675,7 @@ static HRESULT WINAPI IDsCaptureDriverBufferImpl_Stop(PIDSCDRIVERBUFFER iface) This->play_looping = FALSE; snd_pcm_drop(This->pcm); snd_pcm_prepare(This->pcm); + /* **** */ LeaveCriticalSection(&This->pcm_crst); return DS_OK;

1 0

Maarten Lankhorst : winealsa: Use nBLockAlign instead of snd_pcm_bytes_to_frames to get buffer size.
by Alexandre Julliard 12 Sep '07

12 Sep '07

Module: wine Branch: master Commit: 8f6c99791b014da23690c84b9a2e328bc4b2e74f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f6c99791b014da23690c84b9… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Sep 11 15:13:40 2007 +0200 winealsa: Use nBLockAlign instead of snd_pcm_bytes_to_frames to get buffer size. --- dlls/winealsa.drv/dscapture.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winealsa.drv/dscapture.c b/dlls/winealsa.drv/dscapture.c index 7c1aaad..d872e9b 100644 --- a/dlls/winealsa.drv/dscapture.c +++ b/dlls/winealsa.drv/dscapture.c @@ -445,7 +445,7 @@ static HRESULT WINAPI IDsCaptureDriverBufferImpl_SetFormat(PIDSCDRIVERBUFFER ifa } snd_pcm_hw_params_set_periods_integer(pcm, hw_params); - buffer_size = snd_pcm_bytes_to_frames(pcm, This->mmap_buflen_bytes); + buffer_size = This->mmap_buflen_bytes / pwfx->nBlockAlign; snd_pcm_hw_params_set_buffer_size_near(pcm, hw_params, &buffer_size); buffer_size = 5000; snd_pcm_hw_params_set_period_time_near(pcm, hw_params, (unsigned int*)&buffer_size, NULL);

1 0

Rob Shearman : rpcrt4: Fix a trace in RPCRT4_SecurePacket.
by Alexandre Julliard 12 Sep '07

12 Sep '07

Module: wine Branch: master Commit: 2eb0e1ce213b604ea48569b905a56e6a32b0bb75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2eb0e1ce213b604ea48569b90… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Sep 11 17:46:34 2007 +0100 rpcrt4: Fix a trace in RPCRT4_SecurePacket. --- dlls/rpcrt4/rpc_message.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/rpc_message.c b/dlls/rpcrt4/rpc_message.c index e43dd00..ce8d1e7 100644 --- a/dlls/rpcrt4/rpc_message.c +++ b/dlls/rpcrt4/rpc_message.c @@ -415,7 +415,7 @@ static RPC_STATUS RPCRT4_SecurePacket(RpcConnection *Connection, sec_status = DecryptMessage(&Connection->ctx, &message, 0 /* FIXME */, 0); if (sec_status != SEC_E_OK) { - ERR("EncryptMessage failed with 0x%08x\n", sec_status); + ERR("DecryptMessage failed with 0x%08x\n", sec_status); return RPC_S_SEC_PKG_ERROR; } }

1 0

Rob Shearman : crypt32: Fix a compile failure on *BSD systems.
by Alexandre Julliard 12 Sep '07

12 Sep '07

Module: wine Branch: master Commit: 9ddc872a1ac443c459b979d1aa02a8818099b1cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ddc872a1ac443c459b979d1a… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Sep 11 17:29:44 2007 +0100 crypt32: Fix a compile failure on *BSD systems. Include limits.h for the definition of PATH_MAX. --- dlls/crypt32/rootstore.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/rootstore.c b/dlls/crypt32/rootstore.c index e150c6a..7941fa2 100644 --- a/dlls/crypt32/rootstore.c +++ b/dlls/crypt32/rootstore.c @@ -30,6 +30,7 @@ #include <unistd.h> #endif #include <errno.h> +#include <limits.h> #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h"

1 0

Rob Shearman : rpcrt4: Correctly handle the failure of RPCRT4_SecurePacket in RPCRT4_Receive.
by Alexandre Julliard 12 Sep '07

12 Sep '07

Module: wine Branch: master Commit: e0e27e4dfb7809db7171fd84607cf1a023945f59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0e27e4dfb7809db7171fd846… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Sep 11 10:31:54 2007 +0100 rpcrt4: Correctly handle the failure of RPCRT4_SecurePacket in RPCRT4_Receive. --- dlls/rpcrt4/rpc_message.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/rpc_message.c b/dlls/rpcrt4/rpc_message.c index 37839f7..e43dd00 100644 --- a/dlls/rpcrt4/rpc_message.c +++ b/dlls/rpcrt4/rpc_message.c @@ -828,12 +828,15 @@ RPC_STATUS RPCRT4_Receive(RpcConnection *Connection, RpcPktHdr **Header, if ((common_hdr.ptype != PKT_BIND) && (common_hdr.ptype != PKT_BIND_ACK) && (common_hdr.ptype != PKT_AUTH3)) + { status = RPCRT4_SecurePacket(Connection, SECURE_PACKET_RECEIVE, *Header, hdr_length, (unsigned char *)pMsg->Buffer + buffer_length, data_length, (RpcAuthVerifier *)auth_data, (unsigned char *)auth_data + sizeof(RpcAuthVerifier), header_auth_len - sizeof(RpcAuthVerifier)); + if (status != RPC_S_OK) goto fail; + } } buffer_length += data_length;

1 0

Francois Gouget : crypt32: Fix the I_Crypt*Asn1*() prototypes. Add the i_cryptasn1tls.h header and use it.
by Alexandre Julliard 12 Sep '07

12 Sep '07

Module: wine Branch: master Commit: b7bf91f5e8b4d7b033f2ad83e535dd345b563ae9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7bf91f5e8b4d7b033f2ad83e… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Sep 11 16:48:04 2007 +0200 crypt32: Fix the I_Crypt*Asn1*() prototypes. Add the i_cryptasn1tls.h header and use it. --- dlls/crypt32/chain.c | 4 ++-- dlls/crypt32/crypt32.spec | 5 +++-- dlls/crypt32/main.c | 19 +++++++++++++------ include/Makefile.in | 1 + include/i_cryptasn1tls.h | 41 +++++++++++++++++++++++++++++++++++++++++ 5 files changed, 60 insertions(+), 10 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index ed23180..f2fa84e 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -178,7 +178,7 @@ BOOL WINAPI CertCreateCertificateChainEngine(PCERT_CHAIN_ENGINE_CONFIG pConfig, return ret; } -void WINAPI CertFreeCertificateChainEngine(HCERTCHAINENGINE hChainEngine) +VOID WINAPI CertFreeCertificateChainEngine(HCERTCHAINENGINE hChainEngine) { PCertificateChainEngine engine = (PCertificateChainEngine)hChainEngine; @@ -1008,7 +1008,7 @@ PCCERT_CHAIN_CONTEXT WINAPI CertDuplicateCertificateChain( return pChainContext; } -void WINAPI CertFreeCertificateChain(PCCERT_CHAIN_CONTEXT pChainContext) +VOID WINAPI CertFreeCertificateChain(PCCERT_CHAIN_CONTEXT pChainContext) { PCertificateChain chain = (PCertificateChain)pChainContext; diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index ac706c7..cbadf22 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -199,17 +199,18 @@ @ stdcall I_CryptFreeLruCache(ptr long long) @ stdcall I_CryptFreeTls(long long) @ stdcall I_CryptGetAsn1Decoder(long) +@ stdcall I_CryptGetAsn1Encoder(long) @ stdcall I_CryptGetDefaultCryptProv(long) @ stub I_CryptGetDefaultCryptProvForEncrypt @ stdcall I_CryptGetOssGlobal(long) @ stdcall I_CryptGetTls(long) @ stub I_CryptInsertLruEntry -@ stdcall I_CryptInstallAsn1Module(long long long) +@ stdcall I_CryptInstallAsn1Module(ptr long ptr) @ stdcall I_CryptInstallOssGlobal(long long long) @ stdcall I_CryptReadTrustedPublisherDWORDValueFromRegistry(wstr ptr) @ stub I_CryptReleaseLruEntry @ stdcall I_CryptSetTls(long ptr) -@ stdcall I_CryptUninstallAsn1Module(ptr) +@ stdcall I_CryptUninstallAsn1Module(long) @ stub I_CryptUninstallOssGlobal @ stub PFXExportCertStore @ stub PFXImportCertStore diff --git a/dlls/crypt32/main.c b/dlls/crypt32/main.c index 9e53e4b..db17447 100644 --- a/dlls/crypt32/main.c +++ b/dlls/crypt32/main.c @@ -26,6 +26,7 @@ #include "wincrypt.h" #include "winreg.h" #include "winuser.h" +#include "i_cryptasn1tls.h" #include "crypt32_private.h" #include "wine/debug.h" @@ -195,21 +196,27 @@ DWORD WINAPI I_CryptInstallOssGlobal(DWORD x, DWORD y, DWORD z) return ret; } -BOOL WINAPI I_CryptInstallAsn1Module(void *x, DWORD y, DWORD z) +BOOL WINAPI I_CryptInstallAsn1Module(ASN1module_t x, DWORD y, void* z) { - FIXME("%p %08x %08x\n", x, y, z); + FIXME("(%p %08x %p): stub\n", x, y, z); return TRUE; } -BOOL WINAPI I_CryptUninstallAsn1Module(void *x) +BOOL WINAPI I_CryptUninstallAsn1Module(HCRYPTASN1MODULE x) { - FIXME("%p\n", x); + FIXME("(%08x): stub\n", x); return TRUE; } -void *WINAPI I_CryptGetAsn1Decoder(long x) +ASN1decoding_t WINAPI I_CryptGetAsn1Decoder(HCRYPTASN1MODULE x) { - FIXME("%08lx\n", x); + FIXME("(%08x): stub\n", x); + return NULL; +} + +ASN1encoding_t WINAPI I_CryptGetAsn1Encoder(HCRYPTASN1MODULE x) +{ + FIXME("(%08x): stub\n", x); return NULL; } diff --git a/include/Makefile.in b/include/Makefile.in index 660977b..60b916a 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -183,6 +183,7 @@ SRCDIR_INCLUDES = \ guiddef.h \ hlguids.h \ htmlhelp.h \ + i_cryptasn1tls.h \ icm.h \ icmpapi.h \ idispids.h \ diff --git a/include/i_cryptasn1tls.h b/include/i_cryptasn1tls.h new file mode 100644 index 0000000..aee4adc --- /dev/null +++ b/include/i_cryptasn1tls.h @@ -0,0 +1,41 @@ +/* + * Copyright (C) 2007 Francois Gouget + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_I_CRYPTASN1TLS_H +#define __WINE_I_CRYPTASN1TLS_H + +typedef void *ASN1decoding_t; +typedef void *ASN1encoding_t; +typedef void *ASN1module_t; +typedef DWORD HCRYPTASN1MODULE; + + +#ifdef __cplusplus +extern "C" { +#endif + +ASN1decoding_t WINAPI I_CryptGetAsn1Decoder(HCRYPTASN1MODULE); +ASN1encoding_t WINAPI I_CryptGetAsn1Encoder(HCRYPTASN1MODULE); +BOOL WINAPI I_CryptInstallAsn1Module(ASN1module_t, DWORD, void*); +BOOL WINAPI I_CryptUninstallAsn1Module(HCRYPTASN1MODULE); + +#ifdef __cplusplus +} +#endif + +#endif /* __WINE_I_CRYPTASN1TLS_H */

1 0

Francois Gouget : wintrust: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 12 Sep '07

12 Sep '07

Module: wine Branch: master Commit: 2eeb4eaf1d9ad08a07d0e8af5f5ad4c859e3af49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2eeb4eaf1d9ad08a07d0e8af5… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Sep 11 16:37:44 2007 +0200 wintrust: Fix compilation on systems that don't support nameless unions. --- dlls/wintrust/softpub.c | 71 +++++++++++++++++++++------------------- dlls/wintrust/tests/asn.c | 40 +++++++++++----------- dlls/wintrust/tests/softpub.c | 8 ++-- 3 files changed, 61 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2eeb4eaf1d9ad08a07d0e…

1 0

← Newer
1
...
59
60
61
62
63
64
65
...
79
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2007