wine-commits March 2010

wine-commits@winehq.org

3 participants
919 discussions

Christian Costa : d3dx9_36: Find, store and enable retreival of CTAB comment data in shader ( based on code from Luis Busquets).
by Alexandre Julliard 01 Mar '10

01 Mar '10

Module: wine Branch: master Commit: 4072edc11111be5d26ca442862d021f5cd53e779 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4072edc11111be5d26ca44286… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Mon Mar 1 09:39:29 2010 +0100 d3dx9_36: Find, store and enable retreival of CTAB comment data in shader (based on code from Luis Busquets). --- dlls/d3dx9_36/shader.c | 30 ++++++++++++++++++++++++++---- dlls/d3dx9_36/tests/shader.c | 42 ++++++++++++++++++++++++++++++++++++++++++ include/d3dx9shader.h | 7 +++++++ 3 files changed, 75 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 22c297e..5de3cad 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -277,6 +277,8 @@ static const struct ID3DXConstantTableVtbl ID3DXConstantTable_Vtbl; typedef struct ID3DXConstantTableImpl { const ID3DXConstantTableVtbl *lpVtbl; LONG ref; + LPVOID ctab; + DWORD size; } ID3DXConstantTableImpl; /*** IUnknown methods ***/ @@ -316,7 +318,10 @@ static ULONG WINAPI ID3DXConstantTableImpl_Release(ID3DXConstantTable* iface) TRACE("(%p)->(): Release from %d\n", This, ref + 1); if (!ref) + { + HeapFree(GetProcessHeap(), 0, This->ctab); HeapFree(GetProcessHeap(), 0, This); + } return ref; } @@ -326,18 +331,18 @@ static LPVOID WINAPI ID3DXConstantTableImpl_GetBufferPointer(ID3DXConstantTable* { ID3DXConstantTableImpl *This = (ID3DXConstantTableImpl *)iface; - FIXME("(%p)->(): stub\n", This); + TRACE("(%p)->()\n", This); - return NULL; + return This->ctab; } static DWORD WINAPI ID3DXConstantTableImpl_GetBufferSize(ID3DXConstantTable* iface) { ID3DXConstantTableImpl *This = (ID3DXConstantTableImpl *)iface; - FIXME("(%p)->(): stub\n", This); + TRACE("(%p)->()\n", This); - return 0; + return This->size; } /*** ID3DXConstantTable methods ***/ @@ -583,12 +588,19 @@ HRESULT WINAPI D3DXGetShaderConstantTableEx(CONST DWORD* pFunction, LPD3DXCONSTANTTABLE* ppConstantTable) { ID3DXConstantTableImpl* object; + HRESULT hr; + LPCVOID data; + UINT size; FIXME("(%p, %x, %p): semi-stub\n", pFunction, flags, ppConstantTable); if (!pFunction || !ppConstantTable) return D3DERR_INVALIDCALL; + hr = D3DXFindShaderComment(pFunction, MAKEFOURCC('C','T','A','B'), &data, &size); + if (hr != D3D_OK) + return D3DXERR_INVALIDDATA; + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ID3DXConstantTableImpl)); if (!object) { @@ -599,6 +611,16 @@ HRESULT WINAPI D3DXGetShaderConstantTableEx(CONST DWORD* pFunction, object->lpVtbl = &ID3DXConstantTable_Vtbl; object->ref = 1; + object->ctab = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); + if (!object->ctab) + { + HeapFree(GetProcessHeap(), 0, object); + ERR("Out of memory\n"); + return E_OUTOFMEMORY; + } + object->size = size; + memcpy(object->ctab, data, object->size); + *ppConstantTable = (LPD3DXCONSTANTTABLE)object; return D3D_OK; diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index 03c77c2..8a2a5b1 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -48,6 +48,13 @@ static const DWORD shader_with_ctab[] = { 0x0004fffe, FCC_TEXT, 0x00000000, 0x00000000, 0x00000000, /* TEXT comment */ 0x0000ffff}; /* END */ +static const DWORD shader_with_invalid_ctab[] = { + 0xfffe0300, /* vs_3_0 */ + 0x0005fffe, FCC_CTAB, /* CTAB comment */ + 0x0000001c, 0x000000a9, 0xfffe0300, + 0x00000000, 0x00000000, + 0x0000ffff}; /* END */ + static void test_get_shader_size(void) { UINT shader_size, expected; @@ -107,9 +114,44 @@ static void test_find_shader_comment(void) ok(size == 20, "Got result %d, expected 20\n", size); } +static void test_get_shader_constant_table_ex(void) +{ + LPD3DXCONSTANTTABLE constant_table = NULL; + HRESULT hr; + LPVOID data; + DWORD size; + + hr = D3DXGetShaderConstantTableEx(NULL, 0, &constant_table); + ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); + + /* No CTAB data */ + hr = D3DXGetShaderConstantTableEx(simple_ps, 0, &constant_table); + ok(hr == D3DXERR_INVALIDDATA, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DXERR_INVALIDDATA); + + /* With invalid CTAB data */ + hr = D3DXGetShaderConstantTableEx(shader_with_invalid_ctab, 0, &constant_table); + todo_wine ok(hr == D3DXERR_INVALIDDATA, "Got result %x, expected %x (D3DXERR_INVALIDDATA)\n", hr, D3DXERR_INVALIDDATA); + if (constant_table) ID3DXConstantTable_Release(constant_table); + + hr = D3DXGetShaderConstantTableEx(shader_with_ctab, 0, &constant_table); + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); + + if (constant_table) + { + size = ID3DXConstantTable_GetBufferSize(constant_table); + ok(size == 20, "Got result %x, expected 20\n", size); + + data = ID3DXConstantTable_GetBufferPointer(constant_table); + ok(!memcmp(data, shader_with_ctab + 6, size), "Retreived wrong CTAB data\n"); + + ID3DXConstantTable_Release(constant_table); + } +} + START_TEST(shader) { test_get_shader_size(); test_get_shader_version(); test_find_shader_comment(); + test_get_shader_constant_table_ex(); } diff --git a/include/d3dx9shader.h b/include/d3dx9shader.h index 6d11b3d..766d4ca 100644 --- a/include/d3dx9shader.h +++ b/include/d3dx9shader.h @@ -288,6 +288,13 @@ HRESULT WINAPI D3DXAssembleShader(LPCSTR data, LPD3DXBUFFER* shader, LPD3DXBUFFER* error_messages); +HRESULT WINAPI D3DXGetShaderConstantTableEx(CONST DWORD* byte_code, + DWORD flags, + LPD3DXCONSTANTTABLE* constant_table); + +HRESULT WINAPI D3DXGetShaderConstantTable(CONST DWORD* byte_code, + LPD3DXCONSTANTTABLE* constant_table); + #ifdef __cplusplus } #endif

1 0

Christian Costa : d3dx9_36: Implement D3DXFindShaderComment ( based on code from Luis Busquets) + tests.
by Alexandre Julliard 01 Mar '10

01 Mar '10

Module: wine Branch: master Commit: ea50ef8e080e5fcf3c637fb9af4de2149239f4cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea50ef8e080e5fcf3c637fb9a… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Mon Mar 1 09:39:24 2010 +0100 d3dx9_36: Implement D3DXFindShaderComment (based on code from Luis Busquets) + tests. --- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/shader.c | 33 +++++++++++++++++++++++++++++++++ dlls/d3dx9_36/tests/shader.c | 38 ++++++++++++++++++++++++++++++++++++++ include/d3dx9shader.h | 1 + 4 files changed, 73 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index d22ab5f..7924081 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -129,7 +129,7 @@ @ stub D3DXFillVolumeTexture @ stub D3DXFillVolumeTextureTX @ stub D3DXFilterTexture -@ stub D3DXFindShaderComment +@ stdcall D3DXFindShaderComment(ptr long ptr ptr) @ stub D3DXFloat16To32Array @ stub D3DXFloat32To16Array @ stub D3DXFrameAppendChild diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 1106594..22c297e 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -135,6 +135,39 @@ LPCSTR WINAPI D3DXGetVertexShaderProfile(LPDIRECT3DDEVICE9 device) return NULL; } +HRESULT WINAPI D3DXFindShaderComment(CONST DWORD* byte_code, DWORD fourcc, LPCVOID* data, UINT* size) +{ + CONST DWORD *ptr = byte_code; + + TRACE("(%p, %x, %p, %p)", byte_code, fourcc, data, size); + + if (!byte_code) + return D3DERR_INVALIDCALL; + + while (*++ptr != D3DSIO_END) + { + /* Check if it is a comment */ + if ((*ptr & D3DSI_OPCODE_MASK) == D3DSIO_COMMENT) + { + DWORD comment_size = (*ptr & D3DSI_COMMENTSIZE_MASK) >> D3DSI_COMMENTSIZE_SHIFT; + + /* Check if this is the comment we are looking for */ + if (*(ptr + 1) == fourcc) + { + if (size) + *size = (comment_size - 1) * sizeof(DWORD); + if (data) + *data = ptr + 2; + TRACE("Returning comment data at %p with size %d\n", *data, *size); + return D3D_OK; + } + ptr += comment_size; + } + } + + return S_FALSE; +} + HRESULT WINAPI D3DXAssembleShader(LPCSTR data, UINT data_len, CONST D3DXMACRO* defines, diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index b13fed1..03c77c2 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -37,6 +37,16 @@ static const DWORD simple_ps[] = { 0x00000005, 0x800f0000, 0xb0e40000, 0x80e40000, /* mul r0, t0, r0 */ 0x0000ffff}; /* END */ +#define FCC_TEXT MAKEFOURCC('T','E','X','T') +#define FCC_CTAB MAKEFOURCC('C','T','A','B') + +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, + 0x0004fffe, FCC_TEXT, 0x00000000, 0x00000000, 0x00000000, /* TEXT comment */ + 0x0000ffff}; /* END */ static void test_get_shader_size(void) { @@ -70,8 +80,36 @@ static void test_get_shader_version(void) ok(shader_version == 0, "Got shader version 0x%08x, expected 0\n", shader_version); } +static void test_find_shader_comment(void) +{ + HRESULT hr; + LPCVOID data; + UINT size; + + hr = D3DXFindShaderComment(NULL, MAKEFOURCC('C','T','A','B'), &data, &size); + ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); + + hr = D3DXFindShaderComment(shader_with_ctab, MAKEFOURCC('C','T','A','B'), NULL, &size); + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); + + hr = D3DXFindShaderComment(shader_with_ctab, MAKEFOURCC('C','T','A','B'), &data, NULL); + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); + + hr = D3DXFindShaderComment(shader_with_ctab, 0, &data, &size); + ok(hr == S_FALSE, "Got result %x, expected 1 (S_FALSE)\n", hr); + + hr = D3DXFindShaderComment(shader_with_ctab, MAKEFOURCC('X','X','X','X'), &data, &size); + ok(hr == S_FALSE, "Got result %x, expected 1 (S_FALSE)\n", hr); + + 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); +} + START_TEST(shader) { test_get_shader_size(); test_get_shader_version(); + test_find_shader_comment(); } diff --git a/include/d3dx9shader.h b/include/d3dx9shader.h index a0df2a8..6d11b3d 100644 --- a/include/d3dx9shader.h +++ b/include/d3dx9shader.h @@ -248,6 +248,7 @@ LPCSTR WINAPI D3DXGetPixelShaderProfile(LPDIRECT3DDEVICE9 device); UINT WINAPI D3DXGetShaderSize(const DWORD *byte_code); DWORD WINAPI D3DXGetShaderVersion(const DWORD *byte_code); LPCSTR WINAPI D3DXGetVertexShaderProfile(LPDIRECT3DDEVICE9 device); +HRESULT WINAPI D3DXFindShaderComment(CONST DWORD* byte_code, DWORD fourcc, LPCVOID* data, UINT* size); HRESULT WINAPI D3DXAssembleShaderFromFileA(LPCSTR filename, CONST D3DXMACRO* defines,

1 0

Christian Costa : d3dx9_36: Implement stubbed ID3DXConstantTable interface.
by Alexandre Julliard 01 Mar '10

01 Mar '10

Module: wine Branch: master Commit: 66d66f2e22b7624617f551a49380ea9bfb50e5f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66d66f2e22b7624617f551a49… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Mon Mar 1 09:39:18 2010 +0100 d3dx9_36: Implement stubbed ID3DXConstantTable interface. --- dlls/d3dx9_36/shader.c | 325 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 323 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=66d66f2e22b7624617f55…

1 0

Christian Costa : d3drm: Use proper macro for AddRef.
by Alexandre Julliard 01 Mar '10

01 Mar '10

Module: wine Branch: master Commit: edb9fad0a828c351fa81d1b87b6fb75de1afe750 URL: http://source.winehq.org/git/wine.git/?a=commit;h=edb9fad0a828c351fa81d1b87… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Mon Mar 1 09:38:58 2010 +0100 d3drm: Use proper macro for AddRef. --- dlls/d3drm/d3drm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 72eb864..a14226c 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -68,7 +68,7 @@ static HRESULT WINAPI IDirect3DRMImpl_QueryInterface(IDirect3DRM* iface, REFIID if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirect3DRM)) { - IClassFactory_AddRef(iface); + IUnknown_AddRef(iface); *ppvObject = This; return S_OK; }

1 0

Christian Costa : ddraw/tests: Fix typos.
by Alexandre Julliard 01 Mar '10

01 Mar '10

Module: wine Branch: master Commit: 2e48bdd14410c0422dc485d61a0c4178b6759404 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e48bdd14410c0422dc485d61… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Mon Mar 1 09:38:32 2010 +0100 ddraw/tests: Fix typos. --- dlls/ddraw/tests/d3d.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index e922f5d..6d58c67 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -3184,8 +3184,8 @@ static void SetRenderTargetTest(void) ok(vp.dwY == 10, "vp.dwY is %u, expected 10\n", vp.dwY); ok(vp.dwWidth == 246, "vp.dwWidth is %u, expected 246\n", vp.dwWidth); ok(vp.dwHeight == 246, "vp.dwHeight is %u, expected 246\n", vp.dwHeight); - ok(vp.dvMinZ == 0.25, "vp.dvMinZ is %f, expected 0.1\n", vp.dvMinZ); - ok(vp.dvMaxZ == 0.75, "vp.dvMaxZ is %f, expected 0.9\n", vp.dvMaxZ); + ok(vp.dvMinZ == 0.25, "vp.dvMinZ is %f, expected 0.25\n", vp.dvMinZ); + ok(vp.dvMaxZ == 0.75, "vp.dvMaxZ is %f, expected 0.75\n", vp.dvMaxZ); memset(&vp, 0, sizeof(vp)); vp.dwX = 0;

1 0

Christian Costa : d3dxof: Use proper macro for AddRef.
by Alexandre Julliard 01 Mar '10

01 Mar '10

Module: wine Branch: master Commit: feaf2904bf1f3525f44484ead29ffff840885239 URL: http://source.winehq.org/git/wine.git/?a=commit;h=feaf2904bf1f3525f44484ead… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Mon Mar 1 09:36:37 2010 +0100 d3dxof: Use proper macro for AddRef. --- dlls/d3dxof/d3dxof.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index d385e0d..88a9e52 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -97,7 +97,7 @@ static HRESULT WINAPI IDirectXFileImpl_QueryInterface(IDirectXFile* iface, REFII if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirectXFile)) { - IClassFactory_AddRef(iface); + IUnknown_AddRef(iface); *ppvObject = This; return S_OK; } @@ -482,7 +482,7 @@ static HRESULT WINAPI IDirectXFileBinaryImpl_QueryInterface(IDirectXFileBinary* || IsEqualGUID(riid, &IID_IDirectXFileObject) || IsEqualGUID(riid, &IID_IDirectXFileBinary)) { - IClassFactory_AddRef(iface); + IUnknown_AddRef(iface); *ppvObject = This; return S_OK; } @@ -610,7 +610,7 @@ static HRESULT WINAPI IDirectXFileDataImpl_QueryInterface(IDirectXFileData* ifac || IsEqualGUID(riid, &IID_IDirectXFileObject) || IsEqualGUID(riid, &IID_IDirectXFileData)) { - IClassFactory_AddRef(iface); + IUnknown_AddRef(iface); *ppvObject = This; return S_OK; } @@ -853,7 +853,7 @@ static HRESULT WINAPI IDirectXFileDataReferenceImpl_QueryInterface(IDirectXFileD || IsEqualGUID(riid, &IID_IDirectXFileObject) || IsEqualGUID(riid, &IID_IDirectXFileDataReference)) { - IClassFactory_AddRef(iface); + IUnknown_AddRef(iface); *ppvObject = This; return S_OK; } @@ -985,7 +985,7 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_QueryInterface(IDirectXFileEnum if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirectXFileEnumObject)) { - IClassFactory_AddRef(iface); + IUnknown_AddRef(iface); *ppvObject = This; return S_OK; } @@ -1195,7 +1195,7 @@ static HRESULT WINAPI IDirectXFileSaveObjectImpl_QueryInterface(IDirectXFileSave if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirectXFileSaveObject)) { - IClassFactory_AddRef(iface); + IUnknown_AddRef(iface); *ppvObject = This; return S_OK; }

1 0

Christian Costa : d3dxof: Remove wrong description.
by Alexandre Julliard 01 Mar '10

01 Mar '10

Module: wine Branch: master Commit: b30509fc0c696ccb4e5aa9f14d1df59c2e4f92c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b30509fc0c696ccb4e5aa9f14… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Mon Mar 1 09:36:31 2010 +0100 d3dxof: Remove wrong description. --- dlls/d3dxof/d3dxof.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index 4d183d6..d385e0d 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -3,9 +3,6 @@ * * Copyright 2004, 2008 Christian Costa * - * This file contains the (internal) driver registration functions, - * driver enumeration APIs and DirectDraw creation functions. - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either

1 0

Christian Costa : d3dxof: Fix file types checks + tests.
by Alexandre Julliard 01 Mar '10

01 Mar '10

Module: wine Branch: master Commit: aed6a4a4f89182b193e3492919406825f715c3a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aed6a4a4f89182b193e349291… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Mon Mar 1 09:36:25 2010 +0100 d3dxof: Fix file types checks + tests. --- dlls/d3dxof/d3dxof.c | 39 ++++++++++++++------ dlls/d3dxof/tests/d3dxof.c | 82 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 109 insertions(+), 12 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index eccdf98..4d183d6 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -42,6 +42,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3dxof); #define XOFFILE_FORMAT_VERSION_303 MAKEFOUR('0','3','0','3') #define XOFFILE_FORMAT_BINARY MAKEFOUR('b','i','n',' ') #define XOFFILE_FORMAT_TEXT MAKEFOUR('t','x','t',' ') +#define XOFFILE_FORMAT_BINARY_MSZIP MAKEFOUR('b','z','i','p') +#define XOFFILE_FORMAT_TEXT_MSZIP MAKEFOUR('t','z','i','p') #define XOFFILE_FORMAT_COMPRESSED MAKEFOUR('c','m','p',' ') #define XOFFILE_FORMAT_FLOAT_BITS_32 MAKEFOUR('0','0','3','2') #define XOFFILE_FORMAT_FLOAT_BITS_64 MAKEFOUR('0','0','6','4') @@ -58,6 +60,15 @@ static HRESULT IDirectXFileDataReferenceImpl_Create(IDirectXFileDataReferenceImp static HRESULT IDirectXFileEnumObjectImpl_Create(IDirectXFileEnumObjectImpl** ppObj); static HRESULT IDirectXFileSaveObjectImpl_Create(IDirectXFileSaveObjectImpl** ppObj); +/* FOURCC to string conversion for debug messages */ +const char *debugstr_fourcc(DWORD fourcc) +{ + if (!fourcc) return "'null'"; + return wine_dbg_sprintf ("\'%c%c%c%c\'", + (char)(fourcc), (char)(fourcc >> 8), + (char)(fourcc >> 16), (char)(fourcc >> 24)); +} + HRESULT IDirectXFileImpl_Create(IUnknown* pUnkOuter, LPVOID* ppObj) { IDirectXFileImpl* object; @@ -247,16 +258,18 @@ static HRESULT WINAPI IDirectXFileImpl_CreateEnumObject(IDirectXFile* iface, LPV goto error; } - if ((header[2] != XOFFILE_FORMAT_BINARY) && (header[2] != XOFFILE_FORMAT_TEXT) && (header[2] != XOFFILE_FORMAT_COMPRESSED)) + if ((header[2] != XOFFILE_FORMAT_BINARY) && (header[2] != XOFFILE_FORMAT_TEXT) && + (header[2] != XOFFILE_FORMAT_BINARY_MSZIP) && (header[2] != XOFFILE_FORMAT_TEXT_MSZIP)) { + WARN("File type %s unknown\n", debugstr_fourcc(header[2])); hr = DXFILEERR_BADFILETYPE; goto error; } - if (header[2] == XOFFILE_FORMAT_COMPRESSED) + if ((header[2] == XOFFILE_FORMAT_BINARY_MSZIP) || (header[2] == XOFFILE_FORMAT_TEXT_MSZIP)) { - FIXME("Compressed formats not supported yet\n"); - hr = DXFILEERR_BADVALUE; + FIXME("Compressed format %s not supported yet\n", debugstr_fourcc(header[2])); + hr = DXFILEERR_BADALLOC; goto error; } @@ -381,20 +394,22 @@ static HRESULT WINAPI IDirectXFileImpl_RegisterTemplates(IDirectXFile* iface, LP read_bytes(&buf, &token_header, 4); - if ((token_header != XOFFILE_FORMAT_BINARY) && (token_header != XOFFILE_FORMAT_TEXT) && (token_header != XOFFILE_FORMAT_COMPRESSED)) - return DXFILEERR_BADFILETYPE; - - if (token_header == XOFFILE_FORMAT_TEXT) + if ((token_header != XOFFILE_FORMAT_BINARY) && (token_header != XOFFILE_FORMAT_TEXT) && + (token_header != XOFFILE_FORMAT_BINARY_MSZIP) && (token_header != XOFFILE_FORMAT_TEXT_MSZIP)) { - buf.txt = TRUE; + WARN("File type %s unknown\n", debugstr_fourcc(token_header)); + return DXFILEERR_BADFILETYPE; } - if (token_header == XOFFILE_FORMAT_COMPRESSED) + if ((token_header == XOFFILE_FORMAT_BINARY_MSZIP) || (token_header == XOFFILE_FORMAT_TEXT_MSZIP)) { - FIXME("Compressed formats not supported yet\n"); - return DXFILEERR_BADVALUE; + FIXME("Compressed format %s not supported yet\n", debugstr_fourcc(token_header)); + return DXFILEERR_BADALLOC; } + if (token_header == XOFFILE_FORMAT_TEXT) + buf.txt = TRUE; + read_bytes(&buf, &token_header, 4); if ((token_header != XOFFILE_FORMAT_FLOAT_BITS_32) && (token_header != XOFFILE_FORMAT_FLOAT_BITS_64)) diff --git a/dlls/d3dxof/tests/d3dxof.c b/dlls/d3dxof/tests/d3dxof.c index dd1abca..1198229 100644 --- a/dlls/d3dxof/tests/d3dxof.c +++ b/dlls/d3dxof/tests/d3dxof.c @@ -53,6 +53,13 @@ char object[] = "1; 2; 3;\n" "}\n"; +char empty_txt_file[] = "xof 0302txt 0064"; +char empty_bin_file[] = "xof 0302bin 0064"; +char empty_tzip_file[] = "xof 0302tzip0064"; +char empty_bzip_file[] = "xof 0302bzip0064"; +char empty_cmp_file[] = "xof 0302cmp 0064"; +char empty_xxxx_file[] = "xof 0302xxxx0064"; + static void init_function_pointers(void) { /* We have to use LoadLibrary as no d3dxof functions are referenced directly */ @@ -190,6 +197,80 @@ static void test_CreateEnumObject(void) ok(ref == 0, "Got refcount %d, expected 0\n", ref); } +static void test_file_types(void) +{ + HRESULT hr; + LPDIRECTXFILE dxfile = NULL; + LPDIRECTXFILEENUMOBJECT enum_object; + DXFILELOADMEMORY lminfo; + + if (!pDirectXFileCreate) + { + win_skip("DirectXFileCreate is not available\n"); + return; + } + + hr = pDirectXFileCreate(&dxfile); + ok(hr == DXFILE_OK, "DirectXFileCreate: %x\n", hr); + if (!dxfile) + { + skip("Couldn't create DirectXFile interface\n"); + return; + } + + hr = IDirectXFile_RegisterTemplates(dxfile, empty_txt_file, strlen(empty_txt_file)); + ok(hr == DXFILE_OK, "IDirectXFileImpl_RegisterTemplates: %x\n", hr); + + hr = IDirectXFile_RegisterTemplates(dxfile, empty_bin_file, strlen(empty_bin_file)); + ok(hr == DXFILE_OK, "IDirectXFileImpl_RegisterTemplates: %x\n", hr); + + hr = IDirectXFile_RegisterTemplates(dxfile, empty_tzip_file, strlen(empty_tzip_file)); + ok(hr == DXFILEERR_BADALLOC, "IDirectXFileImpl_RegisterTemplates: %x\n", hr); + + hr = IDirectXFile_RegisterTemplates(dxfile, empty_bzip_file, strlen(empty_bzip_file)); + ok(hr == DXFILEERR_BADALLOC, "IDirectXFileImpl_RegisterTemplates: %x\n", hr); + + hr = IDirectXFile_RegisterTemplates(dxfile, empty_cmp_file, strlen(empty_cmp_file)); + ok(hr == DXFILEERR_BADFILETYPE, "IDirectXFileImpl_RegisterTemplates: %x\n", hr); + + hr = IDirectXFile_RegisterTemplates(dxfile, empty_xxxx_file, strlen(empty_xxxx_file)); + ok(hr == DXFILEERR_BADFILETYPE, "IDirectXFileImpl_RegisterTemplates: %x\n", hr); + + lminfo.lpMemory = empty_txt_file; + lminfo.dSize = strlen(empty_txt_file); + 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); + 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_tzip_file; + lminfo.dSize = strlen(empty_tzip_file); + hr = IDirectXFile_CreateEnumObject(dxfile, &lminfo, DXFILELOAD_FROMMEMORY, &enum_object); + ok(hr == DXFILEERR_BADALLOC, "IDirectXFile_CreateEnumObject: %x\n", hr); + + lminfo.lpMemory = empty_bzip_file; + lminfo.dSize = strlen(empty_bzip_file); + hr = IDirectXFile_CreateEnumObject(dxfile, &lminfo, DXFILELOAD_FROMMEMORY, &enum_object); + ok(hr == DXFILEERR_BADALLOC, "IDirectXFile_CreateEnumObject: %x\n", hr); + + lminfo.lpMemory = empty_cmp_file; + lminfo.dSize = strlen(empty_cmp_file); + 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); + hr = IDirectXFile_CreateEnumObject(dxfile, &lminfo, DXFILELOAD_FROMMEMORY, &enum_object); + ok(hr == DXFILEERR_BADFILETYPE, "IDirectXFile_CreateEnumObject: %x\n", hr); + + IDirectXFile_Release(dxfile); +} + /* Set it to 1 to expand the string when dumping the object. This is useful when there is * only one string in a sub-object (very common). Use with care, this may lead to a crash. */ #define EXPAND_STRING 0 @@ -364,6 +445,7 @@ START_TEST(d3dxof) test_refcount(); test_CreateEnumObject(); + test_file_types(); test_dump(); FreeLibrary(hd3dxof);

1 0

Christian Costa : d3dxof: Allow templates to be defined anywhere in objects file.
by Alexandre Julliard 01 Mar '10

01 Mar '10

Module: wine Branch: master Commit: 074465b6751189bf61cefc77850bb03f919b8a52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=074465b6751189bf61cefc778… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Mon Mar 1 09:36:19 2010 +0100 d3dxof: Allow templates to be defined anywhere in objects file. --- dlls/d3dxof/d3dxof.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index 0f800bf..eccdf98 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -1034,6 +1034,23 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetNextDataObject(IDirectXFileE return DXFILEERR_NOMOREOBJECTS; } + /* Check if there are templates defined before the object */ + while (This->buf.rem_bytes && is_template_available(&This->buf)) + { + if (!parse_template(&This->buf)) + { + TRACE("Template is not correct\n"); + hr = DXFILEERR_BADVALUE; + goto error; + } + else + { + TRACE("Template successfully parsed:\n"); + if (TRACE_ON(d3dxof)) + dump_template(This->pDirectXFile->xtemplates, &This->pDirectXFile->xtemplates[This->pDirectXFile->nb_xtemplates - 1]); + } + } + if (!This->buf.rem_bytes) return DXFILEERR_NOMOREOBJECTS;

1 0

Nikolay Sivov : shlwapi: Implement SHFormatDateTimeA/ SHFormatDateTimeW with tests.
by Alexandre Julliard 01 Mar '10

01 Mar '10

Module: wine Branch: master Commit: cf663d17e7121d22cc2b6d0fcdcab40bb3122c8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf663d17e7121d22cc2b6d0fc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 1 01:10:24 2010 +0300 shlwapi: Implement SHFormatDateTimeA/SHFormatDateTimeW with tests. --- dlls/shlwapi/ordinal.c | 75 +++++++++-- dlls/shlwapi/tests/ordinal.c | 307 +++++++++++++++++++++++++++++++++++++++++- include/shlwapi.h | 11 ++ 3 files changed, 381 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cf663d17e7121d22cc2b6…

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2010