July 2013 - Wine-Commits - list.winehq.org

Alexandre Julliard : ntdll: Don't use TIOCGICOUNT if we don't have linux/ serial.h to define the necessary struct.
by Alexandre Julliard July 30, 2013

July 30, 2013

Module: wine Branch: master Commit: f7161ebe899c5f10098f87ce3c6be5219edbd78d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7161ebe899c5f10098f87ce3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 29 21:08:02 2013 +0200 ntdll: Don't use TIOCGICOUNT if we don't have linux/serial.h to define the necessary struct. --- dlls/ntdll/serial.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/serial.c b/dlls/ntdll/serial.c index 3763959..f4ab212 100644 --- a/dlls/ntdll/serial.c +++ b/dlls/ntdll/serial.c @@ -804,7 +804,7 @@ typedef struct async_commio */ static NTSTATUS get_irq_info(int fd, serial_irq_info *irq_info) { -#ifdef TIOCGICOUNT +#if defined (HAVE_LINUX_SERIAL_H) && defined (TIOCGICOUNT) struct serial_icounter_struct einfo; if (!ioctl(fd, TIOCGICOUNT, &einfo)) {

1 0

Piotr Caban : scrrun: Add IFile::get_Size implementation.
by Alexandre Julliard July 30, 2013

July 30, 2013

Module: wine Branch: master Commit: c7abcd74fc9a1cbe56059a31b2af02106efefa6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7abcd74fc9a1cbe56059a31b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 30 11:31:19 2013 +0200 scrrun: Add IFile::get_Size implementation. --- dlls/scrrun/filesystem.c | 24 ++++++++++++++++++++++-- dlls/scrrun/tests/filesystem.c | 6 ++++++ 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 1074ea5..c4aa4b8 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -20,6 +20,7 @@ #include "config.h" #include <stdarg.h> +#include <limits.h> #include "windef.h" #include "winbase.h" @@ -824,8 +825,27 @@ static HRESULT WINAPI file_get_DateLastAccessed(IFile *iface, DATE *pdate) static HRESULT WINAPI file_get_Size(IFile *iface, VARIANT *pvarSize) { struct file *This = impl_from_IFile(iface); - FIXME("(%p)->(%p)\n", This, pvarSize); - return E_NOTIMPL; + WIN32_FIND_DATAW fd; + HANDLE f; + + TRACE("(%p)->(%p)\n", This, pvarSize); + + if(!pvarSize) + return E_POINTER; + + f = FindFirstFileW(This->path, &fd); + if(f == INVALID_HANDLE_VALUE) + return create_error(GetLastError()); + FindClose(f); + + if(fd.nFileSizeHigh || fd.nFileSizeLow>INT_MAX) { + V_VT(pvarSize) = VT_R8; + V_R8(pvarSize) = ((ULONGLONG)fd.nFileSizeHigh<<32) + fd.nFileSizeLow; + }else { + V_VT(pvarSize) = VT_I4; + V_I4(pvarSize) = fd.nFileSizeLow; + } + return S_OK; } static HRESULT WINAPI file_get_Type(IFile *iface, BSTR *pbstrType) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index cc94a82..0a55736 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -467,6 +467,7 @@ static void test_GetFile(void) BSTR path = SysAllocString(get_file); FileAttribute fa; + VARIANT size; DWORD gfa; IFile *file; HRESULT hr; @@ -505,6 +506,11 @@ static void test_GetFile(void) gfa = GetFileAttributesW(get_file) & ~FILE_ATTRIBUTE_NORMAL; ok(hr == S_OK, "get_Attributes returned %x, expected S_OK\n", hr); ok(fa == gfa, "fa = %x, expected %x\n", fa, gfa); + + hr = IFile_get_Size(file, &size); + ok(hr == S_OK, "get_Size returned %x, expected S_OK\n", hr); + ok(V_VT(&size) == VT_I4, "V_VT(&size) = %d, expected VT_I4\n", V_VT(&size)); + ok(V_I4(&size) == 0, "V_I4(&size) = %d, expected 0\n", V_I4(&size)); IFile_Release(file); DeleteFileW(path);

1 0

Piotr Caban : scrrun/tests: Add IFilesystem3::CopyFolder tests.
by Alexandre Julliard July 30, 2013

July 30, 2013

Module: wine Branch: master Commit: f4e4a608cc157275b610eea1093f5e33123dbfce URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4e4a608cc157275b610eea10… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 30 11:32:27 2013 +0200 scrrun/tests: Add IFilesystem3::CopyFolder tests. --- dlls/scrrun/tests/filesystem.c | 125 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 125 insertions(+), 0 deletions(-) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 237c107..0ddbbac 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -526,6 +526,130 @@ static void test_GetFile(void) SysFreeString(path); } +static inline BOOL create_file(const WCHAR *name) +{ + HANDLE f = CreateFileW(name, GENERIC_WRITE, 0, NULL, CREATE_NEW, 0, NULL); + CloseHandle(f); + return f != INVALID_HANDLE_VALUE; +} + +static inline void create_path(const WCHAR *folder, const WCHAR *name, WCHAR *ret) +{ + DWORD len = lstrlenW(folder); + memmove(ret, folder, len*sizeof(WCHAR)); + ret[len] = '\\'; + memmove(ret+len+1, name, (lstrlenW(name)+1)*sizeof(WCHAR)); +} + +static void test_CopyFolder(void) +{ + static const WCHAR filesystem3_dir[] = {'f','i','l','e','s','y','s','t','e','m','3','_','t','e','s','t',0}; + static const WCHAR s1[] = {'s','r','c','1',0}; + static const WCHAR s[] = {'s','r','c','*',0}; + static const WCHAR d[] = {'d','s','t',0}; + static const WCHAR empty[] = {0}; + + WCHAR tmp[MAX_PATH]; + BSTR bsrc, bdst; + HRESULT hr; + + if(!CreateDirectoryW(filesystem3_dir, NULL)) { + skip("can't create temporary directory\n"); + return; + } + + create_path(filesystem3_dir, s1, tmp); + bsrc = SysAllocString(tmp); + create_path(filesystem3_dir, d, tmp); + bdst = SysAllocString(tmp); + hr = IFileSystem3_CopyFile(fs3, bsrc, bdst, VARIANT_TRUE); + ok(hr == CTL_E_FILENOTFOUND, "CopyFile returned %x, expected CTL_E_FILENOTFOUND\n", hr); + + hr = IFileSystem3_CopyFolder(fs3, bsrc, bdst, VARIANT_TRUE); + ok(hr == CTL_E_PATHNOTFOUND, "CopyFolder returned %x, expected CTL_E_PATHNOTFOUND\n", hr); + + ok(create_file(bsrc), "can't create %s file\n", wine_dbgstr_w(bsrc)); + hr = IFileSystem3_CopyFile(fs3, bsrc, bdst, VARIANT_TRUE); + ok(hr == S_OK, "CopyFile returned %x, expected S_OK\n", hr); + + hr = IFileSystem3_CopyFolder(fs3, bsrc, bdst, VARIANT_TRUE); + ok(hr == CTL_E_PATHNOTFOUND, "CopyFolder returned %x, expected CTL_E_PATHNOTFOUND\n", hr); + + hr = IFileSystem3_DeleteFile(fs3, bsrc, VARIANT_FALSE); + ok(hr == S_OK, "DeleteFile returned %x, expected S_OK\n", hr); + + ok(CreateDirectoryW(bsrc, NULL), "can't create %s\n", wine_dbgstr_w(bsrc)); + hr = IFileSystem3_CopyFile(fs3, bsrc, bdst, VARIANT_TRUE); + ok(hr == CTL_E_FILENOTFOUND, "CopyFile returned %x, expected CTL_E_FILENOTFOUND\n", hr); + + hr = IFileSystem3_CopyFolder(fs3, bsrc, bdst, VARIANT_TRUE); + ok(hr == CTL_E_FILEALREADYEXISTS, "CopyFolder returned %x, expected CTL_E_FILEALREADYEXISTS\n", hr); + + hr = IFileSystem3_DeleteFile(fs3, bdst, VARIANT_TRUE); + ok(hr == S_OK, "DeleteFile returned %x, expected S_OK\n", hr); + + hr = IFileSystem3_CopyFolder(fs3, bsrc, bdst, VARIANT_TRUE); + ok(hr == S_OK, "CopyFolder returned %x, expected S_OK\n", hr); + + hr = IFileSystem3_CopyFolder(fs3, bsrc, bdst, VARIANT_TRUE); + ok(hr == S_OK, "CopyFolder returned %x, expected S_OK\n", hr); + create_path(tmp, s1, tmp); + ok(GetFileAttributesW(tmp) == INVALID_FILE_ATTRIBUTES, + "%s file exists\n", wine_dbgstr_w(tmp)); + + create_path(filesystem3_dir, d, tmp); + create_path(tmp, empty, tmp); + SysFreeString(bdst); + bdst = SysAllocString(tmp); + hr = IFileSystem3_CopyFolder(fs3, bsrc, bdst, VARIANT_TRUE); + ok(hr == S_OK, "CopyFolder returned %x, expected S_OK\n", hr); + create_path(tmp, s1, tmp); + ok(GetFileAttributesW(tmp) != INVALID_FILE_ATTRIBUTES, + "%s directory doesn't exist\n", wine_dbgstr_w(tmp)); + ok(RemoveDirectoryW(tmp), "can't remove %s directory\n", wine_dbgstr_w(tmp)); + create_path(filesystem3_dir, d, tmp); + SysFreeString(bdst); + bdst = SysAllocString(tmp); + + + create_path(filesystem3_dir, s, tmp); + SysFreeString(bsrc); + bsrc = SysAllocString(tmp); + hr = IFileSystem3_CopyFolder(fs3, bsrc, bdst, VARIANT_TRUE); + ok(hr == S_OK, "CopyFolder returned %x, expected S_OK\n", hr); + create_path(filesystem3_dir, d, tmp); + create_path(tmp, s1, tmp); + ok(GetFileAttributesW(tmp) != INVALID_FILE_ATTRIBUTES, + "%s directory doesn't exist\n", wine_dbgstr_w(tmp)); + + hr = IFileSystem3_DeleteFolder(fs3, bdst, VARIANT_FALSE); + ok(hr == S_OK, "DeleteFolder returned %x, expected S_OK\n", hr); + + hr = IFileSystem3_CopyFolder(fs3, bsrc, bdst, VARIANT_TRUE); + ok(hr == CTL_E_PATHNOTFOUND, "CopyFolder returned %x, expected CTL_E_PATHNOTFOUND\n", hr); + + create_path(filesystem3_dir, s1, tmp); + SysFreeString(bsrc); + bsrc = SysAllocString(tmp); + create_path(tmp, s1, tmp); + ok(create_file(tmp), "can't create %s file\n", wine_dbgstr_w(tmp)); + hr = IFileSystem3_CopyFolder(fs3, bsrc, bdst, VARIANT_FALSE); + ok(hr == S_OK, "CopyFolder returned %x, expected S_OK\n", hr); + + hr = IFileSystem3_CopyFolder(fs3, bsrc, bdst, VARIANT_FALSE); + ok(hr == CTL_E_FILEALREADYEXISTS, "CopyFolder returned %x, expected CTL_E_FILEALREADYEXISTS\n", hr); + + hr = IFileSystem3_CopyFolder(fs3, bsrc, bdst, VARIANT_TRUE); + ok(hr == S_OK, "CopyFolder returned %x, expected S_OK\n", hr); + SysFreeString(bsrc); + SysFreeString(bdst); + + bsrc = SysAllocString(filesystem3_dir); + hr = IFileSystem3_DeleteFolder(fs3, bsrc, VARIANT_FALSE); + ok(hr == S_OK, "DeleteFolder returned %x, expected S_OK\n", hr); + SysFreeString(bsrc); +} + START_TEST(filesystem) { HRESULT hr; @@ -548,6 +672,7 @@ START_TEST(filesystem) test_GetBaseName(); test_GetAbsolutePathName(); test_GetFile(); + test_CopyFolder(); IFileSystem3_Release(fs3);

1 0

Piotr Caban : scrrun: Add IFileSystem3::DeleteFolder implementation.
by Alexandre Julliard July 30, 2013

July 30, 2013

Module: wine Branch: master Commit: b1af25b056d53e6af0a96550b23d5cbde0cfc3d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1af25b056d53e6af0a96550b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 30 11:31:50 2013 +0200 scrrun: Add IFileSystem3::DeleteFolder implementation. --- dlls/scrrun/filesystem.c | 69 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 67 insertions(+), 2 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 2b84d96..cb9325f 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -1416,12 +1416,77 @@ static HRESULT WINAPI filesys_DeleteFile(IFileSystem3 *iface, BSTR FileSpec, return delete_file(FileSpec, SysStringLen(FileSpec), Force); } +static HRESULT delete_folder(const WCHAR *folder, DWORD folder_len, VARIANT_BOOL force) +{ + WCHAR path[MAX_PATH]; + DWORD len, name_len; + WIN32_FIND_DATAW ffd; + HANDLE f; + HRESULT hr; + + f = FindFirstFileW(folder, &ffd); + if(f == INVALID_HANDLE_VALUE) + return create_error(GetLastError()); + + len = get_parent_folder_name(folder, folder_len); + if(len+1 >= MAX_PATH) + return E_FAIL; + if(len) { + memcpy(path, folder, len*sizeof(WCHAR)); + path[len++] = '\\'; + } + + do { + if(!(ffd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) + continue; + if(ffd.cFileName[0]=='.' && (ffd.cFileName[1]==0 || + (ffd.cFileName[1]=='.' && ffd.cFileName[2]==0))) + continue; + + name_len = strlenW(ffd.cFileName); + if(len+name_len+3 >= MAX_PATH) { + FindClose(f); + return E_FAIL; + } + memcpy(path+len, ffd.cFileName, name_len*sizeof(WCHAR)); + path[len+name_len] = '\\'; + path[len+name_len+1] = '*'; + path[len+name_len+2] = 0; + + hr = delete_file(path, len+name_len+2, force); + if(FAILED(hr)) { + FindClose(f); + return hr; + } + + hr = delete_folder(path, len+name_len+2, force); + if(FAILED(hr)) { + FindClose(f); + return hr; + } + + path[len+name_len] = 0; + TRACE("deleting %s\n", debugstr_w(path)); + + if(!RemoveDirectoryW(path)) { + FindClose(f); + return create_error(GetLastError()); + } + } while(FindNextFileW(f, &ffd)); + FindClose(f); + + return S_OK; +} + static HRESULT WINAPI filesys_DeleteFolder(IFileSystem3 *iface, BSTR FolderSpec, VARIANT_BOOL Force) { - FIXME("%p %s %d\n", iface, debugstr_w(FolderSpec), Force); + TRACE("%p %s %d\n", iface, debugstr_w(FolderSpec), Force); - return E_NOTIMPL; + if(!FolderSpec) + return E_POINTER; + + return delete_folder(FolderSpec, SysStringLen(FolderSpec), Force); } static HRESULT WINAPI filesys_MoveFile(IFileSystem3 *iface, BSTR Source,

1 0

Rico Schüller : d3dx9: Improve ID3DXConstantTable:: SetDefaults().
by Alexandre Julliard July 29, 2013

July 29, 2013

Module: wine Branch: master Commit: 1099bb5e76de05718e3cbd43a3d0326883f39cfe URL: http://source.winehq.org/git/wine.git/?a=commit;h=1099bb5e76de05718e3cbd43a… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Jul 29 11:13:54 2013 +0200 d3dx9: Improve ID3DXConstantTable::SetDefaults(). --- dlls/d3dx9_36/shader.c | 53 ++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 42 insertions(+), 11 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 457036b..16395e8 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -750,15 +750,6 @@ static inline struct ctab_constant *get_valid_constant(struct ID3DXConstantTable return get_constant_by_name(table, NULL, handle); } -static inline void set_float_shader_constant(struct ID3DXConstantTableImpl *table, IDirect3DDevice9 *device, - UINT register_index, const FLOAT *data, UINT count) -{ - if (is_vertex_shader(table->desc.Version)) - IDirect3DDevice9_SetVertexShaderConstantF(device, register_index, data, count); - else - IDirect3DDevice9_SetPixelShaderConstantF(device, register_index, data, count); -} - /*** IUnknown methods ***/ static HRESULT WINAPI ID3DXConstantTableImpl_QueryInterface(ID3DXConstantTable *iface, REFIID riid, void **out) { @@ -1434,19 +1425,59 @@ static HRESULT WINAPI ID3DXConstantTableImpl_SetDefaults(struct ID3DXConstantTab struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface); UINT i; - TRACE("(%p)->(%p)\n", This, device); + TRACE("iface %p, device %p\n", iface, device); if (!device) + { + WARN("Invalid argument specified\n"); return D3DERR_INVALIDCALL; + } for (i = 0; i < This->desc.Constants; i++) { D3DXCONSTANT_DESC *desc = &This->constants[i].desc; + HRESULT hr; if (!desc->DefaultValue) continue; - set_float_shader_constant(This, device, desc->RegisterIndex, desc->DefaultValue, desc->RegisterCount); + switch (desc->RegisterSet) + { + case D3DXRS_BOOL: + if (is_vertex_shader(This->desc.Version)) + hr = IDirect3DDevice9_SetVertexShaderConstantB(device, desc->RegisterIndex, desc->DefaultValue, + desc->RegisterCount); + else + hr = IDirect3DDevice9_SetPixelShaderConstantB(device, desc->RegisterIndex, desc->DefaultValue, + desc->RegisterCount); + break; + + case D3DXRS_INT4: + if (is_vertex_shader(This->desc.Version)) + hr = IDirect3DDevice9_SetVertexShaderConstantI(device, desc->RegisterIndex, desc->DefaultValue, + desc->RegisterCount); + else + hr = IDirect3DDevice9_SetPixelShaderConstantI(device, desc->RegisterIndex, desc->DefaultValue, + desc->RegisterCount); + break; + + case D3DXRS_FLOAT4: + if (is_vertex_shader(This->desc.Version)) + hr = IDirect3DDevice9_SetVertexShaderConstantF(device, desc->RegisterIndex, desc->DefaultValue, + desc->RegisterCount); + else + hr = IDirect3DDevice9_SetPixelShaderConstantF(device, desc->RegisterIndex, desc->DefaultValue, + desc->RegisterCount); + break; + + default: + FIXME("Unhandled register set %s\n", debug_d3dxparameter_registerset(desc->RegisterSet)); + hr = E_NOTIMPL; + break; + } + + if (hr != D3D_OK) + return hr; } return D3D_OK;

1 0

Alexandre Julliard : d3d8/tests: Remove a todo from a test that succeeds.
by Alexandre Julliard July 29, 2013

July 29, 2013

Module: wine Branch: master Commit: 32d8e9cb9643b9c96639a491ebf56b398af783c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32d8e9cb9643b9c96639a491e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 29 15:52:09 2013 +0200 d3d8/tests: Remove a todo from a test that succeeds. --- dlls/d3d8/tests/visual.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index f2c9b67..1436122 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -634,7 +634,7 @@ static void fog_test(IDirect3DDevice8 *device) } color = getPixelColor(device, 160, 360); - todo_wine ok(color_match(color, 0x00e51900, 4), "Partially fogged quad has color %08x\n", color); + ok(color_match(color, 0x00e51900, 4), "Partially fogged quad has color %08x\n", color); color = getPixelColor(device, 160, 120); ok(color_match(color, D3DCOLOR_ARGB(0x00, 0x00, 0xff, 0x00), 1), "Fogged out quad has color %08x\n", color);

1 0

Alexandre Julliard : ddraw/tests: Remove a todo from a test that succeeds.
by Alexandre Julliard July 29, 2013

July 29, 2013

Module: wine Branch: master Commit: cf8d7fbb6b78f6e5d7ae27dca482f5ff9a28db62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf8d7fbb6b78f6e5d7ae27dca… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 29 15:52:17 2013 +0200 ddraw/tests: Remove a todo from a test that succeeds. --- dlls/ddraw/tests/visual.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index b8a4b76..5c25faa 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -685,7 +685,7 @@ static void fog_test(IDirect3DDevice7 *device) } color = getPixelColor(device, 160, 360); - todo_wine ok(color_match(color, 0x00e51900, 4), "Partially fogged quad has color %08x\n", color); + ok(color_match(color, 0x00e51900, 4), "Partially fogged quad has color %08x\n", color); color = getPixelColor(device, 160, 120); ok(color_match(color, 0x0000ff00, 1), "Fogged out quad has color %08x\n", color);

1 0

Rico Schüller : d3dx9/tests: Add ID3DXConstantTable:: SetDefaults() test.
by Alexandre Julliard July 29, 2013

July 29, 2013

Module: wine Branch: master Commit: 4dc11cc3aaf4c4d042eaa2c5ea35717b58d1dde1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dc11cc3aaf4c4d042eaa2c5e… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Jul 29 11:14:01 2013 +0200 d3dx9/tests: Add ID3DXConstantTable::SetDefaults() test. --- dlls/d3dx9_36/tests/shader.c | 231 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 228 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4dc11cc3aaf4c4d042eaa…

1 0

Rico Schüller : d3dx9/tests: Add ID3DXConstantTable RegisterCount test for D3DXRS_INT4.
by Alexandre Julliard July 29, 2013

July 29, 2013

Module: wine Branch: master Commit: faf7dd3131a1063d313f99fe05b56ff81f6574d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=faf7dd3131a1063d313f99fe0… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Jul 29 11:14:08 2013 +0200 d3dx9/tests: Add ID3DXConstantTable RegisterCount test for D3DXRS_INT4. --- dlls/d3dx9_36/tests/shader.c | 48 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 48 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index 8c344c8..d37464a 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -5414,6 +5414,42 @@ static const struct registerset_test registerset_test_struct_struct_bool_float[] {SetMatrixTransposePointerArray, 0, 1, REGISTER_OUTPUT_SIZE / 16, 16, {0x3f800000}}, }; +/* + * fxc.exe /Tvs_3_0 + */ +#if 0 +row_major int3x2 ran[2] = {4, 5, 6, 1, 8, 1, 2, 3, 4, 7, 9, 1}; +float4 main(float4 pos : POSITION) : POSITION +{ + float4 tmp = 0; + int k; + for (k = 0; k < ran[1]._21; k++) + tmp.y += pos.y + tmp.x; + return tmp; +} +#endif +static const DWORD registerset_blob_special_int[] = +{ +0xfffe0300, 0x0038fffe, 0x42415443, 0x0000001c, 0x000000ab, 0xfffe0300, 0x00000001, 0x0000001c, +0x00000100, 0x000000a4, 0x00000030, 0x00000001, 0x00000009, 0x00000034, 0x00000044, 0x006e6172, +0x00020002, 0x00020003, 0x00000002, 0x00000000, 0x00000004, 0x00000005, 0x00000001, 0x00000000, +0x00000006, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000000, +0x00000002, 0x00000003, 0x00000001, 0x00000000, 0x00000004, 0x00000007, 0x00000001, 0x00000000, +0x00000009, 0x00000001, 0x00000001, 0x00000000, 0x335f7376, 0x4d00305f, 0x6f726369, 0x74666f73, +0x29522820, 0x534c4820, 0x6853204c, 0x72656461, 0x6d6f4320, 0x656c6970, 0x2e392072, 0x392e3932, +0x332e3235, 0x00313131, 0x05000051, 0xa00f0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, +0x0200001f, 0x80000000, 0x900f0000, 0x0200001f, 0x80000000, 0xe00f0000, 0x02000001, 0x80010000, +0xa0000000, 0x01000026, 0xf0e40008, 0x03000002, 0x80010000, 0x80000000, 0x90550000, 0x00000027, +0x02000001, 0xe0020000, 0x80000000, 0x02000001, 0xe00d0000, 0xa0000000, 0x0000ffff, +}; + +static const struct registerset_constants registerset_constants_special_int[] = +{ + {"ran", {"ran", D3DXRS_INT4, 0, 9, D3DXPC_MATRIX_ROWS, D3DXPT_INT, 3, 2, 2, 0, 48, NULL}, 17}, + {"ran[0]", {"ran", D3DXRS_INT4, 0, 3, D3DXPC_MATRIX_ROWS, D3DXPT_INT, 3, 2, 1, 0, 24, NULL}, 17}, + {"ran[1]", {"ran", D3DXRS_INT4, 3, 3, D3DXPC_MATRIX_ROWS, D3DXPT_INT, 3, 2, 1, 0, 24, NULL}, 29}, +}; + static const struct { const char *name; @@ -5677,6 +5713,10 @@ registerset_data[] = sizeof(registerset_test_struct_struct_int_float) / sizeof(*registerset_test_struct_struct_int_float), registerset_constants_struct_struct_int_float, sizeof(registerset_constants_struct_struct_int_float) / sizeof(*registerset_constants_struct_struct_int_float)}, + /* special */ + {"int ran", "ran", 0, D3DXRS_INT4, registerset_blob_special_int, NULL, 0, + registerset_constants_special_int, + sizeof(registerset_constants_special_int) / sizeof(*registerset_constants_special_int)}, }; static void registerset_clear(IDirect3DDevice9 *device) @@ -6100,6 +6140,14 @@ registerset_defaults_data[] = 0x00000049, 0x0000004a, 0x0000004b, 0x00000000, 0x0000004c, 0x00000000, 0x00000001, 0x00000000, 0x666e7373, 0x00666e00, 0x00666e76, 0x00000321, 0x0000026c, 0x00000324, 0x00000280, 0x00000005}, {0xffffffff, 0xffffffff, 0x00000000, 0xffffffff, 0xffffffff, 0x00000000}}, + {"int ran", registerset_blob_special_int, 0, 36, 0, + {0x00000000}, + {0x00000004, 0x00000005, 0x00000001, 0x00000000, 0x00000006, 0x00000001, 0x00000001, 0x00000000, + 0x00000008, 0x00000001, 0x00000001, 0x00000000, 0x00000002, 0x00000003, 0x00000001, 0x00000000, + 0x00000004, 0x00000007, 0x00000001, 0x00000000, 0x00000009, 0x00000001, 0x00000001, 0x00000000, + 0x335f7376, 0x4d00305f, 0x6f726369, 0x74666f73, 0x29522820, 0x534c4820, 0x6853204c, 0x72656461, + 0x6d6f4320, 0x656c6970, 0x2e392072, 0x392e3932}, + {0x00000000}}, }; static void test_registerset_defaults(void)

1 0

Rico Schüller : d3dx9/tests: Add ID3DXConstantTable big vector test.
by Alexandre Julliard July 29, 2013

July 29, 2013

Module: wine Branch: master Commit: a6d388321174609fe0af8b61e48ffec2c59357cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6d388321174609fe0af8b61e… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Jul 29 11:14:13 2013 +0200 d3dx9/tests: Add ID3DXConstantTable big vector test. --- dlls/d3dx9_36/tests/shader.c | 114 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 114 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index d37464a..171d62c 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -5450,6 +5450,114 @@ static const struct registerset_constants registerset_constants_special_int[] = {"ran[1]", {"ran", D3DXRS_INT4, 3, 3, D3DXPC_MATRIX_ROWS, D3DXPT_INT, 3, 2, 1, 0, 24, NULL}, 29}, }; +/* + * fxc.exe /Tvs_3_0 + */ +#if 0 +float3 vaf[10]; +float4 main(float4 pos : POSITION) : POSITION +{ + float4 tmp = 0; + tmp.y += pos.y + vaf[8].x; + return tmp; +} +#endif +static const DWORD registerset_blob_bigvec[] = +{ +0xfffe0300, 0x0020fffe, 0x42415443, 0x0000001c, 0x0000004b, 0xfffe0300, 0x00000001, 0x0000001c, +0x00000100, 0x00000044, 0x00000030, 0x00000002, 0x00000009, 0x00000034, 0x00000000, 0x00666176, +0x00030001, 0x00030001, 0x0000000a, 0x00000000, 0x335f7376, 0x4d00305f, 0x6f726369, 0x74666f73, +0x29522820, 0x534c4820, 0x6853204c, 0x72656461, 0x6d6f4320, 0x656c6970, 0x2e392072, 0x392e3932, +0x332e3235, 0x00313131, 0x05000051, 0xa00f0009, 0x00000000, 0x00000000, 0x00000000, 0x00000000, +0x0200001f, 0x80000000, 0x900f0000, 0x0200001f, 0x80000000, 0xe00f0000, 0x03000002, 0xe0020000, +0xa0000008, 0x90550000, 0x02000001, 0xe00d0000, 0xa0000009, 0x0000ffff, +}; + +static const struct registerset_constants registerset_constants_bigvec_float[] = +{ + {"vaf", {"vaf", D3DXRS_FLOAT4, 0, 9, D3DXPC_VECTOR, D3DXPT_FLOAT, 1, 3, 10, 0, 120, NULL}, 0}, + {"vaf[0]", {"vaf", D3DXRS_FLOAT4, 0, 1, D3DXPC_VECTOR, D3DXPT_FLOAT, 1, 3, 1, 0, 12, NULL}, 0}, + {"vaf[1]", {"vaf", D3DXRS_FLOAT4, 1, 1, D3DXPC_VECTOR, D3DXPT_FLOAT, 1, 3, 1, 0, 12, NULL}, 0}, + {"vaf[2]", {"vaf", D3DXRS_FLOAT4, 2, 1, D3DXPC_VECTOR, D3DXPT_FLOAT, 1, 3, 1, 0, 12, NULL}, 0}, + {"vaf[3]", {"vaf", D3DXRS_FLOAT4, 3, 1, D3DXPC_VECTOR, D3DXPT_FLOAT, 1, 3, 1, 0, 12, NULL}, 0}, + {"vaf[4]", {"vaf", D3DXRS_FLOAT4, 4, 1, D3DXPC_VECTOR, D3DXPT_FLOAT, 1, 3, 1, 0, 12, NULL}, 0}, + {"vaf[5]", {"vaf", D3DXRS_FLOAT4, 5, 1, D3DXPC_VECTOR, D3DXPT_FLOAT, 1, 3, 1, 0, 12, NULL}, 0}, + {"vaf[6]", {"vaf", D3DXRS_FLOAT4, 6, 1, D3DXPC_VECTOR, D3DXPT_FLOAT, 1, 3, 1, 0, 12, NULL}, 0}, + {"vaf[7]", {"vaf", D3DXRS_FLOAT4, 7, 1, D3DXPC_VECTOR, D3DXPT_FLOAT, 1, 3, 1, 0, 12, NULL}, 0}, + {"vaf[8]", {"vaf", D3DXRS_FLOAT4, 8, 1, D3DXPC_VECTOR, D3DXPT_FLOAT, 1, 3, 1, 0, 12, NULL}, 0}, + {"vaf[9]", {"vaf", D3DXRS_FLOAT4, 9, 0, D3DXPC_VECTOR, D3DXPT_FLOAT, 1, 3, 1, 0, 12, NULL}, 0}, +}; + +static const struct registerset_test registerset_test_bigvec_float[] = +{ + {SetMatrix, 0, 0, 0, 16, + {0x40000123, 0x00000000, 0x40800123, 0x00000000, 0x40c00123, 0x40e00123, 0x41000123, 0x00000000, + 0x41200123, 0x41300123, 0x41400123, 0x00000000, 0x41600123, 0x41700123, 0x41800123}}, + {SetMatrixArray}, + {SetMatrixArray, 0, 1, 1, 16, + {0x40000123, 0x00000000, 0x40800123, 0x00000000, 0x40c00123, 0x40e00123, 0x41000123, 0x00000000, + 0x41200123, 0x41300123, 0x41400123, 0x00000000, 0x41600123, 0x41700123, 0x41800123}}, + {SetMatrixArray, 0, 2, 2, 32, + {0x40000123, 0x00000000, 0x40800123, 0x00000000, 0x40c00123, 0x40e00123, 0x41000123, 0x00000000, + 0x41200123, 0x41300123, 0x41400123, 0x00000000, 0x41600123, 0x41700123, 0x41800123, 0x00000000, + 0x41a00123, 0x41b00123, 0x41c00123, 0x00000000, 0x00000000, 0x41f00123, 0x42000123, 0x00000000, + 0x00000000, 0x42300123, 0x42400123, 0x00000000, 0x42600123, 0x42700123, 0x42800123}}, + {SetMatrixArray, 0, 3, REGISTER_OUTPUT_SIZE / 16, 36, + {0x40000123, 0x00000000, 0x40800123, 0x00000000, 0x40c00123, 0x40e00123, 0x41000123, 0x00000000, + 0x41200123, 0x41300123, 0x41400123, 0x00000000, 0x41600123, 0x41700123, 0x41800123, 0x00000000, + 0x41a00123, 0x41b00123, 0x41c00123, 0x00000000, 0x00000000, 0x41f00123, 0x42000123, 0x00000000, + 0x00000000, 0x42300123, 0x42400123, 0x00000000, 0x42600123, 0x42700123, 0x42800123, 0x00000000, + 0x43000123, 0x43100123, 0x43200123}}, + {SetMatrixTranspose, 0, 0, 0, 16, + {0x40000123, 0x40c00123, 0x41200123, 0x00000000, 0x00000000, 0x40e00123, 0x41300123, 0x00000000, + 0x40800123, 0x41000123, 0x41400123, 0x00000000, 0x40a00123, 0x41100123, 0x41500123}}, + {SetMatrixTransposeArray}, + {SetMatrixTransposeArray, 0, 1, 1, 16, + {0x40000123, 0x40c00123, 0x41200123, 0x00000000, 0x00000000, 0x40e00123, 0x41300123, 0x00000000, + 0x40800123, 0x41000123, 0x41400123, 0x00000000, 0x40a00123, 0x41100123, 0x41500123}}, + {SetMatrixTransposeArray, 0, 2, 2, 32, + {0x40000123, 0x40c00123, 0x41200123, 0x00000000, 0x00000000, 0x40e00123, 0x41300123, 0x00000000, + 0x40800123, 0x41000123, 0x41400123, 0x00000000, 0x40a00123, 0x41100123, 0x41500123, 0x00000000, + 0x41a00123, 0x00000000, 0x00000000, 0x00000000, 0x41b00123, 0x41f00123, 0x42300123, 0x00000000, + 0x41c00123, 0x42000123, 0x42400123, 0x00000000, 0x41d00123, 0x42100123, 0x42500123}}, + {SetMatrixTransposeArray, 0, 3, REGISTER_OUTPUT_SIZE / 16, 36, + {0x40000123, 0x40c00123, 0x41200123, 0x00000000, 0x00000000, 0x40e00123, 0x41300123, 0x00000000, + 0x40800123, 0x41000123, 0x41400123, 0x00000000, 0x40a00123, 0x41100123, 0x41500123, 0x00000000, + 0x41a00123, 0x00000000, 0x00000000, 0x00000000, 0x41b00123, 0x41f00123, 0x42300123, 0x00000000, + 0x41c00123, 0x42000123, 0x42400123, 0x00000000, 0x41d00123, 0x42100123, 0x42500123, 0x00000000, + 0x43000123, 0x43400123, 0x43800123}}, + {SetMatrixPointerArray}, + {SetMatrixPointerArray, 0, 1, 1, 16, + {0x40000123, 0x00000000, 0x40800123, 0x00000000, 0x40c00123, 0x40e00123, 0x41000123, 0x00000000, + 0x41200123, 0x41300123, 0x41400123, 0x00000000, 0x41600123, 0x41700123, 0x41800123}}, + {SetMatrixPointerArray, 0, 2, 2, 32, + {0x40000123, 0x00000000, 0x40800123, 0x00000000, 0x40c00123, 0x40e00123, 0x41000123, 0x00000000, + 0x41200123, 0x41300123, 0x41400123, 0x00000000, 0x41600123, 0x41700123, 0x41800123, 0x00000000, + 0x41900123, 0x41a00123, 0x41b00123, 0x00000000, 0x41d00123, 0x00000000, 0x41f00123, 0x00000000, + 0x42100123, 0x00000000, 0x42300123, 0x00000000, 0x42500123, 0x42600123, 0x42700123}}, + {SetMatrixPointerArray, 0, 3, REGISTER_OUTPUT_SIZE / 16, 36, + {0x40000123, 0x00000000, 0x40800123, 0x00000000, 0x40c00123, 0x40e00123, 0x41000123, 0x00000000, + 0x41200123, 0x41300123, 0x41400123, 0x00000000, 0x41600123, 0x41700123, 0x41800123, 0x00000000, + 0x41900123, 0x41a00123, 0x41b00123, 0x00000000, 0x41d00123, 0x00000000, 0x41f00123, 0x00000000, + 0x42100123, 0x00000000, 0x42300123, 0x00000000, 0x42500123, 0x42600123, 0x42700123, 0x00000000, + 0x42800123, 0x42900123, 0x43000123}}, + {SetMatrixTransposePointerArray}, + {SetMatrixTransposePointerArray, 0, 1, 1, 16, + {0x40000123, 0x40c00123, 0x41200123, 0x00000000, 0x00000000, 0x40e00123, 0x41300123, 0x00000000, + 0x40800123, 0x41000123, 0x41400123, 0x00000000, 0x40a00123, 0x41100123, 0x41500123}}, + {SetMatrixTransposePointerArray, 0, 2, 2, 32, + {0x40000123, 0x40c00123, 0x41200123, 0x00000000, 0x00000000, 0x40e00123, 0x41300123, 0x00000000, + 0x40800123, 0x41000123, 0x41400123, 0x00000000, 0x40a00123, 0x41100123, 0x41500123, 0x00000000, + 0x41900123, 0x41d00123, 0x42100123, 0x00000000, 0x41a00123, 0x00000000, 0x00000000, 0x00000000, + 0x41b00123, 0x41f00123, 0x42300123, 0x00000000, 0x41c00123, 0x42000123, 0x42400123}}, + {SetMatrixTransposePointerArray, 0, 3, REGISTER_OUTPUT_SIZE / 16, 36, + {0x40000123, 0x40c00123, 0x41200123, 0x00000000, 0x00000000, 0x40e00123, 0x41300123, 0x00000000, + 0x40800123, 0x41000123, 0x41400123, 0x00000000, 0x40a00123, 0x41100123, 0x41500123, 0x00000000, + 0x41900123, 0x41d00123, 0x42100123, 0x00000000, 0x41a00123, 0x00000000, 0x00000000, 0x00000000, + 0x41b00123, 0x41f00123, 0x42300123, 0x00000000, 0x41c00123, 0x42000123, 0x42400123, 0x00000000, + 0x42800123, 0x43200123, 0x43600123}}, +}; + static const struct { const char *name; @@ -5717,6 +5825,10 @@ registerset_data[] = {"int ran", "ran", 0, D3DXRS_INT4, registerset_blob_special_int, NULL, 0, registerset_constants_special_int, sizeof(registerset_constants_special_int) / sizeof(*registerset_constants_special_int)}, + {"bigvec", "vaf", 0, D3DXRS_FLOAT4, registerset_blob_bigvec, registerset_test_bigvec_float, + sizeof(registerset_test_bigvec_float) / sizeof(*registerset_test_bigvec_float), + registerset_constants_bigvec_float, + sizeof(registerset_constants_bigvec_float) / sizeof(*registerset_constants_bigvec_float)}, }; static void registerset_clear(IDirect3DDevice9 *device) @@ -6148,6 +6260,8 @@ registerset_defaults_data[] = 0x335f7376, 0x4d00305f, 0x6f726369, 0x74666f73, 0x29522820, 0x534c4820, 0x6853204c, 0x72656461, 0x6d6f4320, 0x656c6970, 0x2e392072, 0x392e3932}, {0x00000000}}, + /* DefaultValue = NULL */ + {"big vector", registerset_blob_bigvec}, }; static void test_registerset_defaults(void)

1 0