wine-commits July 2013

wine-commits@winehq.org

2 participants
447 discussions

Alexandre Julliard : loader: ELF hash table entries are always 32-bit on Linux.
by Alexandre Julliard 30 Jul '13

30 Jul '13

Module: wine Branch: master Commit: 1ecfff38bd0544beec0e34f58d098a74834684f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ecfff38bd0544beec0e34f58… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 30 14:43:23 2013 +0200 loader: ELF hash table entries are always 32-bit on Linux. --- loader/preloader.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/loader/preloader.c b/loader/preloader.c index e2f9c3f..f38e17a 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -940,10 +940,10 @@ static void *find_symbol( const ElfW(Phdr) *phdr, int num, const char *var, int const ElfW(Dyn) *dyn = NULL; const ElfW(Phdr) *ph; const ElfW(Sym) *symtab = NULL; - const Elf_Symndx *hashtab = NULL; + const Elf32_Word *hashtab = NULL; const Elf32_Word *gnu_hashtab = NULL; const char *strings = NULL; - Elf_Symndx idx; + Elf32_Word idx; /* check the values */ #ifdef DUMP_SYMS @@ -974,7 +974,7 @@ static void *find_symbol( const ElfW(Phdr) *phdr, int num, const char *var, int if( dyn->d_tag == DT_SYMTAB ) symtab = (const ElfW(Sym) *)dyn->d_un.d_ptr; if( dyn->d_tag == DT_HASH ) - hashtab = (const Elf_Symndx *)dyn->d_un.d_ptr; + hashtab = (const Elf32_Word *)dyn->d_un.d_ptr; if( dyn->d_tag == DT_GNU_HASH ) gnu_hashtab = (const Elf32_Word *)dyn->d_un.d_ptr; #ifdef DUMP_SYMS @@ -1007,9 +1007,9 @@ static void *find_symbol( const ElfW(Phdr) *phdr, int num, const char *var, int else if (hashtab) /* old style hash table */ { const unsigned int hash = wld_elf_hash(var); - const Elf_Symndx nbuckets = hashtab[0]; - const Elf_Symndx *buckets = hashtab + 2; - const Elf_Symndx *chains = buckets + nbuckets; + const Elf32_Word nbuckets = hashtab[0]; + const Elf32_Word *buckets = hashtab + 2; + const Elf32_Word *chains = buckets + nbuckets; for (idx = buckets[hash % nbuckets]; idx != STN_UNDEF; idx = chains[idx]) {

1 0

Alexandre Julliard : ntdll: Add context definitions missing from the Android NDK.
by Alexandre Julliard 30 Jul '13

30 Jul '13

Module: wine Branch: master Commit: f8cdbecc25b589ce3e008f9d735fbd9df17ea58b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8cdbecc25b589ce3e008f9d7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 30 14:11:42 2013 +0200 ntdll: Add context definitions missing from the Android NDK. --- dlls/ntdll/signal_arm.c | 12 ++++++++++++ dlls/ntdll/signal_i386.c | 37 ++++++++++++++++++++++++++++++++++++- 2 files changed, 48 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 6334a6e..9b0f1eb 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -68,6 +68,18 @@ static pthread_key_t teb_key; */ #ifdef linux +#ifdef __ANDROID__ +typedef struct ucontext +{ + unsigned long uc_flags; + struct ucontext *uc_link; + stack_t uc_stack; + struct sigcontext uc_mcontext; + sigset_t uc_sigmask; + unsigned long uc_regspace[128] __attribute__((__aligned__(8))); +} ucontext_t; +#endif + typedef ucontext_t SIGCONTEXT; /* All Registers access - only for local access */ diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 0344a29..b29405b 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -100,7 +100,42 @@ typedef struct * signal context platform-specific definitions */ -#if defined (__linux__) +#ifdef __ANDROID__ + +typedef struct ucontext +{ + unsigned long uc_flags; + struct ucontext *uc_link; + stack_t uc_stack; + struct sigcontext uc_mcontext; + sigset_t uc_sigmask; +} SIGCONTEXT; + +#define EAX_sig(context) ((context)->uc_mcontext.eax) +#define EBX_sig(context) ((context)->uc_mcontext.ebx) +#define ECX_sig(context) ((context)->uc_mcontext.ecx) +#define EDX_sig(context) ((context)->uc_mcontext.edx) +#define ESI_sig(context) ((context)->uc_mcontext.esi) +#define EDI_sig(context) ((context)->uc_mcontext.edi) +#define EBP_sig(context) ((context)->uc_mcontext.ebp) +#define ESP_sig(context) ((context)->uc_mcontext.esp) + +#define CS_sig(context) ((context)->uc_mcontext.cs) +#define DS_sig(context) ((context)->uc_mcontext.ds) +#define ES_sig(context) ((context)->uc_mcontext.es) +#define SS_sig(context) ((context)->uc_mcontext.ss) +#define FS_sig(context) ((context)->uc_mcontext.fs) +#define GS_sig(context) ((context)->uc_mcontext.gs) + +#define EFL_sig(context) ((context)->uc_mcontext.eflags) +#define EIP_sig(context) ((context)->uc_mcontext.eip) +#define TRAP_sig(context) ((context)->uc_mcontext.trapno) +#define ERROR_sig(context) ((context)->uc_mcontext.err) + +#define FPU_sig(context) ((FLOATING_SAVE_AREA*)((context)->uc_mcontext.fpstate)) +#define FPUX_sig(context) (FPU_sig(context) && !((context)->uc_mcontext.fpstate->status >> 16) ? (XMM_SAVE_AREA32 *)(FPU_sig(context) + 1) : NULL) + +#elif defined (__linux__) typedef ucontext_t SIGCONTEXT;

1 0

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

30 Jul '13

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

Alexandre Julliard : ntdll: Use fclose instead of endmntent since we use fopen anyway.
by Alexandre Julliard 30 Jul '13

30 Jul '13

Module: wine Branch: master Commit: 581cef082e903059a28dab98f3b53c9498287e5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=581cef082e903059a28dab98f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 29 21:07:12 2013 +0200 ntdll: Use fclose instead of endmntent since we use fopen anyway. --- dlls/ntdll/directory.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 1a84537..cf89879 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -586,13 +586,13 @@ static char *get_default_drive_device( const char *root ) if ((f = fopen( "/etc/mtab", "r" ))) { device = parse_mount_entries( f, st.st_dev, st.st_ino ); - endmntent( f ); + fclose( f ); } /* look through fstab too in case it's not mounted (for instance if it's an audio CD) */ if (!device && (f = fopen( "/etc/fstab", "r" ))) { device = parse_mount_entries( f, st.st_dev, st.st_ino ); - endmntent( f ); + fclose( f ); } if (device) { @@ -764,7 +764,7 @@ static char *get_device_mount_point( dev_t dev ) break; } } - endmntent( f ); + fclose( f ); } RtlLeaveCriticalSection( &dir_section ); #elif defined(__APPLE__)

1 0

André Hentschel : usbd.sys: Implement USBD_ParseConfigurationDescriptor using its Ex version.
by Alexandre Julliard 29 Jul '13

29 Jul '13

Module: wine Branch: master Commit: ca7ba7053f9a9f79de5a19387073a40d01371e78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca7ba7053f9a9f79de5a19387… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jul 28 19:41:51 2013 +0200 usbd.sys: Implement USBD_ParseConfigurationDescriptor using its Ex version. --- dlls/usbd.sys/usbd.c | 9 +++++++++ dlls/usbd.sys/usbd.sys.spec | 2 +- include/ddk/usbdlib.h | 1 + 3 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/usbd.sys/usbd.c b/dlls/usbd.sys/usbd.c index ff0362c..fbec22e 100644 --- a/dlls/usbd.sys/usbd.c +++ b/dlls/usbd.sys/usbd.c @@ -198,6 +198,15 @@ PUSB_INTERFACE_DESCRIPTOR WINAPI USBD_ParseConfigurationDescriptorEx( return NULL; } +PUSB_INTERFACE_DESCRIPTOR WINAPI USBD_ParseConfigurationDescriptor( + PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor, UCHAR InterfaceNumber, + UCHAR AlternateSetting ) +{ + TRACE( "(%p, %u, %u)\n", ConfigurationDescriptor, InterfaceNumber, AlternateSetting ); + return USBD_ParseConfigurationDescriptorEx( ConfigurationDescriptor, ConfigurationDescriptor, + InterfaceNumber, AlternateSetting, -1, -1, -1 ); +} + PUSB_COMMON_DESCRIPTOR WINAPI USBD_ParseDescriptors( PVOID DescriptorBuffer, ULONG TotalLength, diff --git a/dlls/usbd.sys/usbd.sys.spec b/dlls/usbd.sys/usbd.sys.spec index 15cf352..75ce083 100644 --- a/dlls/usbd.sys/usbd.sys.spec +++ b/dlls/usbd.sys/usbd.sys.spec @@ -21,7 +21,7 @@ @ stdcall USBD_GetUSBDIVersion(ptr) @ stub USBD_InitializeDevice @ stub USBD_MakePdoName -@ stub USBD_ParseConfigurationDescriptor +@ stdcall USBD_ParseConfigurationDescriptor(ptr long long) @ stdcall _USBD_ParseConfigurationDescriptorEx@28(ptr ptr long long long long long) USBD_ParseConfigurationDescriptorEx @ stdcall _USBD_ParseDescriptors@16(ptr long ptr long) USBD_ParseDescriptors @ stub USBD_QueryBusTime diff --git a/include/ddk/usbdlib.h b/include/ddk/usbdlib.h index 86080ce..188744f 100644 --- a/include/ddk/usbdlib.h +++ b/include/ddk/usbdlib.h @@ -30,6 +30,7 @@ PURB WINAPI USBD_CreateConfigurationRequestEx(PUSB_CONFIGURATION_DESCRIPTOR,PUSB ULONG WINAPI USBD_GetInterfaceLength(PUSB_INTERFACE_DESCRIPTOR,PUCHAR); VOID WINAPI USBD_GetUSBDIVersion(PUSBD_VERSION_INFORMATION); PUSB_COMMON_DESCRIPTOR WINAPI USBD_ParseDescriptors(PVOID,ULONG,PVOID,LONG); +PUSB_INTERFACE_DESCRIPTOR WINAPI USBD_ParseConfigurationDescriptor(PUSB_CONFIGURATION_DESCRIPTOR,UCHAR,UCHAR); PUSB_INTERFACE_DESCRIPTOR WINAPI USBD_ParseConfigurationDescriptorEx(PUSB_CONFIGURATION_DESCRIPTOR,PVOID,LONG,LONG,LONG,LONG,LONG); USBD_STATUS WINAPI USBD_ValidateConfigurationDescriptor(PUSB_CONFIGURATION_DESCRIPTOR,ULONG,USHORT,PUCHAR*,ULONG);

1 0

Alexandre Julliard : ddraw/tests: Remove a todo from a test that succeeds.
by Alexandre Julliard 29 Jul '13

29 Jul '13

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

Alexandre Julliard : d3d8/tests: Remove a todo from a test that succeeds.
by Alexandre Julliard 29 Jul '13

29 Jul '13

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

Rico Schüller : d3dx9/tests: Add ID3DXConstantTable big vector test.
by Alexandre Julliard 29 Jul '13

29 Jul '13

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

Rico Schüller : d3dx9/tests: Add ID3DXConstantTable RegisterCount test for D3DXRS_INT4.
by Alexandre Julliard 29 Jul '13

29 Jul '13

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:: SetDefaults() test.
by Alexandre Julliard 29 Jul '13

29 Jul '13

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

← Newer
1
...
4
5
6
7
8
9
10
...
45
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 July 2013