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

Mariusz Pluciński : shell32: Add IKnownFolder:: GetPath support.
by Alexandre Julliard June 22, 2011

June 22, 2011

Module: wine Branch: master Commit: c9b70e665044dd15c9cf0c86c1ac88e139b78c78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9b70e665044dd15c9cf0c86c… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Wed Jun 22 15:10:36 2011 +0200 shell32: Add IKnownFolder::GetPath support. --- dlls/shell32/shellpath.c | 55 +++++++++++++++++++++++++++++++++++++-- dlls/shell32/tests/shellpath.c | 5 --- 2 files changed, 52 insertions(+), 8 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 06108ca..6779e61 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -3079,6 +3079,7 @@ HRESULT WINAPI SHGetFolderPathEx(REFKNOWNFOLDERID rfid, DWORD flags, HANDLE toke /* constant values used by known folder functions */ static const WCHAR szCategory[] = {'C','a','t','e','g','o','r','y',0}; static const WCHAR szName[] = {'N','a','m','e',0}; +static const WCHAR szRelativePath[] = {'R','e','l','a','t','i','v','e','P','a','t','h',0}; /* * Internal function to convert known folder identifier to path of registry key @@ -3120,6 +3121,7 @@ struct knownfolder const struct IKnownFolderVtbl *vtbl; LONG refs; KNOWNFOLDERID id; + LPWSTR registryPath; }; static inline struct knownfolder *impl_from_IKnownFolder( IKnownFolder *iface ) @@ -3142,6 +3144,7 @@ static ULONG WINAPI knownfolder_Release( if (!refs) { TRACE("destroying %p\n", knownfolder); + HeapFree( GetProcessHeap(), 0, knownfolder->registryPath); HeapFree( GetProcessHeap(), 0, knownfolder ); } return refs; @@ -3175,11 +3178,32 @@ static HRESULT knownfolder_set_id( const KNOWNFOLDERID *kfid) { struct knownfolder *knownfolder = impl_from_IKnownFolder( iface ); + HKEY hKey; + HRESULT hr; TRACE("%s\n", debugstr_guid(kfid)); knownfolder->id = *kfid; - return S_OK; + + /* check is it registry-registered folder */ + hr = get_known_folder_registry_path(kfid, &knownfolder->registryPath); + if(SUCCEEDED(hr)) + hr = HRESULT_FROM_WIN32(RegOpenKeyExW(HKEY_LOCAL_MACHINE, knownfolder->registryPath, 0, 0, &hKey)); + + if(SUCCEEDED(hr)) + { + hr = S_OK; + RegCloseKey(hKey); + } + else + { + /* This known folder is not registered. To mark it, we set registryPath to NULL */ + HeapFree(GetProcessHeap(), 0, knownfolder->registryPath); + knownfolder->registryPath = NULL; + hr = S_OK; + } + + return hr; } static HRESULT WINAPI knownfolder_GetId( @@ -3218,9 +3242,30 @@ static HRESULT WINAPI knownfolder_GetPath( LPWSTR *ppszPath) { struct knownfolder *knownfolder = impl_from_IKnownFolder( iface ); + DWORD dwSize, dwType; + HRESULT hr; + + TRACE("(%p, 0x%08x, %p)\n", knownfolder, dwFlags, ppszPath); + + /* if this is registry-registered known folder, get path from registry */ + if(knownfolder->registryPath) + { + hr = HRESULT_FROM_WIN32(RegGetValueW(HKEY_LOCAL_MACHINE, knownfolder->registryPath, szRelativePath, RRF_RT_REG_SZ, &dwType, NULL, &dwSize)); - TRACE("0x%08x, %p\n", dwFlags, ppszPath); - return SHGetKnownFolderPath( &knownfolder->id, dwFlags, NULL, ppszPath ); + if(SUCCEEDED(hr)) + { + *ppszPath = CoTaskMemAlloc(dwSize); + if(!*ppszPath) hr = E_OUTOFMEMORY; + } + + if(SUCCEEDED(hr)) + hr = HRESULT_FROM_WIN32(RegGetValueW(HKEY_LOCAL_MACHINE, knownfolder->registryPath, szRelativePath, RRF_RT_REG_SZ, &dwType, *ppszPath, &dwSize)); + } + /* in other case, use older way */ + else + hr = SHGetKnownFolderPath( &knownfolder->id, dwFlags, NULL, ppszPath ); + + return hr; } static HRESULT WINAPI knownfolder_SetPath( @@ -3291,6 +3336,7 @@ static HRESULT knownfolder_create( void **ppv ) kf->vtbl = &knownfolder_vtbl; kf->refs = 1; memset( &kf->id, 0, sizeof(kf->id) ); + kf->registryPath = NULL; *ppv = &kf->vtbl; @@ -3480,6 +3526,9 @@ static HRESULT WINAPI foldermanager_RegisterFolder( if(SUCCEEDED(hr)) hr = HRESULT_FROM_WIN32(RegSetValueExW(hKey, szName, 0, REG_SZ, (LPBYTE)pKFD->pszName, (lstrlenW(pKFD->pszName)+1)*sizeof(WCHAR) )); + if(SUCCEEDED(hr) && pKFD->category != KF_CATEGORY_VIRTUAL) + hr = HRESULT_FROM_WIN32(RegSetValueExW(hKey, szRelativePath, 0, REG_SZ, (LPBYTE)pKFD->pszRelativePath, (lstrlenW(pKFD->pszRelativePath)+1)*sizeof(WCHAR) )); + RegCloseKey(hKey); } diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index 1b575fe..bba7858 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -1180,9 +1180,7 @@ static void test_knownFolders(void) ok(IsEqualGUID(&folderId, &newFolderId)==TRUE, "invalid KNOWNFOLDERID returned\n"); hr = IKnownFolder_GetPath(folder, 0, &folderPath); - todo_wine ok(hr == S_OK, "failed to get path from known folder: 0x%08x\n", hr); - todo_wine ok(lstrcmpiW(folderPath, sExamplePath)==0, "invalid known folder path retreived: \"%s\" when \"%s\" was expected\n", wine_dbgstr_w(folderPath), wine_dbgstr_w(sExamplePath)); CoTaskMemFree(folderPath); @@ -1193,7 +1191,6 @@ static void test_knownFolders(void) /* verify modified path */ hr = IKnownFolder_GetPath(folder, 0, &folderPath); - todo_wine ok(hr == S_OK, "failed to get path from known folder: 0x%08x\n", hr); todo_wine ok(lstrcmpiW(folderPath, sExample2Path)==0, "invalid known folder path retreived: \"%s\" when \"%s\" was expected\n", wine_dbgstr_w(folderPath), wine_dbgstr_w(sExamplePath)); @@ -1206,9 +1203,7 @@ static void test_knownFolders(void) /* again verify modified path */ hr = IKnownFolder_GetPath(folder, 0, &folderPath); - todo_wine ok(hr == S_OK, "failed to get path from known folder: 0x%08x\n", hr); - todo_wine ok(lstrcmpiW(folderPath, sExamplePath)==0, "invalid known folder path retreived: \"%s\" when \"%s\" was expected\n", wine_dbgstr_w(folderPath), wine_dbgstr_w(sExamplePath)); CoTaskMemFree(folderPath);

1 0

Alexandre Julliard : d3dx9: Update the spec files.
by Alexandre Julliard June 22, 2011

June 22, 2011

Module: wine Branch: master Commit: c1a712afe0f6a4daf1cb494af47f917cc1bfc0d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1a712afe0f6a4daf1cb494af… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 22 15:40:07 2011 +0200 d3dx9: Update the spec files. --- dlls/d3dx9_24/d3dx9_24.spec | 10 +++++----- dlls/d3dx9_25/d3dx9_25.spec | 10 +++++----- dlls/d3dx9_26/d3dx9_26.spec | 10 +++++----- dlls/d3dx9_27/d3dx9_27.spec | 10 +++++----- dlls/d3dx9_28/d3dx9_28.spec | 10 +++++----- dlls/d3dx9_29/d3dx9_29.spec | 10 +++++----- dlls/d3dx9_30/d3dx9_30.spec | 10 +++++----- dlls/d3dx9_31/d3dx9_31.spec | 10 +++++----- dlls/d3dx9_32/d3dx9_32.spec | 10 +++++----- dlls/d3dx9_33/d3dx9_33.spec | 10 +++++----- dlls/d3dx9_34/d3dx9_34.spec | 10 +++++----- dlls/d3dx9_35/d3dx9_35.spec | 10 +++++----- dlls/d3dx9_37/d3dx9_37.spec | 10 +++++----- dlls/d3dx9_38/d3dx9_38.spec | 10 +++++----- dlls/d3dx9_39/d3dx9_39.spec | 10 +++++----- dlls/d3dx9_40/d3dx9_40.spec | 10 +++++----- dlls/d3dx9_41/d3dx9_41.spec | 10 +++++----- dlls/d3dx9_42/d3dx9_42.spec | 10 +++++----- dlls/d3dx9_43/d3dx9_43.spec | 10 +++++----- 19 files changed, 95 insertions(+), 95 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c1a712afe0f6a4daf1cb4…

1 0

Travis Athougies : d3dx9_36: Implemented ID3DXConstantTable_SetMatrix and ID3DXConstantTable_SetMatrixArray .
by Alexandre Julliard June 22, 2011

June 22, 2011

Module: wine Branch: master Commit: 4a412c1b83de1e1d137f036e49b3c0f3d5f88076 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a412c1b83de1e1d137f036e4… Author: Travis Athougies <iammisc(a)gmail.com> Date: Tue Jun 21 12:14:33 2011 -0700 d3dx9_36: Implemented ID3DXConstantTable_SetMatrix and ID3DXConstantTable_SetMatrixArray. --- dlls/d3dx9_36/shader.c | 51 ++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 43 insertions(+), 8 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 6448e65..0e0709d 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -980,24 +980,59 @@ static HRESULT WINAPI ID3DXConstantTableImpl_SetVectorArray(ID3DXConstantTable * return D3D_OK; } -static HRESULT WINAPI ID3DXConstantTableImpl_SetMatrix(ID3DXConstantTable* iface, LPDIRECT3DDEVICE9 device, - D3DXHANDLE constant, CONST D3DXMATRIX* matrix) +static HRESULT WINAPI ID3DXConstantTableImpl_SetMatrix(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 device, + D3DXHANDLE constant, CONST D3DXMATRIX *matrix) { ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface); - FIXME("(%p)->(%p, %p, %p): stub\n", This, device, constant, matrix); + TRACE("(%p)->(%p, %p, %p)\n", This, device, constant, matrix); - return E_NOTIMPL; + return ID3DXConstantTable_SetMatrixArray(iface, device, constant, matrix, 1); } -static HRESULT WINAPI ID3DXConstantTableImpl_SetMatrixArray(ID3DXConstantTable* iface, LPDIRECT3DDEVICE9 device, - D3DXHANDLE constant, CONST D3DXMATRIX* matrix, UINT count) +static HRESULT WINAPI ID3DXConstantTableImpl_SetMatrixArray(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 device, + D3DXHANDLE constant, CONST D3DXMATRIX *matrix, UINT count) { ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface); - FIXME("(%p)->(%p, %p, %p, %d): stub\n", This, device, constant, matrix, count); + D3DXCONSTANT_DESC desc; + HRESULT hr; + UINT i, desc_count = 1; + D3DXMATRIX temp; - return E_NOTIMPL; + TRACE("(%p)->(%p, %p, %p, %d)\n", This, device, constant, matrix, count); + + hr = ID3DXConstantTable_GetConstantDesc(iface, constant, &desc, &desc_count); + if (FAILED(hr)) + { + TRACE("ID3DXConstantTable_GetConstantDesc failed: %08x", hr); + return D3DERR_INVALIDCALL; + } + + switch (desc.RegisterSet) + { + case D3DXRS_FLOAT4: + /* i * 4 + 3 is the last register we set. The conditional makes sure that we don't access + registers we're not supposed to */ + for (i = 0; i < count && i * 4 + 3 < desc.RegisterCount; i++) + { + if (desc.Class == D3DXPC_MATRIX_ROWS) + temp = matrix[i]; + else + D3DXMatrixTranspose(&temp, &matrix[i]); + + if (is_vertex_shader(This->desc.Version)) + IDirect3DDevice9_SetVertexShaderConstantF(device, desc.RegisterIndex + i * 4, &temp._11, 4); + else + IDirect3DDevice9_SetPixelShaderConstantF(device, desc.RegisterIndex + i * 4, &temp._11, 4); + } + break; + default: + FIXME("Handle other register sets\n"); + return E_NOTIMPL; + } + + return D3D_OK; } static HRESULT WINAPI ID3DXConstantTableImpl_SetMatrixPointerArray(ID3DXConstantTable* iface, LPDIRECT3DDEVICE9 device,

1 0

Travis Athougies : d3dx9_36: Implemented ID3DXConstantTable_SetIntArray and ID3DXConstantTable_SetInt.
by Alexandre Julliard June 22, 2011

June 22, 2011

Module: wine Branch: master Commit: 73272d1664b93cc716779337256795e5137bceef URL: http://source.winehq.org/git/wine.git/?a=commit;h=73272d1664b93cc7167793372… Author: Travis Athougies <iammisc(a)gmail.com> Date: Tue Jun 21 12:14:31 2011 -0700 d3dx9_36: Implemented ID3DXConstantTable_SetIntArray and ID3DXConstantTable_SetInt. --- dlls/d3dx9_36/shader.c | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 8cebcbe..8f0c707 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -835,6 +835,9 @@ static HRESULT set_float_array(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 devi case D3DXPT_FLOAT: row[0] = ((float *)data)[i]; break; + case D3DXPT_INT: + row[0] = (float)((int *)data)[i]; + break; default: FIXME("Unhandled type passed to set_float_array\n"); return D3DERR_INVALIDCALL; @@ -892,23 +895,23 @@ static HRESULT WINAPI ID3DXConstantTableImpl_SetBoolArray(ID3DXConstantTable* if return E_NOTIMPL; } -static HRESULT WINAPI ID3DXConstantTableImpl_SetInt(ID3DXConstantTable* iface, LPDIRECT3DDEVICE9 device, D3DXHANDLE constant, INT n) +static HRESULT WINAPI ID3DXConstantTableImpl_SetInt(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 device, D3DXHANDLE constant, INT n) { ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface); - FIXME("(%p)->(%p, %p, %d): stub\n", This, device, constant, n); + TRACE("(%p)->(%p, %p, %d)\n", This, device, constant, n); - return E_NOTIMPL; + return ID3DXConstantTable_SetIntArray(iface, device, constant, &n, 1); } -static HRESULT WINAPI ID3DXConstantTableImpl_SetIntArray(ID3DXConstantTable* iface, LPDIRECT3DDEVICE9 device, +static HRESULT WINAPI ID3DXConstantTableImpl_SetIntArray(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 device, D3DXHANDLE constant, CONST INT* n, UINT count) { ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface); - FIXME("(%p)->(%p, %p, %p, %d): stub\n", This, device, constant, n, count); + TRACE("(%p)->(%p, %p, %p, %d)\n", This, device, constant, n, count); - return E_NOTIMPL; + return set_float_array(iface, device, constant, n, count, D3DXPT_INT); } static HRESULT WINAPI ID3DXConstantTableImpl_SetFloat(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 device,

1 0

Travis Athougies : d3dx9_36: Implemented ID3DXConstantTable_SetVector and ID3DXConstantTable_SetVectorArray .
by Alexandre Julliard June 22, 2011

June 22, 2011

Module: wine Branch: master Commit: 9c138a182a609ab9b458733f0cdbbbae29e25f4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c138a182a609ab9b458733f0… Author: Travis Athougies <iammisc(a)gmail.com> Date: Tue Jun 21 12:14:32 2011 -0700 d3dx9_36: Implemented ID3DXConstantTable_SetVector and ID3DXConstantTable_SetVectorArray. --- dlls/d3dx9_36/shader.c | 42 ++++++++++++++++++++++++++++++++++-------- 1 files changed, 34 insertions(+), 8 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 8f0c707..6448e65 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -934,24 +934,50 @@ static HRESULT WINAPI ID3DXConstantTableImpl_SetFloatArray(ID3DXConstantTable *i return set_float_array(iface, device, constant, f, count, D3DXPT_FLOAT); } -static HRESULT WINAPI ID3DXConstantTableImpl_SetVector(ID3DXConstantTable* iface, LPDIRECT3DDEVICE9 device, - D3DXHANDLE constant, CONST D3DXVECTOR4* vector) +static HRESULT WINAPI ID3DXConstantTableImpl_SetVector(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 device, + D3DXHANDLE constant, CONST D3DXVECTOR4 *vector) { ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface); - FIXME("(%p)->(%p, %p, %p): stub\n", This, device, constant, vector); + TRACE("(%p)->(%p, %p, %p)\n", This, device, constant, vector); - return E_NOTIMPL; + return ID3DXConstantTable_SetVectorArray(iface, device, constant, vector, 1); } -static HRESULT WINAPI ID3DXConstantTableImpl_SetVectorArray(ID3DXConstantTable* iface, LPDIRECT3DDEVICE9 device, - D3DXHANDLE constant, CONST D3DXVECTOR4* vector, UINT count) +static HRESULT WINAPI ID3DXConstantTableImpl_SetVectorArray(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 device, + D3DXHANDLE constant, CONST D3DXVECTOR4 *vector, UINT count) { ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface); - FIXME("(%p)->(%p, %p, %p, %d): stub\n", This, device, constant, vector, count); + D3DXCONSTANT_DESC desc; + HRESULT hr; + UINT desc_count = 1; + + TRACE("(%p)->(%p, %p, %p, %d)\n", This, device, constant, vector, count); - return E_NOTIMPL; + hr = ID3DXConstantTable_GetConstantDesc(iface, constant, &desc, &desc_count); + if (FAILED(hr)) + { + TRACE("ID3DXConstantTable_GetConstantDesc failed: %08x", hr); + return D3DERR_INVALIDCALL; + } + + switch (desc.RegisterSet) + { + case D3DXRS_FLOAT4: + if (is_vertex_shader(This->desc.Version)) + IDirect3DDevice9_SetVertexShaderConstantF(device, desc.RegisterIndex, (float *)vector, + min(desc.RegisterCount, count)); + else + IDirect3DDevice9_SetPixelShaderConstantF(device, desc.RegisterIndex, (float *)vector, + min(desc.RegisterCount, count)); + break; + default: + FIXME("Handle other register sets\n"); + return E_NOTIMPL; + } + + return D3D_OK; } static HRESULT WINAPI ID3DXConstantTableImpl_SetMatrix(ID3DXConstantTable* iface, LPDIRECT3DDEVICE9 device,

1 0

Travis Athougies : d3dx9_36/tests: Added tests for ID3DXConstantTable_Set* functions.
by Alexandre Julliard June 22, 2011

June 22, 2011

Module: wine Branch: master Commit: ab5e8aed5a8b2eaa846d662c3ea863d5b52e5b0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab5e8aed5a8b2eaa846d662c3… Author: Travis Athougies <iammisc(a)gmail.com> Date: Tue Jun 21 12:14:34 2011 -0700 d3dx9_36/tests: Added tests for ID3DXConstantTable_Set* functions. --- dlls/d3dx9_36/tests/shader.c | 379 +++++++++++++++++++++++++++++++++--------- 1 files changed, 301 insertions(+), 78 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ab5e8aed5a8b2eaa846d6…

1 0

Matteo Bruni : wined3d: Fix draw buffers tracking.
by Alexandre Julliard June 22, 2011

June 22, 2011

Module: wine Branch: master Commit: 32787ec0dd45a0ec794368ce8e513f421152f9b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32787ec0dd45a0ec794368ce8… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jun 17 19:28:38 2011 +0200 wined3d: Fix draw buffers tracking. --- dlls/wined3d/context.c | 30 +++++++++++++++++++++++------- 1 files changed, 23 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index a3c7c78..42141f2 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1986,7 +1986,7 @@ static inline GLenum draw_buffer_from_rt_mask(DWORD rt_mask) } /* Context activation and GL locking are done by the caller. */ -static void context_apply_draw_buffers(struct wined3d_context *context, DWORD rt_mask, struct wined3d_surface **rts) +static void context_apply_draw_buffers(struct wined3d_context *context, DWORD rt_mask) { if (!rt_mask) { @@ -2007,7 +2007,7 @@ static void context_apply_draw_buffers(struct wined3d_context *context, DWORD rt while (rt_mask) { - if ((rt_mask & 1) && rts[i] && rts[i]->resource.format->id != WINED3DFMT_NULL) + if (rt_mask & 1) context->draw_buffers[i] = GL_COLOR_ATTACHMENT0 + i; else context->draw_buffers[i] = GL_NONE; @@ -2120,7 +2120,10 @@ void context_apply_blit_state(struct wined3d_context *context, struct wined3d_de ENTER_GL(); context_apply_fbo_state_blit(context, GL_FRAMEBUFFER, context->current_rt, NULL, SFLAG_INTEXTURE); LEAVE_GL(); - rt_mask = 1; + if (context->current_rt && context->current_rt->resource.format->id != WINED3DFMT_NULL) + rt_mask = 1; + else + rt_mask = 0; } else { @@ -2138,7 +2141,7 @@ void context_apply_blit_state(struct wined3d_context *context, struct wined3d_de ENTER_GL(); if (rt_mask != context->draw_buffers_mask) { - context_apply_draw_buffers(context, rt_mask, &context->current_rt); + context_apply_draw_buffers(context, rt_mask); context->draw_buffers_mask = rt_mask; } @@ -2191,7 +2194,8 @@ BOOL context_apply_clear_state(struct wined3d_context *context, struct wined3d_d for (i = 0; i < rt_count; ++i) { context->blit_targets[i] = rts[i]; - rt_mask |= (1 << i); + if (rts[i] && rts[i]->resource.format->id != WINED3DFMT_NULL) + rt_mask |= (1 << i); } while (i < context->gl_info->limits.buffers) { @@ -2218,7 +2222,7 @@ BOOL context_apply_clear_state(struct wined3d_context *context, struct wined3d_d ENTER_GL(); if (rt_mask != context->draw_buffers_mask) { - context_apply_draw_buffers(context, rt_mask, rts); + context_apply_draw_buffers(context, rt_mask); context->draw_buffers_mask = rt_mask; } @@ -2282,6 +2286,8 @@ BOOL context_apply_draw_state(struct wined3d_context *context, struct wined3d_de else { const struct wined3d_shader *ps = device->stateBlock->state.pixel_shader; + DWORD rt_mask_bits; + struct wined3d_surface **rts = fb->render_targets; ENTER_GL(); context_apply_fbo_state(context, GL_FRAMEBUFFER, fb->render_targets, fb->depth_stencil, SFLAG_INTEXTURE); @@ -2290,6 +2296,16 @@ BOOL context_apply_draw_state(struct wined3d_context *context, struct wined3d_de LEAVE_GL(); rt_mask = ps ? ps->reg_maps.rt_mask : 1; rt_mask &= device->valid_rt_mask; + rt_mask_bits = rt_mask; + i = 0; + while (rt_mask_bits) + { + rt_mask_bits &= ~(1 << i); + if (!rts[i] || rts[i]->resource.format->id == WINED3DFMT_NULL) + rt_mask &= ~(1 << i); + + i++; + } } } else @@ -2300,7 +2316,7 @@ BOOL context_apply_draw_state(struct wined3d_context *context, struct wined3d_de ENTER_GL(); if (context->draw_buffers_mask != rt_mask) { - context_apply_draw_buffers(context, rt_mask, fb->render_targets); + context_apply_draw_buffers(context, rt_mask); context->draw_buffers_mask = rt_mask; }

1 0

Travis Athougies : d3dx9_36: Implemented ID3DXConstantTable_SetFloatArray and ID3DXConstantTable_SetFloat .
by Alexandre Julliard June 22, 2011

June 22, 2011

Module: wine Branch: master Commit: 3fdcce1863c29f042ffe387933d1314d5fc5b657 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fdcce1863c29f042ffe38793… Author: Travis Athougies <iammisc(a)gmail.com> Date: Tue Jun 21 12:14:30 2011 -0700 d3dx9_36: Implemented ID3DXConstantTable_SetFloatArray and ID3DXConstantTable_SetFloat. --- dlls/d3dx9_36/shader.c | 66 ++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 59 insertions(+), 7 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index b8a6909..8cebcbe 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -1,6 +1,7 @@ /* * Copyright 2008 Luis Busquets * Copyright 2009 Matteo Bruni + * Copyright 2011 Travis Athougies * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -630,6 +631,11 @@ static inline ID3DXConstantTableImpl *impl_from_ID3DXConstantTable(ID3DXConstant return CONTAINING_RECORD(iface, ID3DXConstantTableImpl, ID3DXConstantTable_iface); } +static inline int is_vertex_shader(DWORD version) +{ + return (version & 0xFFFF0000) == 0xFFFE0000; +} + /*** IUnknown methods ***/ static HRESULT WINAPI ID3DXConstantTableImpl_QueryInterface(ID3DXConstantTable* iface, REFIID riid, void** ppvObject) { @@ -801,6 +807,52 @@ static D3DXHANDLE WINAPI ID3DXConstantTableImpl_GetConstantElement(ID3DXConstant return NULL; } +static HRESULT set_float_array(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 device, D3DXHANDLE constant, const void *data, + UINT count, D3DXPARAMETER_TYPE type) +{ + ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface); + + D3DXCONSTANT_DESC desc; + HRESULT hr; + UINT i, desc_count = 1; + float row[4] = {0.0f, 0.0f, 0.0f, 0.0f}; + + hr = ID3DXConstantTable_GetConstantDesc(iface, constant, &desc, &desc_count); + if (FAILED(hr)) + { + TRACE("ID3DXConstantTable_GetConstantDesc failed: %08x", hr); + return D3DERR_INVALIDCALL; + } + + switch (desc.RegisterSet) + { + case D3DXRS_FLOAT4: + for (i = 0; i < count && i < desc.RegisterCount; i++) + { + /* We need the for loop since each IDirect3DDevice9_Set*ShaderConstantF expects a float4 */ + switch(type) + { + case D3DXPT_FLOAT: + row[0] = ((float *)data)[i]; + break; + default: + FIXME("Unhandled type passed to set_float_array\n"); + return D3DERR_INVALIDCALL; + } + if (is_vertex_shader(This->desc.Version)) + IDirect3DDevice9_SetVertexShaderConstantF(device, desc.RegisterIndex + i, row, 1); + else + IDirect3DDevice9_SetPixelShaderConstantF(device, desc.RegisterIndex + i, row, 1); + } + break; + default: + FIXME("Handle other register sets\n"); + return E_NOTIMPL; + } + + return D3D_OK; +} + static HRESULT WINAPI ID3DXConstantTableImpl_SetDefaults(ID3DXConstantTable* iface, LPDIRECT3DDEVICE9 device) { ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface); @@ -859,24 +911,24 @@ static HRESULT WINAPI ID3DXConstantTableImpl_SetIntArray(ID3DXConstantTable* ifa return E_NOTIMPL; } -static HRESULT WINAPI ID3DXConstantTableImpl_SetFloat(ID3DXConstantTable* iface, LPDIRECT3DDEVICE9 device, +static HRESULT WINAPI ID3DXConstantTableImpl_SetFloat(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 device, D3DXHANDLE constant, FLOAT f) { ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface); - FIXME("(%p)->(%p, %p, %f): stub\n", This, device, constant, f); + TRACE("(%p)->(%p, %p, %f)\n", This, device, constant, f); - return E_NOTIMPL; + return ID3DXConstantTable_SetFloatArray(iface, device, constant, &f, 1); } -static HRESULT WINAPI ID3DXConstantTableImpl_SetFloatArray(ID3DXConstantTable* iface, LPDIRECT3DDEVICE9 device, - D3DXHANDLE constant, CONST FLOAT* f, UINT count) +static HRESULT WINAPI ID3DXConstantTableImpl_SetFloatArray(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 device, + D3DXHANDLE constant, CONST FLOAT *f, UINT count) { ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface); - FIXME("(%p)->(%p, %p, %p, %d): stub\n", This, device, constant, f, count); + TRACE("(%p)->(%p, %p, %p, %d)\n", This, device, constant, f, count); - return E_NOTIMPL; + return set_float_array(iface, device, constant, f, count, D3DXPT_FLOAT); } static HRESULT WINAPI ID3DXConstantTableImpl_SetVector(ID3DXConstantTable* iface, LPDIRECT3DDEVICE9 device,

1 0

Piotr Caban : msvcp90: Added basic_string_char:: find_first_of implementation.
by Alexandre Julliard June 22, 2011

June 22, 2011

Module: wine Branch: master Commit: ab612bc650c8aa1c8be72964bb4cd3bbe6e6ce63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab612bc650c8aa1c8be72964b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 22 14:04:05 2011 +0200 msvcp90: Added basic_string_char::find_first_of implementation. --- dlls/msvcp90/msvcp90.spec | 32 +++++++------- dlls/msvcp90/string.c | 98 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 114 insertions(+), 16 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ab612bc650c8aa1c8be72…

1 0

Piotr Caban : msvcp90: Added _Lockit class implementation.
by Alexandre Julliard June 22, 2011

June 22, 2011

Module: wine Branch: master Commit: b8606c82ee82fbceb5b7d77f76178e69ec1642eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8606c82ee82fbceb5b7d77f7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 22 14:03:54 2011 +0200 msvcp90: Added _Lockit class implementation. --- dlls/msvcp90/misc.c | 82 +++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.h | 8 ++++ dlls/msvcp90/msvcp90.spec | 28 +++++++------- dlls/msvcp90/msvcp90_main.c | 2 + 4 files changed, 106 insertions(+), 14 deletions(-) diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 8f7a835..f0d1923 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -90,3 +90,85 @@ void CDECL mutex_mutex_dtor(mutex *m) { mutex_dtor(m); } + +#define _LOCK_LOCALE 0 +#define _LOCK_MALLOC 1 +#define _LOCK_STREAM 2 +#define _LOCK_DEBUG 3 +#define _MAX_LOCK 4 +static CRITICAL_SECTION lockit_cs[_MAX_LOCK]; + +/* ?_Lockit_ctor(a)_Lockit@std@@SAXH(a)Z */ +void __cdecl _Lockit_init(int locktype) { + InitializeCriticalSection(&lockit_cs[locktype]); + lockit_cs[locktype].DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": _Lockit critical section"); +} + +/* ?_Lockit_dtor(a)_Lockit@std@@SAXH(a)Z */ +void __cdecl _Lockit_free(int locktype) +{ + lockit_cs[locktype].DebugInfo->Spare[0] = (DWORD_PTR)0; + DeleteCriticalSection(&lockit_cs[locktype]); +} + +void init_lockit(void) { + int i; + + for(i=0; i<_MAX_LOCK; i++) + _Lockit_init(i); +} + +void free_lockit(void) { + int i; + + for(i=0; i<_MAX_LOCK; i++) + _Lockit_free(i); +} + +/* ?_Lockit_ctor(a)_Lockit@std@@CAXPAV12(a)H@Z */ +/* ?_Lockit_ctor(a)_Lockit@std@@CAXPEAV12(a)H@Z */ +void __cdecl _Lockit__Lockit_ctor_locktype(_Lockit *lockit, int locktype) +{ + lockit->locktype = locktype; + EnterCriticalSection(&lockit_cs[locktype]); +} + +/* ?_Lockit_ctor(a)_Lockit@std@@CAXPAV12@@Z */ +/* ?_Lockit_ctor(a)_Lockit@std@@CAXPEAV12@@Z */ +void __cdecl _Lockit__Lockit_ctor(_Lockit *lockit) +{ + _Lockit__Lockit_ctor_locktype(lockit, 0); +} + +/* ??0_Lockit(a)std@@QAE(a)H@Z */ +/* ??0_Lockit(a)std@@QEAA(a)H@Z */ +DEFINE_THISCALL_WRAPPER(_Lockit_ctor_locktype, 8) +_Lockit* __thiscall _Lockit_ctor_locktype(_Lockit *this, int locktype) +{ + _Lockit__Lockit_ctor_locktype(this, locktype); + return this; +} + +/* ??0_Lockit(a)std@@QAE(a)XZ */ +/* ??0_Lockit(a)std@@QEAA(a)XZ */ +DEFINE_THISCALL_WRAPPER(_Lockit_ctor, 4) +_Lockit* __thiscall _Lockit_ctor(_Lockit *this) +{ + _Lockit__Lockit_ctor_locktype(this, 0); + return this; +} + +/* ?_Lockit_dtor(a)_Lockit@std@@CAXPAV12@@Z */ +/* ?_Lockit_dtor(a)_Lockit@std@@CAXPEAV12@@Z */ +void __cdecl _Lockit__Lockit_dtor(_Lockit *lockit) +{ + LeaveCriticalSection(&lockit_cs[lockit->locktype]); +} + +/* ??1_Lockit(a)std@@QAE(a)XZ */ +/* ??1_Lockit(a)std@@QEAA(a)XZ */ +DEFINE_THISCALL_WRAPPER(_Lockit_dtor, 4) +void __thiscall _Lockit_dtor(_Lockit *this) +{ + _Lockit__Lockit_dtor(this); +} diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index d94bc6f..9c9e337 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -193,3 +193,11 @@ typedef struct { struct locale__Locimp *ptr; } locale; + +/* class _Lockit */ +typedef struct { + int locktype; +} _Lockit; + +void init_lockit(void); +void free_lockit(void); diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 3dfe4d2..0da53e9 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -1078,10 +1078,10 @@ @ stub -arch=win64 ??0_Locinfo(a)std@@QEAA(a)HPEBD@Z @ stub -arch=win32 ??0_Locinfo(a)std@@QAE(a)PBD@Z @ stub -arch=win64 ??0_Locinfo(a)std@@QEAA(a)PEBD@Z -@ stub -arch=win32 ??0_Lockit(a)std@@QAE(a)H@Z -@ stub -arch=win64 ??0_Lockit(a)std@@QEAA(a)H@Z -@ stub -arch=win32 ??0_Lockit(a)std@@QAE(a)XZ -@ stub -arch=win64 ??0_Lockit(a)std@@QEAA(a)XZ +@ thiscall -arch=win32 ??0_Lockit(a)std@@QAE(a)H@Z(ptr long) _Lockit_ctor_locktype +@ cdecl -arch=win64 ??0_Lockit(a)std@@QEAA(a)H@Z(ptr long) _Lockit_ctor_locktype +@ thiscall -arch=win32 ??0_Lockit(a)std@@QAE(a)XZ(ptr) _Lockit_ctor +@ cdecl -arch=win64 ??0_Lockit(a)std@@QEAA(a)XZ(ptr) _Lockit_ctor @ thiscall -arch=win32 ??0_Mutex(a)std@@QAE(a)XZ(ptr) mutex_ctor @ cdecl -arch=win64 ??0_Mutex(a)std@@QEAA(a)XZ(ptr) mutex_ctor @ stub -arch=win32 ??0_Timevec(a)std@@QAE(a)ABV01@@Z @@ -1316,8 +1316,8 @@ @ cdecl -arch=win64 ??1_Locimp(a)locale@std@@MEAA(a)XZ(ptr) locale__Locimp_dtor @ stub -arch=win32 ??1_Locinfo(a)std@@QAE(a)XZ @ stub -arch=win64 ??1_Locinfo(a)std@@QEAA(a)XZ -@ stub -arch=win32 ??1_Lockit(a)std@@QAE(a)XZ -@ stub -arch=win64 ??1_Lockit(a)std@@QEAA(a)XZ +@ thiscall -arch=win32 ??1_Lockit(a)std@@QAE(a)XZ(ptr) _Lockit_dtor +@ cdecl -arch=win64 ??1_Lockit(a)std@@QEAA(a)XZ(ptr) _Lockit_dtor @ thiscall -arch=win32 ??1_Mutex(a)std@@QAE(a)XZ(ptr) mutex_dtor @ cdecl -arch=win64 ??1_Mutex(a)std@@QEAA(a)XZ(ptr) mutex_dtor @ stub -arch=win32 ??1_Timevec(a)std@@QAE(a)XZ @@ -2599,14 +2599,14 @@ @ stub -arch=win64 ?_Lock@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@QEAAXXZ @ thiscall -arch=win32 ?_Lock(a)_Mutex@std@@QAEXXZ(ptr) mutex_lock @ cdecl -arch=win64 ?_Lock(a)_Mutex@std@@QEAAXXZ(ptr) mutex_lock -@ stub -arch=win32 ?_Lockit_ctor(a)_Lockit@std@@CAXPAV12@@Z -@ stub -arch=win64 ?_Lockit_ctor(a)_Lockit@std@@CAXPEAV12@@Z -@ stub -arch=win32 ?_Lockit_ctor(a)_Lockit@std@@CAXPAV12(a)H@Z -@ stub -arch=win64 ?_Lockit_ctor(a)_Lockit@std@@CAXPEAV12(a)H@Z -@ stub ?_Lockit_ctor(a)_Lockit@std@@SAXH(a)Z -@ stub -arch=win32 ?_Lockit_dtor(a)_Lockit@std@@CAXPAV12@@Z -@ stub -arch=win64 ?_Lockit_dtor(a)_Lockit@std@@CAXPEAV12@@Z -@ stub ?_Lockit_dtor(a)_Lockit@std@@SAXH(a)Z +@ cdecl -arch=win32 ?_Lockit_ctor(a)_Lockit@std@@CAXPAV12@@Z(ptr) _Lockit__Lockit_ctor +@ cdecl -arch=win64 ?_Lockit_ctor(a)_Lockit@std@@CAXPEAV12@@Z(ptr) _Lockit__Lockit_ctor +@ cdecl -arch=win32 ?_Lockit_ctor(a)_Lockit@std@@CAXPAV12(a)H@Z(ptr long) _Lockit__Lockit_ctor_locktype +@ cdecl -arch=win64 ?_Lockit_ctor(a)_Lockit@std@@CAXPEAV12(a)H@Z(ptr long) _Lockit__Lockit_ctor_locktype +@ cdecl ?_Lockit_ctor(a)_Lockit@std@@SAXH(a)Z(long) _Lockit_init +@ cdecl -arch=win32 ?_Lockit_dtor(a)_Lockit@std@@CAXPAV12@@Z(ptr) _Lockit__Lockit_dtor +@ cdecl -arch=win64 ?_Lockit_dtor(a)_Lockit@std@@CAXPEAV12@@Z(ptr) _Lockit__Lockit_dtor +@ cdecl ?_Lockit_dtor(a)_Lockit@std@@SAXH(a)Z(long) _Lockit_free @ stub -arch=win32 ?_MP_Add(a)tr1@std@@YAXQA_K_K(a)Z @ stub -arch=win64 ?_MP_Add(a)tr1@std@@YAXQEA_K_K(a)Z @ stub -arch=win32 ?_MP_Get(a)tr1@std@@YA_KQA_K(a)Z diff --git a/dlls/msvcp90/msvcp90_main.c b/dlls/msvcp90/msvcp90_main.c index 5dd4471..f9c508a 100644 --- a/dlls/msvcp90/msvcp90_main.c +++ b/dlls/msvcp90/msvcp90_main.c @@ -57,8 +57,10 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) case DLL_PROCESS_ATTACH: init_cxx_funcs(); set_exception_vtable(); + init_lockit(); break; case DLL_PROCESS_DETACH: + free_lockit(); break; }

1 0