November 2021 - Wine-Devel - list.winehq.org

[PATCH 3/5] win32u: Move NtUserGetProp implementation from user32.
by Jacek Caban Nov. 8, 2021

Nov. 8, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/property.c | 12 +----------- dlls/win32u/syscall.c | 1 + dlls/win32u/tests/win32u.c | 3 +++ dlls/win32u/win32u.spec | 2 +- dlls/win32u/window.c | 21 +++++++++++++++++++++ dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 8 ++++++++ 7 files changed, 36 insertions(+), 12 deletions(-)

1 0

[PATCH 1/5] win32u: Move NtUserGetLayeredWindowAttributes implementation from user32.
by Jacek Caban Nov. 8, 2021

Nov. 8, 2021

1 0

[PATCH 1/4] evr/mixer: Fix rectangle scaling helper argument check (Coverity).
by Nikolay Sivov Nov. 8, 2021

Nov. 8, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/evr/mixer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index bb3f938cb64..b6b4d148f90 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -1237,7 +1237,7 @@ static HRESULT video_mixer_get_d3d_device(struct video_mixer *mixer, IDirect3DDe static void video_mixer_scale_rect(RECT *rect, unsigned int width, unsigned int height, const MFVideoNormalizedRect *scale) { - if (rect->left == 0.0f && rect->top == 0.0f && rect->right == 1.0f && rect->bottom == 1.0f) + if (scale->left == 0.0f && scale->top == 0.0f && scale->right == 1.0f && scale->bottom == 1.0f) { SetRect(rect, 0, 0, width, height); } -- 2.33.0

1 3

[PATCH v5 1/2] nsiproxy: Fill the reply with exact ICMP_ECHO_REPLY in the output buffer.
by Gabriel Ivăncescu Nov. 8, 2021

Nov. 8, 2021

Because iphlpapi has no opportunity to convert the reply in async mode. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/iphlpapi/iphlpapi_main.c | 44 +----- dlls/nsiproxy.sys/device.c | 36 ++++- dlls/nsiproxy.sys/icmp_echo.c | 203 ++++++++++++++++++--------- dlls/nsiproxy.sys/nsiproxy_private.h | 39 +++++ include/wine/nsi.h | 21 +-- 5 files changed, 212 insertions(+), 131 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index d9a85be..8a31241 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -4579,33 +4579,6 @@ DWORD WINAPI IcmpParseReplies( void *reply, DWORD reply_size ) return num_pkts; } -/************************************************************************* - * icmpv4_echo_reply_fixup - * - * Convert struct nsiproxy_icmpv4_echo_reply into ICMP_ECHO_REPLY. - * - * This is necessary due to the different sizes of ICMP_ECHO_REPLY on - * 32 and 64-bits. Despite mention of ICMP_ECHO_REPLY32, 64-bit Windows - * actually does return a full 64-bit version. - */ -static void icmpv4_echo_reply_fixup( ICMP_ECHO_REPLY *dst, struct nsiproxy_icmp_echo_reply *reply ) -{ - dst->Address = reply->addr.Ipv4.sin_addr.s_addr; - dst->Status = reply->status; - dst->RoundTripTime = reply->round_trip_time; - dst->DataSize = reply->data_size; - dst->Reserved = reply->num_of_pkts; - dst->Data = (BYTE *)(dst + 1) + ((reply->opts.options_size + 3) & ~3); - dst->Options.Ttl = reply->opts.ttl; - dst->Options.Tos = reply->opts.tos; - dst->Options.Flags = reply->opts.flags; - dst->Options.OptionsSize = reply->opts.options_size; - dst->Options.OptionsData = (BYTE *)(reply + 1); - - memcpy( dst->Options.OptionsData, (BYTE *)reply + reply->opts.options_offset, reply->opts.options_size ); - memcpy( dst->Data, (BYTE *)reply + reply->data_offset, reply->data_size ); -} - /*********************************************************************** * IcmpSendEcho (IPHLPAPI.@) */ @@ -4636,9 +4609,8 @@ DWORD WINAPI IcmpSendEcho2Ex( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc_r void *reply, DWORD reply_size, DWORD timeout ) { struct icmp_handle_data *data = (struct icmp_handle_data *)handle; - DWORD opt_size, in_size, ret = 0, out_size; + DWORD opt_size, in_size, ret = 0; struct nsiproxy_icmp_echo *in; - struct nsiproxy_icmp_echo_reply *out; HANDLE request_event; IO_STATUS_BLOCK iosb; NTSTATUS status; @@ -4658,17 +4630,15 @@ DWORD WINAPI IcmpSendEcho2Ex( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc_r opt_size = opts ? (opts->OptionsSize + 3) & ~3 : 0; in_size = FIELD_OFFSET(struct nsiproxy_icmp_echo, data[opt_size + request_size]); in = heap_alloc_zero( in_size ); - out_size = reply_size - sizeof(ICMP_ECHO_REPLY) + sizeof(*out); - out = heap_alloc( out_size ); - if (!in || !out) + if (!in) { - heap_free( out ); - heap_free( in ); SetLastError( IP_NO_RESOURCES ); return 0; } + in->user_reply_ptr = (ULONG_PTR)reply; + in->bits = sizeof(void*) * 8; in->src.Ipv4.sin_family = AF_INET; in->src.Ipv4.sin_addr.s_addr = src; in->dst.Ipv4.sin_family = AF_INET; @@ -4689,19 +4659,15 @@ DWORD WINAPI IcmpSendEcho2Ex( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc_r status = NtDeviceIoControlFile( data->nsi_device, request_event, NULL, NULL, &iosb, IOCTL_NSIPROXY_WINE_ICMP_ECHO, in, in_size, - out, out_size ); + reply, reply_size ); if (status == STATUS_PENDING && !WaitForSingleObject( request_event, INFINITE )) status = iosb.Status; if (!status) - { - icmpv4_echo_reply_fixup( reply, out ); ret = IcmpParseReplies( reply, reply_size ); - } CloseHandle( request_event ); - heap_free( out ); heap_free( in ); if (status) SetLastError( RtlNtStatusToDosError( status ) ); diff --git a/dlls/nsiproxy.sys/device.c b/dlls/nsiproxy.sys/device.c index 90a7a3d..4ace66d 100644 --- a/dlls/nsiproxy.sys/device.c +++ b/dlls/nsiproxy.sys/device.c @@ -31,6 +31,7 @@ #include "netiodef.h" #include "wine/nsi.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/unixlib.h" #include "nsiproxy_private.h" @@ -211,6 +212,13 @@ static void WINAPI icmp_echo_cancel( DEVICE_OBJECT *device, IRP *irp ) LeaveCriticalSection( &nsiproxy_cs ); } +static int icmp_echo_reply_struct_len( ULONG family, ULONG bits ) +{ + if (family == AF_INET) + return (bits == 32) ? sizeof(struct icmp_echo_reply_32) : sizeof(struct icmp_echo_reply_64); + return 0; +} + static NTSTATUS nsiproxy_icmp_echo( IRP *irp ) { IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); @@ -222,7 +230,7 @@ static NTSTATUS nsiproxy_icmp_echo( IRP *irp ) if (in_len < offsetof(struct nsiproxy_icmp_echo, data[0]) || in_len < offsetof(struct nsiproxy_icmp_echo, data[((in->opt_size + 3) & ~3) + in->req_size]) || - out_len < sizeof(struct nsiproxy_icmp_echo_reply)) + out_len < icmp_echo_reply_struct_len( in->dst.si_family, in->bits )) return STATUS_INVALID_PARAMETER; switch (in->dst.si_family) @@ -326,8 +334,10 @@ static DWORD WINAPI listen_thread_proc( void *arg ) TRACE( "\n" ); + params.user_reply_ptr = in->user_reply_ptr; params.handle = irp_get_icmp_handle( irp ); params.timeout = in->timeout; + params.bits = in->bits; params.reply = irp->AssociatedIrp.SystemBuffer; params.reply_len = irpsp->Parameters.DeviceIoControl.OutputBufferLength; @@ -353,8 +363,10 @@ static DWORD WINAPI listen_thread_proc( void *arg ) static void handle_queued_send_echo( IRP *irp ) { struct nsiproxy_icmp_echo *in = (struct nsiproxy_icmp_echo *)irp->AssociatedIrp.SystemBuffer; - struct nsiproxy_icmp_echo_reply *reply = (struct nsiproxy_icmp_echo_reply *)irp->AssociatedIrp.SystemBuffer; + void *out = irp->AssociatedIrp.SystemBuffer; struct icmp_send_echo_params params; + ULONG family = in->dst.si_family; + ULONG bits = in->bits; NTSTATUS status; TRACE( "\n" ); @@ -372,9 +384,23 @@ static void handle_queued_send_echo( IRP *irp ) irp->IoStatus.Status = status; if (status == STATUS_SUCCESS) { - memset( reply, 0, sizeof(*reply) ); - reply->status = params.ip_status; - irp->IoStatus.Information = sizeof(*reply); + if (family == AF_INET) + { + if (bits == 32) + { + struct icmp_echo_reply_32 *reply = out; + memset( reply, 0, sizeof(*reply) ); + reply->status = params.ip_status; + irp->IoStatus.Information = sizeof(*reply); + } + else + { + struct icmp_echo_reply_64 *reply = out; + memset( reply, 0, sizeof(*reply) ); + reply->status = params.ip_status; + irp->IoStatus.Information = sizeof(*reply); + } + } } IoCompleteRequest( irp, IO_NO_INCREMENT ); } diff --git a/dlls/nsiproxy.sys/icmp_echo.c b/dlls/nsiproxy.sys/icmp_echo.c index 955fdfd..1e106c6 100644 --- a/dlls/nsiproxy.sys/icmp_echo.c +++ b/dlls/nsiproxy.sys/icmp_echo.c @@ -93,6 +93,20 @@ struct icmp_hdr } un; }; +struct icmp_reply_ctx +{ + SOCKADDR_INET addr; + ULONG status; + ULONG round_trip_time; + LONG data_size; + BYTE ttl; + BYTE tos; + BYTE flags; + BYTE options_size; + void *options_data; + void *data; +}; + struct family_ops; struct icmp_data { @@ -232,20 +246,22 @@ static void ipv4_linux_ping_set_socket_opts( struct icmp_data *data, struct icmp } #endif -static int ipv4_reply_buffer_len( int reply_len ) +static int ipv4_reply_buffer_len( struct icmp_listen_params *params ) { - return sizeof(struct ip_hdr) + sizeof(struct icmp_hdr) + reply_len - sizeof(struct nsiproxy_icmp_echo_reply); + int struct_len = (params->bits == 32) ? sizeof(struct icmp_echo_reply_32) : sizeof(struct icmp_echo_reply_64); + return sizeof(struct ip_hdr) + sizeof(struct icmp_hdr) + params->reply_len - struct_len; } #ifdef __linux__ -static int ipv4_linux_ping_reply_buffer_len( int reply_len ) +static int ipv4_linux_ping_reply_buffer_len( struct icmp_listen_params *params ) { - return sizeof(struct icmp_hdr) + reply_len - sizeof(struct nsiproxy_icmp_echo_reply); + int struct_len = (params->bits == 32) ? sizeof(struct icmp_echo_reply_32) : sizeof(struct icmp_echo_reply_64); + return sizeof(struct icmp_hdr) + params->reply_len - struct_len; } #endif -static BOOL ipv4_parse_ip_hdr( struct msghdr *msg, int recvd, - int *ip_hdr_len, struct nsiproxy_icmp_echo_reply *reply, void **opts ) +static BOOL ipv4_parse_ip_hdr( struct msghdr *msg, int recvd, int *ip_hdr_len, + struct icmp_reply_ctx *ctx ) { struct ip_hdr *ip_hdr; @@ -254,27 +270,27 @@ static BOOL ipv4_parse_ip_hdr( struct msghdr *msg, int recvd, if (ip_hdr->v_hl >> 4 != 4 || ip_hdr->protocol != IPPROTO_ICMP) return FALSE; *ip_hdr_len = (ip_hdr->v_hl & 0xf) << 2; if (*ip_hdr_len < sizeof(*ip_hdr)) return FALSE; - *opts = ip_hdr + 1; - reply->opts.ttl = ip_hdr->ttl; - reply->opts.tos = ip_hdr->tos; - reply->opts.flags = ip_hdr->frag_off >> 13; - reply->opts.options_size = *ip_hdr_len - sizeof(*ip_hdr); + ctx->options_data = ip_hdr + 1; + ctx->ttl = ip_hdr->ttl; + ctx->tos = ip_hdr->tos; + ctx->flags = ip_hdr->frag_off >> 13; + ctx->options_size = *ip_hdr_len - sizeof(*ip_hdr); return TRUE; } #ifdef __linux__ -static BOOL ipv4_linux_ping_parse_ip_hdr( struct msghdr *msg, int recvd, - int *ip_hdr_len, struct nsiproxy_icmp_echo_reply *reply, void **opts ) +static BOOL ipv4_linux_ping_parse_ip_hdr( struct msghdr *msg, int recvd, int *ip_hdr_len, + struct icmp_reply_ctx *ctx ) { struct cmsghdr *cmsg; *ip_hdr_len = 0; - *opts = NULL; - reply->opts.ttl = 0; - reply->opts.tos = 0; - reply->opts.flags = 0; - reply->opts.options_size = 0; /* FIXME from IP_OPTIONS but will require checking for space in the reply */ + ctx->options_data = NULL; + ctx->ttl = 0; + ctx->tos = 0; + ctx->flags = 0; + ctx->options_size = 0; /* FIXME from IP_OPTIONS but will require checking for space in the reply */ for (cmsg = CMSG_FIRSTHDR( msg ); cmsg; cmsg = CMSG_NXTHDR( msg, cmsg )) { @@ -282,10 +298,10 @@ static BOOL ipv4_linux_ping_parse_ip_hdr( struct msghdr *msg, int recvd, switch (cmsg->cmsg_type) { case IP_TTL: - reply->opts.ttl = *(BYTE *)CMSG_DATA( cmsg ); + ctx->ttl = *(BYTE *)CMSG_DATA( cmsg ); break; case IP_TOS: - reply->opts.tos = *(BYTE *)CMSG_DATA( cmsg ); + ctx->tos = *(BYTE *)CMSG_DATA( cmsg ); break; } } @@ -294,7 +310,7 @@ static BOOL ipv4_linux_ping_parse_ip_hdr( struct msghdr *msg, int recvd, #endif static int ipv4_parse_icmp_hdr_( struct icmp_data *data, struct icmp_hdr *icmp, int icmp_size, - struct nsiproxy_icmp_echo_reply *reply, int ping_socket ) + struct icmp_reply_ctx *ctx, int ping_socket ) { static const IP_STATUS unreach_codes[] = { @@ -326,7 +342,7 @@ static int ipv4_parse_icmp_hdr_( struct icmp_data *data, struct icmp_hdr *icmp, if ((!ping_socket && icmp->un.echo.id != data->id) || icmp->un.echo.sequence != data->seq) return -1; - reply->status = IP_SUCCESS; + ctx->status = IP_SUCCESS; return icmp_size - sizeof(*icmp); case ICMP4_DST_UNREACH: @@ -369,24 +385,90 @@ static int ipv4_parse_icmp_hdr_( struct icmp_data *data, struct icmp_hdr *icmp, (!ping_socket && orig_icmp_hdr->un.echo.id != data->id) || orig_icmp_hdr->un.echo.sequence != data->seq) return -1; - reply->status = status; + ctx->status = status; return 0; } -static int ipv4_parse_icmp_hdr( struct icmp_data *data, struct icmp_hdr *icmp, int icmp_size, - struct nsiproxy_icmp_echo_reply *reply ) +static int ipv4_parse_icmp_hdr( struct icmp_data *data, struct icmp_hdr *icmp, + int icmp_size, struct icmp_reply_ctx *ctx) { - return ipv4_parse_icmp_hdr_( data, icmp, icmp_size, reply, 0 ); + return ipv4_parse_icmp_hdr_( data, icmp, icmp_size, ctx, 0 ); } #ifdef __linux__ -static int ipv4_linux_ping_parse_icmp_hdr( struct icmp_data *data, struct icmp_hdr *icmp, int icmp_size, - struct nsiproxy_icmp_echo_reply *reply ) +static int ipv4_linux_ping_parse_icmp_hdr( struct icmp_data *data, struct icmp_hdr *icmp, + int icmp_size, struct icmp_reply_ctx *ctx ) { - return ipv4_parse_icmp_hdr_( data, icmp, icmp_size, reply, 1 ); + return ipv4_parse_icmp_hdr_( data, icmp, icmp_size, ctx, 1 ); } #endif +static NTSTATUS ipv4_set_reply_ip_status( struct icmp_listen_params *params, IP_STATUS ip_status ) +{ + if (params->bits == 32) + { + struct icmp_echo_reply_32 *reply = params->reply; + memset( reply, 0, sizeof(*reply) ); + reply->status = ip_status; + params->reply_len = sizeof(*reply); + } + else + { + struct icmp_echo_reply_64 *reply = params->reply; + memset( reply, 0, sizeof(*reply) ); + reply->status = ip_status; + params->reply_len = sizeof(*reply); + } + return STATUS_SUCCESS; +} + +static void ipv4_fill_reply( struct icmp_listen_params *params, struct icmp_reply_ctx *ctx) +{ + void *options_data; + ULONG data_offset; + if (params->bits == 32) + { + struct icmp_echo_reply_32 *reply = params->reply; + data_offset = sizeof(*reply) + ((ctx->options_size + 3) & ~3); + reply->addr = ctx->addr.Ipv4.sin_addr.WS_s_addr; + reply->status = ctx->status; + reply->round_trip_time = ctx->round_trip_time; + reply->data_size = ctx->data_size; + reply->num_of_pkts = 1; + reply->data_ptr = params->user_reply_ptr + data_offset; + reply->opts.ttl = ctx->ttl; + reply->opts.tos = ctx->tos; + reply->opts.flags = ctx->flags; + reply->opts.options_size = ctx->options_size; + reply->opts.options_ptr = params->user_reply_ptr + sizeof(*reply); + options_data = reply + 1; + } + else + { + struct icmp_echo_reply_64 *reply = params->reply; + data_offset = sizeof(*reply) + ((ctx->options_size + 3) & ~3); + reply->addr = ctx->addr.Ipv4.sin_addr.WS_s_addr; + reply->status = ctx->status; + reply->round_trip_time = ctx->round_trip_time; + reply->data_size = ctx->data_size; + reply->num_of_pkts = 1; + reply->data_ptr = params->user_reply_ptr + data_offset; + reply->opts.ttl = ctx->ttl; + reply->opts.tos = ctx->tos; + reply->opts.flags = ctx->flags; + reply->opts.options_size = ctx->options_size; + reply->opts.options_ptr = params->user_reply_ptr + sizeof(*reply); + options_data = reply + 1; + } + + memcpy( options_data, ctx->options_data, ctx->options_size ); + if (ctx->options_size & 3) + memset( (char *)options_data + ctx->options_size, 0, 4 - (ctx->options_size & 3) ); + + memcpy( (char *)params->reply + data_offset, ctx->data, ctx->data_size ); + params->reply_len = data_offset + ctx->data_size; +} + struct family_ops { int family; @@ -394,11 +476,11 @@ struct family_ops void (*init_icmp_hdr)( struct icmp_data *data, struct icmp_hdr *icmp_hdr ); unsigned short (*chksum)( BYTE *data, unsigned int count ); void (*set_socket_opts)( struct icmp_data *data, struct icmp_send_echo_params *params ); - int (*reply_buffer_len)( int reply_len ); - BOOL (*parse_ip_hdr)( struct msghdr *msg, int recvd, - int *ip_hdr_len, struct nsiproxy_icmp_echo_reply *reply, void **opts ); - int (*parse_icmp_hdr)( struct icmp_data *data, struct icmp_hdr *icmp, int icmp_len, - struct nsiproxy_icmp_echo_reply *reply ); + int (*reply_buffer_len)( struct icmp_listen_params *params ); + BOOL (*parse_ip_hdr)( struct msghdr *msg, int recvd, int *ip_hdr_len, struct icmp_reply_ctx *ctx ); + int (*parse_icmp_hdr)( struct icmp_data *data, struct icmp_hdr *icmp, int icmp_len, struct icmp_reply_ctx *ctx ); + NTSTATUS (*set_reply_ip_status)( struct icmp_listen_params *params, IP_STATUS ip_status ); + void (*fill_reply)( struct icmp_listen_params *params, struct icmp_reply_ctx *ctx ); }; static const struct family_ops ipv4 = @@ -411,6 +493,8 @@ static const struct family_ops ipv4 = ipv4_reply_buffer_len, ipv4_parse_ip_hdr, ipv4_parse_icmp_hdr, + ipv4_set_reply_ip_status, + ipv4_fill_reply, }; #ifdef __linux__ @@ -425,6 +509,8 @@ static const struct family_ops ipv4_linux_ping = ipv4_linux_ping_reply_buffer_len, ipv4_linux_ping_parse_ip_hdr, ipv4_linux_ping_parse_icmp_hdr, + ipv4_set_reply_ip_status, + ipv4_fill_reply, }; #endif @@ -584,16 +670,6 @@ NTSTATUS icmp_send_echo( void *args ) return params->handle ? STATUS_PENDING : STATUS_NO_MEMORY; } -static NTSTATUS set_reply_ip_status( struct icmp_listen_params *params, IP_STATUS ip_status ) -{ - struct nsiproxy_icmp_echo_reply *reply = params->reply; - - memset( reply, 0, sizeof(*reply) ); - reply->status = ip_status; - params->reply_len = sizeof(*reply); - return STATUS_SUCCESS; -} - static int get_timeout( LARGE_INTEGER start, DWORD timeout ) { LARGE_INTEGER now, end; @@ -615,19 +691,18 @@ static ULONG get_rtt( LARGE_INTEGER start ) static NTSTATUS recv_msg( struct icmp_data *data, struct icmp_listen_params *params ) { - struct nsiproxy_icmp_echo_reply *reply = (struct nsiproxy_icmp_echo_reply *)params->reply; struct sockaddr_storage addr; + struct icmp_reply_ctx ctx; struct iovec iov[1]; BYTE cmsg_buf[1024]; struct msghdr msg = { .msg_name = &addr, .msg_namelen = sizeof(addr), .msg_iov = iov, .msg_iovlen = ARRAY_SIZE(iov), .msg_control = cmsg_buf, .msg_controllen = sizeof(cmsg_buf) }; - int ip_hdr_len, recvd, reply_buf_len, data_size; + int ip_hdr_len, recvd, reply_buf_len; char *reply_buf; - void *opts; struct icmp_hdr *icmp_hdr; - reply_buf_len = data->ops->reply_buffer_len( params->reply_len ); + reply_buf_len = data->ops->reply_buffer_len( params ); reply_buf = malloc( reply_buf_len ); if (!reply_buf) return STATUS_NO_MEMORY; @@ -638,31 +713,23 @@ static NTSTATUS recv_msg( struct icmp_data *data, struct icmp_listen_params *par TRACE( "recvmsg() rets %d errno %d addr_len %d iovlen %d msg_flags %x\n", recvd, errno, msg.msg_namelen, (int)iov[0].iov_len, msg.msg_flags ); - if (!data->ops->parse_ip_hdr( &msg, recvd, &ip_hdr_len, reply, &opts )) goto skip; + if (!data->ops->parse_ip_hdr( &msg, recvd, &ip_hdr_len, &ctx )) goto skip; if (recvd < ip_hdr_len + sizeof(*icmp_hdr)) goto skip; icmp_hdr = (struct icmp_hdr *)(reply_buf + ip_hdr_len); - if ((data_size = data->ops->parse_icmp_hdr( data, icmp_hdr, recvd - ip_hdr_len, reply )) < 0) goto skip; - reply->data_size = data_size; - if (reply->data_size && msg.msg_flags & MSG_TRUNC) + if ((ctx.data_size = data->ops->parse_icmp_hdr( data, icmp_hdr, recvd - ip_hdr_len, &ctx )) < 0) goto skip; + if (ctx.data_size && msg.msg_flags & MSG_TRUNC) { free( reply_buf ); - return set_reply_ip_status( params, IP_GENERAL_FAILURE ); + return data->ops->set_reply_ip_status( params, IP_GENERAL_FAILURE ); } - sockaddr_to_SOCKADDR_INET( (struct sockaddr *)&addr, &reply->addr ); - reply->round_trip_time = get_rtt( data->send_time ); - reply->num_of_pkts = 1; - reply->opts.options_offset = sizeof(*reply); - reply->data_offset = sizeof(*reply) + ((reply->opts.options_size + 3) & ~3); - if (reply->opts.options_size) - memcpy( (char *)reply + reply->opts.options_offset, opts, reply->opts.options_size ); - if (reply->opts.options_size & 3) - memset( (char *)reply + reply->opts.options_offset + reply->opts.options_size, 0, 4 - (reply->opts.options_size & 3) ); - if (reply->data_size) - memcpy( (char *)reply + reply->data_offset, icmp_hdr + 1, reply->data_size ); - - params->reply_len = reply->data_offset + reply->data_size; + sockaddr_to_SOCKADDR_INET( (struct sockaddr *)&addr, &ctx.addr ); + ctx.round_trip_time = get_rtt( data->send_time ); + ctx.data = icmp_hdr + 1; + + data->ops->fill_reply( params, &ctx ); + free( reply_buf ); return STATUS_SUCCESS; @@ -703,10 +770,10 @@ NTSTATUS icmp_listen( void *args ) if (!ret) /* timeout */ { TRACE( "timeout\n" ); - return set_reply_ip_status( params, IP_REQ_TIMED_OUT ); + return data->ops->set_reply_ip_status( params, IP_REQ_TIMED_OUT ); } /* ret < 0 */ - return set_reply_ip_status( params, errno_to_ip_status( errno ) ); + return data->ops->set_reply_ip_status( params, errno_to_ip_status( errno ) ); } NTSTATUS icmp_cancel_listen( void *args ) diff --git a/dlls/nsiproxy.sys/nsiproxy_private.h b/dlls/nsiproxy.sys/nsiproxy_private.h index 91dd393..c0b8ca0 100644 --- a/dlls/nsiproxy.sys/nsiproxy_private.h +++ b/dlls/nsiproxy.sys/nsiproxy_private.h @@ -21,7 +21,9 @@ struct icmp_listen_params { HANDLE handle; void *reply; + ULONGLONG user_reply_ptr; unsigned int reply_len; + unsigned int bits; int timeout; }; @@ -34,3 +36,40 @@ struct icmp_send_echo_params HANDLE handle; ULONG ip_status; }; + +/* output for IOCTL_NSIPROXY_WINE_ICMP_ECHO - cf. ICMP_ECHO_REPLY */ +struct icmp_echo_reply_32 +{ + ULONG addr; + ULONG status; + ULONG round_trip_time; + USHORT data_size; + USHORT num_of_pkts; + ULONG data_ptr; + struct + { + BYTE ttl; + BYTE tos; + BYTE flags; + BYTE options_size; + ULONG options_ptr; + } opts; +}; + +struct icmp_echo_reply_64 +{ + ULONG addr; + ULONG status; + ULONG round_trip_time; + USHORT data_size; + USHORT num_of_pkts; + ULONGLONG data_ptr; + struct + { + BYTE ttl; + BYTE tos; + BYTE flags; + BYTE options_size; + ULONGLONG options_ptr; + } opts; +}; diff --git a/include/wine/nsi.h b/include/wine/nsi.h index 9664b53..8c3488d 100644 --- a/include/wine/nsi.h +++ b/include/wine/nsi.h @@ -426,6 +426,8 @@ struct nsiproxy_icmp_echo { SOCKADDR_INET src; SOCKADDR_INET dst; + ULONGLONG user_reply_ptr; + BYTE bits; BYTE ttl; BYTE tos; BYTE flags; @@ -435,25 +437,6 @@ struct nsiproxy_icmp_echo BYTE data[1]; /* ((opt_size + 3) & ~3) + req_size */ }; -/* output for IOCTL_NSIPROXY_WINE_ICMP_ECHO - cf. ICMP_ECHO_REPLY */ -struct nsiproxy_icmp_echo_reply -{ - SOCKADDR_INET addr; - ULONG status; - ULONG round_trip_time; - USHORT data_size; - USHORT num_of_pkts; - DWORD data_offset; - struct - { - BYTE ttl; - BYTE tos; - BYTE flags; - BYTE options_size; - DWORD options_offset; - } opts; -}; - /* Undocumented Nsi api */ #define NSI_PARAM_TYPE_RW 0 -- 2.31.1

2 2

[PATCH v3 6/6] msdasql: Fix use after free (Coverity)
by Alistair Leslie-Hughes Nov. 8, 2021

Nov. 8, 2021

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/tests/provider.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index d093c3c2087..9b75f40a741 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -130,8 +130,8 @@ static void test_Properties(void) hr = IDBProperties_GetProperties(props, 1, &propidlist, &propcnt, &propset); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(propidlist.cPropertyIDs == 14, "got %d\n", propinfoset->cPropertyInfos); - ok(propset->cProperties == 14, "got %d\n", propinfoset->cPropertyInfos); + ok(propidlist.cPropertyIDs == 14, "got %d\n", propidlist.cPropertyIDs); + ok(propset->cProperties == 14, "got %d\n", propset->cProperties); for (i = 0; i < propidlist.cPropertyIDs; i++) { -- 2.33.0

1 0

[PATCH v3 5/6] msdasql: Correct default dialect logic
by Alistair Leslie-Hughes Nov. 8, 2021

Nov. 8, 2021

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/session.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index 98a1fc50220..e52e8cd18d8 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -847,7 +847,7 @@ static HRESULT WINAPI command_SetCommandText(ICommandText *iface, REFGUID dialec struct command *command = impl_from_ICommandText( iface ); TRACE("%p, %s, %s\n", command, debugstr_guid(dialect), debugstr_w(commandstr)); - if (IsEqualGUID(&DBGUID_DEFAULT, dialect)) + if (!IsEqualGUID(&DBGUID_DEFAULT, dialect)) FIXME("Currently non Default Dialect isn't supported\n"); heap_free(command->query); -- 2.33.0

1 0

[PATCH v3 4/6] msdasql: Trace session interfaces.
by Alistair Leslie-Hughes Nov. 8, 2021

Nov. 8, 2021

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/session.c | 10 ++++++++++ dlls/msdasql/tests/provider.c | 13 +++++++++++++ 2 files changed, 23 insertions(+) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index 0298c7e7424..98a1fc50220 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -102,6 +102,16 @@ static HRESULT WINAPI session_QueryInterface(IUnknown *iface, REFIID riid, void TRACE("(%p)->(IDBCreateCommand_iface %p)\n", iface, ppv); *ppv = &session->IDBCreateCommand_iface; } + else if(IsEqualGUID(&IID_IBindResource, riid)) + { + TRACE("(%p)->(IID_IBindResource not support)\n", iface); + return E_NOINTERFACE; + } + else if(IsEqualGUID(&IID_ICreateRow, riid)) + { + TRACE("(%p)->(IID_ICreateRow not support)\n", iface); + return E_NOINTERFACE; + } if(*ppv) { diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index 6ffe17e7028..d093c3c2087 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -367,6 +367,8 @@ static void test_sessions(void) IDBCreateCommand *create_command = NULL; IGetDataSource *datasource = NULL; ISessionProperties *session_props = NULL; + IUnknown *unimplemented = NULL; + ITransactionJoin *join = NULL; IUnknown *cmd = NULL; HRESULT hr; BSTR connect_str; @@ -415,6 +417,17 @@ static void test_sessions(void) ok(hr == S_OK, "got 0x%08x\n", hr); IGetDataSource_Release(datasource); + hr = IUnknown_QueryInterface(session, &IID_ITransactionJoin, (void**)&join); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + if(hr == S_OK) + ITransactionJoin_Release(join); + + hr = IUnknown_QueryInterface(session, &IID_IBindResource, (void**)&unimplemented); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + + hr = IUnknown_QueryInterface(session, &IID_ICreateRow, (void**)&unimplemented); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + hr = IUnknown_QueryInterface(session, &IID_ISessionProperties, (void**)&session_props); ok(hr == S_OK, "got 0x%08x\n", hr); ISessionProperties_Release(session_props); -- 2.33.0

1 0

[PATCH v3 3/6] include: Add trnjoi.idl
by Alistair Leslie-Hughes Nov. 8, 2021

Nov. 8, 2021

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdaps/usrmarshal.c | 28 +++++++++++++++++++++++++++ include/Makefile.in | 1 + include/oledb.idl | 1 + include/trnjoi.idl | 42 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 72 insertions(+) create mode 100644 include/trnjoi.idl diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index 8910070fbac..dc0f2261096 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -1741,3 +1741,31 @@ HRESULT __RPC_STUB ICommandWithParameters_MapParameterNames_Stub(ICommandWithPar FIXME("(%p)->(%ld %p %p %p): stub\n", This, count, names, ordinals, error); return E_NOTIMPL; } + +HRESULT __RPC_STUB ITransactionJoin_GetOptionsObject_Stub(ITransactionJoin* This, + ITransactionOptions **options, IErrorInfo **error) +{ + FIXME("(%p)->(%p, %p): stub\n", This, options, error); + return E_NOTIMPL; +} + +HRESULT CALLBACK ITransactionJoin_GetOptionsObject_Proxy(ITransactionJoin *This, + ITransactionOptions **options) +{ + FIXME("(%p)->(%p): stub\n", This, options); + return E_NOTIMPL; +} + +HRESULT __RPC_STUB ITransactionJoin_JoinTransaction_Stub(ITransactionJoin* This, IUnknown *unk, + ISOLEVEL level, ULONG flags, ITransactionOptions *options, IErrorInfo **error) +{ + FIXME("(%p)->(%p, %d, 0x%08x, %p, %p): stub\n", This, unk, level, flags, options, error); + return E_NOTIMPL; +} + +HRESULT CALLBACK ITransactionJoin_JoinTransaction_Proxy(ITransactionJoin* This, IUnknown *unk, + ISOLEVEL level, ULONG flags, ITransactionOptions *options) +{ + FIXME("(%p)->(%p, %d, 0x%08x, %p): stub\n", This, unk, level, flags, options); + return E_NOTIMPL; +} diff --git a/include/Makefile.in b/include/Makefile.in index a16cba52642..8c4eb732e57 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -720,6 +720,7 @@ SOURCES = \ tpcshrd.h \ traffic.h \ transact.idl \ + trnjoi.idl \ twain.h \ txcoord.idl \ txdtc.idl \ diff --git a/include/oledb.idl b/include/oledb.idl index b889d72bc38..abd4d55069c 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -80,6 +80,7 @@ typedef LONG_PTR DB_LRESERVE; #include "rstupd.idl" #include "mulres.idl" #include "transact.idl" +#include "trnjoi.idl" #include "cmdwpr.idl" cpp_quote("#include <accctrl.h>") diff --git a/include/trnjoi.idl b/include/trnjoi.idl new file mode 100644 index 00000000000..fcc22ce5ea3 --- /dev/null +++ b/include/trnjoi.idl @@ -0,0 +1,42 @@ +/* + * Copyright (C) 2021 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#if 0 +#pragma makedep install +#endif + +[ + object, + uuid(0c733a5e-2a1c-11ce-ade5-00aa0044773d), + pointer_default(unique) +] +interface ITransactionJoin : IUnknown +{ + [local] + HRESULT GetOptionsObject(ITransactionOptions **options); + + [call_as(GetOptionsObject)] + HRESULT RemoteGetOptionsObject([out] ITransactionOptions **options, [out] IErrorInfo **error); + + [local] + HRESULT JoinTransaction(IUnknown *unk, [in] ISOLEVEL level, [in] ULONG flags, ITransactionOptions *options); + + [call_as(JoinTransaction)] + HRESULT RemoteJoinTransaction([in, unique] IUnknown *unk, [in] ISOLEVEL level, [in] ULONG flags, + [in] ITransactionOptions *options, [out] IErrorInfo **error); +} -- 2.33.0

1 0

[PATCH v3 2/6] include: Add transact.idl to oledb.idl
by Alistair Leslie-Hughes Nov. 8, 2021

Nov. 8, 2021

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/xolehlp/Makefile.in | 2 +- include/oledb.idl | 1 + libs/adsiid/adsiid.c | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/xolehlp/Makefile.in b/dlls/xolehlp/Makefile.in index 4f5bd781a58..f39cd90f0b9 100644 --- a/dlls/xolehlp/Makefile.in +++ b/dlls/xolehlp/Makefile.in @@ -1,5 +1,5 @@ MODULE = xolehlp.dll -IMPORTS = adsiid uuid +IMPORTS = uuid EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/include/oledb.idl b/include/oledb.idl index 49c0c304b2d..b889d72bc38 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -79,6 +79,7 @@ typedef LONG_PTR DB_LRESERVE; #include "rstchg.idl" #include "rstupd.idl" #include "mulres.idl" +#include "transact.idl" #include "cmdwpr.idl" cpp_quote("#include <accctrl.h>") -- 2.33.0

1 0

[PATCH v3 1/6] msdasql: Implement IDBProperties SetProperties
by Alistair Leslie-Hughes Nov. 8, 2021

Nov. 8, 2021

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/msdasql_main.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/msdasql/msdasql_main.c b/dlls/msdasql/msdasql_main.c index d14f7957978..e58facc47fc 100644 --- a/dlls/msdasql/msdasql_main.c +++ b/dlls/msdasql/msdasql_main.c @@ -424,10 +424,27 @@ static HRESULT WINAPI dbprops_SetProperties(IDBProperties *iface, ULONG cPropert DBPROPSET rgPropertySets[]) { struct msdasql *provider = impl_from_IDBProperties(iface); + int i, j, k; - FIXME("(%p)->(%d %p)\n", provider, cPropertySets, rgPropertySets); + TRACE("(%p)->(%d %p)\n", provider, cPropertySets, rgPropertySets); - return E_NOTIMPL; + for (i=0; i < cPropertySets; i++) + { + for (j=0; j < rgPropertySets[i].cProperties; j++) + { + for(k=0; k < ARRAY_SIZE(provider->properties); k++) + { + if (provider->properties[k].id == rgPropertySets[i].rgProperties[j].dwPropertyID) + { + TRACE("Found property %d\n", provider->properties[k].id); + VariantCopy(&provider->properties[k].value, &rgPropertySets[i].rgProperties[j].vValue); + break; + } + } + } + } + + return S_OK; } static const struct IDBPropertiesVtbl dbprops_vtbl = -- 2.33.0

1 0

[PATCH vkd3d] vkd3d-shader/hlsl: Define a symbolic constant to represent the D3D_SIF_TEXTURE_COMPONENTS shift.
by Henri Verbeet Nov. 8, 2021

Nov. 8, 2021

From: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- v4: Move the constant definition up with the other shader model 4 constant definitions. This supersedes patch 218887. libs/vkd3d-shader/hlsl_sm4.c | 2 +- libs/vkd3d-shader/sm4.h | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 9d45e163..f8eb0a1e 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -561,7 +561,7 @@ static void write_sm4_rdef(struct hlsl_ctx *ctx, struct dxbc_writer *dxbc) put_u32(&buffer, sm4_resource_format(var->data_type)); put_u32(&buffer, sm4_rdef_resource_dimension(var->data_type)); put_u32(&buffer, ~0u); /* FIXME: multisample count */ - flags |= (var->data_type->e.resource_format->dimx - 1) << 2; + flags |= (var->data_type->e.resource_format->dimx - 1) << VKD3D_SM4_SIF_TEXTURE_COMPONENTS_SHIFT; } put_u32(&buffer, var->reg.id); put_u32(&buffer, 1); /* bind count */ diff --git a/libs/vkd3d-shader/sm4.h b/libs/vkd3d-shader/sm4.h index ddcb9a86..f6b4b612 100644 --- a/libs/vkd3d-shader/sm4.h +++ b/libs/vkd3d-shader/sm4.h @@ -146,6 +146,9 @@ #define VKD3D_SM4_TYPE_COMPONENT(com, i) (((com) >> (4 * (i))) & 0xfu) +/* The shift that corresponds to the D3D_SIF_TEXTURE_COMPONENTS mask. */ +#define VKD3D_SM4_SIF_TEXTURE_COMPONENTS_SHIFT 2 + enum vkd3d_sm4_opcode { VKD3D_SM4_OP_ADD = 0x00, -- 2.20.1

1 0

[PATCH] win32u: use 7-bit ascii for unhandled encodings
by Aurélien Inacio Nov. 8, 2021

Nov. 8, 2021

Signed-off-by: Aurélien Inacio <aur36(a)mailo.com> --- dlls/win32u/opentype.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/win32u/opentype.c b/dlls/win32u/opentype.c index 10234c6d5aa..c206d6dae57 100644 --- a/dlls/win32u/opentype.c +++ b/dlls/win32u/opentype.c @@ -344,8 +344,8 @@ static UINT get_name_record_codepage( enum OPENTYPE_PLATFORM_ID platform, USHORT case TT_NAME_MAC_ENCODING_THAI: return 10021; default: - FIXME( "encoding %u not handled, platform %d.\n", encoding, platform ); - break; + WARN( "default ascii encoding used for encoding %d, platform %d\n", encoding, platform ); + return 20127; } break; case OPENTYPE_PLATFORM_WIN: @@ -366,8 +366,8 @@ static UINT get_name_record_codepage( enum OPENTYPE_PLATFORM_ID platform, USHORT case TT_NAME_WIN_ENCODING_JOHAB: return 1361; default: - FIXME( "encoding %u not handled, platform %d.\n", encoding, platform ); - break; + WARN( "default ascii encoding used for encoding %d, platform %d\n", encoding, platform ); + return 20127; } break; default: -- 2.30.2

2 1

[PATCH 2/2] win32u: Use a real family name as otmpFamilyName for substituted face.
by Akihiro Sagawa Nov. 8, 2021

Nov. 8, 2021

GetTextFace remains to return the original face name, e.g. MS Shell Dlg. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/gdi32/tests/font.c | 2 +- dlls/win32u/font.c | 26 +++++++++++++------------- dlls/win32u/ntgdi_private.h | 1 + 3 files changed, 15 insertions(+), 14 deletions(-)

2 1

[PATCH 1/2] gdi32/tests: Test substituted face family name.
by Akihiro Sagawa Nov. 8, 2021

Nov. 8, 2021

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/gdi32/tests/font.c | 46 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+)

2 1

[PATCH v2 2/6] include: Add transact.idl to oledb.idl
by Alistair Leslie-Hughes Nov. 8, 2021

Nov. 8, 2021

Since uuid.lib includes oledb.h, we get duplicate symbols in adsiid since uuid.lib is linked. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/oledb.idl | 1 + libs/adsiid/adsiid.c | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/include/oledb.idl b/include/oledb.idl index 49c0c304b2d..b889d72bc38 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -79,6 +79,7 @@ typedef LONG_PTR DB_LRESERVE; #include "rstchg.idl" #include "rstupd.idl" #include "mulres.idl" +#include "transact.idl" #include "cmdwpr.idl" cpp_quote("#include <accctrl.h>") diff --git a/libs/adsiid/adsiid.c b/libs/adsiid/adsiid.c index fc0b8b1bf4e..e4e85d89b84 100644 --- a/libs/adsiid/adsiid.c +++ b/libs/adsiid/adsiid.c @@ -25,4 +25,3 @@ #include "initguid.h" #include "iads.h" -#include "transact.h" -- 2.33.0

2 1

[PATCH 1/7] dinput: Always call the device internal poll callback.
by Rémi Bernon Nov. 8, 2021

Nov. 8, 2021

We normally should not peek messages here, but because of current winex11.drv design, we have to call MsgWaitForMultipleObjectsEx from time to time to pull keyboard or mouse events. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51956 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/device.c | 3 +-- dlls/dinput/dinput_main.c | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index d375229e2c0..c79b182bc66 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1535,10 +1535,9 @@ static HRESULT WINAPI dinput_device_Poll( IDirectInputDevice8W *iface ) EnterCriticalSection( &impl->crit ); if (!impl->acquired) hr = DIERR_NOTACQUIRED; LeaveCriticalSection( &impl->crit ); - if (hr != DI_OK) return hr; if (impl->vtbl->poll) return impl->vtbl->poll( iface ); - return DI_OK; + return hr; } static HRESULT WINAPI dinput_device_SendDeviceData( IDirectInputDevice8W *iface, DWORD size, diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 3286e887662..835a8656bd1 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -1430,6 +1430,8 @@ void check_dinput_events(void) * (for example Culpa Innata) * - some games only poll the device, and neither keyboard nor mouse * (for example Civilization: Call to Power 2) + * - some games do not explicitly poll for keyboard events + * (for example Morrowind in its key binding page) */ MsgWaitForMultipleObjectsEx(0, NULL, 0, QS_ALLINPUT, 0); } -- 2.33.1

2 8

[PATCH v6 0/6] gdi32/win32u: EMF fixes to support Hancom Office 2020
by Jinoh Kang Nov. 8, 2021

Nov. 8, 2021

The following commits modify the behaviours of the following GDI functions: - StretchDIBits - SetDIBitsToDevice To match more closely to that of Windows 10, build 2108, subject to the following constraints: - The source image is not a JPEG (BI_JPEG) or a PNG (BI_PNG) image. - The source image is a *bottom-up* device-independent bitmap. Changelog: - v1 -> v2: add more tests, do extra work so that EMF outputs match - v2 -> v3: emf_parse_user_bitmapinfo: zero out *dst (BITMAPINFOHEADER) (gdi32: allow passing BITMAPINFO with bmiHeader.biSizeImage == 0 for EMF DC.) - v3 -> v4: no changes (resend due to borked up patch orders) - v4 -> v5: change subject (no more RFC); address review comments so far - v5 -> v6: remove two EMFDRV functions entirely clarify code in EMF DC patch uppercase subjects Jinoh Kang (6): win32u: Remove EMFDRV_StretchDIBits and EMFDRV_SetDIBitsToDevice. gdi32/tests: Add tests for recording StretchDIBits in EMFs. gdi32/tests: Add tests for recording SetDIBitsToDevice in EMFs. gdi32: Fix bounding box calculation for EMR_STRETCHDIBITS. gdi32: Allow passing BITMAPINFO with bmiHeader.biSizeImage == 0 for EMF DC. gdi32: Calculate effective number of scan lines and truncate bitmap bits for EMR_SETDIBITSTODEVICE. dlls/gdi32/emfdc.c | 234 ++- dlls/gdi32/tests/metafile.c | 2803 +++++++++++++++++++++++++++++++++++ dlls/win32u/emfdrv.c | 22 +- 3 files changed, 3021 insertions(+), 38 deletions(-) -- 2.33.1

2 12

[PATCH] msiexec: Append .msi extension to file name if file is not found.
by Paul Gofman Nov. 8, 2021

Nov. 8, 2021

Fixes Stellaris failing to install launcher at start. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/msi/tests/db.c | 18 ++++++++++++++++ programs/msiexec/msiexec.c | 44 ++++++++++++++++++++++++++++++++++++-- 2 files changed, 60 insertions(+), 2 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index eedfcac486d..b42cc90a955 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -64,6 +64,8 @@ static void WINAPIV check_record_(int line, MSIHANDLE rec, UINT count, ...) static void test_msidatabase(void) { MSIHANDLE hdb = 0, hdb2 = 0; + WCHAR path[MAX_PATH]; + DWORD len; UINT res; DeleteFileW(msifileW); @@ -162,6 +164,22 @@ static void test_msidatabase(void) res = MsiCloseHandle( hdb ); ok( res == ERROR_SUCCESS , "Failed to close database\n" ); + res = GetCurrentDirectoryW(ARRAY_SIZE(path), path); + ok ( res, "Got zero res.\n" ); + lstrcatW( path, L"\\"); + lstrcatW( path, msifileW); + len = lstrlenW(path); + path[len - 4] = 0; + + res = MsiOpenDatabaseW( path, MSIDBOPEN_READONLY, &hdb ); + ok( res != ERROR_SUCCESS , "Got unexpected res %u.\n", res ); + + lstrcpyW( path, msifileW ); + path[lstrlenW(path) - 4] = 0; + + res = MsiOpenDatabaseW( path, MSIDBOPEN_READONLY, &hdb ); + ok( res != ERROR_SUCCESS , "Got unexpected res %u.\n", res ); + res = DeleteFileA( msifile2 ); ok( res == TRUE, "Failed to delete database\n" ); diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c index e25cc2659e6..e9e74f5c19e 100644 --- a/programs/msiexec/msiexec.c +++ b/programs/msiexec/msiexec.c @@ -588,6 +588,31 @@ static BOOL process_args_from_reg( const WCHAR *ident, int *pargc, WCHAR ***parg return ret; } +static WCHAR *get_path_with_extension(const WCHAR *package_name) +{ + static const WCHAR ext[] = L".msi"; + unsigned int p; + WCHAR *path; + + if (!(path = heap_alloc(lstrlenW(package_name) * sizeof(WCHAR) + sizeof(ext)))) + { + WINE_ERR("No memory.\n"); + return NULL; + } + + lstrcpyW(path, package_name); + p = lstrlenW(path); + while (p && path[p] != '.' && path[p] != L'\\' && path[p] != '/') + --p; + if (path[p] == '.') + { + heap_free(path); + return NULL; + } + lstrcatW(path, ext); + return path; +} + int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) { int i; @@ -626,6 +651,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine DWORD ReturnCode; int argc; LPWSTR *argvW = NULL; + WCHAR *path; InitCommonControls(); @@ -1040,14 +1066,28 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine if(IsProductCode(PackageName)) ReturnCode = MsiConfigureProductExW(PackageName, 0, INSTALLSTATE_DEFAULT, Properties); else - ReturnCode = MsiInstallProductW(PackageName, Properties); + { + if ((ReturnCode = MsiInstallProductW(PackageName, Properties)) == ERROR_FILE_NOT_FOUND + && (path = get_path_with_extension(PackageName))) + { + ReturnCode = MsiInstallProductW(path, Properties); + heap_free(path); + } + } } else if(FunctionRepair) { if(IsProductCode(PackageName)) WINE_FIXME("Product code treatment not implemented yet\n"); else - ReturnCode = MsiReinstallProductW(PackageName, RepairMode); + { + if ((ReturnCode = MsiReinstallProductW(PackageName, RepairMode)) == ERROR_FILE_NOT_FOUND + && (path = get_path_with_extension(PackageName))) + { + ReturnCode = MsiReinstallProductW(path, RepairMode); + heap_free(path); + } + } } else if(FunctionAdvertise) { -- 2.33.1

2 1

[PATCH] msvcrt: printf: Later width specifiers should override earlier ones
by David Gow Nov. 8, 2021

Nov. 8, 2021

From: Andrew Eikum <aeikum(a)codeweavers.com> This is a replacement for "msvcrt: The '*' character should be interpreted as the beginning of the width specification"[1], which matches the behaviour I see on my machine better. If a printf format string contains both a '*' (to specify that the field width should be read from a variable), followed by another explicit field width, only the latter field width should be used. For further details, see [2] and [3]. [1]: https://source.winehq.org/patches/data/218904 [2]: https://www.winehq.org/pipermail/wine-devel/2021-November/200039.html [3]: https://github.com/ValveSoftware/Proton/issues/5258#issuecomment-962423092 Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Co-Developed-by: David Gow <david(a)davidgow.net> Signed-off-by: David Gow <david(a)davidgow.net> --- Note also that this moves the new tests after the setlocale(LC_ALL, "C"), as I don't think they need to run in a Japanese locale. --- dlls/msvcrt/printf.h | 8 +++++++- dlls/msvcrt/tests/printf.c | 20 ++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index aeb1290f48f..6d2f02ee85b 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -1050,7 +1050,13 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API flags.LeftAlign = TRUE; flags.FieldLength = -flags.FieldLength; } - } else while (*p >= '0' && *p <= '9') { + + /* Ignore this length if there's another specifier. */ + if (*p >= '0' && *p <= '9') + flags.FieldLength = 0; + } + + while (*p >= '0' && *p <= '9') { flags.FieldLength *= 10; flags.FieldLength += *p++ - '0'; } diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index 06acf4c8450..cc824f571a6 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -396,6 +396,26 @@ static void test_sprintf( void ) ok(!strcmp(buffer, "string to copy"), "failed: \"%s\"\n", buffer); setlocale(LC_ALL, "C"); + + r = p_sprintf(buffer, "%0*02d", 1, 0); + ok(r==2, "r = %d\n", r); + ok(!strcmp(buffer, "00"), "failed: \"%s\"\n", buffer); + + r = p_sprintf(buffer, "%0*02d", 30, 17); + ok(r==2, "r = %d\n", r); + ok(!strcmp(buffer, "17"), "failed: \"%s\"\n", buffer); + + r = p_sprintf(buffer, "%*1d", 1, 3); + ok(r==1, "r = %d\n", r); + ok(!strcmp(buffer, "3"), "failed: \"%s\"\n", buffer); + + r = p_sprintf(buffer, "%0*0d", 1, 2); + ok(r==1, "r = %d\n", r); + ok(!strcmp(buffer, "2"), "failed: \"%s\"\n", buffer); + + r = p_sprintf(buffer, "% *2d", 0, 7); + ok(r==2, "r = %d\n", r); + ok(!strcmp(buffer, " 7"), "failed: \"%s\"\n", buffer); } static void test_swprintf( void ) -- 2.32.0

2 2

[PATCH] mfplay: Fix leaks on error paths (Coverity).
by Nikolay Sivov Nov. 8, 2021

Nov. 8, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplay/player.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index 12ea653b97d..5abee9d7de8 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -1024,6 +1024,15 @@ static HRESULT media_player_create_item_from_url(struct media_player *player, IUnknown *object; HRESULT hr; + if (sync && !ret) + return E_POINTER; + + if (!sync && !player->callback) + { + WARN("Asynchronous item creation is not supported without user callback.\n"); + return MF_E_INVALIDREQUEST; + } + if (FAILED(hr = create_media_item(&player->IMFPMediaPlayer_iface, user_data, &item))) return hr; @@ -1035,9 +1044,6 @@ static HRESULT media_player_create_item_from_url(struct media_player *player, if (sync) { - if (!ret) - return E_POINTER; - *ret = NULL; if (SUCCEEDED(hr = IMFSourceResolver_CreateObjectFromURL(player->resolver, url, MF_RESOLUTION_MEDIASOURCE, @@ -1054,17 +1060,9 @@ static HRESULT media_player_create_item_from_url(struct media_player *player, } IMFPMediaItem_Release(&item->IMFPMediaItem_iface); - - return hr; } else { - if (!player->callback) - { - WARN("Asynchronous item creation is not supported without user callback.\n"); - return MF_E_INVALIDREQUEST; - } - if (ret) *ret = NULL; hr = IMFSourceResolver_BeginCreateObjectFromURL(player->resolver, url, MF_RESOLUTION_MEDIASOURCE, -- 2.33.0

1 0

[PATCH 1/2] mf/session: Implement IsRateSupported().
by Nikolay Sivov Nov. 8, 2021

Nov. 8, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/session.c | 80 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 78 insertions(+), 2 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index e3d77864494..c4dc6419b87 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -3537,6 +3537,80 @@ static HRESULT session_get_presentation_rate(struct media_session *session, MFRA return hr; } +static HRESULT session_is_presentation_rate_supported(struct media_session *session, BOOL thin, float rate, + float *nearest_rate) +{ + IMFRateSupport *rate_support; + struct media_source *source; + struct media_sink *sink; + float value = 0.0f, tmp; + unsigned int flags; + HRESULT hr = S_OK; + + if (!nearest_rate) nearest_rate = &tmp; + + if (rate == 0.0f) + { + *nearest_rate = 1.0f; + return S_OK; + } + + EnterCriticalSection(&session->cs); + + if (session->presentation.topo_status != MF_TOPOSTATUS_INVALID) + { + LIST_FOR_EACH_ENTRY(source, &session->presentation.sources, struct media_source, entry) + { + if (FAILED(hr = MFGetService((IUnknown *)source->source, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateSupport, + (void **)&rate_support))) + { + value = 1.0f; + break; + } + + value = rate; + if (FAILED(hr = IMFRateSupport_IsRateSupported(rate_support, thin, rate, &value))) + WARN("Source does not support rate %f, hr %#x.\n", rate, hr); + IMFRateSupport_Release(rate_support); + + /* Only "first" source is considered. */ + break; + } + + if (SUCCEEDED(hr)) + { + /* For sinks only check if rate is supported, ignoring nearest values. */ + LIST_FOR_EACH_ENTRY(sink, &session->presentation.sinks, struct media_sink, entry) + { + flags = 0; + if (FAILED(hr = IMFMediaSink_GetCharacteristics(sink->sink, &flags))) + break; + + if (flags & MEDIASINK_RATELESS) + continue; + + if (FAILED(MFGetService((IUnknown *)sink->sink, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateSupport, + (void **)&rate_support))) + continue; + + hr = IMFRateSupport_IsRateSupported(rate_support, thin, rate, NULL); + IMFRateSupport_Release(rate_support); + if (FAILED(hr)) + { + WARN("Sink %p does not support rate %f, hr %#x.\n", sink->sink, rate, hr); + break; + } + } + } + } + + LeaveCriticalSection(&session->cs); + + *nearest_rate = value; + + return hr; +} + static HRESULT WINAPI session_rate_support_GetSlowestRate(IMFRateSupport *iface, MFRATE_DIRECTION direction, BOOL thin, float *rate) { @@ -3560,9 +3634,11 @@ static HRESULT WINAPI session_rate_support_GetFastestRate(IMFRateSupport *iface, static HRESULT WINAPI session_rate_support_IsRateSupported(IMFRateSupport *iface, BOOL thin, float rate, float *nearest_supported_rate) { - FIXME("%p, %d, %f, %p.\n", iface, thin, rate, nearest_supported_rate); + struct media_session *session = impl_session_from_IMFRateSupport(iface); - return E_NOTIMPL; + TRACE("%p, %d, %f, %p.\n", iface, thin, rate, nearest_supported_rate); + + return session_is_presentation_rate_supported(session, thin, rate, nearest_supported_rate); } static const IMFRateSupportVtbl session_rate_support_vtbl = -- 2.33.0

1 1

[PATCH] include: Add define SQL_OV_ODBC3_80
by Alistair Leslie-Hughes Nov. 8, 2021

Nov. 8, 2021

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/sqlext.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/sqlext.h b/include/sqlext.h index ba799a36bb3..51e76a5a856 100644 --- a/include/sqlext.h +++ b/include/sqlext.h @@ -64,6 +64,7 @@ extern "C" { #define SQL_OV_ODBC2 __MSABI_LONG(2U) #define SQL_OV_ODBC3 __MSABI_LONG(3U) +#define SQL_OV_ODBC3_80 __MSABI_LONG(380U) #endif #define SQL_ACCESS_MODE 101 -- 2.33.0

1 0

Re: [PATCH] msvcrt: The '*' character should be interpreted as the beginning of the width specification
by David Gow Nov. 8, 2021

Nov. 8, 2021

In reply to Andrew Eikum: > > Signed-off-by: Andrew Eikum <aeikum at codeweavers.com> > --- > > For example, > > "%*0d", 1, ... > > becomes > > "%10d", ... > > i.e. prints ten digits. This doesn't seem to be correct to me. I've written a test program and built it with MSVC 2019: int main(int argc, char **argv) { printf("%0*02d\n",1,0); printf("%0*02d\n",30,17); printf("%*1d\n", 1, 3); printf("%0*0d\n", 1, 2); printf("% *2d\n", 0, 7); return 0; } The output on windows (and wine with native ucrtbase.dll) is: 00 17 3 2 7 The output with this patch is notably different: 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 <absurd number of zeros elided>0000017 3 0000000002 7 I've uploaded a binary for said test program here: https://davidgow.net/stuff/TestPrintf.exe Similarly, Age of Empires IV shows an incorrect timer with this patch (the text under "Gold Medal (Goal…)" should read 00:17): https://davidgow.net/stuff/aoe4-printf-bigtime.jpg This diff to the patch fixes these issues (though it doesn't update the tests): diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index 40a8a13d861..6df7fd66156 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -1050,6 +1050,10 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API flags.LeftAlign = TRUE; flags.FieldLength = -flags.FieldLength; } + + /* Ignore this length if there's another specifier. */ + if (*p >= '0' && *p <= '9') + flags.FieldLength = 0; } while (*p >= '0' && *p <= '9') { Cheers, -- David

2 2

[PATCH] add xinputuap.dll(fixed)
by Yusuf Khan Nov. 7, 2021

Nov. 7, 2021

2 1

[PATCH v2 6/6] msdasql: Fix use after free (Coverity)
by Alistair Leslie-Hughes Nov. 7, 2021

Nov. 7, 2021

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/tests/provider.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index d093c3c2087..9b75f40a741 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -130,8 +130,8 @@ static void test_Properties(void) hr = IDBProperties_GetProperties(props, 1, &propidlist, &propcnt, &propset); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(propidlist.cPropertyIDs == 14, "got %d\n", propinfoset->cPropertyInfos); - ok(propset->cProperties == 14, "got %d\n", propinfoset->cPropertyInfos); + ok(propidlist.cPropertyIDs == 14, "got %d\n", propidlist.cPropertyIDs); + ok(propset->cProperties == 14, "got %d\n", propset->cProperties); for (i = 0; i < propidlist.cPropertyIDs; i++) { -- 2.33.0

1 0

[PATCH v2 5/6] msdasql: Correct default dialect logic
by Alistair Leslie-Hughes Nov. 7, 2021

Nov. 7, 2021

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/session.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index 98a1fc50220..e52e8cd18d8 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -847,7 +847,7 @@ static HRESULT WINAPI command_SetCommandText(ICommandText *iface, REFGUID dialec struct command *command = impl_from_ICommandText( iface ); TRACE("%p, %s, %s\n", command, debugstr_guid(dialect), debugstr_w(commandstr)); - if (IsEqualGUID(&DBGUID_DEFAULT, dialect)) + if (!IsEqualGUID(&DBGUID_DEFAULT, dialect)) FIXME("Currently non Default Dialect isn't supported\n"); heap_free(command->query); -- 2.33.0

1 0

[PATCH v2 4/6] msdasql: Trace session interfaces.
by Alistair Leslie-Hughes Nov. 7, 2021

Nov. 7, 2021

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/session.c | 10 ++++++++++ dlls/msdasql/tests/provider.c | 13 +++++++++++++ 2 files changed, 23 insertions(+) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index 0298c7e7424..98a1fc50220 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -102,6 +102,16 @@ static HRESULT WINAPI session_QueryInterface(IUnknown *iface, REFIID riid, void TRACE("(%p)->(IDBCreateCommand_iface %p)\n", iface, ppv); *ppv = &session->IDBCreateCommand_iface; } + else if(IsEqualGUID(&IID_IBindResource, riid)) + { + TRACE("(%p)->(IID_IBindResource not support)\n", iface); + return E_NOINTERFACE; + } + else if(IsEqualGUID(&IID_ICreateRow, riid)) + { + TRACE("(%p)->(IID_ICreateRow not support)\n", iface); + return E_NOINTERFACE; + } if(*ppv) { diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index 6ffe17e7028..d093c3c2087 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -367,6 +367,8 @@ static void test_sessions(void) IDBCreateCommand *create_command = NULL; IGetDataSource *datasource = NULL; ISessionProperties *session_props = NULL; + IUnknown *unimplemented = NULL; + ITransactionJoin *join = NULL; IUnknown *cmd = NULL; HRESULT hr; BSTR connect_str; @@ -415,6 +417,17 @@ static void test_sessions(void) ok(hr == S_OK, "got 0x%08x\n", hr); IGetDataSource_Release(datasource); + hr = IUnknown_QueryInterface(session, &IID_ITransactionJoin, (void**)&join); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + if(hr == S_OK) + ITransactionJoin_Release(join); + + hr = IUnknown_QueryInterface(session, &IID_IBindResource, (void**)&unimplemented); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + + hr = IUnknown_QueryInterface(session, &IID_ICreateRow, (void**)&unimplemented); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + hr = IUnknown_QueryInterface(session, &IID_ISessionProperties, (void**)&session_props); ok(hr == S_OK, "got 0x%08x\n", hr); ISessionProperties_Release(session_props); -- 2.33.0

1 0

[PATCH v2 3/6] include: Add trnjoi.idl
by Alistair Leslie-Hughes Nov. 7, 2021

Nov. 7, 2021

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdaps/usrmarshal.c | 28 +++++++++++++++++++++++++++ include/Makefile.in | 1 + include/oledb.idl | 1 + include/trnjoi.idl | 42 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 72 insertions(+) create mode 100644 include/trnjoi.idl diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index 8910070fbac..dc0f2261096 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -1741,3 +1741,31 @@ HRESULT __RPC_STUB ICommandWithParameters_MapParameterNames_Stub(ICommandWithPar FIXME("(%p)->(%ld %p %p %p): stub\n", This, count, names, ordinals, error); return E_NOTIMPL; } + +HRESULT __RPC_STUB ITransactionJoin_GetOptionsObject_Stub(ITransactionJoin* This, + ITransactionOptions **options, IErrorInfo **error) +{ + FIXME("(%p)->(%p, %p): stub\n", This, options, error); + return E_NOTIMPL; +} + +HRESULT CALLBACK ITransactionJoin_GetOptionsObject_Proxy(ITransactionJoin *This, + ITransactionOptions **options) +{ + FIXME("(%p)->(%p): stub\n", This, options); + return E_NOTIMPL; +} + +HRESULT __RPC_STUB ITransactionJoin_JoinTransaction_Stub(ITransactionJoin* This, IUnknown *unk, + ISOLEVEL level, ULONG flags, ITransactionOptions *options, IErrorInfo **error) +{ + FIXME("(%p)->(%p, %d, 0x%08x, %p, %p): stub\n", This, unk, level, flags, options, error); + return E_NOTIMPL; +} + +HRESULT CALLBACK ITransactionJoin_JoinTransaction_Proxy(ITransactionJoin* This, IUnknown *unk, + ISOLEVEL level, ULONG flags, ITransactionOptions *options) +{ + FIXME("(%p)->(%p, %d, 0x%08x, %p): stub\n", This, unk, level, flags, options); + return E_NOTIMPL; +} diff --git a/include/Makefile.in b/include/Makefile.in index a16cba52642..8c4eb732e57 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -720,6 +720,7 @@ SOURCES = \ tpcshrd.h \ traffic.h \ transact.idl \ + trnjoi.idl \ twain.h \ txcoord.idl \ txdtc.idl \ diff --git a/include/oledb.idl b/include/oledb.idl index b889d72bc38..abd4d55069c 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -80,6 +80,7 @@ typedef LONG_PTR DB_LRESERVE; #include "rstupd.idl" #include "mulres.idl" #include "transact.idl" +#include "trnjoi.idl" #include "cmdwpr.idl" cpp_quote("#include <accctrl.h>") diff --git a/include/trnjoi.idl b/include/trnjoi.idl new file mode 100644 index 00000000000..fcc22ce5ea3 --- /dev/null +++ b/include/trnjoi.idl @@ -0,0 +1,42 @@ +/* + * Copyright (C) 2021 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#if 0 +#pragma makedep install +#endif + +[ + object, + uuid(0c733a5e-2a1c-11ce-ade5-00aa0044773d), + pointer_default(unique) +] +interface ITransactionJoin : IUnknown +{ + [local] + HRESULT GetOptionsObject(ITransactionOptions **options); + + [call_as(GetOptionsObject)] + HRESULT RemoteGetOptionsObject([out] ITransactionOptions **options, [out] IErrorInfo **error); + + [local] + HRESULT JoinTransaction(IUnknown *unk, [in] ISOLEVEL level, [in] ULONG flags, ITransactionOptions *options); + + [call_as(JoinTransaction)] + HRESULT RemoteJoinTransaction([in, unique] IUnknown *unk, [in] ISOLEVEL level, [in] ULONG flags, + [in] ITransactionOptions *options, [out] IErrorInfo **error); +} -- 2.33.0

1 0

[PATCH v2 1/6] msdasql: Implement IDBProperties SetProperties
by Alistair Leslie-Hughes Nov. 7, 2021

Nov. 7, 2021

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/msdasql_main.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/msdasql/msdasql_main.c b/dlls/msdasql/msdasql_main.c index d14f7957978..e58facc47fc 100644 --- a/dlls/msdasql/msdasql_main.c +++ b/dlls/msdasql/msdasql_main.c @@ -424,10 +424,27 @@ static HRESULT WINAPI dbprops_SetProperties(IDBProperties *iface, ULONG cPropert DBPROPSET rgPropertySets[]) { struct msdasql *provider = impl_from_IDBProperties(iface); + int i, j, k; - FIXME("(%p)->(%d %p)\n", provider, cPropertySets, rgPropertySets); + TRACE("(%p)->(%d %p)\n", provider, cPropertySets, rgPropertySets); - return E_NOTIMPL; + for (i=0; i < cPropertySets; i++) + { + for (j=0; j < rgPropertySets[i].cProperties; j++) + { + for(k=0; k < ARRAY_SIZE(provider->properties); k++) + { + if (provider->properties[k].id == rgPropertySets[i].rgProperties[j].dwPropertyID) + { + TRACE("Found property %d\n", provider->properties[k].id); + VariantCopy(&provider->properties[k].value, &rgPropertySets[i].rgProperties[j].vValue); + break; + } + } + } + } + + return S_OK; } static const struct IDBPropertiesVtbl dbprops_vtbl = -- 2.33.0

1 0

[PATCH 6/6] msdasql: Fix use after free (Coverity)
by Alistair Leslie-Hughes Nov. 7, 2021

Nov. 7, 2021

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/tests/provider.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index 63a51c6f60e..61b5dfc807d 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -130,8 +130,8 @@ static void test_Properties(void) hr = IDBProperties_GetProperties(props, 1, &propidlist, &propcnt, &propset); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(propidlist.cPropertyIDs == 14, "got %d\n", propinfoset->cPropertyInfos); - ok(propset->cProperties == 14, "got %d\n", propinfoset->cPropertyInfos); + ok(propidlist.cPropertyIDs == 14, "got %d\n", propidlist.cPropertyIDs); + ok(propset->cProperties == 14, "got %d\n", propset->cProperties); for (i = 0; i < propidlist.cPropertyIDs; i++) { -- 2.33.0

2 1

[PATCH 4/6] msdasql: Trace unsupported session interfaces.
by Alistair Leslie-Hughes Nov. 7, 2021

Nov. 7, 2021

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/session.c | 15 +++++++++++++++ dlls/msdasql/tests/provider.c | 10 ++++++++++ 2 files changed, 25 insertions(+) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index 0298c7e7424..e42aa2e21f2 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -102,6 +102,21 @@ static HRESULT WINAPI session_QueryInterface(IUnknown *iface, REFIID riid, void TRACE("(%p)->(IDBCreateCommand_iface %p)\n", iface, ppv); *ppv = &session->IDBCreateCommand_iface; } + else if(IsEqualGUID(&IID_ITransactionJoin, riid)) + { + TRACE("(%p)->(IID_ITransactionJoin not support)\n", iface); + return E_NOINTERFACE; + } + else if(IsEqualGUID(&IID_IBindResource, riid)) + { + TRACE("(%p)->(IID_IBindResource not support)\n", iface); + return E_NOINTERFACE; + } + else if(IsEqualGUID(&IID_ICreateRow, riid)) + { + TRACE("(%p)->(IID_ICreateRow not support)\n", iface); + return E_NOINTERFACE; + } if(*ppv) { diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index 6ffe17e7028..63a51c6f60e 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -367,6 +367,7 @@ static void test_sessions(void) IDBCreateCommand *create_command = NULL; IGetDataSource *datasource = NULL; ISessionProperties *session_props = NULL; + IUnknown *unimplemented = NULL; IUnknown *cmd = NULL; HRESULT hr; BSTR connect_str; @@ -415,6 +416,15 @@ static void test_sessions(void) ok(hr == S_OK, "got 0x%08x\n", hr); IGetDataSource_Release(datasource); + hr = IUnknown_QueryInterface(session, &IID_ITransactionJoin, (void**)&unimplemented); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + + hr = IUnknown_QueryInterface(session, &IID_IBindResource, (void**)&unimplemented); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + + hr = IUnknown_QueryInterface(session, &IID_ICreateRow, (void**)&unimplemented); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + hr = IUnknown_QueryInterface(session, &IID_ISessionProperties, (void**)&session_props); ok(hr == S_OK, "got 0x%08x\n", hr); ISessionProperties_Release(session_props); -- 2.33.0

2 1

[PATCH 5/6] msdasql: Correct default dialect logic
by Alistair Leslie-Hughes Nov. 7, 2021

Nov. 7, 2021

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/session.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index e42aa2e21f2..ca561685009 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -852,7 +852,7 @@ static HRESULT WINAPI command_SetCommandText(ICommandText *iface, REFGUID dialec struct command *command = impl_from_ICommandText( iface ); TRACE("%p, %s, %s\n", command, debugstr_guid(dialect), debugstr_w(commandstr)); - if (IsEqualGUID(&DBGUID_DEFAULT, dialect)) + if (!IsEqualGUID(&DBGUID_DEFAULT, dialect)) FIXME("Currently non Default Dialect isn't supported\n"); heap_free(command->query); -- 2.33.0

1 0

[PATCH 3/6] include: Add trnjoi.idl
by Alistair Leslie-Hughes Nov. 7, 2021

Nov. 7, 2021

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdaps/usrmarshal.c | 28 +++++++++++++++++++++++++++ include/Makefile.in | 1 + include/oledb.idl | 1 + include/trnjoi.idl | 42 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 72 insertions(+) create mode 100644 include/trnjoi.idl diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index 8910070fbac..dc0f2261096 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -1741,3 +1741,31 @@ HRESULT __RPC_STUB ICommandWithParameters_MapParameterNames_Stub(ICommandWithPar FIXME("(%p)->(%ld %p %p %p): stub\n", This, count, names, ordinals, error); return E_NOTIMPL; } + +HRESULT __RPC_STUB ITransactionJoin_GetOptionsObject_Stub(ITransactionJoin* This, + ITransactionOptions **options, IErrorInfo **error) +{ + FIXME("(%p)->(%p, %p): stub\n", This, options, error); + return E_NOTIMPL; +} + +HRESULT CALLBACK ITransactionJoin_GetOptionsObject_Proxy(ITransactionJoin *This, + ITransactionOptions **options) +{ + FIXME("(%p)->(%p): stub\n", This, options); + return E_NOTIMPL; +} + +HRESULT __RPC_STUB ITransactionJoin_JoinTransaction_Stub(ITransactionJoin* This, IUnknown *unk, + ISOLEVEL level, ULONG flags, ITransactionOptions *options, IErrorInfo **error) +{ + FIXME("(%p)->(%p, %d, 0x%08x, %p, %p): stub\n", This, unk, level, flags, options, error); + return E_NOTIMPL; +} + +HRESULT CALLBACK ITransactionJoin_JoinTransaction_Proxy(ITransactionJoin* This, IUnknown *unk, + ISOLEVEL level, ULONG flags, ITransactionOptions *options) +{ + FIXME("(%p)->(%p, %d, 0x%08x, %p): stub\n", This, unk, level, flags, options); + return E_NOTIMPL; +} diff --git a/include/Makefile.in b/include/Makefile.in index a16cba52642..8c4eb732e57 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -720,6 +720,7 @@ SOURCES = \ tpcshrd.h \ traffic.h \ transact.idl \ + trnjoi.idl \ twain.h \ txcoord.idl \ txdtc.idl \ diff --git a/include/oledb.idl b/include/oledb.idl index b889d72bc38..abd4d55069c 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -80,6 +80,7 @@ typedef LONG_PTR DB_LRESERVE; #include "rstupd.idl" #include "mulres.idl" #include "transact.idl" +#include "trnjoi.idl" #include "cmdwpr.idl" cpp_quote("#include <accctrl.h>") diff --git a/include/trnjoi.idl b/include/trnjoi.idl new file mode 100644 index 00000000000..fcc22ce5ea3 --- /dev/null +++ b/include/trnjoi.idl @@ -0,0 +1,42 @@ +/* + * Copyright (C) 2021 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#if 0 +#pragma makedep install +#endif + +[ + object, + uuid(0c733a5e-2a1c-11ce-ade5-00aa0044773d), + pointer_default(unique) +] +interface ITransactionJoin : IUnknown +{ + [local] + HRESULT GetOptionsObject(ITransactionOptions **options); + + [call_as(GetOptionsObject)] + HRESULT RemoteGetOptionsObject([out] ITransactionOptions **options, [out] IErrorInfo **error); + + [local] + HRESULT JoinTransaction(IUnknown *unk, [in] ISOLEVEL level, [in] ULONG flags, ITransactionOptions *options); + + [call_as(JoinTransaction)] + HRESULT RemoteJoinTransaction([in, unique] IUnknown *unk, [in] ISOLEVEL level, [in] ULONG flags, + [in] ITransactionOptions *options, [out] IErrorInfo **error); +} -- 2.33.0

1 0

[PATCH 2/6] include: Add transact.idl to oledb.idl
by Alistair Leslie-Hughes Nov. 7, 2021

Nov. 7, 2021

Since uuid.lib includes oledb.h, we get duplicate symbols in adsiid since uuid.lib is linked. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/oledb.idl | 1 + libs/adsiid/adsiid.c | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/include/oledb.idl b/include/oledb.idl index 49c0c304b2d..b889d72bc38 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -79,6 +79,7 @@ typedef LONG_PTR DB_LRESERVE; #include "rstchg.idl" #include "rstupd.idl" #include "mulres.idl" +#include "transact.idl" #include "cmdwpr.idl" cpp_quote("#include <accctrl.h>") diff --git a/libs/adsiid/adsiid.c b/libs/adsiid/adsiid.c index fc0b8b1bf4e..e4e85d89b84 100644 --- a/libs/adsiid/adsiid.c +++ b/libs/adsiid/adsiid.c @@ -25,4 +25,3 @@ #include "initguid.h" #include "iads.h" -#include "transact.h" -- 2.33.0

1 0

[PATCH 1/6] msdasql: Implement IDBProperties SetProperties
by Alistair Leslie-Hughes Nov. 7, 2021

Nov. 7, 2021

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/msdasql_main.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/msdasql/msdasql_main.c b/dlls/msdasql/msdasql_main.c index d14f7957978..e58facc47fc 100644 --- a/dlls/msdasql/msdasql_main.c +++ b/dlls/msdasql/msdasql_main.c @@ -424,10 +424,27 @@ static HRESULT WINAPI dbprops_SetProperties(IDBProperties *iface, ULONG cPropert DBPROPSET rgPropertySets[]) { struct msdasql *provider = impl_from_IDBProperties(iface); + int i, j, k; - FIXME("(%p)->(%d %p)\n", provider, cPropertySets, rgPropertySets); + TRACE("(%p)->(%d %p)\n", provider, cPropertySets, rgPropertySets); - return E_NOTIMPL; + for (i=0; i < cPropertySets; i++) + { + for (j=0; j < rgPropertySets[i].cProperties; j++) + { + for(k=0; k < ARRAY_SIZE(provider->properties); k++) + { + if (provider->properties[k].id == rgPropertySets[i].rgProperties[j].dwPropertyID) + { + TRACE("Found property %d\n", provider->properties[k].id); + VariantCopy(&provider->properties[k].value, &rgPropertySets[i].rgProperties[j].vValue); + break; + } + } + } + } + + return S_OK; } static const struct IDBPropertiesVtbl dbprops_vtbl = -- 2.33.0

1 0

[PATCH 1/3] include: Update existing provider definitions in uiautomationcore.idl.
by Connor McAdams Nov. 6, 2021

Nov. 6, 2021

Update definitions to match newer Windows SDK headers. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- include/uiautomationcore.idl | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/include/uiautomationcore.idl b/include/uiautomationcore.idl index 3ae6dac4b3f..9ee79170e4a 100644 --- a/include/uiautomationcore.idl +++ b/include/uiautomationcore.idl @@ -26,7 +26,10 @@ enum ProviderOptions { ProviderOptions_NonClientAreaProvider = 0x0004, ProviderOptions_OverrideProvider = 0x0008, ProviderOptions_ProviderOwnsSetFocus = 0x0010, - ProviderOptions_UseComThreading = 0x0020 + ProviderOptions_UseComThreading = 0x0020, + ProviderOptions_RefuseNonClientSupport = 0x0040, + ProviderOptions_HasNativeIAccessible = 0x0080, + ProviderOptions_UseClientCoordinates = 0x0100, }; typedef int PROPERTYID; @@ -48,7 +51,8 @@ library UIA [ object, uuid(d6dd68d1-86fd-4332-8666-9abedea2d24c), - pointer_default(unique) + pointer_default(unique), + oleautomation ] interface IRawElementProviderSimple : IUnknown { -- 2.25.1

1 2

[PATCH] po: Update Traditional Chinese translation.
by Chilung Chan Nov. 6, 2021

Nov. 6, 2021

Signed-off-by: Chilung Chan <eason066(a)gmail.com> --- To reviewers: Give yourself sufficient time to review the translations, especially for command help. po/zh_TW.po | 1356 +++++++++++++++++++++++---------------------------- 1 file changed, 598 insertions(+), 758 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index b72bc2b836a..3060728294a 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.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: 2021-10-30 18:53+0800\n" +"PO-Revision-Date: 2021-11-06 18:33+0800\n" "Last-Translator: Chilung Chan <eason066(a)gmail.com>\n" "Language-Team: Chinese (Taiwan)\n" "Language: zh_TW\n" @@ -4558,7 +4558,7 @@ msgstr "自動資料區段超出 64k。\n" #: dlls/kernel32/winerror.mc:793 msgid "Ring 2 segment must be movable.\n" -msgstr "環 2 資料段必須可被移動。\n" +msgstr "環形第 2 資料段必須可被移動。\n" #: dlls/kernel32/winerror.mc:798 msgid "Relocation chain exceeds segment limit in %1.\n" @@ -4582,11 +4582,11 @@ msgstr "檔案名稱過長。\n" #: dlls/kernel32/winerror.mc:823 msgid "Ring 2 stack in use.\n" -msgstr "環 2 堆疊使用中。\n" +msgstr "環形第 2 堆疊現正使用中。\n" #: dlls/kernel32/winerror.mc:828 msgid "Error in use of filename wildcards.\n" -msgstr "使用檔名萬用字元時發生錯誤。\n" +msgstr "使用檔案名稱萬用字元時發生錯誤。\n" #: dlls/kernel32/winerror.mc:833 msgid "Invalid signal number.\n" @@ -6866,7 +6866,7 @@ msgstr "無法存取檔案。\n" #: dlls/kernel32/winerror.mc:3693 msgid "The filename cannot be resolved.\n" -msgstr "無法解析檔名。\n" +msgstr "無法解析檔案名稱。\n" #: dlls/kernel32/winerror.mc:3698 msgid "RPC entry type mismatch.\n" @@ -12257,7 +12257,7 @@ msgstr "驅動程式未啟用。" msgid "" "The specified device is already in use. Wait until it is free, and then try " "again." -msgstr "指定的裝置已在使用中。請等候該裝置不再使用，然後再試一次。" +msgstr "指定的裝置已在使用中。請等待該裝置空出來，然後再試一次。" #: dlls/winmm/winmm.rc:37 msgid "The specified device handle is invalid." @@ -12430,7 +12430,7 @@ msgstr "您正在使用的多媒體控制介面裝置不支援指定的命令。 #: dlls/winmm/winmm.rc:76 msgid "" "Cannot find the specified file. Make sure the path and filename are correct." -msgstr "找不到指定的檔案。請確定路徑和檔名正確。" +msgstr "找不到指定的檔案。請確定路徑和檔案名稱正確。" #: dlls/winmm/winmm.rc:77 msgid "The device driver is not ready." @@ -12623,15 +12623,15 @@ msgid "" "All wave devices that can play files in the current format are in use. Wait " "until a wave device is free, and then try again." msgstr "" -"所有可以用目前格式播放檔案的 wave 裝置都在使用中。請等待其中一個 wave 裝置不" -"再使用，然後再試一次。" +"所有可以用目前格式播放檔案的 wave 裝置都在使用中。請等待其中一個 wave 裝置" +"空出來，然後再試一次。" #: dlls/winmm/winmm.rc:113 msgid "" "Cannot set the current wave device for play back because it is in use. Wait " "until the device is free, and then try again." msgstr "" -"目前的 wave 裝置正在使用中，所以無法設定它來播放。請等待該裝置不再使用，再試" +"目前的 wave 裝置正在使用中，所以無法設定它來播放。請等待該裝置空出來，然後再試" "一次。" #: dlls/winmm/winmm.rc:114 @@ -12639,15 +12639,15 @@ msgid "" "All wave devices that can record files in the current format are in use. " "Wait until a wave device is free, and then try again." msgstr "" -"所有可以用目前格式記錄檔案的 wave 裝置都在使用中。請等待其中一個 wave 裝置不" -"再使用，然後再試一次。" +"所有可以用目前格式記錄檔案的 wave 裝置都在使用中。請等待其中一個 wave 裝置" +"空出來，然後再試一次。" #: dlls/winmm/winmm.rc:115 msgid "" "Cannot set the current wave device for recording because it is in use. Wait " "until the device is free, and then try again." msgstr "" -"無法設定目前的 wave 裝置去記錄，因為它正在使用中。請等待該裝置不再使用，然後" +"無法設定目前的 wave 裝置去記錄，因為它正在使用中。請等待該裝置空出來，然後" "再試一次。" #: dlls/winmm/winmm.rc:116 @@ -12696,7 +12696,7 @@ msgstr "「歌曲指標」的時間格式和 SMPTE 彼此互斥。您無法一 msgid "" "The specified MIDI port is already in use. Wait until it is free, and then " "try again." -msgstr "指定的 MIDI 連接埠已在使用中。請等待它不再使用，然後再試一次。" +msgstr "指定的 MIDI 連接埠已在使用中。請等待該連接埠空出來，然後再試一次。" #: dlls/winmm/winmm.rc:131 msgid "" @@ -13057,11 +13057,11 @@ msgid "" msgstr "" "ATTRIB - 顯示或變更檔案屬性。\n" "\n" -"語法：\n" -"ATTRIB [+R | -R] [+A | -A ] [+S | -S] [+H | -H] [儲存裝置:][路徑][檔名]\n" +"語法:\n" +"ATTRIB [+R | -R] [+A | -A ] [+S | -S] [+H | -H] [儲存裝置:][路徑][檔案名稱]\n" " [/S [/D]]\n" "\n" -"其中：\n" +"其中:\n" "\n" " + 設定一個屬性。\n" " - 清空一個屬性。\n" @@ -13069,7 +13069,7 @@ msgstr "" " A 封存檔案屬性。\n" " S 系統檔案屬性。\n" " H 隱藏檔案屬性。\n" -" [儲存裝置:][路徑][檔名]\n" +" [儲存裝置:][路徑][檔案名稱]\n" " 指定 attrib 要處理的一個或多個檔案。\n" " /S 處理在目前資料夾和所有子資料夾中的匹配檔案。\n" " /D 同樣處理資料夾。\n" @@ -13114,15 +13114,6 @@ msgid "Clock" msgstr "時鐘" #: programs/cmd/cmd.rc:40 -#, fuzzy -#| msgid "" -#| "CALL <batchfilename> is used within a batch file to execute commands\n" -#| "from another batch file. When the batch file exits, control returns to\n" -#| "the file which called it. The CALL command may supply parameters to the\n" -#| "called procedure.\n" -#| "\n" -#| "Changes to default directory, environment variables etc made within a\n" -#| "called procedure are inherited by the caller.\n" msgid "" "CALL <batchfilename> is used within a batch file to execute commands from\n" "another batch file. When the batch file exits, control returns to the file\n" @@ -13132,7 +13123,7 @@ msgid "" "Changes to default directory, environment variables etc made within a\n" "called procedure are inherited by the caller.\n" msgstr "" -"CALL <批次檔名> 是使用在批次檔之內以執行其他\n" +"CALL <批次檔名稱> 是使用在批次檔之內以執行其他\n" "批次檔中的指令。從其他的批次檔離開時，控制權會\n" "回到呼叫它的檔案。CALL 命令可以提供參數給\n" "被呼叫的程序。\n" @@ -13141,10 +13132,6 @@ msgstr "" "將會由呼叫者所繼承。\n" #: programs/cmd/cmd.rc:44 -#, fuzzy -#| msgid "" -#| "CD <dir> is the short version of CHDIR. It changes the current\n" -#| "default directory.\n" msgid "" "CD <directory> is the short version of CHDIR. It changes the current\n" "default directory.\n" @@ -13153,8 +13140,6 @@ msgstr "" "預設目錄。\n" #: programs/cmd/cmd.rc:47 -#, fuzzy -#| msgid "CHDIR <dir> changes the current default directory.\n" msgid "CHDIR <directory> changes the current default directory.\n" msgstr "CHDIR <目錄> 變更目前的預設目錄。\n" @@ -13164,7 +13149,7 @@ msgstr "CLS 清空主控臺螢幕。\n" #: programs/cmd/cmd.rc:53 msgid "COPY <filename> copies a file.\n" -msgstr "COPY <檔名> 複製檔案。\n" +msgstr "COPY <檔案名稱> 複製檔案。\n" #: programs/cmd/cmd.rc:56 msgid "CTTY changes the input/output device.\n" @@ -13176,23 +13161,13 @@ msgstr "DATE 顯示或變更系統日期。\n" #: programs/cmd/cmd.rc:62 msgid "DEL <filename> deletes a file or set of files.\n" -msgstr "DEL <檔名> 刪除檔案或一組檔案。\n" +msgstr "DEL <檔案名稱> 刪除檔案或一組檔案。\n" #: programs/cmd/cmd.rc:65 msgid "DIR lists the contents of a directory.\n" msgstr "DIR 列出目錄的內容。\n" #: programs/cmd/cmd.rc:75 -#, fuzzy -#| msgid "" -#| "ECHO <string> displays <string> on the current terminal device.\n" -#| "\n" -#| "ECHO ON causes all subsequent commands in a batch file to be displayed\n" -#| "on the terminal device before they are executed.\n" -#| "\n" -#| "ECHO OFF reverses the effect of a previous ECHO ON (ECHO is OFF by\n" -#| "default). The ECHO OFF command can be prevented from displaying by\n" -#| "preceding it with an @ sign.\n" msgid "" "ECHO <string> displays <string> on the current terminal device.\n" "\n" @@ -13214,14 +13189,9 @@ msgstr "" #: programs/cmd/cmd.rc:78 msgid "ERASE <filename> deletes a file or set of files.\n" -msgstr "ERASE <檔名> 刪除一個檔案或一組檔案。\n" +msgstr "ERASE <檔案名稱> 刪除一個檔案或一組檔案。\n" #: programs/cmd/cmd.rc:85 -#, fuzzy -#| msgid "" -#| "The FOR command is used to execute a command for each of a set of files.\n" -#| "\n" -#| "Syntax: FOR %variable IN (set) DO command\n" msgid "" "The FOR command is used to execute a command for each of a set of files.\n" "\n" @@ -13231,21 +13201,11 @@ msgid "" msgstr "" "FOR 命令用來向檔案集合中的每一個檔案執行命令。\n" "\n" -"語法：FOR %變數 IN (集合) DO 命令\n" +"語法: FOR %變數 IN (集合) DO 命令\n" +"\n" +"當在批次檔裡使用 FOR 的時候，必須使用兩個 % 符號。\n" #: programs/cmd/cmd.rc:97 -#, fuzzy -#| msgid "" -#| "The GOTO command transfers execution to another statement within a\n" -#| "batch file.\n" -#| "\n" -#| "The label which is the target of a GOTO may be up to 255 characters\n" -#| "long but may not include spaces (this is different from other operating\n" -#| "systems). If two or more identical labels exist in a batch file the\n" -#| "first one will always be executed. Attempting to GOTO a nonexistent\n" -#| "label terminates the batch file execution.\n" -#| "\n" -#| "GOTO has no effect when used interactively.\n" msgid "" "The GOTO command transfers execution to another statement within a batch\n" "file.\n" @@ -13290,7 +13250,7 @@ msgid "" msgstr "" "IF 用於有條件地執行命令。\n" "\n" -"語法：IF [NOT] EXIST 檔名命令\n" +"語法: IF [NOT] EXIST 檔名命令\n" " IF [NOT] 字串一==字串二命令\n" " IF [NOT] ERRORLEVEL 數字命令\n" "\n" @@ -13305,11 +13265,11 @@ msgid "" "The command will prompt you for the new volume label for the given drive.\n" "You can display the disk volume label with the VOL command.\n" msgstr "" -"LABEL 用於設定磁碟卷冊標貼。\n" +"LABEL 用於設定磁碟的磁碟區標籤。\n" "\n" -"語法：LABEL [裝置代號:]\n" -"命令將向您提示詢問新的卷冊標貼用於給定的儲存裝置。\n" -"您可以利用 VOL 命令來顯示磁碟卷冊標貼。\n" +"語法: LABEL [裝置代號:]\n" +"命令將向您提示詢問要讓給定的儲存裝置使用的磁碟區標籤。\n" +"您可以利用 VOL 命令來顯示磁碟的磁碟區標籤。\n" #: programs/cmd/cmd.rc:121 msgid "MD <name> is the short version of MKDIR. It creates a subdirectory.\n" @@ -13320,17 +13280,6 @@ msgid "MKDIR <name> creates a subdirectory.\n" msgstr "MKDIR <名稱> 建立子目錄。\n" #: programs/cmd/cmd.rc:131 -#, fuzzy -#| msgid "" -#| "MOVE relocates a file or directory to a new point within the file " -#| "system.\n" -#| "\n" -#| "If the item being moved is a directory then all the files and " -#| "subdirectories\n" -#| "below the item are moved as well.\n" -#| "\n" -#| "MOVE fails if the old and new locations are on different DOS drive " -#| "letters.\n" msgid "" "MOVE relocates a file or directory to a new point within the file system.\n" "\n" @@ -13347,17 +13296,6 @@ msgstr "" "如果舊的和新的位置在不同的 DOS 儲存裝置代號之上，MOVE 將會失敗。\n" #: programs/cmd/cmd.rc:142 -#, fuzzy -#| msgid "" -#| "PATH displays or changes the cmd search path.\n" -#| "\n" -#| "Entering PATH will display the current PATH setting (initially taken\n" -#| "from the registry). To change the setting follow the\n" -#| "PATH command with the new value.\n" -#| "\n" -#| "It is also possible to modify the PATH by using the PATH environment\n" -#| "variable, for example:\n" -#| "PATH %PATH%;c:\\temp\n" msgid "" "PATH displays or changes the cmd search path.\n" "\n" @@ -13376,16 +13314,10 @@ msgstr "" "PATH 命令之後緊接新的值。\n" "\n" "也可以藉由 PATH 環境變數來修改 PATH，\n" -"舉例來說：\n" +"舉例來說:\n" "PATH %PATH%;c:\\temp\n" #: programs/cmd/cmd.rc:148 -#, fuzzy -#| msgid "" -#| "PAUSE displays a message on the screen asking the user to press a key.\n" -#| "\n" -#| "It is mainly useful in batch files to allow the user to read the output\n" -#| "of a previous command before it scrolls off the screen.\n" msgid "" "PAUSE displays a message on the screen asking the user to press a key.\n" "\n" @@ -13398,30 +13330,6 @@ msgstr "" "輸出捲動離開螢幕之前能夠去讀取它。\n" #: programs/cmd/cmd.rc:169 -#, fuzzy -#| msgid "" -#| "PROMPT sets the command-line prompt.\n" -#| "\n" -#| "The string following the PROMPT command (and the space immediately " -#| "after)\n" -#| "appears at the beginning of the line when cmd is waiting for input.\n" -#| "\n" -#| "The following character strings have the special meaning shown:\n" -#| "\n" -#| "$$ Dollar sign $_ Linefeed $b Pipe sign (|)\n" -#| "$d Current date $e Escape $g > sign\n" -#| "$l < sign $n Current drive $p Current path\n" -#| "$q Equal sign $t Current time $v cmd version\n" -#| "\n" -#| "Note that entering the PROMPT command without a prompt-string resets the\n" -#| "prompt to the default, which is the current directory (which includes " -#| "the\n" -#| "current drive letter) followed by a greater-than (>) sign.\n" -#| "(like a command PROMPT $p$g).\n" -#| "\n" -#| "The prompt can also be changed by altering the PROMPT environment " -#| "variable,\n" -#| "so the command 'SET PROMPT=text' has the same effect as 'PROMPT text'.\n" msgid "" "PROMPT sets the command-line prompt.\n" "\n" @@ -13448,7 +13356,7 @@ msgstr "" "跟隨著 PROMPT 命令的字串 (以及緊接於後的空格)\n" "將會在 cmd 等待輸入時出現於一列的起始部分。\n" "\n" -"下列字元串有特殊平均顯示：\n" +"下列字元串有特殊平均顯示:\n" "\n" "$$ 錢幣符號 $_ 送列鍵 $b 管線符號 (|)\n" "$d 目前日期 $e 退出 $g > 符號\n" @@ -13463,56 +13371,30 @@ msgstr "" "因此命令 SET PROMPT=text 與 PROMPT text 具有相同的效果。\n" #: programs/cmd/cmd.rc:173 -#, fuzzy -#| msgid "" -#| "A command line beginning with REM (followed by a space) performs no\n" -#| "action, and can therefore be used as a comment in a batch file.\n" msgid "" "A command line beginning with REM (followed by a space) performs no action,\n" "and can therefore be used as a comment in a batch file.\n" msgstr "" -"以 REM 起始的命令列 (之後緊接空格) 不會進行任何\n" -"動作，因而可以做為批次檔中的註釋。\n" +"以 REM 起始的命令列 (之後緊接空格) 不會進行任何動作，\n" +"因而可以做為批次檔中的註釋。\n" #: programs/cmd/cmd.rc:176 msgid "REN <filename> is the short version of RENAME. It renames a file.\n" -msgstr "REN <檔名> 是 RENAME 的簡短版本。它會重新命名檔案。\n" +msgstr "REN <檔案名稱> 是 RENAME 的簡短版本。它會重新命名檔案。\n" #: programs/cmd/cmd.rc:178 msgid "RENAME <filename> renames a file.\n" -msgstr "RENAME <檔名> 重新命名檔案。\n" +msgstr "RENAME <檔案名稱> 重新命名檔案。\n" #: programs/cmd/cmd.rc:181 -#, fuzzy -#| msgid "RD <dir> is the short version of RMDIR. It deletes a subdirectory.\n" msgid "RD <directory> is the short version of RMDIR. It deletes a directory.\n" -msgstr "RD <目錄> 是 RMDIR 的簡短版本。它會刪除子目錄。\n" +msgstr "RD <目錄> 是 RMDIR 的簡短版本。它會刪除目錄。\n" #: programs/cmd/cmd.rc:183 -#, fuzzy -#| msgid "RMDIR <dir> deletes a subdirectory.\n" msgid "RMDIR <directory> deletes a directory.\n" -msgstr "RMDIR <目錄> 刪除子目錄。\n" +msgstr "RMDIR <目錄> 刪除目錄。\n" #: programs/cmd/cmd.rc:229 -#, fuzzy -#| msgid "" -#| "SET displays or changes the cmd environment variables.\n" -#| "\n" -#| "SET without parameters shows all of the current environment.\n" -#| "\n" -#| "To create or modify an environment variable the syntax is:\n" -#| "\n" -#| "SET <variable>=<value>\n" -#| "\n" -#| "where <variable> and <value> are character strings. There must be no\n" -#| "space before the equals sign, nor can the variable name\n" -#| "have embedded spaces.\n" -#| "\n" -#| "Under Wine, the environment of the underlying operating system is\n" -#| "included into the Win32 environment, there will generally therefore be\n" -#| "many more values than in a native Win32 implementation. Note that it is\n" -#| "not possible to affect the operating system environment from within cmd.\n" msgid "" "SET displays or changes the cmd environment variables.\n" "\n" @@ -13534,24 +13416,18 @@ msgstr "" "\n" "不接參數的 SET 將顯示目前的全部環境。\n" "\n" -"要建立或修改環境變數的語法是：\n" +"要建立或修改環境變數的語法是:\n" "\n" "SET <變數名稱>=<變數值>\n" "\n" -"其中 <變數名稱> 和 <變數值> 都是字串。在等號之前必須沒有\n" -"空格，而變數名稱也不可以嵌入空格。\n" +"其中 <變數名稱> 和 <變數值> 都是字串。在等號之前必須沒有空格，\n" +"而變數名稱也不可以嵌入空格。\n" "\n" -"在 Wine 之下，下層的作業系統環境也被\n" -"包含於 Win32 環境之中，因此通常會比在原生的 Win32 實作中\n" -"還要多出更多變數值。要注意的是，從 cmd 之中是不可能\n" -"去影響作業系統的環境。\n" +"在 Wine 之下，下層的作業系統環境也被包含於 Win32 環境之中，\n" +"因此通常會比在原生的 Win32 實作中還要多出更多變數值。\n" +"要注意的是，從 cmd 之中是不可能去影響作業系統的環境。\n" #: programs/cmd/cmd.rc:234 -#, fuzzy -#| msgid "" -#| "SHIFT is used in a batch file to remove one parameter from the head of\n" -#| "the list, so parameter 2 becomes parameter 1 and so on. It has no effect\n" -#| "if called from the command line.\n" msgid "" "SHIFT is used in a batch file to remove one parameter from the head of the\n" "list, so parameter 2 becomes parameter 1 and so on. It has no effect if\n" @@ -13562,35 +13438,6 @@ msgstr "" "將不會有任何效果。\n" #: programs/cmd/cmd.rc:212 -#, fuzzy -#| msgid "" -#| "Start a program, or open a document in the program normally used for " -#| "files with that suffix.\n" -#| "Usage:\n" -#| "start [options] program_filename [...]\n" -#| "start [options] document_filename\n" -#| "\n" -#| "Options:\n" -#| "\"title\" Specifies the title of the child windows.\n" -#| "/d directory Start the program in the specified directory.\n" -#| "/b Don't create a new console for the program.\n" -#| "/i Start the program with fresh environment variables.\n" -#| "/min Start the program minimized.\n" -#| "/max Start the program maximized.\n" -#| "/low Start the program in the idle priority class.\n" -#| "/normal Start the program in the normal priority class.\n" -#| "/high Start the program in the high priority class.\n" -#| "/realtime Start the program in the realtime priority class.\n" -#| "/abovenormal Start the program in the abovenormal priority class.\n" -#| "/belownormal Start the program in the belownormal priority class.\n" -#| "/node n Start the program on the specified NUMA node.\n" -#| "/affinity mask Start the program with the specified affinity mask.\n" -#| "/wait Wait for the started program to finish, then exit with its " -#| "exit code.\n" -#| "/unix Use a Unix filename and start the file like Windows " -#| "explorer.\n" -#| "/ProgIDOpen Open a document using the specified progID.\n" -#| "/? Display this help and exit.\n" msgid "" "Start a program, or open a document in the program normally used for files\n" "with that suffix.\n" @@ -13620,30 +13467,30 @@ msgid "" "/ProgIDOpen Open a document using the specified progID.\n" "/? Display this help and exit.\n" msgstr "" -"啟始一個程式，或是利用關聯該檔案字尾的程式來開啟文件。\n" -"用法：\n" +"啟動程式，或根據檔案的後綴，使用一般用於開啟該後綴的程式來開啟文件。\n" +"用法:\n" "start [選項] 程式檔案名稱 [...]\n" "start [選項] 文件檔案名稱\n" "\n" -"選項：\n" -"「標題」指定子視窗的標題。\n" -"/d 目錄在指定的目錄中啟始程式。\n" -"/b 無法為程式建立新的主控臺。\n" -"/i 以新的環境變數啟始程式。\n" -"/min 啟始程式時縮到最小。\n" -"/max 啟始程式時放到最大。\n" -"/low 在閒置優先權類別中啟始程式。\n" -"/normal 在一般優先權類別中啟始程式。\n" -"/high 在高優先權類別中啟始程式。\n" -"/realtime 在即時優先權類別中啟始程式。\n" -"/abovenormal 在正常之上優先權類別中啟始程式。\n" -"/belownormal 在正常之下優先權類別中啟始程式。\n" -"/node n 在指定的 NUMA 節點之上啟始程式。\n" -"/affinity 遮罩以指定的近似遮罩啟始程式。\n" -"/wait 等待啟始的程式直到完成，然後以它的離開代碼離開。\n" -"/unix 使用 Unix 檔名並如同 Windows 檔案總管來啟始檔案。\n" -"/ProgIDOpen 使用指定的 progID 開啟文件。\n" -"/? 顯示這份說明然後離開。\n" +"選項:\n" +"\"標題\" 指定子視窗的標題。\n" +"/d 目錄於指定的目錄開啟程式。\n" +"/b 不要為程式建立新的主控臺。\n" +"/i 使用新的環境變數來啟動程式。\n" +"/min 啟動程式時將視窗最小化。\n" +"/max 啟動程式時將視窗最大化。\n" +"/low 在 Idle 優先類別中啟動程式。\n" +"/normal 在 Normal 優先類別中啟動程式。\n" +"/high 在 High 優先類別中啟動程式。\n" +"/realtime 在 Realtime 優先類別中啟動程式。\n" +"/abovenormal 在 Abovenormal 優先類別中啟動程式。\n" +"/belownormal 在 Belownormal 優先類別中啟動程式。\n" +"/node n 以指定的 NUMA 節點啟動程式。\n" +"/affinity 遮罩以指定的親和性遮罩啟動程式。\n" +"/wait 啟動應用程式並等候它終止，結束時會給予結束代碼。\n" +"/unix 使用 Unix 檔案名稱，並像 Windows 檔案總管一樣開啟檔案\n" +"/ProgIDOpen 使用指定的 progID 開啟檔案。\n" +"/? 顯示這個說明並結束。\n" #: programs/cmd/cmd.rc:237 msgid "TIME sets or shows the current system time.\n" @@ -13654,15 +13501,11 @@ msgid "TITLE <string> sets the window title for the cmd window.\n" msgstr "TITLE <字串> 設定 cmd 視窗的視窗標題。\n" #: programs/cmd/cmd.rc:244 -#, fuzzy -#| msgid "" -#| "TYPE <filename> copies <filename> to the console device (or elsewhere\n" -#| "if redirected). No check is made that the file is readable text.\n" msgid "" "TYPE <filename> copies <filename> to the console device (or elsewhere if\n" "redirected). No check is made that the file is readable text.\n" msgstr "" -"TYPE <檔名> 將 <檔名> 的內容複製到主控臺裝置 (或是其他被\n" +"TYPE <檔案名稱> 將 <檔案名稱> 的內容複製到主控臺裝置 (或是其他被\n" "重新導向的地方)。不會檢查該檔案是否為可讀的文字。\n" #: programs/cmd/cmd.rc:253 @@ -13675,7 +13518,7 @@ msgid "" "\n" "The verify flag has no function in Wine.\n" msgstr "" -"VERIFY 用來設定、清空或測試驗證旗標。有效的形式包括：\n" +"VERIFY 用來設定、清空或測試驗證旗標。有效的形式包括:\n" "\n" "VERIFY ON\t設定旗標。\n" "VERIFY OFF\t清空旗標。\n" @@ -13689,13 +13532,9 @@ msgstr "VER 顯示您正在執行的 cmd 版本。\n" #: programs/cmd/cmd.rc:259 msgid "VOL shows the volume label of a disk device.\n" -msgstr "VOL 顯示磁碟裝置的卷冊標貼。\n" +msgstr "VOL 顯示磁碟裝置的磁碟區標籤。\n" #: programs/cmd/cmd.rc:263 -#, fuzzy -#| msgid "" -#| "ENDLOCAL ends localization of environment changes in a batch file\n" -#| "which were introduced by a preceding SETLOCAL.\n" msgid "" "ENDLOCAL ends localization of environment changes in a batch file which\n" "were introduced by a preceding SETLOCAL.\n" @@ -13716,36 +13555,22 @@ msgstr "" "\n" "SETLOCAL 之後完成的環境變更對於批次檔而言為本地，\n" "並被保留直到遇到下一個 ENDLOCAL (或是檔案\n" -"的結束，取決於誰先出現)，前一個環境的設定值\n" +"的結尾，取決於誰先出現)，前一個環境的設定值\n" "則於該點被儲存。\n" #: programs/cmd/cmd.rc:275 -#, fuzzy -#| msgid "" -#| "PUSHD <directoryname> saves the current directory onto a\n" -#| "stack, and then changes the current directory to the supplied one.\n" msgid "" "PUSHD <directory> saves the current directory onto a stack, and then\n" "changes the current directory to the supplied one.\n" msgstr "" -"PUSHD <目錄名> 儲存目前的目錄到\n" -"堆疊中，然後變更現行目錄到所給定的目錄。\n" +"PUSHD <目錄> 儲存目前的目錄到堆疊中，\n" +"然後變更現行目錄到所給定的目錄。\n" #: programs/cmd/cmd.rc:278 msgid "POPD changes current directory to the last one saved with PUSHD.\n" msgstr "POPD 變更現行目錄到上一個利用 PUSHD 儲存的目錄。\n" #: programs/cmd/cmd.rc:288 -#, fuzzy -#| msgid "" -#| "ASSOC shows or modifies file extension associations.\n" -#| "\n" -#| "Syntax: ASSOC [.ext[=[fileType]]]\n" -#| "\n" -#| "ASSOC without parameters displays current file associations.\n" -#| "If used with only a file extension, displays the current association.\n" -#| "Specifying no file type after the equal sign removes the current " -#| "association, if any.\n" msgid "" "ASSOC shows or modifies file extension associations.\n" "\n" @@ -13758,25 +13583,13 @@ msgid "" msgstr "" "ASSOC 顯示或修改副檔名的關聯。\n" "\n" -"語法：ASSOC [.ext[=[檔案型態]]]\n" +"語法: ASSOC [.ext[=[檔案型態]]]\n" "\n" "ASSOC 不加參數將顯示目前的檔案關聯。\n" "如果只使用副檔名，則顯示它目前的關聯。\n" "在等號之號如果沒有指定檔案類型就移除目前的任何關聯。\n" #: programs/cmd/cmd.rc:300 -#, fuzzy -#| msgid "" -#| "FTYPE shows or modifies open commands associated with file types.\n" -#| "\n" -#| "Syntax: FTYPE [fileType[=[openCommand]]]\n" -#| "\n" -#| "Without parameters, shows the file types for which open command strings " -#| "are currently defined.\n" -#| "If used with only a file type, displays the associated open command " -#| "string, if any.\n" -#| "Specifying no open command after the equal sign removes the command " -#| "string associated to the specified file type.\n" msgid "" "FTYPE shows or modifies open commands associated with file types.\n" "\n" @@ -13791,22 +13604,18 @@ msgid "" msgstr "" "FTYPE 顯示或修改開啟命令所關聯的檔案類型。\n" "\n" -"語法：FTYPE [檔案型態[=[開啟命令]]]\n" +"語法: FTYPE [檔案型態[=[開啟命令]]]\n" "\n" "如果不加參數，則顯示開啟命令目前所定義的檔案型態。\n" "如果只使用檔案類型，則顯示關聯的任何開啟命令字串。\n" -"在等號之號如果沒有指定檔案類型就移除對於給定檔案型態的任何關聯命令字串。\n" +"在等號之號如果沒有指定檔案類型就移除對於給定檔案型態的\n" +"任何關聯命令字串。\n" #: programs/cmd/cmd.rc:303 msgid "MORE displays output of files or piped input in pages.\n" msgstr "MORE 以分頁的方式顯示檔案的輸出或管線的輸入。\n" #: programs/cmd/cmd.rc:308 -#, fuzzy -#| msgid "" -#| "CHOICE displays a text and waits, until the User\n" -#| "presses an allowed Key from a selectable list.\n" -#| "CHOICE is mainly used to build a menu selection in a batch file.\n" msgid "" "CHOICE displays a text and waits, until the User presses an allowed Key\n" "from a selectable list.\n" @@ -13829,61 +13638,26 @@ msgid "" "link_name is the name of the new symbolic link.\n" "target is the path that link_name points to.\n" msgstr "" +"建立符號連結。\n" +"\n" +"語法: MKLINK [選項] 連結名稱目標\n" +"\n" +"選項:\n" +"/d 建立目錄符號連結。\n" +"/h 建立永久連結。\n" +"/j 建立目錄連接。\n" +"連結名稱為新的符號連結的名稱。\n" +"目標為連結名稱指向的路徑。\n" #: programs/cmd/cmd.rc:312 -#, fuzzy -#| msgid "" -#| "EXIT terminates the current command session and returns\n" -#| "to the operating system or shell from which you invoked cmd.\n" msgid "" "EXIT terminates the current command session and returns to the operating\n" "system or shell from which you invoked cmd.\n" msgstr "" -"EXIT 終止目前的命令作業階段並回到\n" -"您從其調用 cmd 的作業系統或命令殼。\n" +"EXIT 終止目前的命令作業階段並回到您從其調用 cmd 的\n" +"作業系統或命令殼。\n" #: programs/cmd/cmd.rc:364 -#, fuzzy -#| msgid "" -#| "CMD built-in commands are:\n" -#| "ASSOC\t\tShow or modify file extension associations\n" -#| "ATTRIB\t\tShow or change DOS file attributes\n" -#| "CALL\t\tInvoke a batch file from inside another\n" -#| "CD (CHDIR)\tChange current default directory\n" -#| "CHOICE\t\tWait for an keypress from a selectable list\n" -#| "CLS\t\tClear the console screen\n" -#| "COPY\t\tCopy file\n" -#| "CTTY\t\tChange input/output device\n" -#| "DATE\t\tShow or change the system date\n" -#| "DEL (ERASE)\tDelete a file or set of files\n" -#| "DIR\t\tList the contents of a directory\n" -#| "ECHO\t\tCopy text directly to the console output\n" -#| "ENDLOCAL\tEnd localization of environment changes in a batch file\n" -#| "FTYPE\t\tShow or modify open commands associated with file types\n" -#| "HELP\t\tShow brief help details on a topic\n" -#| "MD (MKDIR)\tCreate a subdirectory\n" -#| "MORE\t\tDisplay output in pages\n" -#| "MOVE\t\tMove a file, set of files or directory tree\n" -#| "PATH\t\tSet or show the search path\n" -#| "PAUSE\t\tSuspend execution of a batch file\n" -#| "POPD\t\tRestore the directory to the last one saved with PUSHD\n" -#| "PROMPT\t\tChange the command prompt\n" -#| "PUSHD\t\tChange to a new directory, saving the current one\n" -#| "REN (RENAME)\tRename a file\n" -#| "RD (RMDIR)\tDelete a subdirectory\n" -#| "SET\t\tSet or show environment variables\n" -#| "SETLOCAL\tStart localization of environment changes in a batch file\n" -#| "START\t\tStart a program, or open a document in the associated program\n" -#| "TIME\t\tSet or show the current system time\n" -#| "TITLE\t\tSet the window title for the CMD session\n" -#| "TYPE\t\tType the contents of a text file\n" -#| "VER\t\tShow the current version of CMD\n" -#| "VOL\t\tShow the volume label of a disk device\n" -#| "XCOPY\t\tCopy source files or directory trees to a destination\n" -#| "EXIT\t\tClose down CMD\n" -#| "\n" -#| "Enter HELP <command> for further information on any of the above " -#| "commands.\n" msgid "" "CMD built-in commands are:\n" "ASSOC\t\tShow or modify file extension associations\n" @@ -13925,10 +13699,10 @@ msgid "" "\n" "Enter HELP <command> for further information on any of the above commands.\n" msgstr "" -"CMD 內建命令包括：\n" +"CMD 內建命令包括:\n" "ASSOC\t\t顯示或修改副檔名關聯\n" "ATTRIB\t\t顯示或變更 DOS 檔案屬性\n" -"CALL\t\t從另一個批次檔內部調用\n" +"CALL\t\t在批次檔中呼叫另一個批次檔\n" "CD (CHDIR)\t變更目前的預設目錄\n" "CHOICE\t\t從可選清單等待按鍵\n" "CLS\t\t清空主控臺螢幕\n" @@ -13942,13 +13716,14 @@ msgstr "" "FTYPE\t\t顯示或修改與檔案類型關聯的開啟命令\n" "HELP\t\t顯示主題的簡潔說明\n" "MD (MKDIR)\t建立子目錄\n" +"MKLINK\t建立符號連結\n" "MORE\t\t分頁顯示輸出\n" "MOVE\t\t移動一個檔案、一組檔案或樹狀目錄\n" "PATH\t\t設定或顯示搜尋路徑\n" "PAUSE\t\t懸置執行中的批次檔\n" "POPD\t\t還原到上一次以 PUSHD 儲存的目錄\n" "PROMPT\t\t變更指令提示符號\n" -"PUSHD\t\t變更為新的目錄並儲存目前的\n" +"PUSHD\t\t變更為新的目錄並儲存目前的目錄\n" "REN (RENAME)\t重新命名檔案\n" "RD (RMDIR)\t刪除子目錄\n" "SET\t\t設定或顯示環境變數\n" @@ -13958,15 +13733,15 @@ msgstr "" "TITLE\t\t設定用於 CMD 作業階段的視窗標題\n" "TYPE\t\t印出文字檔的內容\n" "VER\t\t顯示目前的 CMD 版本\n" -"VOL\t\t顯示磁碟裝置的卷冊標貼\n" +"VOL\t\t顯示磁碟裝置的磁碟區標籤\n" "XCOPY\t\t複製來源檔案或樹狀目錄到目的地\n" "EXIT\t\t關閉 CMD\n" "\n" -"輸入 HELP <命令> 以獲得關於以上任何命令的進一步資訊。\n" +"輸入 HELP <命令> 以取得關於以上任何命令的進一步資訊。\n" #: programs/cmd/cmd.rc:365 msgid "Are you sure?" -msgstr "您確定嗎？" +msgstr "您確定嗎?" #: programs/cmd/cmd.rc:366 programs/reg/reg.rc:126 programs/xcopy/xcopy.rc:43 msgctxt "Yes key" @@ -13980,15 +13755,15 @@ msgstr "N" #: programs/cmd/cmd.rc:368 msgid "File association missing for extension %1\n" -msgstr "缺少用於延伸檔名 %1 的檔案關聯\n" +msgstr "找不到副檔名 %1 的檔案關聯\n" #: programs/cmd/cmd.rc:369 msgid "No open command associated with file type '%1'\n" -msgstr "沒有與檔案類型 %1 相關聯的開啟命令\n" +msgstr "沒有與檔案類型 '%1' 相關聯的開啟命令\n" #: programs/cmd/cmd.rc:370 msgid "Overwrite %1?" -msgstr "覆寫 %1？" +msgstr "覆寫 %1?" #: programs/cmd/cmd.rc:371 msgid "More..." @@ -13996,7 +13771,7 @@ msgstr "更多..." #: programs/cmd/cmd.rc:372 msgid "Line in Batch processing possibly truncated. Using:\n" -msgstr "命令列於批次處理時可能會被截斷。使用：\n" +msgstr "命令列於批次處理時可能會被截斷。使用:\n" #: programs/cmd/cmd.rc:374 msgid "Argument missing\n" @@ -14024,11 +13799,11 @@ msgstr "現在時間是 %1\n" #: programs/cmd/cmd.rc:381 msgid "Enter new date: " -msgstr "輸入新日期：" +msgstr "輸入新日期: " #: programs/cmd/cmd.rc:382 msgid "Enter new time: " -msgstr "輸入新時間：" +msgstr "輸入新時間: " #: programs/cmd/cmd.rc:383 msgid "Environment variable %1 not defined\n" @@ -14040,7 +13815,7 @@ msgstr "開啟 %1 失敗\n" #: programs/cmd/cmd.rc:385 msgid "Cannot call batch label outside of a batch script\n" -msgstr "無法呼叫批次命令稿外部的批次標貼\n" +msgstr "無法呼叫批次命令指令碼外部的批次標貼\n" #: programs/cmd/cmd.rc:386 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:45 msgctxt "All key" @@ -14049,7 +13824,7 @@ msgstr "A" #: programs/cmd/cmd.rc:387 msgid "Delete %1?" -msgstr "刪除 %1？" +msgstr "刪除 %1?" #: programs/cmd/cmd.rc:388 msgid "Echo is %1\n" @@ -14072,12 +13847,12 @@ msgid "" "Volume Serial Number is %1!04x!-%2!04x!\n" "\n" msgstr "" -"卷冊序號是 %1!04x!-%2!04x!\n" +"磁碟區序號是 %1!04x!-%2!04x!\n" "\n" #: programs/cmd/cmd.rc:393 msgid "Volume label (11 characters, <Enter> for none)?" -msgstr "卷冊標貼 (11 個字元，<Enter> 表示沒有)？" +msgstr "磁碟區標籤 (11 個字元，<Enter> 表示沒有)?" #: programs/cmd/cmd.rc:394 msgid "PATH not found\n" @@ -14085,19 +13860,19 @@ msgstr "找不到 PATH\n" #: programs/cmd/cmd.rc:395 msgid "Press any key to continue... " -msgstr "按下任何鍵繼續... " +msgstr "按下任意鍵繼續... " #: programs/cmd/cmd.rc:396 msgid "Wine Command Prompt" -msgstr "Wine 命令提示符號" +msgstr "Wine 命令提示字元" #: programs/cmd/cmd.rc:397 msgid "Microsoft Windows %1!S!\n" -msgstr "" +msgstr "Microsoft Windows %1!S!\n" #: programs/cmd/cmd.rc:398 msgid "More? " -msgstr "更多？" +msgstr "更多? " #: programs/cmd/cmd.rc:399 msgid "The input line is too long.\n" @@ -14105,26 +13880,24 @@ msgstr "輸入列太長。\n" #: programs/cmd/cmd.rc:400 msgid "Volume in drive %1!c! is %2\n" -msgstr "位於儲存裝置 %1!c! 的卷冊為 %2\n" +msgstr "位於儲存裝置 %1!c! 的磁碟區為 %2\n" #: programs/cmd/cmd.rc:401 msgid "Volume in drive %1!c! has no label.\n" -msgstr "位於儲存裝置 %1!c! 的卷冊沒有任何標貼。\n" +msgstr "位於儲存裝置 %1!c! 的磁碟區沒有任何標籤。\n" #: programs/cmd/cmd.rc:402 programs/reg/reg.rc:129 -#, fuzzy msgid " (Yes|No)" -msgstr " (是|否)" +msgstr " (Yes|No)" #: programs/cmd/cmd.rc:403 programs/reg/reg.rc:130 -#, fuzzy msgid " (Yes|No|All)" -msgstr " (是|否|全部)" +msgstr " (Yes|No|All)" #: programs/cmd/cmd.rc:404 msgid "" "Can't recognize '%1' as an internal or external command, or batch script.\n" -msgstr "無法識別 %1 為內部、外部命令或是批次命令稿。\n" +msgstr "無法識別 %1 為內部、外部命令或是批次命令指令碼。\n" #: programs/cmd/cmd.rc:405 msgid "Division by zero error.\n" @@ -14140,14 +13913,14 @@ msgstr "預期為一個運算子。\n" #: programs/cmd/cmd.rc:408 msgid "Mismatch in parentheses.\n" -msgstr "小括號不匹配。\n" +msgstr "小括號不相符。\n" #: programs/cmd/cmd.rc:409 msgid "" "Badly formed number - must be one of decimal (12),\n" " hexadecimal (0x34) or octal (056).\n" msgstr "" -"不當的數字形式 - 必須是十進位 (12)、\n" +"錯誤的數字形式 - 必須是十進位 (12)、\n" " 十六進位 (0x34) 或八進位 (056) 之一。\n" #: programs/conhost/conhost.rc:54 @@ -14168,23 +13941,19 @@ msgstr "大(&L)" #: programs/conhost/conhost.rc:59 msgid "Command history" -msgstr "指令歷程" +msgstr "命令歷程記錄" #: programs/conhost/conhost.rc:60 -#, fuzzy -#| msgid "Buffer zone" msgid "&Buffer size:" -msgstr "緩衝區域" +msgstr "緩衝大小(&B):" #: programs/conhost/conhost.rc:63 -#, fuzzy -#| msgid "&Remove doubles" msgid "&Remove duplicates" -msgstr "刪除連續相同的指令(&R)" +msgstr "移除重複(&R)" #: programs/conhost/conhost.rc:65 msgid "Popup menu" -msgstr "彈出功能表" +msgstr "快顯功能表" #: programs/conhost/conhost.rc:66 msgid "&Control" @@ -14195,22 +13964,16 @@ msgid "S&hift" msgstr "S&hift" #: programs/conhost/conhost.rc:69 -#, fuzzy -#| msgid "&Close console" msgid "Console" -msgstr "關閉虛擬終端(&C)" +msgstr "主控臺" #: programs/conhost/conhost.rc:70 -#, fuzzy -#| msgid "Quick edit" msgid "&Quick Edit mode" -msgstr "快速編輯" +msgstr "快速編輯模式(&Q)" #: programs/conhost/conhost.rc:71 -#, fuzzy -#| msgid "&Expert mode" msgid "&Insert mode" -msgstr "專家模式(&E)" +msgstr "插入模式(&I)" #: programs/conhost/conhost.rc:79 msgid "&Font" @@ -14222,7 +13985,7 @@ msgstr "顏色(&C)" #: programs/conhost/conhost.rc:92 msgid "Configuration" -msgstr "組態" +msgstr "設定" #: programs/conhost/conhost.rc:95 msgid "Buffer zone" @@ -14230,11 +13993,11 @@ msgstr "緩衝區域" #: programs/conhost/conhost.rc:96 msgid "&Width:" -msgstr "寬度(&W)：" +msgstr "寬度(&W):" #: programs/conhost/conhost.rc:99 msgid "&Height:" -msgstr "高度(&H)：" +msgstr "高度(&H):" #: programs/conhost/conhost.rc:103 msgid "Window size" @@ -14242,11 +14005,11 @@ msgstr "視窗大小" #: programs/conhost/conhost.rc:104 msgid "W&idth:" -msgstr "寬度(&I)：" +msgstr "寬度(&I):" #: programs/conhost/conhost.rc:107 msgid "H&eight:" -msgstr "高度(&E)：" +msgstr "高度(&E):" #: programs/conhost/conhost.rc:111 msgid "End of program" @@ -14254,19 +14017,19 @@ msgstr "當程式結束後" #: programs/conhost/conhost.rc:112 msgid "&Close console" -msgstr "關閉虛擬終端(&C)" +msgstr "關閉主控臺(&C)" #: programs/conhost/conhost.rc:114 msgid "Edition" -msgstr "Edition" +msgstr "版本" #: programs/conhost/conhost.rc:120 msgid "Console parameters" -msgstr "虛擬終端執行參數" +msgstr "主控臺執行參數" #: programs/conhost/conhost.rc:123 msgid "Retain these settings for later sessions" -msgstr "保留當前配置以便下次使用" +msgstr "保留目前設定以便下次使用" #: programs/conhost/conhost.rc:124 msgid "Modify only current session" @@ -14311,8 +14074,6 @@ msgid "Configuration error" msgstr "組態錯誤" #: programs/conhost/conhost.rc:46 -#, fuzzy -#| msgid "Screen buffer size must be greater or equal to the window's one" msgid "" "The size of the screen buffer must be greater than or equal to the size of " "the window." @@ -14332,17 +14093,15 @@ msgstr "DirectX 診斷工具" #: programs/dxdiag/dxdiag.rc:31 msgid "Usage: dxdiag [/whql:off | /whql:on] [/t filename | /x filename]" -msgstr "用法：dxdiag [/whql:off | /whql:on] [/t 檔名 | /x 檔名]" +msgstr "用法: dxdiag [/whql:off | /whql:on] [/t 檔案名稱 | /x 檔案名稱]" #: programs/explorer/explorer.rc:32 msgid "Wine Explorer" msgstr "Wine 檔案總管" #: programs/explorer/explorer.rc:34 -#, fuzzy -#| msgid "StartUp" msgid "Start" -msgstr "啟動" +msgstr "開始" #: programs/explorer/explorer.rc:35 programs/winefile/winefile.rc:36 msgid "&Run..." @@ -14354,6 +14113,9 @@ msgid "" "\n" "hardlink hardlink management\n" msgstr "" +"- 支援的命令 -\n" +"\n" +"hardlink 永久連結管理\n" #: programs/fsutil/fsutil.mc:35 msgid "" @@ -14361,38 +14123,39 @@ msgid "" "\n" "create create a hardlink\n" msgstr "" +"- Hardlink - 支援的命令 -\n" +"\n" +"create 建立永久連結\n" #: programs/fsutil/fsutil.mc:40 msgid "Syntax: fsutil hardlink create <new> <existing>\n" -msgstr "" +msgstr "語法: fsutil hardlink create <new> <existing>" #: programs/hostname/hostname.rc:30 msgid "Usage: hostname\n" -msgstr "用法：主機名稱\n" +msgstr "用法: 主機名稱\n" #: programs/hostname/hostname.rc:31 msgid "Error: Invalid option '%c'.\n" -msgstr "錯誤：無效的選項 %c。\n" +msgstr "錯誤: 無效的選項 '%c'。\n" #: programs/hostname/hostname.rc:32 -#, fuzzy -#| msgid "Error: Could not find process \"%1\".\n" msgid "Error: Could not get hostname: %u.\n" -msgstr "錯誤：找不到行程 %1。\n" +msgstr "錯誤: 無法取得主機名稱: %u。\n" #: programs/hostname/hostname.rc:33 msgid "" "Error: Setting the system hostname is not possible with the hostname " "utility.\n" -msgstr "錯誤：不能利用主機名稱公用程式來設定系統主機名稱。\n" +msgstr "錯誤: 無法使用 hostname 工具設定系統的主機名稱。\n" #: programs/ipconfig/ipconfig.rc:30 msgid "Usage: ipconfig [ /? | /all ]\n" -msgstr "用法：ipconfig [ /? | /all ]\n" +msgstr "用法: ipconfig [ /? | /all ]\n" #: programs/ipconfig/ipconfig.rc:31 msgid "Error: Unknown or invalid command line parameters specified\n" -msgstr "錯誤：指定了不明或無效的命令列參數\n" +msgstr "錯誤: 指定了不明或無效的命令列參數\n" #: programs/ipconfig/ipconfig.rc:32 msgid "%1 adapter %2\n" @@ -14455,10 +14218,8 @@ msgid "IPv6 address" msgstr "IPv6 位址" #: programs/msinfo32/msinfo32.rc:28 -#, fuzzy -#| msgid "System Configuration" msgid "System Information" -msgstr "系統設定" +msgstr "系統資訊" #: programs/net/net.rc:30 msgid "" @@ -14470,7 +14231,7 @@ msgid "" "\n" "Where 'command' is one of HELP, START, STOP or USE.\n" msgstr "" -"這個命令的語法是：\n" +"這個命令的語法是:\n" "\n" "NET command [引數]\n" " 或\n" @@ -14487,12 +14248,12 @@ msgid "" "Displays the list of running services if 'service' is omitted. Otherwise " "'service' is the name of the service to start.\n" msgstr "" -"這個命令的語法是：\n" +"這個命令的語法是:\n" "\n" "NET START [service]\n" "\n" -"如果 service 被省略，就顯示執行中服務的清單，否則 service 表示要啟動的服務名" -"稱。\n" +"如果 'service' 被省略，就顯示執行中服務的清單，否則 'service' 表示要啟動的" +"服務名稱。\n" #: programs/net/net.rc:32 msgid "" @@ -14502,7 +14263,7 @@ msgid "" "\n" "Where 'service' is the name of the service to stop.\n" msgstr "" -"這個命令的語法是：\n" +"這個命令的語法是:\n" "\n" "NET STOP service\n" "\n" @@ -14510,7 +14271,7 @@ msgstr "" #: programs/net/net.rc:33 msgid "Stopping dependent service: %1\n" -msgstr "正在停止附屬服務：%1\n" +msgstr "正在停止附屬服務: %1\n" #: programs/net/net.rc:34 msgid "Could not stop service %1\n" @@ -14518,27 +14279,27 @@ msgstr "無法停止服務 %1。\n" #: programs/net/net.rc:35 msgid "Could not get handle to service control manager.\n" -msgstr "無法獲得服務控制管理員控柄。\n" +msgstr "無法取得服務控制管理員的控制代碼。\n" #: programs/net/net.rc:36 msgid "Could not get handle to service.\n" -msgstr "無法獲得服務控柄。\n" +msgstr "無法取得服務的控制代碼。\n" #: programs/net/net.rc:37 msgid "The %1 service is starting.\n" -msgstr "%1 服務正在開始。\n" +msgstr "正在啟動 %1 服務。\n" #: programs/net/net.rc:38 msgid "The %1 service was started successfully.\n" -msgstr "%1 服務已成功開始。\n" +msgstr "%1 服務已成功啟動。\n" #: programs/net/net.rc:39 msgid "The %1 service failed to start.\n" -msgstr "%1 服務無法開始。\n" +msgstr "無法啟動 %1 服務。\n" #: programs/net/net.rc:40 msgid "The %1 service is stopping.\n" -msgstr "%1 服務正在停止。\n" +msgstr "正在停止 %1 服務。\n" #: programs/net/net.rc:41 msgid "The %1 service was stopped successfully.\n" @@ -14546,11 +14307,11 @@ msgstr "%1 服務已成功停止。\n" #: programs/net/net.rc:42 msgid "The %1 service failed to stop.\n" -msgstr "%1 服務無法停止。\n" +msgstr "無法停止 %1 服務。\n" #: programs/net/net.rc:44 msgid "There are no entries in the list.\n" -msgstr "在清單中沒有條目。\n" +msgstr "在清單中沒有項目。\n" #: programs/net/net.rc:45 msgid "" @@ -14559,12 +14320,12 @@ msgid "" "---------------------------------------------------------------\n" msgstr "" "\n" -"狀態本地遠端\n" +"狀態本機遠端\n" "---------------------------------------------------------------\n" #: programs/net/net.rc:46 msgid "%1 %2 %3 Open resources: %4!u!\n" -msgstr "%1 %2 %3 開啟資源：%4!u!\n" +msgstr "%1 %2 %3 開啟資源: %4!u!\n" #: programs/net/net.rc:48 msgid "Paused" @@ -14580,7 +14341,7 @@ msgstr "網路發生了錯誤" #: programs/net/net.rc:51 msgid "Connection is being made" -msgstr "正在進行連接" +msgstr "正在連線" #: programs/net/net.rc:52 msgid "Reconnecting" @@ -14588,7 +14349,7 @@ msgstr "正在重新連線" #: programs/net/net.rc:43 msgid "The following services are running:\n" -msgstr "下列服務正在執行：\n" +msgstr "下列服務正在執行:\n" #: programs/netstat/netstat.rc:30 msgid "Active Connections" @@ -14725,7 +14486,7 @@ msgstr "版面設定(&T)..." #: programs/notepad/notepad.rc:37 msgid "P&rinter Setup..." -msgstr "列印設定(&R)..." +msgstr "印表機設定(&R)..." #: programs/notepad/notepad.rc:42 programs/wordpad/wordpad.rc:44 msgid "&Undo\tCtrl+Z" @@ -14755,11 +14516,11 @@ msgstr "全選(&A)\tCtrl+A" #: programs/notepad/notepad.rc:50 msgid "&Time/Date\tF5" -msgstr "插入日期時間(&T)\tF5" +msgstr "插入日期/時間(&T)\tF5" #: programs/notepad/notepad.rc:52 msgid "&Wrap long lines" -msgstr "自動換列(&W)" +msgstr "自動換行(&W)" #: programs/notepad/notepad.rc:56 msgid "&Search...\tCtrl+F" @@ -14894,9 +14655,9 @@ msgid "" "\n" "Do you want to create a new file?" msgstr "" -"檔案 %s 不存在\n" +"檔案 '%s' 不存在。\n" "\n" -"您想新增一個檔案嗎？" +"您要建立一個新檔案嗎?" #: programs/notepad/notepad.rc:82 msgid "" @@ -14904,25 +14665,25 @@ msgid "" "\n" "Would you like to save the changes?" msgstr "" -"檔案 %s 正文已更改\n" +"檔案 '%s' 的內容已更改。\n" "\n" -"是否儲存更改？" +"您要儲存更改嗎?" #: programs/notepad/notepad.rc:83 msgid "'%s' could not be found." -msgstr "找不到 %s。" +msgstr "找不到 '%s'。" #: programs/notepad/notepad.rc:85 msgid "Unicode (UTF-16)" -msgstr "萬國碼 (UTF-16)" +msgstr "Unicode (UTF-16)" #: programs/notepad/notepad.rc:86 msgid "Unicode (UTF-16 big-endian)" -msgstr "萬國碼 (UTF-16 大尾序)" +msgstr "Unicode (UTF-16 big-endian)" #: programs/notepad/notepad.rc:87 msgid "Unicode (UTF-8)" -msgstr "萬國碼 (UTF-8)" +msgstr "Unicode (UTF-8)" #: programs/notepad/notepad.rc:94 msgid "" @@ -14934,11 +14695,11 @@ msgid "" "Continue?" msgstr "" "%1\n" -"這個檔案含有萬國碼字元，如果以 %2 編碼\n" -"儲存這個檔案，您將會失去它們。\n" -"要保留這些字元，請按一下取消，然後在編碼\n" -"的下拉選單中選取一個萬國碼選項。\n" -"要繼續嗎？" +"這個檔案含有 Unicode 字元，如果以 %2 編碼儲存這個檔案，\n" +"這些字符將會丟失。\n" +"要保留這些字元，請按一下 [取消]，\n" +"然後在 [編碼] 下拉選單中選取一個 Unicode 選項。\n" +"您要繼續嗎?" #: programs/oleview/oleview.rc:32 msgid "&Bind to file..." @@ -14946,7 +14707,7 @@ msgstr "檔案綁定(&B)..." #: programs/oleview/oleview.rc:33 msgid "&View TypeLib..." -msgstr "查看 &TypeLib..." +msgstr "查看 TypeLib(&V)..." #: programs/oleview/oleview.rc:35 msgid "&System Configuration" @@ -14958,15 +14719,15 @@ msgstr "執行註冊表編輯器(&R)" #: programs/oleview/oleview.rc:42 msgid "&CoCreateInstance Flag" -msgstr "&CoCreateInstance 參數" +msgstr "CoCreateInstance 旗標(&C)" #: programs/oleview/oleview.rc:44 msgid "&In-process server" -msgstr "同行程伺服器(&I)" +msgstr "同處理序伺服程式(&I)" #: programs/oleview/oleview.rc:45 msgid "In-process &handler" -msgstr "同行程處理常式(&H)" +msgstr "同處理序處理常式(&H)" #: programs/oleview/oleview.rc:46 msgid "&Local server" @@ -15031,7 +14792,7 @@ msgstr "關於 OleView(&A)" #: programs/oleview/oleview.rc:82 msgid "&Save as..." -msgstr "另存為(&S)..." +msgstr "另存新檔(&S)..." #: programs/oleview/oleview.rc:87 msgid "&Group by type kind" @@ -15059,7 +14820,7 @@ msgstr "啟用分散式 COM(&E)" #: programs/oleview/oleview.rc:172 msgid "Enable &Remote Connections (Win95 only)" -msgstr "啟用遠端連線(&R)(限 Win95)" +msgstr "啟用遠端連線 (限 Win95)(&R)" #: programs/oleview/oleview.rc:173 msgid "" @@ -15119,7 +14880,7 @@ msgstr "TypeLib 檔案 (*.tlb; *.olb; *.dll; *.ocx; *.exe)" #: programs/oleview/oleview.rc:105 msgid "Bind to file via a File Moniker" -msgstr "通過檔案綽號綁定到檔案" +msgstr "通過 File Moniker 綁定到檔案" #: programs/oleview/oleview.rc:106 msgid "Open a TypeLib file and view the contents" @@ -15127,7 +14888,7 @@ msgstr "開啟 TypeLib 檔案並查看內容" #: programs/oleview/oleview.rc:107 msgid "Change machine wide Distributed COM settings" -msgstr "修改本機分散式 COM 設定" +msgstr "變更本機分散式 COM 設定" #: programs/oleview/oleview.rc:108 msgid "Run the Wine registry editor" @@ -15135,7 +14896,7 @@ msgstr "執行 Wine 註冊表編輯器" #: programs/oleview/oleview.rc:109 msgid "Quit the application. Prompts to save changes" -msgstr "結束程式。提示儲存" +msgstr "結束程式。提示儲存" #: programs/oleview/oleview.rc:110 msgid "Create an instance of the selected object" @@ -15143,19 +14904,19 @@ msgstr "建立目前選擇的物件實例" #: programs/oleview/oleview.rc:111 msgid "Create an instance of the selected object on a specific machine" -msgstr "建立當前選定物件在指定電腦的實例" +msgstr "建立目前選定物件在指定電腦的實例" #: programs/oleview/oleview.rc:112 msgid "Release the currently selected object instance" -msgstr "釋放當前選定物件實例" +msgstr "釋放目前選定物件實例" #: programs/oleview/oleview.rc:113 msgid "Copy the GUID of the currently selected item to the clipboard" -msgstr "將當前選定項目的 GUID 複製到剪貼簿" +msgstr "將目前選定項目的 GUID 複製到剪貼簿" #: programs/oleview/oleview.rc:114 msgid "Display the viewer for the selected item" -msgstr "顯示選定項目的查看器" +msgstr "顯示選定項目的檢視器" #: programs/oleview/oleview.rc:119 msgid "Toggle between expert and novice display mode" @@ -15180,15 +14941,15 @@ msgstr "重新整理所有清單" #: programs/oleview/oleview.rc:124 msgid "Display program information, version number and copyright" -msgstr "顯示程式資訊、版本號及版權" +msgstr "顯示程式資訊、版本號及著作權" #: programs/oleview/oleview.rc:115 msgid "Ask for an in-process server when calling CoGetClassObject" -msgstr "呼叫 CoGetClassObject 時要求一個同行程伺服器" +msgstr "呼叫 CoGetClassObject 時要求一個同處理序伺服程式" #: programs/oleview/oleview.rc:116 msgid "Ask for an in-process handler when calling CoGetClassObject" -msgstr "呼叫 CoGetClassObject 時要求一個同行程處理常式" +msgstr "呼叫 CoGetClassObject 時要求一個同處理序處理常式" #: programs/oleview/oleview.rc:117 msgid "Ask for a local server when calling CoGetClassObject" @@ -15220,7 +14981,7 @@ msgstr "所有物件" #: programs/oleview/oleview.rc:135 msgid "Application IDs" -msgstr "應用程式 IDs" +msgstr "應用程式識別碼" #: programs/oleview/oleview.rc:136 msgid "Type Libraries" @@ -15252,7 +15013,7 @@ msgstr "CoGetClassObject 失敗。" #: programs/oleview/oleview.rc:145 msgid "Unknown error" -msgstr "未知錯誤" +msgstr "不明錯誤" #: programs/oleview/oleview.rc:148 msgid "bytes" @@ -15268,7 +15029,7 @@ msgstr "繼承介面" #: programs/oleview/oleview.rc:126 msgid "Save as an .IDL or .H file" -msgstr "存為 .IDL 或 .H 檔案" +msgstr "儲存為 .IDL 或 .H 檔案" #: programs/oleview/oleview.rc:127 msgid "Close window" @@ -15296,7 +15057,7 @@ msgstr "複製(&C)...\tF8" #: programs/progman/progman.rc:38 msgid "&Properties\tAlt+Enter" -msgstr "屬性(&P)\tAlt+Enter" +msgstr "內容(&P)\tAlt+Enter" #: programs/progman/progman.rc:40 msgid "&Execute..." @@ -15414,11 +15175,11 @@ msgstr "變更圖示" #: programs/progman/progman.rc:194 msgid "&Filename:" -msgstr "檔案名(&F):" +msgstr "檔案名稱(&F):" #: programs/progman/progman.rc:196 msgid "Current &icon:" -msgstr "當前圖示(&I):" +msgstr "目前圖示(&I):" #: programs/progman/progman.rc:210 msgid "Execute Program" @@ -15438,11 +15199,11 @@ msgstr "資訊" #: programs/progman/progman.rc:68 msgid "Delete group `%s'?" -msgstr "是否刪除程式群組 %s？" +msgstr "是否刪除程式群組 `%s'?" #: programs/progman/progman.rc:69 msgid "Delete program `%s'?" -msgstr "是否刪除程式 %s？" +msgstr "是否刪除程式 `%s'?" #: programs/progman/progman.rc:70 msgid "Not implemented" @@ -15450,19 +15211,19 @@ msgstr "未實作" #: programs/progman/progman.rc:71 msgid "Error reading `%s'." -msgstr "讀取檔案 %s 時發生錯誤。" +msgstr "讀取檔案 `%s' 時發生錯誤。" #: programs/progman/progman.rc:72 msgid "Error writing `%s'." -msgstr "寫入檔案 %s 時發生錯誤。" +msgstr "寫入檔案 `%s' 時發生錯誤。" #: programs/progman/progman.rc:75 msgid "" "The group file `%s' cannot be opened.\n" "Should it be tried further on?" msgstr "" -"無法開啟群組檔案 %s。\n" -"是否繼續嘗試？" +"無法開啟群組檔案 `%s'。\n" +"是否繼續嘗試開啟?" #: programs/progman/progman.rc:77 msgid "Help not available." @@ -15470,15 +15231,15 @@ msgstr "沒有可用的說明資訊。" #: programs/progman/progman.rc:78 msgid "Unknown feature in %s" -msgstr "在 %s 中發現未知特性" +msgstr "在 %s 中發現不明功能" #: programs/progman/progman.rc:79 msgid "File `%s' exists. Not overwritten." -msgstr "檔案 %s 已經存在。不覆蓋已有檔案。" +msgstr "檔案 `%s' 已經存在。不覆寫已有檔案。" #: programs/progman/progman.rc:80 msgid "Save group as `%s' to prevent overwriting original files." -msgstr "將程式組儲存為 %s 可以避免復蓋已有的檔案。" +msgstr "將程式組儲存為 `%s' 可以避免覆寫已有的檔案。" #: programs/progman/progman.rc:84 msgid "Libraries (*.dll)" @@ -15493,47 +15254,32 @@ msgid "Icons (*.ico)" msgstr "圖示 (*.ico)" #: programs/reg/reg.rc:139 -#, fuzzy -#| msgid "Error: Invalid key name\n" msgid "reg: Invalid syntax. " -msgstr "錯誤：無效的索引鍵名稱\n" +msgstr "reg: 無效的語法。 " #: programs/reg/reg.rc:142 msgid "Type \"REG %1 /?\" for help.\n" -msgstr "" +msgstr "輸入 \"REG %1 /?\" 以取得說明。\n" #: programs/reg/reg.rc:181 -#, fuzzy -#| msgid "" -#| "Error: The system was unable to find the specified registry key or value\n" msgid "reg: Unable to access or create the specified registry key\n" -msgstr "錯誤：系統無法找到指定的註冊表索引鍵或值\n" +msgstr "reg: 無法存取或建立指定的註冊表鍵\n" #: programs/reg/reg.rc:116 -#, fuzzy -#| msgid "The operation completed successfully\n" msgid "reg: The operation completed successfully\n" -msgstr "作業已成功完成\n" +msgstr "reg: 操作完成\n" #: programs/reg/reg.rc:131 -#, fuzzy -#| msgid "Operation canceled by user.\n" msgid "reg: The registry operation was cancelled\n" -msgstr "作業被使用者取消。\n" +msgstr "reg: 註冊表操作已經取消\n" #: programs/reg/reg.rc:174 -#, fuzzy -#| msgid "" -#| "Error: The system was unable to find the specified registry key or value\n" msgid "reg: Unable to find the specified registry key\n" -msgstr "錯誤：系統無法找到指定的註冊表索引鍵或值\n" +msgstr "reg: 找不到指定的登錄機碼\n" #: programs/reg/reg.rc:120 -#, fuzzy -#| msgid "" -#| "Error: The system was unable to find the specified registry key or value\n" msgid "reg: Unable to find the specified registry value\n" -msgstr "錯誤：系統無法找到指定的註冊表索引鍵或值\n" +msgstr "reg: 找不到指定的登錄值\n" #: programs/reg/reg.rc:132 programs/regedit/regedit.rc:239 msgid "(Default)" @@ -15541,7 +15287,7 @@ msgstr "(預設)" #: programs/reg/reg.rc:141 msgid "Type \"REG /?\" for help.\n" -msgstr "" +msgstr "輸入 \"REG /?\" 以取得說明。\n" #: programs/reg/reg.rc:35 msgid "" @@ -15555,6 +15301,15 @@ msgid "" " REG [operation] /?\n" "\n" msgstr "" +"用法:\n" +" REG [操作] [參數]\n" +"\n" +"支援的操作:\n" +" ADD | COPY | DELETE | EXPORT | IMPORT | QUERY\n" +"\n" +"要取得指定操作的說明，請輸入:\n" +" REG [操作] /?\n" +"\n" #: programs/reg/reg.rc:67 msgid "" @@ -15605,6 +15360,52 @@ msgid "" " Modify the registry without prompting for confirmation.\n" "\n" msgstr "" +"REG ADD <機碼> [/v 值名稱 | /ve] [/t 類型] [/s 分隔符號] [/d 資料] [/f]\n" +"\n" +" 新增一個機碼到註冊表，或新增值到給定的登錄機碼。\n" +"\n" +" <機碼>\n" +" 要新增的機碼，如果指定了 [/v] 或 [/ve]，\n" +" 則會在該機碼新增登錄資料。\n" +"\n" +" 格式: ROOT\\Subkey\n" +"\n" +" ROOT: 預先定義的登錄機碼。這必須是下列的其中一個:\n" +"\n" +" HKEY_LOCAL_MACHINE | HKLM\n" +" HKEY_CURRENT_USER | HKCU\n" +" HKEY_CLASSES_ROOT | HKCR\n" +" HKEY_USERS | HKU\n" +" HKEY_CURRENT_CONFIG | HKCC\n" +"\n" +" Subkey: 在所選取 ROOT 機碼下的登錄機碼的完整路徑。\n" +"\n" +" /v <值名稱>\n" +" 要新增的登錄值的名稱。\n" +"\n" +" /ve\n" +" 新增未命名的登錄值。這個選項會修改 (預設) 的\n" +" 登錄值。\n" +"\n" +" /t <類型>\n" +" 要新增到註冊表的資料類型。如果指定了 [/t]，\n" +" <類型> 必須是下列的其中一個:\n" +"\n" +" REG_SZ | REG_MULTI_SZ | REG_EXPAND_SZ\n" +" REG_DWORD | REG_BINARY | REG_NONE\n" +"\n" +" 如果未指定 [/t]，資料類型將預設為 REG_SZ。\n" +"\n" +" /s <分隔符號>\n" +" 指定一個用於分隔 REG_MULTI_SZ 資料字串的字元。\n" +" 如果未指定 [/s]，分隔符號會預設為 \\0。\n" +"\n" +" /d <資料>\n" +" 要新增給新的登錄值的資料。\n" +"\n" +" /f\n" +" 修改登錄項目而不需確認提示。\n" +"\n" #: programs/reg/reg.rc:202 msgid "" @@ -15640,6 +15441,35 @@ msgid "" "<key2>.\n" "\n" msgstr "" +"REG COPY <機碼1> <機碼2> [/s] [/f]\n" +"\n" +" 複製指定登錄機碼的內容到另一個位置。\n" +" 預設情況下，這個操作只會複製登錄值。\n" +" 使用 [/s] 來遞迴複製所有子機碼和值。\n" +"\n" +" <機碼1>, <機碼2>\n" +" 指定登錄機碼的來源 (<機碼1>) 和目標 (<機碼2>) 資料。\n" +" 如果 <機碼2> 不存在，系統將會建立它。\n" +"\n" +" 格式: ROOT\\Subkey\n" +"\n" +" ROOT: 預先定義的登錄機碼。這必須是下列的其中一個:\n" +"\n" +" HKEY_LOCAL_MACHINE | HKLM\n" +" HKEY_CURRENT_USER | HKCU\n" +" HKEY_CLASSES_ROOT | HKCR\n" +" HKEY_USERS | HKU\n" +" HKEY_CURRENT_CONFIG | HKCC\n" +"\n" +" Subkey: 在所選取 ROOT 機碼下的登錄機碼的完整路徑。\n" +"\n" +" /s\n" +" 從 <機碼1> 複製所有子機碼和值到 <機碼2>。\n" +"\n" +" /f\n" +" 覆寫 <機碼2> 內所有的登錄資料而不需確認提示。\n" +" 這個選項不會修改只在 <機碼2> 存在的子機碼和值。\n" +"\n" #: programs/reg/reg.rc:92 msgid "" @@ -15679,6 +15509,41 @@ msgid "" " prompting for confirmation.\n" "\n" msgstr "" +"REG DELETE <機碼> [/v 值名稱 | /ve | /va] [/f]\n" +"\n" +" 刪除一個登錄機碼 (所有子機碼和值)，\n" +" 或從給定的登錄機碼刪除一個或多個值。\n" +"\n" +" <機碼>\n" +" 要刪除的登錄機碼。如果指定了 [/v]、[/ve] 或 [/va]，\n" +" 則可刪除登錄機碼內的一個或多個值。\n" +"\n" +" 格式: ROOT\\Subkey\n" +"\n" +" ROOT: 預先定義的登錄機碼。這必須是下列的其中一個:\n" +"\n" +" HKEY_LOCAL_MACHINE | HKLM\n" +" HKEY_CURRENT_USER | HKCU\n" +" HKEY_CLASSES_ROOT | HKCR\n" +" HKEY_USERS | HKU\n" +" HKEY_CURRENT_CONFIG | HKCC\n" +"\n" +" Subkey: 在所選取 ROOT 機碼下的登錄機碼的完整路徑。\n" +"\n" +" /v <值名稱>\n" +" 要刪除的登錄值的名稱。\n" +"\n" +" /ve\n" +" 刪除未命名的登錄值。這個選項會刪除 (預設) 的\n" +" 登錄值。\n" +"\n" +" /va\n" +" 刪除登錄機碼的所有值。\n" +"\n" +" /f\n" +" 刪除一個登錄機碼 (包括所有子機碼和值)\n" +" 而不需確認提示。\n" +"\n" #: programs/reg/reg.rc:170 msgid "" @@ -15710,6 +15575,33 @@ msgid "" " Overwrite <file> without prompting for confirmation.\n" "\n" msgstr "" +"REG EXPORT <機碼> <檔案> [/y]\n" +"\n" +" 將指定的登錄機碼 (包括所有子機碼和值)\n" +" 匯出到一個檔案。\n" +"\n" +" <機碼>\n" +" 要匯出的登錄機碼。\n" +"\n" +" 格式: ROOT\\Subkey\n" +"\n" +" ROOT: 預先定義的登錄機碼。這必須是下列的其中一個:\n" +"\n" +" HKEY_LOCAL_MACHINE | HKLM\n" +" HKEY_CURRENT_USER | HKCU\n" +" HKEY_CLASSES_ROOT | HKCR\n" +" HKEY_USERS | HKU\n" +" HKEY_CURRENT_CONFIG | HKCC\n" +"\n" +" Subkey: 在所選取 ROOT 機碼下的登錄機碼的完整路徑。\n" +"\n" +" <檔案>\n" +" 要建立的登錄檔案的名稱和路徑。\n" +" 檔案必須是 .reg 的副檔名。\n" +"\n" +" /y\n" +" 覆寫 <檔案> 而不需確認提示。\n" +"\n" #: programs/reg/reg.rc:148 msgid "" @@ -15721,6 +15613,13 @@ msgid "" " The name and path of the registry file to import.\n" "\n" msgstr "" +"REG IMPORT <檔案>\n" +"\n" +" 從給定的檔案匯入機碼、值和資料到註冊表。\n" +"\n" +" <檔案>\n" +" 要匯入的登錄檔案的名稱和路徑。\n" +"\n" #: programs/reg/reg.rc:114 msgid "" @@ -15756,6 +15655,37 @@ msgid "" " List all registry entries under <key> and its subkeys.\n" "\n" msgstr "" +"REG QUERY <機碼> [/v 值名稱 | /ve] [/s]\n" +"\n" +" 查詢指定的登錄機碼，並列出該機碼中的所有即時子機碼、值和資料。\n" +" 使用 [/s] 來遞迴查詢每個子機碼。\n" +"\n" +" <機碼>\n" +" 要查詢的登錄機碼。\n" +"\n" +" 格式: ROOT\\Subkey\n" +"\n" +" ROOT: 預先定義的登錄機碼。這必須是下列的其中一個:\n" +"\n" +" HKEY_LOCAL_MACHINE | HKLM\n" +" HKEY_CURRENT_USER | HKCU\n" +" HKEY_CLASSES_ROOT | HKCR\n" +" HKEY_USERS | HKU\n" +" HKEY_CURRENT_CONFIG | HKCC\n" +"\n" +" Subkey: 在所選取 ROOT 機碼下的登錄機碼的完整路徑。\n" +"\n" +" /v <值名稱>\n" +" 要查詢的登錄值的名稱。如果未指定 [/v] 或 [/ve]，\n" +" 則會列出 <機碼> 下所有的值。\n" +"\n" +" /ve\n" +" 查詢未命名的登錄值。這個選項會查詢 (預設) 的\n" +" 登錄值。\n" +"\n" +" /s\n" +" 列出 <機碼> 及其子機碼的所有登錄項目。\n" +"\n" #: programs/reg/reg.rc:180 msgid "" @@ -15766,122 +15696,98 @@ msgid "" " Access the registry using the 64-bit view.\n" "\n" msgstr "" +" /reg:32\n" +" 使用 32 位元登錄檢視來存取機碼。\n" +"\n" +" /reg:64\n" +" 使用 64 位元登錄檢視來存取機碼。\n" +"\n" #: programs/reg/reg.rc:117 -#, fuzzy -#| msgid "Error: Invalid key name\n" msgid "reg: Invalid registry key\n" -msgstr "錯誤：無效的索引鍵名稱\n" +msgstr "reg: 無效的登錄機碼\n" #: programs/reg/reg.rc:119 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "reg: Unable to access remote machine\n" -msgstr "錯誤：無法加入索引鍵到遠端機器\n" +msgstr "reg: 無法存取遠端機器\n" #: programs/reg/reg.rc:172 -#, fuzzy -#| msgid "Error: Invalid key name\n" msgid "reg: Invalid system key\n" -msgstr "錯誤：無效的索引鍵名稱\n" +msgstr "reg: 無效的系統金鑰\n" #: programs/reg/reg.rc:140 -#, fuzzy -#| msgid "Error: Invalid option '%c'.\n" msgid "reg: Invalid option [%1]. " -msgstr "錯誤：無效的選項 %c。\n" +msgstr "reg: 無效的選項 [%1]。 " #: programs/reg/reg.rc:122 msgid "reg: The option [/d] must be followed by a valid numeric value\n" -msgstr "" +msgstr "reg: 選項 [/d] 後必須接著一個有效的數字值\n" #: programs/reg/reg.rc:123 msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" -msgstr "" +msgstr "reg: 選項 [/d] 後必須接著一個有效的十六進制值\n" #: programs/reg/reg.rc:136 msgid "reg: The option [/d] must be followed by a valid string\n" -msgstr "" +msgstr "reg: 選項 [/d] 後必須接著一個有效的字串\n" #: programs/reg/reg.rc:124 msgid "reg: Unhandled registry data type [/t 0x%1!x!, /d %2]\n" -msgstr "" +msgstr "reg: 未處理的登錄資料類型 [/t 0x%1!x!, /d %2]\n" #: programs/reg/reg.rc:121 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "reg: Unsupported registry data type [%1]\n" -msgstr "不受支援的型態。\n" +msgstr "reg: 不支援的登錄資料類型 [%1]\n" #: programs/reg/reg.rc:125 -#, fuzzy -#| msgid "The specified file already exists. Do you want to replace it?" msgid "The registry value '%1' already exists. Do you want to overwrite it?" -msgstr "檔案已經存在。您要取代嗎？" +msgstr "登錄值 '%1' 已經存在。您要覆寫它嗎?" #: programs/reg/reg.rc:118 -#, fuzzy -#| msgid "Error: Invalid command line parameters\n" msgid "reg: Invalid command line parameters\n" -msgstr "錯誤：無效的命令列參數\n" +msgstr "reg: 無效的命令列參數\n" #: programs/reg/reg.rc:204 msgid "reg: The source and destination keys cannot be the same\n" -msgstr "" +msgstr "reg: 來源和目標機碼不可以相同\n" #: programs/reg/reg.rc:205 -#, fuzzy -#| msgid "The specified file already exists. Do you want to replace it?" msgid "" "The value '%1\\%2' already exists in the destination key. Do you want to " "overwrite it?" -msgstr "檔案已經存在。您要取代嗎？" +msgstr "目標機碼內的值 '%1\\%2' 已經存在。您要覆寫它嗎?" #: programs/reg/reg.rc:133 -#, fuzzy -#| msgid "Are you sure you want to delete these values?" msgid "Are you sure you want to delete the registry value '%1'?" -msgstr "您確認要刪除這些數值嗎？" +msgstr "您確定要刪除登錄值 '%1' 嗎?" #: programs/reg/reg.rc:134 -#, fuzzy -#| msgid "Are you sure you want to delete value '%s'?" msgid "Are you sure you want to delete all registry values in '%1'?" -msgstr "您確認要刪除這個數值 %s 嗎？" +msgstr "您確定要刪除 '%1' 下的所有登錄值嗎?" #: programs/reg/reg.rc:135 -#, fuzzy -#| msgid "Are you sure you want to delete '%1'?" msgid "Are you sure you want to delete the registry key '%1'?" -msgstr "確定要刪除 %1？" +msgstr "您確定要刪除登錄機碼 '%1' 嗎?" #: programs/reg/reg.rc:137 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "reg: Unable to delete all registry values in '%1'\n" -msgstr "錯誤：無法加入索引鍵到遠端機器\n" +msgstr "reg: 無法刪除所有在 '%1' 下的登錄值\n" #: programs/reg/reg.rc:173 -#, fuzzy -#| msgid "The specified file already exists. Do you want to replace it?" msgid "The file '%1' already exists. Do you want to overwrite it?" -msgstr "檔案已經存在。您要取代嗎？" +msgstr "檔案 '%1' 已經存在。您要覆寫它嗎?" #: programs/reg/reg.rc:151 msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" -msgstr "" +msgstr "reg: 無法辨識的逸出序列 [\\%1!c!]\n" #: programs/reg/reg.rc:175 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "reg: Unable to import the registry key '%1'\n" -msgstr "錯誤：無法加入索引鍵到遠端機器\n" +msgstr "reg: 無法匯入登錄機碼 '%1'\n" #: programs/reg/reg.rc:150 -#, fuzzy -#| msgid "No command was specified." msgid "reg: The file '%1' was not found.\n" -msgstr "沒有任何命令被指定。" +msgstr "reg: 無法找到檔案 '%1'。\n" #: programs/reg/reg.rc:143 programs/regedit/regedit.rc:240 msgid "(value not set)" @@ -15889,7 +15795,7 @@ msgstr "(沒有設值)" #: programs/reg/reg.rc:138 msgid "Search complete. Number of matches found: %1!d!\n" -msgstr "" +msgstr "搜尋完成。相符項目的數目: %1!d!\n" #: programs/regedit/regedit.rc:34 msgid "&Registry" @@ -15897,16 +15803,16 @@ msgstr "註冊表(&R)" #: programs/regedit/regedit.rc:36 msgid "&Import Registry File..." -msgstr "匯入註冊表檔案(&I)..." +msgstr "匯入登錄檔案(&I)..." #: programs/regedit/regedit.rc:37 msgid "&Export Registry File..." -msgstr "匯出註冊表檔案(&E)..." +msgstr "匯出登錄檔案(&E)..." #: programs/regedit/regedit.rc:47 programs/regedit/regedit.rc:99 #: programs/regedit/regedit.rc:121 msgid "&Key" -msgstr "索引鍵(&K)" +msgstr "機碼(&K)" #: programs/regedit/regedit.rc:49 programs/regedit/regedit.rc:101 #: programs/regedit/regedit.rc:123 @@ -15916,12 +15822,12 @@ msgstr "字串值(&S)" #: programs/regedit/regedit.rc:50 programs/regedit/regedit.rc:102 #: programs/regedit/regedit.rc:124 msgid "&Binary Value" -msgstr "二進位值(&B)" +msgstr "二進制值(&B)" #: programs/regedit/regedit.rc:51 programs/regedit/regedit.rc:103 #: programs/regedit/regedit.rc:125 msgid "&DWORD Value" -msgstr "雙字組值(&D)" +msgstr "DWORD 值(&D)" #: programs/regedit/regedit.rc:52 programs/regedit/regedit.rc:104 #: programs/regedit/regedit.rc:126 @@ -15940,7 +15846,7 @@ msgstr "重新命名(&R)\tF2" #: programs/regedit/regedit.rc:59 programs/regedit/regedit.rc:114 msgid "&Copy Key Name" -msgstr "複製索引鍵名稱(&C)" +msgstr "複製機碼名稱(&C)" #: programs/regedit/regedit.rc:61 programs/regedit/regedit.rc:107 #: programs/wordpad/wordpad.rc:53 @@ -15970,13 +15876,11 @@ msgstr "關於註冊表編輯器(&A)" #: programs/regedit/regedit.rc:89 programs/regedit/regedit.rc:96 #: programs/regedit/regedit.rc:230 msgid "Expand" -msgstr "" +msgstr "展開" #: programs/regedit/regedit.rc:134 programs/regedit/regedit.rc:233 -#, fuzzy -#| msgid "Modify Binary Data..." msgid "Modify &Binary Data..." -msgstr "修改二進位資料..." +msgstr "修改二進位資料(&B)..." #: programs/regedit/regedit.rc:267 msgid "Export registry" @@ -15984,31 +15888,31 @@ msgstr "匯出註冊表" #: programs/regedit/regedit.rc:269 msgid "S&elected branch:" -msgstr "指定分支(&E)：" +msgstr "指定分支(&E):" #: programs/regedit/regedit.rc:278 msgid "Find:" -msgstr "搜尋：" +msgstr "尋找:" #: programs/regedit/regedit.rc:280 msgid "Find in:" -msgstr "在這找：" +msgstr "在這找:" #: programs/regedit/regedit.rc:281 msgid "Keys" -msgstr "索引鍵" +msgstr "機碼" #: programs/regedit/regedit.rc:282 msgid "Value names" -msgstr "數值名稱" +msgstr "值名稱" #: programs/regedit/regedit.rc:283 msgid "Value content" -msgstr "數值內容" +msgstr "值內容" #: programs/regedit/regedit.rc:284 msgid "Whole string only" -msgstr "整詞匹配" +msgstr "字串須完全相符" #: programs/regedit/regedit.rc:291 msgid "Add Favorite" @@ -16029,20 +15933,20 @@ msgstr "編輯字串" #: programs/regedit/regedit.rc:316 programs/regedit/regedit.rc:329 #: programs/regedit/regedit.rc:345 programs/regedit/regedit.rc:358 msgid "Value name:" -msgstr "數值名稱:" +msgstr "值名稱:" #: programs/regedit/regedit.rc:318 programs/regedit/regedit.rc:331 #: programs/regedit/regedit.rc:347 programs/regedit/regedit.rc:360 msgid "Value data:" -msgstr "數值資料:" +msgstr "值資料:" #: programs/regedit/regedit.rc:326 msgid "Edit DWORD" -msgstr "編輯雙字組" +msgstr "編輯 DWORD" #: programs/regedit/regedit.rc:333 msgid "Base" -msgstr "進位制" +msgstr "Base" #: programs/regedit/regedit.rc:334 msgid "Hexadecimal" @@ -16054,7 +15958,7 @@ msgstr "十進位" #: programs/regedit/regedit.rc:342 msgid "Edit Binary" -msgstr "編輯二進位資料" +msgstr "編輯二進位" #: programs/regedit/regedit.rc:355 msgid "Edit Multi-String" @@ -16077,13 +15981,9 @@ msgid "Contains commands for accessing frequently used keys" msgstr "含有與使用常用索引鍵有關的全部指令" #: programs/regedit/regedit.rc:163 -#, fuzzy -#| msgid "" -#| "Contains commands for displaying help and information about registry " -#| "editor" msgid "" "Contains commands for displaying Help and information about Registry Editor" -msgstr "含有與說明資訊有關的全部指令" +msgstr "含有顯示登錄編輯程式說明及資訊的命令" #: programs/regedit/regedit.rc:164 msgid "Contains commands for creating new keys or values" @@ -16099,87 +15999,76 @@ msgstr "註冊表編輯器" #: programs/regedit/regedit.rc:221 msgid "Import Registry File" -msgstr "匯入註冊表檔案" +msgstr "匯入登錄檔案" #: programs/regedit/regedit.rc:222 msgid "Export Registry File" -msgstr "匯出註冊表檔案" +msgstr "匯出登錄檔案" #: programs/regedit/regedit.rc:223 msgid "Registry files (*.reg)" -msgstr "註冊表檔案 (*.reg)" +msgstr "登錄檔案 (*.reg)" #: programs/regedit/regedit.rc:224 msgid "Win9x/NT4 Registry files (REGEDIT4)" -msgstr "Win9x/NT4 註冊表檔案 (REGEDIT4)" +msgstr "Win9x/NT4 登錄檔案 (REGEDIT4)" #: programs/regedit/regedit.rc:241 msgid "(cannot display value)" -msgstr "(不能顯示值)" +msgstr "(無法顯示值)" #: programs/regedit/regedit.rc:242 msgid "(unknown %d)" -msgstr "(未知 %d)" +msgstr "(不明 %d)" #: programs/regedit/regedit.rc:247 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "Unable to modify the selected registry value." -msgstr "錯誤：無法加入索引鍵到遠端機器\n" +msgstr "無法編輯選定的登錄值。" #: programs/regedit/regedit.rc:248 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "Unable to create a new registry key." -msgstr "錯誤：無法加入索引鍵到遠端機器\n" +msgstr "無法建立新的登錄機碼。" #: programs/regedit/regedit.rc:249 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "Unable to create a new registry value." -msgstr "錯誤：無法加入索引鍵到遠端機器\n" +msgstr "無法建立新的登錄值。" #: programs/regedit/regedit.rc:250 msgid "" "Unable to rename the key '%1'.\n" "The specified key name already exists." msgstr "" +"無法重新命名機碼 '%1'。\n" +"指定的機碼名稱已經存在。" #: programs/regedit/regedit.rc:251 msgid "" "Unable to rename the value '%1'.\n" "The specified value name already exists." msgstr "" +"無法重新命名值 '%1'。\n" +"指定的值名稱已經存在。" #: programs/regedit/regedit.rc:252 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "Unable to delete the selected registry key." -msgstr "錯誤：無法加入索引鍵到遠端機器\n" +msgstr "無法刪除選定的登錄機碼。" #: programs/regedit/regedit.rc:253 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "Unable to rename the selected registry key." -msgstr "錯誤：無法加入索引鍵到遠端機器\n" +msgstr "無法重新命名選定的登錄機碼。" #: programs/regedit/regedit.rc:254 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "Unable to rename the selected registry value." -msgstr "錯誤：無法加入索引鍵到遠端機器\n" +msgstr "無法重新命名選定的登錄值" #: programs/regedit/regedit.rc:255 msgid "" "The keys and values contained in %1 were successfully added to the registry." -msgstr "" +msgstr "%1 所包含的機碼和值已成功新增至註冊表。" #: programs/regedit/regedit.rc:256 -#, fuzzy -#| msgid "" -#| "Error: The system was unable to find the specified registry key or value\n" msgid "Unable to import %1. The specified file is not a valid registry file." -msgstr "錯誤：系統無法找到指定的註冊表索引鍵或值\n" +msgstr "無法匯入 %1。指定的檔案不是有效的登錄檔案。" #: programs/regedit/regedit.rc:408 msgid "" @@ -16211,151 +16100,144 @@ msgid "" " regedit /E \"export.reg\" \"HKEY_CURRENT_USER\\Console\"\n" " regedit /D \"HKEY_LOCAL_MACHINE\\Key\\Path\"\n" msgstr "" +"用法:\n" +" regedit [選項] [檔案名稱] [登錄機碼]\n" +"\n" +"選項:\n" +" [no option] 啟動本程式的圖形介面。\n" +" /L:system.dat 要修改的 system.dat 檔案位置。\n" +" 與任何其他切換參數相容。已略過。\n" +" /R:user.dat 要修改的 user.dat 檔案位置。\n" +" 與任何其他切換參數相容。已略過。\n" +" /C 匯入登錄檔案的內容。\n" +" /D 刪除指定的登錄機碼。\n" +" /E 匯出指定的登錄機碼內容到檔案。\n" +" 如果沒有指定機碼，則會匯出整個註冊表。\n" +" /S 靜音模式。不會顯示訊息。\n" +" /V 以進階模式啟動圖形介面。已略過。\n" +" /? 顯示這個資訊並結束。\n" +" [檔案名稱] 要匯入的註冊表資訊檔案的位置。\n" +" 當與 [/E] 一起使用時，這個選項會指定\n" +" 註冊表資訊檔案的匯出位置。\n" +" [登錄機碼] 要修改的登錄機碼。\n" +"\n" +"使用範例:\n" +" regedit \"import.reg\"\n" +" regedit /E \"export.reg\" \"HKEY_CURRENT_USER\\Console\"\n" +" regedit /D \"HKEY_LOCAL_MACHINE\\Key\\Path\"\n" #: programs/regedit/regedit.rc:409 msgid "regedit: Invalid or unrecognized switch [%1]\n" -msgstr "" +msgstr "regedit: 無效或無法辨識的切換參數 [%1]\n" #: programs/regedit/regedit.rc:410 msgid "Type \"regedit /?\" for help.\n" -msgstr "" +msgstr "輸入 \"regedit /?\" 以取得說明。\n" #: programs/regedit/regedit.rc:411 -#, fuzzy -#| msgid "No command was specified." msgid "regedit: No filename was specified.\n" -msgstr "沒有任何命令被指定。" +msgstr "regedit: 未指定檔案名稱。\n" #: programs/regedit/regedit.rc:412 msgid "regedit: No registry key was specified for removal.\n" -msgstr "" +msgstr "regedit: 未指定要移除的登錄機碼。\n" #: programs/regedit/regedit.rc:413 msgid "regedit: The file '%1' was not found.\n" -msgstr "" +msgstr "regedit: 找不到檔案 '%1'。\n" #: programs/regedit/regedit.rc:414 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "regedit: Unable to open the file '%1'.\n" -msgstr "錯誤：無法加入索引鍵到遠端機器\n" +msgstr "regedit: 無法開啟檔案 '%1'。\n" #: programs/regedit/regedit.rc:415 -#, fuzzy -#| msgid "Invalid handle operation.\n" msgid "regedit: Unhandled action.\n" -msgstr "無效的控柄作業。\n" +msgstr "regedit: 未處理的操作。\n" #: programs/regedit/regedit.rc:416 msgid "regedit: Out of memory! (%1!S!, line %2!u!)\n" -msgstr "" +msgstr "regedit: 記憶體不足! (%1!S!, line %2!u!)\n" #: programs/regedit/regedit.rc:417 -#, fuzzy -#| msgid "Error: Invalid key name\n" msgid "regedit: Invalid hexadecimal value.\n" -msgstr "錯誤：無效的索引鍵名稱\n" +msgstr "regedit: 錯誤的十六進位值。\n" #: programs/regedit/regedit.rc:418 msgid "" "regedit: Unable to convert hexadecimal data. An invalid value was " "encountered at '%1'.\n" msgstr "" +"regedit: 無法轉換十六進位資料。在 '%1' 遇到錯誤的值。\n" #: programs/regedit/regedit.rc:419 msgid "regedit: Unrecognized escape sequence [\\%1!c!]\n" -msgstr "" +msgstr "regedit: 無法辨識的逸出序列 [\\%1!c!]\n" #: programs/regedit/regedit.rc:420 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "regedit: Unsupported registry data type [0x%1!x!]\n" -msgstr "不受支援的型態。\n" +msgstr "regedit: 不支援的登錄資料類型 [0x%1!x!]\n" #: programs/regedit/regedit.rc:421 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "regedit: Unexpected end of line in '%1'.\n" -msgstr "錯誤：無法加入索引鍵到遠端機器\n" +msgstr "regedit: 在 '%1' 發現意外的結尾。\n" #: programs/regedit/regedit.rc:422 -#, fuzzy -#| msgid "No command was specified." msgid "regedit: The line '%1' was not recognized.\n" -msgstr "沒有任何命令被指定。" +msgstr "regedit: 無法辨識列 '%1'。\n" #: programs/regedit/regedit.rc:423 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "regedit: Unable to add the registry value '%1' to '%2'.\n" -msgstr "錯誤：無法加入索引鍵到遠端機器\n" +msgstr "regedit: 無法從 '%1' 新增登錄值到 '%2'。\n" #: programs/regedit/regedit.rc:424 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "regedit: Unable to open the registry key '%1'.\n" -msgstr "錯誤：無法加入索引鍵到遠端機器\n" +msgstr "regedit: 無法開啟登錄機碼 '%1'。\n" #: programs/regedit/regedit.rc:425 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "" "regedit: Unsupported registry data type [0x%1!x!] encountered in '%2'.\n" -msgstr "不受支援的型態。\n" +msgstr "regedit: 在 '%2' 遇到不支援的登錄資料類型 [0x%1!x!]。\n" #: programs/regedit/regedit.rc:426 msgid "regedit: The registry value '%1' will be exported as binary data.\n" -msgstr "" +msgstr "regedit: 登錄值 '%1' 將以二進位資料匯出。\n" #: programs/regedit/regedit.rc:427 -#, fuzzy -#| msgid "Error: Invalid key name\n" msgid "regedit: Invalid system key [%1]\n" -msgstr "錯誤：無效的索引鍵名稱\n" +msgstr "regedit: 錯誤的系統金鑰 [%1]\n" #: programs/regedit/regedit.rc:428 -#, fuzzy -#| msgid "" -#| "Error: The system was unable to find the specified registry key or value\n" msgid "" "regedit: Unable to export '%1'. The specified registry key was not found.\n" -msgstr "錯誤：系統無法找到指定的註冊表索引鍵或值\n" +msgstr "regedit: 無法匯出 '%1'。找不到指定的登錄機碼。\n" #: programs/regedit/regedit.rc:429 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "regedit: Unable to delete the registry key '%1'.\n" -msgstr "錯誤：無法加入索引鍵到遠端機器\n" +msgstr "regedit: 無法刪除登錄機碼 '%1'。\n" #: programs/regedit/regedit.rc:431 -#, fuzzy -#| msgid "No command was specified." msgid "regedit: The line contains invalid syntax.\n" -msgstr "沒有任何命令被指定。" +msgstr "regedit: 該列有錯誤的語法。\n" #: programs/regedit/regedit.rc:187 -#, fuzzy -#| msgid "Quits the registry editor" msgid "Quits the Registry Editor" msgstr "結束註冊表編輯器" #: programs/regedit/regedit.rc:188 msgid "Adds keys to the favorites list" -msgstr "將索引鍵新增到我的最愛" +msgstr "將機碼新增到我的最愛" #: programs/regedit/regedit.rc:189 msgid "Removes keys from the favorites list" -msgstr "從我的最愛中刪除索引鍵" +msgstr "從我的最愛中刪除機碼" #: programs/regedit/regedit.rc:190 msgid "Shows or hides the status bar" msgstr "顯示或隱藏狀態列" #: programs/regedit/regedit.rc:191 -#, fuzzy -#| msgid "Change position of split between two panes" msgid "Changes the position of the split between two panes" -msgstr "改變兩個窗格之間的分隔線位置" +msgstr "變更兩個窗格之間的分隔線位置" #: programs/regedit/regedit.rc:192 msgid "Refreshes the window" @@ -16363,19 +16245,19 @@ msgstr "重新整理視窗" #: programs/regedit/regedit.rc:193 msgid "Deletes the selection" -msgstr "刪除選擇項目" +msgstr "刪除已選項目" #: programs/regedit/regedit.rc:194 msgid "Renames the selection" -msgstr "重新命名選擇項目" +msgstr "重新命名已選項目" #: programs/regedit/regedit.rc:195 msgid "Copies the name of the selected key to the clipboard" -msgstr "將索引鍵的名稱複製到剪貼簿" +msgstr "將機碼的名稱複製到剪貼簿" #: programs/regedit/regedit.rc:196 msgid "Finds a text string in a key, value or data" -msgstr "在索引鍵、值或資料中找字串" +msgstr "在機碼、值或資料中尋找字串" #: programs/regedit/regedit.rc:197 msgid "Finds next occurrence of text specified in previous search" @@ -16387,7 +16269,7 @@ msgstr "修改值的資料" #: programs/regedit/regedit.rc:171 msgid "Adds a new key" -msgstr "新增一個新的索引鍵" +msgstr "新增一個新的機碼" #: programs/regedit/regedit.rc:172 msgid "Adds a new string value" @@ -16398,10 +16280,8 @@ msgid "Adds a new binary value" msgstr "新增一個新的二進制值" #: programs/regedit/regedit.rc:174 -#, fuzzy -#| msgid "Adds a new binary value" msgid "Adds a new 32-bit value" -msgstr "新增一個新的二進制值" +msgstr "新增一個新的 32 位元值" #: programs/regedit/regedit.rc:177 msgid "Imports a text file into the registry" @@ -16409,118 +16289,92 @@ msgstr "將純文字檔案匯入註冊表" #: programs/regedit/regedit.rc:179 msgid "Exports all or part of the registry to a text file" -msgstr "將註冊表導出到純文字檔案" +msgstr "將註冊表匯出到純文字檔案" #: programs/regedit/regedit.rc:180 msgid "Prints all or part of the registry" msgstr "列印註冊表的全部或部分" #: programs/regedit/regedit.rc:181 -#, fuzzy -#| msgid "Registry Editor" msgid "Opens Registry Editor Help" -msgstr "註冊表編輯器" +msgstr "開啟註冊表編輯器的說明" #: programs/regedit/regedit.rc:182 msgid "Displays program information, version number and copyright" -msgstr "顯示程式資訊、版本號及版權" +msgstr "顯示程式資訊、版本號及著作權" #: programs/regedit/regedit.rc:206 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "Unable to query the registry value '%1'." -msgstr "錯誤：無法加入索引鍵到遠端機器\n" +msgstr "無法查詢登錄值 '%1'。" #: programs/regedit/regedit.rc:207 -#, fuzzy -#| msgid "Can't edit keys of this type (%u)" msgid "Unable to edit registry keys of this type (%1!u!)." -msgstr "無法編輯這類型的索引鍵 (%u)" +msgstr "無法編輯這種類型的登錄機碼 (%1!u!)。" #: programs/regedit/regedit.rc:208 -#, fuzzy -#| msgid "Value is too big (%u)" msgid "The value is too big (%1!u!)." -msgstr "數值太大 (%u)" +msgstr "登錄值太大 (%1!u!)。" #: programs/regedit/regedit.rc:209 msgid "Confirm Value Delete" -msgstr "確認刪除數值" +msgstr "確認刪除登錄值" #: programs/regedit/regedit.rc:210 -#, fuzzy -#| msgid "Are you sure you want to delete these values?" msgid "Are you sure you want to delete the selected registry value?" -msgstr "您確認要刪除這些數值嗎？" +msgstr "您確認要刪除已選取的登錄值嗎?" #: programs/regedit/regedit.rc:216 -#, fuzzy -#| msgid "Search string '%s' not found" msgid "Search complete. The string '%1' was not found." -msgstr "找不到搜尋的字串 %s" +msgstr "搜尋完成。找不到字串 '%1'。" #: programs/regedit/regedit.rc:211 msgid "Are you sure you want to delete these values?" -msgstr "您確認要刪除這些數值嗎？" +msgstr "您確認要刪除這些登錄值嗎?" #: programs/regedit/regedit.rc:214 msgid "New Key #%d" -msgstr "索引鍵 #%d" +msgstr "新機碼 #%d" #: programs/regedit/regedit.rc:215 msgid "New Value #%d" -msgstr "新索引鍵 #%d" +msgstr "新登錄值 #%d" #: programs/regedit/regedit.rc:205 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "Unable to query the registry key '%1'." -msgstr "錯誤：無法加入索引鍵到遠端機器\n" +msgstr "無法查詢登錄機碼 '%1'。" #: programs/regedit/regedit.rc:170 -#, fuzzy -#| msgid "Modifies the value's data" msgid "Modifies the value's data in binary form" -msgstr "修改值的資料" +msgstr "以二進位修改登錄值的資料" #: programs/regedit/regedit.rc:175 msgid "Adds a new multi-string value" -msgstr "新增一個多字串值" +msgstr "新增一個新的多字串值" #: programs/regedit/regedit.rc:198 -#, fuzzy -#| msgid "Exports selected branch of the registry to a text file" msgid "Exports the selected branch of the registry to a text file" -msgstr "匯出註冊表的所選分支到文字檔" +msgstr "匯出註冊表中已選取的分支到文字檔案" #: programs/regedit/regedit.rc:176 -#, fuzzy -#| msgid "Adds a new string value" msgid "Adds a new expandable string value" -msgstr "新增一個新的字串值" +msgstr "新增一個新的可擴充字串值" #: programs/regedit/regedit.rc:212 -#, fuzzy -#| msgid "Confirm Value Delete" msgid "Confirm Key Delete" -msgstr "確認刪除數值" +msgstr "確認刪除機碼" #: programs/regedit/regedit.rc:213 -#, fuzzy -#| msgid "Are you sure you want to delete '%1'?" msgid "" "Are you sure you want to delete this registry key and all of its subkeys?" -msgstr "確定要刪除 %1？" +msgstr "您確認要刪除這個登錄機碼及其所有的子機碼嗎?" #: programs/regedit/regedit.rc:199 msgid "Expands or collapses the selected node" -msgstr "" +msgstr "展開或摺疊已選取的節點" #: programs/regedit/regedit.rc:231 -#, fuzzy -#| msgid "C&ollate" msgid "Collapse" -msgstr "自動分頁(&O)" +msgstr "摺疊" #: programs/regsvr32/regsvr32.rc:33 msgid "" @@ -16529,6 +16383,10 @@ msgid "" "Provides DLL registration services.\n" "\n" msgstr "" +"Wine DLL 註冊工具\n" +"\n" +"提供 DLL 註冊服務。\n" +"\n" #: programs/regsvr32/regsvr32.rc:41 msgid "" @@ -16543,85 +16401,66 @@ msgid "" " [/n] Do not call DllRegisterServer. This option must be used with [/i].\n" "\n" msgstr "" +"用法:\n" +" regsvr32 [/u] [/s] [/n] [/i[:cmdline]] Dll名稱\n" +"\n" +"選項:\n" +" [/u] 取消註冊伺服器。\n" +" [/s] 靜音模式 (不會顯示訊息)。\n" +" [/i] 呼叫 DllInstall，並將選項傳給它 [cmdline]。\n" +"\t在與 [/u] 一起使用時，會以解除安裝模式呼叫 DllInstall。\n" +" [/n] 不要呼叫 DllRegisterServer。這個選項必須與 [/i] 一起使用。\n" +"\n" #: programs/regsvr32/regsvr32.rc:42 msgid "" "regsvr32: Invalid or unrecognized switch [%1]\n" "\n" msgstr "" +"regedit: 無效或無法辨識的切換參數 [%1]\n" +"\n" #: programs/regsvr32/regsvr32.rc:43 -#, fuzzy -#| msgid "Failed to open '%1'\n" msgid "regsvr32: Failed to load DLL '%1'\n" -msgstr "開啟 %1 失敗\n" +msgstr "regsvr32: 無法載入 DLL '%1'\n" #: programs/regsvr32/regsvr32.rc:44 msgid "regsvr32: '%1!S!' not implemented in DLL '%2'\n" -msgstr "" +msgstr "regsvr32: '%1!S!' 尚未於 DLL '%2' 實作\n" #: programs/regsvr32/regsvr32.rc:45 msgid "regsvr32: Failed to register DLL '%1'\n" -msgstr "" +msgstr "regsvr32: 無法註冊 DLL '%1'\n" #: programs/regsvr32/regsvr32.rc:46 msgid "regsvr32: Successfully registered DLL '%1'\n" -msgstr "" +msgstr "regsvr32: 成功註冊 DLL '%1'\n" #: programs/regsvr32/regsvr32.rc:47 msgid "regsvr32: Failed to unregister DLL '%1'\n" -msgstr "" +msgstr "regsvr32: 無法解除註冊 DLL '%1'\n" #: programs/regsvr32/regsvr32.rc:48 msgid "regsvr32: Successfully unregistered DLL '%1'\n" -msgstr "" +msgstr "regsvr32: 成功解除註冊 DLL '%1'\n" #: programs/regsvr32/regsvr32.rc:49 msgid "regsvr32: Failed to install DLL '%1'\n" -msgstr "" +msgstr "regsvr32: 無法安裝 DLL '%1'\n" #: programs/regsvr32/regsvr32.rc:50 msgid "regsvr32: Successfully installed DLL '%1'\n" -msgstr "" +msgstr "regsvr32: 成功安裝 DLL '%1'\n" #: programs/regsvr32/regsvr32.rc:51 msgid "regsvr32: Failed to uninstall DLL '%1'\n" -msgstr "" +msgstr "regsvr32: 無法解除安裝 DLL '%1'\n" #: programs/regsvr32/regsvr32.rc:52 msgid "regsvr32: Successfully uninstalled DLL '%1'\n" -msgstr "" +msgstr "regsvr32: 成功解除安裝 DLL '%1'\n" #: programs/start/start.rc:57 -#, fuzzy -#| msgid "" -#| "Start a program, or open a document in the program normally used for " -#| "files with that suffix.\n" -#| "Usage:\n" -#| "start [options] program_filename [...]\n" -#| "start [options] document_filename\n" -#| "\n" -#| "Options:\n" -#| "\"title\" Specifies the title of the child windows.\n" -#| "/d directory Start the program in the specified directory.\n" -#| "/b Don't create a new console for the program.\n" -#| "/i Start the program with fresh environment variables.\n" -#| "/min Start the program minimized.\n" -#| "/max Start the program maximized.\n" -#| "/low Start the program in the idle priority class.\n" -#| "/normal Start the program in the normal priority class.\n" -#| "/high Start the program in the high priority class.\n" -#| "/realtime Start the program in the realtime priority class.\n" -#| "/abovenormal Start the program in the abovenormal priority class.\n" -#| "/belownormal Start the program in the belownormal priority class.\n" -#| "/node n Start the program on the specified NUMA node.\n" -#| "/affinity mask Start the program with the specified affinity mask.\n" -#| "/wait Wait for the started program to finish, then exit with its " -#| "exit code.\n" -#| "/unix Use a Unix filename and start the file like Windows " -#| "explorer.\n" -#| "/ProgIDOpen Open a document using the specified progID.\n" -#| "/? Display this help and exit.\n" msgid "" "Start a program, or open a document in the program normally used for files\n" "with that suffix.\n" @@ -16652,30 +16491,31 @@ msgid "" "/ProgIDOpen Open a document using the specified progID.\n" "/? Display this help and exit.\n" msgstr "" -"啟始一個程式，或是利用關聯該檔案字尾的程式來開啟文件。\n" -"用法：\n" +"啟動程式，或根據檔案的後綴，使用一般用於開啟該後綴的程式來開啟文件。\n" +"用法:\n" "start [選項] 程式檔案名稱 [...]\n" "start [選項] 文件檔案名稱\n" "\n" -"選項：\n" -"「標題」指定子視窗的標題。\n" -"/d 目錄在指定的目錄中啟始程式。\n" -"/b 無法為程式建立新的主控臺。\n" -"/i 以新的環境變數啟始程式。\n" -"/min 啟始程式時縮到最小。\n" -"/max 啟始程式時放到最大。\n" -"/low 在閒置優先權類別中啟始程式。\n" -"/normal 在一般優先權類別中啟始程式。\n" -"/high 在高優先權類別中啟始程式。\n" -"/realtime 在即時優先權類別中啟始程式。\n" -"/abovenormal 在正常之上優先權類別中啟始程式。\n" -"/belownormal 在正常之下優先權類別中啟始程式。\n" -"/node n 在指定的 NUMA 節點之上啟始程式。\n" -"/affinity 遮罩以指定的近似遮罩啟始程式。\n" -"/wait 等待啟始的程式直到完成，然後以它的離開代碼離開。\n" -"/unix 使用 Unix 檔名並如同 Windows 檔案總管來啟始檔案。\n" -"/ProgIDOpen 使用指定的 progID 開啟文件。\n" -"/? 顯示這份說明然後離開。\n" +"選項:\n" +"\"標題\" 指定子視窗的標題。\n" +"/d 目錄於指定的目錄開啟程式。\n" +"/b 不要為程式建立新的主控臺。\n" +"/i 使用新的環境變數來啟動程式。\n" +"/min 啟動程式時將視窗最小化。\n" +"/max 啟動程式時將視窗最大化。\n" +"/low 在 Idle 優先類別中啟動程式。\n" +"/normal 在 Normal 優先類別中啟動程式。\n" +"/high 在 High 優先類別中啟動程式。\n" +"/realtime 在 Realtime 優先類別中啟動程式。\n" +"/abovenormal 在 Abovenormal 優先類別中啟動程式。\n" +"/belownormal 在 Belownormal 優先類別中啟動程式。\n" +"/node n 以指定的 NUMA 節點啟動程式。\n" +"/affinity mask 以指定的親和性遮罩啟動程式。\n" +"/wait 啟動應用程式並等候它終止，結束時會給予結束代碼。\n" +"/unix 使用 Unix 檔案名稱，並像 Windows 檔案總管一樣開啟檔案\n" +"/exec 對指定檔案進行 Exec (在 Wine 內部使用)。\n" +"/ProgIDOpen 使用指定的 progID 來開啟檔案。\n" +"/? 顯示這個說明並結束。\n" #: programs/start/start.rc:59 msgid "" @@ -16683,12 +16523,12 @@ msgid "" "specified file.\n" "ShellExecuteEx failed" msgstr "" -"無法啟始應用程式，或是沒有與指定檔案關聯的應用程式。\n" +"無法啟動應用程式，或是沒有與指定檔案關聯的應用程式。\n" "ShellExecuteEx 失敗" #: programs/start/start.rc:61 msgid "Could not translate the specified Unix filename to a DOS filename." -msgstr "無法翻譯指定的 Unix 檔名到 DOS 檔名。" +msgstr "無法翻譯指定的 Unix 檔案名稱到 DOS 檔案名稱。" #: programs/taskkill/taskkill.rc:30 msgid "Usage: taskkill [/?] [/f] [/im ProcessName | /pid ProcessID]\n" -- 2.33.0.windows.2

2 1

can we exclude builtin->CRT calls from relay logs?
by Esme Povirk (she/they) Nov. 6, 2021

Nov. 6, 2021

An unfortunate effect of the PE conversion is that relay logs contain much more noise, as every call from a builtin dll into the CRT is now included in relay logs. I tend to either delete those lines using a regex search in vim, or add ucrtbase.* to RelayExclude. I don't think we want to make ucrtbase.* a default RelayExclude, as it would exclude calls from applications too, but maybe I'm wrong about that. A possible alternative would be to add an option which excludes the calls only if they come from a builtin dll. We could then add ucrtbase.* to this by default. Maybe call it RelayFromBuiltinExclude. Does this seem like a good idea? Does anyone have other thoughts? If there were a way to apply this to libmono as well, that'd be useful, as it has a similar issue, but I can't think of a simple design that would make that work.

2 1

Wine staging 6.21 release
by Alistair Leslie-Hughes Nov. 6, 2021

Nov. 6, 2021

Binary packages for various distributions will be available from: https://www.winehq.org/download Notes: dwarf4 debug information is now the default for wine-staging. Summary since last release * Rebased to current wine 6.21 (558 patches are applied to wine vanilla) Upstreamed (Either directly from staging or fixed with a similar patch). * winex11.drv: Accumulate mouse movement to avoid rounding losses. * ntdll/tests: Move some tests to a new sync.c file. * ntdll/tests: Add some tests for Rtl* resources. * ntdll: Merge critsection.c into sync.c. * uiautomationcore: Add dll and stub some functions. Added: * [51957] Append .exe, if registry lookup fails first. Updated: * user32-rawinput-mouse * user32-rawinput-mouse-experimental Where can you help * Run Steam/Battle.net/GOG/UPlay/Epic * Test your favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH] winegstreamer: Drop a debugstr from an out parameter
by Michael Stefaniuc Nov. 5, 2021

Nov. 5, 2021

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winegstreamer/wm_reader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index 2f5659608a9..12d1f04c270 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -1063,7 +1063,7 @@ static HRESULT WINAPI header_info_GetAttributeByIndexEx(IWMHeaderInfo3 *iface, { FIXME("iface %p, stream_number %u, index %u, name %p, name_len %p," " type %p, lang_index %p, value %p, size %p, stub!\n", - iface, stream_number, index, debugstr_w(name), name_len, type, lang_index, value, size); + iface, stream_number, index, name, name_len, type, lang_index, value, size); return E_NOTIMPL; } -- 2.31.1

1 0

[PATCH] msvcrt: The '*' character should be interpreted as the beginning of the width specification
by Andrew Eikum Nov. 5, 2021

Nov. 5, 2021

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- For example, "%*0d", 1, ... becomes "%10d", ... i.e. prints ten digits. dlls/msvcrt/printf.h | 4 +++- dlls/msvcrt/tests/printf.c | 12 ++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index aeb1290f48f..40a8a13d861 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -1050,7 +1050,9 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API flags.LeftAlign = TRUE; flags.FieldLength = -flags.FieldLength; } - } else while (*p >= '0' && *p <= '9') { + } + + while (*p >= '0' && *p <= '9') { flags.FieldLength *= 10; flags.FieldLength += *p++ - '0'; } diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index 06acf4c8450..0dd25c3ba8b 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -395,6 +395,18 @@ static void test_sprintf( void ) ok(r==14, "r = %d\n", r); ok(!strcmp(buffer, "string to copy"), "failed: \"%s\"\n", buffer); + r = p_sprintf(buffer, "%*1d", 1, 3); + ok(r==11, "r = %d\n", r); + ok(!strcmp(buffer, " 3"), "failed: \"%s\"\n", buffer); + + r = p_sprintf(buffer, "%0*0d", 1, 2); + ok(r==10, "r = %d\n", r); + ok(!strcmp(buffer, "0000000002"), "failed: \"%s\"\n", buffer); + + r = p_sprintf(buffer, "% *2d", 0, 7); + ok(r==2, "r = %d\n", r); + ok(!strcmp(buffer, " 7"), "failed: \"%s\"\n", buffer); + setlocale(LC_ALL, "C"); } -- 2.33.1

2 2

[PATCH vkd3d 1/5] vkd3d-shader/hlsl: Introduce a helper to write SM4 code blocks.
by Giovanni Mascellani Nov. 5, 2021

Nov. 5, 2021

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_sm4.c | 97 +++++++++++++++++++----------------- 1 file changed, 52 insertions(+), 45 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 9d45e163..0a9aac2a 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1422,13 +1422,63 @@ static void write_sm4_swizzle(struct hlsl_ctx *ctx, write_sm4_instruction(buffer, &instr); } +static void write_sm4_block(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer, + const struct hlsl_block *block) +{ + const struct hlsl_ir_node *instr; + + LIST_FOR_EACH_ENTRY(instr, &block->instrs, struct hlsl_ir_node, entry) + { + if (instr->data_type) + { + if (instr->data_type->type == HLSL_CLASS_MATRIX) + { + FIXME("Matrix operations need to be lowered.\n"); + break; + } + else if (instr->data_type->type == HLSL_CLASS_OBJECT) + { + hlsl_fixme(ctx, instr->loc, "Object copy.\n"); + break; + } + + assert(instr->data_type->type == HLSL_CLASS_SCALAR || instr->data_type->type == HLSL_CLASS_VECTOR); + } + + switch (instr->type) + { + case HLSL_IR_CONSTANT: + write_sm4_constant(ctx, buffer, hlsl_ir_constant(instr)); + break; + + case HLSL_IR_EXPR: + write_sm4_expr(ctx, buffer, hlsl_ir_expr(instr)); + break; + + case HLSL_IR_LOAD: + write_sm4_load(ctx, buffer, hlsl_ir_load(instr)); + break; + + case HLSL_IR_STORE: + write_sm4_store(ctx, buffer, hlsl_ir_store(instr)); + break; + + case HLSL_IR_SWIZZLE: + write_sm4_swizzle(ctx, buffer, hlsl_ir_swizzle(instr)); + break; + + default: + FIXME("Unhandled instruction type %s.\n", hlsl_node_type_to_string(instr->type)); + } + } +} + static void write_sm4_shdr(struct hlsl_ctx *ctx, const struct hlsl_ir_function_decl *entry_func, struct dxbc_writer *dxbc) { const struct hlsl_profile_info *profile = ctx->profile; struct vkd3d_bytecode_buffer buffer = {0}; const struct hlsl_buffer *cbuffer; - const struct hlsl_ir_node *instr; const struct hlsl_ir_var *var; size_t token_count_position; @@ -1472,50 +1522,7 @@ static void write_sm4_shdr(struct hlsl_ctx *ctx, if (ctx->temp_count) write_sm4_dcl_temps(&buffer, ctx->temp_count); - LIST_FOR_EACH_ENTRY(instr, &entry_func->body.instrs, struct hlsl_ir_node, entry) - { - if (instr->data_type) - { - if (instr->data_type->type == HLSL_CLASS_MATRIX) - { - FIXME("Matrix operations need to be lowered.\n"); - break; - } - else if (instr->data_type->type == HLSL_CLASS_OBJECT) - { - hlsl_fixme(ctx, instr->loc, "Object copy.\n"); - break; - } - - assert(instr->data_type->type == HLSL_CLASS_SCALAR || instr->data_type->type == HLSL_CLASS_VECTOR); - } - - switch (instr->type) - { - case HLSL_IR_CONSTANT: - write_sm4_constant(ctx, &buffer, hlsl_ir_constant(instr)); - break; - - case HLSL_IR_EXPR: - write_sm4_expr(ctx, &buffer, hlsl_ir_expr(instr)); - break; - - case HLSL_IR_LOAD: - write_sm4_load(ctx, &buffer, hlsl_ir_load(instr)); - break; - - case HLSL_IR_STORE: - write_sm4_store(ctx, &buffer, hlsl_ir_store(instr)); - break; - - case HLSL_IR_SWIZZLE: - write_sm4_swizzle(ctx, &buffer, hlsl_ir_swizzle(instr)); - break; - - default: - FIXME("Unhandled instruction type %s.\n", hlsl_node_type_to_string(instr->type)); - } - } + write_sm4_block(ctx, &buffer, &entry_func->body); write_sm4_ret(&buffer); -- 2.33.1

3 7

[v2 PATCH 1/7] d3d10/effect: Handle D3D10_SVT_UINT type when returning numeric values.
by Nikolay Sivov Nov. 5, 2021

Nov. 5, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10/effect.c | 4 +++ dlls/d3d10/tests/effect.c | 59 +++++++++++++++++---------------------- 2 files changed, 29 insertions(+), 34 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 5da8d2065f7..5e65ad3f4be 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -4865,6 +4865,7 @@ static BOOL get_value_as_bool(void *src_data, D3D10_SHADER_VARIABLE_TYPE src_typ { case D3D10_SVT_FLOAT: case D3D10_SVT_INT: + case D3D10_SVT_UINT: case D3D10_SVT_BOOL: if (*(DWORD *)src_data) return -1; @@ -4885,6 +4886,7 @@ static int get_value_as_int(void *src_data, D3D10_SHADER_VARIABLE_TYPE src_type) return (int)(*(float *)src_data); case D3D10_SVT_INT: + case D3D10_SVT_UINT: return *(int *)src_data; case D3D10_SVT_BOOL: @@ -4903,6 +4905,7 @@ static float get_value_as_float(void *src_data, D3D10_SHADER_VARIABLE_TYPE src_t return *(float *)src_data; case D3D10_SVT_INT: + case D3D10_SVT_UINT: return (float)(*(int *)src_data); case D3D10_SVT_BOOL: @@ -4933,6 +4936,7 @@ static void get_vector_as_type(BYTE *dst_data, D3D_SHADER_VARIABLE_TYPE dst_type break; case D3D10_SVT_INT: + case D3D10_SVT_UINT: *(int *)dst_data_dword = get_value_as_int(src_data_dword, src_type); break; diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index a8a64a6ed0d..149328301e1 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -4843,43 +4843,32 @@ cbuffer cb float f0, f_a[2]; int i0, i_a[2]; bool b0, b_a[2]; + uint i1, i1_a[2]; }; #endif static DWORD fx_test_scalar_variable[] = { - 0x43425844, 0xe4da4aa6, 0x1380ddc5, 0x445edad5, - 0x08581666, 0x00000001, 0x0000020b, 0x00000001, - 0x00000024, 0x30315846, 0x000001df, 0xfeff1001, - 0x00000001, 0x00000006, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x000000d3, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x66006263, - 0x74616f6c, 0x00000700, 0x00000100, 0x00000000, - 0x00000400, 0x00001000, 0x00000400, 0x00090900, - 0x00306600, 0x00000007, 0x00000001, 0x00000002, - 0x00000014, 0x00000010, 0x00000008, 0x00000909, - 0x00615f66, 0x00746e69, 0x0000004c, 0x00000001, - 0x00000000, 0x00000004, 0x00000010, 0x00000004, - 0x00000911, 0x4c003069, 0x01000000, 0x02000000, - 0x14000000, 0x10000000, 0x08000000, 0x11000000, - 0x69000009, 0x6200615f, 0x006c6f6f, 0x0000008f, - 0x00000001, 0x00000000, 0x00000004, 0x00000010, - 0x00000004, 0x00000921, 0x8f003062, 0x01000000, - 0x02000000, 0x14000000, 0x10000000, 0x08000000, - 0x21000000, 0x62000009, 0x0400615f, 0x70000000, - 0x00000000, 0x06000000, 0xff000000, 0x00ffffff, - 0x29000000, 0x0d000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x48000000, - 0x2c000000, 0x00000000, 0x10000000, 0x00000000, - 0x00000000, 0x00000000, 0x6c000000, 0x50000000, - 0x00000000, 0x24000000, 0x00000000, 0x00000000, - 0x00000000, 0x8b000000, 0x6f000000, 0x00000000, - 0x30000000, 0x00000000, 0x00000000, 0x00000000, - 0xb0000000, 0x94000000, 0x00000000, 0x44000000, - 0x00000000, 0x00000000, 0x00000000, 0xcf000000, - 0xb3000000, 0x00000000, 0x50000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, + 0x43425844, 0x7d97f44c, 0x1da4b110, 0xb710407e, 0x26750c1c, 0x00000001, 0x00000288, 0x00000001, + 0x00000024, 0x30315846, 0x0000025c, 0xfeff1001, 0x00000001, 0x00000008, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000118, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x66006263, + 0x74616f6c, 0x00000700, 0x00000100, 0x00000000, 0x00000400, 0x00001000, 0x00000400, 0x00090900, + 0x00306600, 0x00000007, 0x00000001, 0x00000002, 0x00000014, 0x00000010, 0x00000008, 0x00000909, + 0x00615f66, 0x00746e69, 0x0000004c, 0x00000001, 0x00000000, 0x00000004, 0x00000010, 0x00000004, + 0x00000911, 0x4c003069, 0x01000000, 0x02000000, 0x14000000, 0x10000000, 0x08000000, 0x11000000, + 0x69000009, 0x6200615f, 0x006c6f6f, 0x0000008f, 0x00000001, 0x00000000, 0x00000004, 0x00000010, + 0x00000004, 0x00000921, 0x8f003062, 0x01000000, 0x02000000, 0x14000000, 0x10000000, 0x08000000, + 0x21000000, 0x62000009, 0x7500615f, 0x00746e69, 0x000000d3, 0x00000001, 0x00000000, 0x00000004, + 0x00000010, 0x00000004, 0x00000919, 0xd3003169, 0x01000000, 0x02000000, 0x14000000, 0x10000000, + 0x08000000, 0x19000000, 0x69000009, 0x00615f31, 0x00000004, 0x00000090, 0x00000000, 0x00000008, + 0xffffffff, 0x00000000, 0x00000029, 0x0000000d, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000048, 0x0000002c, 0x00000000, 0x00000010, 0x00000000, 0x00000000, 0x00000000, + 0x0000006c, 0x00000050, 0x00000000, 0x00000024, 0x00000000, 0x00000000, 0x00000000, 0x0000008b, + 0x0000006f, 0x00000000, 0x00000030, 0x00000000, 0x00000000, 0x00000000, 0x000000b0, 0x00000094, + 0x00000000, 0x00000044, 0x00000000, 0x00000000, 0x00000000, 0x000000cf, 0x000000b3, 0x00000000, + 0x00000050, 0x00000000, 0x00000000, 0x00000000, 0x000000f4, 0x000000d8, 0x00000000, 0x00000064, + 0x00000000, 0x00000000, 0x00000000, 0x00000113, 0x000000f7, 0x00000000, 0x00000070, 0x00000000, + 0x00000000, 0x00000000, }; static void test_scalar_methods(ID3D10EffectScalarVariable *var, D3D10_SHADER_VARIABLE_TYPE type, @@ -5145,9 +5134,11 @@ static void test_effect_scalar_variable(void) { {"f0", D3D10_SVT_FLOAT}, {"i0", D3D10_SVT_INT}, + {"i1", D3D10_SVT_UINT}, {"b0", D3D10_SVT_BOOL}, {"f_a", D3D10_SVT_FLOAT, TRUE}, {"i_a", D3D10_SVT_INT, TRUE}, + {"i1_a", D3D10_SVT_UINT, TRUE}, {"b_a", D3D10_SVT_BOOL, TRUE}, }; ID3D10EffectScalarVariable *s_v, *s_v2; @@ -5178,7 +5169,7 @@ static void test_effect_scalar_variable(void) effect_desc.ConstantBuffers); ok(effect_desc.SharedConstantBuffers == 0, "Unexpected shared constant buffers count %u.\n", effect_desc.SharedConstantBuffers); - ok(effect_desc.GlobalVariables == 6, "Unexpected global variables count %u.\n", + ok(effect_desc.GlobalVariables == 8, "Unexpected global variables count %u.\n", effect_desc.GlobalVariables); ok(effect_desc.SharedGlobalVariables == 0, "Unexpected shared global variables count %u.\n", effect_desc.SharedGlobalVariables); -- 2.33.0

3 16

[PATCH] dbghelp/dwarf: don't skip functions when their inlined flag comes from an abstract origin
by Eric Pouech Nov. 5, 2021

Nov. 5, 2021

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/dwarf.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 269cfadd56c..d812e03f833 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -2242,6 +2242,7 @@ static struct symt* dwarf2_parse_subprogram(dwarf2_debug_info_t* di) * a concrete object that we'll handle */ if (dwarf2_find_attribute(di, DW_AT_inline, &inline_flags) && + inline_flags.gotten_from == attr_direct && inline_flags.u.uvalue != DW_INL_not_inlined) { TRACE("Function %s declared as inlined (%ld)... skipping\n",

1 0

[PATCH] winegstreamer: Print the debug string and not the pointer to it
by Michael Stefaniuc Nov. 5, 2021

Nov. 5, 2021

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winegstreamer/wm_reader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index 2f5659608a9..3476f25ca16 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -1061,7 +1061,7 @@ static HRESULT WINAPI header_info_GetAttributeByIndexEx(IWMHeaderInfo3 *iface, WORD stream_number, WORD index, WCHAR *name, WORD *name_len, WMT_ATTR_DATATYPE *type, WORD *lang_index, BYTE *value, DWORD *size) { - FIXME("iface %p, stream_number %u, index %u, name %p, name_len %p," + FIXME("iface %p, stream_number %u, index %u, name %s, name_len %p," " type %p, lang_index %p, value %p, size %p, stub!\n", iface, stream_number, index, debugstr_w(name), name_len, type, lang_index, value, size); return E_NOTIMPL; -- 2.31.1

2 1

[PATCH resend 1/2] winedbg: Adapt build_command_line() from winevdm
by Robbert van der Helm Nov. 5, 2021

Nov. 5, 2021

The only difference between the two versions is that this one doesn't prefix the result with the command line's length. Signed-off-by: Robbert van der Helm <mail(a)robbertvanderhelm.nl> --- Instead of having having four almost identical copies of this function spread around Wine's code base (two for WCHAR*, two for char*), someone who's more familiar with Wine's code base than I am should probably merge these and move them to somewhere in `include/wine/`. --- programs/winedbg/tgt_active.c | 110 ++++++++++++++++++++++++++++++++++ 1 file changed, 110 insertions(+) diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index 3372a001dfbb..ad46d6b5fc5e 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -770,6 +770,116 @@ static void output_system_info(void) } } +/*********************************************************************** + * build_command_line + * + * Build the command line of a process from the argv array. + * Copied from winevdm, which in turn adapted it from ENV_BuildCommandLine. The difference between + * this and the winevdm version is the command line is not prefixed with its length. + */ +static char *build_command_line(char **argv) +{ + int len; + char *p, **arg, *cmd_line; + + len = 0; + for (arg = argv; *arg; arg++) + { + BOOL has_space; + int bcount; + char* a; + + has_space=FALSE; + bcount=0; + a=*arg; + if( !*a ) has_space=TRUE; + while (*a!='\0') { + if (*a=='\\') { + bcount++; + } else { + if (*a==' ' || *a=='\t') { + has_space=TRUE; + } else if (*a=='"') { + /* doubling of '\' preceding a '"', + * plus escaping of said '"' + */ + len+=2*bcount+1; + } + bcount=0; + } + a++; + } + len+=(a-*arg)+1 /* for the separating space */; + if (has_space) + len+=2; /* for the quotes */ + } + + if (!(cmd_line = HeapAlloc( GetProcessHeap(), 0, len ? len : 1 ))) + return NULL; + + p = cmd_line; + for (arg = argv; *arg; arg++) + { + BOOL has_space,has_quote; + char* a; + + /* Check for quotes and spaces in this argument */ + has_space=has_quote=FALSE; + a=*arg; + if( !*a ) has_space=TRUE; + while (*a!='\0') { + if (*a==' ' || *a=='\t') { + has_space=TRUE; + if (has_quote) + break; + } else if (*a=='"') { + has_quote=TRUE; + if (has_space) + break; + } + a++; + } + + /* Now transfer it to the command line */ + if (has_space) + *p++='"'; + if (has_quote) { + int bcount; + + bcount=0; + a=*arg; + while (*a!='\0') { + if (*a=='\\') { + *p++=*a; + bcount++; + } else { + if (*a=='"') { + int i; + + /* Double all the '\\' preceding this '"', plus one */ + for (i=0;i<=bcount;i++) + *p++='\\'; + *p++='"'; + } else { + *p++=*a; + } + bcount=0; + } + a++; + } + } else { + strcpy(p,*arg); + p+=strlen(*arg); + } + if (has_space) + *p++='"'; + *p++=' '; + } + if (len) p--; /* remove last space */ + *p = '\0'; + return cmd_line; +} + /****************************************************************** * dbg_active_attach * -- 2.33.1

1 1

[PATCH] po: Update Traditional Chinese translation.
by Chilung Chan Nov. 5, 2021

Nov. 5, 2021

Signed-off-by: Chilung Chan <eason066(a)gmail.com> --- po/zh_TW.po | 1385 +++++++++++++++++++++------------------------------ 1 file changed, 579 insertions(+), 806 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index ed6a76e6349..b15c0445278 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.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: 2021-10-29 21:40+0800\n" +"PO-Revision-Date: 2021-10-30 18:53+0800\n" "Last-Translator: Chilung Chan <eason066(a)gmail.com>\n" "Language-Team: Chinese (Taiwan)\n" "Language: zh_TW\n" @@ -1353,7 +1353,8 @@ msgid "" msgstr "" "開啟大寫鎖定可能導致您輸入錯誤的密碼。\n" "\n" -"您可以按下 Caps Lock 鍵以解除大寫鎖定，然後再輸入密碼。" +"您可以按下 Caps Lock 鍵以解除大寫鎖定，\n" +"然後再輸入密碼。" #: dlls/credui/credui.rc:34 msgid "Caps Lock is On" @@ -9633,7 +9634,7 @@ msgstr "Wine Internet Explorer" #: dlls/shdoclc/shdoclc.rc:33 msgid "&w&bPage &p" -msgstr "&w&b頁 &p" +msgstr "&w&b第 &p 頁" #: dlls/shell32/shell32.rc:30 dlls/shell32/shell32.rc:45 #: dlls/shell32/shell32.rc:122 dlls/shell32/shell32.rc:160 @@ -10244,1769 +10245,1627 @@ msgstr "選擇來源" #: dlls/tzres/tzres.rc:126 msgid "China Standard Time" -msgstr "" +msgstr "中國標準時間" #: dlls/tzres/tzres.rc:127 msgid "China Daylight Time" -msgstr "" +msgstr "中國夏令時間" #: dlls/tzres/tzres.rc:128 msgid "(UTC+08:00) Beijing, Chongqing, Hong Kong, Urumqi" -msgstr "" +msgstr "(UTC+08:00) 北京，重慶，香港，烏魯木齊" #: dlls/tzres/tzres.rc:267 msgid "North Asia Standard Time" -msgstr "" +msgstr "北亞標準時間" #: dlls/tzres/tzres.rc:268 msgid "North Asia Daylight Time" -msgstr "" +msgstr "北亞夏令時間" #: dlls/tzres/tzres.rc:269 msgid "(UTC+07:00) Krasnoyarsk" -msgstr "" +msgstr "(UTC+07:00) 克拉斯諾雅斯克" #: dlls/tzres/tzres.rc:168 msgid "Georgian Standard Time" -msgstr "" +msgstr "喬治亞標準時間" #: dlls/tzres/tzres.rc:169 msgid "Georgian Daylight Time" -msgstr "" +msgstr "喬治亞夏令時間" #: dlls/tzres/tzres.rc:170 msgid "(UTC+04:00) Tbilisi" -msgstr "" +msgstr "(UTC+04:00) 提比里斯" #: dlls/tzres/tzres.rc:390 dlls/tzres/tzres.rc:391 msgid "UTC+12" -msgstr "" +msgstr "UTC+12" #: dlls/tzres/tzres.rc:392 msgid "(UTC+12:00) Coordinated Universal Time+12" -msgstr "" +msgstr "(UTC+12:00) 世界協調時間+12" #: dlls/tzres/tzres.rc:252 msgid "Nepal Standard Time" -msgstr "" +msgstr "尼泊爾標準時間" #: dlls/tzres/tzres.rc:253 msgid "Nepal Daylight Time" -msgstr "" +msgstr "尼泊爾夏令時間" #: dlls/tzres/tzres.rc:254 msgid "(UTC+05:45) Kathmandu" -msgstr "" +msgstr "(UTC+05:45) 加德滿都" #: dlls/tzres/tzres.rc:90 msgid "Cape Verde Standard Time" -msgstr "" +msgstr "維德角標準時間" #: dlls/tzres/tzres.rc:91 msgid "Cape Verde Daylight Time" -msgstr "" +msgstr "維德角夏令時間" #: dlls/tzres/tzres.rc:92 msgid "(UTC-01:00) Cabo Verde Is." -msgstr "" +msgstr "(UTC-01:00) 維德角群島" #: dlls/tzres/tzres.rc:183 -#, fuzzy -#| msgid "Date and time" msgid "Haiti Standard Time" -msgstr "日期和時間" +msgstr "海地標準時間" #: dlls/tzres/tzres.rc:184 -#, fuzzy -#| msgid "Date and time" msgid "Haiti Daylight Time" -msgstr "日期和時間" +msgstr "海地夏令時間" #: dlls/tzres/tzres.rc:185 msgid "(UTC-05:00) Haiti" -msgstr "" +msgstr "(UTC-05:00) 海地" #: dlls/tzres/tzres.rc:111 -#, fuzzy -#| msgid "Central European" msgid "Central European Standard Time" -msgstr "中歐語言" +msgstr "歐洲中部標準時間" #: dlls/tzres/tzres.rc:112 -#, fuzzy -#| msgid "Central European" msgid "Central European Daylight Time" -msgstr "中歐語言" +msgstr "歐洲中部夏令時間" #: dlls/tzres/tzres.rc:113 msgid "(UTC+01:00) Sarajevo, Skopje, Warsaw, Zagreb" -msgstr "" +msgstr "(UTC+01:00) 賽拉耶佛，斯高彼亞，華沙，札格雷布" #: dlls/tzres/tzres.rc:234 msgid "Morocco Standard Time" -msgstr "" +msgstr "摩洛哥標準時間" #: dlls/tzres/tzres.rc:235 msgid "Morocco Daylight Time" -msgstr "" +msgstr "摩洛哥夏令時間" #: dlls/tzres/tzres.rc:236 msgid "(UTC+01:00) Casablanca" -msgstr "" +msgstr "(UTC+01:00) 卡薩布蘭卡" #: dlls/tzres/tzres.rc:399 dlls/tzres/tzres.rc:400 msgid "UTC-08" -msgstr "" +msgstr "UTC-08" #: dlls/tzres/tzres.rc:401 msgid "(UTC-08:00) Coordinated Universal Time-08" -msgstr "" +msgstr "(UTC-08:00) 世界協調時間-08" #: dlls/tzres/tzres.rc:39 -#, fuzzy -#| msgid "Date and time" msgid "Altai Standard Time" -msgstr "日期和時間" +msgstr "阿爾泰標準時間" #: dlls/tzres/tzres.rc:40 -#, fuzzy -#| msgid "Date and time" msgid "Altai Daylight Time" -msgstr "日期和時間" +msgstr "阿爾泰夏令時間" #: dlls/tzres/tzres.rc:41 msgid "(UTC+07:00) Barnaul, Gorno-Altaysk" -msgstr "" +msgstr "(UTC+07:00) 巴爾瑙爾，戈爾諾-阿爾泰斯克" #: dlls/tzres/tzres.rc:108 -#, fuzzy -#| msgid "Central European" msgid "Central Europe Standard Time" -msgstr "中歐語言" +msgstr "中歐標準時間" #: dlls/tzres/tzres.rc:109 -#, fuzzy -#| msgid "Central European" msgid "Central Europe Daylight Time" -msgstr "中歐語言" +msgstr "中歐夏令時間" #: dlls/tzres/tzres.rc:110 msgid "(UTC+01:00) Belgrade, Bratislava, Budapest, Ljubljana, Prague" -msgstr "" +msgstr "(UTC+01:00) 貝爾格勒，布拉迪斯拉瓦，布達佩斯，盧布亞那，布拉格" #: dlls/tzres/tzres.rc:192 msgid "Iran Standard Time" -msgstr "" +msgstr "伊朗標準時間" #: dlls/tzres/tzres.rc:193 msgid "Iran Daylight Time" -msgstr "" +msgstr "伊朗夏令時間" #: dlls/tzres/tzres.rc:194 msgid "(UTC+03:30) Tehran" -msgstr "" +msgstr "(UTC+03:30) 德黑蘭" #: dlls/tzres/tzres.rc:318 -#, fuzzy -#| msgid "Date and time" msgid "Saint Pierre Standard Time" -msgstr "日期和時間" +msgstr "聖皮埃標準時間" #: dlls/tzres/tzres.rc:319 -#, fuzzy -#| msgid "Date and time" msgid "Saint Pierre Daylight Time" -msgstr "日期和時間" +msgstr "聖皮埃夏令時間" #: dlls/tzres/tzres.rc:320 -#, fuzzy -#| msgid "Date and time" msgid "(UTC-03:00) Saint Pierre and Miquelon" -msgstr "日期和時間" +msgstr "(UTC-03:00) 聖皮埃與密克隆群島" #: dlls/tzres/tzres.rc:327 -#, fuzzy -#| msgid "&Standard bar" msgid "Sao Tome Standard Time" -msgstr "標準列(&S)" +msgstr "聖多美標準時間" #: dlls/tzres/tzres.rc:328 -#, fuzzy -#| msgid "Date and time" msgid "Sao Tome Daylight Time" -msgstr "日期和時間" +msgstr "聖多美夏令時間" #: dlls/tzres/tzres.rc:329 msgid "(UTC+00:00) Sao Tome" -msgstr "" +msgstr "(UTC+00:00) 聖多美" #: dlls/tzres/tzres.rc:249 msgid "Namibia Standard Time" -msgstr "" +msgstr "納米比亞標準時間" #: dlls/tzres/tzres.rc:250 msgid "Namibia Daylight Time" -msgstr "" +msgstr "納米比亞夏令時間" #: dlls/tzres/tzres.rc:251 msgid "(UTC+02:00) Windhoek" -msgstr "" +msgstr "(UTC+02:00) 溫荷克" #: dlls/tzres/tzres.rc:366 msgid "Tonga Standard Time" -msgstr "" +msgstr "東加標準時間" #: dlls/tzres/tzres.rc:367 msgid "Tonga Daylight Time" -msgstr "" +msgstr "東加夏令時間" #: dlls/tzres/tzres.rc:368 msgid "(UTC+13:00) Nuku'alofa" -msgstr "" +msgstr "(UTC+13:00) 努瓜婁發" #: dlls/tzres/tzres.rc:240 msgid "Mountain Standard Time (Mexico)" -msgstr "" +msgstr "山區標準時間 (墨西哥)" #: dlls/tzres/tzres.rc:241 msgid "Mountain Daylight Time (Mexico)" -msgstr "" +msgstr "山區夏令時間 (墨西哥)" #: dlls/tzres/tzres.rc:242 msgid "(UTC-07:00) Chihuahua, La Paz, Mazatlan" -msgstr "" +msgstr "(UTC-07:00) 契瓦瓦，拉帕茲，馬薩特蘭" #: dlls/tzres/tzres.rc:171 -#, fuzzy -#| msgid "&Standard bar" msgid "GMT Standard Time" -msgstr "標準列(&S)" +msgstr "GMT 標準時間" #: dlls/tzres/tzres.rc:172 msgid "GMT Daylight Time" -msgstr "" +msgstr "GMT 夏令時間" #: dlls/tzres/tzres.rc:173 msgid "(UTC+00:00) Dublin, Edinburgh, Lisbon, London" -msgstr "" +msgstr "(UTC+00:00) 都柏林，愛丁堡，里斯本，倫敦" #: dlls/tzres/tzres.rc:102 msgid "Central Asia Standard Time" -msgstr "" +msgstr "中亞標準時間" #: dlls/tzres/tzres.rc:103 msgid "Central Asia Daylight Time" -msgstr "" +msgstr "中亞夏令時間" #: dlls/tzres/tzres.rc:104 msgid "(UTC+06:00) Astana" -msgstr "" +msgstr "(UTC+06:00) 努爾蘇丹" #: dlls/tzres/tzres.rc:213 -#, fuzzy -#| msgid "&Standard bar" msgid "Lord Howe Standard Time" -msgstr "標準列(&S)" +msgstr "豪勳爵島標準時間" #: dlls/tzres/tzres.rc:214 -#, fuzzy -#| msgid "Date and time" msgid "Lord Howe Daylight Time" -msgstr "日期和時間" +msgstr "豪勳爵島夏令時間" #: dlls/tzres/tzres.rc:215 msgid "(UTC+10:30) Lord Howe Island" -msgstr "" +msgstr "(UTC+10:30) 豪勳爵島" #: dlls/tzres/tzres.rc:48 msgid "Arabic Standard Time" -msgstr "" +msgstr "伊拉克標準時間" #: dlls/tzres/tzres.rc:49 msgid "Arabic Daylight Time" -msgstr "" +msgstr "伊拉克夏令時間" #: dlls/tzres/tzres.rc:50 msgid "(UTC+03:00) Baghdad" -msgstr "" +msgstr "(UTC+03:00) 巴格達" #: dlls/tzres/tzres.rc:393 dlls/tzres/tzres.rc:394 msgid "UTC+13" -msgstr "" +msgstr "UTC+13" #: dlls/tzres/tzres.rc:395 msgid "(UTC+13:00) Coordinated Universal Time+13" -msgstr "" +msgstr "(UTC+13:00) 世界協調時間+13" #: dlls/tzres/tzres.rc:216 msgid "Magadan Standard Time" -msgstr "" +msgstr "馬加丹標準時間" #: dlls/tzres/tzres.rc:217 msgid "Magadan Daylight Time" -msgstr "" +msgstr "馬加丹夏令時間" #: dlls/tzres/tzres.rc:218 msgid "(UTC+11:00) Magadan" -msgstr "" +msgstr "(UTC+11:00) 馬加丹" #: dlls/tzres/tzres.rc:258 msgid "Newfoundland Standard Time" -msgstr "" +msgstr "紐芬蘭標準時間" #: dlls/tzres/tzres.rc:259 msgid "Newfoundland Daylight Time" -msgstr "" +msgstr "紐芬蘭夏令時間" #: dlls/tzres/tzres.rc:260 msgid "(UTC-03:30) Newfoundland" -msgstr "" +msgstr "(UTC-03:30) 紐芬蘭" #: dlls/tzres/tzres.rc:345 -#, fuzzy -#| msgid "Date and time" msgid "Sudan Standard Time" -msgstr "日期和時間" +msgstr "蘇丹標準時間" #: dlls/tzres/tzres.rc:346 -#, fuzzy -#| msgid "Date and time" msgid "Sudan Daylight Time" -msgstr "日期和時間" +msgstr "蘇丹夏令時間" #: dlls/tzres/tzres.rc:347 msgid "(UTC+02:00) Khartoum" -msgstr "" +msgstr "(UTC+02:00) 喀土穆" #: dlls/tzres/tzres.rc:435 msgid "West Pacific Standard Time" -msgstr "" +msgstr "西太平洋標準時間" #: dlls/tzres/tzres.rc:436 msgid "West Pacific Daylight Time" -msgstr "" +msgstr "西太平洋夏令時間" #: dlls/tzres/tzres.rc:437 msgid "(UTC+10:00) Guam, Port Moresby" -msgstr "" +msgstr "(UTC+10:00) 關島，莫爾斯貝港" #: dlls/tzres/tzres.rc:279 msgid "Pacific Standard Time" -msgstr "" +msgstr "太平洋標準時間" #: dlls/tzres/tzres.rc:280 msgid "Pacific Daylight Time" -msgstr "" +msgstr "太平洋夏令時間" #: dlls/tzres/tzres.rc:281 msgid "(UTC-08:00) Pacific Time (US & Canada)" -msgstr "" +msgstr "(UTC-08:00) 太平洋時間 (美國和加拿大)" #: dlls/tzres/tzres.rc:69 msgid "Azerbaijan Standard Time" -msgstr "" +msgstr "亞塞拜然標準時間" #: dlls/tzres/tzres.rc:70 msgid "Azerbaijan Daylight Time" -msgstr "" +msgstr "亞塞拜然夏令時間" #: dlls/tzres/tzres.rc:71 msgid "(UTC+04:00) Baku" -msgstr "" +msgstr "(UTC+04:00) 巴庫" #: dlls/tzres/tzres.rc:219 -#, fuzzy -#| msgid "Date and time" msgid "Magallanes Standard Time" -msgstr "日期和時間" +msgstr "麥哲倫標準時間" #: dlls/tzres/tzres.rc:220 -#, fuzzy -#| msgid "Date and time" msgid "Magallanes Daylight Time" -msgstr "日期和時間" +msgstr "麥哲倫夏令時間" #: dlls/tzres/tzres.rc:221 msgid "(UTC-03:00) Punta Arenas" -msgstr "" +msgstr "(UTC-03:00) 旁塔阿雷納斯" #: dlls/tzres/tzres.rc:324 msgid "Samoa Standard Time" -msgstr "" +msgstr "薩摩亞標準時間" #: dlls/tzres/tzres.rc:325 msgid "Samoa Daylight Time" -msgstr "" +msgstr "薩摩亞夏令時間" #: dlls/tzres/tzres.rc:326 msgid "(UTC+13:00) Samoa" -msgstr "" +msgstr "(UTC+13:00) 薩摩亞" #: dlls/tzres/tzres.rc:201 msgid "Kaliningrad Standard Time" -msgstr "" +msgstr "加里寧格勒標準時間" #: dlls/tzres/tzres.rc:202 msgid "Kaliningrad Daylight Time" -msgstr "" +msgstr "加里寧格勒夏令時間" #: dlls/tzres/tzres.rc:203 msgid "(UTC+02:00) Kaliningrad" -msgstr "" +msgstr "(UTC+02:00) 加里寧格勒" #: dlls/tzres/tzres.rc:282 msgid "Pacific Standard Time (Mexico)" -msgstr "" +msgstr "太平洋標準時間 (墨西哥)" #: dlls/tzres/tzres.rc:283 msgid "Pacific Daylight Time (Mexico)" -msgstr "" +msgstr "太平洋夏令時間 (墨西哥)" #: dlls/tzres/tzres.rc:284 msgid "(UTC-08:00) Baja California" -msgstr "" +msgstr "(UTC-08:00) 下加利福尼亞" #: dlls/tzres/tzres.rc:228 msgid "Middle East Standard Time" -msgstr "" +msgstr "中東標準時間" #: dlls/tzres/tzres.rc:229 msgid "Middle East Daylight Time" -msgstr "" +msgstr "中東夏令時間" #: dlls/tzres/tzres.rc:230 msgid "(UTC+02:00) Beirut" -msgstr "" +msgstr "(UTC+02:00) 貝魯特" #: dlls/tzres/tzres.rc:360 msgid "Tokyo Standard Time" -msgstr "" +msgstr "東京標準時間" #: dlls/tzres/tzres.rc:361 msgid "Tokyo Daylight Time" -msgstr "" +msgstr "東京夏令時間" #: dlls/tzres/tzres.rc:362 msgid "(UTC+09:00) Osaka, Sapporo, Tokyo" -msgstr "" +msgstr "(UTC+09:00) 大阪，札幌，東京" #: dlls/tzres/tzres.rc:210 msgid "Line Islands Standard Time" -msgstr "" +msgstr "萊恩群島標準時間" #: dlls/tzres/tzres.rc:211 msgid "Line Islands Daylight Time" -msgstr "" +msgstr "萊恩群島夏令時間" #: dlls/tzres/tzres.rc:212 msgid "(UTC+14:00) Kiritimati Island" -msgstr "" +msgstr "(UTC+14:00) 聖誕島" #: dlls/tzres/tzres.rc:129 -#, fuzzy -#| msgid "Date and time" msgid "Cuba Standard Time" -msgstr "日期和時間" +msgstr "古巴標準時間" #: dlls/tzres/tzres.rc:130 -#, fuzzy -#| msgid "Date and time" msgid "Cuba Daylight Time" -msgstr "日期和時間" +msgstr "古巴夏令時間" #: dlls/tzres/tzres.rc:131 msgid "(UTC-05:00) Havana" -msgstr "" +msgstr "(UTC-05:00) 哈瓦那" #: dlls/tzres/tzres.rc:198 msgid "Jordan Standard Time" -msgstr "" +msgstr "約旦標準時間" #: dlls/tzres/tzres.rc:199 msgid "Jordan Daylight Time" -msgstr "" +msgstr "約旦夏令時間" #: dlls/tzres/tzres.rc:200 msgid "(UTC+02:00) Amman" -msgstr "" +msgstr "(UTC+02:00) 安曼" #: dlls/tzres/tzres.rc:117 msgid "Central Standard Time" -msgstr "" +msgstr "中部標準時間" #: dlls/tzres/tzres.rc:118 msgid "Central Daylight Time" -msgstr "" +msgstr "中部夏令時間" #: dlls/tzres/tzres.rc:119 msgid "(UTC-06:00) Central Time (US & Canada)" -msgstr "" +msgstr "(UTC-06:00) 中部時間 (美國和加拿大)" #: dlls/tzres/tzres.rc:303 dlls/tzres/tzres.rc:304 msgid "Russia Time Zone 3" -msgstr "" +msgstr "俄羅斯時區 3" #: dlls/tzres/tzres.rc:305 msgid "(UTC+04:00) Izhevsk, Samara" -msgstr "" +msgstr "(UTC+04:00) 伊熱夫斯克，薩馬拉" #: dlls/tzres/tzres.rc:414 -#, fuzzy -#| msgid "&Standard bar" msgid "Volgograd Standard Time" -msgstr "標準列(&S)" +msgstr "伏爾加格勒標準時間" #: dlls/tzres/tzres.rc:415 -#, fuzzy -#| msgid "Date and time" msgid "Volgograd Daylight Time" -msgstr "日期和時間" +msgstr "伏爾加格勒夏令時間" #: dlls/tzres/tzres.rc:416 msgid "(UTC+04:00) Volgograd" -msgstr "" +msgstr "(UTC+04:00) 伏爾加格勒" #: dlls/tzres/tzres.rc:72 msgid "Azores Standard Time" -msgstr "" +msgstr "亞述標準時間" #: dlls/tzres/tzres.rc:73 msgid "Azores Daylight Time" -msgstr "" +msgstr "亞述夏令時間" #: dlls/tzres/tzres.rc:74 msgid "(UTC-01:00) Azores" -msgstr "" +msgstr "(UTC-01:00) 亞述群島" #: dlls/tzres/tzres.rc:264 msgid "North Asia East Standard Time" -msgstr "" +msgstr "北亞東部標準時間" #: dlls/tzres/tzres.rc:265 msgid "North Asia East Daylight Time" -msgstr "" +msgstr "北亞東部夏令時間" #: dlls/tzres/tzres.rc:266 msgid "(UTC+08:00) Irkutsk" -msgstr "" +msgstr "(UTC+08:00) 伊爾庫次克" #: dlls/tzres/tzres.rc:405 dlls/tzres/tzres.rc:406 msgid "UTC-11" -msgstr "" +msgstr "UTC-11" #: dlls/tzres/tzres.rc:407 msgid "(UTC-11:00) Coordinated Universal Time-11" -msgstr "" +msgstr "(UTC-11:00) 世界協調時間-11" #: dlls/tzres/tzres.rc:51 msgid "Argentina Standard Time" -msgstr "" +msgstr "阿根廷標準時間" #: dlls/tzres/tzres.rc:52 msgid "Argentina Daylight Time" -msgstr "" +msgstr "阿根廷夏令時間" #: dlls/tzres/tzres.rc:53 msgid "(UTC-03:00) City of Buenos Aires" -msgstr "" +msgstr "(UTC-03:00) 布宜諾斯艾利斯" #: dlls/tzres/tzres.rc:375 -#, fuzzy -#| msgid "&Standard bar" msgid "Turks And Caicos Standard Time" -msgstr "標準列(&S)" +msgstr "土克凱可標準時間" #: dlls/tzres/tzres.rc:376 -#, fuzzy -#| msgid "Date and time" msgid "Turks And Caicos Daylight Time" -msgstr "日期和時間" +msgstr "土克凱可夏令時間" #: dlls/tzres/tzres.rc:377 msgid "(UTC-05:00) Turks and Caicos" -msgstr "" +msgstr "(UTC-05:00) 土克凱可" #: dlls/tzres/tzres.rc:222 -#, fuzzy -#| msgid "&Standard bar" msgid "Marquesas Standard Time" -msgstr "標準列(&S)" +msgstr "馬克薩斯標準時間" #: dlls/tzres/tzres.rc:223 -#, fuzzy -#| msgid "Date and time" msgid "Marquesas Daylight Time" -msgstr "日期和時間" +msgstr "馬克薩斯夏令時間" #: dlls/tzres/tzres.rc:224 msgid "(UTC-09:30) Marquesas Islands" -msgstr "" +msgstr "(UTC-09:30) 馬克薩斯群島" #: dlls/tzres/tzres.rc:243 msgid "Myanmar Standard Time" -msgstr "" +msgstr "緬甸標準時間" #: dlls/tzres/tzres.rc:244 msgid "Myanmar Daylight Time" -msgstr "" +msgstr "緬甸夏令時間" #: dlls/tzres/tzres.rc:245 msgid "(UTC+06:30) Yangon (Rangoon)" -msgstr "" +msgstr "(UTC+06:30) 仰光" #: dlls/tzres/tzres.rc:387 dlls/tzres/tzres.rc:388 msgid "Coordinated Universal Time" -msgstr "" +msgstr "世界協調時間" #: dlls/tzres/tzres.rc:389 msgid "(UTC) Coordinated Universal Time" -msgstr "" +msgstr "(UTC) 世界協調時間" #: dlls/tzres/tzres.rc:189 msgid "India Standard Time" -msgstr "" +msgstr "印度標準時間" #: dlls/tzres/tzres.rc:190 msgid "India Daylight Time" -msgstr "" +msgstr "印度夏令時間" #: dlls/tzres/tzres.rc:191 msgid "(UTC+05:30) Chennai, Kolkata, Mumbai, New Delhi" -msgstr "" +msgstr "(UTC+05:30) 清奈，加爾各答，孟買，新德里" #: dlls/tzres/tzres.rc:180 -#, fuzzy -#| msgid "&Standard bar" msgid "GTB Standard Time" -msgstr "標準列(&S)" +msgstr "GTB 標準時間" #: dlls/tzres/tzres.rc:181 msgid "GTB Daylight Time" -msgstr "" +msgstr "GTB 夏令時間" #: dlls/tzres/tzres.rc:182 msgid "(UTC+02:00) Athens, Bucharest" -msgstr "" +msgstr "(UTC+02:00) 雅典，布加勒斯特" #: dlls/tzres/tzres.rc:372 msgid "Turkey Standard Time" -msgstr "" +msgstr "土耳其標準時間" #: dlls/tzres/tzres.rc:373 msgid "Turkey Daylight Time" -msgstr "" +msgstr "土耳其夏令時間" #: dlls/tzres/tzres.rc:374 msgid "(UTC+03:00) Istanbul" -msgstr "" +msgstr "(UTC+03:00) 伊斯坦堡" #: dlls/tzres/tzres.rc:54 -#, fuzzy -#| msgid "Date and time" msgid "Astrakhan Standard Time" -msgstr "日期和時間" +msgstr "阿斯特拉罕標準時間" #: dlls/tzres/tzres.rc:55 -#, fuzzy -#| msgid "Date and time" msgid "Astrakhan Daylight Time" -msgstr "日期和時間" +msgstr "阿斯特拉罕夏令時間" #: dlls/tzres/tzres.rc:56 msgid "(UTC+04:00) Astrakhan, Ulyanovsk" -msgstr "" +msgstr "(UTC+04:00) 阿斯特拉罕，烏里揚諾夫斯克" #: dlls/tzres/tzres.rc:162 msgid "Fiji Standard Time" -msgstr "" +msgstr "斐濟標準時間" #: dlls/tzres/tzres.rc:163 msgid "Fiji Daylight Time" -msgstr "" +msgstr "斐濟夏令時間" #: dlls/tzres/tzres.rc:164 msgid "(UTC+12:00) Fiji" -msgstr "" +msgstr "(UTC+12:00) 斐濟" #: dlls/tzres/tzres.rc:87 msgid "Canada Central Standard Time" -msgstr "" +msgstr "加拿大中部標準時間" #: dlls/tzres/tzres.rc:88 msgid "Canada Central Daylight Time" -msgstr "" +msgstr "加拿大中部夏令時間" #: dlls/tzres/tzres.rc:89 msgid "(UTC-06:00) Saskatchewan" -msgstr "" +msgstr "(UTC-06:00) 薩克其萬" #: dlls/tzres/tzres.rc:441 -#, fuzzy -#| msgid "Date and time" msgid "Yukon Standard Time" -msgstr "日期和時間" +msgstr "育空標準時間" #: dlls/tzres/tzres.rc:442 -#, fuzzy -#| msgid "Date and time" msgid "Yukon Daylight Time" -msgstr "日期和時間" +msgstr "育空夏令時間" #: dlls/tzres/tzres.rc:443 msgid "(UTC-07:00) Yukon" -msgstr "" +msgstr "(UTC-07:00) 育空" #: dlls/tzres/tzres.rc:351 msgid "Taipei Standard Time" -msgstr "" +msgstr "臺北標準時間" #: dlls/tzres/tzres.rc:352 msgid "Taipei Daylight Time" -msgstr "" +msgstr "臺北夏令時間" #: dlls/tzres/tzres.rc:353 msgid "(UTC+08:00) Taipei" -msgstr "" +msgstr "(UTC+08:00) 臺北" #: dlls/tzres/tzres.rc:423 msgid "W. Europe Standard Time" -msgstr "" +msgstr "西歐標準時間" #: dlls/tzres/tzres.rc:424 msgid "W. Europe Daylight Time" -msgstr "" +msgstr "西歐夏令時間" #: dlls/tzres/tzres.rc:425 msgid "(UTC+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna" -msgstr "" +msgstr "(UTC+01:00) 阿姆斯特丹，柏林，伯恩，羅馬，斯德哥爾摩，維也納" #: dlls/tzres/tzres.rc:231 msgid "Montevideo Standard Time" -msgstr "" +msgstr "蒙特維多標準時間" #: dlls/tzres/tzres.rc:232 msgid "Montevideo Daylight Time" -msgstr "" +msgstr "蒙特維多夏令時間" #: dlls/tzres/tzres.rc:233 msgid "(UTC-03:00) Montevideo" -msgstr "" +msgstr "(UTC-03:00) 蒙特維多" #: dlls/tzres/tzres.rc:285 msgid "Pakistan Standard Time" -msgstr "" +msgstr "巴基斯坦標準時間" #: dlls/tzres/tzres.rc:286 msgid "Pakistan Daylight Time" -msgstr "" +msgstr "巴基斯坦夏令時間" #: dlls/tzres/tzres.rc:287 msgid "(UTC+05:00) Islamabad, Karachi" -msgstr "" +msgstr "(UTC+05:00) 伊斯蘭瑪巴德，卡拉奇" #: dlls/tzres/tzres.rc:363 -#, fuzzy -#| msgid "&Standard bar" msgid "Tomsk Standard Time" -msgstr "標準列(&S)" +msgstr "托木斯克標準時間" #: dlls/tzres/tzres.rc:364 -#, fuzzy -#| msgid "Date and time" msgid "Tomsk Daylight Time" -msgstr "日期和時間" +msgstr "托木斯克夏令時間" #: dlls/tzres/tzres.rc:365 msgid "(UTC+07:00) Tomsk" -msgstr "" +msgstr "(UTC+07:00) 托木斯克" #: dlls/tzres/tzres.rc:93 msgid "Caucasus Standard Time" -msgstr "" +msgstr "高加索標準時間" #: dlls/tzres/tzres.rc:94 msgid "Caucasus Daylight Time" -msgstr "" +msgstr "高加索夏令時間" #: dlls/tzres/tzres.rc:95 msgid "(UTC+04:00) Yerevan" -msgstr "" +msgstr "(UTC+04:00) 葉里溫" #: dlls/tzres/tzres.rc:66 msgid "AUS Eastern Standard Time" -msgstr "" +msgstr "澳洲東部標準時間" #: dlls/tzres/tzres.rc:67 msgid "AUS Eastern Daylight Time" -msgstr "" +msgstr "澳洲東部夏令時間" #: dlls/tzres/tzres.rc:68 msgid "(UTC+10:00) Canberra, Melbourne, Sydney" -msgstr "" +msgstr "(UTC+10:00) 坎培拉，墨爾本，雪梨" #: dlls/tzres/tzres.rc:246 msgid "N. Central Asia Standard Time" -msgstr "" +msgstr "中亞北部標準時間" #: dlls/tzres/tzres.rc:247 msgid "N. Central Asia Daylight Time" -msgstr "" +msgstr "中亞北部夏令時間" #: dlls/tzres/tzres.rc:248 msgid "(UTC+07:00) Novosibirsk" -msgstr "" +msgstr "(UTC+07:00) 新西伯利亞" #: dlls/tzres/tzres.rc:150 msgid "Eastern Standard Time" -msgstr "" +msgstr "東部標準時間" #: dlls/tzres/tzres.rc:151 msgid "Eastern Daylight Time" -msgstr "" +msgstr "東部夏令時間" #: dlls/tzres/tzres.rc:152 msgid "(UTC-05:00) Eastern Time (US & Canada)" -msgstr "" +msgstr "(UTC-05:00) 東部時間 (美國和加拿大)" #: dlls/tzres/tzres.rc:369 -#, fuzzy -#| msgid "Date and time" msgid "Transbaikal Standard Time" -msgstr "日期和時間" +msgstr "外貝加爾標準時間" #: dlls/tzres/tzres.rc:370 -#, fuzzy -#| msgid "Date and time" msgid "Transbaikal Daylight Time" -msgstr "日期和時間" +msgstr "外貝加爾夏令時間" #: dlls/tzres/tzres.rc:371 msgid "(UTC+09:00) Chita" -msgstr "" +msgstr "(UTC+09:00) 赤塔" #: dlls/tzres/tzres.rc:141 -#, fuzzy -#| msgid "Central European" msgid "E. Europe Standard Time" -msgstr "中歐語言" +msgstr "東歐標準時間" #: dlls/tzres/tzres.rc:142 -#, fuzzy -#| msgid "Central European" msgid "E. Europe Daylight Time" -msgstr "中歐語言" +msgstr "東歐夏令時間" #: dlls/tzres/tzres.rc:143 msgid "(UTC+02:00) Chisinau" -msgstr "" +msgstr "(UTC+02:00) 基希涅夫" #: dlls/tzres/tzres.rc:120 msgid "Central Standard Time (Mexico)" -msgstr "" +msgstr "中部標準時間 (墨西哥)" #: dlls/tzres/tzres.rc:121 msgid "Central Daylight Time (Mexico)" -msgstr "" +msgstr "中部夏令時間 (墨西哥)" #: dlls/tzres/tzres.rc:122 msgid "(UTC-06:00) Guadalajara, Mexico City, Monterrey" -msgstr "" +msgstr "(UTC-06:00) 瓜達拉哈拉，墨西哥城，蒙特雷" #: dlls/tzres/tzres.rc:330 -#, fuzzy -#| msgid "Date and time" msgid "Saratov Standard Time" -msgstr "日期和時間" +msgstr "薩拉托夫標準時間" #: dlls/tzres/tzres.rc:331 -#, fuzzy -#| msgid "Date and time" msgid "Saratov Daylight Time" -msgstr "日期和時間" +msgstr "薩拉托夫夏令時間" #: dlls/tzres/tzres.rc:332 msgid "(UTC+04:00) Saratov" -msgstr "" +msgstr "(UTC+04:00) 薩拉托夫" #: dlls/tzres/tzres.rc:57 msgid "Atlantic Standard Time" -msgstr "" +msgstr "大西洋標準時間" #: dlls/tzres/tzres.rc:58 msgid "Atlantic Daylight Time" -msgstr "" +msgstr "大西洋夏令時間" #: dlls/tzres/tzres.rc:59 msgid "(UTC-04:00) Atlantic Time (Canada)" -msgstr "" +msgstr "(UTC-04:00) 大西洋時間 (加拿大)" #: dlls/tzres/tzres.rc:237 msgid "Mountain Standard Time" -msgstr "" +msgstr "山區標準時間" #: dlls/tzres/tzres.rc:238 msgid "Mountain Daylight Time" -msgstr "" +msgstr "山區夏令時間" #: dlls/tzres/tzres.rc:239 msgid "(UTC-07:00) Mountain Time (US & Canada)" -msgstr "" +msgstr "(UTC-07:00) 山區時間 (美國和加拿大)" #: dlls/tzres/tzres.rc:381 msgid "US Eastern Standard Time" -msgstr "" +msgstr "美國東部標準時間" #: dlls/tzres/tzres.rc:382 msgid "US Eastern Daylight Time" -msgstr "" +msgstr "美國東部夏令時間" #: dlls/tzres/tzres.rc:383 msgid "(UTC-05:00) Indiana (East)" -msgstr "" +msgstr "(UTC-05:00) 印第安納 (東部)" #: dlls/tzres/tzres.rc:321 -#, fuzzy -#| msgid "Date and time" msgid "Sakhalin Standard Time" -msgstr "日期和時間" +msgstr "庫頁島標準時間" #: dlls/tzres/tzres.rc:322 -#, fuzzy -#| msgid "Date and time" msgid "Sakhalin Daylight Time" -msgstr "日期和時間" +msgstr "庫頁島夏令時間" #: dlls/tzres/tzres.rc:323 msgid "(UTC+11:00) Sakhalin" -msgstr "" +msgstr "(UTC+11:00) 庫頁島" #: dlls/tzres/tzres.rc:270 -#, fuzzy -#| msgid "&Standard bar" msgid "North Korea Standard Time" -msgstr "標準列(&S)" +msgstr "北韓標準時間" #: dlls/tzres/tzres.rc:271 -#, fuzzy -#| msgid "Date and time" msgid "North Korea Daylight Time" -msgstr "日期和時間" +msgstr "北韓夏令時間" #: dlls/tzres/tzres.rc:272 msgid "(UTC+09:00) Pyongyang" -msgstr "" +msgstr "(UTC+09:00) 平壤" #: dlls/tzres/tzres.rc:354 msgid "Tasmania Standard Time" -msgstr "" +msgstr "塔斯馬尼亞標準時間" #: dlls/tzres/tzres.rc:355 msgid "Tasmania Daylight Time" -msgstr "" +msgstr "塔斯馬尼亞夏令時間" #: dlls/tzres/tzres.rc:356 msgid "(UTC+10:00) Hobart" -msgstr "" +msgstr "(UTC+10:00) 荷巴特" #: dlls/tzres/tzres.rc:99 msgid "Central America Standard Time" -msgstr "" +msgstr "中美洲標準時間" #: dlls/tzres/tzres.rc:100 msgid "Central America Daylight Time" -msgstr "" +msgstr "中美洲夏令時間" #: dlls/tzres/tzres.rc:101 msgid "(UTC-06:00) Central America" -msgstr "" +msgstr "(UTC-06:00) 中美洲" #: dlls/tzres/tzres.rc:396 dlls/tzres/tzres.rc:397 msgid "UTC-02" -msgstr "" +msgstr "UTC-02" #: dlls/tzres/tzres.rc:398 msgid "(UTC-02:00) Coordinated Universal Time-02" -msgstr "" +msgstr "(UTC-02:00) 世界協調時間-02" #: dlls/tzres/tzres.rc:384 msgid "US Mountain Standard Time" -msgstr "" +msgstr "美國山區標準時間" #: dlls/tzres/tzres.rc:385 msgid "US Mountain Daylight Time" -msgstr "" +msgstr "美國山區夏令時間" #: dlls/tzres/tzres.rc:386 msgid "(UTC-07:00) Arizona" -msgstr "" +msgstr "(UTC-07:00) 亞利桑那" #: dlls/tzres/tzres.rc:339 msgid "South Africa Standard Time" -msgstr "" +msgstr "南非標準時間" #: dlls/tzres/tzres.rc:340 msgid "South Africa Daylight Time" -msgstr "" +msgstr "南非夏令時間" #: dlls/tzres/tzres.rc:341 msgid "(UTC+02:00) Harare, Pretoria" -msgstr "" +msgstr "(UTC+02:00) 哈拉雷，普利托利亞" #: dlls/tzres/tzres.rc:96 msgid "Cen. Australia Standard Time" -msgstr "" +msgstr "澳洲中部標準時間" #: dlls/tzres/tzres.rc:97 msgid "Cen. Australia Daylight Time" -msgstr "" +msgstr "澳洲中部夏令時間" #: dlls/tzres/tzres.rc:98 msgid "(UTC+09:30) Adelaide" -msgstr "" +msgstr "(UTC+09:30) 阿得雷德" #: dlls/tzres/tzres.rc:402 dlls/tzres/tzres.rc:403 msgid "UTC-09" -msgstr "" +msgstr "UTC-09" #: dlls/tzres/tzres.rc:404 msgid "(UTC-09:00) Coordinated Universal Time-09" -msgstr "" +msgstr "(UTC-09:00) 世界協調時間-09" #: dlls/tzres/tzres.rc:342 msgid "Sri Lanka Standard Time" -msgstr "" +msgstr "斯里蘭卡標準時間" #: dlls/tzres/tzres.rc:343 msgid "Sri Lanka Daylight Time" -msgstr "" +msgstr "斯里蘭卡夏令時間" #: dlls/tzres/tzres.rc:344 msgid "(UTC+05:30) Sri Jayawardenepura" -msgstr "" +msgstr "(UTC+05:30) 斯里賈亞瓦德納普拉科特" #: dlls/tzres/tzres.rc:30 msgid "Afghanistan Standard Time" -msgstr "" +msgstr "阿富汗標準時間" #: dlls/tzres/tzres.rc:31 msgid "Afghanistan Daylight Time" -msgstr "" +msgstr "阿富汗夏令時間" #: dlls/tzres/tzres.rc:32 msgid "(UTC+04:30) Kabul" -msgstr "" +msgstr "(UTC+04:30) 喀布爾" #: dlls/tzres/tzres.rc:438 msgid "Yakutsk Standard Time" -msgstr "" +msgstr "雅庫次克標準時間" #: dlls/tzres/tzres.rc:439 msgid "Yakutsk Daylight Time" -msgstr "" +msgstr "雅庫次克夏令時間" #: dlls/tzres/tzres.rc:440 msgid "(UTC+09:00) Yakutsk" -msgstr "" +msgstr "(UTC+09:00) 雅庫次克" #: dlls/tzres/tzres.rc:309 msgid "SA Eastern Standard Time" -msgstr "" +msgstr "南美洲東部標準時間" #: dlls/tzres/tzres.rc:310 msgid "SA Eastern Daylight Time" -msgstr "" +msgstr "南美洲東部夏令時間" #: dlls/tzres/tzres.rc:311 msgid "(UTC-03:00) Cayenne, Fortaleza" -msgstr "" +msgstr "(UTC-03:00) 開雲，福塔萊薩" #: dlls/tzres/tzres.rc:42 msgid "Arab Standard Time" -msgstr "" +msgstr "沙烏地阿拉伯標準時間" #: dlls/tzres/tzres.rc:43 msgid "Arab Daylight Time" -msgstr "" +msgstr "沙烏地阿拉伯夏令時間" #: dlls/tzres/tzres.rc:44 msgid "(UTC+03:00) Kuwait, Riyadh" -msgstr "" +msgstr "(UTC+03:00) 科威特，利雅德" #: dlls/tzres/tzres.rc:45 msgid "Arabian Standard Time" -msgstr "" +msgstr "阿拉伯標準時間" #: dlls/tzres/tzres.rc:46 msgid "Arabian Daylight Time" -msgstr "" +msgstr "阿拉伯夏令時間" #: dlls/tzres/tzres.rc:47 msgid "(UTC+04:00) Abu Dhabi, Muscat" -msgstr "" +msgstr "(UTC+04:00) 阿布達比，馬斯開特" #: dlls/tzres/tzres.rc:357 -#, fuzzy -#| msgid "Date and time" msgid "Tocantins Standard Time" -msgstr "日期和時間" +msgstr "托坎廷斯標準時間" #: dlls/tzres/tzres.rc:358 -#, fuzzy -#| msgid "Date and time" msgid "Tocantins Daylight Time" -msgstr "日期和時間" +msgstr "托坎廷斯夏令時間" #: dlls/tzres/tzres.rc:359 msgid "(UTC-03:00) Araguaina" -msgstr "" +msgstr "(UTC-03:00) 阿拉瓜伊納" #: dlls/tzres/tzres.rc:306 msgid "Russian Standard Time" -msgstr "" +msgstr "俄羅斯標準時間" #: dlls/tzres/tzres.rc:307 msgid "Russian Daylight Time" -msgstr "" +msgstr "俄羅斯夏令時間" #: dlls/tzres/tzres.rc:308 msgid "(UTC+03:00) Moscow, St. Petersburg" -msgstr "" +msgstr "(UTC+03:00) 莫斯科，聖彼得堡" #: dlls/tzres/tzres.rc:63 -#, fuzzy -#| msgid "Central European" msgid "Aus Central W. Standard Time" -msgstr "中歐語言" +msgstr "澳洲中西部標準時間" #: dlls/tzres/tzres.rc:64 -#, fuzzy -#| msgid "Central European" msgid "Aus Central W. Daylight Time" -msgstr "中歐語言" +msgstr "澳洲中西部夏令時間" #: dlls/tzres/tzres.rc:65 msgid "(UTC+08:45) Eucla" -msgstr "" +msgstr "(UTC+08:45) 尤克拉" #: dlls/tzres/tzres.rc:294 msgid "Romance Standard Time" -msgstr "" +msgstr "羅曼語區標準時間" #: dlls/tzres/tzres.rc:295 msgid "Romance Daylight Time" -msgstr "" +msgstr "羅曼語區夏令時間" #: dlls/tzres/tzres.rc:296 msgid "(UTC+01:00) Brussels, Copenhagen, Madrid, Paris" -msgstr "" +msgstr "(UTC+01:00) 布魯塞爾，哥本哈根，馬德里，巴黎" #: dlls/tzres/tzres.rc:159 msgid "Ekaterinburg Standard Time" -msgstr "" +msgstr "葉卡捷琳堡標準時間" #: dlls/tzres/tzres.rc:160 msgid "Ekaterinburg Daylight Time" -msgstr "" +msgstr "葉卡捷琳堡夏令時間" #: dlls/tzres/tzres.rc:161 msgid "(UTC+05:00) Ekaterinburg" -msgstr "" +msgstr "(UTC+05:00) 葉卡捷琳堡" #: dlls/tzres/tzres.rc:300 dlls/tzres/tzres.rc:301 msgid "Russia Time Zone 11" -msgstr "" +msgstr "俄羅斯時區 11" #: dlls/tzres/tzres.rc:302 msgid "(UTC+12:00) Anadyr, Petropavlovsk-Kamchatsky" -msgstr "" +msgstr "(UTC+12:00) 阿納德爾，堪察加彼得巴甫洛夫斯克" #: dlls/tzres/tzres.rc:432 -#, fuzzy -#| msgid "Date and time" msgid "West Bank Standard Time" -msgstr "日期和時間" +msgstr "西岸標準時間" #: dlls/tzres/tzres.rc:433 -#, fuzzy -#| msgid "Date and time" msgid "West Bank Daylight Time" -msgstr "日期和時間" +msgstr "西岸夏令時間" #: dlls/tzres/tzres.rc:434 msgid "(UTC+02:00) Gaza, Hebron" -msgstr "" +msgstr "(UTC+02:00) 加薩，希伯侖" #: dlls/tzres/tzres.rc:348 msgid "Syria Standard Time" -msgstr "" +msgstr "敘利亞標準時間" #: dlls/tzres/tzres.rc:349 msgid "Syria Daylight Time" -msgstr "" +msgstr "敘利亞夏令時間" #: dlls/tzres/tzres.rc:350 msgid "(UTC+02:00) Damascus" -msgstr "" +msgstr "(UTC+02:00) 大馬士革" #: dlls/tzres/tzres.rc:60 msgid "AUS Central Standard Time" -msgstr "" +msgstr "澳洲中部標準時間" #: dlls/tzres/tzres.rc:61 msgid "AUS Central Daylight Time" -msgstr "" +msgstr "澳洲中部夏令時間" #: dlls/tzres/tzres.rc:62 msgid "(UTC+09:30) Darwin" -msgstr "" +msgstr "(UTC+09:30) 達爾文" #: dlls/tzres/tzres.rc:177 msgid "Greenwich Standard Time" -msgstr "" +msgstr "格林威治標準時間" #: dlls/tzres/tzres.rc:178 msgid "Greenwich Daylight Time" -msgstr "" +msgstr "格林威治夏令時間" #: dlls/tzres/tzres.rc:179 msgid "(UTC+00:00) Monrovia, Reykjavik" -msgstr "" +msgstr "(UTC+00:00) 蒙羅維亞，雷克雅維克" #: dlls/tzres/tzres.rc:378 msgid "Ulaanbaatar Standard Time" -msgstr "" +msgstr "烏蘭巴托標準時間" #: dlls/tzres/tzres.rc:379 msgid "Ulaanbaatar Daylight Time" -msgstr "" +msgstr "烏蘭巴托夏令時間" #: dlls/tzres/tzres.rc:380 msgid "(UTC+08:00) Ulaanbaatar" -msgstr "" +msgstr "(UTC+08:00) 烏蘭巴托" #: dlls/tzres/tzres.rc:261 -#, fuzzy -#| msgid "&Standard bar" msgid "Norfolk Standard Time" -msgstr "標準列(&S)" +msgstr "諾福克標準時間" #: dlls/tzres/tzres.rc:262 -#, fuzzy -#| msgid "Date and time" msgid "Norfolk Daylight Time" -msgstr "日期和時間" +msgstr "諾福克夏令時間" #: dlls/tzres/tzres.rc:263 msgid "(UTC+11:00) Norfolk Island" -msgstr "" +msgstr "(UTC+11:00) 諾福克島" #: dlls/tzres/tzres.rc:195 msgid "Israel Standard Time" -msgstr "" +msgstr "以色列標準時間" #: dlls/tzres/tzres.rc:196 msgid "Israel Daylight Time" -msgstr "" +msgstr "以色列夏令時間" #: dlls/tzres/tzres.rc:197 msgid "(UTC+02:00) Jerusalem" -msgstr "" +msgstr "(UTC+02:00) 耶路撒冷" #: dlls/tzres/tzres.rc:78 msgid "Bangladesh Standard Time" -msgstr "" +msgstr "孟加拉標準時間" #: dlls/tzres/tzres.rc:79 msgid "Bangladesh Daylight Time" -msgstr "" +msgstr "孟加拉夏令時間" #: dlls/tzres/tzres.rc:80 msgid "(UTC+06:00) Dhaka" -msgstr "" +msgstr "(UTC+06:00) 達卡" #: dlls/tzres/tzres.rc:312 msgid "SA Pacific Standard Time" -msgstr "" +msgstr "南美洲太平洋標準時間" #: dlls/tzres/tzres.rc:313 msgid "SA Pacific Daylight Time" -msgstr "" +msgstr "南美洲太平洋夏令時間" #: dlls/tzres/tzres.rc:314 msgid "(UTC-05:00) Bogota, Lima, Quito, Rio Branco" -msgstr "" +msgstr "(UTC-05:00) 波哥大，利馬，基多，里約布蘭科" #: dlls/tzres/tzres.rc:429 msgid "West Asia Standard Time" -msgstr "" +msgstr "西亞標準時間" #: dlls/tzres/tzres.rc:430 msgid "West Asia Daylight Time" -msgstr "" +msgstr "西亞夏令時間" #: dlls/tzres/tzres.rc:431 msgid "(UTC+05:00) Ashgabat, Tashkent" -msgstr "" +msgstr "(UTC+05:00) 阿什哈巴特，塔什干" #: dlls/tzres/tzres.rc:33 msgid "Alaskan Standard Time" -msgstr "" +msgstr "阿拉斯加標準時間" #: dlls/tzres/tzres.rc:34 msgid "Alaskan Daylight Time" -msgstr "" +msgstr "阿拉斯加夏令時間" #: dlls/tzres/tzres.rc:35 msgid "(UTC-09:00) Alaska" -msgstr "" +msgstr "(UTC-09:00) 阿拉斯加" #: dlls/tzres/tzres.rc:288 msgid "Paraguay Standard Time" -msgstr "" +msgstr "巴拉圭標準時間" #: dlls/tzres/tzres.rc:289 msgid "Paraguay Daylight Time" -msgstr "" +msgstr "巴拉圭夏令時間" #: dlls/tzres/tzres.rc:290 msgid "(UTC-04:00) Asuncion" -msgstr "" +msgstr "(UTC-04:00) 亞松森" #: dlls/tzres/tzres.rc:132 -#, fuzzy -#| msgid "Date and time" msgid "Dateline Standard Time" -msgstr "日期和時間" +msgstr "換日線標準時間" #: dlls/tzres/tzres.rc:133 msgid "Dateline Daylight Time" -msgstr "" +msgstr "換日線夏令時間" #: dlls/tzres/tzres.rc:134 msgid "(UTC-12:00) International Date Line West" -msgstr "" +msgstr "(UTC-12:00) 國際換日線以西" #: dlls/tzres/tzres.rc:207 msgid "Libya Standard Time" -msgstr "" +msgstr "利比亞標準時間" #: dlls/tzres/tzres.rc:208 msgid "Libya Daylight Time" -msgstr "" +msgstr "利比亞夏令時間" #: dlls/tzres/tzres.rc:209 msgid "(UTC+02:00) Tripoli" -msgstr "" +msgstr "(UTC+02:00) 的黎波里" #: dlls/tzres/tzres.rc:75 msgid "Bahia Standard Time" -msgstr "" +msgstr "巴伊亞標準時間" #: dlls/tzres/tzres.rc:76 msgid "Bahia Daylight Time" -msgstr "" +msgstr "巴伊亞夏令時間" #: dlls/tzres/tzres.rc:77 msgid "(UTC-03:00) Salvador" -msgstr "" +msgstr "(UTC-03:00) 薩爾瓦多" #: dlls/tzres/tzres.rc:408 msgid "Venezuela Standard Time" -msgstr "" +msgstr "委內瑞拉標準時間" #: dlls/tzres/tzres.rc:409 msgid "Venezuela Daylight Time" -msgstr "" +msgstr "委內瑞拉夏令時間" #: dlls/tzres/tzres.rc:410 msgid "(UTC-04:00) Caracas" -msgstr "" +msgstr "(UTC-04:00) 卡拉卡斯" #: dlls/tzres/tzres.rc:84 -#, fuzzy -#| msgid "Date and time" msgid "Bougainville Standard Time" -msgstr "日期和時間" +msgstr "布干維爾標準時間" #: dlls/tzres/tzres.rc:85 -#, fuzzy -#| msgid "Date and time" msgid "Bougainville Daylight Time" -msgstr "日期和時間" +msgstr "布干維爾夏令時間" #: dlls/tzres/tzres.rc:86 msgid "(UTC+11:00) Bougainville Island" -msgstr "" +msgstr "(UTC+11:00) 布干維爾島" #: dlls/tzres/tzres.rc:186 msgid "Hawaiian Standard Time" -msgstr "" +msgstr "夏威夷標準時間" #: dlls/tzres/tzres.rc:187 msgid "Hawaiian Daylight Time" -msgstr "" +msgstr "夏威夷夏令時間" #: dlls/tzres/tzres.rc:188 msgid "(UTC-10:00) Hawaii" -msgstr "" +msgstr "(UTC-10:00) 夏威夷" #: dlls/tzres/tzres.rc:333 msgid "SE Asia Standard Time" -msgstr "" +msgstr "東南亞標準時間" #: dlls/tzres/tzres.rc:334 msgid "SE Asia Daylight Time" -msgstr "" +msgstr "東南亞夏令時間" #: dlls/tzres/tzres.rc:335 msgid "(UTC+07:00) Bangkok, Hanoi, Jakarta" -msgstr "" +msgstr "(UTC+07:00) 曼谷，河內，雅加達" #: dlls/tzres/tzres.rc:291 -#, fuzzy -#| msgid "&Standard bar" msgid "Qyzylorda Standard Time" -msgstr "標準列(&S)" +msgstr "克孜勒奧爾達標準時間" #: dlls/tzres/tzres.rc:292 -#, fuzzy -#| msgid "Date and time" msgid "Qyzylorda Daylight Time" -msgstr "日期和時間" +msgstr "克孜勒奧爾達夏令時間" #: dlls/tzres/tzres.rc:293 msgid "(UTC+05:00) Qyzylorda" -msgstr "" +msgstr "(UTC+05:00) 克孜勒奧爾達" #: dlls/tzres/tzres.rc:426 -#, fuzzy -#| msgid "Date and time" msgid "W. Mongolia Standard Time" -msgstr "日期和時間" +msgstr "蒙古西部標準時間" #: dlls/tzres/tzres.rc:427 -#, fuzzy -#| msgid "Date and time" msgid "W. Mongolia Daylight Time" -msgstr "日期和時間" +msgstr "蒙古西部夏令時間" #: dlls/tzres/tzres.rc:428 msgid "(UTC+07:00) Hovd" -msgstr "" +msgstr "(UTC+07:00) 科布多城" #: dlls/tzres/tzres.rc:255 msgid "New Zealand Standard Time" -msgstr "" +msgstr "紐西蘭標準時間" #: dlls/tzres/tzres.rc:256 msgid "New Zealand Daylight Time" -msgstr "" +msgstr "紐西蘭夏令時間" #: dlls/tzres/tzres.rc:257 msgid "(UTC+12:00) Auckland, Wellington" -msgstr "" +msgstr "(UTC+12:00) 奧克蘭，威靈頓" #: dlls/tzres/tzres.rc:36 -#, fuzzy -#| msgid "Date and time" msgid "Aleutian Standard Time" -msgstr "日期和時間" +msgstr "阿留申標準時間" #: dlls/tzres/tzres.rc:37 -#, fuzzy -#| msgid "Date and time" msgid "Aleutian Daylight Time" -msgstr "日期和時間" +msgstr "阿留申夏令時間" #: dlls/tzres/tzres.rc:38 msgid "(UTC-10:00) Aleutian Islands" -msgstr "" +msgstr "(UTC-10:00) 阿留申群島" #: dlls/tzres/tzres.rc:273 -#, fuzzy -#| msgid "&Standard bar" msgid "Omsk Standard Time" -msgstr "標準列(&S)" +msgstr "鄂木斯克標準時間" #: dlls/tzres/tzres.rc:274 -#, fuzzy -#| msgid "Date and time" msgid "Omsk Daylight Time" -msgstr "日期和時間" +msgstr "鄂木斯克夏令時間" #: dlls/tzres/tzres.rc:275 msgid "(UTC+06:00) Omsk" -msgstr "" +msgstr "(UTC+06:00) 鄂木斯克" #: dlls/tzres/tzres.rc:105 msgid "Central Brazilian Standard Time" -msgstr "" +msgstr "巴西中部標準時間" #: dlls/tzres/tzres.rc:106 msgid "Central Brazilian Daylight Time" -msgstr "" +msgstr "巴西中部夏令時間" #: dlls/tzres/tzres.rc:107 msgid "(UTC-04:00) Cuiaba" -msgstr "" +msgstr "(UTC-04:00) 庫亞巴" #: dlls/tzres/tzres.rc:81 msgid "Belarus Standard Time" -msgstr "" +msgstr "白俄羅斯標準時間" #: dlls/tzres/tzres.rc:82 msgid "Belarus Daylight Time" -msgstr "" +msgstr "白俄羅斯夏令時間" #: dlls/tzres/tzres.rc:83 msgid "(UTC+03:00) Minsk" -msgstr "" +msgstr "(UTC+03:00) 明斯克" #: dlls/tzres/tzres.rc:315 msgid "SA Western Standard Time" -msgstr "" +msgstr "南美洲西部標準時間" #: dlls/tzres/tzres.rc:316 msgid "SA Western Daylight Time" -msgstr "" +msgstr "南美洲西部夏令時間" #: dlls/tzres/tzres.rc:317 msgid "(UTC-04:00) Georgetown, La Paz, Manaus, San Juan" -msgstr "" +msgstr "(UTC-04:00) 喬治敦，拉巴斯，瑪瑙斯，聖胡安" #: dlls/tzres/tzres.rc:174 msgid "Greenland Standard Time" -msgstr "" +msgstr "格陵蘭標準時間" #: dlls/tzres/tzres.rc:175 msgid "Greenland Daylight Time" -msgstr "" +msgstr "格陵蘭夏令時間" #: dlls/tzres/tzres.rc:176 msgid "(UTC-03:00) Greenland" -msgstr "" +msgstr "(UTC-03:00) 格陵蘭" #: dlls/tzres/tzres.rc:147 -#, fuzzy -#| msgid "Date and time" msgid "Easter Island Standard Time" -msgstr "日期和時間" +msgstr "復活節島標準時間" #: dlls/tzres/tzres.rc:148 -#, fuzzy -#| msgid "Date and time" msgid "Easter Island Daylight Time" -msgstr "日期和時間" +msgstr "復活節島夏令時間" #: dlls/tzres/tzres.rc:149 msgid "(UTC-06:00) Easter Island" -msgstr "" +msgstr "(UTC-06:00) 復活節島" #: dlls/tzres/tzres.rc:297 dlls/tzres/tzres.rc:298 msgid "Russia Time Zone 10" -msgstr "" +msgstr "俄羅斯時區 10" #: dlls/tzres/tzres.rc:299 msgid "(UTC+11:00) Chokurdakh" -msgstr "" +msgstr "(UTC+11:00) 喬庫爾達赫" #: dlls/tzres/tzres.rc:156 msgid "Egypt Standard Time" -msgstr "" +msgstr "埃及標準時間" #: dlls/tzres/tzres.rc:157 msgid "Egypt Daylight Time" -msgstr "" +msgstr "埃及夏令時間" #: dlls/tzres/tzres.rc:158 msgid "(UTC+02:00) Cairo" -msgstr "" +msgstr "(UTC+02:00) 開羅" #: dlls/tzres/tzres.rc:153 -#, fuzzy -#| msgid "Date and time" msgid "Eastern Standard Time (Mexico)" -msgstr "日期和時間" +msgstr "東部標準時間 (墨西哥)" #: dlls/tzres/tzres.rc:154 -#, fuzzy -#| msgid "Date and time" msgid "Eastern Daylight Time (Mexico)" -msgstr "日期和時間" +msgstr "東部夏令時間 (墨西哥)" #: dlls/tzres/tzres.rc:155 msgid "(UTC-05:00) Chetumal" -msgstr "" +msgstr "(UTC-05:00) 切圖馬爾" #: dlls/tzres/tzres.rc:225 msgid "Mauritius Standard Time" -msgstr "" +msgstr "模里西斯標準時間" #: dlls/tzres/tzres.rc:226 msgid "Mauritius Daylight Time" -msgstr "" +msgstr "模里西斯夏令時間" #: dlls/tzres/tzres.rc:227 msgid "(UTC+04:00) Port Louis" -msgstr "" +msgstr "(UTC+04:00) 路易士港" #: dlls/tzres/tzres.rc:411 msgid "Vladivostok Standard Time" -msgstr "" +msgstr "海參崴標準時間" #: dlls/tzres/tzres.rc:412 msgid "Vladivostok Daylight Time" -msgstr "" +msgstr "海參崴夏令時間" #: dlls/tzres/tzres.rc:413 msgid "(UTC+10:00) Vladivostok" -msgstr "" +msgstr "(UTC+10:00) 海參崴" #: dlls/tzres/tzres.rc:336 msgid "Singapore Standard Time" -msgstr "" +msgstr "新加坡標準時間" #: dlls/tzres/tzres.rc:337 msgid "Singapore Daylight Time" -msgstr "" +msgstr "新加坡夏令時間" #: dlls/tzres/tzres.rc:338 msgid "(UTC+08:00) Kuala Lumpur, Singapore" -msgstr "" +msgstr "(UTC+08:00) 吉隆坡，新加坡" #: dlls/tzres/tzres.rc:204 msgid "Korea Standard Time" -msgstr "" +msgstr "韓國標準時間" #: dlls/tzres/tzres.rc:205 msgid "Korea Daylight Time" -msgstr "" +msgstr "韓國夏令時間" #: dlls/tzres/tzres.rc:206 msgid "(UTC+09:00) Seoul" -msgstr "" +msgstr "(UTC+09:00) 首爾" #: dlls/tzres/tzres.rc:123 -#, fuzzy -#| msgid "Date and time" msgid "Chatham Islands Standard Time" -msgstr "日期和時間" +msgstr "查塔姆群島標準時間" #: dlls/tzres/tzres.rc:124 -#, fuzzy -#| msgid "Date and time" msgid "Chatham Islands Daylight Time" -msgstr "日期和時間" +msgstr "查塔姆群島夏令時間" #: dlls/tzres/tzres.rc:125 msgid "(UTC+12:45) Chatham Islands" -msgstr "" +msgstr "(UTC+12:45) 查塔姆群島" #: dlls/tzres/tzres.rc:135 msgid "E. Africa Standard Time" -msgstr "" +msgstr "東非標準時間" #: dlls/tzres/tzres.rc:136 msgid "E. Africa Daylight Time" -msgstr "" +msgstr "東非夏令時間" #: dlls/tzres/tzres.rc:137 msgid "(UTC+03:00) Nairobi" -msgstr "" +msgstr "(UTC+03:00) 奈洛比" #: dlls/tzres/tzres.rc:165 -#, fuzzy -#| msgid "&Standard bar" msgid "FLE Standard Time" -msgstr "標準列(&S)" +msgstr "FLE 標準時間" #: dlls/tzres/tzres.rc:166 msgid "FLE Daylight Time" -msgstr "" +msgstr "FLE 夏令時間" #: dlls/tzres/tzres.rc:167 msgid "(UTC+02:00) Helsinki, Kyiv, Riga, Sofia, Tallinn, Vilnius" -msgstr "" +msgstr "(UTC+02:00) 赫爾辛基，基輔，里加，索菲亞，塔林，維爾紐斯" #: dlls/tzres/tzres.rc:144 msgid "E. South America Standard Time" -msgstr "" +msgstr "東南美洲標準時間" #: dlls/tzres/tzres.rc:145 msgid "E. South America Daylight Time" -msgstr "" +msgstr "東南美洲夏令時間" #: dlls/tzres/tzres.rc:146 msgid "(UTC-03:00) Brasilia" -msgstr "" +msgstr "(UTC-03:00) 巴西利亞" #: dlls/tzres/tzres.rc:114 msgid "Central Pacific Standard Time" -msgstr "" +msgstr "太平洋中部標準時間" #: dlls/tzres/tzres.rc:115 msgid "Central Pacific Daylight Time" -msgstr "" +msgstr "太平洋中部夏令時間" #: dlls/tzres/tzres.rc:116 msgid "(UTC+11:00) Solomon Is., New Caledonia" -msgstr "" +msgstr "(UTC+11:00) 索羅門群島，新喀里多尼亞群島" #: dlls/tzres/tzres.rc:420 msgid "W. Central Africa Standard Time" -msgstr "" +msgstr "中西非標準時間" #: dlls/tzres/tzres.rc:421 msgid "W. Central Africa Daylight Time" -msgstr "" +msgstr "中西非夏令時間" #: dlls/tzres/tzres.rc:422 msgid "(UTC+01:00) West Central Africa" -msgstr "" +msgstr "(UTC+01:00) 中西非" #: dlls/tzres/tzres.rc:276 msgid "Pacific SA Standard Time" -msgstr "" +msgstr "太平洋 (南美) 標準時間" #: dlls/tzres/tzres.rc:277 msgid "Pacific SA Daylight Time" -msgstr "" +msgstr "太平洋 (南美) 夏令時間" #: dlls/tzres/tzres.rc:278 msgid "(UTC-04:00) Santiago" -msgstr "" +msgstr "(UTC-04:00) 聖地牙哥" #: dlls/tzres/tzres.rc:138 msgid "E. Australia Standard Time" -msgstr "" +msgstr "澳洲東部標準時間" #: dlls/tzres/tzres.rc:139 msgid "E. Australia Daylight Time" -msgstr "" +msgstr "澳洲東部夏令時間" #: dlls/tzres/tzres.rc:140 msgid "(UTC+10:00) Brisbane" -msgstr "" +msgstr "(UTC+10:00) 布里斯本" #: dlls/tzres/tzres.rc:417 msgid "W. Australia Standard Time" -msgstr "" +msgstr "澳洲西部標準時間" #: dlls/tzres/tzres.rc:418 msgid "W. Australia Daylight Time" -msgstr "" +msgstr "澳洲西部夏令時間" #: dlls/tzres/tzres.rc:419 msgid "(UTC+08:00) Perth" -msgstr "" +msgstr "(UTC+08:00) 伯斯" #: dlls/urlmon/urlmon.rc:32 dlls/wininet/wininet.rc:88 msgid "Security Warning" -msgstr "安全警告" +msgstr "安全性警告" #: dlls/urlmon/urlmon.rc:35 msgid "Do you want to install this software?" -msgstr "您要安裝這個軟體？" +msgstr "您要安裝這個軟體?" #: dlls/urlmon/urlmon.rc:39 msgid "Don't install" @@ -12017,12 +11876,12 @@ msgid "" "When installed, an ActiveX component has full access to your computer. Do " "not click install unless you have absolute trust in the above source." msgstr "" -"ActiveX 組成在安裝之後就能任意存取您的電腦。除非您絕對信賴以上的來源，否則不" -"要按下安裝。" +"在安裝之後，ActiveX 元件能完整存取您的電腦。" +"除非您非常信任以上的來源，否則不要按下安裝。" #: dlls/urlmon/urlmon.rc:51 msgid "Installation of component failed: %08x" -msgstr "無法安裝組成：%08x" +msgstr "無法安裝元件: %08x" #: dlls/urlmon/urlmon.rc:52 msgid "Install (%d)" @@ -12079,11 +11938,11 @@ msgstr "中止(&A)" #: dlls/user32/user32.rc:85 msgid "&Ignore" -msgstr "忽略(&I)" +msgstr "略過(&I)" #: dlls/user32/user32.rc:86 msgid "&Try Again" -msgstr "再試(&T)" +msgstr "再試一次(&T)" #: dlls/user32/user32.rc:87 msgid "&Continue" @@ -12099,217 +11958,167 @@ msgstr "更多視窗(&M)..." #: dlls/vbscript/vbscript.rc:30 msgid "Overflow" -msgstr "" +msgstr "溢位" #: dlls/vbscript/vbscript.rc:31 -#, fuzzy -#| msgid "Out of memory." msgid "Out of memory" -msgstr "記憶體不足。" +msgstr "記憶體不足" #: dlls/vbscript/vbscript.rc:33 msgid "This array is fixed or temporarily locked" -msgstr "" +msgstr "此陣列的長度是固定的或暫時被鎖住" #: dlls/vbscript/vbscript.rc:34 -#, fuzzy -#| msgid "Data type mismatch.\n" msgid "Type mismatch" -msgstr "資料類型不匹配。\n" +msgstr "類型不相符" #: dlls/vbscript/vbscript.rc:36 -#, fuzzy -#| msgid "I/O device error.\n" msgid "Device I/O error" -msgstr "I/O 裝置錯誤。\n" +msgstr "I/O 裝置錯誤" #: dlls/vbscript/vbscript.rc:37 -#, fuzzy -#| msgid "File already exists.\n" msgid "File already exists" -msgstr "檔案已經存在。\n" +msgstr "檔案已經存在" #: dlls/vbscript/vbscript.rc:38 -#, fuzzy -#| msgid "Disk full.\n" msgid "Disk full" -msgstr "磁碟已滿。\n" +msgstr "磁碟已滿" #: dlls/vbscript/vbscript.rc:39 -#, fuzzy -#| msgid "Too many open files.\n" msgid "Too many files" -msgstr "開啟過多檔案。\n" +msgstr "過多檔案" #: dlls/vbscript/vbscript.rc:40 -#, fuzzy -#| msgid "Access denied.\n" msgid "Permission denied" -msgstr "存取被拒。\n" +msgstr "存取被拒" #: dlls/vbscript/vbscript.rc:41 msgid "Path/File access error" -msgstr "" +msgstr "路徑/檔案存取錯誤" #: dlls/vbscript/vbscript.rc:42 -#, fuzzy -#| msgid "Path not found.\n" msgid "Path not found" -msgstr "找不到路徑。\n" +msgstr "找不到路徑" #: dlls/vbscript/vbscript.rc:43 -#, fuzzy -#| msgid "(value not set)" msgid "Object variable not set" -msgstr "(沒有設值)" +msgstr "沒有設定物件變數" #: dlls/vbscript/vbscript.rc:44 -#, fuzzy -#| msgid "Invalid user buffer.\n" msgid "Invalid use of Null" -msgstr "無效的使用者緩衝區。\n" +msgstr "Null 的使用不正確" #: dlls/vbscript/vbscript.rc:45 msgid "Can't create necessary temporary file" -msgstr "" +msgstr "無法建立必須的暫存檔案" #: dlls/vbscript/vbscript.rc:46 -#, fuzzy -#| msgid "Automation server can't create object" msgid "ActiveX component can't create object" -msgstr "自動作業伺服器無法建立物件" +msgstr "ActiveX 元件無法建立物件" #: dlls/vbscript/vbscript.rc:47 -#, fuzzy -#| msgid "Object doesn't support this action" msgid "Class doesn't support Automation" -msgstr "物件不支援此動作" +msgstr "物件類別不支援自動化" #: dlls/vbscript/vbscript.rc:48 msgid "File name or class name not found during Automation operation" -msgstr "" +msgstr "在自動化運作過程中找不到檔案名稱或物件類別名稱" #: dlls/vbscript/vbscript.rc:51 -#, fuzzy -#| msgid "Object doesn't support this action" msgid "Object doesn't support named arguments" -msgstr "物件不支援此動作" +msgstr "物件不支援指名的引數" #: dlls/vbscript/vbscript.rc:52 -#, fuzzy -#| msgid "Object doesn't support this action" msgid "Object doesn't support current locale setting" -msgstr "物件不支援此動作" +msgstr "物件不支援目前的地區設定" #: dlls/vbscript/vbscript.rc:53 dlls/vbscript/vbscript.rc:54 -#, fuzzy -#| msgid "Element not found.\n" msgid "Named argument not found" -msgstr "找不到元件。\n" +msgstr "找不到指名的引數" #: dlls/vbscript/vbscript.rc:55 msgid "Wrong number of arguments or invalid property assignment" -msgstr "" +msgstr "引數的個數錯誤或指派的屬性無效" #: dlls/vbscript/vbscript.rc:56 -#, fuzzy -#| msgid "Object Class Violation" msgid "Object not a collection" -msgstr "物件類別違規" +msgstr "物件並非集合物件" #: dlls/vbscript/vbscript.rc:57 -#, fuzzy -#| msgid "Specified control was not found in message" msgid "Specified DLL function not found" -msgstr "在訊息中找不到指定的控制" +msgstr "找不到指定的 DLL 函數" #: dlls/vbscript/vbscript.rc:58 msgid "Variable uses an Automation type not supported in VBScript" -msgstr "" +msgstr "變數使用了 VBScript 不支援的自動化類型" #: dlls/vbscript/vbscript.rc:59 msgid "The remote server machine does not exist or is unavailable" -msgstr "" +msgstr "遠端伺服器不存在或無法使用" #: dlls/vbscript/vbscript.rc:60 msgid "Invalid or unqualified reference" -msgstr "" +msgstr "無效或不合格的引用" #: dlls/vbscript/vbscript.rc:62 msgid "Microsoft VBScript compilation error" -msgstr "" +msgstr "Microsoft VBScript 編譯錯誤" #: dlls/vbscript/vbscript.rc:63 msgid "Microsoft VBScript runtime error" -msgstr "" +msgstr "Microsoft VBScript 執行期錯誤" #: dlls/winemac.drv/winemac.rc:33 -#, fuzzy -#| msgid "Hide" msgid "Hide %@" -msgstr "隱藏" +msgstr "隱藏 %@" #: dlls/winemac.drv/winemac.rc:35 -#, fuzzy -#| msgid "Other" msgid "Hide Others" -msgstr "其他" +msgstr "隱藏其他" #: dlls/winemac.drv/winemac.rc:36 -#, fuzzy -#| msgid "Show" msgid "Show All" -msgstr "顯示" +msgstr "顯示全部" #: dlls/winemac.drv/winemac.rc:37 msgid "Quit %@" -msgstr "" +msgstr "結束 %@" #: dlls/winemac.drv/winemac.rc:38 msgid "Quit" -msgstr "" +msgstr "結束" #: dlls/winemac.drv/winemac.rc:40 -#, fuzzy -#| msgid "&Window" msgid "Window" -msgstr "視窗(&W)" +msgstr "視窗" #: dlls/winemac.drv/winemac.rc:41 -#, fuzzy -#| msgid "&Minimize" msgid "Minimize" -msgstr "最小化(&M)" +msgstr "最小化" #: dlls/winemac.drv/winemac.rc:42 -#, fuzzy -#| msgid "Zoom in" msgid "Zoom" -msgstr "放大" +msgstr "縮放" #: dlls/winemac.drv/winemac.rc:43 msgid "Enter Full Screen" -msgstr "" +msgstr "進入全螢幕" #: dlls/winemac.drv/winemac.rc:44 -#, fuzzy -#| msgid "&Bring To Front" msgid "Bring All to Front" -msgstr "移到最前面(&B)" +msgstr "將全部移到最前面" #: dlls/wineps.drv/wineps.rc:31 msgid "Paper Si&ze:" -msgstr "紙張大小(&Z)：" +msgstr "紙張大小(&Z):" #: dlls/wineps.drv/wineps.rc:39 msgid "Duplex:" -msgstr "雙面：" +msgstr "雙面:" #: dlls/wineps.drv/wineps.rc:50 -#, fuzzy -#| msgid "&Setup" msgid "Setup" -msgstr "設定(&S)" +msgstr "設定" #: dlls/wininet/wininet.rc:53 dlls/wininet/wininet.rc:73 msgid "Realm" @@ -12329,7 +12138,7 @@ msgstr "這個站臺的憑證有問題。" #: dlls/wininet/wininet.rc:93 msgid "Do you want to continue anyway?" -msgstr "您無論如何都要繼續？" +msgstr "您無論如何都要繼續?" #: dlls/wininet/wininet.rc:28 msgid "LAN Connection" @@ -12345,112 +12154,92 @@ msgstr "憑證上的日期無效。" #: dlls/wininet/wininet.rc:31 msgid "The name on the certificate does not match the site." -msgstr "憑證上的名稱不匹配站臺。" +msgstr "憑證上的名稱與站臺不相符。" #: dlls/wininet/wininet.rc:32 msgid "" "There is at least one unspecified security problem with this certificate." -msgstr "有至少一個未指定的安全問題與這個憑證相關。" +msgstr "這個憑證有至少一個未指定的安全問題。" #: dlls/wininet/wininet.rc:35 msgid "Effective Date" -msgstr "" +msgstr "生效日期" #: dlls/wininet/wininet.rc:37 -#, fuzzy -#| msgid "Security" msgid "Security Protocol" -msgstr "安全性" +msgstr "安全性通訊協定" #: dlls/wininet/wininet.rc:38 -#, fuzzy -#| msgid "Signature" msgid "Signature Type" -msgstr "簽名" +msgstr "簽章類型" #: dlls/wininet/wininet.rc:39 -#, fuzzy -#| msgid "Encrypting File System" msgid "Encryption Type" -msgstr "加密檔案系統" +msgstr "加密類型" #: dlls/wininet/wininet.rc:40 msgid "Privacy Strength" -msgstr "" +msgstr "隱私層次" #: dlls/wininet/wininet.rc:43 msgid "bits" -msgstr "" +msgstr "位元" #: dlls/wininet/winineterror.mc:26 -#, fuzzy -#| msgid "Service request timeout.\n" msgid "The request has timed out.\n" -msgstr "服務要求逾時。\n" +msgstr "要求已逾時。\n" #: dlls/wininet/winineterror.mc:31 -#, fuzzy -#| msgid "A printer error occurred." msgid "An internal error has occurred.\n" -msgstr "印表機發生錯誤。" +msgstr "發生內部錯誤。\n" #: dlls/wininet/winineterror.mc:36 -#, fuzzy -#| msgid "Path is invalid.\n" msgid "The URL is invalid.\n" -msgstr "路徑無效。\n" +msgstr "這個 URL 無效。\n" #: dlls/wininet/winineterror.mc:41 msgid "The URL scheme could not be recognized or is not supported.\n" -msgstr "" +msgstr "無法辨識或不支援的 URL 配置。\n" #: dlls/wininet/winineterror.mc:46 -#, fuzzy -#| msgid "The username could not be found.\n" msgid "The server name could not be resolved.\n" -msgstr "無法找到使用者名稱。\n" +msgstr "無法解析伺服器名稱。\n" #: dlls/wininet/winineterror.mc:51 -#, fuzzy -#| msgid "The user profile is invalid.\n" msgid "The requested operation is invalid.\n" -msgstr "使用者側寫檔無效。\n" +msgstr "要求的操作不正確。\n" #: dlls/wininet/winineterror.mc:56 msgid "" "The operation was canceled, usually because the handle on which the request " "was operating was closed before the operation completed.\n" -msgstr "" +msgstr "這項操作已取消，這一般是因為要求控制代碼在操作完成前被關閉。\n" #: dlls/wininet/winineterror.mc:61 -#, fuzzy -#| msgid "The profile could not be added.\n" msgid "The requested item could not be located.\n" -msgstr "無法加入側寫檔。\n" +msgstr "找不到要求的項目。\n" #: dlls/wininet/winineterror.mc:66 -#, fuzzy -#| msgid "Can't connect to the LDAP server" msgid "The attempt to connect to the server failed.\n" -msgstr "無法連線到 LDAP 伺服器" +msgstr "嘗試連線到伺服器失敗。\n" #: dlls/wininet/winineterror.mc:71 msgid "The connection with the server has been terminated.\n" -msgstr "" +msgstr "與伺服器的連線已終止。\n" #: dlls/wininet/winineterror.mc:76 msgid "" "SSL certificate date that was received from the server is bad. The " "certificate is expired.\n" -msgstr "" +msgstr "從伺服器接收到的 SSL 憑證日期是錯誤的。該憑證已經過期。\n" #: dlls/wininet/winineterror.mc:81 msgid "SSL certificate common name (host name field) is incorrect.\n" -msgstr "" +msgstr "SSL 憑證一般名稱 (主機名稱欄位) 無效。\n" #: dlls/winmm/winmm.rc:32 msgid "The specified command was carried out." -msgstr "指定的命令被帶出。" +msgstr "指定的命令已經執行。" #: dlls/winmm/winmm.rc:33 msgid "Undefined external error." @@ -12458,121 +12247,116 @@ msgstr "未定義的外部錯誤。" #: dlls/winmm/winmm.rc:34 msgid "A device ID has been used that is out of range for your system." -msgstr "裝置識別號已被用於超出您的系統範圍。" +msgstr "使用的裝置識別碼已超出您的系統範圍。" #: dlls/winmm/winmm.rc:35 msgid "The driver was not enabled." -msgstr "驅動程式未被啟用。" +msgstr "驅動程式未啟用。" #: dlls/winmm/winmm.rc:36 msgid "" "The specified device is already in use. Wait until it is free, and then try " "again." -msgstr "指定的裝置已在使用中。等到它可用時，然後再試一次。" +msgstr "指定的裝置已在使用中。請等候該裝置不再使用，然後再試一次。" #: dlls/winmm/winmm.rc:37 msgid "The specified device handle is invalid." -msgstr "指定的裝置控柄無效。" +msgstr "指定的裝置控制代碼無效。" #: dlls/winmm/winmm.rc:38 msgid "There is no driver installed on your system!" -msgstr "沒有任何驅動程式已安裝於您的系統！" +msgstr "您的系統上沒有安裝任何驅動程式!" #: dlls/winmm/winmm.rc:39 dlls/winmm/winmm.rc:65 msgid "" "Not enough memory available for this task. Quit one or more applications to " "increase available memory, and then try again." msgstr "" -"可用於這個任務的記憶體不足。離開一或多個應用程式以增加可用記憶體，然後再試一" -"次。" +"可用於這個任務的記憶體不足。結束一個或多個應用程式以增加可用記憶體，" +"然後再試一次。" #: dlls/winmm/winmm.rc:40 msgid "" "This function is not supported. Use the Capabilities function to determine " "which functions and messages the driver supports." -msgstr "這個函式未被支援。使用功能函式以決定驅動程式支援何項函式和訊息。" +msgstr "不支援這項功能。請使用 [能力] 功能來決定驅動程式所支援的功能和訊息。" #: dlls/winmm/winmm.rc:41 msgid "An error number was specified that is not defined in the system." -msgstr "被指定的錯誤代號未被定義於系統中。" +msgstr "指定的號碼錯誤: 號碼未在系統中定義。" #: dlls/winmm/winmm.rc:42 msgid "An invalid flag was passed to a system function." -msgstr "無效的旗標被傳遞到系統函式。" +msgstr "無效的旗標被傳送給系統功能。" #: dlls/winmm/winmm.rc:43 msgid "An invalid parameter was passed to a system function." -msgstr "無效的參數被傳遞到系統函式。" +msgstr "無效的參數被傳送給系統功能。" #: dlls/winmm/winmm.rc:46 msgid "" "The specified format is not supported or cannot be translated. Use the " "Capabilities function to determine the supported formats." -msgstr "指定的格式未被支援或無法翻譯。使用功能函式以決定支援的格式。" +msgstr "指定的格式未支援或無法翻譯。請使用 [能力] 功能來決定支援的格式。" #: dlls/winmm/winmm.rc:47 dlls/winmm/winmm.rc:53 msgid "" "Cannot perform this operation while media data is still playing. Reset the " "device, or wait until the data is finished playing." msgstr "" -"當媒體資料仍在播放中將無法進行這個作業。請重置裝置，或是等到資料已完成播放。" +"當媒體資料仍在播放時，無法進行這個操作。請重設裝置，或等待資料播放完畢。" #: dlls/winmm/winmm.rc:48 msgid "" "The wave header was not prepared. Use the Prepare function to prepare the " "header, and then try again." -msgstr "wave 標頭尚未就緒。使用「準備功能」以準備標頭，然後再試一次。" +msgstr "wave 標頭尚未就緒。請使用 [準備] 功能以準備標頭，然後再試一次。" #: dlls/winmm/winmm.rc:49 msgid "" "Cannot open the device without using the WAVE_ALLOWSYNC flag. Use the flag, " "and then try again." msgstr "" -"無法在不使用 WAVE_ALLOWSYNC 旗標的狀態下開啟裝置。使用旗標，然後再試一次。" +"無法在不使用 WAVE_ALLOWSYNC 旗標的狀態下開啟裝置。" +"請使用旗標，然後再試一次。" #: dlls/winmm/winmm.rc:52 msgid "" "The MIDI header was not prepared. Use the Prepare function to prepare the " "header, and then try again." -msgstr "MIDI 標頭尚未就緒。使用「準備功能」以準備標頭，然後再試一次。" +msgstr "MIDI 標頭尚未就緒。請使用 [準備] 功能以準備標頭，然後再試一次。" #: dlls/winmm/winmm.rc:54 msgid "" "A MIDI map was not found. There may be a problem with the driver, or the " "MIDIMAP.CFG file may be corrupt or missing." msgstr "" -"找不到 MIDI 對映。也許是驅動程式的問題，或者 MIDIMAP.CFG 檔案已損壞或缺少。" +"找不到 MIDI 對應。這可能是驅動程式的問題，或是 MIDIMAP.CFG 檔案已損壞或遺失。" #: dlls/winmm/winmm.rc:55 msgid "" "The port is transmitting data to the device. Wait until the data has been " "transmitted, and then try again." -msgstr "通訊埠正在傳送資料給裝置。等到資料傳輸完成，然後再試一次。" +msgstr "連接埠正在傳送資料給裝置。請等待資料傳輸完成，然後再試一次。" #: dlls/winmm/winmm.rc:56 dlls/winmm/winmm.rc:129 -#, fuzzy -#| msgid "" -#| "The current MIDI Mapper setup refers to a MIDI device that is not " -#| "installed on the system. Use MIDI Mapper to edit the setup." msgid "" "The current MIDI Mapper setup refers to a MIDI device that is not installed " "on the system." -msgstr "" -"目前的 MIDI 對映表設定，參照了未被安裝於系統上的 MIDI 裝置。使用 MIDI 對映表" -"以編輯設定。" +msgstr "目前的 MIDI Mapper 安裝程式參照了未安裝到系統上的 MIDI 裝置。" #: dlls/winmm/winmm.rc:57 msgid "" "The current MIDI setup is damaged. Copy the original MIDIMAP.CFG file to the " "Windows SYSTEM directory, and then try again." msgstr "" -"目前的 MIDI 設定已受損。複製原來的 MIDIMAP.CFG 檔案到 Windows 系統目錄，然後" -"再試一次。" +"目前的 MIDI Mapper 安裝程式已損壞。請複製原始的 MIDIMAP.CFG 檔案" +"到 Windows SYSTEM 目錄，然後再試一次。" #: dlls/winmm/winmm.rc:60 msgid "Invalid MCI device ID. Use the ID returned when opening the MCI device." msgstr "" -"無效的多媒體控制介面裝置識別號。開啟多媒體控制介面裝置時使用回傳的識別號。" +"無效的多媒體控制介面裝置識別碼。請在開啟多媒體控制介面裝置時使用傳回的識別碼。" #: dlls/winmm/winmm.rc:61 msgid "The driver cannot recognize the specified command parameter." @@ -12586,11 +12370,11 @@ msgstr "驅動程式無法識別指定的命令。" msgid "" "There is a problem with your media device. Make sure it is working correctly " "or contact the device manufacturer." -msgstr "您的媒體裝置有問題。請確定它作用正確或與裝置製造商聯絡。" +msgstr "您的媒體裝置有問題。請確定它正常運作或與裝置製造商聯絡。" #: dlls/winmm/winmm.rc:64 msgid "The specified device is not open or is not recognized by MCI." -msgstr "指定的裝置未開啟或未被多媒體控制介面辨識出來。" +msgstr "指定的裝置未開啟或未被多媒體控制介面識別出來。" #: dlls/winmm/winmm.rc:66 msgid "" @@ -12605,19 +12389,19 @@ msgstr "載入指定的裝置驅動程式時發生無法偵測的問題。" #: dlls/winmm/winmm.rc:68 msgid "No command was specified." -msgstr "沒有任何命令被指定。" +msgstr "未指定任何命令。" #: dlls/winmm/winmm.rc:69 msgid "" "The output string was too large to fit in the return buffer. Increase the " "size of the buffer." -msgstr "輸出字串太大而不適合回傳緩衝區。請增加緩衝區的大小。" +msgstr "輸出字串太大，超出了傳回的緩衝區容量。請增加緩衝區的大小。" #: dlls/winmm/winmm.rc:70 msgid "" "The specified command requires a character-string parameter. Please provide " "one." -msgstr "指定的命令需要字串參數。請提供一個。" +msgstr "指定的命令需要一個字串參數。請提供一個。" #: dlls/winmm/winmm.rc:71 msgid "The specified integer is invalid for this command." @@ -12627,17 +12411,17 @@ msgstr "指定的整數對於這個命令無效。" msgid "" "The device driver returned an invalid return type. Check with the device " "manufacturer about obtaining a new driver." -msgstr "裝置驅動程式回傳無效的類型。請詢問裝置製造商以得到新的驅動程式。" +msgstr "裝置驅動程式傳回了無效的回傳類型。請詢問裝置製造商以取得新的驅動程式。" #: dlls/winmm/winmm.rc:73 msgid "" "There is a problem with the device driver. Check with the device " "manufacturer about obtaining a new driver." -msgstr "裝置驅動程式有問題。請詢問裝置製造商以得到新的驅動程式。" +msgstr "裝置驅動程式有問題。請詢問裝置製造商以取得新的驅動程式。" #: dlls/winmm/winmm.rc:74 msgid "The specified command requires a parameter. Please supply one." -msgstr "指定的命令需要參數。請提供一個。" +msgstr "指定的命令需要一個參數。請提供一個。" #: dlls/winmm/winmm.rc:75 msgid "The MCI device you are using does not support the specified command." @@ -12664,14 +12448,15 @@ msgstr "裝置驅動程式有問題。驅動程式已關閉。發生無法存取 #: dlls/winmm/winmm.rc:80 msgid "Cannot use 'all' as the device name with the specified command." -msgstr "無法使用 all 做為指定命令的裝置名稱。" +msgstr "無法使用 'all' 做為指定命令的裝置名稱。" #: dlls/winmm/winmm.rc:81 msgid "" "Errors occurred in more than one device. Specify each command and device " "separately to determine which devices caused the error." msgstr "" -"在一個以上的裝置中發生錯誤。每個命令分別指定裝置以決定何項裝置造成了錯誤。" +"在一個以上的裝置中發生錯誤。" +"請分別指定每一個命令和裝置，以判定造成錯誤的裝置。" #: dlls/winmm/winmm.rc:82 msgid "Cannot determine the device type from the given filename extension." @@ -12692,14 +12477,10 @@ msgid "" msgstr "無法儲存指定的檔案。請確定您有足夠的磁碟空間，或是仍然連線到網路。" #: dlls/winmm/winmm.rc:86 -#, fuzzy -#| msgid "" -#| "Cannot find the specified device. Make sure it is installed or that the " -#| "device name is spelled correctly." msgid "" "Cannot find the specified device. Make sure it is installed and that the " "device name is spelled correctly." -msgstr "找不到指定的裝置。請確定它已安裝，或是該裝置名稱的拼寫正確。" +msgstr "找不到指定的裝置。請確定它已安裝，以及該裝置名稱的拼寫正確。" #: dlls/winmm/winmm.rc:87 msgid "" @@ -12721,8 +12502,9 @@ msgstr "指定的參數對於這個命令無效。" msgid "" "The device driver is already in use. To share it, use the 'shareable' " "parameter with each 'open' command." -msgstr "" -"裝置驅動程式已在使用中。要分享它，請使用 shareable 參數於每個 open 命令。" +msgstr "" +"裝置驅動程式已在使用中。要分享它，" +"請在每個 'open' 命令使用 'shareable' 參數。" #: dlls/winmm/winmm.rc:91 msgid "" @@ -12734,7 +12516,9 @@ msgstr "指定的命令需要一個別名、檔案、驅動程式或裝置名稱 msgid "" "The specified value for the time format is invalid. Refer to the MCI " "documentation for valid formats." -msgstr "指定的值用於時間格式無效。參考多媒體控制介面文件用於有效格式。" +msgstr "" +"指定的值對時間格式而言是無效的。" +"關於有效的格式，請參考多媒體控制介面文件。" #: dlls/winmm/winmm.rc:93 msgid "" @@ -12744,53 +12528,55 @@ msgstr "參數值缺少一個右側的雙引號。請提供一個。" #: dlls/winmm/winmm.rc:94 msgid "A parameter or value was specified twice. Only specify it once." -msgstr "參數或值被指定了兩次。只要指定它一次。" +msgstr "參數或值被指定了兩次。請只指定它一次。" #: dlls/winmm/winmm.rc:95 msgid "" "The specified file cannot be played on the specified MCI device. The file " "may be corrupt, or not in the correct format." msgstr "" -"指定的檔案無法在指定的多媒體控制介面裝置上播放。檔案也許已經損壞，或者並非正" -"確格式。" +"指定的檔案無法在指定的多媒體控制介面裝置上播放。" +"檔案可能已經損壞，或者並非正確格式。" #: dlls/winmm/winmm.rc:96 msgid "A null parameter block was passed to MCI." -msgstr "空的參數區塊被傳遞到多媒體控制介面。" +msgstr "空的參數區塊被傳送到多媒體控制介面。" #: dlls/winmm/winmm.rc:97 msgid "Cannot save an unnamed file. Supply a filename." -msgstr "無法儲存未命名的檔案。請提供一個檔名。" +msgstr "無法儲存未命名的檔案。請提供一個檔案名稱。" #: dlls/winmm/winmm.rc:98 msgid "You must specify an alias when using the 'new' parameter." -msgstr "使用 new 參數時，您必須指定別名。" +msgstr "使用 'new' 參數時，您必須指定別名。" #: dlls/winmm/winmm.rc:99 msgid "Cannot use the 'notify' flag with auto-opened devices." -msgstr "無法於自動開啟的裝置使用 notify 旗標。" +msgstr "無法於自動開啟的裝置使用 'notify' 旗標。" #: dlls/winmm/winmm.rc:100 msgid "Cannot use a filename with the specified device." -msgstr "無法於指定裝置使用檔名。" +msgstr "無法於指定裝置使用檔案名稱。" #: dlls/winmm/winmm.rc:101 msgid "" "Cannot carry out the commands in the order specified. Correct the command " "sequence, and then try again." -msgstr "無法以指定的順多帶出命令。請修正命令序列，然後再試一次。" +msgstr "無法以指定的順序執行命令。請修正命令序列，然後再試一次。" #: dlls/winmm/winmm.rc:102 msgid "" "Cannot carry out the specified command on an auto-opened device. Wait until " "the device is closed, and then try again." -msgstr "無法於自動開啟的裝置帶出指定的命令。請等到裝置關閉，然後再試一次。" +msgstr "無法於自動開啟的裝置執行指定的命令。請等待裝置關閉，然後再試一次。" #: dlls/winmm/winmm.rc:103 msgid "" "The filename is invalid. Make sure the filename is not longer than 8 " "characters, followed by a period and an extension." -msgstr "檔名無效。請確定檔名長度不超過 8 個字元，然後接著句點和延伸檔名。" +msgstr "" +"無效的檔案名稱。請確定檔案名稱長度不超過 8 個字元，" +"然後接著句點和副檔名。" #: dlls/winmm/winmm.rc:104 msgid "" @@ -12801,14 +12587,15 @@ msgstr "夾於引號的字串之後無法指定額外字元。" msgid "" "The specified device is not installed on the system. Use the Drivers option " "in Control Panel to install the device." -msgstr "指定的裝置未被安裝在系統上。請使用控制面板中的驅動程式選項以安裝裝置。" +msgstr "指定的裝置未被安裝在系統上。請使用控制臺中的驅動程式選項以安裝裝置。" #: dlls/winmm/winmm.rc:106 msgid "" "Cannot access the specified file or MCI device. Try changing directories or " "restarting your computer." msgstr "" -"無法存取指定的檔案或多媒體控制介面裝置。請嘗試變更目錄或重新啟動您的電腦。" +"無法存取指定的檔案或多媒體控制介面裝置。" +"請嘗試變更目錄或重新啟動您的電腦。" #: dlls/winmm/winmm.rc:107 msgid "" @@ -12840,32 +12627,32 @@ msgid "" "All wave devices that can play files in the current format are in use. Wait " "until a wave device is free, and then try again." msgstr "" -"所有可以用目前格式播放檔案的 wave 裝置都在使用中。請等到 wave 裝置有空時，然" -"後再試一次。" +"所有可以用目前格式播放檔案的 wave 裝置都在使用中。" +"請等待其中一個 wave 裝置不再使用，然後再試一次。" #: dlls/winmm/winmm.rc:113 msgid "" "Cannot set the current wave device for play back because it is in use. Wait " "until the device is free, and then try again." msgstr "" -"無法設定目前的 wave 裝置去播放，因為它正在使用中。請等到裝置有空時，然後再試" -"一次。" +"目前的 wave 裝置正在使用中，所以無法設定它來播放。" +"請等待該裝置不再使用，再試一次。" #: dlls/winmm/winmm.rc:114 msgid "" "All wave devices that can record files in the current format are in use. " "Wait until a wave device is free, and then try again." msgstr "" -"所有可以用目前格式記錄檔案的 wave 裝置都在使用中。請等到 wave 裝置有空時，然" -"後再試一次。" +"所有可以用目前格式記錄檔案的 wave 裝置都在使用中。" +"請等待其中一個 wave 裝置不再使用，然後再試一次。" #: dlls/winmm/winmm.rc:115 msgid "" "Cannot set the current wave device for recording because it is in use. Wait " "until the device is free, and then try again." msgstr "" -"無法設定目前的 wave 裝置去記錄，因為它正在使用中。請等到裝置有空時，然後再試" -"一次。" +"無法設定目前的 wave 裝置去記錄，因為它正在使用中。" +"請等待該裝置不再使用，然後再試一次。" #: dlls/winmm/winmm.rc:116 msgid "Any compatible waveform playback device may be used." @@ -12880,8 +12667,8 @@ msgid "" "No wave device that can play files in the current format is installed. Use " "the Drivers option to install the wave device." msgstr "" -"沒有任何可以用目前格式播放檔案的 wave 裝置已被安裝。請使用驅動程式選項以安裝 " -"wave 裝置。" +"沒有任何可以用目前格式播放檔案的 wave 裝置已被安裝。" +"請使用「驅動程式」選項以安裝 wave 裝置。" #: dlls/winmm/winmm.rc:119 msgid "" @@ -12894,8 +12681,8 @@ msgid "" "No wave device that can record files in the current format is installed. Use " "the Drivers option to install the wave device." msgstr "" -"沒有安裝任何能以目前的格式記錄檔案的 wave 裝置。使用「驅動程式」選項以安裝 " -"wave 裝置。" +"沒有安裝任何能以目前的格式記錄檔案的 wave 裝置。" +"使用「驅動程式」選項以安裝 wave 裝置。" #: dlls/winmm/winmm.rc:121 msgid "" @@ -12910,50 +12697,42 @@ msgid "" msgstr "「歌曲指標」的時間格式和 SMPTE 彼此互斥。您無法一起使用它們。" #: dlls/winmm/winmm.rc:128 -#, fuzzy -#| msgid "" -#| "The specified MIDI port is already in use. Wait until it is free; then " -#| "try again." msgid "" "The specified MIDI port is already in use. Wait until it is free, and then " "try again." -msgstr "指定的 MIDI 通訊埠已在使用中。等到它可用時；然後再試一次。" +msgstr "指定的 MIDI 連接埠已在使用中。請等待它不再使用，然後再試一次。" #: dlls/winmm/winmm.rc:131 msgid "" "The specified MIDI device is not installed on the system. Use the Drivers " "option from the Control Panel to install a MIDI device." msgstr "" -"指定的 MIDI 裝置未被安裝在系統上。使用「控制面板」中的「驅動程式」選項以安裝 " -"MIDI 裝置。" +"指定的 MIDI 裝置未安裝到系統上。請使用控制臺中的「驅動程式」選項" +"以安裝 MIDI 裝置。" #: dlls/winmm/winmm.rc:130 msgid "An error occurred with the specified port." -msgstr "指定的通訊埠發生了錯誤。" +msgstr "指定的連接埠發生了錯誤。" #: dlls/winmm/winmm.rc:133 -#, fuzzy -#| msgid "" -#| "All multimedia timers are being used by other applications. Quit one of " -#| "these applications; then, try again." msgid "" "All multimedia timers are being used by other applications. Quit one of " "these applications, and then try again." msgstr "" -"所有多媒體計時器正被其他應用程式使用中。離開其中某一個應用程式；然後再試一" -"次。" +"所有多媒體計時器正被其他應用程式使用中。請結束其中某一個應用程式，" +"然後再試一次。" #: dlls/winmm/winmm.rc:132 msgid "The system doesn't have a current MIDI port specified." -msgstr "系統尚未指定當前的 MIDI 通訊埠。" +msgstr "系統尚未指定目前的 MIDI 連接埠。" #: dlls/winmm/winmm.rc:127 msgid "" "The system has no installed MIDI devices. Use the Drivers option from the " "Control Panel to install a MIDI driver." msgstr "" -"系統沒有任何已安裝的 MIDI 裝置。使用「控制面板」中的「驅動程式」選項以安裝 " -"MIDI 驅動程式。" +"系統沒有任何已安裝的 MIDI 裝置。請使用控制臺中的「驅動程式」選項" +"以安裝 MIDI 驅動程式。" #: dlls/winmm/winmm.rc:122 msgid "There is no display window." @@ -12976,24 +12755,20 @@ msgid "" msgstr "無法寫入指定的檔案。確定您有足夠的磁碟空間或是仍然連線到網路。" #: dlls/winmm/winmm.rc:136 -#, fuzzy -#| msgid "Wine Mono Installer" msgid "Wine Sound Mapper" -msgstr "Wine Mono 安裝程式" +msgstr "Wine Sound Mapper" #: dlls/winmm/winmm.rc:137 -#, fuzzy -#| msgid "column" msgid "Volume" -msgstr "行" +msgstr "音量" #: dlls/winmm/winmm.rc:138 msgid "Master Volume" -msgstr "" +msgstr "主音量" #: dlls/winmm/winmm.rc:139 msgid "Mute" -msgstr "" +msgstr "靜音" #: dlls/winspool.drv/winspool.rc:37 msgid "Print to File" @@ -13001,11 +12776,11 @@ msgstr "列印至檔案" #: dlls/winspool.drv/winspool.rc:40 msgid "&Output File Name:" -msgstr "輸出檔案名稱(&O)：" +msgstr "輸出檔案名稱(&O):" #: dlls/winspool.drv/winspool.rc:31 msgid "The output file already exists. Click OK to overwrite." -msgstr "輸出檔案已存在，按「確定」以覆寫。" +msgstr "輸出檔案已存在，按 [確定] 以覆寫。" #: dlls/winspool.drv/winspool.rc:32 msgid "Unable to create the output file." @@ -13041,7 +12816,7 @@ msgstr "比較為真" #: dlls/wldap32/wldap32.rc:39 msgid "Authentication Method Not Supported" -msgstr "認證方法不受支援" +msgstr "不支援的認證方法" #: dlls/wldap32/wldap32.rc:40 msgid "Strong Authentication Required" @@ -13061,17 +12836,15 @@ msgstr "超出了管理限制" #: dlls/wldap32/wldap32.rc:44 msgid "Unavailable Critical Extension" -msgstr "不得使用關鍵副檔名" +msgstr "無法使用關鍵延伸" #: dlls/wldap32/wldap32.rc:45 msgid "Confidentiality Required" msgstr "要求機密性" #: dlls/wldap32/wldap32.rc:46 -#, fuzzy -#| msgid "Shutdown in progress.\n" msgid "SASL Bind in Progress" -msgstr "關機正在進行。\n" +msgstr "SASL 繫結正在進行中" #: dlls/wldap32/wldap32.rc:48 msgid "No Such Attribute" @@ -13087,7 +12860,7 @@ msgstr "不適當的匹配" #: dlls/wldap32/wldap32.rc:51 msgid "Constraint Violation" -msgstr "限制違規" +msgstr "約束違規" #: dlls/wldap32/wldap32.rc:52 msgid "Attribute Or Value Exists" @@ -13111,11 +12884,11 @@ msgstr "無效的 DN 語法" #: dlls/wldap32/wldap32.rc:67 msgid "Is Leaf" -msgstr "是枝葉" +msgstr "是分葉" #: dlls/wldap32/wldap32.rc:68 msgid "Alias Dereference Problem" -msgstr "別名去除參考的問題" +msgstr "別名解除參照問題" #: dlls/wldap32/wldap32.rc:80 msgid "Inappropriate Authentication" @@ -13123,11 +12896,11 @@ msgstr "不適當的認證" #: dlls/wldap32/wldap32.rc:81 msgid "Invalid Credentials" -msgstr "無效的憑據" +msgstr "無效的憑證" #: dlls/wldap32/wldap32.rc:82 msgid "Insufficient Rights" -msgstr "不足的權限" +msgstr "權限不足" #: dlls/wldap32/wldap32.rc:83 msgid "Busy" @@ -13135,11 +12908,11 @@ msgstr "忙碌" #: dlls/wldap32/wldap32.rc:84 msgid "Unavailable" -msgstr "不得使用" +msgstr "無法使用" #: dlls/wldap32/wldap32.rc:85 msgid "Unwilling To Perform" -msgstr "無進行意願" +msgstr "不願意執行" #: dlls/wldap32/wldap32.rc:86 msgid "Loop Detected" @@ -13163,7 +12936,7 @@ msgstr "物件類別違規" #: dlls/wldap32/wldap32.rc:98 msgid "Not allowed on Non-leaf" -msgstr "於非尾節點不允許" +msgstr "於非分葉結構不允許" #: dlls/wldap32/wldap32.rc:99 msgid "Not allowed on RDN" @@ -13175,7 +12948,7 @@ msgstr "已經存在" #: dlls/wldap32/wldap32.rc:101 msgid "No Object Class Mods" -msgstr "沒有物件類別方法" +msgstr "沒有物件類別 Mods" #: dlls/wldap32/wldap32.rc:102 msgid "Results Too Large" @@ -13183,7 +12956,7 @@ msgstr "結果太大" #: dlls/wldap32/wldap32.rc:103 msgid "Affects Multiple DSAs" -msgstr "影響多重 DSAs" +msgstr "影響多重 DSA" #: dlls/wldap32/wldap32.rc:113 msgid "Server Down" @@ -13207,7 +12980,7 @@ msgstr "逾時" #: dlls/wldap32/wldap32.rc:118 msgid "Auth Unknown" -msgstr "認證不明的" +msgstr "不明的認證" #: dlls/wldap32/wldap32.rc:119 msgid "Filter Error" @@ -13231,7 +13004,7 @@ msgstr "無法連線到 LDAP 伺服器" #: dlls/wldap32/wldap32.rc:124 msgid "Operation not supported by this version of the LDAP protocol" -msgstr "動作不受這個版本的 LDAP 協定所支援" +msgstr "這個 LDAP 協定版本不支援這個操作" #: dlls/wldap32/wldap32.rc:125 msgid "Specified control was not found in message" @@ -13243,7 +13016,7 @@ msgstr "在訊息中沒有結果呈現" #: dlls/wldap32/wldap32.rc:127 msgid "More results returned" -msgstr "回傳了更多結果" +msgstr "傳回了更多結果" #: dlls/wldap32/wldap32.rc:128 msgid "Loop while handling referrals" @@ -13251,7 +13024,7 @@ msgstr "處理參照時產生迴圈" #: dlls/wldap32/wldap32.rc:129 msgid "Referral hop limit exceeded" -msgstr "超出了參照躍點限制" +msgstr "轉介的躍點超出了限制" #: programs/attrib/attrib.rc:30 programs/cmd/cmd.rc:373 msgid "" -- 2.33.0.windows.2

2 1

[PATCH v2] mshtml: Implement HTMLAnchorElement_get_pathname().
by Hans Leidekker Nov. 5, 2021

Nov. 5, 2021

v2: Keep leading slash and use GetPathname(). I added some more tests which show that for some protocols IE will prepend a slash if it's not there in the URL. I left those as todo. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/mshtml/htmlanchor.c | 11 +++++++++-- dlls/mshtml/tests/dom.js | 37 ++++++++++++++++++++++++++----------- 2 files changed, 35 insertions(+), 13 deletions(-) diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index a3608abbeb1..b11d39ae07f 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -476,8 +476,15 @@ static HRESULT WINAPI HTMLAnchorElement_put_pathname(IHTMLAnchorElement *iface, static HRESULT WINAPI HTMLAnchorElement_get_pathname(IHTMLAnchorElement *iface, BSTR *p) { HTMLAnchorElement *This = impl_from_IHTMLAnchorElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString pathname_str; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + /* FIXME: IE prepends a slash for some protocols */ + nsAString_Init(&pathname_str, NULL); + nsres = nsIDOMHTMLAnchorElement_GetPathname(This->nsanchor, &pathname_str); + return return_nsstr(nsres, &pathname_str, p); } static HRESULT WINAPI HTMLAnchorElement_put_port(IHTMLAnchorElement *iface, BSTR v) diff --git a/dlls/mshtml/tests/dom.js b/dlls/mshtml/tests/dom.js index 3a2b96a7958..e2be69782fc 100644 --- a/dlls/mshtml/tests/dom.js +++ b/dlls/mshtml/tests/dom.js @@ -137,24 +137,39 @@ async_test("iframe_location", function() { }); sync_test("anchor", function() { - var iframe = document.body.firstChild; - var anchor = document.createElement("a"); - var anchor_tests = [ - { href: "http://www.winehq.org:123/about", protocol: "http:", host: "www.winehq.org:123" }, - { href: "https://www.winehq.org:123/about", protocol: "https:", host: "www.winehq.org:123" }, - { href: "about:blank", protocol: "about:", host: "" }, - { href: "file:///c:/dir/file.html", protocol: "file:", host: "" }, - { href: "http://www.winehq.org/about", protocol: "http:", host: "www.winehq.org:80", todo_host: true }, - { href: "https://www.winehq.org/about", protocol: "https:", host: "www.winehq.org:443", todo_host: true }, + { href: "http://www.winehq.org:123/about", + protocol: "http:", host: "www.winehq.org:123", path: "/about" }, + { href: "https://www.winehq.org:123/about", + protocol: "https:", host: "www.winehq.org:123", path: "/about" }, + { href: "about:blank", + protocol: "about:", host: "", path: "/blank", todo_pathname: 1 }, + { href: "unknown:path", + protocol: "unknown:", host: "", path: "path" }, + { href: "ftp:path", + protocol: "ftp:", host: "", path: "path" }, + { href: "mailto:path", + protocol: "mailto:", host: "", path: "path" }, + { href: "ws:path", + protocol: "ws:", host: "", path: "path" }, + { href: "file:path", + protocol: "file:", host: "", path: "/path", todo_pathname: 1 }, + { href: "file:///c:/dir/file.html", + protocol: "file:", host: "", path: "/c:/dir/file.html" }, + { href: "http://www.winehq.org/about", + protocol: "http:", host: "www.winehq.org", path: "/about" }, + { href: "https://www.winehq.org/about", + protocol: "https:", host: "www.winehq.org", path: "/about" }, ]; for(var i in anchor_tests) { var t = anchor_tests[i]; - anchor.href = t.href; + document.body.innerHTML = '<a href="' + t.href + '">'; + var anchor = document.body.firstChild; ok(anchor.protocol === t.protocol, "anchor(" + t.href + ").protocol = " + anchor.protocol); - todo_wine_if("todo_host" in t). ok(anchor.host === t.host, "anchor(" + t.href + ").host = " + anchor.host); + todo_wine_if("todo_pathname" in t). + ok(anchor.pathname === t.path, "anchor(" + t.href + ").pathname = " + anchor.pathname); } }); -- 2.30.2

3 2

[PATCH v5 1/3] uiautomationcore: Implement UiaGetReservedNotSupportedValue.
by Connor McAdams Nov. 5, 2021

Nov. 5, 2021

Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/Makefile.in | 1 + dlls/uiautomationcore/uia_main.c | 131 +++++++++++++++++++++++++++++- 2 files changed, 130 insertions(+), 2 deletions(-) diff --git a/dlls/uiautomationcore/Makefile.in b/dlls/uiautomationcore/Makefile.in index 71ea7b99c94..5a72ea144c4 100644 --- a/dlls/uiautomationcore/Makefile.in +++ b/dlls/uiautomationcore/Makefile.in @@ -1,5 +1,6 @@ MODULE = uiautomationcore.dll IMPORTLIB = uiautomationcore +IMPORTS = uuid ole32 EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/uiautomationcore/uia_main.c b/dlls/uiautomationcore/uia_main.c index 2dada95af80..77cacb7c4a4 100644 --- a/dlls/uiautomationcore/uia_main.c +++ b/dlls/uiautomationcore/uia_main.c @@ -16,12 +16,134 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS + #include "uiautomation.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(uiautomation); +struct uia_object_wrapper +{ + IUnknown IUnknown_iface; + LONG refcount; + + IUnknown *marshaler; + IUnknown *marshal_object; +}; + +static struct uia_object_wrapper *impl_uia_object_wrapper_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, struct uia_object_wrapper, IUnknown_iface); +} + +static HRESULT WINAPI uia_object_wrapper_QueryInterface(IUnknown *iface, + REFIID riid, void **ppv) +{ + struct uia_object_wrapper *wrapper = impl_uia_object_wrapper_from_IUnknown(iface); + return IUnknown_QueryInterface(wrapper->marshal_object, riid, ppv); +} + +static ULONG WINAPI uia_object_wrapper_AddRef(IUnknown *iface) +{ + struct uia_object_wrapper *wrapper = impl_uia_object_wrapper_from_IUnknown(iface); + ULONG refcount = InterlockedIncrement(&wrapper->refcount); + + TRACE("%p, refcount %d\n", iface, refcount); + + return refcount; +} + +static ULONG WINAPI uia_object_wrapper_Release(IUnknown *iface) +{ + struct uia_object_wrapper *wrapper = impl_uia_object_wrapper_from_IUnknown(iface); + ULONG refcount = InterlockedDecrement(&wrapper->refcount); + + TRACE("%p, refcount %d\n", iface, refcount); + if (!refcount) + { + IUnknown_Release(wrapper->marshaler); + heap_free(wrapper); + } + + return refcount; +} + +static const IUnknownVtbl uia_object_wrapper_vtbl = { + uia_object_wrapper_QueryInterface, + uia_object_wrapper_AddRef, + uia_object_wrapper_Release, +}; + +/* + * When passing the ReservedNotSupportedValue/ReservedMixedAttributeValue + * interface pointers across apartments within the same process, create a free + * threaded marshaler so that the pointer value is preserved. + */ +static HRESULT create_uia_object_wrapper(IUnknown *reserved, void **ppv) +{ + struct uia_object_wrapper *wrapper; + HRESULT hr; + + TRACE("%p, %p\n", reserved, ppv); + + wrapper = heap_alloc(sizeof(*wrapper)); + if (!wrapper) + return E_OUTOFMEMORY; + + wrapper->IUnknown_iface.lpVtbl = &uia_object_wrapper_vtbl; + wrapper->marshal_object = reserved; + wrapper->refcount = 1; + + if (FAILED(hr = CoCreateFreeThreadedMarshaler(&wrapper->IUnknown_iface, &wrapper->marshaler))) + { + heap_free(wrapper); + return hr; + } + + hr = IUnknown_QueryInterface(wrapper->marshaler, &IID_IMarshal, ppv); + IUnknown_Release(&wrapper->IUnknown_iface); + + return hr; +} + +/* + * UiaReservedNotSupportedValue object. + */ +static HRESULT WINAPI uia_reserved_obj_QueryInterface(IUnknown *iface, + REFIID riid, void **ppv) +{ + *ppv = NULL; + if (IsEqualIID(riid, &IID_IUnknown)) + *ppv = iface; + else if (IsEqualIID(riid, &IID_IMarshal)) + return create_uia_object_wrapper(iface, ppv); + else + return E_NOINTERFACE; + + return S_OK; +} + +static ULONG WINAPI uia_reserved_obj_AddRef(IUnknown *iface) +{ + return 1; +} + +static ULONG WINAPI uia_reserved_obj_Release(IUnknown *iface) +{ + return 1; +} + +static const IUnknownVtbl uia_reserved_obj_vtbl = { + uia_reserved_obj_QueryInterface, + uia_reserved_obj_AddRef, + uia_reserved_obj_Release, +}; + +static IUnknown uia_reserved_ns_iface = {&uia_reserved_obj_vtbl}; + /*********************************************************************** * UiaClientsAreListening (uiautomationcore.@) */ @@ -46,8 +168,13 @@ HRESULT WINAPI UiaGetReservedMixedAttributeValue(IUnknown **value) */ HRESULT WINAPI UiaGetReservedNotSupportedValue(IUnknown **value) { - FIXME("(%p) stub!\n", value); - *value = NULL; + TRACE("(%p)\n", value); + + if (!value) + return E_INVALIDARG; + + *value = &uia_reserved_ns_iface; + return S_OK; } -- 2.25.1

2 5

[PATCH] dxva2: Handle specified background color in VideoProcessBlt().
by Nikolay Sivov Nov. 5, 2021

Nov. 5, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dxva2/main.c | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/dxva2/main.c b/dlls/dxva2/main.c index 46f5a7af485..401b5cc976b 100644 --- a/dlls/dxva2/main.c +++ b/dlls/dxva2/main.c @@ -258,6 +258,26 @@ static BOOL intersect_rect(RECT *dest, const RECT *src1, const RECT *src2) return TRUE; } +static D3DCOLOR video_processor_get_background_color(const DXVA2_AYUVSample16 *ayuv) +{ + float y, cb, cr; + BYTE r, g, b; + + y = (ayuv->Y >> 8) - 16; + cb = (ayuv->Cb >> 8) - 128; + cr = (ayuv->Cr >> 8) - 128; + + y = 255.0f * y / 219.0f; + cb = 255.0f * cb / 224.0f; + cr = 255.0f * cr / 224.0f; + + r = y + 1.402 * cr; + g = y - 0.344 * cb - 0.714 * cr; + b = y + 1.772 * cb; + + return D3DCOLOR_XRGB(r, g, b); +} + static HRESULT WINAPI video_processor_VideoProcessBlt(IDirectXVideoProcessor *iface, IDirect3DSurface9 *rt, const DXVA2_VideoProcessBltParams *params, const DXVA2_VideoSample *samples, UINT sample_count, HANDLE *complete_handle) @@ -269,14 +289,19 @@ static HRESULT WINAPI video_processor_VideoProcessBlt(IDirectXVideoProcessor *if TRACE("%p, %p, %p, %p, %u, %p.\n", iface, rt, params, samples, sample_count, complete_handle); + if (params->BackgroundColor.Alpha != 0xffff) + { + WARN("Unexpected background alpha %#x.\n", params->BackgroundColor.Alpha); + return E_INVALIDARG; + } + if (FAILED(hr = IDirect3DSurface9_GetDevice(rt, &device))) { WARN("Failed to get surface device, hr %#x.\n", hr); return hr; } - /* FIXME: use specified color */ - IDirect3DDevice9_ColorFill(device, rt, NULL, 0); + IDirect3DDevice9_ColorFill(device, rt, &params->TargetRect, video_processor_get_background_color(&params->BackgroundColor)); for (i = 0; i < sample_count; ++i) { -- 2.33.0

1 0