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

Juan Lang : crypt32: Add missing break.
by Alexandre Julliard 14 Aug '07

14 Aug '07

Module: wine Branch: master Commit: d49c9d59d1770cd773752277fd874afb47b2c7ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=d49c9d59d1770cd773752277f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Aug 13 14:30:29 2007 -0700 crypt32: Add missing break. --- dlls/crypt32/cert.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index e2c0fc2..ebcf526 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -972,6 +972,7 @@ static BOOL compare_cert_by_cert_id(PCCERT_CONTEXT pCertContext, DWORD dwType, } else ret = FALSE; + break; } default: ret = FALSE;

1 0

Juan Lang : crypt32: Avoid a memory allocation when decoding the subject key identifier extension .
by Alexandre Julliard 14 Aug '07

14 Aug '07

Module: wine Branch: master Commit: f7bcc26cc5f90c9fd58b064247029db8af64a104 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7bcc26cc5f90c9fd58b06424… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Aug 13 14:31:02 2007 -0700 crypt32: Avoid a memory allocation when decoding the subject key identifier extension. --- dlls/crypt32/cert.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index ebcf526..d67278d 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -250,19 +250,18 @@ static BOOL WINAPI CertContext_GetProperty(void *context, DWORD dwPropId, if (ext) { - CRYPT_DATA_BLOB *value; + CRYPT_DATA_BLOB value; DWORD size; ret = CryptDecodeObjectEx(X509_ASN_ENCODING, szOID_SUBJECT_KEY_IDENTIFIER, ext->Value.pbData, - ext->Value.cbData, CRYPT_DECODE_ALLOC_FLAG, NULL, &value, + ext->Value.cbData, CRYPT_DECODE_NOCOPY_FLAG, NULL, &value, &size); if (ret) { - ret = CertContext_CopyParam(pvData, pcbData, value->pbData, - value->cbData); - CertContext_SetProperty(context, dwPropId, 0, value); - LocalFree(value); + ret = CertContext_CopyParam(pvData, pcbData, value.pbData, + value.cbData); + CertContext_SetProperty(context, dwPropId, 0, &value); } } else

1 0

Stefan Dösinger : wined3d: Do not copy the saved states structure into the primary stateblock.
by Alexandre Julliard 14 Aug '07

14 Aug '07

Module: wine Branch: master Commit: 274f77d4975cee990ba94f7c1fbf60defe3ab7ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=274f77d4975cee990ba94f7c1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jul 31 17:14:18 2007 +0200 wined3d: Do not copy the saved states structure into the primary stateblock. --- dlls/wined3d/stateblock.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 0c0965b..5b98ff7 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -807,7 +807,6 @@ should really perform a delta so that only the changes get updated*/ This->renderState[This->contained_render_states[i]]); } - stateblock_savedstates_copy(iface, &((IWineD3DDeviceImpl*)pDevice)->stateBlock->changed, &This->changed); ((IWineD3DDeviceImpl *)pDevice)->stateBlock->lowest_disabled_stage = MAX_TEXTURES - 1; for(j = 0; j < MAX_TEXTURES - 1; j++) { if(((IWineD3DDeviceImpl *)pDevice)->stateBlock->textureState[j][WINED3DTSS_COLOROP] == WINED3DTOP_DISABLE) {

1 0

Stefan Dösinger : wined3d: Optimize bool and int vs constants.
by Alexandre Julliard 14 Aug '07

14 Aug '07

Module: wine Branch: master Commit: 4673b1c68ec089efbd97a465043974102c8e1325 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4673b1c68ec089efbd97a4650… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Aug 3 20:07:30 2007 +0200 wined3d: Optimize bool and int vs constants. --- dlls/wined3d/device.c | 31 ++++++++++++++++++++-- dlls/wined3d/stateblock.c | 54 +++++++++++++++++++-------------------- dlls/wined3d/wined3d_private.h | 4 +++ 3 files changed, 58 insertions(+), 31 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 8522dac..e4fdeb9 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -474,6 +474,14 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateStateBlock(IWineD3DDevice* iface, object->contained_transform_states[j - 1] = j; } object->num_contained_transform_states = HIGHEST_TRANSFORMSTATE; + for(j = 0; j < MAX_CONST_I; j++) { + object->contained_vs_consts_i[j] = j; + } + object->num_contained_vs_consts_i = MAX_CONST_I; + for(j = 0; j < MAX_CONST_B; j++) { + object->contained_vs_consts_b[j] = j; + } + object->num_contained_vs_consts_b = MAX_CONST_B; } else if (Type == WINED3DSBT_PIXELSTATE) { @@ -517,11 +525,16 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateStateBlock(IWineD3DDevice* iface, /* Vertex Shader Constants */ for (i = 0; i < GL_LIMITS(vshader_constantsF); ++i) object->changed.vertexShaderConstantsF[i] = TRUE; - for (i = 0; i < MAX_CONST_B; ++i) + for (i = 0; i < MAX_CONST_B; ++i) { object->changed.vertexShaderConstantsB[i] = TRUE; - for (i = 0; i < MAX_CONST_I; ++i) + object->contained_vs_consts_b[i] = i; + } + object->num_contained_vs_consts_b = MAX_CONST_B; + for (i = 0; i < MAX_CONST_I; ++i) { object->changed.vertexShaderConstantsI[i] = TRUE; - + object->contained_vs_consts_i[i] = i; + } + object->num_contained_vs_consts_i = MAX_CONST_I; for (i = 0; i < NUM_SAVEDVERTEXSTATES_R; i++) { object->changed.renderState[SavedVertexStates_R[i]] = TRUE; object->contained_render_states[i] = SavedVertexStates_R[i]; @@ -4334,6 +4347,18 @@ static HRESULT WINAPI IWineD3DDeviceImpl_EndStateBlock(IWineD3DDevice *iface, IW object->num_contained_transform_states++; } } + for(i = 0; i < MAX_CONST_I; i++) { + if(object->changed.vertexShaderConstantsI[i]) { + object->contained_vs_consts_i[object->num_contained_vs_consts_i] = i; + object->num_contained_vs_consts_i++; + } + } + for(i = 0; i < MAX_CONST_B; i++) { + if(object->changed.vertexShaderConstantsB[i]) { + object->contained_vs_consts_b[object->num_contained_vs_consts_b] = i; + object->num_contained_vs_consts_b++; + } + } *ppStateBlock = (IWineD3DStateBlock*) object; This->isRecordingState = FALSE; diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 5b98ff7..ba71dc3 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -363,29 +363,27 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_Capture(IWineD3DStateBlock *iface) } /* Vertex Shader Integer Constants */ - for (i = 0; i < MAX_CONST_I; ++i) { - if (This->changed.vertexShaderConstantsI[i]) { - TRACE("Setting %p from %p %d to { %d, %d, %d, %d }\n", This, targetStateBlock, i, - targetStateBlock->vertexShaderConstantI[i * 4], - targetStateBlock->vertexShaderConstantI[i * 4 + 1], - targetStateBlock->vertexShaderConstantI[i * 4 + 2], - targetStateBlock->vertexShaderConstantI[i * 4 + 3]); - - This->vertexShaderConstantI[i * 4] = targetStateBlock->vertexShaderConstantI[i * 4]; - This->vertexShaderConstantI[i * 4 + 1] = targetStateBlock->vertexShaderConstantI[i * 4 + 1]; - This->vertexShaderConstantI[i * 4 + 2] = targetStateBlock->vertexShaderConstantI[i * 4 + 2]; - This->vertexShaderConstantI[i * 4 + 3] = targetStateBlock->vertexShaderConstantI[i * 4 + 3]; - } + for (j = 0; j < This->num_contained_vs_consts_i; ++j) { + i = This->contained_vs_consts_i[j]; + TRACE("Setting %p from %p %d to { %d, %d, %d, %d }\n", This, targetStateBlock, i, + targetStateBlock->vertexShaderConstantI[i * 4], + targetStateBlock->vertexShaderConstantI[i * 4 + 1], + targetStateBlock->vertexShaderConstantI[i * 4 + 2], + targetStateBlock->vertexShaderConstantI[i * 4 + 3]); + + This->vertexShaderConstantI[i * 4] = targetStateBlock->vertexShaderConstantI[i * 4]; + This->vertexShaderConstantI[i * 4 + 1] = targetStateBlock->vertexShaderConstantI[i * 4 + 1]; + This->vertexShaderConstantI[i * 4 + 2] = targetStateBlock->vertexShaderConstantI[i * 4 + 2]; + This->vertexShaderConstantI[i * 4 + 3] = targetStateBlock->vertexShaderConstantI[i * 4 + 3]; } - + /* Vertex Shader Boolean Constants */ - for (i = 0; i < MAX_CONST_B; ++i) { - if (This->changed.vertexShaderConstantsB[i]) { - TRACE("Setting %p from %p %d to %s\n", This, targetStateBlock, i, - targetStateBlock->vertexShaderConstantB[i]? "TRUE":"FALSE"); + for (j = 0; j < This->num_contained_vs_consts_b; ++j) { + i = This->contained_vs_consts_b[j]; + TRACE("Setting %p from %p %d to %s\n", This, targetStateBlock, i, + targetStateBlock->vertexShaderConstantB[i]? "TRUE":"FALSE"); - This->vertexShaderConstantB[i] = targetStateBlock->vertexShaderConstantB[i]; - } + This->vertexShaderConstantB[i] = targetStateBlock->vertexShaderConstantB[i]; } /* Lights... For a recorded state block, we just had a chain of actions to perform, @@ -647,15 +645,15 @@ should really perform a delta so that only the changes get updated*/ if (This->changed.vertexShaderConstantsF[i]) IWineD3DDevice_SetVertexShaderConstantF(pDevice, i, This->vertexShaderConstantF + i * 4, 1); } - - for (i = 0; i < MAX_CONST_I; i++) { - if (This->changed.vertexShaderConstantsI[i]) - IWineD3DDevice_SetVertexShaderConstantI(pDevice, i, This->vertexShaderConstantI + i * 4, 1); + + for (i = 0; i < This->num_contained_vs_consts_i; i++) { + IWineD3DDevice_SetVertexShaderConstantI(pDevice, This->contained_vs_consts_i[i], + This->vertexShaderConstantI + This->contained_vs_consts_i[i] * 4, 1); } - - for (i = 0; i < MAX_CONST_B; i++) { - if (This->changed.vertexShaderConstantsB[i]) - IWineD3DDevice_SetVertexShaderConstantB(pDevice, i, This->vertexShaderConstantB + i, 1); + + for (i = 0; i < This->num_contained_vs_consts_b; i++) { + IWineD3DDevice_SetVertexShaderConstantB(pDevice, This->contained_vs_consts_b[i], + This->vertexShaderConstantB + This->contained_vs_consts_b[i], 1); } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f31e7dc..948cf2e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1371,6 +1371,10 @@ struct IWineD3DStateBlockImpl unsigned int num_contained_render_states; DWORD contained_transform_states[WINEHIGHEST_RENDER_STATE + 1]; unsigned int num_contained_transform_states; + DWORD contained_vs_consts_i[MAX_CONST_I]; + unsigned int num_contained_vs_consts_i; + DWORD contained_vs_consts_b[MAX_CONST_B]; + unsigned int num_contained_vs_consts_b; }; extern void stateblock_savedstates_set(

1 0

Stefan Dösinger : wined3d: Optimize bool and int pixel shader constants.
by Alexandre Julliard 14 Aug '07

14 Aug '07

Module: wine Branch: master Commit: 865b82af2c3e9d48d350827db622ddb02df16477 URL: http://source.winehq.org/git/wine.git/?a=commit;h=865b82af2c3e9d48d350827db… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Aug 3 20:12:54 2007 +0200 wined3d: Optimize bool and int pixel shader constants. --- dlls/wined3d/device.c | 30 ++++++++++++++++++++- dlls/wined3d/stateblock.c | 54 +++++++++++++++++++-------------------- dlls/wined3d/wined3d_private.h | 4 +++ 3 files changed, 58 insertions(+), 30 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e4fdeb9..9165e71 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -482,6 +482,14 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateStateBlock(IWineD3DDevice* iface, object->contained_vs_consts_b[j] = j; } object->num_contained_vs_consts_b = MAX_CONST_B; + for(j = 0; j < MAX_CONST_I; j++) { + object->contained_ps_consts_i[j] = j; + } + object->num_contained_ps_consts_i = MAX_CONST_I; + for(j = 0; j < MAX_CONST_B; j++) { + object->contained_ps_consts_b[j] = j; + } + object->num_contained_ps_consts_b = MAX_CONST_B; } else if (Type == WINED3DSBT_PIXELSTATE) { @@ -493,10 +501,16 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateStateBlock(IWineD3DDevice* iface, /* Pixel Shader Constants */ for (i = 0; i < GL_LIMITS(pshader_constantsF); ++i) object->changed.pixelShaderConstantsF[i] = TRUE; - for (i = 0; i < MAX_CONST_B; ++i) + for (i = 0; i < MAX_CONST_B; ++i) { + object->contained_ps_consts_b[i] = i; object->changed.pixelShaderConstantsB[i] = TRUE; - for (i = 0; i < MAX_CONST_I; ++i) + } + object->num_contained_ps_consts_b = MAX_CONST_B; + for (i = 0; i < MAX_CONST_I; ++i) { + object->contained_ps_consts_i[i] = i; object->changed.pixelShaderConstantsI[i] = TRUE; + } + object->num_contained_ps_consts_i = MAX_CONST_I; for (i = 0; i < NUM_SAVEDPIXELSTATES_R; i++) { object->changed.renderState[SavedPixelStates_R[i]] = TRUE; @@ -4359,6 +4373,18 @@ static HRESULT WINAPI IWineD3DDeviceImpl_EndStateBlock(IWineD3DDevice *iface, IW object->num_contained_vs_consts_b++; } } + for(i = 0; i < MAX_CONST_I; i++) { + if(object->changed.pixelShaderConstantsI[i]) { + object->contained_ps_consts_i[object->num_contained_ps_consts_i] = i; + object->num_contained_ps_consts_i++; + } + } + for(i = 0; i < MAX_CONST_B; i++) { + if(object->changed.pixelShaderConstantsB[i]) { + object->contained_ps_consts_b[object->num_contained_ps_consts_b] = i; + object->num_contained_ps_consts_b++; + } + } *ppStateBlock = (IWineD3DStateBlock*) object; This->isRecordingState = FALSE; diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index ba71dc3..9ce8ea8 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -455,31 +455,29 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_Capture(IWineD3DStateBlock *iface) This->pixelShaderConstantF[i * 4 + 3] = targetStateBlock->pixelShaderConstantF[i * 4 + 3]; } } - + /* Pixel Shader Integer Constants */ - for (i = 0; i < MAX_CONST_I; ++i) { - if (This->changed.pixelShaderConstantsI[i]) { - TRACE("Setting %p from %p %d to { %d, %d, %d, %d }\n", This, targetStateBlock, i, - targetStateBlock->pixelShaderConstantI[i * 4], - targetStateBlock->pixelShaderConstantI[i * 4 + 1], - targetStateBlock->pixelShaderConstantI[i * 4 + 2], - targetStateBlock->pixelShaderConstantI[i * 4 + 3]); - - This->pixelShaderConstantI[i * 4] = targetStateBlock->pixelShaderConstantI[i * 4]; - This->pixelShaderConstantI[i * 4 + 1] = targetStateBlock->pixelShaderConstantI[i * 4 + 1]; - This->pixelShaderConstantI[i * 4 + 2] = targetStateBlock->pixelShaderConstantI[i * 4 + 2]; - This->pixelShaderConstantI[i * 4 + 3] = targetStateBlock->pixelShaderConstantI[i * 4 + 3]; - } + for (j = 0; j < This->num_contained_ps_consts_i; ++j) { + i = This->contained_ps_consts_i[j]; + TRACE("Setting %p from %p %d to { %d, %d, %d, %d }\n", This, targetStateBlock, i, + targetStateBlock->pixelShaderConstantI[i * 4], + targetStateBlock->pixelShaderConstantI[i * 4 + 1], + targetStateBlock->pixelShaderConstantI[i * 4 + 2], + targetStateBlock->pixelShaderConstantI[i * 4 + 3]); + + This->pixelShaderConstantI[i * 4] = targetStateBlock->pixelShaderConstantI[i * 4]; + This->pixelShaderConstantI[i * 4 + 1] = targetStateBlock->pixelShaderConstantI[i * 4 + 1]; + This->pixelShaderConstantI[i * 4 + 2] = targetStateBlock->pixelShaderConstantI[i * 4 + 2]; + This->pixelShaderConstantI[i * 4 + 3] = targetStateBlock->pixelShaderConstantI[i * 4 + 3]; } - + /* Pixel Shader Boolean Constants */ - for (i = 0; i < MAX_CONST_B; ++i) { - if (This->changed.pixelShaderConstantsB[i]) { - TRACE("Setting %p from %p %d to %s\n", This, targetStateBlock, i, - targetStateBlock->pixelShaderConstantB[i]? "TRUE":"FALSE"); + for (j = 0; j < This->num_contained_ps_consts_b; ++j) { + i = This->contained_ps_consts_b[j]; + TRACE("Setting %p from %p %d to %s\n", This, targetStateBlock, i, + targetStateBlock->pixelShaderConstantB[i]? "TRUE":"FALSE"); - This->pixelShaderConstantB[i] = targetStateBlock->pixelShaderConstantB[i]; - } + This->pixelShaderConstantB[i] = targetStateBlock->pixelShaderConstantB[i]; } /* Others + Render & Texture */ @@ -670,14 +668,14 @@ should really perform a delta so that only the changes get updated*/ IWineD3DDevice_SetPixelShaderConstantF(pDevice, i, This->pixelShaderConstantF + i * 4, 1); } - for (i = 0; i < MAX_CONST_I; ++i) { - if (This->changed.pixelShaderConstantsI[i]) - IWineD3DDevice_SetPixelShaderConstantI(pDevice, i, This->pixelShaderConstantI + i * 4, 1); + for (i = 0; i < This->num_contained_ps_consts_i; i++) { + IWineD3DDevice_SetPixelShaderConstantI(pDevice, This->contained_ps_consts_i[i], + This->pixelShaderConstantI + This->contained_ps_consts_i[i] * 4, 1); } - - for (i = 0; i < MAX_CONST_B; ++i) { - if (This->changed.pixelShaderConstantsB[i]) - IWineD3DDevice_SetPixelShaderConstantB(pDevice, i, This->pixelShaderConstantB + i, 1); + + for (i = 0; i < This->num_contained_ps_consts_b; i++) { + IWineD3DDevice_SetPixelShaderConstantB(pDevice, This->contained_ps_consts_b[i], + This->pixelShaderConstantB + This->contained_ps_consts_b[i], 1); } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 948cf2e..62be55e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1375,6 +1375,10 @@ struct IWineD3DStateBlockImpl unsigned int num_contained_vs_consts_i; DWORD contained_vs_consts_b[MAX_CONST_B]; unsigned int num_contained_vs_consts_b; + DWORD contained_ps_consts_i[MAX_CONST_I]; + unsigned int num_contained_ps_consts_i; + DWORD contained_ps_consts_b[MAX_CONST_B]; + unsigned int num_contained_ps_consts_b; }; extern void stateblock_savedstates_set(

1 0

Stefan Dösinger : wined3d: Optimize texture stage state applying.
by Alexandre Julliard 14 Aug '07

14 Aug '07

Module: wine Branch: master Commit: 03ffb7345003ebf189ab3608301a014ef6de5a60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03ffb7345003ebf189ab36083… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Aug 9 17:45:29 2007 +0200 wined3d: Optimize texture stage state applying. --- dlls/wined3d/device.c | 26 ++++++++++++++++++- dlls/wined3d/stateblock.c | 53 +++++++++++++--------------------------- dlls/wined3d/wined3d_private.h | 7 +++++ 3 files changed, 48 insertions(+), 38 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 9165e71..4c53c8a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -490,6 +490,13 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateStateBlock(IWineD3DDevice* iface, object->contained_ps_consts_b[j] = j; } object->num_contained_ps_consts_b = MAX_CONST_B; + for(i = 0; i < MAX_TEXTURES; i++) { + for(j = 1; j <= WINED3D_HIGHEST_TEXTURE_STATE; j++) { + object->contained_tss_states[object->num_contained_tss_states].stage = i; + object->contained_tss_states[object->num_contained_tss_states].state = j; + object->num_contained_tss_states++; + } + } } else if (Type == WINED3DSBT_PIXELSTATE) { @@ -520,6 +527,9 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateStateBlock(IWineD3DDevice* iface, for (j = 0; j < MAX_TEXTURES; j++) { for (i = 0; i < NUM_SAVEDPIXELSTATES_T; i++) { object->changed.textureState[j][SavedPixelStates_T[i]] = TRUE; + object->contained_tss_states[object->num_contained_tss_states].stage = j; + object->contained_tss_states[object->num_contained_tss_states].state = SavedPixelStates_T[i]; + object->num_contained_tss_states++; } } for (j = 0 ; j < 16; j++) { @@ -557,6 +567,9 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateStateBlock(IWineD3DDevice* iface, for (j = 0; j < MAX_TEXTURES; j++) { for (i = 0; i < NUM_SAVEDVERTEXSTATES_T; i++) { object->changed.textureState[j][SavedVertexStates_T[i]] = TRUE; + object->contained_tss_states[object->num_contained_tss_states].stage = j; + object->contained_tss_states[object->num_contained_tss_states].state = SavedVertexStates_T[i]; + object->num_contained_tss_states++; } } for (j = 0 ; j < 16; j++){ @@ -4303,7 +4316,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_BeginStateBlock(IWineD3DDevice *iface) HRESULT temp_result; int i; - TRACE("(%p)\n", This); + ERR("(%p)\n", This); if (This->isRecordingState) { return WINED3DERR_INVALIDCALL; @@ -4340,7 +4353,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_BeginStateBlock(IWineD3DDevice *iface) static HRESULT WINAPI IWineD3DDeviceImpl_EndStateBlock(IWineD3DDevice *iface, IWineD3DStateBlock** ppStateBlock) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - unsigned int i; + unsigned int i, j; IWineD3DStateBlockImpl *object = This->updateStateBlock; if (!This->isRecordingState) { @@ -4385,6 +4398,15 @@ static HRESULT WINAPI IWineD3DDeviceImpl_EndStateBlock(IWineD3DDevice *iface, IW object->num_contained_ps_consts_b++; } } + for(i = 0; i < MAX_TEXTURES; i++) { + for(j = 1; j <= WINED3D_HIGHEST_TEXTURE_STATE; j++) { + if(object->changed.textureState[i][j]) { + object->contained_tss_states[object->num_contained_tss_states].stage = i; + object->contained_tss_states[object->num_contained_tss_states].state = j; + object->num_contained_tss_states++; + } + } + } *ppStateBlock = (IWineD3DStateBlock*) object; This->isRecordingState = FALSE; diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 9ce8ea8..ef05dd2 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -567,15 +567,13 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_Capture(IWineD3DStateBlock *iface) } /* Texture states */ - for (j = 0; j < MAX_TEXTURES; j++) { - /* TODO: move over to using memcpy */ - for (i = 1; i <= WINED3D_HIGHEST_TEXTURE_STATE ; i++) { - if (This->changed.textureState[j][i]) { - TRACE("Updating texturestagestate %d,%d to %d (was %d)\n", j,i, targetStateBlock->textureState[j][i], - This->textureState[j][i]); - This->textureState[j][i] = targetStateBlock->textureState[j][i]; - } - } + for (j = 0; j < This->num_contained_tss_states; j++) { + DWORD stage = This->contained_tss_states[j].stage; + DWORD state = This->contained_tss_states[j].state; + + TRACE("Updating texturestagestate %d,%d to %d (was %d)\n", stage,state, + targetStateBlock->textureState[stage][state], This->textureState[stage][state]); + This->textureState[stage][state] = targetStateBlock->textureState[stage][state]; } /* Samplers */ @@ -614,6 +612,7 @@ should really perform a delta so that only the changes get updated*/ TRACE("(%p) : Applying state block %p ------------------v\n", This, pDevice); + TRACE("Blocktype: %d\n", This->blockType); /* FIXME: Only apply applicable states not all states */ if (/*TODO: 'magic' statetype, replace with BOOL This->blockType == D3DSBT_RECORDED || */This->blockType == WINED3DSBT_INIT || This->blockType == WINED3DSBT_ALL || This->blockType == WINED3DSBT_VERTEXSTATE) { @@ -729,19 +728,6 @@ should really perform a delta so that only the changes get updated*/ } } - /* Texture states */ - for (j = 0; j < MAX_TEXTURES; j++) { /* Set The texture first, just in case it resets the states? */ - /* TODO: move over to memcpy */ - for (i = 1; i <= WINED3D_HIGHEST_TEXTURE_STATE; i++) { - if (This->changed.textureState[j][i]) { /* tb_dx9_10 failes without this test */ - ((IWineD3DDeviceImpl *)pDevice)->stateBlock->textureState[j][i] = This->textureState[j][i]; - ((IWineD3DDeviceImpl *)pDevice)->stateBlock->changed.textureState[j][i] = TRUE; - /* TODO: Record a display list to apply all gl states. For now apply by brute force */ - IWineD3DDeviceImpl_MarkStateDirty((IWineD3DDeviceImpl *)pDevice, STATE_TEXTURESTAGE(j, i)); - } - } - } - /* Samplers */ /* TODO: move over to memcpy */ for (j = 0 ; j < MAX_COMBINED_SAMPLERS; j++){ @@ -764,13 +750,6 @@ should really perform a delta so that only the changes get updated*/ } else if (This->blockType == WINED3DSBT_PIXELSTATE) { - for (j = 0; j < MAX_TEXTURES; j++) { - for (i = 0; i < NUM_SAVEDPIXELSTATES_T; i++) { - ((IWineD3DDeviceImpl *)pDevice)->stateBlock->textureState[j][SavedPixelStates_T[i]] = This->textureState[j][SavedPixelStates_T[i]]; - IWineD3DDeviceImpl_MarkStateDirty((IWineD3DDeviceImpl *)pDevice, STATE_TEXTURESTAGE(j, SavedPixelStates_T[i])); - } - } - for (j = 0; j < MAX_COMBINED_SAMPLERS; j++) { for (i = 0; i < NUM_SAVEDPIXELSTATES_S; i++) { ((IWineD3DDeviceImpl *)pDevice)->stateBlock->samplerState[j][SavedPixelStates_S[i]] = This->samplerState[j][SavedPixelStates_S[i]]; @@ -779,13 +758,6 @@ should really perform a delta so that only the changes get updated*/ } else if (This->blockType == WINED3DSBT_VERTEXSTATE) { - for (j = 0; j < MAX_TEXTURES; j++) { - for (i = 0; i < NUM_SAVEDVERTEXSTATES_T; i++) { - ((IWineD3DDeviceImpl *)pDevice)->stateBlock->textureState[j][SavedVertexStates_T[i]] = This->textureState[j][SavedVertexStates_T[i]]; - IWineD3DDeviceImpl_MarkStateDirty((IWineD3DDeviceImpl *)pDevice, STATE_TEXTURESTAGE(j, SavedVertexStates_T[i])); - } - } - for (j = 0; j < MAX_COMBINED_SAMPLERS; j++) { for (i = 0; i < NUM_SAVEDVERTEXSTATES_S; i++) { ((IWineD3DDeviceImpl *)pDevice)->stateBlock->samplerState[j][SavedVertexStates_S[i]] = This->samplerState[j][SavedVertexStates_S[i]]; @@ -802,6 +774,15 @@ should really perform a delta so that only the changes get updated*/ IWineD3DDevice_SetRenderState(pDevice, This->contained_render_states[i], This->renderState[This->contained_render_states[i]]); } + /* Texture states */ + for (i = 0; i < This->num_contained_tss_states; i++) { + DWORD stage = This->contained_tss_states[i].stage; + DWORD state = This->contained_tss_states[i].state; + ((IWineD3DDeviceImpl *)pDevice)->stateBlock->textureState[stage][state] = This->textureState[stage][state]; + ((IWineD3DDeviceImpl *)pDevice)->stateBlock->changed.textureState[stage][state] = TRUE; + /* TODO: Record a display list to apply all gl states. For now apply by brute force */ + IWineD3DDeviceImpl_MarkStateDirty((IWineD3DDeviceImpl *)pDevice, STATE_TEXTURESTAGE(stage, state)); + } ((IWineD3DDeviceImpl *)pDevice)->stateBlock->lowest_disabled_stage = MAX_TEXTURES - 1; for(j = 0; j < MAX_TEXTURES - 1; j++) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 62be55e..c82abb5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1279,6 +1279,11 @@ typedef struct { DWORD idx[13]; } constants_entry; +struct StageState { + DWORD stage; + DWORD state; +}; + struct IWineD3DStateBlockImpl { /* IUnknown fields */ @@ -1379,6 +1384,8 @@ struct IWineD3DStateBlockImpl unsigned int num_contained_ps_consts_i; DWORD contained_ps_consts_b[MAX_CONST_B]; unsigned int num_contained_ps_consts_b; + struct StageState contained_tss_states[MAX_TEXTURES * (WINED3D_HIGHEST_TEXTURE_STATE)]; + unsigned int num_contained_tss_states; }; extern void stateblock_savedstates_set(

1 0

Jason Edmeades : comctl32: Fix missing tooltips.
by Alexandre Julliard 14 Aug '07

14 Aug '07

Module: wine Branch: master Commit: ff826eb14a9e3b70e2755f7d9fdd15e117bedc5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff826eb14a9e3b70e2755f7d9… Author: Jason Edmeades <jason.edmeades(a)googlemail.com> Date: Mon Aug 13 23:57:05 2007 +0100 comctl32: Fix missing tooltips. --- dlls/comctl32/tooltips.c | 39 +++++++++++++++++++++++++++++++++++---- 1 files changed, 35 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index 9dd1970..3b41dda 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -314,7 +314,7 @@ static void TOOLTIPS_GetDispInfoA(HWND hwnd, TOOLTIPS_INFO *infoPtr, TTTOOL_INFO ZeroMemory (&ttnmdi, sizeof(NMTTDISPINFOA)); ttnmdi.hdr.hwndFrom = hwnd; ttnmdi.hdr.idFrom = toolPtr->uId; - ttnmdi.hdr.code = TTN_GETDISPINFOA; + ttnmdi.hdr.code = TTN_GETDISPINFOA; /* == TTN_NEEDTEXTA */ ttnmdi.lpszText = (LPSTR)&ttnmdi.szText; ttnmdi.uFlags = toolPtr->uFlags; ttnmdi.lParam = toolPtr->lParam; @@ -332,7 +332,6 @@ static void TOOLTIPS_GetDispInfoA(HWND hwnd, TOOLTIPS_INFO *infoPtr, TTTOOL_INFO } } else if (ttnmdi.lpszText == 0) { - /* no text available */ infoPtr->szTipText[0] = '\0'; } else if (ttnmdi.lpszText != LPSTR_TEXTCALLBACKA) { @@ -347,6 +346,22 @@ static void TOOLTIPS_GetDispInfoA(HWND hwnd, TOOLTIPS_INFO *infoPtr, TTTOOL_INFO ERR("recursive text callback!\n"); infoPtr->szTipText[0] = '\0'; } + + /* no text available - try calling parent instead as per native */ + /* FIXME: Unsure if SETITEM should save the value or not */ + if (infoPtr->szTipText[0] == 0x00) { + + SendMessageW(GetParent(toolPtr->hwnd), WM_NOTIFY, + (WPARAM)toolPtr->uId, (LPARAM)&ttnmdi); + + if (IS_INTRESOURCE(ttnmdi.lpszText)) { + LoadStringW(ttnmdi.hinst, LOWORD(ttnmdi.lpszText), + infoPtr->szTipText, INFOTIPSIZE); + } else if (ttnmdi.lpszText && + ttnmdi.lpszText != LPSTR_TEXTCALLBACKA) { + Str_GetPtrAtoW(ttnmdi.lpszText, infoPtr->szTipText, INFOTIPSIZE); + } + } } static void TOOLTIPS_GetDispInfoW(HWND hwnd, TOOLTIPS_INFO *infoPtr, TTTOOL_INFO *toolPtr) @@ -357,7 +372,7 @@ static void TOOLTIPS_GetDispInfoW(HWND hwnd, TOOLTIPS_INFO *infoPtr, TTTOOL_INFO ZeroMemory (&ttnmdi, sizeof(NMTTDISPINFOW)); ttnmdi.hdr.hwndFrom = hwnd; ttnmdi.hdr.idFrom = toolPtr->uId; - ttnmdi.hdr.code = TTN_GETDISPINFOW; + ttnmdi.hdr.code = TTN_GETDISPINFOW; /* == TTN_NEEDTEXTW */ ttnmdi.lpszText = (LPWSTR)&ttnmdi.szText; ttnmdi.uFlags = toolPtr->uFlags; ttnmdi.lParam = toolPtr->lParam; @@ -375,7 +390,6 @@ static void TOOLTIPS_GetDispInfoW(HWND hwnd, TOOLTIPS_INFO *infoPtr, TTTOOL_INFO } } else if (ttnmdi.lpszText == 0) { - /* no text available */ infoPtr->szTipText[0] = '\0'; } else if (ttnmdi.lpszText != LPSTR_TEXTCALLBACKW) { @@ -390,6 +404,23 @@ static void TOOLTIPS_GetDispInfoW(HWND hwnd, TOOLTIPS_INFO *infoPtr, TTTOOL_INFO ERR("recursive text callback!\n"); infoPtr->szTipText[0] = '\0'; } + + /* no text available - try calling parent instead as per native */ + /* FIXME: Unsure if SETITEM should save the value or not */ + if (infoPtr->szTipText[0] == 0x00) { + + SendMessageW(GetParent(toolPtr->hwnd), WM_NOTIFY, + (WPARAM)toolPtr->uId, (LPARAM)&ttnmdi); + + if (IS_INTRESOURCE(ttnmdi.lpszText)) { + LoadStringW(ttnmdi.hinst, LOWORD(ttnmdi.lpszText), + infoPtr->szTipText, INFOTIPSIZE); + } else if (ttnmdi.lpszText && + ttnmdi.lpszText != LPSTR_TEXTCALLBACKW) { + Str_GetPtrW(ttnmdi.lpszText, infoPtr->szTipText, INFOTIPSIZE); + } + } + } static void

1 0

Juan Lang : crypt32: Test authority key identifier with a multi-byte id to show that its byte-order is swapped and fix encoding and decoding it .
by Alexandre Julliard 14 Aug '07

14 Aug '07

Module: wine Branch: master Commit: b82bfa3455a391c9a9c28fa5b2f47fb1d44d33cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=b82bfa3455a391c9a9c28fa5b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Aug 13 14:29:58 2007 -0700 crypt32: Test authority key identifier with a multi-byte id to show that its byte-order is swapped and fix encoding and decoding it. --- dlls/crypt32/decode.c | 41 +++++++++++++++++++++++++++++++++++++++-- dlls/crypt32/encode.c | 43 +++++++++++++++++++++++++++++++++++++++++-- dlls/crypt32/tests/encode.c | 20 +++++++++++--------- 3 files changed, 91 insertions(+), 13 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index f1915d4..723873a 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -2213,6 +2213,43 @@ static BOOL WINAPI CRYPT_AsnDecodeAltNameInternal(DWORD dwCertEncodingType, return ret; } +/* Like CRYPT_AsnDecodeIntegerInternal, but swaps the bytes */ +static BOOL WINAPI CRYPT_AsnDecodeIntegerSwapBytes(DWORD dwCertEncodingType, + LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, + PCRYPT_DECODE_PARA pDecodePara, void *pvStructInfo, DWORD *pcbStructInfo) +{ + BOOL ret; + + TRACE("(%p, %d, 0x%08x, %p, %p, %d)\n", pbEncoded, cbEncoded, dwFlags, + pDecodePara, pvStructInfo, *pcbStructInfo); + + /* Can't use the CRYPT_DECODE_NOCOPY_FLAG, because we modify the bytes in- + * place. + */ + ret = CRYPT_AsnDecodeIntegerInternal(dwCertEncodingType, lpszStructType, + pbEncoded, cbEncoded, dwFlags & ~CRYPT_DECODE_NOCOPY_FLAG, pDecodePara, + pvStructInfo, pcbStructInfo); + if (ret && pvStructInfo) + { + CRYPT_DATA_BLOB *blob = (CRYPT_DATA_BLOB *)pvStructInfo; + + if (blob->cbData) + { + DWORD i; + BYTE temp; + + for (i = 0; i < blob->cbData / 2; i++) + { + temp = blob->pbData[i]; + blob->pbData[i] = blob->pbData[blob->cbData - i - 1]; + blob->pbData[blob->cbData - i - 1] = temp; + } + } + } + TRACE("returning %d (%08x)\n", ret, GetLastError()); + return ret; +} + static BOOL WINAPI CRYPT_AsnDecodeAuthorityKeyId(DWORD dwCertEncodingType, LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, PCRYPT_DECODE_PARA pDecodePara, void *pvStructInfo, DWORD *pcbStructInfo) @@ -2223,7 +2260,7 @@ static BOOL WINAPI CRYPT_AsnDecodeAuthorityKeyId(DWORD dwCertEncodingType, { struct AsnDecodeSequenceItem items[] = { { ASN_CONTEXT | 0, offsetof(CERT_AUTHORITY_KEY_ID_INFO, KeyId), - CRYPT_AsnDecodeIntegerInternal, sizeof(CRYPT_DATA_BLOB), + CRYPT_AsnDecodeIntegerSwapBytes, sizeof(CRYPT_DATA_BLOB), TRUE, TRUE, offsetof(CERT_AUTHORITY_KEY_ID_INFO, KeyId.pbData), 0 }, { ASN_CONTEXT | ASN_CONSTRUCTOR| 1, offsetof(CERT_AUTHORITY_KEY_ID_INFO, CertIssuer), @@ -2258,7 +2295,7 @@ static BOOL WINAPI CRYPT_AsnDecodeAuthorityKeyId2(DWORD dwCertEncodingType, { struct AsnDecodeSequenceItem items[] = { { ASN_CONTEXT | 0, offsetof(CERT_AUTHORITY_KEY_ID2_INFO, KeyId), - CRYPT_AsnDecodeIntegerInternal, sizeof(CRYPT_DATA_BLOB), + CRYPT_AsnDecodeIntegerSwapBytes, sizeof(CRYPT_DATA_BLOB), TRUE, TRUE, offsetof(CERT_AUTHORITY_KEY_ID2_INFO, KeyId.pbData), 0 }, { ASN_CONTEXT | ASN_CONSTRUCTOR| 1, offsetof(CERT_AUTHORITY_KEY_ID2_INFO, AuthorityCertIssuer), diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index be724d0..96e94f4 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -2003,6 +2003,45 @@ static BOOL CRYPT_AsnEncodeAltNameEntry(const CERT_ALT_NAME_ENTRY *entry, return ret; } +static BOOL WINAPI CRYPT_AsnEncodeIntegerSwapBytes(DWORD dwCertEncodingType, + LPCSTR lpszStructType, const void *pvStructInfo, DWORD dwFlags, + PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded) +{ + BOOL ret; + + __TRY + { + const CRYPT_DATA_BLOB *blob = (const CRYPT_DATA_BLOB *)pvStructInfo; + CRYPT_DATA_BLOB newBlob = { blob->cbData, NULL }; + + ret = TRUE; + if (newBlob.cbData) + { + newBlob.pbData = CryptMemAlloc(newBlob.cbData); + if (newBlob.pbData) + { + DWORD i; + + for (i = 0; i < newBlob.cbData; i++) + newBlob.pbData[newBlob.cbData - i - 1] = blob->pbData[i]; + } + else + ret = FALSE; + } + if (ret) + ret = CRYPT_AsnEncodeInteger(dwCertEncodingType, lpszStructType, + &newBlob, dwFlags, pEncodePara, pbEncoded, pcbEncoded); + CryptMemFree(newBlob.pbData); + } + __EXCEPT_PAGE_FAULT + { + SetLastError(STATUS_ACCESS_VIOLATION); + ret = FALSE; + } + __ENDTRY + return ret; +} + static BOOL WINAPI CRYPT_AsnEncodeAuthorityKeyId(DWORD dwCertEncodingType, LPCSTR lpszStructType, const void *pvStructInfo, DWORD dwFlags, PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded) @@ -2022,7 +2061,7 @@ static BOOL WINAPI CRYPT_AsnEncodeAuthorityKeyId(DWORD dwCertEncodingType, { swapped[cSwapped].tag = ASN_CONTEXT | 0; swapped[cSwapped].pvStructInfo = &info->KeyId; - swapped[cSwapped].encodeFunc = CRYPT_AsnEncodeInteger; + swapped[cSwapped].encodeFunc = CRYPT_AsnEncodeIntegerSwapBytes; items[cItem].pvStructInfo = &swapped[cSwapped]; items[cItem].encodeFunc = CRYPT_AsnEncodeSwapTag; cSwapped++; @@ -2155,7 +2194,7 @@ static BOOL WINAPI CRYPT_AsnEncodeAuthorityKeyId2(DWORD dwCertEncodingType, { swapped[cSwapped].tag = ASN_CONTEXT | 0; swapped[cSwapped].pvStructInfo = &info->KeyId; - swapped[cSwapped].encodeFunc = CRYPT_AsnEncodeInteger; + swapped[cSwapped].encodeFunc = CRYPT_AsnEncodeIntegerSwapBytes; items[cItem].pvStructInfo = &swapped[cSwapped]; items[cItem].encodeFunc = CRYPT_AsnEncodeSwapTag; cSwapped++; diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 50c458d..7b3e562 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -4423,7 +4423,9 @@ static void test_decodeEnhancedKeyUsage(DWORD dwEncoding) } } -static const BYTE authorityKeyIdWithId[] = { 0x30,0x03,0x80,0x01,0x01 }; +static BYTE keyId[] = { 1,2,3,4 }; +static const BYTE authorityKeyIdWithId[] = { + 0x30,0x06,0x80,0x04,0x01,0x02,0x03,0x04 }; static const BYTE authorityKeyIdWithIssuer[] = { 0x30,0x19,0xa1,0x17,0x30,0x15, 0x31,0x13,0x30,0x11,0x06,0x03,0x55,0x04,0x03,0x13,0x0a,0x4a,0x75,0x61,0x6e, 0x20,0x4c,0x61,0x6e,0x67,0x00 }; @@ -4447,8 +4449,8 @@ static void test_encodeAuthorityKeyId(DWORD dwEncoding) LocalFree(buf); } /* With just a key id */ - info.KeyId.cbData = sizeof(serialNum); - info.KeyId.pbData = (BYTE *)serialNum; + info.KeyId.cbData = sizeof(keyId); + info.KeyId.pbData = keyId; ret = CryptEncodeObjectEx(dwEncoding, X509_AUTHORITY_KEY_ID, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); @@ -4519,8 +4521,8 @@ static void test_decodeAuthorityKeyId(DWORD dwEncoding) ok(size >= sizeof(CERT_AUTHORITY_KEY_ID_INFO), "Unexpected size %d\n", size); - ok(info->KeyId.cbData == sizeof(serialNum), "Unexpected key id len\n"); - ok(!memcmp(info->KeyId.pbData, serialNum, sizeof(serialNum)), + ok(info->KeyId.cbData == sizeof(keyId), "Unexpected key id len\n"); + ok(!memcmp(info->KeyId.pbData, keyId, sizeof(keyId)), "Unexpected key id\n"); ok(info->CertIssuer.cbData == 0, "Expected no issuer name\n"); ok(info->CertSerialNumber.cbData == 0, "Expected no serial number\n"); @@ -4587,8 +4589,8 @@ static void test_encodeAuthorityKeyId2(DWORD dwEncoding) LocalFree(buf); } /* With just a key id */ - info.KeyId.cbData = sizeof(serialNum); - info.KeyId.pbData = (BYTE *)serialNum; + info.KeyId.cbData = sizeof(keyId); + info.KeyId.pbData = keyId; ret = CryptEncodeObjectEx(dwEncoding, X509_AUTHORITY_KEY_ID2, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); @@ -4670,8 +4672,8 @@ static void test_decodeAuthorityKeyId2(DWORD dwEncoding) ok(size >= sizeof(CERT_AUTHORITY_KEY_ID2_INFO), "Unexpected size %d\n", size); - ok(info->KeyId.cbData == sizeof(serialNum), "Unexpected key id len\n"); - ok(!memcmp(info->KeyId.pbData, serialNum, sizeof(serialNum)), + ok(info->KeyId.cbData == sizeof(keyId), "Unexpected key id len\n"); + ok(!memcmp(info->KeyId.pbData, keyId, sizeof(keyId)), "Unexpected key id\n"); ok(info->AuthorityCertIssuer.cAltEntry == 0, "Expected no issuer name entries\n");

1 0

Misha Koshelev : winebrowser: Add support for XTYP_REQUEST in DDE callback.
by Alexandre Julliard 14 Aug '07

14 Aug '07

Module: wine Branch: master Commit: 70edf2d2234159f021465f52de52cb4cfcf6e1ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=70edf2d2234159f021465f52d… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Sun Aug 12 20:08:01 2007 -0500 winebrowser: Add support for XTYP_REQUEST in DDE callback. --- programs/winebrowser/main.c | 54 ++++++++++++++++++++++++++++++------------ 1 files changed, 38 insertions(+), 16 deletions(-) diff --git a/programs/winebrowser/main.c b/programs/winebrowser/main.c index 976e465..ee7b947 100644 --- a/programs/winebrowser/main.c +++ b/programs/winebrowser/main.c @@ -125,15 +125,16 @@ static int open_mailto_url( const char *url ) * DDE helper functions. */ -static char *ddeExec = NULL; -static HSZ hszTopic = 0; +static char *ddeString = NULL; +static HSZ hszTopic = 0, hszReturn = 0; +static DWORD ddeInst = 0; -/* Dde callback, save the execute string for processing */ +/* Dde callback, save the execute or request string for processing */ static HDDEDATA CALLBACK ddeCb(UINT uType, UINT uFmt, HCONV hConv, HSZ hsz1, HSZ hsz2, HDDEDATA hData, ULONG_PTR dwData1, ULONG_PTR dwData2) { - DWORD size = 0; + DWORD size = 0, ret = 0; WINE_TRACE("dde_cb: %04x, %04x, %p, %p, %p, %p, %08lx, %08lx\n", uType, uFmt, hConv, hsz1, hsz2, hData, dwData1, dwData2); @@ -148,13 +149,26 @@ static HDDEDATA CALLBACK ddeCb(UINT uType, UINT uFmt, HCONV hConv, case XTYP_EXECUTE: if (!(size = DdeGetData(hData, NULL, 0, 0))) WINE_ERR("DdeGetData returned zero size of execute string\n"); - else if (!(ddeExec = HeapAlloc(GetProcessHeap(), 0, size))) + else if (!(ddeString = HeapAlloc(GetProcessHeap(), 0, size))) WINE_ERR("Out of memory\n"); - else if (DdeGetData(hData, (LPBYTE)ddeExec, size, 0) != size) + else if (DdeGetData(hData, (LPBYTE)ddeString, size, 0) != size) WINE_WARN("DdeGetData did not return %d bytes\n", size); DdeFreeDataHandle(hData); return (HDDEDATA)DDE_FACK; + case XTYP_REQUEST: + ret = -3; /* error */ + if (!(size = DdeQueryString(ddeInst, hsz2, NULL, 0, CP_WINANSI))) + WINE_ERR("DdeQueryString returned zero size of request string\n"); + else if (!(ddeString = HeapAlloc(GetProcessHeap(), 0, size+1))) + WINE_ERR("Out of memory\n"); + else if (DdeQueryString(ddeInst, hsz2, ddeString, size+1, CP_WINANSI) != size) + WINE_WARN("DdeQueryString did not return %d bytes\n", size); + else + ret = -2; /* acknowledgment */ + return DdeCreateDataHandle(ddeInst, (LPBYTE)&ret, sizeof(ret), 0, + hszReturn, CF_TEXT, 0); + default: return NULL; } @@ -164,15 +178,15 @@ static char *get_url_from_dde(void) { static const char szApplication[] = "IExplore"; static const char szTopic[] = "WWW_OpenURL"; + static const char szReturn[] = "Return"; HSZ hszApplication = 0; - DWORD ddeInst = 0; UINT_PTR timer = 0; int rc; char *ret = NULL; rc = DdeInitializeA(&ddeInst, ddeCb, CBF_SKIP_ALLNOTIFICATIONS | CBF_FAIL_ADVISES | - CBF_FAIL_POKES | CBF_FAIL_REQUESTS, 0); + CBF_FAIL_POKES, 0); if (rc != DMLERR_NO_ERROR) { WINE_ERR("Unable to initialize DDE, DdeInitialize returned %d\n", rc); @@ -193,6 +207,13 @@ static char *get_url_from_dde(void) goto done; } + hszReturn = DdeCreateStringHandleA(ddeInst, szReturn, CP_WINANSI); + if (!hszReturn) + { + WINE_ERR("Unable to initialize DDE, DdeCreateStringHandle failed\n"); + goto done; + } + if (!DdeNameService(ddeInst, hszApplication, 0, DNS_REGISTER)) { WINE_ERR("Unable to initialize DDE, DdeNameService failed\n"); @@ -206,7 +227,7 @@ static char *get_url_from_dde(void) goto done; } - while (!ddeExec) + while (!ddeString) { MSG msg; if (!GetMessage(&msg, NULL, 0, 0)) break; @@ -214,21 +235,21 @@ static char *get_url_from_dde(void) DispatchMessage(&msg); } - if (ddeExec) + if (ddeString) { - if (*ddeExec == '"') + if (*ddeString == '"') { - char *endquote = strchr(ddeExec+1, '"'); + char *endquote = strchr(ddeString+1, '"'); if (!endquote) { - WINE_ERR("Unabled to retrieve URL from string '%s'\n", ddeExec); + WINE_ERR("Unabled to retrieve URL from string '%s'\n", ddeString); goto done; } *endquote = 0; - ret = ddeExec+1; + ret = ddeString+1; } else - ret = ddeExec; + ret = ddeString; } done: @@ -236,6 +257,7 @@ done: if (ddeInst) { if (hszTopic && hszApplication) DdeNameService(ddeInst, hszApplication, 0, DNS_UNREGISTER); + if (hszReturn) DdeFreeStringHandle(ddeInst, hszReturn); if (hszTopic) DdeFreeStringHandle(ddeInst, hszTopic); if (hszApplication) DdeFreeStringHandle(ddeInst, hszApplication); DdeUninitialize(ddeInst); @@ -332,6 +354,6 @@ int main(int argc, char *argv[]) ret = open_http_url( url ); done: - HeapFree(GetProcessHeap(), 0, ddeExec); + HeapFree(GetProcessHeap(), 0, ddeString); return ret; }

1 0

Misha Koshelev : urlmon: Fix timing issue with FLAG_REQUEST_COMPLETE and InternetQueryDataAvailable in HttpProtocol_Continue .
by Alexandre Julliard 14 Aug '07

14 Aug '07

Module: wine Branch: master Commit: 4f405b228d94c79cebc506053c7d892b7e18a7fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f405b228d94c79cebc506053… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Mon Aug 13 00:24:57 2007 -0500 urlmon: Fix timing issue with FLAG_REQUEST_COMPLETE and InternetQueryDataAvailable in HttpProtocol_Continue. --- dlls/urlmon/http.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/urlmon/http.c b/dlls/urlmon/http.c index 08d6419..2d1929d 100644 --- a/dlls/urlmon/http.c +++ b/dlls/urlmon/http.c @@ -661,20 +661,22 @@ static HRESULT WINAPI HttpProtocol_Continue(IInternetProtocol *iface, PROTOCOLDA if (pProtocolData->pData >= (LPVOID)BINDSTATUS_DOWNLOADINGDATA) { + /* InternetQueryDataAvailable may immediately fork and perform its asynchronous + * read, so clear the flag _before_ calling so it does not incorrectly get cleared + * after the status callback is called */ + This->flags &= ~FLAG_REQUEST_COMPLETE; if (!InternetQueryDataAvailable(This->request, &This->available_bytes, 0, 0)) { - if (GetLastError() == ERROR_IO_PENDING) - { - This->flags &= ~FLAG_REQUEST_COMPLETE; - } - else + if (GetLastError() != ERROR_IO_PENDING) { + This->flags |= FLAG_REQUEST_COMPLETE; WARN("InternetQueryDataAvailable failed: %d\n", GetLastError()); HTTPPROTOCOL_ReportResult(This, INET_E_DATA_NOT_AVAILABLE); } } else { + This->flags |= FLAG_REQUEST_COMPLETE; HTTPPROTOCOL_ReportData(This); } }

1 0