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

Stefan Dösinger : wined3d: Non-primary stateblocks also hold an internal reference to buffers.
by Alexandre Julliard 27 Aug '07

27 Aug '07

Module: wine Branch: master Commit: d170aabe2087c969dd7f2711c10810bf4895481b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d170aabe2087c969dd7f2711c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Aug 19 20:40:44 2007 +0200 wined3d: Non-primary stateblocks also hold an internal reference to buffers. --- dlls/wined3d/device.c | 21 +++++++++++++++++++++ dlls/wined3d/stateblock.c | 32 ++++++++++++++++++++++++-------- 2 files changed, 45 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 2b2dac5..6b53729 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -514,6 +514,12 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateStateBlock(IWineD3DDevice* iface, } } + for(i = 0; i < MAX_STREAMS; i++) { + if(object->streamSource[i]) { + IWineD3DVertexBuffer_AddRef(object->streamSource[i]); + } + } + } else if (Type == WINED3DSBT_PIXELSTATE) { TRACE("PIXELSTATE => Pretend all pixel shates have changed\n"); @@ -560,6 +566,13 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateStateBlock(IWineD3DDevice* iface, } } + /* Pixel state blocks do not contain vertex buffers. Set them to NULL to avoid wrong refcounting + * on them. This makes releasing the buffer easier + */ + for(i = 0; i < MAX_STREAMS; i++) { + object->streamSource[i] = NULL; + } + } else if (Type == WINED3DSBT_VERTEXSTATE) { TRACE("VERTEXSTATE => Pretend all vertex shates have changed\n"); @@ -613,6 +626,12 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateStateBlock(IWineD3DDevice* iface, light->enabledChanged = TRUE; } } + + for(i = 0; i < MAX_STREAMS; i++) { + if(object->streamSource[i]) { + IWineD3DVertexBuffer_AddRef(object->streamSource[i]); + } + } } else { FIXME("Unrecognized state block type %d\n", Type); } @@ -2237,6 +2256,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetStreamSource(IWineD3DDevice *iface, /* Handle recording of state blocks */ if (This->isRecordingState) { TRACE("Recording... not performing anything\n"); + if(pStreamData) IWineD3DVertexBuffer_AddRef(pStreamData); + if(oldSrc) IWineD3DVertexBuffer_Release(oldSrc); return WINED3D_OK; } diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index dfe62c9..0362053 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -262,15 +262,15 @@ static ULONG WINAPI IWineD3DStateBlockImpl_Release(IWineD3DStateBlock *iface) { } } } - for (counter = 0; counter < MAX_STREAMS; counter++) { - if(This->streamSource[counter]) { - if(0 != IWineD3DVertexBuffer_Release(This->streamSource[counter])) { - TRACE("Vertex buffer still referenced by stateblock, applications has leaked Stream %u, buffer %p\n", counter, This->streamSource[counter]); - } - } - } if(This->pIndexData) IWineD3DIndexBuffer_Release(This->pIndexData); + } + for (counter = 0; counter < MAX_STREAMS; counter++) { + if(This->streamSource[counter]) { + if(0 != IWineD3DVertexBuffer_Release(This->streamSource[counter])) { + TRACE("Vertex buffer still referenced by stateblock, applications has leaked Stream %u, buffer %p\n", counter, This->streamSource[counter]); + } + } } for(counter = 0; counter < LIGHTMAP_SIZE; counter++) { @@ -532,6 +532,8 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_Capture(IWineD3DStateBlock *iface) TRACE("Updating stream source %d to %p, stride to %d\n", i, targetStateBlock->streamSource[i], targetStateBlock->streamStride[i]); This->streamStride[i] = targetStateBlock->streamStride[i]; + if(targetStateBlock->streamSource[i]) IWineD3DVertexBuffer_AddRef(targetStateBlock->streamSource[i]); + if(This->streamSource[i]) IWineD3DVertexBuffer_Release(This->streamSource[i]); This->streamSource[i] = targetStateBlock->streamSource[i]; } @@ -600,7 +602,6 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_Capture(IWineD3DStateBlock *iface) memcpy(This->vertexShaderConstantF, targetStateBlock->vertexShaderConstantF, sizeof(float) * GL_LIMITS(vshader_constantsF) * 4); memcpy(This->streamStride, targetStateBlock->streamStride, sizeof(This->streamStride)); memcpy(This->streamOffset, targetStateBlock->streamOffset, sizeof(This->streamOffset)); - memcpy(This->streamSource, targetStateBlock->streamSource, sizeof(This->streamSource)); memcpy(This->streamFreq, targetStateBlock->streamFreq, sizeof(This->streamFreq)); memcpy(This->streamFlags, targetStateBlock->streamFlags, sizeof(This->streamFlags)); This->pIndexData = targetStateBlock->pIndexData; @@ -621,6 +622,14 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_Capture(IWineD3DStateBlock *iface) memcpy(This->textureState, targetStateBlock->textureState, sizeof(This->textureState)); memcpy(This->samplerState, targetStateBlock->samplerState, sizeof(This->samplerState)); This->scissorRect = targetStateBlock->scissorRect; + + for(i = 0; i < MAX_STREAMS; i++) { + if(targetStateBlock->streamSource[i] != This->streamSource[i]) { + if(targetStateBlock->streamSource[i]) IWineD3DVertexBuffer_AddRef(targetStateBlock->streamSource[i]); + if(This->streamSource[i]) IWineD3DVertexBuffer_Release(This->streamSource[i]); + This->streamSource[i] = targetStateBlock->streamSource[i]; + } + } } else if(This->blockType == WINED3DSBT_VERTEXSTATE) { This->vertexShader = targetStateBlock->vertexShader; memcpy(This->vertexShaderConstantB, targetStateBlock->vertexShaderConstantB, sizeof(This->vertexShaderConstantI)); @@ -640,6 +649,13 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_Capture(IWineD3DStateBlock *iface) This->textureState[j][SavedVertexStates_R[i]] = targetStateBlock->textureState[j][SavedVertexStates_R[i]]; } } + for(i = 0; i < MAX_STREAMS; i++) { + if(targetStateBlock->streamSource[i] != This->streamSource[i]) { + if(targetStateBlock->streamSource[i]) IWineD3DVertexBuffer_AddRef(targetStateBlock->streamSource[i]); + if(This->streamSource[i]) IWineD3DVertexBuffer_Release(This->streamSource[i]); + This->streamSource[i] = targetStateBlock->streamSource[i]; + } + } } else if(This->blockType == WINED3DSBT_PIXELSTATE) { This->pixelShader = targetStateBlock->pixelShader; memcpy(This->pixelShaderConstantB, targetStateBlock->pixelShaderConstantB, sizeof(This->pixelShaderConstantI));

1 0

Maarten Lankhorst : winealsa: Update sound caps.
by Alexandre Julliard 27 Aug '07

27 Aug '07

Module: wine Branch: master Commit: a083c2419d3044fb09a0a0a95dc30320254deb0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a083c2419d3044fb09a0a0a95… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sat Aug 25 12:28:57 2007 +0200 winealsa: Update sound caps. --- dlls/winealsa.drv/waveinit.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/winealsa.drv/waveinit.c b/dlls/winealsa.drv/waveinit.c index 0de1335..dae6ab4 100644 --- a/dlls/winealsa.drv/waveinit.c +++ b/dlls/winealsa.drv/waveinit.c @@ -325,6 +325,10 @@ static int ALSA_ComputeCaps(snd_ctl_t *ctl, snd_pcm_t *pcm, } } + *flags = DSCAPS_CERTIFIED | DSCAPS_CONTINUOUSRATE; + *flags |= DSCAPS_SECONDARYMONO | DSCAPS_SECONDARYSTEREO; + *flags |= DSCAPS_SECONDARY8BIT | DSCAPS_SECONDARY16BIT; + if (*formats & (WAVE_FORMAT_1M08 | WAVE_FORMAT_2M08 | WAVE_FORMAT_4M08 | WAVE_FORMAT_48M08 | WAVE_FORMAT_96M08 | WAVE_FORMAT_1M16 |

1 0

Maarten Lankhorst : wineoss: Update sound caps.
by Alexandre Julliard 27 Aug '07

27 Aug '07

Module: wine Branch: master Commit: b93cb5f3fa60d1e40d57b8a0ca42f7f87db8e26a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b93cb5f3fa60d1e40d57b8a0c… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sat Aug 25 12:29:12 2007 +0200 wineoss: Update sound caps. --- dlls/wineoss.drv/audio.c | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/wineoss.drv/audio.c b/dlls/wineoss.drv/audio.c index 4deee4b..f3360cf 100644 --- a/dlls/wineoss.drv/audio.c +++ b/dlls/wineoss.drv/audio.c @@ -774,6 +774,12 @@ static BOOL OSS_WaveOutInit(OSS_DEVICE* ossdev) /* direct sound caps */ ossdev->ds_caps.dwFlags = DSCAPS_CERTIFIED; + ossdev->ds_caps.dwFlags |= DSCAPS_SECONDARY8BIT; + ossdev->ds_caps.dwFlags |= DSCAPS_SECONDARY16BIT; + ossdev->ds_caps.dwFlags |= DSCAPS_SECONDARYMONO; + ossdev->ds_caps.dwFlags |= DSCAPS_SECONDARYSTEREO; + ossdev->ds_caps.dwFlags |= DSCAPS_CONTINUOUSRATE; + ossdev->ds_caps.dwPrimaryBuffers = 1; ossdev->ds_caps.dwMinSecondarySampleRate = DSBFREQUENCY_MIN; ossdev->ds_caps.dwMaxSecondarySampleRate = DSBFREQUENCY_MAX; @@ -845,14 +851,6 @@ static BOOL OSS_WaveOutInit(OSS_DEVICE* ossdev) if ((arg & DSP_CAP_MULTI) && (ossdev->out_caps.dwSupport & WAVECAPS_DIRECTSOUND)) { TRACE("hardware secondary buffer support available\n"); - if (ossdev->ds_caps.dwFlags & DSCAPS_PRIMARY8BIT) - ossdev->ds_caps.dwFlags |= DSCAPS_SECONDARY8BIT; - if (ossdev->ds_caps.dwFlags & DSCAPS_PRIMARY16BIT) - ossdev->ds_caps.dwFlags |= DSCAPS_SECONDARY16BIT; - if (ossdev->ds_caps.dwFlags & DSCAPS_PRIMARYMONO) - ossdev->ds_caps.dwFlags |= DSCAPS_SECONDARYMONO; - if (ossdev->ds_caps.dwFlags & DSCAPS_PRIMARYSTEREO) - ossdev->ds_caps.dwFlags |= DSCAPS_SECONDARYSTEREO; ossdev->ds_caps.dwMaxHwMixingAllBuffers = 16; ossdev->ds_caps.dwMaxHwMixingStaticBuffers = 0;

1 0

Juan Lang : wintrust: Test and correct alloc and free functions in WintrustLoadFunctionPointers.
by Alexandre Julliard 27 Aug '07

27 Aug '07

Module: wine Branch: master Commit: e8cc4db1c75694ea3f887cea46ff0e53a1a2eb13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8cc4db1c75694ea3f887cea4… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Aug 24 15:07:41 2007 -0700 wintrust: Test and correct alloc and free functions in WintrustLoadFunctionPointers. --- dlls/wintrust/register.c | 14 ++++++++++++-- dlls/wintrust/tests/register.c | 2 ++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/wintrust/register.c b/dlls/wintrust/register.c index d16b186..517359f 100644 --- a/dlls/wintrust/register.c +++ b/dlls/wintrust/register.c @@ -812,6 +812,16 @@ error_close_key: return Func; } +static void * WINAPI WINTRUST_Alloc(DWORD cb) +{ + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, cb); +} + +static void WINAPI WINTRUST_Free(void *p) +{ + HeapFree(GetProcessHeap(), 0, p); +} + /*********************************************************************** * WintrustLoadFunctionPointers (WINTRUST.@) */ @@ -834,8 +844,8 @@ BOOL WINAPI WintrustLoadFunctionPointers( GUID* pgActionID, WINTRUST_Guid2Wstr( pgActionID, GuidString); /* Get the function pointers from the registry, where applicable */ - pPfns->pfnAlloc = NULL; - pPfns->pfnFree = NULL; + pPfns->pfnAlloc = WINTRUST_Alloc; + pPfns->pfnFree = WINTRUST_Free; pPfns->pfnAddStore2Chain = NULL; pPfns->pfnAddSgnr2Chain = NULL; pPfns->pfnAddCert2Chain = NULL; diff --git a/dlls/wintrust/tests/register.c b/dlls/wintrust/tests/register.c index 6e6ed20..f4aef92 100644 --- a/dlls/wintrust/tests/register.c +++ b/dlls/wintrust/tests/register.c @@ -284,6 +284,8 @@ static void test_LoadFunctionPointers(void) funcs.cbStruct = sizeof(funcs); ret = pWintrustLoadFunctionPointers(&action, &funcs); ok(ret, "WintrustLoadFunctionPointers failed: %d\n", GetLastError()); + ok(funcs.pfnAlloc != NULL, "Expected a pointer\n"); + ok(funcs.pfnFree != NULL, "Expected a pointer\n"); } static void test_RegPolicyFlags(void)

1 0

Stefan Dösinger : wined3d: Disable specular color when blitting.
by Alexandre Julliard 27 Aug '07

27 Aug '07

Module: wine Branch: master Commit: 6857fc6b61567b51da158f98d18c09d56c78c31d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6857fc6b61567b51da158f98d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Aug 14 16:32:35 2007 +0200 wined3d: Disable specular color when blitting. --- dlls/wined3d/context.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index ab1d91c..6dce228 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -588,6 +588,16 @@ static inline void SetupForBlit(IWineD3DDeviceImpl *This, WineD3DContext *contex glColorMask(GL_TRUE, GL_TRUE,GL_TRUE,GL_TRUE); checkGLcall("glColorMask"); Context_MarkStateDirty(context, STATE_RENDER(WINED3DRS_CLIPPING)); + if (GL_SUPPORT(EXT_SECONDARY_COLOR)) { + glDisable(GL_COLOR_SUM_EXT); + Context_MarkStateDirty(context, STATE_RENDER(WINED3DRS_SPECULARENABLE)); + checkGLcall("glDisable(GL_COLOR_SUM_EXT)"); + } + if (GL_SUPPORT(NV_REGISTER_COMBINERS)) { + GL_EXTCALL(glFinalCombinerInputNV(GL_VARIABLE_B_NV, GL_SPARE0_NV, GL_UNSIGNED_IDENTITY_NV, GL_RGB)); + Context_MarkStateDirty(context, STATE_RENDER(WINED3DRS_SPECULARENABLE)); + checkGLcall("glFinalCombinerInputNV"); + } /* Setup transforms */ glMatrixMode(GL_MODELVIEW);

1 0

Stefan Dösinger : d3d9: Return the correct return value in GetDepthStencilSurface.
by Alexandre Julliard 27 Aug '07

27 Aug '07

Module: wine Branch: master Commit: cc563b9c6965714f196388a80b7e9cc7ee4c519e URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc563b9c6965714f196388a80… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Aug 14 20:23:52 2007 +0200 d3d9: Return the correct return value in GetDepthStencilSurface. --- dlls/d3d9/device.c | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index aa65c7e..d48587f 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -593,16 +593,19 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetDepthStencilSurface(LPDIRECT3DDE } EnterCriticalSection(&d3d9_cs); - hr=IWineD3DDevice_GetDepthStencilSurface(This->WineD3DDevice,&pZStencilSurface); - if(hr == D3D_OK && pZStencilSurface != NULL){ - IWineD3DSurface_GetParent(pZStencilSurface,(IUnknown**)ppZStencilSurface); - IWineD3DSurface_Release(pZStencilSurface); - }else{ - FIXME("Call to IWineD3DDevice_GetRenderTarget failed\n"); - *ppZStencilSurface = NULL; + hr = IWineD3DDevice_GetDepthStencilSurface(This->WineD3DDevice,&pZStencilSurface); + if(hr == D3D_OK) { + if(pZStencilSurface != NULL){ + IWineD3DSurface_GetParent(pZStencilSurface,(IUnknown**)ppZStencilSurface); + IWineD3DSurface_Release(pZStencilSurface); + } else { + *ppZStencilSurface = NULL; + } + } else { + WARN("Call to IWineD3DDevice_GetDepthStencilSurface failed\n"); } LeaveCriticalSection(&d3d9_cs); - return D3D_OK; + return hr; } static HRESULT WINAPI IDirect3DDevice9Impl_BeginScene(LPDIRECT3DDEVICE9 iface) {

1 0

Juan Lang : crypt32: Partially implement CMSG_CTRL_VERIFY_SIGNATURE_EX.
by Alexandre Julliard 27 Aug '07

27 Aug '07

Module: wine Branch: master Commit: ff26d428e3e59ed4e8e1a04411ed692c47254cb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff26d428e3e59ed4e8e1a0441… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Aug 24 15:20:13 2007 -0700 crypt32: Partially implement CMSG_CTRL_VERIFY_SIGNATURE_EX. --- dlls/crypt32/msg.c | 101 +++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 77 insertions(+), 24 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 7cf1a30..4e608bc 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -2087,6 +2087,38 @@ static BOOL CDecodeHashMsg_VerifyHash(CDecodeMsg *msg) return ret; } +static BOOL CDecodeSignedMsg_VerifySignatureWithKey(CDecodeMsg *msg, + HCRYPTPROV prov, DWORD signerIndex, PCERT_PUBLIC_KEY_INFO keyInfo) +{ + HCRYPTKEY key; + BOOL ret; + + if (!prov) + prov = msg->crypt_prov; + ret = CryptImportPublicKeyInfo(prov, X509_ASN_ENCODING, keyInfo, &key); + if (ret) + { + HCRYPTHASH hash; + CRYPT_HASH_BLOB reversedHash; + + if (msg->u.signed_data.info->rgSignerInfo[signerIndex].AuthAttrs.cAttr) + hash = msg->u.signed_data.signerHandles[signerIndex].authAttrHash; + else + hash = msg->u.signed_data.signerHandles[signerIndex].contentHash; + ret = CRYPT_ConstructBlob(&reversedHash, + &msg->u.signed_data.info->rgSignerInfo[signerIndex].EncryptedHash); + if (ret) + { + CRYPT_ReverseBytes(&reversedHash); + ret = CryptVerifySignatureW(hash, reversedHash.pbData, + reversedHash.cbData, key, NULL, 0); + CryptMemFree(reversedHash.pbData); + } + CryptDestroyKey(key); + } + return ret; +} + static BOOL CDecodeSignedMsg_VerifySignature(CDecodeMsg *msg, PCERT_INFO info) { BOOL ret = FALSE; @@ -2106,35 +2138,45 @@ static BOOL CDecodeSignedMsg_VerifySignature(CDecodeMsg *msg, PCERT_INFO info) } } if (ret) - { - HCRYPTKEY key; + ret = CDecodeSignedMsg_VerifySignatureWithKey(msg, 0, i, + &info->SubjectPublicKeyInfo); + else + SetLastError(CRYPT_E_SIGNER_NOT_FOUND); - ret = CryptImportPublicKeyInfo(msg->crypt_prov, X509_ASN_ENCODING, - &info->SubjectPublicKeyInfo, &key); - if (ret) + return ret; +} + +static BOOL CDecodeSignedMsg_VerifySignatureEx(CDecodeMsg *msg, + PCMSG_CTRL_VERIFY_SIGNATURE_EX_PARA para) +{ + BOOL ret = FALSE; + + if (para->cbSize != sizeof(CMSG_CTRL_VERIFY_SIGNATURE_EX_PARA)) + SetLastError(ERROR_INVALID_PARAMETER); + else if (para->dwSignerIndex >= msg->u.signed_data.info->cSignerInfo) + SetLastError(CRYPT_E_SIGNER_NOT_FOUND); + else + { + switch (para->dwSignerType) + { + case CMSG_VERIFY_SIGNER_PUBKEY: + ret = CDecodeSignedMsg_VerifySignatureWithKey(msg, + para->hCryptProv, para->dwSignerIndex, + (PCERT_PUBLIC_KEY_INFO)para->pvSigner); + break; + case CMSG_VERIFY_SIGNER_CERT: { - HCRYPTHASH hash; - CRYPT_HASH_BLOB reversedHash; + PCCERT_CONTEXT cert = (PCCERT_CONTEXT)para->pvSigner; - if (msg->u.signed_data.info->rgSignerInfo[i].AuthAttrs.cAttr) - hash = msg->u.signed_data.signerHandles[i].authAttrHash; - else - hash = msg->u.signed_data.signerHandles[i].contentHash; - ret = CRYPT_ConstructBlob(&reversedHash, - &msg->u.signed_data.info->rgSignerInfo[i].EncryptedHash); - if (ret) - { - CRYPT_ReverseBytes(&reversedHash); - ret = CryptVerifySignatureW(hash, reversedHash.pbData, - reversedHash.cbData, key, NULL, 0); - CryptMemFree(reversedHash.pbData); - } - CryptDestroyKey(key); + ret = CDecodeSignedMsg_VerifySignatureWithKey(msg, para->hCryptProv, + para->dwSignerIndex, &cert->pCertInfo->SubjectPublicKeyInfo); + break; + } + default: + FIXME("unimplemented for signer type %d\n", para->dwSignerType); + SetLastError(CRYPT_E_SIGNER_NOT_FOUND); } } - else - SetLastError(CRYPT_E_SIGNER_NOT_FOUND); - return ret; } @@ -2173,6 +2215,17 @@ static BOOL CDecodeMsg_Control(HCRYPTMSG hCryptMsg, DWORD dwFlags, SetLastError(CRYPT_E_INVALID_MSG_TYPE); } break; + case CMSG_CTRL_VERIFY_SIGNATURE_EX: + switch (msg->type) + { + case CMSG_SIGNED: + ret = CDecodeSignedMsg_VerifySignatureEx(msg, + (PCMSG_CTRL_VERIFY_SIGNATURE_EX_PARA)pvCtrlPara); + break; + default: + SetLastError(CRYPT_E_INVALID_MSG_TYPE); + } + break; default: SetLastError(CRYPT_E_CONTROL_TYPE); }

1 0

Stefan Leichter : msi: Remove 'recursive registry key delete' function.
by Alexandre Julliard 27 Aug '07

27 Aug '07

Module: wine Branch: master Commit: e96695a652de268530cbaa7d17e90362130bf9e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e96695a652de268530cbaa7d1… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Fri Aug 24 20:05:24 2007 +0200 msi: Remove 'recursive registry key delete' function. --- dlls/msi/regsvr.c | 76 +++++----------------------------------------------- 1 files changed, 8 insertions(+), 68 deletions(-) diff --git a/dlls/msi/regsvr.c b/dlls/msi/regsvr.c index 6aa73d1..df8955a 100644 --- a/dlls/msi/regsvr.c +++ b/dlls/msi/regsvr.c @@ -135,9 +135,6 @@ static LONG register_key_defvalueA(HKEY base, WCHAR const *name, static LONG register_progid(WCHAR const *clsid, char const *progid, char const *curver_progid, char const *name, char const *extra); -static LONG recursive_delete_key(HKEY key); -static LONG recursive_delete_keyA(HKEY base, char const *name); -static LONG recursive_delete_keyW(HKEY base, WCHAR const *name); /*********************************************************************** * register_interfaces @@ -224,7 +221,8 @@ static HRESULT unregister_interfaces(struct regsvr_interface const *list) { WCHAR buf[39]; StringFromGUID2(list->iid, buf, 39); - res = recursive_delete_keyW(interface_key, buf); + res = RegDeleteTreeW(interface_key, buf); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; } RegCloseKey(interface_key); @@ -346,16 +344,19 @@ static HRESULT unregister_coclasses(struct regsvr_coclass const *list) { WCHAR buf[39]; StringFromGUID2(list->clsid, buf, 39); - res = recursive_delete_keyW(coclass_key, buf); + res = RegDeleteTreeW(coclass_key, buf); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; if (list->progid) { - res = recursive_delete_keyA(HKEY_CLASSES_ROOT, list->progid); + res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->progid); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; } if (list->viprogid) { - res = recursive_delete_keyA(HKEY_CLASSES_ROOT, list->viprogid); + res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->viprogid); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; } } @@ -464,67 +465,6 @@ error_close_progid_key: } /*********************************************************************** - * recursive_delete_key - */ -static LONG recursive_delete_key(HKEY key) { - LONG res; - WCHAR subkey_name[MAX_PATH]; - DWORD cName; - HKEY subkey; - - for (;;) { - cName = sizeof(subkey_name) / sizeof(WCHAR); - res = RegEnumKeyExW(key, 0, subkey_name, &cName, - NULL, NULL, NULL, NULL); - if (res != ERROR_SUCCESS && res != ERROR_MORE_DATA) { - res = ERROR_SUCCESS; /* presumably we're done enumerating */ - break; - } - res = RegOpenKeyExW(key, subkey_name, 0, - KEY_READ | KEY_WRITE, &subkey); - if (res == ERROR_FILE_NOT_FOUND) continue; - if (res != ERROR_SUCCESS) break; - - res = recursive_delete_key(subkey); - RegCloseKey(subkey); - if (res != ERROR_SUCCESS) break; - } - - if (res == ERROR_SUCCESS) res = RegDeleteKeyW(key, 0); - return res; -} - -/*********************************************************************** - * recursive_delete_keyA - */ -static LONG recursive_delete_keyA(HKEY base, char const *name) { - LONG res; - HKEY key; - - res = RegOpenKeyExA(base, name, 0, KEY_READ | KEY_WRITE, &key); - if (res == ERROR_FILE_NOT_FOUND) return ERROR_SUCCESS; - if (res != ERROR_SUCCESS) return res; - res = recursive_delete_key(key); - RegCloseKey(key); - return res; -} - -/*********************************************************************** - * recursive_delete_keyW - */ -static LONG recursive_delete_keyW(HKEY base, WCHAR const *name) { - LONG res; - HKEY key; - - res = RegOpenKeyExW(base, name, 0, KEY_READ | KEY_WRITE, &key); - if (res == ERROR_FILE_NOT_FOUND) return ERROR_SUCCESS; - if (res != ERROR_SUCCESS) return res; - res = recursive_delete_key(key); - RegCloseKey(key); - return res; -} - -/*********************************************************************** * coclass list */ static struct regsvr_coclass const coclass_list[] = {

1 0

Roderick Colenbrander : wined3d: Add Geforce8 device ids.
by Alexandre Julliard 27 Aug '07

27 Aug '07

Module: wine Branch: master Commit: 925e8964f17244783e5d8e9f2fdcf56891b18d7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=925e8964f17244783e5d8e9f2… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Fri Aug 24 21:17:57 2007 +0200 wined3d: Add Geforce8 device ids. --- include/wine/wined3d_gl.h | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/include/wine/wined3d_gl.h b/include/wine/wined3d_gl.h index 7348b83..e98049c 100644 --- a/include/wine/wined3d_gl.h +++ b/include/wine/wined3d_gl.h @@ -3067,6 +3067,9 @@ typedef enum _GL_Cards { CARD_NVIDIA_GEFORCE_6600GT = 0x0140, CARD_NVIDIA_GEFORCE_6800 = 0x0041, CARD_NVIDIA_GEFORCE_7800GT = 0x0092, + CARD_NVIDIA_GEFORCE_8300GS = 0x0423, + CARD_NVIDIA_GEFORCE_8600GT = 0x0402, + CARD_NVIDIA_GEFORCE_8800GTS = 0x0193, CARD_INTEL_845G = 0x2562, CARD_INTEL_I830G = 0x3577,

1 0

Roderick Colenbrander : wined3d: Override backbufferformat in window mode.
by Alexandre Julliard 27 Aug '07

27 Aug '07

Module: wine Branch: master Commit: 308408151966ba92756b70faec1da302647e4d13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=308408151966ba92756b70fae… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Fri Aug 24 23:44:00 2007 +0200 wined3d: Override backbufferformat in window mode. --- dlls/wined3d/device.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 60f310a..425ffe2 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1336,6 +1336,10 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateAdditionalSwapChain(IWineD3DDevic pPresentationParameters->BackBufferHeight = Rect.bottom; TRACE("Updating height to %d\n", pPresentationParameters->BackBufferHeight); } + if (pPresentationParameters->BackBufferFormat == WINED3DFMT_UNKNOWN) { + pPresentationParameters->BackBufferFormat = object->orig_fmt; + TRACE("Updating format to %s\n", debug_d3dformat(object->orig_fmt)); + } } /* Put the correct figures in the presentation parameters */

1 0