March 2009 - Wine-Commits - list.winehq.org

Hans Leidekker : msi: Add tests for MsiEnumProducts.
by Alexandre Julliard March 27, 2009

March 27, 2009

Module: wine Branch: master Commit: f0d1d61d3b8f613dfa82b7169484c32a70ed16b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0d1d61d3b8f613dfa82b7169… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 27 13:40:59 2009 +0100 msi: Add tests for MsiEnumProducts. --- dlls/msi/tests/msi.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 71 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index 928e48a..13afd92 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -10874,6 +10874,76 @@ static void test_MsiGetPatchInfoEx(void) RegCloseKey(udprod); } +static void test_MsiEnumProducts(void) +{ + UINT r; + int found1, found2, found3; + DWORD index; + char product1[39], product2[39], product3[39], guid[39]; + char product_squashed1[33], product_squashed2[33], product_squashed3[33]; + char keypath1[MAX_PATH], keypath2[MAX_PATH], keypath3[MAX_PATH]; + char *usersid; + HKEY key1, key2, key3; + + create_test_guid(product1, product_squashed1); + create_test_guid(product2, product_squashed2); + create_test_guid(product3, product_squashed3); + get_user_sid(&usersid); + + strcpy(keypath1, "Software\\Classes\\Installer\\Products\\"); + strcat(keypath1, product_squashed1); + + r = RegCreateKeyA(HKEY_LOCAL_MACHINE, keypath1, &key1); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + strcpy(keypath2, "Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\Managed\\"); + strcat(keypath2, usersid); + strcat(keypath2, "\\Installer\\Products\\"); + strcat(keypath2, product_squashed2); + + r = RegCreateKeyA(HKEY_LOCAL_MACHINE, keypath2, &key2); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + strcpy(keypath3, "Software\\Microsoft\\Installer\\Products\\"); + strcat(keypath3, product_squashed3); + + r = RegCreateKeyA(HKEY_CURRENT_USER, keypath3, &key3); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + index = 0; + r = MsiEnumProductsA(index, NULL); + ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %u\n", r); + + index = 2; + r = MsiEnumProductsA(index, guid); + ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %u\n", r); + + index = 0; + r = MsiEnumProductsA(index, guid); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + found1 = found2 = found3 = 0; + while ((r = MsiEnumProductsA(index, guid)) == ERROR_SUCCESS) + { + if (!strcmp(product1, guid)) found1 = 1; + if (!strcmp(product2, guid)) found2 = 1; + if (!strcmp(product3, guid)) found3 = 1; + index++; + } + ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %u\n", r); + ok(found1, "product1 not found\n"); + ok(found2, "product2 not found\n"); + ok(found3, "product3 not found\n"); + + RegDeleteKeyA(key1, ""); + RegDeleteKeyA(key2, ""); + RegDeleteKeyA(key3, ""); + RegCloseKey(key1); + RegCloseKey(key2); + RegCloseKey(key3); + LocalFree(usersid); +} + START_TEST(msi) { init_functionpointers(); @@ -10901,6 +10971,7 @@ START_TEST(msi) test_MsiEnumPatchesEx(); test_MsiEnumPatches(); test_MsiGetPatchInfoEx(); + test_MsiEnumProducts(); } test_MsiGetFileVersion();

1 0

Hans Leidekker : msi: Enumerate products from all contexts.
by Alexandre Julliard March 27, 2009

March 27, 2009

Module: wine Branch: master Commit: 9163b0d0a388c2aa2b1e7cf835e01616ba66fb4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9163b0d0a388c2aa2b1e7cf83… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 27 13:40:16 2009 +0100 msi: Enumerate products from all contexts. Fix for office 2007 proofing tools installer. --- dlls/msi/registry.c | 121 ++++++++++++++++++++++++++++++++++++++++--- dlls/msi/tests/automation.c | 2 +- 2 files changed, 114 insertions(+), 9 deletions(-) diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index 3205079..3ba34d1 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -103,6 +103,12 @@ static const WCHAR szUninstall_fmt[] = { 'U','n','i','n','s','t','a','l','l','\\', '%','s',0 }; +static const WCHAR szUserProduct[] = { +'S','o','f','t','w','a','r','e','\\', +'M','i','c','r','o','s','o','f','t','\\', +'I','n','s','t','a','l','l','e','r','\\', +'P','r','o','d','u','c','t','s',0}; + static const WCHAR szUserProduct_fmt[] = { 'S','o','f','t','w','a','r','e','\\', 'M','i','c','r','o','s','o','f','t','\\', @@ -187,6 +193,12 @@ static const WCHAR szInstallProperties_fmt[] = { '%','s','\\','P','r','o','d','u','c','t','s','\\','%','s','\\', 'I','n','s','t','a','l','l','P','r','o','p','e','r','t','i','e','s',0}; +static const WCHAR szInstaller_LocalClassesProd[] = { +'S','o','f','t','w','a','r','e','\\', +'C','l','a','s','s','e','s','\\', +'I','n','s','t','a','l','l','e','r','\\', +'P','r','o','d','u','c','t','s',0}; + static const WCHAR szInstaller_LocalClassesProd_fmt[] = { 'S','o','f','t','w','a','r','e','\\', 'C','l','a','s','s','e','s','\\', @@ -199,6 +211,16 @@ static const WCHAR szInstaller_LocalClassesFeat_fmt[] = { 'I','n','s','t','a','l','l','e','r','\\', 'F','e','a','t','u','r','e','s','\\','%','s',0}; +static const WCHAR szInstaller_LocalManaged_fmt[] = { +'S','o','f','t','w','a','r','e','\\', +'M','i','c','r','o','s','o','f','t','\\', +'W','i','n','d','o','w','s','\\', +'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', +'I','n','s','t','a','l','l','e','r','\\', +'M','a','n','a','g','e','d','\\','%','s','\\', +'I','n','s','t','a','l','l','e','r','\\', +'P','r','o','d','u','c','t','s',0}; + static const WCHAR szInstaller_LocalManagedProd_fmt[] = { 'S','o','f','t','w','a','r','e','\\', 'M','i','c','r','o','s','o','f','t','\\', @@ -1198,25 +1220,108 @@ UINT WINAPI MsiEnumProductsA(DWORD index, LPSTR lpguid) UINT WINAPI MsiEnumProductsW(DWORD index, LPWSTR lpguid) { - HKEY hkeyProducts = 0; - DWORD r; + UINT r; WCHAR szKeyName[SQUISH_GUID_SIZE]; + HKEY key; + DWORD machine_count, managed_count, unmanaged_count; + WCHAR keypath[MAX_PATH]; + LPWSTR usersid = NULL; + + static DWORD last_index; TRACE("%d %p\n", index, lpguid); if (NULL == lpguid) return ERROR_INVALID_PARAMETER; - r = RegCreateKeyW(HKEY_LOCAL_MACHINE, szInstaller_Products, &hkeyProducts); + if (index && index - last_index != 1) + return ERROR_INVALID_PARAMETER; + + r = RegCreateKeyW(HKEY_LOCAL_MACHINE, szInstaller_LocalClassesProd, &key); if( r != ERROR_SUCCESS ) return ERROR_NO_MORE_ITEMS; - r = RegEnumKeyW(hkeyProducts, index, szKeyName, SQUISH_GUID_SIZE); - if( r == ERROR_SUCCESS ) - unsquash_guid(szKeyName, lpguid); - RegCloseKey(hkeyProducts); + r = RegQueryInfoKeyW(key, NULL, NULL, NULL, &machine_count, NULL, NULL, + NULL, NULL, NULL, NULL, NULL); + if( r != ERROR_SUCCESS ) + { + RegCloseKey(key); + return ERROR_NO_MORE_ITEMS; + } - return r; + if (machine_count && index <= machine_count) + { + r = RegEnumKeyW(key, index, szKeyName, SQUISH_GUID_SIZE); + if( r == ERROR_SUCCESS ) + { + unsquash_guid(szKeyName, lpguid); + last_index = index; + RegCloseKey(key); + return ERROR_SUCCESS; + } + } + RegCloseKey(key); + + r = get_user_sid(&usersid); + if (r != ERROR_SUCCESS || !usersid) + { + ERR("Failed to retrieve user SID: %d\n", r); + return r; + } + sprintfW(keypath, szInstaller_LocalManaged_fmt, usersid); + LocalFree(usersid); + + r = RegCreateKeyW(HKEY_LOCAL_MACHINE, keypath, &key); + if( r != ERROR_SUCCESS ) + return ERROR_NO_MORE_ITEMS; + + r = RegQueryInfoKeyW(key, NULL, NULL, NULL, &managed_count, NULL, NULL, + NULL, NULL, NULL, NULL, NULL); + if( r != ERROR_SUCCESS ) + { + RegCloseKey(key); + return ERROR_NO_MORE_ITEMS; + } + + if (managed_count && index <= machine_count + managed_count) + { + r = RegEnumKeyW(key, index - machine_count, szKeyName, SQUISH_GUID_SIZE); + if( r == ERROR_SUCCESS ) + { + unsquash_guid(szKeyName, lpguid); + last_index = index; + RegCloseKey(key); + return ERROR_SUCCESS; + } + } + RegCloseKey(key); + + r = RegCreateKeyW(HKEY_CURRENT_USER, szUserProduct, &key); + if( r != ERROR_SUCCESS ) + return ERROR_NO_MORE_ITEMS; + + r = RegQueryInfoKeyW(key, NULL, NULL, NULL, &unmanaged_count, NULL, NULL, + NULL, NULL, NULL, NULL, NULL); + if( r != ERROR_SUCCESS ) + { + RegCloseKey(key); + return ERROR_NO_MORE_ITEMS; + } + + if (unmanaged_count && index <= machine_count + managed_count + unmanaged_count) + { + r = RegEnumKeyW(key, index - machine_count - managed_count, szKeyName, SQUISH_GUID_SIZE); + if( r == ERROR_SUCCESS ) + { + unsquash_guid(szKeyName, lpguid); + last_index = index; + RegCloseKey(key); + return ERROR_SUCCESS; + } + } + RegCloseKey(key); + + return ERROR_NO_MORE_ITEMS; } UINT WINAPI MsiEnumFeaturesA(LPCSTR szProduct, DWORD index, diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index ca40f09..f9ab254 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -2022,7 +2022,7 @@ static void test_Installer_Products(BOOL bProductInstalled) } } - if (bProductInstalled) todo_wine + if (bProductInstalled) { ok(bProductInstalled == bProductFound, "Product expected to %s installed but product code was %s\n", bProductInstalled ? "be" : "not be",

1 0

Henri Verbeet : wined3d: Remove IWineD3DVertexDeclaration_SetDeclaration() from the public interface.
by Alexandre Julliard March 27, 2009

March 27, 2009

Module: wine Branch: master Commit: 4330d20d0df55bc15058083a377d985caa2fd1bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=4330d20d0df55bc15058083a3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 27 10:25:55 2009 +0100 wined3d: Remove IWineD3DVertexDeclaration_SetDeclaration() from the public interface. --- dlls/wined3d/device.c | 3 ++- dlls/wined3d/vertexdeclaration.c | 7 +++---- dlls/wined3d/wined3d_private.h | 3 +++ include/wine/wined3d.idl | 4 ---- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 70e6f63..a115192 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2172,7 +2172,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVertexDeclaration(IWineD3DDevice* *ppVertexDeclaration = (IWineD3DVertexDeclaration *)object; - hr = IWineD3DVertexDeclaration_SetDeclaration((IWineD3DVertexDeclaration *)object, elements, element_count); + hr = vertexdeclaration_init(object, elements, element_count); + if(FAILED(hr)) { IWineD3DVertexDeclaration_Release((IWineD3DVertexDeclaration *)object); *ppVertexDeclaration = NULL; diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index 0091ce4..ae3bbc1 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -191,9 +191,9 @@ static BOOL declaration_element_valid_ffp(const WINED3DVERTEXELEMENT *element) } } -static HRESULT WINAPI IWineD3DVertexDeclarationImpl_SetDeclaration(IWineD3DVertexDeclaration *iface, - const WINED3DVERTEXELEMENT *elements, UINT element_count) { - IWineD3DVertexDeclarationImpl *This = (IWineD3DVertexDeclarationImpl *)iface; +HRESULT vertexdeclaration_init(IWineD3DVertexDeclarationImpl *This, + const WINED3DVERTEXELEMENT *elements, UINT element_count) +{ HRESULT hr = WINED3D_OK; unsigned int i; char isPreLoaded[MAX_STREAMS]; @@ -271,5 +271,4 @@ const IWineD3DVertexDeclarationVtbl IWineD3DVertexDeclaration_Vtbl = /* IWineD3DVertexDeclaration */ IWineD3DVertexDeclarationImpl_GetParent, IWineD3DVertexDeclarationImpl_GetDevice, - IWineD3DVertexDeclarationImpl_SetDeclaration }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 73c394f..fd37ef5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1765,6 +1765,9 @@ typedef struct IWineD3DVertexDeclarationImpl { extern const IWineD3DVertexDeclarationVtbl IWineD3DVertexDeclaration_Vtbl; +HRESULT vertexdeclaration_init(IWineD3DVertexDeclarationImpl *This, + const WINED3DVERTEXELEMENT *elements, UINT element_count); + /***************************************************************************** * IWineD3DStateBlock implementation structure */ diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index 0c17d7d..2f92898 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -2758,10 +2758,6 @@ interface IWineD3DVertexDeclaration : IWineD3DBase HRESULT GetDevice( [out] IWineD3DDevice **device ); - HRESULT SetDeclaration( - [in] const WINED3DVERTEXELEMENT *elements, - [in] UINT element_count - ); } [

1 0

Henri Verbeet : wined3d: Use separate structures for ddraw style strided data and wined3d' s internal stream info.
by Alexandre Julliard March 27, 2009

March 27, 2009

Module: wine Branch: master Commit: d7c7c768507a923902e9178f98343e22e4e22652 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7c7c768507a923902e9178f9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 27 10:25:55 2009 +0100 wined3d: Use separate structures for ddraw style strided data and wined3d's internal stream info. --- dlls/ddraw/device.c | 76 +++++----- dlls/wined3d/buffer.c | 58 ++++---- dlls/wined3d/device.c | 270 +++++++++++++++++++++++++++++---- dlls/wined3d/drawprim.c | 331 ++++++++++----------------------------- dlls/wined3d/state.c | 303 ++++++++++++++++++------------------- dlls/wined3d/wined3d_private.h | 59 ++++++-- include/wine/wined3d.idl | 35 +---- 7 files changed, 595 insertions(+), 537 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d7c7c768507a923902e91…

1 0

Henri Verbeet : wined3d: Remove IWineD3DVertexDeclarationImpl_GetDeclaration().
by Alexandre Julliard March 27, 2009

March 27, 2009

Module: wine Branch: master Commit: d8a4cc664833901fcaa4af4e1756901e731933a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8a4cc664833901fcaa4af4e1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 27 10:25:55 2009 +0100 wined3d: Remove IWineD3DVertexDeclarationImpl_GetDeclaration(). It's never used. --- dlls/wined3d/vertexdeclaration.c | 17 ----------------- include/wine/wined3d.idl | 4 ---- 2 files changed, 0 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index cef81d3..0091ce4 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -103,22 +103,6 @@ static HRESULT WINAPI IWineD3DVertexDeclarationImpl_GetDevice(IWineD3DVertexDecl return WINED3D_OK; } -static HRESULT WINAPI IWineD3DVertexDeclarationImpl_GetDeclaration(IWineD3DVertexDeclaration *iface, - WINED3DVERTEXELEMENT *elements, UINT *element_count) { - IWineD3DVertexDeclarationImpl *This = (IWineD3DVertexDeclarationImpl *)iface; - HRESULT hr = WINED3D_OK; - - TRACE("(%p) : d3d version %d, elements %p, element_count %p\n", - This, ((IWineD3DImpl *)This->wineD3DDevice->wineD3D)->dxVersion, elements, element_count); - - *element_count = This->declarationWNumElements; - if (elements) { - CopyMemory(elements, This->pDeclarationWine, This->declarationWNumElements * sizeof(WINED3DVERTEXELEMENT)); - } - - return hr; -} - static BOOL declaration_element_valid_ffp(const WINED3DVERTEXELEMENT *element) { switch(element->Usage) @@ -287,6 +271,5 @@ const IWineD3DVertexDeclarationVtbl IWineD3DVertexDeclaration_Vtbl = /* IWineD3DVertexDeclaration */ IWineD3DVertexDeclarationImpl_GetParent, IWineD3DVertexDeclarationImpl_GetDevice, - IWineD3DVertexDeclarationImpl_GetDeclaration, IWineD3DVertexDeclarationImpl_SetDeclaration }; diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index 783c3fa..0c17d7d 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -2758,10 +2758,6 @@ interface IWineD3DVertexDeclaration : IWineD3DBase HRESULT GetDevice( [out] IWineD3DDevice **device ); - HRESULT GetDeclaration( - [out] WINED3DVERTEXELEMENT *elements, - [out] UINT *element_count - ); HRESULT SetDeclaration( [in] const WINED3DVERTEXELEMENT *elements, [in] UINT element_count

1 0

Henri Verbeet : wined3d: Unify vertex and texture formats.
by Alexandre Julliard March 27, 2009

March 27, 2009

Module: wine Branch: master Commit: 4434d00f84c0e254a8c5d27fa80cffaf621897c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4434d00f84c0e254a8c5d27fa… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 27 10:25:56 2009 +0100 wined3d: Unify vertex and texture formats. Some fields should be redundant now, eg. gl_vtx_type and glType. I'll leave that for a different patch to fix though. --- dlls/d3d8/vertexdeclaration.c | 38 ++++++-- dlls/d3d9/vertexdeclaration.c | 85 ++++++++++------- dlls/ddraw/device.c | 44 +++++----- dlls/wined3d/buffer.c | 40 ++++---- dlls/wined3d/device.c | 126 +++++++++++++------------ dlls/wined3d/directx.c | 193 +++++++++++++++++++------------------- dlls/wined3d/drawprim.c | 73 +++++++------- dlls/wined3d/state.c | 41 ++++---- dlls/wined3d/utils.c | 177 ++++++++++++++++++++--------------- dlls/wined3d/vertexdeclaration.c | 123 ++++++++++++------------ dlls/wined3d/wined3d_gl.h | 12 --- dlls/wined3d/wined3d_private.h | 57 ++++++++---- include/wine/wined3d.idl | 46 +++------- 13 files changed, 552 insertions(+), 503 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4434d00f84c0e254a8c5d…

1 0

Henri Verbeet : wined3d: Separate the internal representation of vertex declaration elements from the struct used to create it .
by Alexandre Julliard March 27, 2009

March 27, 2009

Module: wine Branch: master Commit: 9f26fed28dc0c7f356dc9822e82dbae05245cafb URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f26fed28dc0c7f356dc9822e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 27 10:25:56 2009 +0100 wined3d: Separate the internal representation of vertex declaration elements from the struct used to create it. Internally we want to store some extra data, like ffp_valid. One of the later patches also stores the format desc in the declaration elements, instead of the current WINED3DDECLTYPE. --- dlls/wined3d/device.c | 60 +++++++++++++++++++------------------- dlls/wined3d/vertexdeclaration.c | 53 +++++++++++++++++++-------------- dlls/wined3d/vertexshader.c | 7 ++-- dlls/wined3d/wined3d_private.h | 17 +++++++++-- 4 files changed, 79 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9f26fed28dc0c7f356dc9…

1 0

Henri Verbeet : wined3d: Don' t create an END element for wined3d vertex declarations.
by Alexandre Julliard March 27, 2009

March 27, 2009

Module: wine Branch: master Commit: 6f206c75ecd9d9849b47d8faa5b85f26184e8479 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f206c75ecd9d9849b47d8faa… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 27 10:25:56 2009 +0100 wined3d: Don't create an END element for wined3d vertex declarations. Wined3d doesn't need it since it already has the element count. --- dlls/d3d8/vertexdeclaration.c | 5 ----- dlls/d3d9/vertexdeclaration.c | 17 ++++++++++++----- dlls/wined3d/device.c | 13 +++++-------- dlls/wined3d/vertexdeclaration.c | 3 --- include/wine/wined3d.idl | 1 - 5 files changed, 17 insertions(+), 22 deletions(-) diff --git a/dlls/d3d8/vertexdeclaration.c b/dlls/d3d8/vertexdeclaration.c index 46957d0..f2da777 100644 --- a/dlls/d3d8/vertexdeclaration.c +++ b/dlls/d3d8/vertexdeclaration.c @@ -324,11 +324,6 @@ UINT convert_to_wined3d_declaration(const DWORD *d3d8_elements, DWORD *d3d8_elem token += parse_token(token); } - /* END */ - element = *wined3d_elements + element_count++; - element->Stream = 0xFF; - element->Type = WINED3DDECLTYPE_UNUSED; - *d3d8_elements_size = (++token - d3d8_elements) * sizeof(DWORD); return element_count; diff --git a/dlls/d3d9/vertexdeclaration.c b/dlls/d3d9/vertexdeclaration.c index 86403fd..74229e9 100644 --- a/dlls/d3d9/vertexdeclaration.c +++ b/dlls/d3d9/vertexdeclaration.c @@ -312,13 +312,16 @@ static UINT convert_to_wined3d_declaration(const D3DVERTEXELEMENT9* d3d9_element while (element++->Stream != 0xff && element_count++ < 128); if (element_count == 128) { - return 0; + return ~0U; } + /* Skip the END element */ + --element_count; + *wined3d_elements = HeapAlloc(GetProcessHeap(), 0, element_count * sizeof(WINED3DVERTEXELEMENT)); if (!*wined3d_elements) { FIXME("Memory allocation failed\n"); - return 0; + return ~0U; } for (i = 0; i < element_count; ++i) { @@ -335,6 +338,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_CreateVertexDeclaration(LPDIRECT3DDEVICE9E IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; IDirect3DVertexDeclaration9Impl *object = NULL; WINED3DVERTEXELEMENT* wined3d_elements; + UINT wined3d_element_count; UINT element_count; HRESULT hr = D3D_OK; @@ -344,8 +348,9 @@ HRESULT WINAPI IDirect3DDevice9Impl_CreateVertexDeclaration(LPDIRECT3DDEVICE9E return D3DERR_INVALIDCALL; } - element_count = convert_to_wined3d_declaration(pVertexElements, &wined3d_elements); - if (!element_count) { + wined3d_element_count = convert_to_wined3d_declaration(pVertexElements, &wined3d_elements); + if (wined3d_element_count == ~0U) + { FIXME("(%p) : Error parsing vertex declaration\n", This); return D3DERR_INVALIDCALL; } @@ -361,6 +366,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_CreateVertexDeclaration(LPDIRECT3DDEVICE9E object->lpVtbl = &Direct3DVertexDeclaration9_Vtbl; object->ref = 0; + element_count = wined3d_element_count + 1; object->elements = HeapAlloc(GetProcessHeap(), 0, element_count * sizeof(D3DVERTEXELEMENT9)); if (!object->elements) { HeapFree(GetProcessHeap(), 0, wined3d_elements); @@ -372,7 +378,8 @@ HRESULT WINAPI IDirect3DDevice9Impl_CreateVertexDeclaration(LPDIRECT3DDEVICE9E object->element_count = element_count; EnterCriticalSection(&d3d9_cs); - hr = IWineD3DDevice_CreateVertexDeclaration(This->WineD3DDevice, &object->wineD3DVertexDeclaration, (IUnknown *)object, wined3d_elements, element_count); + hr = IWineD3DDevice_CreateVertexDeclaration(This->WineD3DDevice, &object->wineD3DVertexDeclaration, + (IUnknown *)object, wined3d_elements, wined3d_element_count); LeaveCriticalSection(&d3d9_cs); HeapFree(GetProcessHeap(), 0, wined3d_elements); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index dd493f5..5bb9771 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2200,8 +2200,6 @@ static unsigned int ConvertFvfToDeclaration(IWineD3DDeviceImpl *This, /* For the DWORD num_textures = (fvf & WINED3DFVF_TEXCOUNT_MASK) >> WINED3DFVF_TEXCOUNT_SHIFT; DWORD texcoords = (fvf & 0xFFFF0000) >> 16; - - WINED3DVERTEXELEMENT end_element = WINED3DDECL_END(); WINED3DVERTEXELEMENT *elements = NULL; unsigned int size; @@ -2210,14 +2208,12 @@ static unsigned int ConvertFvfToDeclaration(IWineD3DDeviceImpl *This, /* For the /* Compute declaration size */ size = has_pos + (has_blend && num_blends > 0) + has_blend_idx + has_normal + - has_psize + has_diffuse + has_specular + num_textures + 1; + has_psize + has_diffuse + has_specular + num_textures; /* convert the declaration */ elements = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WINED3DVERTEXELEMENT)); - if (!elements) - return 0; + if (!elements) return ~0U; - elements[size-1] = end_element; idx = 0; if (has_pos) { if (!has_blend && (fvf & WINED3DFVF_XYZRHW)) { @@ -2310,7 +2306,8 @@ static unsigned int ConvertFvfToDeclaration(IWineD3DDeviceImpl *This, /* For the } /* Now compute offsets, and initialize the rest of the fields */ - for (idx = 0, offset = 0; idx < size-1; idx++) { + for (idx = 0, offset = 0; idx < size; ++idx) + { elements[idx].Stream = 0; elements[idx].Method = WINED3DDECLMETHOD_DEFAULT; elements[idx].Offset = offset; @@ -2328,7 +2325,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVertexDeclarationFromFVF(IWineD3D DWORD hr; size = ConvertFvfToDeclaration(This, Fvf, &elements); - if (size == 0) return WINED3DERR_OUTOFVIDEOMEMORY; + if (size == ~0U) return WINED3DERR_OUTOFVIDEOMEMORY; hr = IWineD3DDevice_CreateVertexDeclaration(iface, ppVertexDeclaration, Parent, elements, size); HeapFree(GetProcessHeap(), 0, elements); diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index cb2915d..1c23c51 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -206,9 +206,6 @@ HRESULT vertexdeclaration_init(IWineD3DVertexDeclarationImpl *This, } } - /* Skip the END element. */ - --element_count; - This->element_count = element_count; This->elements = HeapAlloc(GetProcessHeap(), 0, sizeof(*This->elements) * element_count); if (!This->elements) diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index 2f92898..bed165b 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -846,7 +846,6 @@ typedef enum _WINED3DDECLTYPE WINED3DDECLTYPE_FLOAT16_4 = 16, WINED3DDECLTYPE_UNUSED = 17, } WINED3DDECLTYPE; -cpp_quote("#define WINED3DDECL_END() {0xFF, 0, WINED3DDECLTYPE_UNUSED, 0, 0, 0, -1}") typedef enum _WINED3DDECLUSAGE {

1 0

Rein Klazes : user32/tests: Show that a submenu is still functional after calling DestroyMenu().
by Alexandre Julliard March 27, 2009

March 27, 2009

Module: wine Branch: master Commit: 5396fbf97d5eb859855366a41e004019ff5980c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5396fbf97d5eb859855366a41… Author: Rein Klazes <wijn(a)online.nl> Date: Fri Mar 27 08:40:26 2009 +0100 user32/tests: Show that a submenu is still functional after calling DestroyMenu(). --- dlls/user32/tests/menu.c | 100 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 100 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index 06fa350..f375123 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -290,6 +290,105 @@ static void test_menu_locked_by_window(void) DestroyWindow(hwnd); } +/* demonstrates that subpopup's are locked + * even after a client calls DestroyMenu on it */ +static LRESULT WINAPI subpopuplocked_wnd_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) +{ + HWND hwndmenu; + switch (msg) + { + case WM_ENTERIDLE: + hwndmenu = GetCapture(); + if( hwndmenu) { + PostMessage( hwndmenu, WM_KEYDOWN, VK_DOWN, 0); + PostMessage( hwndmenu, WM_KEYDOWN, VK_RIGHT, 0); + PostMessage( hwndmenu, WM_KEYDOWN, VK_RETURN, 0); + } + } + return DefWindowProc(hwnd, msg, wparam, lparam); +} + +static void test_subpopup_locked_by_menu(void) +{ + DWORD gle; + BOOL ret; + HMENU hmenu, hsubmenu; + MENUINFO mi = { sizeof( MENUINFO)}; + MENUITEMINFO mii = { sizeof( MENUITEMINFO)}; + HWND hwnd; + const int itemid = 0x1234567; + if( !pGetMenuInfo) + { + win_skip("GetMenuInfo is not available\n"); + return; + } + /* create window, popupmenu with one subpopup */ + hwnd = CreateWindowEx(0, MAKEINTATOM(atomMenuCheckClass), NULL, + WS_VISIBLE, CW_USEDEFAULT, CW_USEDEFAULT, 200, 200, + NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "CreateWindowEx failed with error %d\n", GetLastError()); + SetWindowLongPtr( hwnd, GWLP_WNDPROC, (LONG_PTR) subpopuplocked_wnd_proc); + hmenu = CreatePopupMenu(); + ok(hmenu != NULL, "CreateMenu failed with error %d\n", GetLastError()); + hsubmenu = CreatePopupMenu(); + ok(hsubmenu != NULL, "CreateMenu failed with error %d\n", GetLastError()); + ret = InsertMenu(hmenu, 0, MF_BYPOSITION | MF_POPUP | MF_STRING, (UINT_PTR)hsubmenu, + TEXT("PopUpLockTest")); + ok(ret, "InsertMenu failed with error %d\n", GetLastError()); + ret = InsertMenu(hsubmenu, 0, MF_BYPOSITION | MF_STRING, itemid, TEXT("PopUpMenu")); + ok(ret, "InsertMenu failed with error %d\n", GetLastError()); + /* first some tests that all this functions properly */ + mii.fMask = MIIM_SUBMENU; + ret = GetMenuItemInfo( hmenu, 0, TRUE, &mii); + ok( ret, "GetMenuItemInfo failed error %d\n", GetLastError()); + ok( mii.hSubMenu == hsubmenu, "submenu is %p\n", mii.hSubMenu); + mi.fMask |= MIM_STYLE; + ret = pGetMenuInfo( hsubmenu, &mi); + ok( ret , "GetMenuInfo returned 0 with error %d\n", GetLastError()); + ret = IsMenu( hsubmenu); + ok( ret , "Menu handle is not valid\n"); + SetLastError( 0xdeadbeef); + ret = TrackPopupMenu( hmenu, 0x100, 100,100, 0, hwnd, NULL); + if( ret == (itemid & 0xffff)) { + win_skip("not on 16 bit menu subsystem\n"); + DestroyMenu( hsubmenu); + } else { + gle = GetLastError(); + ok( ret == itemid , "TrackPopupMenu returned %d error is %d\n", ret, gle); + ok( gle == 0 || + broken( gle == 0xdeadbeef), /* win2k0 */ + "Last error is %d\n", gle); + /* then destroy the sub-popup */ + ret = DestroyMenu( hsubmenu); + ok(ret, "DestroyMenu failed with error %d\n", GetLastError()); + /* and repeat the tests */ + mii.fMask = MIIM_SUBMENU; + ret = GetMenuItemInfo( hmenu, 0, TRUE, &mii); + ok( ret, "GetMenuItemInfo failed error %d\n", GetLastError()); + /* GetMenuInfo fails now */ + ok( mii.hSubMenu == hsubmenu, "submenu is %p\n", mii.hSubMenu); + mi.fMask |= MIM_STYLE; + ret = pGetMenuInfo( hsubmenu, &mi); + ok( !ret , "GetMenuInfo should have failed\n"); + /* IsMenu says it is not */ + ret = IsMenu( hsubmenu); + ok( !ret , "Menu handle should be invalid\n"); + /* but TrackPopupMenu still works! */ + SetLastError( 0xdeadbeef); + ret = TrackPopupMenu( hmenu, 0x100, 100,100, 0, hwnd, NULL); + gle = GetLastError(); + todo_wine { + ok( ret == itemid , "TrackPopupMenu returned %d error is %d\n", ret, gle); + } + ok( gle == 0 || + broken( gle == ERROR_INVALID_PARAMETER), /* win2k0 */ + "Last error is %d\n", gle); + } + /* clean up */ + DestroyMenu( hmenu); + DestroyWindow(hwnd); +} + static void test_menu_ownerdraw(void) { int i,j,k; @@ -2768,6 +2867,7 @@ START_TEST(menu) register_menu_check_class(); test_menu_locked_by_window(); + test_subpopup_locked_by_menu(); test_menu_ownerdraw(); test_menu_bmp_and_string(); /* test Get/SetMenuInfo if available */

1 0

Henri Verbeet : wined3d: Make sure the format actually exists in init_format_texture_info().
by Alexandre Julliard March 27, 2009

March 27, 2009

Module: wine Branch: master Commit: 5390628e6f3a0b7ea52f107a164651468af5e449 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5390628e6f3a0b7ea52f107a1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 27 10:25:55 2009 +0100 wined3d: Make sure the format actually exists in init_format_texture_info(). --- dlls/wined3d/utils.c | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 059c021..0d51701 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -429,7 +429,7 @@ static BOOL check_fbo_compat(const WineD3D_GL_Info *gl_info, GLint internal_form return status == GL_FRAMEBUFFER_COMPLETE_EXT; } -static void init_format_texture_info(WineD3D_GL_Info *gl_info) +static BOOL init_format_texture_info(WineD3D_GL_Info *gl_info) { unsigned int i; @@ -438,6 +438,13 @@ static void init_format_texture_info(WineD3D_GL_Info *gl_info) int fmt_idx = getFmtIdx(gl_formats_template[i].fmt); struct GlPixelFormatDesc *desc; + if (fmt_idx == -1) + { + ERR("Format %s (%#x) not found.\n", + debug_d3dformat(gl_formats_template[i].fmt), gl_formats_template[i].fmt); + return FALSE; + } + desc = &gl_info->gl_formats[fmt_idx]; desc->glInternal = gl_formats_template[i].glInternal; desc->glGammaInternal = gl_formats_template[i].glGammaInternal; @@ -470,6 +477,8 @@ static void init_format_texture_info(WineD3D_GL_Info *gl_info) desc->rtInternal = gl_formats_template[i].glInternal; } } + + return TRUE; } static void apply_format_fixups(WineD3D_GL_Info *gl_info) @@ -608,7 +617,11 @@ BOOL initPixelFormats(WineD3D_GL_Info *gl_info) { if (!init_format_base_info(gl_info)) return FALSE; - init_format_texture_info(gl_info); + if (!init_format_texture_info(gl_info)) + { + HeapFree(GetProcessHeap(), 0, gl_info->gl_formats); + return FALSE; + } apply_format_fixups(gl_info);

1 0