October 2006 - Wine-commits

Mike McCormack : msi: An empty string table entry should always have a zero refcount.
by Alexandre Julliard 12 Oct '06

12 Oct '06

Module: wine Branch: master Commit: 5742b332fea1c85d976078eef042236b5c1d3884 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5742b332fea1c85d976078eef… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Oct 11 19:16:09 2006 +0900 msi: An empty string table entry should always have a zero refcount. --- dlls/msi/table.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 38697aa..26c0cc1 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -804,7 +804,10 @@ static UINT save_string_table( MSIDATABA if( sz && (sz < (datasize - used ) ) ) sz--; - pool[ n*2 + 1 ] = msi_id_refcount( db->strings, i ); + if (sz) + pool[ n*2 + 1 ] = msi_id_refcount( db->strings, i ); + else + pool[ n*2 + 1 ] = 0; if (sz < 0x10000) { pool[ n*2 ] = sz;

1 0

Mike McCormack : msi: Tests for transforms modifying rows in a table.
by Alexandre Julliard 12 Oct '06

12 Oct '06

Module: wine Branch: master Commit: 8f56ae8b3af19c16b9dcafc2bab5308d5d6b7be9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f56ae8b3af19c16b9dcafc2b… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Oct 11 19:17:46 2006 +0900 msi: Tests for transforms modifying rows in a table. --- dlls/msi/tests/db.c | 73 +++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 56 insertions(+), 17 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 3f65c58..3778a7e 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -1698,18 +1698,19 @@ static void generate_transform(void) LPCSTR query; UINT r; - /* create an empty database */ - r = MsiOpenDatabase(msifile, MSIDBOPEN_CREATE, &hdb1 ); + /* start with two identical databases */ + CopyFile(msifile2, msifile, FALSE); + + r = MsiOpenDatabase(msifile, MSIDBOPEN_TRANSACT, &hdb1 ); ok( r == ERROR_SUCCESS , "Failed to create database\n" ); r = MsiDatabaseCommit( hdb1 ); ok( r == ERROR_SUCCESS , "Failed to commit database\n" ); - /* create another empty database */ r = MsiOpenDatabase(msifile2, MSIDBOPEN_READONLY, &hdb2 ); ok( r == ERROR_SUCCESS , "Failed to create database\n" ); - /* the transform between two empty database should be empty */ + /* the transform between two identical database should be empty */ r = MsiDatabaseGenerateTransform(hdb1, hdb2, NULL, 0, 0); todo_wine { ok( r == ERROR_NO_DATA, "return code %d, should be ERROR_NO_DATA\n", r ); @@ -1727,6 +1728,10 @@ static void generate_transform(void) r = run_query(hdb1, 0, query); ok(r == ERROR_SUCCESS, "failed to add row 2\n"); + query = "UPDATE `MOO` SET `OOO` = 'c' WHERE `NOO` = 1"; + r = run_query(hdb1, 0, query); + ok(r == ERROR_SUCCESS, "failed to add row 1\n"); + /* database needs to be committed */ MsiDatabaseCommit(hdb1); @@ -1737,33 +1742,43 @@ static void generate_transform(void) MsiCloseHandle( hdb2 ); } +/* data for generating a transform */ + +/* tables transform names - encoded as they would be in an msi database file */ static const WCHAR name1[] = { 0x4840, 0x3a8a, 0x481b, 0 }; /* AAR */ static const WCHAR name2[] = { 0x4840, 0x3b3f, 0x43f2, 0x4438, 0x45b1, 0 }; /* _Columns */ static const WCHAR name3[] = { 0x4840, 0x3f7f, 0x4164, 0x422f, 0x4836, 0 }; /* _Tables */ static const WCHAR name4[] = { 0x4840, 0x3f3f, 0x4577, 0x446c, 0x3b6a, 0x45e4, 0x4824, 0 }; /* _StringData */ static const WCHAR name5[] = { 0x4840, 0x3f3f, 0x4577, 0x446c, 0x3e6a, 0x44b2, 0x482f, 0 }; /* _StringPool */ +static const WCHAR name6[] = { 0x4840, 0x3e16, 0x4181, 0}; +/* data in each table */ static const WCHAR data1[] = { /* AAR */ - 0x0201, 0x0004, 0x8001, - 0x0201, 0x0005, 0x8002, + 0x0201, 0x0005, 0x8001, /* 0x0201 = add row (1), two shorts */ + 0x0201, 0x0006, 0x8002, }; static const WCHAR data2[] = { /* _Columns */ - 0x0401, 0x0001, 0x0000, 0x0002, 0xbdff, - 0x0401, 0x0001, 0x0000, 0x0003, 0x8502, + 0x0401, 0x0002, 0x0000, 0x0003, 0xbdff, /* 0x0401 = add row (1), 4 shorts */ + 0x0401, 0x0002, 0x0000, 0x0004, 0x8502, }; static const WCHAR data3[] = { /* _Tables */ - 0x0101, 0x0001, + 0x0101, 0x0002, /* 0x0101 = add row (1), 1 short */ }; static const char data4[] = /* _StringData */ - "AARCARBARvwbmw"; + "cAARCARBARvwbmw"; /* all the strings squashed together */ static const WCHAR data5[] = { /* _StringPool */ /* len, refs */ - 0, 0, - 3, 3, /* string 1 */ - 3, 1, /* string 2 */ - 3, 1, /* string 3 */ - 2, 1, /* string 4 */ - 3, 1, /* string 5 */ + 0, 0, /* string 0 '' */ + 1, 1, /* string 1 'c' */ + 3, 3, /* string 2 'AAR' */ + 3, 1, /* string 3 'CAR' */ + 3, 1, /* string 4 'BAR' */ + 2, 1, /* string 5 'vw' */ + 3, 1, /* string 6 'bmw' */ +}; +/* update row, 0x0002 is a bitmask of present column data, keys are excluded */ +static const WCHAR data6[] = { /* MOO */ + 0x0002, 0x8001, 0x0001, }; static const struct { @@ -1775,8 +1790,9 @@ static const struct { { name1, data1, sizeof data1 }, { name2, data2, sizeof data2 }, { name3, data3, sizeof data3 }, - { name4, data4, sizeof data4 }, + { name4, data4, sizeof data4 - 1 }, { name5, data5, sizeof data5 }, + { name6, data6, sizeof data6 }, }; #define NUM_TRANSFORM_TABLES (sizeof table_transform_data/sizeof table_transform_data[0]) @@ -1836,6 +1852,18 @@ static void test_try_transform(void) r = MsiOpenDatabase(msifile2, MSIDBOPEN_CREATE, &hdb ); ok( r == ERROR_SUCCESS , "Failed to create database\n" ); + query = "CREATE TABLE `MOO` ( `NOO` SHORT NOT NULL, `OOO` CHAR(255) PRIMARY KEY `NOO`)"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "failed to add table\n"); + + query = "INSERT INTO `MOO` ( `NOO`, `OOO` ) VALUES ( 1, 'a' )"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "failed to add row 1\n"); + + query = "INSERT INTO `MOO` ( `NOO`, `OOO` ) VALUES ( 2, 'b' )"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "failed to add row 1\n"); + r = MsiDatabaseCommit( hdb ); ok( r == ERROR_SUCCESS , "Failed to commit database\n" ); @@ -1859,6 +1887,7 @@ static void test_try_transform(void) MsiDatabaseCommit( hdb ); + /* check new values */ query = "select `BAR`,`CAR` from `AAR` where `BAR` = 1 AND `CAR` = 'vw'"; r = run_query(hdb, 0, query); ok(r == ERROR_SUCCESS, "select query failed\n"); @@ -1867,6 +1896,16 @@ static void test_try_transform(void) r = run_query(hdb, 0, query); ok(r == ERROR_SUCCESS, "select query failed\n"); + /* check updated values */ + query = "select `NOO`,`OOO` from `MOO` where `NOO` = 1 AND `OOO` = 'c'"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "select query failed\n"); + + /* check unchanged values */ + query = "select `NOO`,`OOO` from `MOO` where `NOO` = 1 AND `OOO` = 'c'"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "select query failed\n"); + MsiCloseHandle( hdb ); DeleteFile(msifile);

1 0

Ivan Gyurdiev : wined3d: Merge GAMMARAMP types into one type in WINED3D namespace.
by Alexandre Julliard 11 Oct '06

11 Oct '06

Module: wine Branch: master Commit: 732e0e908b299306889cc45df9245acdd6a159b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=732e0e908b299306889cc45df… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Tue Oct 10 21:58:01 2006 -0400 wined3d: Merge GAMMARAMP types into one type in WINED3D namespace. --- dlls/d3d8/device.c | 2 ++ dlls/d3d9/device.c | 4 +++- dlls/ddraw/gamma.c | 5 +++-- include/wine/wined3d_interface.h | 19 ------------------- include/wine/wined3d_types.h | 6 ++++++ 5 files changed, 14 insertions(+), 22 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 92e32b3..a2312e6 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -308,6 +308,7 @@ static void WINAPI IDirect3DDevice8Impl_ IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; TRACE("(%p) Relay\n", This); + /* Note: D3DGAMMARAMP is compatible with WINED3DGAMMARAMP */ return IWineD3DDevice_SetGammaRamp(This->WineD3DDevice, 0, Flags, (WINED3DGAMMARAMP *) pRamp); } @@ -315,6 +316,7 @@ static void WINAPI IDirect3DDevice8Impl_ IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; TRACE("(%p) Relay\n", This); + /* Note: D3DGAMMARAMP is compatible with WINED3DGAMMARAMP */ return IWineD3DDevice_GetGammaRamp(This->WineD3DDevice, 0, (WINED3DGAMMARAMP *) pRamp); } diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 2e6c3c3..7bec1e9 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -228,7 +228,8 @@ static void WINAPI IDirect3DDevice9Impl_ IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; TRACE("(%p) Relay\n", This); - + + /* Note: D3DGAMMARAMP is compatible with WINED3DGAMMARAMP */ return IWineD3DDevice_SetGammaRamp(This->WineD3DDevice, iSwapChain, Flags, (WINED3DGAMMARAMP *) pRamp); } @@ -236,6 +237,7 @@ static void WINAPI IDirect3DDevice9Impl_ IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; TRACE("(%p) Relay\n", This); + /* Note: D3DGAMMARAMP is compatible with WINED3DGAMMARAMP */ return IWineD3DDevice_GetGammaRamp(This->WineD3DDevice, iSwapChain, (WINED3DGAMMARAMP *) pRamp); } diff --git a/dlls/ddraw/gamma.c b/dlls/ddraw/gamma.c index 735c329..b885b81 100644 --- a/dlls/ddraw/gamma.c +++ b/dlls/ddraw/gamma.c @@ -145,7 +145,7 @@ IDirectDrawGammaControlImpl_GetGammaRamp if(This->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) { - /* This returns a void */ + /* Note: DDGAMMARAMP is compatible with WINED3DGAMMARAMP */ IWineD3DDevice_GetGammaRamp(This->ddraw->wineD3DDevice, 0 /* Swapchain */, (WINED3DGAMMARAMP *) GammaRamp); @@ -189,7 +189,8 @@ IDirectDrawGammaControlImpl_SetGammaRamp if(This->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) { - /* This returns a void */ + + /* Note: DDGAMMARAMP is compatible with WINED3DGAMMARAMP */ IWineD3DDevice_SetGammaRamp(This->ddraw->wineD3DDevice, 0 /* Swapchain */, Flags, diff --git a/include/wine/wined3d_interface.h b/include/wine/wined3d_interface.h index 4c3c9a8..79dfe2d 100644 --- a/include/wine/wined3d_interface.h +++ b/include/wine/wined3d_interface.h @@ -184,25 +184,6 @@ DEFINE_GUID(IID_IWineD3DStateBlock, DEFINE_GUID(IID_IWineD3DQuery, 0x905ddbac, 0x6f30, 0x11d9, 0xc6, 0x87, 0x0, 0x4, 0x61, 0x42, 0xc1, 0x4f); - -/* The following have differing names, but actually are the same layout. */ -/* Also, D3DCAPS8 is a subset of D3DCAPS9 so can be typecase as long as - none of the 9 fields are accessed when the device is d3d8 */ -/* TODO: remove the d3d8/d3d9 dependencies by making a all inclusive WINED3D version */ -#if defined( __WINE_D3D9_H ) - /* Identical: */ -# define WINED3DGAMMARAMP D3DGAMMARAMP - -#elif defined( __WINE_D3D8_H ) - /* Identical: */ -# define WINED3DGAMMARAMP D3DGAMMARAMP - -#else /* defined (__WINE_D3D_H ) */ - /* Identical: */ -# define WINED3DGAMMARAMP DDGAMMARAMP - -#endif - /***************************************************************************** * Callback functions required for predefining surfaces / stencils */ diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h index 9bc2698..76bd905 100644 --- a/include/wine/wined3d_types.h +++ b/include/wine/wined3d_types.h @@ -85,6 +85,12 @@ typedef struct _WINED3DVIEWPORT { float MaxZ; } WINED3DVIEWPORT; +typedef struct _WINED3DGAMMARAMP { + WORD red [256]; + WORD green[256]; + WORD blue [256]; +} WINED3DGAMMARAMP; + #define WINED3D_VSHADER_MAX_CONSTANTS 96 #define WINED3D_PSHADER_MAX_CONSTANTS 32

1 0

Ivan Gyurdiev : wined3d: Merge VIEWPORT types into one type in WINED3D namespace.
by Alexandre Julliard 11 Oct '06

11 Oct '06

Module: wine Branch: master Commit: 5f2987ae3233ea441b210aee365e0d1d4360ba4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f2987ae3233ea441b210aee3… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Tue Oct 10 21:57:25 2006 -0400 wined3d: Merge VIEWPORT types into one type in WINED3D namespace. --- dlls/d3d8/device.c | 2 ++ dlls/d3d9/device.c | 4 ++++ dlls/ddraw/device.c | 7 +++++-- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/stateblock.c | 4 ++-- include/wine/wined3d_interface.h | 3 --- include/wine/wined3d_types.h | 9 +++++++++ 7 files changed, 24 insertions(+), 9 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 2a7d730..92e32b3 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -697,6 +697,7 @@ static HRESULT WINAPI IDirect3DDevice8Im IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; TRACE("(%p) Relay\n" , This); + /* Note: D3DVIEWPORT8 is compatible with WINED3DVIEWPORT */ return IWineD3DDevice_SetViewport(This->WineD3DDevice, (const WINED3DVIEWPORT *)pViewport); } @@ -704,6 +705,7 @@ static HRESULT WINAPI IDirect3DDevice8Im IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; TRACE("(%p) Relay\n" , This); + /* Note: D3DVIEWPORT8 is compatible with WINED3DVIEWPORT */ return IWineD3DDevice_GetViewport(This->WineD3DDevice, (WINED3DVIEWPORT *)pViewport); } diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 815ea6d..2e6c3c3 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -480,12 +480,16 @@ static HRESULT WINAPI IDirect3DDevice9 static HRESULT WINAPI IDirect3DDevice9Impl_SetViewport(LPDIRECT3DDEVICE9 iface, CONST D3DVIEWPORT9* pViewport) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; TRACE("(%p) Relay\n" , This); + + /* Note: D3DVIEWPORT9 is compatible with WINED3DVIEWPORT */ return IWineD3DDevice_SetViewport(This->WineD3DDevice, (const WINED3DVIEWPORT *)pViewport); } static HRESULT WINAPI IDirect3DDevice9Impl_GetViewport(LPDIRECT3DDEVICE9 iface, D3DVIEWPORT9* pViewport) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; TRACE("(%p) Relay\n" , This); + + /* Note: D3DVIEWPORT9 is compatible with WINED3DVIEWPORT */ return IWineD3DDevice_GetViewport(This->WineD3DDevice, (WINED3DVIEWPORT *)pViewport); } diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 42e4697..26c6897 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -4035,8 +4035,9 @@ IDirect3DDeviceImpl_7_SetViewport(IDirec if(!Data) return DDERR_INVALIDPARAMS; + /* Note: D3DVIEWPORT7 is compatible with WINED3DVIEWPORT */ return IWineD3DDevice_SetViewport(This->wineD3DDevice, - Data); + (WINED3DVIEWPORT*) Data); } /***************************************************************************** @@ -4066,8 +4067,10 @@ IDirect3DDeviceImpl_7_GetViewport(IDirec if(!Data) return DDERR_INVALIDPARAMS; + /* Note: D3DVIEWPORT7 is compatible with WINED3DVIEWPORT */ hr = IWineD3DDevice_GetViewport(This->wineD3DDevice, - Data); + (WINED3DVIEWPORT*) Data); + return hr_ddraw_from_wined3d(hr); } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index f0da0cc..44a55d8 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2114,7 +2114,7 @@ #endif list_init(&This->glsl_shader_progs); { /* Set a default viewport */ - D3DVIEWPORT9 vp; + WINED3DVIEWPORT vp; vp.X = 0; vp.Y = 0; vp.Width = *(pPresentationParameters->BackBufferWidth); @@ -5083,7 +5083,7 @@ process_vertices_strided(IWineD3DDeviceI char *dest_ptr, *dest_conv = NULL; unsigned int i; DWORD DestFVF = dest->fvf; - D3DVIEWPORT9 vp; + WINED3DVIEWPORT vp; D3DMATRIX mat, proj_mat, view_mat, world_mat; BOOL doClip; int numTextures; diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 841f03c..cd6c58b 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -527,9 +527,9 @@ static HRESULT WINAPI IWineD3DStateBloc if (This->set.viewport && memcmp(&targetStateBlock->viewport, &This->viewport, - sizeof(D3DVIEWPORT9)) != 0) { + sizeof(WINED3DVIEWPORT)) != 0) { TRACE("Updating viewport\n"); - memcpy(&This->viewport, &targetStateBlock->viewport, sizeof(D3DVIEWPORT9)); + memcpy(&This->viewport, &targetStateBlock->viewport, sizeof(WINED3DVIEWPORT)); } for (i = 0; i < MAX_STREAMS; i++) { diff --git a/include/wine/wined3d_interface.h b/include/wine/wined3d_interface.h index 7bd64c7..4c3c9a8 100644 --- a/include/wine/wined3d_interface.h +++ b/include/wine/wined3d_interface.h @@ -191,17 +191,14 @@ DEFINE_GUID(IID_IWineD3DQuery, /* TODO: remove the d3d8/d3d9 dependencies by making a all inclusive WINED3D version */ #if defined( __WINE_D3D9_H ) /* Identical: */ -# define WINED3DVIEWPORT D3DVIEWPORT9 # define WINED3DGAMMARAMP D3DGAMMARAMP #elif defined( __WINE_D3D8_H ) /* Identical: */ -# define WINED3DVIEWPORT D3DVIEWPORT8 # define WINED3DGAMMARAMP D3DGAMMARAMP #else /* defined (__WINE_D3D_H ) */ /* Identical: */ -# define WINED3DVIEWPORT D3DVIEWPORT7 # define WINED3DGAMMARAMP DDGAMMARAMP #endif diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h index b1c3ae1..9bc2698 100644 --- a/include/wine/wined3d_types.h +++ b/include/wine/wined3d_types.h @@ -76,6 +76,15 @@ typedef struct _WINED3DMATERIAL { float Power; } WINED3DMATERIAL; +typedef struct _WINED3DVIEWPORT { + DWORD X; + DWORD Y; + DWORD Width; + DWORD Height; + float MinZ; + float MaxZ; +} WINED3DVIEWPORT; + #define WINED3D_VSHADER_MAX_CONSTANTS 96 #define WINED3D_PSHADER_MAX_CONSTANTS 32

1 0

Ivan Gyurdiev : wined3d: Merge MATERIAL types into one type in WINED3D namespace.
by Alexandre Julliard 11 Oct '06

11 Oct '06

Module: wine Branch: master Commit: 90f5be2bef5c8dd96b02493fd84b491660690db1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90f5be2bef5c8dd96b02493fd… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Tue Oct 10 21:56:41 2006 -0400 wined3d: Merge MATERIAL types into one type in WINED3D namespace. --- dlls/d3d8/device.c | 6 ++++-- dlls/d3d9/device.c | 4 ++++ dlls/ddraw/device.c | 8 ++++++-- dlls/wined3d/device.c | 1 - dlls/wined3d/stateblock.c | 4 ++-- include/wine/wined3d_interface.h | 3 --- include/wine/wined3d_types.h | 8 ++++++++ 7 files changed, 24 insertions(+), 10 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 5d841fa..2a7d730 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -710,14 +710,16 @@ static HRESULT WINAPI IDirect3DDevice8Im static HRESULT WINAPI IDirect3DDevice8Impl_SetMaterial(LPDIRECT3DDEVICE8 iface, CONST D3DMATERIAL8* pMaterial) { IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; TRACE("(%p) Relay\n" , This); -/* FIXME: Verify that D3DMATERIAL8 ~= WINED3DMATERIAL */ + + /* Note: D3DMATERIAL8 is compatible with WINED3DMATERIAL */ return IWineD3DDevice_SetMaterial(This->WineD3DDevice, (const WINED3DMATERIAL *)pMaterial); } static HRESULT WINAPI IDirect3DDevice8Impl_GetMaterial(LPDIRECT3DDEVICE8 iface, D3DMATERIAL8* pMaterial) { IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; TRACE("(%p) Relay\n" , This); -/* FIXME: Verify that D3DMATERIAL8 ~= WINED3DMATERIAL */ + + /* Note: D3DMATERIAL8 is compatible with WINED3DMATERIAL */ return IWineD3DDevice_GetMaterial(This->WineD3DDevice, (WINED3DMATERIAL *)pMaterial); } diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 316d762..815ea6d 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -492,12 +492,16 @@ static HRESULT WINAPI IDirect3DDevice9 static HRESULT WINAPI IDirect3DDevice9Impl_SetMaterial(LPDIRECT3DDEVICE9 iface, CONST D3DMATERIAL9* pMaterial) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; TRACE("(%p) Relay\n" , This); + + /* Note: D3DMATERIAL9 is compatible with WINED3DMATERIAL */ return IWineD3DDevice_SetMaterial(This->WineD3DDevice, (const WINED3DMATERIAL *)pMaterial); } static HRESULT WINAPI IDirect3DDevice9Impl_GetMaterial(LPDIRECT3DDEVICE9 iface, D3DMATERIAL9* pMaterial) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; TRACE("(%p) Relay\n" , This); + + /* Note: D3DMATERIAL9 is compatible with WINED3DMATERIAL */ return IWineD3DDevice_GetMaterial(This->WineD3DDevice, (WINED3DMATERIAL *)pMaterial); } diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 836168c..42e4697 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -4095,8 +4095,10 @@ IDirect3DDeviceImpl_7_SetMaterial(IDirec HRESULT hr; TRACE("(%p)->(%p): Relay!\n", This, Mat); + /* Note: D3DMATERIAL7 is compatible with WINED3DMATERIAL */ hr = IWineD3DDevice_SetMaterial(This->wineD3DDevice, - Mat); + (WINED3DMATERIAL*) Mat); + return hr_ddraw_from_wined3d(hr); } @@ -4124,8 +4126,10 @@ IDirect3DDeviceImpl_7_GetMaterial(IDirec HRESULT hr; TRACE("(%p)->(%p): Relay!\n", This, Mat); + /* Note: D3DMATERIAL7 is compatible with WINED3DMATERIAL */ hr = IWineD3DDevice_GetMaterial(This->wineD3DDevice, - Mat); + (WINED3DMATERIAL*) Mat); + return hr_ddraw_from_wined3d(hr); } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 40c0d83..f0da0cc 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3139,7 +3139,6 @@ static HRESULT WINAPI IWineD3DDeviceIm /***** * Get / Set Material - * WARNING: This code relies on the fact that D3DMATERIAL8 == D3DMATERIAL9 *****/ static HRESULT WINAPI IWineD3DDeviceImpl_SetMaterial(IWineD3DDevice *iface, CONST WINED3DMATERIAL* pMaterial) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 3356a71..841f03c 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -520,9 +520,9 @@ static HRESULT WINAPI IWineD3DStateBloc if (This->set.material && memcmp(&targetStateBlock->material, &This->material, - sizeof(D3DMATERIAL9)) != 0) { + sizeof(WINED3DMATERIAL)) != 0) { TRACE("Updating material\n"); - memcpy(&This->material, &targetStateBlock->material, sizeof(D3DMATERIAL9)); + memcpy(&This->material, &targetStateBlock->material, sizeof(WINED3DMATERIAL)); } if (This->set.viewport && memcmp(&targetStateBlock->viewport, diff --git a/include/wine/wined3d_interface.h b/include/wine/wined3d_interface.h index a581115..7bd64c7 100644 --- a/include/wine/wined3d_interface.h +++ b/include/wine/wined3d_interface.h @@ -191,19 +191,16 @@ DEFINE_GUID(IID_IWineD3DQuery, /* TODO: remove the d3d8/d3d9 dependencies by making a all inclusive WINED3D version */ #if defined( __WINE_D3D9_H ) /* Identical: */ -# define WINED3DMATERIAL D3DMATERIAL9 # define WINED3DVIEWPORT D3DVIEWPORT9 # define WINED3DGAMMARAMP D3DGAMMARAMP #elif defined( __WINE_D3D8_H ) /* Identical: */ -# define WINED3DMATERIAL D3DMATERIAL8 # define WINED3DVIEWPORT D3DVIEWPORT8 # define WINED3DGAMMARAMP D3DGAMMARAMP #else /* defined (__WINE_D3D_H ) */ /* Identical: */ -# define WINED3DMATERIAL D3DMATERIAL7 # define WINED3DVIEWPORT D3DVIEWPORT7 # define WINED3DGAMMARAMP DDGAMMARAMP diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h index 814075e..b1c3ae1 100644 --- a/include/wine/wined3d_types.h +++ b/include/wine/wined3d_types.h @@ -68,6 +68,14 @@ typedef struct _WINED3DLIGHT { float Phi; } WINED3DLIGHT; +typedef struct _WINED3DMATERIAL { + WINED3DCOLORVALUE Diffuse; + WINED3DCOLORVALUE Ambient; + WINED3DCOLORVALUE Specular; + WINED3DCOLORVALUE Emissive; + float Power; +} WINED3DMATERIAL; + #define WINED3D_VSHADER_MAX_CONSTANTS 96 #define WINED3D_PSHADER_MAX_CONSTANTS 32

1 0

Ivan Gyurdiev : wined3d: TEXTUREFILTERTYPE: Consistently use in WINED3D namespace.
by Alexandre Julliard 11 Oct '06

11 Oct '06

Module: wine Branch: master Commit: fea4495a610c6bbabd0548123c7331e4bfe876dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=fea4495a610c6bbabd0548123… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Tue Oct 10 21:55:05 2006 -0400 wined3d: TEXTUREFILTERTYPE: Consistently use in WINED3D namespace. --- dlls/wined3d/wined3d_private.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7f011e6..0ef6ad9 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -82,7 +82,7 @@ extern int minLookup[MAX_LOOKUPS]; extern int maxLookup[MAX_LOOKUPS]; extern DWORD *stateLookup[MAX_LOOKUPS]; -extern DWORD minMipLookup[D3DTEXF_ANISOTROPIC + 1][D3DTEXF_LINEAR + 1]; +extern DWORD minMipLookup[WINED3DTEXF_ANISOTROPIC + 1][WINED3DTEXF_LINEAR + 1]; typedef struct _WINED3DGLTYPE { int d3dType;

1 0

Ivan Gyurdiev : wined3d: Merge LIGHT types into one type in WINED3D namespace.
by Alexandre Julliard 11 Oct '06

11 Oct '06

Module: wine Branch: master Commit: 70bbf734b1f971a65fc13443b02dd4fd05a6c5e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70bbf734b1f971a65fc13443b… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Tue Oct 10 21:55:47 2006 -0400 wined3d: Merge LIGHT types into one type in WINED3D namespace. --- dlls/d3d8/device.c | 6 ++++- dlls/d3d9/device.c | 4 ++++ dlls/ddraw/device.c | 7 ++++-- dlls/wined3d/device.c | 43 +++++++++++++++++++------------------- include/wine/wined3d_interface.h | 3 --- include/wine/wined3d_types.h | 38 ++++++++++++++++++++++++++++++++++ 6 files changed, 72 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=70bbf734b1f971a65fc13…

1 0

Ivan Gyurdiev : wined3d: D3DQUERYTYPE: Consistently use in WINED3D namespace.
by Alexandre Julliard 11 Oct '06

11 Oct '06

Module: wine Branch: master Commit: f0d5b35c976a7a256450767f2bea9026aca9330d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0d5b35c976a7a256450767f2… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Tue Oct 10 21:53:30 2006 -0400 wined3d: D3DQUERYTYPE: Consistently use in WINED3D namespace. --- dlls/wined3d/device.c | 28 ++++++++++++++-------------- dlls/wined3d/wined3d_private.h | 4 ++-- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 86a48f4..fbe22dc 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1446,26 +1446,26 @@ static HRESULT WINAPI IWineD3DDeviceImpl object->type = Type; /* allocated the 'extended' data based on the type of query requested */ switch(Type){ - case D3DQUERYTYPE_OCCLUSION: + case WINED3DQUERYTYPE_OCCLUSION: if(GL_SUPPORT(ARB_OCCLUSION_QUERY)) { TRACE("(%p) Allocating data for an occlusion query\n", This); object->extendedData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WineQueryOcclusionData)); GL_EXTCALL(glGenQueriesARB(1, &((WineQueryOcclusionData *)(object->extendedData))->queryId)); break; } - case D3DQUERYTYPE_VCACHE: - case D3DQUERYTYPE_RESOURCEMANAGER: - case D3DQUERYTYPE_VERTEXSTATS: - case D3DQUERYTYPE_EVENT: - case D3DQUERYTYPE_TIMESTAMP: - case D3DQUERYTYPE_TIMESTAMPDISJOINT: - case D3DQUERYTYPE_TIMESTAMPFREQ: - case D3DQUERYTYPE_PIPELINETIMINGS: - case D3DQUERYTYPE_INTERFACETIMINGS: - case D3DQUERYTYPE_VERTEXTIMINGS: - case D3DQUERYTYPE_PIXELTIMINGS: - case D3DQUERYTYPE_BANDWIDTHTIMINGS: - case D3DQUERYTYPE_CACHEUTILIZATION: + case WINED3DQUERYTYPE_VCACHE: + case WINED3DQUERYTYPE_RESOURCEMANAGER: + case WINED3DQUERYTYPE_VERTEXSTATS: + case WINED3DQUERYTYPE_EVENT: + case WINED3DQUERYTYPE_TIMESTAMP: + case WINED3DQUERYTYPE_TIMESTAMPDISJOINT: + case WINED3DQUERYTYPE_TIMESTAMPFREQ: + case WINED3DQUERYTYPE_PIPELINETIMINGS: + case WINED3DQUERYTYPE_INTERFACETIMINGS: + case WINED3DQUERYTYPE_VERTEXTIMINGS: + case WINED3DQUERYTYPE_PIXELTIMINGS: + case WINED3DQUERYTYPE_BANDWIDTHTIMINGS: + case WINED3DQUERYTYPE_CACHEUTILIZATION: default: object->extendedData = 0; FIXME("(%p) Unhandled query type %d\n",This , Type); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9d4fd9f..d2230a6 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1185,9 +1185,9 @@ #if 0 #else IWineD3DDeviceImpl *wineD3DDevice; #endif - /* IWineD3DQuery fields */ - D3DQUERYTYPE type; + /* IWineD3DQuery fields */ + WINED3DQUERYTYPE type; /* TODO: Think about using a IUnknown instead of a void* */ void *extendedData;

1 0

Ivan Gyurdiev : wined3d: D3DDECLTYPE: Consistently use in WINED3D namespace .
by Alexandre Julliard 11 Oct '06

11 Oct '06

Module: wine Branch: master Commit: a07a8f793bf665a38527caf108779ae801ea6cfc URL: http://source.winehq.org/git/wine.git/?a=commit;h=a07a8f793bf665a38527caf10… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Tue Oct 10 21:54:22 2006 -0400 wined3d: D3DDECLTYPE: Consistently use in WINED3D namespace. --- dlls/wined3d/drawprim.c | 28 ++++++++++++++-------------- dlls/wined3d/wined3d_private.h | 38 +++++++++++++++++++------------------- 2 files changed, 33 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a07a8f793bf665a38527c…

1 0

Ivan Gyurdiev : wined3d: D3DTEXTURESTAGESTATETYPE: Consistently use in WINED3D namespace.
by Alexandre Julliard 11 Oct '06

11 Oct '06

Module: wine Branch: master Commit: 837027fcb74c4a0afaadcd242dade09c11530390 URL: http://source.winehq.org/git/wine.git/?a=commit;h=837027fcb74c4a0afaadcd242… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Tue Oct 10 21:52:50 2006 -0400 wined3d: D3DTEXTURESTAGESTATETYPE: Consistently use in WINED3D namespace. --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/device.c | 2 +- dlls/wined3d/drawprim.c | 24 ++++++++++++------------ dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/stateblock.c | 36 ++++++++++++++++++------------------ dlls/wined3d/utils.c | 16 ++++++++-------- 6 files changed, 41 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=837027fcb74c4a0afaadc…

1 0