wine-commits March 2020

wine-commits@winehq.org

1 participants
996 discussions

Alexandre Julliard : user.exe: Clear out the thunk array to catch invalid winprocs.
by Alexandre Julliard 26 Mar '20

26 Mar '20

Module: wine Branch: master Commit: 64bd952b85eb183d97b438a3d2695b2bf78d17ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=64bd952b85eb183d97b438a3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 26 15:31:21 2020 +0100 user.exe: Clear out the thunk array to catch invalid winprocs. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48814 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user.exe16/message.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/user.exe16/message.c b/dlls/user.exe16/message.c index 14e7a19889..e3ca3fd779 100644 --- a/dlls/user.exe16/message.c +++ b/dlls/user.exe16/message.c @@ -152,7 +152,8 @@ static WNDPROC16 alloc_win16_thunk( WNDPROC handle ) { assert( MAX_WINPROCS16 * sizeof(WINPROC_THUNK) <= 0x10000 ); - if (!(thunk_selector = GlobalAlloc16( GMEM_FIXED, MAX_WINPROCS16 * sizeof(WINPROC_THUNK) ))) + if (!(thunk_selector = GlobalAlloc16( GMEM_FIXED | GMEM_ZEROINIT, + MAX_WINPROCS16 * sizeof(WINPROC_THUNK) ))) return NULL; PrestoChangoSelector16( thunk_selector, thunk_selector ); thunk_array = GlobalLock16( thunk_selector );

1 0

Alexandre Julliard : ntdll: Use the NLS case mapping table for RtlHashUnicodeString().
by Alexandre Julliard 26 Mar '20

26 Mar '20

Module: wine Branch: master Commit: 9bbb66fdf72a4090e38da46bda0eff0a6ab642ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=9bbb66fdf72a4090e38da46b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 26 11:26:13 2020 +0100 ntdll: Use the NLS case mapping table for RtlHashUnicodeString(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/locale.c | 34 ++++++++++++++++++++++++++++++++++ dlls/ntdll/rtlstr.c | 25 ------------------------- dlls/ntdll/tests/rtlstr.c | 20 ++++++++++++-------- 3 files changed, 46 insertions(+), 33 deletions(-) diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index afd65f3c02..1be3086a1e 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -1288,6 +1288,40 @@ BOOLEAN WINAPI RtlPrefixUnicodeString( const UNICODE_STRING *s1, const UNICODE_S } + +/****************************************************************************** + * RtlHashUnicodeString (NTDLL.@) + */ +NTSTATUS WINAPI RtlHashUnicodeString( const UNICODE_STRING *string, BOOLEAN case_insensitive, + ULONG alg, ULONG *hash ) +{ + unsigned int i; + + if (!string || !hash) return STATUS_INVALID_PARAMETER; + + switch (alg) + { + case HASH_STRING_ALGORITHM_DEFAULT: + case HASH_STRING_ALGORITHM_X65599: + break; + default: + return STATUS_INVALID_PARAMETER; + } + + *hash = 0; + if (!case_insensitive) + for (i = 0; i < string->Length / sizeof(WCHAR); i++) + *hash = *hash * 65599 + string->Buffer[i]; + else if (nls_info.UpperCaseTable) + for (i = 0; i < string->Length / sizeof(WCHAR); i++) + *hash = *hash * 65599 + casemap( nls_info.UpperCaseTable, string->Buffer[i] ); + else /* locale not setup yet */ + for (i = 0; i < string->Length / sizeof(WCHAR); i++) + *hash = *hash * 65599 + casemap_ascii( string->Buffer[i] ); + return STATUS_SUCCESS; +} + + /************************************************************************** * RtlCustomCPToUnicodeN (NTDLL.@) */ diff --git a/dlls/ntdll/rtlstr.c b/dlls/ntdll/rtlstr.c index c0d8ec6477..6f2a2e85c2 100644 --- a/dlls/ntdll/rtlstr.c +++ b/dlls/ntdll/rtlstr.c @@ -1708,28 +1708,3 @@ NTSTATUS WINAPI RtlStringFromGUID(const GUID* guid, UNICODE_STRING *str) return STATUS_SUCCESS; } - -/****************************************************************************** - * RtlHashUnicodeString [NTDLL.@] - */ -NTSTATUS WINAPI RtlHashUnicodeString(PCUNICODE_STRING string, BOOLEAN case_insensitive, ULONG alg, ULONG *hash) -{ - unsigned int i; - - if (!string || !hash) return STATUS_INVALID_PARAMETER; - - switch (alg) - { - case HASH_STRING_ALGORITHM_DEFAULT: - case HASH_STRING_ALGORITHM_X65599: - break; - default: - return STATUS_INVALID_PARAMETER; - } - - *hash = 0; - for (i = 0; i < string->Length/sizeof(WCHAR); i++) - *hash = *hash*65599 + (case_insensitive ? toupperW(string->Buffer[i]) : string->Buffer[i]); - - return STATUS_SUCCESS; -} diff --git a/dlls/ntdll/tests/rtlstr.c b/dlls/ntdll/tests/rtlstr.c index f872422954..cd95ec3a48 100644 --- a/dlls/ntdll/tests/rtlstr.c +++ b/dlls/ntdll/tests/rtlstr.c @@ -1942,14 +1942,18 @@ struct hash_unicodestring_test { }; static const struct hash_unicodestring_test hash_test[] = { - { {'T',0}, FALSE, 0x00000054 }, - { {'T','e','s','t',0}, FALSE, 0x766bb952 }, - { {'T','e','S','t',0}, FALSE, 0x764bb172 }, - { {'t','e','s','t',0}, FALSE, 0x4745d132 }, - { {'t','e','s','t',0}, TRUE, 0x6689c132 }, - { {'T','E','S','T',0}, TRUE, 0x6689c132 }, - { {'T','E','S','T',0}, FALSE, 0x6689c132 }, - { {'a','b','c','d','e','f',0}, FALSE, 0x971318c3 }, + { L"T", FALSE, 0x00000054 }, + { L"Test", FALSE, 0x766bb952 }, + { L"TeSt", FALSE, 0x764bb172 }, + { L"test", FALSE, 0x4745d132 }, + { L"test", TRUE, 0x6689c132 }, + { L"TEST", TRUE, 0x6689c132 }, + { L"TEST", FALSE, 0x6689c132 }, + { L"t\xe9st", FALSE, 0x8845cfb6 }, + { L"t\xe9st", TRUE, 0xa789bfb6 }, + { L"T\xc9ST", TRUE, 0xa789bfb6 }, + { L"T\xc9ST", FALSE, 0xa789bfb6 }, + { L"abcdef", FALSE, 0x971318c3 }, { { 0 } } };

1 0

Brendan Shanks : dinput: Fix IDirectInputEffect::SetParameters() behavior with NULL effect parameters.
by Alexandre Julliard 26 Mar '20

26 Mar '20

Module: wine Branch: master Commit: f66517b5a27057243912f3a7c4a41a291ab2bfb8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f66517b5a27057243912f3a7… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Mar 25 16:31:30 2020 -0700 dinput: Fix IDirectInputEffect::SetParameters() behavior with NULL effect parameters. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/effect_linuxinput.c | 8 +++++++- dlls/dinput/tests/joystick.c | 2 -- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/effect_linuxinput.c b/dlls/dinput/effect_linuxinput.c index cc2df3ce87..ef21ecaa30 100644 --- a/dlls/dinput/effect_linuxinput.c +++ b/dlls/dinput/effect_linuxinput.c @@ -499,6 +499,9 @@ static HRESULT WINAPI LinuxInputEffectImpl_SetParameters( dump_DIEFFECT(peff, &This->guid, dwFlags); if (dwFlags & DIEP_AXES) { + if (!(peff->rgdwAxes)) + return DIERR_INVALIDPARAM; + /* the linux input effect system only supports one or two axes */ if (peff->cAxes > 2) return DIERR_INVALIDPARAM; @@ -511,6 +514,9 @@ static HRESULT WINAPI LinuxInputEffectImpl_SetParameters( * different opinions about which way direction "0" is. directx has 0 along the x * axis (left), linux has it along the y axis (down). */ if (dwFlags & DIEP_DIRECTION) { + if (!(peff->rglDirection)) + return DIERR_INVALIDPARAM; + if (peff->cAxes == 1) { if (peff->dwFlags & DIEFF_CARTESIAN) { if (dwFlags & DIEP_AXES) { @@ -629,7 +635,7 @@ static HRESULT WINAPI LinuxInputEffectImpl_SetParameters( if (dwFlags & DIEP_TYPESPECIFICPARAMS) { if (!(peff->lpvTypeSpecificParams)) - return DIERR_INCOMPLETEEFFECT; + return DIERR_INVALIDPARAM; if (type == DIEFT_PERIODIC) { diff --git a/dlls/dinput/tests/joystick.c b/dlls/dinput/tests/joystick.c index fb777e71ae..a3d7440367 100644 --- a/dlls/dinput/tests/joystick.c +++ b/dlls/dinput/tests/joystick.c @@ -606,7 +606,6 @@ static BOOL CALLBACK EnumJoysticks(const DIDEVICEINSTANCEA *lpddi, void *pvRef) ok(hr==DI_OK,"IDirectInputEffect_Initialize failed: %08x\n", hr); /* Test SetParameters with NULL pointers */ - todo_wine { tmp = effect_data.eff.rgdwAxes; effect_data.eff.rgdwAxes = NULL; hr = IDirectInputEffect_SetParameters(effect, &effect_data.eff, DIEP_AXES); @@ -624,7 +623,6 @@ static BOOL CALLBACK EnumJoysticks(const DIDEVICEINSTANCEA *lpddi, void *pvRef) hr = IDirectInputEffect_SetParameters(effect, &effect_data.eff, DIEP_TYPESPECIFICPARAMS); ok(hr==DIERR_INVALIDPARAM,"IDirectInputEffect_SetParameters should fail with INVALIDPARAM, got: %08x\n", hr); effect_data.eff.lpvTypeSpecificParams = tmp; - } hr = IDirectInputEffect_SetParameters(effect, &effect_data.eff, DIEP_AXES | DIEP_DIRECTION | DIEP_TYPESPECIFICPARAMS);

1 0

Brendan Shanks : dinput/tests: Test IDirectInputEffect::SetParameters() with NULL effect parameters.
by Alexandre Julliard 26 Mar '20

26 Mar '20

Module: wine Branch: master Commit: f00b59f597b047577d7542d0743701890a8f3b78 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f00b59f597b047577d7542d0… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Mar 25 16:31:29 2020 -0700 dinput/tests: Test IDirectInputEffect::SetParameters() with NULL effect parameters. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/joystick.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/dlls/dinput/tests/joystick.c b/dlls/dinput/tests/joystick.c index f009ef347b..fb777e71ae 100644 --- a/dlls/dinput/tests/joystick.c +++ b/dlls/dinput/tests/joystick.c @@ -598,11 +598,34 @@ static BOOL CALLBACK EnumJoysticks(const DIDEVICEINSTANCEA *lpddi, void *pvRef) { DWORD effect_status; struct DIPROPDWORD diprop_word; + void *tmp; GUID guid = {0}; hr = IDirectInputEffect_Initialize(effect, hInstance, data->version, &effect_data.guid); ok(hr==DI_OK,"IDirectInputEffect_Initialize failed: %08x\n", hr); + + /* Test SetParameters with NULL pointers */ + todo_wine { + tmp = effect_data.eff.rgdwAxes; + effect_data.eff.rgdwAxes = NULL; + hr = IDirectInputEffect_SetParameters(effect, &effect_data.eff, DIEP_AXES); + ok(hr==DIERR_INVALIDPARAM,"IDirectInputEffect_SetParameters should fail with INVALIDPARAM, got: %08x\n", hr); + effect_data.eff.rgdwAxes = tmp; + + tmp = effect_data.eff.rglDirection; + effect_data.eff.rglDirection = NULL; + hr = IDirectInputEffect_SetParameters(effect, &effect_data.eff, DIEP_DIRECTION); + ok(hr==DIERR_INVALIDPARAM,"IDirectInputEffect_SetParameters should fail with INVALIDPARAM, got: %08x\n", hr); + effect_data.eff.rglDirection = tmp; + + tmp = effect_data.eff.lpvTypeSpecificParams; + effect_data.eff.lpvTypeSpecificParams = NULL; + hr = IDirectInputEffect_SetParameters(effect, &effect_data.eff, DIEP_TYPESPECIFICPARAMS); + ok(hr==DIERR_INVALIDPARAM,"IDirectInputEffect_SetParameters should fail with INVALIDPARAM, got: %08x\n", hr); + effect_data.eff.lpvTypeSpecificParams = tmp; + } + hr = IDirectInputEffect_SetParameters(effect, &effect_data.eff, DIEP_AXES | DIEP_DIRECTION | DIEP_TYPESPECIFICPARAMS); ok(hr==DI_OK,"IDirectInputEffect_SetParameters failed: %08x\n", hr);

1 0

Zebediah Figura : mountmgr: Return STATUS_BUFFER_OVERFLOW from query_unix_drive() if the buffer is too small.
by Alexandre Julliard 26 Mar '20

26 Mar '20

Module: wine Branch: master Commit: 2d0e113db15fc6109d0b44502cda40727ff04fa7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d0e113db15fc6109d0b4450… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Mar 25 18:17:03 2020 -0500 mountmgr: Return STATUS_BUFFER_OVERFLOW from query_unix_drive() if the buffer is too small. STATUS_MORE_ENTRIES is meant for enumeration APIs like NtQueryDirectoryFile(); we are not enumerating anything here. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mountmgr.sys/mountmgr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c index dd3a3932b4..222395fadf 100644 --- a/dlls/mountmgr.sys/mountmgr.c +++ b/dlls/mountmgr.sys/mountmgr.c @@ -330,7 +330,7 @@ static NTSTATUS query_unix_drive( void *buff, SIZE_T insize, output->type = type; iosb->Information = FIELD_OFFSET( struct mountmgr_unix_drive, type ) + sizeof(output->type); } - status = STATUS_MORE_ENTRIES; + status = STATUS_BUFFER_OVERFLOW; goto done; }

1 0

Zebediah Figura : mountmgr: Fill the mountmgr_unix_drive structure even if the buffer is too small to hold the dynamic strings.
by Alexandre Julliard 26 Mar '20

26 Mar '20

Module: wine Branch: master Commit: aafe39a8126ef3d500d70cd330cadf94f339568a URL: https://source.winehq.org/git/wine.git/?a=commit;h=aafe39a8126ef3d500d70cd3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Mar 25 18:17:02 2020 -0500 mountmgr: Fill the mountmgr_unix_drive structure even if the buffer is too small to hold the dynamic strings. kernel32 actually already assumes this. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mountmgr.sys/mountmgr.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c index 3331eedf8d..dd3a3932b4 100644 --- a/dlls/mountmgr.sys/mountmgr.c +++ b/dlls/mountmgr.sys/mountmgr.c @@ -311,6 +311,11 @@ static NTSTATUS query_unix_drive( void *buff, SIZE_T insize, input = NULL; output = buff; + output->size = size; + output->letter = letter; + output->type = type; + output->mount_point_offset = 0; + output->device_offset = 0; if (size > outsize) { @@ -328,9 +333,7 @@ static NTSTATUS query_unix_drive( void *buff, SIZE_T insize, status = STATUS_MORE_ENTRIES; goto done; } - output->size = size; - output->letter = letter; - output->type = type; + ptr = (char *)(output + 1); if (mount_point)

1 0

Zebediah Figura : include: Rename the FileSystemAttribute field of FILE_FS_ATTRIBUTE_INFORMATION to FileSystemAttributes.
by Alexandre Julliard 26 Mar '20

26 Mar '20

Module: wine Branch: master Commit: 97e88a56bce95417a49bb60176680284d75c97f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=97e88a56bce95417a49bb601… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Mar 25 18:15:19 2020 -0500 include: Rename the FileSystemAttribute field of FILE_FS_ATTRIBUTE_INFORMATION to FileSystemAttributes. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 6 +++--- dlls/ntdll/tests/file.c | 6 +++--- include/winioctl.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 1a5f86d7c2..bd27d5a434 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -3248,9 +3248,9 @@ NTSTATUS WINAPI NtQueryVolumeInformationFile( HANDLE handle, PIO_STATUS_BLOCK io FILE_FS_ATTRIBUTE_INFORMATION *info = buffer; FIXME( "%p: faking attribute info\n", handle ); - info->FileSystemAttribute = FILE_SUPPORTS_ENCRYPTION | FILE_FILE_COMPRESSION | - FILE_PERSISTENT_ACLS | FILE_UNICODE_ON_DISK | - FILE_CASE_PRESERVED_NAMES | FILE_CASE_SENSITIVE_SEARCH; + info->FileSystemAttributes = FILE_SUPPORTS_ENCRYPTION | FILE_FILE_COMPRESSION | + FILE_PERSISTENT_ACLS | FILE_UNICODE_ON_DISK | + FILE_CASE_PRESERVED_NAMES | FILE_CASE_SENSITIVE_SEARCH; info->MaximumComponentNameLength = MAXIMUM_FILENAME_LENGTH - 1; info->FileSystemNameLength = sizeof(ntfsW); memcpy(info->FileSystemName, ntfsW, sizeof(ntfsW)); diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 75a67e8095..546795456a 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -3955,12 +3955,12 @@ static void test_query_attribute_information_file(void) ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %d\n", status); ok(U(io).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %d\n", U(io).Status); - ok(ffai->FileSystemAttribute != 0, "Missing FileSystemAttribute\n"); + ok(ffai->FileSystemAttributes != 0, "Missing FileSystemAttributes\n"); ok(ffai->MaximumComponentNameLength != 0, "Missing MaximumComponentNameLength\n"); ok(ffai->FileSystemNameLength != 0, "Missing FileSystemNameLength\n"); - trace("FileSystemAttribute: %x MaximumComponentNameLength: %x FileSystemName: %s\n", - ffai->FileSystemAttribute, ffai->MaximumComponentNameLength, + trace("FileSystemAttributes: %x MaximumComponentNameLength: %x FileSystemName: %s\n", + ffai->FileSystemAttributes, ffai->MaximumComponentNameLength, wine_dbgstr_wn(ffai->FileSystemName, ffai->FileSystemNameLength / sizeof(WCHAR))); CloseHandle( dir ); diff --git a/include/winioctl.h b/include/winioctl.h index 7699579183..076ce9d7a8 100644 --- a/include/winioctl.h +++ b/include/winioctl.h @@ -434,7 +434,7 @@ typedef struct _FILE_FS_DEVICE_INFORMATION { /* FileFsAttributeInformation = 5 */ typedef struct _FILE_FS_ATTRIBUTE_INFORMATION { - ULONG FileSystemAttribute; + ULONG FileSystemAttributes; LONG MaximumComponentNameLength; ULONG FileSystemNameLength; WCHAR FileSystemName[1];

1 0

Connor McAdams : d3d10: Apply shader resources for shaders used in pass.
by Alexandre Julliard 25 Mar '20

25 Mar '20

Module: wine Branch: master Commit: ab0a3cb2ff5378f6ab5dd79712547dc43a484100 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab0a3cb2ff5378f6ab5dd797… Author: Connor McAdams <conmanx360(a)gmail.com> Date: Wed Mar 25 14:16:27 2020 -0400 d3d10: Apply shader resources for shaders used in pass. Signed-off-by: Connor McAdams <conmanx360(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 123 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 120 insertions(+), 3 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index e2c18ce049..3d397a38eb 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -3619,9 +3619,119 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_pass_GetAnno return &null_variable.ID3D10EffectVariable_iface; } +static void update_buffer(ID3D10Device *device, struct d3d10_effect_variable *v) +{ + struct d3d10_effect_buffer_variable *b = &v->u.buffer; + + if (!b->changed) + return; + + ID3D10Device_UpdateSubresource(device, (ID3D10Resource *)b->buffer, 0, NULL, + b->local_buffer, v->data_size, 0); + + b->changed = FALSE; +} + +static void apply_shader_resources(ID3D10Device *device, struct ID3D10EffectShaderVariable *variable) +{ + struct d3d10_effect_variable *v = impl_from_ID3D10EffectShaderVariable(variable); + struct d3d10_effect_shader_variable *sv = &v->u.shader; + struct d3d10_effect_shader_resource *sr; + struct d3d10_effect_variable *rsrc_v; + ID3D10ShaderResourceView **srv; + unsigned int i; + + for (i = 0; i < sv->resource_count; ++i) + { + sr = &sv->resources[i]; + rsrc_v = sr->variable; + + switch (sr->in_type) + { + case D3D10_SIT_CBUFFER: + update_buffer(device, rsrc_v); + switch (v->type->basetype) + { + case D3D10_SVT_VERTEXSHADER: + ID3D10Device_VSSetConstantBuffers(device, sr->bind_point, sr->bind_count, + &rsrc_v->u.buffer.buffer); + break; + + case D3D10_SVT_PIXELSHADER: + ID3D10Device_PSSetConstantBuffers(device, sr->bind_point, sr->bind_count, + &rsrc_v->u.buffer.buffer); + break; + + case D3D10_SVT_GEOMETRYSHADER: + ID3D10Device_GSSetConstantBuffers(device, sr->bind_point, sr->bind_count, + &rsrc_v->u.buffer.buffer); + break; + + default: + WARN("Incorrect shader type to bind constant buffer.\n"); + break; + } + break; + + case D3D10_SIT_TBUFFER: + update_buffer(device, rsrc_v); + srv = &rsrc_v->u.buffer.resource_view; + + switch (v->type->basetype) + { + case D3D10_SVT_VERTEXSHADER: + ID3D10Device_VSSetShaderResources(device, sr->bind_point, sr->bind_count, srv); + break; + + case D3D10_SVT_PIXELSHADER: + ID3D10Device_PSSetShaderResources(device, sr->bind_point, sr->bind_count, srv); + break; + + case D3D10_SVT_GEOMETRYSHADER: + ID3D10Device_GSSetShaderResources(device, sr->bind_point, sr->bind_count, srv); + break; + + default: + WARN("Incorrect shader type to bind shader resource view.\n"); + break; + } + break; + + case D3D10_SIT_SAMPLER: + switch (v->type->basetype) + { + case D3D10_SVT_VERTEXSHADER: + ID3D10Device_VSSetSamplers(device, sr->bind_point, sr->bind_count, + &rsrc_v->u.state.object.sampler); + break; + + case D3D10_SVT_PIXELSHADER: + ID3D10Device_PSSetSamplers(device, sr->bind_point, sr->bind_count, + &rsrc_v->u.state.object.sampler); + break; + + case D3D10_SVT_GEOMETRYSHADER: + ID3D10Device_GSSetSamplers(device, sr->bind_point, sr->bind_count, + &rsrc_v->u.state.object.sampler); + break; + + default: + WARN("Incorrect shader type to bind sampler.\n"); + break; + } + break; + + default: + WARN("Unhandled shader resource %#x.\n", sr->in_type); + break; + } + } +} + static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_Apply(ID3D10EffectPass *iface, UINT flags) { - struct d3d10_effect_pass *This = impl_from_ID3D10EffectPass(iface); + struct d3d10_effect_pass *pass = impl_from_ID3D10EffectPass(iface); + ID3D10Device *device = pass->technique->effect->device; HRESULT hr = S_OK; unsigned int i; @@ -3629,9 +3739,16 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_Apply(ID3D10EffectPass *iface if (flags) FIXME("Ignoring flags (%#x)\n", flags); - for (i = 0; i < This->object_count; ++i) + if (pass->vs.pShaderVariable != (ID3D10EffectShaderVariable *)&null_shader_variable.ID3D10EffectVariable_iface) + apply_shader_resources(device, pass->vs.pShaderVariable); + if (pass->gs.pShaderVariable != (ID3D10EffectShaderVariable *)&null_shader_variable.ID3D10EffectVariable_iface) + apply_shader_resources(device, pass->gs.pShaderVariable); + if (pass->ps.pShaderVariable != (ID3D10EffectShaderVariable *)&null_shader_variable.ID3D10EffectVariable_iface) + apply_shader_resources(device, pass->ps.pShaderVariable); + + for (i = 0; i < pass->object_count; ++i) { - hr = d3d10_effect_object_apply(&This->objects[i]); + hr = d3d10_effect_object_apply(&pass->objects[i]); if (FAILED(hr)) break; }

1 0

Connor McAdams : d3d10: Add impl_from_ID3D10EffectShaderVariable.
by Alexandre Julliard 25 Mar '20

25 Mar '20

Module: wine Branch: master Commit: 176c1c6b4c5ac78cb93e1b073e558c695cd1ddd7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=176c1c6b4c5ac78cb93e1b07… Author: Connor McAdams <conmanx360(a)gmail.com> Date: Wed Mar 25 14:16:26 2020 -0400 d3d10: Add impl_from_ID3D10EffectShaderVariable. Signed-off-by: Connor McAdams <conmanx360(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 2360e5a025..e2c18ce049 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -124,6 +124,11 @@ static inline struct d3d10_effect_variable *impl_from_ID3D10EffectVariable(ID3D1 return CONTAINING_RECORD(iface, struct d3d10_effect_variable, ID3D10EffectVariable_iface); } +static inline struct d3d10_effect_variable *impl_from_ID3D10EffectShaderVariable(ID3D10EffectShaderVariable *iface) +{ + return CONTAINING_RECORD(iface, struct d3d10_effect_variable, ID3D10EffectVariable_iface); +} + struct d3d10_effect_state_property_info { UINT id; @@ -6639,7 +6644,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetShaderDesc( static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetVertexShader( ID3D10EffectShaderVariable *iface, UINT index, ID3D10VertexShader **shader) { - struct d3d10_effect_variable *v = impl_from_ID3D10EffectVariable((ID3D10EffectVariable *)iface); + struct d3d10_effect_variable *v = impl_from_ID3D10EffectShaderVariable(iface); TRACE("iface %p, index %u, shader %p.\n", iface, index, shader); @@ -6661,7 +6666,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetVertexShader( static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetGeometryShader( ID3D10EffectShaderVariable *iface, UINT index, ID3D10GeometryShader **shader) { - struct d3d10_effect_variable *v = impl_from_ID3D10EffectVariable((ID3D10EffectVariable *)iface); + struct d3d10_effect_variable *v = impl_from_ID3D10EffectShaderVariable(iface); TRACE("iface %p, index %u, shader %p.\n", iface, index, shader); @@ -6683,7 +6688,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetGeometryShader( static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetPixelShader( ID3D10EffectShaderVariable *iface, UINT index, ID3D10PixelShader **shader) { - struct d3d10_effect_variable *v = impl_from_ID3D10EffectVariable((ID3D10EffectVariable *)iface); + struct d3d10_effect_variable *v = impl_from_ID3D10EffectShaderVariable(iface); TRACE("iface %p, index %u, shader %p.\n", iface, index, shader); @@ -6706,7 +6711,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetInputSignatureE ID3D10EffectShaderVariable *iface, UINT shader_index, UINT element_index, D3D10_SIGNATURE_PARAMETER_DESC *desc) { - struct d3d10_effect_variable *This = (struct d3d10_effect_variable *)iface; + struct d3d10_effect_variable *v = impl_from_ID3D10EffectShaderVariable(iface); struct d3d10_effect_shader_variable *s; D3D10_SIGNATURE_PARAMETER_DESC *d; @@ -6720,13 +6725,13 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetInputSignatureE } /* Check shader_index, this crashes on W7/DX10 */ - if (shader_index >= This->effect->used_shader_count) + if (shader_index >= v->effect->used_shader_count) { WARN("This should crash on W7/DX10!\n"); return E_FAIL; } - s = &This->effect->used_shaders[shader_index]->u.shader; + s = &v->effect->used_shaders[shader_index]->u.shader; if (!s->input_signature.signature) { WARN("No shader signature\n"); @@ -6762,7 +6767,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetOutputSignature ID3D10EffectShaderVariable *iface, UINT shader_index, UINT element_index, D3D10_SIGNATURE_PARAMETER_DESC *desc) { - struct d3d10_effect_variable *This = (struct d3d10_effect_variable *)iface; + struct d3d10_effect_variable *v = impl_from_ID3D10EffectShaderVariable(iface); struct d3d10_effect_shader_variable *s; D3D10_SIGNATURE_PARAMETER_DESC *d; @@ -6776,13 +6781,13 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetOutputSignature } /* Check shader_index, this crashes on W7/DX10 */ - if (shader_index >= This->effect->used_shader_count) + if (shader_index >= v->effect->used_shader_count) { WARN("This should crash on W7/DX10!\n"); return E_FAIL; } - s = &This->effect->used_shaders[shader_index]->u.shader; + s = &v->effect->used_shaders[shader_index]->u.shader; if (!s->output_signature.signature) { WARN("No shader signature\n");

1 0

Zebediah Figura : d3dcompiler: Store a pointer to the bwriter_shader structure inside the bc_writer structure.
by Alexandre Julliard 25 Mar '20

25 Mar '20

Module: wine Branch: master Commit: 8ea5b759ef6d353bff50fd1ca5873d683e8ccc7f URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ea5b759ef6d353bff50fd1c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 24 19:18:33 2020 -0500 d3dcompiler: Store a pointer to the bwriter_shader structure inside the bc_writer structure. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/bytecodewriter.c | 30 +++++++++++++++++++----------- dlls/d3dcompiler_43/d3dcompiler_private.h | 3 +-- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/dlls/d3dcompiler_43/bytecodewriter.c b/dlls/d3dcompiler_43/bytecodewriter.c index 8b016cd620..35bd6669ef 100644 --- a/dlls/d3dcompiler_43/bytecodewriter.c +++ b/dlls/d3dcompiler_43/bytecodewriter.c @@ -939,7 +939,8 @@ static void vs_12_dstreg(struct bc_writer *This, const struct shader_reg *reg, break; case BWRITERSPR_PREDICATE: - if(This->version != BWRITERVS_VERSION(2, 1)){ + if (This->shader->major_version != 2 || This->shader->minor_version != 1) + { WARN("Predicate register is allowed only in vs_2_x\n"); This->state = E_INVALIDARG; return; @@ -1634,7 +1635,8 @@ static void vs_2_srcreg(struct bc_writer *This, break; case BWRITERSPR_PREDICATE: - if(This->version != BWRITERVS_VERSION(2, 1)){ + if (This->shader->major_version != 2 || This->shader->minor_version != 1) + { WARN("Predicate register is allowed only in vs_2_x\n"); This->state = E_INVALIDARG; return; @@ -1871,7 +1873,8 @@ static void ps_2_srcreg(struct bc_writer *This, break; case BWRITERSPR_PREDICATE: - if(This->version != BWRITERPS_VERSION(2, 1)){ + if (This->shader->minor_version == 0) + { WARN("Predicate register not supported in ps_2_0\n"); This->state = E_INVALIDARG; } @@ -1917,7 +1920,8 @@ static void ps_2_0_dstreg(struct bc_writer *This, break; case BWRITERSPR_PREDICATE: - if(This->version != BWRITERPS_VERSION(2, 1)){ + if (This->shader->minor_version == 0) + { WARN("Predicate register not supported in ps_2_0\n"); This->state = E_INVALIDARG; } @@ -2072,6 +2076,7 @@ static void sm_3_header(struct bc_writer *This, const struct bwriter_shader *sha static void sm_3_srcreg(struct bc_writer *This, const struct shader_reg *reg, struct bytecode_buffer *buffer) { + const struct bwriter_shader *shader = This->shader; DWORD token = (1u << 31); /* Bit 31 of registers is 1 */ DWORD d3d9reg; @@ -2081,14 +2086,16 @@ static void sm_3_srcreg(struct bc_writer *This, token |= d3d9_srcmod(reg->srcmod); if(reg->rel_reg) { - if(reg->type == BWRITERSPR_CONST && This->version == BWRITERPS_VERSION(3, 0)) { + if (reg->type == BWRITERSPR_CONST && shader->type == ST_PIXEL) + { WARN("c%u[...] is unsupported in ps_3_0\n", reg->regnum); This->state = E_INVALIDARG; return; } - if(((reg->rel_reg->type == BWRITERSPR_ADDR && This->version == BWRITERVS_VERSION(3, 0)) || - reg->rel_reg->type == BWRITERSPR_LOOP) && - reg->rel_reg->regnum == 0) { + + if (((reg->rel_reg->type == BWRITERSPR_ADDR && shader->type == ST_VERTEX) + || reg->rel_reg->type == BWRITERSPR_LOOP) && reg->rel_reg->regnum == 0) + { token |= D3DVS_ADDRMODE_RELATIVE & D3DVS_ADDRESSMODE_MASK; } else { WARN("Unsupported relative addressing register\n"); @@ -2111,12 +2118,13 @@ static void sm_3_dstreg(struct bc_writer *This, const struct shader_reg *reg, struct bytecode_buffer *buffer, DWORD shift, DWORD mod) { + const struct bwriter_shader *shader = This->shader; DWORD token = (1u << 31); /* Bit 31 of registers is 1 */ DWORD d3d9reg; if(reg->rel_reg) { - if(This->version == BWRITERVS_VERSION(3, 0) && - reg->type == BWRITERSPR_OUTPUT) { + if (shader->type == ST_VERTEX && reg->type == BWRITERSPR_OUTPUT) + { token |= D3DVS_ADDRMODE_RELATIVE & D3DVS_ADDRESSMODE_MASK; } else { WARN("Relative addressing not supported for this shader type or register type\n"); @@ -2395,7 +2403,6 @@ static struct bc_writer *create_writer(DWORD version) WARN("Unexpected shader version requested: %08x\n", version); goto fail; } - ret->version = version; return ret; fail: @@ -2437,6 +2444,7 @@ HRESULT shader_write_bytecode(const struct bwriter_shader *shader, DWORD **resul return E_FAIL; } writer = create_writer(sm1_version(shader)); + writer->shader = shader; *result = NULL; if(!writer) { diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 3dfc736abe..b9caf59580 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -332,12 +332,11 @@ struct bytecode_backend { /* Bytecode writing stuff */ struct bc_writer { const struct bytecode_backend *funcs; + const struct bwriter_shader *shader; /* Avoid result checking */ HRESULT state; - DWORD version; - /* Vertex shader varying mapping */ DWORD oPos_regnum; DWORD oD_regnum[2];

1 0

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 March 2020