April 2010 - Wine-Commits - list.winehq.org

Jörg Höhle : msacm32: Fix nesting in acmFilter/ FormatTagEnum.
by Alexandre Julliard April 6, 2010

April 6, 2010

Module: wine Branch: master Commit: 770c9bc8734386e72909cdf29b665c641bb16a6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=770c9bc8734386e72909cdf29… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sun Apr 4 22:37:10 2010 +0200 msacm32: Fix nesting in acmFilter/FormatTagEnum. --- dlls/msacm32/filter.c | 2 +- dlls/msacm32/format.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msacm32/filter.c b/dlls/msacm32/filter.c index 9d70773..53db827 100644 --- a/dlls/msacm32/filter.c +++ b/dlls/msacm32/filter.c @@ -448,8 +448,8 @@ MMRESULT WINAPI acmFilterTagEnumW(HACMDRIVER had, PACMFILTERTAGDETAILSW paftd, } } } + acmDriverClose(had, 0); } - acmDriverClose(had, 0); } return MMSYSERR_NOERROR; } diff --git a/dlls/msacm32/format.c b/dlls/msacm32/format.c index a6f7fbd..9866139 100644 --- a/dlls/msacm32/format.c +++ b/dlls/msacm32/format.c @@ -893,8 +893,8 @@ MMRESULT WINAPI acmFormatTagEnumW(HACMDRIVER had, PACMFORMATTAGDETAILSW paftd, } } } + acmDriverClose(had, 0); } - acmDriverClose(had, 0); } } return MMSYSERR_NOERROR;

1 0

Jörg Höhle : msvidc32: Fix "Unknown message: 400e ".
by Alexandre Julliard April 6, 2010

April 6, 2010

Module: wine Branch: master Commit: d0b92c91f84eaa063a0b0b486108a00a024a4088 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0b92c91f84eaa063a0b0b486… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sun Apr 4 01:02:46 2010 +0200 msvidc32: Fix "Unknown message: 400e". --- dlls/msvidc32/msvideo1.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/msvidc32/msvideo1.c b/dlls/msvidc32/msvideo1.c index 19784eb..9b571bf 100644 --- a/dlls/msvidc32/msvideo1.c +++ b/dlls/msvidc32/msvideo1.c @@ -562,6 +562,10 @@ LRESULT WINAPI CRAM_DriverProc( DWORD_PTR dwDriverId, HDRVR hdrvr, UINT msg, (DWORD) lParam2 ); break; + case ICM_DECOMPRESS_END: + r = ICERR_OK; + break; + case ICM_COMPRESS_QUERY: FIXME("compression not implemented\n"); r = ICERR_BADFORMAT;

1 0

Alexandre Julliard : mmdevapi/tests: Mark some failing tests as todo.
by Alexandre Julliard April 6, 2010

April 6, 2010

Module: wine Branch: master Commit: aed8b8cd8d50bf53529d1f0a833b6a2106c58feb URL: http://source.winehq.org/git/wine.git/?a=commit;h=aed8b8cd8d50bf53529d1f0a8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 6 14:27:56 2010 +0200 mmdevapi/tests: Mark some failing tests as todo. --- dlls/mmdevapi/tests/capture.c | 2 +- dlls/mmdevapi/tests/render.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mmdevapi/tests/capture.c b/dlls/mmdevapi/tests/capture.c index 60496e1..3420508 100644 --- a/dlls/mmdevapi/tests/capture.c +++ b/dlls/mmdevapi/tests/capture.c @@ -319,7 +319,7 @@ START_TEST(capture) } hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&ac); - ok(hr == S_OK, "Activation failed with %08x\n", hr); + todo_wine ok(hr == S_OK, "Activation failed with %08x\n", hr); if (ac) { test_audioclient(ac); diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index 56fea02..24aa085 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -252,7 +252,7 @@ START_TEST(render) } hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&ac); - ok(hr == S_OK, "Activation failed with %08x\n", hr); + todo_wine ok(hr == S_OK, "Activation failed with %08x\n", hr); if (ac) { test_audioclient(ac);

1 0

Christian Costa : d3dx9_36: Improve FIXMEs and TRACEs for surface.
by Alexandre Julliard April 6, 2010

April 6, 2010

Module: wine Branch: master Commit: 24b37eaca01b07e78b7e227786ac114a80c31ec6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24b37eaca01b07e78b7e22778… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Mon Apr 5 20:28:07 2010 +0200 d3dx9_36: Improve FIXMEs and TRACEs for surface. --- dlls/d3dx9_36/surface.c | 36 ++++++++++++++++++++++++++---------- 1 files changed, 26 insertions(+), 10 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 6de6de7..699dbcb 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -71,7 +71,8 @@ HRESULT WINAPI D3DXGetImageInfoFromFileA(LPCSTR file, D3DXIMAGE_INFO *info) LPWSTR widename; HRESULT hr; int strlength; - TRACE("(void): relay\n"); + + TRACE("(%s, %p): relay\n", debugstr_a(file), info); if( !file ) return D3DERR_INVALIDCALL; @@ -90,7 +91,8 @@ HRESULT WINAPI D3DXGetImageInfoFromFileW(LPCWSTR file, D3DXIMAGE_INFO *info) HRESULT hr; DWORD size; LPVOID buffer; - TRACE("(void): relay\n"); + + TRACE("(%s, %p): relay\n", debugstr_w(file), info); if( !file ) return D3DERR_INVALIDCALL; @@ -115,7 +117,8 @@ HRESULT WINAPI D3DXGetImageInfoFromFileW(LPCWSTR file, D3DXIMAGE_INFO *info) HRESULT WINAPI D3DXGetImageInfoFromResourceA(HMODULE module, LPCSTR resource, D3DXIMAGE_INFO *info) { HRSRC resinfo; - TRACE("(void)\n"); + + TRACE("(%p, %s, %p)\n", module, debugstr_a(resource), info); resinfo = FindResourceA(module, resource, (LPCSTR)RT_RCDATA); if(resinfo) { @@ -139,7 +142,8 @@ HRESULT WINAPI D3DXGetImageInfoFromResourceA(HMODULE module, LPCSTR resource, D3 HRESULT WINAPI D3DXGetImageInfoFromResourceW(HMODULE module, LPCWSTR resource, D3DXIMAGE_INFO *info) { HRSRC resinfo; - TRACE("(void)\n"); + + TRACE("(%p, %s, %p)\n", module, debugstr_w(resource), info); resinfo = FindResourceW(module, resource, (LPCWSTR)RT_RCDATA); if(resinfo) { @@ -215,7 +219,9 @@ HRESULT WINAPI D3DXLoadSurfaceFromFileA(LPDIRECT3DSURFACE9 pDestSurface, LPWSTR pWidename; HRESULT hr; int strlength; - TRACE("(void): relay\n"); + + TRACE("(%p, %p, %p, %s, %p, %u, %#x, %p): relay\n", pDestSurface, pDestPalette, pDestRect, debugstr_a(pSrcFile), + pSrcRect, dwFilter, Colorkey, pSrcInfo); if( !pSrcFile || !pDestSurface ) return D3DERR_INVALIDCALL; @@ -241,7 +247,9 @@ HRESULT WINAPI D3DXLoadSurfaceFromFileW(LPDIRECT3DSURFACE9 pDestSurface, HRESULT hr; DWORD dwSize; LPVOID pBuffer; - TRACE("(void): relay\n"); + + TRACE("(%p, %p, %p, %s, %p, %u, %#x, %p): relay\n", pDestSurface, pDestPalette, pDestRect, debugstr_w(pSrcFile), + pSrcRect, Filter, Colorkey, pSrcInfo); if( !pSrcFile || !pDestSurface ) return D3DERR_INVALIDCALL; @@ -268,7 +276,9 @@ HRESULT WINAPI D3DXLoadSurfaceFromResourceA(LPDIRECT3DSURFACE9 pDestSurface, D3DXIMAGE_INFO *pSrcInfo) { HRSRC hResInfo; - TRACE("(void): relay\n"); + + TRACE("(%p, %p, %p, %p, %s, %p, %u, %#x, %p): relay\n", pDestSurface, pDestPalette, pDestRect, hSrcModule, + debugstr_a(pResource), pSrcRect, dwFilter, Colorkey, pSrcInfo); if( !pDestSurface ) return D3DERR_INVALIDCALL; @@ -302,7 +312,9 @@ HRESULT WINAPI D3DXLoadSurfaceFromResourceW(LPDIRECT3DSURFACE9 pDestSurface, D3DXIMAGE_INFO *pSrcInfo) { HRSRC hResInfo; - TRACE("(void): relay\n"); + + TRACE("(%p, %p, %p, %p, %s, %p, %u, %#x, %p): relay\n", pDestSurface, pDestPalette, pDestRect, hSrcModule, + debugstr_w(pResource), pSrcRect, dwFilter, Colorkey, pSrcInfo); if( !pDestSurface ) return D3DERR_INVALIDCALL; @@ -450,7 +462,9 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(LPDIRECT3DSURFACE9 pDestSurface, D3DLOCKED_RECT lockrect; POINT srcsize, destsize; HRESULT hr; - TRACE("(void)\n"); + + TRACE("(%p, %p, %p, %p, %x, %u, %p, %p %u, %#x)\n", pDestSurface, pDestPalette, pDestRect, pSrcMemory, + SrcFormat, SrcPitch, pSrcPalette, pSrcRect, dwFilter, Colorkey); if( !pDestSurface || !pSrcMemory || !pSrcRect ) return D3DERR_INVALIDCALL; if(SrcFormat == D3DFMT_UNKNOWN || pSrcRect->left >= pSrcRect->right || pSrcRect->top >= pSrcRect->bottom) return E_FAIL; @@ -520,7 +534,9 @@ HRESULT WINAPI D3DXLoadSurfaceFromSurface(LPDIRECT3DSURFACE9 pDestSurface, D3DLOCKED_RECT lock; D3DSURFACE_DESC SrcDesc; HRESULT hr; - TRACE("(void): relay\n"); + + TRACE("(%p, %p, %p, %p, %p, %p, %u, %#x): relay\n", pDestSurface, pDestPalette, pDestRect, + pSrcSurface, pSrcPalette, pSrcRect, dwFilter, Colorkey); if( !pDestSurface || !pSrcSurface ) return D3DERR_INVALIDCALL;

1 0

Marcin Baczyński : makedep: Silence unused result warnings.
by Alexandre Julliard April 6, 2010

April 6, 2010

Module: wine Branch: master Commit: d04c2ccb27dec686553ccb24a1e4d2cd083e5341 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d04c2ccb27dec686553ccb24a… Author: Marcin Baczyński <marbacz(a)gmail.com> Date: Fri Apr 2 19:06:31 2010 +0200 makedep: Silence unused result warnings. --- tools/makedep.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 9ce5bef..4fb1ac5 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -204,7 +204,7 @@ static char *get_line( FILE *file ) while (p == buffer + size - 1 && p[-1] != '\n') { buffer = xrealloc( buffer, size * 2 ); - fgets( buffer + size - 1, size + 1, file ); + if (!fgets( buffer + size - 1, size + 1, file )) break; p = buffer + strlen(buffer); size *= 2; } @@ -216,7 +216,7 @@ static char *get_line( FILE *file ) { *(--p) = 0; /* line ends in backslash, read continuation line */ - fgets( p, size - (p - buffer), file ); + if (!fgets( p, size - (p - buffer), file )) return buffer; input_line++; continue; }

1 0

Alexandre Julliard : ole32: Don' t use in-memory structure layouts to build the wire data, define wire-specific structures instead.
by Alexandre Julliard April 6, 2010

April 6, 2010

Module: wine Branch: master Commit: a8ffa9bace4940862f62d2c1834df86119fe9002 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8ffa9bace4940862f62d2c18… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 6 18:07:59 2010 +0200 ole32: Don't use in-memory structure layouts to build the wire data, define wire-specific structures instead. --- dlls/ole32/rpc.c | 56 +++++++++++++++++++++++++++++++++++++---------------- 1 files changed, 39 insertions(+), 17 deletions(-) diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index 0daa4ab..75b6b1f 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -144,6 +144,28 @@ typedef struct /* [size_is((size+7)&~7)] */ unsigned char data[1]; } WIRE_ORPC_EXTENT; +typedef struct +{ + ULONG size; + ULONG reserved; + unsigned char extent[1]; +} WIRE_ORPC_EXTENT_ARRAY; + +typedef struct +{ + ULONG version; + ULONG flags; + ULONG reserved1; + GUID cid; + unsigned char extensions[1]; +} WIRE_ORPCTHIS; + +typedef struct +{ + ULONG flags; + unsigned char extensions[1]; +} WIRE_ORPCTHAT; + struct channel_hook_entry { struct list entry; @@ -503,10 +525,10 @@ static HRESULT WINAPI ServerRpcChannelBuffer_GetBuffer(LPRPCCHANNELBUFFER iface, extensions_size = ChannelHooks_ServerGetSize(&message_state->channel_hook_info, &channel_hook_data, &channel_hook_count, &extension_count); - msg->BufferLength += FIELD_OFFSET(ORPCTHAT, extensions) + 4; + msg->BufferLength += FIELD_OFFSET(WIRE_ORPCTHAT, extensions) + sizeof(DWORD); if (extensions_size) { - msg->BufferLength += FIELD_OFFSET(ORPC_EXTENT_ARRAY, extent) + 2*sizeof(DWORD) + extensions_size; + msg->BufferLength += FIELD_OFFSET(WIRE_ORPC_EXTENT_ARRAY, extent[2*sizeof(DWORD) + extensions_size]); if (extension_count & 1) msg->BufferLength += FIELD_OFFSET(WIRE_ORPC_EXTENT, data[0]); } @@ -523,7 +545,7 @@ static HRESULT WINAPI ServerRpcChannelBuffer_GetBuffer(LPRPCCHANNELBUFFER iface, status = I_RpcGetBuffer(msg); orpcthat = msg->Buffer; - msg->Buffer = (char *)msg->Buffer + FIELD_OFFSET(ORPCTHAT, extensions); + msg->Buffer = (char *)msg->Buffer + FIELD_OFFSET(WIRE_ORPCTHAT, extensions); orpcthat->flags = ORPCF_NULL /* FIXME? */; @@ -533,10 +555,10 @@ static HRESULT WINAPI ServerRpcChannelBuffer_GetBuffer(LPRPCCHANNELBUFFER iface, if (extensions_size) { - ORPC_EXTENT_ARRAY *orpc_extent_array = msg->Buffer; + WIRE_ORPC_EXTENT_ARRAY *orpc_extent_array = msg->Buffer; orpc_extent_array->size = extension_count; orpc_extent_array->reserved = 0; - msg->Buffer = (char *)msg->Buffer + FIELD_OFFSET(ORPC_EXTENT_ARRAY, extent); + msg->Buffer = (char *)msg->Buffer + FIELD_OFFSET(WIRE_ORPC_EXTENT_ARRAY, extent); /* NDR representation of orpc_extent_array->extent */ *(DWORD *)msg->Buffer = 1; msg->Buffer = (char *)msg->Buffer + sizeof(DWORD); @@ -645,10 +667,10 @@ static HRESULT WINAPI ClientRpcChannelBuffer_GetBuffer(LPRPCCHANNELBUFFER iface, extensions_size = ChannelHooks_ClientGetSize(&message_state->channel_hook_info, &channel_hook_data, &channel_hook_count, &extension_count); - msg->BufferLength += FIELD_OFFSET(ORPCTHIS, extensions) + 4; + msg->BufferLength += FIELD_OFFSET(WIRE_ORPCTHIS, extensions) + sizeof(DWORD); if (extensions_size) { - msg->BufferLength += FIELD_OFFSET(ORPC_EXTENT_ARRAY, extent) + 2*sizeof(DWORD) + extensions_size; + msg->BufferLength += FIELD_OFFSET(WIRE_ORPC_EXTENT_ARRAY, extent[2*sizeof(DWORD) + extensions_size]); if (extension_count & 1) msg->BufferLength += FIELD_OFFSET(WIRE_ORPC_EXTENT, data[0]); } @@ -703,7 +725,7 @@ static HRESULT WINAPI ClientRpcChannelBuffer_GetBuffer(LPRPCCHANNELBUFFER iface, if (status == RPC_S_OK) { orpcthis = msg->Buffer; - msg->Buffer = (char *)msg->Buffer + FIELD_OFFSET(ORPCTHIS, extensions); + msg->Buffer = (char *)msg->Buffer + FIELD_OFFSET(WIRE_ORPCTHIS, extensions); orpcthis->version.MajorVersion = COM_MAJOR_VERSION; orpcthis->version.MinorVersion = COM_MINOR_VERSION; @@ -720,7 +742,7 @@ static HRESULT WINAPI ClientRpcChannelBuffer_GetBuffer(LPRPCCHANNELBUFFER iface, ORPC_EXTENT_ARRAY *orpc_extent_array = msg->Buffer; orpc_extent_array->size = extension_count; orpc_extent_array->reserved = 0; - msg->Buffer = (char *)msg->Buffer + FIELD_OFFSET(ORPC_EXTENT_ARRAY, extent); + msg->Buffer = (char *)msg->Buffer + FIELD_OFFSET(WIRE_ORPC_EXTENT_ARRAY, extent); /* NDR representation of orpc_extent_array->extent */ *(DWORD *)msg->Buffer = 1; msg->Buffer = (char *)msg->Buffer + sizeof(DWORD); @@ -1152,8 +1174,8 @@ static HRESULT unmarshal_ORPC_EXTENT_ARRAY(RPC_MESSAGE *msg, const char *end, DWORD pointer_id; DWORD i; - memcpy(extensions, msg->Buffer, FIELD_OFFSET(ORPC_EXTENT_ARRAY, extent)); - msg->Buffer = (char *)msg->Buffer + FIELD_OFFSET(ORPC_EXTENT_ARRAY, extent); + memcpy(extensions, msg->Buffer, FIELD_OFFSET(WIRE_ORPC_EXTENT_ARRAY, extent)); + msg->Buffer = (char *)msg->Buffer + FIELD_OFFSET(WIRE_ORPC_EXTENT_ARRAY, extent); if ((const char *)msg->Buffer + 2 * sizeof(DWORD) > end) return RPC_E_INVALID_HEADER; @@ -1205,14 +1227,14 @@ static HRESULT unmarshal_ORPCTHIS(RPC_MESSAGE *msg, ORPCTHIS *orpcthis, *first_wire_orpc_extent = NULL; - if (msg->BufferLength < FIELD_OFFSET(ORPCTHIS, extensions) + 4) + if (msg->BufferLength < FIELD_OFFSET(WIRE_ORPCTHIS, extensions) + sizeof(DWORD)) { ERR("invalid buffer length\n"); return RPC_E_INVALID_HEADER; } - memcpy(orpcthis, msg->Buffer, FIELD_OFFSET(ORPCTHIS, extensions)); - msg->Buffer = (char *)msg->Buffer + FIELD_OFFSET(ORPCTHIS, extensions); + memcpy(orpcthis, msg->Buffer, FIELD_OFFSET(WIRE_ORPCTHIS, extensions)); + msg->Buffer = (char *)msg->Buffer + FIELD_OFFSET(WIRE_ORPCTHIS, extensions); if ((const char *)msg->Buffer + sizeof(DWORD) > end) return RPC_E_INVALID_HEADER; @@ -1256,14 +1278,14 @@ static HRESULT unmarshal_ORPCTHAT(RPC_MESSAGE *msg, ORPCTHAT *orpcthat, *first_wire_orpc_extent = NULL; - if (msg->BufferLength < FIELD_OFFSET(ORPCTHAT, extensions) + 4) + if (msg->BufferLength < FIELD_OFFSET(WIRE_ORPCTHAT, extensions) + sizeof(DWORD)) { ERR("invalid buffer length\n"); return RPC_E_INVALID_HEADER; } - memcpy(orpcthat, msg->Buffer, FIELD_OFFSET(ORPCTHAT, extensions)); - msg->Buffer = (char *)msg->Buffer + FIELD_OFFSET(ORPCTHAT, extensions); + memcpy(orpcthat, msg->Buffer, FIELD_OFFSET(WIRE_ORPCTHAT, extensions)); + msg->Buffer = (char *)msg->Buffer + FIELD_OFFSET(WIRE_ORPCTHAT, extensions); if ((const char *)msg->Buffer + sizeof(DWORD) > end) return RPC_E_INVALID_HEADER;

1 0

Christian Costa : d3dx9_36: Add stub for D3DXCreateBox.
by Alexandre Julliard April 6, 2010

April 6, 2010

Module: wine Branch: master Commit: 7444b682d091624da95ffd36eb75e844b96cf813 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7444b682d091624da95ffd36e… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Tue Apr 6 00:31:46 2010 +0200 d3dx9_36: Add stub for D3DXCreateBox. --- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/mesh.c | 8 ++++++++ include/Makefile.in | 1 + include/d3dx9shape.h | 39 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 49 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index 5980d74..329e501 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -31,7 +31,7 @@ @ stub D3DXConvertMeshSubsetToSingleStrip @ stub D3DXConvertMeshSubsetToStrips @ stub D3DXCreateAnimationController -@ stub D3DXCreateBox +@ stdcall D3DXCreateBox(ptr long long long ptr ptr) @ stdcall D3DXCreateBuffer(long ptr) @ stub D3DXCreateCompressedAnimationSet @ stub D3DXCreateCubeTexture diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index f90de85..f2dc4d4 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -316,3 +316,11 @@ BOOL WINAPI D3DXSphereBoundProbe(CONST D3DXVECTOR3 *pcenter, FLOAT radius, CONST if ( ( d <= 0.0f ) || ( sqrt(d) <= b ) ) return FALSE; return TRUE; } + +HRESULT WINAPI D3DXCreateBox(LPDIRECT3DDEVICE9 device, FLOAT width, FLOAT height, + FLOAT depth, LPD3DXMESH* mesh, LPD3DXBUFFER* adjacency) +{ + FIXME("(%p, %f, %f, %f, %p, %p): stub\n", device, width, height, depth, mesh, adjacency); + + return E_NOTIMPL; +} diff --git a/include/Makefile.in b/include/Makefile.in index c9570f0..2408e27 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -173,6 +173,7 @@ SRCDIR_INCLUDES = \ d3dx9math.inl \ d3dx9mesh.h \ d3dx9shader.h \ + d3dx9shape.h \ d3dx9tex.h \ dbccmd.idl \ dbcses.idl \ diff --git a/include/d3dx9shape.h b/include/d3dx9shape.h new file mode 100644 index 0000000..e1bf231 --- /dev/null +++ b/include/d3dx9shape.h @@ -0,0 +1,39 @@ +/* + * Copyright 2010 Christian Costa + * + * 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 + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "d3dx9.h" + +#ifndef __D3DX9SHAPE_H__ +#define __D3DX9SHAPE_H__ + +#ifdef __cplusplus +extern "C" { +#endif + +HRESULT WINAPI D3DXCreateBox(LPDIRECT3DDEVICE9 device, + FLOAT width, + FLOAT height, + FLOAT depth, + LPD3DXMESH* mesh, + LPD3DXBUFFER* adjacency); + +#ifdef __cplusplus +} +#endif + +#endif /* __D3DX9SHAPE_H__ */

1 0

Alexandre Julliard : mmdevapi/tests: Remove some todos that succeed now.
by Alexandre Julliard April 6, 2010

April 6, 2010

Module: wine Branch: master Commit: 87f1933d8683ff5a5cf8b6fa91b1149343d5cf99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87f1933d8683ff5a5cf8b6fa9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 6 14:26:23 2010 +0200 mmdevapi/tests: Remove some todos that succeed now. --- dlls/mmdevapi/tests/propstore.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mmdevapi/tests/propstore.c b/dlls/mmdevapi/tests/propstore.c index 328cdbb..bb9ff16 100644 --- a/dlls/mmdevapi/tests/propstore.c +++ b/dlls/mmdevapi/tests/propstore.c @@ -74,7 +74,7 @@ START_TEST(propstore) } store = NULL; hr = IMMDevice_OpenPropertyStore(dev, 3, &store); - todo_wine ok(hr == E_INVALIDARG, "Wrong hr returned: %08x\n", hr); + ok(hr == E_INVALIDARG, "Wrong hr returned: %08x\n", hr); if (hr != S_OK) /* It seems on windows returning with E_INVALIDARG doesn't * set store to NULL, so just don't set store to non-null @@ -84,11 +84,11 @@ START_TEST(propstore) else if (store) IPropertyStore_Release(store); hr = IMMDevice_OpenPropertyStore(dev, STGM_READ, NULL); - todo_wine ok(hr == E_POINTER, "Wrong hr returned: %08x\n", hr); + ok(hr == E_POINTER, "Wrong hr returned: %08x\n", hr); store = NULL; hr = IMMDevice_OpenPropertyStore(dev, STGM_READ, &store); - todo_wine ok(hr == S_OK, "Opening valid store returned %08x\n", hr); + ok(hr == S_OK, "Opening valid store returned %08x\n", hr); if (store) { test_propertystore(store);

1 0

Christian Costa : d3dx9_36: Add definitions for ID3DXBaseMesh and ID3DXMesh interfaces.
by Alexandre Julliard April 6, 2010

April 6, 2010

Module: wine Branch: master Commit: 1db6ce130950711d902dc7f81f96d70c26895e6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1db6ce130950711d902dc7f81… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Tue Apr 6 00:31:40 2010 +0200 d3dx9_36: Add definitions for ID3DXBaseMesh and ID3DXMesh interfaces. --- include/d3dx9mesh.h | 98 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 98 insertions(+), 0 deletions(-) diff --git a/include/d3dx9mesh.h b/include/d3dx9mesh.h index 9e0b333..84db95f 100644 --- a/include/d3dx9mesh.h +++ b/include/d3dx9mesh.h @@ -21,6 +21,104 @@ #ifndef __WINE_D3DX9MESH_H #define __WINE_D3DX9MESH_H +DEFINE_GUID(IID_ID3DXBaseMesh, 0x7ed943dd, 0x52e8, 0x40b5, 0xa8, 0xd8, 0x76, 0x68, 0x5c, 0x40, 0x63, 0x30); +DEFINE_GUID(IID_ID3DXMesh, 0x4020e5c2, 0x1403, 0x4929, 0x88, 0x3f, 0xe2, 0xe8, 0x49, 0xfa, 0xc1, 0x95); + +enum _MAX_FVF_DECL_SIZE +{ + MAX_FVF_DECL_SIZE = MAXD3DDECLLENGTH + 1 +}; + +typedef struct ID3DXBaseMesh* LPD3DXBASEMESH; +typedef struct ID3DXMesh* LPD3DXMESH; + +typedef struct _D3DXATTRIBUTERANGE { + DWORD AttribId; + DWORD FaceStart; + DWORD FaceCount; + DWORD VertexStart; + DWORD VertexCount; +} D3DXATTRIBUTERANGE; + +typedef D3DXATTRIBUTERANGE* LPD3DXATTRIBUTERANGE; + +#undef INTERFACE +#define INTERFACE ID3DXBaseMesh + +DECLARE_INTERFACE_(ID3DXBaseMesh, IUnknown) +{ + /*** IUnknown methods ***/ + STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID* object) PURE; + STDMETHOD_(ULONG, AddRef)(THIS) PURE; + STDMETHOD_(ULONG, Release)(THIS) PURE; + /*** ID3DXBaseMesh ***/ + STDMETHOD(DrawSubset)(THIS_ DWORD attrib_id) PURE; + STDMETHOD_(DWORD, GetNumFaces)(THIS) PURE; + STDMETHOD_(DWORD, GetNumVertices)(THIS) PURE; + STDMETHOD_(DWORD, GetFVF)(THIS) PURE; + STDMETHOD(GetDeclaration)(THIS_ D3DVERTEXELEMENT9 declaration[MAX_FVF_DECL_SIZE]) PURE; + STDMETHOD_(DWORD, GetNumBytesPerVertex)(THIS) PURE; + STDMETHOD_(DWORD, GetOptions)(THIS) PURE; + STDMETHOD(GetDevice)(THIS_ LPDIRECT3DDEVICE9* device) PURE; + STDMETHOD(CloneMeshFVF)(THIS_ DWORD options, DWORD fvf, LPDIRECT3DDEVICE9 device, LPD3DXMESH* clone_mesh) PURE; + STDMETHOD(CloneMesh)(THIS_ DWORD options, CONST D3DVERTEXELEMENT9* declaration, LPDIRECT3DDEVICE9 device, + LPD3DXMESH* clone_mesh) PURE; + STDMETHOD(GetVertexBuffer)(THIS_ LPDIRECT3DVERTEXBUFFER9* vertex_buffer) PURE; + STDMETHOD(GetIndexBuffer)(THIS_ LPDIRECT3DINDEXBUFFER9* index_buffer) PURE; + STDMETHOD(LockVertexBuffer)(THIS_ DWORD flags, LPVOID* data) PURE; + STDMETHOD(UnlockVertexBuffer)(THIS) PURE; + STDMETHOD(LockIndexBuffer)(THIS_ DWORD flags, LPVOID* data) PURE; + STDMETHOD(UnlockIndexBuffer)(THIS) PURE; + STDMETHOD(GetAttributeTable)(THIS_ D3DXATTRIBUTERANGE* attrib_table, DWORD* attrib_table_size) PURE; + STDMETHOD(ConvertPointRepsToAdjacency)(THIS_ CONST DWORD* point_reps, DWORD* adjacency) PURE; + STDMETHOD(ConvertAdjacencyToPointReps)(THIS_ CONST DWORD* adjacency, DWORD* point_reps) PURE; + STDMETHOD(GenerateAdjacency)(THIS_ FLOAT epsilon, DWORD* adjacency) PURE; + STDMETHOD(UpdateSemantics)(THIS_ D3DVERTEXELEMENT9 declaration[MAX_FVF_DECL_SIZE]) PURE; +}; + + +#undef INTERFACE +#define INTERFACE ID3DXMesh + +DECLARE_INTERFACE_(ID3DXMesh, ID3DXBaseMesh) +{ + /*** IUnknown methods ***/ + STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID* object) PURE; + STDMETHOD_(ULONG, AddRef)(THIS) PURE; + STDMETHOD_(ULONG, Release)(THIS) PURE; + /*** ID3DXBaseMesh ***/ + STDMETHOD(DrawSubset)(THIS_ DWORD attrib_id) PURE; + STDMETHOD_(DWORD, GetNumFaces)(THIS) PURE; + STDMETHOD_(DWORD, GetNumVertices)(THIS) PURE; + STDMETHOD_(DWORD, GetFVF)(THIS) PURE; + STDMETHOD(GetDeclaration)(THIS_ D3DVERTEXELEMENT9 declaration[MAX_FVF_DECL_SIZE]) PURE; + STDMETHOD_(DWORD, GetNumBytesPerVertex)(THIS) PURE; + STDMETHOD_(DWORD, GetOptions)(THIS) PURE; + STDMETHOD(GetDevice)(THIS_ LPDIRECT3DDEVICE9* device) PURE; + STDMETHOD(CloneMeshFVF)(THIS_ DWORD options, DWORD fvf, LPDIRECT3DDEVICE9 device, LPD3DXMESH* clone_mesh) PURE; + STDMETHOD(CloneMesh)(THIS_ DWORD options, CONST D3DVERTEXELEMENT9* declaration, LPDIRECT3DDEVICE9 device, + LPD3DXMESH* clone_mesh) PURE; + STDMETHOD(GetVertexBuffer)(THIS_ LPDIRECT3DVERTEXBUFFER9* vertex_buffer) PURE; + STDMETHOD(GetIndexBuffer)(THIS_ LPDIRECT3DINDEXBUFFER9* index_buffer) PURE; + STDMETHOD(LockVertexBuffer)(THIS_ DWORD flags, LPVOID* data) PURE; + STDMETHOD(UnlockVertexBuffer)(THIS) PURE; + STDMETHOD(LockIndexBuffer)(THIS_ DWORD flags, LPVOID* data) PURE; + STDMETHOD(UnlockIndexBuffer)(THIS) PURE; + STDMETHOD(GetAttributeTable)(THIS_ D3DXATTRIBUTERANGE* attrib_table, DWORD* attrib_table_size) PURE; + STDMETHOD(ConvertPointRepsToAdjacency)(THIS_ CONST DWORD* point_reps, DWORD* adjacency) PURE; + STDMETHOD(ConvertAdjacencyToPointReps)(THIS_ CONST DWORD* adjacency, DWORD* point_reps) PURE; + STDMETHOD(GenerateAdjacency)(THIS_ FLOAT epsilon, DWORD* adjacency) PURE; + STDMETHOD(UpdateSemantics)(THIS_ D3DVERTEXELEMENT9 declaration[MAX_FVF_DECL_SIZE]) PURE; + /*** ID3DXMesh ***/ + STDMETHOD(LockAttributeBuffer)(THIS_ DWORD flags, DWORD** data) PURE; + STDMETHOD(UnlockAttributeBuffer)(THIS) PURE; + STDMETHOD(Optimize)(THIS_ DWORD flags, CONST DWORD* adjacency_in, DWORD* adjacency_out, + DWORD* face_remap, LPD3DXBUFFER* vertex_remap, LPD3DXMESH* opt_mesh) PURE; + STDMETHOD(OptimizeInplace)(THIS_ DWORD flags, CONST DWORD* adjacency_in, DWORD* adjacency_out, + DWORD* face_remap, LPD3DXBUFFER* vertex_remap) PURE; + STDMETHOD(SetAttributeTable)(THIS_ CONST D3DXATTRIBUTERANGE* attrib_table, DWORD attrib_table_size) PURE; +}; + #ifdef __cplusplus extern "C" { #endif

1 0

Roderick Colenbrander : wined3d: Move EXT_PALETTED_TEXTURE code over to ffp_blit.
by Alexandre Julliard April 6, 2010

April 6, 2010

Module: wine Branch: master Commit: 69902ab6d07f7c3b975a46b21b0b795730cab06d URL: http://source.winehq.org/git/wine.git/?a=commit;h=69902ab6d07f7c3b975a46b21… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Mon Apr 5 20:05:14 2010 +0200 wined3d: Move EXT_PALETTED_TEXTURE code over to ffp_blit. --- dlls/wined3d/surface.c | 62 +++++++++++++++++++++--------------------------- 1 files changed, 27 insertions(+), 35 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 57514e8..95889e4 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2857,29 +2857,6 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI return WINED3D_OK; } -/* This function is used in case of 8bit paletted textures to upload the palette. - It supports GL_EXT_paletted_texture and GL_ARB_fragment_program, support for other - extensions like ATI_fragment_shaders is possible. -*/ -/* Context activation is done by the caller. */ -static void d3dfmt_p8_upload_palette(IWineD3DSurface *iface, - const struct wined3d_gl_info *gl_info, CONVERT_TYPES convert) -{ - IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; - BYTE table[256][4]; - - d3dfmt_p8_init_palette(This, table, (convert == CONVERT_PALETTED_CK)); - - /* Try to use the paletted texture extension */ - if (gl_info->supported[EXT_PALETTED_TEXTURE]) - { - TRACE("Using GL_EXT_PALETTED_TEXTURE for 8-bit paletted texture support\n"); - ENTER_GL(); - GL_EXTCALL(glColorTableEXT(This->texture_target, GL_RGBA, 256, GL_RGBA, GL_UNSIGNED_BYTE, table)); - LEAVE_GL(); - } -} - BOOL palette9_changed(IWineD3DSurfaceImpl *This) { IWineD3DDeviceImpl *device = This->resource.device; @@ -4317,18 +4294,14 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_RealizePalette(IWineD3DSurface *iface) if((This->resource.usage & WINED3DUSAGE_RENDERTARGET) && device->blitter->color_fixup_supported(&device->adapter->gl_info, This->resource.format_desc->color_fixup)) { - struct wined3d_context *context; - /* Make sure the texture is up to date. This call doesn't do anything if the texture is already up to date. */ IWineD3DSurface_LoadLocation(iface, SFLAG_INTEXTURE, NULL); /* We want to force a palette refresh, so mark the drawable as not being up to date */ IWineD3DSurface_ModifyLocation(iface, SFLAG_INDRAWABLE, FALSE); - /* Re-upload the palette */ - context = context_acquire(device, NULL, CTXUSAGE_RESOURCELOAD); - d3dfmt_p8_upload_palette(iface, context->gl_info, NO_CONVERSION); - context_release(context); + /* Force a palette refresh by re-uploading to the drawable */ + IWineD3DSurface_LoadLocation(iface, SFLAG_INDRAWABLE, NULL); } else { if(!(This->Flags & SFLAG_INSYSMEM)) { TRACE("Palette changed with surface that does not have an up to date system memory copy\n"); @@ -4937,12 +4910,6 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadLocation(IWineD3DSurface *iface, D return WINED3DERR_OUTOFVIDEOMEMORY; } d3dfmt_convert_surface(This->resource.allocatedMemory, mem, pitch, width, height, outpitch, convert, This); - } - else if (This->resource.format_desc->format == WINED3DFMT_P8_UINT - && (device->blitter->color_fixup_supported(gl_info, This->resource.format_desc->color_fixup))) - { - d3dfmt_p8_upload_palette(iface, gl_info, convert); - mem = This->resource.allocatedMemory; } else { mem = This->resource.allocatedMemory; } @@ -5119,9 +5086,34 @@ static HRESULT ffp_blit_alloc(IWineD3DDevice *iface) { return WINED3D_OK; } /* Context activation is done by the caller. */ static void ffp_blit_free(IWineD3DDevice *iface) { } +/* This function is used in case of 8bit paletted textures using GL_EXT_paletted_texture */ +/* Context activation is done by the caller. */ +static void ffp_blit_p8_upload_palette(IWineD3DSurfaceImpl *surface, const struct wined3d_gl_info *gl_info) +{ + BYTE table[256][4]; + BOOL colorkey_active = (surface->CKeyFlags & WINEDDSD_CKSRCBLT) ? TRUE : FALSE; + + d3dfmt_p8_init_palette(surface, table, colorkey_active); + + TRACE("Using GL_EXT_PALETTED_TEXTURE for 8-bit paletted texture support\n"); + ENTER_GL(); + GL_EXTCALL(glColorTableEXT(surface->texture_target, GL_RGBA, 256, GL_RGBA, GL_UNSIGNED_BYTE, table)); + LEAVE_GL(); +} + /* Context activation is done by the caller. */ static HRESULT ffp_blit_set(IWineD3DDevice *iface, IWineD3DSurfaceImpl *surface) { + IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *) iface; + const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; + enum complex_fixup fixup = get_complex_fixup(surface->resource.format_desc->color_fixup); + + /* When EXT_PALETTED_TEXTURE is around, palette conversion is done by the GPU + * else the surface is converted in software at upload time in LoadLocation. + */ + if(fixup == COMPLEX_FIXUP_P8 && gl_info->supported[EXT_PALETTED_TEXTURE]) + ffp_blit_p8_upload_palette(surface, gl_info); + ENTER_GL(); glEnable(surface->texture_target); checkGLcall("glEnable(surface->texture_target)");

1 0