September 2007 - Wine-commits

Juan Lang : crypt32: (Re) introduce helper function to get issuer certificate.
by Alexandre Julliard 12 Sep '07

12 Sep '07

Module: wine Branch: master Commit: 05492ae9073eac48bbcf63cfe2edac7e80275aed URL: http://source.winehq.org/git/wine.git/?a=commit;h=05492ae9073eac48bbcf63cfe… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Sep 11 12:47:13 2007 -0700 crypt32: (Re)introduce helper function to get issuer certificate. --- dlls/crypt32/chain.c | 22 +++++++++++++++------- 1 files changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index f2fa84e..bd26cb1 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -511,6 +511,17 @@ static void CRYPT_CheckSimpleChain(PCertificateChainEngine engine, CRYPT_CombineTrustStatus(&chain->TrustStatus, &rootElement->TrustStatus); } +static PCCERT_CONTEXT CRYPT_GetIssuer(HCERTSTORE store, PCCERT_CONTEXT subject, + PCCERT_CONTEXT prevIssuer) +{ + PCCERT_CONTEXT issuer; + DWORD flags = 0; + + issuer = CertGetIssuerCertificateFromStore(store, subject, prevIssuer, + &flags); + return issuer; +} + /* Builds a simple chain by finding an issuer for the last cert in the chain, * until reaching a self-signed cert, or until no issuer can be found. */ @@ -523,9 +534,7 @@ static BOOL CRYPT_BuildSimpleChain(PCertificateChainEngine engine, while (ret && !CRYPT_IsSimpleChainCyclic(chain) && !CRYPT_IsCertificateSelfSigned(cert)) { - DWORD flags = 0; - PCCERT_CONTEXT issuer = - CertGetIssuerCertificateFromStore(world, cert, NULL, &flags); + PCCERT_CONTEXT issuer = CRYPT_GetIssuer(world, cert, NULL); if (issuer) { @@ -782,7 +791,7 @@ static PCertificateChain CRYPT_BuildAlternateContextFromChain( alternate = NULL; else { - DWORD i, j, flags; + DWORD i, j; PCCERT_CONTEXT alternateIssuer = NULL; alternate = NULL; @@ -795,9 +804,8 @@ static PCertificateChain CRYPT_BuildAlternateContextFromChain( PCCERT_CONTEXT prevIssuer = CertDuplicateCertificateContext( chain->context.rgpChain[i]->rgpElement[j + 1]->pCertContext); - flags = CERT_STORE_REVOCATION_FLAG | CERT_STORE_SIGNATURE_FLAG; - alternateIssuer = CertGetIssuerCertificateFromStore( - prevIssuer->hCertStore, subject, prevIssuer, &flags); + alternateIssuer = CRYPT_GetIssuer(prevIssuer->hCertStore, + subject, prevIssuer); } if (alternateIssuer) {

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: 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

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

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: 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 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

Roderick Colenbrander : wined3d: Move the memory code of LockRect to the end of the function.
by Alexandre Julliard 12 Sep '07

12 Sep '07

Module: wine Branch: master Commit: 12e942b135b403ad9c088fb94bc3fd3129fd8186 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12e942b135b403ad9c088fb94… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Mon Sep 10 23:46:23 2007 +0200 wined3d: Move the memory code of LockRect to the end of the function. This is needed for PBOs because for those memory allocation works differently. --- dlls/wined3d/surface.c | 42 +++++++++++++++++++++++------------------- 1 files changed, 23 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index aecf7f2..4904f24 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -696,36 +696,19 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LockRect(IWineD3DSurface *iface, WINED This->Flags &= ~SFLAG_INSYSMEM; /* This is the marker that surface data has to be downloaded */ } - /* Calculate the correct start address to report */ + /* Calculate the dimensions of the locked rect */ if (NULL == pRect) { - pLockedRect->pBits = This->resource.allocatedMemory; This->lockedRect.left = 0; This->lockedRect.top = 0; This->lockedRect.right = This->currentDesc.Width; This->lockedRect.bottom = This->currentDesc.Height; TRACE("Locked Rect (%p) = l %d, t %d, r %d, b %d\n", &This->lockedRect, This->lockedRect.left, This->lockedRect.top, This->lockedRect.right, This->lockedRect.bottom); } else { - TRACE("Lock Rect (%p) = l %d, t %d, r %d, b %d\n", pRect, pRect->left, pRect->top, pRect->right, pRect->bottom); - - /* DXTn textures are based on compressed blocks of 4x4 pixels, each - * 16 bytes large (8 bytes in case of DXT1). Because of that Pitch has - * slightly different meaning compared to regular textures. For DXTn - * textures Pitch is the size of a row of blocks, 4 high and "width" - * long. The x offset is calculated differently as well, since moving 4 - * pixels to the right actually moves an entire 4x4 block to right, ie - * 16 bytes (8 in case of DXT1). */ - if (This->resource.format == WINED3DFMT_DXT1) { - pLockedRect->pBits = This->resource.allocatedMemory + (pLockedRect->Pitch * pRect->top / 4) + (pRect->left * 2); - } else if (This->resource.format == WINED3DFMT_DXT2 || This->resource.format == WINED3DFMT_DXT3 - || This->resource.format == WINED3DFMT_DXT4 || This->resource.format == WINED3DFMT_DXT5) { - pLockedRect->pBits = This->resource.allocatedMemory + (pLockedRect->Pitch * pRect->top / 4) + (pRect->left * 4); - } else { - pLockedRect->pBits = This->resource.allocatedMemory + (pLockedRect->Pitch * pRect->top) + (pRect->left * This->bytesPerPixel); - } This->lockedRect.left = pRect->left; This->lockedRect.top = pRect->top; This->lockedRect.right = pRect->right; This->lockedRect.bottom = pRect->bottom; + TRACE("Locked Rect (%p) = l %d, t %d, r %d, b %d\n", pRect, pRect->left, pRect->top, pRect->right, pRect->bottom); } if (This->Flags & SFLAG_NONPOW2) { @@ -872,6 +855,27 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LockRect(IWineD3DSurface *iface, WINED } lock_end: + /* Calculate the correct start address to report */ + if (NULL == pRect) { + pLockedRect->pBits = This->resource.allocatedMemory; + } else { + /* DXTn textures are based on compressed blocks of 4x4 pixels, each + * 16 bytes large (8 bytes in case of DXT1). Because of that Pitch has + * slightly different meaning compared to regular textures. For DXTn + * textures Pitch is the size of a row of blocks, 4 high and "width" + * long. The x offset is calculated differently as well, since moving 4 + * pixels to the right actually moves an entire 4x4 block to right, ie + * 16 bytes (8 in case of DXT1). */ + if (This->resource.format == WINED3DFMT_DXT1) { + pLockedRect->pBits = This->resource.allocatedMemory + (pLockedRect->Pitch * pRect->top / 4) + (pRect->left * 2); + } else if (This->resource.format == WINED3DFMT_DXT2 || This->resource.format == WINED3DFMT_DXT3 + || This->resource.format == WINED3DFMT_DXT4 || This->resource.format == WINED3DFMT_DXT5) { + pLockedRect->pBits = This->resource.allocatedMemory + (pLockedRect->Pitch * pRect->top / 4) + (pRect->left * 4); + } else { + pLockedRect->pBits = This->resource.allocatedMemory + (pLockedRect->Pitch * pRect->top) + (pRect->left * This->bytesPerPixel); + } + } + if (Flags & (WINED3DLOCK_NO_DIRTY_UPDATE | WINED3DLOCK_READONLY)) { /* Don't dirtify */ } else {

1 0

Francois Gouget : winapi_check: 'char*' is a string, not a pointer.
by Alexandre Julliard 12 Sep '07

12 Sep '07

Module: wine Branch: master Commit: 2cd698aff0055754eb6ba0782d5e7c27726d029d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cd698aff0055754eb6ba0782… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Sep 11 16:35:12 2007 +0200 winapi_check: 'char*' is a string, not a pointer. --- tools/winapi/win32.api | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index d772561..b463a74 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -4279,7 +4279,6 @@ UUID_VECTOR * ULONG * struct IRpcChannelBuffer * struct IRpcStubBuffer * -char * char ** twr_t * twr_t ** @@ -4295,6 +4294,7 @@ void %str RPC_CSTR +char * %wstr

1 0

Francois Gouget : wldap32: Fix a typo in the French resources.
by Alexandre Julliard 12 Sep '07

12 Sep '07

Module: wine Branch: master Commit: a4519b02ba7995f7f649da6b13c8908c2bb6d2e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4519b02ba7995f7f649da6b1… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Sep 11 16:35:46 2007 +0200 wldap32: Fix a typo in the French resources. --- dlls/wldap32/wldap32_Fr.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wldap32/wldap32_Fr.rc b/dlls/wldap32/wldap32_Fr.rc index d4b7458..a725754 100644 --- a/dlls/wldap32/wldap32_Fr.rc +++ b/dlls/wldap32/wldap32_Fr.rc @@ -117,7 +117,7 @@ STRINGTABLE DISCARDABLE 92 "Op�ration non support�e par cette version du protocole LDAP" 93 "Le contr�le sp�cifi� n'a pas �t� trouv� dans le message" 94 "Pas de r�sultat dans le message" - 95 "Plusde r�sultats retourn�s" + 95 "Plus de r�sultats retourn�s" 96 "Boucle lors du traitement des r�f�rants" 97 "Limite du nombre de r�f�rents d�pass�e" }

1 0