June 2011 - Wine-commits - list.winehq.org

Dylan Smith : d3dx9: Implement ID3DXSkinInfo::GetBoneName and SetBoneName.
by Alexandre Julliard 23 Jun '11

23 Jun '11

Module: wine Branch: master Commit: 1a1fa9a42d3449d6377f731ab17f6a81d452fef4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a1fa9a42d3449d6377f731ab… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Jun 22 14:24:28 2011 -0400 d3dx9: Implement ID3DXSkinInfo::GetBoneName and SetBoneName. --- dlls/d3dx9_36/skin.c | 26 ++++++++++++++++++++++---- 1 files changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/skin.c b/dlls/d3dx9_36/skin.c index 96de222..d1713ec 100644 --- a/dlls/d3dx9_36/skin.c +++ b/dlls/d3dx9_36/skin.c @@ -25,6 +25,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3dx); struct bone { + char *name; DWORD num_influences; DWORD *vertices; FLOAT *weights; @@ -83,6 +84,7 @@ static ULONG WINAPI ID3DXSkinInfoImpl_Release(ID3DXSkinInfo *iface) if (ref == 0) { int i; for (i = 0; i < This->num_bones; i++) { + HeapFree(GetProcessHeap(), 0, This->bones[i].name); HeapFree(GetProcessHeap(), 0, This->bones[i].vertices); HeapFree(GetProcessHeap(), 0, This->bones[i].weights); } @@ -237,19 +239,35 @@ static FLOAT WINAPI ID3DXSkinInfoImpl_GetMinBoneInfluence(ID3DXSkinInfo *iface) static HRESULT WINAPI ID3DXSkinInfoImpl_SetBoneName(ID3DXSkinInfo *iface, DWORD bone_num, LPCSTR name) { ID3DXSkinInfoImpl *This = impl_from_ID3DXSkinInfo(iface); + char *new_name; + size_t size; - FIXME("(%p, %u, %s): stub\n", This, bone_num, debugstr_a(name)); + TRACE("(%p, %u, %s)\n", This, bone_num, debugstr_a(name)); - return E_NOTIMPL; + if (bone_num >= This->num_bones || !name) + return D3DERR_INVALIDCALL; + + size = strlen(name) + 1; + new_name = HeapAlloc(GetProcessHeap(), 0, size); + if (!new_name) + return E_OUTOFMEMORY; + memcpy(new_name, name, size); + HeapFree(GetProcessHeap(), 0, This->bones[bone_num].name); + This->bones[bone_num].name = new_name; + + return D3D_OK; } static LPCSTR WINAPI ID3DXSkinInfoImpl_GetBoneName(ID3DXSkinInfo *iface, DWORD bone_num) { ID3DXSkinInfoImpl *This = impl_from_ID3DXSkinInfo(iface); - FIXME("(%p, %u): stub\n", This, bone_num); + TRACE("(%p, %u)\n", This, bone_num); - return NULL; + if (bone_num >= This->num_bones) + return NULL; + + return This->bones[bone_num].name; } static HRESULT WINAPI ID3DXSkinInfoImpl_SetBoneOffsetMatrix(ID3DXSkinInfo *iface, DWORD bone_num, CONST D3DXMATRIX *bone_transform)

1 0

Dylan Smith : d3dx9: Implement GetBoneOffsetMatrix and SetBoneOffsetMatrix.
by Alexandre Julliard 23 Jun '11

23 Jun '11

Module: wine Branch: master Commit: 69cf5e4d8ef69979658834b49b278f13f22535c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69cf5e4d8ef69979658834b49… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Jun 22 14:24:35 2011 -0400 d3dx9: Implement GetBoneOffsetMatrix and SetBoneOffsetMatrix. --- dlls/d3dx9_36/skin.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/skin.c b/dlls/d3dx9_36/skin.c index d1713ec..3b03425 100644 --- a/dlls/d3dx9_36/skin.c +++ b/dlls/d3dx9_36/skin.c @@ -26,6 +26,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3dx); struct bone { char *name; + D3DXMATRIX transform; DWORD num_influences; DWORD *vertices; FLOAT *weights; @@ -274,18 +275,25 @@ static HRESULT WINAPI ID3DXSkinInfoImpl_SetBoneOffsetMatrix(ID3DXSkinInfo *iface { ID3DXSkinInfoImpl *This = impl_from_ID3DXSkinInfo(iface); - FIXME("(%p, %u, %p): stub\n", This, bone_num, bone_transform); + TRACE("(%p, %u, %p)\n", This, bone_num, bone_transform); - return E_NOTIMPL; + if (bone_num >= This->num_bones || !bone_transform) + return D3DERR_INVALIDCALL; + + This->bones[bone_num].transform = *bone_transform; + return D3D_OK; } static LPD3DXMATRIX WINAPI ID3DXSkinInfoImpl_GetBoneOffsetMatrix(ID3DXSkinInfo *iface, DWORD bone_num) { ID3DXSkinInfoImpl *This = impl_from_ID3DXSkinInfo(iface); - FIXME("(%p, %u): stub\n", This, bone_num); + TRACE("(%p, %u)\n", This, bone_num); + + if (bone_num >= This->num_bones) + return NULL; - return NULL; + return &This->bones[bone_num].transform; } static HRESULT WINAPI ID3DXSkinInfoImpl_Clone(ID3DXSkinInfo *iface, LPD3DXSKININFO *skin_info)

1 0

Dylan Smith : d3dx9/tests: Added tests for D3DXCreateSkinInfo.
by Alexandre Julliard 23 Jun '11

23 Jun '11

Module: wine Branch: master Commit: 01ff07e2e1d2e77575ddbd88a705ef12ea6f9073 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01ff07e2e1d2e77575ddbd88a… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Jun 22 14:24:41 2011 -0400 d3dx9/tests: Added tests for D3DXCreateSkinInfo. --- dlls/d3dx9_36/tests/mesh.c | 229 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 229 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=01ff07e2e1d2e77575ddb…

1 0

Hans Leidekker : msi: Don' t update the progress bar in schedule_install_files.
by Alexandre Julliard 23 Jun '11

23 Jun '11

Module: wine Branch: master Commit: 838614c7ec487b8cc134b9255d9e1f3fa06831c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=838614c7ec487b8cc134b9255… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jun 23 09:07:31 2011 +0200 msi: Don't update the progress bar in schedule_install_files. --- dlls/msi/files.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 94e5e6c..7ff84cf 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -153,7 +153,6 @@ static void schedule_install_files(MSIPACKAGE *package) TRACE("not overwriting %s\n", debugstr_w(file->TargetPath)); file->state = msifs_skipped; } - msi_ui_progress( package, 2, file->FileSize, 0, 0 ); } }

1 0

Henri Verbeet : wined3d: Only invalidate STATE_STREAMSRC for bound buffers.
by Alexandre Julliard 23 Jun '11

23 Jun '11

Module: wine Branch: master Commit: c3c131ab3419df6152598cd731e08b06e585b440 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3c131ab3419df6152598cd73… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 23 00:02:37 2011 +0200 wined3d: Only invalidate STATE_STREAMSRC for bound buffers. --- dlls/wined3d/buffer.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 1199d3c..ea94c7e 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -843,7 +843,8 @@ void CDECL wined3d_buffer_preload(struct wined3d_buffer *buffer) FIXME("Too many full buffer conversions, stopping converting.\n"); buffer_unload(&buffer->resource); buffer->flags &= ~WINED3D_BUFFER_CREATEBO; - device_invalidate_state(device, STATE_STREAMSRC); + if (buffer->bind_count) + device_invalidate_state(device, STATE_STREAMSRC); return; } } @@ -1070,7 +1071,8 @@ HRESULT CDECL wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UIN TRACE("Dynamic buffer, dropping VBO\n"); buffer_unload(&buffer->resource); buffer->flags &= ~WINED3D_BUFFER_CREATEBO; - device_invalidate_state(device, STATE_STREAMSRC); + if (buffer->bind_count) + device_invalidate_state(device, STATE_STREAMSRC); } else {

1 0

Jacek Caban : urlmon: Fixed handling empty URIs.
by Alexandre Julliard 23 Jun '11

23 Jun '11

Module: wine Branch: master Commit: 6862697acb3ec07ec991b34ed3af96d740563a3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6862697acb3ec07ec991b34ed… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 22 19:22:08 2011 +0200 urlmon: Fixed handling empty URIs. --- dlls/urlmon/tests/uri.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++- dlls/urlmon/uri.c | 44 +++++++++++++++++++------------------- 2 files changed, 74 insertions(+), 23 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 930622a..bc84825 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -4139,7 +4139,58 @@ static const uri_properties uri_tests[] = { {URL_SCHEME_MK,S_OK,FALSE}, {URLZONE_INVALID,E_NOTIMPL,FALSE} } - } + }, + { "", Uri_CREATE_ALLOW_RELATIVE, S_OK, FALSE, + { + {"",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_OK,FALSE}, + {"",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK,FALSE}, + {0,S_FALSE,FALSE}, + {URL_SCHEME_UNKNOWN,S_OK,FALSE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE} + } + }, + { " \t ", Uri_CREATE_ALLOW_RELATIVE, S_OK, FALSE, + { + {"",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_OK,FALSE}, + {"",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK,FALSE}, + {0,S_FALSE,FALSE}, + {URL_SCHEME_UNKNOWN,S_OK,FALSE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE} + } + }, + }; typedef struct _invalid_uri { diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index f12f826..6f2897a 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -857,35 +857,35 @@ static void compute_elision_location(const ipv6_address *address, const USHORT v * characters inside of the URI string. */ static BSTR pre_process_uri(LPCWSTR uri) { - BSTR ret; + const WCHAR *start, *end, *ptr; + WCHAR *ptr2; DWORD len; - const WCHAR *start, *end; - WCHAR *buf, *ptr; - - len = lstrlenW(uri); + BSTR ret; start = uri; /* Skip leading controls and whitespace. */ - while(iscntrlW(*start) || isspaceW(*start)) ++start; + while(*start && (iscntrlW(*start) || isspaceW(*start))) ++start; - end = uri+len-1; - if(start == end) - /* URI consisted only of control/whitespace. */ - ret = SysAllocStringLen(NULL, 0); - else { - while(iscntrlW(*end) || isspaceW(*end)) --end; + /* URI consisted only of control/whitespace. */ + if(!*start) + return SysAllocStringLen(NULL, 0); - buf = heap_alloc(((end+1)-start)*sizeof(WCHAR)); - if(!buf) - return NULL; + end = start + strlenW(start); + while(--end > start && (iscntrlW(*end) || isspaceW(*end))); - for(ptr = buf; start < end+1; ++start) { - if(!iscntrlW(*start)) - *ptr++ = *start; - } + len = ++end - start; + for(ptr = start; ptr < end; ptr++) { + if(iscntrlW(*ptr)) + len--; + } + + ret = SysAllocStringLen(NULL, len); + if(!ret) + return NULL; - ret = SysAllocStringLen(buf, ptr-buf); - heap_free(buf); + for(ptr = start, ptr2=ret; ptr < end; ptr++) { + if(!iscntrlW(*ptr)) + *ptr2++ = *ptr; } return ret; @@ -5096,7 +5096,7 @@ HRESULT WINAPI CreateUri(LPCWSTR pwzURI, DWORD dwFlags, DWORD_PTR dwReserved, IU if(!ppURI) return E_INVALIDARG; - if(!pwzURI || !*pwzURI) { + if(!pwzURI) { *ppURI = NULL; return E_INVALIDARG; }

1 0

Jacek Caban : urlmon: Use BSTR for URLName in URLMoniker object.
by Alexandre Julliard 23 Jun '11

23 Jun '11

Module: wine Branch: master Commit: e135972fd1a0ae98accf968b11efcd03c99aee19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e135972fd1a0ae98accf968b1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 22 19:22:20 2011 +0200 urlmon: Use BSTR for URLName in URLMoniker object. --- dlls/urlmon/umon.c | 31 +++++++++++++------------------ 1 files changed, 13 insertions(+), 18 deletions(-) diff --git a/dlls/urlmon/umon.c b/dlls/urlmon/umon.c index 8ef740f..8811718 100644 --- a/dlls/urlmon/umon.c +++ b/dlls/urlmon/umon.c @@ -37,7 +37,7 @@ typedef struct { LONG ref; - LPOLESTR URLName; /* URL string identified by this URLmoniker */ + BSTR URLName; } URLMoniker; static inline URLMoniker *impl_from_IMoniker(IMoniker *iface) @@ -98,7 +98,7 @@ static ULONG WINAPI URLMoniker_Release(IMoniker *iface) TRACE("(%p) ref=%u\n",This, refCount); if (!refCount) { - heap_free(This->URLName); + SysFreeString(This->URLName); heap_free(This); URLMON_UnlockModule(); @@ -153,13 +153,12 @@ static HRESULT WINAPI URLMoniker_Load(IMoniker* iface,IStream* pStm) res = IStream_Read(pStm, &size, sizeof(ULONG), &got); if(SUCCEEDED(res)) { if(got == sizeof(ULONG)) { - heap_free(This->URLName); - This->URLName = heap_alloc(size); + SysFreeString(This->URLName); + This->URLName = SysAllocStringLen(NULL, size/sizeof(WCHAR)); if(!This->URLName) res = E_OUTOFMEMORY; else { res = IStream_Read(pStm, This->URLName, size, NULL); - This->URLName[size/sizeof(WCHAR) - 1] = 0; } } else @@ -180,7 +179,7 @@ static HRESULT WINAPI URLMoniker_Save(IMoniker *iface, IStream* pStm, BOOL fClea if(!pStm) return E_INVALIDARG; - size = (strlenW(This->URLName) + 1)*sizeof(WCHAR); + size = (SysStringLen(This->URLName) + 1)*sizeof(WCHAR); res=IStream_Write(pStm,&size,sizeof(ULONG),NULL); if(SUCCEEDED(res)) res=IStream_Write(pStm,This->URLName,size,NULL); @@ -198,7 +197,7 @@ static HRESULT WINAPI URLMoniker_GetSizeMax(IMoniker* iface, ULARGE_INTEGER *pcb if(!pcbSize) return E_INVALIDARG; - pcbSize->QuadPart = sizeof(ULONG) + ((strlenW(This->URLName)+1) * sizeof(WCHAR)); + pcbSize->QuadPart = sizeof(ULONG) + ((SysStringLen(This->URLName)+1) * sizeof(WCHAR)); return S_OK; } @@ -409,7 +408,7 @@ static HRESULT WINAPI URLMoniker_GetDisplayName(IMoniker *iface, IBindCtx *pbc, /* FIXME: If this is a partial URL, try and get a URL moniker from SZ_URLCONTEXT in the bind context, then look at pmkToLeft to try and complete the URL */ - len = lstrlenW(This->URLName)+1; + len = SysStringLen(This->URLName)+1; *ppszDisplayName = CoTaskMemAlloc(len*sizeof(WCHAR)); if(!*ppszDisplayName) return E_OUTOFMEMORY; @@ -523,29 +522,25 @@ static URLMoniker *alloc_moniker(void) static HRESULT URLMoniker_Init(URLMoniker *This, LPCOLESTR lpszLeftURLName, LPCOLESTR lpszURLName) { + WCHAR url[INTERNET_MAX_URL_LENGTH]; HRESULT hres; DWORD sizeStr = 0; TRACE("(%p,%s,%s)\n",This,debugstr_w(lpszLeftURLName),debugstr_w(lpszURLName)); - This->URLName = heap_alloc(INTERNET_MAX_URL_LENGTH*sizeof(WCHAR)); - if(lpszLeftURLName) hres = CoInternetCombineUrl(lpszLeftURLName, lpszURLName, URL_FILE_USE_PATHURL, - This->URLName, INTERNET_MAX_URL_LENGTH, &sizeStr, 0); + url, INTERNET_MAX_URL_LENGTH, &sizeStr, 0); else hres = CoInternetParseUrl(lpszURLName, PARSE_CANONICALIZE, URL_FILE_USE_PATHURL, - This->URLName, INTERNET_MAX_URL_LENGTH, &sizeStr, 0); + url, INTERNET_MAX_URL_LENGTH, &sizeStr, 0); - if(FAILED(hres)) { - heap_free(This->URLName); + if(FAILED(hres)) return hres; - } - URLMON_LockModule(); + This->URLName = SysAllocString(url); - if(sizeStr != INTERNET_MAX_URL_LENGTH) - This->URLName = heap_realloc(This->URLName, (sizeStr+1)*sizeof(WCHAR)); + URLMON_LockModule(); TRACE("URLName = %s\n", debugstr_w(This->URLName));

1 0

Dylan Smith : d3dx9: Add stubs for D3DXCreateSkinInfo functions.
by Alexandre Julliard 23 Jun '11

23 Jun '11

Module: wine Branch: master Commit: 7e403aac73352d38a292f222747a9213bcb4a974 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e403aac73352d38a292f2227… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Jun 22 14:24:01 2011 -0400 d3dx9: Add stubs for D3DXCreateSkinInfo functions. --- dlls/d3dx9_36/Makefile.in | 1 + dlls/d3dx9_36/d3dx9_36.spec | 4 ++-- dlls/d3dx9_36/skin.c | 39 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 42 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/Makefile.in b/dlls/d3dx9_36/Makefile.in index cba0ea7..a9bbf50 100644 --- a/dlls/d3dx9_36/Makefile.in +++ b/dlls/d3dx9_36/Makefile.in @@ -11,6 +11,7 @@ C_SRCS = \ math.c \ mesh.c \ shader.c \ + skin.c \ sprite.c \ surface.c \ texture.c \ diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index ca85b7d..f3b4efe 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -84,9 +84,9 @@ @ stub D3DXCreateRenderToEnvMap(ptr long long long long long ptr) @ stub D3DXCreateRenderToSurface(ptr long long long long long ptr) @ stub D3DXCreateSPMesh(ptr ptr ptr ptr ptr) -@ stub D3DXCreateSkinInfo(long ptr long ptr) +@ stdcall D3DXCreateSkinInfo(long ptr long ptr) @ stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr) -@ stub D3DXCreateSkinInfoFVF(long long long ptr) +@ stdcall D3DXCreateSkinInfoFVF(long long long ptr) @ stdcall D3DXCreateSphere(ptr float long long ptr ptr) @ stdcall D3DXCreateSprite(ptr ptr) @ stdcall D3DXCreateTeapot(ptr ptr ptr) diff --git a/dlls/d3dx9_36/skin.c b/dlls/d3dx9_36/skin.c new file mode 100644 index 0000000..24b930e --- /dev/null +++ b/dlls/d3dx9_36/skin.c @@ -0,0 +1,39 @@ +/* + * Skin Info operations specific to D3DX9. + * + * Copyright (C) 2011 Dylan Smith + * + * 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 "wine/debug.h" +#include "d3dx9_36_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d3dx); + +HRESULT WINAPI D3DXCreateSkinInfo(DWORD num_vertices, CONST D3DVERTEXELEMENT9 *declaration, + DWORD num_bones, LPD3DXSKININFO *skin_info) +{ + FIXME("(%u, %p, %u, %p): stub\n", num_vertices, declaration, num_bones, skin_info); + + return E_NOTIMPL; +} + +HRESULT WINAPI D3DXCreateSkinInfoFVF(DWORD num_vertices, DWORD fvf, DWORD num_bones, LPD3DXSKININFO *skin_info) +{ + FIXME("(%u, %x, %u, %p): stub\n", num_vertices, fvf, num_bones, skin_info); + + return E_NOTIMPL; +}

1 0

Dylan Smith : d3dx9: Implement D3DXCreateSkinInfo functions.
by Alexandre Julliard 23 Jun '11

23 Jun '11

Module: wine Branch: master Commit: 999d043e571b74f71640037754669a5642acd238 URL: http://source.winehq.org/git/wine.git/?a=commit;h=999d043e571b74f7164003775… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Jun 22 14:24:12 2011 -0400 d3dx9: Implement D3DXCreateSkinInfo functions. --- dlls/d3dx9_36/skin.c | 386 +++++++++++++++++++++++++++++++++++++++++++++++++- include/d3dx9mesh.h | 2 +- 2 files changed, 383 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=999d043e571b74f716400…

1 0

Dylan Smith : d3dx9: Implement ID3DXSkinInfo bone influence getting and setting.
by Alexandre Julliard 23 Jun '11

23 Jun '11

Module: wine Branch: master Commit: 209ce3233db62bbe8e90534faa90525d73c89dde URL: http://source.winehq.org/git/wine.git/?a=commit;h=209ce3233db62bbe8e90534fa… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Jun 22 14:24:20 2011 -0400 d3dx9: Implement ID3DXSkinInfo bone influence getting and setting. --- dlls/d3dx9_36/skin.c | 81 +++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 71 insertions(+), 10 deletions(-) diff --git a/dlls/d3dx9_36/skin.c b/dlls/d3dx9_36/skin.c index 04ccfab..96de222 100644 --- a/dlls/d3dx9_36/skin.c +++ b/dlls/d3dx9_36/skin.c @@ -23,6 +23,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3dx); +struct bone +{ + DWORD num_influences; + DWORD *vertices; + FLOAT *weights; +}; + typedef struct ID3DXSkinInfoImpl { ID3DXSkinInfo ID3DXSkinInfo_iface; @@ -32,6 +39,7 @@ typedef struct ID3DXSkinInfoImpl D3DVERTEXELEMENT9 vertex_declaration[MAX_FVF_DECL_SIZE]; DWORD num_vertices; DWORD num_bones; + struct bone *bones; } ID3DXSkinInfoImpl; static inline struct ID3DXSkinInfoImpl *impl_from_ID3DXSkinInfo(ID3DXSkinInfo *iface) @@ -73,6 +81,12 @@ static ULONG WINAPI ID3DXSkinInfoImpl_Release(ID3DXSkinInfo *iface) TRACE("%p decreasing refcount to %u\n", This, ref); if (ref == 0) { + int i; + for (i = 0; i < This->num_bones; i++) { + HeapFree(GetProcessHeap(), 0, This->bones[i].vertices); + HeapFree(GetProcessHeap(), 0, This->bones[i].weights); + } + HeapFree(GetProcessHeap(), 0, This->bones); HeapFree(GetProcessHeap(), 0, This); } @@ -82,10 +96,35 @@ static ULONG WINAPI ID3DXSkinInfoImpl_Release(ID3DXSkinInfo *iface) static HRESULT WINAPI ID3DXSkinInfoImpl_SetBoneInfluence(ID3DXSkinInfo *iface, DWORD bone_num, DWORD num_influences, CONST DWORD *vertices, CONST FLOAT *weights) { ID3DXSkinInfoImpl *This = impl_from_ID3DXSkinInfo(iface); + struct bone *bone; + DWORD *new_vertices = NULL; + FLOAT *new_weights = NULL; - FIXME("(%p, %u, %u, %p, %p): stub\n", This, bone_num, num_influences, vertices, weights); + TRACE("(%p, %u, %u, %p, %p)\n", This, bone_num, num_influences, vertices, weights); - return E_NOTIMPL; + if (bone_num >= This->num_bones || !vertices || !weights) + return D3DERR_INVALIDCALL; + + if (num_influences) { + new_vertices = HeapAlloc(GetProcessHeap(), 0, num_influences * sizeof(*vertices)); + if (!new_vertices) + return E_OUTOFMEMORY; + new_weights = HeapAlloc(GetProcessHeap(), 0, num_influences * sizeof(*weights)); + if (!new_weights) { + HeapFree(GetProcessHeap(), 0, new_vertices); + return E_OUTOFMEMORY; + } + memcpy(new_vertices, vertices, num_influences * sizeof(*vertices)); + memcpy(new_weights, weights, num_influences * sizeof(*weights)); + } + bone = &This->bones[bone_num]; + bone->num_influences = num_influences; + HeapFree(GetProcessHeap(), 0, bone->vertices); + HeapFree(GetProcessHeap(), 0, bone->weights); + bone->vertices = new_vertices; + bone->weights = new_weights; + + return D3D_OK; } static HRESULT WINAPI ID3DXSkinInfoImpl_SetBoneVertexInfluence(ID3DXSkinInfo *iface, DWORD bone_num, DWORD influence_num, float weight) @@ -101,18 +140,33 @@ static DWORD WINAPI ID3DXSkinInfoImpl_GetNumBoneInfluences(ID3DXSkinInfo *iface, { ID3DXSkinInfoImpl *This = impl_from_ID3DXSkinInfo(iface); - FIXME("(%p, %u): stub\n", This, bone_num); + TRACE("(%p, %u)\n", This, bone_num); - return 0; + if (bone_num >= This->num_bones) + return 0; + + return This->bones[bone_num].num_influences; } static HRESULT WINAPI ID3DXSkinInfoImpl_GetBoneInfluence(ID3DXSkinInfo *iface, DWORD bone_num, DWORD *vertices, FLOAT *weights) { ID3DXSkinInfoImpl *This = impl_from_ID3DXSkinInfo(iface); + struct bone *bone; - FIXME("(%p, %u, %p, %p): stub\n", This, bone_num, vertices, weights); + TRACE("(%p, %u, %p, %p)\n", This, bone_num, vertices, weights); - return E_NOTIMPL; + if (bone_num >= This->num_bones || !vertices) + return D3DERR_INVALIDCALL; + + bone = &This->bones[bone_num]; + if (!bone->num_influences) + return D3D_OK; + + memcpy(vertices, bone->vertices, bone->num_influences * sizeof(*vertices)); + if (weights) + memcpy(weights, bone->weights, bone->num_influences * sizeof(*weights)); + + return D3D_OK; } static HRESULT WINAPI ID3DXSkinInfoImpl_GetBoneVertexInfluence(ID3DXSkinInfo *iface, DWORD bone_num, @@ -391,15 +445,22 @@ HRESULT WINAPI D3DXCreateSkinInfo(DWORD num_vertices, CONST D3DVERTEXELEMENT9 *d object->vertex_declaration[0] = empty_declaration; object->fvf = 0; - hr = ID3DXSkinInfoImpl_SetDeclaration(&object->ID3DXSkinInfo_iface, declaration); - if (FAILED(hr)) { - HeapFree(GetProcessHeap(), 0, object); - return hr; + object->bones = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, num_bones * sizeof(*object->bones)); + if (!object->bones) { + hr = E_OUTOFMEMORY; + goto error; } + hr = ID3DXSkinInfoImpl_SetDeclaration(&object->ID3DXSkinInfo_iface, declaration); + if (FAILED(hr)) goto error; + *skin_info = &object->ID3DXSkinInfo_iface; return D3D_OK; +error: + HeapFree(GetProcessHeap(), 0, object->bones); + HeapFree(GetProcessHeap(), 0, object); + return hr; } HRESULT WINAPI D3DXCreateSkinInfoFVF(DWORD num_vertices, DWORD fvf, DWORD num_bones, LPD3DXSKININFO *skin_info)

1 0