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

Alexandre Julliard : npmshtml: Build with msvcrt.
by Alexandre Julliard 17 Jun '19

17 Jun '19

Module: wine Branch: master Commit: adc203e56338e5479ba51b6658367bcf34e55c61 URL: https://source.winehq.org/git/wine.git/?a=commit;h=adc203e56338e5479ba51b66… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 17 09:25:50 2019 +0200 npmshtml: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/npmshtml/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/npmshtml/Makefile.in b/dlls/npmshtml/Makefile.in index aaaad83..61e057c 100644 --- a/dlls/npmshtml/Makefile.in +++ b/dlls/npmshtml/Makefile.in @@ -1,5 +1,7 @@ MODULE = npmshtml.dll IMPORTS = mshtml +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = main.c RC_SRCS = rsrc.rc

1 0

Alexandre Julliard : npptools: Build with msvcrt.
by Alexandre Julliard 17 Jun '19

17 Jun '19

Module: wine Branch: master Commit: 2cad63d7ce4653f088fce6023491186aa8cc7d35 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2cad63d7ce4653f088fce602… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 17 09:25:59 2019 +0200 npptools: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/npptools/Makefile.in | 2 ++ dlls/npptools/main.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/npptools/Makefile.in b/dlls/npptools/Makefile.in index a9bbd35..64ff969 100644 --- a/dlls/npptools/Makefile.in +++ b/dlls/npptools/Makefile.in @@ -1,4 +1,6 @@ MODULE = npptools.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c diff --git a/dlls/npptools/main.c b/dlls/npptools/main.c index a72f634..ad2b893 100644 --- a/dlls/npptools/main.c +++ b/dlls/npptools/main.c @@ -16,7 +16,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdarg.h>

1 0

Alexandre Julliard : ntdsapi: Build with msvcrt.
by Alexandre Julliard 17 Jun '19

17 Jun '19

Module: wine Branch: master Commit: 921e0457c5f2f692503a5b56d873bd21a609d3c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=921e0457c5f2f692503a5b56… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 17 09:26:13 2019 +0200 ntdsapi: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdsapi/Makefile.in | 2 ++ dlls/ntdsapi/ntdsapi.c | 27 +++++++++++++-------------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/dlls/ntdsapi/Makefile.in b/dlls/ntdsapi/Makefile.in index 4e82a1e..afe29a3 100644 --- a/dlls/ntdsapi/Makefile.in +++ b/dlls/ntdsapi/Makefile.in @@ -2,5 +2,7 @@ MODULE = ntdsapi.dll IMPORTLIB = ntdsapi IMPORTS = user32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ ntdsapi.c diff --git a/dlls/ntdsapi/ntdsapi.c b/dlls/ntdsapi/ntdsapi.c index 003b1a2..8966a67 100644 --- a/dlls/ntdsapi/ntdsapi.c +++ b/dlls/ntdsapi/ntdsapi.c @@ -24,7 +24,6 @@ #include "winuser.h" #include "ntdsapi.h" #include "wine/debug.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(ntdsapi); @@ -83,11 +82,11 @@ DWORD WINAPI DsMakeSpnW(LPCWSTR svc_class, LPCWSTR svc_name, if (!svc_class || !svc_name) return ERROR_INVALID_PARAMETER; - new_spn_length = strlenW(svc_class) + 1 /* for '/' */ + 1 /* for terminating '\0' */; + new_spn_length = lstrlenW(svc_class) + 1 /* for '/' */ + 1 /* for terminating '\0' */; if (inst_name) - new_spn_length += strlenW(inst_name); + new_spn_length += lstrlenW(inst_name); else - new_spn_length += strlenW(svc_name); + new_spn_length += lstrlenW(svc_name); if (inst_port) { USHORT n = inst_port; @@ -99,7 +98,7 @@ DWORD WINAPI DsMakeSpnW(LPCWSTR svc_class, LPCWSTR svc_name, } while (n != 0); } if (inst_name) - new_spn_length += 1 /* for '/' */ + strlenW(svc_name); + new_spn_length += 1 /* for '/' */ + lstrlenW(svc_name); if (*spn_length < new_spn_length) { @@ -109,21 +108,21 @@ DWORD WINAPI DsMakeSpnW(LPCWSTR svc_class, LPCWSTR svc_name, *spn_length = new_spn_length; p = spn; - len = strlenW(svc_class); + len = lstrlenW(svc_class); memcpy(p, svc_class, len * sizeof(WCHAR)); p += len; *p = '/'; p++; if (inst_name) { - len = strlenW(inst_name); + len = lstrlenW(inst_name); memcpy(p, inst_name, len * sizeof(WCHAR)); p += len; *p = '\0'; } else { - len = strlenW(svc_name); + len = lstrlenW(svc_name); memcpy(p, svc_name, len * sizeof(WCHAR)); p += len; *p = '\0'; @@ -135,14 +134,14 @@ DWORD WINAPI DsMakeSpnW(LPCWSTR svc_class, LPCWSTR svc_name, *p = ':'; p++; wsprintfW(p, percentU, inst_port); - p += strlenW(p); + p += lstrlenW(p); } if (inst_name) { *p = '/'; p++; - len = strlenW(svc_name); + len = lstrlenW(svc_name); memcpy(p, svc_name, len * sizeof(WCHAR)); p += len; *p = '\0'; @@ -216,7 +215,7 @@ DWORD WINAPI DsClientMakeSpnForTargetServerW(LPCWSTR class, LPCWSTR name, DWORD if (!class || !name || !buflen) return ERROR_INVALID_PARAMETER; - len = strlenW(class) + 1 + strlenW(name) + 1; + len = lstrlenW(class) + 1 + lstrlenW(name) + 1; if (*buflen < len) { *buflen = len; @@ -224,10 +223,10 @@ DWORD WINAPI DsClientMakeSpnForTargetServerW(LPCWSTR class, LPCWSTR name, DWORD } *buflen = len; - memcpy(buf, class, strlenW(class) * sizeof(WCHAR)); - p = buf + strlenW(class); + memcpy(buf, class, lstrlenW(class) * sizeof(WCHAR)); + p = buf + lstrlenW(class); *p++ = '/'; - memcpy(p, name, strlenW(name) * sizeof(WCHAR)); + memcpy(p, name, lstrlenW(name) * sizeof(WCHAR)); buf[len - 1] = 0; return ERROR_SUCCESS;

1 0

Conor McCarthy : vkd3d: Implement d3d12_command_list_SetPredication().
by Alexandre Julliard 17 Jun '19

17 Jun '19

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

Conor McCarthy : vkd3d/tests: Add tests for predicated rendering.
by Alexandre Julliard 17 Jun '19

17 Jun '19

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

Roberto Pungartnik : po: Update Brazilian Portuguese translation.
by Alexandre Julliard 14 Jun '19

14 Jun '19

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

Alexandre Julliard : nddeapi: Build with msvcrt.
by Alexandre Julliard 14 Jun '19

14 Jun '19

Module: wine Branch: master Commit: 47df0afda07a9e37bfa5a0fb779f4b00725b9e24 URL: https://source.winehq.org/git/wine.git/?a=commit;h=47df0afda07a9e37bfa5a0fb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 14 09:22:01 2019 +0200 nddeapi: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nddeapi/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/nddeapi/Makefile.in b/dlls/nddeapi/Makefile.in index 6a33511..c044cde 100644 --- a/dlls/nddeapi/Makefile.in +++ b/dlls/nddeapi/Makefile.in @@ -1,5 +1,7 @@ MODULE = nddeapi.dll IMPORTLIB = nddeapi +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ nddeapi.c

1 0

Alexandre Julliard : ndis.sys: Build with msvcrt.
by Alexandre Julliard 14 Jun '19

14 Jun '19

Module: wine Branch: master Commit: 6705519f098b3147da777dc93ca4a9ac795f114b URL: https://source.winehq.org/git/wine.git/?a=commit;h=6705519f098b3147da777dc9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 14 09:22:06 2019 +0200 ndis.sys: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ndis.sys/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ndis.sys/Makefile.in b/dlls/ndis.sys/Makefile.in index 3b466ad..cc52260 100644 --- a/dlls/ndis.sys/Makefile.in +++ b/dlls/ndis.sys/Makefile.in @@ -1,5 +1,7 @@ MODULE = ndis.sys EXTRADLLFLAGS = -Wl,--subsystem,native +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c

1 0

Alexandre Julliard : netcfgx: Build with msvcrt.
by Alexandre Julliard 14 Jun '19

14 Jun '19

Module: wine Branch: master Commit: dfaddf309ee93a27fa92f35fa8c01b8f397718de URL: https://source.winehq.org/git/wine.git/?a=commit;h=dfaddf309ee93a27fa92f35f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 14 09:22:17 2019 +0200 netcfgx: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netcfgx/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/netcfgx/Makefile.in b/dlls/netcfgx/Makefile.in index 7e5e1fc..d4dae8f 100644 --- a/dlls/netcfgx/Makefile.in +++ b/dlls/netcfgx/Makefile.in @@ -1,6 +1,8 @@ MODULE = netcfgx.dll IMPORTS = uuid +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c \ netcfg.c

1 0

Alexandre Julliard : netprofm: Build with msvcrt.
by Alexandre Julliard 14 Jun '19

14 Jun '19

Module: wine Branch: master Commit: 3e5db60e84ae57c37afabed8141eb5449d220436 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e5db60e84ae57c37afabed8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 14 09:22:32 2019 +0200 netprofm: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netprofm/Makefile.in | 2 ++ dlls/netprofm/list.c | 1 - dlls/netprofm/main.c | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/netprofm/Makefile.in b/dlls/netprofm/Makefile.in index def2614..d57d1d6 100644 --- a/dlls/netprofm/Makefile.in +++ b/dlls/netprofm/Makefile.in @@ -1,6 +1,8 @@ MODULE = netprofm.dll IMPORTS = iphlpapi +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ list.c \ main.c diff --git a/dlls/netprofm/list.c b/dlls/netprofm/list.c index f6823f0..93e9d14 100644 --- a/dlls/netprofm/list.c +++ b/dlls/netprofm/list.c @@ -21,7 +21,6 @@ #define NONAMELESSUNION #define NONAMELESSSTRUCT -#include "config.h" #include <stdarg.h> #include "windef.h" #include "winbase.h" diff --git a/dlls/netprofm/main.c b/dlls/netprofm/main.c index 9808dee..d1e622f 100644 --- a/dlls/netprofm/main.c +++ b/dlls/netprofm/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" #include "winbase.h"

1 0