October 2009 - Wine-Commits

Henri Verbeet : wined3d: Simplify IWineD3DStateBlockImpl_Capture().
by Alexandre Julliard Oct. 14, 2009

Oct. 14, 2009

Module: wine Branch: master Commit: 1f029a30dbae7d40818d0d81bc84d15c93578c17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f029a30dbae7d40818d0d81b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 14 10:55:18 2009 +0200 wined3d: Simplify IWineD3DStateBlockImpl_Capture(). Consistently use the stateblock's contained states to determine what to capture. --- dlls/wined3d/stateblock.c | 556 +++++++++++++++++++-------------------------- 1 files changed, 230 insertions(+), 326 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1f029a30dbae7d40818d0…

1 0

Henri Verbeet : wined3d: Remove the useless "changed" and "enabledChanged" fields from struct wined3d_light_info.
by Alexandre Julliard Oct. 14, 2009

Oct. 14, 2009

Module: wine Branch: master Commit: a24d14796a47eea5a199fdf316a619d723d230d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a24d14796a47eea5a199fdf31… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 14 10:55:17 2009 +0200 wined3d: Remove the useless "changed" and "enabledChanged" fields from struct wined3d_light_info. --- dlls/wined3d/device.c | 2 - dlls/wined3d/stateblock.c | 52 ++++++++++++++------------------------- dlls/wined3d/wined3d_private.h | 2 - 3 files changed, 19 insertions(+), 37 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a94c4bb..33c15ec 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2485,7 +2485,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetLight(IWineD3DDevice *iface, DWORD I list_add_head(&This->updateStateBlock->lightMap[Hi], &object->entry); object->glIndex = -1; object->OriginalIndex = Index; - object->changed = TRUE; } /* Initialize the object */ @@ -2636,7 +2635,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetLightEnable(IWineD3DDevice *iface, D } } - lightInfo->enabledChanged = TRUE; if(!Enable) { if(lightInfo->glIndex != -1) { if(!This->isRecordingState) { diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 74a9f3a..862eb66 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -447,8 +447,6 @@ static void stateblock_init_lights(IWineD3DStateBlockImpl *stateblock, struct li struct wined3d_light_info *dst_light = HeapAlloc(GetProcessHeap(), 0, sizeof(*dst_light)); *dst_light = *src_light; - dst_light->changed = TRUE; - dst_light->enabledChanged = TRUE; list_add_tail(&stateblock->lightMap[i], &dst_light->entry); } } @@ -561,42 +559,34 @@ static void record_lights(IWineD3DStateBlockImpl *This, const IWineD3DStateBlock LIST_FOR_EACH(e, &This->lightMap[i]) { BOOL updated = FALSE; struct wined3d_light_info *src = LIST_ENTRY(e, struct wined3d_light_info, entry), *realLight; - if (!src->changed && !src->enabledChanged) continue; /* Look up the light in the destination */ LIST_FOR_EACH(f, &targetStateBlock->lightMap[i]) { realLight = LIST_ENTRY(f, struct wined3d_light_info, entry); - if(realLight->OriginalIndex == src->OriginalIndex) { - if(src->changed) { - src->OriginalParms = realLight->OriginalParms; + if (realLight->OriginalIndex == src->OriginalIndex) + { + src->OriginalParms = realLight->OriginalParms; + + if (realLight->glIndex == -1 && src->glIndex != -1) + { + /* Light disabled */ + This->activeLights[src->glIndex] = NULL; } - if(src->enabledChanged) { - /* Need to double check because enabledChanged does not catch enabled -> disabled -> enabled - * or disabled -> enabled -> disabled changes - */ - if(realLight->glIndex == -1 && src->glIndex != -1) { - /* Light disabled */ - This->activeLights[src->glIndex] = NULL; - } else if(realLight->glIndex != -1 && src->glIndex == -1){ - /* Light enabled */ - This->activeLights[realLight->glIndex] = src; - } - src->glIndex = realLight->glIndex; + else if (realLight->glIndex != -1 && src->glIndex == -1) + { + /* Light enabled */ + This->activeLights[realLight->glIndex] = src; } + src->glIndex = realLight->glIndex; updated = TRUE; break; } } - if(updated) { - /* Found a light, all done, proceed with next hash entry */ - continue; - } else if(src->changed) { - /* Otherwise assign defaul params */ - src->OriginalParms = WINED3D_default_light; - } else { - /* Not enabled by default */ - src->glIndex = -1; + if (!updated) + { + ERR("Light %u in stateblock %p does not exist in device stateblock %p.\n", + src->OriginalIndex, This, targetStateBlock); } } } @@ -987,12 +977,8 @@ static void apply_lights(IWineD3DDevice *pDevice, const IWineD3DStateBlockImpl * { const struct wined3d_light_info *light = LIST_ENTRY(e, struct wined3d_light_info, entry); - if(light->changed) { - IWineD3DDevice_SetLight(pDevice, light->OriginalIndex, &light->OriginalParms); - } - if(light->enabledChanged) { - IWineD3DDevice_SetLightEnable(pDevice, light->OriginalIndex, light->glIndex != -1); - } + IWineD3DDevice_SetLight(pDevice, light->OriginalIndex, &light->OriginalParms); + IWineD3DDevice_SetLightEnable(pDevice, light->OriginalIndex, light->glIndex != -1); } } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4077d81..69467e0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1208,8 +1208,6 @@ struct wined3d_light_info WINED3DLIGHT OriginalParms; /* Note D3D8LIGHT == D3D9LIGHT */ DWORD OriginalIndex; LONG glIndex; - BOOL changed; - BOOL enabledChanged; BOOL enabled; /* Converted parms to speed up swapping lights */

1 0

Henri Verbeet : wined3d: Rename PLIGHTINFOEL to something less awful.
by Alexandre Julliard Oct. 14, 2009

Oct. 14, 2009

Module: wine Branch: master Commit: 3bc9d1894d56bb3a320731a1a566e07c7ebfeb2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bc9d1894d56bb3a320731a1a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 14 10:55:16 2009 +0200 wined3d: Rename PLIGHTINFOEL to something less awful. --- dlls/wined3d/device.c | 43 +++++++++++++++++++++++---------------- dlls/wined3d/state.c | 5 +-- dlls/wined3d/stateblock.c | 20 ++++++++++-------- dlls/wined3d/wined3d_private.h | 6 ++-- 4 files changed, 41 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3bc9d1894d56bb3a32073…

1 0

Henri Verbeet : wined3d: Get rid of stateblock_copy_values().
by Alexandre Julliard Oct. 14, 2009

Oct. 14, 2009

Module: wine Branch: master Commit: 580cd8c5bb6c23ce6eac541fe93001d43584fc2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=580cd8c5bb6c23ce6eac541fe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 14 10:55:15 2009 +0200 wined3d: Get rid of stateblock_copy_values(). Use IWineD3DStateBlockImpl_Capture() for the initial stateblock capture instead. --- dlls/wined3d/stateblock.c | 195 +++++++++------------------------------------ 1 files changed, 37 insertions(+), 158 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 6e6dac7..64ae8bb 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -322,70 +322,6 @@ static void stateblock_savedstates_set_vertex(SAVEDSTATES *states, const struct memset(states->vertexShaderConstantsF, TRUE, sizeof(BOOL) * gl_info->max_vshader_constantsF); } -static void stateblock_copy_values(IWineD3DStateBlockImpl *dst, const IWineD3DStateBlockImpl *src, - const struct wined3d_gl_info *gl_info) -{ - unsigned int l; - - /* Single items */ - dst->gl_primitive_type = src->gl_primitive_type; - dst->vertexDecl = src->vertexDecl; - dst->vertexShader = src->vertexShader; - dst->streamIsUP = src->streamIsUP; - dst->pIndexData = src->pIndexData; - dst->IndexFmt = src->IndexFmt; - dst->baseVertexIndex = src->baseVertexIndex; - dst->clip_status = src->clip_status; - dst->viewport = src->viewport; - dst->material = src->material; - dst->pixelShader = src->pixelShader; - dst->scissorRect = src->scissorRect; - - /* Lights */ - memset(dst->activeLights, 0, sizeof(dst->activeLights)); - for (l = 0; l < LIGHTMAP_SIZE; ++l) - { - struct list *e1, *e2; - LIST_FOR_EACH_SAFE(e1, e2, &dst->lightMap[l]) - { - PLIGHTINFOEL *light = LIST_ENTRY(e1, PLIGHTINFOEL, entry); - list_remove(&light->entry); - HeapFree(GetProcessHeap(), 0, light); - } - - LIST_FOR_EACH(e1, &src->lightMap[l]) - { - PLIGHTINFOEL *light = LIST_ENTRY(e1, PLIGHTINFOEL, entry), *light2; - light2 = HeapAlloc(GetProcessHeap(), 0, sizeof(*light)); - *light2 = *light; - list_add_tail(&dst->lightMap[l], &light2->entry); - if (light2->glIndex != -1) dst->activeLights[light2->glIndex] = light2; - } - } - - /* Fixed size arrays */ - memcpy(dst->vertexShaderConstantB, src->vertexShaderConstantB, sizeof(dst->vertexShaderConstantB)); - memcpy(dst->vertexShaderConstantI, src->vertexShaderConstantI, sizeof(dst->vertexShaderConstantI)); - memcpy(dst->pixelShaderConstantB, src->pixelShaderConstantB, sizeof(dst->pixelShaderConstantB)); - memcpy(dst->pixelShaderConstantI, src->pixelShaderConstantI, sizeof(dst->pixelShaderConstantI)); - - memcpy(dst->streamStride, src->streamStride, sizeof(dst->streamStride)); - memcpy(dst->streamOffset, src->streamOffset, sizeof(dst->streamOffset)); - memcpy(dst->streamSource, src->streamSource, sizeof(dst->streamSource)); - memcpy(dst->streamFreq, src->streamFreq, sizeof(dst->streamFreq)); - memcpy(dst->streamFlags, src->streamFlags, sizeof(dst->streamFlags)); - memcpy(dst->transforms, src->transforms, sizeof(dst->transforms)); - memcpy(dst->clipplane, src->clipplane, sizeof(dst->clipplane)); - memcpy(dst->renderState, src->renderState, sizeof(dst->renderState)); - memcpy(dst->textures, src->textures, sizeof(dst->textures)); - memcpy(dst->textureState, src->textureState, sizeof(dst->textureState)); - memcpy(dst->samplerState, src->samplerState, sizeof(dst->samplerState)); - - /* Dynamically sized arrays */ - memcpy(dst->vertexShaderConstantF, src->vertexShaderConstantF, sizeof(float) * gl_info->max_vshader_constantsF * 4); - memcpy(dst->pixelShaderConstantF, src->pixelShaderConstantF, sizeof(float) * gl_info->max_pshader_constantsF * 4); -} - void stateblock_init_contained_states(IWineD3DStateBlockImpl *stateblock) { const struct wined3d_gl_info *gl_info = &stateblock->wineD3DDevice->adapter->gl_info; @@ -498,6 +434,26 @@ void stateblock_init_contained_states(IWineD3DStateBlockImpl *stateblock) } } +static void stateblock_init_lights(IWineD3DStateBlockImpl *stateblock, struct list *light_map) +{ + unsigned int i; + + for (i = 0; i < LIGHTMAP_SIZE; ++i) + { + const PLIGHTINFOEL *src_light; + + LIST_FOR_EACH_ENTRY(src_light, &light_map[i], PLIGHTINFOEL, entry) + { + PLIGHTINFOEL *dst_light = HeapAlloc(GetProcessHeap(), 0, sizeof(*dst_light)); + + *dst_light = *src_light; + dst_light->changed = TRUE; + dst_light->enabledChanged = TRUE; + list_add_tail(&stateblock->lightMap[i], &dst_light->entry); + } + } +} + /********************************************************** * IWineD3DStateBlockImpl IUnknown parts follows **********************************************************/ @@ -1658,108 +1614,31 @@ HRESULT stateblock_init(IWineD3DStateBlockImpl *stateblock, IWineD3DDeviceImpl * * state block. */ if (type == WINED3DSBT_INIT || type == WINED3DSBT_RECORDED) return WINED3D_OK; - stateblock_copy_values(stateblock, device->stateBlock, gl_info); - TRACE("Updating changed flags appropriate for type %#x.\n", type); - if (type == WINED3DSBT_ALL) + switch (type) { - TRACE("ALL => Pretend everything has changed.\n"); - - stateblock_savedstates_set_all(&stateblock->changed, gl_info); - stateblock_init_contained_states(stateblock); - - /* Lights are not part of the changed / set structure. */ - for (i = 0; i < LIGHTMAP_SIZE; ++i) - { - struct list *e; - LIST_FOR_EACH(e, &stateblock->lightMap[i]) - { - PLIGHTINFOEL *light = LIST_ENTRY(e, PLIGHTINFOEL, entry); - light->changed = TRUE; - light->enabledChanged = TRUE; - } - } - - for (i = 0; i < MAX_STREAMS; ++i) - { - if (stateblock->streamSource[i]) IWineD3DBuffer_AddRef(stateblock->streamSource[i]); - } - - for (i = 0; i < MAX_COMBINED_SAMPLERS; ++i) - { - if (stateblock->textures[i]) IWineD3DBaseTexture_AddRef(stateblock->textures[i]); - } - - if (stateblock->vertexDecl) IWineD3DVertexDeclaration_AddRef(stateblock->vertexDecl); - if (stateblock->pIndexData) IWineD3DBuffer_AddRef(stateblock->pIndexData); - if (stateblock->vertexShader) IWineD3DVertexShader_AddRef(stateblock->vertexShader); - if (stateblock->pixelShader) IWineD3DPixelShader_AddRef(stateblock->pixelShader); - } - else if (type == WINED3DSBT_PIXELSTATE) - { - TRACE("PIXELSTATE => Pretend all pixel states have changed.\n"); - - stateblock_savedstates_set_pixel(&stateblock->changed, gl_info); - stateblock_init_contained_states(stateblock); - - if (stateblock->pixelShader) IWineD3DPixelShader_AddRef(stateblock->pixelShader); + case WINED3DSBT_ALL: + stateblock_init_lights(stateblock, device->stateBlock->lightMap); + stateblock_savedstates_set_all(&stateblock->changed, gl_info); + break; - /* 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) - { - stateblock->streamSource[i] = NULL; - } + case WINED3DSBT_PIXELSTATE: + stateblock_savedstates_set_pixel(&stateblock->changed, gl_info); + break; - for (i = 0; i < MAX_COMBINED_SAMPLERS; ++i) - { - stateblock->textures[i] = NULL; - } + case WINED3DSBT_VERTEXSTATE: + stateblock_init_lights(stateblock, device->stateBlock->lightMap); + stateblock_savedstates_set_vertex(&stateblock->changed, gl_info); + break; - stateblock->vertexDecl = NULL; - stateblock->pIndexData = NULL; - stateblock->vertexShader = NULL; + default: + FIXME("Unrecognized state block type %#x.\n", type); + break; } - else if (type == WINED3DSBT_VERTEXSTATE) - { - TRACE("VERTEXSTATE => Pretend all vertex shates have changed.\n"); - stateblock_savedstates_set_vertex(&stateblock->changed, gl_info); - stateblock_init_contained_states(stateblock); - - for (i = 0; i < LIGHTMAP_SIZE; ++i) - { - struct list *e; - LIST_FOR_EACH(e, &stateblock->lightMap[i]) - { - PLIGHTINFOEL *light = LIST_ENTRY(e, PLIGHTINFOEL, entry); - light->changed = TRUE; - light->enabledChanged = TRUE; - } - } - - for (i = 0; i < MAX_STREAMS; ++i) - { - if (stateblock->streamSource[i]) IWineD3DBuffer_AddRef(stateblock->streamSource[i]); - } - - for (i = 0; i < MAX_COMBINED_SAMPLERS; ++i) - { - stateblock->textures[i] = NULL; - } - - if (stateblock->vertexShader) IWineD3DVertexShader_AddRef(stateblock->vertexShader); - - if (stateblock->vertexDecl) IWineD3DVertexDeclaration_AddRef(stateblock->vertexDecl); - stateblock->pIndexData = NULL; - stateblock->pixelShader = NULL; - } - else - { - FIXME("Unrecognized state block type %#x.\n", type); - } + stateblock_init_contained_states(stateblock); + IWineD3DStateBlockImpl_Capture((IWineD3DStateBlock *)stateblock); return WINED3D_OK; }

1 0

Vincent Povirk : ole32: Add test showing storage objects can' t be opened twice.
by Alexandre Julliard Oct. 14, 2009

Oct. 14, 2009

Module: wine Branch: master Commit: 657c8327659a2992b751c44b1f6c7c7fcb2a7c60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=657c8327659a2992b751c44b1… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Oct 12 16:26:01 2009 -0500 ole32: Add test showing storage objects can't be opened twice. --- dlls/ole32/tests/storage32.c | 85 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 85 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index cd62d72..5ec51cf 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -1037,6 +1037,90 @@ static void test_transact(void) ok( r == TRUE, "deleted file\n"); } +static void test_substorage_share(void) +{ + IStorage *stg, *stg2, *stg3; + IStream *stm, *stm2; + HRESULT r; + static const WCHAR stgname[] = { 'P','E','R','M','S','T','G',0 }; + static const WCHAR stmname[] = { 'C','O','N','T','E','N','T','S',0 }; + + DeleteFileA(filenameA); + + /* create the file */ + r = StgCreateDocfile( filename, STGM_CREATE | STGM_SHARE_EXCLUSIVE | + STGM_READWRITE, 0, &stg); + ok(r==S_OK, "StgCreateDocfile failed\n"); + + /* create a read/write storage and try to open it again */ + r = IStorage_CreateStorage(stg, stgname, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &stg2); + ok(r==S_OK, "IStorage->CreateStorage failed, hr=%08x\n", r); + + if (r == S_OK) + { + r = IStorage_OpenStorage(stg, stgname, NULL, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &stg3); + todo_wine ok(r==STG_E_ACCESSDENIED, "IStorage->OpenStorage should fail %08x\n", r); + + if (r == S_OK) + IStorage_Release(stg3); + + r = IStorage_OpenStorage(stg, stgname, NULL, STGM_READ | STGM_SHARE_EXCLUSIVE, 0, 0, &stg3); + todo_wine ok(r==STG_E_ACCESSDENIED, "IStorage->OpenStorage should fail %08x\n", r); + + if (r == S_OK) + IStorage_Release(stg3); + +#if 0 + /* This crashes on Wine. */ + + /* destroying an object while it's open invalidates it */ + r = IStorage_DestroyElement(stg, stgname); + ok(r==S_OK, "IStorage->DestroyElement failed, hr=%08x\n", r); + + r = IStorage_CreateStream(stg2, stmname, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &stm); + todo_wine ok(r==STG_E_REVERTED, "IStorage->CreateStream failed, hr=%08x\n", r); + + if (r == S_OK) + IStorage_Release(stm); +#endif + + IStorage_Release(stg2); + } + + /* create a read/write stream and try to open it again */ + r = IStorage_CreateStream(stg, stmname, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &stm); + ok(r==S_OK, "IStorage->CreateStream failed, hr=%08x\n", r); + + if (r == S_OK) + { + r = IStorage_OpenStream(stg, stmname, NULL, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, &stm2); + todo_wine ok(r==STG_E_ACCESSDENIED, "IStorage->OpenStream should fail %08x\n", r); + + if (r == S_OK) + IStorage_Release(stm2); + + r = IStorage_OpenStream(stg, stmname, NULL, STGM_READ | STGM_SHARE_EXCLUSIVE, 0, &stm2); + todo_wine ok(r==STG_E_ACCESSDENIED, "IStorage->OpenStream should fail %08x\n", r); + + if (r == S_OK) + IStorage_Release(stm2); + + /* destroying an object while it's open invalidates it */ + r = IStorage_DestroyElement(stg, stmname); + ok(r==S_OK, "IStorage->DestroyElement failed, hr=%08x\n", r); + + r = IStream_Write(stm, "this shouldn't work\n", 20, NULL); + todo_wine ok(r==STG_E_REVERTED, "IStream_Write should fail %08x\n", r); + + IStorage_Release(stm); + } + + IStorage_Release(stg); + + r = DeleteFileA(filenameA); + ok( r == TRUE, "deleted file\n"); +} + static void test_revert(void) { IStorage *stg = NULL, *stg2 = NULL, *stg3 = NULL; @@ -2254,6 +2338,7 @@ START_TEST(storage32) test_storage_refcount(); test_streamenum(); test_transact(); + test_substorage_share(); test_revert(); test_nonroot_transacted(); test_ReadClassStm();

1 0

Paul Vriens : advapi32/tests: Fix a test failure on W2K and lower.
by Alexandre Julliard Oct. 14, 2009

Oct. 14, 2009

Module: wine Branch: master Commit: b4955e57793b8c241ec5ed7f71b61739dad425f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4955e57793b8c241ec5ed7f7… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Oct 13 20:55:34 2009 +0200 advapi32/tests: Fix a test failure on W2K and lower. --- dlls/advapi32/tests/crypt.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/tests/crypt.c b/dlls/advapi32/tests/crypt.c index 08c53f0..e4b5934 100644 --- a/dlls/advapi32/tests/crypt.c +++ b/dlls/advapi32/tests/crypt.c @@ -968,7 +968,10 @@ static void hashtest(void) ret = pCryptImportKey(provider, (BYTE*)&key_blob, sizeof(BLOBHEADER)+sizeof(DWORD)+key_length, 0, CRYPT_IPSEC_HMAC_KEY, &hkey); - ok(ret, "CryptImportKey error %u\n", GetLastError()); + /* CRYPT_IPSEC_HMAC_KEY is not supported on W2K and lower */ + ok(ret || + broken(!ret && GetLastError() == NTE_BAD_FLAGS), + "CryptImportKey error %u\n", GetLastError()); pCryptDestroyKey(hkey); pCryptReleaseContext(provider, 0);

1 0

Jacek Caban : mshtml: Added support for DISPATCH_METHOD|DISPATCH_PROPERTYGET calls to InvokeEx implementation .
by Alexandre Julliard Oct. 14, 2009

Oct. 14, 2009

Module: wine Branch: master Commit: b7c257bb48e299bc710eb43ff1b028d01f21f576 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7c257bb48e299bc710eb43ff… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 13 20:50:28 2009 +0200 mshtml: Added support for DISPATCH_METHOD|DISPATCH_PROPERTYGET calls to InvokeEx implementation. --- dlls/mshtml/dispex.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 4079242..fc8bd55 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -221,7 +221,7 @@ static void add_func_info(dispex_data_t *data, DWORD *size, tid_t tid, const FUN data->funcs[data->func_cnt].id = desc->memid; data->funcs[data->func_cnt].tid = tid; - data->funcs[data->func_cnt].func_disp_idx = desc->invkind == DISPATCH_METHOD ? data->func_disp_cnt++ : -1; + data->funcs[data->func_cnt].func_disp_idx = (desc->invkind & DISPATCH_METHOD) ? data->func_disp_cnt++ : -1; data->func_cnt++; } @@ -515,6 +515,9 @@ static HRESULT function_value(IUnknown *iface, LCID lcid, WORD flags, DISPPARAMS HRESULT hres; switch(flags) { + case DISPATCH_METHOD|DISPATCH_PROPERTYGET: + if(!res) + return E_INVALIDARG; case DISPATCH_METHOD: hres = typeinfo_invoke(This->obj, This->info, flags, params, res, ei); break; @@ -571,8 +574,10 @@ static HRESULT function_invoke(DispatchEx *This, func_info_t *func, WORD flags, HRESULT hres; switch(flags) { - case DISPATCH_METHOD: case DISPATCH_METHOD|DISPATCH_PROPERTYGET: + if(!res) + return E_INVALIDARG; + case DISPATCH_METHOD: hres = typeinfo_invoke(This, func, flags, dp, res, ei); break; case DISPATCH_PROPERTYGET: { @@ -810,6 +815,9 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc var = &This->dynamic_data->props[idx].var; switch(wFlags) { + case DISPATCH_METHOD|DISPATCH_PROPERTYGET: + if(!pvarRes) + return E_INVALIDARG; case DISPATCH_METHOD: { DISPID named_arg = DISPID_THIS; DISPPARAMS dp = {NULL, &named_arg, 0, 1};

1 0

Jacek Caban : mshtml: Added IHTMLBaseFrame interface stub implementation.
by Alexandre Julliard Oct. 14, 2009

Oct. 14, 2009

Module: wine Branch: master Commit: a4deae49b37397d4f9dfcf179ea904e377771869 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4deae49b37397d4f9dfcf179… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 13 20:49:13 2009 +0200 mshtml: Added IHTMLBaseFrame interface stub implementation. --- dlls/mshtml/htmliframe.c | 219 +++++++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/tests/dom.c | 1 + 2 files changed, 219 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmliframe.c b/dlls/mshtml/htmliframe.c index a482a5b..4ddff4e 100644 --- a/dlls/mshtml/htmliframe.c +++ b/dlls/mshtml/htmliframe.c @@ -33,6 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); typedef struct { HTMLElement element; + const IHTMLFrameBaseVtbl *lpIHTMLFrameBaseVtbl; const IHTMLFrameBase2Vtbl *lpIHTMLFrameBase2Vtbl; LONG ref; @@ -41,6 +42,7 @@ typedef struct { HTMLWindow *content_window; } HTMLIFrame; +#define HTMLFRAMEBASE(x) (&(x)->lpIHTMLFrameBaseVtbl) #define HTMLFRAMEBASE2(x) (&(x)->lpIHTMLFrameBase2Vtbl) static HRESULT create_content_window(HTMLIFrame *This, nsIDOMHTMLDocument *nsdoc, HTMLWindow **ret) @@ -77,6 +79,217 @@ static HRESULT create_content_window(HTMLIFrame *This, nsIDOMHTMLDocument *nsdoc return hres; } +#define HTMLFRAMEBASE_THIS(iface) DEFINE_THIS(HTMLIFrame, IHTMLFrameBase, iface) + +static HRESULT WINAPI HTMLIFrameBase_QueryInterface(IHTMLFrameBase *iface, REFIID riid, void **ppv) +{ + HTMLIFrame *This = HTMLFRAMEBASE_THIS(iface); + + return IHTMLDOMNode_QueryInterface(HTMLDOMNODE(&This->element.node), riid, ppv); +} + +static ULONG WINAPI HTMLIFrameBase_AddRef(IHTMLFrameBase *iface) +{ + HTMLIFrame *This = HTMLFRAMEBASE_THIS(iface); + + return IHTMLDOMNode_AddRef(HTMLDOMNODE(&This->element.node)); +} + +static ULONG WINAPI HTMLIFrameBase_Release(IHTMLFrameBase *iface) +{ + HTMLIFrame *This = HTMLFRAMEBASE_THIS(iface); + + return IHTMLDOMNode_Release(HTMLDOMNODE(&This->element.node)); +} + +static HRESULT WINAPI HTMLIFrameBase_GetTypeInfoCount(IHTMLFrameBase *iface, UINT *pctinfo) +{ + HTMLIFrame *This = HTMLFRAMEBASE_THIS(iface); + + return IDispatchEx_GetTypeInfoCount(DISPATCHEX(&This->element.node.dispex), pctinfo); +} + +static HRESULT WINAPI HTMLIFrameBase_GetTypeInfo(IHTMLFrameBase *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + HTMLIFrame *This = HTMLFRAMEBASE_THIS(iface); + + return IDispatchEx_GetTypeInfo(DISPATCHEX(&This->element.node.dispex), iTInfo, lcid, ppTInfo); +} + +static HRESULT WINAPI HTMLIFrameBase_GetIDsOfNames(IHTMLFrameBase *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + HTMLIFrame *This = HTMLFRAMEBASE_THIS(iface); + + return IDispatchEx_GetIDsOfNames(DISPATCHEX(&This->element.node.dispex), riid, rgszNames, + cNames, lcid, rgDispId); +} + +static HRESULT WINAPI HTMLIFrameBase_Invoke(IHTMLFrameBase *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, + VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + HTMLIFrame *This = HTMLFRAMEBASE_THIS(iface); + + return IDispatchEx_Invoke(DISPATCHEX(&This->element.node.dispex), dispIdMember, riid, lcid, + wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI HTMLIFrameBase_put_src(IHTMLFrameBase *iface, BSTR v) +{ + HTMLIFrame *This = HTMLFRAMEBASE_THIS(iface); + FIXME("(%p)->(%s)\n", This, debugstr_w(v)); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLIFrameBase_get_src(IHTMLFrameBase *iface, BSTR *p) +{ + HTMLIFrame *This = HTMLFRAMEBASE_THIS(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLIFrameBase_put_name(IHTMLFrameBase *iface, BSTR v) +{ + HTMLIFrame *This = HTMLFRAMEBASE_THIS(iface); + FIXME("(%p)->(%s)\n", This, debugstr_w(v)); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLIFrameBase_get_name(IHTMLFrameBase *iface, BSTR *p) +{ + HTMLIFrame *This = HTMLFRAMEBASE_THIS(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLIFrameBase_put_border(IHTMLFrameBase *iface, VARIANT v) +{ + HTMLIFrame *This = HTMLFRAMEBASE_THIS(iface); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLIFrameBase_get_border(IHTMLFrameBase *iface, VARIANT *p) +{ + HTMLIFrame *This = HTMLFRAMEBASE_THIS(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLIFrameBase_put_frameBorder(IHTMLFrameBase *iface, BSTR v) +{ + HTMLIFrame *This = HTMLFRAMEBASE_THIS(iface); + FIXME("(%p)->(%s)\n", This, debugstr_w(v)); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLIFrameBase_get_frameBorder(IHTMLFrameBase *iface, BSTR *p) +{ + HTMLIFrame *This = HTMLFRAMEBASE_THIS(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLIFrameBase_put_frameSpacing(IHTMLFrameBase *iface, VARIANT v) +{ + HTMLIFrame *This = HTMLFRAMEBASE_THIS(iface); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLIFrameBase_get_frameSpacing(IHTMLFrameBase *iface, VARIANT *p) +{ + HTMLIFrame *This = HTMLFRAMEBASE_THIS(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLIFrameBase_put_marginWidth(IHTMLFrameBase *iface, VARIANT v) +{ + HTMLIFrame *This = HTMLFRAMEBASE_THIS(iface); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLIFrameBase_get_marginWidth(IHTMLFrameBase *iface, VARIANT *p) +{ + HTMLIFrame *This = HTMLFRAMEBASE_THIS(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLIFrameBase_put_marginHeight(IHTMLFrameBase *iface, VARIANT v) +{ + HTMLIFrame *This = HTMLFRAMEBASE_THIS(iface); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLIFrameBase_get_marginHeight(IHTMLFrameBase *iface, VARIANT *p) +{ + HTMLIFrame *This = HTMLFRAMEBASE_THIS(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLIFrameBase_put_noResize(IHTMLFrameBase *iface, VARIANT_BOOL v) +{ + HTMLIFrame *This = HTMLFRAMEBASE_THIS(iface); + FIXME("(%p)->(%x)\n", This, v); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLIFrameBase_get_noResize(IHTMLFrameBase *iface, VARIANT_BOOL *p) +{ + HTMLIFrame *This = HTMLFRAMEBASE_THIS(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLIFrameBase_put_scrolling(IHTMLFrameBase *iface, BSTR v) +{ + HTMLIFrame *This = HTMLFRAMEBASE_THIS(iface); + FIXME("(%p)->(%s)\n", This, debugstr_w(v)); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLIFrameBase_get_scrolling(IHTMLFrameBase *iface, BSTR *p) +{ + HTMLIFrame *This = HTMLFRAMEBASE_THIS(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static const IHTMLFrameBaseVtbl HTMLIFrameBaseVtbl = { + HTMLIFrameBase_QueryInterface, + HTMLIFrameBase_AddRef, + HTMLIFrameBase_Release, + HTMLIFrameBase_GetTypeInfoCount, + HTMLIFrameBase_GetTypeInfo, + HTMLIFrameBase_GetIDsOfNames, + HTMLIFrameBase_Invoke, + HTMLIFrameBase_put_src, + HTMLIFrameBase_get_src, + HTMLIFrameBase_put_name, + HTMLIFrameBase_get_name, + HTMLIFrameBase_put_border, + HTMLIFrameBase_get_border, + HTMLIFrameBase_put_frameBorder, + HTMLIFrameBase_get_frameBorder, + HTMLIFrameBase_put_frameSpacing, + HTMLIFrameBase_get_frameSpacing, + HTMLIFrameBase_put_marginWidth, + HTMLIFrameBase_get_marginWidth, + HTMLIFrameBase_put_marginHeight, + HTMLIFrameBase_get_marginHeight, + HTMLIFrameBase_put_noResize, + HTMLIFrameBase_get_noResize, + HTMLIFrameBase_put_scrolling, + HTMLIFrameBase_get_scrolling +}; + #define HTMLFRAMEBASE2_THIS(iface) DEFINE_THIS(HTMLIFrame, IHTMLFrameBase2, iface) static HRESULT WINAPI HTMLIFrameBase2_QueryInterface(IHTMLFrameBase2 *iface, REFIID riid, void **ppv) @@ -265,7 +478,10 @@ static HRESULT HTMLIFrame_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) *ppv = NULL; - if(IsEqualGUID(&IID_IHTMLFrameBase2, riid)) { + if(IsEqualGUID(&IID_IHTMLFrameBase, riid)) { + TRACE("(%p)->(IID_IHTMLFrameBase %p)\n", This, ppv); + *ppv = HTMLFRAMEBASE(This); + }else if(IsEqualGUID(&IID_IHTMLFrameBase2, riid)) { TRACE("(%p)->(IID_IHTMLFrameBase2 %p)\n", This, ppv); *ppv = HTMLFRAMEBASE2(This); }else { @@ -319,6 +535,7 @@ HTMLElement *HTMLIFrame_Create(nsIDOMHTMLElement *nselem) ret = heap_alloc_zero(sizeof(HTMLIFrame)); + ret->lpIHTMLFrameBaseVtbl = &HTMLIFrameBaseVtbl; ret->lpIHTMLFrameBase2Vtbl = &HTMLIFrameBase2Vtbl; ret->element.node.vtbl = &HTMLIFrameImplVtbl; diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index f826a01..d319c03 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -304,6 +304,7 @@ static const IID * const iframe_iids[] = { &IID_IHTMLElement, &IID_IHTMLElement2, &IID_IHTMLElement3, + &IID_IHTMLFrameBase, &IID_IHTMLFrameBase2, &IID_IDispatchEx, &IID_IConnectionPointContainer,

1 0

Paul Vriens : advapi32/tests: Fix a test failure on Vista and higher.
by Alexandre Julliard Oct. 14, 2009

Oct. 14, 2009

Module: wine Branch: master Commit: 133c0f5401c79189d5b3696cbba45db7acc0ba17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=133c0f5401c79189d5b3696cb… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Oct 13 21:03:26 2009 +0200 advapi32/tests: Fix a test failure on Vista and higher. --- dlls/advapi32/tests/security.c | 19 ++++++++----------- 1 files changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index a60136e..d226017 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -2666,6 +2666,7 @@ static void test_ConvertStringSecurityDescriptor(void) DWORD revision; BOOL ret; DWORD GLE; + DWORD altGLE; } cssd[] = { { "D:(A;;GA;;;WD)", 0xdeadbeef, FALSE, ERROR_UNKNOWN_REVISION }, @@ -2673,11 +2674,11 @@ static void test_ConvertStringSecurityDescriptor(void) { "D:(A;;GA;;;WD)", SDDL_REVISION_1, TRUE }, { "D:(D;;GA;;;WD)", SDDL_REVISION_1, TRUE }, { "ERROR:(D;;GA;;;WD)", SDDL_REVISION_1, FALSE, ERROR_INVALID_PARAMETER }, - /* test ACE string type with spaces */ + /* test ACE string with spaces */ { " D:(D;;GA;;;WD)", SDDL_REVISION_1, TRUE }, { "D: (D;;GA;;;WD)", SDDL_REVISION_1, TRUE }, { "D:( D;;GA;;;WD)", SDDL_REVISION_1, TRUE }, - { "D:(D ;;GA;;;WD)", SDDL_REVISION_1, FALSE, RPC_S_INVALID_STRING_UUID }, + { "D:(D ;;GA;;;WD)", SDDL_REVISION_1, FALSE, RPC_S_INVALID_STRING_UUID, ERROR_INVALID_ACL }, /* Vista+ */ { "D:(D; ;GA;;;WD)", SDDL_REVISION_1, TRUE }, { "D:(D;; GA;;;WD)", SDDL_REVISION_1, TRUE }, { "D:(D;;GA ;;;WD)", SDDL_REVISION_1, FALSE, ERROR_INVALID_ACL }, @@ -2699,7 +2700,8 @@ static void test_ConvertStringSecurityDescriptor(void) /* test behaviour with empty strings */ { "", SDDL_REVISION_1, TRUE }, /* test ACE string SID */ - { "D:(D;;GA;;;S-1-0-0)", SDDL_REVISION_1, TRUE } + { "D:(D;;GA;;;S-1-0-0)", SDDL_REVISION_1, TRUE }, + { "D:(D;;GA;;;Nonexistent account)", SDDL_REVISION_1, FALSE, ERROR_INVALID_ACL, ERROR_INVALID_SID } /* W2K */ }; if (!pConvertStringSecurityDescriptorToSecurityDescriptorA) @@ -2718,7 +2720,9 @@ static void test_ConvertStringSecurityDescriptor(void) GLE = GetLastError(); ok(ret == cssd[i].ret, "(%02d) Expected %s (%d)\n", i, cssd[i].ret ? "success" : "failure", GLE); if (!cssd[i].ret) - ok(GLE == cssd[i].GLE, "(%02d) Expected %d, got %d\n", i, cssd[i].GLE, GLE); + ok(GLE == cssd[i].GLE || + (cssd[i].altGLE && GLE == cssd[i].altGLE), + "(%02d) Unexpected last error %d\n", i, GLE); if (ret) LocalFree(pSD); } @@ -2759,13 +2763,6 @@ static void test_ConvertStringSecurityDescriptor(void) Blank, SDDL_REVISION_1, &pSD, NULL); ok(ret, "ConvertStringSecurityDescriptorToSecurityDescriptor failed with error %d\n", GetLastError()); - /* test ACE string SID */ - SetLastError(0xdeadbeef); - ret = pConvertStringSecurityDescriptorToSecurityDescriptorA( - "D:(D;;GA;;;Nonexistent account)", SDDL_REVISION_1, &pSD, NULL); - ok(!ret, "Expected failure, got %d\n", ret); - ok(GetLastError() == ERROR_INVALID_ACL || GetLastError() == ERROR_INVALID_SID, - "Expected ERROR_INVALID_ACL or ERROR_INVALID_SID, got %d\n", GetLastError()); } static void test_ConvertSecurityDescriptorToString(void)

1 0

Jacek Caban : mshtml: Added IHTMLFrameBase IDispatchEx support.
by Alexandre Julliard Oct. 14, 2009

Oct. 14, 2009

Module: wine Branch: master Commit: f6b89e9f1562242aab18f0c4b802aedc669ddbff URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6b89e9f1562242aab18f0c4b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 13 20:49:34 2009 +0200 mshtml: Added IHTMLFrameBase IDispatchEx support. --- dlls/mshtml/dispex.c | 1 + dlls/mshtml/htmliframe.c | 1 + dlls/mshtml/mshtml_private.h | 1 + 3 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 4092374..210c3ae 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -123,6 +123,7 @@ static REFIID tid_ids[] = { &IID_IHTMLElement4, &IID_IHTMLElementCollection, &IID_IHTMLEventObj, + &IID_IHTMLFrameBase, &IID_IHTMLFrameBase2, &IID_IHTMLGenericElement, &IID_IHTMLImgElement, diff --git a/dlls/mshtml/htmliframe.c b/dlls/mshtml/htmliframe.c index 4ddff4e..7af0070 100644 --- a/dlls/mshtml/htmliframe.c +++ b/dlls/mshtml/htmliframe.c @@ -517,6 +517,7 @@ static const tid_t HTMLIFrame_iface_tids[] = { IHTMLElement_tid, IHTMLElement2_tid, IHTMLElement3_tid, + IHTMLFrameBase_tid, IHTMLFrameBase2_tid, 0 }; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index c92bb25..4106500 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -101,6 +101,7 @@ typedef enum { IHTMLElement4_tid, IHTMLElementCollection_tid, IHTMLEventObj_tid, + IHTMLFrameBase_tid, IHTMLFrameBase2_tid, IHTMLGenericElement_tid, IHTMLImgElement_tid,

1 0