September 2020 - Wine-Commits

Nikolay Sivov : combase: Manage per-thread call cancellation counter.
by Alexandre Julliard Sept. 16, 2020

Sept. 16, 2020

Module: wine Branch: master Commit: 609c311a81b87ed351a4cf02478552c737fab716 URL: https://source.winehq.org/git/wine.git/?a=commit;h=609c311a81b87ed351a4cf02… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 16 16:02:40 2020 +0300 combase: Manage per-thread call cancellation counter. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/combase.c | 27 ++++++++++++++++--- dlls/combase/combase_private.h | 1 + dlls/ole32/compobj_private.h | 1 + dlls/ole32/tests/compobj.c | 59 ++++++++++++++++++++++++++++++++++++++++++ include/winerror.h | 1 + 5 files changed, 85 insertions(+), 4 deletions(-) diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c index c66f0bbf8e..7a85b95a19 100644 --- a/dlls/combase/combase.c +++ b/dlls/combase/combase.c @@ -3104,9 +3104,20 @@ HRESULT WINAPI CoRegisterChannelHook(REFGUID guidExtension, IChannelHook *channe */ HRESULT WINAPI CoDisableCallCancellation(void *reserved) { - FIXME("%p stub\n", reserved); + struct tlsdata *tlsdata; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p\n", reserved); + + if (FAILED(hr = com_get_tlsdata(&tlsdata))) + return hr; + + if (!tlsdata->cancelcount) + return CO_E_CANCEL_DISABLED; + + tlsdata->cancelcount--; + + return S_OK; } /*********************************************************************** @@ -3114,9 +3125,17 @@ HRESULT WINAPI CoDisableCallCancellation(void *reserved) */ HRESULT WINAPI CoEnableCallCancellation(void *reserved) { - FIXME("%p stub\n", reserved); + struct tlsdata *tlsdata; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p\n", reserved); + + if (FAILED(hr = com_get_tlsdata(&tlsdata))) + return hr; + + tlsdata->cancelcount++; + + return S_OK; } /*********************************************************************** diff --git a/dlls/combase/combase_private.h b/dlls/combase/combase_private.h index 2c938e6ff4..55ce02d06f 100644 --- a/dlls/combase/combase_private.h +++ b/dlls/combase/combase_private.h @@ -84,6 +84,7 @@ struct tlsdata IUnknown *state; /* see CoSetState */ struct list spies; /* Spies installed with CoRegisterInitializeSpy */ DWORD spies_lock; + DWORD cancelcount; }; extern HRESULT WINAPI InternalTlsAllocData(struct tlsdata **data); diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index f10b41907a..4ec22d51f4 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -62,6 +62,7 @@ struct oletls IUnknown *state; /* see CoSetState */ struct list spies; /* Spies installed with CoRegisterInitializeSpy */ DWORD spies_lock; + DWORD cancelcount; }; /* Global Interface Table Functions */ diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index e627521fa5..5ed3f9638b 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -4186,6 +4186,64 @@ todo_wine CoUninitialize(); } +static void test_call_cancellation(void) +{ + HRESULT hr; + + /* Cancellation is disabled initially. */ + hr = CoDisableCallCancellation(NULL); + ok(hr == CO_E_CANCEL_DISABLED, "Unexpected hr %#x.\n", hr); + + hr = CoEnableCallCancellation(NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = CoDisableCallCancellation(NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = CoDisableCallCancellation(NULL); + ok(hr == CO_E_CANCEL_DISABLED, "Unexpected hr %#x.\n", hr); + + hr = CoEnableCallCancellation(NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + /* Counter is not affected by initialization. */ + hr = CoInitialize(NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = CoDisableCallCancellation(NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = CoDisableCallCancellation(NULL); + ok(hr == CO_E_CANCEL_DISABLED, "Unexpected hr %#x.\n", hr); + + hr = CoEnableCallCancellation(NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + CoUninitialize(); + + hr = CoDisableCallCancellation(NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = CoDisableCallCancellation(NULL); + ok(hr == CO_E_CANCEL_DISABLED, "Unexpected hr %#x.\n", hr); + + /* It's cumulative. */ + hr = CoEnableCallCancellation(NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = CoEnableCallCancellation(NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = CoDisableCallCancellation(NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = CoDisableCallCancellation(NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = CoDisableCallCancellation(NULL); + ok(hr == CO_E_CANCEL_DISABLED, "Unexpected hr %#x.\n", hr); +} + START_TEST(compobj) { init_funcs(); @@ -4236,6 +4294,7 @@ START_TEST(compobj) test_CoGetCurrentProcess(); test_mta_usage(); test_CoCreateInstanceFromApp(); + test_call_cancellation(); DeleteFileA( testlib ); } diff --git a/include/winerror.h b/include/winerror.h index 4ebb48c124..86f7aace68 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -2679,6 +2679,7 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define RPC_E_NO_CONTEXT _HRESULT_TYPEDEF_(0x8001011E) #define RPC_E_TIMEOUT _HRESULT_TYPEDEF_(0x8001011F) #define RPC_E_NO_SYNC _HRESULT_TYPEDEF_(0x80010120) +#define CO_E_CANCEL_DISABLED _HRESULT_TYPEDEF_(0x80010140) #define RPC_E_UNEXPECTED _HRESULT_TYPEDEF_(0x8001FFFF) #define DISP_E_UNKNOWNINTERFACE _HRESULT_TYPEDEF_(0x80020001)

1 0

Roberto Pungartnik : po: Brazilian Portuguese update.
by Alexandre Julliard Sept. 16, 2020

Sept. 16, 2020

Module: wine Branch: master Commit: 7a6e0ff63924bce334d7fa6adcfe980ce0d9c97c URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a6e0ff63924bce334d7fa6a… Author: Roberto Pungartnik <rpungartnik(a)gmail.com> Date: Wed Sep 16 00:07:37 2020 -0300 po: Brazilian Portuguese update. Signed-off-by: Roberto Pungartnik <rpungartnik(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/pt_BR.po | 112 ++++++++++++++++++------------------------------------------ 1 file changed, 34 insertions(+), 78 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index a4c43e20e5..777044ffcb 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2020-08-31 09:45-0300\n" +"PO-Revision-Date: 2020-09-15 21:16-0300\n" "Last-Translator: Roberto Augusto Pungartnik <rpungartnik(a)gmail.com>\n" "Language-Team: Portuguese (Brazil)\n" "Language: pt_BR\n" @@ -10758,153 +10758,115 @@ msgstr "&Mais Janelas..." #: dlls/vbscript/vbscript.rc:30 msgid "Overflow" -msgstr "" +msgstr "Extravasamento" #: dlls/vbscript/vbscript.rc:31 -#, fuzzy -#| msgid "Out of memory." msgid "Out of memory" -msgstr "Memória insuficiente." +msgstr "Memória insuficiente" #: dlls/vbscript/vbscript.rc:33 msgid "This array is fixed or temporarily locked" -msgstr "" +msgstr "Este array está fixo ou temporariamente bloqueado" #: dlls/vbscript/vbscript.rc:34 -#, fuzzy -#| msgid "Data type mismatch.\n" msgid "Type mismatch" -msgstr "Tipo de dados diferente.\n" +msgstr "Tipo de dados diferente" #: dlls/vbscript/vbscript.rc:36 -#, fuzzy -#| msgid "I/O device error.\n" msgid "Device I/O error" -msgstr "Erro em dispositivo de E/S.\n" +msgstr "Erro em dispositivo de E/S" #: dlls/vbscript/vbscript.rc:37 -#, fuzzy -#| msgid "File already exists.\n" msgid "File already exists" -msgstr "O arquivo já existe.\n" +msgstr "O arquivo já existe" #: dlls/vbscript/vbscript.rc:38 -#, fuzzy -#| msgid "Disk full.\n" msgid "Disk full" -msgstr "Disco cheio.\n" +msgstr "Disco cheio" #: dlls/vbscript/vbscript.rc:39 -#, fuzzy -#| msgid "Too many open files.\n" msgid "Too many files" -msgstr "Muitos arquivos abertos.\n" +msgstr "Muitos arquivos abertos" #: dlls/vbscript/vbscript.rc:40 -#, fuzzy -#| msgid "Access denied.\n" msgid "Permission denied" -msgstr "Acesso negado.\n" +msgstr "Acesso negado" #: dlls/vbscript/vbscript.rc:41 msgid "Path/File access error" -msgstr "" +msgstr "Falha de acesso ao Caminho/Arquivo" #: dlls/vbscript/vbscript.rc:42 -#, fuzzy -#| msgid "Path not found.\n" msgid "Path not found" -msgstr "Caminho não encontrado.\n" +msgstr "Caminho não encontrado" #: dlls/vbscript/vbscript.rc:43 -#, fuzzy -#| msgid "(value not set)" msgid "Object variable not set" -msgstr "(valor não dado)" +msgstr "Objeto variável não setado" #: dlls/vbscript/vbscript.rc:44 -#, fuzzy -#| msgid "Invalid user buffer.\n" msgid "Invalid use of Null" -msgstr "Buffer de usuário inválido.\n" +msgstr "Usuo inválido de Null" #: dlls/vbscript/vbscript.rc:45 msgid "Can't create necessary temporary file" -msgstr "" +msgstr "Arquivo temporário não pode ser criado" #: dlls/vbscript/vbscript.rc:46 -#, fuzzy -#| msgid "Automation server can't create object" msgid "ActiveX component can't create object" -msgstr "O servidor de automação não conseguiu criar o objeto" +msgstr "Componente ActiveX não pode criar objeto" #: dlls/vbscript/vbscript.rc:47 -#, fuzzy -#| msgid "Object doesn't support this action" msgid "Class doesn't support Automation" -msgstr "O objeto não suporta esta ação" +msgstr "Classe não suporta nomeação automática" #: dlls/vbscript/vbscript.rc:48 msgid "File name or class name not found during Automation operation" -msgstr "" +msgstr "Nome de arquivo ou classe não encontrado durante operação automática" #: dlls/vbscript/vbscript.rc:51 -#, fuzzy -#| msgid "Object doesn't support this action" msgid "Object doesn't support named arguments" -msgstr "O objeto não suporta esta ação" +msgstr "O objeto não suporta argumentos nomeados" #: dlls/vbscript/vbscript.rc:52 -#, fuzzy -#| msgid "Object doesn't support this action" msgid "Object doesn't support current locale setting" msgstr "O objeto não suporta esta ação" #: dlls/vbscript/vbscript.rc:53 dlls/vbscript/vbscript.rc:54 -#, fuzzy -#| msgid "Element not found.\n" msgid "Named argument not found" -msgstr "Elemento não encontrado.\n" +msgstr "Argumento nomeado não encontrado" #: dlls/vbscript/vbscript.rc:55 msgid "Wrong number of arguments or invalid property assignment" -msgstr "" +msgstr "Numero de argumento errado ou propriedade inválida" #: dlls/vbscript/vbscript.rc:56 -#, fuzzy -#| msgid "Object Class Violation" msgid "Object not a collection" -msgstr "Violação da Classe de Objeto" +msgstr "Objeto não é coleção" #: dlls/vbscript/vbscript.rc:57 -#, fuzzy -#| msgid "Specified control was not found in message" msgid "Specified DLL function not found" -msgstr "O controle especificado não foi encontrado na mensagem" +msgstr "DLL de função não encontrada" #: dlls/vbscript/vbscript.rc:58 msgid "Variable uses an Automation type not supported in VBScript" -msgstr "" +msgstr "Variável usa um tipo de automação não suportado em VBScript" #: dlls/vbscript/vbscript.rc:59 msgid "The remote server machine does not exist or is unavailable" -msgstr "" +msgstr "Servidor remoto não existe ou esta inacessível" #: dlls/vbscript/vbscript.rc:60 msgid "Invalid or unqualified reference" -msgstr "" +msgstr "Referência inválida" #: dlls/vbscript/vbscript.rc:62 -#, fuzzy -#| msgid "Microsoft JScript compilation error" msgid "Microsoft VBScript compilation error" -msgstr "Microsoft JScript erro de compilação" +msgstr "Microsoft VBScript erro de compilação" #: dlls/vbscript/vbscript.rc:63 -#, fuzzy -#| msgid "Microsoft JScript runtime error" msgid "Microsoft VBScript runtime error" -msgstr "Microsoft JScript erro de execução" +msgstr "Microsoft VBScript erro de execução" #: dlls/winemac.drv/winemac.rc:33 msgid "Hide %@" @@ -11002,33 +10964,27 @@ msgstr "" #: dlls/wininet/wininet.rc:35 msgid "Effective Date" -msgstr "" +msgstr "Data de Início" #: dlls/wininet/wininet.rc:37 -#, fuzzy -#| msgid "Security" msgid "Security Protocol" -msgstr "Segurança" +msgstr "Protocolo de Segurança" #: dlls/wininet/wininet.rc:38 -#, fuzzy -#| msgid "Signature" msgid "Signature Type" -msgstr "Assinatura" +msgstr "Tipo de Assinatura" #: dlls/wininet/wininet.rc:39 -#, fuzzy -#| msgid "Encrypting File System" msgid "Encryption Type" -msgstr "Encriptando Sistema de Arquivos" +msgstr "Tipo de encriptação" #: dlls/wininet/wininet.rc:40 msgid "Privacy Strength" -msgstr "" +msgstr "Nível de Privacidade" #: dlls/wininet/wininet.rc:43 msgid "bits" -msgstr "" +msgstr "bits" #: dlls/wininet/winineterror.mc:26 msgid "The request has timed out.\n"

1 0

Isabella Bosia : vkd3d-shader: Print dcl_cb registers with dump_register directly.
by Alexandre Julliard Sept. 16, 2020

Sept. 16, 2020

Module: vkd3d Branch: master Commit: 5fa7d5d3564bef01ab97f3fe47bda67132ede20c URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=5fa7d5d3564bef01ab97f3f… Author: Isabella Bosia <ibosia(a)codeweavers.com> Date: Tue Sep 15 18:06:36 2020 +0100 vkd3d-shader: Print dcl_cb registers with dump_register directly. Signed-off-by: Isabella Bosia <ibosia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/trace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 9e2fb65..e4bad38 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -1282,7 +1282,7 @@ static void shader_dump_instruction(struct vkd3d_string_buffer *buffer, case VKD3DSIH_DCL_CONSTANT_BUFFER: shader_addline(buffer, "%s ", shader_opcode_names[ins->handler_idx]); - shader_dump_src_param(buffer, &ins->declaration.cb.src, shader_version); + shader_dump_register(buffer, &ins->declaration.cb.src.reg, shader_version); if (shader_ver_ge(shader_version, 5, 1)) shader_addline(buffer, "[%u]", ins->declaration.cb.size); shader_addline(buffer, ", %s",

1 0

Isabella Bosia : vkd3d-shader: Print uav with dump_register directly.
by Alexandre Julliard Sept. 16, 2020

Sept. 16, 2020

Module: vkd3d Branch: master Commit: d1360ad3aabd57a5bc5df4dddf4b4675ce76b3ce URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d1360ad3aabd57a5bc5df4d… Author: Isabella Bosia <ibosia(a)codeweavers.com> Date: Tue Sep 15 18:06:37 2020 +0100 vkd3d-shader: Print uav with dump_register directly. Signed-off-by: Isabella Bosia <ibosia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/trace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index e4bad38..b184d86 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -1276,7 +1276,7 @@ static void shader_dump_instruction(struct vkd3d_string_buffer *buffer, shader_dump_decl_usage(buffer, &ins->declaration.semantic, ins->flags, shader_version); shader_dump_ins_modifiers(buffer, &ins->declaration.semantic.resource.reg); shader_addline(buffer, " "); - shader_dump_dst_param(buffer, &ins->declaration.semantic.resource.reg, shader_version); + shader_dump_register(buffer, &ins->declaration.semantic.resource.reg.reg, shader_version); shader_dump_register_space(buffer, ins->declaration.semantic.resource.register_space, shader_version); break;

1 0

Isabella Bosia : vkd3d-shader: Recognize skipOptimization global flag.
by Alexandre Julliard Sept. 16, 2020

Sept. 16, 2020

Module: vkd3d Branch: master Commit: 058aec3ad91b02464669ff63cca0978ad7293319 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=058aec3ad91b02464669ff6… Author: Isabella Bosia <ibosia(a)codeweavers.com> Date: Tue Sep 15 18:05:11 2020 +0100 vkd3d-shader: Recognize skipOptimization global flag. Signed-off-by: Isabella Bosia <ibosia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/trace.c | 1 + libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 2 files changed, 2 insertions(+) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 3d29d71..001c347 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -348,6 +348,7 @@ static void shader_dump_global_flags(struct vkd3d_string_buffer *buffer, DWORD g {VKD3DSGF_FORCE_EARLY_DEPTH_STENCIL, "forceEarlyDepthStencil"}, {VKD3DSGF_ENABLE_RAW_AND_STRUCTURED_BUFFERS, "enableRawAndStructuredBuffers"}, {VKD3DSGF_ENABLE_MINIMUM_PRECISION, "enableMinimumPrecision"}, + {VKD3DSGF_SKIP_OPTIMIZATION, "skipOptimization"}, }; for (i = 0; i < ARRAY_SIZE(global_flag_info); ++i) diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 1acb01f..00b2441 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -451,6 +451,7 @@ enum vkd3d_shader_global_flags VKD3DSGF_REFACTORING_ALLOWED = 0x01, VKD3DSGF_FORCE_EARLY_DEPTH_STENCIL = 0x04, VKD3DSGF_ENABLE_RAW_AND_STRUCTURED_BUFFERS = 0x08, + VKD3DSGF_SKIP_OPTIMIZATION = 0x10, VKD3DSGF_ENABLE_MINIMUM_PRECISION = 0x20 };

1 0

Isabella Bosia : vkd3d-shader: Add shader_ver_ge version comparison function.
by Alexandre Julliard Sept. 16, 2020

Sept. 16, 2020

Module: vkd3d Branch: master Commit: 56382c21bf55de18e5da2a54bac820fa6b9db8a3 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=56382c21bf55de18e5da2a5… Author: Isabella Bosia <ibosia(a)codeweavers.com> Date: Tue Sep 15 18:05:09 2020 +0100 vkd3d-shader: Add shader_ver_ge version comparison function. Signed-off-by: Isabella Bosia <ibosia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/trace.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index fa35bc7..3d29d71 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -300,6 +300,11 @@ shader_input_sysval_semantic_names[] = {VKD3D_SIV_LINE_DENSITY_TESS_FACTOR, "finalLineDensityTessFactor"}, }; +static int shader_ver_ge(const struct vkd3d_shader_version *v, int major, int minor) +{ + return v->major > major || (v->major == major && v->minor >= minor); +} + static int VKD3D_PRINTF_FUNC(2, 3) shader_addline(struct vkd3d_string_buffer *buffer, const char *format, ...) { va_list args; @@ -579,7 +584,7 @@ static void shader_dump_decl_usage(struct vkd3d_string_buffer *buffer, else { /* Pixel shaders 3.0 don't have usage semantics. */ - if (shader_version->major < 3 && shader_version->type == VKD3D_SHADER_TYPE_PIXEL) + if (!shader_ver_ge(shader_version, 3, 0) && shader_version->type == VKD3D_SHADER_TYPE_PIXEL) return; else shader_addline(buffer, "_"); @@ -711,7 +716,7 @@ static void shader_dump_register(struct vkd3d_string_buffer *buffer, case VKD3DSPR_TEXCRDOUT: /* Vertex shaders >= 3.0 use general purpose output registers * (VKD3DSPR_OUTPUT), which can include an address token. */ - if (shader_version->major >= 3) + if (shader_ver_ge(shader_version, 3, 0)) shader_addline(buffer, "o"); else shader_addline(buffer, "oT"); @@ -1239,7 +1244,7 @@ static void shader_dump_instruction_flags(struct vkd3d_string_buffer *buffer, break; case VKD3DSIH_TEX: - if (shader_version->major >= 2 && (ins->flags & VKD3DSI_TEXLD_PROJECT)) + if (shader_ver_ge(shader_version, 2, 0) && (ins->flags & VKD3DSI_TEXLD_PROJECT)) shader_addline(buffer, "p"); break; @@ -1252,7 +1257,7 @@ static void shader_dump_instruction_flags(struct vkd3d_string_buffer *buffer, static void shader_dump_register_space(struct vkd3d_string_buffer *buffer, unsigned int register_space, const struct vkd3d_shader_version *shader_version) { - if (shader_version->major >= 5 && shader_version->minor >= 1) + if (shader_ver_ge(shader_version, 5, 1)) shader_addline(buffer, ", space=%u", register_space); } @@ -1275,7 +1280,7 @@ static void shader_dump_instruction(struct vkd3d_string_buffer *buffer, case VKD3DSIH_DCL_CONSTANT_BUFFER: shader_addline(buffer, "%s ", shader_opcode_names[ins->handler_idx]); shader_dump_src_param(buffer, &ins->declaration.cb.src, shader_version); - if (shader_version->major >= 5 && shader_version->minor >= 1) + if (shader_ver_ge(shader_version, 5, 1)) shader_addline(buffer, "[%u]", ins->declaration.cb.size); shader_addline(buffer, ", %s", ins->flags & VKD3DSI_INDEXED_DYNAMIC ? "dynamicIndexed" : "immediateIndexed");

1 0

Isabella Bosia : vkd3d-shader: Fix out of bound array accesses.
by Alexandre Julliard Sept. 16, 2020

Sept. 16, 2020

Module: vkd3d Branch: master Commit: cf3388dad7bcf98c01b606f1ceb594894c902dd6 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=cf3388dad7bcf98c01b606f… Author: Isabella Bosia <ibosia(a)codeweavers.com> Date: Tue Sep 15 18:05:10 2020 +0100 vkd3d-shader: Fix out of bound array accesses. Signed-off-by: Isabella Bosia <ibosia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/dxbc.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 973a80d..a62974a 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -1787,7 +1787,13 @@ static void shader_sm4_read_instruction_modifier(DWORD modifier, struct vkd3d_sh if ((components & 0xfff0) != (components & 0xf) * 0x1110) FIXME("Components (%#x) have different data types.\n", components); - ins->resource_data_type = data_type_table[data_type]; + if (data_type < ARRAY_SIZE(data_type_table)) + ins->resource_data_type = data_type_table[data_type]; + else + { + FIXME("Unhandled data type %#x.\n", data_type); + ins->resource_data_type = VKD3D_DATA_FLOAT; + } break; } @@ -1796,7 +1802,13 @@ static void shader_sm4_read_instruction_modifier(DWORD modifier, struct vkd3d_sh enum vkd3d_sm4_resource_type resource_type = (modifier & VKD3D_SM5_MODIFIER_RESOURCE_TYPE_MASK) >> VKD3D_SM5_MODIFIER_RESOURCE_TYPE_SHIFT; - ins->resource_type = resource_type_table[resource_type]; + if (resource_type < ARRAY_SIZE(resource_type_table)) + ins->resource_type = resource_type_table[resource_type]; + else + { + FIXME("Unhandled resource type %#x.\n", resource_type); + ins->resource_type = VKD3D_SHADER_RESOURCE_NONE; + } break; }

1 0

Isabella Bosia : vkd3d-shader: Print samplers with dump_register directly.
by Alexandre Julliard Sept. 16, 2020

Sept. 16, 2020

Module: vkd3d Branch: master Commit: ef7c28eb935a4d51196ef593e53cd79bd6ee09c2 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ef7c28eb935a4d51196ef59… Author: Isabella Bosia <ibosia(a)codeweavers.com> Date: Tue Sep 15 18:06:38 2020 +0100 vkd3d-shader: Print samplers with dump_register directly. Signed-off-by: Isabella Bosia <ibosia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/trace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index b184d86..3571de8 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -1396,7 +1396,7 @@ static void shader_dump_instruction(struct vkd3d_string_buffer *buffer, case VKD3DSIH_DCL_SAMPLER: shader_addline(buffer, "%s ", shader_opcode_names[ins->handler_idx]); - shader_dump_src_param(buffer, &ins->declaration.sampler.src, shader_version); + shader_dump_register(buffer, &ins->declaration.sampler.src.reg, shader_version); if (ins->flags == VKD3DSI_SAMPLER_COMPARISON_MODE) shader_addline(buffer, ", comparisonMode"); shader_dump_register_space(buffer, ins->declaration.sampler.register_space, shader_version);

1 0

Isabella Bosia : vkd3d-shader: Add "typed" when handling VKD3DSIH_DCL_UAV_TYPED.
by Alexandre Julliard Sept. 16, 2020

Sept. 16, 2020

Module: vkd3d Branch: master Commit: cc9d08eb38289edfc655cf3f111d3b4e4e44c5d7 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=cc9d08eb38289edfc655cf3… Author: Isabella Bosia <ibosia(a)codeweavers.com> Date: Tue Sep 15 18:05:12 2020 +0100 vkd3d-shader: Add "typed" when handling VKD3DSIH_DCL_UAV_TYPED. Signed-off-by: Isabella Bosia <ibosia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/trace.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 001c347..9e2fb65 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -576,7 +576,9 @@ static void shader_dump_decl_usage(struct vkd3d_string_buffer *buffer, if (semantic->resource.reg.reg.type == VKD3DSPR_RESOURCE) shader_addline(buffer, "_resource_"); else - shader_addline(buffer, "_uav_"); + /* non typed UAVs don't go through this code path */ + shader_addline(buffer, "_uav_typed_"); + shader_dump_resource_type(buffer, semantic->resource_type); if (semantic->resource.reg.reg.type == VKD3DSPR_UAV) shader_dump_uav_flags(buffer, flags);

1 0

Piotr Caban : msvcrt: Fix buffer overflow in _write function.
by Alexandre Julliard Sept. 15, 2020

Sept. 15, 2020

Module: wine Branch: master Commit: 427e2bb60995300d479fba602362a24147d76a2c URL: https://source.winehq.org/git/wine.git/?a=commit;h=427e2bb60995300d479fba60… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 15 11:55:37 2020 +0200 msvcrt: Fix buffer overflow in _write function. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49770 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/file.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index a37aa87b5d..602fe6d1df 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3504,7 +3504,8 @@ int CDECL MSVCRT__write(int fd, const void* buf, unsigned int count) } #endif - for (; i < count && j < sizeof(conv)-1; i++, j++, len++) + for (; i < count && j < sizeof(conv)-1 && + len < (sizeof(lfbuf) - 1) / sizeof(WCHAR); i++, j++, len++) { if (MSVCRT_isleadbyte((unsigned char)s[i])) {

1 0