September 2010 - Wine-commits

Hans Leidekker : msi: Fix comparison of table ids in TABLE_Exists.
by Alexandre Julliard 08 Sep '10

08 Sep '10

Module: wine Branch: master Commit: d8b58797982ff2b648106e96e74bb50e09763572 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8b58797982ff2b648106e96e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 8 12:17:01 2010 +0200 msi: Fix comparison of table ids in TABLE_Exists. --- dlls/msi/table.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 6755496..464eced 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -988,8 +988,8 @@ done: /* try to find the table name in the _Tables table */ BOOL TABLE_Exists( MSIDATABASE *db, LPCWSTR name ) { - UINT r, table_id = 0, i, count; - MSITABLE *table = NULL; + UINT r, table_id, i; + MSITABLE *table; static const WCHAR szStreams[] = {'_','S','t','r','e','a','m','s',0}; static const WCHAR szStorages[] = {'_','S','t','o','r','a','g','e','s',0}; @@ -1012,10 +1012,11 @@ BOOL TABLE_Exists( MSIDATABASE *db, LPCWSTR name ) return FALSE; } - count = table->row_count; - for( i=0; i<count; i++ ) - if( table->data[ i ][ 0 ] == table_id ) + for( i = 0; i < table->row_count; i++ ) + { + if( read_table_int( table->data, i, 0, db->bytes_per_strref ) == table_id ) return TRUE; + } return FALSE; }

1 0

Hans Leidekker : msi: Open relocated package database in transacted mode.
by Alexandre Julliard 08 Sep '10

08 Sep '10

Module: wine Branch: master Commit: f6e26351d51b97ca0ba7d3da0195a471879e2885 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6e26351d51b97ca0ba7d3da0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 8 12:17:13 2010 +0200 msi: Open relocated package database in transacted mode. --- dlls/msi/package.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index aa0d1b5..c386f89 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1354,7 +1354,7 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, MSIPACKAGE **pPackage) * read/write, which is safe because we always create a copy that is thrown * away when we're done. */ - r = MSI_OpenDatabaseW( file, MSIDBOPEN_DIRECT, &db ); + r = MSI_OpenDatabaseW( file, MSIDBOPEN_TRANSACT, &db ); if( r != ERROR_SUCCESS ) { if (file != szPackage)

1 0

Hans Leidekker : msi/tests: Fix some test failures on 64-bit.
by Alexandre Julliard 08 Sep '10

08 Sep '10

Module: wine Branch: master Commit: 4a5b2abcf40591954bdd94088931f5b639540bd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a5b2abcf40591954bdd94088… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 8 12:17:26 2010 +0200 msi/tests: Fix some test failures on 64-bit. --- dlls/msi/tests/package.c | 149 +++++++++++++++++++++++++--------------------- 1 files changed, 80 insertions(+), 69 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4a5b2abcf40591954bdd9…

1 0

Matteo Bruni : d3dx9: Fix D3DXCompileShaderFromFileW.
by Alexandre Julliard 08 Sep '10

08 Sep '10

Module: wine Branch: master Commit: d6ead897e23322c10e0f4497fe83c53bdf1a5e27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6ead897e23322c10e0f4497f… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Wed Sep 8 16:07:07 2010 +0200 d3dx9: Fix D3DXCompileShaderFromFileW. --- dlls/d3dx9_36/shader.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 1ddcde7..a3648c2 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -423,7 +423,7 @@ HRESULT WINAPI D3DXCompileShaderFromFileW(LPCWSTR filename, LPD3DXCONSTANTTABLE* constant_table) { void *buffer; - DWORD len; + DWORD len, filename_len; HRESULT hr; struct D3DXIncludeImpl includefromfile; char *filename_a; @@ -437,13 +437,14 @@ HRESULT WINAPI D3DXCompileShaderFromFileW(LPCWSTR filename, include = (LPD3DXINCLUDE)&includefromfile; } - filename_a = HeapAlloc(GetProcessHeap(), 0, len * sizeof(char)); + filename_len = WideCharToMultiByte(CP_ACP, 0, filename, -1, NULL, 0, NULL, NULL); + filename_a = HeapAlloc(GetProcessHeap(), 0, filename_len * sizeof(char)); if (!filename_a) { UnmapViewOfFile(buffer); return E_OUTOFMEMORY; } - WideCharToMultiByte(CP_ACP, 0, filename, -1, filename_a, len, NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, filename, -1, filename_a, filename_len, NULL, NULL); hr = D3DCompile(buffer, len, filename_a, (D3D_SHADER_MACRO *)defines, (ID3DInclude *)include, entrypoint, profile, flags, 0,

1 0

Matteo Bruni : d3dx9: Fix D3DXAssembleShader tests.
by Alexandre Julliard 08 Sep '10

08 Sep '10

Module: wine Branch: master Commit: d82255575b8be0fc8068a5572f9077a965103f2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d82255575b8be0fc8068a5572… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Fri Sep 3 15:25:23 2010 +0200 d3dx9: Fix D3DXAssembleShader tests. --- dlls/d3dx9_36/tests/asm.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/tests/asm.c b/dlls/d3dx9_36/tests/asm.c index 19907aa..4d319ed 100644 --- a/dlls/d3dx9_36/tests/asm.c +++ b/dlls/d3dx9_36/tests/asm.c @@ -115,6 +115,7 @@ static void assembleshader_test(void) { "#include \"incl4.vsh\"\n" }; const char testincl4_ok[] = { + "#define REGISTER r0\n" "vs.1.1\n" }; const char testincl4_wrong[] = { @@ -208,9 +209,9 @@ static void assembleshader_test(void) { } if(shader) ID3DXBuffer_Release(shader); - shader_vsh_res = create_file("shader.vsh", testshader, sizeof(testshader)); + shader_vsh_res = create_file("shader.vsh", testshader, sizeof(testshader) - 1); if(SUCCEEDED(shader_vsh_res)) { - create_file("incl.vsh", testincl, sizeof(testincl)); + create_file("incl.vsh", testincl, sizeof(testincl) - 1); /* D3DXAssembleShaderFromFile + #include test */ shader = NULL; @@ -238,11 +239,11 @@ static void assembleshader_test(void) { } if(shader) ID3DXBuffer_Release(shader); - create_file("shader3.vsh", testshader3, sizeof(testshader3)); - create_file("incl4.vsh", testincl4_wrong, sizeof(testincl4_wrong)); + create_file("shader3.vsh", testshader3, sizeof(testshader3) - 1); + create_file("incl4.vsh", testincl4_wrong, sizeof(testincl4_wrong) - 1); if(CreateDirectoryA("include", NULL)) { - create_file("include/incl3.vsh", testincl3, sizeof(testincl3)); - create_file("include/incl4.vsh", testincl4_ok, sizeof(testincl4_ok)); + create_file("include/incl3.vsh", testincl3, sizeof(testincl3) - 1); + create_file("include/incl4.vsh", testincl4_ok, sizeof(testincl4_ok) - 1); /* path search #include test */ shader = NULL;

1 0

Henri Verbeet : wined3d: GL_DRAW_FRAMEBUFFER depends on either ARB_framebuffer_object or EXT_framebuffer_blit .
by Alexandre Julliard 08 Sep '10

08 Sep '10

Module: wine Branch: master Commit: f49028d91c1f23109fdb521a48b32877275f4fde URL: http://source.winehq.org/git/wine.git/?a=commit;h=f49028d91c1f23109fdb521a4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 8 11:24:46 2010 +0200 wined3d: GL_DRAW_FRAMEBUFFER depends on either ARB_framebuffer_object or EXT_framebuffer_blit. --- dlls/wined3d/swapchain.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 455eb47..3326411 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -165,7 +165,7 @@ static void swapchain_blit(IWineD3DSwapChainImpl *This, struct wined3d_context * gl_filter = GL_NEAREST; ENTER_GL(); - context_bind_fbo(context2, GL_DRAW_FRAMEBUFFER, NULL); + context_bind_fbo(context2, GL_FRAMEBUFFER, NULL); /* Set up the texture. The surface is not in a IWineD3D*Texture container, * so there are no d3d texture settings to dirtify

1 0

Henri Verbeet : wined3d: IWineD3DSurface_GetDesc() should never fail.
by Alexandre Julliard 08 Sep '10

08 Sep '10

Module: wine Branch: master Commit: 53183b4cf356b28c79cd3d51307a429f8b673413 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53183b4cf356b28c79cd3d513… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 8 11:24:47 2010 +0200 wined3d: IWineD3DSurface_GetDesc() should never fail. --- dlls/d3d8/surface.c | 24 ++++++++++-------------- dlls/d3d9/surface.c | 24 ++++++++++-------------- dlls/ddraw/ddraw.c | 3 +-- dlls/ddraw/surface.c | 8 +------- dlls/wined3d/cubetexture.c | 4 +++- dlls/wined3d/surface_base.c | 4 +--- dlls/wined3d/texture.c | 4 +++- dlls/wined3d/wined3d_private.h | 2 +- include/wine/wined3d.idl | 2 +- 9 files changed, 31 insertions(+), 44 deletions(-) diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c index a71ab12..6e59bd6 100644 --- a/dlls/d3d8/surface.c +++ b/dlls/d3d8/surface.c @@ -190,27 +190,23 @@ static HRESULT WINAPI IDirect3DSurface8Impl_GetContainer(LPDIRECT3DSURFACE8 ifac static HRESULT WINAPI IDirect3DSurface8Impl_GetDesc(LPDIRECT3DSURFACE8 iface, D3DSURFACE_DESC *pDesc) { IDirect3DSurface8Impl *This = (IDirect3DSurface8Impl *)iface; WINED3DSURFACE_DESC wined3ddesc; - HRESULT hr; TRACE("iface %p, desc %p.\n", iface, pDesc); wined3d_mutex_lock(); - hr = IWineD3DSurface_GetDesc(This->wineD3DSurface, &wined3ddesc); + IWineD3DSurface_GetDesc(This->wineD3DSurface, &wined3ddesc); wined3d_mutex_unlock(); - if (SUCCEEDED(hr)) - { - pDesc->Format = d3dformat_from_wined3dformat(wined3ddesc.format); - pDesc->Type = wined3ddesc.resource_type; - pDesc->Usage = wined3ddesc.usage; - pDesc->Pool = wined3ddesc.pool; - pDesc->Size = wined3ddesc.size; - pDesc->MultiSampleType = wined3ddesc.multisample_type; - pDesc->Width = wined3ddesc.width; - pDesc->Height = wined3ddesc.height; - } + pDesc->Format = d3dformat_from_wined3dformat(wined3ddesc.format); + pDesc->Type = wined3ddesc.resource_type; + pDesc->Usage = wined3ddesc.usage; + pDesc->Pool = wined3ddesc.pool; + pDesc->Size = wined3ddesc.size; + pDesc->MultiSampleType = wined3ddesc.multisample_type; + pDesc->Width = wined3ddesc.width; + pDesc->Height = wined3ddesc.height; - return hr; + return D3D_OK; } static HRESULT WINAPI IDirect3DSurface8Impl_LockRect(LPDIRECT3DSURFACE8 iface, D3DLOCKED_RECT *pLockedRect, CONST RECT *pRect, DWORD Flags) { diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c index c7dc895..de3fb77 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -246,27 +246,23 @@ static HRESULT WINAPI IDirect3DSurface9Impl_GetContainer(LPDIRECT3DSURFACE9 ifac static HRESULT WINAPI IDirect3DSurface9Impl_GetDesc(LPDIRECT3DSURFACE9 iface, D3DSURFACE_DESC* pDesc) { IDirect3DSurface9Impl *This = (IDirect3DSurface9Impl *)iface; WINED3DSURFACE_DESC wined3ddesc; - HRESULT hr; TRACE("iface %p, desc %p.\n", iface, pDesc); wined3d_mutex_lock(); - hr = IWineD3DSurface_GetDesc(This->wineD3DSurface, &wined3ddesc); + IWineD3DSurface_GetDesc(This->wineD3DSurface, &wined3ddesc); wined3d_mutex_unlock(); - if (SUCCEEDED(hr)) - { - pDesc->Format = d3dformat_from_wined3dformat(wined3ddesc.format); - pDesc->Type = wined3ddesc.resource_type; - pDesc->Usage = wined3ddesc.usage; - pDesc->Pool = wined3ddesc.pool; - pDesc->MultiSampleType = wined3ddesc.multisample_type; - pDesc->MultiSampleQuality = wined3ddesc.multisample_quality; - pDesc->Width = wined3ddesc.width; - pDesc->Height = wined3ddesc.height; - } + pDesc->Format = d3dformat_from_wined3dformat(wined3ddesc.format); + pDesc->Type = wined3ddesc.resource_type; + pDesc->Usage = wined3ddesc.usage; + pDesc->Pool = wined3ddesc.pool; + pDesc->MultiSampleType = wined3ddesc.multisample_type; + pDesc->MultiSampleQuality = wined3ddesc.multisample_quality; + pDesc->Width = wined3ddesc.width; + pDesc->Height = wined3ddesc.height; - return hr; + return D3D_OK; } static HRESULT WINAPI IDirect3DSurface9Impl_LockRect(LPDIRECT3DSURFACE9 iface, D3DLOCKED_RECT* pLockedRect, CONST RECT* pRect, DWORD Flags) { diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 865d5d0..cb942d4 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2389,8 +2389,7 @@ HRESULT WINAPI ddraw_recreate_surfaces_cb(IDirectDrawSurface7 *surf, DDSURFACEDE IWineD3DSurface_GetClipper(wineD3DSurface, &clipper); /* Get the surface properties */ - hr = IWineD3DSurface_GetDesc(wineD3DSurface, &Desc); - if(hr != D3D_OK) return hr; + IWineD3DSurface_GetDesc(wineD3DSurface, &Desc); Format = Desc.format; Usage = Desc.usage; diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index a433913..badd46b 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -3588,13 +3588,7 @@ HRESULT ddraw_surface_init(IDirectDrawSurfaceImpl *surface, IDirectDrawImpl *ddr } surface->surface_desc.dwFlags |= DDSD_PIXELFORMAT; - hr = IWineD3DSurface_GetDesc(surface->WineD3DSurface, &wined3d_desc); - if (FAILED(hr)) - { - ERR("Failed to get wined3d surface desc, hr %#x.\n", hr); - IWineD3DSurface_Release(surface->WineD3DSurface); - return hr; - } + IWineD3DSurface_GetDesc(surface->WineD3DSurface, &wined3d_desc); format = wined3d_desc.format; if (format == WINED3DFMT_UNKNOWN) diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c index 519efbd..13ec3a8 100644 --- a/dlls/wined3d/cubetexture.c +++ b/dlls/wined3d/cubetexture.c @@ -337,7 +337,9 @@ static HRESULT WINAPI IWineD3DCubeTextureImpl_GetLevelDesc(IWineD3DCubeTexture * return WINED3DERR_INVALIDCALL; } - return IWineD3DSurface_GetDesc(surface, desc); + IWineD3DSurface_GetDesc(surface, desc); + + return WINED3D_OK; } static HRESULT WINAPI IWineD3DCubeTextureImpl_GetCubeMapSurface(IWineD3DCubeTexture *iface, diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index eb64804..172b8a8 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -146,7 +146,7 @@ void * WINAPI IWineD3DBaseSurfaceImpl_GetParent(IWineD3DSurface *iface) return ((IWineD3DSurfaceImpl *)iface)->resource.parent; } -HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetDesc(IWineD3DSurface *iface, WINED3DSURFACE_DESC *desc) +void WINAPI IWineD3DBaseSurfaceImpl_GetDesc(IWineD3DSurface *iface, WINED3DSURFACE_DESC *desc) { IWineD3DSurfaceImpl *surface = (IWineD3DSurfaceImpl *)iface; @@ -161,8 +161,6 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetDesc(IWineD3DSurface *iface, WINED3DSU desc->multisample_quality = surface->currentDesc.MultiSampleQuality; desc->width = surface->currentDesc.Width; desc->height = surface->currentDesc.Height; - - return WINED3D_OK; } HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetBltStatus(IWineD3DSurface *iface, DWORD Flags) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 8e285f7..a52d7c4 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -353,7 +353,9 @@ static HRESULT WINAPI IWineD3DTextureImpl_GetLevelDesc(IWineD3DTexture *iface, U return WINED3DERR_INVALIDCALL; } - return IWineD3DSurface_GetDesc(surface, desc); + IWineD3DSurface_GetDesc(surface, desc); + + return WINED3D_OK; } static HRESULT WINAPI IWineD3DTextureImpl_GetSurfaceLevel(IWineD3DTexture *iface, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 30a5ea5..d9e6e83 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2151,7 +2151,7 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_FreePrivateData(IWineD3DSurface *iface, R DWORD WINAPI IWineD3DBaseSurfaceImpl_SetPriority(IWineD3DSurface *iface, DWORD PriorityNew) DECLSPEC_HIDDEN; DWORD WINAPI IWineD3DBaseSurfaceImpl_GetPriority(IWineD3DSurface *iface) DECLSPEC_HIDDEN; WINED3DRESOURCETYPE WINAPI IWineD3DBaseSurfaceImpl_GetType(IWineD3DSurface *iface) DECLSPEC_HIDDEN; -HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetDesc(IWineD3DSurface *iface, WINED3DSURFACE_DESC *desc) DECLSPEC_HIDDEN; +void WINAPI IWineD3DBaseSurfaceImpl_GetDesc(IWineD3DSurface *iface, WINED3DSURFACE_DESC *desc) DECLSPEC_HIDDEN; HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetBltStatus(IWineD3DSurface *iface, DWORD Flags) DECLSPEC_HIDDEN; HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetFlipStatus(IWineD3DSurface *iface, DWORD Flags) DECLSPEC_HIDDEN; HRESULT WINAPI IWineD3DBaseSurfaceImpl_IsLost(IWineD3DSurface *iface) DECLSPEC_HIDDEN; diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index 942ecdc..36a82a5 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -2373,7 +2373,7 @@ interface IWineD3DClipper : IUnknown ] interface IWineD3DSurface : IWineD3DResource { - HRESULT GetDesc( + void GetDesc( [out] WINED3DSURFACE_DESC *desc ); HRESULT LockRect(

1 0

Henri Verbeet : wined3d: IWineD3DVolume_GetDesc() should never fail.
by Alexandre Julliard 08 Sep '10

08 Sep '10

Module: wine Branch: master Commit: 955858e97d215016d8a865a17aa1f246903eacdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=955858e97d215016d8a865a17… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 8 11:24:48 2010 +0200 wined3d: IWineD3DVolume_GetDesc() should never fail. --- dlls/d3d8/volume.c | 26 +++++++++++--------------- dlls/d3d9/volume.c | 24 ++++++++++-------------- dlls/wined3d/volume.c | 4 +--- dlls/wined3d/volumetexture.c | 4 +++- include/wine/wined3d.idl | 2 +- 5 files changed, 26 insertions(+), 34 deletions(-) diff --git a/dlls/d3d8/volume.c b/dlls/d3d8/volume.c index c2b7417..1705822 100644 --- a/dlls/d3d8/volume.c +++ b/dlls/d3d8/volume.c @@ -177,28 +177,24 @@ static HRESULT WINAPI IDirect3DVolume8Impl_GetContainer(LPDIRECT3DVOLUME8 iface, static HRESULT WINAPI IDirect3DVolume8Impl_GetDesc(LPDIRECT3DVOLUME8 iface, D3DVOLUME_DESC *pDesc) { IDirect3DVolume8Impl *This = (IDirect3DVolume8Impl *)iface; - HRESULT hr; - WINED3DVOLUME_DESC wined3ddesc; + WINED3DVOLUME_DESC wined3ddesc; TRACE("iface %p, desc %p.\n", iface, pDesc); wined3d_mutex_lock(); - hr = IWineD3DVolume_GetDesc(This->wineD3DVolume, &wined3ddesc); + IWineD3DVolume_GetDesc(This->wineD3DVolume, &wined3ddesc); wined3d_mutex_unlock(); - if (SUCCEEDED(hr)) - { - pDesc->Format = d3dformat_from_wined3dformat(wined3ddesc.Format); - pDesc->Type = wined3ddesc.Type; - pDesc->Usage = wined3ddesc.Usage; - pDesc->Pool = wined3ddesc.Pool; - pDesc->Size = wined3ddesc.Size; - pDesc->Width = wined3ddesc.Width; - pDesc->Height = wined3ddesc.Height; - pDesc->Depth = wined3ddesc.Depth; - } + pDesc->Format = d3dformat_from_wined3dformat(wined3ddesc.Format); + pDesc->Type = wined3ddesc.Type; + pDesc->Usage = wined3ddesc.Usage; + pDesc->Pool = wined3ddesc.Pool; + pDesc->Size = wined3ddesc.Size; + pDesc->Width = wined3ddesc.Width; + pDesc->Height = wined3ddesc.Height; + pDesc->Depth = wined3ddesc.Depth; - return hr; + return D3D_OK; } static HRESULT WINAPI IDirect3DVolume8Impl_LockBox(LPDIRECT3DVOLUME8 iface, D3DLOCKED_BOX *pLockedVolume, CONST D3DBOX *pBox, DWORD Flags) { diff --git a/dlls/d3d9/volume.c b/dlls/d3d9/volume.c index 0d87b86..1ecd2b2 100644 --- a/dlls/d3d9/volume.c +++ b/dlls/d3d9/volume.c @@ -182,29 +182,25 @@ static HRESULT WINAPI IDirect3DVolume9Impl_GetContainer(LPDIRECT3DVOLUME9 iface, static HRESULT WINAPI IDirect3DVolume9Impl_GetDesc(LPDIRECT3DVOLUME9 iface, D3DVOLUME_DESC* pDesc) { IDirect3DVolume9Impl *This = (IDirect3DVolume9Impl *)iface; - WINED3DVOLUME_DESC wined3ddesc; - HRESULT hr; + WINED3DVOLUME_DESC wined3ddesc; TRACE("iface %p, desc %p.\n", iface, pDesc); wined3d_mutex_lock(); - hr = IWineD3DVolume_GetDesc(This->wineD3DVolume, &wined3ddesc); + IWineD3DVolume_GetDesc(This->wineD3DVolume, &wined3ddesc); wined3d_mutex_unlock(); - if (SUCCEEDED(hr)) - { - pDesc->Format = d3dformat_from_wined3dformat(wined3ddesc.Format); - pDesc->Type = wined3ddesc.Type; - pDesc->Usage = wined3ddesc.Usage; - pDesc->Pool = wined3ddesc.Pool; - pDesc->Width = wined3ddesc.Width; - pDesc->Height = wined3ddesc.Height; - pDesc->Depth = wined3ddesc.Depth; - } + pDesc->Format = d3dformat_from_wined3dformat(wined3ddesc.Format); + pDesc->Type = wined3ddesc.Type; + pDesc->Usage = wined3ddesc.Usage; + pDesc->Pool = wined3ddesc.Pool; + pDesc->Width = wined3ddesc.Width; + pDesc->Height = wined3ddesc.Height; + pDesc->Depth = wined3ddesc.Depth; - return hr; + return D3D_OK; } static HRESULT WINAPI IDirect3DVolume9Impl_LockBox(LPDIRECT3DVOLUME9 iface, D3DLOCKED_BOX* pLockedVolume, CONST D3DBOX* pBox, DWORD Flags) { diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 94ea319..8c596fb 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -187,7 +187,7 @@ static WINED3DRESOURCETYPE WINAPI IWineD3DVolumeImpl_GetType(IWineD3DVolume *ifa return resource_get_type((IWineD3DResource *)iface); } -static HRESULT WINAPI IWineD3DVolumeImpl_GetDesc(IWineD3DVolume *iface, WINED3DVOLUME_DESC *desc) +static void WINAPI IWineD3DVolumeImpl_GetDesc(IWineD3DVolume *iface, WINED3DVOLUME_DESC *desc) { IWineD3DVolumeImpl *volume = (IWineD3DVolumeImpl *)iface; @@ -201,8 +201,6 @@ static HRESULT WINAPI IWineD3DVolumeImpl_GetDesc(IWineD3DVolume *iface, WINED3DV desc->Width = volume->currentDesc.Width; desc->Height = volume->currentDesc.Height; desc->Depth = volume->currentDesc.Depth; - - return WINED3D_OK; } static HRESULT WINAPI IWineD3DVolumeImpl_LockBox(IWineD3DVolume *iface, WINED3DLOCKED_BOX* pLockedVolume, CONST WINED3DBOX* pBox, DWORD Flags) { diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c index 6abba41..2e9fec9 100644 --- a/dlls/wined3d/volumetexture.c +++ b/dlls/wined3d/volumetexture.c @@ -273,7 +273,9 @@ static HRESULT WINAPI IWineD3DVolumeTextureImpl_GetLevelDesc(IWineD3DVolumeTextu return WINED3DERR_INVALIDCALL; } - return IWineD3DVolume_GetDesc(volume, desc); + IWineD3DVolume_GetDesc(volume, desc); + + return WINED3D_OK; } static HRESULT WINAPI IWineD3DVolumeTextureImpl_GetVolumeLevel(IWineD3DVolumeTexture *iface, diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index 36a82a5..80dabac 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -2486,7 +2486,7 @@ interface IWineD3DSurface : IWineD3DResource ] interface IWineD3DVolume : IWineD3DResource { - HRESULT GetDesc( + void GetDesc( [out] WINED3DVOLUME_DESC *desc ); HRESULT LockBox(

1 0

Henri Verbeet : ddraw: Remove some stray tabs.
by Alexandre Julliard 08 Sep '10

08 Sep '10

Module: wine Branch: master Commit: b1a385db110e62a3852c7a2595ff44a09f1c4ff8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1a385db110e62a3852c7a259… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 8 11:24:49 2010 +0200 ddraw: Remove some stray tabs. --- dlls/ddraw/clipper.c | 10 ++-- dlls/ddraw/device.c | 6 +- dlls/ddraw/light.c | 6 +- dlls/ddraw/main.c | 14 +++--- dlls/ddraw/material.c | 30 +++++------ dlls/ddraw/palette.c | 3 +- dlls/ddraw/tests/dsurface.c | 79 +++++++++++++++++------------- dlls/ddraw/utils.c | 4 +- dlls/ddraw/viewport.c | 114 ++++++++++++++++++++++--------------------- 9 files changed, 136 insertions(+), 130 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b1a385db110e62a3852c7…

1 0

Henri Verbeet : ddraw: Just pass FOURCC formats through to wined3d.
by Alexandre Julliard 08 Sep '10

08 Sep '10

Module: wine Branch: master Commit: 50d3f8081e79738b05a40d949fddc3431c7dab24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50d3f8081e79738b05a40d949… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 8 11:24:50 2010 +0200 ddraw: Just pass FOURCC formats through to wined3d. --- dlls/ddraw/utils.c | 42 +----------------------------------------- 1 files changed, 1 insertions(+), 41 deletions(-) diff --git a/dlls/ddraw/utils.c b/dlls/ddraw/utils.c index f9cc0d9..07c3ccc 100644 --- a/dlls/ddraw/utils.c +++ b/dlls/ddraw/utils.c @@ -568,47 +568,7 @@ enum wined3d_format_id PixelFormat_DD2WineD3D(const DDPIXELFORMAT *DDPixelFormat } else if(DDPixelFormat->dwFlags & DDPF_FOURCC) { - if(DDPixelFormat->dwFourCC == MAKEFOURCC('U', 'Y', 'V', 'Y')) - { - return WINED3DFMT_UYVY; - } - if(DDPixelFormat->dwFourCC == MAKEFOURCC('Y', 'U', 'Y', '2')) - { - return WINED3DFMT_YUY2; - } - if(DDPixelFormat->dwFourCC == MAKEFOURCC('Y', 'V', '1', '2')) - { - return WINED3DFMT_YV12; - } - if(DDPixelFormat->dwFourCC == MAKEFOURCC('D', 'X', 'T', '1')) - { - return WINED3DFMT_DXT1; - } - if(DDPixelFormat->dwFourCC == MAKEFOURCC('D', 'X', 'T', '2')) - { - return WINED3DFMT_DXT2; - } - if(DDPixelFormat->dwFourCC == MAKEFOURCC('D', 'X', 'T', '3')) - { - return WINED3DFMT_DXT3; - } - if(DDPixelFormat->dwFourCC == MAKEFOURCC('D', 'X', 'T', '4')) - { - return WINED3DFMT_DXT4; - } - if(DDPixelFormat->dwFourCC == MAKEFOURCC('D', 'X', 'T', '5')) - { - return WINED3DFMT_DXT5; - } - if(DDPixelFormat->dwFourCC == MAKEFOURCC('G', 'R', 'G', 'B')) - { - return WINED3DFMT_G8R8_G8B8; - } - if(DDPixelFormat->dwFourCC == MAKEFOURCC('R', 'G', 'B', 'G')) - { - return WINED3DFMT_R8G8_B8G8; - } - return WINED3DFMT_UNKNOWN; /* Abuse this as an error value */ + return DDPixelFormat->dwFourCC; } else if(DDPixelFormat->dwFlags & DDPF_BUMPDUDV) {

1 0