wine-commits June 2011

wine-commits@winehq.org

2 participants
809 discussions

Mariusz Pluciński : shell32: Add IKnownFolderManager:: RegisterFolder implementation.
by Alexandre Julliard 22 Jun '11

22 Jun '11

Module: wine Branch: master Commit: 7a3b53ab6821a66eb639e2a6335907cbcd4df24d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a3b53ab6821a66eb639e2a63… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Wed Jun 22 16:03:47 2011 +0200 shell32: Add IKnownFolderManager::RegisterFolder implementation. --- dlls/shell32/shellpath.c | 70 ++++++++++++++++++++++++++++++++++++++- dlls/shell32/tests/shellpath.c | 1 - 2 files changed, 68 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index ef0564c..f602092 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -816,6 +816,7 @@ static const WCHAR AllUsersProfileValueW[] = {'A','l','l','U','s','e','r','s','P static const WCHAR szSHFolders[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\','E','x','p','l','o','r','e','r','\\','S','h','e','l','l',' ','F','o','l','d','e','r','s','\0'}; static const WCHAR szSHUserFolders[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\','E','x','p','l','o','r','e','r','\\','U','s','e','r',' ','S','h','e','l','l',' ','F','o','l','d','e','r','s','\0'}; static const WCHAR szDefaultProfileDirW[] = {'u','s','e','r','s',0}; +static const WCHAR szKnownFolderDescriptions[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\','E','x','p','l','o','r','e','r','\\','F','o','l','d','e','r','D','e','s','c','r','i','p','t','i','o','n','s','\0'}; static const WCHAR AllUsersW[] = {'P','u','b','l','i','c',0}; typedef enum _CSIDL_Type { @@ -3075,6 +3076,45 @@ HRESULT WINAPI SHGetFolderPathEx(REFKNOWNFOLDERID rfid, DWORD flags, HANDLE toke return hr; } +/* 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}; + +/* + * Internal function to convert known folder identifier to path of registry key + * associated with known folder. + * + * Parameters: + * rfid [I] pointer to known folder identifier + * lpPath [O] place to store string address. String should be + * later freed using HeapFree(GetProcessHeap(),0, ... ) + */ +static HRESULT get_known_folder_registry_path(REFKNOWNFOLDERID rfid, LPWSTR *lpPath) +{ + static const WCHAR sBackslash[] = {'\\',0}; + HRESULT hr = S_OK; + int length; + WCHAR sGuid[50]; + + TRACE("(%s, %p)\n", debugstr_guid(rfid), lpPath); + + StringFromGUID2(rfid, sGuid, sizeof(sGuid)/sizeof(sGuid[0])); + + length = lstrlenW(szKnownFolderDescriptions)+51; + *lpPath = HeapAlloc(GetProcessHeap(), 0, length*sizeof(WCHAR)); + if(!(*lpPath)) + hr = E_OUTOFMEMORY; + + if(SUCCEEDED(hr)) + { + lstrcpyW(*lpPath, szKnownFolderDescriptions); + lstrcatW(*lpPath, sBackslash); + lstrcatW(*lpPath, sGuid); + } + + return hr; +} + struct knownfolder { const struct IKnownFolderVtbl *vtbl; @@ -3403,8 +3443,34 @@ static HRESULT WINAPI foldermanager_RegisterFolder( REFKNOWNFOLDERID rfid, KNOWNFOLDER_DEFINITION const *pKFD) { - FIXME("%p, %p\n", rfid, pKFD); - return E_NOTIMPL; + HRESULT hr; + HKEY hKey = NULL; + DWORD dwDisp; + LPWSTR registryPath = NULL; + TRACE("(%p, %s, %p)\n", iface, debugstr_guid(rfid), pKFD); + + hr = get_known_folder_registry_path(rfid, &registryPath); + TRACE("registry path: %s\n", debugstr_w(registryPath)); + + if(SUCCEEDED(hr)) + hr = HRESULT_FROM_WIN32(RegCreateKeyExW(HKEY_LOCAL_MACHINE, registryPath, 0, NULL, 0, KEY_WRITE, 0, &hKey, &dwDisp)); + + if(SUCCEEDED(hr)) + { + if(dwDisp == REG_OPENED_EXISTING_KEY) + hr = E_FAIL; + + if(SUCCEEDED(hr)) + hr = HRESULT_FROM_WIN32(RegSetValueExW(hKey, szCategory, 0, REG_DWORD, (LPBYTE)&pKFD->category, sizeof(pKFD->category))); + + if(SUCCEEDED(hr)) + hr = HRESULT_FROM_WIN32(RegSetValueExW(hKey, szName, 0, REG_SZ, (LPBYTE)pKFD->pszName, (lstrlenW(pKFD->pszName)+1)*sizeof(WCHAR) )); + + RegCloseKey(hKey); + } + + HeapFree(GetProcessHeap(), 0, registryPath); + return hr; } static HRESULT WINAPI foldermanager_UnregisterFolder( diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index ee38e4e..c4a268c 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -1168,7 +1168,6 @@ static void test_knownFolders(void) win_skip("No permissions required to register custom known folder\n"); else { - todo_wine ok(hr == S_OK, "failed to register known folder: 0x%08x\n", hr); if(SUCCEEDED(hr)) {

1 0

Alexandre Julliard : d3dx9: Update the spec files.
by Alexandre Julliard 22 Jun '11

22 Jun '11

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/tests: Added tests for ID3DXConstantTable_Set* functions.
by Alexandre Julliard 22 Jun '11

22 Jun '11

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

Travis Athougies : d3dx9_36: Implemented ID3DXConstantTable_SetMatrix and ID3DXConstantTable_SetMatrixArray .
by Alexandre Julliard 22 Jun '11

22 Jun '11

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_SetVector and ID3DXConstantTable_SetVectorArray .
by Alexandre Julliard 22 Jun '11

22 Jun '11

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: Implemented ID3DXConstantTable_SetIntArray and ID3DXConstantTable_SetInt.
by Alexandre Julliard 22 Jun '11

22 Jun '11

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_SetFloatArray and ID3DXConstantTable_SetFloat .
by Alexandre Julliard 22 Jun '11

22 Jun '11

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 22 Jun '11

22 Jun '11

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 22 Jun '11

22 Jun '11

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@_Lockit@std@@SAXH@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@_Lockit@std@@SAXH@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@_Lockit@std@@CAXPAV12@H@Z */ +/* ?_Lockit_ctor@_Lockit@std@@CAXPEAV12@H@Z */ +void __cdecl _Lockit__Lockit_ctor_locktype(_Lockit *lockit, int locktype) +{ + lockit->locktype = locktype; + EnterCriticalSection(&lockit_cs[locktype]); +} + +/* ?_Lockit_ctor@_Lockit@std@@CAXPAV12@@Z */ +/* ?_Lockit_ctor@_Lockit@std@@CAXPEAV12@@Z */ +void __cdecl _Lockit__Lockit_ctor(_Lockit *lockit) +{ + _Lockit__Lockit_ctor_locktype(lockit, 0); +} + +/* ??0_Lockit@std@@QAE@H@Z */ +/* ??0_Lockit@std@@QEAA@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@std@@QAE@XZ */ +/* ??0_Lockit@std@@QEAA@XZ */ +DEFINE_THISCALL_WRAPPER(_Lockit_ctor, 4) +_Lockit* __thiscall _Lockit_ctor(_Lockit *this) +{ + _Lockit__Lockit_ctor_locktype(this, 0); + return this; +} + +/* ?_Lockit_dtor@_Lockit@std@@CAXPAV12@@Z */ +/* ?_Lockit_dtor@_Lockit@std@@CAXPEAV12@@Z */ +void __cdecl _Lockit__Lockit_dtor(_Lockit *lockit) +{ + LeaveCriticalSection(&lockit_cs[lockit->locktype]); +} + +/* ??1_Lockit@std@@QAE@XZ */ +/* ??1_Lockit@std@@QEAA@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@std@@QEAA@HPEBD@Z @ stub -arch=win32 ??0_Locinfo@std@@QAE@PBD@Z @ stub -arch=win64 ??0_Locinfo@std@@QEAA@PEBD@Z -@ stub -arch=win32 ??0_Lockit@std@@QAE@H@Z -@ stub -arch=win64 ??0_Lockit@std@@QEAA@H@Z -@ stub -arch=win32 ??0_Lockit@std@@QAE@XZ -@ stub -arch=win64 ??0_Lockit@std@@QEAA@XZ +@ thiscall -arch=win32 ??0_Lockit@std@@QAE@H@Z(ptr long) _Lockit_ctor_locktype +@ cdecl -arch=win64 ??0_Lockit@std@@QEAA@H@Z(ptr long) _Lockit_ctor_locktype +@ thiscall -arch=win32 ??0_Lockit@std@@QAE@XZ(ptr) _Lockit_ctor +@ cdecl -arch=win64 ??0_Lockit@std@@QEAA@XZ(ptr) _Lockit_ctor @ thiscall -arch=win32 ??0_Mutex@std@@QAE@XZ(ptr) mutex_ctor @ cdecl -arch=win64 ??0_Mutex@std@@QEAA@XZ(ptr) mutex_ctor @ stub -arch=win32 ??0_Timevec@std@@QAE@ABV01@@Z @@ -1316,8 +1316,8 @@ @ cdecl -arch=win64 ??1_Locimp@locale@std@@MEAA@XZ(ptr) locale__Locimp_dtor @ stub -arch=win32 ??1_Locinfo@std@@QAE@XZ @ stub -arch=win64 ??1_Locinfo@std@@QEAA@XZ -@ stub -arch=win32 ??1_Lockit@std@@QAE@XZ -@ stub -arch=win64 ??1_Lockit@std@@QEAA@XZ +@ thiscall -arch=win32 ??1_Lockit@std@@QAE@XZ(ptr) _Lockit_dtor +@ cdecl -arch=win64 ??1_Lockit@std@@QEAA@XZ(ptr) _Lockit_dtor @ thiscall -arch=win32 ??1_Mutex@std@@QAE@XZ(ptr) mutex_dtor @ cdecl -arch=win64 ??1_Mutex@std@@QEAA@XZ(ptr) mutex_dtor @ stub -arch=win32 ??1_Timevec@std@@QAE@XZ @@ -2599,14 +2599,14 @@ @ stub -arch=win64 ?_Lock@?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@QEAAXXZ @ thiscall -arch=win32 ?_Lock@_Mutex@std@@QAEXXZ(ptr) mutex_lock @ cdecl -arch=win64 ?_Lock@_Mutex@std@@QEAAXXZ(ptr) mutex_lock -@ stub -arch=win32 ?_Lockit_ctor@_Lockit@std@@CAXPAV12@@Z -@ stub -arch=win64 ?_Lockit_ctor@_Lockit@std@@CAXPEAV12@@Z -@ stub -arch=win32 ?_Lockit_ctor@_Lockit@std@@CAXPAV12@H@Z -@ stub -arch=win64 ?_Lockit_ctor@_Lockit@std@@CAXPEAV12@H@Z -@ stub ?_Lockit_ctor@_Lockit@std@@SAXH@Z -@ stub -arch=win32 ?_Lockit_dtor@_Lockit@std@@CAXPAV12@@Z -@ stub -arch=win64 ?_Lockit_dtor@_Lockit@std@@CAXPEAV12@@Z -@ stub ?_Lockit_dtor@_Lockit@std@@SAXH@Z +@ cdecl -arch=win32 ?_Lockit_ctor@_Lockit@std@@CAXPAV12@@Z(ptr) _Lockit__Lockit_ctor +@ cdecl -arch=win64 ?_Lockit_ctor@_Lockit@std@@CAXPEAV12@@Z(ptr) _Lockit__Lockit_ctor +@ cdecl -arch=win32 ?_Lockit_ctor@_Lockit@std@@CAXPAV12@H@Z(ptr long) _Lockit__Lockit_ctor_locktype +@ cdecl -arch=win64 ?_Lockit_ctor@_Lockit@std@@CAXPEAV12@H@Z(ptr long) _Lockit__Lockit_ctor_locktype +@ cdecl ?_Lockit_ctor@_Lockit@std@@SAXH@Z(long) _Lockit_init +@ cdecl -arch=win32 ?_Lockit_dtor@_Lockit@std@@CAXPAV12@@Z(ptr) _Lockit__Lockit_dtor +@ cdecl -arch=win64 ?_Lockit_dtor@_Lockit@std@@CAXPEAV12@@Z(ptr) _Lockit__Lockit_dtor +@ cdecl ?_Lockit_dtor@_Lockit@std@@SAXH@Z(long) _Lockit_free @ stub -arch=win32 ?_MP_Add@tr1@std@@YAXQA_K_K@Z @ stub -arch=win64 ?_MP_Add@tr1@std@@YAXQEA_K_K@Z @ stub -arch=win32 ?_MP_Get@tr1@std@@YA_KQA_K@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

Piotr Caban : msvcp90: Added locale class stub.
by Alexandre Julliard 22 Jun '11

22 Jun '11

Module: wine Branch: master Commit: 00f7683ea7bcb235c63bdd97ca7c8c4a14174c06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00f7683ea7bcb235c63bdd97c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 22 14:03:39 2011 +0200 msvcp90: Added locale class stub. --- dlls/msvcp90/locale.c | 187 +++++++++++++++++++++++++++++++++++++++++++- dlls/msvcp90/msvcp90.h | 13 +++- dlls/msvcp90/msvcp90.spec | 72 +++++++++--------- 3 files changed, 230 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=00f7683ea7bcb235c63bd…

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
81
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2011