June 2019 - Wine-Commits - list.winehq.org

Alexandre Julliard : ninput: Build with msvcrt.
by Alexandre Julliard June 17, 2019

June 17, 2019

Module: wine Branch: master Commit: aca0e819d9316218e339c072881462cd2b328c2f URL: https://source.winehq.org/git/wine.git/?a=commit;h=aca0e819d9316218e339c072… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 17 09:25:34 2019 +0200 ninput: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ninput/Makefile.in | 2 ++ dlls/ninput/main.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ninput/Makefile.in b/dlls/ninput/Makefile.in index 8f1039b..2afd034 100644 --- a/dlls/ninput/Makefile.in +++ b/dlls/ninput/Makefile.in @@ -1,5 +1,7 @@ MODULE = ninput.dll IMPORTLIB = ninput +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c diff --git a/dlls/ninput/main.c b/dlls/ninput/main.c index 5d2be62..8635ffb 100644 --- a/dlls/ninput/main.c +++ b/dlls/ninput/main.c @@ -16,7 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdarg.h> #include "windef.h"

1 0

Alexandre Julliard : winebuild: Add a -munix option.
by Alexandre Julliard June 17, 2019

June 17, 2019

Module: wine Branch: master Commit: 5061261c5ebbfea147b418da7de97621d7c79c44 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5061261c5ebbfea147b418da… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 17 09:24:25 2019 +0200 winebuild: Add a -munix option. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/build.h | 1 + tools/winebuild/main.c | 2 ++ tools/winebuild/winebuild.man.in | 4 ++++ tools/winegcc/winegcc.c | 1 + 4 files changed, 8 insertions(+) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index 241fd60..382829c 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -358,6 +358,7 @@ extern int verbose; extern int link_ext_symbols; extern int force_pointer_size; extern int unwind_tables; +extern int unix_lib; extern char *input_file_name; extern char *spec_file_name; diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index 831db5d..d308716 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -46,6 +46,7 @@ int verbose = 0; int link_ext_symbols = 0; int force_pointer_size = 0; int unwind_tables = 0; +int unix_lib = 0; #ifdef __i386__ enum target_cpu target_cpu = CPU_x86; @@ -411,6 +412,7 @@ static char **parse_options( int argc, char **argv, DLLSPEC *spec ) else if (!strcmp( optarg, "64" )) force_pointer_size = 8; else if (!strcmp( optarg, "arm" )) thumb_mode = 0; else if (!strcmp( optarg, "thumb" )) thumb_mode = 1; + else if (!strcmp( optarg, "unix" )) unix_lib = 1; else if (!strncmp( optarg, "cpu=", 4 )) cpu_option = xstrdup( optarg + 4 ); else if (!strncmp( optarg, "fpu=", 4 )) fpu_option = xstrdup( optarg + 4 ); else if (!strncmp( optarg, "arch=", 5 )) arch_option = xstrdup( optarg + 5 ); diff --git a/tools/winebuild/winebuild.man.in b/tools/winebuild/winebuild.man.in index 461bff6..e9386f9 100644 --- a/tools/winebuild/winebuild.man.in +++ b/tools/winebuild/winebuild.man.in @@ -160,6 +160,10 @@ Generate respectively 16-bit, 32-bit or 64-bit code. .BI \-marm,\ \-mthumb,\ \-march= option ,\ \-mcpu= option ,\ \-mfpu= option ,\ \-mfloat-abi= option Set code generation options for the assembler. .TP +.B \-munix +Build a library that imports standard functions from the Unix C +library instead of the Windows runtime. +.TP .BI \-M,\ --main-module= module When building a 16-bit dll, set the name of its 32-bit counterpart to \fImodule\fR. This is used to enforce that the load order for the diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 242df38..32df2bf 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -845,6 +845,7 @@ static strarray *get_winebuild_args(struct options *opts) strarray_add( spec_args, "--target" ); strarray_add( spec_args, opts->target ); } + if (!opts->use_msvcrt) strarray_add( spec_args, "-munix" ); if (opts->unwind_tables) strarray_add( spec_args, "-fasynchronous-unwind-tables" ); else strarray_add( spec_args, "-fno-asynchronous-unwind-tables" ); return spec_args;

1 0

Zebediah Figura : dmusic: Store the master clock as an IReferenceClock pointer.
by Alexandre Julliard June 17, 2019

June 17, 2019

Module: wine Branch: master Commit: 89ecfe19ca0c4bf3e182c354ef161a9c9971083a URL: https://source.winehq.org/git/wine.git/?a=commit;h=89ecfe19ca0c4bf3e182c354… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jun 14 11:42:44 2019 -0500 dmusic: Store the master clock as an IReferenceClock pointer. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmusic/dmusic.c | 6 +++--- dlls/dmusic/dmusic_private.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c index 94c0ff4..a74a31e 100644 --- a/dlls/dmusic/dmusic.c +++ b/dlls/dmusic/dmusic.c @@ -72,7 +72,7 @@ static ULONG WINAPI IDirectMusic8Impl_Release(LPDIRECTMUSIC8 iface) TRACE("(%p)->(): new ref = %u\n", This, ref); if (!ref) { - IReferenceClock_Release(&This->master_clock->IReferenceClock_iface); + IReferenceClock_Release(This->master_clock); if (This->dsound) IDirectSound_Release(This->dsound); HeapFree(GetProcessHeap(), 0, This->system_ports); @@ -246,9 +246,9 @@ static HRESULT WINAPI IDirectMusic8Impl_GetMasterClock(LPDIRECTMUSIC8 iface, LPG TRACE("(%p)->(%p, %p)\n", This, guid_clock, reference_clock); if (guid_clock) - *guid_clock = This->master_clock->pClockInfo.guidClock; + *guid_clock = GUID_NULL; if (reference_clock) { - *reference_clock = &This->master_clock->IReferenceClock_iface; + *reference_clock = This->master_clock; IReferenceClock_AddRef(*reference_clock); } diff --git a/dlls/dmusic/dmusic_private.h b/dlls/dmusic/dmusic_private.h index c59646d..4863aad 100644 --- a/dlls/dmusic/dmusic_private.h +++ b/dlls/dmusic/dmusic_private.h @@ -111,7 +111,7 @@ struct IDirectMusic8Impl { IDirectMusic8 IDirectMusic8_iface; LONG ref; IDirectSound *dsound; - IReferenceClockImpl *master_clock; + IReferenceClock *master_clock; IDirectMusicPort **ports; int num_ports; port_info *system_ports;

1 0

Conor McCarthy : vkd3d/tests: Add tests for predicated rendering.
by Alexandre Julliard June 17, 2019

June 17, 2019

Module: vkd3d Branch: master Commit: b6e35378fc086cbcb1f3142a3aa3eb3641d78331 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=b6e35378fc086cbcb1f3142… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Sun Jun 16 00:12:47 2019 +0430 vkd3d/tests: Add tests for predicated rendering. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 366 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 366 insertions(+) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=b6e35378fc086cbcb1f…

1 0

Conor McCarthy : vkd3d: Implement d3d12_command_list_SetPredication().
by Alexandre Julliard June 17, 2019

June 17, 2019

Module: vkd3d Branch: master Commit: 901fb7e798765729c57f3f0db23e1217db571fc9 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=901fb7e798765729c57f3f0… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Sun Jun 16 00:12:46 2019 +0430 vkd3d: Implement d3d12_command_list_SetPredication(). Predicate arguments which are only non-zero in bit 32 or higher are not supported. Predicates will not be applied to clear and copy commands because Vulkan does not support predication of these command classes. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 66 +++++++++++++++++++++++++++++++++++++++++++++- libs/vkd3d/device.c | 12 +++++++++ libs/vkd3d/vkd3d_private.h | 3 +++ libs/vkd3d/vulkan_procs.h | 4 +++ 4 files changed, 84 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 75556f5..4723e79 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2288,6 +2288,8 @@ static void d3d12_command_list_reset_state(struct d3d12_command_list *list, list->xfb_enabled = false; + list->is_predicated = false; + list->current_framebuffer = VK_NULL_HANDLE; list->current_pipeline = VK_NULL_HANDLE; list->pso_render_pass = VK_NULL_HANDLE; @@ -4910,8 +4912,70 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResolveQueryData(ID3D12Graphics static void STDMETHODCALLTYPE d3d12_command_list_SetPredication(ID3D12GraphicsCommandList1 *iface, ID3D12Resource *buffer, UINT64 aligned_buffer_offset, D3D12_PREDICATION_OP operation) { - FIXME("iface %p, buffer %p, aligned_buffer_offset %#"PRIx64", operation %#x stub!\n", + struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface); + struct d3d12_resource *resource = unsafe_impl_from_ID3D12Resource(buffer); + const struct vkd3d_vulkan_info *vk_info = &list->device->vk_info; + const struct vkd3d_vk_device_procs *vk_procs; + + TRACE("iface %p, buffer %p, aligned_buffer_offset %#"PRIx64", operation %#x.\n", iface, buffer, aligned_buffer_offset, operation); + + if (!vk_info->EXT_conditional_rendering) + { + FIXME("Vulkan conditional rendering extension not present. Conditional rendering not supported.\n"); + return; + } + + vk_procs = &list->device->vk_procs; + + if (resource) + { + VkConditionalRenderingBeginInfoEXT cond_info; + + if (aligned_buffer_offset & (sizeof(UINT64) - 1)) + { + WARN("Unaligned predicate argument buffer offset %#"PRIx64".\n", aligned_buffer_offset); + return; + } + + if (!d3d12_resource_is_buffer(resource)) + { + WARN("Predicate arguments must be stored in a buffer resource.\n"); + return; + } + + FIXME("Predication doesn't support clear and copy commands, " + "and predication values are treated as 32-bit values.\n"); + + cond_info.sType = VK_STRUCTURE_TYPE_CONDITIONAL_RENDERING_BEGIN_INFO_EXT; + cond_info.pNext = NULL; + cond_info.buffer = resource->u.vk_buffer; + cond_info.offset = aligned_buffer_offset; + switch (operation) + { + case D3D12_PREDICATION_OP_EQUAL_ZERO: + cond_info.flags = 0; + break; + + case D3D12_PREDICATION_OP_NOT_EQUAL_ZERO: + cond_info.flags = VK_CONDITIONAL_RENDERING_INVERTED_BIT_EXT; + break; + + default: + FIXME("Unhandled predication operation %#x.\n", operation); + return; + } + + if (list->is_predicated) + VK_CALL(vkCmdEndConditionalRenderingEXT(list->vk_command_buffer)); + VK_CALL(vkCmdBeginConditionalRenderingEXT(list->vk_command_buffer, &cond_info)); + list->is_predicated = true; + } + else if (list->is_predicated) + { + VK_CALL(vkCmdEndConditionalRenderingEXT(list->vk_command_buffer)); + list->is_predicated = false; + } } static void STDMETHODCALLTYPE d3d12_command_list_SetMarker(ID3D12GraphicsCommandList1 *iface, diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index fa10bb8..217c1c8 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -142,6 +142,7 @@ static const struct vkd3d_optional_extension_info optional_device_extensions[] = {VK_KHR_MAINTENANCE3_EXTENSION_NAME, offsetof(struct vkd3d_vulkan_info, KHR_maintenance3)}, {VK_KHR_PUSH_DESCRIPTOR_EXTENSION_NAME, offsetof(struct vkd3d_vulkan_info, KHR_push_descriptor)}, /* EXT extensions */ + {VK_EXT_CONDITIONAL_RENDERING_EXTENSION_NAME, offsetof(struct vkd3d_vulkan_info, EXT_conditional_rendering)}, {VK_EXT_DEBUG_MARKER_EXTENSION_NAME, offsetof(struct vkd3d_vulkan_info, EXT_debug_marker)}, {VK_EXT_DEPTH_CLIP_ENABLE_EXTENSION_NAME, offsetof(struct vkd3d_vulkan_info, EXT_depth_clip_enable)}, {VK_EXT_DESCRIPTOR_INDEXING_EXTENSION_NAME, offsetof(struct vkd3d_vulkan_info, EXT_descriptor_indexing)}, @@ -673,6 +674,7 @@ struct vkd3d_physical_device_info VkPhysicalDeviceProperties2KHR properties2; /* features */ + VkPhysicalDeviceConditionalRenderingFeaturesEXT conditional_rendering_features; VkPhysicalDeviceDepthClipEnableFeaturesEXT depth_clip_features; VkPhysicalDeviceDescriptorIndexingFeaturesEXT descriptor_indexing_features; VkPhysicalDeviceTransformFeedbackFeaturesEXT xfb_features; @@ -684,6 +686,7 @@ struct vkd3d_physical_device_info static void vkd3d_physical_device_info_init(struct vkd3d_physical_device_info *info, struct d3d12_device *device) { const struct vkd3d_vk_instance_procs *vk_procs = &device->vkd3d_instance->vk_procs; + VkPhysicalDeviceConditionalRenderingFeaturesEXT *conditional_rendering_features; VkPhysicalDeviceDescriptorIndexingPropertiesEXT *descriptor_indexing_properties; VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT *vertex_divisor_properties; VkPhysicalDeviceDescriptorIndexingFeaturesEXT *descriptor_indexing_features; @@ -696,6 +699,7 @@ static void vkd3d_physical_device_info_init(struct vkd3d_physical_device_info *i struct vkd3d_vulkan_info *vulkan_info = &device->vk_info; memset(info, 0, sizeof(*info)); + conditional_rendering_features = &info->conditional_rendering_features; depth_clip_features = &info->depth_clip_features; descriptor_indexing_features = &info->descriptor_indexing_features; descriptor_indexing_properties = &info->descriptor_indexing_properties; @@ -705,7 +709,9 @@ static void vkd3d_physical_device_info_init(struct vkd3d_physical_device_info *i xfb_features = &info->xfb_features; xfb_properties = &info->xfb_properties; + conditional_rendering_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CONDITIONAL_RENDERING_FEATURES_EXT; depth_clip_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEPTH_CLIP_ENABLE_FEATURES_EXT; + depth_clip_features->pNext = conditional_rendering_features; descriptor_indexing_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_FEATURES_EXT; descriptor_indexing_features->pNext = depth_clip_features; xfb_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TRANSFORM_FEEDBACK_FEATURES_EXT; @@ -999,6 +1005,7 @@ static void vkd3d_trace_physical_device_limits(const struct vkd3d_physical_devic static void vkd3d_trace_physical_device_features(const struct vkd3d_physical_device_info *info) { + const VkPhysicalDeviceConditionalRenderingFeaturesEXT *conditional_rendering_features; const VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT *divisor_features; const VkPhysicalDeviceDescriptorIndexingFeaturesEXT *descriptor_indexing; const VkPhysicalDeviceDepthClipEnableFeaturesEXT *depth_clip_features; @@ -1109,6 +1116,10 @@ static void vkd3d_trace_physical_device_features(const struct vkd3d_physical_dev TRACE(" runtimeDescriptorArray: %#x.\n", descriptor_indexing->runtimeDescriptorArray); + conditional_rendering_features = &info->conditional_rendering_features; + TRACE(" VkPhysicalDeviceConditionalRenderingFeaturesEXT:\n"); + TRACE(" conditionalRendering: %#x.\n", conditional_rendering_features->conditionalRendering); + depth_clip_features = &info->depth_clip_features; TRACE(" VkPhysicalDeviceDepthClipEnableFeaturesEXT:\n"); TRACE(" depthClipEnable: %#x.\n", depth_clip_features->depthClipEnable); @@ -1337,6 +1348,7 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, *user_extension_supported, vulkan_info, "device", device->vkd3d_instance->config_flags & VKD3D_CONFIG_FLAG_VULKAN_DEBUG); + vulkan_info->EXT_conditional_rendering = physical_device_info->conditional_rendering_features.conditionalRendering; vulkan_info->EXT_depth_clip_enable = physical_device_info->depth_clip_features.depthClipEnable; if (get_spec_version(vk_extensions, count, VK_EXT_VERTEX_ATTRIBUTE_DIVISOR_EXTENSION_NAME) >= 3) diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 3af8a95..e0d563f 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -97,6 +97,7 @@ struct vkd3d_vulkan_info bool KHR_maintenance3; bool KHR_push_descriptor; /* EXT device extensions */ + bool EXT_conditional_rendering; bool EXT_debug_marker; bool EXT_depth_clip_enable; bool EXT_descriptor_indexing; @@ -907,6 +908,8 @@ struct d3d12_command_list bool xfb_enabled; + bool is_predicated; + VkFramebuffer current_framebuffer; VkPipeline current_pipeline; VkRenderPass pso_render_pass; diff --git a/libs/vkd3d/vulkan_procs.h b/libs/vkd3d/vulkan_procs.h index a55fb07..702cfd2 100644 --- a/libs/vkd3d/vulkan_procs.h +++ b/libs/vkd3d/vulkan_procs.h @@ -192,6 +192,10 @@ VK_DEVICE_EXT_PFN(vkGetDescriptorSetLayoutSupportKHR) /* VK_KHR_push_descriptor */ VK_DEVICE_EXT_PFN(vkCmdPushDescriptorSetKHR) +/* VK_EXT_conditional_rendering */ +VK_DEVICE_EXT_PFN(vkCmdBeginConditionalRenderingEXT) +VK_DEVICE_EXT_PFN(vkCmdEndConditionalRenderingEXT) + /* VK_EXT_debug_marker */ VK_DEVICE_EXT_PFN(vkDebugMarkerSetObjectNameEXT)

1 0

Roberto Pungartnik : po: Update Brazilian Portuguese translation.
by Alexandre Julliard June 14, 2019

June 14, 2019

Module: wine Branch: master Commit: c674ceefe1226b9ccb15372a4465c69a4d6dfb50 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c674ceefe1226b9ccb15372a… Author: Roberto Pungartnik <rpungartnik(a)gmail.com> Date: Fri Jun 14 10:02:03 2019 -0300 po: Update Brazilian Portuguese translation. Signed-off-by: Roberto Pungartnik <rpungartnik(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/pt_BR.po | 90 +++++++++++++++++++++++++++++++------------------------------ 1 file changed, 46 insertions(+), 44 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index 3ffadf1..f8974b0 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -3681,7 +3681,7 @@ msgstr "Caractere inválido" #: jscript.rc:43 msgid "Unterminated string constant" -msgstr "String constante não terminada" +msgstr "Cadeia constante não terminada" #: jscript.rc:44 msgid "'return' statement outside of function" @@ -6916,7 +6916,7 @@ msgstr "Dados inválidos.\n" #: mferror.mc:186 msgid "Realtime support is not available.\n" -msgstr "Suporte Realtime não disponível.\n" +msgstr "Suporte em tempo real não disponível.\n" #: mferror.mc:193 msgid "Unsupported rate.\n" @@ -6928,7 +6928,7 @@ msgstr "Tipo não suportado.\n" #: mferror.mc:207 msgid "Reversing is not supported.\n" -msgstr "Revesão não suportado.\n" +msgstr "Reversão não suportado.\n" #: mferror.mc:214 msgid "Unsupported rate transition.\n" @@ -6952,11 +6952,11 @@ msgstr "Relógio não disponível.\n" #: mferror.mc:263 msgid "Multiple subscribers are not supported.\n" -msgstr "Múltiplos assisentes não suportados.\n" +msgstr "Múltiplos assistentes não suportados.\n" #: mferror.mc:270 msgid "The timer was orphaned.\n" -msgstr "O timer está orfão.\n" +msgstr "O timer está órfão.\n" #: mferror.mc:277 msgid "State transition is pending.\n" @@ -7020,7 +7020,7 @@ msgstr "Vetor de Propriedade não permitido.\n" #: mferror.mc:382 msgid "Vector property is required.\n" -msgstr "Propriedade do vetor ncessária.\n" +msgstr "Propriedade do vetor necessária.\n" #: mferror.mc:389 msgid "Operation was cancelled.\n" @@ -7028,7 +7028,7 @@ msgstr "Operação cancelada.\n" #: mferror.mc:396 msgid "Bytestream is not seekable.\n" -msgstr "Bytestream não é pesquisavel.\n" +msgstr "Bytestream não é pesquisável.\n" #: mferror.mc:403 msgid "Platform is disabled in safe mode.\n" @@ -7331,7 +7331,7 @@ msgid "" "\t/help\n" "\t/?\n" msgstr "" -"Windows Installer %s\n" +"Instalador do Windows %s\n" "\n" "Modo de usar:\n" "msiexec comando {parâmetro requisitado} [parâmetro opcional]\n" @@ -9526,19 +9526,19 @@ msgstr "Horário de verão da Europa Central" #: tzres.rc:118 msgid "Iran Standard Time" -msgstr "Hora padrão do Iran" +msgstr "Hora padrão do Irã" #: tzres.rc:119 msgid "Iran Daylight Time" -msgstr "Horário de verão do Iran" +msgstr "Horário de verão do Irã" #: tzres.rc:150 msgid "Namibia Standard Time" -msgstr "Hora padrão da Nanibia" +msgstr "Hora padrão da Namíbia" #: tzres.rc:151 msgid "Namibia Daylight Time" -msgstr "Horário de verão da Nanibia" +msgstr "Horário de verão da Namíbia" #: tzres.rc:200 msgid "Tonga Standard Time" @@ -9630,11 +9630,11 @@ msgstr "Horário de verão de Samoa" #: tzres.rc:124 msgid "Kaliningrad Standard Time" -msgstr "Hora padrão de kalingrado" +msgstr "Hora padrão de Kaliningrado" #: tzres.rc:125 msgid "Kaliningrad Daylight Time" -msgstr "Horário de verão de Kalingrado" +msgstr "Horário de verão de Kaliningrado" #: tzres.rc:166 msgid "Pacific Standard Time (Mexico)" @@ -9654,11 +9654,11 @@ msgstr "Horário de verão do Oriente Médio" #: tzres.rc:198 msgid "Tokyo Standard Time" -msgstr "Hora padrão de Tokyo" +msgstr "Hora padrão de Tóquio" #: tzres.rc:199 msgid "Tokyo Daylight Time" -msgstr "Horário de verão Tokyo" +msgstr "Horário de verão Tóquio" #: tzres.rc:130 msgid "Line Islands Standard Time" @@ -9674,7 +9674,7 @@ msgstr "Hora padrão da Jordânia" #: tzres.rc:123 msgid "Jordan Daylight Time" -msgstr "Horário de verão da Jordania" +msgstr "Horário de verão da Jordânia" #: tzres.rc:78 msgid "Central Standard Time" @@ -9778,11 +9778,11 @@ msgstr "Horário de verão Oeste da Europa" #: tzres.rc:138 msgid "Montevideo Standard Time" -msgstr "Hora padrão de Montevidéo" +msgstr "Hora padrão de Montevidéu" #: tzres.rc:139 msgid "Montevideo Daylight Time" -msgstr "Horário de verão de Montevidéo" +msgstr "Horário de verão de Montevidéu" #: tzres.rc:168 msgid "Pakistan Standard Time" @@ -9794,11 +9794,11 @@ msgstr "Horário de verão do Paquistão" #: tzres.rc:62 msgid "Caucasus Standard Time" -msgstr "Hora padrão do Caucaso" +msgstr "Hora padrão do Cáucaso" #: tzres.rc:63 msgid "Caucasus Daylight Time" -msgstr "Horário de verão do Caucaso" +msgstr "Horário de verão do Cáucaso" #: tzres.rc:46 msgid "AUS Eastern Standard Time" @@ -9894,7 +9894,7 @@ msgstr "Hora padrão da Austrália" #: tzres.rc:65 msgid "Cen. Australia Daylight Time" -msgstr "Horário de verão da Australia Central" +msgstr "Horário de verão da Austrália Central" #: tzres.rc:190 msgid "Sri Lanka Standard Time" @@ -9902,7 +9902,7 @@ msgstr "Hora padrão do Sri Lanka" #: tzres.rc:191 msgid "Sri Lanka Daylight Time" -msgstr "Horário de verão do Sri lanka" +msgstr "Horário de verão do Sri Lanka" #: tzres.rc:30 msgid "Afghanistan Standard Time" @@ -9914,15 +9914,15 @@ msgstr "Horário de verão do Afeganistão" #: tzres.rc:226 msgid "Yakutsk Standard Time" -msgstr "Hora padrão de Yakutsk" +msgstr "Hora padrão de Iacutusque" #: tzres.rc:227 msgid "Yakutsk Daylight Time" -msgstr "Horário de verão de Yakutsk" +msgstr "Horário de verão de Iacutusque" #: tzres.rc:176 msgid "SA Eastern Standard Time" -msgstr "Hora padrão do Leste da SA" +msgstr "Hora padrão do Leste da América do Sul" #: tzres.rc:177 msgid "SA Eastern Daylight Time" @@ -9938,15 +9938,15 @@ msgstr "Horário de verão Árabe" #: tzres.rc:36 msgid "Arabian Standard Time" -msgstr "Hora padrão da Arábia Saudia" +msgstr "Hora padrão da Arábia Saudita" #: tzres.rc:37 msgid "Arabian Daylight Time" -msgstr "Horário de verão da Arábia" +msgstr "Horário de verão da Arábia Saudita" #: tzres.rc:174 msgid "Russian Standard Time" -msgstr "Hora padrão da Russia" +msgstr "Hora padrão da Rússia" #: tzres.rc:175 msgid "Russian Daylight Time" @@ -9962,11 +9962,11 @@ msgstr "Horário de verão da România" #: tzres.rc:98 msgid "Ekaterinburg Standard Time" -msgstr "Hora padrão de Ekaterinbugo" +msgstr "Hora padrão de Ecaterimburgo" #: tzres.rc:99 msgid "Ekaterinburg Daylight Time" -msgstr "Horário de verão de Ekaterinburgo" +msgstr "Horário de verão de Ecaterimburgo" #: tzres.rc:192 msgid "Syria Standard Time" @@ -10018,7 +10018,7 @@ msgstr "Horário de verão de Bangladesh" #: tzres.rc:178 msgid "SA Pacific Standard Time" -msgstr "Hora padrão do Pacífico da SA" +msgstr "Hora padrão do Pacífico da América do Sul" #: tzres.rc:179 msgid "SA Pacific Daylight Time" @@ -10038,7 +10038,7 @@ msgstr "Hora padrão do Alasca" #: tzres.rc:33 msgid "Alaskan Daylight Time" -msgstr "Horário de verão do Alaska" +msgstr "Horário de verão do Alasca" #: tzres.rc:170 msgid "Paraguay Standard Time" @@ -10082,7 +10082,7 @@ msgstr "Horário de verão da Venezuela" #: tzres.rc:114 msgid "Hawaiian Standard Time" -msgstr "Hora padrão do Avai" +msgstr "Hora padrão do Avaí" #: tzres.rc:115 msgid "Hawaiian Daylight Time" @@ -10114,7 +10114,7 @@ msgstr "Horário de verão Brasil Central" #: tzres.rc:56 msgid "Belarus Standard Time" -msgstr "Hora padrão de Belárus" +msgstr "Hora padrão de Belarus" #: tzres.rc:57 msgid "Belarus Daylight Time" @@ -10122,7 +10122,7 @@ msgstr "Horário de verão de Belarus" #: tzres.rc:180 msgid "SA Western Standard Time" -msgstr "Hora padrão do Oeste da SA" +msgstr "Hora padrão do Oeste da América do Sul" #: tzres.rc:181 msgid "SA Western Daylight Time" @@ -10130,11 +10130,11 @@ msgstr "Horário de verão do Oeste da América do Sul" #: tzres.rc:108 msgid "Greenland Standard Time" -msgstr "Hora padrão da Groelândia" +msgstr "Hora padrão da Groenlândia" #: tzres.rc:109 msgid "Greenland Daylight Time" -msgstr "Horário de verão da Groelândia" +msgstr "Horário de verão da Groenlândia" #: tzres.rc:92 msgid "Easter Island Standard Time" @@ -10178,11 +10178,11 @@ msgstr "Horário de verão de Singapura" #: tzres.rc:126 msgid "Korea Standard Time" -msgstr "Hora padrão da Koreia" +msgstr "Hora padrão da Coréia" #: tzres.rc:127 msgid "Korea Daylight Time" -msgstr "Horário de verão da Koreia" +msgstr "Horário de verão da Coréia" #: tzres.rc:86 msgid "E. Africa Standard Time" @@ -10202,7 +10202,7 @@ msgstr "Horário de verão FLE" #: tzres.rc:90 msgid "E. South America Standard Time" -msgstr "Hora padrão de Brasilia" +msgstr "Hora padrão de Brasília" #: tzres.rc:91 msgid "E. South America Daylight Time" @@ -10464,7 +10464,7 @@ msgid "" "The operation was canceled, usually because the handle on which the request " "was operating was closed before the operation completed.\n" msgstr "" -"A operação foi cancelada, normalmente isto ocorre porque o handle onde a " +"A operação foi cancelada, normalmente isto ocorre porque o canal onde a " "requisição foi feita foi fechado antes da operação ser concluída.\n" #: winineterror.mc:61 @@ -13928,7 +13928,7 @@ msgstr "" "Exemplos de uso:\n" " regedit \"importar.reg\"\n" " regedit /E \"exportar.reg\" \"HKEY_CURRENT_USER\\Console\"\n" -" regedit /D \"HKEY_LOCAL_MACHINE\\Error\\Path\"\n" +" regedit /D \"HKEY_LOCAL_MACHINE\\Error\\Caminho\"\n" #: regedit.rc:409 msgid "regedit: Invalid or unrecognized switch [%1]\n" @@ -14136,7 +14136,7 @@ msgstr "Tem certeza que deseja excluir o valor do registro selecionado?" #: regedit.rc:216 msgid "Search complete. The string '%1' was not found." -msgstr "Busca completa. A seqüência '%1' não foi encontrada." +msgstr "Busca completa. A sequência '%1' não foi encontrada." #: regedit.rc:211 msgid "Are you sure you want to delete these values?" @@ -17045,6 +17045,8 @@ msgstr "" "[/A] Copiar apenas arquivos com atributo de arquivo.\n" "[/M] Copiar apenas arquivos com atributo de arquivo, removendo\n" "\to atributo de arquivo.\n" +"[/K] Copia os atributos do arquivo; sem isto, os attributos nao são " +"preservados.\n" "[/D | /D:m-d-y] Copiar novos arquivos ou os alterados após a data " "fornecida.\n" "\t\tSe nenhuma data for fornecida, apenas copiar se o destino\n"

1 0

Huw Davies : kernel32/tests: Add a test for GetTickCount().
by Alexandre Julliard June 14, 2019

June 14, 2019

Module: wine Branch: master Commit: 2706b94dd011b08113f541fe123c251ffd751734 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2706b94dd011b08113f541fe… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jun 14 11:50:30 2019 +0100 kernel32/tests: Add a test for GetTickCount(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/time.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/dlls/kernel32/tests/time.c b/dlls/kernel32/tests/time.c index 536f233..5faabd3 100644 --- a/dlls/kernel32/tests/time.c +++ b/dlls/kernel32/tests/time.c @@ -32,6 +32,7 @@ static int (WINAPI *pGetCalendarInfoW)(LCID,CALID,CALTYPE,LPWSTR,int,LPDWORD); static DWORD (WINAPI *pGetDynamicTimeZoneInformation)(DYNAMIC_TIME_ZONE_INFORMATION*); static void (WINAPI *pGetSystemTimePreciseAsFileTime)(LPFILETIME); static BOOL (WINAPI *pGetTimeZoneInformationForYear)(USHORT, PDYNAMIC_TIME_ZONE_INFORMATION, LPTIME_ZONE_INFORMATION); +static ULONG (WINAPI *pNtGetTickCount)(void); #define SECSPERMIN 60 #define SECSPERDAY 86400 @@ -1004,9 +1005,32 @@ static void test_GetTimeZoneInformationForYear(void) "GetTimeZoneInformationForYear err %u\n", GetLastError()); } +static void test_GetTickCount(void) +{ + DWORD t1, t2, t3; + int i = 0; + + if (!pNtGetTickCount) + { + win_skip("NtGetTickCount not implemented\n"); + return; + } + + do + { + t1 = pNtGetTickCount(); + t2 = GetTickCount(); + t3 = pNtGetTickCount(); + } while(t3 < t1 && i++ < 1); /* allow for wrap, but only once */ + + ok(t1 <= t2, "out of order %d %d\n", t1, t2); + ok(t2 <= t3, "out of order %d %d\n", t2, t3); +} + START_TEST(time) { HMODULE hKernel = GetModuleHandleA("kernel32"); + HMODULE hntdll = GetModuleHandleA("ntdll"); pTzSpecificLocalTimeToSystemTime = (void *)GetProcAddress(hKernel, "TzSpecificLocalTimeToSystemTime"); pSystemTimeToTzSpecificLocalTime = (void *)GetProcAddress( hKernel, "SystemTimeToTzSpecificLocalTime"); pGetSystemTimes = (void *)GetProcAddress( hKernel, "GetSystemTimes"); @@ -1015,6 +1039,7 @@ START_TEST(time) pGetDynamicTimeZoneInformation = (void *)GetProcAddress(hKernel, "GetDynamicTimeZoneInformation"); pGetSystemTimePreciseAsFileTime = (void *)GetProcAddress(hKernel, "GetSystemTimePreciseAsFileTime"); pGetTimeZoneInformationForYear = (void *)GetProcAddress(hKernel, "GetTimeZoneInformationForYear"); + pNtGetTickCount = (void *)GetProcAddress(hntdll, "NtGetTickCount"); test_conversions(); test_invalid_arg(); @@ -1029,4 +1054,5 @@ START_TEST(time) test_GetSystemTimeAsFileTime(); test_GetSystemTimePreciseAsFileTime(); test_GetTimeZoneInformationForYear(); + test_GetTickCount(); }

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to context_generate_fbo_key().
by Alexandre Julliard June 14, 2019

June 14, 2019

Module: wine Branch: master Commit: c600fd86e1b8d875e07a0172221e6c379230e7ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=c600fd86e1b8d875e07a0172… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 14 16:05:22 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_generate_fbo_key(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 15ee031..6258771 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -498,12 +498,11 @@ static inline void wined3d_context_gl_set_fbo_key_for_render_target(const struct } } -static void context_generate_fbo_key(const struct wined3d_context *context, +static void wined3d_context_gl_generate_fbo_key(const struct wined3d_context_gl *context_gl, struct wined3d_fbo_entry_key *key, const struct wined3d_rendertarget_info *render_targets, const struct wined3d_rendertarget_info *depth_stencil, DWORD color_location, DWORD ds_location) { - const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); - unsigned int buffers = context->gl_info->limits.buffers; + unsigned int buffers = context_gl->c.gl_info->limits.buffers; unsigned int i; key->rb_namespace = 0; @@ -519,11 +518,13 @@ static struct fbo_entry *context_create_fbo_entry(const struct wined3d_context * const struct wined3d_rendertarget_info *render_targets, const struct wined3d_rendertarget_info *depth_stencil, DWORD color_location, DWORD ds_location) { + const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); const struct wined3d_gl_info *gl_info = context->gl_info; struct fbo_entry *entry; entry = heap_alloc(sizeof(*entry)); - context_generate_fbo_key(context, &entry->key, render_targets, depth_stencil, color_location, ds_location); + wined3d_context_gl_generate_fbo_key(context_gl, &entry->key, + render_targets, depth_stencil, color_location, ds_location); entry->flags = 0; if (depth_stencil->resource) { @@ -550,7 +551,8 @@ static void wined3d_context_gl_reuse_fbo_entry(struct wined3d_context_gl *contex wined3d_context_gl_bind_fbo(context_gl, target, entry->id); context_clean_fbo_attachments(gl_info, target); - context_generate_fbo_key(&context_gl->c, &entry->key, render_targets, depth_stencil, color_location, ds_location); + wined3d_context_gl_generate_fbo_key(context_gl, &entry->key, + render_targets, depth_stencil, color_location, ds_location); entry->flags = 0; if (depth_stencil->resource) { @@ -618,7 +620,8 @@ static struct fbo_entry *wined3d_context_gl_find_fbo_entry(struct wined3d_contex } } - context_generate_fbo_key(&context_gl->c, &fbo_key, render_targets, depth_stencil, color_location, ds_location); + wined3d_context_gl_generate_fbo_key(context_gl, &fbo_key, + render_targets, depth_stencil, color_location, ds_location); if (TRACE_ON(d3d)) {

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to context_set_fbo_key_for_render_target ().
by Alexandre Julliard June 14, 2019

June 14, 2019

Module: wine Branch: master Commit: b5ecad008b2bf545cf67d2a9ee3f05b61edda8ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5ecad008b2bf545cf67d2a9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 14 16:05:21 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_set_fbo_key_for_render_target(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 2ed1e48..15ee031 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -428,7 +428,7 @@ static inline DWORD context_generate_rt_mask_from_resource(struct wined3d_resour return (1u << 31) | wined3d_texture_get_gl_buffer(texture_from_resource(resource)); } -static inline void context_set_fbo_key_for_render_target(const struct wined3d_context *context, +static inline void wined3d_context_gl_set_fbo_key_for_render_target(const struct wined3d_context_gl *context_gl, struct wined3d_fbo_entry_key *key, unsigned int idx, const struct wined3d_rendertarget_info *render_target, DWORD location) { @@ -475,11 +475,11 @@ static inline void context_set_fbo_key_for_render_target(const struct wined3d_co switch (location) { case WINED3D_LOCATION_TEXTURE_RGB: - key->objects[idx].object = wined3d_texture_gl_get_texture_name(texture_gl, context, FALSE); + key->objects[idx].object = wined3d_texture_gl_get_texture_name(texture_gl, &context_gl->c, FALSE); break; case WINED3D_LOCATION_TEXTURE_SRGB: - key->objects[idx].object = wined3d_texture_gl_get_texture_name(texture_gl, context, TRUE); + key->objects[idx].object = wined3d_texture_gl_get_texture_name(texture_gl, &context_gl->c, TRUE); break; case WINED3D_LOCATION_RB_MULTISAMPLE: @@ -502,14 +502,15 @@ static void context_generate_fbo_key(const struct wined3d_context *context, struct wined3d_fbo_entry_key *key, const struct wined3d_rendertarget_info *render_targets, const struct wined3d_rendertarget_info *depth_stencil, DWORD color_location, DWORD ds_location) { + const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); unsigned int buffers = context->gl_info->limits.buffers; unsigned int i; key->rb_namespace = 0; - context_set_fbo_key_for_render_target(context, key, 0, depth_stencil, ds_location); + wined3d_context_gl_set_fbo_key_for_render_target(context_gl, key, 0, depth_stencil, ds_location); for (i = 0; i < buffers; ++i) - context_set_fbo_key_for_render_target(context, key, i + 1, &render_targets[i], color_location); + wined3d_context_gl_set_fbo_key_for_render_target(context_gl, key, i + 1, &render_targets[i], color_location); memset(&key->objects[buffers + 1], 0, (ARRAY_SIZE(key->objects) - buffers - 1) * sizeof(*key->objects)); }

1 0

Gabriel Ivăncescu : comctl32/treeview: Get rid of useless casts.
by Alexandre Julliard June 14, 2019

June 14, 2019

Module: wine Branch: master Commit: 3e1d8ab501ed68e7648cec5f8039a05e8fa13db3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e1d8ab501ed68e7648cec5f… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Jun 5 14:39:02 2019 +0300 comctl32/treeview: Get rid of useless casts. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/treeview.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 6854b0c..3c73964 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -5027,7 +5027,7 @@ static LRESULT TREEVIEW_MouseWheel(TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam) { short wheelDelta; - UINT pulScrollLines = 3; + INT pulScrollLines = 3; if (wParam & (MK_SHIFT | MK_CONTROL)) return DefWindowProcW(infoPtr->hwnd, WM_MOUSEWHEEL, wParam, lParam); @@ -5051,8 +5051,8 @@ TREEVIEW_MouseWheel(TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam) int maxDy; int lineScroll; - lineScroll = pulScrollLines * (float)infoPtr->wheelRemainder / WHEEL_DELTA; - infoPtr->wheelRemainder -= WHEEL_DELTA * lineScroll / (int)pulScrollLines; + lineScroll = pulScrollLines * infoPtr->wheelRemainder / WHEEL_DELTA; + infoPtr->wheelRemainder -= WHEEL_DELTA * lineScroll / pulScrollLines; newDy = infoPtr->firstVisible->visibleOrder - lineScroll; maxDy = infoPtr->maxVisibleOrder;

1 0