March 2010 - Wine-commits - list.winehq.org

Christian Costa : d3dxof: Avoid using strlen for specifying templates or objects size.
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: c37ada25bb23ca88ed7e11237a6b2764b99c9f6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c37ada25bb23ca88ed7e11237… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Mon Mar 8 08:55:58 2010 +0100 d3dxof: Avoid using strlen for specifying templates or objects size. --- dlls/d3dxof/tests/d3dxof.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/d3dxof/tests/d3dxof.c b/dlls/d3dxof/tests/d3dxof.c index b630ae4..f1d020a 100644 --- a/dlls/d3dxof/tests/d3dxof.c +++ b/dlls/d3dxof/tests/d3dxof.c @@ -111,11 +111,11 @@ static void test_refcount(void) ref = IDirectXFile_Release(lpDirectXFile); ok(ref == 1, "Got refcount %d, expected 1\n", ref); - hr = IDirectXFile_RegisterTemplates(lpDirectXFile, template, strlen(template)); + hr = IDirectXFile_RegisterTemplates(lpDirectXFile, template, sizeof(template) - 1); ok(hr == DXFILE_OK, "IDirectXFileImpl_RegisterTemplates: %x\n", hr); dxflm.lpMemory = &object; - dxflm.dSize = strlen(object); + dxflm.dSize = sizeof(object) - 1; hr = IDirectXFile_CreateEnumObject(lpDirectXFile, &dxflm, DXFILELOAD_FROMMEMORY, &lpdxfeo); ok(hr == DXFILE_OK, "IDirectXFile_CreateEnumObject: %x\n", hr); ref = getRefcount( (IUnknown *) lpDirectXFile); @@ -176,11 +176,11 @@ static void test_CreateEnumObject(void) return; } - hr = IDirectXFile_RegisterTemplates(lpDirectXFile, template, strlen(template)); + hr = IDirectXFile_RegisterTemplates(lpDirectXFile, template, sizeof(template) - 1); ok(hr == DXFILE_OK, "IDirectXFileImpl_RegisterTemplates: %x\n", hr); dxflm.lpMemory = &object; - dxflm.dSize = strlen(object); + dxflm.dSize = sizeof(object) - 1; /* Check that only lowest 4 bits are relevant in DXFILELOADOPTIONS */ hr = IDirectXFile_CreateEnumObject(lpDirectXFile, &dxflm, 0xFFFFFFF0 + DXFILELOAD_FROMMEMORY, &lpdxfeo); ok(hr == DXFILE_OK, "IDirectXFile_CreateEnumObject: %x\n", hr); @@ -225,10 +225,10 @@ static void test_file_types(void) return; } - hr = IDirectXFile_RegisterTemplates(dxfile, empty_txt_file, strlen(empty_txt_file)); + hr = IDirectXFile_RegisterTemplates(dxfile, empty_txt_file, sizeof(empty_txt_file) - 1); ok(hr == DXFILE_OK, "IDirectXFileImpl_RegisterTemplates: %x\n", hr); - hr = IDirectXFile_RegisterTemplates(dxfile, empty_bin_file, strlen(empty_bin_file)); + hr = IDirectXFile_RegisterTemplates(dxfile, empty_bin_file, sizeof(empty_bin_file) - 1); ok(hr == DXFILE_OK, "IDirectXFileImpl_RegisterTemplates: %x\n", hr); hr = IDirectXFile_RegisterTemplates(dxfile, empty_tzip_file, sizeof(empty_tzip_file) - 1); @@ -237,20 +237,20 @@ static void test_file_types(void) hr = IDirectXFile_RegisterTemplates(dxfile, empty_bzip_file, sizeof(empty_bzip_file) - 1); todo_wine ok(hr == DXFILE_OK, "IDirectXFileImpl_RegisterTemplates: %x\n", hr); - hr = IDirectXFile_RegisterTemplates(dxfile, empty_cmp_file, strlen(empty_cmp_file)); + hr = IDirectXFile_RegisterTemplates(dxfile, empty_cmp_file, sizeof(empty_cmp_file) - 1); ok(hr == DXFILEERR_BADFILETYPE, "IDirectXFileImpl_RegisterTemplates: %x\n", hr); - hr = IDirectXFile_RegisterTemplates(dxfile, empty_xxxx_file, strlen(empty_xxxx_file)); + hr = IDirectXFile_RegisterTemplates(dxfile, empty_xxxx_file, sizeof(empty_xxxx_file) - 1); ok(hr == DXFILEERR_BADFILETYPE, "IDirectXFileImpl_RegisterTemplates: %x\n", hr); lminfo.lpMemory = empty_txt_file; - lminfo.dSize = strlen(empty_txt_file); + lminfo.dSize = sizeof(empty_txt_file) - 1; hr = IDirectXFile_CreateEnumObject(dxfile, &lminfo, DXFILELOAD_FROMMEMORY, &enum_object); ok(hr == DXFILE_OK, "IDirectXFile_CreateEnumObject: %x\n", hr); if (hr == DXFILE_OK) IDirectXFileEnumObject_Release(enum_object); lminfo.lpMemory = empty_bin_file; - lminfo.dSize = strlen(empty_bin_file); + lminfo.dSize = sizeof(empty_bin_file) - 1; hr = IDirectXFile_CreateEnumObject(dxfile, &lminfo, DXFILELOAD_FROMMEMORY, &enum_object); ok(hr == DXFILE_OK, "IDirectXFile_CreateEnumObject: %x\n", hr); if (hr == DXFILE_OK) IDirectXFileEnumObject_Release(enum_object); @@ -268,12 +268,12 @@ static void test_file_types(void) if (hr == DXFILE_OK) IDirectXFileEnumObject_Release(enum_object); lminfo.lpMemory = empty_cmp_file; - lminfo.dSize = strlen(empty_cmp_file); + lminfo.dSize = sizeof(empty_cmp_file) - 1; hr = IDirectXFile_CreateEnumObject(dxfile, &lminfo, DXFILELOAD_FROMMEMORY, &enum_object); ok(hr == DXFILEERR_BADFILETYPE, "IDirectXFile_CreateEnumObject: %x\n", hr); lminfo.lpMemory = empty_xxxx_file; - lminfo.dSize = strlen(empty_xxxx_file); + lminfo.dSize = sizeof(empty_xxxx_file) - 1; hr = IDirectXFile_CreateEnumObject(dxfile, &lminfo, DXFILELOAD_FROMMEMORY, &enum_object); ok(hr == DXFILEERR_BADFILETYPE, "IDirectXFile_CreateEnumObject: %x\n", hr); @@ -421,7 +421,7 @@ static void test_dump(void) goto exit; } - hr = IDirectXFile_RegisterTemplates(lpDirectXFile, pvData, strlen(pvData)); + hr = IDirectXFile_RegisterTemplates(lpDirectXFile, pvData, cbSize); ok(hr == DXFILE_OK, "IDirectXFileImpl_RegisterTemplates: %x\n", hr); hr = IDirectXFile_CreateEnumObject(lpDirectXFile, (LPVOID)"objects.txt", DXFILELOAD_FROMFILE, &lpDirectXFileEnumObject);

1 0

Christian Costa : d3dx9_36: Rename variables in D3DXGetShaderConstantTable( Ex) to match naming convention used in the file.
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: c29f186fe02007a0b7fb4687283e91c025ca3510 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c29f186fe02007a0b7fb46872… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Mon Mar 8 08:56:22 2010 +0100 d3dx9_36: Rename variables in D3DXGetShaderConstantTable(Ex) to match naming convention used in the file. --- dlls/d3dx9_36/shader.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index e4de6b3..c65f674 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -585,21 +585,21 @@ static const struct ID3DXConstantTableVtbl ID3DXConstantTable_Vtbl = ID3DXConstantTableImpl_SetMatrixTransposePointerArray }; -HRESULT WINAPI D3DXGetShaderConstantTableEx(CONST DWORD* pFunction, +HRESULT WINAPI D3DXGetShaderConstantTableEx(CONST DWORD* byte_code, DWORD flags, - LPD3DXCONSTANTTABLE* ppConstantTable) + LPD3DXCONSTANTTABLE* constant_table) { ID3DXConstantTableImpl* object; HRESULT hr; LPCVOID data; UINT size; - FIXME("(%p, %x, %p): semi-stub\n", pFunction, flags, ppConstantTable); + FIXME("(%p, %x, %p): semi-stub\n", byte_code, flags, constant_table); - if (!pFunction || !ppConstantTable) + if (!byte_code || !constant_table) return D3DERR_INVALIDCALL; - hr = D3DXFindShaderComment(pFunction, MAKEFOURCC('C','T','A','B'), &data, &size); + hr = D3DXFindShaderComment(byte_code, MAKEFOURCC('C','T','A','B'), &data, &size); if (hr != D3D_OK) return D3DXERR_INVALIDDATA; @@ -623,15 +623,15 @@ HRESULT WINAPI D3DXGetShaderConstantTableEx(CONST DWORD* pFunction, object->size = size; memcpy(object->ctab, data, object->size); - *ppConstantTable = (LPD3DXCONSTANTTABLE)object; + *constant_table = (LPD3DXCONSTANTTABLE)object; return D3D_OK; } -HRESULT WINAPI D3DXGetShaderConstantTable(CONST DWORD* pFunction, - LPD3DXCONSTANTTABLE* ppConstantTable) +HRESULT WINAPI D3DXGetShaderConstantTable(CONST DWORD* byte_code, + LPD3DXCONSTANTTABLE* constant_table) { - TRACE("(%p, %p): Forwarded to D3DXGetShaderConstantTableEx\n", pFunction, ppConstantTable); + TRACE("(%p, %p): Forwarded to D3DXGetShaderConstantTableEx\n", byte_code, constant_table); - return D3DXGetShaderConstantTableEx(pFunction, 0, ppConstantTable); + return D3DXGetShaderConstantTableEx(byte_code, 0, constant_table); }

1 0

Christian Costa : d3dx9: Fix typo in ID3DXConstantTable_SetMatrixTranspose macro.
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: 8991b214b6a60ccd52c4cf493c0486a8e3728d8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8991b214b6a60ccd52c4cf493… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Mon Mar 8 08:56:28 2010 +0100 d3dx9: Fix typo in ID3DXConstantTable_SetMatrixTranspose macro. --- include/d3dx9shader.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/d3dx9shader.h b/include/d3dx9shader.h index 766d4ca..371d46d 100644 --- a/include/d3dx9shader.h +++ b/include/d3dx9shader.h @@ -207,7 +207,7 @@ DECLARE_INTERFACE_(ID3DXConstantTable, ID3DXBuffer) #define ID3DXConstantTable_SetMatrix(p,a,b,c) (p)->SetMatrix(a,b,c) #define ID3DXConstantTable_SetMatrixArray(p,a,b,c,d) (p)->SetMatrixArray(a,b,c,d) #define ID3DXConstantTable_SetMatrixPointerArray(p,a,b,c,d) (p)->SetMatrixPointerArray(a,b,c,d) -#define ID3DXConstantTable_SetMatrixTranspose(p,a,b,c) (p)->>SetMatrixTranspose(a,b,c) +#define ID3DXConstantTable_SetMatrixTranspose(p,a,b,c) (p)->SetMatrixTranspose(a,b,c) #define ID3DXConstantTable_SetMatrixTransposeArray(p,a,b,c,d) (p)->SetMatrixTransposeArray(a,b,c,d) #define ID3DXConstantTable_SetMatrixTransposePointerArray(p,a,b,c,d) (p)->SetMatrixTransposePointerArray(a,b,c,d) #endif

1 0

Christian Costa : d3dx9: Add some shader definitions.
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: 2a933cb016da46ff348d5a88a0b82f45ebf5ff4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a933cb016da46ff348d5a88a… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Mon Mar 8 08:56:34 2010 +0100 d3dx9: Add some shader definitions. --- include/d3dx9shader.h | 39 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 39 insertions(+), 0 deletions(-) diff --git a/include/d3dx9shader.h b/include/d3dx9shader.h index 371d46d..2fee386 100644 --- a/include/d3dx9shader.h +++ b/include/d3dx9shader.h @@ -299,4 +299,43 @@ HRESULT WINAPI D3DXGetShaderConstantTable(CONST DWORD* byte_code, } #endif +typedef struct _D3DXSHADER_CONSTANTTABLE +{ + DWORD Size; + DWORD Creator; + DWORD Version; + DWORD Constants; + DWORD ConstantInfo; + DWORD Flags; + DWORD Target; +} D3DXSHADER_CONSTANTTABLE, *LPD3DXSHADER_CONSTANTTABLE; + +typedef struct _D3DXSHADER_CONSTANTINFO +{ + DWORD Name; + WORD RegisterSet; + WORD RegisterIndex; + WORD RegisterCount; + WORD Reserved; + DWORD TypeInfo; + DWORD DefaultValue; +} D3DXSHADER_CONSTANTINFO, *LPD3DXSHADER_CONSTANTINFO; + +typedef struct _D3DXSHADER_TYPEINFO +{ + WORD Class; + WORD Type; + WORD Rows; + WORD Columns; + WORD Elements; + WORD StructMembers; + DWORD StructMemberInfo; +} D3DXSHADER_TYPEINFO, *LPD3DXSHADER_TYPEINFO; + +typedef struct _D3DXSHADER_STRUCTMEMBERINFO +{ + DWORD Name; + DWORD TypeInfo; +} D3DXSHADER_STRUCTMEMBERINFO, *LPD3DXSHADER_STRUCTMEMBERINFO; + #endif /* __D3DX9SHADER_H__ */

1 0

Christian Costa : d3dx9_36/tests: Fix contant table header in ctab data.
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: e6d540d5c8ecf59bbf429b298903eab774be0b00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6d540d5c8ecf59bbf429b298… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Mon Mar 8 08:56:40 2010 +0100 d3dx9_36/tests: Fix contant table header in ctab data. --- dlls/d3dx9_36/tests/shader.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index 8a2a5b1..c49d089 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -43,8 +43,8 @@ static const DWORD simple_ps[] = { static const DWORD shader_with_ctab[] = { 0xfffe0300, /* vs_3_0 */ 0x0002fffe, FCC_TEXT, 0x00000000, /* TEXT comment */ - 0x0006fffe, FCC_CTAB, 0x0000001c, 0x00000000, 0xfffe0300, 0x00000000, /* CTAB comment */ - 0x00000000, + 0x0008fffe, FCC_CTAB, 0x0000001c, 0x00000000, 0xfffe0300, 0x00000000, /* CTAB comment */ + 0x00000000, 0x00000000, 0x00000000, 0x0004fffe, FCC_TEXT, 0x00000000, 0x00000000, 0x00000000, /* TEXT comment */ 0x0000ffff}; /* END */ @@ -111,7 +111,7 @@ static void test_find_shader_comment(void) hr = D3DXFindShaderComment(shader_with_ctab, MAKEFOURCC('C','T','A','B'), &data, &size); ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); ok(data == (LPCVOID)(shader_with_ctab + 6), "Got result %p, expected %p\n", data, shader_with_ctab + 6); - ok(size == 20, "Got result %d, expected 20\n", size); + ok(size == 28, "Got result %d, expected 28\n", size); } static void test_get_shader_constant_table_ex(void) @@ -139,7 +139,7 @@ static void test_get_shader_constant_table_ex(void) if (constant_table) { size = ID3DXConstantTable_GetBufferSize(constant_table); - ok(size == 20, "Got result %x, expected 20\n", size); + ok(size == 28, "Got result %x, expected 28\n", size); data = ID3DXConstantTable_GetBufferPointer(constant_table); ok(!memcmp(data, shader_with_ctab + 6, size), "Retreived wrong CTAB data\n");

1 0

Paul Vriens : advapi32/tests: Restore default cryptographic provider after the tests.
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: 0b994d0aee643c59b985613802d3d4aa069f3554 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b994d0aee643c59b98561380… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Mar 8 11:16:15 2010 +0100 advapi32/tests: Restore default cryptographic provider after the tests. --- dlls/advapi32/tests/crypt.c | 18 +++++++++++++++++- 1 files changed, 17 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/tests/crypt.c b/dlls/advapi32/tests/crypt.c index 2a5993c..12288fd 100644 --- a/dlls/advapi32/tests/crypt.c +++ b/dlls/advapi32/tests/crypt.c @@ -856,6 +856,8 @@ static void test_set_provider_ex(void) { DWORD result; DWORD notNull = 5; + LPSTR curProvName = NULL; + DWORD curlen; /* results */ LPSTR pszProvName = NULL; @@ -867,6 +869,13 @@ static void test_set_provider_ex(void) return; } + /* store the current one */ + pCryptGetDefaultProviderA(PROV_RSA_FULL, NULL, CRYPT_MACHINE_DEFAULT, NULL, &curlen); + if (!(curProvName = LocalAlloc(LMEM_ZEROINIT, curlen))) + return; + result = pCryptGetDefaultProviderA(PROV_RSA_FULL, NULL, CRYPT_MACHINE_DEFAULT, curProvName, &curlen); + ok(result, "%d\n", GetLastError()); + /* check pdwReserved for NULL */ result = pCryptSetProviderExA(MS_DEF_PROV, PROV_RSA_FULL, &notNull, CRYPT_MACHINE_DEFAULT); ok(!result && GetLastError()==ERROR_INVALID_PARAMETER, "expected %i, got %d\n", @@ -880,6 +889,7 @@ static void test_set_provider_ex(void) ok( GetLastError() == ERROR_ACCESS_DENIED || broken(GetLastError() == ERROR_INVALID_PARAMETER), "wrong error %u\n", GetLastError() ); skip("Not enough rights to remove the default provider\n"); + LocalFree(curProvName); return; } @@ -889,13 +899,19 @@ static void test_set_provider_ex(void) /* call CryptGetDefaultProvider to see if they match */ result = pCryptGetDefaultProviderA(PROV_RSA_FULL, NULL, CRYPT_MACHINE_DEFAULT, NULL, &cbProvName); if (!(pszProvName = LocalAlloc(LMEM_ZEROINIT, cbProvName))) - return; + goto reset; result = pCryptGetDefaultProviderA(PROV_RSA_FULL, NULL, CRYPT_MACHINE_DEFAULT, pszProvName, &cbProvName); ok(result && !strcmp(MS_DEF_PROV, pszProvName), "expected %s, got %s\n", MS_DEF_PROV, pszProvName); ok(result && cbProvName==(strlen(MS_DEF_PROV) + 1), "expected %i, got %d\n", (lstrlenA(MS_DEF_PROV) + 1), cbProvName); LocalFree(pszProvName); + +reset: + /* Set the provider back to it's original */ + result = pCryptSetProviderExA(curProvName, PROV_RSA_FULL, NULL, CRYPT_MACHINE_DEFAULT); + ok(result, "%d\n", GetLastError()); + LocalFree(curProvName); } static void test_machine_guid(void)

1 0

Paul Vriens : oleaut32/tests: Don't add typelib information to the registry .
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: 13762e233dfa0d62e9446b045a3eb510b30d31e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13762e233dfa0d62e9446b045… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Mar 8 15:09:29 2010 +0100 oleaut32/tests: Don't add typelib information to the registry. --- dlls/oleaut32/tests/typelib.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 5aee88d..5f4d997 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -1378,7 +1378,7 @@ static void test_CreateTypeLib(void) { ok(hres == S_OK, "got %08x\n", hres); ICreateTypeLib2_Release(createtl); - hres = LoadTypeLib(filenameW, &tl); + hres = LoadTypeLibEx(filenameW, REGKIND_NONE, &tl); ok(hres == S_OK, "got %08x\n", hres); ITypeInfo_Release(interface2);

1 0

Vincent Povirk : gdiplus: Don' t crash when creating a texture with NULL imageattributes.
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: 69e9de1867d78ba54c58d028642efde1880161de URL: http://source.winehq.org/git/wine.git/?a=commit;h=69e9de1867d78ba54c58d0286… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Mar 8 11:28:25 2010 -0600 gdiplus: Don't crash when creating a texture with NULL imageattributes. --- dlls/gdiplus/brush.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index abcc47f..287d9d8 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -838,7 +838,10 @@ GpStatus WINGDIPAPI GdipCreateTextureIA(GpImage *image, (*texture)->brush.gdibrush = CreateBrushIndirect(&(*texture)->brush.lb); (*texture)->brush.bt = BrushTypeTextureFill; - (*texture)->wrap = imageattr->wrap; + if (imageattr) + (*texture)->wrap = imageattr->wrap; + else + (*texture)->wrap = WrapModeTile; (*texture)->image = new_image; exit:

1 0

Vincent Povirk : gdiplus: Add a test for GdipGetMetafileHeaderFromMetafile.
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: 89e5c26236d10853518cfeef4ddb58488bdf9263 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89e5c26236d10853518cfeef4… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Mar 8 15:04:42 2010 -0600 gdiplus: Add a test for GdipGetMetafileHeaderFromMetafile. --- dlls/gdiplus/tests/image.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 44 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 9085ef2..2810b51 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -828,6 +828,7 @@ static void test_loadwmf(void) GpRectF bounds; GpUnit unit; REAL res = 12345.0; + MetafileHeader header; hglob = GlobalAlloc (0, sizeof(wmfimage)); data = GlobalLock (hglob); @@ -863,6 +864,27 @@ static void test_loadwmf(void) expect(Ok, stat); todo_wine expectf(1440.0, res); + memset(&header, 0, sizeof(header)); + stat = GdipGetMetafileHeaderFromMetafile((GpMetafile*)img, &header); + expect(Ok, stat); + if (stat == Ok) + { + todo_wine expect(MetafileTypeWmfPlaceable, header.Type); + todo_wine expect(sizeof(wmfimage)-sizeof(WmfPlaceableFileHeader), header.Size); + todo_wine expect(0x300, header.Version); + expect(0, header.EmfPlusFlags); + todo_wine expectf(1440.0, header.DpiX); + todo_wine expectf(1440.0, header.DpiY); + expect(0, header.X); + expect(0, header.Y); + todo_wine expect(320, header.Width); + todo_wine expect(320, header.Height); + todo_wine expect(1, header.WmfHeader.mtType); + expect(0, header.EmfPlusHeaderSize); + expect(0, header.LogicalDpiX); + expect(0, header.LogicalDpiY); + } + GdipDisposeImage(img); } @@ -874,6 +896,7 @@ static void test_createfromwmf(void) GpRectF bounds; GpUnit unit; REAL res = 12345.0; + MetafileHeader header; hwmf = SetMetaFileBitsEx(sizeof(wmfimage)-sizeof(WmfPlaceableFileHeader), wmfimage+sizeof(WmfPlaceableFileHeader)); @@ -899,6 +922,27 @@ static void test_createfromwmf(void) expect(Ok, stat); expectf(1440.0, res); + memset(&header, 0, sizeof(header)); + stat = GdipGetMetafileHeaderFromMetafile((GpMetafile*)img, &header); + expect(Ok, stat); + if (stat == Ok) + { + todo_wine expect(MetafileTypeWmfPlaceable, header.Type); + todo_wine expect(sizeof(wmfimage)-sizeof(WmfPlaceableFileHeader), header.Size); + todo_wine expect(0x300, header.Version); + expect(0, header.EmfPlusFlags); + todo_wine expectf(1440.0, header.DpiX); + todo_wine expectf(1440.0, header.DpiY); + expect(0, header.X); + expect(0, header.Y); + todo_wine expect(320, header.Width); + todo_wine expect(320, header.Height); + todo_wine expect(1, header.WmfHeader.mtType); + expect(0, header.EmfPlusHeaderSize); + expect(0, header.LogicalDpiX); + expect(0, header.LogicalDpiY); + } + GdipDisposeImage(img); }

1 0

Vincent Povirk : gdiplus: Zero the MetafileHeader structure in GetMetafileHeader.
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: c1c555e3dffdf02e98d143a744f8f8161f36e98d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1c555e3dffdf02e98d143a74… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Mar 8 15:09:13 2010 -0600 gdiplus: Zero the MetafileHeader structure in GetMetafileHeader. Since we return success, we should at least make sure the result is not uninitialized memory. --- dlls/gdiplus/image.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index d72d4cf..0d95579 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -2108,6 +2108,8 @@ GpStatus WINGDIPAPI GdipGetMetafileHeaderFromMetafile(GpMetafile * metafile, if(!(calls++)) FIXME("not implemented\n"); + memset(header, 0, sizeof(MetafileHeader)); + return Ok; }

1 0