July 2007 - Wine-commits - list.winehq.org

Maarten Lankhorst : winealsa: Increase performance of waveout getposition.
by Alexandre Julliard 30 Jul '07

30 Jul '07

Module: wine Branch: master Commit: 408abf9a76fbac0d964c4bb7c5f60c1d121b8744 URL: http://source.winehq.org/git/wine.git/?a=commit;h=408abf9a76fbac0d964c4bb7c… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Jul 6 15:28:31 2007 +0200 winealsa: Increase performance of waveout getposition. --- dlls/winealsa.drv/waveout.c | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) diff --git a/dlls/winealsa.drv/waveout.c b/dlls/winealsa.drv/waveout.c index 7004e52..6a01df3 100644 --- a/dlls/winealsa.drv/waveout.c +++ b/dlls/winealsa.drv/waveout.c @@ -109,7 +109,7 @@ static BOOL wodUpdatePlayedTotal(WINE_WAVEDEV* wwo, snd_pcm_status_t* ps) WARN("Unexpected state (%d) or delay (%ld) while updating Total Played, resetting\n", state, delay); delay=0; } - wwo->dwPlayedTotal = wwo->dwWrittenTotal - snd_pcm_frames_to_bytes(wwo->pcm, delay); + InterlockedExchange((LONG*)&wwo->dwPlayedTotal, wwo->dwWrittenTotal - snd_pcm_frames_to_bytes(wwo->pcm, delay)); return TRUE; } @@ -444,10 +444,6 @@ static void wodPlayer_ProcessMessages(WINE_WAVEDEV* wwo) wodPlayer_Reset(wwo,TRUE); SetEvent(ev); break; - case WINE_WM_UPDATE: - wodUpdatePlayedTotal(wwo, NULL); - SetEvent(ev); - break; case WINE_WM_BREAKLOOP: if (wwo->state == WINE_WS_PLAYING && wwo->lpLoopPtr != NULL) { /* ensure exit at end of current loop */ @@ -1013,8 +1009,6 @@ static DWORD wodGetPosition(WORD wDevID, LPMMTIME lpTime, DWORD uSize) if (lpTime == NULL) return MMSYSERR_INVALPARAM; wwo = &WOutDev[wDevID]; - ALSA_AddRingMessage(&wwo->msgRing, WINE_WM_UPDATE, 0, TRUE); - return ALSA_bytes_to_mmtime(lpTime, wwo->dwPlayedTotal, &wwo->format); }

1 0

Maarten Lankhorst : winealsa: Always commit at least 3 periods in dsoutput.
by Alexandre Julliard 30 Jul '07

30 Jul '07

Module: wine Branch: master Commit: ecfafa37c7f4626cb71af3a79fcf551653cc4c3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecfafa37c7f4626cb71af3a79… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sun Jul 29 12:39:49 2007 +0200 winealsa: Always commit at least 3 periods in dsoutput. --- dlls/winealsa.drv/dsoutput.c | 27 +++++---------------------- 1 files changed, 5 insertions(+), 22 deletions(-) diff --git a/dlls/winealsa.drv/dsoutput.c b/dlls/winealsa.drv/dsoutput.c index dbac200..bfe10a6 100644 --- a/dlls/winealsa.drv/dsoutput.c +++ b/dlls/winealsa.drv/dsoutput.c @@ -296,8 +296,6 @@ static HRESULT WINAPI IDsDriverBufferImpl_Unlock(PIDSDRIVERBUFFER iface, return DSERR_UNSUPPORTED; } -static int warnonce; - static HRESULT SetFormat(IDsDriverBufferImpl *This, LPWAVEFORMATEX pwfx, BOOL forced) { snd_pcm_t *pcm = NULL; @@ -382,26 +380,11 @@ static HRESULT SetFormat(IDsDriverBufferImpl *This, LPWAVEFORMATEX pwfx, BOOL fo err = snd_pcm_hw_params_get_period_size(hw_params, &psize, NULL); TRACE("Period size is: %lu\n", psize); - /* If period size is 'high', try to commit less - * dmix needs at least 2 buffers to work successfully but prefers 3 - * however it seems to work ok if I just commit 2 1/2 buffers - */ - if (psize >= 512) - { - if (psize == 1024 && ++warnonce == 1) - FIXME("Your alsa dmix period size is 1024, try decreasing it to 512 if possible\n"); - else if (psize > 512) - WARN("Your alsa period size is excessively high (%lu)\n", psize); - This->mmap_commitahead = 2 * psize + psize/2; - This->mmap_writeahead = 2 * psize; - } - else - { - This->mmap_commitahead = 3 * psize; - while (This->mmap_commitahead <= 512) - This->mmap_commitahead += psize; - This->mmap_writeahead = This->mmap_commitahead; - } + /* ALSA needs at least 3 buffers to work succesfully */ + This->mmap_commitahead = 3 * psize; + while (This->mmap_commitahead <= 512) + This->mmap_commitahead += psize; + This->mmap_writeahead = This->mmap_commitahead; if (This->pcm) {

1 0

Juan Lang : crypt32: Implement message stores.
by Alexandre Julliard 30 Jul '07

30 Jul '07

Module: wine Branch: master Commit: c7f44c8ec7b497e47d46373faaf38946683d4192 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7f44c8ec7b497e47d46373fa… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Jul 27 10:59:49 2007 -0700 crypt32: Implement message stores. --- dlls/crypt32/store.c | 166 ++++++++++++++++++++++++++++++++++++++++++++ dlls/crypt32/tests/store.c | 6 -- 2 files changed, 166 insertions(+), 6 deletions(-) diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index b2be152..2bebb5d 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -175,6 +175,14 @@ typedef struct _WINE_FILESTOREINFO BOOL dirty; } WINE_FILESTOREINFO, *PWINE_FILESTOREINFO; +typedef struct _WINE_MSGSTOREINFO +{ + DWORD dwOpenFlags; + HCRYPTPROV cryptProv; + PWINECRYPT_CERTSTORE memStore; + HCRYPTMSG msg; +} WINE_MSGSTOREINFO, *PWINE_MSGSTOREINFO; + typedef struct _WINE_STORE_LIST_ENTRY { PWINECRYPT_CERTSTORE store; @@ -1920,6 +1928,158 @@ static PWINECRYPT_CERTSTORE CRYPT_FileNameOpenStoreA(HCRYPTPROV hCryptProv, return ret; } +static void WINAPI CRYPT_MsgCloseStore(HCERTSTORE hCertStore, DWORD dwFlags) +{ + PWINE_MSGSTOREINFO store = (PWINE_MSGSTOREINFO)hCertStore; + + TRACE("(%p, %08x)\n", store, dwFlags); + CertCloseStore(store->memStore, dwFlags); + CryptMsgClose(store->msg); + CryptMemFree(store); +} + +static void *msgProvFuncs[] = { + CRYPT_MsgCloseStore, + NULL, /* CERT_STORE_PROV_READ_CERT_FUNC */ + NULL, /* CERT_STORE_PROV_WRITE_CERT_FUNC */ + NULL, /* CERT_STORE_PROV_DELETE_CERT_FUNC */ + NULL, /* CERT_STORE_PROV_SET_CERT_PROPERTY_FUNC */ + NULL, /* CERT_STORE_PROV_READ_CRL_FUNC */ + NULL, /* CERT_STORE_PROV_WRITE_CRL_FUNC */ + NULL, /* CERT_STORE_PROV_DELETE_CRL_FUNC */ + NULL, /* CERT_STORE_PROV_SET_CRL_PROPERTY_FUNC */ + NULL, /* CERT_STORE_PROV_READ_CTL_FUNC */ + NULL, /* CERT_STORE_PROV_WRITE_CTL_FUNC */ + NULL, /* CERT_STORE_PROV_DELETE_CTL_FUNC */ + NULL, /* CERT_STORE_PROV_SET_CTL_PROPERTY_FUNC */ + NULL, /* CERT_STORE_PROV_CONTROL_FUNC */ +}; + +static PWINECRYPT_CERTSTORE CRYPT_MsgOpenStore(HCRYPTPROV hCryptProv, + DWORD dwFlags, const void *pvPara) +{ + PWINECRYPT_CERTSTORE store = NULL; + HCRYPTMSG msg = (HCRYPTMSG)pvPara; + PWINECRYPT_CERTSTORE memStore; + + TRACE("(%ld, %08x, %p)\n", hCryptProv, dwFlags, pvPara); + + memStore = CRYPT_MemOpenStore(hCryptProv, dwFlags, NULL); + if (memStore) + { + BOOL ret; + DWORD size, count, i; + + size = sizeof(count); + ret = CryptMsgGetParam(msg, CMSG_CERT_COUNT_PARAM, 0, &count, &size); + for (i = 0; ret && i < count; i++) + { + size = 0; + ret = CryptMsgGetParam(msg, CMSG_CERT_PARAM, i, NULL, &size); + if (ret) + { + LPBYTE buf = CryptMemAlloc(size); + + if (buf) + { + ret = CryptMsgGetParam(msg, CMSG_CERT_PARAM, i, buf, &size); + if (ret) + ret = CertAddEncodedCertificateToStore(memStore, + X509_ASN_ENCODING, buf, size, CERT_STORE_ADD_ALWAYS, + NULL); + CryptMemFree(buf); + } + } + } + size = sizeof(count); + ret = CryptMsgGetParam(msg, CMSG_CRL_COUNT_PARAM, 0, &count, &size); + for (i = 0; ret && i < count; i++) + { + size = 0; + ret = CryptMsgGetParam(msg, CMSG_CRL_PARAM, i, NULL, &size); + if (ret) + { + LPBYTE buf = CryptMemAlloc(size); + + if (buf) + { + ret = CryptMsgGetParam(msg, CMSG_CRL_PARAM, i, buf, &size); + if (ret) + ret = CertAddEncodedCRLToStore(memStore, + X509_ASN_ENCODING, buf, size, CERT_STORE_ADD_ALWAYS, + NULL); + CryptMemFree(buf); + } + } + } + if (ret) + { + PWINE_MSGSTOREINFO info = CryptMemAlloc(sizeof(WINE_MSGSTOREINFO)); + + if (info) + { + CERT_STORE_PROV_INFO provInfo = { 0 }; + + info->dwOpenFlags = dwFlags; + info->cryptProv = hCryptProv; + info->memStore = memStore; + info->msg = CryptMsgDuplicate(msg); + provInfo.cbSize = sizeof(provInfo); + provInfo.cStoreProvFunc = sizeof(msgProvFuncs) / + sizeof(msgProvFuncs[0]); + provInfo.rgpvStoreProvFunc = msgProvFuncs; + provInfo.hStoreProv = info; + store = CRYPT_ProvCreateStore(hCryptProv, dwFlags, memStore, + &provInfo); + } + else + CertCloseStore(memStore, 0); + } + else + CertCloseStore(memStore, 0); + } + TRACE("returning %p\n", store); + return store; +} + +static PWINECRYPT_CERTSTORE CRYPT_PKCSOpenStore(HCRYPTPROV hCryptProv, + DWORD dwFlags, const void *pvPara) +{ + HCRYPTMSG msg; + PWINECRYPT_CERTSTORE store = NULL; + const CRYPT_DATA_BLOB *data = (const CRYPT_DATA_BLOB *)pvPara; + BOOL ret; + + TRACE("(%ld, %08x, %p)\n", hCryptProv, dwFlags, pvPara); + + msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, CMSG_SIGNED, 0, NULL, + NULL); + ret = CryptMsgUpdate(msg, data->pbData, data->cbData, TRUE); + if (!ret) + { + CryptMsgClose(msg); + msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, 0, 0, NULL, NULL); + ret = CryptMsgUpdate(msg, data->pbData, data->cbData, TRUE); + if (ret) + { + DWORD type, size = sizeof(type); + + /* Only signed messages are allowed, check type */ + ret = CryptMsgGetParam(msg, CMSG_TYPE_PARAM, 0, &type, &size); + if (ret && type != CMSG_SIGNED) + { + SetLastError(CRYPT_E_INVALID_MSG_TYPE); + ret = FALSE; + } + } + } + if (ret) + store = CRYPT_MsgOpenStore(hCryptProv, dwFlags, msg); + CryptMsgClose(msg); + TRACE("returning %p\n", store); + return store; +} + static PWINECRYPT_CERTSTORE CRYPT_PhysOpenStoreW(HCRYPTPROV hCryptProv, DWORD dwFlags, const void *pvPara) { @@ -1945,12 +2105,18 @@ HCERTSTORE WINAPI CertOpenStore(LPCSTR lpszStoreProvider, { switch (LOWORD(lpszStoreProvider)) { + case (int)CERT_STORE_PROV_MSG: + openFunc = CRYPT_MsgOpenStore; + break; case (int)CERT_STORE_PROV_MEMORY: openFunc = CRYPT_MemOpenStore; break; case (int)CERT_STORE_PROV_FILE: openFunc = CRYPT_FileOpenStore; break; + case (int)CERT_STORE_PROV_PKCS7: + openFunc = CRYPT_PKCSOpenStore; + break; case (int)CERT_STORE_PROV_REG: openFunc = CRYPT_RegOpenStore; break; diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c index 96b62f0..450352f 100644 --- a/dlls/crypt32/tests/store.c +++ b/dlls/crypt32/tests/store.c @@ -1398,12 +1398,10 @@ static void testMessageStore(void) */ SetLastError(0xdeadbeef); store = CertOpenStore(CERT_STORE_PROV_MSG, 0, 0, 0, msg); - todo_wine ok(!store && GetLastError() == CRYPT_E_INVALID_MSG_TYPE, "Expected CRYPT_E_INVALID_MSG_TYPE, got %08x\n", GetLastError()); CryptMsgUpdate(msg, signedContent, sizeof(signedContent), TRUE); store = CertOpenStore(CERT_STORE_PROV_MSG, 0, 0, 0, msg); - todo_wine ok(store != NULL, "CertOpenStore failed: %08x\n", GetLastError()); if (store) { @@ -1452,7 +1450,6 @@ static void testMessageStore(void) store = CertOpenStore(CERT_STORE_PROV_PKCS7, 0, 0, 0, NULL); */ store = CertOpenStore(CERT_STORE_PROV_PKCS7, 0, 0, 0, &blob); - todo_wine ok(store != NULL, "CertOpenStore failed: %08x\n", GetLastError()); if (store) { @@ -1479,7 +1476,6 @@ static void testMessageStore(void) /* Encoding appears to be ignored */ store = CertOpenStore(CERT_STORE_PROV_PKCS7, X509_ASN_ENCODING, 0, 0, &blob); - todo_wine ok(store != NULL, "CertOpenStore failed: %08x\n", GetLastError()); if (store) CertCloseStore(store, 0); @@ -1488,14 +1484,12 @@ static void testMessageStore(void) blob.pbData = (LPBYTE)hashContent; SetLastError(0xdeadbeef); store = CertOpenStore(CERT_STORE_PROV_PKCS7, 0, 0, 0, &blob); - todo_wine ok(!store && GetLastError() == CRYPT_E_INVALID_MSG_TYPE, "Expected CRYPT_E_INVALID_MSG_TYPE, got %08x\n", GetLastError()); blob.cbData = sizeof(hashBareContent); blob.pbData = (LPBYTE)hashBareContent; SetLastError(0xdeadbeef); store = CertOpenStore(CERT_STORE_PROV_PKCS7, 0, 0, 0, &blob); - todo_wine ok(!store && GetLastError() == CRYPT_E_ASN1_BADTAG, "Expected CRYPT_E_ASN1_BADTAG, got %08x\n", GetLastError()); }

1 0

Robert Millan : ddraw: Remove thread safety FIXMEs.
by Alexandre Julliard 30 Jul '07

30 Jul '07

Module: wine Branch: master Commit: 47c847663e5d32df7ffb954ddffc12025b789ab4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47c847663e5d32df7ffb954dd… Author: Robert Millan <rmh(a)aybabtu.com> Date: Sat Jul 28 21:17:19 2007 +0200 ddraw: Remove thread safety FIXMEs. --- dlls/ddraw/ddraw.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index c903ad4..b447403 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -516,8 +516,6 @@ IDirectDrawImpl_SetCooperativeLevel(IDirectDraw7 *iface, if(cooplevel & DDSCL_MULTITHREADED && !(This->cooperative_level & DDSCL_MULTITHREADED)) { - FIXME("DirectDraw is not fully thread safe yet\n"); - /* Enable thread safety in wined3d */ IWineD3DDevice_SetMultithreaded(This->wineD3DDevice); }

1 0

Jason Edmeades : comdlg32: Save dialog works if fred\ entered as filename.
by Alexandre Julliard 30 Jul '07

30 Jul '07

Module: wine Branch: master Commit: 8707021aaed095b50ba79f05e0494684ecb7c807 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8707021aaed095b50ba79f05e… Author: Jason Edmeades <jason.edmeades(a)googlemail.com> Date: Sat Jul 28 20:34:49 2007 +0100 comdlg32: Save dialog works if fred\ entered as filename. --- dlls/comdlg32/filedlg.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index e8e82f2..ca058f2 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -1958,7 +1958,8 @@ BOOL FILEDLG95_OnOpen(HWND hwnd) } else if (!(fodInfos->ofnInfos->Flags & OFN_NOVALIDATE)) { - if(*lpszTemp) /* points to trailing null for last path element */ + if(*lpszTemp || /* points to trailing null for last path element */ + (lpwstrTemp[strlenW(lpwstrTemp)-1] == '\\')) /* or if last element ends in '\' */ { if(fodInfos->ofnInfos->Flags & OFN_PATHMUSTEXIST) {

1 0

Vitaliy Margolen : dinput: Fix typo.
by Alexandre Julliard 30 Jul '07

30 Jul '07

Module: wine Branch: master Commit: ed4f1e8ec76d0bf5a615ce83b54c4117c9faadd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed4f1e8ec76d0bf5a615ce83b… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sat Jul 28 20:09:43 2007 -0600 dinput: Fix typo. --- dlls/dinput/joystick_linux.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 57f1d7a..9bd423b 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -1208,12 +1208,12 @@ static const IDirectInputDevice8AVtbl JoystickAvt = }; #if !defined(__STRICT_ANSI__) && defined(__GNUC__) -# define XCAST(fun) (typeof(SysJoystickWvt.fun)) +# define XCAST(fun) (typeof(JoystickWvt.fun)) #else # define XCAST(fun) (void*) #endif -static const IDirectInputDevice8WVtbl SysJoystickWvt = +static const IDirectInputDevice8WVtbl JoystickWvt = { IDirectInputDevice2WImpl_QueryInterface, XCAST(AddRef)IDirectInputDevice2AImpl_AddRef,

1 0

Misha Koshelev : msi: Use SysAllocString/ SysFreeString for BSTR members of EXCEPINFO structure.
by Alexandre Julliard 30 Jul '07

30 Jul '07

Module: wine Branch: master Commit: 03d19b5782e92fba2bea0f1ae5758b30be43666f URL: http://source.winehq.org/git/wine.git/?a=commit;h=03d19b5782e92fba2bea0f1ae… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Fri Jul 27 23:51:47 2007 -0500 msi: Use SysAllocString/SysFreeString for BSTR members of EXCEPINFO structure. --- dlls/msi/automation.c | 4 ++-- dlls/msi/script.c | 6 ++++++ dlls/msi/tests/automation.c | 4 ++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index 97084fc..fb8d4f5 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -426,8 +426,8 @@ static HRESULT WINAPI AutomationObject_Invoke( memset(pExcepInfo, 0, sizeof(EXCEPINFO)); pExcepInfo->wCode = 1000; - pExcepInfo->bstrSource = szExceptionSource; - pExcepInfo->bstrDescription = szExceptionDescription; + pExcepInfo->bstrSource = SysAllocString(szExceptionSource); + pExcepInfo->bstrDescription = SysAllocString(szExceptionDescription); hr = DISP_E_EXCEPTION; } } diff --git a/dlls/msi/script.c b/dlls/msi/script.c index cbce0ce..2f2a17e 100644 --- a/dlls/msi/script.c +++ b/dlls/msi/script.c @@ -336,9 +336,15 @@ static HRESULT WINAPI MsiActiveScriptSite_OnScriptError(IActiveScriptSite* iface TRACE("(%p/%p)->(%p)\n", This, iface, pscripterror); + memset(&exception, 0, sizeof(EXCEPINFO)); hr = IActiveScriptError_GetExceptionInfo(pscripterror, &exception); if (SUCCEEDED(hr)) + { ERR("script error: %s\n", debugstr_w(exception.bstrDescription)); + SysFreeString(exception.bstrSource); + SysFreeString(exception.bstrDescription); + SysFreeString(exception.bstrHelpFile); + } return S_OK; } diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index e7d1847..d2aac28 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -433,6 +433,10 @@ static WCHAR szSource[] = {'M','s','i',' ','A','P','I',' ','E','r','r','o','r',0 ok(excepinfo.bstrDescription != NULL, "Exception description was NULL\n"); \ if (excepinfo.bstrDescription) \ ok_w2("Exception description was \"%s\" but expected to be \"%s\"\n", excepinfo.bstrDescription, szDescription); \ +\ + SysFreeString(excepinfo.bstrSource); \ + SysFreeString(excepinfo.bstrDescription); \ + SysFreeString(excepinfo.bstrHelpFile); \ } static DISPID get_dispid( IDispatch *disp, const char *name )

1 0

Maarten Lankhorst : winealsa: Increase performance of wavein getposition.
by Alexandre Julliard 30 Jul '07

30 Jul '07

Module: wine Branch: master Commit: f45128c2a6bc5c304244c258ead1378a855b6aba URL: http://source.winehq.org/git/wine.git/?a=commit;h=f45128c2a6bc5c304244c258e… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Jul 5 00:41:59 2007 +0200 winealsa: Increase performance of wavein getposition. --- dlls/winealsa.drv/wavein.c | 12 +++--------- 1 files changed, 3 insertions(+), 9 deletions(-) diff --git a/dlls/winealsa.drv/wavein.c b/dlls/winealsa.drv/wavein.c index 5d731eb..412edd2 100644 --- a/dlls/winealsa.drv/wavein.c +++ b/dlls/winealsa.drv/wavein.c @@ -154,7 +154,7 @@ static DWORD CALLBACK widRecorder(LPVOID pmt) DWORD frames_per_period; wwi->state = WINE_WS_STOPPED; - wwi->dwTotalRecorded = 0; + InterlockedExchange((LONG*)&wwi->dwTotalRecorded, 0); wwi->lpQueuePtr = NULL; SetEvent(wwi->hStartUpEvent); @@ -198,7 +198,7 @@ static DWORD CALLBACK widRecorder(LPVOID pmt) { /* update number of bytes recorded in current buffer and by this device */ lpWaveHdr->dwBytesRecorded += bytesRead; - wwi->dwTotalRecorded += bytesRead; + InterlockedExchangeAdd((LONG*)&wwi->dwTotalRecorded, bytesRead); /* buffer is full. notify client */ if (lpWaveHdr->dwBytesRecorded == lpWaveHdr->dwBufferLength) @@ -247,7 +247,7 @@ static DWORD CALLBACK widRecorder(LPVOID pmt) /* update number of bytes recorded in current buffer and by this device */ lpWaveHdr->dwBytesRecorded += dwToCopy; - wwi->dwTotalRecorded += dwToCopy; + InterlockedExchangeAdd((LONG*)&wwi->dwTotalRecorded, dwToCopy); bytesRead -= dwToCopy; pOffset += dwToCopy; @@ -385,10 +385,6 @@ static DWORD CALLBACK widRecorder(LPVOID pmt) HeapFree(GetProcessHeap(), 0, buffer); ExitThread(0); /* shouldn't go here */ - case WINE_WM_UPDATE: - SetEvent(ev); - break; - default: FIXME("unknown message %d\n", msg); break; @@ -784,8 +780,6 @@ static DWORD widGetPosition(WORD wDevID, LPMMTIME lpTime, DWORD uSize) } wwi = &WInDev[wDevID]; - ALSA_AddRingMessage(&wwi->msgRing, WINE_WM_UPDATE, 0, TRUE); - return ALSA_bytes_to_mmtime(lpTime, wwi->dwTotalRecorded, &wwi->format); }

1 0

Juan Lang : crypt32: Implement getting some parameters from a decoded signed message.
by Alexandre Julliard 30 Jul '07

30 Jul '07

Module: wine Branch: master Commit: 115edc67e60308d35c34dd9adeb46ae2f54db39c URL: http://source.winehq.org/git/wine.git/?a=commit;h=115edc67e60308d35c34dd9ad… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Jul 27 10:57:50 2007 -0700 crypt32: Implement getting some parameters from a decoded signed message. --- dlls/crypt32/msg.c | 88 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/crypt32/tests/msg.c | 12 ------ 2 files changed, 88 insertions(+), 12 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 042b1ef..bca4040 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -1559,6 +1559,90 @@ static BOOL CDecodeHashMsg_GetParam(CDecodeMsg *msg, DWORD dwParamType, return ret; } +static BOOL CDecodeSignedMsg_GetParam(CDecodeMsg *msg, DWORD dwParamType, + DWORD dwIndex, void *pvData, DWORD *pcbData) +{ + BOOL ret = FALSE; + + switch (dwParamType) + { + case CMSG_TYPE_PARAM: + ret = CRYPT_CopyParam(pvData, pcbData, &msg->type, sizeof(msg->type)); + break; + case CMSG_SIGNER_COUNT_PARAM: + if (msg->u.signedInfo) + ret = CRYPT_CopyParam(pvData, pcbData, + &msg->u.signedInfo->cSignerInfo, sizeof(DWORD)); + else + SetLastError(CRYPT_E_INVALID_MSG_TYPE); + break; + case CMSG_CERT_COUNT_PARAM: + if (msg->u.signedInfo) + ret = CRYPT_CopyParam(pvData, pcbData, + &msg->u.signedInfo->cCertEncoded, sizeof(DWORD)); + else + SetLastError(CRYPT_E_INVALID_MSG_TYPE); + break; + case CMSG_CERT_PARAM: + if (msg->u.signedInfo) + { + if (dwIndex >= msg->u.signedInfo->cCertEncoded) + SetLastError(CRYPT_E_INVALID_INDEX); + else + ret = CRYPT_CopyParam(pvData, pcbData, + msg->u.signedInfo->rgCertEncoded[dwIndex].pbData, + msg->u.signedInfo->rgCertEncoded[dwIndex].cbData); + } + else + SetLastError(CRYPT_E_INVALID_MSG_TYPE); + break; + case CMSG_CRL_COUNT_PARAM: + if (msg->u.signedInfo) + ret = CRYPT_CopyParam(pvData, pcbData, + &msg->u.signedInfo->cCrlEncoded, sizeof(DWORD)); + else + SetLastError(CRYPT_E_INVALID_MSG_TYPE); + break; + case CMSG_CRL_PARAM: + if (msg->u.signedInfo) + { + if (dwIndex >= msg->u.signedInfo->cCrlEncoded) + SetLastError(CRYPT_E_INVALID_INDEX); + else + ret = CRYPT_CopyParam(pvData, pcbData, + msg->u.signedInfo->rgCrlEncoded[dwIndex].pbData, + msg->u.signedInfo->rgCrlEncoded[dwIndex].cbData); + } + else + SetLastError(CRYPT_E_INVALID_MSG_TYPE); + break; + case CMSG_ATTR_CERT_COUNT_PARAM: + if (msg->u.signedInfo) + ret = CRYPT_CopyParam(pvData, pcbData, + &msg->u.signedInfo->cAttrCertEncoded, sizeof(DWORD)); + else + SetLastError(CRYPT_E_INVALID_MSG_TYPE); + break; + case CMSG_ATTR_CERT_PARAM: + if (msg->u.signedInfo) + { + if (dwIndex >= msg->u.signedInfo->cAttrCertEncoded) + SetLastError(CRYPT_E_INVALID_INDEX); + else + ret = CRYPT_CopyParam(pvData, pcbData, + msg->u.signedInfo->rgAttrCertEncoded[dwIndex].pbData, + msg->u.signedInfo->rgAttrCertEncoded[dwIndex].cbData); + } + else + SetLastError(CRYPT_E_INVALID_MSG_TYPE); + break; + default: + FIXME("unimplemented for %d\n", dwParamType); + SetLastError(CRYPT_E_INVALID_MSG_TYPE); + } + return ret; +} + static BOOL CDecodeMsg_GetParam(HCRYPTMSG hCryptMsg, DWORD dwParamType, DWORD dwIndex, void *pvData, DWORD *pcbData) { @@ -1571,6 +1655,10 @@ static BOOL CDecodeMsg_GetParam(HCRYPTMSG hCryptMsg, DWORD dwParamType, ret = CDecodeHashMsg_GetParam(msg, dwParamType, dwIndex, pvData, pcbData); break; + case CMSG_SIGNED: + ret = CDecodeSignedMsg_GetParam(msg, dwParamType, dwIndex, pvData, + pcbData); + break; default: switch (dwParamType) { diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index b7f9393..85a9d62 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -1961,26 +1961,18 @@ static void test_decode_msg_get_param(void) size = sizeof(value); value = 2112; ret = CryptMsgGetParam(msg, CMSG_SIGNER_COUNT_PARAM, 0, &value, &size); - todo_wine { ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); ok(value == 1, "Expected 1 signer, got %d\n", value); - } /* index is ignored when getting signer count */ ret = CryptMsgGetParam(msg, CMSG_SIGNER_COUNT_PARAM, 1, &value, &size); - todo_wine { ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); ok(value == 1, "Expected 1 signer, got %d\n", value); - } ret = CryptMsgGetParam(msg, CMSG_CERT_COUNT_PARAM, 0, &value, &size); - todo_wine { ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); ok(value == 0, "Expected 0 certs, got %d\n", value); - } ret = CryptMsgGetParam(msg, CMSG_CRL_COUNT_PARAM, 0, &value, &size); - todo_wine { ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); ok(value == 0, "Expected 0 CRLs, got %d\n", value); - } CryptMsgClose(msg); msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, CMSG_SIGNED, 0, NULL, NULL); @@ -1988,17 +1980,13 @@ static void test_decode_msg_get_param(void) sizeof(signedWithCertAndCrlBareContent), TRUE); ok(ret, "CryptMsgUpdate failed: %08x\n", GetLastError()); ret = CryptMsgGetParam(msg, CMSG_CERT_COUNT_PARAM, 0, &value, &size); - todo_wine { ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); ok(value == 1, "Expected 1 cert, got %d\n", value); check_param("cert", msg, CMSG_CERT_PARAM, cert, sizeof(cert)); - } ret = CryptMsgGetParam(msg, CMSG_CRL_COUNT_PARAM, 0, &value, &size); - todo_wine { ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); ok(value == 1, "Expected 1 CRL, got %d\n", value); check_param("crl", msg, CMSG_CRL_PARAM, crl, sizeof(crl)); - } CryptMsgClose(msg); }

1 0

Juan Lang : crypt32: Add tests for message stores.
by Alexandre Julliard 30 Jul '07

30 Jul '07

Module: wine Branch: master Commit: d76e1899ad85e2766b5a55a00eb8b916f6b027bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=d76e1899ad85e2766b5a55a00… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Jul 27 10:58:28 2007 -0700 crypt32: Add tests for message stores. --- dlls/crypt32/tests/store.c | 168 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 168 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c index aa8f653..96b62f0 100644 --- a/dlls/crypt32/tests/store.c +++ b/dlls/crypt32/tests/store.c @@ -1333,6 +1333,173 @@ static void testFileNameStore(void) DeleteFileW(filename); } +static const BYTE signedContent[] = { +0x30,0x81,0xb2,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x07,0x02,0xa0, +0x81,0xa4,0x30,0x81,0xa1,0x02,0x01,0x01,0x31,0x0e,0x30,0x0c,0x06,0x08,0x2a, +0x86,0x48,0x86,0xf7,0x0d,0x02,0x05,0x05,0x00,0x30,0x13,0x06,0x09,0x2a,0x86, +0x48,0x86,0xf7,0x0d,0x01,0x07,0x01,0xa0,0x06,0x04,0x04,0x01,0x02,0x03,0x04, +0x31,0x77,0x30,0x75,0x02,0x01,0x01,0x30,0x1a,0x30,0x15,0x31,0x13,0x30,0x11, +0x06,0x03,0x55,0x04,0x03,0x13,0x0a,0x4a,0x75,0x61,0x6e,0x20,0x4c,0x61,0x6e, +0x67,0x00,0x02,0x01,0x01,0x30,0x0c,0x06,0x08,0x2a,0x86,0x48,0x86,0xf7,0x0d, +0x02,0x05,0x05,0x00,0x30,0x04,0x06,0x00,0x05,0x00,0x04,0x40,0x81,0xa6,0x70, +0xb3,0xef,0x59,0xd1,0x66,0xd1,0x9b,0xc0,0x9a,0xb6,0x9a,0x5e,0x6d,0x6f,0x6d, +0x0d,0x59,0xa9,0xaa,0x6e,0xe9,0x2c,0xa0,0x1e,0xee,0xc2,0x60,0xbc,0x59,0xbe, +0x3f,0x63,0x06,0x8d,0xc9,0x11,0x1d,0x23,0x64,0x92,0xef,0x2e,0xfc,0x57,0x29, +0xa4,0xaf,0xe0,0xee,0x93,0x19,0x39,0x51,0xe4,0x44,0xb8,0x0b,0x28,0xf4,0xa8, +0x0d }; +static const BYTE signedWithCertAndCrlBareContent[] = { +0x30,0x82,0x01,0x4f,0x02,0x01,0x01,0x31,0x0e,0x30,0x0c,0x06,0x08,0x2a,0x86, +0x48,0x86,0xf7,0x0d,0x02,0x05,0x05,0x00,0x30,0x13,0x06,0x09,0x2a,0x86,0x48, +0x86,0xf7,0x0d,0x01,0x07,0x01,0xa0,0x06,0x04,0x04,0x01,0x02,0x03,0x04,0xa0, +0x7c,0x30,0x7a,0x02,0x01,0x01,0x30,0x02,0x06,0x00,0x30,0x15,0x31,0x13,0x30, +0x11,0x06,0x03,0x55,0x04,0x03,0x13,0x0a,0x4a,0x75,0x61,0x6e,0x20,0x4c,0x61, +0x6e,0x67,0x00,0x30,0x22,0x18,0x0f,0x31,0x36,0x30,0x31,0x30,0x31,0x30,0x31, +0x30,0x30,0x30,0x30,0x30,0x30,0x5a,0x18,0x0f,0x31,0x36,0x30,0x31,0x30,0x31, +0x30,0x31,0x30,0x30,0x30,0x30,0x30,0x30,0x5a,0x30,0x15,0x31,0x13,0x30,0x11, +0x06,0x03,0x55,0x04,0x03,0x13,0x0a,0x4a,0x75,0x61,0x6e,0x20,0x4c,0x61,0x6e, +0x67,0x00,0x30,0x07,0x30,0x02,0x06,0x00,0x03,0x01,0x00,0xa3,0x16,0x30,0x14, +0x30,0x12,0x06,0x03,0x55,0x1d,0x13,0x01,0x01,0xff,0x04,0x08,0x30,0x06,0x01, +0x01,0xff,0x02,0x01,0x01,0xa1,0x2e,0x30,0x2c,0x30,0x02,0x06,0x00,0x30,0x15, +0x31,0x13,0x30,0x11,0x06,0x03,0x55,0x04,0x03,0x13,0x0a,0x4a,0x75,0x61,0x6e, +0x20,0x4c,0x61,0x6e,0x67,0x00,0x18,0x0f,0x31,0x36,0x30,0x31,0x30,0x31,0x30, +0x31,0x30,0x30,0x30,0x30,0x30,0x30,0x5a,0x31,0x77,0x30,0x75,0x02,0x01,0x01, +0x30,0x1a,0x30,0x15,0x31,0x13,0x30,0x11,0x06,0x03,0x55,0x04,0x03,0x13,0x0a, +0x4a,0x75,0x61,0x6e,0x20,0x4c,0x61,0x6e,0x67,0x00,0x02,0x01,0x01,0x30,0x0c, +0x06,0x08,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x02,0x05,0x05,0x00,0x30,0x04,0x06, +0x00,0x05,0x00,0x04,0x40,0x81,0xa6,0x70,0xb3,0xef,0x59,0xd1,0x66,0xd1,0x9b, +0xc0,0x9a,0xb6,0x9a,0x5e,0x6d,0x6f,0x6d,0x0d,0x59,0xa9,0xaa,0x6e,0xe9,0x2c, +0xa0,0x1e,0xee,0xc2,0x60,0xbc,0x59,0xbe,0x3f,0x63,0x06,0x8d,0xc9,0x11,0x1d, +0x23,0x64,0x92,0xef,0x2e,0xfc,0x57,0x29,0xa4,0xaf,0xe0,0xee,0x93,0x19,0x39, +0x51,0xe4,0x44,0xb8,0x0b,0x28,0xf4,0xa8,0x0d }; +static const BYTE hashContent[] = { +0x30,0x47,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x07,0x05,0xa0,0x3a, +0x30,0x38,0x02,0x01,0x00,0x30,0x0c,0x06,0x08,0x2a,0x86,0x48,0x86,0xf7,0x0d, +0x02,0x05,0x05,0x00,0x30,0x13,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01, +0x07,0x01,0xa0,0x06,0x04,0x04,0x01,0x02,0x03,0x04,0x04,0x10,0x08,0xd6,0xc0, +0x5a,0x21,0x51,0x2a,0x79,0xa1,0xdf,0xeb,0x9d,0x2a,0x8f,0x26,0x2f }; +static const BYTE hashBareContent[] = { +0x30,0x38,0x02,0x01,0x00,0x30,0x0c,0x06,0x08,0x2a,0x86,0x48,0x86,0xf7,0x0d, +0x02,0x05,0x05,0x00,0x30,0x13,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01, +0x07,0x01,0xa0,0x06,0x04,0x04,0x01,0x02,0x03,0x04,0x04,0x10,0x08,0xd6,0xc0, +0x5a,0x21,0x51,0x2a,0x79,0xa1,0xdf,0xeb,0x9d,0x2a,0x8f,0x26,0x2f }; + +static void testMessageStore(void) +{ + HCERTSTORE store; + HCRYPTMSG msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, 0, 0, NULL, + NULL); + CRYPT_DATA_BLOB blob = { sizeof(signedWithCertAndCrlBareContent), + (LPBYTE)signedWithCertAndCrlBareContent }; + DWORD count, size; + BOOL ret; + + /* Crashes + store = CertOpenStore(CERT_STORE_PROV_MSG, 0, 0, 0, NULL); + */ + SetLastError(0xdeadbeef); + store = CertOpenStore(CERT_STORE_PROV_MSG, 0, 0, 0, msg); + todo_wine + ok(!store && GetLastError() == CRYPT_E_INVALID_MSG_TYPE, + "Expected CRYPT_E_INVALID_MSG_TYPE, got %08x\n", GetLastError()); + CryptMsgUpdate(msg, signedContent, sizeof(signedContent), TRUE); + store = CertOpenStore(CERT_STORE_PROV_MSG, 0, 0, 0, msg); + todo_wine + ok(store != NULL, "CertOpenStore failed: %08x\n", GetLastError()); + if (store) + { + PCCERT_CONTEXT cert = NULL; + PCCRL_CONTEXT crl = NULL; + + count = 0; + do { + cert = CertEnumCertificatesInStore(store, cert); + if (cert) + count++; + } while (cert); + ok(count == 0, "Expected 0 certificates, got %d\n", count); + + count = 0; + do { + crl = CertEnumCRLsInStore(store, crl); + if (crl) + count++; + } while (crl); + ok(count == 0, "Expected 0 CRLs, got %d\n", count); + + /* Can add certs to a message store */ + ret = CertAddEncodedCertificateToStore(store, X509_ASN_ENCODING, + bigCert, sizeof(bigCert), CERT_STORE_ADD_ALWAYS, NULL); + ok(ret, "CertAddEncodedCertificateToStore failed: %08x\n", + GetLastError()); + count = 0; + do { + cert = CertEnumCertificatesInStore(store, cert); + if (cert) + count++; + } while (cert); + ok(count == 1, "Expected 1 certificate, got %d\n", count); + + CertCloseStore(store, 0); + } + /* but the added certs weren't actually added to the message */ + size = sizeof(count); + ret = CryptMsgGetParam(msg, CMSG_CERT_COUNT_PARAM, 0, &count, &size); + ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); + ok(count == 0, "Expected 0 certificates, got %d\n", count); + CryptMsgClose(msg); + + /* Crashes + store = CertOpenStore(CERT_STORE_PROV_PKCS7, 0, 0, 0, NULL); + */ + store = CertOpenStore(CERT_STORE_PROV_PKCS7, 0, 0, 0, &blob); + todo_wine + ok(store != NULL, "CertOpenStore failed: %08x\n", GetLastError()); + if (store) + { + DWORD count = 0; + PCCERT_CONTEXT cert = NULL; + PCCRL_CONTEXT crl = NULL; + + do { + cert = CertEnumCertificatesInStore(store, cert); + if (cert) + count++; + } while (cert); + ok(count == 1, "Expected 1 certificate, got %d\n", count); + + count = 0; + do { + crl = CertEnumCRLsInStore(store, crl); + if (crl) + count++; + } while (crl); + ok(count == 1, "Expected 1 CRL, got %d\n", count); + CertCloseStore(store, 0); + } + /* Encoding appears to be ignored */ + store = CertOpenStore(CERT_STORE_PROV_PKCS7, X509_ASN_ENCODING, 0, 0, + &blob); + todo_wine + ok(store != NULL, "CertOpenStore failed: %08x\n", GetLastError()); + if (store) + CertCloseStore(store, 0); + /* Messages other than signed messages aren't allowed */ + blob.cbData = sizeof(hashContent); + blob.pbData = (LPBYTE)hashContent; + SetLastError(0xdeadbeef); + store = CertOpenStore(CERT_STORE_PROV_PKCS7, 0, 0, 0, &blob); + todo_wine + ok(!store && GetLastError() == CRYPT_E_INVALID_MSG_TYPE, + "Expected CRYPT_E_INVALID_MSG_TYPE, got %08x\n", GetLastError()); + blob.cbData = sizeof(hashBareContent); + blob.pbData = (LPBYTE)hashBareContent; + SetLastError(0xdeadbeef); + store = CertOpenStore(CERT_STORE_PROV_PKCS7, 0, 0, 0, &blob); + todo_wine + ok(!store && GetLastError() == CRYPT_E_ASN1_BADTAG, + "Expected CRYPT_E_ASN1_BADTAG, got %08x\n", GetLastError()); +} + static void testCertOpenSystemStore(void) { HCERTSTORE store; @@ -1637,6 +1804,7 @@ START_TEST(store) testSystemStore(); testFileStore(); testFileNameStore(); + testMessageStore(); testCertOpenSystemStore(); testCertEnumSystemStore();

1 0