December 2020 - Wine-Devel - list.winehq.org

[PATCH 1/2] qedit/tests: Check the Sample Grabber's buffer during and after flushing.
by Gabriel Ivăncescu Oct. 4, 2022

Oct. 4, 2022

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/qedit/tests/samplegrabber.c | 234 +++++++++++++++++++++++++++++++ 1 file changed, 234 insertions(+) diff --git a/dlls/qedit/tests/samplegrabber.c b/dlls/qedit/tests/samplegrabber.c index 8e68e3e..e66180f 100644 --- a/dlls/qedit/tests/samplegrabber.c +++ b/dlls/qedit/tests/samplegrabber.c @@ -1036,6 +1036,239 @@ static void test_connect_pin(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +struct frame_thread_params +{ + IMemInputPin *sink; + IMediaSample *sample; + DWORD delay; +}; + +static DWORD WINAPI frame_thread(void *arg) +{ + struct frame_thread_params *params = arg; + HRESULT hr; + + if (params->delay) + { + if (winetest_debug > 1) trace("%04x: Sleeping %u ms.\n", GetCurrentThreadId(), params->delay); + Sleep(params->delay); + } + if (winetest_debug > 1) trace("%04x: Sending frame.\n", GetCurrentThreadId()); + hr = IMemInputPin_Receive(params->sink, params->sample); + if (winetest_debug > 1) trace("%04x: Returned %#x.\n", GetCurrentThreadId(), hr); + IMediaSample_Release(params->sample); + free(params); + return hr; +} + +static HANDLE send_frame_time(IMemInputPin *sink, REFERENCE_TIME start_time, unsigned char color, DWORD delay) +{ + struct frame_thread_params *params = malloc(sizeof(*params)); + IMemAllocator *allocator; + REFERENCE_TIME end_time; + IMediaSample *sample; + HANDLE thread; + HRESULT hr; + BYTE *data; + + hr = IMemInputPin_GetAllocator(sink, &allocator); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMemAllocator_GetBuffer(allocator, &sample, NULL, NULL, 0); + if (hr == VFW_E_NOT_COMMITTED) + { + IMemAllocator_Commit(allocator); + hr = IMemAllocator_GetBuffer(allocator, &sample, NULL, NULL, 0); + } + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaSample_GetPointer(sample, &data); + ok(hr == S_OK, "Got hr %#x.\n", hr); + memset(data, 0x55, 32 * 16 * 2); + + hr = IMediaSample_SetActualDataLength(sample, 32 * 16 * 2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + start_time *= 10000000; + end_time = start_time + 10000000; + hr = IMediaSample_SetTime(sample, &start_time, &end_time); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + params->sink = sink; + params->sample = sample; + params->delay = delay; + thread = CreateThread(NULL, 0, frame_thread, params, 0, NULL); + + IMemAllocator_Release(allocator); + return thread; +} + +static HANDLE send_frame(IMemInputPin *sink, DWORD delay) +{ + return send_frame_time(sink, 0, 0x55, delay); /* purple */ +} + +static HRESULT join_thread_(int line, HANDLE thread) +{ + DWORD ret; + ok_(__FILE__, line)(!WaitForSingleObject(thread, 1000), "Wait failed.\n"); + GetExitCodeThread(thread, &ret); + CloseHandle(thread); + return ret; +} +#define join_thread(a) join_thread_(__LINE__, a) + +static void test_buffer_flush(void) +{ + AM_MEDIA_TYPE req_mt = + { + .majortype = MEDIATYPE_Video, + .subtype = MEDIASUBTYPE_RGB565, + .formattype = FORMAT_VideoInfo, + .bTemporalCompression = TRUE, + }; + LONG buf[(32 * 16 * 2) / sizeof(LONG)], size = sizeof(buf); + IPin *sink, *source, *renderer_pin; + struct testfilter testsource; + ISampleGrabber *grabber; + IMediaControl *control; + IFilterGraph2 *graph; + IMemInputPin *input; + IBaseFilter *filter; + OAFilterState state; + IMediaFilter *mf; + HANDLE thread; + DWORD ticks; + unsigned i; + HRESULT hr; + ULONG ref; + + testfilter_init(&testsource); + CoCreateInstance(&CLSID_FilterGraph, NULL, CLSCTX_INPROC_SERVER, + &IID_IFilterGraph2, (void **)&graph); + CoCreateInstance(&CLSID_NullRenderer, NULL, CLSCTX_INPROC_SERVER, + &IID_IBaseFilter, (void **)&filter); + IFilterGraph2_AddFilter(graph, filter, L"sink"); + IBaseFilter_FindPin(filter, L"In", &renderer_pin); + IBaseFilter_Release(filter); + + filter = create_sample_grabber(); + IFilterGraph2_AddFilter(graph, &testsource.filter.IBaseFilter_iface, L"source"); + IFilterGraph2_AddFilter(graph, filter, L"sample grabber"); + IBaseFilter_FindPin(filter, L"In", &sink); + IBaseFilter_FindPin(filter, L"Out", &source); + IBaseFilter_QueryInterface(filter, &IID_ISampleGrabber, (void **)&grabber); + IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&control); + IPin_QueryInterface(sink, &IID_IMemInputPin, (void **)&input); + + ISampleGrabber_SetMediaType(grabber, &req_mt); + ISampleGrabber_SetBufferSamples(grabber, TRUE); + + testsource.sink_mt = &req_mt; + hr = IFilterGraph2_ConnectDirect(graph, &testsource.source.pin.IPin_iface, sink, &req_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IFilterGraph2_ConnectDirect(graph, source, renderer_pin, &req_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IPin_Release(renderer_pin); + + IFilterGraph2_QueryInterface(graph, &IID_IMediaFilter, (void **)&mf); + IMediaFilter_SetSyncSource(mf, NULL); + IMediaFilter_Release(mf); + + hr = IMemInputPin_ReceiveCanBlock(input); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = ISampleGrabber_GetCurrentBuffer(grabber, &size, buf); + ok(hr == VFW_E_WRONG_STATE, "Got hr %#x.\n", hr); + + hr = IMediaControl_Pause(control); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + hr = IMediaControl_GetState(control, 0, &state); + ok(hr == VFW_S_STATE_INTERMEDIATE, "Got hr %#x.\n", hr); + + thread = send_frame(input, 0); + hr = IMediaControl_GetState(control, 1000, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); + + for (i = 0; i < 3; i++) + { + ticks = GetTickCount(); + hr = ISampleGrabber_GetCurrentBuffer(grabber, &size, buf); + ticks = GetTickCount() - ticks; + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(ticks < 100, "Got %u ticks.\n", ticks); + ok(size == sizeof(buf), "Got size %d.\n", size); + } + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = join_thread(thread); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaControl_GetState(control, 1000, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(state == State_Stopped, "Got state %d.\n", state); + hr = ISampleGrabber_GetCurrentBuffer(grabber, &size, buf); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_Pause(control); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + hr = IMediaControl_GetState(control, 0, &state); + ok(hr == VFW_S_STATE_INTERMEDIATE, "Got hr %#x.\n", hr); + + thread = send_frame(input, 0); + hr = IMediaControl_GetState(control, 1000, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); + + for (i = 0; i < 3; i++) + { + ticks = GetTickCount(); + hr = ISampleGrabber_GetCurrentBuffer(grabber, &size, buf); + ticks = GetTickCount() - ticks; + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(ticks < 100, "Got %u ticks.\n", ticks); + ok(size == sizeof(buf), "Got size %d.\n", size); + } + + IPin_BeginFlush(sink); + hr = join_thread(thread); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = ISampleGrabber_GetCurrentBuffer(grabber, &size, buf); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IPin_EndFlush(sink); + + hr = IMediaControl_GetState(control, 0, &state); + todo_wine ok(hr == VFW_S_STATE_INTERMEDIATE, "Got hr %#x.\n", hr); + + ticks = GetTickCount(); + thread = send_frame(input, 150); + hr = ISampleGrabber_GetCurrentBuffer(grabber, &size, buf); + ticks = GetTickCount() - ticks; + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(ticks < 100, "Got %u ticks.\n", ticks); + ok(size == sizeof(buf), "Got size %d.\n", size); + + hr = IMediaControl_GetState(control, 1000, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = join_thread(thread); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + IPin_Release(sink); + IPin_Release(source); + IMemInputPin_Release(input); + IMediaControl_Release(control); + ref = IFilterGraph2_Release(graph); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ISampleGrabber_Release(grabber); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IBaseFilter_Release(&testsource.filter.IBaseFilter_iface); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(samplegrabber) { IBaseFilter *filter; @@ -1059,6 +1292,7 @@ START_TEST(samplegrabber) test_aggregation(); test_media_types(); test_connect_pin(); + test_buffer_flush(); CoUninitialize(); } -- 2.21.0

5 7

[PATCH] include: add AV1 support to dxva.h
by Steve Lhomme Aug. 9, 2021

Aug. 9, 2021

Based on the DXVA AV1 specs https://www.microsoft.com/en-us/download/details.aspx?id=101577 The structures and the associated define are available in Windows SDK since at least 10.0.20231.0. The GUIDs were present in previous SDKs as well. --- include/dxva.h | 279 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 279 insertions(+) diff --git a/include/dxva.h b/include/dxva.h index 4f18f2e60da..b474bd87111 100644 --- a/include/dxva.h +++ b/include/dxva.h @@ -563,6 +563,285 @@ typedef struct _DXVA_Status_VPx USHORT wNumMbsAffected; } DXVA_Status_VPx, *LPDXVA_Status_VPx; + +#define _DIRECTX_AV1_VA_ + +/* AV1 decoder GUIDs */ +DEFINE_GUID(DXVA_ModeAV1_VLD_Profile0, 0xb8be4ccb, 0xcf53, 0x46ba, 0x8d, 0x59, 0xd6, 0xb8, 0xa6, 0xda, 0x5d, 0x2a); +DEFINE_GUID(DXVA_ModeAV1_VLD_Profile1, 0x6936ff0f, 0x45b1, 0x4163, 0x9c, 0xc1, 0x64, 0x6e, 0xf6, 0x94, 0x61, 0x08); +DEFINE_GUID(DXVA_ModeAV1_VLD_Profile2, 0x0c5f2aa1, 0xe541, 0x4089, 0xbb, 0x7b, 0x98, 0x11, 0x0a, 0x19, 0xd7, 0xc8); +DEFINE_GUID(DXVA_ModeAV1_VLD_12bit_Profile2, 0x17127009, 0xa00f, 0x4ce1, 0x99, 0x4e, 0xbf, 0x40, 0x81, 0xf6, 0xf3, 0xf0); +DEFINE_GUID(DXVA_ModeAV1_VLD_12bit_Profile2_420, 0x2d80bed6, 0x9cac, 0x4835, 0x9e, 0x91, 0x32, 0x7b, 0xbc, 0x4f, 0x9e, 0xe8); + +/* AV1 picture entry data structure */ +typedef struct _DXVA_PicEntry_AV1 { + UINT width; + UINT height; + + // Global motion parameters + INT wmmat[6]; + union { + struct { + UCHAR wminvalid : 1; + UCHAR wmtype : 2; + UCHAR Reserved : 5; + }; + UCHAR GlobalMotionFlags; + }; + UCHAR Index; + USHORT Reserved16Bits; +} DXVA_PicEntry_AV1, *LPDXVA_PicEntry_AV1; + +/* AV1 picture parameters data structure */ +typedef struct _DXVA_PicParams_AV1 { + UINT width; + UINT height; + + UINT max_width; + UINT max_height; + + UCHAR CurrPicTextureIndex; + UCHAR superres_denom; + UCHAR bitdepth; + UCHAR seq_profile; + + // Tiles: + struct { + UCHAR cols; + UCHAR rows; + USHORT context_update_id; + USHORT widths[64]; + USHORT heights[64]; + } tiles; + + // Coding Tools + union { + struct { + UINT use_128x128_superblock : 1; + UINT intra_edge_filter : 1; + UINT interintra_compound : 1; + UINT masked_compound : 1; + UINT warped_motion : 1; + UINT dual_filter : 1; + UINT jnt_comp : 1; + UINT screen_content_tools : 1; + UINT integer_mv : 1; + UINT cdef : 1; + UINT restoration : 1; + UINT film_grain : 1; + UINT intrabc : 1; + UINT high_precision_mv : 1; + UINT switchable_motion_mode : 1; + UINT filter_intra : 1; + UINT disable_frame_end_update_cdf : 1; + UINT disable_cdf_update : 1; + UINT reference_mode : 1; + UINT skip_mode : 1; + UINT reduced_tx_set : 1; + UINT superres : 1; + UINT tx_mode : 2; + UINT use_ref_frame_mvs : 1; + UINT enable_ref_frame_mvs : 1; + UINT reference_frame_update : 1; + UINT Reserved : 5; + }; + UINT32 CodingParamToolFlags; + } coding; + + // Format & Picture Info flags + union { + struct { + UCHAR frame_type : 2; + UCHAR show_frame : 1; + UCHAR showable_frame : 1; + UCHAR subsampling_x : 1; + UCHAR subsampling_y : 1; + UCHAR mono_chrome : 1; + UCHAR Reserved : 1; + }; + UCHAR FormatAndPictureInfoFlags; + } format; + + // References + UCHAR primary_ref_frame; + UCHAR order_hint; + UCHAR order_hint_bits; + + DXVA_PicEntry_AV1 frame_refs[7]; + UCHAR RefFrameMapTextureIndex[8]; + + // Loop filter parameters + struct { + UCHAR filter_level[2]; + UCHAR filter_level_u; + UCHAR filter_level_v; + + UCHAR sharpness_level; + union { + struct { + UCHAR mode_ref_delta_enabled : 1; + UCHAR mode_ref_delta_update : 1; + UCHAR delta_lf_multi : 1; + UCHAR delta_lf_present : 1; + UCHAR Reserved : 4; + }; + UCHAR ControlFlags; + } DUMMYUNIONNAME; + CHAR ref_deltas[8]; + CHAR mode_deltas[2]; + UCHAR delta_lf_res; + UCHAR frame_restoration_type[3]; + USHORT log2_restoration_unit_size[3]; + UINT16 Reserved16Bits; + } loop_filter; + + // Quantization + struct { + union { + struct { + UCHAR delta_q_present : 1; + UCHAR delta_q_res : 2; + UCHAR Reserved : 5; + }; + UCHAR ControlFlags; + } DUMMYUNIONNAME; + + UCHAR base_qindex; + CHAR y_dc_delta_q; + CHAR u_dc_delta_q; + CHAR v_dc_delta_q; + CHAR u_ac_delta_q; + CHAR v_ac_delta_q; + // using_qmatrix: + UCHAR qm_y; + UCHAR qm_u; + UCHAR qm_v; + UINT16 Reserved16Bits; + } quantization; + + // Cdef parameters + struct { + union { + struct { + UCHAR damping : 2; + UCHAR bits : 2; + UCHAR Reserved : 4; + }; + UCHAR ControlFlags; + } DUMMYUNIONNAME; + + union { + struct { + UCHAR primary : 6; + UCHAR secondary : 2; + }; + UCHAR combined; + } y_strengths[8]; + + union { + struct { + UCHAR primary : 6; + UCHAR secondary : 2; + }; + UCHAR combined; + } uv_strengths[8]; + + } cdef; + + UCHAR interp_filter; + + // Segmentation + struct { + union { + struct { + UCHAR enabled : 1; + UCHAR update_map : 1; + UCHAR update_data : 1; + UCHAR temporal_update : 1; + UCHAR Reserved : 4; + }; + UCHAR ControlFlags; + } DUMMYUNIONNAME; + UCHAR Reserved24Bits[3]; + + union { + struct { + UCHAR alt_q : 1; + UCHAR alt_lf_y_v : 1; + UCHAR alt_lf_y_h : 1; + UCHAR alt_lf_u : 1; + UCHAR alt_lf_v : 1; + UCHAR ref_frame : 1; + UCHAR skip : 1; + UCHAR globalmv : 1; + }; + UCHAR mask; + } feature_mask[8]; + + SHORT feature_data[8][8]; + + } segmentation; + + struct { + union { + struct { + USHORT apply_grain : 1; + USHORT scaling_shift_minus8 : 2; + USHORT chroma_scaling_from_luma : 1; + USHORT ar_coeff_lag : 2; + USHORT ar_coeff_shift_minus6 : 2; + USHORT grain_scale_shift : 2; + USHORT overlap_flag : 1; + USHORT clip_to_restricted_range : 1; + USHORT matrix_coeff_is_identity : 1; + USHORT Reserved : 3; + }; + USHORT ControlFlags; + } DUMMYUNIONNAME; + + USHORT grain_seed; + UCHAR scaling_points_y[14][2]; + UCHAR num_y_points; + UCHAR scaling_points_cb[10][2]; + UCHAR num_cb_points; + UCHAR scaling_points_cr[10][2]; + UCHAR num_cr_points; + UCHAR ar_coeffs_y[24]; + UCHAR ar_coeffs_cb[25]; + UCHAR ar_coeffs_cr[25]; + UCHAR cb_mult; + UCHAR cb_luma_mult; + UCHAR cr_mult; + UCHAR cr_luma_mult; + UCHAR Reserved8Bits; + SHORT cb_offset; + SHORT cr_offset; + } film_grain; + + UINT Reserved32Bits; + UINT StatusReportFeedbackNumber; +} DXVA_PicParams_AV1, *LPDXVA_PicParams_AV1; + +/* AV1 tile data structure */ +typedef struct _DXVA_Tile_AV1 { + UINT DataOffset; + UINT DataSize; + USHORT row; + USHORT column; + USHORT Reserved16Bits; + UCHAR anchor_frame; + UCHAR Reserved8Bits; +} DXVA_Tile_AV1, *LPDXVA_Tile_AV1; + +typedef struct _DXVA_Status_AV1 { + UINT StatusReportFeedbackNumber; + DXVA_PicEntry_AV1 CurrPic; + UCHAR bBufType; + UCHAR bStatus; + UCHAR bReserved8Bits; + USHORT wNumMbsAffected; +} DXVA_Status_AV1, *LPDXVA_Status_AV1; + #include <poppack.h> typedef enum _DXVA_VideoChromaSubsampling -- 2.26.2

4 7

[PATCH vkd3d] build: Make the default symbol visibility "hidden".
by Zebediah Figura July 12, 2021

July 12, 2021

We tag far fewer symbols this way. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- configure.ac | 1 + include/private/vkd3d_common.h | 6 + include/private/vkd3d_debug.h | 19 ++- include/private/vkd3d_memory.h | 3 +- include/private/vkd3d_utf8.h | 2 +- libs/vkd3d-common/debug.c | 2 +- libs/vkd3d-shader/dxbc.c | 6 +- libs/vkd3d-shader/vkd3d_shader_main.c | 24 +-- libs/vkd3d-shader/vkd3d_shader_private.h | 48 +++--- libs/vkd3d-utils/vkd3d_utils_main.c | 22 +-- libs/vkd3d/command.c | 6 +- libs/vkd3d/device.c | 16 +- libs/vkd3d/resource.c | 6 +- libs/vkd3d/utils.c | 4 +- libs/vkd3d/vkd3d_main.c | 10 +- libs/vkd3d/vkd3d_private.h | 188 +++++++++++------------ 16 files changed, 184 insertions(+), 179 deletions(-) diff --git a/configure.ac b/configure.ac index d5f6588..e9c135a 100644 --- a/configure.ac +++ b/configure.ac @@ -47,6 +47,7 @@ AC_SUBST([VKD3D_CFLAGS]) AS_IF([test "x${GCC}" = "xyes"], [VKD3D_CFLAGS="-Wall -pipe" VKD3D_CHECK_CFLAGS([-std=c99]) + VKD3D_CHECK_CFLAGS([-fvisibility=hidden]) VKD3D_CHECK_CFLAGS([-Wdeclaration-after-statement]) VKD3D_CHECK_CFLAGS([-Wimplicit-fallthrough]) VKD3D_CHECK_CFLAGS([-Wmissing-prototypes]) diff --git a/include/private/vkd3d_common.h b/include/private/vkd3d_common.h index ac217e9..fd62ae8 100644 --- a/include/private/vkd3d_common.h +++ b/include/private/vkd3d_common.h @@ -53,6 +53,12 @@ static inline size_t align(size_t addr, size_t alignment) # define VKD3D_UNUSED #endif /* __GNUC__ */ +#if defined(__GNUC__) && !defined(__MINGW32__) +# define VKD3D_API __attribute__((visibility("default"))) +#else +# define VKD3D_API +#endif + static inline unsigned int vkd3d_popcount(unsigned int v) { #ifdef _MSC_VER diff --git a/include/private/vkd3d_debug.h b/include/private/vkd3d_debug.h index c37c841..a206a92 100644 --- a/include/private/vkd3d_debug.h +++ b/include/private/vkd3d_debug.h @@ -44,15 +44,14 @@ enum vkd3d_dbg_level VKD3D_DBG_LEVEL_TRACE, }; -enum vkd3d_dbg_level vkd3d_dbg_get_level(void) DECLSPEC_HIDDEN; +enum vkd3d_dbg_level vkd3d_dbg_get_level(void); -void vkd3d_dbg_printf(enum vkd3d_dbg_level level, const char *function, - const char *fmt, ...) VKD3D_PRINTF_FUNC(3, 4) DECLSPEC_HIDDEN; +void vkd3d_dbg_printf(enum vkd3d_dbg_level level, const char *function, const char *fmt, ...) VKD3D_PRINTF_FUNC(3, 4); -const char *vkd3d_dbg_sprintf(const char *fmt, ...) VKD3D_PRINTF_FUNC(1, 2) DECLSPEC_HIDDEN; -const char *vkd3d_dbg_vsprintf(const char *fmt, va_list args) DECLSPEC_HIDDEN; -const char *debugstr_a(const char *str) DECLSPEC_HIDDEN; -const char *debugstr_w(const WCHAR *wstr, size_t wchar_size) DECLSPEC_HIDDEN; +const char *vkd3d_dbg_sprintf(const char *fmt, ...) VKD3D_PRINTF_FUNC(1, 2); +const char *vkd3d_dbg_vsprintf(const char *fmt, va_list args); +const char *debugstr_a(const char *str); +const char *debugstr_w(const WCHAR *wstr, size_t wchar_size); #define VKD3D_DBG_LOG(level) \ do { \ @@ -103,7 +102,7 @@ static inline const char *debugstr_guid(const GUID *guid) guid->Data4[5], guid->Data4[6], guid->Data4[7]); } -unsigned int vkd3d_env_var_as_uint(const char *name, unsigned int default_value) DECLSPEC_HIDDEN; +unsigned int vkd3d_env_var_as_uint(const char *name, unsigned int default_value); struct vkd3d_debug_option { @@ -111,8 +110,8 @@ struct vkd3d_debug_option uint64_t flag; }; -bool vkd3d_debug_list_has_member(const char *string, const char *member) DECLSPEC_HIDDEN; +bool vkd3d_debug_list_has_member(const char *string, const char *member); uint64_t vkd3d_parse_debug_options(const char *string, - const struct vkd3d_debug_option *options, unsigned int option_count) DECLSPEC_HIDDEN; + const struct vkd3d_debug_option *options, unsigned int option_count); #endif /* __VKD3D_DEBUG_H */ diff --git a/include/private/vkd3d_memory.h b/include/private/vkd3d_memory.h index df93abf..8bbc691 100644 --- a/include/private/vkd3d_memory.h +++ b/include/private/vkd3d_memory.h @@ -54,7 +54,6 @@ static inline void vkd3d_free(void *ptr) free(ptr); } -bool vkd3d_array_reserve(void **elements, size_t *capacity, - size_t element_count, size_t element_size) DECLSPEC_HIDDEN; +bool vkd3d_array_reserve(void **elements, size_t *capacity, size_t element_count, size_t element_size); #endif /* __VKD3D_MEMORY_H */ diff --git a/include/private/vkd3d_utf8.h b/include/private/vkd3d_utf8.h index ab32884..ccb9e17 100644 --- a/include/private/vkd3d_utf8.h +++ b/include/private/vkd3d_utf8.h @@ -21,6 +21,6 @@ #include "vkd3d_common.h" -char *vkd3d_strdup_w_utf8(const WCHAR *wstr, size_t wchar_size) DECLSPEC_HIDDEN; +char *vkd3d_strdup_w_utf8(const WCHAR *wstr, size_t wchar_size); #endif /* __VKD3D_UTF8_H */ diff --git a/libs/vkd3d-common/debug.c b/libs/vkd3d-common/debug.c index 33deed6..a4d5a3d 100644 --- a/libs/vkd3d-common/debug.c +++ b/libs/vkd3d-common/debug.c @@ -31,7 +31,7 @@ #define VKD3D_DEBUG_BUFFER_COUNT 64 #define VKD3D_DEBUG_BUFFER_SIZE 512 -extern const char *vkd3d_dbg_env_name DECLSPEC_HIDDEN; +extern const char *vkd3d_dbg_env_name; static const char *debug_level_names[] = { diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 973a80d..231c48b 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2726,7 +2726,7 @@ static int rts0_handler(const char *data, DWORD data_size, DWORD tag, void *cont return shader_parse_root_signature(data, data_size, desc); } -int vkd3d_shader_parse_root_signature(const struct vkd3d_shader_code *dxbc, +VKD3D_API int vkd3d_shader_parse_root_signature(const struct vkd3d_shader_code *dxbc, struct vkd3d_shader_versioned_root_signature_desc *root_signature, char **messages) { struct vkd3d_shader_message_context message_context; @@ -3288,7 +3288,7 @@ static int validate_root_signature_desc(const struct vkd3d_shader_versioned_root return ret; } -int vkd3d_shader_serialize_root_signature(const struct vkd3d_shader_versioned_root_signature_desc *root_signature, +VKD3D_API int vkd3d_shader_serialize_root_signature(const struct vkd3d_shader_versioned_root_signature_desc *root_signature, struct vkd3d_shader_code *dxbc, char **messages) { struct root_signature_writer_context context; @@ -3592,7 +3592,7 @@ fail: return ret; } -int vkd3d_shader_convert_root_signature(struct vkd3d_shader_versioned_root_signature_desc *dst, +VKD3D_API int vkd3d_shader_convert_root_signature(struct vkd3d_shader_versioned_root_signature_desc *dst, enum vkd3d_shader_root_signature_version version, const struct vkd3d_shader_versioned_root_signature_desc *src) { int ret; diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 16d895f..4d49eef 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -292,14 +292,14 @@ static int vkd3d_shader_validate_compile_info(const struct vkd3d_shader_compile_ return VKD3D_OK; } -void vkd3d_shader_free_messages(char *messages) +VKD3D_API void vkd3d_shader_free_messages(char *messages) { TRACE("messages %p.\n", messages); vkd3d_free(messages); } -int vkd3d_shader_compile(const struct vkd3d_shader_compile_info *compile_info, +VKD3D_API int vkd3d_shader_compile(const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out, char **messages) { struct vkd3d_shader_scan_descriptor_info scan_descriptor_info; @@ -837,7 +837,7 @@ static int vkd3d_shader_scan_instruction(struct vkd3d_shader_scan_context *conte return VKD3D_OK; } -int vkd3d_shader_scan(const struct vkd3d_shader_compile_info *compile_info, char **messages) +VKD3D_API int vkd3d_shader_scan(const struct vkd3d_shader_compile_info *compile_info, char **messages) { struct vkd3d_shader_scan_descriptor_info *scan_descriptor_info; struct vkd3d_shader_message_context *message_context; @@ -912,14 +912,14 @@ done: return ret; } -void vkd3d_shader_free_scan_descriptor_info(struct vkd3d_shader_scan_descriptor_info *scan_descriptor_info) +VKD3D_API void vkd3d_shader_free_scan_descriptor_info(struct vkd3d_shader_scan_descriptor_info *scan_descriptor_info) { TRACE("scan_descriptor_info %p.\n", scan_descriptor_info); vkd3d_free(scan_descriptor_info->descriptors); } -void vkd3d_shader_free_shader_code(struct vkd3d_shader_code *shader_code) +VKD3D_API void vkd3d_shader_free_shader_code(struct vkd3d_shader_code *shader_code) { TRACE("shader_code %p.\n", shader_code); @@ -960,7 +960,7 @@ static void vkd3d_shader_free_root_signature_v_1_1(struct vkd3d_shader_root_sign memset(root_signature, 0, sizeof(*root_signature)); } -void vkd3d_shader_free_root_signature(struct vkd3d_shader_versioned_root_signature_desc *desc) +VKD3D_API void vkd3d_shader_free_root_signature(struct vkd3d_shader_versioned_root_signature_desc *desc) { TRACE("desc %p.\n", desc); @@ -981,7 +981,7 @@ void vkd3d_shader_free_root_signature(struct vkd3d_shader_versioned_root_signatu desc->version = 0; } -int vkd3d_shader_parse_input_signature(const struct vkd3d_shader_code *dxbc, +VKD3D_API int vkd3d_shader_parse_input_signature(const struct vkd3d_shader_code *dxbc, struct vkd3d_shader_signature *signature, char **messages) { struct vkd3d_shader_message_context message_context; @@ -1004,7 +1004,7 @@ int vkd3d_shader_parse_input_signature(const struct vkd3d_shader_code *dxbc, return ret; } -struct vkd3d_shader_signature_element *vkd3d_shader_find_signature_element( +VKD3D_API struct vkd3d_shader_signature_element *vkd3d_shader_find_signature_element( const struct vkd3d_shader_signature *signature, const char *semantic_name, unsigned int semantic_index, unsigned int stream_index) { @@ -1026,7 +1026,7 @@ struct vkd3d_shader_signature_element *vkd3d_shader_find_signature_element( return NULL; } -void vkd3d_shader_free_shader_signature(struct vkd3d_shader_signature *signature) +VKD3D_API void vkd3d_shader_free_shader_signature(struct vkd3d_shader_signature *signature) { TRACE("signature %p.\n", signature); @@ -1034,7 +1034,7 @@ void vkd3d_shader_free_shader_signature(struct vkd3d_shader_signature *signature signature->elements = NULL; } -const char *vkd3d_shader_get_version(unsigned int *major, unsigned int *minor) +VKD3D_API const char *vkd3d_shader_get_version(unsigned int *major, unsigned int *minor) { int x, y; @@ -1052,7 +1052,7 @@ const char *vkd3d_shader_get_version(unsigned int *major, unsigned int *minor) return "vkd3d-shader " PACKAGE_VERSION VKD3D_VCS_ID; } -const enum vkd3d_shader_source_type *vkd3d_shader_get_supported_source_types(unsigned int *count) +VKD3D_API const enum vkd3d_shader_source_type *vkd3d_shader_get_supported_source_types(unsigned int *count) { static const enum vkd3d_shader_source_type types[] = { @@ -1065,7 +1065,7 @@ const enum vkd3d_shader_source_type *vkd3d_shader_get_supported_source_types(uns return types; } -const enum vkd3d_shader_target_type *vkd3d_shader_get_supported_target_types( +VKD3D_API const enum vkd3d_shader_target_type *vkd3d_shader_get_supported_target_types( enum vkd3d_shader_source_type source_type, unsigned int *count) { static const enum vkd3d_shader_target_type dxbc_tpf_types[] = diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 1acb01f..1291148 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -809,18 +809,18 @@ static inline bool vkd3d_shader_register_is_output(const struct vkd3d_shader_reg return reg->type == VKD3DSPR_OUTPUT || reg->type == VKD3DSPR_COLOROUT; } -void vkd3d_shader_trace(void *data) DECLSPEC_HIDDEN; +void vkd3d_shader_trace(void *data); -const char *shader_get_type_prefix(enum vkd3d_shader_type type) DECLSPEC_HIDDEN; +const char *shader_get_type_prefix(enum vkd3d_shader_type type); void *shader_sm4_init(const DWORD *byte_code, size_t byte_code_size, - const struct vkd3d_shader_signature *output_signature) DECLSPEC_HIDDEN; -void shader_sm4_free(void *data) DECLSPEC_HIDDEN; + const struct vkd3d_shader_signature *output_signature); +void shader_sm4_free(void *data); void shader_sm4_read_header(void *data, const DWORD **ptr, - struct vkd3d_shader_version *shader_version) DECLSPEC_HIDDEN; + struct vkd3d_shader_version *shader_version); void shader_sm4_read_instruction(void *data, const DWORD **ptr, - struct vkd3d_shader_instruction *ins) DECLSPEC_HIDDEN; -bool shader_sm4_is_end(void *data, const DWORD **ptr) DECLSPEC_HIDDEN; + struct vkd3d_shader_instruction *ins); +bool shader_sm4_is_end(void *data, const DWORD **ptr); struct vkd3d_string_buffer { @@ -829,9 +829,9 @@ struct vkd3d_string_buffer unsigned int content_size; }; -void vkd3d_string_buffer_cleanup(struct vkd3d_string_buffer *buffer) DECLSPEC_HIDDEN; -bool vkd3d_string_buffer_init(struct vkd3d_string_buffer *buffer) DECLSPEC_HIDDEN; -int vkd3d_string_buffer_vprintf(struct vkd3d_string_buffer *buffer, const char *format, va_list args) DECLSPEC_HIDDEN; +void vkd3d_string_buffer_cleanup(struct vkd3d_string_buffer *buffer); +bool vkd3d_string_buffer_init(struct vkd3d_string_buffer *buffer); +int vkd3d_string_buffer_vprintf(struct vkd3d_string_buffer *buffer, const char *format, va_list args); struct vkd3d_shader_message_context { @@ -841,39 +841,39 @@ struct vkd3d_shader_message_context struct vkd3d_string_buffer messages; }; -void vkd3d_shader_message_context_cleanup(struct vkd3d_shader_message_context *context) DECLSPEC_HIDDEN; -char *vkd3d_shader_message_context_copy_messages(struct vkd3d_shader_message_context *context) DECLSPEC_HIDDEN; +void vkd3d_shader_message_context_cleanup(struct vkd3d_shader_message_context *context); +char *vkd3d_shader_message_context_copy_messages(struct vkd3d_shader_message_context *context); bool vkd3d_shader_message_context_init(struct vkd3d_shader_message_context *context, - enum vkd3d_shader_log_level log_level, const char *source_name) DECLSPEC_HIDDEN; + enum vkd3d_shader_log_level log_level, const char *source_name); void vkd3d_shader_message_context_trace_messages_(const struct vkd3d_shader_message_context *context, - const char *function) DECLSPEC_HIDDEN; + const char *function); #define vkd3d_shader_message_context_trace_messages(context) \ vkd3d_shader_message_context_trace_messages_(context, __FUNCTION__) void vkd3d_shader_error(struct vkd3d_shader_message_context *context, enum vkd3d_shader_error error, - const char *format, ...) VKD3D_PRINTF_FUNC(3, 4) DECLSPEC_HIDDEN; + const char *format, ...) VKD3D_PRINTF_FUNC(3, 4); void vkd3d_shader_verror(struct vkd3d_shader_message_context *context, - enum vkd3d_shader_error error, const char *format, va_list args) DECLSPEC_HIDDEN; + enum vkd3d_shader_error error, const char *format, va_list args); int shader_extract_from_dxbc(const void *dxbc, size_t dxbc_length, - struct vkd3d_shader_message_context *message_context, struct vkd3d_shader_desc *desc) DECLSPEC_HIDDEN; -void free_shader_desc(struct vkd3d_shader_desc *desc) DECLSPEC_HIDDEN; + struct vkd3d_shader_message_context *message_context, struct vkd3d_shader_desc *desc); +void free_shader_desc(struct vkd3d_shader_desc *desc); int shader_parse_input_signature(const void *dxbc, size_t dxbc_length, - struct vkd3d_shader_message_context *message_context, struct vkd3d_shader_signature *signature) DECLSPEC_HIDDEN; + struct vkd3d_shader_message_context *message_context, struct vkd3d_shader_signature *signature); struct vkd3d_dxbc_compiler; struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader_version *shader_version, const struct vkd3d_shader_desc *shader_desc, const struct vkd3d_shader_compile_info *compile_info, const struct vkd3d_shader_scan_descriptor_info *scan_descriptor_info, - struct vkd3d_shader_message_context *message_context) DECLSPEC_HIDDEN; + struct vkd3d_shader_message_context *message_context); int vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler, - const struct vkd3d_shader_instruction *instruction) DECLSPEC_HIDDEN; + const struct vkd3d_shader_instruction *instruction); int vkd3d_dxbc_compiler_generate_spirv(struct vkd3d_dxbc_compiler *compiler, - const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *spirv) DECLSPEC_HIDDEN; -void vkd3d_dxbc_compiler_destroy(struct vkd3d_dxbc_compiler *compiler) DECLSPEC_HIDDEN; + const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *spirv); +void vkd3d_dxbc_compiler_destroy(struct vkd3d_dxbc_compiler *compiler); -void vkd3d_compute_dxbc_checksum(const void *dxbc, size_t size, uint32_t checksum[4]) DECLSPEC_HIDDEN; +void vkd3d_compute_dxbc_checksum(const void *dxbc, size_t size, uint32_t checksum[4]); static inline enum vkd3d_shader_component_type vkd3d_component_type_from_data_type( enum vkd3d_data_type data_type) diff --git a/libs/vkd3d-utils/vkd3d_utils_main.c b/libs/vkd3d-utils/vkd3d_utils_main.c index c19fe7f..b64693e 100644 --- a/libs/vkd3d-utils/vkd3d_utils_main.c +++ b/libs/vkd3d-utils/vkd3d_utils_main.c @@ -21,14 +21,14 @@ VKD3D_DEBUG_ENV_NAME("VKD3D_DEBUG"); -HRESULT WINAPI D3D12GetDebugInterface(REFIID iid, void **debug) +VKD3D_API HRESULT WINAPI D3D12GetDebugInterface(REFIID iid, void **debug) { FIXME("iid %s, debug %p stub!\n", debugstr_guid(iid), debug); return E_NOTIMPL; } -HRESULT WINAPI D3D12CreateDeviceVKD3D(IUnknown *adapter, D3D_FEATURE_LEVEL minimum_feature_level, +VKD3D_API HRESULT WINAPI D3D12CreateDeviceVKD3D(IUnknown *adapter, D3D_FEATURE_LEVEL minimum_feature_level, REFIID iid, void **device, enum vkd3d_api_version api_version) { struct vkd3d_optional_instance_extensions_info optional_extensions_info; @@ -85,13 +85,13 @@ HRESULT WINAPI D3D12CreateDeviceVKD3D(IUnknown *adapter, D3D_FEATURE_LEVEL minim return vkd3d_create_device(&device_create_info, iid, device); } -HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, +VKD3D_API HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, D3D_FEATURE_LEVEL minimum_feature_level, REFIID iid, void **device) { return D3D12CreateDeviceVKD3D(adapter, minimum_feature_level, iid, device, VKD3D_API_VERSION_1_0); } -HRESULT WINAPI D3D12CreateRootSignatureDeserializer(const void *data, SIZE_T data_size, +VKD3D_API HRESULT WINAPI D3D12CreateRootSignatureDeserializer(const void *data, SIZE_T data_size, REFIID iid, void **deserializer) { TRACE("data %p, data_size %lu, iid %s, deserializer %p.\n", @@ -100,7 +100,7 @@ HRESULT WINAPI D3D12CreateRootSignatureDeserializer(const void *data, SIZE_T dat return vkd3d_create_root_signature_deserializer(data, data_size, iid, deserializer); } -HRESULT WINAPI D3D12CreateVersionedRootSignatureDeserializer(const void *data, SIZE_T data_size, +VKD3D_API HRESULT WINAPI D3D12CreateVersionedRootSignatureDeserializer(const void *data, SIZE_T data_size, REFIID iid,void **deserializer) { TRACE("data %p, data_size %lu, iid %s, deserializer %p.\n", @@ -109,7 +109,7 @@ HRESULT WINAPI D3D12CreateVersionedRootSignatureDeserializer(const void *data, S return vkd3d_create_versioned_root_signature_deserializer(data, data_size, iid, deserializer); } -HRESULT WINAPI D3D12SerializeRootSignature(const D3D12_ROOT_SIGNATURE_DESC *desc, +VKD3D_API HRESULT WINAPI D3D12SerializeRootSignature(const D3D12_ROOT_SIGNATURE_DESC *desc, D3D_ROOT_SIGNATURE_VERSION version, ID3DBlob **blob, ID3DBlob **error_blob) { TRACE("desc %p, version %#x, blob %p, error_blob %p.\n", desc, version, blob, error_blob); @@ -117,7 +117,7 @@ HRESULT WINAPI D3D12SerializeRootSignature(const D3D12_ROOT_SIGNATURE_DESC *desc return vkd3d_serialize_root_signature(desc, version, blob, error_blob); } -HRESULT WINAPI D3D12SerializeVersionedRootSignature(const D3D12_VERSIONED_ROOT_SIGNATURE_DESC *desc, +VKD3D_API HRESULT WINAPI D3D12SerializeVersionedRootSignature(const D3D12_VERSIONED_ROOT_SIGNATURE_DESC *desc, ID3DBlob **blob, ID3DBlob **error_blob) { TRACE("desc %p, blob %p, error_blob %p.\n", desc, blob, error_blob); @@ -126,7 +126,7 @@ HRESULT WINAPI D3D12SerializeVersionedRootSignature(const D3D12_VERSIONED_ROOT_S } /* Events */ -HANDLE vkd3d_create_event(void) +VKD3D_API HANDLE vkd3d_create_event(void) { struct vkd3d_event *event; int rc; @@ -157,7 +157,7 @@ HANDLE vkd3d_create_event(void) return event; } -unsigned int vkd3d_wait_event(HANDLE event, unsigned int milliseconds) +VKD3D_API unsigned int vkd3d_wait_event(HANDLE event, unsigned int milliseconds) { struct vkd3d_event *impl = event; int rc; @@ -200,7 +200,7 @@ unsigned int vkd3d_wait_event(HANDLE event, unsigned int milliseconds) return VKD3D_WAIT_FAILED; } -HRESULT vkd3d_signal_event(HANDLE event) +VKD3D_API HRESULT vkd3d_signal_event(HANDLE event) { struct vkd3d_event *impl = event; int rc; @@ -219,7 +219,7 @@ HRESULT vkd3d_signal_event(HANDLE event) return S_OK; } -void vkd3d_destroy_event(HANDLE event) +VKD3D_API void vkd3d_destroy_event(HANDLE event) { struct vkd3d_event *impl = event; int rc; diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index e5c6791..4ff510a 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -6251,21 +6251,21 @@ HRESULT d3d12_command_queue_create(struct d3d12_device *device, return S_OK; } -uint32_t vkd3d_get_vk_queue_family_index(ID3D12CommandQueue *queue) +VKD3D_API uint32_t vkd3d_get_vk_queue_family_index(ID3D12CommandQueue *queue) { struct d3d12_command_queue *d3d12_queue = impl_from_ID3D12CommandQueue(queue); return d3d12_queue->vkd3d_queue->vk_family_index; } -VkQueue vkd3d_acquire_vk_queue(ID3D12CommandQueue *queue) +VKD3D_API VkQueue vkd3d_acquire_vk_queue(ID3D12CommandQueue *queue) { struct d3d12_command_queue *d3d12_queue = impl_from_ID3D12CommandQueue(queue); return vkd3d_queue_acquire(d3d12_queue->vkd3d_queue); } -void vkd3d_release_vk_queue(ID3D12CommandQueue *queue) +VKD3D_API void vkd3d_release_vk_queue(ID3D12CommandQueue *queue) { struct d3d12_command_queue *d3d12_queue = impl_from_ID3D12CommandQueue(queue); diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index bef6477..38d3d56 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -589,7 +589,7 @@ static HRESULT vkd3d_instance_init(struct vkd3d_instance *instance, return S_OK; } -HRESULT vkd3d_create_instance(const struct vkd3d_instance_create_info *create_info, +VKD3D_API HRESULT vkd3d_create_instance(const struct vkd3d_instance_create_info *create_info, struct vkd3d_instance **instance) { struct vkd3d_instance *object; @@ -637,7 +637,7 @@ static void vkd3d_destroy_instance(struct vkd3d_instance *instance) vkd3d_free(instance); } -ULONG vkd3d_instance_incref(struct vkd3d_instance *instance) +VKD3D_API ULONG vkd3d_instance_incref(struct vkd3d_instance *instance) { ULONG refcount = InterlockedIncrement(&instance->refcount); @@ -646,7 +646,7 @@ ULONG vkd3d_instance_incref(struct vkd3d_instance *instance) return refcount; } -ULONG vkd3d_instance_decref(struct vkd3d_instance *instance) +VKD3D_API ULONG vkd3d_instance_decref(struct vkd3d_instance *instance) { ULONG refcount = InterlockedDecrement(&instance->refcount); @@ -658,7 +658,7 @@ ULONG vkd3d_instance_decref(struct vkd3d_instance *instance) return refcount; } -VkInstance vkd3d_instance_get_vk_instance(struct vkd3d_instance *instance) +VKD3D_API VkInstance vkd3d_instance_get_vk_instance(struct vkd3d_instance *instance) { return instance->vk_instance; } @@ -3828,28 +3828,28 @@ HRESULT vkd3d_join_thread(struct vkd3d_instance *instance, union vkd3d_thread_ha return hr; } -IUnknown *vkd3d_get_device_parent(ID3D12Device *device) +VKD3D_API IUnknown *vkd3d_get_device_parent(ID3D12Device *device) { struct d3d12_device *d3d12_device = impl_from_ID3D12Device(device); return d3d12_device->parent; } -VkDevice vkd3d_get_vk_device(ID3D12Device *device) +VKD3D_API VkDevice vkd3d_get_vk_device(ID3D12Device *device) { struct d3d12_device *d3d12_device = impl_from_ID3D12Device(device); return d3d12_device->vk_device; } -VkPhysicalDevice vkd3d_get_vk_physical_device(ID3D12Device *device) +VKD3D_API VkPhysicalDevice vkd3d_get_vk_physical_device(ID3D12Device *device) { struct d3d12_device *d3d12_device = impl_from_ID3D12Device(device); return d3d12_device->vk_physical_device; } -struct vkd3d_instance *vkd3d_instance_from_device(ID3D12Device *device) +VKD3D_API struct vkd3d_instance *vkd3d_instance_from_device(ID3D12Device *device) { struct d3d12_device *d3d12_device = impl_from_ID3D12Device(device); diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index a9d4d46..a432806 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1983,7 +1983,7 @@ HRESULT d3d12_reserved_resource_create(struct d3d12_device *device, return S_OK; } -HRESULT vkd3d_create_image_resource(ID3D12Device *device, +VKD3D_API HRESULT vkd3d_create_image_resource(ID3D12Device *device, const struct vkd3d_image_resource_create_info *create_info, ID3D12Resource **resource) { struct d3d12_device *d3d12_device = unsafe_impl_from_ID3D12Device(device); @@ -2035,13 +2035,13 @@ HRESULT vkd3d_create_image_resource(ID3D12Device *device, return S_OK; } -ULONG vkd3d_resource_incref(ID3D12Resource *resource) +VKD3D_API ULONG vkd3d_resource_incref(ID3D12Resource *resource) { TRACE("resource %p.\n", resource); return d3d12_resource_incref(impl_from_ID3D12Resource(resource)); } -ULONG vkd3d_resource_decref(ID3D12Resource *resource) +VKD3D_API ULONG vkd3d_resource_decref(ID3D12Resource *resource) { TRACE("resource %p.\n", resource); return d3d12_resource_decref(impl_from_ID3D12Resource(resource)); diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c index 7abfd42..ea11f3a 100644 --- a/libs/vkd3d/utils.c +++ b/libs/vkd3d/utils.c @@ -506,7 +506,7 @@ void vkd3d_format_copy_data(const struct vkd3d_format *format, const uint8_t *sr } } -VkFormat vkd3d_get_vk_format(DXGI_FORMAT format) +VKD3D_API VkFormat vkd3d_get_vk_format(DXGI_FORMAT format) { const struct vkd3d_format *vkd3d_format; @@ -516,7 +516,7 @@ VkFormat vkd3d_get_vk_format(DXGI_FORMAT format) return vkd3d_format->vk_format; } -DXGI_FORMAT vkd3d_get_dxgi_format(VkFormat format) +VKD3D_API DXGI_FORMAT vkd3d_get_dxgi_format(VkFormat format) { DXGI_FORMAT dxgi_format; VkFormat vk_format; diff --git a/libs/vkd3d/vkd3d_main.c b/libs/vkd3d/vkd3d_main.c index 327cdf8..4c0d6c5 100644 --- a/libs/vkd3d/vkd3d_main.c +++ b/libs/vkd3d/vkd3d_main.c @@ -21,7 +21,7 @@ VKD3D_DEBUG_ENV_NAME("VKD3D_DEBUG"); -HRESULT vkd3d_create_device(const struct vkd3d_device_create_info *create_info, +VKD3D_API HRESULT vkd3d_create_device(const struct vkd3d_device_create_info *create_info, REFIID iid, void **device) { struct vkd3d_instance *instance; @@ -216,7 +216,7 @@ static HRESULT d3d12_root_signature_deserializer_init(struct d3d12_root_signatur return S_OK; } -HRESULT vkd3d_create_root_signature_deserializer(const void *data, SIZE_T data_size, +VKD3D_API HRESULT vkd3d_create_root_signature_deserializer(const void *data, SIZE_T data_size, REFIID iid, void **deserializer) { struct vkd3d_shader_code dxbc = {data, data_size}; @@ -400,7 +400,7 @@ static HRESULT d3d12_versioned_root_signature_deserializer_init(struct d3d12_ver return S_OK; } -HRESULT vkd3d_create_versioned_root_signature_deserializer(const void *data, SIZE_T data_size, +VKD3D_API HRESULT vkd3d_create_versioned_root_signature_deserializer(const void *data, SIZE_T data_size, REFIID iid, void **deserializer) { struct d3d12_versioned_root_signature_deserializer *object; @@ -537,7 +537,7 @@ static HRESULT d3d_blob_create(void *buffer, SIZE_T size, struct d3d_blob **blob return S_OK; } -HRESULT vkd3d_serialize_root_signature(const D3D12_ROOT_SIGNATURE_DESC *desc, +VKD3D_API HRESULT vkd3d_serialize_root_signature(const D3D12_ROOT_SIGNATURE_DESC *desc, D3D_ROOT_SIGNATURE_VERSION version, ID3DBlob **blob, ID3DBlob **error_blob) { struct vkd3d_shader_versioned_root_signature_desc vkd3d_desc; @@ -592,7 +592,7 @@ HRESULT vkd3d_serialize_root_signature(const D3D12_ROOT_SIGNATURE_DESC *desc, return S_OK; } -HRESULT vkd3d_serialize_versioned_root_signature(const D3D12_VERSIONED_ROOT_SIGNATURE_DESC *desc, +VKD3D_API HRESULT vkd3d_serialize_versioned_root_signature(const D3D12_VERSIONED_ROOT_SIGNATURE_DESC *desc, ID3DBlob **blob, ID3DBlob **error_blob) { const struct vkd3d_shader_versioned_root_signature_desc *vkd3d_desc; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 9f0982d..54077f9 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -82,9 +82,9 @@ struct vkd3d_vk_device_procs }; #undef DECLARE_VK_PFN -HRESULT hresult_from_errno(int rc) DECLSPEC_HIDDEN; -HRESULT hresult_from_vk_result(VkResult vr) DECLSPEC_HIDDEN; -HRESULT hresult_from_vkd3d_result(int vkd3d_result) DECLSPEC_HIDDEN; +HRESULT hresult_from_errno(int rc); +HRESULT hresult_from_vk_result(VkResult vr); +HRESULT hresult_from_vkd3d_result(int vkd3d_result); struct vkd3d_vulkan_info { @@ -161,8 +161,8 @@ union vkd3d_thread_handle }; HRESULT vkd3d_create_thread(struct vkd3d_instance *instance, - PFN_vkd3d_thread thread_main, void *data, union vkd3d_thread_handle *thread) DECLSPEC_HIDDEN; -HRESULT vkd3d_join_thread(struct vkd3d_instance *instance, union vkd3d_thread_handle *thread) DECLSPEC_HIDDEN; + PFN_vkd3d_thread thread_main, void *data, union vkd3d_thread_handle *thread); +HRESULT vkd3d_join_thread(struct vkd3d_instance *instance, union vkd3d_thread_handle *thread); struct vkd3d_waiting_fence { @@ -199,9 +199,9 @@ struct vkd3d_fence_worker }; HRESULT vkd3d_fence_worker_start(struct vkd3d_fence_worker *worker, - struct d3d12_device *device) DECLSPEC_HIDDEN; + struct d3d12_device *device); HRESULT vkd3d_fence_worker_stop(struct vkd3d_fence_worker *worker, - struct d3d12_device *device) DECLSPEC_HIDDEN; + struct d3d12_device *device); struct vkd3d_gpu_va_allocation { @@ -230,11 +230,11 @@ struct vkd3d_gpu_va_allocator }; D3D12_GPU_VIRTUAL_ADDRESS vkd3d_gpu_va_allocator_allocate(struct vkd3d_gpu_va_allocator *allocator, - size_t alignment, size_t size, void *ptr) DECLSPEC_HIDDEN; + size_t alignment, size_t size, void *ptr); void *vkd3d_gpu_va_allocator_dereference(struct vkd3d_gpu_va_allocator *allocator, - D3D12_GPU_VIRTUAL_ADDRESS address) DECLSPEC_HIDDEN; + D3D12_GPU_VIRTUAL_ADDRESS address); void vkd3d_gpu_va_allocator_free(struct vkd3d_gpu_va_allocator *allocator, - D3D12_GPU_VIRTUAL_ADDRESS address) DECLSPEC_HIDDEN; + D3D12_GPU_VIRTUAL_ADDRESS address); struct vkd3d_render_pass_key { @@ -257,11 +257,11 @@ struct vkd3d_render_pass_cache }; void vkd3d_render_pass_cache_cleanup(struct vkd3d_render_pass_cache *cache, - struct d3d12_device *device) DECLSPEC_HIDDEN; + struct d3d12_device *device); HRESULT vkd3d_render_pass_cache_find(struct vkd3d_render_pass_cache *cache, struct d3d12_device *device, const struct vkd3d_render_pass_key *key, - VkRenderPass *vk_render_pass) DECLSPEC_HIDDEN; -void vkd3d_render_pass_cache_init(struct vkd3d_render_pass_cache *cache) DECLSPEC_HIDDEN; + VkRenderPass *vk_render_pass); +void vkd3d_render_pass_cache_init(struct vkd3d_render_pass_cache *cache); struct vkd3d_private_store { @@ -317,11 +317,11 @@ static inline void vkd3d_private_store_destroy(struct vkd3d_private_store *store } HRESULT vkd3d_get_private_data(struct vkd3d_private_store *store, - const GUID *tag, unsigned int *out_size, void *out) DECLSPEC_HIDDEN; + const GUID *tag, unsigned int *out_size, void *out); HRESULT vkd3d_set_private_data(struct vkd3d_private_store *store, - const GUID *tag, unsigned int data_size, const void *data) DECLSPEC_HIDDEN; + const GUID *tag, unsigned int data_size, const void *data); HRESULT vkd3d_set_private_data_interface(struct vkd3d_private_store *store, - const GUID *tag, const IUnknown *object) DECLSPEC_HIDDEN; + const GUID *tag, const IUnknown *object); struct vkd3d_signaled_semaphore { @@ -362,7 +362,7 @@ struct d3d12_fence }; HRESULT d3d12_fence_create(struct d3d12_device *device, - uint64_t initial_value, D3D12_FENCE_FLAGS flags, struct d3d12_fence **fence) DECLSPEC_HIDDEN; + uint64_t initial_value, D3D12_FENCE_FLAGS flags, struct d3d12_fence **fence); /* ID3D12Heap */ struct d3d12_heap @@ -386,8 +386,8 @@ struct d3d12_heap }; HRESULT d3d12_heap_create(struct d3d12_device *device, const D3D12_HEAP_DESC *desc, - const struct d3d12_resource *resource, struct d3d12_heap **heap) DECLSPEC_HIDDEN; -struct d3d12_heap *unsafe_impl_from_ID3D12Heap(ID3D12Heap *iface) DECLSPEC_HIDDEN; + const struct d3d12_resource *resource, struct d3d12_heap **heap); +struct d3d12_heap *unsafe_impl_from_ID3D12Heap(ID3D12Heap *iface); #define VKD3D_RESOURCE_PUBLIC_FLAGS \ (VKD3D_RESOURCE_INITIAL_STATE_TRANSITION | VKD3D_RESOURCE_PRESENT_STATE_TRANSITION) @@ -435,29 +435,29 @@ static inline bool d3d12_resource_is_texture(const struct d3d12_resource *resour return resource->desc.Dimension != D3D12_RESOURCE_DIMENSION_BUFFER; } -bool d3d12_resource_is_cpu_accessible(const struct d3d12_resource *resource) DECLSPEC_HIDDEN; -HRESULT d3d12_resource_validate_desc(const D3D12_RESOURCE_DESC *desc, struct d3d12_device *device) DECLSPEC_HIDDEN; +bool d3d12_resource_is_cpu_accessible(const struct d3d12_resource *resource); +HRESULT d3d12_resource_validate_desc(const D3D12_RESOURCE_DESC *desc, struct d3d12_device *device); HRESULT d3d12_committed_resource_create(struct d3d12_device *device, const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags, const D3D12_RESOURCE_DESC *desc, D3D12_RESOURCE_STATES initial_state, - const D3D12_CLEAR_VALUE *optimized_clear_value, struct d3d12_resource **resource) DECLSPEC_HIDDEN; + const D3D12_CLEAR_VALUE *optimized_clear_value, struct d3d12_resource **resource); HRESULT d3d12_placed_resource_create(struct d3d12_device *device, struct d3d12_heap *heap, uint64_t heap_offset, const D3D12_RESOURCE_DESC *desc, D3D12_RESOURCE_STATES initial_state, - const D3D12_CLEAR_VALUE *optimized_clear_value, struct d3d12_resource **resource) DECLSPEC_HIDDEN; + const D3D12_CLEAR_VALUE *optimized_clear_value, struct d3d12_resource **resource); HRESULT d3d12_reserved_resource_create(struct d3d12_device *device, const D3D12_RESOURCE_DESC *desc, D3D12_RESOURCE_STATES initial_state, - const D3D12_CLEAR_VALUE *optimized_clear_value, struct d3d12_resource **resource) DECLSPEC_HIDDEN; -struct d3d12_resource *unsafe_impl_from_ID3D12Resource(ID3D12Resource *iface) DECLSPEC_HIDDEN; + const D3D12_CLEAR_VALUE *optimized_clear_value, struct d3d12_resource **resource); +struct d3d12_resource *unsafe_impl_from_ID3D12Resource(ID3D12Resource *iface); HRESULT vkd3d_allocate_buffer_memory(struct d3d12_device *device, VkBuffer vk_buffer, const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags, - VkDeviceMemory *vk_memory, uint32_t *vk_memory_type, VkDeviceSize *vk_memory_size) DECLSPEC_HIDDEN; + VkDeviceMemory *vk_memory, uint32_t *vk_memory_type, VkDeviceSize *vk_memory_size); HRESULT vkd3d_create_buffer(struct d3d12_device *device, const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags, - const D3D12_RESOURCE_DESC *desc, VkBuffer *vk_buffer) DECLSPEC_HIDDEN; + const D3D12_RESOURCE_DESC *desc, VkBuffer *vk_buffer); HRESULT vkd3d_get_image_allocation_info(struct d3d12_device *device, - const D3D12_RESOURCE_DESC *desc, D3D12_RESOURCE_ALLOCATION_INFO *allocation_info) DECLSPEC_HIDDEN; + const D3D12_RESOURCE_DESC *desc, D3D12_RESOURCE_ALLOCATION_INFO *allocation_info); enum vkd3d_view_type { @@ -495,8 +495,8 @@ struct vkd3d_view } info; }; -void vkd3d_view_decref(struct vkd3d_view *view, struct d3d12_device *device) DECLSPEC_HIDDEN; -void vkd3d_view_incref(struct vkd3d_view *view) DECLSPEC_HIDDEN; +void vkd3d_view_decref(struct vkd3d_view *view, struct d3d12_device *device); +void vkd3d_view_incref(struct vkd3d_view *view); struct vkd3d_texture_view_desc { @@ -511,9 +511,9 @@ struct vkd3d_texture_view_desc }; bool vkd3d_create_buffer_view(struct d3d12_device *device, VkBuffer vk_buffer, const struct vkd3d_format *format, - VkDeviceSize offset, VkDeviceSize size, struct vkd3d_view **view) DECLSPEC_HIDDEN; + VkDeviceSize offset, VkDeviceSize size, struct vkd3d_view **view); bool vkd3d_create_texture_view(struct d3d12_device *device, VkImage vk_image, - const struct vkd3d_texture_view_desc *desc, struct vkd3d_view **view) DECLSPEC_HIDDEN; + const struct vkd3d_texture_view_desc *desc, struct vkd3d_view **view); struct d3d12_desc { @@ -537,24 +537,24 @@ static inline struct d3d12_desc *d3d12_desc_from_gpu_handle(D3D12_GPU_DESCRIPTOR } void d3d12_desc_copy(struct d3d12_desc *dst, const struct d3d12_desc *src, - struct d3d12_device *device) DECLSPEC_HIDDEN; + struct d3d12_device *device); void d3d12_desc_create_cbv(struct d3d12_desc *descriptor, - struct d3d12_device *device, const D3D12_CONSTANT_BUFFER_VIEW_DESC *desc) DECLSPEC_HIDDEN; + struct d3d12_device *device, const D3D12_CONSTANT_BUFFER_VIEW_DESC *desc); void d3d12_desc_create_srv(struct d3d12_desc *descriptor, struct d3d12_device *device, struct d3d12_resource *resource, - const D3D12_SHADER_RESOURCE_VIEW_DESC *desc) DECLSPEC_HIDDEN; + const D3D12_SHADER_RESOURCE_VIEW_DESC *desc); void d3d12_desc_create_uav(struct d3d12_desc *descriptor, struct d3d12_device *device, struct d3d12_resource *resource, struct d3d12_resource *counter_resource, - const D3D12_UNORDERED_ACCESS_VIEW_DESC *desc) DECLSPEC_HIDDEN; + const D3D12_UNORDERED_ACCESS_VIEW_DESC *desc); void d3d12_desc_create_sampler(struct d3d12_desc *sampler, - struct d3d12_device *device, const D3D12_SAMPLER_DESC *desc) DECLSPEC_HIDDEN; + struct d3d12_device *device, const D3D12_SAMPLER_DESC *desc); void d3d12_desc_write_atomic(struct d3d12_desc *dst, const struct d3d12_desc *src, - struct d3d12_device *device) DECLSPEC_HIDDEN; + struct d3d12_device *device); bool vkd3d_create_raw_buffer_view(struct d3d12_device *device, - D3D12_GPU_VIRTUAL_ADDRESS gpu_address, VkBufferView *vk_buffer_view) DECLSPEC_HIDDEN; + D3D12_GPU_VIRTUAL_ADDRESS gpu_address, VkBufferView *vk_buffer_view); HRESULT vkd3d_create_static_sampler(struct d3d12_device *device, - const D3D12_STATIC_SAMPLER_DESC *desc, VkSampler *vk_sampler) DECLSPEC_HIDDEN; + const D3D12_STATIC_SAMPLER_DESC *desc, VkSampler *vk_sampler); struct d3d12_rtv_desc { @@ -574,7 +574,7 @@ static inline struct d3d12_rtv_desc *d3d12_rtv_desc_from_cpu_handle(D3D12_CPU_DE } void d3d12_rtv_desc_create_rtv(struct d3d12_rtv_desc *rtv_desc, struct d3d12_device *device, - struct d3d12_resource *resource, const D3D12_RENDER_TARGET_VIEW_DESC *desc) DECLSPEC_HIDDEN; + struct d3d12_resource *resource, const D3D12_RENDER_TARGET_VIEW_DESC *desc); struct d3d12_dsv_desc { @@ -594,7 +594,7 @@ static inline struct d3d12_dsv_desc *d3d12_dsv_desc_from_cpu_handle(D3D12_CPU_DE } void d3d12_dsv_desc_create_dsv(struct d3d12_dsv_desc *dsv_desc, struct d3d12_device *device, - struct d3d12_resource *resource, const D3D12_DEPTH_STENCIL_VIEW_DESC *desc) DECLSPEC_HIDDEN; + struct d3d12_resource *resource, const D3D12_DEPTH_STENCIL_VIEW_DESC *desc); /* ID3D12DescriptorHeap */ struct d3d12_descriptor_heap @@ -612,7 +612,7 @@ struct d3d12_descriptor_heap }; HRESULT d3d12_descriptor_heap_create(struct d3d12_device *device, - const D3D12_DESCRIPTOR_HEAP_DESC *desc, struct d3d12_descriptor_heap **descriptor_heap) DECLSPEC_HIDDEN; + const D3D12_DESCRIPTOR_HEAP_DESC *desc, struct d3d12_descriptor_heap **descriptor_heap); /* ID3D12QueryHeap */ struct d3d12_query_heap @@ -630,8 +630,8 @@ struct d3d12_query_heap }; HRESULT d3d12_query_heap_create(struct d3d12_device *device, const D3D12_QUERY_HEAP_DESC *desc, - struct d3d12_query_heap **heap) DECLSPEC_HIDDEN; -struct d3d12_query_heap *unsafe_impl_from_ID3D12QueryHeap(ID3D12QueryHeap *iface) DECLSPEC_HIDDEN; + struct d3d12_query_heap **heap); +struct d3d12_query_heap *unsafe_impl_from_ID3D12QueryHeap(ID3D12QueryHeap *iface); /* A Vulkan query has to be issued at least one time before the result is * available. In D3D12 it is legal to get query reults for not issued queries. @@ -731,11 +731,11 @@ struct d3d12_root_signature }; HRESULT d3d12_root_signature_create(struct d3d12_device *device, const void *bytecode, - size_t bytecode_length, struct d3d12_root_signature **root_signature) DECLSPEC_HIDDEN; -struct d3d12_root_signature *unsafe_impl_from_ID3D12RootSignature(ID3D12RootSignature *iface) DECLSPEC_HIDDEN; + size_t bytecode_length, struct d3d12_root_signature **root_signature); +struct d3d12_root_signature *unsafe_impl_from_ID3D12RootSignature(ID3D12RootSignature *iface); int vkd3d_parse_root_signature_v_1_0(const struct vkd3d_shader_code *dxbc, - struct vkd3d_shader_versioned_root_signature_desc *desc) DECLSPEC_HIDDEN; + struct vkd3d_shader_versioned_root_signature_desc *desc); struct d3d12_graphics_pipeline_state { @@ -829,13 +829,13 @@ static inline bool d3d12_pipeline_state_has_unknown_dsv_format(struct d3d12_pipe } HRESULT d3d12_pipeline_state_create_compute(struct d3d12_device *device, - const D3D12_COMPUTE_PIPELINE_STATE_DESC *desc, struct d3d12_pipeline_state **state) DECLSPEC_HIDDEN; + const D3D12_COMPUTE_PIPELINE_STATE_DESC *desc, struct d3d12_pipeline_state **state); HRESULT d3d12_pipeline_state_create_graphics(struct d3d12_device *device, - const D3D12_GRAPHICS_PIPELINE_STATE_DESC *desc, struct d3d12_pipeline_state **state) DECLSPEC_HIDDEN; + const D3D12_GRAPHICS_PIPELINE_STATE_DESC *desc, struct d3d12_pipeline_state **state); VkPipeline d3d12_pipeline_state_get_or_create_pipeline(struct d3d12_pipeline_state *state, D3D12_PRIMITIVE_TOPOLOGY topology, const uint32_t *strides, VkFormat dsv_format, - VkRenderPass *vk_render_pass) DECLSPEC_HIDDEN; -struct d3d12_pipeline_state *unsafe_impl_from_ID3D12PipelineState(ID3D12PipelineState *iface) DECLSPEC_HIDDEN; + VkRenderPass *vk_render_pass); +struct d3d12_pipeline_state *unsafe_impl_from_ID3D12PipelineState(ID3D12PipelineState *iface); struct vkd3d_buffer { @@ -895,7 +895,7 @@ struct d3d12_command_allocator }; HRESULT d3d12_command_allocator_create(struct d3d12_device *device, - D3D12_COMMAND_LIST_TYPE type, struct d3d12_command_allocator **allocator) DECLSPEC_HIDDEN; + D3D12_COMMAND_LIST_TYPE type, struct d3d12_command_allocator **allocator); struct vkd3d_push_descriptor { @@ -987,7 +987,7 @@ struct d3d12_command_list HRESULT d3d12_command_list_create(struct d3d12_device *device, UINT node_mask, D3D12_COMMAND_LIST_TYPE type, ID3D12CommandAllocator *allocator_iface, - ID3D12PipelineState *initial_pipeline_state, struct d3d12_command_list **list) DECLSPEC_HIDDEN; + ID3D12PipelineState *initial_pipeline_state, struct d3d12_command_list **list); struct vkd3d_queue { @@ -1014,12 +1014,12 @@ struct vkd3d_queue VkSemaphore old_vk_semaphores[VKD3D_MAX_VK_SYNC_OBJECTS]; }; -VkQueue vkd3d_queue_acquire(struct vkd3d_queue *queue) DECLSPEC_HIDDEN; +VkQueue vkd3d_queue_acquire(struct vkd3d_queue *queue); HRESULT vkd3d_queue_create(struct d3d12_device *device, uint32_t family_index, const VkQueueFamilyProperties *properties, - struct vkd3d_queue **queue) DECLSPEC_HIDDEN; -void vkd3d_queue_destroy(struct vkd3d_queue *queue, struct d3d12_device *device) DECLSPEC_HIDDEN; -void vkd3d_queue_release(struct vkd3d_queue *queue) DECLSPEC_HIDDEN; + struct vkd3d_queue **queue); +void vkd3d_queue_destroy(struct vkd3d_queue *queue, struct d3d12_device *device); +void vkd3d_queue_release(struct vkd3d_queue *queue); /* ID3D12CommandQueue */ struct d3d12_command_queue @@ -1040,7 +1040,7 @@ struct d3d12_command_queue }; HRESULT d3d12_command_queue_create(struct d3d12_device *device, - const D3D12_COMMAND_QUEUE_DESC *desc, struct d3d12_command_queue **queue) DECLSPEC_HIDDEN; + const D3D12_COMMAND_QUEUE_DESC *desc, struct d3d12_command_queue **queue); /* ID3D12CommandSignature */ struct d3d12_command_signature @@ -1056,8 +1056,8 @@ struct d3d12_command_signature }; HRESULT d3d12_command_signature_create(struct d3d12_device *device, const D3D12_COMMAND_SIGNATURE_DESC *desc, - struct d3d12_command_signature **signature) DECLSPEC_HIDDEN; -struct d3d12_command_signature *unsafe_impl_from_ID3D12CommandSignature(ID3D12CommandSignature *iface) DECLSPEC_HIDDEN; + struct d3d12_command_signature **signature); +struct d3d12_command_signature *unsafe_impl_from_ID3D12CommandSignature(ID3D12CommandSignature *iface); /* NULL resources */ struct vkd3d_null_resources @@ -1076,9 +1076,9 @@ struct vkd3d_null_resources }; HRESULT vkd3d_init_null_resources(struct vkd3d_null_resources *null_resources, - struct d3d12_device *device) DECLSPEC_HIDDEN; + struct d3d12_device *device); void vkd3d_destroy_null_resources(struct vkd3d_null_resources *null_resources, - struct d3d12_device *device) DECLSPEC_HIDDEN; + struct d3d12_device *device); struct vkd3d_format_compatibility_list { @@ -1116,8 +1116,8 @@ struct vkd3d_uav_clear_state struct vkd3d_uav_clear_pipelines pipelines_uint; }; -HRESULT vkd3d_uav_clear_state_init(struct vkd3d_uav_clear_state *state, struct d3d12_device *device) DECLSPEC_HIDDEN; -void vkd3d_uav_clear_state_cleanup(struct vkd3d_uav_clear_state *state, struct d3d12_device *device) DECLSPEC_HIDDEN; +HRESULT vkd3d_uav_clear_state_init(struct vkd3d_uav_clear_state *state, struct d3d12_device *device); +void vkd3d_uav_clear_state_cleanup(struct vkd3d_uav_clear_state *state, struct d3d12_device *device); /* ID3D12Device */ struct d3d12_device @@ -1173,13 +1173,13 @@ struct d3d12_device }; HRESULT d3d12_device_create(struct vkd3d_instance *instance, - const struct vkd3d_device_create_info *create_info, struct d3d12_device **device) DECLSPEC_HIDDEN; + const struct vkd3d_device_create_info *create_info, struct d3d12_device **device); struct vkd3d_queue *d3d12_device_get_vkd3d_queue(struct d3d12_device *device, - D3D12_COMMAND_LIST_TYPE type) DECLSPEC_HIDDEN; -bool d3d12_device_is_uma(struct d3d12_device *device, bool *coherent) DECLSPEC_HIDDEN; + D3D12_COMMAND_LIST_TYPE type); +bool d3d12_device_is_uma(struct d3d12_device *device, bool *coherent); void d3d12_device_mark_as_removed(struct d3d12_device *device, HRESULT reason, - const char *message, ...) VKD3D_PRINTF_FUNC(3, 4) DECLSPEC_HIDDEN; -struct d3d12_device *unsafe_impl_from_ID3D12Device(ID3D12Device *iface) DECLSPEC_HIDDEN; + const char *message, ...) VKD3D_PRINTF_FUNC(3, 4); +struct d3d12_device *unsafe_impl_from_ID3D12Device(ID3D12Device *iface); static inline HRESULT d3d12_device_query_interface(struct d3d12_device *device, REFIID iid, void **object) { @@ -1254,15 +1254,15 @@ static inline bool vkd3d_format_is_compressed(const struct vkd3d_format *format) void vkd3d_format_copy_data(const struct vkd3d_format *format, const uint8_t *src, unsigned int src_row_pitch, unsigned int src_slice_pitch, uint8_t *dst, unsigned int dst_row_pitch, - unsigned int dst_slice_pitch, unsigned int w, unsigned int h, unsigned int d) DECLSPEC_HIDDEN; + unsigned int dst_slice_pitch, unsigned int w, unsigned int h, unsigned int d); const struct vkd3d_format *vkd3d_get_format(const struct d3d12_device *device, - DXGI_FORMAT dxgi_format, bool depth_stencil) DECLSPEC_HIDDEN; + DXGI_FORMAT dxgi_format, bool depth_stencil); const struct vkd3d_format *vkd3d_find_uint_format(const struct d3d12_device *device, - DXGI_FORMAT dxgi_format) DECLSPEC_HIDDEN; + DXGI_FORMAT dxgi_format); -HRESULT vkd3d_init_format_info(struct d3d12_device *device) DECLSPEC_HIDDEN; -void vkd3d_cleanup_format_info(struct d3d12_device *device) DECLSPEC_HIDDEN; +HRESULT vkd3d_init_format_info(struct d3d12_device *device); +void vkd3d_cleanup_format_info(struct d3d12_device *device); static inline const struct vkd3d_format *vkd3d_format_from_d3d12_resource_desc( const struct d3d12_device *device, const D3D12_RESOURCE_DESC *desc, DXGI_FORMAT view_format) @@ -1310,24 +1310,24 @@ static inline unsigned int vkd3d_compute_workgroup_count(unsigned int thread_cou return (thread_count + workgroup_size - 1) / workgroup_size; } -VkCompareOp vk_compare_op_from_d3d12(D3D12_COMPARISON_FUNC op) DECLSPEC_HIDDEN; -VkSampleCountFlagBits vk_samples_from_dxgi_sample_desc(const DXGI_SAMPLE_DESC *desc) DECLSPEC_HIDDEN; -VkSampleCountFlagBits vk_samples_from_sample_count(unsigned int sample_count) DECLSPEC_HIDDEN; +VkCompareOp vk_compare_op_from_d3d12(D3D12_COMPARISON_FUNC op); +VkSampleCountFlagBits vk_samples_from_dxgi_sample_desc(const DXGI_SAMPLE_DESC *desc); +VkSampleCountFlagBits vk_samples_from_sample_count(unsigned int sample_count); -bool is_valid_feature_level(D3D_FEATURE_LEVEL feature_level) DECLSPEC_HIDDEN; +bool is_valid_feature_level(D3D_FEATURE_LEVEL feature_level); -bool is_valid_resource_state(D3D12_RESOURCE_STATES state) DECLSPEC_HIDDEN; -bool is_write_resource_state(D3D12_RESOURCE_STATES state) DECLSPEC_HIDDEN; +bool is_valid_resource_state(D3D12_RESOURCE_STATES state); +bool is_write_resource_state(D3D12_RESOURCE_STATES state); HRESULT return_interface(void *iface, REFIID iface_iid, - REFIID requested_iid, void **object) DECLSPEC_HIDDEN; + REFIID requested_iid, void **object); -const char *debug_d3d12_box(const D3D12_BOX *box) DECLSPEC_HIDDEN; -const char *debug_d3d12_shader_component_mapping(unsigned int mapping) DECLSPEC_HIDDEN; -const char *debug_vk_extent_3d(VkExtent3D extent) DECLSPEC_HIDDEN; -const char *debug_vk_memory_heap_flags(VkMemoryHeapFlags flags) DECLSPEC_HIDDEN; -const char *debug_vk_memory_property_flags(VkMemoryPropertyFlags flags) DECLSPEC_HIDDEN; -const char *debug_vk_queue_flags(VkQueueFlags flags) DECLSPEC_HIDDEN; +const char *debug_d3d12_box(const D3D12_BOX *box); +const char *debug_d3d12_shader_component_mapping(unsigned int mapping); +const char *debug_vk_extent_3d(VkExtent3D extent); +const char *debug_vk_memory_heap_flags(VkMemoryHeapFlags flags); +const char *debug_vk_memory_property_flags(VkMemoryPropertyFlags flags); +const char *debug_vk_queue_flags(VkQueueFlags flags); static inline void debug_ignored_node_mask(unsigned int mask) { @@ -1336,15 +1336,15 @@ static inline void debug_ignored_node_mask(unsigned int mask) } HRESULT vkd3d_load_vk_global_procs(struct vkd3d_vk_global_procs *procs, - PFN_vkGetInstanceProcAddr vkGetInstanceProcAddr) DECLSPEC_HIDDEN; + PFN_vkGetInstanceProcAddr vkGetInstanceProcAddr); HRESULT vkd3d_load_vk_instance_procs(struct vkd3d_vk_instance_procs *procs, - const struct vkd3d_vk_global_procs *global_procs, VkInstance instance) DECLSPEC_HIDDEN; + const struct vkd3d_vk_global_procs *global_procs, VkInstance instance); HRESULT vkd3d_load_vk_device_procs(struct vkd3d_vk_device_procs *procs, - const struct vkd3d_vk_instance_procs *parent_procs, VkDevice device) DECLSPEC_HIDDEN; + const struct vkd3d_vk_instance_procs *parent_procs, VkDevice device); extern const char vkd3d_build[]; -bool vkd3d_get_program_name(char program_name[PATH_MAX]) DECLSPEC_HIDDEN; +bool vkd3d_get_program_name(char program_name[PATH_MAX]); static inline void vkd3d_set_thread_name(const char *name) { @@ -1356,9 +1356,9 @@ static inline void vkd3d_set_thread_name(const char *name) } VkResult vkd3d_set_vk_object_name_utf8(struct d3d12_device *device, uint64_t vk_object, - VkDebugReportObjectTypeEXT vk_object_type, const char *name) DECLSPEC_HIDDEN; + VkDebugReportObjectTypeEXT vk_object_type, const char *name); HRESULT vkd3d_set_vk_object_name(struct d3d12_device *device, uint64_t vk_object, - VkDebugReportObjectTypeEXT vk_object_type, const WCHAR *name) DECLSPEC_HIDDEN; + VkDebugReportObjectTypeEXT vk_object_type, const WCHAR *name); static inline void vk_prepend_struct(void *header, void *structure) { -- 2.28.0

5 6

[PATCH 1/7] include: Update _XSTATE_CONFIGURATION structure definition.
by Paul Gofman May 27, 2021

May 27, 2021

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- include/ddk/wdm.h | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 9fcb1387012..b8bb7bd971f 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1207,16 +1207,24 @@ typedef enum _ALTERNATIVE_ARCHITECTURE_TYPE typedef struct _XSTATE_FEATURE { - ULONG Offset; - ULONG Size; + ULONG Offset; + ULONG Size; } XSTATE_FEATURE, *PXSTATE_FEATURE; typedef struct _XSTATE_CONFIGURATION { - ULONG64 EnabledFeatures; - ULONG Size; - ULONG OptimizedSave:1; - XSTATE_FEATURE Features[MAXIMUM_XSTATE_FEATURES]; + ULONG64 EnabledFeatures; + ULONG64 EnabledVolatileFeatures; + ULONG Size; + ULONG OptimizedSave:1; + ULONG CompactionEnabled:1; + XSTATE_FEATURE Features[MAXIMUM_XSTATE_FEATURES]; + + ULONG64 EnabledSupervisorFeatures; + ULONG64 AlignedFeatures; + ULONG AllFeatureSize; + ULONG AllFeatures[MAXIMUM_XSTATE_FEATURES]; + ULONG64 EnabledUserVisibleSupervisorFeatures; } XSTATE_CONFIGURATION, *PXSTATE_CONFIGURATION; typedef struct _KUSER_SHARED_DATA { -- 2.26.2

3 16

[PATCH] winex11: Allow user to set WM_CLASS
by Nicholas Little May 26, 2021

May 26, 2021

This commit allows the user to optionally set the WM_CLASS by setting an environment variable WINEWMCLASS with the aim of allowing him to ensure desktop environments can correctly identify wine windows, unfortunately the executable filename isn't always sufficient as some programs share a common executable name. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50095 --- dlls/winex11.drv/window.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 457173964eb..6b87166c830 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -837,6 +837,7 @@ static void set_initial_wm_hints( Display *display, Window window ) Atom protocols[3]; Atom dndVersion = WINE_XDND_VERSION; XClassHint *class_hints; + char *wine_wm_class; /* wm protocols */ i = 0; @@ -849,8 +850,9 @@ static void set_initial_wm_hints( Display *display, Window window ) /* class hints */ if ((class_hints = XAllocClassHint())) { + wine_wm_class = getenv( "WINEWMCLASS" ); class_hints->res_name = process_name; - class_hints->res_class = process_name; + class_hints->res_class = wine_wm_class ? wine_wm_class : process_name; XSetClassHint( display, window, class_hints ); XFree( class_hints ); } -- 2.26.2

2 2

[PATCH] user32: Keep toplevel minimized windows offscreen if they're already.
by Gabriel Ivăncescu Feb. 4, 2021

Feb. 4, 2021

Some applications (e.g. Lego Worlds) use (-32000,-32000) to determine whether a window is minimized. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/user32/tests/win.c | 52 +++++++++++++++++++++++++++++++++++++++++ dlls/user32/winpos.c | 8 +++++++ 2 files changed, 60 insertions(+) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 843da89..19a0db2 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -11593,6 +11593,58 @@ todo_wine ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", wine_dbgstr_rect(&wp.rcNormalPosition)); + wp.flags = WPF_SETMINPOSITION; + wp.showCmd = SW_NORMAL; + wp.ptMinPosition.x = wp.ptMinPosition.y = 100; + wp.ptMaxPosition.x = wp.ptMaxPosition.y = 100; + wp.rcNormalPosition = orig; + ret = SetWindowPlacement(hwnd, &wp); + ok(ret, "failed to set window placement, error %u\n", GetLastError()); + + ShowWindow(hwnd, SW_MINIMIZE); + + ret = GetWindowPlacement(hwnd, &wp); + ok(ret, "failed to get window placement, error %u\n", GetLastError()); + ok(wp.showCmd == SW_SHOWMINIMIZED, "got show cmd %u\n", wp.showCmd); + ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, + "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); +todo_wine + ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, + "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); + ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", + wine_dbgstr_rect(&wp.rcNormalPosition)); + + ret = SetWindowPos(hwnd, NULL, 100, 100, 151, 151, SWP_NOACTIVATE | SWP_NOZORDER); + ok(ret, "failed to set window pos, error %u\n", GetLastError()); + + ret = GetWindowPlacement(hwnd, &wp); + ok(ret, "failed to get window placement, error %u\n", GetLastError()); + ok(wp.showCmd == SW_SHOWMINIMIZED, "got show cmd %u\n", wp.showCmd); + ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, + "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); +todo_wine + ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, + "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); + ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", + wine_dbgstr_rect(&wp.rcNormalPosition)); + GetWindowRect(hwnd, &rect); + ok(rect.left == -32000 && rect.top == -32000, "got window rect %s\n", wine_dbgstr_rect(&rect)); + + ShowWindow(hwnd, SW_SHOWNORMAL); + + ret = GetWindowPlacement(hwnd, &wp); + ok(ret, "failed to get window placement, error %u\n", GetLastError()); + ok(wp.showCmd == SW_NORMAL, "got show cmd %u\n", wp.showCmd); + ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, + "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); +todo_wine + ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, + "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); + ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", + wine_dbgstr_rect(&wp.rcNormalPosition)); + GetWindowRect(hwnd, &rect); + ok(EqualRect(&rect, &orig), "got window rect %s\n", wine_dbgstr_rect(&rect)); + DestroyWindow(hwnd); } diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index b45b74c..3ccd939 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -1688,6 +1688,14 @@ static BOOL SWP_DoWinPosChanging( WINDOWPOS *pWinpos, RECT *old_window_rect, REC } if (!(pWinpos->flags & SWP_NOMOVE)) { + /* If the window is toplevel minimized off-screen, force keep it there */ + if ((wndPtr->dwStyle & WS_MINIMIZE) && + wndPtr->window_rect.left <= -32000 && wndPtr->window_rect.top <= -32000 && + (!wndPtr->parent || wndPtr->parent == GetDesktopWindow())) + { + pWinpos->x = -32000; + pWinpos->y = -32000; + } new_window_rect->left = pWinpos->x; new_window_rect->top = pWinpos->y; new_window_rect->right += pWinpos->x - old_window_rect->left; -- 2.21.0

3 3

[PATCH] msi: Also set "MsiRunningElevated" installer property.
by Dmitry Timoshkov Jan. 21, 2021

Jan. 21, 2021

This property is supposed to be set starting from Windows Installer 4.0 targeting Windows Vista. This patch fixes the installer that checks this property in addition to VersionNT and ALLUSERS. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/msi/package.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 2483d99e2b..25e22f040a 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -737,6 +737,7 @@ static VOID set_installer_properties(MSIPACKAGE *package) /* in a wine environment the user is always admin and privileged */ msi_set_property( package->db, L"AdminUser", L"1", -1 ); msi_set_property( package->db, L"Privileged", L"1", -1 ); + msi_set_property( package->db, L"MsiRunningElevated", L"1", -1 ); /* set the os things */ OSVersion.dwOSVersionInfoSize = sizeof(OSVersion); @@ -963,6 +964,8 @@ void msi_adjust_privilege_properties( MSIPACKAGE *package ) msi_set_property( package->db, L"ALLUSERS", L"1", -1 ); } msi_set_property( package->db, L"AdminUser", L"1", -1 ); + msi_set_property( package->db, L"Privileged", L"1", -1 ); + msi_set_property( package->db, L"MsiRunningElevated", L"1", -1 ); } MSIPACKAGE *MSI_CreatePackage( MSIDATABASE *db ) -- 2.29.2

2 1

[PATCH 1/2] wbemprox: Add class SystemRestore stub implementation.
by Dmitry Timoshkov Jan. 19, 2021

Jan. 19, 2021

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50033 Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wbemprox/Makefile.in | 1 + dlls/wbemprox/builtin.c | 38 ++++++++++++++++++++ dlls/wbemprox/sysrestore.c | 62 ++++++++++++++++++++++++++++++++ dlls/wbemprox/tests/query.c | 7 ++-- dlls/wbemprox/wbemprox_private.h | 5 +++ 5 files changed, 111 insertions(+), 2 deletions(-) create mode 100644 dlls/wbemprox/sysrestore.c diff --git a/dlls/wbemprox/Makefile.in b/dlls/wbemprox/Makefile.in index a26c833878..ed2710f885 100644 --- a/dlls/wbemprox/Makefile.in +++ b/dlls/wbemprox/Makefile.in @@ -14,6 +14,7 @@ C_SRCS = \ security.c \ service.c \ services.c \ + sysrestore.c \ table.c \ wbemlocator.c diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 9bd58ca77e..1924598bbe 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -406,6 +406,20 @@ static const struct column col_systemsecurity[] = { L"GetSD", CIM_FLAG_ARRAY|COL_FLAG_METHOD }, { L"SetSD", CIM_FLAG_ARRAY|COL_FLAG_METHOD }, }; +static const struct column col_sysrestore[] = +{ + { L"CreationTime", CIM_STRING }, + { L"Description", CIM_STRING }, + { L"EventType", CIM_UINT32 }, + { L"RestorePointType", CIM_UINT32 }, + { L"SequenceNumber", CIM_UINT32 }, + /* methods */ + { L"CreateRestorePoint", CIM_FLAG_ARRAY|COL_FLAG_METHOD }, + { L"Disable", CIM_FLAG_ARRAY|COL_FLAG_METHOD }, + { L"Enable", CIM_FLAG_ARRAY|COL_FLAG_METHOD }, + { L"GetLastRestoreStatus", CIM_FLAG_ARRAY|COL_FLAG_METHOD }, + { L"Restore", CIM_FLAG_ARRAY|COL_FLAG_METHOD }, +}; static const struct column col_videocontroller[] = { { L"AdapterCompatibility", CIM_STRING }, @@ -783,6 +797,19 @@ struct record_stdregprov class_method *enumvalues; class_method *getstringvalue; }; +struct record_sysrestore +{ + const WCHAR *creation_time; + const WCHAR *description; + UINT32 event_type; + UINT32 restore_point_type; + UINT32 seuence_number; + class_method *create_restore_point; + class_method *disable_restore; + class_method *enable_restore; + class_method *get_last_restore_status; + class_method *restore; +}; struct record_systemsecurity { class_method *getsd; @@ -865,6 +892,10 @@ static const struct record_param data_param[] = { L"StdRegProv", L"GetStringValue", 1, L"sValueName", CIM_STRING }, { L"StdRegProv", L"GetStringValue", -1, L"ReturnValue", CIM_UINT32 }, { L"StdRegProv", L"GetStringValue", -1, L"sValue", CIM_STRING }, + { L"SystemRestore", L"Disable", 1, L"Drive", CIM_STRING }, + { L"SystemRestore", L"Disable", -1, L"ReturnValue", CIM_UINT32 }, + { L"SystemRestore", L"Enable", 1, L"Drive", CIM_STRING }, + { L"SystemRestore", L"Enable", -1, L"ReturnValue", CIM_UINT32 }, { L"Win32_Process", L"GetOwner", -1, L"ReturnValue", CIM_UINT32 }, { L"Win32_Process", L"GetOwner", -1, L"User", CIM_STRING }, { L"Win32_Process", L"GetOwner", -1, L"Domain", CIM_STRING }, @@ -895,6 +926,12 @@ static const struct record_stdregprov data_stdregprov[] = { { reg_create_key, reg_enum_key, reg_enum_values, reg_get_stringvalue } }; + +static const struct record_sysrestore data_sysrestore[] = +{ + { NULL, NULL, 0, 0, 0, create_restore_point, disable_restore, enable_restore, get_last_restore_status, restore } +}; + static UINT16 systemenclosure_chassistypes[] = { 1, @@ -3981,6 +4018,7 @@ static struct table builtin_classes[] = { L"CIM_LogicalDisk", C(col_logicaldisk), 0, 0, NULL, fill_logicaldisk }, { L"CIM_Processor", C(col_processor), 0, 0, NULL, fill_processor }, { L"StdRegProv", C(col_stdregprov), D(data_stdregprov) }, + { L"SystemRestore", C(col_sysrestore), D(data_sysrestore) }, { L"Win32_BIOS", C(col_bios), 0, 0, NULL, fill_bios }, { L"Win32_BaseBoard", C(col_baseboard), 0, 0, NULL, fill_baseboard }, { L"Win32_CDROMDrive", C(col_cdromdrive), 0, 0, NULL, fill_cdromdrive }, diff --git a/dlls/wbemprox/sysrestore.c b/dlls/wbemprox/sysrestore.c new file mode 100644 index 0000000000..b840d220b5 --- /dev/null +++ b/dlls/wbemprox/sysrestore.c @@ -0,0 +1,62 @@ +/* + * SystemRestore implementation + * + * Copyright 2020 Dmitry Timoshkov + * + * 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 + */ + +#define COBJMACROS + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wbemcli.h" + +#include "wine/debug.h" +#include "wbemprox_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wbemprox); + +HRESULT create_restore_point( IWbemClassObject *obj, IWbemClassObject *in, IWbemClassObject **out ) +{ + FIXME("stub\n"); + return S_OK; +} + +HRESULT disable_restore( IWbemClassObject *obj, IWbemClassObject *in, IWbemClassObject **out ) +{ + FIXME("stub\n"); + return S_OK; +} + +HRESULT enable_restore( IWbemClassObject *obj, IWbemClassObject *in, IWbemClassObject **out ) +{ + FIXME("stub\n"); + return S_OK; +} + +HRESULT get_last_restore_status( IWbemClassObject *obj, IWbemClassObject *in, IWbemClassObject **out ) +{ + FIXME("stub\n"); + return E_NOTIMPL; +} + +HRESULT restore( IWbemClassObject *obj, IWbemClassObject *in, IWbemClassObject **out ) +{ + FIXME("stub\n"); + return S_OK; +} diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 37b6fb4e8d..1c7a615dd4 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1772,16 +1772,19 @@ static void test_SystemRestore( IWbemServices *services ) hr = IWbemServices_GetObject( services, class, 0, NULL, &service, NULL ); if (hr != S_OK) { - skip( "SystemRestore not available\n" ); + win_skip( "SystemRestore not available\n" ); SysFreeString( class ); return; } check_property( service, L"CreationTime", VT_NULL, CIM_STRING ); check_property( service, L"Description", VT_NULL, CIM_STRING ); + if (0) /* FIXME */ + { check_property( service, L"EventType", VT_NULL, CIM_UINT32 ); check_property( service, L"RestorePointType", VT_NULL, CIM_UINT32 ); check_property( service, L"SequenceNumber", VT_NULL, CIM_UINT32 ); + } method = SysAllocString( L"Enable" ); sig_in = NULL; @@ -1802,7 +1805,7 @@ static void test_SystemRestore( IWbemServices *services ) out = NULL; hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, in, &out, NULL ); ok( hr == S_OK || hr == WBEM_E_ACCESS_DENIED, "failed to execute method %08x\n", hr ); - if (hr == S_OK) + if (hr == S_OK && out) { VariantInit( &var ); hr = IWbemClassObject_Get( out, L"ReturnValue", 0, &var, NULL, NULL ); diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index 3064925764..ff9a7f6ff8 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -253,6 +253,11 @@ HRESULT service_start_service(IWbemClassObject *, IWbemClassObject *, IWbemClass HRESULT service_stop_service(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; HRESULT security_get_sd(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; HRESULT security_set_sd(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; +HRESULT create_restore_point(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; +HRESULT disable_restore(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; +HRESULT enable_restore(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; +HRESULT get_last_restore_status(IWbemClassObject *, IWbemClassObject *in, IWbemClassObject **) DECLSPEC_HIDDEN; +HRESULT restore(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; static inline WCHAR *heap_strdupW( const WCHAR *src ) { -- 2.29.2

1 1

[PATCH 1/4] ddraw/tests: Don't test functions directly when reporting GetLastError()
by André Hentschel Jan. 6, 2021

Jan. 6, 2021

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/ddraw/tests/ddraw1.c | 28 +++++++++++++++++++--------- dlls/ddraw/tests/ddraw2.c | 28 +++++++++++++++++++--------- dlls/ddraw/tests/ddraw4.c | 28 +++++++++++++++++++--------- dlls/ddraw/tests/ddraw7.c | 28 +++++++++++++++++++--------- 4 files changed, 76 insertions(+), 36 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index e1a315f291f..df5c8ac8400 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -13964,6 +13964,7 @@ static void test_cursor_clipping(void) IDirectDraw *ddraw; HWND window; HRESULT hr; + BOOL ret; window = create_window(); ok(!!window, "Failed to create a window.\n"); @@ -13986,9 +13987,11 @@ static void test_cursor_clipping(void) goto done; } - ok(ClipCursor(NULL), "ClipCursor failed, error %#x.\n", GetLastError()); + ret = ClipCursor(NULL); + ok(ret, "ClipCursor failed, error %#x.\n", GetLastError()); get_virtual_rect(&rect); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -13997,7 +14000,8 @@ static void test_cursor_clipping(void) ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#x.\n", hr); flush_events(); get_virtual_rect(&rect); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -14010,7 +14014,8 @@ static void test_cursor_clipping(void) } flush_events(); get_virtual_rect(&rect); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -14018,7 +14023,8 @@ static void test_cursor_clipping(void) ok(hr == DD_OK, "RestoreDisplayMode failed, hr %#x.\n", hr); flush_events(); get_virtual_rect(&rect); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -14027,7 +14033,8 @@ static void test_cursor_clipping(void) ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#x.\n", hr); flush_events(); SetRect(&rect, 0, 0, param.old_width, param.old_height); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -14040,7 +14047,8 @@ static void test_cursor_clipping(void) } flush_events(); SetRect(&rect, 0, 0, param.new_width, param.new_height); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -14049,7 +14057,8 @@ static void test_cursor_clipping(void) ok(hr == DD_OK, "RestoreDisplayMode failed, hr %#x.\n", hr); flush_events(); SetRect(&rect, 0, 0, param.old_width, param.old_height); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -14058,7 +14067,8 @@ static void test_cursor_clipping(void) ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#x.\n", hr); flush_events(); get_virtual_rect(&rect); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 849d510a349..bc915c97864 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -14925,6 +14925,7 @@ static void test_cursor_clipping(void) IDirectDraw2 *ddraw; HWND window; HRESULT hr; + BOOL ret; window = create_window(); ok(!!window, "Failed to create a window.\n"); @@ -14947,9 +14948,11 @@ static void test_cursor_clipping(void) goto done; } - ok(ClipCursor(NULL), "ClipCursor failed, error %#x.\n", GetLastError()); + ret = ClipCursor(NULL); + ok(ret, "ClipCursor failed, error %#x.\n", GetLastError()); get_virtual_rect(&rect); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -14958,7 +14961,8 @@ static void test_cursor_clipping(void) ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#x.\n", hr); flush_events(); get_virtual_rect(&rect); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -14971,7 +14975,8 @@ static void test_cursor_clipping(void) } flush_events(); get_virtual_rect(&rect); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -14979,7 +14984,8 @@ static void test_cursor_clipping(void) ok(hr == DD_OK, "RestoreDisplayMode failed, hr %#x.\n", hr); flush_events(); get_virtual_rect(&rect); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -14988,7 +14994,8 @@ static void test_cursor_clipping(void) ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#x.\n", hr); flush_events(); SetRect(&rect, 0, 0, param.old_width, param.old_height); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -15001,7 +15008,8 @@ static void test_cursor_clipping(void) } flush_events(); SetRect(&rect, 0, 0, param.new_width, param.new_height); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -15010,7 +15018,8 @@ static void test_cursor_clipping(void) ok(hr == DD_OK, "RestoreDisplayMode failed, hr %#x.\n", hr); flush_events(); SetRect(&rect, 0, 0, param.old_width, param.old_height); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -15019,7 +15028,8 @@ static void test_cursor_clipping(void) ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#x.\n", hr); flush_events(); get_virtual_rect(&rect); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 56a4777add5..f009b4583f4 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -17985,6 +17985,7 @@ static void test_cursor_clipping(void) IDirectDraw4 *ddraw; HWND window; HRESULT hr; + BOOL ret; window = create_window(); ok(!!window, "Failed to create a window.\n"); @@ -18007,9 +18008,11 @@ static void test_cursor_clipping(void) goto done; } - ok(ClipCursor(NULL), "ClipCursor failed, error %#x.\n", GetLastError()); + ret = ClipCursor(NULL); + ok(ret, "ClipCursor failed, error %#x.\n", GetLastError()); get_virtual_rect(&rect); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -18018,7 +18021,8 @@ static void test_cursor_clipping(void) ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#x.\n", hr); flush_events(); get_virtual_rect(&rect); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -18031,7 +18035,8 @@ static void test_cursor_clipping(void) } flush_events(); get_virtual_rect(&rect); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -18039,7 +18044,8 @@ static void test_cursor_clipping(void) ok(hr == DD_OK, "RestoreDisplayMode failed, hr %#x.\n", hr); flush_events(); get_virtual_rect(&rect); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -18048,7 +18054,8 @@ static void test_cursor_clipping(void) ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#x.\n", hr); flush_events(); SetRect(&rect, 0, 0, param.old_width, param.old_height); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -18061,7 +18068,8 @@ static void test_cursor_clipping(void) } flush_events(); SetRect(&rect, 0, 0, param.new_width, param.new_height); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -18070,7 +18078,8 @@ static void test_cursor_clipping(void) ok(hr == DD_OK, "RestoreDisplayMode failed, hr %#x.\n", hr); flush_events(); SetRect(&rect, 0, 0, param.old_width, param.old_height); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -18079,7 +18088,8 @@ static void test_cursor_clipping(void) ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#x.\n", hr); flush_events(); get_virtual_rect(&rect); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index c9ba50287be..613f8dae98b 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -18247,6 +18247,7 @@ static void test_cursor_clipping(void) IDirectDraw7 *ddraw; HWND window; HRESULT hr; + BOOL ret; window = create_window(); ok(!!window, "Failed to create a window.\n"); @@ -18269,9 +18270,11 @@ static void test_cursor_clipping(void) goto done; } - ok(ClipCursor(NULL), "ClipCursor failed, error %#x.\n", GetLastError()); + ret = ClipCursor(NULL); + ok(ret, "ClipCursor failed, error %#x.\n", GetLastError()); get_virtual_rect(&rect); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -18280,7 +18283,8 @@ static void test_cursor_clipping(void) ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#x.\n", hr); flush_events(); get_virtual_rect(&rect); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -18293,7 +18297,8 @@ static void test_cursor_clipping(void) } flush_events(); get_virtual_rect(&rect); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -18301,7 +18306,8 @@ static void test_cursor_clipping(void) ok(hr == DD_OK, "RestoreDisplayMode failed, hr %#x.\n", hr); flush_events(); get_virtual_rect(&rect); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -18310,7 +18316,8 @@ static void test_cursor_clipping(void) ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#x.\n", hr); flush_events(); SetRect(&rect, 0, 0, param.old_width, param.old_height); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -18323,7 +18330,8 @@ static void test_cursor_clipping(void) } flush_events(); SetRect(&rect, 0, 0, param.new_width, param.new_height); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -18332,7 +18340,8 @@ static void test_cursor_clipping(void) ok(hr == DD_OK, "RestoreDisplayMode failed, hr %#x.\n", hr); flush_events(); SetRect(&rect, 0, 0, param.old_width, param.old_height); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -18341,7 +18350,8 @@ static void test_cursor_clipping(void) ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#x.\n", hr); flush_events(); get_virtual_rect(&rect); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); -- 2.25.1

4 12

[PATCH v3 1/3] winegstreamer: Unmap and unref the buffer and release the sample before returning.
by Anton Baskanov Jan. 4, 2021

Jan. 4, 2021

Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> --- dlls/winegstreamer/gstdemux.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 9114e6610a3..805a7b8c089 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -826,6 +826,9 @@ static GstFlowReturn got_data_sink(GstPad *pad, GstObject *parent, GstBuffer *bu hr = IMediaSample_SetActualDataLength(sample, info.size); if(FAILED(hr)){ + IMediaSample_Release(sample); + gst_buffer_unmap(buf, &info); + gst_buffer_unref(buf); WARN("SetActualDataLength failed: %08x\n", hr); return GST_FLOW_FLUSHING; } -- 2.25.1

3 5

[PATCH vkd3d v4 2/4] vkd3d-shader: Implement basic support for #if and #endif.
by Zebediah Figura Jan. 4, 2021

Jan. 4, 2021

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- v4: Tweak preproc_parse_integer() a bit. include/private/vkd3d_memory.h | 11 +++ libs/vkd3d-shader/preproc.h | 17 ++++ libs/vkd3d-shader/preproc.l | 106 +++++++++++++++++++++-- libs/vkd3d-shader/preproc.y | 102 +++++++++++++++++++++- libs/vkd3d-shader/vkd3d_shader_main.c | 24 +++++ libs/vkd3d-shader/vkd3d_shader_private.h | 6 ++ tests/hlsl_d3d12.c | 2 +- 7 files changed, 258 insertions(+), 10 deletions(-) diff --git a/include/private/vkd3d_memory.h b/include/private/vkd3d_memory.h index df93abf5..bd56d30a 100644 --- a/include/private/vkd3d_memory.h +++ b/include/private/vkd3d_memory.h @@ -22,6 +22,7 @@ #include <assert.h> #include <stdbool.h> #include <stdlib.h> +#include <string.h> #include "vkd3d_debug.h" @@ -54,6 +55,16 @@ static inline void vkd3d_free(void *ptr) free(ptr); } +static inline char *vkd3d_strdup(const char *string) +{ + size_t len = strlen(string) + 1; + char *ptr; + + if ((ptr = vkd3d_malloc(len))) + memcpy(ptr, string, len); + return ptr; +} + bool vkd3d_array_reserve(void **elements, size_t *capacity, size_t element_count, size_t element_size) DECLSPEC_HIDDEN; diff --git a/libs/vkd3d-shader/preproc.h b/libs/vkd3d-shader/preproc.h index bd9dfdd3..0f494fcd 100644 --- a/libs/vkd3d-shader/preproc.h +++ b/libs/vkd3d-shader/preproc.h @@ -23,6 +23,12 @@ #include "vkd3d_shader_private.h" +struct preproc_if_state +{ + /* Are we currently in a "true" block? */ + bool current_true; +}; + struct preproc_ctx { void *scanner; @@ -31,7 +37,18 @@ struct preproc_ctx struct vkd3d_string_buffer buffer; struct vkd3d_shader_location location; + struct preproc_if_state *if_stack; + size_t if_count, if_stack_size; + + int current_directive; + + bool last_was_newline; + bool last_was_eof; + bool error; }; +void preproc_warning(struct preproc_ctx *ctx, const struct vkd3d_shader_location *loc, + enum vkd3d_shader_error error, const char *format, ...) VKD3D_PRINTF_FUNC(4, 5) DECLSPEC_HIDDEN; + #endif diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l index b406af09..c60970cd 100644 --- a/libs/vkd3d-shader/preproc.l +++ b/libs/vkd3d-shader/preproc.l @@ -50,6 +50,7 @@ static void update_location(struct preproc_ctx *ctx); %s C_COMMENT %s CXX_COMMENT +NEWLINE \r?\n WS [ \t] IDENTIFIER [A-Za-z_][A-Za-z0-9_]* @@ -57,10 +58,10 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]* <INITIAL>"//" {yy_push_state(CXX_COMMENT, yyscanner);} <INITIAL>"/*" {yy_push_state(C_COMMENT, yyscanner);} -<CXX_COMMENT>\\\r?\n {} +<CXX_COMMENT>\\{NEWLINE} {} <CXX_COMMENT>\n { yy_pop_state(yyscanner); - return T_TEXT; + return T_NEWLINE; } <C_COMMENT>"*/" {yy_pop_state(yyscanner);} <C_COMMENT,CXX_COMMENT><<EOF>> {yy_pop_state(yyscanner);} @@ -68,13 +69,15 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]* <INITIAL>{IDENTIFIER} {return T_TEXT;} + /* We have no use for floats, but shouldn't parse them as integers. */ + <INITIAL>[0-9]*\.[0-9]+([eE][+-]?[0-9]+)?[hHfF]? {return T_TEXT;} <INITIAL>[0-9]+\.([eE][+-]?[0-9]+)?[hHfF]? {return T_TEXT;} <INITIAL>[0-9]+([eE][+-]?[0-9]+)?[hHfF] {return T_TEXT;} <INITIAL>[0-9]+[eE][+-]?[0-9]+ {return T_TEXT;} -<INITIAL>0[xX][0-9a-fA-f]+[ul]{0,2} {return T_TEXT;} -<INITIAL>0[0-7]*[ul]{0,2} {return T_TEXT;} -<INITIAL>[1-9][0-9]*[ul]{0,2} {return T_TEXT;} +<INITIAL>0[xX][0-9a-fA-f]+[ul]{0,2} {return T_INTEGER;} +<INITIAL>0[0-7]*[ul]{0,2} {return T_INTEGER;} +<INITIAL>[1-9][0-9]*[ul]{0,2} {return T_INTEGER;} <INITIAL>"&&" {return T_TEXT;} <INITIAL>"||" {return T_TEXT;} @@ -87,6 +90,29 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]* /* C strings (including escaped quotes). */ <INITIAL>\"([^"\\]|\\.)*\" {return T_TEXT;} +<INITIAL>#{WS}*{IDENTIFIER} { + struct preproc_ctx *ctx = yyget_extra(yyscanner); + const char *p; + + if (!ctx->last_was_newline) + return T_TEXT; + + for (p = yytext + 1; strchr(" \t", *p); ++p) + ; + + if (!strcmp(p, "endif")) + return T_ENDIF; + if (!strcmp(p, "if")) + return T_IF; + + preproc_warning(ctx, yyget_lloc(yyscanner), VKD3D_SHADER_WARNING_PP_UNKNOWN_DIRECTIVE, + "Ignoring unknown directive \"%s\".", yytext); + return T_TEXT; + } + +<INITIAL>\\{NEWLINE} {} +<INITIAL>{NEWLINE} {return T_NEWLINE;} + <INITIAL>{WS}+ {} <INITIAL>. {return T_TEXT;} @@ -113,6 +139,27 @@ static void update_location(struct preproc_ctx *ctx) } } +static bool preproc_is_writing(struct preproc_ctx *ctx) +{ + if (!ctx->if_count) + return true; + return ctx->if_stack[ctx->if_count - 1].current_true; +} + +static int return_token(int token, YYSTYPE *lval, const char *text) +{ + switch (token) + { + case T_INTEGER: + case T_TEXT: + if (!(lval->string = vkd3d_strdup(text))) + return 0; + break; + } + + return token; +} + int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner) { struct preproc_ctx *ctx = yyget_extra(scanner); @@ -122,11 +169,44 @@ int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner) const char *text; int token; - if (!(token = preproc_lexer_lex(lval, lloc, scanner))) + if (ctx->last_was_eof) return 0; - text = yyget_text(scanner); - TRACE("Parsing token %d, line %d, string %s.\n", token, lloc->line, debugstr_a(text)); + if (!(token = preproc_lexer_lex(lval, lloc, scanner))) + { + ctx->last_was_eof = true; + token = T_NEWLINE; + text = "\n"; + } + else + { + text = yyget_text(scanner); + } + + if (ctx->last_was_newline) + { + switch (token) + { + case T_ENDIF: + case T_IF: + ctx->current_directive = token; + break; + + default: + ctx->current_directive = 0; + } + } + + ctx->last_was_newline = (token == T_NEWLINE); + + TRACE("Parsing token %d, line %d, in directive %d, string %s.\n", + token, lloc->line, ctx->current_directive, debugstr_a(text)); + + if (!ctx->current_directive && !preproc_is_writing(ctx)) + continue; + + if (ctx->current_directive) + return return_token(token, lval, text); vkd3d_string_buffer_printf(&ctx->buffer, "%s ", text); } @@ -147,12 +227,22 @@ int preproc_lexer_parse(const struct vkd3d_shader_compile_info *compile_info, yylex_init_extra(&ctx, &ctx.scanner); top_buffer = yy_scan_bytes(compile_info->source.code, compile_info->source.size, ctx.scanner); + ctx.last_was_newline = true; preproc_yyparse(ctx.scanner, &ctx); yy_delete_buffer(top_buffer, ctx.scanner); yylex_destroy(ctx.scanner); + if (ctx.if_count) + { + const struct vkd3d_shader_location loc = {.source_name = ctx.location.source_name}; + + preproc_warning(&ctx, &loc, VKD3D_SHADER_WARNING_PP_UNTERMINATED_IF, "Unterminated #if block."); + } + + vkd3d_free(ctx.if_stack); + if (ctx.error) { WARN("Failed to preprocess.\n"); diff --git a/libs/vkd3d-shader/preproc.y b/libs/vkd3d-shader/preproc.y index 16b84ea9..3dc7e7cb 100644 --- a/libs/vkd3d-shader/preproc.y +++ b/libs/vkd3d-shader/preproc.y @@ -51,11 +51,71 @@ static void preproc_error(struct preproc_ctx *ctx, const struct vkd3d_shader_loc ctx->error = true; } +void preproc_warning(struct preproc_ctx *ctx, const struct vkd3d_shader_location *loc, + enum vkd3d_shader_error error, const char *format, ...) +{ + va_list args; + + va_start(args, format); + vkd3d_shader_vwarning(ctx->message_context, loc, error, format, args); + va_end(args); +} + static void yyerror(const YYLTYPE *loc, void *scanner, struct preproc_ctx *ctx, const char *string) { preproc_error(ctx, loc, VKD3D_SHADER_ERROR_PP_INVALID_SYNTAX, "%s", string); } +static bool preproc_was_writing(struct preproc_ctx *ctx) +{ + if (ctx->if_count < 2) + return true; + return ctx->if_stack[ctx->if_count - 2].current_true; +} + +static bool preproc_push_if(struct preproc_ctx *ctx, bool condition) +{ + struct preproc_if_state *state; + + if (!vkd3d_array_reserve((void **)&ctx->if_stack, &ctx->if_stack_size, ctx->if_count + 1, sizeof(*ctx->if_stack))) + return false; + state = &ctx->if_stack[ctx->if_count++]; + state->current_true = condition && preproc_was_writing(ctx); + return true; +} + +static int char_to_int(char c) +{ + if ('0' <= c && c <= '9') + return c - '0'; + if ('A' <= c && c <= 'F') + return c - 'A' + 10; + if ('a' <= c && c <= 'f') + return c - 'a' + 10; + return -1; +} + +static uint32_t preproc_parse_integer(const char *s) +{ + uint32_t base = 10, ret = 0; + int digit; + + if (*s == '0') + { + base = 8; + ++s; + if (*s == 'x' || *s == 'X') + { + base = 16; + ++s; + } + } + + while ((digit = char_to_int(*s++)) >= 0) + ret = ret * base + (uint32_t)digit; + return ret; +} + } %define api.prefix {preproc_yy} @@ -67,9 +127,49 @@ static void yyerror(const YYLTYPE *loc, void *scanner, struct preproc_ctx *ctx, %parse-param {void *scanner} %parse-param {struct preproc_ctx *ctx} -%token T_TEXT +%union +{ + char *string; + uint32_t integer; +} + +%token <string> T_INTEGER +%token <string> T_TEXT + +%token T_NEWLINE + +%token T_ENDIF "#endif" +%token T_IF "#if" + +%type <integer> expr %% shader_text : %empty + | shader_text directive + { + vkd3d_string_buffer_printf(&ctx->buffer, "\n"); + } + +directive + : T_IF expr T_NEWLINE + { + if (!preproc_push_if(ctx, !!$2)) + YYABORT; + } + | T_ENDIF T_NEWLINE + { + if (ctx->if_count) + --ctx->if_count; + else + preproc_warning(ctx, &@$, VKD3D_SHADER_WARNING_PP_INVALID_DIRECTIVE, + "Ignoring #endif without prior #if."); + } + +expr + : T_INTEGER + { + $$ = preproc_parse_integer($1); + vkd3d_free($1); + } diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 173ff170..df3b1a57 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -144,6 +144,30 @@ bool vkd3d_shader_message_context_copy_messages(struct vkd3d_shader_message_cont return true; } +void vkd3d_shader_vwarning(struct vkd3d_shader_message_context *context, const struct vkd3d_shader_location *location, + enum vkd3d_shader_error error, const char *format, va_list args) +{ + if (context->log_level < VKD3D_SHADER_LOG_WARNING) + return; + + if (location) + { + const char *source_name = location->source_name ? location->source_name : "<anonymous>"; + + if (location->line) + vkd3d_string_buffer_printf(&context->messages, "%s:%u:%u: W%04u: ", + source_name, location->line, location->column, error); + else + vkd3d_string_buffer_printf(&context->messages, "%s: W%04u: ", source_name, error); + } + else + { + vkd3d_string_buffer_printf(&context->messages, "W%04u: ", error); + } + vkd3d_string_buffer_vprintf(&context->messages, format, args); + vkd3d_string_buffer_printf(&context->messages, "\n"); +} + void vkd3d_shader_verror(struct vkd3d_shader_message_context *context, const struct vkd3d_shader_location *location, enum vkd3d_shader_error error, const char *format, va_list args) { diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 882a8060..b89d20e2 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -81,6 +81,10 @@ enum vkd3d_shader_error VKD3D_SHADER_ERROR_RS_MIXED_DESCRIPTOR_RANGE_TYPES = 3004, VKD3D_SHADER_ERROR_PP_INVALID_SYNTAX = 4000, + + VKD3D_SHADER_WARNING_PP_INVALID_DIRECTIVE = 4301, + VKD3D_SHADER_WARNING_PP_UNKNOWN_DIRECTIVE = 4303, + VKD3D_SHADER_WARNING_PP_UNTERMINATED_IF = 4305, }; enum VKD3D_SHADER_INSTRUCTION_HANDLER @@ -871,6 +875,8 @@ void vkd3d_shader_error(struct vkd3d_shader_message_context *context, const stru enum vkd3d_shader_error error, const char *format, ...) VKD3D_PRINTF_FUNC(4, 5) DECLSPEC_HIDDEN; void vkd3d_shader_verror(struct vkd3d_shader_message_context *context, const struct vkd3d_shader_location *location, enum vkd3d_shader_error error, const char *format, va_list args) DECLSPEC_HIDDEN; +void vkd3d_shader_vwarning(struct vkd3d_shader_message_context *context, const struct vkd3d_shader_location *location, + enum vkd3d_shader_error error, const char *format, va_list args) DECLSPEC_HIDDEN; int shader_extract_from_dxbc(const void *dxbc, size_t dxbc_length, struct vkd3d_shader_message_context *message_context, const char *source_name, diff --git a/tests/hlsl_d3d12.c b/tests/hlsl_d3d12.c index 61324fa9..77a7ea1a 100644 --- a/tests/hlsl_d3d12.c +++ b/tests/hlsl_d3d12.c @@ -414,7 +414,7 @@ static void test_preprocess(void) hr = D3DPreprocess(test_include_top, strlen(test_include_top), NULL, NULL, &test_include_fail, &blob, &errors); todo ok(hr == E_FAIL, "Got hr %#x.\n", hr); todo ok(blob == (ID3D10Blob *)0xdeadbeef, "Expected no compiled shader blob.\n"); - todo ok(!!errors, "Expected non-NULL error blob.\n"); + ok(!!errors, "Expected non-NULL error blob.\n"); if (errors) { if (vkd3d_test_state.debug_level) -- 2.29.2

2 1

[PATCH vkd3d v3 1/4] vkd3d-shader: Handle preprocessor parsing errors.
by Zebediah Figura Jan. 4, 2021

Jan. 4, 2021

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- v3: Use vkd3d_shader_location. In fact, use it also in struct preproc_ctx. Although there are conceptual reasons not to, for now it's more confusing when left distinct. libs/vkd3d-shader/preproc.h | 4 +++ libs/vkd3d-shader/preproc.l | 38 +++++++++++++++++++++++- libs/vkd3d-shader/preproc.y | 17 ++++++++++- libs/vkd3d-shader/vkd3d_shader_private.h | 2 ++ 4 files changed, 59 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/preproc.h b/libs/vkd3d-shader/preproc.h index cbd93229..bd9dfdd3 100644 --- a/libs/vkd3d-shader/preproc.h +++ b/libs/vkd3d-shader/preproc.h @@ -27,7 +27,11 @@ struct preproc_ctx { void *scanner; + struct vkd3d_shader_message_context *message_context; struct vkd3d_string_buffer buffer; + struct vkd3d_shader_location location; + + bool error; }; #endif diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l index 4d809b8f..b406af09 100644 --- a/libs/vkd3d-shader/preproc.l +++ b/libs/vkd3d-shader/preproc.l @@ -27,6 +27,10 @@ #define YY_DECL static int preproc_lexer_lex(YYSTYPE *yylval_param, YYLTYPE *yylloc_param, yyscan_t yyscanner) +static void update_location(struct preproc_ctx *ctx); + +#define YY_USER_ACTION update_location(yyget_extra(yyscanner)); + %} %option 8bit @@ -88,6 +92,27 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]* %% +static void update_location(struct preproc_ctx *ctx) +{ + unsigned int i, leng = yyget_leng(ctx->scanner); + const char *text = yyget_text(ctx->scanner); + + /* We want to do this here, rather than before calling yylex(), because + * some tokens are skipped by the lexer. */ + + *yyget_lloc(ctx->scanner) = ctx->location; + + for (i = 0; i < leng; ++i) + { + ++ctx->location.column; + if (text[i] == '\n') + { + ctx->location.column = 1; + ++ctx->location.line; + } + } +} + int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner) { struct preproc_ctx *ctx = yyget_extra(scanner); @@ -101,7 +126,7 @@ int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner) return 0; text = yyget_text(scanner); - TRACE("Parsing token %d, string %s.\n", token, debugstr_a(text)); + TRACE("Parsing token %d, line %d, string %s.\n", token, lloc->line, debugstr_a(text)); vkd3d_string_buffer_printf(&ctx->buffer, "%s ", text); } @@ -115,6 +140,10 @@ int preproc_lexer_parse(const struct vkd3d_shader_compile_info *compile_info, void *output_code; vkd3d_string_buffer_init(&ctx.buffer); + ctx.message_context = message_context; + ctx.location.source_name = compile_info->source_name; + ctx.location.line = 1; + ctx.location.column = 1; yylex_init_extra(&ctx, &ctx.scanner); top_buffer = yy_scan_bytes(compile_info->source.code, compile_info->source.size, ctx.scanner); @@ -124,6 +153,13 @@ int preproc_lexer_parse(const struct vkd3d_shader_compile_info *compile_info, yy_delete_buffer(top_buffer, ctx.scanner); yylex_destroy(ctx.scanner); + if (ctx.error) + { + WARN("Failed to preprocess.\n"); + vkd3d_string_buffer_cleanup(&ctx.buffer); + return VKD3D_ERROR_INVALID_SHADER; + } + if (!(output_code = vkd3d_malloc(ctx.buffer.content_size))) { vkd3d_string_buffer_cleanup(&ctx.buffer); diff --git a/libs/vkd3d-shader/preproc.y b/libs/vkd3d-shader/preproc.y index 92448f24..16b84ea9 100644 --- a/libs/vkd3d-shader/preproc.y +++ b/libs/vkd3d-shader/preproc.y @@ -24,6 +24,8 @@ #include "vkd3d_shader_private.h" #include "preproc.h" +#define PREPROC_YYLTYPE struct vkd3d_shader_location + } %code provides @@ -36,9 +38,22 @@ int preproc_yylex(PREPROC_YYSTYPE *yylval_param, PREPROC_YYLTYPE *yylloc_param, %code { +#define YYLLOC_DEFAULT(cur, rhs, n) (cur) = YYRHSLOC(rhs, !!n) + +static void preproc_error(struct preproc_ctx *ctx, const struct vkd3d_shader_location *loc, + enum vkd3d_shader_error error, const char *format, ...) +{ + va_list args; + + va_start(args, format); + vkd3d_shader_verror(ctx->message_context, loc, error, format, args); + va_end(args); + ctx->error = true; +} + static void yyerror(const YYLTYPE *loc, void *scanner, struct preproc_ctx *ctx, const char *string) { - FIXME("Error reporting is not implemented.\n"); + preproc_error(ctx, loc, VKD3D_SHADER_ERROR_PP_INVALID_SYNTAX, "%s", string); } } diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index e974b928..882a8060 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -79,6 +79,8 @@ enum vkd3d_shader_error VKD3D_SHADER_ERROR_RS_INVALID_ROOT_PARAMETER_TYPE = 3002, VKD3D_SHADER_ERROR_RS_INVALID_DESCRIPTOR_RANGE_TYPE = 3003, VKD3D_SHADER_ERROR_RS_MIXED_DESCRIPTOR_RANGE_TYPES = 3004, + + VKD3D_SHADER_ERROR_PP_INVALID_SYNTAX = 4000, }; enum VKD3D_SHADER_INSTRUCTION_HANDLER -- 2.29.2

4 11

[PATCH] wined3d: Use debug_d3dusage() for both usage and usage query flags.
by Zebediah Figura Jan. 4, 2021

Jan. 4, 2021

Avoid spurious FIXME messages in wined3d_check_device_format(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/directx.c | 4 ++-- dlls/wined3d/utils.c | 29 ++++++++--------------------- dlls/wined3d/wined3d_private.h | 1 - 3 files changed, 10 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index d35108710c2..2764b113065 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1692,10 +1692,10 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, DWORD format_flags = 0; DWORD allowed_usage; - TRACE("wined3d %p, adapter %p, device_type %s, adapter_format %s, usage %s, %s, " + TRACE("wined3d %p, adapter %p, device_type %s, adapter_format %s, usage %s, " "bind_flags %s, resource_type %s, check_format %s.\n", wined3d, adapter, debug_d3ddevicetype(device_type), debug_d3dformat(adapter_format_id), - debug_d3dusage(usage), debug_d3dusagequery(usage), wined3d_debug_bind_flags(bind_flags), + debug_d3dusage(usage), wined3d_debug_bind_flags(bind_flags), debug_d3dresourcetype(resource_type), debug_d3dformat(check_format_id)); adapter_format = wined3d_get_format(adapter, adapter_format_id, WINED3D_BIND_RENDER_TARGET); diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 88175d4bf26..4ec6e4db42d 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4710,6 +4710,14 @@ const char *debug_d3dusage(DWORD usage) WINED3DUSAGE_TO_STR(WINED3DUSAGE_OWNDC); WINED3DUSAGE_TO_STR(WINED3DUSAGE_STATICDECL); WINED3DUSAGE_TO_STR(WINED3DUSAGE_OVERLAY); + WINED3DUSAGE_TO_STR(WINED3DUSAGE_QUERY_FILTER); + WINED3DUSAGE_TO_STR(WINED3DUSAGE_QUERY_GENMIPMAP); + WINED3DUSAGE_TO_STR(WINED3DUSAGE_QUERY_LEGACYBUMPMAP); + WINED3DUSAGE_TO_STR(WINED3DUSAGE_QUERY_POSTPIXELSHADER_BLENDING); + WINED3DUSAGE_TO_STR(WINED3DUSAGE_QUERY_SRGBREAD); + WINED3DUSAGE_TO_STR(WINED3DUSAGE_QUERY_SRGBWRITE); + WINED3DUSAGE_TO_STR(WINED3DUSAGE_QUERY_VERTEXTEXTURE); + WINED3DUSAGE_TO_STR(WINED3DUSAGE_QUERY_WRAPANDMIP); #undef WINED3DUSAGE_TO_STR if (usage) FIXME("Unrecognized usage flag(s) %#x.\n", usage); @@ -4717,27 +4725,6 @@ const char *debug_d3dusage(DWORD usage) return wine_dbg_sprintf("%s", buffer.str); } -const char *debug_d3dusagequery(DWORD usage) -{ - struct debug_buffer buffer; - - init_debug_buffer(&buffer, "0"); -#define WINED3DUSAGEQUERY_TO_STR(x) if (usage & x) { debug_append(&buffer, #x, " | "); usage &= ~x; } - WINED3DUSAGEQUERY_TO_STR(WINED3DUSAGE_QUERY_FILTER); - WINED3DUSAGEQUERY_TO_STR(WINED3DUSAGE_QUERY_GENMIPMAP); - WINED3DUSAGEQUERY_TO_STR(WINED3DUSAGE_QUERY_LEGACYBUMPMAP); - WINED3DUSAGEQUERY_TO_STR(WINED3DUSAGE_QUERY_POSTPIXELSHADER_BLENDING); - WINED3DUSAGEQUERY_TO_STR(WINED3DUSAGE_QUERY_SRGBREAD); - WINED3DUSAGEQUERY_TO_STR(WINED3DUSAGE_QUERY_SRGBWRITE); - WINED3DUSAGEQUERY_TO_STR(WINED3DUSAGE_QUERY_VERTEXTEXTURE); - WINED3DUSAGEQUERY_TO_STR(WINED3DUSAGE_QUERY_WRAPANDMIP); -#undef WINED3DUSAGEQUERY_TO_STR - if (usage) - FIXME("Unrecognized usage query flag(s) %#x.\n", usage); - - return wine_dbg_sprintf("%s", buffer.str); -} - const char *debug_d3ddeclmethod(enum wined3d_decl_method method) { switch (method) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0749f95f998..bd848f61e32 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -5273,7 +5273,6 @@ const char *debug_d3dformat(enum wined3d_format_id format_id) DECLSPEC_HIDDEN; const char *debug_d3ddevicetype(enum wined3d_device_type device_type) DECLSPEC_HIDDEN; const char *debug_d3dresourcetype(enum wined3d_resource_type resource_type) DECLSPEC_HIDDEN; const char *debug_d3dusage(DWORD usage) DECLSPEC_HIDDEN; -const char *debug_d3dusagequery(DWORD usagequery) DECLSPEC_HIDDEN; const char *debug_d3ddeclmethod(enum wined3d_decl_method method) DECLSPEC_HIDDEN; const char *debug_d3ddeclusage(enum wined3d_decl_usage usage) DECLSPEC_HIDDEN; const char *debug_d3dinput_classification(enum wined3d_input_classification classification) DECLSPEC_HIDDEN; -- 2.29.2

2 1

[PATCH] user32: Send the WM_NCCALCSIZE message with wparam TRUE when creating a window.
by Haoyang Chen Dec. 31, 2020

Dec. 31, 2020

2 3

[PATCH] propkey.h: Added more PROPERTYKEY declarations.
by Biswapriyo Nath Dec. 31, 2020

Dec. 31, 2020

1 0

[PATCH] winedbg: Distinguish -0 from 0
by Qijia Liu Dec. 30, 2020

Dec. 30, 2020

1 0

[PATCH v2] po: Update Ukrainian translation.
by Andrey Gusev Dec. 30, 2020

Dec. 30, 2020

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- po/uk.po | 734 ++++++++++++++++++++++++------------------------------- 1 file changed, 317 insertions(+), 417 deletions(-) diff --git a/po/uk.po b/po/uk.po index 7ef7b4f29f6..d7b64f45a79 100644 --- a/po/uk.po +++ b/po/uk.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: 2019-12-09 22:24+0200\n" +"PO-Revision-Date: 2020-12-25 21:00+0200\n" "Last-Translator: Andrey Gusev <andrey.goosev(a)gmail.com>\n" "Language-Team: Ukrainian\n" "Language: uk\n" @@ -700,7 +700,7 @@ msgstr "Д&одаткові кольори:" #: dlls/comdlg32/comdlg32.rc:289 msgid "|S&olid" -msgstr "" +msgstr "|&Суцільний" #: dlls/comdlg32/comdlg32.rc:290 msgid "&Red:" @@ -737,11 +737,9 @@ msgid "&Define Custom Colors >>" msgstr "&Визначити колір >>" #: dlls/comdlg32/comdlg32.rc:312 -#, fuzzy -#| msgid "&No" msgctxt "Solid" -msgid "&o" -msgstr "&Ні" +msgid "&Sol" +msgstr "&Суц" #: dlls/comdlg32/comdlg32.rc:318 programs/regedit/regedit.rc:275 #: programs/regedit/regedit.rc:285 @@ -3743,7 +3741,7 @@ msgstr "Ігрові Контролери" #: dlls/joy.cpl/joy.rc:32 msgid "Test and configure game controllers." -msgstr "" +msgstr "Перевірте та налаштуйте ігрові контролери." #: dlls/jscript/jscript.rc:28 msgid "Error converting object to primitive type" @@ -3758,10 +3756,8 @@ msgid "Subscript out of range" msgstr "Індекс поза діапазоном" #: dlls/jscript/jscript.rc:31 -#, fuzzy -#| msgid "Out of paper; " msgid "Out of stack space" -msgstr "Не вистачає паперу; " +msgstr "В стеку немає місця" #: dlls/jscript/jscript.rc:32 msgid "Object required" @@ -3910,16 +3906,12 @@ msgid "JScript object expected" msgstr "Очікується об'єкт JScript" #: dlls/jscript/jscript.rc:63 -#, fuzzy -#| msgid "Array object expected" msgid "Enumerator object expected" -msgstr "Очікується об'єкт Array" +msgstr "Очікується об’єкт перечислювача" #: dlls/jscript/jscript.rc:64 -#, fuzzy -#| msgid "Boolean object expected" msgid "Regular Expression object expected" -msgstr "Очікується об'єкт Boolean" +msgstr "Очікується об’єкт регулярного виразу" #: dlls/jscript/jscript.rc:65 msgid "Syntax error in regular expression" @@ -3927,7 +3919,7 @@ msgstr "Синтаксична помилка в регулярному вира #: dlls/jscript/jscript.rc:66 msgid "Exception thrown and not caught" -msgstr "" +msgstr "Виняток викликано, але не перехоплено" #: dlls/jscript/jscript.rc:68 msgid "URI to be encoded contains invalid characters" @@ -6944,32 +6936,24 @@ msgid "Connection reset by peer.\n" msgstr "У з'єднанні відмовлено.\n" #: dlls/kernel32/winerror.mc:3767 -#, fuzzy -#| msgid "Not implemented" msgid "Not implemented.\n" -msgstr "Не реалізовано" +msgstr "Не реалізовано.\n" #: dlls/kernel32/winerror.mc:3788 -#, fuzzy -#| msgid "Creation failed.\n" msgid "Call failed.\n" -msgstr "Помилка створення.\n" +msgstr "Помилка запиту.\n" #: dlls/kernel32/winerror.mc:3760 msgid "No Signature found in file.\n" msgstr "Відсутній підпис файла.\n" #: dlls/kernel32/winerror.mc:3774 -#, fuzzy -#| msgid "Invalid level.\n" msgid "Invalid call.\n" -msgstr "Невірний рівень.\n" +msgstr "Невірний запит.\n" #: dlls/kernel32/winerror.mc:3781 -#, fuzzy -#| msgid "Value is not available.\n" msgid "Resource is not currently available.\n" -msgstr "Значення недоступне.\n" +msgstr "Наразі ресурс недоступний.\n" #: dlls/localspl/localspl.rc:31 dlls/localui/localui.rc:31 #: dlls/winspool.drv/winspool.rc:30 @@ -7029,10 +7013,8 @@ msgid "Sink has not been finalized.\n" msgstr "Вихід не було завершено.\n" #: dlls/mferror/mferror.mc:732 -#, fuzzy -#| msgid "Sink was already stopped.\n" msgid "Clock was stopped\n" -msgstr "Вихід вже було припинино.\n" +msgstr "Годинник зупинино\n" #: dlls/mferror/mferror.mc:32 msgid "Media Foundation platform is not initialized.\n" @@ -7411,10 +7393,8 @@ msgid "Clock state was already set.\n" msgstr "Статус годинника вже встановлено.\n" #: dlls/mferror/mferror.mc:725 -#, fuzzy -#| msgid "Clock is not available.\n" msgid "Clock is not simple\n" -msgstr "Годинник недоступний.\n" +msgstr "Годинник не простий\n" #: dlls/mpr/mpr.rc:35 dlls/wininet/wininet.rc:48 msgid "Enter Network Password" @@ -8582,98 +8562,72 @@ msgid "Off" msgstr "Вимкнено" #: dlls/oledb32/version.rc:56 -#, fuzzy -#| msgid "video" msgid "Provider" -msgstr "відео" +msgstr "Постачальник" #: dlls/oledb32/version.rc:59 -#, fuzzy -#| msgid "Select the format you want to use:" msgid "Select the data you want to connect to:" -msgstr "Виберіть формат, який ви хочете використати:" +msgstr "Виберіть дані, до яких потрібно підключитися:" #: dlls/oledb32/version.rc:66 -#, fuzzy -#| msgid "Connections" msgid "Connection" msgstr "Підключення" #: dlls/oledb32/version.rc:69 -#, fuzzy -#| msgid "Select the format you want to use:" msgid "Specify the following to connect to ODBC data:" -msgstr "Виберіть формат, який ви хочете використати:" +msgstr "Вкажіть наступне для підключення до даних ODBC:" #: dlls/oledb32/version.rc:70 msgid "1. Specify the source of data:" -msgstr "" +msgstr "1. Вкажіть джерело даних:" #: dlls/oledb32/version.rc:71 -#, fuzzy -#| msgid "Please enter your name" msgid "Use &data source name" -msgstr "Введіть ваше ім'я" +msgstr "Використовувати &ім'я джерела даних" #: dlls/oledb32/version.rc:74 -#, fuzzy -#| msgid "Reset Connections" msgid "Use c&onnection string" -msgstr "Скинутих Підключень" +msgstr "Використовувати р&ядок підключення" #: dlls/oledb32/version.rc:75 -#, fuzzy -#| msgid "Connections" msgid "&Connection string:" -msgstr "Підключення" +msgstr "&Рядок з'єднання:" #: dlls/oledb32/version.rc:77 -#, fuzzy -#| msgid "A&dd..." msgid "B&uild..." -msgstr "&Додати..." +msgstr "&Створити..." #: dlls/oledb32/version.rc:78 msgid "2. Enter information to log on to the server" -msgstr "" +msgstr "2. Введіть інформацію для входу на сервер" #: dlls/oledb32/version.rc:79 -#, fuzzy -#| msgid "&User name:" msgid "User &name:" -msgstr "&Користувач:" +msgstr "Ім'я &користувача:" #: dlls/oledb32/version.rc:83 -#, fuzzy -#| msgid "&Blank page" msgid "&Blank password" -msgstr "По&рожня сторінка" +msgstr "&Пустий пароль" #: dlls/oledb32/version.rc:84 -#, fuzzy -#| msgid "Wrong password.\n" msgid "Allow &saving password" -msgstr "Невірний пароль.\n" +msgstr "Дозволити &збереження пароля" #: dlls/oledb32/version.rc:85 msgid "3. Enter the &initial catalog to use:" -msgstr "" +msgstr "3. Введіть &початковий каталог для використання:" #: dlls/oledb32/version.rc:87 -#, fuzzy -#| msgid "Reset Connections" msgid "&Test Connection" -msgstr "Скинутих Підключень" +msgstr "&Тест підключення" #: dlls/oledb32/version.rc:92 msgid "Advanced" msgstr "Майстер" #: dlls/oledb32/version.rc:95 -#, fuzzy -#| msgid "Network share" msgid "Network settings" -msgstr "Мережний диск" +msgstr "Мережеві налаштування" #: dlls/oledb32/version.rc:96 msgid "&Impersonation level:" @@ -8681,83 +8635,67 @@ msgstr "" #: dlls/oledb32/version.rc:98 msgid "P&rotection level:" -msgstr "" +msgstr "Р&івень захисту:" #: dlls/oledb32/version.rc:101 -#, fuzzy -#| msgid "Connected" msgid "Connect:" -msgstr "Під'єднано" +msgstr "З'єднання:" #: dlls/oledb32/version.rc:103 -#, fuzzy -#| msgid "seconds" msgid "seconds." -msgstr "сек." +msgstr "секунд." #: dlls/oledb32/version.rc:104 -#, fuzzy -#| msgid "Success" msgid "A&ccess:" -msgstr "Успіх" +msgstr "&Доступ:" #: dlls/oledb32/version.rc:110 -#, fuzzy -#| msgid "&All" msgid "All" -msgstr "&Все" +msgstr "Все" #: dlls/oledb32/version.rc:114 msgid "" "These are the initialization properties for this type of data. To edit a " "value, select a property, then choose Edit Value below." msgstr "" +"Це властивості ініціалізації даних цього типу. Щоб відредагувати " +"значення, виберіть властивість, а потім нижче виберіть Редагувати Значення." #: dlls/oledb32/version.rc:115 -#, fuzzy -#| msgid "&Edit..." msgid "&Edit Value..." -msgstr "&Змінити..." +msgstr "&Редагувати Значення..." #: dlls/oledb32/version.rc:49 -#, fuzzy -#| msgid "Properties" msgid "Data Link Error" -msgstr "Властивості" +msgstr "Помилка при передачі даних" #: dlls/oledb32/version.rc:50 -#, fuzzy -#| msgid "Please select a file." msgid "Please select a provider." -msgstr "Виберіть файл." +msgstr "Виберіть постачальника послуг." #: dlls/oledb32/version.rc:51 msgid "" "Provider is no longer available. Ensure that the provider is installed " "properly." msgstr "" +"Постачальник більше не доступний. Переконайтеся, що постачальник " +"встановлений належним чином." #: dlls/oledb32/version.rc:36 -#, fuzzy -#| msgid "Properties" msgid "Data Link Properties" -msgstr "Властивості" +msgstr "Властивості каналу передачі даних" #: dlls/oledb32/version.rc:37 msgid "OLE DB Provider(s)" -msgstr "" +msgstr "Постачальник(и) OLE DB" #: dlls/oledb32/version.rc:41 -#, fuzzy -#| msgid "Ready" msgid "Read" -msgstr "Готово" +msgstr "Читання" #: dlls/oledb32/version.rc:42 -#, fuzzy -#| msgid "Readme:" msgid "ReadWrite" -msgstr "Файл Readme:" +msgstr "Читання/Запис" #: dlls/oledb32/version.rc:43 msgid "Share Deny None" @@ -8776,10 +8714,8 @@ msgid "Share Exclusive" msgstr "" #: dlls/oledb32/version.rc:47 -#, fuzzy -#| msgid "I/O Writes" msgid "Write" -msgstr "Кількість записів" +msgstr "Запис" #: dlls/oledlg/oledlg.rc:55 msgid "Insert Object" @@ -9973,895 +9909,895 @@ msgstr "Виберіть джерело" #: dlls/tzres/tzres.rc:90 msgid "China Standard Time" -msgstr "" +msgstr "Китайський стандартний час" #: dlls/tzres/tzres.rc:91 msgid "China Daylight Time" -msgstr "" +msgstr "Китайський літній час" #: dlls/tzres/tzres.rc:180 msgid "North Asia Standard Time" -msgstr "" +msgstr "Північноазіатський стандартний час" #: dlls/tzres/tzres.rc:181 msgid "North Asia Daylight Time" -msgstr "" +msgstr "Північноазіатський літній час" #: dlls/tzres/tzres.rc:116 msgid "Georgian Standard Time" -msgstr "" +msgstr "Грузинський стандартний час" #: dlls/tzres/tzres.rc:117 msgid "Georgian Daylight Time" -msgstr "" +msgstr "Грузинський літній час" #: dlls/tzres/tzres.rc:172 msgid "Nepal Standard Time" -msgstr "" +msgstr "Непальський стандартний час" #: dlls/tzres/tzres.rc:173 msgid "Nepal Daylight Time" -msgstr "" +msgstr "Непальський літній час" #: dlls/tzres/tzres.rc:66 msgid "Cape Verde Standard Time" -msgstr "" +msgstr "Стандартний час Кабо-Верде" #: dlls/tzres/tzres.rc:67 msgid "Cape Verde Daylight Time" -msgstr "" +msgstr "Літній час Кабо-Верде" #: dlls/tzres/tzres.rc:126 msgid "Haiti Standard Time" -msgstr "" +msgstr "Стандартний час Гаїті" #: dlls/tzres/tzres.rc:127 msgid "Haiti Daylight Time" -msgstr "" +msgstr "Літній час Гаїті" #: dlls/tzres/tzres.rc:80 msgid "Central European Standard Time" -msgstr "" +msgstr "Центральноєвропейський стандартний час" #: dlls/tzres/tzres.rc:81 msgid "Central European Daylight Time" -msgstr "" +msgstr "Центральноєвропейський літній час" #: dlls/tzres/tzres.rc:160 msgid "Morocco Standard Time" -msgstr "" +msgstr "Стандартний час Марокко" #: dlls/tzres/tzres.rc:161 msgid "Morocco Daylight Time" -msgstr "" +msgstr "Літній час Марокко" #: dlls/tzres/tzres.rc:78 msgid "Central Europe Standard Time" -msgstr "" +msgstr "Центральноєвропейський стандартний час" #: dlls/tzres/tzres.rc:79 msgid "Central Europe Daylight Time" -msgstr "" +msgstr "Центральноєвропейський літній час" #: dlls/tzres/tzres.rc:132 msgid "Iran Standard Time" -msgstr "" +msgstr "Іранський стандартний час" #: dlls/tzres/tzres.rc:133 msgid "Iran Daylight Time" -msgstr "" +msgstr "Іранський літній час" #: dlls/tzres/tzres.rc:204 msgid "Saint Pierre Standard Time" -msgstr "" +msgstr "Стандартний час Сен-П'єра" #: dlls/tzres/tzres.rc:205 msgid "Saint Pierre Daylight Time" -msgstr "" +msgstr "Літній час Сен-П'єра" #: dlls/tzres/tzres.rc:170 msgid "Namibia Standard Time" -msgstr "" +msgstr "Стандартний час Намібії" #: dlls/tzres/tzres.rc:171 msgid "Namibia Daylight Time" -msgstr "" +msgstr "Літній час Намібії" #: dlls/tzres/tzres.rc:226 msgid "Tonga Standard Time" -msgstr "" +msgstr "Стандартний час Королівства Тонга" #: dlls/tzres/tzres.rc:227 msgid "Tonga Daylight Time" -msgstr "" +msgstr "Літній час Королівства Тонга" #: dlls/tzres/tzres.rc:164 msgid "Mountain Standard Time (Mexico)" -msgstr "" +msgstr "Гірський стандартний час (Мексика)" #: dlls/tzres/tzres.rc:165 msgid "Mountain Daylight Time (Mexico)" -msgstr "" +msgstr "Гірський літній час (Мексика)" #: dlls/tzres/tzres.rc:118 msgid "GMT Standard Time" -msgstr "" +msgstr "GMT стандартний час" #: dlls/tzres/tzres.rc:119 msgid "GMT Daylight Time" -msgstr "" +msgstr "GMT літній час" #: dlls/tzres/tzres.rc:74 msgid "Central Asia Standard Time" -msgstr "" +msgstr "Середньоазіатський стандартний час" #: dlls/tzres/tzres.rc:75 msgid "Central Asia Daylight Time" -msgstr "" +msgstr "Середньоазіатський літній час" #: dlls/tzres/tzres.rc:146 msgid "Lord Howe Standard Time" -msgstr "" +msgstr "Стандартний час острова Лорд-Хау" #: dlls/tzres/tzres.rc:147 msgid "Lord Howe Daylight Time" -msgstr "" +msgstr "Літній час острова Лорд-Хау" #: dlls/tzres/tzres.rc:40 msgid "Arabic Standard Time" -msgstr "" +msgstr "Арабський стандартний час" #: dlls/tzres/tzres.rc:41 msgid "Arabic Daylight Time" -msgstr "" +msgstr "Арабський літній час" #: dlls/tzres/tzres.rc:148 msgid "Magadan Standard Time" -msgstr "" +msgstr "Магаданський стандартний час" #: dlls/tzres/tzres.rc:149 msgid "Magadan Daylight Time" -msgstr "" +msgstr "Магаданський літній час" #: dlls/tzres/tzres.rc:176 msgid "Newfoundland Standard Time" -msgstr "" +msgstr "Стандартний час Ньюфаундленда" #: dlls/tzres/tzres.rc:177 msgid "Newfoundland Daylight Time" -msgstr "" +msgstr "Літній час Ньюфаундленда" #: dlls/tzres/tzres.rc:250 msgid "West Pacific Standard Time" -msgstr "" +msgstr "Західно-Тихоокеанський стандартний час" #: dlls/tzres/tzres.rc:251 msgid "West Pacific Daylight Time" -msgstr "" +msgstr "Західно-Тихоокеанський літній час" #: dlls/tzres/tzres.rc:186 msgid "Pacific Standard Time" -msgstr "" +msgstr "Тихоокеанський стандартний час" #: dlls/tzres/tzres.rc:187 msgid "Pacific Daylight Time" -msgstr "" +msgstr "Тихоокеанський літній час" #: dlls/tzres/tzres.rc:52 msgid "Azerbaijan Standard Time" -msgstr "" +msgstr "Азербайджанський стандартний час" #: dlls/tzres/tzres.rc:53 msgid "Azerbaijan Daylight Time" -msgstr "" +msgstr "Азербайджанський літній час" #: dlls/tzres/tzres.rc:150 msgid "Magallanes Standard Time" -msgstr "" +msgstr "Стандартний час Магальянеса" #: dlls/tzres/tzres.rc:151 msgid "Magallanes Daylight Time" -msgstr "" +msgstr "Літній час Магальянеса" #: dlls/tzres/tzres.rc:206 msgid "Samoa Standard Time" -msgstr "" +msgstr "Стандартний час Самоа" #: dlls/tzres/tzres.rc:207 msgid "Samoa Daylight Time" -msgstr "" +msgstr "Літній час Самоа" #: dlls/tzres/tzres.rc:138 msgid "Kaliningrad Standard Time" -msgstr "" +msgstr "Калінінградський стандартний час" #: dlls/tzres/tzres.rc:139 msgid "Kaliningrad Daylight Time" -msgstr "" +msgstr "Калінінградський літній час" #: dlls/tzres/tzres.rc:188 msgid "Pacific Standard Time (Mexico)" -msgstr "" +msgstr "Тихоокеанський стандартний час (Мексика)" #: dlls/tzres/tzres.rc:189 msgid "Pacific Daylight Time (Mexico)" -msgstr "" +msgstr "Тихоокеанський літній час (Мексика)" #: dlls/tzres/tzres.rc:156 msgid "Middle East Standard Time" -msgstr "" +msgstr "Близькосхідний стандартний час" #: dlls/tzres/tzres.rc:157 msgid "Middle East Daylight Time" -msgstr "" +msgstr "Близькосхідний літній час" #: dlls/tzres/tzres.rc:224 msgid "Tokyo Standard Time" -msgstr "" +msgstr "Токійський стандартний час" #: dlls/tzres/tzres.rc:225 msgid "Tokyo Daylight Time" -msgstr "" +msgstr "Токійський літній час" #: dlls/tzres/tzres.rc:144 msgid "Line Islands Standard Time" -msgstr "" +msgstr "Стандартний час островів Лайн" #: dlls/tzres/tzres.rc:145 msgid "Line Islands Daylight Time" -msgstr "" +msgstr "Літній час островів Лайн" #: dlls/tzres/tzres.rc:92 msgid "Cuba Standard Time" -msgstr "" +msgstr "Кубинський стандартний час" #: dlls/tzres/tzres.rc:93 msgid "Cuba Daylight Time" -msgstr "" +msgstr "Кубинський літній час" #: dlls/tzres/tzres.rc:136 msgid "Jordan Standard Time" -msgstr "" +msgstr "Йорданський стандартний час" #: dlls/tzres/tzres.rc:137 msgid "Jordan Daylight Time" -msgstr "" +msgstr "Йорданський літній час" #: dlls/tzres/tzres.rc:84 msgid "Central Standard Time" -msgstr "" +msgstr "Центральний стандартний час" #: dlls/tzres/tzres.rc:85 msgid "Central Daylight Time" -msgstr "" +msgstr "Центральний літній час" #: dlls/tzres/tzres.rc:54 msgid "Azores Standard Time" -msgstr "" +msgstr "Стандартний час Азорських островів" #: dlls/tzres/tzres.rc:55 msgid "Azores Daylight Time" -msgstr "" +msgstr "Літній час Азорських островів" #: dlls/tzres/tzres.rc:178 msgid "North Asia East Standard Time" -msgstr "" +msgstr "Північноазіатський східний стандартний час" #: dlls/tzres/tzres.rc:179 msgid "North Asia East Daylight Time" -msgstr "" +msgstr "Північноазіатський східний літній час" #: dlls/tzres/tzres.rc:42 msgid "Argentina Standard Time" -msgstr "" +msgstr "Аргентинський стандартний час" #: dlls/tzres/tzres.rc:43 msgid "Argentina Daylight Time" -msgstr "" +msgstr "Аргентинський літній час" #: dlls/tzres/tzres.rc:152 msgid "Marquesas Standard Time" -msgstr "" +msgstr "Стандартний час Маркізьких островів" #: dlls/tzres/tzres.rc:153 msgid "Marquesas Daylight Time" -msgstr "" +msgstr "Літній час Маркізьких островів" #: dlls/tzres/tzres.rc:166 msgid "Myanmar Standard Time" -msgstr "" +msgstr "Стандартний час М'янми" #: dlls/tzres/tzres.rc:167 msgid "Myanmar Daylight Time" -msgstr "" +msgstr "Літній час М'янми" #: dlls/tzres/tzres.rc:236 dlls/tzres/tzres.rc:237 msgid "Coordinated Universal Time" -msgstr "" +msgstr "Всесвітній координований час" #: dlls/tzres/tzres.rc:130 msgid "India Standard Time" -msgstr "" +msgstr "Індійський стандартний час" #: dlls/tzres/tzres.rc:131 msgid "India Daylight Time" -msgstr "" +msgstr "Індійський літній час" #: dlls/tzres/tzres.rc:124 msgid "GTB Standard Time" -msgstr "" +msgstr "GTB стандартний час" #: dlls/tzres/tzres.rc:125 msgid "GTB Daylight Time" -msgstr "" +msgstr "GTB літній час" #: dlls/tzres/tzres.rc:228 msgid "Turkey Standard Time" -msgstr "" +msgstr "Турецький стандартний час" #: dlls/tzres/tzres.rc:229 msgid "Turkey Daylight Time" -msgstr "" +msgstr "Турецький літній час" #: dlls/tzres/tzres.rc:112 msgid "Fiji Standard Time" -msgstr "" +msgstr "Стандартний час Фіджі" #: dlls/tzres/tzres.rc:113 msgid "Fiji Daylight Time" -msgstr "" +msgstr "Літній час Фіджі" #: dlls/tzres/tzres.rc:64 msgid "Canada Central Standard Time" -msgstr "" +msgstr "Центральний стандартний час Канади" #: dlls/tzres/tzres.rc:65 msgid "Canada Central Daylight Time" -msgstr "" +msgstr "Центральний літній час Канади" #: dlls/tzres/tzres.rc:218 msgid "Taipei Standard Time" -msgstr "" +msgstr "Тайбейський стандартний час" #: dlls/tzres/tzres.rc:219 msgid "Taipei Daylight Time" -msgstr "" +msgstr "Тайбейський літній час" #: dlls/tzres/tzres.rc:246 msgid "W. Europe Standard Time" -msgstr "" +msgstr "Західноєвропейський стандартний час" #: dlls/tzres/tzres.rc:247 msgid "W. Europe Daylight Time" -msgstr "" +msgstr "Західноєвропейський літній час" #: dlls/tzres/tzres.rc:158 msgid "Montevideo Standard Time" -msgstr "" +msgstr "Стандартний час Монтевідео" #: dlls/tzres/tzres.rc:159 msgid "Montevideo Daylight Time" -msgstr "" +msgstr "Літній час Монтевідео" #: dlls/tzres/tzres.rc:190 msgid "Pakistan Standard Time" -msgstr "" +msgstr "Пакистанський стандартний час" #: dlls/tzres/tzres.rc:191 msgid "Pakistan Daylight Time" -msgstr "" +msgstr "Пакистанський літній час" #: dlls/tzres/tzres.rc:68 msgid "Caucasus Standard Time" -msgstr "" +msgstr "Кавказький стандартний час" #: dlls/tzres/tzres.rc:69 msgid "Caucasus Daylight Time" -msgstr "" +msgstr "Кавказький літній час" #: dlls/tzres/tzres.rc:50 msgid "AUS Eastern Standard Time" -msgstr "" +msgstr "AUS східний стандартний час" #: dlls/tzres/tzres.rc:51 msgid "AUS Eastern Daylight Time" -msgstr "" +msgstr "AUS східний літній час" #: dlls/tzres/tzres.rc:168 msgid "N. Central Asia Standard Time" -msgstr "" +msgstr "Північно-Центральна Азія за стандартним часом" #: dlls/tzres/tzres.rc:169 msgid "N. Central Asia Daylight Time" -msgstr "" +msgstr "Північно-Центральна Азія за літнім часом" #: dlls/tzres/tzres.rc:104 msgid "Eastern Standard Time" -msgstr "" +msgstr "Східний стандартний час" #: dlls/tzres/tzres.rc:105 msgid "Eastern Daylight Time" -msgstr "" +msgstr "Східний літній час" #: dlls/tzres/tzres.rc:86 msgid "Central Standard Time (Mexico)" -msgstr "" +msgstr "Центральний стандартний час (Мексика)" #: dlls/tzres/tzres.rc:87 msgid "Central Daylight Time (Mexico)" -msgstr "" +msgstr "Центральний літній час (Мексика)" #: dlls/tzres/tzres.rc:44 msgid "Atlantic Standard Time" -msgstr "" +msgstr "Атлантичний стандартний час" #: dlls/tzres/tzres.rc:45 msgid "Atlantic Daylight Time" -msgstr "" +msgstr "Атлантичний літній час" #: dlls/tzres/tzres.rc:162 msgid "Mountain Standard Time" -msgstr "" +msgstr "Гірський стандартний час" #: dlls/tzres/tzres.rc:163 msgid "Mountain Daylight Time" -msgstr "" +msgstr "Гірський літній час" #: dlls/tzres/tzres.rc:232 msgid "US Eastern Standard Time" -msgstr "" +msgstr "Східний стандартний час США" #: dlls/tzres/tzres.rc:233 msgid "US Eastern Daylight Time" -msgstr "" +msgstr "Східний літній час США" #: dlls/tzres/tzres.rc:182 msgid "North Korea Standard Time" -msgstr "" +msgstr "Північнокорейський стандартний час" #: dlls/tzres/tzres.rc:183 msgid "North Korea Daylight Time" -msgstr "" +msgstr "Північнокорейський літній час" #: dlls/tzres/tzres.rc:220 msgid "Tasmania Standard Time" -msgstr "" +msgstr "Тасманійський стандартний час" #: dlls/tzres/tzres.rc:221 msgid "Tasmania Daylight Time" -msgstr "" +msgstr "Тасманійський літній час" #: dlls/tzres/tzres.rc:72 msgid "Central America Standard Time" -msgstr "" +msgstr "Центральна Америка за стандартним часом" #: dlls/tzres/tzres.rc:73 msgid "Central America Daylight Time" -msgstr "" +msgstr "Центральна Америка за літнім часом" #: dlls/tzres/tzres.rc:234 msgid "US Mountain Standard Time" -msgstr "" +msgstr "Американський гірський стандартний час" #: dlls/tzres/tzres.rc:235 msgid "US Mountain Daylight Time" -msgstr "" +msgstr "Американський гірський літній час" #: dlls/tzres/tzres.rc:212 msgid "South Africa Standard Time" -msgstr "" +msgstr "Південно-Африканський стандартний час" #: dlls/tzres/tzres.rc:213 msgid "South Africa Daylight Time" -msgstr "" +msgstr "Південно-Африканський літній час" #: dlls/tzres/tzres.rc:70 msgid "Cen. Australia Standard Time" -msgstr "" +msgstr "Цен. Австралійський стандартний час" #: dlls/tzres/tzres.rc:71 msgid "Cen. Australia Daylight Time" -msgstr "" +msgstr "Цен. Австралійський літній час" #: dlls/tzres/tzres.rc:214 msgid "Sri Lanka Standard Time" -msgstr "" +msgstr "Стандартний час Шрі-Ланки" #: dlls/tzres/tzres.rc:215 msgid "Sri Lanka Daylight Time" -msgstr "" +msgstr "Літній час Шрі-Ланки" #: 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:252 msgid "Yakutsk Standard Time" -msgstr "" +msgstr "Якутський стандартний час" #: dlls/tzres/tzres.rc:253 msgid "Yakutsk Daylight Time" -msgstr "" +msgstr "Якутський літній час" #: dlls/tzres/tzres.rc:198 msgid "SA Eastern Standard Time" -msgstr "" +msgstr "SA східний стандартний час" #: dlls/tzres/tzres.rc:199 msgid "SA Eastern Daylight Time" -msgstr "" +msgstr "SA східний літній час" #: dlls/tzres/tzres.rc:36 msgid "Arab Standard Time" -msgstr "" +msgstr "Арабський стандартний час" #: dlls/tzres/tzres.rc:37 msgid "Arab Daylight Time" -msgstr "" +msgstr "Арабський літній час" #: dlls/tzres/tzres.rc:38 msgid "Arabian Standard Time" -msgstr "" +msgstr "Арабський стандартний час" #: dlls/tzres/tzres.rc:39 msgid "Arabian Daylight Time" -msgstr "" +msgstr "Арабський літній час" #: dlls/tzres/tzres.rc:222 msgid "Tocantins Standard Time" -msgstr "" +msgstr "Стандартний час Токантінс" #: dlls/tzres/tzres.rc:223 msgid "Tocantins Daylight Time" -msgstr "" +msgstr "Літній час Токантінс" #: dlls/tzres/tzres.rc:196 msgid "Russian Standard Time" -msgstr "" +msgstr "Російський стандартний час" #: dlls/tzres/tzres.rc:197 msgid "Russian Daylight Time" -msgstr "" +msgstr "Російський літній час" #: dlls/tzres/tzres.rc:48 msgid "Aus Central W. Standard Time" -msgstr "" +msgstr "Aus Central W. стандартний час" #: dlls/tzres/tzres.rc:49 msgid "Aus Central W. Daylight Time" -msgstr "" +msgstr "Aus Central W. літній час" #: dlls/tzres/tzres.rc:194 msgid "Romance Standard Time" -msgstr "" +msgstr "Романський стандартний час" #: dlls/tzres/tzres.rc:195 msgid "Romance Daylight Time" -msgstr "" +msgstr "Романський літній час" #: dlls/tzres/tzres.rc:110 msgid "Ekaterinburg Standard Time" -msgstr "" +msgstr "Стандартний час Єкатеринбурга" #: dlls/tzres/tzres.rc:111 msgid "Ekaterinburg Daylight Time" -msgstr "" +msgstr "Літній час Єкатеринбурга" #: dlls/tzres/tzres.rc:216 msgid "Syria Standard Time" -msgstr "" +msgstr "Стандартний час Сирії" #: dlls/tzres/tzres.rc:217 msgid "Syria Daylight Time" -msgstr "" +msgstr "Літній час Сирії" #: dlls/tzres/tzres.rc:46 msgid "AUS Central Standard Time" -msgstr "" +msgstr "Центральний стандартний час AUS" #: dlls/tzres/tzres.rc:47 msgid "AUS Central Daylight Time" -msgstr "" +msgstr "Центральний літній час AUS" #: dlls/tzres/tzres.rc:122 msgid "Greenwich Standard Time" -msgstr "" +msgstr "Стандартний час за Грінвічем" #: dlls/tzres/tzres.rc:123 msgid "Greenwich Daylight Time" -msgstr "" +msgstr "Літній час за Грінвічем" #: dlls/tzres/tzres.rc:230 msgid "Ulaanbaatar Standard Time" -msgstr "" +msgstr "Стандартний час Улан-Батора" #: dlls/tzres/tzres.rc:231 msgid "Ulaanbaatar Daylight Time" -msgstr "" +msgstr "Літній час Улан-Батора" #: dlls/tzres/tzres.rc:134 msgid "Israel Standard Time" -msgstr "" +msgstr "Стандартний час Ізраїлю" #: dlls/tzres/tzres.rc:135 msgid "Israel Daylight Time" -msgstr "" +msgstr "Літній час Ізраїлю" #: dlls/tzres/tzres.rc:58 msgid "Bangladesh Standard Time" -msgstr "" +msgstr "Стандартний час Бангладеш" #: dlls/tzres/tzres.rc:59 msgid "Bangladesh Daylight Time" -msgstr "" +msgstr "Літній час Бангладеш" #: dlls/tzres/tzres.rc:200 msgid "SA Pacific Standard Time" -msgstr "" +msgstr "SA Тихоокеанський стандартний час" #: dlls/tzres/tzres.rc:201 msgid "SA Pacific Daylight Time" -msgstr "" +msgstr "SA Тихоокеанський літній час" #: dlls/tzres/tzres.rc:248 msgid "West Asia Standard Time" -msgstr "" +msgstr "Західноазіатський стандартний час" #: dlls/tzres/tzres.rc:249 msgid "West Asia Daylight Time" -msgstr "" +msgstr "Західноазіатський літній час" #: dlls/tzres/tzres.rc:32 msgid "Alaskan Standard Time" -msgstr "" +msgstr "Аляскинський стандартний час" #: dlls/tzres/tzres.rc:33 msgid "Alaskan Daylight Time" -msgstr "" +msgstr "Аляскинський літній час" #: dlls/tzres/tzres.rc:192 msgid "Paraguay Standard Time" -msgstr "" +msgstr "Парагвайський стандартний час" #: dlls/tzres/tzres.rc:193 msgid "Paraguay Daylight Time" -msgstr "" +msgstr "Парагвайський літній час" #: dlls/tzres/tzres.rc:94 msgid "Dateline Standard Time" -msgstr "" +msgstr "Стандартний час у Дателіні" #: dlls/tzres/tzres.rc:95 msgid "Dateline Daylight Time" -msgstr "" +msgstr "Літній час у Дателіні" #: dlls/tzres/tzres.rc:142 msgid "Libya Standard Time" -msgstr "" +msgstr "Лівійський стандартний час" #: dlls/tzres/tzres.rc:143 msgid "Libya Daylight Time" -msgstr "" +msgstr "Лівійський літній час" #: dlls/tzres/tzres.rc:56 msgid "Bahia Standard Time" -msgstr "" +msgstr "Стандартний час Баїя" #: dlls/tzres/tzres.rc:57 msgid "Bahia Daylight Time" -msgstr "" +msgstr "Літній час Баїя" #: dlls/tzres/tzres.rc:238 msgid "Venezuela Standard Time" -msgstr "" +msgstr "Стандартний час Венесуели" #: dlls/tzres/tzres.rc:239 msgid "Venezuela Daylight Time" -msgstr "" +msgstr "Літній час Венесуели" #: dlls/tzres/tzres.rc:62 msgid "Bougainville Standard Time" -msgstr "" +msgstr "Стандартний час Бугенвіля" #: dlls/tzres/tzres.rc:63 msgid "Bougainville Daylight Time" -msgstr "" +msgstr "Літній час Бугенвіля" #: dlls/tzres/tzres.rc:128 msgid "Hawaiian Standard Time" -msgstr "" +msgstr "Гавайський стандартний час" #: dlls/tzres/tzres.rc:129 msgid "Hawaiian Daylight Time" -msgstr "" +msgstr "Гавайський літній час" #: dlls/tzres/tzres.rc:208 msgid "SE Asia Standard Time" -msgstr "" +msgstr "Південно-Східний Азіатський стандартний час" #: dlls/tzres/tzres.rc:209 msgid "SE Asia Daylight Time" -msgstr "" +msgstr "Південно-Східний Азіатський літній час" #: dlls/tzres/tzres.rc:174 msgid "New Zealand Standard Time" -msgstr "" +msgstr "Стандартний час Нової Зеландії" #: dlls/tzres/tzres.rc:175 msgid "New Zealand Daylight Time" -msgstr "" +msgstr "Літній час Нової Зеландії" #: dlls/tzres/tzres.rc:34 msgid "Aleutian Standard Time" -msgstr "" +msgstr "Алеутський стандартний час" #: dlls/tzres/tzres.rc:35 msgid "Aleutian Daylight Time" -msgstr "" +msgstr "Алеутський літній час" #: dlls/tzres/tzres.rc:76 msgid "Central Brazilian Standard Time" -msgstr "" +msgstr "Центральний бразильський стандартний час" #: dlls/tzres/tzres.rc:77 msgid "Central Brazilian Daylight Time" -msgstr "" +msgstr "Центральний бразильський літній час" #: dlls/tzres/tzres.rc:60 msgid "Belarus Standard Time" -msgstr "" +msgstr "Білоруський стандартний час" #: dlls/tzres/tzres.rc:61 msgid "Belarus Daylight Time" -msgstr "" +msgstr "Білоруський літній час" #: dlls/tzres/tzres.rc:202 msgid "SA Western Standard Time" -msgstr "" +msgstr "SA Західний стандартний час" #: dlls/tzres/tzres.rc:203 msgid "SA Western Daylight Time" -msgstr "" +msgstr "SA Західний літній час" #: dlls/tzres/tzres.rc:120 msgid "Greenland Standard Time" -msgstr "" +msgstr "Стандартний час Гренландії" #: dlls/tzres/tzres.rc:121 msgid "Greenland Daylight Time" -msgstr "" +msgstr "Літній час Гренландії" #: dlls/tzres/tzres.rc:102 msgid "Easter Island Standard Time" -msgstr "" +msgstr "Стандартний час острова Пасхи" #: dlls/tzres/tzres.rc:103 msgid "Easter Island Daylight Time" -msgstr "" +msgstr "Літній час острова Пасхи" #: dlls/tzres/tzres.rc:108 msgid "Egypt Standard Time" -msgstr "" +msgstr "Єгипетський стандартний час" #: dlls/tzres/tzres.rc:109 msgid "Egypt Daylight Time" -msgstr "" +msgstr "Єгипетський літній час" #: dlls/tzres/tzres.rc:106 msgid "Eastern Standard Time (Mexico)" -msgstr "" +msgstr "Східний стандартний час (Мексика)" #: dlls/tzres/tzres.rc:107 msgid "Eastern Daylight Time (Mexico)" -msgstr "" +msgstr "Східний літній час (Мексика)" #: dlls/tzres/tzres.rc:154 msgid "Mauritius Standard Time" -msgstr "" +msgstr "Стандартний час Маврикія" #: dlls/tzres/tzres.rc:155 msgid "Mauritius Daylight Time" -msgstr "" +msgstr "Літній час Маврикія" #: dlls/tzres/tzres.rc:240 msgid "Vladivostok Standard Time" -msgstr "" +msgstr "Стандартний час Владивостока" #: dlls/tzres/tzres.rc:241 msgid "Vladivostok Daylight Time" -msgstr "" +msgstr "Літній час Владивостока" #: dlls/tzres/tzres.rc:210 msgid "Singapore Standard Time" -msgstr "" +msgstr "Стандартний час Сінгапуру" #: dlls/tzres/tzres.rc:211 msgid "Singapore Daylight Time" -msgstr "" +msgstr "Літній час Сінгапуру" #: dlls/tzres/tzres.rc:140 msgid "Korea Standard Time" -msgstr "" +msgstr "Корейський стандартний час" #: dlls/tzres/tzres.rc:141 msgid "Korea Daylight Time" -msgstr "" +msgstr "Корейський літній час" #: dlls/tzres/tzres.rc:88 msgid "Chatham Islands Standard Time" -msgstr "" +msgstr "Стандартний час островів Чатем" #: dlls/tzres/tzres.rc:89 msgid "Chatham Islands Daylight Time" -msgstr "" +msgstr "Літній час островів Чатем" #: dlls/tzres/tzres.rc:96 msgid "E. Africa Standard Time" -msgstr "" +msgstr "E. Стандартний час в Африці" #: dlls/tzres/tzres.rc:97 msgid "E. Africa Daylight Time" -msgstr "" +msgstr "E. Літній час в Африці" #: dlls/tzres/tzres.rc:114 msgid "FLE Standard Time" -msgstr "" +msgstr "Стандартний час FLE" #: dlls/tzres/tzres.rc:115 msgid "FLE Daylight Time" -msgstr "" +msgstr "Літній час FLE" #: dlls/tzres/tzres.rc:100 msgid "E. South America Standard Time" -msgstr "" +msgstr "E. Стандартний час Південної Америки" #: dlls/tzres/tzres.rc:101 msgid "E. South America Daylight Time" -msgstr "" +msgstr "E. Літній час Південної Америки" #: dlls/tzres/tzres.rc:82 msgid "Central Pacific Standard Time" -msgstr "" +msgstr "Центральний тихоокеанський стандартний час" #: dlls/tzres/tzres.rc:83 msgid "Central Pacific Daylight Time" -msgstr "" +msgstr "Центральний тихоокеанський літній час" #: dlls/tzres/tzres.rc:244 msgid "W. Central Africa Standard Time" -msgstr "" +msgstr "В. Стандартний час у Центральній Африці" #: dlls/tzres/tzres.rc:245 msgid "W. Central Africa Daylight Time" -msgstr "" +msgstr "В. Літній час у Центральній Африці" #: dlls/tzres/tzres.rc:184 msgid "Pacific SA Standard Time" -msgstr "" +msgstr "Тихоокеанський стандартний час SA" #: dlls/tzres/tzres.rc:185 msgid "Pacific SA Daylight Time" -msgstr "" +msgstr "Тихоокеанський літній час SA" #: dlls/tzres/tzres.rc:98 msgid "E. Australia Standard Time" -msgstr "" +msgstr "E. Стандартний час в Австралії" #: dlls/tzres/tzres.rc:99 msgid "E. Australia Daylight Time" -msgstr "" +msgstr "E. Літній час в Австралії" #: dlls/tzres/tzres.rc:242 msgid "W. Australia Standard Time" -msgstr "" +msgstr "В. Стандартний час в Австралії" #: dlls/tzres/tzres.rc:243 msgid "W. Australia Daylight Time" -msgstr "" +msgstr "В. Літній час в Австралії" #: dlls/urlmon/urlmon.rc:32 dlls/wininet/wininet.rc:88 msgid "Security Warning" @@ -10960,147 +10896,115 @@ msgstr "&Ще вікна..." #: 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 msgid "Device I/O error" -msgstr "" +msgstr "Помилка вводу-виводу пристрою" #: 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 cursor handle.\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 msgid "Hide %@" @@ -11197,33 +11101,27 @@ 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 msgid "The request has timed out.\n" @@ -13236,6 +13134,9 @@ msgid "" "\n" "hardlink hardlink management\n" msgstr "" +"- Підтримувані команди -\n" +"\n" +"hardlink управління жорстким посиланням\n" #: programs/fsutil/fsutil.mc:35 msgid "" @@ -13243,10 +13144,13 @@ msgid "" "\n" "create create a hardlink\n" msgstr "" +"- Жорстке посилання - Підтримувані команди -\n" +"\n" +"create створити жорстке посилання\n" #: programs/fsutil/fsutil.mc:40 msgid "Syntax: fsutil hardlink create <new> <existing>\n" -msgstr "" +msgstr "Синтаксис: fsutil hardlink create <нове> <існуюче>\n" #: programs/hostname/hostname.rc:30 msgid "Usage: hostname\n" @@ -16053,10 +15957,10 @@ msgid "" "data before it is terminated. Are you sure you want to\n" "terminate the process?" msgstr "" -"УВАГА: Завершення цього процесу може призвести до\n" -"небажаних результатів, включаючи втрату даних та\n" -"нестабільність системи. Процес не зможе зберегти\n" -"свою позицію чи дані. Ви справді хочете завершити\n" +"УВАГА: Завершення цього процесу може призвести до " +"небажаних результатів, включаючи втрату даних та " +"нестабільність системи. Процес не зможе зберегти " +"свою позицію чи дані. Ви справді хочете завершити " "процес?" #: programs/taskmgr/taskmgr.rc:311 @@ -17069,10 +16973,8 @@ msgid "&Beginner" msgstr "Н&овачок" #: programs/winemine/winemine.rc:45 -#, fuzzy -#| msgid "Interface" msgid "&Intermediate" -msgstr "Інтерфейс" +msgstr "&Проміжний" #: programs/winemine/winemine.rc:46 msgid "&Expert" @@ -17103,10 +17005,8 @@ msgid "Beginner" msgstr "Новачок" #: programs/winemine/winemine.rc:65 -#, fuzzy -#| msgid "Interface" msgid "Intermediate" -msgstr "Інтерфейс" +msgstr "Проміжний" #: programs/winemine/winemine.rc:66 msgid "Expert" -- 2.29.2

3 2

[PATCH] readme: Update Finnish translation.
by Lauri Kenttä Dec. 30, 2020

Dec. 30, 2020

Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> --- documentation/README.fi | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/documentation/README.fi b/documentation/README.fi index 30311d82807..b2c6524548e 100644 --- a/documentation/README.fi +++ b/documentation/README.fi @@ -39,7 +39,7 @@ Winen kääntämiseen tarvitaan jokin seuraavista: FreeBSD 8.0 tai uudempi Solaris x86 9 tai uudempi NetBSD-current - Mac OS X 10.5 tai uudempi + Mac OS X 10.8 tai uudempi Wine vaatii kerneliltä tuen säikeille. Tämän takia toistaiseksi vain yllä mainittuja käyttöjärjestelmiä tuetaan; tulevaisuudessa saatetaan lisätä tuki @@ -59,8 +59,9 @@ Tietoa NetBSD:lle: USER_LDT, SYSVSHM, SYSVSEM ja SYSVMSG täytyy aktivoida kernelistä. Tietoa Mac OS X:lle: - Winen onnistuneeseen kääntämiseen x86:lla tarvitaan Xcode 2.4 tai uudempi. - Mac-ajuri vaatii OS X 10.6:n tai uudemman, ja sitä ei käännetä 10.5:ssä. + Winen kääntämiseen tarvitaan Xcode Command Line Tools tai Apple cctools. + Vähimmäisversiot ovat clang 3.8, MacOSX10.10.sdk ja mingw-w64 v8. + MacOSX10.14.sdk ja myöhemmät sopivat vain wine64:n kääntämiseen. Tuetut tiedostojärjestelmät: -- 2.30.0

1 0

[PATCH] include: Add DBACCESSORFLAGSENUM/DBBINDSTATUSENUM values
by Alistair Leslie-Hughes Dec. 30, 2020

Dec. 30, 2020

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/access.idl | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/include/access.idl b/include/access.idl index 5ade09b85ce..fe1f3baddd7 100644 --- a/include/access.idl +++ b/include/access.idl @@ -32,6 +32,27 @@ interface IAccessor : IUnknown typedef DWORD DBBINDSTATUS; + enum DBACCESSORFLAGSENUM + { + DBACCESSOR_INVALID = 0x00, + DBACCESSOR_PASSBYREF = 0x01, + DBACCESSOR_ROWDATA = 0x02, + DBACCESSOR_PARAMETERDATA = 0x04, + DBACCESSOR_OPTIMIZED = 0x08, + DBACCESSOR_INHERITED = 0x10, + }; + + enum DBBINDSTATUSENUM + { + DBBINDSTATUS_OK = 0, + DBBINDSTATUS_BADORDINAL = 1, + DBBINDSTATUS_UNSUPPORTEDCONVERSION = 2, + DBBINDSTATUS_BADBINDINFO = 3, + DBBINDSTATUS_BADSTORAGEFLAGS = 4, + DBBINDSTATUS_NOINTERFACE = 5, + DBBINDSTATUS_MULTIPLESTORAGE = 6, + }; + [local] HRESULT AddRefAccessor([in] HACCESSOR hAccessor, [in, out, unique, annotation("__out_opt")] DBREFCOUNT *pcRefCount); -- 2.29.2

1 0

[PATCH 2/2] conhost: Ignore CONTROL_C_EXIT exceptions in Unix mode.
by Jacek Caban Dec. 29, 2020

Dec. 29, 2020

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50304 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/conhost.c | 10 ++++++++++ 1 file changed, 10 insertions(+)

1 0

[PATCH 1/2] condrv: Don't requre write access for IOCTL_CONDRV_CTRL_EVENT ioctl.
by Jacek Caban Dec. 29, 2020

Dec. 29, 2020

Fixes propagating CONTROL_C_EXIT exception from console server handle. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50304 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/wine/condrv.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH] winedbg: Remove arm_disasm_branchreg.
by liumeo＠pku.edu.cn Dec. 29, 2020

Dec. 29, 2020

1 0

[PATCH v2] winegstreamer: Split audio data to fit in the sample buffer.
by Anton Baskanov Dec. 29, 2020

Dec. 29, 2020

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50355 Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> --- v2: Set discontinuity and sync point flags only for the first sample. --- dlls/winegstreamer/gstdemux.c | 144 +++++++++++++++++++++------------- 1 file changed, 90 insertions(+), 54 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 9114e6610a3..676b7396515 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -81,6 +81,7 @@ struct gstdemux_source HANDLE caps_event, eos_event; GstSegment *segment; SourceSeeking seek; + DWORD bytes_per_second; }; static inline struct gstdemux *impl_from_strmbase_filter(struct strmbase_filter *iface) @@ -801,6 +802,7 @@ static GstFlowReturn got_data_sink(GstPad *pad, GstObject *parent, GstBuffer *bu BYTE *ptr = NULL; IMediaSample *sample; GstMapInfo info; + gsize position = 0; TRACE("%p %p\n", pad, buf); @@ -809,76 +811,108 @@ static GstFlowReturn got_data_sink(GstPad *pad, GstObject *parent, GstBuffer *bu return GST_FLOW_OK; } - hr = BaseOutputPinImpl_GetDeliveryBuffer(&pin->pin, &sample, NULL, NULL, 0); - - if (hr == VFW_E_NOT_CONNECTED) { - gst_buffer_unref(buf); - return GST_FLOW_NOT_LINKED; - } + gst_buffer_map(buf, &info, GST_MAP_READ); - if (FAILED(hr)) { - gst_buffer_unref(buf); - ERR("Could not get a delivery buffer (%x), returning GST_FLOW_FLUSHING\n", hr); - return GST_FLOW_FLUSHING; - } + while (position < info.size) + { + gsize advance; - gst_buffer_map(buf, &info, GST_MAP_READ); + hr = BaseOutputPinImpl_GetDeliveryBuffer(&pin->pin, &sample, NULL, NULL, 0); - hr = IMediaSample_SetActualDataLength(sample, info.size); - if(FAILED(hr)){ - WARN("SetActualDataLength failed: %08x\n", hr); - return GST_FLOW_FLUSHING; - } + if (hr == VFW_E_NOT_CONNECTED) { + gst_buffer_unmap(buf, &info); + gst_buffer_unref(buf); + return GST_FLOW_NOT_LINKED; + } - IMediaSample_GetPointer(sample, &ptr); + if (FAILED(hr)) { + gst_buffer_unmap(buf, &info); + gst_buffer_unref(buf); + ERR("Could not get a delivery buffer (%x), returning GST_FLOW_FLUSHING\n", hr); + return GST_FLOW_FLUSHING; + } - memcpy(ptr, info.data, info.size); + advance = min(IMediaSample_GetSize(sample), info.size - position); - gst_buffer_unmap(buf, &info); + hr = IMediaSample_SetActualDataLength(sample, advance); + if(FAILED(hr)){ + gst_buffer_unmap(buf, &info); + gst_buffer_unref(buf); + WARN("SetActualDataLength failed: %08x\n", hr); + return GST_FLOW_FLUSHING; + } - if (GST_BUFFER_PTS_IS_VALID(buf)) { - REFERENCE_TIME rtStart = gst_segment_to_running_time(pin->segment, GST_FORMAT_TIME, buf->pts); - if (rtStart >= 0) - rtStart /= 100; - - if (GST_BUFFER_DURATION_IS_VALID(buf)) { - REFERENCE_TIME tStart = buf->pts / 100; - REFERENCE_TIME tStop = (buf->pts + buf->duration) / 100; - REFERENCE_TIME rtStop; - rtStop = gst_segment_to_running_time(pin->segment, GST_FORMAT_TIME, buf->pts + buf->duration); - if (rtStop >= 0) - rtStop /= 100; - TRACE("Current time on %p: %i to %i ms\n", pin, (int)(rtStart / 10000), (int)(rtStop / 10000)); - IMediaSample_SetTime(sample, &rtStart, rtStop >= 0 ? &rtStop : NULL); - IMediaSample_SetMediaTime(sample, &tStart, &tStop); + IMediaSample_GetPointer(sample, &ptr); + + memcpy(ptr, &info.data[position], advance); + + if (GST_BUFFER_PTS_IS_VALID(buf)) { + REFERENCE_TIME rtStart; + GstClockTime ptsStart = buf->pts; + if (position > 0 && pin->bytes_per_second) + ptsStart = buf->pts + gst_util_uint64_scale(position, GST_SECOND, pin->bytes_per_second); + rtStart = gst_segment_to_running_time(pin->segment, GST_FORMAT_TIME, ptsStart); + if (rtStart >= 0) + rtStart /= 100; + + if (GST_BUFFER_DURATION_IS_VALID(buf)) { + REFERENCE_TIME rtStop; + REFERENCE_TIME tStart; + REFERENCE_TIME tStop; + GstClockTime ptsStop = buf->pts + buf->duration; + if (position + advance < info.size && pin->bytes_per_second) + ptsStop = buf->pts + gst_util_uint64_scale(position + advance, GST_SECOND, pin->bytes_per_second); + tStart = ptsStart / 100; + tStop = ptsStop / 100; + rtStop = gst_segment_to_running_time(pin->segment, GST_FORMAT_TIME, ptsStop); + if (rtStop >= 0) + rtStop /= 100; + TRACE("Current time on %p: %i to %i ms\n", pin, (int)(rtStart / 10000), (int)(rtStop / 10000)); + IMediaSample_SetTime(sample, &rtStart, rtStop >= 0 ? &rtStop : NULL); + IMediaSample_SetMediaTime(sample, &tStart, &tStop); + } else { + IMediaSample_SetTime(sample, rtStart >= 0 ? &rtStart : NULL, NULL); + IMediaSample_SetMediaTime(sample, NULL, NULL); + } } else { - IMediaSample_SetTime(sample, rtStart >= 0 ? &rtStart : NULL, NULL); + IMediaSample_SetTime(sample, NULL, NULL); IMediaSample_SetMediaTime(sample, NULL, NULL); } - } else { - IMediaSample_SetTime(sample, NULL, NULL); - IMediaSample_SetMediaTime(sample, NULL, NULL); - } - IMediaSample_SetDiscontinuity(sample, GST_BUFFER_FLAG_IS_SET(buf, GST_BUFFER_FLAG_DISCONT)); - IMediaSample_SetPreroll(sample, GST_BUFFER_FLAG_IS_SET(buf, GST_BUFFER_FLAG_LIVE)); - IMediaSample_SetSyncPoint(sample, !GST_BUFFER_FLAG_IS_SET(buf, GST_BUFFER_FLAG_DELTA_UNIT)); + IMediaSample_SetDiscontinuity(sample, + !position && GST_BUFFER_FLAG_IS_SET(buf, GST_BUFFER_FLAG_DISCONT)); + IMediaSample_SetPreroll(sample, GST_BUFFER_FLAG_IS_SET(buf, GST_BUFFER_FLAG_LIVE)); + IMediaSample_SetSyncPoint(sample, + !position && !GST_BUFFER_FLAG_IS_SET(buf, GST_BUFFER_FLAG_DELTA_UNIT)); - if (!pin->pin.pin.peer) - hr = VFW_E_NOT_CONNECTED; - else - hr = IMemInputPin_Receive(pin->pin.pMemInputPin, sample); + if (!pin->pin.pin.peer) + hr = VFW_E_NOT_CONNECTED; + else + hr = IMemInputPin_Receive(pin->pin.pMemInputPin, sample); - TRACE("sending sample returned: %08x\n", hr); + TRACE("sending sample returned: %08x\n", hr); - gst_buffer_unref(buf); - IMediaSample_Release(sample); + IMediaSample_Release(sample); - if (hr == VFW_E_NOT_CONNECTED) - return GST_FLOW_NOT_LINKED; + if (hr == VFW_E_NOT_CONNECTED) + { + gst_buffer_unmap(buf, &info); + gst_buffer_unref(buf); + return GST_FLOW_NOT_LINKED; + } - if (FAILED(hr)) - return GST_FLOW_FLUSHING; + if (FAILED(hr)) + { + gst_buffer_unmap(buf, &info); + gst_buffer_unref(buf); + return GST_FLOW_FLUSHING; + } + + position += advance; + } + + gst_buffer_unmap(buf, &info); + gst_buffer_unref(buf); return GST_FLOW_OK; } @@ -2104,6 +2138,8 @@ static HRESULT WINAPI GSTOutPin_DecideBufferSize(struct strmbase_source *iface, { WAVEFORMATEX *format = (WAVEFORMATEX *)pin->pin.pin.mt.pbFormat; buffer_size = format->nAvgBytesPerSec; + + pin->bytes_per_second = format->nAvgBytesPerSec; } props->cBuffers = max(props->cBuffers, 1); -- 2.25.1

2 1

[PATCH] devenum: Avoid initializing nameless unions in designated initializers.
by Zebediah Figura Dec. 29, 2020

Dec. 29, 2020

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50423 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/devenum/mediacatenum.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/devenum/mediacatenum.c b/dlls/devenum/mediacatenum.c index ab675b5656f..f097c580261 100644 --- a/dlls/devenum/mediacatenum.c +++ b/dlls/devenum/mediacatenum.c @@ -137,17 +137,10 @@ static HRESULT WINAPI property_bag_Read(IPropertyBag *iface, } else if (!wcscmp(name, L"FilterData")) { - REGFILTERPINS2 reg_pins[2] = {{0}}; - REGFILTER2 reg_filter = - { - .dwVersion = 2, - .dwMerit = MERIT_NORMAL + 0x800, - .cPins2 = 2, - .rgPins2 = reg_pins, - }; - unsigned int count = 1, input_count, output_count, i; DMO_PARTIAL_MEDIATYPE *types = NULL, *new_array; + REGFILTERPINS2 reg_pins[2] = {{0}}; + REGFILTER2 reg_filter = {0}; REGPINTYPES *reg_types; HRESULT hr; @@ -192,6 +185,10 @@ static HRESULT WINAPI property_bag_Read(IPropertyBag *iface, reg_pins[1].cInstances = 1; reg_pins[1].nMediaTypes = output_count; reg_pins[1].lpMediaType = reg_types + count; + reg_filter.dwVersion = 2; + reg_filter.dwMerit = MERIT_NORMAL + 0x800, + reg_filter.cPins2 = 2; + reg_filter.rgPins2 = reg_pins; hr = create_filter_data(var, &reg_filter); free(reg_types); -- 2.29.2

1 0

[PATCH v2] user32: Add stub for SetDisplayConfig().
by Paul Gofman Dec. 29, 2020

Dec. 29, 2020

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50420 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v2: - add missing WINAPI and flags dump. dlls/user32/sysparams.c | 12 ++++++++++++ dlls/user32/user32.spec | 1 + 2 files changed, 13 insertions(+) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index a620116053a..55d6d7e53a7 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -4794,3 +4794,15 @@ LONG WINAPI DisplayConfigGetDeviceInfo(DISPLAYCONFIG_DEVICE_INFO_HEADER *packet) return ERROR_INVALID_PARAMETER; } } + +/*********************************************************************** + * SetDisplayConfig (USER32.@) + */ +LONG WINAPI SetDisplayConfig(UINT32 path_info_count, DISPLAYCONFIG_PATH_INFO *path_info, UINT32 mode_info_count, + DISPLAYCONFIG_MODE_INFO *mode_info, UINT32 flags) +{ + FIXME("path_info_count %u, path_info %p, mode_info_count %u, mode_info %p, flags %#x stub.\n", + path_info_count, path_info, mode_info_count, mode_info, flags); + + return ERROR_SUCCESS; +} diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 8051ae3f767..4ef75247d71 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -663,6 +663,7 @@ @ stdcall SetDeskWallPaper(str) # @ stub SetDeskWallpaper # @ stub SetDesktopBitmap +@ stdcall SetDisplayConfig(long ptr long ptr long) @ stdcall SetDlgItemInt(long long long long) @ stdcall SetDlgItemTextA(long long str) @ stdcall SetDlgItemTextW(long long wstr) -- 2.29.2

1 0

[PATCH] user32: Add stub for SetDisplayConfig().
by Paul Gofman Dec. 29, 2020

Dec. 29, 2020

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50420 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/user32/sysparams.c | 12 ++++++++++++ dlls/user32/user32.spec | 1 + 2 files changed, 13 insertions(+) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index a620116053a..d9c383ba36f 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -4794,3 +4794,15 @@ LONG WINAPI DisplayConfigGetDeviceInfo(DISPLAYCONFIG_DEVICE_INFO_HEADER *packet) return ERROR_INVALID_PARAMETER; } } + +/*********************************************************************** + * SetDisplayConfig (USER32.@) + */ +LONG SetDisplayConfig(UINT32 path_info_count, DISPLAYCONFIG_PATH_INFO *path_info, UINT32 mode_info_count, + DISPLAYCONFIG_MODE_INFO *mode_info, UINT32 flags) +{ + FIXME("path_info_count %u, path_info %p, mode_info_count %u, mode_info %p stub.", + path_info_count, path_info, mode_info_count, mode_info); + + return ERROR_SUCCESS; +} diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 8051ae3f767..4ef75247d71 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -663,6 +663,7 @@ @ stdcall SetDeskWallPaper(str) # @ stub SetDeskWallpaper # @ stub SetDesktopBitmap +@ stdcall SetDisplayConfig(long ptr long ptr long) @ stdcall SetDlgItemInt(long long long long) @ stdcall SetDlgItemTextA(long long str) @ stdcall SetDlgItemTextW(long long wstr) -- 2.29.2

2 2

[PATCH] ntdll: Use WINAPI calling convention for stub_entry_point().
by Paul Gofman Dec. 29, 2020

Dec. 29, 2020

Otherwise it ends up being stdcall function in the gcc PE build and cdecl in ELF while allocate_stub() currently assumes cdecl. Fixes missing function details output on x64. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntdll/loader.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index efa7d204628..118e85ec2a2 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -332,7 +332,7 @@ static inline BOOL call_dll_entry_point( DLLENTRYPROC proc, void *module, * * Entry point for stub functions. */ -static void stub_entry_point( const char *dll, const char *name, void *ret_addr ) +static void WINAPI stub_entry_point( const char *dll, const char *name, void *ret_addr ) { EXCEPTION_RECORD rec; @@ -443,15 +443,15 @@ static ULONG_PTR allocate_stub( const char *dll, const char *name ) stub->name = name; stub->entry = stub_entry_point; #else - stub->movq_rdi[0] = 0x48; /* movq $dll,%rdi */ - stub->movq_rdi[1] = 0xbf; + stub->movq_rdi[0] = 0x48; /* movq $dll,%rcx */ + stub->movq_rdi[1] = 0xb9; stub->dll = dll; - stub->movq_rsi[0] = 0x48; /* movq $name,%rsi */ - stub->movq_rsi[1] = 0xbe; + stub->movq_rsi[0] = 0x48; /* movq $name,%rdx */ + stub->movq_rsi[1] = 0xba; stub->name = name; - stub->movq_rsp_rdx[0] = 0x48; /* movq (%rsp),%rdx */ + stub->movq_rsp_rdx[0] = 0x4c; /* movq (%rsp),%r8 */ stub->movq_rsp_rdx[1] = 0x8b; - stub->movq_rsp_rdx[2] = 0x14; + stub->movq_rsp_rdx[2] = 0x04; stub->movq_rsp_rdx[3] = 0x24; stub->movq_rax[0] = 0x48; /* movq $entry, %rax */ stub->movq_rax[1] = 0xb8; -- 2.29.2

1 0

[PATCH] comctl32: PBS_MARQUEE Draw only when true for Marquee.
by Chao Long Dec. 29, 2020

Dec. 29, 2020

1 0

[PATCH] po: Update Korean translation.
by Byeongsik Jeon Dec. 29, 2020

Dec. 29, 2020

Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> --- po/ko.po | 1684 +++++++++++++++++++++++++++--------------------------- 1 file changed, 840 insertions(+), 844 deletions(-) diff --git a/po/ko.po b/po/ko.po index a8b4f84d583..40962ead745 100644 --- a/po/ko.po +++ b/po/ko.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2020-12-16 13:14+0900\n" +"PO-Revision-Date: 2020-12-29 16:25+0900\n" "Last-Translator: Byeongsik Jeon <bsjeon(a)hanmail.net>\n" "Language-Team: Korean\n" "Language: ko\n" @@ -23,7 +23,7 @@ msgid "" "drive, click Install." msgstr "" "플로피 디스크, 시디롬 드라이브, 또는 하드디스크 드라이브에서 새 프로그램을 설" -"치하려면 [설치]를 클릭하십시오." +"치하려면 [설치]를 클릭하세요." #: dlls/appwiz.cpl/appwiz.rc:62 msgid "&Install..." @@ -36,7 +36,7 @@ msgid "" "Remove." msgstr "" "다음 소프트웨어는 자동으로 제거됩니다. 프로그램을 제거하거나 설치된 구성요소" -"를 수정하려면, 목록에서 선택한 후 [수정/제거]를 클릭하십시오." +"를 수정하려면, 목록에서 선택한 후 [수정/제거]를 클릭하세요." #: dlls/appwiz.cpl/appwiz.rc:67 msgid "&Support Information" @@ -101,7 +101,7 @@ msgstr "이 정보는 %s을(를) 위한 기술 지원을 받는 데 사용될 #: dlls/appwiz.cpl/appwiz.rc:80 msgid "Publisher:" -msgstr "제작사:" +msgstr "제조업체:" #: dlls/appwiz.cpl/appwiz.rc:81 programs/winefile/winefile.rc:165 msgid "Version:" @@ -133,7 +133,7 @@ msgstr "설명:" #: dlls/appwiz.cpl/appwiz.rc:100 msgid "Wine Gecko Installer" -msgstr "Wine Gecko 설치관리자" +msgstr "Wine Gecko 설치 관리자" #: dlls/appwiz.cpl/appwiz.rc:103 msgid "" @@ -151,7 +151,7 @@ msgstr "" "\n" "참고: 배포판이 제공하는 Gecko 패키지 사용을 추천합니다. 자세한 내용은 <a " "href=\"https://wiki.winehq.org/Gecko\">https://wiki.winehq.org/Gecko</a>를 보" -"십시오." +"세요." #: dlls/appwiz.cpl/appwiz.rc:109 dlls/appwiz.cpl/appwiz.rc:124 msgid "&Install" @@ -202,7 +202,7 @@ msgstr "취소" #: dlls/appwiz.cpl/appwiz.rc:115 msgid "Wine Mono Installer" -msgstr "Wine Mono 설치관리자" +msgstr "Wine Mono 설치 관리자" #: dlls/appwiz.cpl/appwiz.rc:118 msgid "" @@ -258,7 +258,7 @@ msgstr "이름" #: dlls/appwiz.cpl/appwiz.rc:39 msgid "Publisher" -msgstr "제작사" +msgstr "제조업체" #: dlls/appwiz.cpl/appwiz.rc:40 dlls/cryptui/cryptui.rc:54 msgid "Version" @@ -936,14 +936,14 @@ msgstr "파일을 찾을 수 없음" #: dlls/comdlg32/comdlg32.rc:34 msgid "Please verify that the correct file name was given" -msgstr "파일 이름이 올바른지 확인하십시오" +msgstr "파일 이름이 올바른지 확인하세요" #: dlls/comdlg32/comdlg32.rc:35 msgid "" "File does not exist.\n" "Do you want to create file?" msgstr "" -"파일이 없습니다\n" +"파일이 없습니다.\n" "파일을 새로 만드시겠습니까?" #: dlls/comdlg32/comdlg32.rc:36 @@ -956,15 +956,15 @@ msgstr "" #: dlls/comdlg32/comdlg32.rc:37 msgid "Invalid character(s) in path" -msgstr "경로에 올바르지 않은 문자가 들어 있습니다" +msgstr "경로에 잘못된 문자가 들어 있습니다" #: dlls/comdlg32/comdlg32.rc:38 msgid "" "A filename cannot contain any of the following characters:\n" " / : < > |" msgstr "" -"파일 이름에 다음 문자가 들어 있으면 안됩니다.\n" -" / : < > |" +"파일 이름에는 아래의 문자가 들어 있을 수 없습니다.\n" +" / : < > |" #: dlls/comdlg32/comdlg32.rc:39 msgid "Path does not exist" @@ -1080,7 +1080,7 @@ msgstr "흰색" #: dlls/comdlg32/comdlg32.rc:57 msgid "Unreadable Entry" -msgstr "읽을 수 없는 항목입니다" +msgstr "읽을 수 없는 항목" #: dlls/comdlg32/comdlg32.rc:59 msgid "" @@ -1100,7 +1100,7 @@ msgid "" "Please reenter margins." msgstr "" "여백이 겹쳐졌거나 용지 크기를 넘었습니다.\n" -"여백 크기를 다시 입력십시오." +"여백 크기를 다시 입력하세요." #: dlls/comdlg32/comdlg32.rc:65 msgid "The 'Number of copies' field cannot be empty." @@ -1111,12 +1111,12 @@ msgid "" "This large number of copies is not supported by your printer.\n" "Please enter a value between 1 and %d." msgstr "" -"복사본 개수가 너무 많아서 프린터가 지원하지 않습니다.\n" -"1과 %d 사이의 값을 입력하십시오." +"이렇게 많은 복사본 갯수는 프린터에서 지원되지 않습니다.\n" +"1과 %d 사이의 값을 입력하세요." #: dlls/comdlg32/comdlg32.rc:68 msgid "A printer error occurred." -msgstr "프린터 오류 발생." +msgstr "프린터 오류가 발생하였습니다." #: dlls/comdlg32/comdlg32.rc:69 msgid "No default printer defined." @@ -1128,15 +1128,15 @@ msgstr "프린터를 찾을 수 없습니다." #: dlls/comdlg32/comdlg32.rc:71 programs/progman/progman.rc:76 msgid "Out of memory." -msgstr "메모리 부족." +msgstr "메모리가 부족합니다." #: dlls/comdlg32/comdlg32.rc:72 msgid "An error occurred." -msgstr "오류 발생." +msgstr "오류가 발생했습니다." #: dlls/comdlg32/comdlg32.rc:73 msgid "Unknown printer driver." -msgstr "알 수 없는 프린터 드라이버." +msgstr "알 수 없는 프린터 드라이버입니다." #: dlls/comdlg32/comdlg32.rc:76 msgid "" @@ -1144,11 +1144,11 @@ msgid "" "a document, you need to install a printer. Please install one and retry." msgstr "" "페이지 설정이나 문서 인쇄와 같은 프린터 관련 작업을 수행하려면 먼저 프린터를 " -"설치해야 합니다. 프린터를 설치하고 다시 시도하십시오." +"설치해야 합니다. 프린터를 설치하고 다시 시도하세요." #: dlls/comdlg32/comdlg32.rc:142 msgid "Select a font size between %1!d! and %2!d! points." -msgstr "%1!d!pt - %2!d!pt 사이에서 글꼴 크기를 선택하십시오." +msgstr "%1!d!pt - %2!d!pt 사이에서 글꼴 크기를 선택하세요." #: dlls/comdlg32/comdlg32.rc:143 dlls/ieframe/ieframe.rc:35 msgid "&Save" @@ -1284,7 +1284,7 @@ msgstr "기본 프린터; " #: dlls/comdlg32/comdlg32.rc:79 msgid "There are %d documents in the queue" -msgstr "대기열에는 %d의 문서가 존재합니다" +msgstr "대기열에는 문서 %d이(가) 존재합니다" #: dlls/comdlg32/comdlg32.rc:80 msgid "Margins [inches]" @@ -1330,7 +1330,7 @@ msgid "" "and password are correct." msgstr "" "사용자 이름과 암호가 올바른지\n" -"확인하십시오." +"확인하세요." #: dlls/credui/credui.rc:35 msgid "" @@ -1339,10 +1339,10 @@ msgid "" "Press the Caps Lock key on your keyboard to turn off Caps Lock before\n" "entering your password." msgstr "" -"Caps Lock이 켜져 있으면 암호가 올바르지 않게 입력될 수 있습니다.\n" +"Caps Lock을 켜 놓으면 암호가 올바르게 입력되지 않을 수 있습니다.\n" "\n" "암호를 입력하기 전에 키보드의 Caps Lock 키를 눌러서 Caps Lock을\n" -"끄십시오." +"끄세요." #: dlls/credui/credui.rc:34 msgid "Caps Lock is On" @@ -1455,7 +1455,7 @@ msgstr "서명한 데이터 선호" #: dlls/crypt32/crypt32.rc:56 dlls/cryptdlg/cryptdlg.rc:34 msgctxt "Certification Practice Statement" msgid "CPS" -msgstr "CPS" +msgstr "CPS(인증서 사용 약관)" #: dlls/crypt32/crypt32.rc:57 dlls/cryptdlg/cryptdlg.rc:35 msgid "User Notice" @@ -2298,7 +2298,7 @@ msgstr "인증서 저장소 선택" #: dlls/cryptui/cryptui.rc:276 msgid "Select the certificate store you want to use:" -msgstr "사용하고자 하는 인증서 저장소를 선택하십시오:" +msgstr "사용하고자 하는 인증서 저장소를 선택하세요:" #: dlls/cryptui/cryptui.rc:279 msgid "&Show physical stores" @@ -2475,7 +2475,7 @@ msgstr "" "다. 또한 메시지에 사인하고 인증하는 데도 사용됩니다.인증서 보관소는 인증서, " "인증서 파기 목록, 인증서 신뢰 목록의저장소입니다.\n" "\n" -"계속 하려면, [다음]을 클릭하십시오." +"계속 하려면, [다음]을 클릭하세요." #: dlls/cryptui/cryptui.rc:389 msgid "" @@ -2551,7 +2551,7 @@ msgstr "인증서 선택" #: dlls/cryptui/cryptui.rc:459 msgid "Select a certificate you want to use" -msgstr "사용하고자 하는 인증서를 선택하십시오" +msgstr "사용할 인증서를 선택합니다" #: dlls/cryptui/cryptui.rc:30 dlls/cryptui/cryptui.rc:93 msgid "Certificate" @@ -2566,8 +2566,8 @@ msgid "" "This certificate has an invalid signature. The certificate may have been " "altered or corrupted." msgstr "" -"이 인증서는 올바르지 않은 서명을 가지고 있습니다. 이 인증서는 아마도 고쳐졌거" -"나 망가진 것같습니가." +"이 인증서에는 잘못된 서명이 있습니다. 인증서가 변경되었거나 손상되었을 수 있" +"습니다." #: dlls/cryptui/cryptui.rc:33 msgid "" @@ -2575,27 +2575,27 @@ msgid "" "trusted root certificate store." msgstr "" "이 루트 인증서는 신뢰할 수 없습니다. 이것을 신뢰하려면 시스템의 신뢰할 수 있" -"는 루트 인증서 저장소에 추가하십시오." +"는 루트 인증서 저장소에 추가하세요." #: dlls/cryptui/cryptui.rc:34 msgid "This certificate could not be validated to a trusted root certificate." -msgstr "이 인증서는 신뢰된 루트 인증서로 허가될 수 없습니다." +msgstr "이 인증서를 신뢰할 수 있는 루트 인증서로 검증할 수 없습니다." #: dlls/cryptui/cryptui.rc:35 msgid "This certificate's issuer could not be found." -msgstr "이 인증서의 발행자를 찾을 수 없습니다." +msgstr "이 인증서의 발급자를 찾을 수 없습니다." #: dlls/cryptui/cryptui.rc:36 msgid "All the intended purposes of this certificate could not be verified." -msgstr "이 인증서의 모든 계획된 목적은 검증될 수 없습니다." +msgstr "이 인증서의 모든 의도된 목적을 확인할 수 없습니다." #: dlls/cryptui/cryptui.rc:37 msgid "This certificate is intended for the following purposes:" -msgstr "이 인증서는 다음의 목적으로 계획되어있습니다:" +msgstr "이 인증서는 다음 목적을 위해 작성되었습니다:" #: dlls/cryptui/cryptui.rc:38 msgid "Issued to: " -msgstr "발행대상: " +msgstr "발행 대상: " #: dlls/cryptui/cryptui.rc:39 msgid "Issued by: " @@ -2611,7 +2611,7 @@ msgstr " 유효기간(끝) " #: dlls/cryptui/cryptui.rc:42 msgid "This certificate has an invalid signature." -msgstr "이 인증서는 올바르지 않은 서명을 가지고 있습니다." +msgstr "이 인증서는 잘못된 서명을 가지고 있습니다." #: dlls/cryptui/cryptui.rc:43 msgid "This certificate has expired or is not yet valid." @@ -2709,7 +2709,7 @@ msgstr "인증서 속성" #: dlls/cryptui/cryptui.rc:67 msgid "Please enter an OID in the form 1.2.3.4" -msgstr "폼 1,2,3,4에 하나의 OID를 입력하십시오" +msgstr "폼 1,2,3,4에 하나의 OID를 입력하세요" #: dlls/cryptui/cryptui.rc:68 msgid "The OID you entered already exists." @@ -2717,14 +2717,14 @@ msgstr "입력한 OID가 이미 존재합니다." #: dlls/cryptui/cryptui.rc:70 msgid "Please select a certificate store." -msgstr "인증서 저장소를 선택하십시오." +msgstr "인증서 저장소를 선택하세요." #: dlls/cryptui/cryptui.rc:72 msgid "" "The file contains objects that do not match the given criteria. Please " "select another file." msgstr "" -"이 파일에 주어진 기준에 맞지 않는 개체가 있습니다. 다른 파일을 선택하십시오." +"이 파일에 주어진 기준에 맞지 않는 개체가 있습니다. 다른 파일을 선택하세요." #: dlls/cryptui/cryptui.rc:73 msgid "File to Import" @@ -2767,11 +2767,11 @@ msgstr "CMS/PKCS #7 메시지 (*.spc; *.p7b)" #: dlls/cryptui/cryptui.rc:84 msgid "Please select a file." -msgstr "파일을 선택하십시오." +msgstr "파일을 선택하세요." #: dlls/cryptui/cryptui.rc:85 msgid "The file format is not recognized. Please select another file." -msgstr "이 파일 형식을 이해할 수 없습니다. 다른 파일을 선택하십시오." +msgstr "이 파일 형식을 이해할 수 없습니다. 다른 파일을 선택하세요." #: dlls/cryptui/cryptui.rc:86 msgid "Could not open " @@ -2783,7 +2783,7 @@ msgstr "프로그램이 결정" #: dlls/cryptui/cryptui.rc:88 msgid "Please select a store" -msgstr "보관소를 선택하십시오" +msgstr "보관소를 선택하세요" #: dlls/cryptui/cryptui.rc:89 msgid "Certificate Store Selected" @@ -2965,7 +2965,7 @@ msgstr "" #: dlls/cryptui/cryptui.rc:127 msgid "Protects e-mail messages" -msgstr "전자 메일 메시지를 보호합니다" +msgstr "전자메일 메시지를 보호합니다" #: dlls/cryptui/cryptui.rc:128 msgid "Allows secure communication over the Internet" @@ -3092,7 +3092,7 @@ msgstr "구현되지 않음" #: dlls/dinput/dinput.rc:34 msgid "Configure Devices" -msgstr "장치 설정" +msgstr "장치 구성" #: dlls/dinput/dinput.rc:39 msgid "Reset" @@ -3136,19 +3136,19 @@ msgstr "%1!u!메가바이트 사용됨, %2!u!메가바이 사용 가능함" #: dlls/gdi32/gdi32.rc:28 msgid "Western" -msgstr "서부" +msgstr "영어" #: dlls/gdi32/gdi32.rc:29 msgid "Central European" -msgstr "중부 유럽" +msgstr "중앙 유럽어" #: dlls/gdi32/gdi32.rc:30 msgid "Cyrillic" -msgstr "키릴문자" +msgstr "키릴 문자" #: dlls/gdi32/gdi32.rc:31 msgid "Greek" -msgstr "그리스어" +msgstr "그리스 문자" #: dlls/gdi32/gdi32.rc:32 msgid "Turkish" @@ -3200,20 +3200,20 @@ msgstr "기호" #: dlls/gdi32/gdi32.rc:44 msgid "OEM/DOS" -msgstr "OEM/도" +msgstr "OEM/DOS" #: dlls/gdi32/gdi32.rc:45 dlls/oledb32/version.rc:100 #: dlls/wldap32/wldap32.rc:112 msgid "Other" -msgstr "다른 문제" +msgstr "기타" #: dlls/gphoto2.ds/gphoto2.rc:30 msgid "Files on Camera" -msgstr "카메라에 있는 파" +msgstr "카메라에 있는 파일" #: dlls/gphoto2.ds/gphoto2.rc:34 msgid "Import Selected" -msgstr "선택된 것을 불러오기" +msgstr "선택한 항목 가져오기" #: dlls/gphoto2.ds/gphoto2.rc:35 msgid "Preview" @@ -3221,31 +3221,31 @@ msgstr "미리 보기" #: dlls/gphoto2.ds/gphoto2.rc:36 msgid "Import All" -msgstr "모두 불러오기" +msgstr "모두 가져오기" #: dlls/gphoto2.ds/gphoto2.rc:37 msgid "Skip This Dialog" -msgstr "대화상자 지나치기" +msgstr "이 대화상자 건너뛰기" #: dlls/gphoto2.ds/gphoto2.rc:38 msgid "Exit" -msgstr "나가기" +msgstr "끝내기" #: dlls/gphoto2.ds/gphoto2.rc:43 msgid "Transferring" -msgstr "옮기는 중" +msgstr "전송 중" #: dlls/gphoto2.ds/gphoto2.rc:46 msgid "Transferring... Please Wait" -msgstr "옮기는 중... 잠시만 기다리십시오" +msgstr "전송 중입니다. 잠시 기다려 주세요" #: dlls/gphoto2.ds/gphoto2.rc:51 msgid "Connecting to camera" -msgstr "카메라하고 연결중" +msgstr "카메라에 연결 중입니다" #: dlls/gphoto2.ds/gphoto2.rc:55 msgid "Connecting to camera... Please Wait" -msgstr "카메라하고 연결중... 잠시만 기다리십시오" +msgstr "카메라에 연결 중입니다. 잠시 기다려 주세요" #: dlls/hhctrl.ocx/hhctrl.rc:59 msgid "S&ync" @@ -3287,7 +3287,7 @@ msgstr "모두 선택(&A)" #: dlls/hhctrl.ocx/hhctrl.rc:78 dlls/shdoclc/shdoclc.rc:54 msgid "&View Source" -msgstr "소스 보기(&V)" +msgstr "원본 보기(&V)" #: dlls/hhctrl.ocx/hhctrl.rc:83 msgid "Proper&ties" @@ -3353,7 +3353,7 @@ msgstr "숨기기" #: dlls/hhctrl.ocx/hhctrl.rc:44 dlls/ieframe/ieframe.rc:68 #: dlls/shdoclc/shdoclc.rc:167 dlls/shdoclc/shdoclc.rc:191 msgid "Stop" -msgstr "멈추기" +msgstr "중지" #: dlls/hhctrl.ocx/hhctrl.rc:45 dlls/ieframe/ieframe.rc:69 #: dlls/shell32/shell32.rc:62 @@ -3428,15 +3428,15 @@ msgstr "인쇄 미리보기(&W)" #: dlls/ieframe/ieframe.rc:47 msgid "&Toolbars" -msgstr "도구바(&T)" +msgstr "도구 모음(&T)" #: dlls/ieframe/ieframe.rc:49 msgid "&Standard bar" -msgstr "표준 바(&S)" +msgstr "표준 도구 모음(&S)" #: dlls/ieframe/ieframe.rc:50 msgid "&Address bar" -msgstr "주소 바(&A)" +msgstr "주소 표시줄(&A)" #: dlls/ieframe/ieframe.rc:53 programs/regedit/regedit.rc:72 msgid "&Favorites" @@ -3448,7 +3448,7 @@ msgstr "즐겨찾기 추가(&A)..." #: dlls/ieframe/ieframe.rc:60 msgid "&About Internet Explorer" -msgstr "인터넷 익스플로어에 관하여(&A)" +msgstr "인터넷 익스플로어 정보(&A)" #: dlls/ieframe/ieframe.rc:90 msgid "Open URL" @@ -3456,7 +3456,7 @@ msgstr "URL 열기" #: dlls/ieframe/ieframe.rc:93 msgid "Specify the URL you wish to open in Internet Explorer" -msgstr "인터넷 익스플로어로 열 URL 지정" +msgstr "인터넷 탐색기에서 열 URL을 지정합니다" #: dlls/ieframe/ieframe.rc:94 msgid "Open:" @@ -3485,7 +3485,7 @@ msgstr "%s 다운로드 시작" #: dlls/ieframe/ieframe.rc:83 msgid "Downloading %s" -msgstr "%s 다운로드중" +msgstr "%s 다운로드 중" #: dlls/ieframe/ieframe.rc:84 msgid "Asking for %s" @@ -3517,7 +3517,7 @@ msgstr "방문 기록" #: dlls/inetcpl.cpl/inetcpl.rc:57 msgid "You can delete cached pages, cookies and other data." -msgstr "캐시된 페이지, 쿠키 및 기타 데이터를 제거할 수 있습니다." +msgstr "캐시된 페이지, 쿠키 및 기타 데이터를 삭제할 수 있습니다." #: dlls/inetcpl.cpl/inetcpl.rc:59 msgid "Delete &files..." @@ -3537,7 +3537,7 @@ msgid "" "Cached copies of web pages, images and certificates." msgstr "" "임시 인터넷 파일\n" -"웹 페이지의 캐시된 복사본,그림 그리고 인증서." +"웹 페이지, 이미지 및 인증서의 캐시된 복사본." #: dlls/inetcpl.cpl/inetcpl.rc:73 msgid "" @@ -3547,7 +3547,7 @@ msgid "" msgstr "" "쿠키\n" "사용자 기본 설정 및 로그인 정보와 같은 항목을 저장하는 웹 사이트에서 컴퓨터" -"에 저장된 파일입니다." +"에 저장한 파일입니다." #: dlls/inetcpl.cpl/inetcpl.rc:75 msgid "" @@ -3601,7 +3601,7 @@ msgstr "연결" #: dlls/inetcpl.cpl/inetcpl.rc:125 msgid "Automatic configuration" -msgstr "자동 설정" +msgstr "자동 구성" #: dlls/inetcpl.cpl/inetcpl.rc:126 msgid "Use Web Proxy Auto-Discovery (WPAD)" @@ -3633,7 +3633,7 @@ msgstr "인터넷 설정" #: dlls/inetcpl.cpl/inetcpl.rc:32 msgid "Configure Wine Internet Browser and related settings" -msgstr "Wine 인터넷 브라우저와 관련 설정 처리" +msgstr "Wine 인터넷 브라우저 및 관련 설정 구성" #: dlls/inetcpl.cpl/inetcpl.rc:33 msgid "Security settings for zone: " @@ -3705,7 +3705,7 @@ msgstr "강제 피드백 테스트" #: dlls/joy.cpl/joy.rc:68 msgid "Available Effects" -msgstr "가능한 효과들" +msgstr "사용 가능한 효과" #: dlls/joy.cpl/joy.rc:70 msgid "" @@ -3729,7 +3729,7 @@ msgstr "개체를 기본 형식으로 변환하는 중에 오류 발생" #: dlls/jscript/jscript.rc:29 dlls/vbscript/vbscript.rc:29 msgid "Invalid procedure call or argument" -msgstr "올바르지 않은 프로시져 호출이나 인수" +msgstr "잘못된 프로시져 호출이나 인수" #: dlls/jscript/jscript.rc:30 dlls/vbscript/vbscript.rc:32 msgid "Subscript out of range" @@ -3749,7 +3749,7 @@ msgstr "자동화 서버가 개체를 만들 수 없음" #: dlls/jscript/jscript.rc:34 dlls/vbscript/vbscript.rc:49 msgid "Object doesn't support this property or method" -msgstr "개체는 이 속성이나 메소드를 지원하지 않음" +msgstr "개체가 이 속성이나 메소드를 지원하지 않습니다" #: dlls/jscript/jscript.rc:35 dlls/vbscript/vbscript.rc:50 msgid "Object doesn't support this action" @@ -3893,7 +3893,7 @@ msgstr "예외가 발생했지만 catch할 수 없습니다" #: dlls/jscript/jscript.rc:68 msgid "URI to be encoded contains invalid characters" -msgstr "인코딩할 URI에 올바르지 않은 문자가 들어 있습니다" +msgstr "인코딩할 URI에 잘못된 문자가 들어 있습니다" #: dlls/jscript/jscript.rc:67 msgid "URI to be decoded is incorrect" @@ -3949,7 +3949,7 @@ msgstr "성공.\n" #: dlls/kernel32/winerror.mc:33 msgid "Invalid function.\n" -msgstr "올바르지 않은 함수.\n" +msgstr "잘못된 함수입니다.\n" #: dlls/kernel32/winerror.mc:38 msgid "File not found.\n" @@ -3961,43 +3961,43 @@ msgstr "경로를 찾을 수 없습니다.\n" #: dlls/kernel32/winerror.mc:48 msgid "Too many open files.\n" -msgstr "너무 많은 파일 오픈.\n" +msgstr "열린 파일이 너무 많습니다.\n" #: dlls/kernel32/winerror.mc:53 msgid "Access denied.\n" -msgstr "접근 거부.\n" +msgstr "접근이 거부되었습니다.\n" #: dlls/kernel32/winerror.mc:58 msgid "Invalid handle.\n" -msgstr "올바르지 않은 핸들.\n" +msgstr "잘못된 핸들입니다.\n" #: dlls/kernel32/winerror.mc:63 msgid "Memory trashed.\n" -msgstr "메모리 손상.\n" +msgstr "메모리 손상되었습니다.\n" #: dlls/kernel32/winerror.mc:68 msgid "Not enough memory.\n" -msgstr "메모리 부족.\n" +msgstr "메모리가 부족합니다.\n" #: dlls/kernel32/winerror.mc:73 msgid "Invalid block.\n" -msgstr "올바르지 않은 블록.\n" +msgstr "잘못된 블록입니다.\n" #: dlls/kernel32/winerror.mc:78 msgid "Bad environment.\n" -msgstr "잘못된 환경.\n" +msgstr "잘못된 환경입니다.\n" #: dlls/kernel32/winerror.mc:83 msgid "Bad format.\n" -msgstr "잘못된 형식.\n" +msgstr "잘못된 형식입니다.\n" #: dlls/kernel32/winerror.mc:88 msgid "Invalid access.\n" -msgstr "올바르지 않은 접근.\n" +msgstr "잘못된 접근입니다.\n" #: dlls/kernel32/winerror.mc:93 msgid "Invalid data.\n" -msgstr "올바르지 않은 데이터.\n" +msgstr "잘못된 데이터입니다.\n" #: dlls/kernel32/winerror.mc:98 msgid "Out of memory.\n" @@ -4005,7 +4005,7 @@ msgstr "메모리 부족.\n" #: dlls/kernel32/winerror.mc:103 msgid "Invalid drive.\n" -msgstr "올바르지 않은 드라이브.\n" +msgstr "잘못된 드라이브.\n" #: dlls/kernel32/winerror.mc:108 msgid "Can't delete current directory.\n" @@ -4209,11 +4209,11 @@ msgstr "이미 할당되어 있습니다.\n" #: dlls/kernel32/winerror.mc:358 dlls/kernel32/winerror.mc:1713 msgid "Invalid password.\n" -msgstr "올바르지 않은 암호.\n" +msgstr "잘못된 암호.\n" #: dlls/kernel32/winerror.mc:363 msgid "Invalid parameter.\n" -msgstr "올바르지 않은 매개변수.\n" +msgstr "잘못된 매개변수.\n" #: dlls/kernel32/winerror.mc:368 msgid "Net write fault.\n" @@ -4241,7 +4241,7 @@ msgstr "너무 많은 세마포어 요청.\n" #: dlls/kernel32/winerror.mc:398 msgid "Invalid at interrupt time.\n" -msgstr "올바르지 않은 인터럽트 시간.\n" +msgstr "잘못된 인터럽트 시간.\n" #: dlls/kernel32/winerror.mc:403 msgid "Semaphore owner died.\n" @@ -4253,7 +4253,7 @@ msgstr "세마포어 사용자 제한.\n" #: dlls/kernel32/winerror.mc:413 msgid "Insert disk for drive %1.\n" -msgstr "드라이브 %1에 디스크를 넣으십시오.\n" +msgstr "드라이브 %1에 디스크를 넣으세요.\n" #: dlls/kernel32/winerror.mc:418 msgid "Drive locked.\n" @@ -4277,15 +4277,15 @@ msgstr "핸들을 더이상 찾을 수 없습니다.\n" #: dlls/kernel32/winerror.mc:448 msgid "Invalid target handle.\n" -msgstr "올바르지 않은 목표 핸들.\n" +msgstr "잘못된 목표 핸들.\n" #: dlls/kernel32/winerror.mc:453 msgid "Invalid IOCTL.\n" -msgstr "올바르지 않은 IOCTL.\n" +msgstr "잘못된 IOCTL.\n" #: dlls/kernel32/winerror.mc:458 msgid "Invalid verify switch.\n" -msgstr "올바르지 않은 검증 스위치.\n" +msgstr "잘못된 검증 스위치.\n" #: dlls/kernel32/winerror.mc:463 msgid "Bad driver level.\n" @@ -4293,7 +4293,7 @@ msgstr "잘못된 드라이버 레벨.\n" #: dlls/kernel32/winerror.mc:468 msgid "Call not implemented.\n" -msgstr "지원하지 않는 요청.\n" +msgstr "호출이 구현되지 않았습니다.\n" #: dlls/kernel32/winerror.mc:473 msgid "Semaphore timeout.\n" @@ -4305,11 +4305,11 @@ msgstr "충분하지 않은 버퍼.\n" #: dlls/kernel32/winerror.mc:483 dlls/mferror/mferror.mc:109 msgid "Invalid name.\n" -msgstr "올바르지 않은 이름.\n" +msgstr "잘못된 이름.\n" #: dlls/kernel32/winerror.mc:488 msgid "Invalid level.\n" -msgstr "올바르지 않은 레벨.\n" +msgstr "잘못된 레벨.\n" #: dlls/kernel32/winerror.mc:493 msgid "No volume label.\n" @@ -4413,7 +4413,7 @@ msgstr "시스템 추적이 지정하지 않았거나 허용되지 않습니다. #: dlls/kernel32/winerror.mc:623 msgid "Event count for DosMuxSemWait incorrect.\n" -msgstr "DosMuxSemWait 용 이벤트 개수가 올바르지 않습니다.\n" +msgstr "DosMuxSemWait 용 이벤트 개수가 잘못되었습니다.\n" #: dlls/kernel32/winerror.mc:628 msgid "Too many waiters for DosMuxSemWait.\n" @@ -4421,7 +4421,7 @@ msgstr "DosMuxSemWait 용 대기자가 너무 많습니다.\n" #: dlls/kernel32/winerror.mc:633 msgid "DosSemMuxWait list invalid.\n" -msgstr "DosSemMuxWait 목록이 올바르지 않습니다.\n" +msgstr "DosSemMuxWait 목록이 잘못되었습니다.\n" #: dlls/kernel32/winerror.mc:638 msgid "Volume label too long.\n" @@ -4453,7 +4453,7 @@ msgstr "잘못된 DosExecPgm 인수.\n" #: dlls/kernel32/winerror.mc:673 msgid "Path is invalid.\n" -msgstr "올바르지 않은 경로.\n" +msgstr "잘못된 경로.\n" #: dlls/kernel32/winerror.mc:678 msgid "Signal pending.\n" @@ -4481,11 +4481,11 @@ msgstr "원자적 잠금 미지원.\n" #: dlls/kernel32/winerror.mc:708 msgid "Invalid segment number.\n" -msgstr "올바르지 않은 세그멘트 번호.\n" +msgstr "잘못된 세그멘트 번호.\n" #: dlls/kernel32/winerror.mc:713 msgid "Invalid ordinal for %1.\n" -msgstr "올바르지 않은 %1 번호.\n" +msgstr "잘못된 %1 번호.\n" #: dlls/kernel32/winerror.mc:718 msgid "File already exists.\n" @@ -4493,7 +4493,7 @@ msgstr "파일이 이미 존재합니다.\n" #: dlls/kernel32/winerror.mc:723 msgid "Invalid flag number.\n" -msgstr "올바르지 않은 플래그.\n" +msgstr "잘못된 플래그.\n" #: dlls/kernel32/winerror.mc:728 msgid "Semaphore name not found.\n" @@ -4501,27 +4501,27 @@ msgstr "세마포어 이름을 찾을 수 없습니다.\n" #: dlls/kernel32/winerror.mc:733 msgid "Invalid starting code segment for %1.\n" -msgstr "올바르지 않은 %1 시작 코드 세그멘트.\n" +msgstr "잘못된 %1 시작 코드 세그멘트.\n" #: dlls/kernel32/winerror.mc:738 msgid "Invalid starting stack segment for %1.\n" -msgstr "올바르지 않은 %1 시작 스택 세그먼트.\n" +msgstr "잘못된 %1 시작 스택 세그먼트.\n" #: dlls/kernel32/winerror.mc:743 msgid "Invalid module type for %1.\n" -msgstr "올바르지 않은 %1 모듈 유형.\n" +msgstr "잘못된 %1 모듈 유형.\n" #: dlls/kernel32/winerror.mc:748 msgid "Invalid EXE signature in %1.\n" -msgstr "올바르지 않은 %1 실행 서명.\n" +msgstr "잘못된 %1 EXE 서명.\n" #: dlls/kernel32/winerror.mc:753 msgid "EXE %1 is marked invalid.\n" -msgstr "올바르지 않다고 표신된 EXE %1.\n" +msgstr "EXE %1이(가) 잘못된 것으로 표시되었습니다.\n" #: dlls/kernel32/winerror.mc:758 msgid "Bad EXE format for %1.\n" -msgstr "잘못된 %1 실행 형식.\n" +msgstr "잘못된 %1 EXE 형식.\n" #: dlls/kernel32/winerror.mc:763 msgid "Iterated data exceeds 64k in %1.\n" @@ -4533,7 +4533,7 @@ msgstr "%1 최소 할당 크기가 잘못되었습니다.\n" #: dlls/kernel32/winerror.mc:773 msgid "Dynlink from invalid ring.\n" -msgstr "올바르지 않은 링에서의 동적 링크.\n" +msgstr "잘못된 링에서의 동적 링크.\n" #: dlls/kernel32/winerror.mc:778 msgid "IOPL not enabled.\n" @@ -4541,7 +4541,7 @@ msgstr "불가능한 IOPL.\n" #: dlls/kernel32/winerror.mc:783 msgid "Invalid SEGDPL in %1.\n" -msgstr "올바르지 않은 %1 SEGDPL.\n" +msgstr "잘못된 %1 SEGDPL.\n" #: dlls/kernel32/winerror.mc:788 msgid "Auto data segment exceeds 64k.\n" @@ -4581,7 +4581,7 @@ msgstr "파일 이름 와일드카드 사용 오류.\n" #: dlls/kernel32/winerror.mc:833 msgid "Invalid signal number.\n" -msgstr "올바르지 않은 시그널 번호.\n" +msgstr "잘못된 시그널 번호.\n" #: dlls/kernel32/winerror.mc:838 msgid "Error setting signal handler.\n" @@ -4629,7 +4629,7 @@ msgstr "세션 취소.\n" #: dlls/kernel32/winerror.mc:893 msgid "Invalid extended attribute name.\n" -msgstr "올바르지 않은 확장 속성 이름.\n" +msgstr "잘못된 확장 속성 이름.\n" #: dlls/kernel32/winerror.mc:898 msgid "Extended attribute list inconsistent.\n" @@ -4645,7 +4645,7 @@ msgstr "복사 API를 사용할 수 없습니다.\n" #: dlls/kernel32/winerror.mc:913 msgid "Directory name invalid.\n" -msgstr "올바르지 않은 디렉터리 이름.\n" +msgstr "잘못된 디렉터리 이름.\n" #: dlls/kernel32/winerror.mc:918 msgid "Extended attributes didn't fit.\n" @@ -4661,7 +4661,7 @@ msgstr "확장 속성 테이블이 가득 찾습니다.\n" #: dlls/kernel32/winerror.mc:933 msgid "Invalid extended attribute handle.\n" -msgstr "올바르지 않은 확장 속성 핸들.\n" +msgstr "잘못된 확장 속성 핸들.\n" #: dlls/kernel32/winerror.mc:938 msgid "Extended attributes not supported.\n" @@ -4685,7 +4685,7 @@ msgstr "승인되지 않은 oplock.\n" #: dlls/kernel32/winerror.mc:963 msgid "Invalid oplock message received.\n" -msgstr "올바르지 않은 oplock 메시지 수신.\n" +msgstr "잘못된 oplock 메시지 수신.\n" #: dlls/kernel32/winerror.mc:968 msgid "Message 0x%1 not found in file %2.\n" @@ -4693,7 +4693,7 @@ msgstr "파일 %2에 메시지 0x%1이(가) 없습니다.\n" #: dlls/kernel32/winerror.mc:973 msgid "Invalid address.\n" -msgstr "올바르지 않은 주소.\n" +msgstr "잘못된 주소.\n" #: dlls/kernel32/winerror.mc:978 msgid "Arithmetic overflow.\n" @@ -4737,7 +4737,7 @@ msgstr "스택 오버플로우.\n" #: dlls/kernel32/winerror.mc:1028 msgid "Invalid message.\n" -msgstr "올바르지 않은 메시지.\n" +msgstr "잘못된 메시지입니다.\n" #: dlls/kernel32/winerror.mc:1033 msgid "Cannot complete.\n" @@ -4745,7 +4745,7 @@ msgstr "완료할 수 없습니다.\n" #: dlls/kernel32/winerror.mc:1038 msgid "Invalid flags.\n" -msgstr "올바르지 않은 플래그.\n" +msgstr "잘못된 플래그입니다.\n" #: dlls/kernel32/winerror.mc:1043 msgid "Unrecognized volume.\n" @@ -4753,7 +4753,7 @@ msgstr "인식되지 않는 볼륨.\n" #: dlls/kernel32/winerror.mc:1048 msgid "File invalid.\n" -msgstr "올바르지 않는 파일.\n" +msgstr "잘못된 파일입니다.\n" #: dlls/kernel32/winerror.mc:1053 msgid "Cannot run full-screen.\n" @@ -4769,7 +4769,7 @@ msgstr "레지스트리 손상.\n" #: dlls/kernel32/winerror.mc:1068 msgid "Invalid key.\n" -msgstr "올바르지 않은 키.\n" +msgstr "잘못된 키.\n" #: dlls/kernel32/winerror.mc:1073 msgid "Can't open registry key.\n" @@ -4825,7 +4825,7 @@ msgstr "의존 서비스 실행 중.\n" #: dlls/kernel32/winerror.mc:1138 msgid "Invalid service control.\n" -msgstr "올바르지 않은 서비스 컨트롤.\n" +msgstr "잘못된 서비스 컨트롤.\n" #: dlls/kernel32/winerror.mc:1143 msgid "Service request timeout.\n" @@ -4845,7 +4845,7 @@ msgstr "서비스 실행 증.\n" #: dlls/kernel32/winerror.mc:1163 msgid "Invalid service account.\n" -msgstr "올바르지 않은 서비스 계정.\n" +msgstr "잘못된 서비스 계정.\n" #: dlls/kernel32/winerror.mc:1168 msgid "Service is disabled.\n" @@ -4901,7 +4901,7 @@ msgstr "서비스 start-hang.\n" #: dlls/kernel32/winerror.mc:1233 msgid "Invalid service lock.\n" -msgstr "올바르지 않은 서비스 잠금.\n" +msgstr "잘못된 서비스 잠금.\n" #: dlls/kernel32/winerror.mc:1238 msgid "Service marked for delete.\n" @@ -4977,7 +4977,7 @@ msgstr "파티션 실패.\n" #: dlls/kernel32/winerror.mc:1328 msgid "Invalid block length.\n" -msgstr "올바르지 않은 블럭 길이.\n" +msgstr "잘못된 블럭 길이.\n" #: dlls/kernel32/winerror.mc:1333 msgid "Device not partitioned.\n" @@ -5113,7 +5113,7 @@ msgstr "리얼 모드 프로그램.\n" #: dlls/kernel32/winerror.mc:1498 msgid "Invalid DLL.\n" -msgstr "올바르지 않은 DLL.\n" +msgstr "잘못된 DLL.\n" #: dlls/kernel32/winerror.mc:1503 msgid "No associated application.\n" @@ -5145,7 +5145,7 @@ msgstr "대상 요소가 가능 차 있습니다.\n" #: dlls/kernel32/winerror.mc:1538 msgid "The element address is invalid.\n" -msgstr "올바르지 않은 요소 주소.\n" +msgstr "잘못된 요소 주소.\n" #: dlls/kernel32/winerror.mc:1543 msgid "The magazine is not present.\n" @@ -5153,15 +5153,15 @@ msgstr "Magazine이 없습니다.\n" #: dlls/kernel32/winerror.mc:1548 msgid "The device needs reinitialization.\n" -msgstr "이 장치는 초기화가 다시 필요합니다.\n" +msgstr "이 장치는 재초기화가 필요합니다.\n" #: dlls/kernel32/winerror.mc:1553 msgid "The device requires cleaning.\n" -msgstr "장치는 청소가 필요함.\n" +msgstr "이 장치는 정리가 필요합니다.\n" #: dlls/kernel32/winerror.mc:1558 msgid "The device door is open.\n" -msgstr "장치의 문이 열려있음.\n" +msgstr "장치 문이 열려 있습니다.\n" #: dlls/kernel32/winerror.mc:1563 msgid "The device is not connected.\n" @@ -5185,15 +5185,15 @@ msgstr "포인트를 찾을 수 없습니다.\n" #: dlls/kernel32/winerror.mc:1588 msgid "No running tracking service.\n" -msgstr "추적 서비스가 실행중이 아님.\n" +msgstr "실행 중인 추적 서비스가 없습니다.\n" #: dlls/kernel32/winerror.mc:1593 msgid "No such volume ID.\n" -msgstr "볼륨 아이디가 없음.\n" +msgstr "그런 볼륨 ID가 없습니다.\n" #: dlls/kernel32/winerror.mc:1598 msgid "Unable to remove the file to be replaced.\n" -msgstr "교체하려는 파일을 지울 수 없습니다.\n" +msgstr "바꿀 파일을 제거할 수 없습니다.\n" #: dlls/kernel32/winerror.mc:1603 msgid "Unable to move the replacement file into place.\n" @@ -5201,11 +5201,11 @@ msgstr "교체 파일을 제자리로 이동할 수 없습니다.\n" #: dlls/kernel32/winerror.mc:1608 msgid "Moving the replacement file failed.\n" -msgstr "교체 파일 이동 실패.\n" +msgstr "교체 파일을 이동하지 못했습니다.\n" #: dlls/kernel32/winerror.mc:1613 msgid "The journal is being deleted.\n" -msgstr "저널이 지워졌습니다.\n" +msgstr "저널이 삭제되고 있습니다.\n" #: dlls/kernel32/winerror.mc:1618 msgid "The journal is not active.\n" @@ -5221,7 +5221,7 @@ msgstr "저널 엔트리가 지워짐.\n" #: dlls/kernel32/winerror.mc:1633 msgid "Invalid device name.\n" -msgstr "올바르지 않은 장치 이름.\n" +msgstr "잘못된 장치 이름.\n" #: dlls/kernel32/winerror.mc:1638 msgid "Connection unavailable.\n" @@ -5237,7 +5237,7 @@ msgstr "네트워크가 없거나 잘못된 경로.\n" #: dlls/kernel32/winerror.mc:1653 msgid "Invalid network provider name.\n" -msgstr "올바르지 않은 네트워크 제공자 이름.\n" +msgstr "잘못된 네트워크 제공자 이름.\n" #: dlls/kernel32/winerror.mc:1658 msgid "Cannot open network connection profile.\n" @@ -5257,39 +5257,39 @@ msgstr "확장된 오류.\n" #: dlls/kernel32/winerror.mc:1678 msgid "Invalid group name.\n" -msgstr "올바르지 않은 그룹 이름.\n" +msgstr "잘못된 그룹 이름.\n" #: dlls/kernel32/winerror.mc:1683 msgid "Invalid computer name.\n" -msgstr "올바르지 않은 컴퓨터 이름.\n" +msgstr "잘못된 컴퓨터 이름.\n" #: dlls/kernel32/winerror.mc:1688 msgid "Invalid event name.\n" -msgstr "올바르지 않은 이벤트 이름.\n" +msgstr "잘못된 이벤트 이름.\n" #: dlls/kernel32/winerror.mc:1693 msgid "Invalid domain name.\n" -msgstr "올바르지 않은 도메인 이름.\n" +msgstr "잘못된 도메인 이름.\n" #: dlls/kernel32/winerror.mc:1698 msgid "Invalid service name.\n" -msgstr "올바르지 않은 서비스 이름.\n" +msgstr "잘못된 서비스 이름.\n" #: dlls/kernel32/winerror.mc:1703 msgid "Invalid network name.\n" -msgstr "올바르지 않은 네트워크 이름.\n" +msgstr "잘못된 네트워크 이름.\n" #: dlls/kernel32/winerror.mc:1708 msgid "Invalid share name.\n" -msgstr "올바르지 않은 공유 이름.\n" +msgstr "잘못된 공유 이름.\n" #: dlls/kernel32/winerror.mc:1718 msgid "Invalid message name.\n" -msgstr "올바르지 않은 메시지 이름.\n" +msgstr "잘못된 메시지 이름.\n" #: dlls/kernel32/winerror.mc:1723 msgid "Invalid message destination.\n" -msgstr "올바르지 않은 메시지 대상.\n" +msgstr "잘못된 메시지 대상.\n" #: dlls/kernel32/winerror.mc:1728 msgid "Session credential conflict.\n" @@ -5305,7 +5305,7 @@ msgstr "도메인 또는 작업그룹 이름 중복.\n" #: dlls/kernel32/winerror.mc:1743 msgid "No network.\n" -msgstr "네트쿼크 없음.\n" +msgstr "네트워크 없음.\n" #: dlls/kernel32/winerror.mc:1748 msgid "Operation canceled by user.\n" @@ -5325,27 +5325,27 @@ msgstr "정상적으로 연결 종료.\n" #: dlls/kernel32/winerror.mc:1768 msgid "Address already associated with transport endpoint.\n" -msgstr "주소는 이미 전송 끝점과 관련되어 있음.\n" +msgstr "이미 전송 엔드포인트와 연결된 주소입니다.\n" #: dlls/kernel32/winerror.mc:1773 msgid "Address not associated with transport endpoint.\n" -msgstr "주소가 전송 끝점과 연관되지 않았습니다.\n" +msgstr "주소가 전송 엔드포인트와 연결되지 않았습니다.\n" #: dlls/kernel32/winerror.mc:1778 msgid "Connection invalid.\n" -msgstr "올바르지 않은 연결.\n" +msgstr "연결이 잘못되었습니다.\n" #: dlls/kernel32/winerror.mc:1783 msgid "Connection is active.\n" -msgstr "연결 활성화.\n" +msgstr "연결이 활성화되었습니다.\n" #: dlls/kernel32/winerror.mc:1788 msgid "Network unreachable.\n" -msgstr "접근할 수 없는 네트워크.\n" +msgstr "네트워크에 연결할 수 없습니다.\n" #: dlls/kernel32/winerror.mc:1793 msgid "Host unreachable.\n" -msgstr "접근할 수 없는 호스트.\n" +msgstr "호스트에 연결할 수 없습니다.\n" #: dlls/kernel32/winerror.mc:1798 msgid "Protocol unreachable.\n" @@ -5365,7 +5365,7 @@ msgstr "연결 중단.\n" #: dlls/kernel32/winerror.mc:1818 msgid "Please retry operation.\n" -msgstr "작업을 다시 시도하십시오.\n" +msgstr "작업을 다시 시도하세요.\n" #: dlls/kernel32/winerror.mc:1823 msgid "Connection count limit reached.\n" @@ -5433,7 +5433,7 @@ msgstr "사용자 프로파일이 잘못되었습니다.\n" #: dlls/kernel32/winerror.mc:1903 msgid "Not supported on Small Business Server.\n" -msgstr "Small Business Server는 지원하지 않습니다.\n" +msgstr "Small Business Server는 지원되지 않습니다.\n" #: dlls/kernel32/winerror.mc:1908 msgid "Not all privileges assigned.\n" @@ -5465,11 +5465,11 @@ msgstr "호환되지 않는 리비전 레벨.\n" #: dlls/kernel32/winerror.mc:1943 msgid "Invalid owner.\n" -msgstr "올바르지 않은 소유자.\n" +msgstr "잘못된 소유자.\n" #: dlls/kernel32/winerror.mc:1948 msgid "Invalid primary group.\n" -msgstr "올바르지 않은 기본 그룹.\n" +msgstr "잘못된 기본 그룹.\n" #: dlls/kernel32/winerror.mc:1953 msgid "No impersonation token.\n" @@ -5497,7 +5497,7 @@ msgstr "권한이 유지 되지 않음.\n" #: dlls/kernel32/winerror.mc:1983 msgid "Invalid account name.\n" -msgstr "올바르지 않은 계정 이름.\n" +msgstr "잘못된 계정 이름.\n" #: dlls/kernel32/winerror.mc:1988 msgid "User already exists.\n" @@ -5549,11 +5549,11 @@ msgstr "계정 제한.\n" #: dlls/kernel32/winerror.mc:2048 msgid "Invalid logon hours.\n" -msgstr "올바르지 않은 로그온 시간.\n" +msgstr "잘못된 로그온 시간.\n" #: dlls/kernel32/winerror.mc:2053 msgid "Invalid workstation.\n" -msgstr "올바르지 않은 워크스테이션.\n" +msgstr "잘못된 워크스테이션.\n" #: dlls/kernel32/winerror.mc:2058 msgid "Password expired.\n" @@ -5577,19 +5577,19 @@ msgstr "LUID가 고갈됨.\n" #: dlls/kernel32/winerror.mc:2083 msgid "Invalid sub authority.\n" -msgstr "올바르지 않은 하위 기관.\n" +msgstr "잘못된 하위 기관.\n" #: dlls/kernel32/winerror.mc:2088 msgid "Invalid ACL.\n" -msgstr "올바르지 않은 ACL.\n" +msgstr "잘못된 ACL.\n" #: dlls/kernel32/winerror.mc:2093 msgid "Invalid SID.\n" -msgstr "올바르지 않은 SID.\n" +msgstr "잘못된 SID.\n" #: dlls/kernel32/winerror.mc:2098 msgid "Invalid security descriptor.\n" -msgstr "올바르지 않은 보안 설명자.\n" +msgstr "잘못된 보안 설명자.\n" #: dlls/kernel32/winerror.mc:2103 msgid "Bad inherited ACL.\n" @@ -5605,7 +5605,7 @@ msgstr "서버가 가능하지 않지가 않음.\n" #: dlls/kernel32/winerror.mc:2118 msgid "Invalid ID authority.\n" -msgstr "올바르지 않은 아이디 권한.\n" +msgstr "잘못된 아이디 권한.\n" #: dlls/kernel32/winerror.mc:2123 msgid "Allotted space exceeded.\n" @@ -5613,7 +5613,7 @@ msgstr "할당된 공간을 초과했습니다.\n" #: dlls/kernel32/winerror.mc:2128 msgid "Invalid group attributes.\n" -msgstr "올바르지 않은 그룹 속성.\n" +msgstr "잘못된 그룹 속성.\n" #: dlls/kernel32/winerror.mc:2133 msgid "Bad impersonation level.\n" @@ -5641,15 +5641,15 @@ msgstr "도메인 정보에 접근할 수 없음.\n" #: dlls/kernel32/winerror.mc:2163 msgid "Invalid server state.\n" -msgstr "올바르지 않은 서버 상태.\n" +msgstr "잘못된 서버 상태.\n" #: dlls/kernel32/winerror.mc:2168 msgid "Invalid domain state.\n" -msgstr "올바르지 않은 도메인 상태.\n" +msgstr "잘못된 도메인 상태.\n" #: dlls/kernel32/winerror.mc:2173 msgid "Invalid domain role.\n" -msgstr "올바르지 않은 도메인 법칙.\n" +msgstr "잘못된 도메인 법칙.\n" #: dlls/kernel32/winerror.mc:2178 msgid "No such domain.\n" @@ -5701,7 +5701,7 @@ msgstr "로그온 세션 아이디 충돌.\n" #: dlls/kernel32/winerror.mc:2238 msgid "Invalid logon type.\n" -msgstr "올바르지 않은 로그온 타입.\n" +msgstr "잘못된 로그온 타입.\n" #: dlls/kernel32/winerror.mc:2243 msgid "Cannot impersonate.\n" @@ -5709,7 +5709,7 @@ msgstr "사칭할 수 없습니다.\n" #: dlls/kernel32/winerror.mc:2248 msgid "Invalid transaction state.\n" -msgstr "트랜잭션 상태가 올바르지 않습니다.\n" +msgstr "트랜잭션 상태가 잘못되었습니다.\n" #: dlls/kernel32/winerror.mc:2253 msgid "Security DB commit failure.\n" @@ -5781,7 +5781,7 @@ msgstr "어떤 회원도 없습니다.\n" #: dlls/kernel32/winerror.mc:2343 msgid "Invalid member.\n" -msgstr "올바르지 않은 회원.\n" +msgstr "잘못된 회원.\n" #: dlls/kernel32/winerror.mc:2348 msgid "Too many SIDs.\n" @@ -5825,27 +5825,27 @@ msgstr "클라이언트와 서버 사이의 시간 왜곡.\n" #: dlls/kernel32/winerror.mc:2398 msgid "Invalid window handle.\n" -msgstr "올바르지 않은 원도우 핸들.\n" +msgstr "잘못된 원도우 핸들.\n" #: dlls/kernel32/winerror.mc:2403 msgid "Invalid menu handle.\n" -msgstr "올바르지 않은 메뉴 핸들.\n" +msgstr "잘못된 메뉴 핸들.\n" #: dlls/kernel32/winerror.mc:2408 msgid "Invalid cursor handle.\n" -msgstr "올바르지 않은 커서 핸들.\n" +msgstr "잘못된 커서 핸들.\n" #: dlls/kernel32/winerror.mc:2413 msgid "Invalid accelerator table handle.\n" -msgstr "올바르지 않은 엑셀레이터 테이블 핸들.\n" +msgstr "잘못된 엑셀레이터 테이블 핸들.\n" #: dlls/kernel32/winerror.mc:2418 msgid "Invalid hook handle.\n" -msgstr "올바르지 않은 hook 핸들.\n" +msgstr "잘못된 hook 핸들.\n" #: dlls/kernel32/winerror.mc:2423 msgid "Invalid DWP handle.\n" -msgstr "올바르지 않은 DWP 핸들.\n" +msgstr "잘못된 DWP 핸들.\n" #: dlls/kernel32/winerror.mc:2428 msgid "Can't create top-level child window.\n" @@ -5877,11 +5877,11 @@ msgstr "클래스는 연 상태의 창을 가지고 있습니다.\n" #: dlls/kernel32/winerror.mc:2463 dlls/mferror/mferror.mc:130 msgid "Invalid index.\n" -msgstr "올바르지 않은 인덱스.\n" +msgstr "잘못된 인덱스.\n" #: dlls/kernel32/winerror.mc:2468 msgid "Invalid icon handle.\n" -msgstr "올바르지 않은 아이콘 핸들.\n" +msgstr "잘못된 아이콘 핸들.\n" #: dlls/kernel32/winerror.mc:2473 msgid "Private dialog index.\n" @@ -5913,7 +5913,7 @@ msgstr "컨트롤 아이디를 찾을 수 없음.\n" #: dlls/kernel32/winerror.mc:2508 msgid "Invalid combo box message.\n" -msgstr "올바르지 않은 콤보 박스 메시지입니다.\n" +msgstr "잘못된 콤보 박스 메시지입니다.\n" #: dlls/kernel32/winerror.mc:2513 msgid "Not a combo box window.\n" @@ -5921,7 +5921,7 @@ msgstr "콤보 박스 창이 아닙니다.\n" #: dlls/kernel32/winerror.mc:2518 msgid "Invalid edit height.\n" -msgstr "올바르지 않은 편집 높이.\n" +msgstr "잘못된 편집 높이.\n" #: dlls/kernel32/winerror.mc:2523 msgid "DC not found.\n" @@ -5929,43 +5929,43 @@ msgstr "DC를 찾을 수 없습니다.\n" #: dlls/kernel32/winerror.mc:2528 msgid "Invalid hook filter.\n" -msgstr "올바르지 않은 hook 필터.\n" +msgstr "잘못된 훅 필터.\n" #: dlls/kernel32/winerror.mc:2533 msgid "Invalid filter procedure.\n" -msgstr "올바르지 않은 필터 프로시져.\n" +msgstr "잘못된 필터 프로시져.\n" #: dlls/kernel32/winerror.mc:2538 msgid "Hook procedure needs module handle.\n" -msgstr "후크 프로 시저가 처리 모듈 필요.\n" +msgstr "훅 프로시저가 모듈 핸들을 필요로 합니다.\n" #: dlls/kernel32/winerror.mc:2543 msgid "Global-only hook procedure.\n" -msgstr "글로벌 전용 후크 프로 시저.\n" +msgstr "글로벌 전용 훅 프로시저.\n" #: dlls/kernel32/winerror.mc:2548 msgid "Journal hook already set.\n" -msgstr "저널 후크는 이미 설정되어 있음.\n" +msgstr "저널 훅이 이미 설정되어 있습니다.\n" #: dlls/kernel32/winerror.mc:2553 msgid "Hook procedure not installed.\n" -msgstr "설치되어 있지 않은 후크 프로 시저.\n" +msgstr "훅 프로시저가 설치되어 있지 않습니다.\n" #: dlls/kernel32/winerror.mc:2558 msgid "Invalid list box message.\n" -msgstr "올바르지 않은 목록상자 메시지.\n" +msgstr "잘못된 목록상자 메시지.\n" #: dlls/kernel32/winerror.mc:2563 msgid "Invalid LB_SETCOUNT sent.\n" -msgstr "올바르지 않은 LB_SETCOUNT 보내기.\n" +msgstr "잘못된 LB_SETCOUNT 보내기.\n" #: dlls/kernel32/winerror.mc:2568 msgid "No tab stops on this list box.\n" -msgstr "목록상자에는 탭정지가 없음.\n" +msgstr "이 목록상자는 탭정지가 없습니다.\n" #: dlls/kernel32/winerror.mc:2573 msgid "Can't destroy object owned by another thread.\n" -msgstr "다른 스레드가 소유한 개체를 파괴할 수 없다.\n" +msgstr "다른 스레드가 소유한 개체를 파괴할 수 없습니다.\n" #: dlls/kernel32/winerror.mc:2578 msgid "Child window menus not allowed.\n" @@ -5973,15 +5973,15 @@ msgstr "자식 창 메뉴는 허용되지 않습니다.\n" #: dlls/kernel32/winerror.mc:2583 msgid "Window has no system menu.\n" -msgstr "창은 시스템 메뉴를 가지고 있지 않습니다.\n" +msgstr "창이 시스템 메뉴를 가지고 있지 않습니다.\n" #: dlls/kernel32/winerror.mc:2588 msgid "Invalid message box style.\n" -msgstr "올바르지 않은 메시지 박스 스타일.\n" +msgstr "잘못된 메시지 박스 스타일.\n" #: dlls/kernel32/winerror.mc:2593 msgid "Invalid SPI parameter.\n" -msgstr "올바르지 않은 SPI 매개변수.\n" +msgstr "잘못된 SPI 매개변수.\n" #: dlls/kernel32/winerror.mc:2598 msgid "Screen already locked.\n" @@ -5997,11 +5997,11 @@ msgstr "자식 창이 아닙니다.\n" #: dlls/kernel32/winerror.mc:2613 msgid "Invalid GW command.\n" -msgstr "올바르지 않은 GW 명령.\n" +msgstr "잘못된 GW 명령.\n" #: dlls/kernel32/winerror.mc:2618 msgid "Invalid thread ID.\n" -msgstr "올바르지 않은 스레드 ID.\n" +msgstr "잘못된 스레드 ID.\n" #: dlls/kernel32/winerror.mc:2623 msgid "Not an MDI child window.\n" @@ -6017,11 +6017,11 @@ msgstr "스크롤바가 없습니다.\n" #: dlls/kernel32/winerror.mc:2638 msgid "Invalid scrollbar range.\n" -msgstr "올바르지 않은 스코롤바 범위.\n" +msgstr "잘못된 스코롤바 범위.\n" #: dlls/kernel32/winerror.mc:2643 msgid "Invalid ShowWin command.\n" -msgstr "올바르지 않은 ShowWin 명령.\n" +msgstr "잘못된 ShowWin 명령.\n" #: dlls/kernel32/winerror.mc:2648 msgid "No system resources.\n" @@ -6053,7 +6053,7 @@ msgstr "메뉴 항목을 찾을 수 없습니다.\n" #: dlls/kernel32/winerror.mc:2683 msgid "Invalid keyboard handle.\n" -msgstr "올바르지 않은 키보드 핸들.\n" +msgstr "잘못된 키보드 핸들.\n" #: dlls/kernel32/winerror.mc:2688 msgid "Hook type not allowed.\n" @@ -6069,7 +6069,7 @@ msgstr "시간 초과.\n" #: dlls/kernel32/winerror.mc:2703 msgid "Invalid monitor handle.\n" -msgstr "올바르지 않은 모니터 핸들.\n" +msgstr "잘못된 모니터 핸들.\n" #: dlls/kernel32/winerror.mc:2708 msgid "Event log file corrupt.\n" @@ -6141,31 +6141,31 @@ msgstr "잘못된 설치 패키지 버전.\n" #: dlls/kernel32/winerror.mc:2793 msgid "Product uninstalled.\n" -msgstr "제품 제거됨.\n" +msgstr "제품이 제거되었습니다.\n" #: dlls/kernel32/winerror.mc:2798 msgid "Invalid query syntax.\n" -msgstr "잘못된 쿼리 구문.\n" +msgstr "잘못된 쿼리 구문입니다.\n" #: dlls/kernel32/winerror.mc:2803 msgid "Invalid field.\n" -msgstr "올바르지 않은 필드.\n" +msgstr "잘못된 필드입니다.\n" #: dlls/kernel32/winerror.mc:2808 msgid "Device removed.\n" -msgstr "장치가 제거됨.\n" +msgstr "장치가 제거되었습니다.\n" #: dlls/kernel32/winerror.mc:2813 msgid "Installation already running.\n" -msgstr "설치 작업은 이미 실행증임.\n" +msgstr "설치 작업이 이미 실행중입니다.\n" #: dlls/kernel32/winerror.mc:2818 msgid "Installation package failed to open.\n" -msgstr "설치 패키지 열기 실패.\n" +msgstr "설치 패키지를 열지 못했습니다.\n" #: dlls/kernel32/winerror.mc:2823 msgid "Installation package is invalid.\n" -msgstr "설치 패키지가 올바르지 않음.\n" +msgstr "설치 패키지가 잘못되었습니다.\n" #: dlls/kernel32/winerror.mc:2828 msgid "Installer user interface failed.\n" @@ -6177,7 +6177,7 @@ msgstr "설치 로그 파일 열기 실패.\n" #: dlls/kernel32/winerror.mc:2838 msgid "Installation language not supported.\n" -msgstr "설치 언어를 지원하지 않습니다.\n" +msgstr "설치하려는 언어가 지원되지 않습니다.\n" #: dlls/kernel32/winerror.mc:2843 msgid "Installation transform failed to apply.\n" @@ -6197,7 +6197,7 @@ msgstr "함수 실패.\n" #: dlls/kernel32/winerror.mc:2863 msgid "Invalid table.\n" -msgstr "올바르지 않은 테이블.\n" +msgstr "잘못된 테이블.\n" #: dlls/kernel32/winerror.mc:2868 msgid "Data type mismatch.\n" @@ -6205,7 +6205,7 @@ msgstr "데이터 형식이 맞지 않습니다.\n" #: dlls/kernel32/winerror.mc:2873 dlls/kernel32/winerror.mc:3083 msgid "Unsupported type.\n" -msgstr "지원하지 않는 형식.\n" +msgstr "지원되지 않는 형식.\n" #: dlls/kernel32/winerror.mc:2878 msgid "Creation failed.\n" @@ -6217,7 +6217,7 @@ msgstr "임시 디렉터리에 기록할 수 없음.\n" #: dlls/kernel32/winerror.mc:2888 msgid "Installation platform not supported.\n" -msgstr "설치 플랫폼을 지원하지 않음.\n" +msgstr "설치하려는 플랫폼이 지원되지 않스니다.\n" #: dlls/kernel32/winerror.mc:2893 msgid "Installer not used.\n" @@ -6229,11 +6229,11 @@ msgstr "패치 패키지 열기 실패.\n" #: dlls/kernel32/winerror.mc:2903 msgid "Invalid patch package.\n" -msgstr "올바르지 않은 패치 패키지.\n" +msgstr "잘못된 패치 패키지.\n" #: dlls/kernel32/winerror.mc:2908 msgid "Unsupported patch package.\n" -msgstr "지원하지 않는 패치 패키지.\n" +msgstr "지원되지 않는 패치 패키지입니다.\n" #: dlls/kernel32/winerror.mc:2913 msgid "Another version is installed.\n" @@ -6241,7 +6241,7 @@ msgstr "다른 버전이 설치되어 있음.\n" #: dlls/kernel32/winerror.mc:2918 msgid "Invalid command line.\n" -msgstr "올바르지 않은 명령 라인.\n" +msgstr "잘못된 명령 라인.\n" #: dlls/kernel32/winerror.mc:2923 msgid "Remote installation not allowed.\n" @@ -6253,7 +6253,7 @@ msgstr "설치가 성공한 후에 스스로 재부팅될 것임.\n" #: dlls/kernel32/winerror.mc:2933 msgid "Invalid string binding.\n" -msgstr "올바르지 않은 문자열 바인딩.\n" +msgstr "잘못된 문자열 바인딩.\n" #: dlls/kernel32/winerror.mc:2938 msgid "Wrong kind of binding.\n" @@ -6261,7 +6261,7 @@ msgstr "잘못된 종류의 바인딩.\n" #: dlls/kernel32/winerror.mc:2943 msgid "Invalid binding.\n" -msgstr "올바르지 않은 바인딩.\n" +msgstr "잘못된 바인딩.\n" #: dlls/kernel32/winerror.mc:2948 msgid "RPC protocol sequence not supported.\n" @@ -6269,19 +6269,19 @@ msgstr "RPC 프로토콜 시퀀스가 지원되지 않음.\n" #: dlls/kernel32/winerror.mc:2953 msgid "Invalid RPC protocol sequence.\n" -msgstr "올바르지 않은 RPC 프로토콜 순서.\n" +msgstr "잘못된 RPC 프로토콜 순서.\n" #: dlls/kernel32/winerror.mc:2958 msgid "Invalid string UUID.\n" -msgstr "올바르지 않은 문자열 UUID.\n" +msgstr "잘못된 문자열 UUID.\n" #: dlls/kernel32/winerror.mc:2963 msgid "Invalid endpoint format.\n" -msgstr "올바르지 않은 엔드포인트 포맷.\n" +msgstr "잘못된 엔드포인트 포맷.\n" #: dlls/kernel32/winerror.mc:2968 msgid "Invalid network address.\n" -msgstr "올바르지 않은 네트워크 주소.\n" +msgstr "잘못된 네트워크 주소.\n" #: dlls/kernel32/winerror.mc:2973 msgid "No endpoint found.\n" @@ -6289,7 +6289,7 @@ msgstr "엔드포인트를 찾을 수 없음.\n" #: dlls/kernel32/winerror.mc:2978 msgid "Invalid timeout value.\n" -msgstr "올바르지 않은 시간 초과 값.\n" +msgstr "잘못된 시간 초과 값.\n" #: dlls/kernel32/winerror.mc:2983 msgid "Object UUID not found.\n" @@ -6337,59 +6337,59 @@ msgstr "엔드포인트를 만들 수 없습니다.\n" #: dlls/kernel32/winerror.mc:3038 msgid "Out of resources.\n" -msgstr "리소스가 부족합니다.\n" +msgstr "리소스 부족.\n" #: dlls/kernel32/winerror.mc:3043 msgid "RPC server unavailable.\n" -msgstr "RPC 서버가 가능하지 않습니다.\n" +msgstr "RPC 서버를 사용할 수 없습니다.\n" #: dlls/kernel32/winerror.mc:3048 msgid "RPC server too busy.\n" -msgstr "RPC 서버는 매우 바쁩니다.\n" +msgstr "RPC 서버가 지나치게 사용 중입니다.\n" #: dlls/kernel32/winerror.mc:3053 msgid "Invalid network options.\n" -msgstr "올바르지 않은 네트워크 옵션.\n" +msgstr "잘못된 네트워크 옵션.\n" #: dlls/kernel32/winerror.mc:3058 msgid "No RPC call active.\n" -msgstr "어떤 RPC 호출도 활성화되어있지 않습니다.\n" +msgstr "RPC 호출이 활성화되지 않았습니다.\n" #: dlls/kernel32/winerror.mc:3063 msgid "RPC call failed.\n" -msgstr "RPC 호출 실패.\n" +msgstr "RPC 호출이 실패했습니다.\n" #: dlls/kernel32/winerror.mc:3068 msgid "RPC call failed and didn't execute.\n" -msgstr "RPC 호출 실패 그리고 실행못함.\n" +msgstr "RPC 호출이 실패하여 실행하지 않았습니다.\n" #: dlls/kernel32/winerror.mc:3073 msgid "RPC protocol error.\n" -msgstr "RPC 프로토콜 오류.\n" +msgstr "RPC 프로토콜 오류.\n" #: dlls/kernel32/winerror.mc:3078 msgid "Unsupported transfer syntax.\n" -msgstr "지원하지 않는 트랜스퍼 문법.\n" +msgstr "지원되지 않는 전송 구문.\n" #: dlls/kernel32/winerror.mc:3088 msgid "Invalid tag.\n" -msgstr "올바르지 않은 태그.\n" +msgstr "잘못된 태그.\n" #: dlls/kernel32/winerror.mc:3093 msgid "Invalid array bounds.\n" -msgstr "올바르지 않은 배치 영역.\n" +msgstr "배열 경계가 잘못되었습니다.\n" #: dlls/kernel32/winerror.mc:3098 msgid "No entry name.\n" -msgstr "엔트리 이름이 없음.\n" +msgstr "항목 이름이 없습니다.\n" #: dlls/kernel32/winerror.mc:3103 msgid "Invalid name syntax.\n" -msgstr "올바르지 않은 이름 문법.\n" +msgstr "잘못된 이름 구문.\n" #: dlls/kernel32/winerror.mc:3108 msgid "Unsupported name syntax.\n" -msgstr "지원하지 않는 이름 문법.\n" +msgstr "지원되지 않는 이름 구문.\n" #: dlls/kernel32/winerror.mc:3113 msgid "No network address.\n" @@ -6397,7 +6397,7 @@ msgstr "네트워크 주소가 없습니다.\n" #: dlls/kernel32/winerror.mc:3118 msgid "Duplicate endpoint.\n" -msgstr "중복된 끝나는 점.\n" +msgstr "중복된 엔드포인트.\n" #: dlls/kernel32/winerror.mc:3123 msgid "Unknown authentication type.\n" @@ -6405,7 +6405,7 @@ msgstr "알 수 없는 인증 형식.\n" #: dlls/kernel32/winerror.mc:3128 msgid "Maximum calls too low.\n" -msgstr "호출의 최대값이 너무 낮습니다.\n" +msgstr "최대 호출이 너무 낮습니다.\n" #: dlls/kernel32/winerror.mc:3133 msgid "String too long.\n" @@ -6413,15 +6413,15 @@ msgstr "문자열이 너무 깁니다.\n" #: dlls/kernel32/winerror.mc:3138 msgid "Protocol sequence not found.\n" -msgstr "프로토콜 순서를 찾을 수 없습니다.\n" +msgstr "프로토콜 시퀀스를 찾을 수 없습니다.\n" #: dlls/kernel32/winerror.mc:3143 msgid "Procedure number out of range.\n" -msgstr "처리절차 번호가 범위를 벗어납니다.\n" +msgstr "절차 번호가 범위를 벗어났습니다.\n" #: dlls/kernel32/winerror.mc:3148 msgid "Binding has no authentication data.\n" -msgstr "바인딩은 어떤 인증 정보도 가지고 있지 않습니다.\n" +msgstr "바인딩에 인증 데이터가 없습니다.\n" #: dlls/kernel32/winerror.mc:3153 msgid "Unknown authentication service.\n" @@ -6429,11 +6429,11 @@ msgstr "알 수 없는 인증 서비스.\n" #: dlls/kernel32/winerror.mc:3158 msgid "Unknown authentication level.\n" -msgstr "알 수 없는 인증 레벨.\n" +msgstr "알 수 없는 인증 수준.\n" #: dlls/kernel32/winerror.mc:3163 msgid "Invalid authentication identity.\n" -msgstr "올바르지 않은 인증 증명서.\n" +msgstr "잘못된 인증 ID.\n" #: dlls/kernel32/winerror.mc:3168 msgid "Unknown authorization service.\n" @@ -6441,35 +6441,35 @@ msgstr "알 수 없는 인증 서비스.\n" #: dlls/kernel32/winerror.mc:3173 msgid "Invalid entry.\n" -msgstr "올바르지 않은 엔트리.\n" +msgstr "잘못된 항목.\n" #: dlls/kernel32/winerror.mc:3178 msgid "Can't perform operation.\n" -msgstr "작업을 완료할 수 없습니다.\n" +msgstr "작업을 수행할 수 없습니다.\n" #: dlls/kernel32/winerror.mc:3183 msgid "Endpoints not registered.\n" -msgstr "끝나는 점이 등록되지 않았습니다.\n" +msgstr "엔드포인트가 등록되지 않았습니다.\n" #: dlls/kernel32/winerror.mc:3188 msgid "Nothing to export.\n" -msgstr "불러 올 것이 없습니다.\n" +msgstr "내보낼 것이 없습니다.\n" #: dlls/kernel32/winerror.mc:3193 msgid "Incomplete name.\n" -msgstr "완성되지 않은 이름.\n" +msgstr "불완전한 이름.\n" #: dlls/kernel32/winerror.mc:3198 msgid "Invalid version option.\n" -msgstr "올바르지 않은 버전 옵션.\n" +msgstr "잘못된 버전 옵션.\n" #: dlls/kernel32/winerror.mc:3203 msgid "No more members.\n" -msgstr "더 이상 회원은 없습니다.\n" +msgstr "구성원이 더 이상 없습니다.\n" #: dlls/kernel32/winerror.mc:3208 msgid "Not all objects unexported.\n" -msgstr "모든 개체가 내보내지지 못했습니다.\n" +msgstr "내보내기 취소된 개체가 없습니다.\n" #: dlls/kernel32/winerror.mc:3213 msgid "Interface not found.\n" @@ -6477,27 +6477,27 @@ msgstr "인터페이스를 찾을 수 없습니다.\n" #: dlls/kernel32/winerror.mc:3218 msgid "Entry already exists.\n" -msgstr "엔트리는 이미 존재합니다.\n" +msgstr "항목이 이미 존재합니다.\n" #: dlls/kernel32/winerror.mc:3223 msgid "Entry not found.\n" -msgstr "엔트리를 찾을 수 업습니다.\n" +msgstr "항목을 찾을 수 없습니다.\n" #: dlls/kernel32/winerror.mc:3228 msgid "Name service unavailable.\n" -msgstr "네임 서비스는 가능하지 않습니다.\n" +msgstr "이름 서비스를 사용할 수 없습니다.\n" #: dlls/kernel32/winerror.mc:3233 msgid "Invalid network address family.\n" -msgstr "올바르지 않은 네트워크 주소 가족.\n" +msgstr "네트워크 주소 패밀리가 잘못되었습니다.\n" #: dlls/kernel32/winerror.mc:3238 msgid "Operation not supported.\n" -msgstr "이 작업은 지원하지 않습니다.\n" +msgstr "작업이 지원되지 않습니다.\n" #: dlls/kernel32/winerror.mc:3243 msgid "No security context available.\n" -msgstr "가능한 보안 컨텍스가 없음.\n" +msgstr "사용할 수 있는 보안 컨텍스트가 없습니다.\n" #: dlls/kernel32/winerror.mc:3248 msgid "RPCInternal error.\n" @@ -6513,75 +6513,75 @@ msgstr "주소 오류.\n" #: dlls/kernel32/winerror.mc:3263 msgid "Floating-point divide-by-zero.\n" -msgstr "플로팅 0으로 나눔.\n" +msgstr "0으로 나뉜 부동 소수점.\n" #: dlls/kernel32/winerror.mc:3268 msgid "Floating-point underflow.\n" -msgstr "플로팅 언더플로우.\n" +msgstr "부동 소수점 언더플로우.\n" #: dlls/kernel32/winerror.mc:3273 msgid "Floating-point overflow.\n" -msgstr "플로팅 오버플로우.\n" +msgstr "부동 소수점 오버플로.\n" #: dlls/kernel32/winerror.mc:3278 msgid "No more entries.\n" -msgstr "더 이상 엔트리가 없습니다.\n" +msgstr "추가 항목이 없습니다.\n" #: dlls/kernel32/winerror.mc:3283 msgid "Character translation table open failed.\n" -msgstr "문자변환테이블 열기 실패.\n" +msgstr "문자 변환 테이블을 열지 못했습니다.\n" #: dlls/kernel32/winerror.mc:3288 msgid "Character translation table file too small.\n" -msgstr "문자변환테이블 파일이 너무 작습니다.\n" +msgstr "문자 변환 테이블 파일이 너무 작습니다.\n" #: dlls/kernel32/winerror.mc:3293 msgid "Null context handle.\n" -msgstr "빈 콘택트 핸들.\n" +msgstr "널 컨택스트 핸들.\n" #: dlls/kernel32/winerror.mc:3298 msgid "Context handle damaged.\n" -msgstr "콘텍트 핸들이 손상되었습니다.\n" +msgstr "컨텍스트 핸들이 손상되었습니다.\n" #: dlls/kernel32/winerror.mc:3303 msgid "Binding handle mismatch.\n" -msgstr "바인딩 핸들이 맞지 않습니다.\n" +msgstr "바인딩 핸들이 일치하지 않습니다.\n" #: dlls/kernel32/winerror.mc:3308 msgid "Cannot get call handle.\n" -msgstr "호출 핸들을 얻을 수 없습니다.\n" +msgstr "호출 핸들을 가져올 수 없습니다.\n" #: dlls/kernel32/winerror.mc:3313 msgid "Null reference pointer.\n" -msgstr "빈 레퍼런스 포인터.\n" +msgstr "널 참조 포인터.\n" #: dlls/kernel32/winerror.mc:3318 msgid "Enumeration value out of range.\n" -msgstr "열거 값이 범위를 벗어남.\n" +msgstr "열거 값이 범위를 벗어났습니다.\n" #: dlls/kernel32/winerror.mc:3323 msgid "Byte count too small.\n" -msgstr "바이트 카운트가 너무 작습니다.\n" +msgstr "바이트 수가 너무 적습니다.\n" #: dlls/kernel32/winerror.mc:3328 msgid "Bad stub data.\n" -msgstr "나쁜 스텁 정보.\n" +msgstr "잘못된 스텁 데이터.\n" #: dlls/kernel32/winerror.mc:3333 msgid "Invalid user buffer.\n" -msgstr "올바르지 않은 사용자 버퍼.\n" +msgstr "잘못된 사용자 버퍼.\n" #: dlls/kernel32/winerror.mc:3338 msgid "Unrecognized media.\n" -msgstr "이해할 수 없는 미디어.\n" +msgstr "알 수 없는 미디어입니다.\n" #: dlls/kernel32/winerror.mc:3343 msgid "No trust secret.\n" -msgstr "어떤 신뢰된 비밀이 없습니다.\n" +msgstr "트러스트 암호가 없습니다.\n" #: dlls/kernel32/winerror.mc:3348 msgid "No trust SAM account.\n" -msgstr "어떤 신뢰 SAM 계정이 없습니다.\n" +msgstr "트러스트 SAM 계정이 없습니다.\n" #: dlls/kernel32/winerror.mc:3353 msgid "Trusted domain failure.\n" @@ -6593,11 +6593,11 @@ msgstr "신뢰할 수 있는 관계 실패.\n" #: dlls/kernel32/winerror.mc:3363 msgid "Trust logon failure.\n" -msgstr "신뢰할 수 있는 로그온 실패.\n" +msgstr "트러스트 로그온 실패.\n" #: dlls/kernel32/winerror.mc:3368 msgid "RPC call already in progress.\n" -msgstr "RPC 요구는 이미 작업중입니다.\n" +msgstr "RPC 호출이 이미 진행 중입니다.\n" #: dlls/kernel32/winerror.mc:3373 msgid "NETLOGON is not started.\n" @@ -6605,15 +6605,15 @@ msgstr "NETLOGON이 시작되지 않았습니다.\n" #: dlls/kernel32/winerror.mc:3378 msgid "Account expired.\n" -msgstr "계정이 만기되었습니다.\n" +msgstr "계좌가 만료되었습니다.\n" #: dlls/kernel32/winerror.mc:3383 msgid "Redirector has open handles.\n" -msgstr "리다이렉터가 핸들을 열었습니다.\n" +msgstr "리디렉터 핸들이 열려 있습니다.\n" #: dlls/kernel32/winerror.mc:3388 msgid "Printer driver already installed.\n" -msgstr "프린터 드라이버는 이미 설치되어 있습니다.\n" +msgstr "프린터 드라이버가 이미 설치되었습니다.\n" #: dlls/kernel32/winerror.mc:3393 msgid "Unknown port.\n" @@ -6625,59 +6625,59 @@ msgstr "알 수 없는 프린터 드라이버.\n" #: dlls/kernel32/winerror.mc:3403 msgid "Unknown print processor.\n" -msgstr "알 수 없는 프린터 프로세서.\n" +msgstr "알 수 없는 인쇄 프로세서.\n" #: dlls/kernel32/winerror.mc:3408 msgid "Invalid separator file.\n" -msgstr "올바르지 않은 파일 구분 기호.\n" +msgstr "잘못된 구분 파일.\n" #: dlls/kernel32/winerror.mc:3413 msgid "Invalid priority.\n" -msgstr "올바르지 않은 우선순위.\n" +msgstr "잘못된 우선순위.\n" #: dlls/kernel32/winerror.mc:3418 msgid "Invalid printer name.\n" -msgstr "올바르지 않은 프린터 이름.\n" +msgstr "잘못된 프린터 이름.\n" #: dlls/kernel32/winerror.mc:3423 msgid "Printer already exists.\n" -msgstr "프린터는 이미 존재합니다.\n" +msgstr "프린터가 이미 존재합니다.\n" #: dlls/kernel32/winerror.mc:3428 msgid "Invalid printer command.\n" -msgstr "올바르지 않은 프린터 명령.\n" +msgstr "잘못된 프린터 명령.\n" #: dlls/kernel32/winerror.mc:3433 msgid "Invalid data type.\n" -msgstr "올바르지 않은 데이터 형식.\n" +msgstr "잘못된 데이터 형식.\n" #: dlls/kernel32/winerror.mc:3438 msgid "Invalid environment.\n" -msgstr "올바르지 않은 환경변수.\n" +msgstr "잘못된 환경변수.\n" #: dlls/kernel32/winerror.mc:3443 msgid "No more bindings.\n" -msgstr "더 이상의 바인딩은 없음.\n" +msgstr "이제 바인딩이 없습니다.\n" #: dlls/kernel32/winerror.mc:3448 msgid "Can't log on with inter-domain trust account.\n" -msgstr "내부 도메인의 신뢰된 계정에 로그온할 수 없습니다.\n" +msgstr "도메인 간 트러스트 계정으로 로그온할 수 없습니다.\n" #: dlls/kernel32/winerror.mc:3453 msgid "Can't log on with workstation trust account.\n" -msgstr "워크스테이션의 신뢰된 계정에 로그온할 수 없습니다.\n" +msgstr "워크스테이션 트러스트 계정으로 로그온할 수 없습니다.\n" #: dlls/kernel32/winerror.mc:3458 msgid "Can't log on with server trust account.\n" -msgstr "서버의 신뢰된 계정에 로그온할 수 없습니다.\n" +msgstr "서버 트러스트 계정으로 로그온할 수 없습니다.\n" #: dlls/kernel32/winerror.mc:3463 msgid "Domain trust information inconsistent.\n" -msgstr "도메인 신뢰 정보가 다름.\n" +msgstr "도메인 신뢰 정보가 일치하지 않습니다.\n" #: dlls/kernel32/winerror.mc:3468 msgid "Server has open handles.\n" -msgstr "서버가 핸들을 열었습니다.\n" +msgstr "서버에 열린 핸들이 있습니다.\n" #: dlls/kernel32/winerror.mc:3473 msgid "Resource data not found.\n" @@ -6697,11 +6697,11 @@ msgstr "리소스 언어를 찾을 수 없습니다.\n" #: dlls/kernel32/winerror.mc:3493 msgid "Not enough quota.\n" -msgstr "쿼터가 충분하지 않습니다.\n" +msgstr "할당량이 충분하지 않습니다.\n" #: dlls/kernel32/winerror.mc:3498 msgid "No interfaces.\n" -msgstr "인터페이스가 없음.\n" +msgstr "인터페이스가 없습니다.\n" #: dlls/kernel32/winerror.mc:3503 msgid "RPC call canceled.\n" @@ -6709,27 +6709,27 @@ msgstr "RPC 호출이 취소되었습니다.\n" #: dlls/kernel32/winerror.mc:3508 msgid "Binding incomplete.\n" -msgstr "바인딩이 완료되지 않음.\n" +msgstr "Binding incomplete.\n" #: dlls/kernel32/winerror.mc:3513 msgid "RPC comm failure.\n" -msgstr "RPC 일반 실패.\n" +msgstr "RPC 통신 오류.\n" #: dlls/kernel32/winerror.mc:3518 msgid "Unsupported authorization level.\n" -msgstr "지원하지 않는 인증 레벨.\n" +msgstr "지원되지 않는 권한 수준.\n" #: dlls/kernel32/winerror.mc:3523 msgid "No principal name registered.\n" -msgstr "어떤 등록된 주요 이름이 없음.\n" +msgstr "등록된 기본 이름이 없습니다.\n" #: dlls/kernel32/winerror.mc:3528 msgid "Not an RPC error.\n" -msgstr "RPC 오류가 아닙.\n" +msgstr "RPC 오류가 아닙니다.\n" #: dlls/kernel32/winerror.mc:3533 msgid "UUID is local only.\n" -msgstr "UUID는 오직 로컬에서만 가능합니다.\n" +msgstr "UUID는 로컬 전용입니다.\n" #: dlls/kernel32/winerror.mc:3538 msgid "Security package error.\n" @@ -6737,15 +6737,15 @@ msgstr "보안 패키지 오류.\n" #: dlls/kernel32/winerror.mc:3543 msgid "Thread not canceled.\n" -msgstr "스레드는 취소되지 않았습니다.\n" +msgstr "스레드가 취소되지 않았습니다.\n" #: dlls/kernel32/winerror.mc:3548 msgid "Invalid handle operation.\n" -msgstr "올바르지 않은 핸들 작업.\n" +msgstr "잘못된 핸들 작업.\n" #: dlls/kernel32/winerror.mc:3553 msgid "Wrong serializing package version.\n" -msgstr "잘못된 연속 패키지 버전.\n" +msgstr "잘못된 일련의 순차적인 패키지 버전.\n" #: dlls/kernel32/winerror.mc:3558 msgid "Wrong stub version.\n" @@ -6753,7 +6753,7 @@ msgstr "잘못된 스텁 버전.\n" #: dlls/kernel32/winerror.mc:3563 msgid "Invalid pipe object.\n" -msgstr "올바르지 않은 파이프 개체.\n" +msgstr "잘못된 파이프 개체.\n" #: dlls/kernel32/winerror.mc:3568 msgid "Wrong pipe order.\n" @@ -6769,39 +6769,39 @@ msgstr "그룹 멤버를 찾을 수 없습니다.\n" #: dlls/kernel32/winerror.mc:3583 msgid "Can't create endpoint mapper DB.\n" -msgstr "엔드포인트 매퍼 DB를 만들 수 없습니다.\n" +msgstr "엔드포인트 매핑기 DB를 만들 수 없습니다.\n" #: dlls/kernel32/winerror.mc:3588 msgid "Invalid object.\n" -msgstr "올바르지 않은 개체.\n" +msgstr "잘못된 개체.\n" #: dlls/kernel32/winerror.mc:3593 msgid "Invalid time.\n" -msgstr "올바르지 않은 시간.\n" +msgstr "잘못된 시간.\n" #: dlls/kernel32/winerror.mc:3598 msgid "Invalid form name.\n" -msgstr "올바르지 않은 폼 이름.\n" +msgstr "잘못된 폼 이름.\n" #: dlls/kernel32/winerror.mc:3603 msgid "Invalid form size.\n" -msgstr "올바르지 않은 폼 크기.\n" +msgstr "잘못된 폼 크기.\n" #: dlls/kernel32/winerror.mc:3608 msgid "Already awaiting printer handle.\n" -msgstr "이미 프린터 핸들르 기다리고 있습니다.\n" +msgstr "이미 프린터 핸들을 기다리고 있습니다.\n" #: dlls/kernel32/winerror.mc:3613 msgid "Printer deleted.\n" -msgstr "프린터가 지워졌습니다.\n" +msgstr "프린터가 삭제되었습니다.\n" #: dlls/kernel32/winerror.mc:3618 msgid "Invalid printer state.\n" -msgstr "올바르지 않은 프린터 상태.\n" +msgstr "프린터 상태가 잘못되었습니다.\n" #: dlls/kernel32/winerror.mc:3623 msgid "User must change password.\n" -msgstr "사용자는 반드시 암호를 바꾸어야 합니다.\n" +msgstr "사용자는 암호를 변경해야 합니다.\n" #: dlls/kernel32/winerror.mc:3628 msgid "Domain controller not found.\n" @@ -6809,59 +6809,59 @@ msgstr "도메인 컨트롤러를 찾을 수 없습니다.\n" #: dlls/kernel32/winerror.mc:3633 msgid "Account locked out.\n" -msgstr "계정이 잠겨 있음.\n" +msgstr "계정이 잠겨 있습니다.\n" #: dlls/kernel32/winerror.mc:3638 msgid "Invalid pixel format.\n" -msgstr "올바르지 않은 픽셀 형식.\n" +msgstr "잘못된 픽셀 형식.\n" #: dlls/kernel32/winerror.mc:3643 msgid "Invalid driver.\n" -msgstr "올바르지 않은 드라이버.\n" +msgstr "잘못된 드라이버.\n" #: dlls/kernel32/winerror.mc:3648 msgid "Invalid object resolver set.\n" -msgstr "잘못된 개체 확인자 세트.\n" +msgstr "잘못된 개체 해결기 집합.\n" #: dlls/kernel32/winerror.mc:3653 msgid "Incomplete RPC send.\n" -msgstr "불완전 RPC를 보냄.\n" +msgstr "불완전한 RPC 전송.\n" #: dlls/kernel32/winerror.mc:3658 msgid "Invalid asynchronous RPC handle.\n" -msgstr "올바르지 않은 비동기식 RPC 핸들.\n" +msgstr "잘못된 비동기 RPC 핸들.\n" #: dlls/kernel32/winerror.mc:3663 msgid "Invalid asynchronous RPC call.\n" -msgstr "비동기 RPC 호출이 잘못되었습니다.\n" +msgstr "잘못된 비동기 RPC 호출.\n" #: dlls/kernel32/winerror.mc:3668 msgid "RPC pipe closed.\n" -msgstr "RPC 파이프가 닫힘.\n" +msgstr "RPC 파이프가 닫혔습니다.\n" #: dlls/kernel32/winerror.mc:3673 msgid "Discipline error on RPC pipe.\n" -msgstr "RPC 파이프에 대한 규율 오류.\n" +msgstr "RPC 파이프의 징계 오류입니다.\n" #: dlls/kernel32/winerror.mc:3678 msgid "No data on RPC pipe.\n" -msgstr "RPC 파이프에 어떠한 데이터도 없음.\n" +msgstr "RPC 파이프에 데이터가 없습니다.\n" #: dlls/kernel32/winerror.mc:3683 msgid "No site name available.\n" -msgstr "가능한 사이트 이름이 없음.\n" +msgstr "사용할 수 있는 사이트 이름이 없습니다.\n" #: dlls/kernel32/winerror.mc:3688 msgid "The file cannot be accessed.\n" -msgstr "이 파일은 접근할 수 없습니다.\n" +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" -msgstr "RPC 입력 유형 불일치.\n" +msgstr "RPC 입력 유형이 일치하지 않습니다.\n" #: dlls/kernel32/winerror.mc:3703 msgid "Not all objects could be exported.\n" @@ -6917,11 +6917,11 @@ msgstr "파일에서 서명을 찾을 수 없습니다.\n" #: dlls/kernel32/winerror.mc:3774 msgid "Invalid call.\n" -msgstr "올바르지 않은 호출입니다.\n" +msgstr "잘못된 호출.\n" #: dlls/kernel32/winerror.mc:3781 msgid "Resource is not currently available.\n" -msgstr "지금은 리소스를 사용할 수 없습니다.\n" +msgstr "현재 리소스를 사용할 수 없습니다.\n" #: dlls/localspl/localspl.rc:31 dlls/localui/localui.rc:31 #: dlls/winspool.drv/winspool.rc:30 @@ -6942,7 +6942,7 @@ msgstr "추가할 포트 이름 입력(&E):" #: dlls/localui/localui.rc:51 msgid "Configure LPT Port" -msgstr "LPT 포트 설정" +msgstr "LPT 포트 구성" #: dlls/localui/localui.rc:54 msgid "Timeout (seconds)" @@ -6966,7 +6966,7 @@ msgstr "이 포트는 설정할 옵션이 없습니다" #: dlls/mapi32/mapi32.rc:31 msgid "Mail sending failed as you do not have a MAPI mail client installed." -msgstr "설치된 MAPI 메일 클라이언트가 없어서 메일 보내기 실패." +msgstr "MAPI 메일 클라이언트가 설치되어 있지 않아 메일 발송이 실패했습니다." #: dlls/mapi32/mapi32.rc:32 msgid "Send Mail" @@ -6982,11 +6982,11 @@ msgstr "싱크가 완료되지 않았습니다.\n" #: dlls/mferror/mferror.mc:732 msgid "Clock was stopped\n" -msgstr "시계가 중지되었습니다.\n" +msgstr "시계가 중지되었습니다\n" #: dlls/mferror/mferror.mc:32 msgid "Media Foundation platform is not initialized.\n" -msgstr "미디어 기초 플랫폼이 최기화되지 않았습니다.\n" +msgstr "미디어 기초 플랫폼이 초기화되지 않았습니다.\n" #: dlls/mferror/mferror.mc:39 msgid "Buffer is too small.\n" @@ -7030,15 +7030,15 @@ msgstr "예상치 못한 오류입니다.\n" #: dlls/mferror/mferror.mc:116 msgid "Invalid type.\n" -msgstr "올바르지 않은 형식입니다.\n" +msgstr "잘못된 형식입니다.\n" #: dlls/mferror/mferror.mc:123 msgid "Invalid file format.\n" -msgstr "올바르지 않은 파일 형식입니다.\n" +msgstr "잘못된 파일 형식입니다.\n" #: dlls/mferror/mferror.mc:137 msgid "Invalid timestamp.\n" -msgstr "올바르지 않은 타임스탬프입니다.\n" +msgstr "잘못된 타임스탬프입니다.\n" #: dlls/mferror/mferror.mc:144 msgid "Unsupported scheme.\n" @@ -7058,35 +7058,35 @@ msgstr "이 샘플에 대한 타임스탬프가 설정되지 않았습니다.\n" #: dlls/mferror/mferror.mc:172 msgid "No duration set for the sample.\n" -msgstr "이 샘플에 대한 기간(duration) 설정이 없습니다.\n" +msgstr "샘플에 대한 재생 시간 설정이 없습니다.\n" #: dlls/mferror/mferror.mc:179 msgid "Invalid stream data.\n" -msgstr "올바르지 않은 스트림 데이터입니다.\n" +msgstr "잘못된 스트림 데이터입니다.\n" #: dlls/mferror/mferror.mc:186 msgid "Realtime support is not available.\n" -msgstr "실시간 지원은 가능하지 않습니다.\n" +msgstr "실시간 지원을 사용할 수 없습니다.\n" #: dlls/mferror/mferror.mc:193 msgid "Unsupported rate.\n" -msgstr "지원하지 않는 비율(rate).\n" +msgstr "지원되지 않는 비율입니다.\n" #: dlls/mferror/mferror.mc:200 msgid "Unsupported thinning.\n" -msgstr "지원하지 않는 세선화(thinning).\n" +msgstr "지원되지 않는 THINING.\n" #: dlls/mferror/mferror.mc:207 msgid "Reversing is not supported.\n" -msgstr "리버싱(reversing)은 지원되지 않습니다.\n" +msgstr "반전은 지원되지 않습니다.\n" #: dlls/mferror/mferror.mc:214 msgid "Unsupported rate transition.\n" -msgstr "지원하지 않는 비율(rate) 변환.\n" +msgstr "지원되지 않는 비율 변환입니다.\n" #: dlls/mferror/mferror.mc:221 msgid "Rate change was preempted.\n" -msgstr "비율(rate) 변경이 선점되었습니다.\n" +msgstr "비율 변경이 선점되었습니다.\n" #: dlls/mferror/mferror.mc:228 msgid "Object or value wasn't found.\n" @@ -7106,7 +7106,7 @@ msgstr "다중 가입자는 지원되지 않습니다.\n" #: dlls/mferror/mferror.mc:270 msgid "The timer was orphaned.\n" -msgstr "타이머가 고립되었습니다.\n" +msgstr "타이머가 분리되었습니다.\n" #: dlls/mferror/mferror.mc:277 msgid "State transition is pending.\n" @@ -7114,7 +7114,7 @@ msgstr "상태 전환이 보류 중입니다.\n" #: dlls/mferror/mferror.mc:284 msgid "Unsupported state transition.\n" -msgstr "지원되지 않는 상태 전환.\n" +msgstr "지원되지 않는 상태 전환입니다.\n" #: dlls/mferror/mferror.mc:291 msgid "Unrecoverable error occurred.\n" @@ -7130,19 +7130,19 @@ msgstr "샘플에 쓰기가 가능하지 않습니다.\n" #: dlls/mferror/mferror.mc:312 msgid "Key is invalid.\n" -msgstr "올바르지 않은 키.\n" +msgstr "키가 잘못되었습니다.\n" #: dlls/mferror/mferror.mc:319 msgid "Bad startup version.\n" -msgstr "잘못된 시작 버전.\n" +msgstr "시작 버전이 잘못되었습니다.\n" #: dlls/mferror/mferror.mc:326 msgid "Unsupported caption.\n" -msgstr "지원하지 않는 자막.\n" +msgstr "지원되지 않는 자막입니다.\n" #: dlls/mferror/mferror.mc:333 msgid "Invalid position.\n" -msgstr "올바르지 않은 위치.\n" +msgstr "잘못된 위치입니다.\n" #: dlls/mferror/mferror.mc:340 msgid "Attribute is not found.\n" @@ -7190,7 +7190,7 @@ msgstr "바이트 스트림을 구문 분석할 수 없습니다.\n" #: dlls/mferror/mferror.mc:417 msgid "Mutually exclusive flags passed to source resolver.\n" -msgstr "상호 배타적이 플래그가 소스 확인자로 전달되었습니다.\n" +msgstr "상호 배타적이 플래그가 원본 확인자에 전달되었습니다.\n" #: dlls/mferror/mferror.mc:424 msgid "Unknown bytestream length.\n" @@ -7198,7 +7198,7 @@ msgstr "알 수 없는 바이트 스트림 길이입니다.\n" #: dlls/mferror/mferror.mc:431 msgid "Invalid work queue index.\n" -msgstr "올바르지 않은 작업 큐 인덱스.\n" +msgstr "잘못된 작업 큐 인덱스입니다.\n" #: dlls/mferror/mferror.mc:438 msgid "No events available.\n" @@ -7206,7 +7206,7 @@ msgstr "사용할 수 있는 이벤트가 없습니다.\n" #: dlls/mferror/mferror.mc:445 msgid "Invalid media source state transition.\n" -msgstr "올바르지 않은 미디어 소스 상태 전환.\n" +msgstr "잘못된 미디어 원본 상태 전환입니다.\n" #: dlls/mferror/mferror.mc:452 msgid "End of media stream has been reached.\n" @@ -7222,7 +7222,7 @@ msgstr "미디어 스트림에 기간 설정이 없습니다.\n" #: dlls/mferror/mferror.mc:473 msgid "Media format was recognized but is invalid.\n" -msgstr "미디어 형식이 인식되었지만 올바르지 않습니다.\n" +msgstr "미디어 형식이 인식되었지만 유효하지 않습니다.\n" #: dlls/mferror/mferror.mc:480 msgid "Property wasn't found.\n" @@ -7238,15 +7238,15 @@ msgstr "속성이 허용되지 않습니다.\n" #: dlls/mferror/mferror.mc:501 msgid "Media source is not started.\n" -msgstr "미디어 소스가 시작되지 않았습니다.\n" +msgstr "미디어 원본이 시작되지 않았습니다.\n" #: dlls/mferror/mferror.mc:508 msgid "Unsupported media format.\n" -msgstr "지원하지 않는 미디어 형식.\n" +msgstr "지원되지 않는 미디어 형식입니다.\n" #: dlls/mferror/mferror.mc:515 msgid "Media source is in wrong state.\n" -msgstr "미디어 소스가 잘못된 상태에 있습니다.\n" +msgstr "미디어 원본이 잘못된 상태에 있습니다.\n" #: dlls/mferror/mferror.mc:522 msgid "No media streams were selected.\n" @@ -7254,7 +7254,7 @@ msgstr "미디어 스트림이 선택되지 않았습니다.\n" #: dlls/mferror/mferror.mc:529 msgid "Unsupported media source characteristics.\n" -msgstr "지원되지 않는 미디어 소스 특성입니다.\n" +msgstr "지원되지 않는 미디어 원본 특성입니다.\n" #: dlls/mferror/mferror.mc:536 msgid "Stream sink was removed.\n" @@ -7306,7 +7306,7 @@ msgstr "싱크가 필요한 헤더를 제공하지 않았습니다.\n" #: dlls/mferror/mferror.mc:627 msgid "Optional node is invalid.\n" -msgstr "선택적 노드가 올바르지 않습니다.\n" +msgstr "선택적 노드가 잘못되었습니다.\n" #: dlls/mferror/mferror.mc:634 msgid "Cannot find decryptor.\n" @@ -7326,7 +7326,7 @@ msgstr "토폴로지 요청이 지원되지 않습니다.\n" #: dlls/mferror/mferror.mc:662 msgid "Invalid topology time attributes.\n" -msgstr "올바르지 않은 토폴로지 시간 특성.\n" +msgstr "잘못된 토폴로지 시간 특성입니다.\n" #: dlls/mferror/mferror.mc:669 msgid "Found loops in topology.\n" @@ -7346,7 +7346,7 @@ msgstr "스트림 설명자가 선택되지 않았습니다.\n" #: dlls/mferror/mferror.mc:697 msgid "Source is missing.\n" -msgstr "소스가 없습니다.\n" +msgstr "원본이 없습니다.\n" #: dlls/mferror/mferror.mc:704 msgid "Topology loader does not support sink activates.\n" @@ -7354,7 +7354,7 @@ msgstr "토폴로지 로더가 싱크 활성화를 지원하지 않습니다.\n" #: dlls/mferror/mferror.mc:711 msgid "Clock has no time source set.\n" -msgstr "시계가 시간 소스 설정을 가지고 있지 않습니다.\n" +msgstr "시계가 시간 원본 집합을 가지고 있지 않습니다.\n" #: dlls/mferror/mferror.mc:718 msgid "Clock state was already set.\n" @@ -7362,7 +7362,7 @@ msgstr "시계 상태가 이미 설정되었습니다.\n" #: dlls/mferror/mferror.mc:725 msgid "Clock is not simple\n" -msgstr "시계가 단순하지 않습니다.\n" +msgstr "시계가 단순하지 않습니다\n" #: dlls/mpr/mpr.rc:35 dlls/wininet/wininet.rc:48 msgid "Enter Network Password" @@ -7370,7 +7370,7 @@ msgstr "네트워크 암호 입력" #: dlls/mpr/mpr.rc:38 dlls/wininet/wininet.rc:51 dlls/wininet/wininet.rc:71 msgid "Please enter your username and password:" -msgstr "사용자 이름과 암호를 입력하십시오:" +msgstr "사용자 이름과 암호를 입력하세요:" #: dlls/mpr/mpr.rc:39 dlls/wininet/wininet.rc:52 msgid "Proxy" @@ -7441,7 +7441,7 @@ msgid "" "The specified installation package could not be opened. Please check the " "file path and try again." msgstr "" -"지정한 설치 패키지를 열 수 없습니다. 파일 경로를 검사한 후 다시 시도하십시오." +"지정한 설치 패키지를 열 수 없습니다. 파일 경로를 검사한 후 다시 시도하세요." #: dlls/msi/msi.rc:32 msgid "path %s not found" @@ -7449,7 +7449,7 @@ msgstr "경로 %s을(를) 찾을 수 없습니다" #: dlls/msi/msi.rc:33 msgid "insert disk %s" -msgstr "디스크 %s을(를) 넣으십시오" +msgstr "디스크 %s을(를) 넣으세요" #: dlls/msi/msi.rc:34 msgid "" @@ -7928,12 +7928,12 @@ msgid "" "arguments are: [2], [3], [4]}}" msgstr "" "설치 프로그램에서 이 패키지를 설치하는 동안 예기치 않은 오류가 발생했습니다. " -"이 패키지에 문제가 있음을 나타낼 수 있습니다. 오류 코드 [1]. {{인수 : [2], " +"이 패키지에 문제가 있음을 나타낼 수 있습니다. 오류 코드 [1]. {{인수: [2], " "[3], [4]}}" #: dlls/msi/msi.rc:77 msgid "{{Disk full: }}" -msgstr "{{디스크가 꽉 찼습니다: }}" +msgstr "{{디스크가 가득 찼습니다: }}" #: dlls/msi/msi.rc:78 msgid "Action [Time]: [1]. [2]" @@ -7957,7 +7957,7 @@ msgstr "작업 끝 [Time]: [1]. 반환 값 [2]." #: dlls/msi/msi.rc:84 msgid "Please insert the disk: [2]" -msgstr "디스크를 넣으십시오: [2]" +msgstr "디스크를 넣으세요: [2]" #: dlls/msi/msi.rc:85 msgid "" @@ -7965,7 +7965,7 @@ msgid "" "that you can access it." msgstr "" "원본 파일을 찾을 수 없습니다 {{(cabinet)}}: [2]. 파일 존재 및 액세스 가능 여" -"부를 확인하십시오." +"부를 확인하세요." #: dlls/msrle32/msrle32.rc:31 msgid "Wine MS-RLE video codec" @@ -8161,11 +8161,11 @@ msgstr "목록 항목" #: dlls/oleacc/oleacc.rc:66 msgid "outline" -msgstr "외곽선" +msgstr "윤곽선" #: dlls/oleacc/oleacc.rc:67 msgid "outline item" -msgstr "외곽선 항목" +msgstr "윤곽선 항목" #: dlls/oleacc/oleacc.rc:68 msgid "page tab" @@ -8193,7 +8193,7 @@ msgstr "문자" #: dlls/oleacc/oleacc.rc:74 msgid "push button" -msgstr "누르기 버튼" +msgstr "푸쉬 버튼" #: dlls/oleacc/oleacc.rc:75 msgid "check button" @@ -8205,15 +8205,15 @@ msgstr "라디오 버튼" #: dlls/oleacc/oleacc.rc:77 msgid "combo box" -msgstr "콤보 상자" +msgstr "콤보 상자" #: dlls/oleacc/oleacc.rc:78 msgid "drop down" -msgstr "드룹 다운" +msgstr "드롭다운" #: dlls/oleacc/oleacc.rc:79 msgid "progress bar" -msgstr "진행바" +msgstr "진행률 표시줄" #: dlls/oleacc/oleacc.rc:80 msgid "dial" @@ -8221,7 +8221,7 @@ msgstr "다이얼" #: dlls/oleacc/oleacc.rc:81 msgid "hot key field" -msgstr "바로 가기 모음" +msgstr "바로 가기 키 필드" #: dlls/oleacc/oleacc.rc:82 msgid "slider" @@ -8245,7 +8245,7 @@ msgstr "수식" #: dlls/oleacc/oleacc.rc:87 msgid "drop down button" -msgstr "드룹 다운 버튼" +msgstr "드롭다운 버튼" #: dlls/oleacc/oleacc.rc:88 msgid "menu button" @@ -8253,11 +8253,11 @@ msgstr "메뉴 버튼" #: dlls/oleacc/oleacc.rc:89 msgid "grid drop down button" -msgstr "그립 드룹 다운 단추" +msgstr "그리드 드롭다운 버튼" #: dlls/oleacc/oleacc.rc:90 msgid "white space" -msgstr "빈 공간" +msgstr "공백" #: dlls/oleacc/oleacc.rc:91 msgid "page tab list" @@ -8269,7 +8269,7 @@ msgstr "시계" #: dlls/oleacc/oleacc.rc:93 msgid "split button" -msgstr "나누기 단추" +msgstr "나누기 버튼" #: dlls/oleacc/oleacc.rc:94 msgid "IP address" @@ -8277,42 +8277,42 @@ msgstr "IP 주소" #: dlls/oleacc/oleacc.rc:95 msgid "outline button" -msgstr "외곽선 단추" +msgstr "윤곽선 버튼" #: dlls/oleacc/oleacc.rc:97 msgctxt "object state" msgid "normal" -msgstr "normal" +msgstr "보통" #: dlls/oleacc/oleacc.rc:98 msgctxt "object state" msgid "unavailable" -msgstr "unavailable" +msgstr "사용할 수 없음" #: dlls/oleacc/oleacc.rc:99 msgctxt "object state" msgid "selected" -msgstr "selected" +msgstr "선택됨" #: dlls/oleacc/oleacc.rc:100 msgctxt "object state" msgid "focused" -msgstr "focused" +msgstr "포커스됨" #: dlls/oleacc/oleacc.rc:101 msgctxt "object state" msgid "pressed" -msgstr "pressed" +msgstr "눌림" #: dlls/oleacc/oleacc.rc:102 msgctxt "object state" msgid "checked" -msgstr "checked" +msgstr "선택 표시됨" #: dlls/oleacc/oleacc.rc:103 msgctxt "object state" msgid "mixed" -msgstr "mixed" +msgstr "혼합됨" #: dlls/oleacc/oleacc.rc:104 msgctxt "object state" @@ -8322,122 +8322,122 @@ msgstr "읽기 전용" #: dlls/oleacc/oleacc.rc:105 msgctxt "object state" msgid "hot tracked" -msgstr "hot tracked" +msgstr "상시 추적됨" #: dlls/oleacc/oleacc.rc:106 msgctxt "object state" msgid "default" -msgstr "default" +msgstr "기본값" #: dlls/oleacc/oleacc.rc:107 msgctxt "object state" msgid "expanded" -msgstr "expanded" +msgstr "확장됨" #: dlls/oleacc/oleacc.rc:108 msgctxt "object state" msgid "collapsed" -msgstr "collapsed" +msgstr "축소됨" #: dlls/oleacc/oleacc.rc:109 msgctxt "object state" msgid "busy" -msgstr "busy" +msgstr "사용 중" #: dlls/oleacc/oleacc.rc:110 msgctxt "object state" msgid "floating" -msgstr "floating" +msgstr "떠다님" #: dlls/oleacc/oleacc.rc:111 msgctxt "object state" msgid "marqueed" -msgstr "marqueed" +msgstr "움직임" #: dlls/oleacc/oleacc.rc:112 msgctxt "object state" msgid "animated" -msgstr "animated" +msgstr "애니메이트됨" #: dlls/oleacc/oleacc.rc:113 msgctxt "object state" msgid "invisible" -msgstr "invisible" +msgstr "숨김" #: dlls/oleacc/oleacc.rc:114 msgctxt "object state" msgid "offscreen" -msgstr "offscreen" +msgstr "화면 벗어남" #: dlls/oleacc/oleacc.rc:115 msgctxt "object state" msgid "sizeable" -msgstr "sizeable" +msgstr "크기 조절 가능" #: dlls/oleacc/oleacc.rc:116 msgctxt "object state" msgid "moveable" -msgstr "moveable" +msgstr "이동 가능" #: dlls/oleacc/oleacc.rc:117 msgctxt "object state" msgid "self voicing" -msgstr "self voicing" +msgstr "자가 발성" #: dlls/oleacc/oleacc.rc:118 msgctxt "object state" msgid "focusable" -msgstr "focusable" +msgstr "포커스 가능" #: dlls/oleacc/oleacc.rc:119 msgctxt "object state" msgid "selectable" -msgstr "selectable" +msgstr "선택 가능" #: dlls/oleacc/oleacc.rc:120 msgctxt "object state" msgid "linked" -msgstr "linked" +msgstr "연결됨" #: dlls/oleacc/oleacc.rc:121 msgctxt "object state" msgid "traversed" -msgstr "traversed" +msgstr "방문됨" #: dlls/oleacc/oleacc.rc:122 msgctxt "object state" msgid "multi selectable" -msgstr "multi selectable" +msgstr "다중 선택 가능" #: dlls/oleacc/oleacc.rc:123 msgctxt "object state" msgid "extended selectable" -msgstr "extended selectable" +msgstr "확장된 선택 가능" #: dlls/oleacc/oleacc.rc:124 msgctxt "object state" msgid "alert low" -msgstr "alert low" +msgstr "낮은 수준의 경고" #: dlls/oleacc/oleacc.rc:125 msgctxt "object state" msgid "alert medium" -msgstr "alert medium" +msgstr "보통 수준의 경고" #: dlls/oleacc/oleacc.rc:126 msgctxt "object state" msgid "alert high" -msgstr "alert high" +msgstr "높은 수준의 경고" #: dlls/oleacc/oleacc.rc:127 msgctxt "object state" msgid "protected" -msgstr "protected" +msgstr "보호됨" #: dlls/oleacc/oleacc.rc:128 msgctxt "object state" msgid "has popup" -msgstr "has popup" +msgstr "팝업 있음" #: dlls/oleaut32/oleaut32.rc:30 programs/oleview/oleview.rc:146 msgid "True" @@ -8553,7 +8553,7 @@ msgid "" "value, select a property, then choose Edit Value below." msgstr "" "이러한 유형의 데이터에 대한 초기화 속성입니다. 값을 편집하려면 속성을 선택한 " -"다음 아래의 값 편집을 선택합니다." +"다음 아래의 [값 편집]을 선택합니다." #: dlls/oledb32/version.rc:115 msgid "&Edit Value..." @@ -8565,7 +8565,7 @@ msgstr "데이터 링크 오류" #: dlls/oledb32/version.rc:50 msgid "Please select a provider." -msgstr "공급자를 선택하십시오." +msgstr "공급자를 선택하세요." #: dlls/oledb32/version.rc:51 msgid "" @@ -8633,7 +8633,7 @@ msgstr "컨트롤 만들기" #: dlls/oledlg/oledlg.rc:69 msgid "Create From File" -msgstr "파일로부터 만들기" +msgstr "파일에서 만들기" #: dlls/oledlg/oledlg.rc:72 msgid "&Add Control..." @@ -8641,7 +8641,7 @@ msgstr "컨트롤 추가(&A)..." #: dlls/oledlg/oledlg.rc:73 msgid "Display As Icon" -msgstr "아이콘으로 보기" +msgstr "아이콘으로 표시" #: dlls/oledlg/oledlg.rc:75 dlls/setupapi/setupapi.rc:61 msgid "Browse..." @@ -8653,7 +8653,7 @@ msgstr "파일:" #: dlls/oledlg/oledlg.rc:82 msgid "Paste Special" -msgstr "특별하게 붙여넣기" +msgstr "선택하여 붙여넣기" #: dlls/oledlg/oledlg.rc:85 dlls/setupapi/setupapi.rc:43 msgid "Source:" @@ -8669,7 +8669,7 @@ msgstr "붙여넣기(&P)" #: dlls/oledlg/oledlg.rc:88 msgid "Paste &Link" -msgstr "링크로 붙여넣기(&L)" +msgstr "연결하여 붙여넣기(&L)" #: dlls/oledlg/oledlg.rc:90 msgid "&As:" @@ -8677,7 +8677,7 @@ msgstr "다른 이름으로(&A):" #: dlls/oledlg/oledlg.rc:97 msgid "&Display As Icon" -msgstr "아이콘으로 보기(&D)" +msgstr "아이콘으로 표시(&D)" #: dlls/oledlg/oledlg.rc:99 msgid "Change &Icon..." @@ -8794,7 +8794,7 @@ msgstr "스캔 중" #: dlls/sane.ds/sane.rc:44 msgid "SCANNING... Please Wait" -msgstr "스캔 중... 기다려 주십시오" +msgstr "스캔 중... 기다려 주세요" #: dlls/sane.ds/sane.rc:31 msgctxt "unit: pixels" @@ -8863,12 +8863,12 @@ msgid "" "Insert the manufacturer's installation disk, and then\n" "make sure the correct drive is selected below" msgstr "" -"제작사의 설치 디스크를 삽입하고,\n" +"제조업체 설치 디스크를 삽입하고,\n" "아래의 선택된 드라이브가 올바른지 확인하시오" #: dlls/setupapi/setupapi.rc:57 msgid "Copy manufacturer's files from:" -msgstr "제작사의 파일이 복사할 곳:" +msgstr "제조업체의 파일을 복사하세요:" #: dlls/setupapi/setupapi.rc:31 msgid "The file '%1' on %2 is needed" @@ -8876,15 +8876,15 @@ msgstr "%2의 '%1' 파일이 필요합니다" #: dlls/setupapi/setupapi.rc:32 programs/ipconfig/ipconfig.rc:34 msgid "Unknown" -msgstr "없음" +msgstr "알 수 없음" #: dlls/setupapi/setupapi.rc:33 msgid "Copy files from:" -msgstr "복사할 파일이 위치한 곳:" +msgstr "파일을 복사하세요:" #: dlls/setupapi/setupapi.rc:34 msgid "Type the path where the file is located, and then click OK." -msgstr "파일이 위치한 경로를 입력하고, [확인]을 클릭하십시오." +msgstr "파일이 위치한 경로를 입력하고, [확인]을 클릭하세요." #: dlls/shdoclc/shdoclc.rc:42 msgid "F&orward" @@ -8892,7 +8892,7 @@ msgstr "앞으로(&O)" #: dlls/shdoclc/shdoclc.rc:44 msgid "&Save Background As..." -msgstr "배경으로 저장(&S)..." +msgstr "다른 이름으로 배경 저장(&S)..." #: dlls/shdoclc/shdoclc.rc:45 msgid "Set As Back&ground" @@ -8900,7 +8900,7 @@ msgstr "배경으로 설정(&G)" #: dlls/shdoclc/shdoclc.rc:46 msgid "&Copy Background" -msgstr "배경으로 복사(&C)" +msgstr "배경 화면 복사(&C)" #: dlls/shdoclc/shdoclc.rc:47 msgid "Set as &Desktop Item" @@ -8942,28 +8942,28 @@ msgstr "다른 이름으로 저장(&A)..." #: dlls/shdoclc/shdoclc.rc:69 dlls/shdoclc/shdoclc.rc:130 #: dlls/shdoclc/shdoclc.rc:152 dlls/shdoclc/shdoclc.rc:176 msgid "&Print Target" -msgstr "타겟 저장(&P)" +msgstr "대상 인쇄(&P)" #: dlls/shdoclc/shdoclc.rc:71 dlls/shdoclc/shdoclc.rc:154 #: dlls/shdoclc/shdoclc.rc:178 msgid "S&how Picture" -msgstr "그림 보기(&H)" +msgstr "사진 표시(&H)" #: dlls/shdoclc/shdoclc.rc:72 dlls/shdoclc/shdoclc.rc:179 msgid "&Save Picture As..." -msgstr "다른 이름으로 그림 저장(&S)..." +msgstr "다른 이름으로 사진 저장(&S)..." #: dlls/shdoclc/shdoclc.rc:73 msgid "&E-mail Picture..." -msgstr "그림을 전자메일로(&E)..." +msgstr "사진을 메일로 보내기(&E)..." #: dlls/shdoclc/shdoclc.rc:74 msgid "Pr&int Picture..." -msgstr "그림 인쇄(&I)..." +msgstr "사진 인쇄(&I)..." #: dlls/shdoclc/shdoclc.rc:75 msgid "&Go to My Pictures" -msgstr "내 그림으로 가기(&G)" +msgstr "[내 사진]으로 가기(&G)" #: dlls/shdoclc/shdoclc.rc:76 dlls/shdoclc/shdoclc.rc:156 #: dlls/shdoclc/shdoclc.rc:180 @@ -9000,15 +9000,15 @@ msgstr "선택(&S)" #: dlls/shdoclc/shdoclc.rc:105 msgid "&Cell" -msgstr "칸(&C)" +msgstr "셀(&C)" #: dlls/shdoclc/shdoclc.rc:106 msgid "&Row" -msgstr "가로줄(&R)" +msgstr "행(&R)" #: dlls/shdoclc/shdoclc.rc:107 msgid "&Column" -msgstr "세로줄(&C)" +msgstr "열(&C)" #: dlls/shdoclc/shdoclc.rc:108 msgid "&Table" @@ -9016,7 +9016,7 @@ msgstr "표(&T)" #: dlls/shdoclc/shdoclc.rc:111 msgid "&Cell Properties" -msgstr "가로줄 속성(&C)" +msgstr "셀 속성(&C)" #: dlls/shdoclc/shdoclc.rc:112 msgid "&Table Properties" @@ -9032,7 +9032,7 @@ msgstr "잘라내기" #: dlls/shdoclc/shdoclc.rc:155 msgid "&Save Video As..." -msgstr "비디오 다른 이름으로 저장(&S)..." +msgstr "다른 이름으로 비디오 저장(&S)..." #: dlls/shdoclc/shdoclc.rc:166 dlls/shdoclc/shdoclc.rc:190 msgid "Play" @@ -9044,7 +9044,7 @@ msgstr "다시 감기" #: dlls/shdoclc/shdoclc.rc:199 msgid "Trace Tags" -msgstr "태그 추적" +msgstr "추적 태그" #: dlls/shdoclc/shdoclc.rc:200 msgid "Resource Failures" @@ -9060,7 +9060,7 @@ msgstr "디버깅 중지" #: dlls/shdoclc/shdoclc.rc:203 msgid "Debug View" -msgstr "디버깅 정보 보기" +msgstr "디버깅 보기" #: dlls/shdoclc/shdoclc.rc:204 msgid "Dump Tree" @@ -9068,19 +9068,19 @@ msgstr "트리 덤프" #: dlls/shdoclc/shdoclc.rc:205 msgid "Dump Lines" -msgstr "라인 덤프" +msgstr "줄 덤프" #: dlls/shdoclc/shdoclc.rc:206 msgid "Dump DisplayTree" -msgstr "디스플레이트리 덤프" +msgstr "DisplayTree 덤프" #: dlls/shdoclc/shdoclc.rc:207 msgid "Dump FormatCaches" -msgstr "포맷캐쉬 덤프" +msgstr "FormatCaches 덤프" #: dlls/shdoclc/shdoclc.rc:208 msgid "Dump LayoutRects" -msgstr "레이아웃렉트 덤프" +msgstr "LayoutRects 덤프" #: dlls/shdoclc/shdoclc.rc:209 msgid "Memory Monitor" @@ -9088,7 +9088,7 @@ msgstr "메모리 모니터" #: dlls/shdoclc/shdoclc.rc:210 msgid "Performance Meters" -msgstr "성능 측정" +msgstr "성능 측정기" #: dlls/shdoclc/shdoclc.rc:211 msgid "Save HTML" @@ -9096,31 +9096,31 @@ msgstr "HTML 저장" #: dlls/shdoclc/shdoclc.rc:213 msgid "&Browse View" -msgstr "보기 상태(&B)" +msgstr "브라우저 보기(&B)" #: dlls/shdoclc/shdoclc.rc:214 msgid "&Edit View" -msgstr "편집 상태(&E)" +msgstr "편집 보기(&E)" #: dlls/shdoclc/shdoclc.rc:219 dlls/shdoclc/shdoclc.rc:233 msgid "Scroll Here" -msgstr "여기서 스크롤" +msgstr "여기로 스크롤" #: dlls/shdoclc/shdoclc.rc:221 msgid "Top" -msgstr "위" +msgstr "맨 위" #: dlls/shdoclc/shdoclc.rc:222 msgid "Bottom" -msgstr "아래" +msgstr "맨 아래" #: dlls/shdoclc/shdoclc.rc:224 msgid "Page Up" -msgstr "위 페이지" +msgstr "페이지 위로" #: dlls/shdoclc/shdoclc.rc:225 msgid "Page Down" -msgstr "아래 페이지" +msgstr "페이지 아래로" #: dlls/shdoclc/shdoclc.rc:227 msgid "Scroll Up" @@ -9160,7 +9160,7 @@ msgstr "Wine 인터넷 익스폴로어" #: 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:162 @@ -9194,19 +9194,19 @@ msgstr "아이콘 정렬(&I)" #: dlls/shell32/shell32.rc:53 msgid "By &Name" -msgstr "이름으로(&N)" +msgstr "이름별(&N)" #: dlls/shell32/shell32.rc:54 msgid "By &Type" -msgstr "형식으로(&T)" +msgstr "종류별(&T)" #: dlls/shell32/shell32.rc:55 msgid "By &Size" -msgstr "크기로(&S)" +msgstr "크기순(&S)" #: dlls/shell32/shell32.rc:56 msgid "By &Date" -msgstr "날짜로(&D)" +msgstr "날짜순(&D)" #: dlls/shell32/shell32.rc:58 msgid "&Auto Arrange" @@ -9214,7 +9214,7 @@ msgstr "자동 정렬(&A)" #: dlls/shell32/shell32.rc:60 msgid "Line up Icons" -msgstr "아이콘 정렬" +msgstr "아이콘 줄 맞춤" #: dlls/shell32/shell32.rc:65 msgid "Paste as Link" @@ -9308,7 +9308,7 @@ msgstr "%s 실행중" #: dlls/shell32/shell32.rc:329 msgid "Wine was brought to you by:" -msgstr "Wine에 도움주신 분:" +msgstr "Wine 기여자 목록:" #: dlls/shell32/shell32.rc:334 msgid "Run" @@ -9319,7 +9319,7 @@ msgid "" "Type the name of a program, folder, document, or Internet resource, and Wine " "will open it for you." msgstr "" -"프로그램,폴더,문서나 인터넷 자원, 그리고 Wine이 열 것의 이름을 적어주세요." +"프로그램, 폴더, 문서 또는 인터넷 리소스의 이름을 입력하면 Wine이 열어줍니다." #: dlls/shell32/shell32.rc:339 msgid "&Open:" @@ -9373,11 +9373,11 @@ msgstr "바꾸기(&C)..." #: dlls/shell32/shell32.rc:400 msgid "Last modified:" -msgstr "수정날짜:" +msgstr "마지막으로 수정한 날짜:" #: dlls/shell32/shell32.rc:402 msgid "Last accessed:" -msgstr "마지막 접근:" +msgstr "마지막으로 액세스한 날짜:" #: dlls/shell32/shell32.rc:138 dlls/shell32/shell32.rc:142 #: programs/winefile/winefile.rc:107 @@ -9390,7 +9390,7 @@ msgstr "종류" #: dlls/shell32/shell32.rc:140 msgid "Modified" -msgstr "수정날짜" +msgstr "수정됨" #: dlls/shell32/shell32.rc:141 programs/winefile/winefile.rc:171 #: programs/winefile/winefile.rc:113 @@ -9399,7 +9399,7 @@ msgstr "속성" #: dlls/shell32/shell32.rc:143 msgid "Size available" -msgstr "가능한 크기" +msgstr "사용할 수 있는 크기" #: dlls/shell32/shell32.rc:145 msgid "Comments" @@ -9419,7 +9419,7 @@ msgstr "원래 위치" #: dlls/shell32/shell32.rc:149 msgid "Date deleted" -msgstr "지워진 날짜" +msgstr "삭제된 날짜" #: dlls/shell32/shell32.rc:156 programs/winecfg/winecfg.rc:100 #: programs/winefile/winefile.rc:99 @@ -9519,7 +9519,7 @@ msgstr "Common Files" #: dlls/shell32/shell32.rc:219 dlls/shell32/shell32.rc:150 #: dlls/shell32/shell32.rc:235 msgid "Documents" -msgstr "내 문서" +msgstr "문서" #: dlls/shell32/shell32.rc:220 msgid "Administrative Tools" @@ -9527,15 +9527,15 @@ msgstr "관리 도구" #: dlls/shell32/shell32.rc:221 msgid "Music" -msgstr "내 음악" +msgstr "음악" #: dlls/shell32/shell32.rc:222 msgid "Pictures" -msgstr "내 그림" +msgstr "그림" #: dlls/shell32/shell32.rc:223 msgid "Videos" -msgstr "내 비디오" +msgstr "비디오" #: dlls/shell32/shell32.rc:216 msgid "Program Files (x86)" @@ -10707,7 +10707,7 @@ msgid "" "not click install unless you have absolute trust in the above source." msgstr "" "설치할 때, ActiveX 구성 요소는 컴퓨터에 대한 완전한 액세스 권한을 가집니다. " -"위 원본에 대한 절대적인 신뢰가 없는 경우 [설치]를 클릭하지 마십시오." +"위 원본에 대한 절대적인 신뢰가 없는 경우 [설치]를 클릭하지 마세요." #: dlls/urlmon/urlmon.rc:51 msgid "Installation of component failed: %08x" @@ -10836,7 +10836,7 @@ msgstr "개체 변수가 설정되어 있지 않습니다" #: dlls/vbscript/vbscript.rc:44 msgid "Invalid use of Null" -msgstr "올바르지 않은 널 사용" +msgstr "잘못된 널 사용" #: dlls/vbscript/vbscript.rc:45 msgid "Can't create necessary temporary file" @@ -10880,7 +10880,7 @@ msgstr "지정한 DLL 함수를 찾을 수 없습니다" #: dlls/vbscript/vbscript.rc:58 msgid "Variable uses an Automation type not supported in VBScript" -msgstr "변수에 VBScript에서 지원하지 않는 자동화 형식이 사용되었습니다" +msgstr "변수에 VBScript에서 지원되지 않는 자동화 형식이 사용되었습니다" #: dlls/vbscript/vbscript.rc:59 msgid "The remote server machine does not exist or is unavailable" @@ -10888,7 +10888,7 @@ msgstr "원격 서버가 없거나 사용할 수 없습니다" #: dlls/vbscript/vbscript.rc:60 msgid "Invalid or unqualified reference" -msgstr "올바르지 않거나 비정규화된 참조" +msgstr "잘못된 참조입니다" #: dlls/vbscript/vbscript.rc:62 msgid "Microsoft VBScript compilation error" @@ -10980,7 +10980,7 @@ msgstr "알려지지 않았거나 신뢰할 수 없는 게시자가 발행한 #: dlls/wininet/wininet.rc:30 msgid "The date on the certificate is invalid." -msgstr "인증서 날짜가 올바르지 않습니다." +msgstr "인증서 날짜가 잘못되었습니다." #: dlls/wininet/wininet.rc:31 msgid "The name on the certificate does not match the site." @@ -11025,7 +11025,7 @@ msgstr "내부 오류 발생.\n" #: dlls/wininet/winineterror.mc:36 msgid "The URL is invalid.\n" -msgstr "URL이 올바르지 않습니다.\n" +msgstr "URL이 잘못되었습니다.\n" #: dlls/wininet/winineterror.mc:41 msgid "The URL scheme could not be recognized or is not supported.\n" @@ -11037,7 +11037,7 @@ msgstr "서버 이름을 확인할 수 없습니다.\n" #: dlls/wininet/winineterror.mc:51 msgid "The requested operation is invalid.\n" -msgstr "요청한 작업이 올바르지 않습니다.\n" +msgstr "요청한 작업이 잘못되었습니다.\n" #: dlls/wininet/winineterror.mc:56 msgid "" @@ -11091,7 +11091,7 @@ msgid "" "again." msgstr "" "지정한 장치가 이미 사용되고 있습니다. 사용할 수 있을 때까지 기다린 다음 다시 " -"시도하십시오." +"시도하세요." #: dlls/winmm/winmm.rc:37 msgid "The specified device handle is invalid." @@ -11107,15 +11107,15 @@ msgid "" "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 "" -"이 기능은 지원하지 않습니다. Capabilities 함수를 사용하여 드라이버가 지원하" -"는 기능 및 메시지를 결정하십시오." +"이 기능은 지원되지 않습니다. Capabilities 함수를 사용하여 드라이버가 지원하" +"는 기능 및 메시지를 결정하세요." #: dlls/winmm/winmm.rc:41 msgid "An error number was specified that is not defined in the system." @@ -11135,7 +11135,7 @@ msgid "" "Capabilities function to determine the supported formats." msgstr "" "지정한 형식이 지원되지 않거나 변환할 수 없습니다. 지원되는 형식을 결정하려면 " -"Capabilities 함수를 사용하십시오." +"Capabilities 함수를 사용하세요." #: dlls/winmm/winmm.rc:47 dlls/winmm/winmm.rc:53 msgid "" @@ -11151,7 +11151,7 @@ msgid "" "header, and then try again." msgstr "" "웨이브 헤더가 준비되지 않았습니다. Prepare 함수를 사용하여 헤더를 준비한 후 " -"다시 시도하십시오." +"다시 시도하세요." #: dlls/winmm/winmm.rc:49 msgid "" @@ -11159,7 +11159,7 @@ msgid "" "and then try again." msgstr "" "WAVE_ALLOWSYNC 플래그를 사용하지 않고 장치를 열 수 없습니다. 플래그를 사용한 " -"후 다시 시도하십시오." +"후 다시 시도하세요." #: dlls/winmm/winmm.rc:52 msgid "" @@ -11167,7 +11167,7 @@ msgid "" "header, and then try again." msgstr "" "MIDI 헤더가 준비되지 않았습니다. Prepare 함수를 사용하여 헤더를 준비한 후 다" -"시 시도하십시오." +"시 시도하세요." #: dlls/winmm/winmm.rc:54 msgid "" @@ -11183,7 +11183,7 @@ msgid "" "transmitted, and then try again." msgstr "" "포트가 데이터를 장치로 전송하고 있습니다. 데이터가 모두 전송될 때까지 기다린 " -"후 다시 시도하십시오." +"후 다시 시도하세요." #: dlls/winmm/winmm.rc:56 dlls/winmm/winmm.rc:129 msgid "" @@ -11197,12 +11197,11 @@ msgid "" "Windows SYSTEM directory, and then try again." msgstr "" "현재 MIDI 설정이 손상되었습니다. 원래의 MIDIMAP.CFG 파일을 Windows SYSTEM 디" -"렉터리에 복사한 후 다시 시도하십시오." +"렉터리에 복사한 후 다시 시도하세요." #: dlls/winmm/winmm.rc:60 msgid "Invalid MCI device ID. Use the ID returned when opening the MCI device." -msgstr "" -"MCI 장치 ID가 잘못되었습니다. MCI 장치를 열 때 반환된 ID를 사용하십시오." +msgstr "MCI 장치 ID가 잘못되었습니다. MCI 장치를 열 때 반환된 ID를 사용하세요." #: dlls/winmm/winmm.rc:61 msgid "The driver cannot recognize the specified command parameter." @@ -11218,7 +11217,7 @@ msgid "" "or contact the device manufacturer." msgstr "" "미디어 장치에 문제가 있습니다. 제대로 작동하는지 확인하거나 장치 제조업체에 " -"문의하십시오." +"문의하세요." #: dlls/winmm/winmm.rc:64 msgid "The specified device is not open or is not recognized by MCI." @@ -11230,7 +11229,7 @@ msgid "" "unique alias." msgstr "" "프로그램에서 장치 이름을 이미 별칭으로 사용하고 있습니다. 고유한 별칭을 사용" -"하십시오." +"하세요." #: dlls/winmm/winmm.rc:67 msgid "" @@ -11253,7 +11252,7 @@ msgstr "" 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." @@ -11265,7 +11264,7 @@ msgid "" "manufacturer about obtaining a new driver." msgstr "" "장치 드라이버가 잘못된 반환 형식을 반환했습니다. 새 드라이버를 얻을 수 있는" -"지 장치 제조업체에 확인하십시오." +"지 장치 제조업체에 확인하세요." #: dlls/winmm/winmm.rc:73 msgid "" @@ -11273,21 +11272,20 @@ msgid "" "manufacturer about obtaining a new driver." 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." -msgstr "사용 중인 MCI 장치가 지정한 명령을 지원하지 않습니다." +msgstr "사용 중인 MCI 장치가 지정한 명령을 지원되지 않습니다." #: 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." @@ -11295,7 +11293,7 @@ msgstr "장치 드라이버가 준비되지 않았습니다." #: dlls/winmm/winmm.rc:78 msgid "A problem occurred in initializing MCI. Try restarting Windows." -msgstr "MCI 초기화 중 문제가 발생했습니다. Windows를 다시 시작하십시오." +msgstr "MCI 초기화 중 문제가 발생했습니다. Windows를 다시 시작하세요." #: dlls/winmm/winmm.rc:79 msgid "" @@ -11335,7 +11333,7 @@ msgid "" "still connected to the network." msgstr "" "지정한 파일을 저장할 수 없습니다. 디스크 공간이 충분한지 또는 아직 네트에크" -"에 연결되어 있는지 확인하십시오." +"에 연결되어 있는지 확인하세요." #: dlls/winmm/winmm.rc:86 msgid "" @@ -11343,13 +11341,13 @@ msgid "" "device name is spelled correctly." msgstr "" "지정한 장치를 찾을 수 없습니다. 장치가 설치 여부와 장치 이름 철자가 올바른지" -"를 확인하십시오." +"를 확인하세요." #: dlls/winmm/winmm.rc:87 msgid "" "The specified device is now being closed. Wait a few seconds, and then try " "again." -msgstr "지정한 장치는 현재 닫혀 있습니다. 잠시 기다린 후, 다시 시도하십시오." +msgstr "지정한 장치는 현재 닫혀 있습니다. 잠시 기다린 후, 다시 시도하세요." #: dlls/winmm/winmm.rc:88 msgid "" @@ -11357,7 +11355,7 @@ msgid "" "alias." msgstr "" "지정한 별칭이 이미 응용프로그램에서 사용되고 있습니다. 다른 고유한 별칭을 사" -"용하십시오." +"용하세요." #: dlls/winmm/winmm.rc:89 msgid "The specified parameter is invalid for this command." @@ -11369,7 +11367,7 @@ msgid "" "parameter with each 'open' command." msgstr "" "장치 드라이버가 이미 사용되고 있습니다. 공유하려면 각 'open' 명령마다 " -"'shareable' 매개변수를 사용하십시오." +"'shareable' 매개변수를 사용하세요." #: dlls/winmm/winmm.rc:91 msgid "" @@ -11377,7 +11375,7 @@ msgid "" "Please supply one." msgstr "" "지정한 명령은 별칭, 파일, 드라이버 또는 장치 이름이 필요합니다. 이 중 하나를 " -"입력하십시오." +"입력하세요." #: dlls/winmm/winmm.rc:92 msgid "" @@ -11385,17 +11383,17 @@ msgid "" "documentation for valid formats." msgstr "" "시간 형식에 지정한 값이 잘못되었습니다. MCI 문서에서 유효한 형식에 관한 내용" -"을 참조하십시오." +"을 참조하세요." #: dlls/winmm/winmm.rc:93 msgid "" "A closing double-quotation mark is missing from the parameter value. Please " "supply one." -msgstr "매개변수 값에 닫는 큰 따옴표(\")가 빠졌습니다. 입력하십시오." +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 "" @@ -11411,7 +11409,7 @@ msgstr "비어있는 매개변수 블럭이 MCI에 전달되었습니다." #: 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." @@ -11431,7 +11429,7 @@ msgid "" "sequence, and then try again." msgstr "" "지정한 순서대로 명령을 수행할 수 없습니다. 명령 순서를 수정한 다음 다시 시도" -"하십시오." +"하세요." #: dlls/winmm/winmm.rc:102 msgid "" @@ -11439,7 +11437,7 @@ msgid "" "the device is closed, and then try again." msgstr "" "자동 열기 장치에서 지정한 명령을 수행할 수 없습니다. 장치가 닫힐 때까지 기다" -"렸다가 다시 시도하십시오." +"렸다가 다시 시도하세요." #: dlls/winmm/winmm.rc:103 msgid "" @@ -11447,7 +11445,7 @@ msgid "" "characters, followed by a period and an extension." msgstr "" "파일 이름이 잘못되었습니다. 파일 이름이 8 문자를 넘지 않고, 점과 확장명이 있" -"는지 확인하십시오." +"는지 확인하세요." #: dlls/winmm/winmm.rc:104 msgid "" @@ -11460,7 +11458,7 @@ msgid "" "in Control Panel to install the device." msgstr "" "지정한 장치가 시스템에 설치되지 않았습니다. 제어판에서 드라이버 옵션을 사용하" -"여 장치를 설치하십시오." +"여 장치를 설치하세요." #: dlls/winmm/winmm.rc:106 msgid "" @@ -11468,7 +11466,7 @@ msgid "" "restarting your computer." msgstr "" "지정한 파일이나 MCI 장치에 접근할 수 없습니다. 디렉터리를 바꾸거나 컴퓨터를 " -"다시 시작하십시오." +"다시 시작하세요." #: dlls/winmm/winmm.rc:107 msgid "" @@ -11488,17 +11486,17 @@ msgstr "" #: dlls/winmm/winmm.rc:109 msgid "Specify a device or driver name that is less than 79 characters." -msgstr "장치나 드라이버 이름을 79자 미만으로 지정하십시오." +msgstr "장치나 드라이버 이름을 79자 미만으로 지정하세요." #: dlls/winmm/winmm.rc:110 msgid "Specify a device or driver name that is less than 69 characters." -msgstr "장치나 드라이버 이름을 69자 미만으로 지정하십시오." +msgstr "장치나 드라이버 이름을 69자 미만으로 지정하세요." #: dlls/winmm/winmm.rc:111 msgid "" "The specified command requires an integer parameter. Please provide one." msgstr "" -"지정한 명령에는 정수 매개변수가 필요합니다. 올바른 매개변수를 지정하십시오." +"지정한 명령에는 정수 매개변수가 필요합니다. 올바른 매개변수를 지정하세요." #: dlls/winmm/winmm.rc:112 msgid "" @@ -11506,7 +11504,7 @@ msgid "" "until a wave device is free, and then try again." msgstr "" "현재 형식으로 파일을 재생할 수 있는 모든 웨이브 장치가 사용 중입니다. 웨이브 " -"장치를 사용할 수 있을 때까지 기다린 다음 다시 시도하십시오." +"장치를 사용할 수 있을 때까지 기다린 다음 다시 시도하세요." #: dlls/winmm/winmm.rc:113 msgid "" @@ -11514,7 +11512,7 @@ msgid "" "until the device is free, and then try again." msgstr "" "현재 웨이브 장치가 사용 중이므로 재생하도록 설정할 수 없습니다. 장치를 사용" -"할 수 있을 때까지 기다린 다음 다시 시도하십시오." +"할 수 있을 때까지 기다린 다음 다시 시도하세요." #: dlls/winmm/winmm.rc:114 msgid "" @@ -11522,7 +11520,7 @@ msgid "" "Wait until a wave device is free, and then try again." msgstr "" "파일을 현재 형식으로 녹음할 수 있는 모든 웨이브 장치가 사용 중입니다. 웨이브 " -"장치를 사용할 수 있을 때까지 기다린 다음 다시 시도하십시오." +"장치를 사용할 수 있을 때까지 기다린 다음 다시 시도하세요." #: dlls/winmm/winmm.rc:115 msgid "" @@ -11530,7 +11528,7 @@ msgid "" "until the device is free, and then try again." msgstr "" "현재 웨이브 장치가 사용 중이므로 녹음하도록 설정할 수 없습니다. 장치를 사용" -"할 수 있을 때까지 기다린 다음 다시 시도하십시오." +"할 수 있을 때까지 기다린 다음 다시 시도하세요." #: dlls/winmm/winmm.rc:116 msgid "Any compatible waveform playback device may be used." @@ -11546,7 +11544,7 @@ msgid "" "the Drivers option to install the wave device." msgstr "" "현재 형식으로 파일을 재생할 수 있는 웨이브 장치가 설치되지 않았습니다. [드라" -"이버] 옵션을 사용하여 웨이브 장치를 설치하십시오." +"이버] 옵션을 사용하여 웨이브 장치를 설치하세요." #: dlls/winmm/winmm.rc:119 msgid "" @@ -11560,7 +11558,7 @@ msgid "" "the Drivers option to install the wave device." msgstr "" "현재 형식으로 파일을 기록할 수 있는 웨이브 장치가 설치되지 않았습니다. [드라" -"이버] 옵션을 사용하여 웨이브 장치를 설치하십시오." +"이버] 옵션을 사용하여 웨이브 장치를 설치하세요." #: dlls/winmm/winmm.rc:121 msgid "" @@ -11582,7 +11580,7 @@ msgid "" "try again." msgstr "" "저정한 MIDI 포트는 이미 사용 중입니다. 사용할 수 있을 때까지 기다렸다가 다시 " -"시도하십시오." +"시도하세요." #: dlls/winmm/winmm.rc:131 msgid "" @@ -11590,7 +11588,7 @@ msgid "" "option from the Control Panel to install a MIDI device." msgstr "" "지정한 MIDI 장치는 시스템에 설치되어 있지 않습니다. 제어판에서 [드라이버] 옵" -"션을 사용해서 MIDI 장치를 설치하십시오." +"션을 사용해서 MIDI 장치를 설치하세요." #: dlls/winmm/winmm.rc:130 msgid "An error occurred with the specified port." @@ -11602,7 +11600,7 @@ msgid "" "these applications, and then try again." msgstr "" "모든 멀티미디어 타이머는 다른 프로그램에서 사용되고 있습니다. 이 중 하나를 종" -"료한 다음 다시 시도하십시오." +"료한 다음 다시 시도하세요." #: dlls/winmm/winmm.rc:132 msgid "The system doesn't have a current MIDI port specified." @@ -11614,7 +11612,7 @@ msgid "" "Control Panel to install a MIDI driver." msgstr "" "시스템에 MIDI 장치가 설치되어 있지 않습니다. 제어판에서 [드라이버] 옵션을 사" -"용해서 MIDI 드라이버를 설치하십시오." +"용해서 MIDI 드라이버를 설치하세요." #: dlls/winmm/winmm.rc:122 msgid "There is no display window." @@ -11630,7 +11628,7 @@ msgid "" "check your disk or network connection." msgstr "" "지정한 파일을 읽을 수 없습니다. 파일이 있는지 확인하거나, 디스크나 네트워크 " -"연결을 확인하십시오." +"연결을 확인하세요." #: dlls/winmm/winmm.rc:125 msgid "" @@ -11638,7 +11636,7 @@ msgid "" "are still connected to the network." msgstr "" "지정한 파일에 쓸 수 없습니다. 디스크 용량이 충분한 지 또는 네트워크 연결이 되" -"었는지 확인하십시오." +"었는지 확인하세요." #: dlls/winmm/winmm.rc:136 msgid "Wine Sound Mapper" @@ -11666,7 +11664,7 @@ 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." @@ -11686,43 +11684,43 @@ msgstr "프로토콜 오류" #: dlls/wldap32/wldap32.rc:35 msgid "Time Limit Exceeded" -msgstr "시간 제한 도달" +msgstr "시간 제한 초과" #: dlls/wldap32/wldap32.rc:36 msgid "Size Limit Exceeded" -msgstr "크기 제한 도달" +msgstr "크기 제한 초과" #: dlls/wldap32/wldap32.rc:37 msgid "Compare False" -msgstr "잘못된 비교" +msgstr "비교 - 거짓" #: dlls/wldap32/wldap32.rc:38 msgid "Compare True" -msgstr "잘된 비교" +msgstr "비교 - 참" #: dlls/wldap32/wldap32.rc:39 msgid "Authentication Method Not Supported" -msgstr "인증 방법을 지원하지 않습니다" +msgstr "지원되지 않는 인증 방법입니다" #: dlls/wldap32/wldap32.rc:40 msgid "Strong Authentication Required" -msgstr "강력한 인증이 필요합니다" +msgstr "높은 수준의 인증이 요구됩니다" #: dlls/wldap32/wldap32.rc:41 msgid "Referral (v2)" -msgstr "추천 (v2)" +msgstr "조회 (v2)" #: dlls/wldap32/wldap32.rc:42 msgid "Referral" -msgstr "추천" +msgstr "조회" #: dlls/wldap32/wldap32.rc:43 msgid "Administration Limit Exceeded" -msgstr "관리 제한을 넘었습니다" +msgstr "관리 제한이 초과되었습니다" #: dlls/wldap32/wldap32.rc:44 msgid "Unavailable Critical Extension" -msgstr "가능하지 않은 치명적 확장" +msgstr "중요한 확장을 사용할 수 없습니다" #: dlls/wldap32/wldap32.rc:45 msgid "Confidentiality Required" @@ -11734,59 +11732,59 @@ msgstr "SASL 바인딩 진행 중" #: dlls/wldap32/wldap32.rc:48 msgid "No Such Attribute" -msgstr "어떤 속성도 없습니다" +msgstr "그런 특성이 없습니다" #: dlls/wldap32/wldap32.rc:49 msgid "Undefined Type" -msgstr "정의되지 않은 타입" +msgstr "정의되지 않은 유형입니다" #: dlls/wldap32/wldap32.rc:50 msgid "Inappropriate Matching" -msgstr "어울리지 않습니다" +msgstr "부적합한 일치입니다" #: dlls/wldap32/wldap32.rc:51 msgid "Constraint Violation" -msgstr "강제 위반" +msgstr "제약 조건 위반" #: dlls/wldap32/wldap32.rc:52 msgid "Attribute Or Value Exists" -msgstr "속성이나 값이 존재합니다" +msgstr "특성 또는 값이 있습니다" #: dlls/wldap32/wldap32.rc:53 msgid "Invalid Syntax" -msgstr "잘못된 문법" +msgstr "잘못된 구문" #: dlls/wldap32/wldap32.rc:64 msgid "No Such Object" -msgstr "어떤 개체도 없음" +msgstr "그런 개체가 없습니다" #: dlls/wldap32/wldap32.rc:65 msgid "Alias Problem" -msgstr "Alias 문제" +msgstr "별칭 문제" #: dlls/wldap32/wldap32.rc:66 msgid "Invalid DN Syntax" -msgstr "잘못된 DN 문법" +msgstr "잘못된 DN 구문입니다" #: dlls/wldap32/wldap32.rc:67 msgid "Is Leaf" -msgstr "Is Leaf" +msgstr "잎 노드임" #: dlls/wldap32/wldap32.rc:68 msgid "Alias Dereference Problem" -msgstr "Alias 역참조 문제" +msgstr "별칭 참조 취소에 문제가 있습니다" #: dlls/wldap32/wldap32.rc:80 msgid "Inappropriate Authentication" -msgstr "부적절한 인증" +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" @@ -11794,19 +11792,19 @@ 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" -msgstr "루프가 발견되었습니다" +msgstr "루프를 감지했습니다" #: dlls/wldap32/wldap32.rc:92 msgid "Sort Control Missing" -msgstr "정렬 제어가 빠졌습니다" +msgstr "정렬 컨트롤 손실" #: dlls/wldap32/wldap32.rc:93 msgid "Index range error" @@ -11814,7 +11812,7 @@ msgstr "인덱스 범위 오류" #: dlls/wldap32/wldap32.rc:96 msgid "Naming Violation" -msgstr "명명 위반" +msgstr "이름 짓기 규칙 위반" #: dlls/wldap32/wldap32.rc:97 msgid "Object Class Violation" @@ -11822,11 +11820,11 @@ msgstr "개체 클래스 위반" #: dlls/wldap32/wldap32.rc:98 msgid "Not allowed on Non-leaf" -msgstr "론-리프를 따를 수 없습니다" +msgstr "잎 노드 이외에는 허용되지 않습니다" #: dlls/wldap32/wldap32.rc:99 msgid "Not allowed on RDN" -msgstr "RDN은 따를수 없습니다" +msgstr "RDN에서 허용되지 않습니다" #: dlls/wldap32/wldap32.rc:100 msgid "Already Exists" @@ -11834,7 +11832,7 @@ msgstr "이미 존재합니다" #: dlls/wldap32/wldap32.rc:101 msgid "No Object Class Mods" -msgstr "어떤 개체 클래스 모드도 없숩니다" +msgstr "개체 클래스 모드가 없습니다" #: dlls/wldap32/wldap32.rc:102 msgid "Results Too Large" @@ -11842,11 +11840,11 @@ msgstr "결과가 너무 큽니다" #: dlls/wldap32/wldap32.rc:103 msgid "Affects Multiple DSAs" -msgstr "다중 DSA를 적용합니다" +msgstr "여러 DSA에 영향을 미칩니다" #: dlls/wldap32/wldap32.rc:113 msgid "Server Down" -msgstr "서버 다운" +msgstr "서버 작동 안함" #: dlls/wldap32/wldap32.rc:114 msgid "Local Error" @@ -11874,15 +11872,15 @@ msgstr "필터 오류" #: dlls/wldap32/wldap32.rc:120 msgid "User Canceled" -msgstr "사용자가 취소함" +msgstr "사용자가 취소했습니다" #: dlls/wldap32/wldap32.rc:121 msgid "Parameter Error" -msgstr "매개변수 오류" +msgstr "매개 변수 오류" #: dlls/wldap32/wldap32.rc:122 msgid "No Memory" -msgstr "메모리 없음" +msgstr "메모리 부족" #: dlls/wldap32/wldap32.rc:123 msgid "Can't connect to the LDAP server" @@ -11890,27 +11888,27 @@ 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" -msgstr "지정한 제어는 메시지에서 발견할 수 없습니다" +msgstr "지정한 컨트롤이 메시지에 없습니다" #: dlls/wldap32/wldap32.rc:126 msgid "No result present in message" -msgstr "메시지에 결과가 없습니다" +msgstr "결과가 메시지에 없습니다" #: dlls/wldap32/wldap32.rc:127 msgid "More results returned" -msgstr "더 많은 결과가 돌아왔습니다" +msgstr "추가 결과를 반환했습니다" #: dlls/wldap32/wldap32.rc:128 msgid "Loop while handling referrals" -msgstr "리퍼럴을 다루는 동안의 루프" +msgstr "조회를 처리하는 동안의 루프" #: dlls/wldap32/wldap32.rc:129 msgid "Referral hop limit exceeded" -msgstr "리퍼럴 홉 제한에 도달했습니다" +msgstr "조회 홉 한계를 초과했습니다" #: programs/attrib/attrib.rc:30 programs/cmd/cmd.rc:373 msgid "" @@ -12321,7 +12319,7 @@ msgstr "" "Wine 아래의 Win32 환경 변수에는 기반 운영체제의 환경 변수도 들어 있기\n" "때문에 일반적으로 네이티브 Win32 구현보다 더 많은 값이 들어 있습니다.\n" "cmd에서 운영체제 환경 변수에 영향을 미치는 것이 가능하지 않다는 것에\n" -"주목하십시오.\n" +"주목하세요.\n" #: programs/cmd/cmd.rc:234 msgid "" @@ -12657,11 +12655,11 @@ 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?" @@ -12673,11 +12671,11 @@ 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" -msgstr "인수가 없습니다\n" +msgstr "인수 없음\n" #: programs/cmd/cmd.rc:375 msgid "Syntax error\n" @@ -12685,7 +12683,7 @@ msgstr "문법 오류\n" #: programs/cmd/cmd.rc:377 msgid "No help available for %1\n" -msgstr "%1을(를) 위한 도움말을 찾을 수 없습니다\n" +msgstr "%1에 대한 도움말이 없습니다\n" #: programs/cmd/cmd.rc:378 msgid "Target to GOTO not found\n" @@ -12738,7 +12736,7 @@ msgstr "Verify: %1\n" #: programs/cmd/cmd.rc:390 msgid "Verify must be ON or OFF\n" -msgstr "Verify는 ON 또는 OFF 여야 합니다\n" +msgstr "Verify는 ON 또는 OFF이어야 합니다\n" #: programs/cmd/cmd.rc:391 msgid "Parameter error\n" @@ -12754,7 +12752,7 @@ msgstr "" #: 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" @@ -12762,7 +12760,7 @@ 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" @@ -12778,7 +12776,7 @@ msgstr "더? " #: programs/cmd/cmd.rc:399 msgid "The input line is too long.\n" -msgstr "입력 라인이 너무 깁니다.\n" +msgstr "입력 줄이 너무 깁니다.\n" #: programs/cmd/cmd.rc:400 msgid "Volume in drive %1!c! is %2\n" @@ -12823,8 +12821,8 @@ msgid "" "Badly formed number - must be one of decimal (12),\n" " hexadecimal (0x34) or octal (056).\n" msgstr "" -"잘못된 형식의 숫자 - 십진수(12)나,\n" -"16진수(0x34)나 팔진수(056)중의 하나이어야 합니다.\n" +"잘못된 형식의 숫자 - 10진수(12)나,\n" +"16진수(0x34)나 8진수(056)중의 하나이어야 합니다.\n" #: programs/conhost/conhost.rc:54 msgid "Cursor size" @@ -13040,7 +13038,7 @@ msgstr "사용법: hostname\n" #: programs/hostname/hostname.rc:31 msgid "Error: Invalid option '%c'.\n" -msgstr "오류: 올바르지 않은 옵션 '%c'.\n" +msgstr "오류: 잘못된 옵션 '%c'.\n" #: programs/hostname/hostname.rc:32 msgid "Error: Could not get hostname: %u.\n" @@ -13059,7 +13057,7 @@ 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" @@ -13602,7 +13600,7 @@ msgstr "" "파일이 %2 인코딩으로 저장하면 손실되는 유니코드 문자를 포합하고\n" "있습니다.\n" "손실을 피하려면 [취소]를 클릭한 다음, 인코딩 드롭다운 목록에서\n" -"유니코드 옵션 중 하나를 선택하십시오.\n" +"유니코드 옵션 중 하나를 선택하세요.\n" "계속하시겠습니까?" #: programs/oleview/oleview.rc:32 @@ -13651,7 +13649,7 @@ msgstr "인스턴스 만들기(&I)" #: programs/oleview/oleview.rc:53 msgid "Create Instance &On..." -msgstr "인스턴트 온 만들기(&O)..." +msgstr "인스턴트 만들기(&O)..." #: programs/oleview/oleview.rc:54 msgid "&Release Instance" @@ -13671,13 +13669,13 @@ msgstr "전문가 모드(&E)" #: programs/oleview/oleview.rc:65 msgid "&Hidden component categories" -msgstr "구성 요소 분류 숨기기(&H)" +msgstr "숨겨진 구성 요소 범주(&H)" #: programs/oleview/oleview.rc:67 programs/oleview/oleview.rc:89 #: programs/winefile/winefile.rc:65 programs/wordpad/wordpad.rc:71 #: programs/wordpad/wordpad.rc:272 msgid "&Toolbar" -msgstr "도구바(&T)" +msgstr "도구 모음(&T)" #: programs/oleview/oleview.rc:68 programs/oleview/oleview.rc:90 #: programs/winefile/winefile.rc:67 programs/wordpad/wordpad.rc:74 @@ -13692,7 +13690,7 @@ msgstr "새로 고침(&R)\tF5" #: programs/oleview/oleview.rc:74 msgid "&About OleView" -msgstr "OleView에 관하여(&A)" +msgstr "OleView 정보(&A)" #: programs/oleview/oleview.rc:82 msgid "&Save as..." @@ -13704,39 +13702,39 @@ msgstr "타입 종류에 따라 구분(&G)" #: programs/oleview/oleview.rc:156 msgid "Connect to another machine" -msgstr "다른 머신(machine)에 접속" +msgstr "다른 머신에 접속" #: programs/oleview/oleview.rc:159 msgid "&Machine name:" -msgstr "머신(&Machine) 이름:" +msgstr "머신 이름(&M):" #: programs/oleview/oleview.rc:167 msgid "System Configuration" -msgstr "시스템 설정" +msgstr "시스템 구성" #: programs/oleview/oleview.rc:170 msgid "System Settings" -msgstr "시스템 셋팅" +msgstr "시스템 설정" #: programs/oleview/oleview.rc:171 msgid "&Enable Distributed COM" -msgstr "DCOM 허용(&E)" +msgstr "DCOM 사용(&E)" #: programs/oleview/oleview.rc:172 msgid "Enable &Remote Connections (Win95 only)" -msgstr "원격 연결 허용(&R) (Win95만 해당)" +msgstr "원격 연결 사용(Win95 전용)(&R)" #: programs/oleview/oleview.rc:173 msgid "" "These settings change only registry values.\n" "They have no effect on Wine performance." msgstr "" -"이 셋팅은 오직 레지스트리 값만 바꿉니다.\n" -"WIne의 성능에는 아무 영향을 안 미칩니다." +"이 셋팅은 레지스트리 값만 바꿉니다.\n" +"Wine의 성능에는 영향을 미치지 않습니다." #: programs/oleview/oleview.rc:180 msgid "Default Interface Viewer" -msgstr "기본 인터페이스 보기" +msgstr "기본 인터페이스 뷰어" #: programs/oleview/oleview.rc:183 msgid "Interface" @@ -13792,7 +13790,7 @@ msgstr "TypeLib 파일 열고 내용 보기" #: programs/oleview/oleview.rc:107 msgid "Change machine wide Distributed COM settings" -msgstr "머신 전체의 DCOM설정 바꾸기" +msgstr "머신 전체의 DCOM 설정 바꾸기" #: programs/oleview/oleview.rc:108 msgid "Run the Wine registry editor" @@ -13945,7 +13943,7 @@ msgstr "타입정보를 타입에 따라 분류" #: programs/progman/progman.rc:33 msgid "&New..." -msgstr "새 작업(&N)..." +msgstr "새로 만들기(&N)..." #: programs/progman/progman.rc:34 msgid "O&pen\tEnter" @@ -13969,7 +13967,7 @@ msgstr "실행(&E)..." #: programs/progman/progman.rc:42 msgid "E&xit Windows" -msgstr "창 나가기(&X)" +msgstr "끝내기(&X)" #: programs/progman/progman.rc:44 programs/taskmgr/taskmgr.rc:41 #: programs/winefile/winefile.rc:62 programs/winhlp32/winhlp32.rc:47 @@ -13978,15 +13976,15 @@ msgstr "옵션(&O)" #: programs/progman/progman.rc:45 msgid "&Arrange automatically" -msgstr "자동 정렬(&A)" +msgstr "자동으로 정렬(&A)" #: programs/progman/progman.rc:46 msgid "&Minimize on run" -msgstr "실행시 최소화(&M)" +msgstr "실행 중 최소화(&M)" #: programs/progman/progman.rc:47 programs/winefile/winefile.rc:70 msgid "&Save settings on exit" -msgstr "끝내면서 설정 저장(&S)" +msgstr "끝낼 때 설정 내용 저장(&S)" #: programs/progman/progman.rc:49 programs/taskmgr/taskmgr.rc:78 #: programs/taskmgr/taskmgr.rc:255 @@ -13995,11 +13993,11 @@ msgstr "창(&W)" #: programs/progman/progman.rc:50 msgid "&Overlapped\tShift+F5" -msgstr "겹치기(&O)\tShift+F5" +msgstr "겹쳐서 배열(&O)\tShift+F5" #: programs/progman/progman.rc:51 msgid "&Side by side\tShift+F4" -msgstr "나누기(&S)\tShift+F4" +msgstr "나란히 배열(&S)\tShift+F4" #: programs/progman/progman.rc:52 msgid "&Arrange Icons" @@ -14031,7 +14029,7 @@ msgstr "대상 그룹:" #: programs/progman/progman.rc:122 programs/progman/progman.rc:140 msgid "&To group:" -msgstr "목적 그룹(&T):" +msgstr "대상 그룹(&T):" #: programs/progman/progman.rc:134 msgid "Copy Program" @@ -14071,11 +14069,11 @@ msgstr "실행시 최소화(&M)" #: programs/progman/progman.rc:183 msgid "Change &icon..." -msgstr "아이콘 바꾸기(&I)..." +msgstr "아이콘 변경(&I)..." #: programs/progman/progman.rc:192 msgid "Change Icon" -msgstr "아이콘 바꾸기" +msgstr "아이콘 변경" #: programs/progman/progman.rc:194 msgid "&Filename:" @@ -14131,11 +14129,11 @@ msgstr "" #: programs/progman/progman.rc:77 msgid "Help not available." -msgstr "도움말은 가능하지않습니다." +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." @@ -14143,7 +14141,7 @@ 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)" @@ -14203,7 +14201,7 @@ msgstr "reg: 키 이름이 잘못되었습니다\n" #: programs/reg/reg.rc:41 msgid "reg: Invalid command line parameters\n" -msgstr "reg: 명령줄 매개변수가 올바르지 않습니다\n" +msgstr "reg: 명령줄 매개변수가 잘못되었습니다\n" #: programs/reg/reg.rc:42 msgid "reg: Unable to access remote machine\n" @@ -14279,19 +14277,19 @@ msgstr "검색 완료. 일치하는 항목 수: %1!d!\n" #: programs/reg/reg.rc:61 msgid "reg: Invalid syntax. " -msgstr "reg: 올바르지 않은 구문. " +msgstr "reg: 잘못된 구문. " #: programs/reg/reg.rc:62 msgid "reg: Invalid option [%1]. " -msgstr "reg: 올바르지 않은 옵션 [%1]. " +msgstr "reg: 잘못된 옵션 [%1]. " #: programs/reg/reg.rc:63 msgid "Type \"REG /?\" for help.\n" -msgstr "도움말을 보려면 \"REG /?\"를 입력하십시오.\n" +msgstr "도움말을 보려면 \"REG /?\"를 입력하세요.\n" #: programs/reg/reg.rc:64 msgid "Type \"REG %1 /?\" for help.\n" -msgstr "도움말을 보려면 \"REG %1 /?\"를 입력하십시오.\n" +msgstr "도움말을 보려면 \"REG %1 /?\"를 입력하세요.\n" #: programs/reg/reg.rc:65 programs/regedit/regedit.rc:240 msgid "(value not set)" @@ -14319,7 +14317,7 @@ msgstr "REG EXPORT key_name 파일.reg [/y]\n" #: programs/reg/reg.rc:71 msgid "reg: Invalid system key [%1]\n" -msgstr "reg: 올바르지 않은 시스템 키 [%1]\n" +msgstr "reg: 잘못된 시스템 키 [%1]\n" #: programs/reg/reg.rc:72 msgid "The file '%1' already exists. Do you want to overwrite it?" @@ -14661,7 +14659,7 @@ msgstr "regedit: [%1](은)는 유효하지 않거나 인식할 수 없는 스위 #: programs/regedit/regedit.rc:410 msgid "Type \"regedit /?\" for help.\n" -msgstr "도움말을 보려면 \"regedit /?\"를 입력하십시오.\n" +msgstr "도움말을 보려면 \"regedit /?\"를 입력하세요.\n" #: programs/regedit/regedit.rc:411 msgid "regedit: No filename was specified.\n" @@ -14689,14 +14687,13 @@ msgstr "regedit: 메모리 초과! (%1!S!, line %2!u!)\n" #: programs/regedit/regedit.rc:417 msgid "regedit: Invalid hexadecimal value.\n" -msgstr "regedit: 올바르지 않은 16진수 값.\n" +msgstr "regedit: 잘못된 16진수 값.\n" #: programs/regedit/regedit.rc:418 msgid "" "regedit: Unable to convert hexadecimal data. An invalid value was " "encountered at '%1'.\n" -msgstr "" -"regedit: 16진수 값을 변환할 수 없습니다. '%1'(이)가 올바르지 않습니다.\n" +msgstr "regedit: 16진수 값을 변환할 수 없습니다. '%1'(이)가 잘못되었습니다.\n" #: programs/regedit/regedit.rc:419 msgid "regedit: Unrecognized escape sequence [\\%1!c!]\n" @@ -14704,7 +14701,7 @@ msgstr "regedit: [\\%1!c!](은)는 알 수 없는 제어 문자입니다\n" #: programs/regedit/regedit.rc:420 msgid "regedit: Unsupported registry data type [0x%1!x!]\n" -msgstr "regedit: [0x%1!x!](은)는 지원하지 않는 레지스트리 데이터 유형입니다\n" +msgstr "regedit: [0x%1!x!](은)는 지원되지 않는 레지스트리 데이터 유형입니다\n" #: programs/regedit/regedit.rc:421 msgid "regedit: Unexpected end of line in '%1'.\n" @@ -14726,7 +14723,7 @@ msgstr "regedit: 레지스트리 키 '%1'을(를) 열 수 없습니다.\n" msgid "" "regedit: Unsupported registry data type [0x%1!x!] encountered in '%2'.\n" msgstr "" -"regedit: 지원하지 않는 레지스트리 데이터 유형 [0x%1!x!]이(가) '%2'에서 발생하" +"regedit: 지원되지 않는 레지스트리 데이터 유형 [0x%1!x!]이(가) '%2'에서 발생하" "였습니다.\n" #: programs/regedit/regedit.rc:426 @@ -14735,7 +14732,7 @@ msgstr "regedit: 레지스트리 값 '%1'(이)가 이진 정보로 출력됩니 #: programs/regedit/regedit.rc:427 msgid "regedit: Invalid system key [%1]\n" -msgstr "regedit: 올바르지 않은 시스템 키 [%1]\n" +msgstr "regedit: 잘못된 시스템 키 [%1]\n" #: programs/regedit/regedit.rc:428 msgid "" @@ -15010,11 +15007,11 @@ msgstr "사용법: taskkill [/?] [/f] [/im 프로세스이름 | /pid 프로세 #: programs/taskkill/taskkill.rc:31 msgid "Error: Unknown or invalid command line option specified.\n" -msgstr "오류: 없거나 올바르지 않은 명령라인 옵션이 지정되었습니다.\n" +msgstr "오류: 없거나 잘못된 명령라인 옵션이 지정되었습니다.\n" #: programs/taskkill/taskkill.rc:32 msgid "Error: Invalid command line parameter specified.\n" -msgstr "오류: 올바르지 않은 명령어 라인 옵션이 지정되었습니다.\n" +msgstr "오류: 잘못된 명령어 라인 옵션이 지정되었습니다.\n" #: programs/taskkill/taskkill.rc:33 msgid "Error: One of options /im or /pid must be specified.\n" @@ -15065,7 +15062,7 @@ msgstr "오류: 프로세스 자가 종료는 허용되지 않습니다.\n" #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108 msgid "&New Task (Run...)" -msgstr "새 작업(&N)( 실행...)" +msgstr "새 작업(실행...)(&N)" #: programs/taskmgr/taskmgr.rc:39 msgid "E&xit Task Manager" @@ -15073,11 +15070,11 @@ msgstr "작업 관리자 나가기(&X)" #: programs/taskmgr/taskmgr.rc:45 msgid "&Minimize On Use" -msgstr "최소화 상태로 사용(&M)" +msgstr "작업 전환할 때 최소화(&M)" #: programs/taskmgr/taskmgr.rc:47 msgid "&Hide When Minimized" -msgstr "최소화 상태일 때 숨기기(&H)" +msgstr "최소화할 때 숨기기(&H)" #: programs/taskmgr/taskmgr.rc:49 programs/taskmgr/taskmgr.rc:257 msgid "&Show 16-bit tasks" @@ -15085,7 +15082,7 @@ msgstr "16-bit 작업 보기(&S)" #: programs/taskmgr/taskmgr.rc:54 msgid "&Refresh Now" -msgstr "지금 새로 읽기(&R)" +msgstr "지금 새로 고침(&R)" #: programs/taskmgr/taskmgr.rc:55 msgid "&Update Speed" @@ -15097,7 +15094,7 @@ msgstr "높음(&H)" #: programs/taskmgr/taskmgr.rc:58 programs/taskmgr/taskmgr.rc:162 msgid "&Normal" -msgstr "정상(&N)" +msgstr "보통(&N)" #: programs/taskmgr/taskmgr.rc:60 programs/taskmgr/taskmgr.rc:166 msgid "&Low" @@ -15105,11 +15102,11 @@ msgstr "낮음(&L)" #: programs/taskmgr/taskmgr.rc:61 msgid "&Paused" -msgstr "정지(&P)" +msgstr "일시 중지됨(&P)" #: programs/taskmgr/taskmgr.rc:68 programs/taskmgr/taskmgr.rc:256 msgid "&Select Columns..." -msgstr "세로 칸 선택(&S)..." +msgstr "열 선택(&S)..." #: programs/taskmgr/taskmgr.rc:69 programs/taskmgr/taskmgr.rc:258 msgid "&CPU History" @@ -15117,25 +15114,25 @@ msgstr "&CPU 기록" #: programs/taskmgr/taskmgr.rc:71 programs/taskmgr/taskmgr.rc:259 msgid "&One Graph, All CPUs" -msgstr "모든 CPU에 하나의 그래프(&O)" +msgstr "그래프 하나에 모든 CPU(&O)" #: programs/taskmgr/taskmgr.rc:73 programs/taskmgr/taskmgr.rc:260 msgid "One Graph &Per CPU" -msgstr "CPU 당 하나의 그래프(&P)" +msgstr "CPU마다 그래프 하나(&P)" #: programs/taskmgr/taskmgr.rc:76 programs/taskmgr/taskmgr.rc:261 msgid "&Show Kernel Times" -msgstr "커널 시간 보기(&S)" +msgstr "커널 시간 표시(&S)" #: programs/taskmgr/taskmgr.rc:80 programs/taskmgr/taskmgr.rc:96 #: programs/taskmgr/taskmgr.rc:123 programs/winefile/winefile.rc:76 msgid "Tile &Horizontally" -msgstr "가로 바둑판식 정렬(&H)" +msgstr "가로 바둑판식 배열(&H)" #: programs/taskmgr/taskmgr.rc:81 programs/taskmgr/taskmgr.rc:97 #: programs/taskmgr/taskmgr.rc:124 msgid "Tile &Vertically" -msgstr "세로 바둑판 정렬(&V)" +msgstr "세로 바둑판식 배열(&V)" #: programs/taskmgr/taskmgr.rc:82 programs/taskmgr/taskmgr.rc:98 #: programs/taskmgr/taskmgr.rc:125 @@ -15145,16 +15142,16 @@ msgstr "최소화(&M)" #: programs/taskmgr/taskmgr.rc:84 programs/taskmgr/taskmgr.rc:100 #: programs/taskmgr/taskmgr.rc:127 msgid "&Cascade" -msgstr "정렬(&C)" +msgstr "계단식 배열(&C)" #: programs/taskmgr/taskmgr.rc:85 programs/taskmgr/taskmgr.rc:101 #: programs/taskmgr/taskmgr.rc:121 msgid "&Bring To Front" -msgstr "앞으로 가져오기(&B)" +msgstr "맨 앞으로 가져오기(&B)" #: programs/taskmgr/taskmgr.rc:90 msgid "&About Task Manager" -msgstr "작업관리자에 관하여(&A)" +msgstr "작업 관리자 정보(&A)" #: programs/taskmgr/taskmgr.rc:120 programs/taskmgr/taskmgr.rc:352 msgid "&Switch To" @@ -15162,19 +15159,19 @@ msgstr "전환(&S)" #: programs/taskmgr/taskmgr.rc:129 programs/taskmgr/taskmgr.rc:353 msgid "&End Task" -msgstr "작업 끝(&E)" +msgstr "작업 끝내기(&E)" #: programs/taskmgr/taskmgr.rc:130 msgid "&Go To Process" -msgstr "프로세스로 가기(&G)" +msgstr "프로세스로 이동(&G)" #: programs/taskmgr/taskmgr.rc:149 programs/taskmgr/taskmgr.rc:363 msgid "&End Process" -msgstr "작업 끝(&E)" +msgstr "프로세스 끝내기(&E)" #: programs/taskmgr/taskmgr.rc:150 msgid "End Process &Tree" -msgstr "작업 트리 끝(&T)" +msgstr "프로세스 트리 끝내기(&T)" #: programs/taskmgr/taskmgr.rc:152 programs/winedbg/winedbg.rc:32 msgid "&Debug" @@ -15182,7 +15179,7 @@ msgstr "디버깅(&D)" #: programs/taskmgr/taskmgr.rc:154 msgid "Set &Priority" -msgstr "우선순위 설정(&P)" +msgstr "우선 순위 설정(&P)" #: programs/taskmgr/taskmgr.rc:156 msgid "&Realtime" @@ -15190,11 +15187,11 @@ msgstr "실시간(&R)" #: programs/taskmgr/taskmgr.rc:160 msgid "&Above Normal" -msgstr "보통보다 위(&A)" +msgstr "보통 이상(&A)" #: programs/taskmgr/taskmgr.rc:164 msgid "&Below Normal" -msgstr "보통보다 아래(&B)" +msgstr "보통 이하(&B)" #: programs/taskmgr/taskmgr.rc:169 msgid "Set &Affinity..." @@ -15215,7 +15212,7 @@ msgstr "새 작업(&N)..." #: programs/taskmgr/taskmgr.rc:364 msgid "&Show processes from all users" -msgstr "모든 사용자의 작업 보기(&S)" +msgstr "모든 사용자의 프로세스 보기(&S)" #: programs/taskmgr/taskmgr.rc:372 msgid "CPU usage" @@ -15227,7 +15224,7 @@ msgstr "메모리 사용량" #: programs/taskmgr/taskmgr.rc:374 msgid "Totals" -msgstr "합계" +msgstr "전체" #: programs/taskmgr/taskmgr.rc:375 msgid "Commit charge (K)" @@ -15251,7 +15248,7 @@ msgstr "스레드" #: programs/taskmgr/taskmgr.rc:380 programs/taskmgr/taskmgr.rc:263 msgid "Processes" -msgstr "작업" +msgstr "프로세스" #: programs/taskmgr/taskmgr.rc:387 programs/taskmgr/taskmgr.rc:396 #: programs/taskmgr/taskmgr.rc:405 @@ -15264,7 +15261,7 @@ msgstr "제한" #: programs/taskmgr/taskmgr.rc:389 msgid "Peak" -msgstr "피크" +msgstr "최고" #: programs/taskmgr/taskmgr.rc:398 msgid "System Cache" @@ -15272,11 +15269,11 @@ msgstr "시스템 캐쉬" #: programs/taskmgr/taskmgr.rc:406 msgid "Paged" -msgstr "페이지된" +msgstr "페이지 됨" #: programs/taskmgr/taskmgr.rc:407 msgid "Nonpaged" -msgstr "페이지안된" +msgstr "페이지 안 됨" #: programs/taskmgr/taskmgr.rc:414 msgid "CPU usage history" @@ -15292,13 +15289,13 @@ msgstr "디버깅 채널" #: programs/taskmgr/taskmgr.rc:439 msgid "Processor Affinity" -msgstr "프로세서 친화도" +msgstr "프로세서 선호도" #: programs/taskmgr/taskmgr.rc:444 msgid "" "The Processor Affinity setting controls which CPUs the process will be " "allowed to execute on." -msgstr "프로세서 친화도 설정은 어떤 CPU가 프로세스를 실행시킬 지를 제어한다." +msgstr "프로세서 선호도 설정은 어떤 CPU가 프로세스를 실행시킬 지를 제어한다." #: programs/taskmgr/taskmgr.rc:446 msgid "CPU 0" @@ -15430,12 +15427,12 @@ msgstr "CPU 31" #: programs/taskmgr/taskmgr.rc:514 msgid "Select Columns" -msgstr "세로줄 선택" +msgstr "열 선택" #: programs/taskmgr/taskmgr.rc:519 msgid "" "Select the columns that will appear on the Process page of the Task Manager." -msgstr "세로줄 선택은 작업 관리자의 작업 페이지에 나타날것입니다." +msgstr "작업 관리자의 프로세스 페이지에 표시될 열을 선택하십시오." #: programs/taskmgr/taskmgr.rc:521 msgid "&Image Name" @@ -15459,15 +15456,15 @@ msgstr "메모리 사용(&M)" #: programs/taskmgr/taskmgr.rc:531 msgid "Memory Usage &Delta" -msgstr "메모리 사용 델타(&D)" +msgstr "메모리 사용 변화량(&D)" #: programs/taskmgr/taskmgr.rc:533 msgid "Pea&k Memory Usage" -msgstr "피크 메모리 사용(&K)" +msgstr "최대 메모리 사용(&K)" #: programs/taskmgr/taskmgr.rc:535 msgid "Page &Faults" -msgstr "페이지 실패(&F)" +msgstr "페이지 폴트(&F)" #: programs/taskmgr/taskmgr.rc:537 msgid "&USER Objects" @@ -15479,7 +15476,7 @@ msgstr "I/O 읽기" #: programs/taskmgr/taskmgr.rc:541 programs/taskmgr/taskmgr.rc:282 msgid "I/O Read Bytes" -msgstr "I/O 읽은 바이트" +msgstr "I/O 읽기 바이트" #: programs/taskmgr/taskmgr.rc:543 msgid "&Session ID" @@ -15491,7 +15488,7 @@ msgstr "사용자 이름(&N)" #: programs/taskmgr/taskmgr.rc:547 msgid "Page F&aults Delta" -msgstr "페이지 실패 델타(&A)" +msgstr "페이지 폴트 변화량(&A)" #: programs/taskmgr/taskmgr.rc:549 msgid "&Virtual Memory Size" @@ -15499,23 +15496,23 @@ msgstr "가상 메모리 크기(&V)" #: programs/taskmgr/taskmgr.rc:551 msgid "Pa&ged Pool" -msgstr "페이지된 풀(&G)" +msgstr "페이징 풀(&G)" #: programs/taskmgr/taskmgr.rc:553 msgid "N&on-paged Pool" -msgstr "페이지되지 않은 풀(&O)" +msgstr "비페이징 풀(&O)" #: programs/taskmgr/taskmgr.rc:555 msgid "Base P&riority" -msgstr "기본 우선권(&R)" +msgstr "기본 우선 순위(&R)" #: programs/taskmgr/taskmgr.rc:557 msgid "&Handle Count" -msgstr "핸들 카운트(&H)" +msgstr "핸들 수(&H)" #: programs/taskmgr/taskmgr.rc:559 msgid "&Thread Count" -msgstr "스레드 카운트(&T)" +msgstr "스레드 수(&T)" #: programs/taskmgr/taskmgr.rc:561 programs/taskmgr/taskmgr.rc:292 msgid "GDI Objects" @@ -15527,7 +15524,7 @@ msgstr "I/O 쓰기" #: programs/taskmgr/taskmgr.rc:565 programs/taskmgr/taskmgr.rc:294 msgid "I/O Write Bytes" -msgstr "I/O 쓴 바이트" +msgstr "I/O 쓰기 바이트" #: programs/taskmgr/taskmgr.rc:567 programs/taskmgr/taskmgr.rc:295 msgid "I/O Other" @@ -15547,167 +15544,167 @@ msgstr "새 프로그램 실행" #: programs/taskmgr/taskmgr.rc:188 msgid "Task Manager remains in front of all other windows unless minimized" -msgstr "작업관리자는 최소화 되지 않는 한 다른 창 앞에 있게 됩니다" +msgstr "작업 관리자는 최소화되지 않는 한 다른 모든 창 앞에 있게 됩니다" #: programs/taskmgr/taskmgr.rc:190 msgid "Task Manager is minimized when a SwitchTo operation is performed" -msgstr "작엄관리자는 전환 작업이 완료될 때 최소화됩니다" +msgstr "작업 관리자는 작업 전환이 실행될 때 최소화됩니다" #: programs/taskmgr/taskmgr.rc:191 msgid "Hide the Task Manager when it is minimized" -msgstr "작업관리자가 최소하 될 때 숨기기" +msgstr "최소화되었을 때는 작업 관리자를 숨깁니다" #: programs/taskmgr/taskmgr.rc:192 msgid "Force Task Manager to update now, regardless of Update Speed setting" -msgstr "업데이트 속도 설정과는 상관없이 작업관리자 강제로 업데이트" +msgstr "업데이트 속도 설정에 관계없이 작업 관리자를 바로 업데이트합니다" #: programs/taskmgr/taskmgr.rc:193 msgid "Displays tasks by using large icons" -msgstr "큰 아이콘 사용해서 작업 관리자 보여줌" +msgstr "큰 아이콘을 사용하여 작업을 표시합니다" #: programs/taskmgr/taskmgr.rc:194 msgid "Displays tasks by using small icons" -msgstr "작은 아이콘 사용해서 작업 관리자 보여줌" +msgstr "작은 아이콘을 사용하여 작업을 표시합니다" #: programs/taskmgr/taskmgr.rc:195 msgid "Displays information about each task" -msgstr "각각의 작업 정보 보여줌" +msgstr "각 작업에 대한 정보를 표시합니다" #: programs/taskmgr/taskmgr.rc:196 msgid "Updates the display twice per second" -msgstr "1초에 2번 디스플레이 새로 고침" +msgstr "표시를 1초마다 두 번 업데이트합니다" #: programs/taskmgr/taskmgr.rc:197 msgid "Updates the display every two seconds" -msgstr "2초마다 디스플레이 새로 고침" +msgstr "표시를 2초마다 업데이트합니다" #: programs/taskmgr/taskmgr.rc:198 msgid "Updates the display every four seconds" -msgstr "4초마다 디스플레이 새로 고침" +msgstr "표시를 4초마다 업데이트합니다" #: programs/taskmgr/taskmgr.rc:203 msgid "Does not automatically update" -msgstr "자동 업데이트할 수 없습니다" +msgstr "표시를 자동으로 업데이트하지 않습니다" #: programs/taskmgr/taskmgr.rc:205 msgid "Tiles the windows horizontally on the desktop" -msgstr "수평 바둑판식으로 창 배열" +msgstr "창을 바탕 화면에 가로로 배열합니다" #: programs/taskmgr/taskmgr.rc:206 msgid "Tiles the windows vertically on the desktop" -msgstr "수직 바둑판식으로 창 배열" +msgstr "바탕 화면에 창을 수직으로 배열합니다" #: programs/taskmgr/taskmgr.rc:207 msgid "Minimizes the windows" -msgstr "창 최소화" +msgstr "창을 최소화합니다" #: programs/taskmgr/taskmgr.rc:208 msgid "Maximizes the windows" -msgstr "창 최대화" +msgstr "창을 최대화합니다" #: programs/taskmgr/taskmgr.rc:209 msgid "Cascades the windows diagonally on the desktop" -msgstr "계단식으로 창 배열" +msgstr "창을 바탕 화면에 대각선으로 계단식 배열합니다" #: programs/taskmgr/taskmgr.rc:210 msgid "Brings the window front, but does not switch to it" -msgstr "포커스 전환 없이, 창을 앞으로 가져옵니다" +msgstr "창을 앞으로 가져오지만 전환하지는 않습니다" #: programs/taskmgr/taskmgr.rc:211 msgid "Displays Task Manager help topics" -msgstr "작업 관리자 도움물 목차 보기" +msgstr "작업 관리자 도움말 항목을 표시합니다" #: programs/taskmgr/taskmgr.rc:212 msgid "Displays program information, version number, and copyright" -msgstr "프로그램 정보,버전 그리고 저작권 보기" +msgstr "프로그램 정보, 버전 번호, 저작권을 표시합니다" #: programs/taskmgr/taskmgr.rc:213 msgid "Exits the Task Manager application" -msgstr "작업 관리자 프로그램 나가기" +msgstr "작업 관리자 응용 프로그램을 끝냅니다" #: programs/taskmgr/taskmgr.rc:215 msgid "Shows 16-bit tasks under the associated ntvdm.exe" -msgstr "NTVDM.EXE와 연관된 16비트 작업 보기" +msgstr "NTVDM.EXE와 연관된 16비트 작업을 표시합니다" #: programs/taskmgr/taskmgr.rc:216 msgid "Select which columns will be visible on the Process page" -msgstr "세로줄 선택은 작업페이지의 보여주게 될 것입니다" +msgstr "프로세스 페이지에서 볼 수 있는 열을 선택합니다" #: programs/taskmgr/taskmgr.rc:217 msgid "Displays kernel time in the performance graphs" -msgstr "성능 그래프의 커널 타입 보기" +msgstr "커널 시간을 성능 그래프로 표시합니다" #: programs/taskmgr/taskmgr.rc:219 msgid "A single history graph shows total CPU usage" -msgstr "모든 CPU 사용을 하나의 기록 그래프로 보기" +msgstr "단일 사용 현황 그래프를 보면 전체 CPU 사용을 알 수 있습니다" #: programs/taskmgr/taskmgr.rc:220 msgid "Each CPU has its own history graph" -msgstr "각각 CPU를 각자의 기록 그래프로 보기" +msgstr "CPU마다 자체의 사용 현황 그래프를 가집니다" #: programs/taskmgr/taskmgr.rc:222 msgid "Brings a task to the foreground, switch focus to that task" -msgstr "작업을 앞으로 가져오고, 그 작업으로 포커스 이동" +msgstr "작업을 앞으로 가져와서 포커스를 그 작업으로 전환합니다" #: programs/taskmgr/taskmgr.rc:227 msgid "Tells the selected tasks to close" -msgstr "선택한 작업을 닫으라고 말하기" +msgstr "선택한 작업을 닫으라고 지시합니다" #: programs/taskmgr/taskmgr.rc:228 msgid "Switches the focus to the process of the selected task" -msgstr "선택된 태스크의 작업으로 포커스 이동" +msgstr "선택한 작업의 프로세스로 포커스를 전환합니다" #: programs/taskmgr/taskmgr.rc:229 msgid "Restores the Task Manager from its hidden state" -msgstr "숨은 상태에서 작업관리자 복귀" +msgstr "작업 관리자를 숨김 상태에서 복원합니다" #: programs/taskmgr/taskmgr.rc:230 msgid "Removes the process from the system" -msgstr "시스템에서 작업 제거" +msgstr "시스템에서 프로세스를 제거합니다" #: programs/taskmgr/taskmgr.rc:232 msgid "Removes this process and all descendants from the system" -msgstr "작업과 시스템으로부터의 모든 자식 프로세스를 제거" +msgstr "이 프로세스 및 모든 하위 항목을 시스템에서 제거합니다" #: programs/taskmgr/taskmgr.rc:233 msgid "Attaches the debugger to this process" -msgstr "프로세스에 디버거 부착" +msgstr "이 프로세스에 디버거를 연결합니다" #: programs/taskmgr/taskmgr.rc:235 msgid "Controls which processors the process will be allowed to run on" -msgstr "프로세스를 실행할 수 있는 포로세서를 제어합니다" +msgstr "프로세스가 어떤 프로세서에서 실행될 것인지 제어합니다" #: programs/taskmgr/taskmgr.rc:237 msgid "Sets process to the REALTIME priority class" -msgstr "작업을 실시간 순위 클래스로 설정" +msgstr "프로세스를 실시간 우선 순위 클래스로 설정합니다" #: programs/taskmgr/taskmgr.rc:238 msgid "Sets process to the HIGH priority class" -msgstr "작업을 높은 순위 클래스로 설정" +msgstr "프로세스를 높은 우선 순위 클래스로 설정합니다" #: programs/taskmgr/taskmgr.rc:240 msgid "Sets process to the ABOVE NORMAL priority class" -msgstr "작업을 보통보다 높은 순위 클래스로 설정" +msgstr "프로세스를 보통 이상 우선 순위 클래스로 설정합니다" #: programs/taskmgr/taskmgr.rc:242 msgid "Sets process to the NORMAL priority class" -msgstr "작업을 보통 순위 클래스로 설정" +msgstr "프로세스를 보통 우선 순위 클래스로 설정합니다" #: programs/taskmgr/taskmgr.rc:244 msgid "Sets process to the BELOW NORMAL priority class" -msgstr "작업을 보통보다 낮은 순위 클래스로 설정" +msgstr "프로세스를 보통 이하 우선 순위 클래스로 설정합니다" #: programs/taskmgr/taskmgr.rc:245 msgid "Sets process to the LOW priority class" -msgstr "작업을 낮은 순위 클래스로 설정" +msgstr "프로세스를 낮은 우선 순위 클래스로 설정합니다" #: programs/taskmgr/taskmgr.rc:247 msgid "Controls Debug Channels" -msgstr "디버깅 채널 제어" +msgstr "디버깅 채널 제어합니다" #: programs/taskmgr/taskmgr.rc:264 msgid "Performance" -msgstr "퍼포먼스" +msgstr "성능" #: programs/taskmgr/taskmgr.rc:265 msgid "CPU Usage: %3d%%" @@ -15719,7 +15716,7 @@ msgstr "프로세스: %d" #: programs/taskmgr/taskmgr.rc:267 msgid "Mem Usage: %1!u!kB / %2!u!kB" -msgstr "메모리 사용량: %1!u!킬로바이트 / %2!u!킬로바이트" +msgstr "메모리 사용량: %1!u!kB / %2!u!kB" #: programs/taskmgr/taskmgr.rc:272 msgid "Image Name" @@ -15743,15 +15740,15 @@ msgstr "메모리 사용량" #: programs/taskmgr/taskmgr.rc:277 msgid "Mem Delta" -msgstr "메모리 델타" +msgstr "메모리 변화량" #: programs/taskmgr/taskmgr.rc:278 msgid "Peak Mem Usage" -msgstr "피크 메모리 사용" +msgstr "최고 메모리 사용률" #: programs/taskmgr/taskmgr.rc:279 msgid "Page Faults" -msgstr "페이지 실패" +msgstr "페이지 폴트" #: programs/taskmgr/taskmgr.rc:280 msgid "USER Objects" @@ -15767,7 +15764,7 @@ msgstr "사용자 이름" #: programs/taskmgr/taskmgr.rc:285 msgid "PF Delta" -msgstr "PF 델타" +msgstr "PF 변화량" #: programs/taskmgr/taskmgr.rc:286 msgid "VM Size" @@ -15775,7 +15772,7 @@ msgstr "VM 크기" #: programs/taskmgr/taskmgr.rc:287 msgid "Paged Pool" -msgstr "페이지된 풀" +msgstr "페이징 풀" #: programs/taskmgr/taskmgr.rc:288 msgid "NP Pool" @@ -15795,13 +15792,13 @@ msgid "" "cause undesired results including system instability. Are you\n" "sure you want to change the priority class?" msgstr "" -"경고: 이 프로세스의 우선 순위 등급을 바꾸면 시스템 불안정과\n" -"같은 원하지 않는 결과가 발생할 수 있습니다.\n" -"우선 순위 등급을 바꾸시겠습니까?" +"경고: 이 프로세스의 우선 순위 클래스를 변경하면 시스템 불안정을\n" +"포함하여 원하지 않는 결과가 발생할 수 있습니다.\n" +"우선 순위 클래스를 변경하시겠습니까?" #: programs/taskmgr/taskmgr.rc:305 msgid "Unable to Change Priority" -msgstr "우선순위를 바꿀 수 없습니다" +msgstr "우선 순위를 변경할 수 없습니다" #: programs/taskmgr/taskmgr.rc:310 msgid "" @@ -15811,23 +15808,23 @@ msgid "" "data before it is terminated. Are you sure you want to\n" "terminate the process?" msgstr "" -"경고: 프로세스를 종료하면 데이터 손실 및 시스템 불안정과\n" -"같은 원하지 않는 결과가 발생할 수 있습니다.\n" -"프로세스는 종료되기 전에 상태 또는 데이터를 저장할 기회를\n" -"얻지 못합니다.\n" +"경고: 프로세스를 종료하면 데이터 손실 및 시스템 불안정을\n" +"포함하여 원하지 않는 결과가 발생할 수 있습니다.\n" +"프로세스는 종료되기 전에 상태 또는 데이터를 저장할 기회가\n" +"제공되지 않습니다.\n" "프로세스를 종료하시겠습니까?" #: programs/taskmgr/taskmgr.rc:311 msgid "Unable to Terminate Process" -msgstr "프로세스를 중단시킬 수 없습니다" +msgstr "프로세스를 종료할 수 없습니다" #: programs/taskmgr/taskmgr.rc:313 msgid "" "WARNING: Debugging this process may result in loss of data.\n" "Are you sure you wish to attach the debugger?" msgstr "" -"경고: 이 프로세스를 디버깅하면 데이터가 손실될 수 있습니다.\n" -"디버거를 시작하시겠습니까?" +"경고: 이 프로세스를 디버깅하면 데이터를 손실될 수 있습니다.\n" +"디버거를 연결하시겠습니까?" #: programs/taskmgr/taskmgr.rc:314 msgid "Unable to Debug Process" @@ -15835,23 +15832,23 @@ msgstr "프로세스를 디버깅할 수 없습니다" #: programs/taskmgr/taskmgr.rc:315 msgid "The process must have affinity with at least one processor" -msgstr "프로세스는 최소 하나 이상의 프로세서와 선호도를 가져야 합니다" +msgstr "프로세스는 하나 이상의 프로세서와 선호도가 있어야 합니다" #: programs/taskmgr/taskmgr.rc:316 msgid "Invalid Option" -msgstr "올바르지 않은 옵션" +msgstr "잘못된 옵션입니다" #: programs/taskmgr/taskmgr.rc:317 msgid "Unable to Access or Set Process Affinity" -msgstr "프로세스 선호도에 접근하거나 설정할 수 없습니다" +msgstr "프로세프 선호도를 설정 또는 액세스할 수 없습니다" #: programs/taskmgr/taskmgr.rc:322 msgid "System Idle Process" -msgstr "시스템 유휴 작업" +msgstr "시스템 유휴 시간 프로세스" #: programs/taskmgr/taskmgr.rc:323 msgid "Not Responding" -msgstr "반응 없음" +msgstr "응답하지 않음" #: programs/taskmgr/taskmgr.rc:324 msgid "Running" @@ -15863,7 +15860,7 @@ msgstr "작업" #: programs/uninstaller/uninstaller.rc:29 msgid "Wine Application Uninstaller" -msgstr "Wine 프로그램 삭제기" +msgstr "Wine 프로그램 제거 관리자" #: programs/uninstaller/uninstaller.rc:30 msgid "" @@ -15871,8 +15868,9 @@ msgid "" "executable.\n" "Do you want to remove the uninstall entry from the registry?" msgstr "" -"실행 파일이 누락되어 있어서, 제거 명령 '%s'을(를) 실행하지 못했습니다.\n" -"레지스트리에서 해당 제거 정보 제거하시겠습니까?" +"삭제 명령 '%s'을(를) 실행하지 못했습니다. 실행 파일이 누락되었을 수 있습니" +"다.\n" +"레지스트리에서 해당 항목을 제거하시겠습니까?" #: programs/uninstaller/uninstaller.rc:31 msgid "uninstaller: The application with GUID '%1' was not found\n" @@ -15885,7 +15883,7 @@ msgstr "uninstaller: '--remove' 옵션 뒤에는 프로그램 GUID가 있어야 #: programs/uninstaller/uninstaller.rc:33 msgid "uninstaller: Invalid option [%1]\n" -msgstr "uninstaller: 올바르지 않은 옵션 [%1]\n" +msgstr "uninstaller: 잘못된 옵션 [%1]\n" #: programs/uninstaller/uninstaller.rc:35 msgid "" @@ -15896,7 +15894,7 @@ msgid "" msgstr "" "Wine Application Uninstaller\n" "\n" -"현재 실행한 Wine에 설치된 프로그램을 제거합니다.\n" +"현재 Wine 구성(prefix)에서 프로그램을 제거합니다.\n" "\n" #: programs/uninstaller/uninstaller.rc:43 @@ -15916,11 +15914,11 @@ msgstr "" " uninstaller [옵션]\n" "\n" "옵션:\n" -" --help 지금 보고 있는 정보를 출력합니다.\n" -" --list 실행한 Wine에 설치된 모든 프로그램의 목록을 출력합니다.\n" -" --remove {GUID} 지정한 프로그램을 제거합니다. 프로그램의 GUID를 알아\n" -" 내려면 '--list' 옵션을 사용하십시오.\n" -" [옵션 없음] 옵션없이 실행하면 uninstaller의 GUI 버전이 시작됩니다.\n" +" --help 지금 보고 있는 정보를 표시합니다.\n" +" --list 실행한 Wine에 설치된 모든 프로그램의 목록을 표시합니다.\n" +" --remove {GUID} 지정한 프로그램을 제거합니다. '--list' 옵션을\n" +" 사용하면 프로그램의 GUID를 알 수 있습니다.\n" +" [옵션 없음] 옵션없이 실행하면 uninstaller의 GUI 버전이 시작됩니다.\n" "\n" #: programs/view/view.rc:36 @@ -15929,7 +15927,7 @@ msgstr "이동(&P)" #: programs/view/view.rc:38 msgid "&Scale to Window" -msgstr "화면 가득 채우기(&S)" +msgstr "창 크기에 맞춤(&S)" #: programs/view/view.rc:40 msgid "&Left" @@ -15941,7 +15939,7 @@ msgstr "오른쪽(&R)" #: programs/view/view.rc:49 msgid "Regular Metafile Viewer" -msgstr "정규 메타파일 보기" +msgstr "일반 메타파일 뷰어" #: programs/view/view.rc:50 msgid "Metafiles (*.wmf, *.emf)" @@ -15949,11 +15947,11 @@ msgstr "메타파일 (*.wmf, *.emf)" #: programs/wineboot/wineboot.rc:31 msgid "Waiting for Program" -msgstr "프로그램 대기중" +msgstr "프로그램 대기 중" #: programs/wineboot/wineboot.rc:35 msgid "Terminate Process" -msgstr "프로세스 끝내기" +msgstr "프로세스 종료" #: programs/wineboot/wineboot.rc:36 msgid "" @@ -15969,7 +15967,7 @@ msgstr "" #: programs/wineboot/wineboot.rc:46 msgid "The Wine configuration in %s is being updated, please wait..." -msgstr "Wine 설정(%s)을 업데이트하고 있습니다. 잠시만 기다려주십시오..." +msgstr "Wine 설정(%s)을 업데이트하고 있습니다. 잠시만 기다려주세요..." # 라이선스 문구는 번역하지 않습니다. #: programs/winecfg/winecfg.rc:140 @@ -16077,7 +16075,7 @@ msgstr "추가(&D)" #: programs/winecfg/winecfg.rc:196 msgid "Existing &overrides:" -msgstr "현재 재정의 DLL 목록(&O):" +msgstr "현재 DLL 재정의 목록(&O):" #: programs/winecfg/winecfg.rc:198 msgid "&Edit..." @@ -16093,11 +16091,11 @@ msgstr "로드 순서" #: programs/winecfg/winecfg.rc:208 msgid "&Builtin (Wine)" -msgstr "내장(&B) (Wine)" +msgstr "내장 (Wine &Builtin)" #: programs/winecfg/winecfg.rc:209 msgid "&Native (Windows)" -msgstr "네이티브(&N) (Windows)" +msgstr "네이티브 (Windows &Native)" #: programs/winecfg/winecfg.rc:210 msgid "Buil&tin then Native" @@ -16132,7 +16130,7 @@ msgstr "경로(&P):" #: programs/winecfg/winecfg.rc:246 programs/winecfg/winecfg.rc:37 msgid "Show Advan&ced" -msgstr "추가 옵션(&C) 보이기" +msgstr "고급 옵션 표시(&C)" #: programs/winecfg/winecfg.rc:247 msgid "De&vice:" @@ -16148,11 +16146,11 @@ msgstr "레이블(&L):" #: programs/winecfg/winecfg.rc:253 msgid "S&erial:" -msgstr "시리얼(&E):" +msgstr "일련 번호(&E):" #: programs/winecfg/winecfg.rc:256 msgid "&Show dot files" -msgstr "숨김 파일(dot 파일) 보기(&S)" +msgstr "숨김 파일(dot 파일) 표시(&S)" #: programs/winecfg/winecfg.rc:263 msgid "Driver diagnostics" @@ -16160,7 +16158,7 @@ msgstr "드라이버 진단" #: programs/winecfg/winecfg.rc:265 msgid "Defaults" -msgstr "기본" +msgstr "기본값" #: programs/winecfg/winecfg.rc:266 msgid "Output device:" @@ -16184,7 +16182,7 @@ msgstr "소리 테스트(&T)" #: programs/winecfg/winecfg.rc:275 programs/winecfg/winecfg.rc:89 msgid "Speaker configuration" -msgstr "스피커 설정" +msgstr "스피커 구성" #: programs/winecfg/winecfg.rc:278 msgid "Speakers:" @@ -16216,7 +16214,7 @@ msgstr "MIME 형식" #: programs/winecfg/winecfg.rc:303 msgid "Manage file &associations" -msgstr "Wine이 호스트 시스템의 파일 연결을 수정합니다(&A)" +msgstr "Wine이 호스트 OS의 파일 연결을 수정합니다(&A)" #: programs/winecfg/winecfg.rc:306 msgid "Folders" @@ -16236,15 +16234,15 @@ msgstr "드라이브" #: programs/winecfg/winecfg.rc:35 msgid "Select the Unix target directory, please." -msgstr "유닉스 목적 폴더를 선택하십시오." +msgstr "연결 대상 디렉터리를 선택하세요." #: programs/winecfg/winecfg.rc:36 msgid "Hide Advan&ced" -msgstr "추가 옵션 숨기기(&C)" +msgstr "고급 옵션 숨기기(&C)" #: programs/winecfg/winecfg.rc:38 msgid "(No Theme)" -msgstr "(테마 선택하지 않음)" +msgstr "(테마 사용 안함)" #: programs/winecfg/winecfg.rc:39 msgid "Graphics" @@ -16272,7 +16270,7 @@ msgstr "테마 파일 (*.msstyles; *.theme)" #: programs/winecfg/winecfg.rc:46 msgid "Select a theme file" -msgstr "테마 파일 선택" +msgstr "테마 파일을 선택하세요" #: programs/winecfg/winecfg.rc:47 msgid "Folder" @@ -16280,7 +16278,7 @@ msgstr "폴더" #: programs/winecfg/winecfg.rc:48 msgid "Links to" -msgstr "연결 위치" +msgstr "연결 대상" #: programs/winecfg/winecfg.rc:44 msgid "Wine configuration for %s" @@ -16368,7 +16366,7 @@ msgstr "실행 파일 선택" #: programs/winecfg/winecfg.rc:68 msgid "Autodetect" -msgstr "자동으로 찾기" +msgstr "자동검색" #: programs/winecfg/winecfg.rc:69 msgid "Local hard disk" @@ -16421,7 +16419,7 @@ msgstr "문자" #: programs/winecfg/winecfg.rc:77 msgid "Target folder" -msgstr "목표 폴더" +msgstr "대상 폴더" #: programs/winecfg/winecfg.rc:78 msgid "" @@ -16431,7 +16429,7 @@ msgid "" msgstr "" "드라이브 C가 없습니다. 좋은 구성이 아닙니다.\n" "\n" -"드라이브 탭에서 [추가]를 클릭해서 만드는 것을 잊지 마십시오!\n" +"드라이브 탭에서 [추가]를 클릭해서 만드는 것을 잊지 마세요!\n" #: programs/winecfg/winecfg.rc:98 msgid "Controls Background" @@ -16563,7 +16561,7 @@ msgid "" "The command is invalid.\n" msgstr "" "wineconsole: 프로그램 %s 시작 실패.\n" -"이 명령은 올바르지 않습니다.\n" +"이 명령은 잘못되었습니다.\n" #: programs/winedbg/winedbg.rc:50 programs/winedbg/winedbg.rc:38 msgid "Program Error" @@ -16585,11 +16583,11 @@ msgid "" msgstr "" "이것은 프로그램의 문제나 Wine의 결함으로 인해 발생할 수 있습니다. 프로그램 실" "행에 대한 팁을 얻으려면 <a href=\"https://appdb.winehq.org\">Application " -"Database</a>를 살펴보십시오." +"Database</a>를 살펴보세요." #: programs/winedbg/winedbg.rc:62 msgid "Show &Details" -msgstr "자세히(&D) 보이기" +msgstr "자세히 보이기(^D)" #: programs/winedbg/winedbg.rc:67 msgid "Program Error Details" @@ -16625,7 +16623,7 @@ msgstr "저장 실패" #: programs/winedbg/winedbg.rc:45 msgid "Loading detailed information, please wait..." -msgstr "자세한 정보를 불러오는 중입니다, 잠시만 기다리십시오..." +msgstr "자세한 정보를 불러오는 중입니다, 잠시만 기다리세요..." #: programs/winefile/winefile.rc:29 msgid "&Open\tEnter" @@ -16633,7 +16631,7 @@ msgstr "열기(&O)\tEnter" #: programs/winefile/winefile.rc:33 msgid "Re&name..." -msgstr "이름바꾸기(&N)..." +msgstr "이름 바꾸기(&N)..." #: programs/winefile/winefile.rc:34 msgid "Propert&ies\tAlt+Enter" @@ -16661,31 +16659,31 @@ msgstr "이름(&N)" #: programs/winefile/winefile.rc:52 msgid "&All File Details" -msgstr "모든 파일 설명(&A)" +msgstr "파일 세부 정보(&A)" #: programs/winefile/winefile.rc:54 msgid "&Sort by Name" -msgstr "이름으로 정렬(&S)" +msgstr "이름 정렬(&S)" #: programs/winefile/winefile.rc:55 msgid "Sort &by Type" -msgstr "타입으로 정렬(&B)" +msgstr "종류별 정렬(&B)" #: programs/winefile/winefile.rc:56 msgid "Sort by Si&ze" -msgstr "크기로 정렬(&Z)" +msgstr "크기별 정렬(&Z)" #: programs/winefile/winefile.rc:57 msgid "Sort by &Date" -msgstr "날짜로 정렬(&D)" +msgstr "날짜별 정렬(&D)" #: programs/winefile/winefile.rc:59 msgid "Filter by&..." -msgstr "로 걸려내기&..." +msgstr "필터링 기준&..." #: programs/winefile/winefile.rc:66 msgid "&Drive Bar" -msgstr "드라이브 바(&D)" +msgstr "드라이브 표시줄(&D)" #: programs/winefile/winefile.rc:68 msgid "F&ull Screen\tCtrl+Shift+S" @@ -16697,11 +16695,11 @@ msgstr "새 창(&W)" #: programs/winefile/winefile.rc:75 msgid "Cascading\tCtrl+F5" -msgstr "정렬\tCtrl+F5" +msgstr "계단식\tCtrl+F5" #: programs/winefile/winefile.rc:77 msgid "Tile &Vertically\tCtrl+F4" -msgstr "세로 바둑판식 정렬(&V)\tCtrl+F4" +msgstr "세로 바둑판식 배열(&V)\tCtrl+F4" #: programs/winefile/winefile.rc:84 msgid "&About Wine File Manager" @@ -16713,11 +16711,11 @@ msgstr "대상 선택" #: programs/winefile/winefile.rc:134 msgid "By File Type" -msgstr "파일 타입으로" +msgstr "파일 형식별 필터링 기준" #: programs/winefile/winefile.rc:139 msgid "File type" -msgstr "파일 타입" +msgstr "파일 형식" #: programs/winefile/winefile.rc:140 msgid "&Directories" @@ -16729,15 +16727,15 @@ msgstr "프로그램(&P)" #: programs/winefile/winefile.rc:144 msgid "Docu&ments" -msgstr "문서파일(&M)" +msgstr "문서(&M)" #: programs/winefile/winefile.rc:146 msgid "&Other files" -msgstr "다른 파일(&O)" +msgstr "기타 파일(&O)" #: programs/winefile/winefile.rc:148 msgid "Show Hidden/&System Files" -msgstr "숨김/시스템 파일 보이기(&S)" +msgstr "숨김/시스템 파일 표시(&S)" #: programs/winefile/winefile.rc:159 msgid "&File Name:" @@ -16745,11 +16743,11 @@ msgstr "파일 이름(&F):" #: programs/winefile/winefile.rc:161 msgid "Full &Path:" -msgstr "완전한 경로(&P):" +msgstr "전체 경로(&P):" #: programs/winefile/winefile.rc:163 msgid "Last Change:" -msgstr "마지막 변화:" +msgstr "마지막 변경:" #: programs/winefile/winefile.rc:167 msgid "Cop&yright:" @@ -16761,7 +16759,7 @@ msgstr "시스템(&S)" #: programs/winefile/winefile.rc:176 msgid "&Compressed" -msgstr "압축(&C)" +msgstr "압축됨(&C)" #: programs/winefile/winefile.rc:177 msgid "Version information" @@ -16778,7 +16776,7 @@ msgstr "글꼴 설정 적용" #: programs/winefile/winefile.rc:91 msgid "Error while selecting new font." -msgstr "새 글꼴 선택 오류." +msgstr "새 글꼴을 선택하는 동안 오류가 발생했습니다." #: programs/winefile/winefile.rc:96 msgid "Wine File Manager" @@ -16810,7 +16808,7 @@ msgstr "인덱스/아이노드" #: programs/winefile/winefile.rc:116 msgid "%1 of %2 free" -msgstr "%1 / %2 사용가능" +msgstr "%2 중 %1 사용가능" #: programs/winemine/winemine.rc:39 msgid "&Game" @@ -16846,7 +16844,7 @@ msgstr "가장 빠른 시간(&F)" #: programs/winemine/winemine.rc:54 msgid "&About WineMine" -msgstr "WINE지뢰찾기 정보(&A)" +msgstr "지뢰찾기 정보(&A)" #: programs/winemine/winemine.rc:61 msgid "Fastest Times" @@ -16902,7 +16900,7 @@ msgstr "모든 결과를 잃습니다. 계속 진행하시겠습니까?" #: programs/winemine/winemine.rc:30 msgid "WineMine" -msgstr "Wine지뢰찾기" +msgstr "지뢰찾기" #: programs/winemine/winemine.rc:31 msgid "Nobody" @@ -16994,7 +16992,7 @@ msgstr "도움말 파일 (*.hlp)" #: programs/winhlp32/winhlp32.rc:92 msgid "Cannot find '%s'. Do you want to find this file yourself?" -msgstr "%s을(를) 찾을 수 없습니다'. 이 파일을 직접 찾겠시겠습니까?" +msgstr "%s을(를) 찾을 수 없습니다'. 이 파일을 직접 찾으시겠습니까?" #: programs/winhlp32/winhlp32.rc:93 msgid "Cannot find a richedit implementation... Aborting" @@ -17006,7 +17004,7 @@ msgstr "도움말 목차: " #: programs/wmic/wmic.rc:28 msgid "Error: Command line not supported\n" -msgstr "오류: 명령 라인은 지원하지 않음\n" +msgstr "오류: 명령 라인은 지원되지 않음\n" #: programs/wmic/wmic.rc:29 msgid "Error: Alias not found\n" @@ -17014,11 +17012,11 @@ msgstr "오류: Alias를 찾을 수 없음\n" #: programs/wmic/wmic.rc:30 msgid "Error: Invalid query\n" -msgstr "오류: 올바르지 않은 질의\n" +msgstr "오류: 잘못된 질의\n" #: programs/wmic/wmic.rc:31 msgid "Error: Invalid syntax for PATH\n" -msgstr "오류: 올바르지 않은 키 이름\n" +msgstr "오류: 잘못된 키 이름\n" #: programs/wordpad/wordpad.rc:31 msgid "&New...\tCtrl+N" @@ -17046,11 +17044,11 @@ msgstr "읽기 전용(&O)" #: programs/wordpad/wordpad.rc:58 msgid "&Modified" -msgstr "수정 가능(&M)" +msgstr "수정됨(&M)" #: programs/wordpad/wordpad.rc:60 msgid "E&xtras" -msgstr "기타(&X)" +msgstr "추가(&X)" #: programs/wordpad/wordpad.rc:62 msgid "Selection &info" @@ -17058,15 +17056,15 @@ msgstr "선택 영역 정보(&I)" #: programs/wordpad/wordpad.rc:63 msgid "Character &format" -msgstr "문자 형식(&F)" +msgstr "글꼴 서식(&F)" #: programs/wordpad/wordpad.rc:64 msgid "&Def. char format" -msgstr "정의된 문자열 형식(&D)" +msgstr "기본 글꼴 서식(&D)" #: programs/wordpad/wordpad.rc:65 msgid "Paragrap&h format" -msgstr "단락 형식(&H)" +msgstr "단락 서식(&H)" #: programs/wordpad/wordpad.rc:66 msgid "&Get text" @@ -17074,11 +17072,11 @@ msgstr "문자열 얻기(&G)" #: programs/wordpad/wordpad.rc:72 programs/wordpad/wordpad.rc:273 msgid "&Format Bar" -msgstr "형식바(&F)" +msgstr "서식 모음(&F)" #: programs/wordpad/wordpad.rc:73 programs/wordpad/wordpad.rc:274 msgid "&Ruler" -msgstr "눈금바(&R)" +msgstr "눈금자(&R)" #: programs/wordpad/wordpad.rc:78 msgid "&Insert" @@ -17086,11 +17084,11 @@ msgstr "삽입(&I)" #: programs/wordpad/wordpad.rc:80 msgid "&Date and time..." -msgstr "날짜와 시간(&D)..." +msgstr "날짜 및 시간(&D)..." #: programs/wordpad/wordpad.rc:82 msgid "F&ormat" -msgstr "형식(&O)" +msgstr "서식(&O)" #: programs/wordpad/wordpad.rc:85 msgid "&Lists" @@ -17098,27 +17096,27 @@ msgstr "목록(&L)" #: programs/wordpad/wordpad.rc:87 programs/wordpad/wordpad.rc:116 msgid "&Bullet points" -msgstr "강조 점(&B)" +msgstr "글머리 기호(&B)" #: programs/wordpad/wordpad.rc:88 msgid "Numbers" -msgstr "번호" +msgstr "숫자" #: programs/wordpad/wordpad.rc:89 msgid "Letters - lower case" -msgstr "아래 첨자" +msgstr "문자 - 소문자" #: programs/wordpad/wordpad.rc:90 msgid "Letters - upper case" -msgstr "위 첨자" +msgstr "문자 - 대문자" #: programs/wordpad/wordpad.rc:91 msgid "Roman numerals - lower case" -msgstr "로마 숫자 위 첨자" +msgstr "로마 숫자 - 소문자" #: programs/wordpad/wordpad.rc:92 msgid "Roman numerals - upper case" -msgstr "로마 숫자 아래 첨자" +msgstr "로마 숫자 - 대문자" #: programs/wordpad/wordpad.rc:94 programs/wordpad/wordpad.rc:117 msgid "&Paragraph..." @@ -17138,11 +17136,11 @@ msgstr "시스템(&S)\tCtrl+1" #: programs/wordpad/wordpad.rc:99 msgid "&Pale yellow\tCtrl+2" -msgstr "노랑색으로(&P)\tCtrl+2" +msgstr "흐린 노란색(&P)\tCtrl+2" #: programs/wordpad/wordpad.rc:104 msgid "&About Wine Wordpad" -msgstr "Wine 워드패드에 관하여(&A)" +msgstr "Wine 워드패드 정보(&A)" #: programs/wordpad/wordpad.rc:141 msgid "Automatic" @@ -17150,19 +17148,19 @@ msgstr "자동" #: programs/wordpad/wordpad.rc:210 msgid "Date and time" -msgstr "날짜와 시간" +msgstr "날짜 및 시간" #: programs/wordpad/wordpad.rc:213 msgid "Available formats" -msgstr "가능한 형식" +msgstr "사용 가능한 형식" #: programs/wordpad/wordpad.rc:224 msgid "New document type" -msgstr "새 문서 형식" +msgstr "새 문서 종류" #: programs/wordpad/wordpad.rc:232 msgid "Paragraph format" -msgstr "단락 형식" +msgstr "단락 서식" #: programs/wordpad/wordpad.rc:235 msgid "Indentation" @@ -17194,7 +17192,7 @@ msgstr "탭 정지" #: programs/wordpad/wordpad.rc:255 msgid "&Add" -msgstr "더하기(&A)" +msgstr "추가(&A)" #: programs/wordpad/wordpad.rc:259 msgid "Remove al&l" @@ -17329,7 +17327,7 @@ msgstr "페이지" #: programs/wordpad/wordpad.rc:182 msgid "Pages" -msgstr "페이지들" +msgstr "페이지" #: programs/wordpad/wordpad.rc:183 msgctxt "unit: centimeter" @@ -17356,31 +17354,31 @@ msgstr "문서" #: programs/wordpad/wordpad.rc:192 msgid "Save changes to '%s'?" -msgstr "'%s'에 바뀐 사항을 저장하시겠습니까?" +msgstr "변경 내용을 '%s'에 저장하시겠습니까?" #: programs/wordpad/wordpad.rc:193 msgid "Finished searching the document." -msgstr "문서 검색이 끝났습니다." +msgstr "문서 검색을 마쳤습니다." #: programs/wordpad/wordpad.rc:194 msgid "Failed to load the RichEdit library." -msgstr "RichEdit 라이브러리 불러오기 실패." +msgstr "RichEdit 라이브러리를 로드하지 못했습니다." #: programs/wordpad/wordpad.rc:195 msgid "" "You have chosen to save in plain text format, which will cause all " "formatting to be lost. Are you sure that you wish to do this?" msgstr "" -"일반 텍스트 형식으로 저장하도록 선택했습니다. 이로 인해 모든 형식이 손실됩니" -"다. 계속하시겠습니까?" +"일반 텍스트 형식으로 저장하도록 선택했기 때문에 모든 서식이 손실됩니다. 계속" +"하시겠습니까?" #: programs/wordpad/wordpad.rc:198 msgid "Invalid number format." -msgstr "올바르지 않은 숫자 형식." +msgstr "잘못된 숫자 형식." #: programs/wordpad/wordpad.rc:199 msgid "OLE storage documents are not supported." -msgstr "OLE 저장 문서는 지원되지 않습니다." +msgstr "OLE 저장소 문서는 지원되지 않습니다." #: programs/wordpad/wordpad.rc:200 msgid "Could not save the file." @@ -17388,7 +17386,7 @@ msgstr "파일을 저장할 수 없습니다." #: programs/wordpad/wordpad.rc:201 msgid "You do not have access to save the file." -msgstr "파일을 저장할 권한이 없습니다." +msgstr "파일을 저장할 수 있는 권한이 없습니다." #: programs/wordpad/wordpad.rc:202 msgid "Could not open the file." @@ -17396,29 +17394,27 @@ msgstr "파일을 열 수 없습니다." #: programs/wordpad/wordpad.rc:203 msgid "You do not have access to open the file." -msgstr "파일을 열 권한이 없습니다." +msgstr "파일을 열 수 있는 권한이 없습니다." #: programs/wordpad/wordpad.rc:204 msgid "Printing not implemented." -msgstr "인쇄는 지원되지 않습니다." +msgstr "인쇄가 구현되지 않았습니다." #: programs/wordpad/wordpad.rc:205 msgid "Cannot add more than 32 tab stops." -msgstr "탭중지는 32개 이상 추가할 수 없습니다." +msgstr "탭 중지는 32개 이상 추가할 수 없습니다." #: programs/write/write.rc:30 msgid "Starting Wordpad failed" -msgstr "워드패드 시작 실패함" +msgstr "워드패드 시작 실패" #: programs/xcopy/xcopy.rc:30 msgid "Invalid number of parameters - Use xcopy /? for help\n" -msgstr "" -"올바르지 않은 매개변수의 개수 - 도움말을 보려면 'xcopy /?'를 사용하십시오\n" +msgstr "잘못된 매개변수 개수 - 도움말을 보려면 'xcopy /?'를 사용하세요\n" #: programs/xcopy/xcopy.rc:31 msgid "Invalid parameter '%1' - Use xcopy /? for help\n" -msgstr "" -"올바르지 않은 매개변수 '%1' - 도움말을 보려면 'xcopy /?'를 사용하십시오\n" +msgstr "잘못된 매개변수 '%1' - 도움말을 보려면 'xcopy /?'를 사용하세요\n" #: programs/xcopy/xcopy.rc:32 msgid "Press <Enter> to begin copying\n" -- 2.29.2

1 0

[PATCH] winebus: Remove redundant preprocessor check for libsdl2
by Alex Henrie Dec. 29, 2020

Dec. 29, 2020

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/winebus.sys/bus_sdl.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index fa691011fde..8f48b44eb95 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -69,7 +69,6 @@ static void *sdl_handle = NULL; static HANDLE deviceloop_handle; static UINT quit_event = -1; -#ifdef SONAME_LIBSDL2 #define MAKE_FUNCPTR(f) static typeof(f) * p##f = NULL MAKE_FUNCPTR(SDL_GetError); MAKE_FUNCPTR(SDL_Init); @@ -109,7 +108,6 @@ MAKE_FUNCPTR(SDL_memset); MAKE_FUNCPTR(SDL_GameControllerAddMapping); MAKE_FUNCPTR(SDL_RegisterEvents); MAKE_FUNCPTR(SDL_PushEvent); -#endif static Uint16 (*pSDL_JoystickGetProduct)(SDL_Joystick * joystick); static Uint16 (*pSDL_JoystickGetProductVersion)(SDL_Joystick * joystick); static Uint16 (*pSDL_JoystickGetVendor)(SDL_Joystick * joystick); -- 2.29.2

1 0

[PATCH] user32/tests: Don't kill explorer to test shell window.
by Esme Povirk Dec. 28, 2020

Dec. 28, 2020

Killing explorer breaks later tests. We can create a new desktop without a shell instead. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48142 Signed-off-by: Esme Povirk <esme(a)codeweavers.com> --- dlls/user32/tests/win.c | 96 +++++++++++------------------------------ 1 file changed, 24 insertions(+), 72 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 843da8900f1..c9d2819e1a9 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -1288,87 +1288,24 @@ static LRESULT CALLBACK cbt_hook_proc(int nCode, WPARAM wParam, LPARAM lParam) return CallNextHookEx(hhook, nCode, wParam, lParam); } -static const WCHAR winlogonW[] = - {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', - 'W','i','n','d','o','w','s',' ','N','T','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', - 'W','i','n','l','o','g','o','n',0}; -static const WCHAR autorestartshellW[] = - {'A','u','t','o','R','e','s','t','a','r','t','S','h','e','l','l',0}; - -static DWORD get_autorestart(void) -{ - DWORD type, val, len = sizeof(val); - REGSAM access = KEY_ALL_ACCESS|KEY_WOW64_64KEY; - HKEY hkey; - LONG res; - - if (RegCreateKeyExW( HKEY_LOCAL_MACHINE, winlogonW, 0, 0, 0, access, NULL, &hkey, 0 )) return 0; - res = RegQueryValueExW( hkey, autorestartshellW, NULL, &type, (BYTE *)&val, &len ); - RegCloseKey( hkey ); - return (!res && type == REG_DWORD) ? val : 0; -} - -static BOOL set_autorestart( DWORD val ) -{ - REGSAM access = KEY_ALL_ACCESS|KEY_WOW64_64KEY; - HKEY hkey; - LONG res; - - if (RegCreateKeyExW( HKEY_LOCAL_MACHINE, winlogonW, 0, 0, 0, access, NULL, &hkey, 0 )) return FALSE; - res = RegSetValueExW( hkey, autorestartshellW, 0, REG_DWORD, (BYTE *)&val, sizeof(val) ); - RegCloseKey( hkey ); - return !res; -} - -static void test_shell_window(void) +static DWORD WINAPI test_shell_window_thread(LPVOID param) { BOOL ret; - DWORD error, restart = get_autorestart(); HMODULE hinst, hUser32; BOOL (WINAPI*SetShellWindow)(HWND); HWND hwnd1, hwnd2, hwnd3, hwnd4, hwnd5; HWND shellWindow, nextWnd; + HDESK testDesktop = (HDESK)param; - if (restart && !set_autorestart(0)) - { - skip("cannot disable automatic shell restart (needs admin rights\n"); - return; - } + SetThreadDesktop(testDesktop); shellWindow = GetShellWindow(); hinst = GetModuleHandleA(NULL); hUser32 = GetModuleHandleA("user32"); - SetShellWindow = (void *)GetProcAddress(hUser32, "SetShellWindow"); - - if (shellWindow) { - DWORD pid; - HANDLE hProcess; - - GetWindowThreadProcessId(shellWindow, &pid); - hProcess = OpenProcess(PROCESS_ALL_ACCESS, FALSE, pid); - if (!hProcess) - { - skip( "cannot get access to shell process\n" ); - set_autorestart(restart); - return; - } - - SetLastError(0xdeadbeef); - ret = DestroyWindow(shellWindow); - error = GetLastError(); + ok(shellWindow == NULL, "Newly created desktop has a shell window %p\n", shellWindow); - ok(!ret, "DestroyWindow(shellWindow)\n"); - /* passes on Win XP, but not on Win98 */ - ok(error==ERROR_ACCESS_DENIED || error == 0xdeadbeef, - "got %u after DestroyWindow(shellWindow)\n", error); - - /* close old shell instance */ - ret = TerminateProcess(hProcess, 0); - ok(ret, "termination of previous shell process failed: GetLastError()=%d\n", GetLastError()); - WaitForSingleObject(hProcess, INFINITE); /* wait for termination */ - CloseHandle(hProcess); - } + SetShellWindow = (void *)GetProcAddress(hUser32, "SetShellWindow"); hwnd1 = CreateWindowExA(0, "#32770", "TEST1", WS_OVERLAPPEDWINDOW/*|WS_VISIBLE*/, 100, 100, 300, 200, 0, 0, hinst, 0); @@ -1381,8 +1318,8 @@ static void test_shell_window(void) ok(!ret, "second call to SetShellWindow(hwnd1)\n"); ret = SetShellWindow(0); - error = GetLastError(); /* passes on Win XP, but not on Win98 + DWORD error = GetLastError(); ok(!ret, "reset shell window by SetShellWindow(0)\n"); ok(error==ERROR_INVALID_WINDOW_HANDLE, "ERROR_INVALID_WINDOW_HANDLE after SetShellWindow(0)\n"); */ @@ -1442,7 +1379,24 @@ static void test_shell_window(void) DestroyWindow(hwnd3); DestroyWindow(hwnd4); DestroyWindow(hwnd5); - set_autorestart(restart); + + return 0; +} + +static void test_shell_window(void) +{ + HDESK hdesk; + HANDLE hthread; + + hdesk = CreateDesktopA("winetest", NULL, NULL, 0, GENERIC_ALL, NULL); + + hthread = CreateThread(NULL, 0, test_shell_window_thread, (LPVOID)hdesk, 0, NULL); + + WaitForSingleObject(hthread, INFINITE); + + DeleteObject(hthread); + + CloseDesktop(hdesk); } /************** MDI test ****************/ @@ -12075,7 +12029,5 @@ START_TEST(win) */ test_topmost(); - /* Execute the SetShellWindow() test last, since it kills explorer and that - * breaks a lot of things. */ test_shell_window(); } -- 2.25.1

2 1

[PATCH 2/2] ntdll/tests: Align check test correctly clears AC flag.
by Jefferson Carpenter Dec. 28, 2020

Dec. 28, 2020

Makes sure AC flag is set back to its original value regardless of the outcome of the test, so it will not interfere with subsequent tests. thanks, Jefferson

2 1

[PATCH] po: Update Ukrainian translation.
by Andrey Gusev Dec. 28, 2020

Dec. 28, 2020

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- po/uk.po | 734 ++++++++++++++++++++++++------------------------------- 1 file changed, 317 insertions(+), 417 deletions(-) diff --git a/po/uk.po b/po/uk.po index 7ef7b4f29f6..2b3a5ad8577 100644 --- a/po/uk.po +++ b/po/uk.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: 2019-12-09 22:24+0200\n" +"PO-Revision-Date: 2020-12-25 19:38+0200\n" "Last-Translator: Andrey Gusev <andrey.goosev(a)gmail.com>\n" "Language-Team: Ukrainian\n" "Language: uk\n" @@ -700,7 +700,7 @@ msgstr "Д&одаткові кольори:" #: dlls/comdlg32/comdlg32.rc:289 msgid "|S&olid" -msgstr "" +msgstr "|&Твердий" #: dlls/comdlg32/comdlg32.rc:290 msgid "&Red:" @@ -737,11 +737,9 @@ msgid "&Define Custom Colors >>" msgstr "&Визначити колір >>" #: dlls/comdlg32/comdlg32.rc:312 -#, fuzzy -#| msgid "&No" msgctxt "Solid" -msgid "&o" -msgstr "&Ні" +msgid "&Sol" +msgstr "&Тврд" #: dlls/comdlg32/comdlg32.rc:318 programs/regedit/regedit.rc:275 #: programs/regedit/regedit.rc:285 @@ -3743,7 +3741,7 @@ msgstr "Ігрові Контролери" #: dlls/joy.cpl/joy.rc:32 msgid "Test and configure game controllers." -msgstr "" +msgstr "Перевірте та налаштуйте ігрові контролери." #: dlls/jscript/jscript.rc:28 msgid "Error converting object to primitive type" @@ -3758,10 +3756,8 @@ msgid "Subscript out of range" msgstr "Індекс поза діапазоном" #: dlls/jscript/jscript.rc:31 -#, fuzzy -#| msgid "Out of paper; " msgid "Out of stack space" -msgstr "Не вистачає паперу; " +msgstr "В стеку немає місця" #: dlls/jscript/jscript.rc:32 msgid "Object required" @@ -3910,16 +3906,12 @@ msgid "JScript object expected" msgstr "Очікується об'єкт JScript" #: dlls/jscript/jscript.rc:63 -#, fuzzy -#| msgid "Array object expected" msgid "Enumerator object expected" -msgstr "Очікується об'єкт Array" +msgstr "Очікується об’єкт перечислювача" #: dlls/jscript/jscript.rc:64 -#, fuzzy -#| msgid "Boolean object expected" msgid "Regular Expression object expected" -msgstr "Очікується об'єкт Boolean" +msgstr "Очікується об’єкт регулярного виразу" #: dlls/jscript/jscript.rc:65 msgid "Syntax error in regular expression" @@ -3927,7 +3919,7 @@ msgstr "Синтаксична помилка в регулярному вира #: dlls/jscript/jscript.rc:66 msgid "Exception thrown and not caught" -msgstr "" +msgstr "Виняток викликано, але не перехоплено" #: dlls/jscript/jscript.rc:68 msgid "URI to be encoded contains invalid characters" @@ -6944,32 +6936,24 @@ msgid "Connection reset by peer.\n" msgstr "У з'єднанні відмовлено.\n" #: dlls/kernel32/winerror.mc:3767 -#, fuzzy -#| msgid "Not implemented" msgid "Not implemented.\n" -msgstr "Не реалізовано" +msgstr "Не реалізовано.\n" #: dlls/kernel32/winerror.mc:3788 -#, fuzzy -#| msgid "Creation failed.\n" msgid "Call failed.\n" -msgstr "Помилка створення.\n" +msgstr "Помилка запиту.\n" #: dlls/kernel32/winerror.mc:3760 msgid "No Signature found in file.\n" msgstr "Відсутній підпис файла.\n" #: dlls/kernel32/winerror.mc:3774 -#, fuzzy -#| msgid "Invalid level.\n" msgid "Invalid call.\n" -msgstr "Невірний рівень.\n" +msgstr "Невірний запит.\n" #: dlls/kernel32/winerror.mc:3781 -#, fuzzy -#| msgid "Value is not available.\n" msgid "Resource is not currently available.\n" -msgstr "Значення недоступне.\n" +msgstr "Наразі ресурс недоступний.\n" #: dlls/localspl/localspl.rc:31 dlls/localui/localui.rc:31 #: dlls/winspool.drv/winspool.rc:30 @@ -7029,10 +7013,8 @@ msgid "Sink has not been finalized.\n" msgstr "Вихід не було завершено.\n" #: dlls/mferror/mferror.mc:732 -#, fuzzy -#| msgid "Sink was already stopped.\n" msgid "Clock was stopped\n" -msgstr "Вихід вже було припинино.\n" +msgstr "Годинник зупинино\n" #: dlls/mferror/mferror.mc:32 msgid "Media Foundation platform is not initialized.\n" @@ -7411,10 +7393,8 @@ msgid "Clock state was already set.\n" msgstr "Статус годинника вже встановлено.\n" #: dlls/mferror/mferror.mc:725 -#, fuzzy -#| msgid "Clock is not available.\n" msgid "Clock is not simple\n" -msgstr "Годинник недоступний.\n" +msgstr "Годинник не простий\n" #: dlls/mpr/mpr.rc:35 dlls/wininet/wininet.rc:48 msgid "Enter Network Password" @@ -8582,98 +8562,72 @@ msgid "Off" msgstr "Вимкнено" #: dlls/oledb32/version.rc:56 -#, fuzzy -#| msgid "video" msgid "Provider" -msgstr "відео" +msgstr "Постачальник" #: dlls/oledb32/version.rc:59 -#, fuzzy -#| msgid "Select the format you want to use:" msgid "Select the data you want to connect to:" -msgstr "Виберіть формат, який ви хочете використати:" +msgstr "Виберіть дані, до яких потрібно підключитися:" #: dlls/oledb32/version.rc:66 -#, fuzzy -#| msgid "Connections" msgid "Connection" msgstr "Підключення" #: dlls/oledb32/version.rc:69 -#, fuzzy -#| msgid "Select the format you want to use:" msgid "Specify the following to connect to ODBC data:" -msgstr "Виберіть формат, який ви хочете використати:" +msgstr "Вкажіть наступне для підключення до даних ODBC:" #: dlls/oledb32/version.rc:70 msgid "1. Specify the source of data:" -msgstr "" +msgstr "1. Вкажіть джерело даних:" #: dlls/oledb32/version.rc:71 -#, fuzzy -#| msgid "Please enter your name" msgid "Use &data source name" -msgstr "Введіть ваше ім'я" +msgstr "Використовувати &ім'я джерела даних" #: dlls/oledb32/version.rc:74 -#, fuzzy -#| msgid "Reset Connections" msgid "Use c&onnection string" -msgstr "Скинутих Підключень" +msgstr "Використовувати р&ядок підключення" #: dlls/oledb32/version.rc:75 -#, fuzzy -#| msgid "Connections" msgid "&Connection string:" -msgstr "Підключення" +msgstr "&Рядок з'єднання:" #: dlls/oledb32/version.rc:77 -#, fuzzy -#| msgid "A&dd..." msgid "B&uild..." -msgstr "&Додати..." +msgstr "&Створити..." #: dlls/oledb32/version.rc:78 msgid "2. Enter information to log on to the server" -msgstr "" +msgstr "2. Введіть інформацію для входу на сервер" #: dlls/oledb32/version.rc:79 -#, fuzzy -#| msgid "&User name:" msgid "User &name:" -msgstr "&Користувач:" +msgstr "Ім'я &користувача:" #: dlls/oledb32/version.rc:83 -#, fuzzy -#| msgid "&Blank page" msgid "&Blank password" -msgstr "По&рожня сторінка" +msgstr "&Пустий пароль" #: dlls/oledb32/version.rc:84 -#, fuzzy -#| msgid "Wrong password.\n" msgid "Allow &saving password" -msgstr "Невірний пароль.\n" +msgstr "Дозволити &збереження пароля" #: dlls/oledb32/version.rc:85 msgid "3. Enter the &initial catalog to use:" -msgstr "" +msgstr "3. Введіть &початковий каталог для використання:" #: dlls/oledb32/version.rc:87 -#, fuzzy -#| msgid "Reset Connections" msgid "&Test Connection" -msgstr "Скинутих Підключень" +msgstr "&Тест підключення" #: dlls/oledb32/version.rc:92 msgid "Advanced" msgstr "Майстер" #: dlls/oledb32/version.rc:95 -#, fuzzy -#| msgid "Network share" msgid "Network settings" -msgstr "Мережний диск" +msgstr "Мережеві налаштування" #: dlls/oledb32/version.rc:96 msgid "&Impersonation level:" @@ -8681,83 +8635,67 @@ msgstr "" #: dlls/oledb32/version.rc:98 msgid "P&rotection level:" -msgstr "" +msgstr "Р&івень захисту:" #: dlls/oledb32/version.rc:101 -#, fuzzy -#| msgid "Connected" msgid "Connect:" -msgstr "Під'єднано" +msgstr "З'єднання:" #: dlls/oledb32/version.rc:103 -#, fuzzy -#| msgid "seconds" msgid "seconds." -msgstr "сек." +msgstr "секунд." #: dlls/oledb32/version.rc:104 -#, fuzzy -#| msgid "Success" msgid "A&ccess:" -msgstr "Успіх" +msgstr "&Доступ:" #: dlls/oledb32/version.rc:110 -#, fuzzy -#| msgid "&All" msgid "All" -msgstr "&Все" +msgstr "Все" #: dlls/oledb32/version.rc:114 msgid "" "These are the initialization properties for this type of data. To edit a " "value, select a property, then choose Edit Value below." msgstr "" +"Це властивості ініціалізації даних цього типу. Щоб відредагувати " +"значення, виберіть властивість, а потім нижче виберіть Редагувати Значення." #: dlls/oledb32/version.rc:115 -#, fuzzy -#| msgid "&Edit..." msgid "&Edit Value..." -msgstr "&Змінити..." +msgstr "&Редагувати Значення..." #: dlls/oledb32/version.rc:49 -#, fuzzy -#| msgid "Properties" msgid "Data Link Error" -msgstr "Властивості" +msgstr "Помилка при передачі даних" #: dlls/oledb32/version.rc:50 -#, fuzzy -#| msgid "Please select a file." msgid "Please select a provider." -msgstr "Виберіть файл." +msgstr "Виберіть постачальника послуг." #: dlls/oledb32/version.rc:51 msgid "" "Provider is no longer available. Ensure that the provider is installed " "properly." msgstr "" +"Постачальник більше не доступний. Переконайтеся, що постачальник " +"встановлений належним чином." #: dlls/oledb32/version.rc:36 -#, fuzzy -#| msgid "Properties" msgid "Data Link Properties" -msgstr "Властивості" +msgstr "Властивості каналу передачі даних" #: dlls/oledb32/version.rc:37 msgid "OLE DB Provider(s)" -msgstr "" +msgstr "Постачальник(и) OLE DB" #: dlls/oledb32/version.rc:41 -#, fuzzy -#| msgid "Ready" msgid "Read" -msgstr "Готово" +msgstr "Читання" #: dlls/oledb32/version.rc:42 -#, fuzzy -#| msgid "Readme:" msgid "ReadWrite" -msgstr "Файл Readme:" +msgstr "Читання/Запис" #: dlls/oledb32/version.rc:43 msgid "Share Deny None" @@ -8776,10 +8714,8 @@ msgid "Share Exclusive" msgstr "" #: dlls/oledb32/version.rc:47 -#, fuzzy -#| msgid "I/O Writes" msgid "Write" -msgstr "Кількість записів" +msgstr "Запис" #: dlls/oledlg/oledlg.rc:55 msgid "Insert Object" @@ -9973,895 +9909,895 @@ msgstr "Виберіть джерело" #: dlls/tzres/tzres.rc:90 msgid "China Standard Time" -msgstr "" +msgstr "Китайський стандартний час" #: dlls/tzres/tzres.rc:91 msgid "China Daylight Time" -msgstr "" +msgstr "Китайський літній час" #: dlls/tzres/tzres.rc:180 msgid "North Asia Standard Time" -msgstr "" +msgstr "Північноазіатський стандартний час" #: dlls/tzres/tzres.rc:181 msgid "North Asia Daylight Time" -msgstr "" +msgstr "Північноазіатський літній час" #: dlls/tzres/tzres.rc:116 msgid "Georgian Standard Time" -msgstr "" +msgstr "Грузинський стандартний час" #: dlls/tzres/tzres.rc:117 msgid "Georgian Daylight Time" -msgstr "" +msgstr "Грузинський літній час" #: dlls/tzres/tzres.rc:172 msgid "Nepal Standard Time" -msgstr "" +msgstr "Непальський стандартний час" #: dlls/tzres/tzres.rc:173 msgid "Nepal Daylight Time" -msgstr "" +msgstr "Непальський літній час" #: dlls/tzres/tzres.rc:66 msgid "Cape Verde Standard Time" -msgstr "" +msgstr "Стандартний час Кабо-Верде" #: dlls/tzres/tzres.rc:67 msgid "Cape Verde Daylight Time" -msgstr "" +msgstr "Літній час Кабо-Верде" #: dlls/tzres/tzres.rc:126 msgid "Haiti Standard Time" -msgstr "" +msgstr "Стандартний час Гаїті" #: dlls/tzres/tzres.rc:127 msgid "Haiti Daylight Time" -msgstr "" +msgstr "Літній час Гаїті" #: dlls/tzres/tzres.rc:80 msgid "Central European Standard Time" -msgstr "" +msgstr "Центральноєвропейський стандартний час" #: dlls/tzres/tzres.rc:81 msgid "Central European Daylight Time" -msgstr "" +msgstr "Центральноєвропейський літній час" #: dlls/tzres/tzres.rc:160 msgid "Morocco Standard Time" -msgstr "" +msgstr "Стандартний час Марокко" #: dlls/tzres/tzres.rc:161 msgid "Morocco Daylight Time" -msgstr "" +msgstr "Літній час Марокко" #: dlls/tzres/tzres.rc:78 msgid "Central Europe Standard Time" -msgstr "" +msgstr "Центральноєвропейський стандартний час" #: dlls/tzres/tzres.rc:79 msgid "Central Europe Daylight Time" -msgstr "" +msgstr "Центральноєвропейський літній час" #: dlls/tzres/tzres.rc:132 msgid "Iran Standard Time" -msgstr "" +msgstr "Іранський стандартний час" #: dlls/tzres/tzres.rc:133 msgid "Iran Daylight Time" -msgstr "" +msgstr "Іранський літній час" #: dlls/tzres/tzres.rc:204 msgid "Saint Pierre Standard Time" -msgstr "" +msgstr "Стандартний час Сен-П'єра" #: dlls/tzres/tzres.rc:205 msgid "Saint Pierre Daylight Time" -msgstr "" +msgstr "Літній час Сен-П'єра" #: dlls/tzres/tzres.rc:170 msgid "Namibia Standard Time" -msgstr "" +msgstr "Стандартний час Намібії" #: dlls/tzres/tzres.rc:171 msgid "Namibia Daylight Time" -msgstr "" +msgstr "Літній час Намібії" #: dlls/tzres/tzres.rc:226 msgid "Tonga Standard Time" -msgstr "" +msgstr "Стандартний час Королівства Тонга" #: dlls/tzres/tzres.rc:227 msgid "Tonga Daylight Time" -msgstr "" +msgstr "Літній час Королівства Тонга" #: dlls/tzres/tzres.rc:164 msgid "Mountain Standard Time (Mexico)" -msgstr "" +msgstr "Гірський стандартний час (Мексика)" #: dlls/tzres/tzres.rc:165 msgid "Mountain Daylight Time (Mexico)" -msgstr "" +msgstr "Гірський літній час (Мексика)" #: dlls/tzres/tzres.rc:118 msgid "GMT Standard Time" -msgstr "" +msgstr "GMT стандартний час" #: dlls/tzres/tzres.rc:119 msgid "GMT Daylight Time" -msgstr "" +msgstr "GMT літній час" #: dlls/tzres/tzres.rc:74 msgid "Central Asia Standard Time" -msgstr "" +msgstr "Середньоазіатський стандартний час" #: dlls/tzres/tzres.rc:75 msgid "Central Asia Daylight Time" -msgstr "" +msgstr "Середньоазіатський літній час" #: dlls/tzres/tzres.rc:146 msgid "Lord Howe Standard Time" -msgstr "" +msgstr "Стандартний час острова Лорд-Хау" #: dlls/tzres/tzres.rc:147 msgid "Lord Howe Daylight Time" -msgstr "" +msgstr "Літній час острова Лорд-Хау" #: dlls/tzres/tzres.rc:40 msgid "Arabic Standard Time" -msgstr "" +msgstr "Арабський стандартний час" #: dlls/tzres/tzres.rc:41 msgid "Arabic Daylight Time" -msgstr "" +msgstr "Арабський літній час" #: dlls/tzres/tzres.rc:148 msgid "Magadan Standard Time" -msgstr "" +msgstr "Магаданський стандартний час" #: dlls/tzres/tzres.rc:149 msgid "Magadan Daylight Time" -msgstr "" +msgstr "Магаданський літній час" #: dlls/tzres/tzres.rc:176 msgid "Newfoundland Standard Time" -msgstr "" +msgstr "Стандартний час Ньюфаундленда" #: dlls/tzres/tzres.rc:177 msgid "Newfoundland Daylight Time" -msgstr "" +msgstr "Літній час Ньюфаундленда" #: dlls/tzres/tzres.rc:250 msgid "West Pacific Standard Time" -msgstr "" +msgstr "Західно-Тихоокеанський стандартний час" #: dlls/tzres/tzres.rc:251 msgid "West Pacific Daylight Time" -msgstr "" +msgstr "Західно-Тихоокеанський літній час" #: dlls/tzres/tzres.rc:186 msgid "Pacific Standard Time" -msgstr "" +msgstr "Тихоокеанський стандартний час" #: dlls/tzres/tzres.rc:187 msgid "Pacific Daylight Time" -msgstr "" +msgstr "Тихоокеанський літній час" #: dlls/tzres/tzres.rc:52 msgid "Azerbaijan Standard Time" -msgstr "" +msgstr "Азербайджанський стандартний час" #: dlls/tzres/tzres.rc:53 msgid "Azerbaijan Daylight Time" -msgstr "" +msgstr "Азербайджанський літній час" #: dlls/tzres/tzres.rc:150 msgid "Magallanes Standard Time" -msgstr "" +msgstr "Стандартний час Магальянеса" #: dlls/tzres/tzres.rc:151 msgid "Magallanes Daylight Time" -msgstr "" +msgstr "Літній час Магальянеса" #: dlls/tzres/tzres.rc:206 msgid "Samoa Standard Time" -msgstr "" +msgstr "Стандартний час Самоа" #: dlls/tzres/tzres.rc:207 msgid "Samoa Daylight Time" -msgstr "" +msgstr "Літній час Самоа" #: dlls/tzres/tzres.rc:138 msgid "Kaliningrad Standard Time" -msgstr "" +msgstr "Калінінградський стандартний час" #: dlls/tzres/tzres.rc:139 msgid "Kaliningrad Daylight Time" -msgstr "" +msgstr "Калінінградський літній час" #: dlls/tzres/tzres.rc:188 msgid "Pacific Standard Time (Mexico)" -msgstr "" +msgstr "Тихоокеанський стандартний час (Мексика)" #: dlls/tzres/tzres.rc:189 msgid "Pacific Daylight Time (Mexico)" -msgstr "" +msgstr "Тихоокеанський літній час (Мексика)" #: dlls/tzres/tzres.rc:156 msgid "Middle East Standard Time" -msgstr "" +msgstr "Близькосхідний стандартний час" #: dlls/tzres/tzres.rc:157 msgid "Middle East Daylight Time" -msgstr "" +msgstr "Близькосхідний літній час" #: dlls/tzres/tzres.rc:224 msgid "Tokyo Standard Time" -msgstr "" +msgstr "Токійський стандартний час" #: dlls/tzres/tzres.rc:225 msgid "Tokyo Daylight Time" -msgstr "" +msgstr "Токійський літній час" #: dlls/tzres/tzres.rc:144 msgid "Line Islands Standard Time" -msgstr "" +msgstr "Стандартний час островів Лайн" #: dlls/tzres/tzres.rc:145 msgid "Line Islands Daylight Time" -msgstr "" +msgstr "Літній час островів Лайн" #: dlls/tzres/tzres.rc:92 msgid "Cuba Standard Time" -msgstr "" +msgstr "Кубинський стандартний час" #: dlls/tzres/tzres.rc:93 msgid "Cuba Daylight Time" -msgstr "" +msgstr "Кубинський літній час" #: dlls/tzres/tzres.rc:136 msgid "Jordan Standard Time" -msgstr "" +msgstr "Йорданський стандартний час" #: dlls/tzres/tzres.rc:137 msgid "Jordan Daylight Time" -msgstr "" +msgstr "Йорданський літній час" #: dlls/tzres/tzres.rc:84 msgid "Central Standard Time" -msgstr "" +msgstr "Центральний стандартний час" #: dlls/tzres/tzres.rc:85 msgid "Central Daylight Time" -msgstr "" +msgstr "Центральний літній час" #: dlls/tzres/tzres.rc:54 msgid "Azores Standard Time" -msgstr "" +msgstr "Стандартний час Азорських островів" #: dlls/tzres/tzres.rc:55 msgid "Azores Daylight Time" -msgstr "" +msgstr "Літній час Азорських островів" #: dlls/tzres/tzres.rc:178 msgid "North Asia East Standard Time" -msgstr "" +msgstr "Північноазіатський східний стандартний час" #: dlls/tzres/tzres.rc:179 msgid "North Asia East Daylight Time" -msgstr "" +msgstr "Північноазіатський східний літній час" #: dlls/tzres/tzres.rc:42 msgid "Argentina Standard Time" -msgstr "" +msgstr "Аргентинський стандартний час" #: dlls/tzres/tzres.rc:43 msgid "Argentina Daylight Time" -msgstr "" +msgstr "Аргентинський літній час" #: dlls/tzres/tzres.rc:152 msgid "Marquesas Standard Time" -msgstr "" +msgstr "Стандартний час Маркізьких островів" #: dlls/tzres/tzres.rc:153 msgid "Marquesas Daylight Time" -msgstr "" +msgstr "Літній час Маркізьких островів" #: dlls/tzres/tzres.rc:166 msgid "Myanmar Standard Time" -msgstr "" +msgstr "Стандартний час М'янми" #: dlls/tzres/tzres.rc:167 msgid "Myanmar Daylight Time" -msgstr "" +msgstr "Літній час М'янми" #: dlls/tzres/tzres.rc:236 dlls/tzres/tzres.rc:237 msgid "Coordinated Universal Time" -msgstr "" +msgstr "Всесвітній координований час" #: dlls/tzres/tzres.rc:130 msgid "India Standard Time" -msgstr "" +msgstr "Індійський стандартний час" #: dlls/tzres/tzres.rc:131 msgid "India Daylight Time" -msgstr "" +msgstr "Індійський літній час" #: dlls/tzres/tzres.rc:124 msgid "GTB Standard Time" -msgstr "" +msgstr "GTB стандартний час" #: dlls/tzres/tzres.rc:125 msgid "GTB Daylight Time" -msgstr "" +msgstr "GTB літній час" #: dlls/tzres/tzres.rc:228 msgid "Turkey Standard Time" -msgstr "" +msgstr "Турецький стандартний час" #: dlls/tzres/tzres.rc:229 msgid "Turkey Daylight Time" -msgstr "" +msgstr "Турецький літній час" #: dlls/tzres/tzres.rc:112 msgid "Fiji Standard Time" -msgstr "" +msgstr "Стандартний час Фіджі" #: dlls/tzres/tzres.rc:113 msgid "Fiji Daylight Time" -msgstr "" +msgstr "Літній час Фіджі" #: dlls/tzres/tzres.rc:64 msgid "Canada Central Standard Time" -msgstr "" +msgstr "Центральний стандартний час Канади" #: dlls/tzres/tzres.rc:65 msgid "Canada Central Daylight Time" -msgstr "" +msgstr "Центральний літній час Канади" #: dlls/tzres/tzres.rc:218 msgid "Taipei Standard Time" -msgstr "" +msgstr "Тайбейський стандартний час" #: dlls/tzres/tzres.rc:219 msgid "Taipei Daylight Time" -msgstr "" +msgstr "Тайбейський літній час" #: dlls/tzres/tzres.rc:246 msgid "W. Europe Standard Time" -msgstr "" +msgstr "Західноєвропейський стандартний час" #: dlls/tzres/tzres.rc:247 msgid "W. Europe Daylight Time" -msgstr "" +msgstr "Західноєвропейський літній час" #: dlls/tzres/tzres.rc:158 msgid "Montevideo Standard Time" -msgstr "" +msgstr "Стандартний час Монтевідео" #: dlls/tzres/tzres.rc:159 msgid "Montevideo Daylight Time" -msgstr "" +msgstr "Літній час Монтевідео" #: dlls/tzres/tzres.rc:190 msgid "Pakistan Standard Time" -msgstr "" +msgstr "Пакистанський стандартний час" #: dlls/tzres/tzres.rc:191 msgid "Pakistan Daylight Time" -msgstr "" +msgstr "Пакистанський літній час" #: dlls/tzres/tzres.rc:68 msgid "Caucasus Standard Time" -msgstr "" +msgstr "Кавказький стандартний час" #: dlls/tzres/tzres.rc:69 msgid "Caucasus Daylight Time" -msgstr "" +msgstr "Кавказький літній час" #: dlls/tzres/tzres.rc:50 msgid "AUS Eastern Standard Time" -msgstr "" +msgstr "AUS східний стандартний час" #: dlls/tzres/tzres.rc:51 msgid "AUS Eastern Daylight Time" -msgstr "" +msgstr "AUS східний літній час" #: dlls/tzres/tzres.rc:168 msgid "N. Central Asia Standard Time" -msgstr "" +msgstr "Північно-Центральна Азія за стандартним часом" #: dlls/tzres/tzres.rc:169 msgid "N. Central Asia Daylight Time" -msgstr "" +msgstr "Північно-Центральна Азія за літнім часом" #: dlls/tzres/tzres.rc:104 msgid "Eastern Standard Time" -msgstr "" +msgstr "Східний стандартний час" #: dlls/tzres/tzres.rc:105 msgid "Eastern Daylight Time" -msgstr "" +msgstr "Східний літній час" #: dlls/tzres/tzres.rc:86 msgid "Central Standard Time (Mexico)" -msgstr "" +msgstr "Центральний стандартний час (Мексика)" #: dlls/tzres/tzres.rc:87 msgid "Central Daylight Time (Mexico)" -msgstr "" +msgstr "Центральний літній час (Мексика)" #: dlls/tzres/tzres.rc:44 msgid "Atlantic Standard Time" -msgstr "" +msgstr "Атлантичний стандартний час" #: dlls/tzres/tzres.rc:45 msgid "Atlantic Daylight Time" -msgstr "" +msgstr "Атлантичний літній час" #: dlls/tzres/tzres.rc:162 msgid "Mountain Standard Time" -msgstr "" +msgstr "Гірський стандартний час" #: dlls/tzres/tzres.rc:163 msgid "Mountain Daylight Time" -msgstr "" +msgstr "Гірський літній час" #: dlls/tzres/tzres.rc:232 msgid "US Eastern Standard Time" -msgstr "" +msgstr "Східний стандартний час США" #: dlls/tzres/tzres.rc:233 msgid "US Eastern Daylight Time" -msgstr "" +msgstr "Східний літній час США" #: dlls/tzres/tzres.rc:182 msgid "North Korea Standard Time" -msgstr "" +msgstr "Північнокорейський стандартний час" #: dlls/tzres/tzres.rc:183 msgid "North Korea Daylight Time" -msgstr "" +msgstr "Північнокорейський літній час" #: dlls/tzres/tzres.rc:220 msgid "Tasmania Standard Time" -msgstr "" +msgstr "Тасманійський стандартний час" #: dlls/tzres/tzres.rc:221 msgid "Tasmania Daylight Time" -msgstr "" +msgstr "Тасманійський літній час" #: dlls/tzres/tzres.rc:72 msgid "Central America Standard Time" -msgstr "" +msgstr "Центральна Америка за стандартним часом" #: dlls/tzres/tzres.rc:73 msgid "Central America Daylight Time" -msgstr "" +msgstr "Центральна Америка за літнім часом" #: dlls/tzres/tzres.rc:234 msgid "US Mountain Standard Time" -msgstr "" +msgstr "Американський гірський стандартний час" #: dlls/tzres/tzres.rc:235 msgid "US Mountain Daylight Time" -msgstr "" +msgstr "Американський гірський літній час" #: dlls/tzres/tzres.rc:212 msgid "South Africa Standard Time" -msgstr "" +msgstr "Південно-Африканський стандартний час" #: dlls/tzres/tzres.rc:213 msgid "South Africa Daylight Time" -msgstr "" +msgstr "Південно-Африканський літній час" #: dlls/tzres/tzres.rc:70 msgid "Cen. Australia Standard Time" -msgstr "" +msgstr "Цен. Австралійський стандартний час" #: dlls/tzres/tzres.rc:71 msgid "Cen. Australia Daylight Time" -msgstr "" +msgstr "Цен. Австралійський літній час" #: dlls/tzres/tzres.rc:214 msgid "Sri Lanka Standard Time" -msgstr "" +msgstr "Стандартний час Шрі-Ланки" #: dlls/tzres/tzres.rc:215 msgid "Sri Lanka Daylight Time" -msgstr "" +msgstr "Літній час Шрі-Ланки" #: 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:252 msgid "Yakutsk Standard Time" -msgstr "" +msgstr "Якутський стандартний час" #: dlls/tzres/tzres.rc:253 msgid "Yakutsk Daylight Time" -msgstr "" +msgstr "Якутський літній час" #: dlls/tzres/tzres.rc:198 msgid "SA Eastern Standard Time" -msgstr "" +msgstr "SA східний стандартний час" #: dlls/tzres/tzres.rc:199 msgid "SA Eastern Daylight Time" -msgstr "" +msgstr "SA східний літній час" #: dlls/tzres/tzres.rc:36 msgid "Arab Standard Time" -msgstr "" +msgstr "Арабський стандартний час" #: dlls/tzres/tzres.rc:37 msgid "Arab Daylight Time" -msgstr "" +msgstr "Арабський літній час" #: dlls/tzres/tzres.rc:38 msgid "Arabian Standard Time" -msgstr "" +msgstr "Арабський стандартний час" #: dlls/tzres/tzres.rc:39 msgid "Arabian Daylight Time" -msgstr "" +msgstr "Арабський літній час" #: dlls/tzres/tzres.rc:222 msgid "Tocantins Standard Time" -msgstr "" +msgstr "Стандартний час Токантінс" #: dlls/tzres/tzres.rc:223 msgid "Tocantins Daylight Time" -msgstr "" +msgstr "Літній час Токантінс" #: dlls/tzres/tzres.rc:196 msgid "Russian Standard Time" -msgstr "" +msgstr "Російський стандартний час" #: dlls/tzres/tzres.rc:197 msgid "Russian Daylight Time" -msgstr "" +msgstr "Російський літній час" #: dlls/tzres/tzres.rc:48 msgid "Aus Central W. Standard Time" -msgstr "" +msgstr "Aus Central W. стандартний час" #: dlls/tzres/tzres.rc:49 msgid "Aus Central W. Daylight Time" -msgstr "" +msgstr "Aus Central W. літній час" #: dlls/tzres/tzres.rc:194 msgid "Romance Standard Time" -msgstr "" +msgstr "Романський стандартний час" #: dlls/tzres/tzres.rc:195 msgid "Romance Daylight Time" -msgstr "" +msgstr "Романський літній час" #: dlls/tzres/tzres.rc:110 msgid "Ekaterinburg Standard Time" -msgstr "" +msgstr "Стандартний час Єкатеринбурга" #: dlls/tzres/tzres.rc:111 msgid "Ekaterinburg Daylight Time" -msgstr "" +msgstr "Літній час Єкатеринбурга" #: dlls/tzres/tzres.rc:216 msgid "Syria Standard Time" -msgstr "" +msgstr "Стандартний час Сирії" #: dlls/tzres/tzres.rc:217 msgid "Syria Daylight Time" -msgstr "" +msgstr "Літній час Сирії" #: dlls/tzres/tzres.rc:46 msgid "AUS Central Standard Time" -msgstr "" +msgstr "Центральний стандартний час AUS" #: dlls/tzres/tzres.rc:47 msgid "AUS Central Daylight Time" -msgstr "" +msgstr "Центральний літній час AUS" #: dlls/tzres/tzres.rc:122 msgid "Greenwich Standard Time" -msgstr "" +msgstr "Стандартний час за Грінвічем" #: dlls/tzres/tzres.rc:123 msgid "Greenwich Daylight Time" -msgstr "" +msgstr "Літній час за Грінвічем" #: dlls/tzres/tzres.rc:230 msgid "Ulaanbaatar Standard Time" -msgstr "" +msgstr "Стандартний час Улан-Батора" #: dlls/tzres/tzres.rc:231 msgid "Ulaanbaatar Daylight Time" -msgstr "" +msgstr "Літній час Улан-Батора" #: dlls/tzres/tzres.rc:134 msgid "Israel Standard Time" -msgstr "" +msgstr "Стандартний час Ізраїлю" #: dlls/tzres/tzres.rc:135 msgid "Israel Daylight Time" -msgstr "" +msgstr "Літній час Ізраїлю" #: dlls/tzres/tzres.rc:58 msgid "Bangladesh Standard Time" -msgstr "" +msgstr "Стандартний час Бангладеш" #: dlls/tzres/tzres.rc:59 msgid "Bangladesh Daylight Time" -msgstr "" +msgstr "Літній час Бангладеш" #: dlls/tzres/tzres.rc:200 msgid "SA Pacific Standard Time" -msgstr "" +msgstr "SA Тихоокеанський стандартний час" #: dlls/tzres/tzres.rc:201 msgid "SA Pacific Daylight Time" -msgstr "" +msgstr "SA Тихоокеанський літній час" #: dlls/tzres/tzres.rc:248 msgid "West Asia Standard Time" -msgstr "" +msgstr "Західноазіатський стандартний час" #: dlls/tzres/tzres.rc:249 msgid "West Asia Daylight Time" -msgstr "" +msgstr "Західноазіатський літній час" #: dlls/tzres/tzres.rc:32 msgid "Alaskan Standard Time" -msgstr "" +msgstr "Аляскинський стандартний час" #: dlls/tzres/tzres.rc:33 msgid "Alaskan Daylight Time" -msgstr "" +msgstr "Аляскинський літній час" #: dlls/tzres/tzres.rc:192 msgid "Paraguay Standard Time" -msgstr "" +msgstr "Парагвайський стандартний час" #: dlls/tzres/tzres.rc:193 msgid "Paraguay Daylight Time" -msgstr "" +msgstr "Парагвайський літній час" #: dlls/tzres/tzres.rc:94 msgid "Dateline Standard Time" -msgstr "" +msgstr "Стандартний час у Дателіні" #: dlls/tzres/tzres.rc:95 msgid "Dateline Daylight Time" -msgstr "" +msgstr "Літній час у Дателіні" #: dlls/tzres/tzres.rc:142 msgid "Libya Standard Time" -msgstr "" +msgstr "Лівійський стандартний час" #: dlls/tzres/tzres.rc:143 msgid "Libya Daylight Time" -msgstr "" +msgstr "Лівійський літній час" #: dlls/tzres/tzres.rc:56 msgid "Bahia Standard Time" -msgstr "" +msgstr "Стандартний час Баїя" #: dlls/tzres/tzres.rc:57 msgid "Bahia Daylight Time" -msgstr "" +msgstr "Літній час Баїя" #: dlls/tzres/tzres.rc:238 msgid "Venezuela Standard Time" -msgstr "" +msgstr "Стандартний час Венесуели" #: dlls/tzres/tzres.rc:239 msgid "Venezuela Daylight Time" -msgstr "" +msgstr "Літній час Венесуели" #: dlls/tzres/tzres.rc:62 msgid "Bougainville Standard Time" -msgstr "" +msgstr "Стандартний час Бугенвіля" #: dlls/tzres/tzres.rc:63 msgid "Bougainville Daylight Time" -msgstr "" +msgstr "Літній час Бугенвіля" #: dlls/tzres/tzres.rc:128 msgid "Hawaiian Standard Time" -msgstr "" +msgstr "Гавайський стандартний час" #: dlls/tzres/tzres.rc:129 msgid "Hawaiian Daylight Time" -msgstr "" +msgstr "Гавайський літній час" #: dlls/tzres/tzres.rc:208 msgid "SE Asia Standard Time" -msgstr "" +msgstr "Південно-Східний Азіатський стандартний час" #: dlls/tzres/tzres.rc:209 msgid "SE Asia Daylight Time" -msgstr "" +msgstr "Південно-Східний Азіатський літній час" #: dlls/tzres/tzres.rc:174 msgid "New Zealand Standard Time" -msgstr "" +msgstr "Стандартний час Нової Зеландії" #: dlls/tzres/tzres.rc:175 msgid "New Zealand Daylight Time" -msgstr "" +msgstr "Літній час Нової Зеландії" #: dlls/tzres/tzres.rc:34 msgid "Aleutian Standard Time" -msgstr "" +msgstr "Алеутський стандартний час" #: dlls/tzres/tzres.rc:35 msgid "Aleutian Daylight Time" -msgstr "" +msgstr "Алеутський літній час" #: dlls/tzres/tzres.rc:76 msgid "Central Brazilian Standard Time" -msgstr "" +msgstr "Центральний бразильський стандартний час" #: dlls/tzres/tzres.rc:77 msgid "Central Brazilian Daylight Time" -msgstr "" +msgstr "Центральний бразильський літній час" #: dlls/tzres/tzres.rc:60 msgid "Belarus Standard Time" -msgstr "" +msgstr "Білоруський стандартний час" #: dlls/tzres/tzres.rc:61 msgid "Belarus Daylight Time" -msgstr "" +msgstr "Білоруський літній час" #: dlls/tzres/tzres.rc:202 msgid "SA Western Standard Time" -msgstr "" +msgstr "SA Західний стандартний час" #: dlls/tzres/tzres.rc:203 msgid "SA Western Daylight Time" -msgstr "" +msgstr "SA Західний літній час" #: dlls/tzres/tzres.rc:120 msgid "Greenland Standard Time" -msgstr "" +msgstr "Стандартний час Гренландії" #: dlls/tzres/tzres.rc:121 msgid "Greenland Daylight Time" -msgstr "" +msgstr "Літній час Гренландії" #: dlls/tzres/tzres.rc:102 msgid "Easter Island Standard Time" -msgstr "" +msgstr "Стандартний час острова Пасхи" #: dlls/tzres/tzres.rc:103 msgid "Easter Island Daylight Time" -msgstr "" +msgstr "Літній час острова Пасхи" #: dlls/tzres/tzres.rc:108 msgid "Egypt Standard Time" -msgstr "" +msgstr "Єгипетський стандартний час" #: dlls/tzres/tzres.rc:109 msgid "Egypt Daylight Time" -msgstr "" +msgstr "Єгипетський літній час" #: dlls/tzres/tzres.rc:106 msgid "Eastern Standard Time (Mexico)" -msgstr "" +msgstr "Східний стандартний час (Мексика)" #: dlls/tzres/tzres.rc:107 msgid "Eastern Daylight Time (Mexico)" -msgstr "" +msgstr "Східний літній час (Мексика)" #: dlls/tzres/tzres.rc:154 msgid "Mauritius Standard Time" -msgstr "" +msgstr "Стандартний час Маврикія" #: dlls/tzres/tzres.rc:155 msgid "Mauritius Daylight Time" -msgstr "" +msgstr "Літній час Маврикія" #: dlls/tzres/tzres.rc:240 msgid "Vladivostok Standard Time" -msgstr "" +msgstr "Стандартний час Владивостока" #: dlls/tzres/tzres.rc:241 msgid "Vladivostok Daylight Time" -msgstr "" +msgstr "Літній час Владивостока" #: dlls/tzres/tzres.rc:210 msgid "Singapore Standard Time" -msgstr "" +msgstr "Стандартний час Сінгапуру" #: dlls/tzres/tzres.rc:211 msgid "Singapore Daylight Time" -msgstr "" +msgstr "Літній час Сінгапуру" #: dlls/tzres/tzres.rc:140 msgid "Korea Standard Time" -msgstr "" +msgstr "Корейський стандартний час" #: dlls/tzres/tzres.rc:141 msgid "Korea Daylight Time" -msgstr "" +msgstr "Корейський літній час" #: dlls/tzres/tzres.rc:88 msgid "Chatham Islands Standard Time" -msgstr "" +msgstr "Стандартний час островів Чатем" #: dlls/tzres/tzres.rc:89 msgid "Chatham Islands Daylight Time" -msgstr "" +msgstr "Літній час островів Чатем" #: dlls/tzres/tzres.rc:96 msgid "E. Africa Standard Time" -msgstr "" +msgstr "E. Стандартний час в Африці" #: dlls/tzres/tzres.rc:97 msgid "E. Africa Daylight Time" -msgstr "" +msgstr "E. Літній час в Африці" #: dlls/tzres/tzres.rc:114 msgid "FLE Standard Time" -msgstr "" +msgstr "Стандартний час FLE" #: dlls/tzres/tzres.rc:115 msgid "FLE Daylight Time" -msgstr "" +msgstr "Літній час FLE" #: dlls/tzres/tzres.rc:100 msgid "E. South America Standard Time" -msgstr "" +msgstr "E. Стандартний час Південної Америки" #: dlls/tzres/tzres.rc:101 msgid "E. South America Daylight Time" -msgstr "" +msgstr "E. Літній час Південної Америки" #: dlls/tzres/tzres.rc:82 msgid "Central Pacific Standard Time" -msgstr "" +msgstr "Центральний тихоокеанський стандартний час" #: dlls/tzres/tzres.rc:83 msgid "Central Pacific Daylight Time" -msgstr "" +msgstr "Центральний тихоокеанський літній час" #: dlls/tzres/tzres.rc:244 msgid "W. Central Africa Standard Time" -msgstr "" +msgstr "В. Стандартний час у Центральній Африці" #: dlls/tzres/tzres.rc:245 msgid "W. Central Africa Daylight Time" -msgstr "" +msgstr "В. Літній час у Центральній Африці" #: dlls/tzres/tzres.rc:184 msgid "Pacific SA Standard Time" -msgstr "" +msgstr "Тихоокеанський стандартний час SA" #: dlls/tzres/tzres.rc:185 msgid "Pacific SA Daylight Time" -msgstr "" +msgstr "Тихоокеанський літній час SA" #: dlls/tzres/tzres.rc:98 msgid "E. Australia Standard Time" -msgstr "" +msgstr "E. Стандартний час в Австралії" #: dlls/tzres/tzres.rc:99 msgid "E. Australia Daylight Time" -msgstr "" +msgstr "E. Літній час в Австралії" #: dlls/tzres/tzres.rc:242 msgid "W. Australia Standard Time" -msgstr "" +msgstr "В. Стандартний час в Австралії" #: dlls/tzres/tzres.rc:243 msgid "W. Australia Daylight Time" -msgstr "" +msgstr "В. Літній час в Австралії" #: dlls/urlmon/urlmon.rc:32 dlls/wininet/wininet.rc:88 msgid "Security Warning" @@ -10960,147 +10896,115 @@ msgstr "&Ще вікна..." #: 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 msgid "Device I/O error" -msgstr "" +msgstr "Помилка вводу-виводу пристрою" #: 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 cursor handle.\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 msgid "Hide %@" @@ -11197,33 +11101,27 @@ 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 msgid "The request has timed out.\n" @@ -13236,6 +13134,9 @@ msgid "" "\n" "hardlink hardlink management\n" msgstr "" +"- Підтримувані команди -\n" +"\n" +"hardlink управління жорстким посиланням\n" #: programs/fsutil/fsutil.mc:35 msgid "" @@ -13243,10 +13144,13 @@ msgid "" "\n" "create create a hardlink\n" msgstr "" +"- Жорстке посилання - Підтримувані команди -\n" +"\n" +"create створити жорстке посилання\n" #: programs/fsutil/fsutil.mc:40 msgid "Syntax: fsutil hardlink create <new> <existing>\n" -msgstr "" +msgstr "Синтаксис: fsutil hardlink create <нове> <існуюче>\n" #: programs/hostname/hostname.rc:30 msgid "Usage: hostname\n" @@ -16053,10 +15957,10 @@ msgid "" "data before it is terminated. Are you sure you want to\n" "terminate the process?" msgstr "" -"УВАГА: Завершення цього процесу може призвести до\n" -"небажаних результатів, включаючи втрату даних та\n" -"нестабільність системи. Процес не зможе зберегти\n" -"свою позицію чи дані. Ви справді хочете завершити\n" +"УВАГА: Завершення цього процесу може призвести до " +"небажаних результатів, включаючи втрату даних та " +"нестабільність системи. Процес не зможе зберегти " +"свою позицію чи дані. Ви справді хочете завершити " "процес?" #: programs/taskmgr/taskmgr.rc:311 @@ -17069,10 +16973,8 @@ msgid "&Beginner" msgstr "Н&овачок" #: programs/winemine/winemine.rc:45 -#, fuzzy -#| msgid "Interface" msgid "&Intermediate" -msgstr "Інтерфейс" +msgstr "&Проміжний" #: programs/winemine/winemine.rc:46 msgid "&Expert" @@ -17103,10 +17005,8 @@ msgid "Beginner" msgstr "Новачок" #: programs/winemine/winemine.rc:65 -#, fuzzy -#| msgid "Interface" msgid "Intermediate" -msgstr "Інтерфейс" +msgstr "Проміжний" #: programs/winemine/winemine.rc:66 msgid "Expert" -- 2.29.2

3 2

[PATCH] d3dcompiler/tests: Avoid initializing nameless unions in designated initializers.
by Zebediah Figura Dec. 28, 2020

Dec. 28, 2020

Old versions of gcc can't handle this. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50397 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/d3dcompiler_43/tests/hlsl_d3d11.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/hlsl_d3d11.c b/dlls/d3dcompiler_43/tests/hlsl_d3d11.c index 7a1243b9ccf..53dbd3e2df7 100644 --- a/dlls/d3dcompiler_43/tests/hlsl_d3d11.c +++ b/dlls/d3dcompiler_43/tests/hlsl_d3d11.c @@ -526,6 +526,7 @@ static void test_trig(void) static void test_sampling(void) { + D3D11_SHADER_RESOURCE_VIEW_DESC srv_desc = {0}; struct test_context test_context; ID3D11ShaderResourceView *srv; ID3D11SamplerState *sampler; @@ -592,13 +593,6 @@ static void test_sampling(void) static const D3D11_SUBRESOURCE_DATA resource_data = {&texture_data, sizeof(texture_data) / 2}; - static const D3D11_SHADER_RESOURCE_VIEW_DESC srv_desc = - { - .Format = DXGI_FORMAT_R32G32B32A32_FLOAT, - .ViewDimension = D3D11_SRV_DIMENSION_TEXTURE2D, - .Texture2D.MipLevels = 1, - }; - static const D3D11_SAMPLER_DESC sampler_desc = { .Filter = D3D11_FILTER_MIN_MAG_MIP_LINEAR, @@ -614,6 +608,9 @@ static void test_sampling(void) hr = ID3D11Device_CreateTexture2D(test_context.device, &texture_desc, &resource_data, &texture); ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); + srv_desc.Format = DXGI_FORMAT_R32G32B32A32_FLOAT; + srv_desc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE2D; + srv_desc.Texture2D.MipLevels = 1; hr = ID3D11Device_CreateShaderResourceView(test_context.device, (ID3D11Resource *)texture, &srv_desc, &srv); ok(hr == S_OK, "Failed to create SRV, hr %#x.\n", hr); ID3D11DeviceContext_PSSetShaderResources(test_context.immediate_context, 0, 1, &srv); -- 2.29.2

2 1

[PATCH] ucrtbase: Do not prefix MSVCRT_ to the exported function name of _lrot*.
by Zebediah Figura Dec. 28, 2020

Dec. 28, 2020

Fixes: e8936e79c20f09156afe8ecac0fe9cde87905a71 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ucrtbase/ucrtbase.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 8b884366fa0..e593f5d745c 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -568,8 +568,8 @@ @ cdecl _logb(double) @ cdecl -arch=!i386 _logbf(float) @ cdecl -arch=i386 _longjmpex(ptr long) MSVCRT_longjmp -@ cdecl MSVCRT__lrotl(long long) MSVCRT__lrotl -@ cdecl MSVCRT__lrotr(long long) MSVCRT__lrotr +@ cdecl _lrotl(long long) MSVCRT__lrotl +@ cdecl _lrotr(long long) MSVCRT__lrotr @ cdecl _lsearch(ptr ptr ptr long ptr) @ stub _lsearch_s @ cdecl _lseek(long long long) -- 2.29.2

3 2

[PATCH] configure: Don't check for libVulkan on macOS.
by Dean M Greer Dec. 28, 2020

Dec. 28, 2020

macOS uses libMoltenVK, finding libVulkan on macOS causes libMoltenVK to be ignored and Wine is unable to interact with the Vulkan loader on macOS. Signed-off-by: Dean M Greer <gcenx83(a)gmail.com> --- configure.ac | 1 + 1 file changed, 1 insertion(+) diff --git a/configure.ac b/configure.ac index dafa8489b71..1d770009ae3 100644 --- a/configure.ac +++ b/configure.ac @@ -130,6 +130,7 @@ AC_CHECK_TOOL(LD,ld) case $host in *-darwin*) with_fontconfig=${with_fontconfig:-no} + ac_cv_lib_soname_vulkan= ;; *-mingw32*|*-cygwin*) enable_win16=${enable_win16:-no} -- 2.24.3 (Apple Git-128)

3 2

ARM disassembler bug
by Qijia Liu Dec. 28, 2020

Dec. 28, 2020

Hello, I’m from downstream radare2 project. There seems to be a bug in winedbg’s ARM 32-bit disassembler. For the instruction 0xe329f00d, it produces “msr cpsr, sp” while our other 2 disassembler (gnu and capstone) produces “msr cpsr_fc, 13”. I think the bug is in https://github.com/wine-mirror/wine/blob/e377786a71c3b6eab5bc11c0b1c9c7c3dc…. Please take a look. Thank you. Best, Qijia Liu

2 1

[PATCH] Configure: Remove Xcode 3.x check.
by Dean M Greer Dec. 28, 2020

Dec. 28, 2020

Check causes issues with newer Xcode versions. Xcode 3.x is unable to compile modern wine. Signed-off-by: Dean M Greer <gcenx83(a)gmail.com> --- configure.ac | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/configure.ac b/configure.ac index 1d770009ae3..6b1b29fef3c 100644 --- a/configure.ac +++ b/configure.ac @@ -867,24 +867,6 @@ case $host_os in LIBS="$ac_save_LIBS" fi - dnl Check for Xcode 3.x broken 16-bit support - if test "x$enable_win16" = "xyes" - then - AC_MSG_CHECKING([whether 16-bit code can be built correctly]) - AC_RUN_IFELSE([AC_LANG_PROGRAM([[asm(".text\n" - "bad:\tnop;nop\n" - "good:\tnop;nop\n\t" - ".globl _testfunc\n" - "_testfunc:\tcallw good"); - extern void testfunc();]], - [[unsigned short *p = (unsigned short *)testfunc; - return p[0] != 0xe866 || p[1] != 0xfffa]])], - AC_MSG_RESULT(yes), - [AC_MSG_RESULT(no) - AC_MSG_ERROR([Xcode 3.x cannot build 16-bit code correctly. Use --disable-win16 if you don't need 16-bit support.])], - AC_MSG_RESULT([[cross-compiling, assuming yes]])) - fi - AC_SUBST(LIBWINE_SHAREDLIB,"libwine.$libwine_version.dylib") AC_SUBST(LIBWINE_LDFLAGS,["-dynamiclib -install_name @rpath/libwine.$libwine_soversion.dylib -Wl,-rpath,@loader_path/ -compatibility_version $libwine_soversion -current_version $libwine_version"]) AC_SUBST(WINELOADER_DEPENDS,"wine_info.plist") -- 2.24.3 (Apple Git-128)

1 0

[PATCH] README: Update OS X requirements.
by Dean M Greer Dec. 27, 2020

Dec. 27, 2020

Signed-off-by: Dean M Greer <gcenx83(a)gmail.com> --- README | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/README b/README index 9761f667034..ed139d9cd18 100644 --- a/README +++ b/README @@ -40,7 +40,7 @@ To compile and run Wine, you must have one of the following: FreeBSD 8.0 or later Solaris x86 9 or later NetBSD-current - Mac OS X 10.5 or later + Mac OS X 10.8 or later As Wine requires kernel-level thread support to run, only the operating systems mentioned above are supported. Other operating systems which @@ -61,9 +61,10 @@ NetBSD info: turned on in your kernel. Mac OS X info: - You need Xcode 2.4 or later to build properly on x86. - The Mac driver requires OS X 10.6 or later and won't be built on 10.5. - + The minimum requirements for compiling Wine are clang 3.8 with + The MacOSX10.10.sdk and mingw-w64 v8. + The MacOSX10.14.sdk and later can only build wine64. + Xcode/Xcode Command Line Tools or Apple cctools. Supported file systems: Wine should run on most file systems. A few compatibility problems -- 2.24.3 (Apple Git-128)

1 0

[PATCH 2/2] ntdll/tests: Align check test correctly clears AC flag.
by Jefferson Carpenter Dec. 27, 2020

Dec. 27, 2020

RESEND Makes sure AC flag is set back to its original value regardless of the outcome of the test, so it will not interfere with subsequent tests. thanks, Jefferson

1 0

[PATCH 1/2] ntdll: Set signal stack before calling getenv.
by Jefferson Carpenter Dec. 27, 2020

Dec. 27, 2020

Figured out what was causing the Segmentation Fault running the exception tests. Since the AC bit was left on, an exception was thrown inside of a glibc function in server_init_thread, and the current TEB was mis-identified leading to the crash. This commit re-orders the code in server_init_thread so that the TEB is correctly identified should an exception be thrown from inside it. thanks, Jefferson

1 0

[PATCH 1/2] ntdll: Set signal stack before calling getenv.
by Jefferson Carpenter Dec. 27, 2020

Dec. 27, 2020

Figured out what was causing the Segmentation Fault running the exception tests. Since the AC bit was left on, an exception was thrown inside of a glibc function in server_init_thread, and the current TEB was mis-identified leading to the crash. This commit re-orders the code in server_init_thread so that the TEB is correctly identified should an exception be thrown from inside it. thanks, Jefferson

1 0

[PATCH] ws2_32: deal with getaddrinfo() returning NULL ai_canonname despite AI_CANONNAME
by Damjan Jovanovic Dec. 27, 2020

Dec. 27, 2020

This fixes a wineboot crash on FreeBSD, where getaddrinfo() returns a NULL ai_canonname, causing wineboot to pass NULL to strchr(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50408 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/ws2_32/socket.c | 6 ++++++ 1 file changed, 6 insertions(+)

1 0

Wine staging 6.0-rc4 release
by Alistair Leslie-Hughes Dec. 27, 2020

Dec. 27, 2020

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 6.0-rc4 (772 patches are applied to wine vanilla) Upstreamed (Either directly from staging or fixed with a similar patch). * None Added: * None Updated: * server-File_Permissions * mfplat-streaming-support * dxdiag-new-dlls 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] httpapi/tests: Avoid some test failures with newer Windows 10.
by Zebediah Figura Dec. 26, 2020

Dec. 26, 2020

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/httpapi/tests/httpapi.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/httpapi/tests/httpapi.c b/dlls/httpapi/tests/httpapi.c index 5d79197505c..1d1ad56e9f6 100644 --- a/dlls/httpapi/tests/httpapi.c +++ b/dlls/httpapi/tests/httpapi.c @@ -304,7 +304,7 @@ static void test_v1_server(void) ok(req->BytesReceived == strlen(req_text), "Got %s bytes.\n", wine_dbgstr_longlong(req->BytesReceived)); ok(!req->EntityChunkCount, "Got %u entity chunks.\n", req->EntityChunkCount); ok(!req->pEntityChunks, "Got entity chunks %p.\n", req->pEntityChunks); - ok(!req->RawConnectionId, "Got SSL connection ID %s.\n", wine_dbgstr_longlong(req->RawConnectionId)); + /* req->RawConnectionId is zero until Win10 2004. */ ok(!req->pSslInfo, "Got SSL info %p.\n", req->pSslInfo); response.StatusCode = 418; @@ -1372,10 +1372,9 @@ static void test_v2_server(void) ok(req->BytesReceived == strlen(req_text), "Got %s bytes.\n", wine_dbgstr_longlong(req->BytesReceived)); ok(!req->EntityChunkCount, "Got %u entity chunks.\n", req->EntityChunkCount); ok(!req->pEntityChunks, "Got entity chunks %p.\n", req->pEntityChunks); - ok(!req->RawConnectionId, "Got SSL connection ID %s.\n", wine_dbgstr_longlong(req->RawConnectionId)); + /* req->RawConnectionId is zero until Win10 2004. */ ok(!req->pSslInfo, "Got SSL info %p.\n", req->pSslInfo); - ok(!reqv2->RequestInfoCount, "Got request info count %u.\n", reqv2->RequestInfoCount); - ok(!reqv2->pRequestInfo, "Got request info %p.\n", reqv2->pRequestInfo); + /* RequestInfoCount and pRequestInfo are zero until Win10 1909. */ response.s.StatusCode = 418; response.s.pReason = "I'm a teapot"; -- 2.29.2

1 0

[PATCH] msscript.ocx/tests: Use wide-char string literals.
by Michael Stefaniuc Dec. 26, 2020

Dec. 26, 2020

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msscript.ocx/tests/msscript.c | 47 ++++++++++++------------------ 1 file changed, 18 insertions(+), 29 deletions(-) diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 4f43764234c..756c21d887b 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -34,7 +34,6 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); #define TESTSCRIPT_CLSID "{178fc164-f585-4e24-9c13-4bb7faf80746}" static const GUID CLSID_TestScript = {0x178fc164,0xf585,0x4e24,{0x9c,0x13,0x4b,0xb7,0xfa,0xf8,0x07,0x46}}; -static const WCHAR vbW[] = {'V','B','S','c','r','i','p','t',0}; #ifdef _WIN64 @@ -1371,9 +1370,6 @@ static void test_olecontrol(void) static void test_Language(void) { - static const WCHAR jsW[] = {'J','S','c','r','i','p','t',0}; - static const WCHAR vb2W[] = {'v','B','s','c','r','i','p','t',0}; - static const WCHAR dummyW[] = {'d','u','m','m','y',0}; IScriptControl *sc; HRESULT hr; BSTR str; @@ -1390,39 +1386,39 @@ static void test_Language(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(str == NULL, "got %s\n", wine_dbgstr_w(str)); - str = SysAllocString(vbW); + str = SysAllocString(L"VBScript"); hr = IScriptControl_put_Language(sc, str); ok(hr == S_OK, "got 0x%08x\n", hr); SysFreeString(str); - str = SysAllocString(vb2W); + str = SysAllocString(L"vBscript"); hr = IScriptControl_put_Language(sc, str); ok(hr == S_OK, "got 0x%08x\n", hr); SysFreeString(str); hr = IScriptControl_get_Language(sc, &str); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(!lstrcmpW(str, vbW), "got %s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(str, L"VBScript"), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); - str = SysAllocString(dummyW); + str = SysAllocString(L"dummy"); hr = IScriptControl_put_Language(sc, str); ok(hr == CTL_E_INVALIDPROPERTYVALUE, "got 0x%08x\n", hr); SysFreeString(str); hr = IScriptControl_get_Language(sc, &str); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(!lstrcmpW(str, vbW), "got %s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(str, L"VBScript"), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); - str = SysAllocString(jsW); + str = SysAllocString(L"JScript"); hr = IScriptControl_put_Language(sc, str); ok(hr == S_OK, "got 0x%08x\n", hr); SysFreeString(str); hr = IScriptControl_get_Language(sc, &str); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(!lstrcmpW(str, jsW), "got %s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(str, L"JScript"), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); hr = IScriptControl_put_Language(sc, NULL); @@ -1436,8 +1432,6 @@ static void test_Language(void) /* custom script engine */ if (have_custom_engine) { - static const WCHAR testscriptW[] = {'t','e','s','t','s','c','r','i','p','t',0}; - hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IScriptControl, (void**)&sc); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -1448,7 +1442,7 @@ static void test_Language(void) SET_EXPECT(QI_IActiveScriptParse); SET_EXPECT(InitNew); - str = SysAllocString(testscriptW); + str = SysAllocString(L"testscript"); hr = IScriptControl_put_Language(sc, str); ok(hr == S_OK, "got 0x%08x\n", hr); SysFreeString(str); @@ -1462,7 +1456,7 @@ static void test_Language(void) todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); if (hr == S_OK) - ok(!lstrcmpW(testscriptW, str), "%s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(L"testscript", str), "%s\n", wine_dbgstr_w(str)); SysFreeString(str); IActiveScriptSite_Release(site); @@ -1687,7 +1681,7 @@ static void test_timeout(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(val == 0, "got %d\n", val); - str = SysAllocString(vbW); + str = SysAllocString(L"VBScript"); hr = IScriptControl_put_Language(sc, str); ok(hr == S_OK, "got 0x%08x\n", hr); SysFreeString(str); @@ -1716,7 +1710,7 @@ static void test_Reset(void) hr = IScriptControl_Reset(sc); ok(hr == E_FAIL, "got 0x%08x\n", hr); - str = SysAllocString(vbW); + str = SysAllocString(L"VBScript"); hr = IScriptControl_put_Language(sc, str); ok(hr == S_OK, "got 0x%08x\n", hr); SysFreeString(str); @@ -1726,15 +1720,13 @@ static void test_Reset(void) hr = IScriptControl_get_Language(sc, &str); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(!lstrcmpW(str, vbW), "got %s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(str, L"VBScript"), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); IScriptControl_Release(sc); /* custom script engine */ if (have_custom_engine) { - static const WCHAR testscriptW[] = {'t','e','s','t','s','c','r','i','p','t',0}; - hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IScriptControl, (void**)&sc); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -1745,7 +1737,7 @@ static void test_Reset(void) SET_EXPECT(QI_IActiveScriptParse); SET_EXPECT(InitNew); - str = SysAllocString(testscriptW); + str = SysAllocString(L"testscript"); hr = IScriptControl_put_Language(sc, str); ok(hr == S_OK, "got 0x%08x\n", hr); SysFreeString(str); @@ -1833,7 +1825,6 @@ static IDispatch testdisp = { &dispvtbl }; static void test_AddObject(void) { - static const WCHAR oW[] = {'o',0}; IScriptControl *sc; BSTR str, objname; HRESULT hr; @@ -1842,14 +1833,14 @@ static void test_AddObject(void) &IID_IScriptControl, (void**)&sc); ok(hr == S_OK, "got 0x%08x\n", hr); - objname = SysAllocString(oW); + objname = SysAllocString(L"o"); hr = IScriptControl_AddObject(sc, objname, NULL, VARIANT_FALSE); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); hr = IScriptControl_AddObject(sc, objname, &testdisp, VARIANT_FALSE); ok(hr == E_FAIL, "got 0x%08x\n", hr); - str = SysAllocString(vbW); + str = SysAllocString(L"VBScript"); hr = IScriptControl_put_Language(sc, str); ok(hr == S_OK, "got 0x%08x\n", hr); SysFreeString(str); @@ -1867,8 +1858,6 @@ static void test_AddObject(void) /* custom script engine */ if (have_custom_engine) { - static const WCHAR testscriptW[] = {'t','e','s','t','s','c','r','i','p','t',0}; - hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IScriptControl, (void**)&sc); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -1879,7 +1868,7 @@ static void test_AddObject(void) SET_EXPECT(QI_IActiveScriptParse); SET_EXPECT(InitNew); - str = SysAllocString(testscriptW); + str = SysAllocString(L"testscript"); hr = IScriptControl_put_Language(sc, str); ok(hr == S_OK, "got 0x%08x\n", hr); SysFreeString(str); @@ -2122,7 +2111,7 @@ static void test_UseSafeSubset(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(use_safe_subset == VARIANT_TRUE, "got %d\n", use_safe_subset); - str = SysAllocString(vbW); + str = SysAllocString(L"VBScript"); hr = IScriptControl_put_Language(sc, str); ok(hr == S_OK, "got 0x%08x\n", hr); SysFreeString(str); @@ -2239,7 +2228,7 @@ static void test_State(void) hr = IScriptControl_put_State(sc, Connected); ok(hr == E_FAIL, "got 0x%08x\n", hr); - str = SysAllocString(vbW); + str = SysAllocString(L"VBScript"); hr = IScriptControl_put_Language(sc, str); ok(hr == S_OK, "got 0x%08x\n", hr); SysFreeString(str); -- 2.26.2

1 0

TestBot news
by Francois Gouget Dec. 26, 2020

Dec. 26, 2020

Summary: * New w1064 VM with all Windows 10 fall releases. * Rebuilt w7u VM with dual-screen and some languages. * Cleaned up wvista VM. * The cw-rx460 Linux results are back. * The vm3 SSD died, will be replaced soon. * Test PCI-passthrough VM on the development TestBot. w1064 ----- This is essentially the same as the w10pro64 VM but with test configurations for 1507, 1607, 1709, 1809, 1909 and the latest 2009. The goal is to spread the testing load across two VM hosts. So w10pro64 will handle all (or most of) the languages, while w1064 will handle the older Windows 10 releases and a few extra configurations like dual-screen and test without elevated privileges (not yet present), etc. I will try to update w10pro64 to the latest spring Windows releases while I will keep adding fall releases to w1064. So they should each get updated once a year. w7u --- I rebuilt this VM from scratch to get it on more recent QEMu virtual hardware; and only kept the latest configuration. Here is the base configuration summary: [CPU:2*IvyBridge-IBRS RAM:2GB disk:scsi-unmap eth:e1000-metered snd:ich9 GPU:vga display:spice virtio:0.1.185 testagentd:1.8] The most annoying part is getting Windows Update to work because the servers now require SHA2 but Windows 7 does not support it out of the box. So I had to find and manually install the right KB fix to get it going. Then Windows Update ran out of memory so I installed another KB fix so it would just take forever to install a measly ~160 updates. So to summarize I installed SP1 manually, added KB4474419 to add SHA2 support, KB3050265 to prevent Windows Update from running out of memory, KB2852386 to get winsxs disk cleanup options, and finally installed all updates up to 2020-11-25. Then I added a dual screen test configuration, a non-elevated privileges configuration and a few European languages. I avoided languages with tricky scripts because I was not sure if Windows 7 would support them right (Vista does not). And I decided to pick a set that does not overlap with the ones the Windows 10 VM is already testing. Let me know if you need a different set of languages. wvista ------ I flattened all the snapshots to only keep the latest version, that is all updates up to 2014-04-21. Note that Vista runs into the same Windows Update issue as Windows 7: SHA2 support is required by the servers. But there's no way to get SHA2 support on Vista which means Vista has no Windows Update support at all. I also tweaked the hardware configuration and updated the QEmu drivers. [CPU:1*SandyBridge-IBRS RAM:2GB disk:scsi-unmap eth:e1000 snd:ac97 GPU:vga display:spice virtio:0.1.185 testagentd:1.8] The new configuration seems to be working pretty well except for test_driver4() in ntoskrnl.exe:ntoskrnl which crashes Vista. So I only run WineTest without elevated privileges which forces a skip of that test. But you can still run the tests with elevated privileges if you manually submit a job. cw-rx460 Linux results ---------------------- cw-rx460 is not a TestBot VM but does run WineTest daily and has the advantage of running on real hardware. For a long time it failed to reliably submit WineTest results. Now it works again (the issue was in the wt-bot script). vm3 SSD ------- The SSD of the vm3 host died last week so I moved its VMs to vm1 and vm4. That's part of why the TestBot was slow at the start of the week. The other reasons are: * The Debian VM which is bloated and which I'm working on updating with a new libX11, * The couple older Debian configurations which I removed. * Too many VMs on vm1 (I moved some to vm4). vm4's SSD is also on the brink of death according to smartctl so they'll both get new and bigger SSDs soon. PCI-passthrough --------------- I also set up a new Windows 10 Pro VM on my development TestBot environment and added a configuration with an RX550 graphics card to it using PCI-passthrough. That seems to be working [1] so far, by which I mostly mean that besides actually running its TestBot tasks the graphics card has not locked up and required a host reboot yet. What's annoying is that this VM crashes when it runs ntdll:exception so which prevents it from submitting its test results. That is however totally unrelated to the RX550 since it also happens with QEmu's built-in vga graphics card (a test configuration which has never seen the RX550 in any shape or form). Another thing that's missing is support for screenshots but I figure that can come later (it would be great if someone wanted to tackle bug 44709). There are many PCI-passthrough recipes online, but here's mine, just for adding the passthrough to an existing Windows VM (i.e. it assumes you've configured the host already): * While still using QEmu's built-in vga card, install TightVNC (or equivalent). I prefer to avoid Windows' RDP because that uses a separate desktop with its own graphics driver, changes the resolution, and disables sound. All that means I wouldn't really know what's going on with the actual graphics card. * Then power off and virsh edit to: - replace the <domain...> line with <domain type='kvm' xmlns:qemu='http://libvirt.org/schemas/domain/qemu/1.0'> - add these lines before the closing </domain> (in fact it's likely fine anywhere) <qemu:commandline> <qemu:arg value='-set'/> <qemu:arg value='device.hostdev0.x-vga=on'/> </qemu:commandline> * Remove the Display (Spice), Video (VGA), Tablet (USB|Virtio), and Sound (ich9) devices. Add the graphics card's two PCI devices (GPU + audio). * Boot up, connect using VNC, install the graphics driver, reboot again. * All done. [1] One side effect is that whenever the RX550 configuration powers up it messes the colors of my desktop, as if it switched some palette. Fortunately all I have to do is to switch the focus to another window to fix it so I'm just putting up with it. -- Francois Gouget <fgouget(a)codeweavers.com>

1 3

[PATCH] winegstreamer: Split audio data to fit in the sample buffer.
by Anton Baskanov Dec. 24, 2020

Dec. 24, 2020

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50355 Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> --- dlls/winegstreamer/gstdemux.c | 142 +++++++++++++++++++++------------- 1 file changed, 88 insertions(+), 54 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 9114e6610a3..8a9c0a84191 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -81,6 +81,7 @@ struct gstdemux_source HANDLE caps_event, eos_event; GstSegment *segment; SourceSeeking seek; + DWORD bytes_per_second; }; static inline struct gstdemux *impl_from_strmbase_filter(struct strmbase_filter *iface) @@ -801,6 +802,7 @@ static GstFlowReturn got_data_sink(GstPad *pad, GstObject *parent, GstBuffer *bu BYTE *ptr = NULL; IMediaSample *sample; GstMapInfo info; + gsize position = 0; TRACE("%p %p\n", pad, buf); @@ -809,76 +811,106 @@ static GstFlowReturn got_data_sink(GstPad *pad, GstObject *parent, GstBuffer *bu return GST_FLOW_OK; } - hr = BaseOutputPinImpl_GetDeliveryBuffer(&pin->pin, &sample, NULL, NULL, 0); - - if (hr == VFW_E_NOT_CONNECTED) { - gst_buffer_unref(buf); - return GST_FLOW_NOT_LINKED; - } + gst_buffer_map(buf, &info, GST_MAP_READ); - if (FAILED(hr)) { - gst_buffer_unref(buf); - ERR("Could not get a delivery buffer (%x), returning GST_FLOW_FLUSHING\n", hr); - return GST_FLOW_FLUSHING; - } + while (position < info.size) + { + gsize advance; - gst_buffer_map(buf, &info, GST_MAP_READ); + hr = BaseOutputPinImpl_GetDeliveryBuffer(&pin->pin, &sample, NULL, NULL, 0); - hr = IMediaSample_SetActualDataLength(sample, info.size); - if(FAILED(hr)){ - WARN("SetActualDataLength failed: %08x\n", hr); - return GST_FLOW_FLUSHING; - } + if (hr == VFW_E_NOT_CONNECTED) { + gst_buffer_unmap(buf, &info); + gst_buffer_unref(buf); + return GST_FLOW_NOT_LINKED; + } - IMediaSample_GetPointer(sample, &ptr); + if (FAILED(hr)) { + gst_buffer_unmap(buf, &info); + gst_buffer_unref(buf); + ERR("Could not get a delivery buffer (%x), returning GST_FLOW_FLUSHING\n", hr); + return GST_FLOW_FLUSHING; + } - memcpy(ptr, info.data, info.size); + advance = min(IMediaSample_GetSize(sample), info.size - position); - gst_buffer_unmap(buf, &info); + hr = IMediaSample_SetActualDataLength(sample, advance); + if(FAILED(hr)){ + gst_buffer_unmap(buf, &info); + gst_buffer_unref(buf); + WARN("SetActualDataLength failed: %08x\n", hr); + return GST_FLOW_FLUSHING; + } - if (GST_BUFFER_PTS_IS_VALID(buf)) { - REFERENCE_TIME rtStart = gst_segment_to_running_time(pin->segment, GST_FORMAT_TIME, buf->pts); - if (rtStart >= 0) - rtStart /= 100; - - if (GST_BUFFER_DURATION_IS_VALID(buf)) { - REFERENCE_TIME tStart = buf->pts / 100; - REFERENCE_TIME tStop = (buf->pts + buf->duration) / 100; - REFERENCE_TIME rtStop; - rtStop = gst_segment_to_running_time(pin->segment, GST_FORMAT_TIME, buf->pts + buf->duration); - if (rtStop >= 0) - rtStop /= 100; - TRACE("Current time on %p: %i to %i ms\n", pin, (int)(rtStart / 10000), (int)(rtStop / 10000)); - IMediaSample_SetTime(sample, &rtStart, rtStop >= 0 ? &rtStop : NULL); - IMediaSample_SetMediaTime(sample, &tStart, &tStop); + IMediaSample_GetPointer(sample, &ptr); + + memcpy(ptr, &info.data[position], advance); + + if (GST_BUFFER_PTS_IS_VALID(buf)) { + REFERENCE_TIME rtStart; + GstClockTime ptsStart = buf->pts; + if (position > 0 && pin->bytes_per_second) + ptsStart = buf->pts + gst_util_uint64_scale(position, GST_SECOND, pin->bytes_per_second); + rtStart = gst_segment_to_running_time(pin->segment, GST_FORMAT_TIME, ptsStart); + if (rtStart >= 0) + rtStart /= 100; + + if (GST_BUFFER_DURATION_IS_VALID(buf)) { + REFERENCE_TIME rtStop; + REFERENCE_TIME tStart; + REFERENCE_TIME tStop; + GstClockTime ptsStop = buf->pts + buf->duration; + if (position + advance < info.size && pin->bytes_per_second) + ptsStop = buf->pts + gst_util_uint64_scale(position + advance, GST_SECOND, pin->bytes_per_second); + tStart = ptsStart / 100; + tStop = ptsStop / 100; + rtStop = gst_segment_to_running_time(pin->segment, GST_FORMAT_TIME, ptsStop); + if (rtStop >= 0) + rtStop /= 100; + TRACE("Current time on %p: %i to %i ms\n", pin, (int)(rtStart / 10000), (int)(rtStop / 10000)); + IMediaSample_SetTime(sample, &rtStart, rtStop >= 0 ? &rtStop : NULL); + IMediaSample_SetMediaTime(sample, &tStart, &tStop); + } else { + IMediaSample_SetTime(sample, rtStart >= 0 ? &rtStart : NULL, NULL); + IMediaSample_SetMediaTime(sample, NULL, NULL); + } } else { - IMediaSample_SetTime(sample, rtStart >= 0 ? &rtStart : NULL, NULL); + IMediaSample_SetTime(sample, NULL, NULL); IMediaSample_SetMediaTime(sample, NULL, NULL); } - } else { - IMediaSample_SetTime(sample, NULL, NULL); - IMediaSample_SetMediaTime(sample, NULL, NULL); - } - IMediaSample_SetDiscontinuity(sample, GST_BUFFER_FLAG_IS_SET(buf, GST_BUFFER_FLAG_DISCONT)); - IMediaSample_SetPreroll(sample, GST_BUFFER_FLAG_IS_SET(buf, GST_BUFFER_FLAG_LIVE)); - IMediaSample_SetSyncPoint(sample, !GST_BUFFER_FLAG_IS_SET(buf, GST_BUFFER_FLAG_DELTA_UNIT)); + IMediaSample_SetDiscontinuity(sample, GST_BUFFER_FLAG_IS_SET(buf, GST_BUFFER_FLAG_DISCONT)); + IMediaSample_SetPreroll(sample, GST_BUFFER_FLAG_IS_SET(buf, GST_BUFFER_FLAG_LIVE)); + IMediaSample_SetSyncPoint(sample, !GST_BUFFER_FLAG_IS_SET(buf, GST_BUFFER_FLAG_DELTA_UNIT)); - if (!pin->pin.pin.peer) - hr = VFW_E_NOT_CONNECTED; - else - hr = IMemInputPin_Receive(pin->pin.pMemInputPin, sample); + if (!pin->pin.pin.peer) + hr = VFW_E_NOT_CONNECTED; + else + hr = IMemInputPin_Receive(pin->pin.pMemInputPin, sample); - TRACE("sending sample returned: %08x\n", hr); + TRACE("sending sample returned: %08x\n", hr); - gst_buffer_unref(buf); - IMediaSample_Release(sample); + IMediaSample_Release(sample); - if (hr == VFW_E_NOT_CONNECTED) - return GST_FLOW_NOT_LINKED; + if (hr == VFW_E_NOT_CONNECTED) + { + gst_buffer_unmap(buf, &info); + gst_buffer_unref(buf); + return GST_FLOW_NOT_LINKED; + } - if (FAILED(hr)) - return GST_FLOW_FLUSHING; + if (FAILED(hr)) + { + gst_buffer_unmap(buf, &info); + gst_buffer_unref(buf); + return GST_FLOW_FLUSHING; + } + + position += advance; + } + + gst_buffer_unmap(buf, &info); + gst_buffer_unref(buf); return GST_FLOW_OK; } @@ -2104,6 +2136,8 @@ static HRESULT WINAPI GSTOutPin_DecideBufferSize(struct strmbase_source *iface, { WAVEFORMATEX *format = (WAVEFORMATEX *)pin->pin.pin.mt.pbFormat; buffer_size = format->nAvgBytesPerSec; + + pin->bytes_per_second = format->nAvgBytesPerSec; } props->cBuffers = max(props->cBuffers, 1); -- 2.25.1

1 0

[PATCH v2] comctl32/tests: add test for getting listview data during sorting.
by Jiangyi Chen Dec. 24, 2020

Dec. 24, 2020

3 2

[PATCH] comdlg32: The app might strcmp api filter.
by longchao＠uniontech.com Dec. 24, 2020

Dec. 24, 2020

2 1

[PATCH] d3dx9: Avoid closing invalid handles.
by Akihiro Sagawa Dec. 23, 2020

Dec. 23, 2020

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50373 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/d3dx9_36/util.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)

3 4

[PATCH 1/3] shell32/tests: Remove no longer used parameter.
by Dmitry Timoshkov Dec. 23, 2020

Dec. 23, 2020

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/shell32/tests/shell32_test.h | 4 ++-- dlls/shell32/tests/shelllink.c | 23 +++++++++++------------ dlls/shell32/tests/shlexec.c | 4 ++-- 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/dlls/shell32/tests/shell32_test.h b/dlls/shell32/tests/shell32_test.h index 42a74fb2d5..89d08e70c0 100644 --- a/dlls/shell32/tests/shell32_test.h +++ b/dlls/shell32/tests/shell32_test.h @@ -33,5 +33,5 @@ typedef struct WORD hotkey; } lnk_desc_t; -#define create_lnk(a,b,c) create_lnk_(__LINE__, (a), (b), (c)) -void create_lnk_(int,const WCHAR*,lnk_desc_t*,int); +#define create_lnk(a,b) create_lnk_(__LINE__, (a), (b)) +void create_lnk_(int,const WCHAR*,lnk_desc_t*); diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index e4f176237f..4f650d801d 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -386,7 +386,7 @@ static void test_get_set(void) #define lok ok_(__FILE__, line) #define check_lnk(a,b,c) check_lnk_(__LINE__, (a), (b), (c)) -void create_lnk_(int line, const WCHAR* path, lnk_desc_t* desc, int save_fails) +void create_lnk_(int line, const WCHAR* path, lnk_desc_t* desc) { HRESULT r; IShellLinkA *sl; @@ -460,8 +460,7 @@ void create_lnk_(int line, const WCHAR* path, lnk_desc_t* desc, int save_fails) lok(str == NULL, "got %p\n", str); r = IPersistFile_Save(pf, path, TRUE); - todo_wine_if (save_fails) - lok(r == S_OK, "save failed (0x%08x)\n", r); + lok(r == S_OK, "save failed (0x%08x)\n", r); /* test GetCurFile after ::Save */ r = IPersistFile_GetCurFile(pf, &str); @@ -628,7 +627,7 @@ static void test_load_save(void) /* Save an empty .lnk file */ memset(&desc, 0, sizeof(desc)); - create_lnk(lnkfile, &desc, 0); + create_lnk(lnkfile, &desc); /* It should come back as a bunch of empty strings */ desc.description=""; @@ -648,7 +647,7 @@ static void test_load_save(void) desc.icon="c:\\nonexistent\\icon\\file"; desc.icon_id=1234; desc.hotkey=0; - create_lnk(lnkfile, &desc, 0); + create_lnk(lnkfile, &desc); check_lnk(lnkfile, &desc, 0x0); r=GetModuleFileNameA(NULL, mypath, sizeof(mypath)); @@ -672,7 +671,7 @@ static void test_load_save(void) desc.icon=mypath; desc.icon_id=0; desc.hotkey=0x1234; - create_lnk(lnkfile, &desc, 0); + create_lnk(lnkfile, &desc); check_lnk(lnkfile, &desc, 0x0); /* Test omitting .exe from an absolute path */ @@ -689,7 +688,7 @@ static void test_load_save(void) desc.icon=mypath; desc.icon_id=0; desc.hotkey=0x1234; - create_lnk(lnkfile, &desc, 0); + create_lnk(lnkfile, &desc); strcat(realpath, ".exe"); check_lnk(lnkfile, &desc, 0x4); @@ -703,7 +702,7 @@ static void test_load_save(void) desc.icon=mypath; desc.icon_id=0; desc.hotkey=0x1234; - create_lnk(lnkfile, &desc, 0); + create_lnk(lnkfile, &desc); /* Check that link is created to proper location */ SearchPathA( NULL, desc.path, NULL, MAX_PATH, realpath, NULL); desc.path=realpath; @@ -719,7 +718,7 @@ static void test_load_save(void) desc.icon=mypath; desc.icon_id=0; desc.hotkey=0x1234; - create_lnk(lnkfile, &desc, 0); + create_lnk(lnkfile, &desc); /* Check that link is created to proper location */ SearchPathA( NULL, "rundll32", NULL, MAX_PATH, realpath, NULL); desc.path=realpath; @@ -750,7 +749,7 @@ static void test_load_save(void) desc.icon=mypath; desc.icon_id=0; desc.hotkey=0x1234; - create_lnk(lnkfile, &desc, 0); + create_lnk(lnkfile, &desc); check_lnk(lnkfile, &desc, 0x0); r = GetShortPathNameA(mydir, mypath, sizeof(mypath)); @@ -770,7 +769,7 @@ static void test_load_save(void) desc.icon=mypath; desc.icon_id=0; desc.hotkey=0x1234; - create_lnk(lnkfile, &desc, 0); + create_lnk(lnkfile, &desc); desc.path=realpath; check_lnk(lnkfile, &desc, 0x0); @@ -800,7 +799,7 @@ static void test_load_save(void) desc.icon=mypath; desc.icon_id=0; desc.hotkey=0x1234; - create_lnk(lnkfile, &desc, 0); + create_lnk(lnkfile, &desc); desc.path = realpath; check_lnk(lnkfile, &desc, 0x4); diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 8ee662321d..2481fb6faa 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -2742,7 +2742,7 @@ static void init_test(void) desc.icon=NULL; desc.icon_id=0; desc.hotkey=0; - create_lnk(lnkfile, &desc, 0); + create_lnk(lnkfile, &desc); sprintf(filename, "%s\\test_shortcut_exe.lnk", tmpdir); MultiByteToWideChar(CP_ACP, 0, filename, -1, lnkfile, ARRAY_SIZE(lnkfile)); @@ -2756,7 +2756,7 @@ static void init_test(void) desc.icon=NULL; desc.icon_id=0; desc.hotkey=0; - create_lnk(lnkfile, &desc, 0); + create_lnk(lnkfile, &desc); /* Create a basic association suitable for most tests */ if (!create_test_association(".shlexec")) -- 2.29.2

2 2

[PATCH 3/3] shell32: IPersistFile::Save(NULL) should use previously stored file name.
by Dmitry Timoshkov Dec. 23, 2020

Dec. 23, 2020

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/shell32/shelllink.c | 14 ++++++++++---- dlls/shell32/tests/shelllink.c | 10 ++++++++++ 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index 5b044d4be1..23c5935a7b 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -367,7 +367,10 @@ static HRESULT WINAPI IPersistFile_fnSave(IPersistFile* iface, LPCOLESTR pszFile TRACE("(%p)->(%s)\n",This,debugstr_w(pszFileName)); if (!pszFileName) - return E_FAIL; + { + pszFileName = This->filepath; + fRemember = FALSE; + } r = SHCreateStreamOnFileW( pszFileName, STGM_READWRITE | STGM_CREATE | STGM_SHARE_EXCLUSIVE, &stm ); if( SUCCEEDED( r ) ) @@ -379,9 +382,12 @@ static HRESULT WINAPI IPersistFile_fnSave(IPersistFile* iface, LPCOLESTR pszFile { StartLinkProcessor( pszFileName ); - /* update file path */ - heap_free(This->filepath); - This->filepath = strdupW(pszFileName); + if (fRemember) + { + /* update file path */ + heap_free(This->filepath); + This->filepath = strdupW(pszFileName); + } This->bDirty = FALSE; } diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index 20c48814f1..21e9107fa6 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -467,6 +467,16 @@ void create_lnk_(int line, const WCHAR* path, lnk_desc_t* desc) lok(!wcscmp(path, str), "Expected %s, got %s\n", wine_dbgstr_w(path), wine_dbgstr_w(str)); CoTaskMemFree(str); + r = IPersistFile_Save(pf, NULL, TRUE); + lok(r == S_OK, "save failed (0x%08x)\n", r); + + /* test GetCurFile after ::Save */ + r = IPersistFile_GetCurFile(pf, &str); + lok(r == S_OK, "got 0x%08x\n", r); + lok(str != NULL, "Didn't expect NULL\n"); + lok(!wcscmp(path, str), "Expected %s, got %s\n", wine_dbgstr_w(path), wine_dbgstr_w(str)); + CoTaskMemFree(str); + IPersistFile_Release(pf); } -- 2.29.2

1 0

[PATCH 2/3] shell32/tests: Remove workarounds for shell32 < 5.0.
by Dmitry Timoshkov Dec. 23, 2020

Dec. 23, 2020

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/shell32/tests/shelllink.c | 39 +++++++--------------------------- 1 file changed, 8 insertions(+), 31 deletions(-) diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index 4f650d801d..20c48814f1 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -454,9 +454,7 @@ void create_lnk_(int line, const WCHAR* path, lnk_desc_t* desc) /* test GetCurFile before ::Save */ str = (LPWSTR)0xdeadbeef; r = IPersistFile_GetCurFile(pf, &str); - lok(r == S_FALSE || - broken(r == S_OK), /* shell32 < 5.0 */ - "got 0x%08x\n", r); + lok(r == S_FALSE, "got 0x%08x\n", r); lok(str == NULL, "got %p\n", str); r = IPersistFile_Save(pf, path, TRUE); @@ -465,16 +463,9 @@ void create_lnk_(int line, const WCHAR* path, lnk_desc_t* desc) /* test GetCurFile after ::Save */ r = IPersistFile_GetCurFile(pf, &str); lok(r == S_OK, "got 0x%08x\n", r); - lok(str != NULL || - broken(str == NULL), /* shell32 < 5.0 */ - "Didn't expect NULL\n"); - if (str) - { - lok(!wcscmp(path, str), "Expected %s, got %s\n", wine_dbgstr_w(path), wine_dbgstr_w(str)); - CoTaskMemFree(str); - } - else - win_skip("GetCurFile fails on shell32 < 5.0\n"); + lok(str != NULL, "Didn't expect NULL\n"); + lok(!wcscmp(path, str), "Expected %s, got %s\n", wine_dbgstr_w(path), wine_dbgstr_w(str)); + CoTaskMemFree(str); IPersistFile_Release(pf); } @@ -507,9 +498,7 @@ static void check_lnk_(int line, const WCHAR* path, lnk_desc_t* desc, int todo) /* test GetCurFile before ::Load */ str = (LPWSTR)0xdeadbeef; r = IPersistFile_GetCurFile(pf, &str); - lok(r == S_FALSE || - broken(r == S_OK), /* shell32 < 5.0 */ - "got 0x%08x\n", r); + lok(r == S_FALSE, "got 0x%08x\n", r); lok(str == NULL, "got %p\n", str); r = IPersistFile_Load(pf, path, STGM_READ); @@ -518,23 +507,11 @@ static void check_lnk_(int line, const WCHAR* path, lnk_desc_t* desc, int todo) /* test GetCurFile after ::Save */ r = IPersistFile_GetCurFile(pf, &str); lok(r == S_OK, "got 0x%08x\n", r); - lok(str != NULL || - broken(str == NULL), /* shell32 < 5.0 */ - "Didn't expect NULL\n"); - if (str != NULL) - { - lok(!wcscmp(path, str), "Expected %s, got %s\n", wine_dbgstr_w(path), wine_dbgstr_w(str)); - CoTaskMemFree(str); - } - else - win_skip("GetCurFile fails on shell32 < 5.0\n"); + lok(str != NULL, "Didn't expect NULL\n"); + lok(!wcscmp(path, str), "Expected %s, got %s\n", wine_dbgstr_w(path), wine_dbgstr_w(str)); + CoTaskMemFree(str); IPersistFile_Release(pf); - if (r != S_OK) - { - IShellLinkA_Release(sl); - return; - } if (desc->description) { -- 2.29.2

1 0

Looking for TestBot help
by Francois Gouget Dec. 23, 2020

Dec. 23, 2020

In these freezing times I'm looking for volunteers to help with three TestBot related tasks: * Modify WineTest to detect which tests can be run by running 'xxx_test --list' and automatically detecting and dismissing the "Missing dll" / "Missing entrypoint" dialogs. This would fix a lot of issues with tests not being run when they should: - Detect and report WineTest's "load errors" https://bugs.winehq.org/show_bug.cgi?id=48062 - Detect missing entry point errors https://bugs.winehq.org/show_bug.cgi?id=48208 * Alternatively the same type of change is needed for the TestBot's TestLauncher where it would replace AllImportedDllsPresent(): https://source.winehq.org/git/tools.git/blob/HEAD:/testbot/src/TestLauncher… There too it will help with a lot of issues: - TestLauncher says a required DLL is missing, but the test runs fine without TestLauncher https://bugs.winehq.org/show_bug.cgi?id=31609 But I expect that once this is done on one side it will be easy to port to the other. So the choice of codebase is yours. * Write or find a Windows tool to automatically take a screenshot every few seconds and deduplicate identical screenshots. The requirements are: - Open-source of course. - No dependency (so if using an off-the-shelf tool it should not require installing some language runtime, etc). - Must support multi-screen configurations, even with slightly different resolutions. - Will eventually need to be used by the TestBot through TestAgentd, either by running this external tool, or be integrated in TestAgentd itself. The same functionality will be needed on Unix. If that's not possible with a Windows tool this may turn into a separate project to do the same on the Unix side. There I expect some scriptable open-source tools to already exist but if one tool can do it all that would be simpler. - Take live/regular screenshots https://bugs.winehq.org/show_bug.cgi?id=44709 In the meantime I'll continue refreshing the test VMs, and working on the website and Engine perl side of things (but if there are volunteers for that you're welcome too). -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ Theory is where you know everything but nothing works. Practice is where everything works but nobody knows why. Sometimes they go hand in hand: nothing works and nobody knows why.

3 5

[PATCH] ntdll: Preserve syscall frame when calling async IO system APC.
by Paul Gofman Dec. 23, 2020

Dec. 23, 2020

The frame can currently be reset from ws2_32.dll async IO callbacks which are still in the user part and are calling 'syscall' functions. If the user APC is processed after that during the same call to server_select(), the call_user_apc_dispatcher() faults. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49782 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntdll/unix/server.c | 16 ++++++++++++++++ dlls/ntdll/unix/signal_arm.c | 9 +++++++++ dlls/ntdll/unix/signal_arm64.c | 10 ++++++++++ dlls/ntdll/unix/signal_i386.c | 10 ++++++++++ dlls/ntdll/unix/signal_x86_64.c | 9 +++++++++ dlls/ntdll/unix/unix_private.h | 3 +++ 6 files changed, 57 insertions(+) diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index 87dd4b10b83..a9608abfb73 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -389,8 +389,24 @@ static void invoke_system_apc( const apc_call_t *call, apc_result_t *result ) { IO_STATUS_BLOCK *iosb = wine_server_get_ptr( call->async_io.sb ); NTSTATUS (**user)(void *, IO_STATUS_BLOCK *, NTSTATUS) = wine_server_get_ptr( call->async_io.user ); + void *saved_frame = get_syscall_frame(); + void *frame; + result->type = call->type; result->async_io.status = (*user)( user, iosb, call->async_io.status ); + + if ((frame = get_syscall_frame()) != saved_frame) + { + /* The frame can be altered by syscalls from ws2_32 async callbacks + * which are currently in the user part. */ + static unsigned int once; + + if (!once++) + FIXME( "syscall frame changed in APC function, frame %p, saved_frame %p.\n", frame, saved_frame ); + + set_syscall_frame( saved_frame ); + } + if (result->async_io.status != STATUS_PENDING) result->async_io.total = iosb->Information; break; diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index e8971d22dbd..487c8501cc7 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -203,6 +203,15 @@ static inline struct arm_thread_data *arm_thread_data(void) return (struct arm_thread_data *)ntdll_get_thread_data()->cpu_data; } +void *get_syscall_frame(void) +{ + return arm_thread_data()->syscall_frame; +} + +void set_syscall_frame(void *frame) +{ + arm_thread_data()->syscall_frame = frame; +} /*********************************************************************** * unwind_builtin_dll diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index 3beef729dca..95042de45e1 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -157,6 +157,16 @@ static inline struct arm64_thread_data *arm64_thread_data(void) return (struct arm64_thread_data *)ntdll_get_thread_data()->cpu_data; } +void *get_syscall_frame(void) +{ + return arm64_thread_data()->syscall_frame; +} + +void set_syscall_frame(void *frame) +{ + arm64_thread_data()->syscall_frame = frame; +} + extern void raise_func_trampoline( EXCEPTION_RECORD *rec, CONTEXT *context, void *dispatcher ); /*********************************************************************** diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index c8690b51f2f..ff9d8a12c14 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -495,6 +495,16 @@ static inline struct x86_thread_data *x86_thread_data(void) return (struct x86_thread_data *)ntdll_get_thread_data()->cpu_data; } +void *get_syscall_frame(void) +{ + return x86_thread_data()->syscall_frame; +} + +void set_syscall_frame(void *frame) +{ + x86_thread_data()->syscall_frame = frame; +} + static inline WORD get_cs(void) { WORD res; __asm__( "movw %%cs,%0" : "=r" (res) ); return res; } static inline WORD get_ds(void) { WORD res; __asm__( "movw %%ds,%0" : "=r" (res) ); return res; } static inline WORD get_fs(void) { WORD res; __asm__( "movw %%fs,%0" : "=r" (res) ); return res; } diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 837cd9ed654..1fd26d5bd76 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -306,6 +306,15 @@ static inline struct amd64_thread_data *amd64_thread_data(void) return (struct amd64_thread_data *)ntdll_get_thread_data()->cpu_data; } +void *get_syscall_frame(void) +{ + return amd64_thread_data()->syscall_frame; +} + +void set_syscall_frame(void *frame) +{ + amd64_thread_data()->syscall_frame = frame; +} /*********************************************************************** * Definitions for Dwarf unwind tables diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 23731f0fdc6..f8f50d0ab27 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -247,6 +247,9 @@ extern void WINAPI DECLSPEC_NORETURN call_user_exception_dispatcher( EXCEPTION_R NTSTATUS (WINAPI *dispatcher)(EXCEPTION_RECORD*,CONTEXT*) ) DECLSPEC_HIDDEN; extern void WINAPI DECLSPEC_NORETURN call_raise_user_exception_dispatcher( NTSTATUS (WINAPI *dispatcher)(void) ) DECLSPEC_HIDDEN; +extern void *get_syscall_frame(void) DECLSPEC_HIDDEN; +extern void set_syscall_frame(void *frame) DECLSPEC_HIDDEN; + #define TICKSPERSEC 10000000 #define SECS_1601_TO_1970 ((369 * 365 + 89) * (ULONGLONG)86400) -- 2.29.2

1 0

[PATCH] msado15: Set row_set point to NULL on close
by Alistair Leslie-Hughes Dec. 23, 2020

Dec. 23, 2020

Stops a crash when Close then Release is called on a Recordset. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msado15/recordset.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index 17200d73790..e915922fdc4 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -760,6 +760,7 @@ static void close_recordset( struct recordset *recordset ) ULONG row, col, col_count; if ( recordset->row_set ) IRowset_Release( recordset->row_set ); + recordset->row_set = NULL; if (!recordset->fields) return; col_count = get_column_count( recordset ); -- 2.29.2

1 0

[PATCH] msado15/tests: Add test for interface ADOConnectionConstruction15
by Alistair Leslie-Hughes Dec. 23, 2020

Dec. 23, 2020

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msado15/tests/msado15.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index cafb73d64e4..8b08e8af193 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -1024,6 +1024,7 @@ static void test_Connection(void) IRunnableObject *runtime; ISupportErrorInfo *errorinfo; IConnectionPointContainer *pointcontainer; + ADOConnectionConstruction15 *construct; LONG state, timeout; BSTR str, str2, str3; ConnectModeEnum mode; @@ -1044,6 +1045,11 @@ static void test_Connection(void) ok(hr == S_OK, "Failed to get IConnectionPointContainer interface %08x\n", hr); IConnectionPointContainer_Release(pointcontainer); + hr = _Connection_QueryInterface(connection, &IID_ADOConnectionConstruction15, (void**)&construct); + todo_wine ok(hr == S_OK, "Failed to get ADOConnectionConstruction15 interface %08x\n", hr); + if (hr == S_OK) + ADOConnectionConstruction15_Release(construct); + if (0) /* Crashes on windows */ { hr = _Connection_get_State(connection, NULL); -- 2.29.2

1 0

[PATCH v2] comctl32/tests: add test for getting listview data during sorting.
by Jiangyi Chen Dec. 23, 2020

Dec. 23, 2020

1 0

[PATCH v2] kernelbase: Ignore SORT_DIGITSASNUMBERS in CompareStringEx()
by John Zourlios Dec. 22, 2020

Dec. 22, 2020

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50362 Signed-off-by: John Zourlios <john.kinigos(a)gmail.com> --- dlls/kernelbase/locale.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index c60b796aa48..51085f4377a 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -3021,7 +3021,7 @@ INT WINAPI CompareStringEx( const WCHAR *locale, DWORD flags, const WCHAR *str1, { DWORD supported_flags = NORM_IGNORECASE | NORM_IGNORENONSPACE | NORM_IGNORESYMBOLS | SORT_STRINGSORT | NORM_IGNOREKANATYPE | NORM_IGNOREWIDTH | LOCALE_USE_CP_ACP; - DWORD semistub_flags = NORM_LINGUISTIC_CASING | LINGUISTIC_IGNORECASE | 0x10000000; + DWORD semistub_flags = NORM_LINGUISTIC_CASING | LINGUISTIC_IGNORECASE | 0x10000000 | SORT_DIGITSASNUMBERS; /* 0x10000000 is related to diacritics in Arabic, Japanese, and Hebrew */ INT ret; static int once; -- 2.29.2

2 1

[PATCH] qcap: Avoid unused variable warning if v4l is absent.
by Huw Davies Dec. 22, 2020

Dec. 22, 2020

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/qcap/v4l.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index da09b2b26d6..ccc06194b99 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -57,10 +57,9 @@ #include "qcap_private.h" #include "winternl.h" -WINE_DEFAULT_DEBUG_CHANNEL(qcap); - #ifdef HAVE_LINUX_VIDEODEV2_H +WINE_DEFAULT_DEBUG_CHANNEL(qcap); WINE_DECLARE_DEBUG_CHANNEL(winediag); static typeof(open) *video_open = open; -- 2.23.0

2 1

[PATCH] programs/ping: add IcmpCloseHandle(icmp_file) and fix a memory leak.
by Jiangyi Chen Dec. 22, 2020

Dec. 22, 2020

2 1

[PATCH] shell32: Return S_OK from IShellLink::SetFlags() stub.
by Dmitry Timoshkov Dec. 22, 2020

Dec. 22, 2020

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/shell32/shelllink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index 5b044d4be1..46d9bc994f 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -2297,7 +2297,7 @@ static HRESULT WINAPI ShellLink_SetFlags( IShellLinkDataList* iface, DWORD dwFlags ) { FIXME("(%p)->(%u): stub\n", iface, dwFlags); - return E_NOTIMPL; + return S_OK; } static const IShellLinkDataListVtbl dlvt = -- 2.29.2

1 0

[PATCH] dwrite: Add a notice regarding HarfBuzz.
by Nikolay Sivov Dec. 22, 2020

Dec. 22, 2020

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/shape.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/dwrite/shape.c b/dlls/dwrite/shape.c index 82eb5308da6..be8a69c27c4 100644 --- a/dlls/dwrite/shape.c +++ b/dlls/dwrite/shape.c @@ -17,6 +17,11 @@ * 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 + * + * + * Shaping features processing, default features, and lookups handling logic are + * derived from HarfBuzz implementation. Consult project documentation for the full + * list of its authors. */ #define COBJMACROS -- 2.29.2

1 0

[PATCH 2/2] wbemprox: Flesh out a bit SystemRestore::Enable() implementation.
by Dmitry Timoshkov Dec. 22, 2020

Dec. 22, 2020

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wbemprox/sysrestore.c | 48 +++++++++++++++++++++++++++++++++++-- dlls/wbemprox/tests/query.c | 2 +- 2 files changed, 47 insertions(+), 3 deletions(-) diff --git a/dlls/wbemprox/sysrestore.c b/dlls/wbemprox/sysrestore.c index b840d220b5..d59077381f 100644 --- a/dlls/wbemprox/sysrestore.c +++ b/dlls/wbemprox/sysrestore.c @@ -45,8 +45,52 @@ HRESULT disable_restore( IWbemClassObject *obj, IWbemClassObject *in, IWbemClass HRESULT enable_restore( IWbemClassObject *obj, IWbemClassObject *in, IWbemClassObject **out ) { - FIXME("stub\n"); - return S_OK; + VARIANT drive, retval; + IWbemClassObject *sig, *out_params = NULL; + HRESULT hr; + + TRACE("%p, %p\n", in, out); + + hr = IWbemClassObject_Get( in, L"Drive", 0, &drive, NULL, NULL ); + if (hr != S_OK) return hr; + + hr = create_signature( L"SystemRestore", L"Enable", PARAM_OUT, &sig ); + if (hr != S_OK) + { + VariantClear( &drive ); + return hr; + } + + if (out) + { + hr = IWbemClassObject_SpawnInstance( sig, 0, &out_params ); + if (hr != S_OK) + { + VariantClear( &drive ); + IWbemClassObject_Release( sig ); + return hr; + } + } + + FIXME("%s: stub\n", wine_dbgstr_variant(&drive)); + + VariantClear( &drive ); + IWbemClassObject_Release( sig ); + + if (out_params) + { + set_variant( VT_UI4, ERROR_SUCCESS, NULL, &retval ); + hr = IWbemClassObject_Put( out_params, L"ReturnValue", 0, &retval, CIM_UINT32 ); + } + + if (hr == S_OK && out) + { + *out = out_params; + IWbemClassObject_AddRef( out_params ); + } + if (out_params) IWbemClassObject_Release( out_params ); + + return hr; } HRESULT get_last_restore_status( IWbemClassObject *obj, IWbemClassObject *in, IWbemClassObject **out ) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 1c7a615dd4..67c0b218ce 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1805,7 +1805,7 @@ static void test_SystemRestore( IWbemServices *services ) out = NULL; hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, in, &out, NULL ); ok( hr == S_OK || hr == WBEM_E_ACCESS_DENIED, "failed to execute method %08x\n", hr ); - if (hr == S_OK && out) + if (hr == S_OK) { VariantInit( &var ); hr = IWbemClassObject_Get( out, L"ReturnValue", 0, &var, NULL, NULL ); -- 2.29.2

1 0

[PATCH] comctl32/tests: add test for getting listview data during sorting.
by Jiangyi Chen Dec. 22, 2020

Dec. 22, 2020

3 2

[PATCH] conhost: Fix copy-paste typos in selection coordinates.
by Jacek Caban Dec. 21, 2020

Dec. 21, 2020

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50052 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/window.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

1 0

[PATCH] amstream/tests: Define NONAMELESSUNION.
by Zebediah Figura Dec. 21, 2020

Dec. 21, 2020

Old versions of gcc allow nameless unions, but can't parse them in designated initializers. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50378 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/amstream/tests/amstream.c | 255 +++++++++++++++++---------------- 1 file changed, 128 insertions(+), 127 deletions(-) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 279b040339c..648d5ee93c3 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -19,6 +19,7 @@ */ #define COBJMACROS +#define NONAMELESSUNION #include "wine/test.h" #include "dshow.h" @@ -79,7 +80,7 @@ static const VIDEOINFO rgb565_video_info = .bmiHeader.biPlanes = 1, .bmiHeader.biBitCount = 16, .bmiHeader.biCompression = BI_BITFIELDS, - .dwBitMasks = {0xf800, 0x07e0, 0x001f}, + .u.dwBitMasks = {0xf800, 0x07e0, 0x001f}, }; static const VIDEOINFO rgb24_video_info = @@ -158,7 +159,7 @@ static const DDSURFACEDESC rgb8_format = .dwFlags = DDSD_PIXELFORMAT, .ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT), .ddpfPixelFormat.dwFlags = DDPF_RGB | DDPF_PALETTEINDEXED8, - .ddpfPixelFormat.dwRGBBitCount = 8, + .ddpfPixelFormat.u1.dwRGBBitCount = 8, }; static const DDSURFACEDESC rgb555_format = @@ -167,10 +168,10 @@ static const DDSURFACEDESC rgb555_format = .dwFlags = DDSD_PIXELFORMAT, .ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT), .ddpfPixelFormat.dwFlags = DDPF_RGB, - .ddpfPixelFormat.dwRGBBitCount = 16, - .ddpfPixelFormat.dwRBitMask = 0x7c00, - .ddpfPixelFormat.dwGBitMask = 0x03e0, - .ddpfPixelFormat.dwBBitMask = 0x001f, + .ddpfPixelFormat.u1.dwRGBBitCount = 16, + .ddpfPixelFormat.u2.dwRBitMask = 0x7c00, + .ddpfPixelFormat.u3.dwGBitMask = 0x03e0, + .ddpfPixelFormat.u4.dwBBitMask = 0x001f, }; static const DDSURFACEDESC rgb565_format = @@ -179,10 +180,10 @@ static const DDSURFACEDESC rgb565_format = .dwFlags = DDSD_PIXELFORMAT, .ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT), .ddpfPixelFormat.dwFlags = DDPF_RGB, - .ddpfPixelFormat.dwRGBBitCount = 16, - .ddpfPixelFormat.dwRBitMask = 0xf800, - .ddpfPixelFormat.dwGBitMask = 0x07e0, - .ddpfPixelFormat.dwBBitMask = 0x001f, + .ddpfPixelFormat.u1.dwRGBBitCount = 16, + .ddpfPixelFormat.u2.dwRBitMask = 0xf800, + .ddpfPixelFormat.u3.dwGBitMask = 0x07e0, + .ddpfPixelFormat.u4.dwBBitMask = 0x001f, }; static const DDSURFACEDESC rgb24_format = @@ -191,10 +192,10 @@ static const DDSURFACEDESC rgb24_format = .dwFlags = DDSD_PIXELFORMAT, .ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT), .ddpfPixelFormat.dwFlags = DDPF_RGB, - .ddpfPixelFormat.dwRGBBitCount = 24, - .ddpfPixelFormat.dwRBitMask = 0xff0000, - .ddpfPixelFormat.dwGBitMask = 0x00ff00, - .ddpfPixelFormat.dwBBitMask = 0x0000ff, + .ddpfPixelFormat.u1.dwRGBBitCount = 24, + .ddpfPixelFormat.u2.dwRBitMask = 0xff0000, + .ddpfPixelFormat.u3.dwGBitMask = 0x00ff00, + .ddpfPixelFormat.u4.dwBBitMask = 0x0000ff, }; static const DDSURFACEDESC rgb32_format = @@ -203,10 +204,10 @@ static const DDSURFACEDESC rgb32_format = .dwFlags = DDSD_PIXELFORMAT, .ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT), .ddpfPixelFormat.dwFlags = DDPF_RGB, - .ddpfPixelFormat.dwRGBBitCount = 32, - .ddpfPixelFormat.dwRBitMask = 0xff0000, - .ddpfPixelFormat.dwGBitMask = 0x00ff00, - .ddpfPixelFormat.dwBBitMask = 0x0000ff, + .ddpfPixelFormat.u1.dwRGBBitCount = 32, + .ddpfPixelFormat.u2.dwRBitMask = 0xff0000, + .ddpfPixelFormat.u3.dwGBitMask = 0x00ff00, + .ddpfPixelFormat.u4.dwBBitMask = 0x0000ff, }; static const DDSURFACEDESC argb32_format = @@ -215,11 +216,11 @@ static const DDSURFACEDESC argb32_format = .dwFlags = DDSD_PIXELFORMAT, .ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT), .ddpfPixelFormat.dwFlags = DDPF_RGB | DDPF_ALPHAPIXELS, - .ddpfPixelFormat.dwRGBBitCount = 32, - .ddpfPixelFormat.dwRBitMask = 0xff0000, - .ddpfPixelFormat.dwGBitMask = 0x00ff00, - .ddpfPixelFormat.dwBBitMask = 0x0000ff, - .ddpfPixelFormat.dwRGBAlphaBitMask = 0xff000000, + .ddpfPixelFormat.u1.dwRGBBitCount = 32, + .ddpfPixelFormat.u2.dwRBitMask = 0xff0000, + .ddpfPixelFormat.u3.dwGBitMask = 0x00ff00, + .ddpfPixelFormat.u4.dwBBitMask = 0x0000ff, + .ddpfPixelFormat.u5.dwRGBAlphaBitMask = 0xff000000, }; static const DDSURFACEDESC yuy2_format = @@ -229,7 +230,7 @@ static const DDSURFACEDESC yuy2_format = .ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT), .ddpfPixelFormat.dwFlags = DDPF_FOURCC, .ddpfPixelFormat.dwFourCC = MAKEFOURCC('Y', 'U', 'Y', '2'), - .ddpfPixelFormat.dwYUVBitCount = 16, + .ddpfPixelFormat.u1.dwYUVBitCount = 16, }; static const DDSURFACEDESC yv12_format = @@ -239,7 +240,7 @@ static const DDSURFACEDESC yv12_format = .ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT), .ddpfPixelFormat.dwFlags = DDPF_FOURCC, .ddpfPixelFormat.dwFourCC = MAKEFOURCC('Y', 'V', '1', '2'), - .ddpfPixelFormat.dwYUVBitCount = 12, + .ddpfPixelFormat.u1.dwYUVBitCount = 12, }; static const WCHAR primary_video_sink_id[] = L"I{A35FF56A-9FDA-11D0-8FDF-00C04FD9189D}"; @@ -3799,9 +3800,9 @@ static void test_ddrawstream_receive_connection(void) ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); format = yuy2_format; - format.ddpfPixelFormat.dwRBitMask = 0xf800; - format.ddpfPixelFormat.dwGBitMask = 0x07e0; - format.ddpfPixelFormat.dwBBitMask = 0x001f; + format.ddpfPixelFormat.u2.dwRBitMask = 0xf800; + format.ddpfPixelFormat.u3.dwGBitMask = 0x07e0; + format.ddpfPixelFormat.u4.dwBBitMask = 0x001f; hr = IDirectDrawMediaStream_SetFormat(ddraw_stream, &format, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -5116,7 +5117,7 @@ static void test_ddrawstream_set_format(void) .dwFlags = DDSD_PIXELFORMAT, .ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT), .ddpfPixelFormat.dwFlags = DDPF_RGB | DDPF_PALETTEINDEXED1, - .ddpfPixelFormat.dwRGBBitCount = 1, + .ddpfPixelFormat.u1.dwRGBBitCount = 1, }; static const DDSURFACEDESC rgb2_format = { @@ -5124,7 +5125,7 @@ static void test_ddrawstream_set_format(void) .dwFlags = DDSD_PIXELFORMAT, .ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT), .ddpfPixelFormat.dwFlags = DDPF_RGB | DDPF_PALETTEINDEXED2, - .ddpfPixelFormat.dwRGBBitCount = 2, + .ddpfPixelFormat.u1.dwRGBBitCount = 2, }; static const DDSURFACEDESC rgb4_format = { @@ -5132,7 +5133,7 @@ static void test_ddrawstream_set_format(void) .dwFlags = DDSD_PIXELFORMAT, .ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT), .ddpfPixelFormat.dwFlags = DDPF_RGB | DDPF_PALETTEINDEXED4, - .ddpfPixelFormat.dwRGBBitCount = 4, + .ddpfPixelFormat.u1.dwRGBBitCount = 4, }; static const DDSURFACEDESC rgb4to8_format = { @@ -5140,7 +5141,7 @@ static void test_ddrawstream_set_format(void) .dwFlags = DDSD_PIXELFORMAT, .ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT), .ddpfPixelFormat.dwFlags = DDPF_RGB | DDPF_PALETTEINDEXEDTO8, - .ddpfPixelFormat.dwRGBBitCount = 4, + .ddpfPixelFormat.u1.dwRGBBitCount = 4, }; static const DDSURFACEDESC rgb332_format = { @@ -5148,10 +5149,10 @@ static void test_ddrawstream_set_format(void) .dwFlags = DDSD_PIXELFORMAT, .ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT), .ddpfPixelFormat.dwFlags = DDPF_RGB, - .ddpfPixelFormat.dwRGBBitCount = 8, - .ddpfPixelFormat.dwRBitMask = 0xe0, - .ddpfPixelFormat.dwGBitMask = 0x1c, - .ddpfPixelFormat.dwBBitMask = 0x03, + .ddpfPixelFormat.u1.dwRGBBitCount = 8, + .ddpfPixelFormat.u2.dwRBitMask = 0xe0, + .ddpfPixelFormat.u3.dwGBitMask = 0x1c, + .ddpfPixelFormat.u4.dwBBitMask = 0x03, }; IDirectDrawMediaStream *ddraw_stream; @@ -5231,19 +5232,19 @@ static void test_ddrawstream_set_format(void) check_ddrawstream_set_format(ddraw_stream, &format, NULL, DDERR_INVALIDSURFACETYPE); format = rgb565_format; - format.ddpfPixelFormat.dwRBitMask = 0x001f; - format.ddpfPixelFormat.dwGBitMask = 0x07e0; - format.ddpfPixelFormat.dwBBitMask = 0xf800; + format.ddpfPixelFormat.u2.dwRBitMask = 0x001f; + format.ddpfPixelFormat.u3.dwGBitMask = 0x07e0; + format.ddpfPixelFormat.u4.dwBBitMask = 0xf800; check_ddrawstream_set_format(ddraw_stream, &format, NULL, DDERR_INVALIDSURFACETYPE); format = rgb32_format; - format.ddpfPixelFormat.dwRBitMask = 0x00ff00; - format.ddpfPixelFormat.dwGBitMask = 0x0000ff; - format.ddpfPixelFormat.dwBBitMask = 0xff0000; + format.ddpfPixelFormat.u2.dwRBitMask = 0x00ff00; + format.ddpfPixelFormat.u3.dwGBitMask = 0x0000ff; + format.ddpfPixelFormat.u4.dwBBitMask = 0xff0000; check_ddrawstream_set_format(ddraw_stream, &format, NULL, DDERR_INVALIDSURFACETYPE); format = yuy2_format; - format.ddpfPixelFormat.dwYUVBitCount = 0; + format.ddpfPixelFormat.u1.dwYUVBitCount = 0; check_ddrawstream_set_format(ddraw_stream, &format, NULL, E_INVALIDARG); format = rgb32_format; @@ -5289,10 +5290,10 @@ static void test_ddrawstream_set_format(void) "Got subtype %s.\n", wine_dbgstr_guid(&source.source.pin.mt.subtype)); hr = IDirectDrawMediaStream_GetFormat(ddraw_stream, &current_format, NULL, &desired_format, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(current_format.ddpfPixelFormat.dwRGBBitCount == 8, - "Got rgb bit count %u.\n", current_format.ddpfPixelFormat.dwRGBBitCount); - ok(desired_format.ddpfPixelFormat.dwRGBBitCount == 8, - "Got rgb bit count %u.\n", desired_format.ddpfPixelFormat.dwRGBBitCount); + ok(current_format.ddpfPixelFormat.u1.dwRGBBitCount == 8, + "Got rgb bit count %u.\n", current_format.ddpfPixelFormat.u1.dwRGBBitCount); + ok(desired_format.ddpfPixelFormat.u1.dwRGBBitCount == 8, + "Got rgb bit count %u.\n", desired_format.ddpfPixelFormat.u1.dwRGBBitCount); format = rgb555_format; format.dwFlags = 0; @@ -5312,10 +5313,10 @@ static void test_ddrawstream_set_format(void) "Got subtype %s.\n", wine_dbgstr_guid(&source.source.pin.mt.subtype)); hr = IDirectDrawMediaStream_GetFormat(ddraw_stream, &current_format, NULL, &desired_format, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(current_format.ddpfPixelFormat.dwRGBBitCount == 16, - "Got rgb bit count %u.\n", current_format.ddpfPixelFormat.dwRGBBitCount); - ok(desired_format.ddpfPixelFormat.dwRGBBitCount == 16, - "Got rgb bit count %u.\n", desired_format.ddpfPixelFormat.dwRGBBitCount); + ok(current_format.ddpfPixelFormat.u1.dwRGBBitCount == 16, + "Got rgb bit count %u.\n", current_format.ddpfPixelFormat.u1.dwRGBBitCount); + ok(desired_format.ddpfPixelFormat.u1.dwRGBBitCount == 16, + "Got rgb bit count %u.\n", desired_format.ddpfPixelFormat.u1.dwRGBBitCount); video_info = rgb555_video_info; video_info.bmiHeader.biWidth = 222; @@ -7189,7 +7190,7 @@ static void test_ddrawstream_create_sample(void) ok(desc.dwWidth == 100, "Expected width 100, got %d.\n", desc.dwWidth); ok(desc.dwHeight == 100, "Expected height 100, got %d.\n", desc.dwHeight); ok(desc.ddpfPixelFormat.dwFlags == DDPF_RGB, "Expected format flags DDPF_RGB, got %#x.\n", desc.ddpfPixelFormat.dwFlags); - ok(desc.ddpfPixelFormat.dwRGBBitCount, "Expected non-zero RGB bit count.\n"); + ok(desc.ddpfPixelFormat.u1.dwRGBBitCount, "Expected non-zero RGB bit count.\n"); IDirectDrawSurface_Release(surface); IDirectDrawStreamSample_Release(sample); EXPECT_REF(stream, 3); @@ -7233,11 +7234,11 @@ static void test_ddrawstream_create_sample(void) desc.dwHeight = 400; desc.ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT); desc.ddpfPixelFormat.dwFlags = DDPF_RGB | DDPF_ALPHAPIXELS; - desc.ddpfPixelFormat.dwRGBBitCount = 32; - desc.ddpfPixelFormat.dwRBitMask = 0xff0000; - desc.ddpfPixelFormat.dwGBitMask = 0x00ff00; - desc.ddpfPixelFormat.dwBBitMask = 0x0000ff; - desc.ddpfPixelFormat.dwRGBAlphaBitMask = 0xff000000; + desc.ddpfPixelFormat.u1.dwRGBBitCount = 32; + desc.ddpfPixelFormat.u2.dwRBitMask = 0xff0000; + desc.ddpfPixelFormat.u3.dwGBitMask = 0x00ff00; + desc.ddpfPixelFormat.u4.dwBBitMask = 0x0000ff; + desc.ddpfPixelFormat.u5.dwRGBAlphaBitMask = 0xff000000; desc.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY | DDSCAPS_OFFSCREENPLAIN; hr = IDirectDraw_CreateSurface(ddraw, &desc, &surface, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -7278,7 +7279,7 @@ static void test_ddrawstream_create_sample(void) desc.dwHeight = 400; desc.ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT); desc.ddpfPixelFormat.dwFlags = DDPF_RGB | DDPF_PALETTEINDEXED4; - desc.ddpfPixelFormat.dwRGBBitCount = 4; + desc.ddpfPixelFormat.u1.dwRGBBitCount = 4; desc.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY | DDSCAPS_OFFSCREENPLAIN; hr = IDirectDraw_CreateSurface(ddraw, &desc, &surface, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -7304,10 +7305,10 @@ static void test_ddrawstream_create_sample(void) ok(desc.dwWidth == 100, "Got width %u.\n", desc.dwWidth); ok(desc.dwHeight == 100, "Got height %u.\n", desc.dwHeight); ok(desc.ddpfPixelFormat.dwFlags == DDPF_RGB, "Got flags %#x.\n", desc.ddpfPixelFormat.dwFlags); - ok(desc.ddpfPixelFormat.dwRGBBitCount == 32, "Got rgb bit count %u.\n", desc.ddpfPixelFormat.dwRGBBitCount); - ok(desc.ddpfPixelFormat.dwRBitMask == 0xff0000, "Got r bit mask %#x.\n", desc.ddpfPixelFormat.dwRBitMask); - ok(desc.ddpfPixelFormat.dwGBitMask == 0x00ff00, "Got g bit mask %#x.\n", desc.ddpfPixelFormat.dwGBitMask); - ok(desc.ddpfPixelFormat.dwBBitMask == 0x0000ff, "Got b bit mask %#x.\n", desc.ddpfPixelFormat.dwBBitMask); + ok(desc.ddpfPixelFormat.u1.dwRGBBitCount == 32, "Got rgb bit count %u.\n", desc.ddpfPixelFormat.u1.dwRGBBitCount); + ok(desc.ddpfPixelFormat.u2.dwRBitMask == 0xff0000, "Got r bit mask %#x.\n", desc.ddpfPixelFormat.u2.dwRBitMask); + ok(desc.ddpfPixelFormat.u3.dwGBitMask == 0x00ff00, "Got g bit mask %#x.\n", desc.ddpfPixelFormat.u3.dwGBitMask); + ok(desc.ddpfPixelFormat.u4.dwBBitMask == 0x0000ff, "Got b bit mask %#x.\n", desc.ddpfPixelFormat.u4.dwBBitMask); format1 = rgb8_format; format1.dwFlags |= DDSD_WIDTH; @@ -7333,30 +7334,30 @@ static void test_ddrawstream_create_sample(void) ok(desc.dwWidth == 333, "Got width %u.\n", desc.dwWidth); ok(desc.dwHeight == 444, "Got height %u.\n", desc.dwHeight); ok(desc.ddpfPixelFormat.dwFlags == DDPF_RGB, "Got flags %#x.\n", desc.ddpfPixelFormat.dwFlags); - ok(desc.ddpfPixelFormat.dwRGBBitCount == 32, "Got rgb bit count %u.\n", desc.ddpfPixelFormat.dwRGBBitCount); - ok(desc.ddpfPixelFormat.dwRBitMask == 0xff0000, "Got r bit mask %#x.\n", desc.ddpfPixelFormat.dwRBitMask); - ok(desc.ddpfPixelFormat.dwGBitMask == 0x00ff00, "Got g bit mask %#x.\n", desc.ddpfPixelFormat.dwGBitMask); - ok(desc.ddpfPixelFormat.dwBBitMask == 0x0000ff, "Got b bit mask %#x.\n", desc.ddpfPixelFormat.dwBBitMask); + ok(desc.ddpfPixelFormat.u1.dwRGBBitCount == 32, "Got rgb bit count %u.\n", desc.ddpfPixelFormat.u1.dwRGBBitCount); + ok(desc.ddpfPixelFormat.u2.dwRBitMask == 0xff0000, "Got r bit mask %#x.\n", desc.ddpfPixelFormat.u2.dwRBitMask); + ok(desc.ddpfPixelFormat.u3.dwGBitMask == 0x00ff00, "Got g bit mask %#x.\n", desc.ddpfPixelFormat.u3.dwGBitMask); + ok(desc.ddpfPixelFormat.u4.dwBBitMask == 0x0000ff, "Got b bit mask %#x.\n", desc.ddpfPixelFormat.u4.dwBBitMask); get_ddrawstream_create_sample_desc(&rgb565_format, NULL, NULL, &desc); ok(desc.dwWidth == 100, "Got width %u.\n", desc.dwWidth); ok(desc.dwHeight == 100, "Got height %u.\n", desc.dwHeight); ok(desc.ddpfPixelFormat.dwFlags == DDPF_RGB, "Got flags %#x.\n", desc.ddpfPixelFormat.dwFlags); - ok(desc.ddpfPixelFormat.dwRGBBitCount == 16, "Got rgb bit count %u.\n", desc.ddpfPixelFormat.dwRGBBitCount); - ok(desc.ddpfPixelFormat.dwRBitMask == 0xf800, "Got r bit mask %#x.\n", desc.ddpfPixelFormat.dwRBitMask); - ok(desc.ddpfPixelFormat.dwGBitMask == 0x07e0, "Got g bit mask %#x.\n", desc.ddpfPixelFormat.dwGBitMask); - ok(desc.ddpfPixelFormat.dwBBitMask == 0x001f, "Got b bit mask %#x.\n", desc.ddpfPixelFormat.dwBBitMask); + ok(desc.ddpfPixelFormat.u1.dwRGBBitCount == 16, "Got rgb bit count %u.\n", desc.ddpfPixelFormat.u1.dwRGBBitCount); + ok(desc.ddpfPixelFormat.u2.dwRBitMask == 0xf800, "Got r bit mask %#x.\n", desc.ddpfPixelFormat.u2.dwRBitMask); + ok(desc.ddpfPixelFormat.u3.dwGBitMask == 0x07e0, "Got g bit mask %#x.\n", desc.ddpfPixelFormat.u3.dwGBitMask); + ok(desc.ddpfPixelFormat.u4.dwBBitMask == 0x001f, "Got b bit mask %#x.\n", desc.ddpfPixelFormat.u4.dwBBitMask); get_ddrawstream_create_sample_desc(&argb32_format, NULL, NULL, &desc); ok(desc.dwWidth == 100, "Got width %u.\n", desc.dwWidth); ok(desc.dwHeight == 100, "Got height %u.\n", desc.dwHeight); ok(desc.ddpfPixelFormat.dwFlags == (DDPF_RGB | DDPF_ALPHAPIXELS), "Got flags %#x.\n", desc.ddpfPixelFormat.dwFlags); - ok(desc.ddpfPixelFormat.dwRGBBitCount == 32, "Got rgb bit count %u.\n", desc.ddpfPixelFormat.dwRGBBitCount); - ok(desc.ddpfPixelFormat.dwRBitMask == 0xff0000, "Got r bit mask %#x.\n", desc.ddpfPixelFormat.dwRBitMask); - ok(desc.ddpfPixelFormat.dwGBitMask == 0x00ff00, "Got g bit mask %#x.\n", desc.ddpfPixelFormat.dwGBitMask); - ok(desc.ddpfPixelFormat.dwBBitMask == 0x0000ff, "Got b bit mask %#x.\n", desc.ddpfPixelFormat.dwBBitMask); - ok(desc.ddpfPixelFormat.dwRGBAlphaBitMask == 0xff000000, - "Got alpha bit mask %#x.\n", desc.ddpfPixelFormat.dwBBitMask); + ok(desc.ddpfPixelFormat.u1.dwRGBBitCount == 32, "Got rgb bit count %u.\n", desc.ddpfPixelFormat.u1.dwRGBBitCount); + ok(desc.ddpfPixelFormat.u2.dwRBitMask == 0xff0000, "Got r bit mask %#x.\n", desc.ddpfPixelFormat.u2.dwRBitMask); + ok(desc.ddpfPixelFormat.u3.dwGBitMask == 0x00ff00, "Got g bit mask %#x.\n", desc.ddpfPixelFormat.u3.dwGBitMask); + ok(desc.ddpfPixelFormat.u4.dwBBitMask == 0x0000ff, "Got b bit mask %#x.\n", desc.ddpfPixelFormat.u4.dwBBitMask); + ok(desc.ddpfPixelFormat.u5.dwRGBAlphaBitMask == 0xff000000, + "Got alpha bit mask %#x.\n", desc.ddpfPixelFormat.u4.dwBBitMask); format1 = rgb32_format; format1.dwFlags |= DDSD_CAPS; @@ -7368,10 +7369,10 @@ static void test_ddrawstream_create_sample(void) ok(desc.dwWidth == 100, "Got width %u.\n", desc.dwWidth); ok(desc.dwHeight == 100, "Got height %u.\n", desc.dwHeight); ok(desc.ddpfPixelFormat.dwFlags == DDPF_RGB, "Got flags %#x.\n", desc.ddpfPixelFormat.dwFlags); - ok(desc.ddpfPixelFormat.dwRGBBitCount == 32, "Got rgb bit count %u.\n", desc.ddpfPixelFormat.dwRGBBitCount); - ok(desc.ddpfPixelFormat.dwRBitMask == 0xff0000, "Got r bit mask %#x.\n", desc.ddpfPixelFormat.dwRBitMask); - ok(desc.ddpfPixelFormat.dwGBitMask == 0x00ff00, "Got g bit mask %#x.\n", desc.ddpfPixelFormat.dwGBitMask); - ok(desc.ddpfPixelFormat.dwBBitMask == 0x0000ff, "Got b bit mask %#x.\n", desc.ddpfPixelFormat.dwBBitMask); + ok(desc.ddpfPixelFormat.u1.dwRGBBitCount == 32, "Got rgb bit count %u.\n", desc.ddpfPixelFormat.u1.dwRGBBitCount); + ok(desc.ddpfPixelFormat.u2.dwRBitMask == 0xff0000, "Got r bit mask %#x.\n", desc.ddpfPixelFormat.u2.dwRBitMask); + ok(desc.ddpfPixelFormat.u3.dwGBitMask == 0x00ff00, "Got g bit mask %#x.\n", desc.ddpfPixelFormat.u3.dwGBitMask); + ok(desc.ddpfPixelFormat.u4.dwBBitMask == 0x0000ff, "Got b bit mask %#x.\n", desc.ddpfPixelFormat.u4.dwBBitMask); format1 = rgb32_format; format1.dwFlags |= DDSD_CKSRCBLT; @@ -7382,10 +7383,10 @@ static void test_ddrawstream_create_sample(void) ok(desc.dwWidth == 100, "Got width %u.\n", desc.dwWidth); ok(desc.dwHeight == 100, "Got height %u.\n", desc.dwHeight); ok(desc.ddpfPixelFormat.dwFlags == DDPF_RGB, "Got flags %#x.\n", desc.ddpfPixelFormat.dwFlags); - ok(desc.ddpfPixelFormat.dwRGBBitCount == 32, "Got rgb bit count %u.\n", desc.ddpfPixelFormat.dwRGBBitCount); - ok(desc.ddpfPixelFormat.dwRBitMask == 0xff0000, "Got r bit mask %#x.\n", desc.ddpfPixelFormat.dwRBitMask); - ok(desc.ddpfPixelFormat.dwGBitMask == 0x00ff00, "Got g bit mask %#x.\n", desc.ddpfPixelFormat.dwGBitMask); - ok(desc.ddpfPixelFormat.dwBBitMask == 0x0000ff, "Got b bit mask %#x.\n", desc.ddpfPixelFormat.dwBBitMask); + ok(desc.ddpfPixelFormat.u1.dwRGBBitCount == 32, "Got rgb bit count %u.\n", desc.ddpfPixelFormat.u1.dwRGBBitCount); + ok(desc.ddpfPixelFormat.u2.dwRBitMask == 0xff0000, "Got r bit mask %#x.\n", desc.ddpfPixelFormat.u2.dwRBitMask); + ok(desc.ddpfPixelFormat.u3.dwGBitMask == 0x00ff00, "Got g bit mask %#x.\n", desc.ddpfPixelFormat.u3.dwGBitMask); + ok(desc.ddpfPixelFormat.u4.dwBBitMask == 0x0000ff, "Got b bit mask %#x.\n", desc.ddpfPixelFormat.u4.dwBBitMask); ok(desc.ddckCKSrcBlt.dwColorSpaceLowValue == 0, "Got color key low value %#x.\n", desc.ddckCKSrcBlt.dwColorSpaceLowValue); ok(desc.ddckCKSrcBlt.dwColorSpaceHighValue == 0, "Got color key high value %#x.\n", @@ -7557,7 +7558,7 @@ static void test_ddrawstreamsample_update(void) hr = IDirectDrawSurface_Lock(surface, NULL, &desc, 0, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); for (i = 0; i < 5; ++i) - memcpy((BYTE *)desc.lpSurface + i * desc.lPitch, initial_data, 12); + memcpy((BYTE *)desc.lpSurface + i * desc.u1.lPitch, initial_data, 12); hr = IDirectDrawSurface_Unlock(surface, desc.lpSurface); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -7574,11 +7575,11 @@ static void test_ddrawstreamsample_update(void) ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IDirectDrawSurface_Lock(surface, NULL, &desc, 0, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(memcmp((BYTE *)desc.lpSurface + 0 * desc.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); - ok(memcmp((BYTE *)desc.lpSurface + 1 * desc.lPitch, &test_data[0], 12) == 0, "Sample data didn't match.\n"); - ok(memcmp((BYTE *)desc.lpSurface + 2 * desc.lPitch, &test_data[12], 12) == 0, "Sample data didn't match.\n"); - ok(memcmp((BYTE *)desc.lpSurface + 3 * desc.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); - ok(memcmp((BYTE *)desc.lpSurface + 4 * desc.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 0 * desc.u1.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 1 * desc.u1.lPitch, &test_data[0], 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 2 * desc.u1.lPitch, &test_data[12], 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 3 * desc.u1.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 4 * desc.u1.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); hr = IDirectDrawSurface_Unlock(surface, desc.lpSurface); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -7605,7 +7606,7 @@ static void test_ddrawstreamsample_update(void) hr = IDirectDrawSurface_Lock(surface, NULL, &desc, 0, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); for (i = 0; i < 5; ++i) - memcpy((BYTE *)desc.lpSurface + i * desc.lPitch, initial_data, 12); + memcpy((BYTE *)desc.lpSurface + i * desc.u1.lPitch, initial_data, 12); hr = IDirectDrawSurface_Unlock(surface, desc.lpSurface); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -7622,11 +7623,11 @@ static void test_ddrawstreamsample_update(void) ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IDirectDrawSurface_Lock(surface, NULL, &desc, 0, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(memcmp((BYTE *)desc.lpSurface + 0 * desc.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); - ok(memcmp((BYTE *)desc.lpSurface + 1 * desc.lPitch, &test_data[12], 12) == 0, "Sample data didn't match.\n"); - ok(memcmp((BYTE *)desc.lpSurface + 2 * desc.lPitch, &test_data[0], 12) == 0, "Sample data didn't match.\n"); - ok(memcmp((BYTE *)desc.lpSurface + 3 * desc.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); - ok(memcmp((BYTE *)desc.lpSurface + 4 * desc.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 0 * desc.u1.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 1 * desc.u1.lPitch, &test_data[12], 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 2 * desc.u1.lPitch, &test_data[0], 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 3 * desc.u1.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 4 * desc.u1.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); hr = IDirectDrawSurface_Unlock(surface, desc.lpSurface); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -7658,7 +7659,7 @@ static void test_ddrawstreamsample_update(void) hr = IDirectDrawSurface_Lock(surface, NULL, &desc, 0, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); for (i = 0; i < 5; ++i) - memcpy((BYTE *)desc.lpSurface + i * desc.lPitch, initial_data, 12); + memcpy((BYTE *)desc.lpSurface + i * desc.u1.lPitch, initial_data, 12); hr = IDirectDrawSurface_Unlock(surface, desc.lpSurface); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -7674,11 +7675,11 @@ static void test_ddrawstreamsample_update(void) ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IDirectDrawSurface_Lock(surface, NULL, &desc, 0, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(memcmp((BYTE *)desc.lpSurface + 0 * desc.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); - ok(memcmp((BYTE *)desc.lpSurface + 1 * desc.lPitch, &test_data[12], 12) == 0, "Sample data didn't match.\n"); - ok(memcmp((BYTE *)desc.lpSurface + 2 * desc.lPitch, &test_data[0], 12) == 0, "Sample data didn't match.\n"); - ok(memcmp((BYTE *)desc.lpSurface + 3 * desc.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); - ok(memcmp((BYTE *)desc.lpSurface + 4 * desc.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 0 * desc.u1.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 1 * desc.u1.lPitch, &test_data[12], 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 2 * desc.u1.lPitch, &test_data[0], 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 3 * desc.u1.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 4 * desc.u1.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); hr = IDirectDrawSurface_Unlock(surface, desc.lpSurface); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -7707,7 +7708,7 @@ static void test_ddrawstreamsample_update(void) hr = IDirectDrawSurface_Lock(surface, NULL, &desc, 0, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); for (i = 0; i < 5; ++i) - memcpy((BYTE *)desc.lpSurface + i * desc.lPitch, initial_data, 12); + memcpy((BYTE *)desc.lpSurface + i * desc.u1.lPitch, initial_data, 12); hr = IDirectDrawSurface_Unlock(surface, desc.lpSurface); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -7723,11 +7724,11 @@ static void test_ddrawstreamsample_update(void) ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IDirectDrawSurface_Lock(surface, NULL, &desc, 0, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(memcmp((BYTE *)desc.lpSurface + 0 * desc.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); - ok(memcmp((BYTE *)desc.lpSurface + 1 * desc.lPitch, &test_data[12], 12) == 0, "Sample data didn't match.\n"); - ok(memcmp((BYTE *)desc.lpSurface + 2 * desc.lPitch, &test_data[0], 12) == 0, "Sample data didn't match.\n"); - ok(memcmp((BYTE *)desc.lpSurface + 3 * desc.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); - ok(memcmp((BYTE *)desc.lpSurface + 4 * desc.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 0 * desc.u1.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 1 * desc.u1.lPitch, &test_data[12], 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 2 * desc.u1.lPitch, &test_data[0], 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 3 * desc.u1.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 4 * desc.u1.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); hr = IDirectDrawSurface_Unlock(surface, desc.lpSurface); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -7743,7 +7744,7 @@ static void test_ddrawstreamsample_update(void) hr = IDirectDrawSurface_Lock(surface, NULL, &desc, 0, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); for (i = 0; i < 5; ++i) - memcpy((BYTE *)desc.lpSurface + i * desc.lPitch, initial_data, 12); + memcpy((BYTE *)desc.lpSurface + i * desc.u1.lPitch, initial_data, 12); hr = IDirectDrawSurface_Unlock(surface, desc.lpSurface); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -7755,18 +7756,18 @@ static void test_ddrawstreamsample_update(void) hr = IDirectDrawSurface_Lock(surface, NULL, &desc, 0, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(memcmp((BYTE *)desc.lpSurface + 0 * desc.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); - ok(memcmp((BYTE *)desc.lpSurface + 1 * desc.lPitch, &test_data[12], 12) == 0, "Sample data didn't match.\n"); - ok(memcmp((BYTE *)desc.lpSurface + 2 * desc.lPitch, &test_data[0], 12) == 0, "Sample data didn't match.\n"); - ok(memcmp((BYTE *)desc.lpSurface + 3 * desc.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); - ok(memcmp((BYTE *)desc.lpSurface + 4 * desc.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 0 * desc.u1.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 1 * desc.u1.lPitch, &test_data[12], 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 2 * desc.u1.lPitch, &test_data[0], 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 3 * desc.u1.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 4 * desc.u1.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); hr = IDirectDrawSurface_Unlock(surface, desc.lpSurface); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IDirectDrawSurface_Lock(surface, NULL, &desc, 0, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); for (i = 0; i < 5; ++i) - memcpy((BYTE *)desc.lpSurface + i * desc.lPitch, initial_data, 12); + memcpy((BYTE *)desc.lpSurface + i * desc.u1.lPitch, initial_data, 12); hr = IDirectDrawSurface_Unlock(surface, desc.lpSurface); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -7778,11 +7779,11 @@ static void test_ddrawstreamsample_update(void) hr = IDirectDrawSurface_Lock(surface, NULL, &desc, 0, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(memcmp((BYTE *)desc.lpSurface + 0 * desc.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); - ok(memcmp((BYTE *)desc.lpSurface + 1 * desc.lPitch, &test_data[12], 12) == 0, "Sample data didn't match.\n"); - ok(memcmp((BYTE *)desc.lpSurface + 2 * desc.lPitch, &test_data[0], 12) == 0, "Sample data didn't match.\n"); - ok(memcmp((BYTE *)desc.lpSurface + 3 * desc.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); - ok(memcmp((BYTE *)desc.lpSurface + 4 * desc.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 0 * desc.u1.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 1 * desc.u1.lPitch, &test_data[12], 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 2 * desc.u1.lPitch, &test_data[0], 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 3 * desc.u1.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 4 * desc.u1.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); hr = IDirectDrawSurface_Unlock(surface, desc.lpSurface); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -7811,7 +7812,7 @@ static void test_ddrawstreamsample_update(void) hr = IDirectDrawSurface_Lock(surface, NULL, &desc, 0, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); for (i = 0; i < 5; ++i) - memcpy((BYTE *)desc.lpSurface + i * desc.lPitch, initial_data, 12); + memcpy((BYTE *)desc.lpSurface + i * desc.u1.lPitch, initial_data, 12); hr = IDirectDrawSurface_Unlock(surface, desc.lpSurface); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -7837,7 +7838,7 @@ static void test_ddrawstreamsample_update(void) hr = IDirectDrawSurface_Lock(surface, NULL, &desc, 0, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); for (i = 0; i < 5; ++i) - ok(memcmp((BYTE *)desc.lpSurface + i * desc.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + i * desc.u1.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); hr = IDirectDrawSurface_Unlock(surface, desc.lpSurface); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -7848,11 +7849,11 @@ static void test_ddrawstreamsample_update(void) hr = IDirectDrawSurface_Lock(surface, NULL, &desc, 0, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(memcmp((BYTE *)desc.lpSurface + 0 * desc.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); - ok(memcmp((BYTE *)desc.lpSurface + 1 * desc.lPitch, &test_data[12], 12) == 0, "Sample data didn't match.\n"); - ok(memcmp((BYTE *)desc.lpSurface + 2 * desc.lPitch, &test_data[0], 12) == 0, "Sample data didn't match.\n"); - ok(memcmp((BYTE *)desc.lpSurface + 3 * desc.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); - ok(memcmp((BYTE *)desc.lpSurface + 4 * desc.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 0 * desc.u1.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 1 * desc.u1.lPitch, &test_data[12], 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 2 * desc.u1.lPitch, &test_data[0], 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 3 * desc.u1.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 4 * desc.u1.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); hr = IDirectDrawSurface_Unlock(surface, desc.lpSurface); ok(hr == S_OK, "Got hr %#x.\n", hr); -- 2.29.2

1 0

[PATCH 2/2] include: Add IAMCameraControl definition in axextend.idl.
by Biswapriyo Nath Dec. 21, 2020

Dec. 21, 2020

2 1

[PATCH 1/2] include: Add more Media Foundation error codes.
by Biswapriyo Nath Dec. 21, 2020

Dec. 21, 2020

1 0

[PATCH] po: Update Japanese translation.
by Akihiro Sagawa Dec. 21, 2020

Dec. 21, 2020

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- po/ja.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)

1 0

[PATCH v2 2/4] gdi32: Avoid best fit chars when mapping unicode character to a glyph index.
by Dmitry Timoshkov Dec. 21, 2020

Dec. 21, 2020

This part fixes GetGlyphIndices. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/gdi32/font.c | 2 +- dlls/gdi32/tests/font.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 00bbeb0a11..9380d3efbe 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -3223,7 +3223,7 @@ static DWORD CDECL font_GetGlyphIndices( PHYSDEV dev, const WCHAR *str, INT coun if (str[i] >= 0xf020 && str[i] <= 0xf100) glyph = str[i] - 0xf000; else if (str[i] < 0x100) glyph = str[i]; } - else if (WideCharToMultiByte( physdev->font->codepage, 0, &str[i], 1, + else if (WideCharToMultiByte( physdev->font->codepage, WC_NO_BEST_FIT_CHARS, &str[i], 1, &ch, 1, NULL, &used ) && !used) glyph = (unsigned char)ch; } diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index c630b65e5e..5eb069bf31 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1690,14 +1690,12 @@ static void test_GetGlyphIndices(void) charcount = GetGlyphIndicesW(hdc, c, ARRAY_SIZE(c), glyphs, GGI_MARK_NONEXISTING_GLYPHS); ok(charcount == ARRAY_SIZE(c), "got %u\n", charcount); ok(glyphs[0] == 0x001f || glyphs[0] == 0xffff /* Vista */, "got %#x\n", glyphs[0]); -todo_wine ok(glyphs[1] == 0x001f || glyphs[1] == 0xffff /* Vista */, "got %#x\n", glyphs[1]); glyphs[0] = glyphs[1] = 0; charcount = GetGlyphIndicesW(hdc, c, ARRAY_SIZE(c), glyphs, 0); ok(charcount == ARRAY_SIZE(c), "got %u\n", charcount); ok(glyphs[0] == textm.tmDefaultChar || glyphs[0] == 0x20 /* CJK Windows */, "got %#x\n", glyphs[0]); -todo_wine ok(glyphs[1] == textm.tmDefaultChar || glyphs[1] == 0x20 /* CJK Windows */, "got %#x\n", glyphs[1]); DeleteObject(SelectObject(hdc, hOldFont)); -- 2.29.2

2 3

[PATCH v2 4/4] fonts: Correct default glyph index for MS Sans Serif font to match Windows.
by Dmitry Timoshkov Dec. 21, 2020

Dec. 21, 2020

This one doesn't depend on previous patches in the sequence. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- fonts/ms_sans_serif.sfd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fonts/ms_sans_serif.sfd b/fonts/ms_sans_serif.sfd index 751b35d064..e8c720b528 100644 --- a/fonts/ms_sans_serif.sfd +++ b/fonts/ms_sans_serif.sfd @@ -4,7 +4,7 @@ FullName: MS Sans Serif FamilyName: MS Sans Serif Weight: Medium Copyright: Copyright (C) 2004 Huw D M Davies, Dmitry Timoshkov -UComments: "#pragma makedep font ssee1255.fon -d 129 13,1255,5 16,1255,7 20,1255,8+AAoA#pragma makedep font ssee1256.fon -d 129 13,1256,5 16,1256,7 20,1256,8+AAoA#pragma makedep font ssee1257.fon -d 129 13,1257,5 16,1257,7 20,1257,8+AAoA#pragma makedep font ssee874.fon -d 129 13,874,5 16,874,7 20,874,8+AAoA#pragma makedep font ssef1255.fon -d 129 -r 120 16,1255,7 20,1255,8+AAoA#pragma makedep font ssef1256.fon -d 129 -r 120 16,1256,7 20,1256,8+AAoA#pragma makedep font ssef1257.fon -d 129 -r 120 16,1257,7 20,1257,8+AAoA#pragma makedep font ssef874.fon -d 129 -r 120 16,874,7 20,874,8+AAoA#pragma makedep font sserife.fon -d 129 13,1252,5 16,1252,7 20,1252,8+AAoA#pragma makedep font sserifee.fon -d 129 13,1250,5 16,1250,7+AAoA#pragma makedep font sserifeg.fon -d 129 13,1253,5 16,1253,7 20,1253,8 +AAoA#pragma makedep font sserifer.fon -d 129 13,1251,5 16,1251,7 20,1251,8+AAoA#pragma makedep font sserifet.fon -d 129 13,1254,5 16,1254,7 20,1254,8+AAoA#pragma makedep font sseriff.fon -d 129 -r 120 16,1252,7 20,1252,8+AAoA#pragma makedep font sseriffe.fon -d 129 -r 120 16,1250,7+AAoA#pragma makedep font sseriffg.fon -d 129 -r 120 16,1253,7 20,1253,8 +AAoA#pragma makedep font sseriffr.fon -d 129 -r 120 16,1251,7 20,1251,8+AAoA#pragma makedep font sserifft.fon -d 129 -r 120 16,1254,7 20,1254,8" +UComments: "#pragma makedep font ssee1255.fon -d 129 13,1255,5 16,1255,7 20,1255,8+AAoA#pragma makedep font ssee1256.fon -d 129 13,1256,5 16,1256,7 20,1256,8+AAoA#pragma makedep font ssee1257.fon -d 128 13,1257,5 16,1257,7 20,1257,8+AAoA#pragma makedep font ssee874.fon -d 129 13,874,5 16,874,7 20,874,8+AAoA#pragma makedep font ssef1255.fon -d 129 -r 120 16,1255,7 20,1255,8+AAoA#pragma makedep font ssef1256.fon -d 129 -r 120 16,1256,7 20,1256,8+AAoA#pragma makedep font ssef1257.fon -d 128 -r 120 16,1257,7 20,1257,8+AAoA#pragma makedep font ssef874.fon -d 129 -r 120 16,874,7 20,874,8+AAoA#pragma makedep font sserife.fon -d 129 13,1252,5 16,1252,7 20,1252,8+AAoA#pragma makedep font sserifee.fon -d 128 13,1250,5 16,1250,7+AAoA#pragma makedep font sserifeg.fon -d 129 13,1253,5 16,1253,7 20,1253,8 +AAoA#pragma makedep font sserifer.fon -d 127 13,1251,5 16,1251,7 20,1251,8+AAoA#pragma makedep font sserifet.fon -d 129 13,1254,5 16,1254,7 20,1254,8+AAoA#pragma makedep font sseriff.fon -d 129 -r 120 16,1252,7 20,1252,8+AAoA#pragma makedep font sseriffe.fon -d 128 -r 120 16,1250,7+AAoA#pragma makedep font sseriffg.fon -d 129 -r 120 16,1253,7 20,1253,8 +AAoA#pragma makedep font sseriffr.fon -d 127 -r 120 16,1251,7 20,1251,8+AAoA#pragma makedep font sserifft.fon -d 129 -r 120 16,1254,7 20,1254,8" Version: 001.000 ItalicAngle: 0 UnderlinePosition: -15753.8 -- 2.29.2

2 1

[PATCH v3] gdi32/tests: Add some tests to show that GetGlyphIndices() should avoid best fit chars.
by Huw Davies Dec. 21, 2020

Dec. 21, 2020

From: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/tests/font.c | 41 ++++++++++++++++++++++++++++++++++++----- 1 file changed, 36 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index ad7408f5620..da5fdf2238e 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1632,6 +1632,7 @@ static void test_GetGlyphIndices(void) LOGFONTA lf; DWORD flags = 0; WCHAR testtext[] = L"Test\xffff"; + WCHAR c[] = { 0x25bc /* Black Down-Pointing Triangle */, 0x212a /* Kelvin Sign */ }; WORD glyphs[(sizeof(testtext)/2)-1]; TEXTMETRICA textm; HFONT hOldFont; @@ -1653,8 +1654,9 @@ static void test_GetGlyphIndices(void) lf.lfCharSet = ANSI_CHARSET; hfont = CreateFontIndirectA(&lf); - ok(hfont != 0, "CreateFontIndirectEx failed\n"); - ok(GetTextMetricsA(hdc, &textm), "GetTextMetric failed\n"); + ok(hfont != 0, "CreateFontIndirect failed\n"); + hOldFont = SelectObject(hdc, hfont); + ok(GetTextMetricsA(hdc, &textm), "GetTextMetrics failed\n"); if (textm.tmCharSet == ANSI_CHARSET) { flags |= GGI_MARK_NONEXISTING_GLYPHS; @@ -1664,16 +1666,44 @@ static void test_GetGlyphIndices(void) flags = 0; charcount = pGetGlyphIndicesW(hdc, testtext, (sizeof(testtext)/2)-1, glyphs, flags); ok(charcount == 5, "GetGlyphIndicesW count of glyphs should = 5 not %d\n", charcount); - ok(glyphs[4] == textm.tmDefaultChar, "GetGlyphIndicesW should have returned a %04x not %04x\n", - textm.tmDefaultChar, glyphs[4]); + ok(glyphs[4] == textm.tmDefaultChar || glyphs[4] == 0x20 /* CJK Windows */, + "GetGlyphIndicesW should have returned a %04x not %04x\n", textm.tmDefaultChar, glyphs[4]); } else /* FIXME: Write tests for non-ANSI charsets. */ skip("GetGlyphIndices System font tests only for ANSI_CHARSET\n"); + DeleteObject(SelectObject(hdc, hOldFont)); + + memset(&lf, 0, sizeof(lf)); + strcpy(lf.lfFaceName, "MS Sans Serif"); + lf.lfHeight = -13; + lf.lfCharSet = DEFAULT_CHARSET; + hfont = CreateFontIndirectA(&lf); + ok(hfont != 0, "CreateFontIndirect failed\n"); + hOldFont = SelectObject(hdc, hfont); + ok(GetTextMetricsA(hdc, &textm), "GetTextMetrics failed\n"); + + glyphs[0] = glyphs[1] = 0; + charcount = GetGlyphIndicesW(hdc, c, ARRAY_SIZE(c), glyphs, GGI_MARK_NONEXISTING_GLYPHS); + ok(charcount == ARRAY_SIZE(c), "got %u\n", charcount); + ok(glyphs[0] == 0x001f || glyphs[0] == 0xffff /* Vista */, "got %#x\n", glyphs[0]); +todo_wine + ok(glyphs[1] == 0x001f || glyphs[1] == 0xffff /* Vista */, "got %#x\n", glyphs[1]); + + glyphs[0] = glyphs[1] = 0; + charcount = GetGlyphIndicesW(hdc, c, ARRAY_SIZE(c), glyphs, 0); + ok(charcount == ARRAY_SIZE(c), "got %u\n", charcount); + ok(glyphs[0] == textm.tmDefaultChar || glyphs[0] == 0x20 /* CJK Windows */, "got %#x\n", glyphs[0]); +todo_wine + ok(glyphs[1] == textm.tmDefaultChar || glyphs[1] == 0x20 /* CJK Windows */, "got %#x\n", glyphs[1]); + + DeleteObject(SelectObject(hdc, hOldFont)); + if(!is_font_installed("Tahoma")) { skip("Tahoma is not installed so skipping this test\n"); + ReleaseDC(0, hdc); return; } memset(&lf, 0, sizeof(lf)); @@ -1718,12 +1748,13 @@ static void test_GetGlyphIndices(void) ok(glyphs[4] == 0, "GetGlyphIndicesW should have returned 0 not %04x\n", glyphs[4]); DeleteObject(SelectObject(hdc, hOldFont)); + ReleaseDC(0, hdc); + ret = pRemoveFontMemResourceEx(rsrc); ok(ret, "RemoveFontMemResourceEx error %d\n", GetLastError()); free_font(font); ret = DeleteFileA(ttf_name); ok(ret, "Failed to delete font file, %d.\n", GetLastError()); - } static void test_GetKerningPairs(void) -- 2.23.0

1 0

[PATCH] include: Check whether the ms_abi attribute is supported on aarch64
by Martin Storsjo Dec. 21, 2020

Dec. 21, 2020

While wine's configure checks and requires that the ms_abi attribute is supported on aarch64 (without it, variadic functions don't have the correct ABI), these headers are also included when building widl as a generic cross compilation tool as part of mingw-w64-tools. In the case of widl, the functions that use these attributes (and in particular, their ABI) doesn't matter as they aren't used/called, they're just included as a side effect of including the headers that widl actually needs. This fixes building the widl tool for aarch64 linux with GCC, even if wine itself can't be built in that configuration. Only windef.h is used/needed by widl, but update msvcrt/corecrt.h as well to keep these definitions in sync. Signed-off-by: Martin Storsjo <martin(a)martin.st> --- include/msvcrt/corecrt.h | 4 ++-- include/windef.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/msvcrt/corecrt.h b/include/msvcrt/corecrt.h index 4d11f68be0d..a66f43877ac 100644 --- a/include/msvcrt/corecrt.h +++ b/include/msvcrt/corecrt.h @@ -81,7 +81,7 @@ # endif # elif defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) # define __stdcall __attribute__((pcs("aapcs-vfp"))) -# elif defined(__aarch64__) && defined (__GNUC__) +# elif defined(__aarch64__) && defined (__GNUC__) && __has_attribute(ms_abi) # define __stdcall __attribute__((ms_abi)) # else /* __i386__ */ # define __stdcall @@ -102,7 +102,7 @@ #endif #ifndef __ms_va_list -# if (defined(__x86_64__) || defined(__aarch64__)) && defined (__GNUC__) +# if (defined(__x86_64__) || (defined(__aarch64__) && __has_attribute(ms_abi))) && defined (__GNUC__) # define __ms_va_list __builtin_ms_va_list # define __ms_va_start(list,arg) __builtin_ms_va_start(list,arg) # define __ms_va_end(list) __builtin_ms_va_end(list) diff --git a/include/windef.h b/include/windef.h index b8e5ed692b1..5351afe66db 100644 --- a/include/windef.h +++ b/include/windef.h @@ -74,7 +74,7 @@ extern "C" { # endif # elif defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) # define __stdcall __attribute__((pcs("aapcs-vfp"))) -# elif defined(__aarch64__) && defined (__GNUC__) +# elif defined(__aarch64__) && defined (__GNUC__) && __has_attribute(ms_abi) # define __stdcall __attribute__((ms_abi)) # else /* __i386__ */ # define __stdcall @@ -103,7 +103,7 @@ extern "C" { #endif #ifndef __ms_va_list -# if (defined(__x86_64__) || defined(__aarch64__)) && defined (__GNUC__) +# if (defined(__x86_64__) || (defined(__aarch64__) && __has_attribute(ms_abi))) && defined (__GNUC__) # define __ms_va_list __builtin_ms_va_list # define __ms_va_start(list,arg) __builtin_ms_va_start(list,arg) # define __ms_va_end(list) __builtin_ms_va_end(list) -- 2.17.1

3 3

[PATCH] winspool/tests: Use wide-char string literals.
by Michael Stefaniuc Dec. 21, 2020

Dec. 21, 2020

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winspool.drv/tests/info.c | 46 ++++++++++++++-------------------- 1 file changed, 19 insertions(+), 27 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index 53aa67ba036..56d73798538 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -56,16 +56,6 @@ static CHAR version_dll[] = "version.dll"; static CHAR winetest[] = "winetest"; static CHAR xcv_localport[] = ",XcvMonitor Local Port"; -static const WCHAR cmd_MonitorUIW[] = {'M','o','n','i','t','o','r','U','I',0}; -static const WCHAR cmd_PortIsValidW[] = {'P','o','r','t','I','s','V','a','l','i','d',0}; -static WCHAR emptyW[] = {0}; - -static WCHAR portname_com1W[] = {'C','O','M','1',':',0}; -static WCHAR portname_com2W[] = {'C','O','M','2',':',0}; -static WCHAR portname_fileW[] = {'F','I','L','E',':',0}; -static WCHAR portname_lpt1W[] = {'L','P','T','1',':',0}; -static WCHAR portname_lpt2W[] = {'L','P','T','2',':',0}; - static HANDLE hwinspool; static BOOL (WINAPI * pAddPortExA)(LPSTR, DWORD, LPBYTE, LPSTR); static BOOL (WINAPI * pEnumPrinterDriversW)(LPWSTR, LPWSTR, DWORD, LPBYTE, DWORD, LPDWORD, LPDWORD); @@ -2088,7 +2078,7 @@ static void test_XcvDataW_MonitorUI(void) needed = (DWORD) 0xdeadbeef; status = (DWORD) 0xdeadbeef; SetLastError(0xdeadbeef); - res = pXcvDataW(hXcv, cmd_MonitorUIW, NULL, 0, NULL, 0, &needed, &status); + res = pXcvDataW(hXcv, L"MonitorUI", NULL, 0, NULL, 0, &needed, &status); ok( res && (status == ERROR_INSUFFICIENT_BUFFER) && (needed <= MAX_PATH), "returned %d with %u and %u for status %u (expected '!= 0' and " "'<= MAX_PATH' for status ERROR_INSUFFICIENT_BUFFER)\n", @@ -2105,7 +2095,7 @@ static void test_XcvDataW_MonitorUI(void) needed = (DWORD) 0xdeadbeef; status = (DWORD) 0xdeadbeef; SetLastError(0xdeadbeef); - res = pXcvDataW(hXcv, emptyW, NULL, 0, NULL, 0, &needed, &status); + res = pXcvDataW(hXcv, L"", NULL, 0, NULL, 0, &needed, &status); ok( res && (status == ERROR_INVALID_PARAMETER), "returned %d with %u and %u for status %u (expected '!= 0' with " "ERROR_INVALID_PARAMETER)\n", res, GetLastError(), needed, status); @@ -2122,7 +2112,7 @@ static void test_XcvDataW_MonitorUI(void) needed = (DWORD) 0xdeadbeef; status = (DWORD) 0xdeadbeef; SetLastError(0xdeadbeef); - res = pXcvDataW(hXcv, cmd_MonitorUIW, NULL, 0, buffer, len, NULL, &status); + res = pXcvDataW(hXcv, L"MonitorUI", NULL, 0, buffer, len, NULL, &status); ok( !res && (GetLastError() == ERROR_INVALID_PARAMETER), "returned %d with %u and %u for status %u (expected '0' with " "ERROR_INVALID_PARAMETER)\n", res, GetLastError(), needed, status); @@ -2130,7 +2120,7 @@ static void test_XcvDataW_MonitorUI(void) needed = (DWORD) 0xdeadbeef; status = (DWORD) 0xdeadbeef; SetLastError(0xdeadbeef); - res = pXcvDataW(hXcv, cmd_MonitorUIW, NULL, 0, NULL, len, &needed, &status); + res = pXcvDataW(hXcv, L"MonitorUI", NULL, 0, NULL, len, &needed, &status); ok( !res && (GetLastError() == RPC_X_NULL_REF_POINTER), "returned %d with %u and %u for status %u (expected '0' with " "RPC_X_NULL_REF_POINTER)\n", res, GetLastError(), needed, status); @@ -2138,7 +2128,7 @@ static void test_XcvDataW_MonitorUI(void) needed = (DWORD) 0xdeadbeef; status = (DWORD) 0xdeadbeef; SetLastError(0xdeadbeef); - res = pXcvDataW(hXcv, cmd_MonitorUIW, NULL, 0, buffer, len, &needed, NULL); + res = pXcvDataW(hXcv, L"MonitorUI", NULL, 0, buffer, len, &needed, NULL); ok( !res && (GetLastError() == RPC_X_NULL_REF_POINTER), "returned %d with %u and %u for status %u (expected '0' with " "RPC_X_NULL_REF_POINTER)\n", res, GetLastError(), needed, status); @@ -2147,7 +2137,7 @@ static void test_XcvDataW_MonitorUI(void) needed = (DWORD) 0xdeadbeef; status = (DWORD) 0xdeadbeef; SetLastError(0xdeadbeef); - res = pXcvDataW(hXcv, cmd_MonitorUIW, NULL, 0, buffer, len+1, &needed, &status); + res = pXcvDataW(hXcv, L"MonitorUI", NULL, 0, buffer, len+1, &needed, &status); ok( res && (status == ERROR_SUCCESS), "returned %d with %u and %u for status %u (expected '!= 0' for status " "ERROR_SUCCESS)\n", res, GetLastError(), needed, status); @@ -2157,7 +2147,7 @@ static void test_XcvDataW_MonitorUI(void) needed = (DWORD) 0xdeadbeef; status = (DWORD) 0xdeadbeef; SetLastError(0xdeadbeef); - res = pXcvDataW(hXcv, cmd_MonitorUIW, NULL, 0, buffer, len-1, &needed, &status); + res = pXcvDataW(hXcv, L"MonitorUI", NULL, 0, buffer, len-1, &needed, &status); ok( res && (status == ERROR_INSUFFICIENT_BUFFER), "returned %d with %u and %u for status %u (expected '!= 0' for status " "ERROR_INSUFFICIENT_BUFFER)\n", res, GetLastError(), needed, status); @@ -2168,7 +2158,7 @@ static void test_XcvDataW_MonitorUI(void) needed = (DWORD) 0xdeadbeef; status = (DWORD) 0xdeadbeef; SetLastError(0xdeadbeef); - res = pXcvDataW(hXcv, cmd_MonitorUIW, NULL, 0, buffer, len, &needed, &status); + res = pXcvDataW(hXcv, L"MonitorUI", NULL, 0, buffer, len, &needed, &status); ok( res && (status == ERROR_SUCCESS), "returned %d with %u and %u for status %u (expected '!= 0' for status " "ERROR_SUCCESS)\n", res, GetLastError(), needed, status); @@ -2207,7 +2197,7 @@ static void test_XcvDataW_PortIsValid(void) needed = (DWORD) 0xdeadbeef; status = (DWORD) 0xdeadbeef; SetLastError(0xdeadbeef); - res = pXcvDataW(hXcv, cmd_PortIsValidW, (PBYTE) portname_lpt1W, sizeof(portname_lpt1W), NULL, 0, NULL, &status); + res = pXcvDataW(hXcv, L"PortIsValid", (BYTE *) L"LPT1:", sizeof(L"LPT1:"), NULL, 0, NULL, &status); ok( !res && (GetLastError() == ERROR_INVALID_PARAMETER), "returned %d with %u and %u for status %u (expected '!= 0' with ERROR_INVALID_PARAMETER)\n", res, GetLastError(), needed, status); @@ -2216,7 +2206,7 @@ static void test_XcvDataW_PortIsValid(void) needed = (DWORD) 0xdeadbeef; status = (DWORD) 0xdeadbeef; SetLastError(0xdeadbeef); - res = pXcvDataW(hXcv, cmd_PortIsValidW, (PBYTE) emptyW, sizeof(emptyW), NULL, 0, &needed, &status); + res = pXcvDataW(hXcv, L"PortIsValid", (BYTE *) L"", sizeof(L""), NULL, 0, &needed, &status); ok( res && ((status == ERROR_FILE_NOT_FOUND) || (status == ERROR_PATH_NOT_FOUND)), "returned %d with %u and %u for status %u (expected '!= 0' for status: " "ERROR_FILE_NOT_FOUND or ERROR_PATH_NOT_FOUND)\n", @@ -2226,7 +2216,8 @@ static void test_XcvDataW_PortIsValid(void) needed = (DWORD) 0xdeadbeef; status = (DWORD) 0xdeadbeef; SetLastError(0xdeadbeef); - res = pXcvDataW(hXcv, cmd_PortIsValidW, (PBYTE) tempdirW, (lstrlenW(tempdirW) + 1) * sizeof(WCHAR), NULL, 0, &needed, &status); + res = pXcvDataW(hXcv, L"PortIsValid", (BYTE *) tempdirW, (lstrlenW(tempdirW) + 1) * sizeof(WCHAR), + NULL, 0, &needed, &status); /* XP: ERROR_PATH_NOT_FOUND, w2k ERROR_ACCESS_DENIED */ ok( res && ((status == ERROR_PATH_NOT_FOUND) || (status == ERROR_ACCESS_DENIED)), "returned %d with %u and %u for status %u (expected '!= 0' for status: " @@ -2237,7 +2228,7 @@ static void test_XcvDataW_PortIsValid(void) needed = (DWORD) 0xdeadbeef; status = (DWORD) 0xdeadbeef; SetLastError(0xdeadbeef); - res = pXcvDataW(hXcv, cmd_PortIsValidW, (PBYTE) portname_lpt1W, sizeof(portname_lpt1W), NULL, 0, &needed, &status); + res = pXcvDataW(hXcv, L"PortIsValid", (BYTE *) L"LPT1:", sizeof(L"LPT1:"), NULL, 0, &needed, &status); ok( res && (status == ERROR_SUCCESS), "returned %d with %u and %u for status %u (expected '!= 0' for ERROR_SUCCESS)\n", res, GetLastError(), needed, status); @@ -2245,7 +2236,7 @@ static void test_XcvDataW_PortIsValid(void) needed = (DWORD) 0xdeadbeef; status = (DWORD) 0xdeadbeef; SetLastError(0xdeadbeef); - res = pXcvDataW(hXcv, cmd_PortIsValidW, (PBYTE) portname_lpt2W, sizeof(portname_lpt2W), NULL, 0, &needed, &status); + res = pXcvDataW(hXcv, L"PortIsValid", (BYTE *) L"LPT2:", sizeof(L"LPT2:"), NULL, 0, &needed, &status); ok( res && (status == ERROR_SUCCESS), "returned %d with %u and %u for status %u (expected '!= 0' for ERROR_SUCCESS)\n", res, GetLastError(), needed, status); @@ -2253,7 +2244,7 @@ static void test_XcvDataW_PortIsValid(void) needed = (DWORD) 0xdeadbeef; status = (DWORD) 0xdeadbeef; SetLastError(0xdeadbeef); - res = pXcvDataW(hXcv, cmd_PortIsValidW, (PBYTE) portname_com1W, sizeof(portname_com1W), NULL, 0, &needed, &status); + res = pXcvDataW(hXcv, L"PortIsValid", (BYTE *) L"COM1:", sizeof(L"COM1:"), NULL, 0, &needed, &status); ok( res && (status == ERROR_SUCCESS), "returned %d with %u and %u for status %u (expected '!= 0' for ERROR_SUCCESS)\n", res, GetLastError(), needed, status); @@ -2261,7 +2252,7 @@ static void test_XcvDataW_PortIsValid(void) needed = (DWORD) 0xdeadbeef; status = (DWORD) 0xdeadbeef; SetLastError(0xdeadbeef); - res = pXcvDataW(hXcv, cmd_PortIsValidW, (PBYTE) portname_com2W, sizeof(portname_com2W), NULL, 0, &needed, &status); + res = pXcvDataW(hXcv, L"PortIsValid", (BYTE *) L"COM2:", sizeof(L"COM2:"), NULL, 0, &needed, &status); ok( res && (status == ERROR_SUCCESS), "returned %d with %u and %u for status %u (expected '!= 0' for ERROR_SUCCESS)\n", res, GetLastError(), needed, status); @@ -2269,7 +2260,7 @@ static void test_XcvDataW_PortIsValid(void) needed = (DWORD) 0xdeadbeef; status = (DWORD) 0xdeadbeef; SetLastError(0xdeadbeef); - res = pXcvDataW(hXcv, cmd_PortIsValidW, (PBYTE) portname_fileW, sizeof(portname_fileW), NULL, 0, &needed, &status); + res = pXcvDataW(hXcv, L"PortIsValid", (BYTE *) L"FILE:", sizeof(L"FILE:"), NULL, 0, &needed, &status); ok( res && (status == ERROR_SUCCESS), "returned %d with %u and %u for status %u (expected '!= 0' with ERROR_SUCCESS)\n", res, GetLastError(), needed, status); @@ -2279,7 +2270,8 @@ static void test_XcvDataW_PortIsValid(void) needed = (DWORD) 0xdeadbeef; status = (DWORD) 0xdeadbeef; SetLastError(0xdeadbeef); - res = pXcvDataW(hXcv, cmd_PortIsValidW, (PBYTE) tempfileW, (lstrlenW(tempfileW) + 1) * sizeof(WCHAR), NULL, 0, &needed, &status); + res = pXcvDataW(hXcv, L"PortIsValid", (BYTE *) tempfileW, (lstrlenW(tempfileW) + 1) * sizeof(WCHAR), + NULL, 0, &needed, &status); ok( res && (status == ERROR_SUCCESS), "returned %d with %u and %u for status %u (expected '!= 0' with ERROR_SUCCESS)\n", res, GetLastError(), needed, status); -- 2.26.2

2 1

[PATCH 2/2] gdi32/tests: Fix test failures on Win10 1909+.
by Zhiyi Zhang Dec. 21, 2020

Dec. 21, 2020

Memory DC, metafile DC and enhanced metafile DC support gamma ramp on Win10 1909+. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- Fix test failures like in https://test.winehq.org/data/3acb0b3326c4120ea0c4c6076bd03c9cfe82c744/win10… dlls/gdi32/tests/dc.c | 45 ++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 2cb8c65dd64..04703288302 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -346,11 +346,6 @@ static void test_device_caps( HDC hdc, HDC ref_dc, const char *descr, int scale "wrong caps on %s for %u: %u\n", descr, caps[i], GetDeviceCaps( hdc, caps[i] ) ); - SetLastError( 0xdeadbeef ); - ret = GetDeviceGammaRamp( hdc, &ramp ); - ok( !ret, "GetDeviceGammaRamp succeeded on %s\n", descr ); - ok( GetLastError() == ERROR_INVALID_PARAMETER || broken(GetLastError() == 0xdeadbeef), /* nt4 */ - "wrong error %u on %s\n", GetLastError(), descr ); type = GetClipBox( hdc, &rect ); ok( type == ERROR, "GetClipBox returned %d on %s\n", type, descr ); @@ -393,17 +388,6 @@ static void test_device_caps( HDC hdc, HDC ref_dc, const char *descr, int scale hdc_caps, GetDeviceCaps( ref_dc, caps[i] ), scale ); } - SetLastError( 0xdeadbeef ); - ret = GetDeviceGammaRamp( hdc, &ramp ); - if (GetObjectType( hdc ) != OBJ_DC || GetDeviceCaps( hdc, TECHNOLOGY ) == DT_RASPRINTER) - { - ok( !ret, "GetDeviceGammaRamp succeeded on %s (type %d)\n", descr, GetObjectType( hdc ) ); - ok( GetLastError() == ERROR_INVALID_PARAMETER || broken(GetLastError() == 0xdeadbeef), /* nt4 */ - "wrong error %u on %s\n", GetLastError(), descr ); - } - else - ok( ret || broken(!ret) /* NT4 */, "GetDeviceGammaRamp failed on %s (type %d), error %u\n", descr, GetObjectType( hdc ), GetLastError() ); - type = GetBoundsRect( hdc, &rect, 0 ); ok( type == DCB_RESET || broken(type == DCB_SET) /* XP */, "GetBoundsRect returned type %x for %s\n", type, descr ); @@ -494,12 +478,6 @@ static void test_device_caps( HDC hdc, HDC ref_dc, const char *descr, int scale "mismatched caps on %s and DIB for %u: %u/%u\n", descr, caps[i], GetDeviceCaps( hdc, caps[i] ), GetDeviceCaps( ref_dc, caps[i] ) ); - SetLastError( 0xdeadbeef ); - ret = GetDeviceGammaRamp( hdc, &ramp ); - ok( !ret, "GetDeviceGammaRamp succeeded on %s\n", descr ); - ok( GetLastError() == ERROR_INVALID_PARAMETER || broken(GetLastError() == 0xdeadbeef), /* nt4 */ - "wrong error %u on %s\n", GetLastError(), descr ); - type = GetClipBox( hdc, &rect ); ok( type == SIMPLEREGION, "GetClipBox returned %d on memdc for %s\n", type, descr ); ok( rect.left == 0 && rect.top == 0 && rect.right == 16 && rect.bottom == 16, @@ -517,6 +495,29 @@ static void test_device_caps( HDC hdc, HDC ref_dc, const char *descr, int scale DeleteObject( dib ); } + /* Memory DC, metafile DC and enhanced metafile DC support gamma ramp on Win10 1909+. Exclude + * these types from tests as they return different results depending on Windows versions */ + if (GetObjectType( hdc ) != OBJ_MEMDC + && GetObjectType( hdc ) != OBJ_METADC + && GetObjectType( hdc ) != OBJ_ENHMETADC) + { + SetLastError( 0xdeadbeef ); + ret = GetDeviceGammaRamp( hdc, &ramp ); + if (GetObjectType( hdc ) != OBJ_DC || GetDeviceCaps( hdc, TECHNOLOGY ) == DT_RASPRINTER) + { + ok( !ret, "GetDeviceGammaRamp succeeded on %s (type %d)\n", descr, GetObjectType( hdc ) ); + ok( GetLastError() == ERROR_INVALID_PARAMETER + || broken(GetLastError() == 0xdeadbeef) /* nt4 */ + || broken(GetLastError() == NO_ERROR), /* Printer DC on Win10 1909+ */ + "wrong error %u on %s\n", GetLastError(), descr ); + } + else + { + ok( ret || broken(!ret) /* NT4 */, "GetDeviceGammaRamp failed on %s (type %d), error %u\n", + descr, GetObjectType( hdc ), GetLastError() ); + } + } + /* restore hdc state */ SetBoundsRect( hdc, NULL, DCB_RESET | DCB_DISABLE ); SetBoundsRect( ref_dc, NULL, DCB_RESET | DCB_DISABLE ); -- 2.27.0

2 1

[PATCH 1/2] gdi32/tests: Fix possible test failures in test_clip_box().
by Zhiyi Zhang Dec. 21, 2020

Dec. 21, 2020

When there are multiple monitors and their monitor region union can still be represented by a simple rectangle, the clip box region type for the screen DC is still SIMPLEREGION. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- Fix test failures like in https://test.winehq.org/data/3acb0b3326c4120ea0c4c6076bd03c9cfe82c744/win7_… dlls/gdi32/tests/dc.c | 36 +++++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index b4a89b213d2..2cb8c65dd64 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -1539,6 +1539,40 @@ static void test_pscript_printer_dc(void) DeleteDC(hdc); } +struct screen_region_info +{ + HRGN region; + INT type; +}; + +static BOOL CALLBACK enum_monitor_proc(HMONITOR monitor, HDC hdc, RECT *rect, LPARAM lparam) +{ + struct screen_region_info *info = (struct screen_region_info *)lparam; + HRGN region; + + if (!info->region) + { + info->region = CreateRectRgnIndirect(rect); + info->type = SIMPLEREGION; + } + else + { + region = CreateRectRgnIndirect(rect); + info->type = CombineRgn(info->region, info->region, region, RGN_OR); + DeleteObject(region); + } + return TRUE; +} + +static INT get_screen_region_type(void) +{ + struct screen_region_info info = {NULL, NULLREGION}; + + EnumDisplayMonitors(NULL, NULL, enum_monitor_proc, (LPARAM)&info); + DeleteObject(info.region); + return info.type; +} + static void test_clip_box(void) { DEVMODEA scale_mode = {.dmSize = sizeof(DEVMODEA)}; @@ -1554,7 +1588,7 @@ static void test_clip_box(void) SetRect(&screen_rect, GetSystemMetrics(SM_XVIRTUALSCREEN), GetSystemMetrics(SM_YVIRTUALSCREEN), GetSystemMetrics(SM_XVIRTUALSCREEN) + GetSystemMetrics(SM_CXVIRTUALSCREEN), GetSystemMetrics(SM_YVIRTUALSCREEN) + GetSystemMetrics(SM_CYVIRTUALSCREEN)); - screen_type = GetSystemMetrics(SM_CMONITORS) > 1 ? COMPLEXREGION : SIMPLEREGION; + screen_type = get_screen_region_type(); dc = CreateDCA("DISPLAY", NULL, NULL, NULL); type = GetClipBox(dc, &rect); -- 2.27.0

2 1

[PATCH v4 2/2] wbemprox/tests: Add some tests for SystemRestore class.
by Dmitry Timoshkov Dec. 21, 2020

Dec. 21, 2020

v2: Fix test failures under 2 testbot VMs (w7u_adm and w8adm). v3: Avoid using NULL interface on clean up due to a failed method call. v4: Accept WBEM_E_ACCESS_DENIED and print a message about it. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wbemprox/tests/query.c | 63 +++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 73f055e8bd..37b6fb4e8d 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1760,6 +1760,67 @@ static void test_Win32_SoundDevice( IWbemServices *services ) SysFreeString( wql ); } +static void test_SystemRestore( IWbemServices *services ) +{ + WCHAR path[MAX_PATH]; + BSTR class, method; + IWbemClassObject *service, *sig_in, *in, *out; + VARIANT var; + HRESULT hr; + + class = SysAllocString( L"SystemRestore" ); + hr = IWbemServices_GetObject( services, class, 0, NULL, &service, NULL ); + if (hr != S_OK) + { + skip( "SystemRestore not available\n" ); + SysFreeString( class ); + return; + } + + check_property( service, L"CreationTime", VT_NULL, CIM_STRING ); + check_property( service, L"Description", VT_NULL, CIM_STRING ); + check_property( service, L"EventType", VT_NULL, CIM_UINT32 ); + check_property( service, L"RestorePointType", VT_NULL, CIM_UINT32 ); + check_property( service, L"SequenceNumber", VT_NULL, CIM_UINT32 ); + + method = SysAllocString( L"Enable" ); + sig_in = NULL; + hr = IWbemClassObject_GetMethod( service, method, 0, &sig_in, NULL ); + ok( hr == S_OK, "failed to get Enable method %08x\n", hr ); + + hr = IWbemClassObject_SpawnInstance( sig_in, 0, &in ); + ok( hr == S_OK, "failed to spawn instance %08x\n", hr ); + + GetWindowsDirectoryW(path, ARRAY_SIZE(path)); + path[3] = 0; /* otherwise XP fails */ + V_VT( &var ) = VT_BSTR; + V_BSTR( &var ) = SysAllocString( path ); + hr = IWbemClassObject_Put( in, L"Drive", 0, &var, 0 ); + ok( hr == S_OK, "failed to set Drive %08x\n", hr ); + SysFreeString( V_BSTR( &var ) ); + + out = NULL; + hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, in, &out, NULL ); + ok( hr == S_OK || hr == WBEM_E_ACCESS_DENIED, "failed to execute method %08x\n", hr ); + if (hr == S_OK) + { + VariantInit( &var ); + hr = IWbemClassObject_Get( out, L"ReturnValue", 0, &var, NULL, NULL ); + ok( hr == S_OK, "failed to get return value %08x\n", hr ); + ok( V_I4( &var ) == ERROR_SUCCESS, "unexpected error %u\n", V_UI4( &var ) ); + + IWbemClassObject_Release( out ); + } + else if (hr == WBEM_E_ACCESS_DENIED) + win_skip( "insufficient privs to test SystemRestore\n" ); + + IWbemClassObject_Release( in ); + IWbemClassObject_Release( sig_in ); + IWbemClassObject_Release( service ); + SysFreeString( method ); + SysFreeString( class ); +} + START_TEST(query) { BSTR path = SysAllocString( L"ROOT\\CIMV2" ); @@ -1823,6 +1884,7 @@ START_TEST(query) test_Win32_SystemEnclosure( services ); test_Win32_VideoController( services ); test_Win32_WinSAT( services ); + test_SystemRestore( services ); SysFreeString( path ); IWbemServices_Release( services ); @@ -1836,6 +1898,7 @@ START_TEST(query) ok( hr == S_OK, "failed to set proxy blanket %08x\n", hr ); test_StdRegProv( services ); + test_SystemRestore( services ); SysFreeString( path ); IWbemServices_Release( services ); -- 2.29.2

2 1

[PATCH v4 1/2] wbemprox/tests: Run StdRegProv tests using ROOT\\DEFAULT connection point.
by Dmitry Timoshkov Dec. 21, 2020

Dec. 21, 2020

StdRegProv is not available on ROOT\\CIMV2 for unknown reason on some Windows configs. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wbemprox/tests/query.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 191b9f6c85..73f055e8bd 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1824,6 +1824,19 @@ START_TEST(query) test_Win32_VideoController( services ); test_Win32_WinSAT( services ); + SysFreeString( path ); + IWbemServices_Release( services ); + + /* Some tests need other connection point */ + path = SysAllocString( L"ROOT\\DEFAULT" ); + hr = IWbemLocator_ConnectServer( locator, path, NULL, NULL, NULL, 0, NULL, NULL, &services ); + ok( hr == S_OK, "failed to get IWbemServices interface %08x\n", hr ); + hr = CoSetProxyBlanket( (IUnknown *)services, RPC_C_AUTHN_WINNT, RPC_C_AUTHZ_NONE, NULL, + RPC_C_AUTHN_LEVEL_CALL, RPC_C_IMP_LEVEL_IMPERSONATE, NULL, EOAC_NONE ); + ok( hr == S_OK, "failed to set proxy blanket %08x\n", hr ); + + test_StdRegProv( services ); + SysFreeString( path ); IWbemServices_Release( services ); IWbemLocator_Release( locator ); -- 2.29.2

2 1

[PATCH] include: Add ExecuteOptionEnum typedef
by Alistair Leslie-Hughes Dec. 21, 2020

Dec. 21, 2020

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/msado15_backcompat.idl | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/include/msado15_backcompat.idl b/include/msado15_backcompat.idl index e5d0f5ecfe9..fedaf557066 100644 --- a/include/msado15_backcompat.idl +++ b/include/msado15_backcompat.idl @@ -513,6 +513,17 @@ typedef [uuid(00000531-0000-0010-8000-00aa006d2ea4)] enum EventReasonEnum adRsnMoveLast = 15 } EventReasonEnum; +typedef [uuid(0000051e-0000-0010-8000-00aa006d2ea4)] enum ExecuteOptionEnum +{ + adOptionUnspecified = -1, + adAsyncExecute = 16, + adAsyncFetch = 32, + adAsyncFetchNonBlocking = 64, + adExecuteNoRecords = 128, + adExecuteStream = 1024, + [hidden] adExecuteRecord = 2048 +} ExecuteOptionEnum; + typedef [uuid(00000541-0000-0010-8000-00aa006d2ea4)] enum ConnectOptionEnum { adConnectUnspecified = -1, -- 2.29.2

1 0

[PATCH] include: Add DB_LRESERVE type
by Alistair Leslie-Hughes Dec. 21, 2020

Dec. 21, 2020

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/oledb.idl | 1 + 1 file changed, 1 insertion(+) diff --git a/include/oledb.idl b/include/oledb.idl index 5609e219320..4e333353a5e 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -40,6 +40,7 @@ typedef ULONG_PTR DBREFCOUNT; typedef ULONG_PTR DB_UPARAMS; typedef LONG_PTR DB_LPARAMS; typedef DWORD_PTR DBHASHVALUE; +typedef LONG_PTR DB_LRESERVE; #include "dbs.idl" -- 2.29.2

1 0

[PATCH] comctl32: Avoid incorrect data read by user callback function during sorting.
by Jiangyi Chen Dec. 21, 2020

Dec. 21, 2020

2 1

[PATCH] winebuild: Pass -m options to dlltool for arm and arm64
by Martin Storsjo Dec. 20, 2020

Dec. 20, 2020

This allows using the arch independent llvm-dlltool without the llvm-mingw specific <triple>-dlltool wrappers. Signed-off-by: Martin Storsjo <martin(a)martin.st> --- tools/winebuild/import.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index fb5c26da07f..bd25ec5ee70 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1856,6 +1856,14 @@ static void build_windows_import_lib( DLLSPEC *spec ) m_flag = "i386:x86-64"; as_flags = "--as-flags=--64"; break; + case CPU_ARM: + m_flag = "arm"; + as_flags = NULL; + break; + case CPU_ARM64: + m_flag = "arm64"; + as_flags = NULL; + break; default: m_flag = NULL; break; -- 2.17.1

2 1

[PATCH] include: Fix the signature of _InterlockedCompareExchange128
by Martin Storsjo Dec. 20, 2020

Dec. 20, 2020

Clang 12 doesn't consider a function with an inconsistent signature as matching the intrinsic. This fixes InterlockedCompareExchange128 with clang 12 in MSVC mode. Signed-off-by: Martin Storsjo <martin(a)martin.st> --- include/winnt.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/winnt.h b/include/winnt.h index 01402d211fe..6d76e5e49e5 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6923,7 +6923,7 @@ static inline BOOLEAN BitScanReverse(DWORD *index, DWORD mask) #if defined(_MSC_VER) #define InterlockedCompareExchange128 _InterlockedCompareExchange128 -static inline unsigned char _InterlockedCompareExchange128(__int64 *dest, __int64 xchg_high, __int64 xchg_low, __int64 *compare); +unsigned char _InterlockedCompareExchange128(volatile __int64 *dest, __int64 xchg_high, __int64 xchg_low, __int64 *compare); #pragma intrinsic(_InterlockedCompareExchange128) #elif defined(__x86_64__) -- 2.17.1

2 1

[PATCH] asm: Use SEH assembly when building with clang in MSVC mode
by Martin Storsjo Dec. 20, 2020

Dec. 20, 2020

In MSVC mode, the __SEH__ macro isn't defined, but the .seh directives are supported in assembly. In these cases, we have to hardcode which architectures we know clang supports SEH directives in as it's not exposed otherwise. Signed-off-by: Martin Storsjo <martin(a)martin.st> --- This is admittedly rather ugly, but fixes a few unwinding cases with a wine in PE mode, built with clang in MSVC mode. --- include/wine/asm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wine/asm.h b/include/wine/asm.h index ed44a7dd6dd..236b35cf8fe 100644 --- a/include/wine/asm.h +++ b/include/wine/asm.h @@ -41,7 +41,7 @@ # define __ASM_CFI(str) #endif -#ifdef __SEH__ +#if defined(__SEH__) || (defined(_MSC_VER) && defined(__clang__) && (defined(__x86_64__) || defined(__aarch64__))) # if defined(__aarch64__) && defined(__clang_major__) && (__clang_major__ < 12 || defined(__apple_build_version__)) /* Clang got support for aarch64 SEH assembly directives in Clang 12, * before that, only .seh_startproc/.seh_endproc but nothing else was -- 2.17.1

2 1

[PATCH] asm: Separate .def/.scl/.type/.endef with newlines instead of semicolons
by Martin Storsjo Dec. 20, 2020

Dec. 20, 2020

When targeting arm64 in MSVC mode, LLVM treats semicolons in assembly as comment char, instead of as statement separator (contrary to in mingw mode, where semicolons still work as separator). In generated code, there's no need to keep these directives on one single line though, so just separate them with newlines. Signed-off-by: Martin Storsjo <martin(a)martin.st> --- (There's no reference for how msvc should interpret gas-style assembly, so one could also think LLVM should change and treat semicolons as statement separator there, like for other architectures. But when I suggested fixing that a couple years ago, it was suggested to only change it for GNU style targets, see [1]. I guess the matter could be brought up again though.) [1] https://reviews.llvm.org/D36366#833185 --- include/wine/asm.h | 2 +- tools/winebuild/utils.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/wine/asm.h b/include/wine/asm.h index b5e6c6efd3d..ed44a7dd6dd 100644 --- a/include/wine/asm.h +++ b/include/wine/asm.h @@ -56,7 +56,7 @@ #endif #ifdef _WIN32 -# define __ASM_FUNC_TYPE(name) ".def " name "; .scl 2; .type 32; .endef" +# define __ASM_FUNC_TYPE(name) ".def " name "\n\t.scl 2\n\t.type 32\n\t.endef" #elif defined(__APPLE__) # define __ASM_FUNC_TYPE(name) "" #elif defined(__arm__) || defined(__arm64__) diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 1af42f10005..5cffc74accd 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -686,7 +686,7 @@ void output_standard_file_header(void) output( "/* This file can be copied, modified and distributed without restriction. */\n\n" ); if (safe_seh) { - output( "\t.def @feat.00; .scl 3; .type 0; .endef\n" ); + output( "\t.def @feat.00\n\t.scl 3\n\t.type 0\n\t.endef\n" ); output( "\t.globl @feat.00\n" ); output( ".set @feat.00, 1\n" ); } @@ -1119,7 +1119,7 @@ const char *func_declaration( const char *func ) return ""; case PLATFORM_WINDOWS: free( buffer ); - buffer = strmake( ".def %s; .scl 2; .type 32; .endef", asm_name(func) ); + buffer = strmake( ".def %s\n\t.scl 2\n\t.type 32\n\t.endef", asm_name(func) ); break; default: free( buffer ); -- 2.17.1

2 1

[PATCH] include: Don't use the MSVC intrinsic _InterlockedCompareExchange128 on clang in MSVC mode
by Martin Storsjo Dec. 19, 2020

Dec. 19, 2020

Clang doesn't consider the currently declared function as the proper intrinsic function (a few parameters differ vaguely), and even if declared properly, clang requires building for a target with the cx16 flag enabled to be able to use that intrinsic. Instead just use the inline assembly or GCC builtin version instead. This fixes building in PE mode with Clang in MSVC mode for both x86_64 and aarch64. Signed-off-by: Martin Storsjo <martin(a)martin.st> --- include/winnt.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index 04353d9405d..9d797a85099 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6894,7 +6894,7 @@ static inline BOOLEAN BitScanReverse(DWORD *index, DWORD mask) #ifdef _WIN64 -#if defined(_MSC_VER) +#if defined(_MSC_VER) && !defined(__clang__) #define InterlockedCompareExchange128 _InterlockedCompareExchange128 static inline unsigned char _InterlockedCompareExchange128(__int64 *dest, __int64 xchg_high, __int64 xchg_low, __int64 *compare); @@ -6913,7 +6913,7 @@ static inline unsigned char InterlockedCompareExchange128(__int64 *dest, __int64 return ret; } -#elif defined(__GNUC__) +#elif defined(__GNUC__) || defined(__clang__) static inline unsigned char InterlockedCompareExchange128(__int64 *dest, __int64 xchg_high, __int64 xchg_low, __int64 *compare) { -- 2.17.1

2 2

[PATCH] kernel32/tests: Don't test functions directly when reporting GetLastError()
by André Hentschel Dec. 19, 2020

Dec. 19, 2020

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/kernel32/tests/debugger.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index 0a43fe91e64..962b308b6dc 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -1332,8 +1332,8 @@ static void test_debugger(const char *argv0) status = NtSuspendThread(thread, NULL); ok(!status, "NtSuspendThread failed, last error:%u\n", GetLastError()); - ok(ContinueDebugEvent(ctx.ev.dwProcessId, ctx.ev.dwThreadId, DBG_REPLY_LATER), - "ContinueDebugEvent failed, last error:%u\n", GetLastError()); + ret = ContinueDebugEvent(ctx.ev.dwProcessId, ctx.ev.dwThreadId, DBG_REPLY_LATER); + ok(ret, "ContinueDebugEvent failed, last error:%u\n", GetLastError()); ok(!WaitForDebugEvent(&ctx.ev, POLL_EVENT_TIMEOUT), "WaitForDebugEvent succeeded.\n"); status = NtResumeThread(thread, NULL); @@ -1350,8 +1350,8 @@ static void test_debugger(const char *argv0) ok(ctx.ev.dwDebugEventCode == LOAD_DLL_DEBUG_EVENT, "dwDebugEventCode = %d\n", ctx.ev.dwDebugEventCode); de = ctx.ev; - ok(ContinueDebugEvent(ctx.ev.dwProcessId, ctx.ev.dwThreadId, DBG_REPLY_LATER), - "ContinueDebugEvent failed, last error:%u\n", GetLastError()); + ret = ContinueDebugEvent(ctx.ev.dwProcessId, ctx.ev.dwThreadId, DBG_REPLY_LATER); + ok(ret, "ContinueDebugEvent failed, last error:%u\n", GetLastError()); ctx.ev.dwDebugEventCode = -1; next_event(&ctx, WAIT_EVENT_TIMEOUT); @@ -1462,8 +1462,8 @@ static void test_debugger(const char *argv0) status = NtSuspendThread(thread_b, NULL); ok(!status, "NtSuspendThread failed, last error:%u\n", GetLastError()); - ok(ContinueDebugEvent(ctx.ev.dwProcessId, ctx.ev.dwThreadId, DBG_REPLY_LATER), - "ContinueDebugEvent failed, last error:%u\n", GetLastError()); + ret = ContinueDebugEvent(ctx.ev.dwProcessId, ctx.ev.dwThreadId, DBG_REPLY_LATER); + ok(ret, "ContinueDebugEvent failed, last error:%u\n", GetLastError()); ctx.ev.dwDebugEventCode = -1; next_event(&ctx, WAIT_EVENT_TIMEOUT); @@ -1485,8 +1485,8 @@ static void test_debugger(const char *argv0) { status = pNtSuspendProcess(pi.hProcess); ok(!status, "NtSuspendProcess failed, last error:%u\n", GetLastError()); - ok(ContinueDebugEvent(ctx.ev.dwProcessId, ctx.ev.dwThreadId, DBG_REPLY_LATER), - "ContinueDebugEvent failed, last error:%u\n", GetLastError()); + ret = ContinueDebugEvent(ctx.ev.dwProcessId, ctx.ev.dwThreadId, DBG_REPLY_LATER); + ok(ret, "ContinueDebugEvent failed, last error:%u\n", GetLastError()); ok(!WaitForDebugEvent(&ctx.ev, POLL_EVENT_TIMEOUT), "WaitForDebugEvent succeeded.\n"); status = NtResumeThread(thread_b, NULL); -- 2.25.1

2 1

[PATCH] opengl32/tests: Don't test function directly when reporting GetLastError()
by André Hentschel Dec. 19, 2020

Dec. 19, 2020

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/opengl32/tests/opengl.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index db5ad0ad765..90f06492e81 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -235,9 +235,10 @@ static int test_pfd(const PIXELFORMATDESCRIPTOR *pfd, PIXELFORMATDESCRIPTOR *fmt pf = ChoosePixelFormat( hdc, pfd ); if (pf && fmt) { + INT ret; memset(fmt, 0, sizeof(*fmt)); - ok(DescribePixelFormat( hdc, pf, sizeof(*fmt), fmt ), - "DescribePixelFormat failed with error: %u\n", GetLastError()); + ret = DescribePixelFormat( hdc, pf, sizeof(*fmt), fmt ); + ok(ret, "DescribePixelFormat failed with error: %u\n", GetLastError()); } ReleaseDC( hwnd, hdc ); DestroyWindow( hwnd ); -- 2.25.1

1 0

Wine staging 6.0-rc3 release
by Alistair Leslie-Hughes Dec. 19, 2020

Dec. 19, 2020

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 6.0-rc3 (773 patches are applied to wine vanilla) Upstreamed (Either directly from staging or fixed with a similar patch). * winmm: Pass a fullpath to CreateFileA Added: * [39346] - Support IDirect3D3 when creating device. * [50150] - odbccp32: Implement SQLWriteDSNToIni/W * [50293] - native dxdiag complains about missing dlls. * [50026] - ntdll: Add stub for RtlQueryProcessPlaceholderCompatibilityMode Updated: * Staging * ntdll-NtQueryVirtualMemory * bcrypt-ECDHSecretAgreement * ntdll-Syscall_Emulation * mfplat-streaming-support * widl-winrt-support 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] ntdll, ntoskrnl: Implement a no-op __chkstk for arm64
by Martin Storsjo Dec. 18, 2020

Dec. 18, 2020

Signed-off-by: Martin Storsjo <martin(a)martin.st> --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernelbase/kernelbase.spec | 2 +- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/signal_arm64.c | 7 +++++++ dlls/ntoskrnl.exe/ntoskrnl.c | 7 +++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 6 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 949b262a592..ee2e3f8ad31 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1647,7 +1647,7 @@ @ stdcall WriteTapemark(ptr long long long) @ stdcall -import ZombifyActCtx(ptr) @ stdcall -arch=x86_64 -private __C_specific_handler(ptr long ptr ptr) ntdll.__C_specific_handler -@ cdecl -arch=arm,x86_64 -norelay __chkstk() ntdll.__chkstk +@ cdecl -arch=arm,arm64,x86_64 -norelay __chkstk() ntdll.__chkstk @ stub _DebugOut @ stub _DebugPrintf @ stdcall _hread(long ptr long) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 36d0492857f..b02737f045b 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1742,7 +1742,7 @@ # @ stub _GetMUIStringFromCache # @ stub _OpenMuiStringCache @ stdcall -arch=x86_64 -private __C_specific_handler(ptr long ptr ptr) ntdll.__C_specific_handler -@ cdecl -arch=arm,x86_64 -norelay __chkstk() ntdll.__chkstk +@ cdecl -arch=arm,arm64,x86_64 -norelay __chkstk() ntdll.__chkstk # @ stub __dllonexit3 @ stub __misaligned_access # @ stub __wgetmainargs diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index b9acb120844..f3ec8fd9e39 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1445,7 +1445,7 @@ @ cdecl -private -arch=i386 _CIsin() @ cdecl -private -arch=i386 _CIsqrt() @ stdcall -arch=x86_64,arm64 __C_specific_handler(ptr long ptr ptr) -@ cdecl -arch=arm,x86_64 -norelay __chkstk() +@ cdecl -arch=arm,arm64,x86_64 -norelay __chkstk() @ cdecl __isascii(long) @ cdecl __iscsym(long) @ cdecl __iscsymf(long) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index c31eb510382..6ca49481c77 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -100,6 +100,13 @@ static inline BOOL is_valid_frame( ULONG_PTR frame ) } +/************************************************************************** + * __chkstk (NTDLL.@) + * + * Supposed to touch all the stack pages, but we shouldn't need that. + */ +__ASM_GLOBAL_FUNC( __chkstk, "ret") + /*********************************************************************** * RtlCaptureContext (NTDLL.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 4092e33db43..23ca0c1c51d 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3858,6 +3858,13 @@ __ASM_GLOBAL_FUNC( _chkstk, */ __ASM_GLOBAL_FUNC( __chkstk, "lsl r4, r4, #2\n\t" "bx lr" ) +#elif defined(__aarch64__) +/************************************************************************** + * __chkstk (NTOSKRNL.@) + * + * Supposed to touch all the stack pages, but we shouldn't need that. + */ +__ASM_GLOBAL_FUNC( __chkstk, "ret" ); #endif /********************************************************************* diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 6ac70c718f1..d57a2f81df6 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1522,7 +1522,7 @@ @ stdcall ZwWriteFile(long long ptr ptr ptr ptr long ptr ptr) NtWriteFile @ stdcall -private ZwYieldExecution() NtYieldExecution @ stdcall -arch=x86_64 __C_specific_handler(ptr long ptr ptr) -@ cdecl -arch=arm,x86_64 -norelay __chkstk() +@ cdecl -arch=arm,arm64,x86_64 -norelay __chkstk() @ cdecl -private -arch=i386 _CIcos() @ cdecl -private -arch=i386 _CIsin() @ cdecl -private -arch=i386 _CIsqrt() -- 2.17.1

1 0

[PATCH] ntdll: Always copy context in call_user_apc_dispatcher() on x86.
by Paul Gofman Dec. 18, 2020

Dec. 18, 2020

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntdll/tests/exception.c | 48 ++++++++++++++++++++ dlls/ntdll/unix/signal_i386.c | 84 ++++++++++++++++++++++------------- 2 files changed, 101 insertions(+), 31 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 48785f229e9..3aa8b7a4eb9 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -2003,6 +2003,53 @@ static void test_kiuserexceptiondispatcher(void) ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); } +static BOOL test_apc_called; + +static void CALLBACK test_apc(ULONG_PTR arg1, ULONG_PTR arg2, ULONG_PTR arg3) +{ + test_apc_called = TRUE; +} + +static void test_user_apc(void) +{ + NTSTATUS status; + CONTEXT context; + int pass; + + if (!pNtQueueApcThread) + { + win_skip("NtQueueApcThread is not available.\n"); + return; + } + + pass = 0; + InterlockedIncrement(&pass); + RtlCaptureContext(&context); + InterlockedIncrement(&pass); + + if (pass == 2) + { + /* Try to make sure context data is far enough below context.Esp. */ + CONTEXT c[4]; + + c[0] = context; + + test_apc_called = FALSE; + status = pNtQueueApcThread(GetCurrentThread(), test_apc, 0, 0, 0); + ok(!status, "Got unexpected status %#x.\n", status); + SleepEx(0, TRUE); + ok(test_apc_called, "Test user APC was not called.\n"); + test_apc_called = FALSE; + status = pNtQueueApcThread(GetCurrentThread(), test_apc, 0, 0, 0); + ok(!status, "Got unexpected status %#x.\n", status); + status = NtContinue(&c[0], TRUE ); + + /* Broken before Win7, in that case NtContinue returns here instead of restoring context after calling APC. */ + ok(0, "Should not get here, status %#x.\n", status); + } + ok(pass == 3, "Got unexpected pass %d.\n", pass); + ok(test_apc_called, "Test user APC was not called.\n"); +} #elif defined(__x86_64__) #define UNW_FLAG_NHANDLER 0 @@ -8291,6 +8338,7 @@ START_TEST(exception) test_kiuserexceptiondispatcher(); test_extended_context(); test_copy_context(); + test_user_apc(); #elif defined(__x86_64__) diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index f1fd2cd2e41..ff9d8a12c14 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -1675,6 +1675,42 @@ static void setup_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec ) setup_raise_exception( sigcontext, stack, rec, &xcontext ); } +/* stack layout when calling an user apc function. + * FIXME: match Windows ABI. */ +struct apc_stack_layout +{ + void *context_ptr; + void *ctx; + void *arg1; + void *arg2; + void *func; + CONTEXT context; +}; + +struct apc_stack_layout * WINAPI setup_user_apc_dispatcher_stack( CONTEXT *context, struct apc_stack_layout *stack, + void *ctx, void *arg1, void *arg2, void *func ) +{ + CONTEXT c; + + if (!context) + { + c.ContextFlags = CONTEXT_FULL; + NtGetContextThread( GetCurrentThread(), &c ); + context = &c; + } + memmove( &stack->context, context, sizeof(stack->context) ); + stack->context_ptr = &stack->context; + stack->ctx = ctx; + stack->arg1 = arg1; + stack->arg2 = arg2; + stack->func = func; + stack->context.Eax = STATUS_USER_APC; + return stack; +} + +C_ASSERT( sizeof(struct apc_stack_layout) == 0x2e0 ); +C_ASSERT( offsetof(struct syscall_frame, ret_addr) == 0x14 ); +C_ASSERT( offsetof(struct apc_stack_layout, context) == 20 ); /*********************************************************************** * call_user_apc_dispatcher @@ -1682,41 +1718,27 @@ static void setup_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec ) __ASM_GLOBAL_FUNC( call_user_apc_dispatcher, "movl 4(%esp),%esi\n\t" /* context_ptr */ "movl 24(%esp),%edi\n\t" /* dispatcher */ + "leal 4(%esp),%ebp\n\t" "test %esi,%esi\n\t" "jz 1f\n\t" - "movl 0xc4(%esi),%eax\n\t" /* context_ptr->Rsp */ - "leal -0x2f8(%eax),%eax\n\t" /* sizeof(CONTEXT) + offsetof(frame,ret_addr) + params */ - "movl 20(%esp),%ecx\n\t" /* func */ - "movl %ecx,20(%eax)\n\t" - "movl 8(%esp),%ebx\n\t" /* ctx */ - "movl 12(%esp),%edx\n\t" /* arg1 */ - "movl 16(%esp),%ecx\n\t" /* arg2 */ - "leal 4(%eax),%esp\n\t" - "jmp 2f\n" + "movl 0xc4(%esi),%eax\n\t" /* context_ptr->Esp */ + "jmp 2f\n\t" "1:\tmovl %fs:0x1f8,%eax\n\t" /* x86_thread_data()->syscall_frame */ - "leal -0x2cc(%eax),%esi\n\t" - "movl %esp,%ebx\n\t" - "cmpl %esp,%esi\n\t" - "cmovbl %esi,%esp\n\t" - "pushl 20(%ebx)\n\t" /* func */ - "pushl 16(%ebx)\n\t" /* arg2 */ - "pushl 12(%ebx)\n\t" /* arg1 */ - "movl 8(%ebx),%ebx\n\t" /* ctx */ - "movl $0x00010007,(%esi)\n\t" /* context.ContextFlags = CONTEXT_FULL */ - "pushl %esi\n\t" /* context */ - "pushl $0xfffffffe\n\t" - "call " __ASM_STDCALL("NtGetContextThread",8) "\n\t" - "movl $0xc0,0xb0(%esi)\n" /* context.Eax = STATUS_USER_APC */ - "popl %edx\n\t" - "popl %ecx\n\t" - "popl %eax\n\t" - "leal -20(%esi),%esp\n\t" - "movl %eax,16(%esp)\n" /* func */ - "2:\tmovl %ecx,12(%esp)\n\t" /* arg2 */ - "movl %edx,8(%esp)\n\t" /* arg1 */ - "movl %ebx,4(%esp)\n\t" /* ctx */ - "movl %esi,(%esp)\n\t" /* context */ + "leal 0x14(%eax),%eax\n\t" /* &x86_thread_data()->syscall_frame->ret_addr */ + "2:\tsubl $0x2e0,%eax\n\t" /* sizeof(struct apc_stack_layout) */ + "movl %ebp,%esp\n\t" /* pop return address */ + "cmpl %esp,%eax\n\t" + "cmovbl %eax,%esp\n\t" + "pushl 16(%ebp)\n\t" /* func */ + "pushl 12(%ebp)\n\t" /* arg2 */ + "pushl 8(%ebp)\n\t" /* arg1 */ + "pushl 4(%ebp)\n\t" /* ctx */ + "pushl %eax\n\t" + "pushl %esi\n\t" + "call " __ASM_STDCALL("setup_user_apc_dispatcher_stack",24) "\n\t" "movl $0,%fs:0x1f8\n\t" /* x86_thread_data()->syscall_frame = NULL */ + "movl %eax,%esp\n\t" + "leal 20(%eax),%esi\n\t" "movl 0xb4(%esi),%ebp\n\t" /* context.Ebp */ "pushl 0xb8(%esi)\n\t" /* context.Eip */ "jmp *%edi\n" ) -- 2.29.2

2 1

[PATCH] ieframe: Fix memory leak in PersistFile_Save.
by Haidong Yu Dec. 18, 2020

Dec. 18, 2020

2 1

[PATCH v2 1/2] widl: don't use local methods when writing async interfaces
by Steve Lhomme Dec. 18, 2020

Dec. 18, 2020

The same entries can have a different call_as between the synchronous and asynchronous interfaces and shouldn't be mixed up. --- tools/widl/header.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index 223ab5c5ca9..e6de236a25f 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -1614,7 +1614,8 @@ static void write_com_interface_end(FILE *header, type_t *iface) if (!dispinterface && !winrt_mode) { write_method_proto(header, iface); - write_locals(header, iface, FALSE); + if (type_iface_get_async_iface(iface) != iface) + write_locals(header, iface, FALSE); fprintf(header, "\n"); } fprintf(header, "#endif /* __%s_%sINTERFACE_DEFINED__ */\n", iface->c_name, dispinterface ? "DISP" : ""); -- 2.29.2

2 1

[PATCH] widl: Don't apply call_as methods to async interface.
by Jacek Caban Dec. 18, 2020

Dec. 18, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/widl/parser.y | 2 ++ 1 file changed, 2 insertions(+)

1 0

[PATCH v3 1/4] winmm: Always allocate at least MAX_PATH bytes in mmioOpenW().
by Zebediah Figura Dec. 18, 2020

Dec. 18, 2020

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winmm/mmio.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c index 48bbd3ed48d..cb3175c5cd7 100644 --- a/dlls/winmm/mmio.c +++ b/dlls/winmm/mmio.c @@ -734,6 +734,7 @@ HMMIO WINAPI mmioOpenW(LPWSTR szFileName, MMIOINFO* lpmmioinfo, if (szFileName) { INT len = WideCharToMultiByte( CP_ACP, 0, szFileName, -1, NULL, 0, NULL, NULL ); + if (len < MAX_PATH) len = MAX_PATH; szFn = HeapAlloc( GetProcessHeap(), 0, len ); if (!szFn) return NULL; WideCharToMultiByte( CP_ACP, 0, szFileName, -1, szFn, len, NULL, NULL ); -- 2.29.2

2 7

[PATCH v3 2/2] wbemprox/tests: Add some tests for SystemRestore class.
by Dmitry Timoshkov Dec. 18, 2020

Dec. 18, 2020

v2: Fix test failures under 2 testbot VMs (w7u_adm and w8adm). v3: Avoid using NULL interface on clean up due to a failed method call. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wbemprox/tests/query.c | 61 +++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 73f055e8bd..0a0bd2c4f8 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1760,6 +1760,65 @@ static void test_Win32_SoundDevice( IWbemServices *services ) SysFreeString( wql ); } +static void test_SystemRestore( IWbemServices *services ) +{ + WCHAR path[MAX_PATH]; + BSTR class, method; + IWbemClassObject *service, *sig_in, *in, *out; + VARIANT var; + HRESULT hr; + + class = SysAllocString( L"SystemRestore" ); + hr = IWbemServices_GetObject( services, class, 0, NULL, &service, NULL ); + if (hr != S_OK) + { + skip( "SystemRestore not available\n" ); + SysFreeString( class ); + return; + } + + check_property( service, L"CreationTime", VT_NULL, CIM_STRING ); + check_property( service, L"Description", VT_NULL, CIM_STRING ); + check_property( service, L"EventType", VT_NULL, CIM_UINT32 ); + check_property( service, L"RestorePointType", VT_NULL, CIM_UINT32 ); + check_property( service, L"SequenceNumber", VT_NULL, CIM_UINT32 ); + + method = SysAllocString( L"Enable" ); + sig_in = NULL; + hr = IWbemClassObject_GetMethod( service, method, 0, &sig_in, NULL ); + ok( hr == S_OK, "failed to get Enable method %08x\n", hr ); + + hr = IWbemClassObject_SpawnInstance( sig_in, 0, &in ); + ok( hr == S_OK, "failed to spawn instance %08x\n", hr ); + + GetWindowsDirectoryW(path, ARRAY_SIZE(path)); + path[3] = 0; /* otherwise XP fails */ + V_VT( &var ) = VT_BSTR; + V_BSTR( &var ) = SysAllocString( path ); + hr = IWbemClassObject_Put( in, L"Drive", 0, &var, 0 ); + ok( hr == S_OK, "failed to set Drive %08x\n", hr ); + SysFreeString( V_BSTR( &var ) ); + + out = NULL; + hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, in, &out, NULL ); + ok( hr == S_OK || broken(hr == WBEM_E_ACCESS_DENIED), "failed to execute method %08x\n", hr ); + if (hr == S_OK) + { + VariantInit( &var ); + hr = IWbemClassObject_Get( out, L"ReturnValue", 0, &var, NULL, NULL ); + ok( hr == S_OK, "failed to get return value %08x\n", hr ); + ok( V_I4( &var ) == ERROR_SUCCESS, "unexpected error %u\n", V_UI4( &var ) ); + + IWbemClassObject_Release( out ); + } + + IWbemClassObject_Release( in ); + IWbemClassObject_Release( sig_in ); + IWbemClassObject_Release( service ); + SysFreeString( method ); + SysFreeString( class ); +} + START_TEST(query) { BSTR path = SysAllocString( L"ROOT\\CIMV2" ); @@ -1823,6 +1882,7 @@ START_TEST(query) test_Win32_SystemEnclosure( services ); test_Win32_VideoController( services ); test_Win32_WinSAT( services ); + test_SystemRestore( services ); SysFreeString( path ); IWbemServices_Release( services ); @@ -1836,6 +1896,7 @@ START_TEST(query) ok( hr == S_OK, "failed to set proxy blanket %08x\n", hr ); test_StdRegProv( services ); + test_SystemRestore( services ); SysFreeString( path ); IWbemServices_Release( services ); -- 2.29.2

2 4

[PATCH v3 1/2] wbemprox/tests: Run StdRegProv tests using ROOT\\DEFAULT connection point.
by Dmitry Timoshkov Dec. 18, 2020

Dec. 18, 2020

StdRegProv is not available on ROOT\\CIMV2 for unknown reason on some Windows configs. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wbemprox/tests/query.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 191b9f6c85..73f055e8bd 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1824,6 +1824,19 @@ START_TEST(query) test_Win32_VideoController( services ); test_Win32_WinSAT( services ); + SysFreeString( path ); + IWbemServices_Release( services ); + + /* Some tests need other connection point */ + path = SysAllocString( L"ROOT\\DEFAULT" ); + hr = IWbemLocator_ConnectServer( locator, path, NULL, NULL, NULL, 0, NULL, NULL, &services ); + ok( hr == S_OK, "failed to get IWbemServices interface %08x\n", hr ); + hr = CoSetProxyBlanket( (IUnknown *)services, RPC_C_AUTHN_WINNT, RPC_C_AUTHZ_NONE, NULL, + RPC_C_AUTHN_LEVEL_CALL, RPC_C_IMP_LEVEL_IMPERSONATE, NULL, EOAC_NONE ); + ok( hr == S_OK, "failed to set proxy blanket %08x\n", hr ); + + test_StdRegProv( services ); + SysFreeString( path ); IWbemServices_Release( services ); IWbemLocator_Release( locator ); -- 2.29.2

1 0

[PATCH v2 2/2] wbemprox/tests: Add some tests for SystemRestore class.
by Dmitry Timoshkov Dec. 18, 2020

Dec. 18, 2020

v2: Fix test failures under 2 testbot VMs (w7u_adm and w8adm). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wbemprox/tests/query.c | 60 +++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 73f055e8bd..d102c660e3 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1760,6 +1760,64 @@ static void test_Win32_SoundDevice( IWbemServices *services ) SysFreeString( wql ); } +static void test_SystemRestore( IWbemServices *services ) +{ + WCHAR path[MAX_PATH]; + BSTR class, method; + IWbemClassObject *service, *sig_in, *in, *out; + VARIANT var; + HRESULT hr; + + class = SysAllocString( L"SystemRestore" ); + hr = IWbemServices_GetObject( services, class, 0, NULL, &service, NULL ); + if (hr != S_OK) + { + skip( "SystemRestore not available\n" ); + SysFreeString( class ); + return; + } + + check_property( service, L"CreationTime", VT_NULL, CIM_STRING ); + check_property( service, L"Description", VT_NULL, CIM_STRING ); + check_property( service, L"EventType", VT_NULL, CIM_UINT32 ); + check_property( service, L"RestorePointType", VT_NULL, CIM_UINT32 ); + check_property( service, L"SequenceNumber", VT_NULL, CIM_UINT32 ); + + method = SysAllocString( L"Enable" ); + sig_in = NULL; + hr = IWbemClassObject_GetMethod( service, method, 0, &sig_in, NULL ); + ok( hr == S_OK, "failed to get Enable method %08x\n", hr ); + + hr = IWbemClassObject_SpawnInstance( sig_in, 0, &in ); + ok( hr == S_OK, "failed to spawn instance %08x\n", hr ); + + GetWindowsDirectoryW(path, ARRAY_SIZE(path)); + path[3] = 0; /* otherwise XP fails */ + V_VT( &var ) = VT_BSTR; + V_BSTR( &var ) = SysAllocString( path ); + hr = IWbemClassObject_Put( in, L"Drive", 0, &var, 0 ); + ok( hr == S_OK, "failed to set Drive %08x\n", hr ); + SysFreeString( V_BSTR( &var ) ); + + out = NULL; + hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, in, &out, NULL ); + ok( hr == S_OK || broken(hr == WBEM_E_ACCESS_DENIED), "failed to execute method %08x\n", hr ); + if (hr == S_OK) + { + VariantInit( &var ); + hr = IWbemClassObject_Get( out, L"ReturnValue", 0, &var, NULL, NULL ); + ok( hr == S_OK, "failed to get return value %08x\n", hr ); + ok( V_I4( &var ) == ERROR_SUCCESS, "unexpected error %u\n", V_UI4( &var ) ); + } + + IWbemClassObject_Release( in ); + IWbemClassObject_Release( out ); + IWbemClassObject_Release( sig_in ); + IWbemClassObject_Release( service ); + SysFreeString( method ); + SysFreeString( class ); +} + START_TEST(query) { BSTR path = SysAllocString( L"ROOT\\CIMV2" ); @@ -1823,6 +1881,7 @@ START_TEST(query) test_Win32_SystemEnclosure( services ); test_Win32_VideoController( services ); test_Win32_WinSAT( services ); + test_SystemRestore( services ); SysFreeString( path ); IWbemServices_Release( services ); @@ -1836,6 +1895,7 @@ START_TEST(query) ok( hr == S_OK, "failed to set proxy blanket %08x\n", hr ); test_StdRegProv( services ); + test_SystemRestore( services ); SysFreeString( path ); IWbemServices_Release( services ); -- 2.29.2

2 1

[PATCH v2 1/2] wbemprox/tests: Run StdRegProv tests using ROOT\\DEFAULT connection point.
by Dmitry Timoshkov Dec. 18, 2020

Dec. 18, 2020

StdRegProv is not available on ROOT\\CIMV2 for unknown reason on some Windows configs. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wbemprox/tests/query.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 191b9f6c85..73f055e8bd 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1824,6 +1824,19 @@ START_TEST(query) test_Win32_VideoController( services ); test_Win32_WinSAT( services ); + SysFreeString( path ); + IWbemServices_Release( services ); + + /* Some tests need other connection point */ + path = SysAllocString( L"ROOT\\DEFAULT" ); + hr = IWbemLocator_ConnectServer( locator, path, NULL, NULL, NULL, 0, NULL, NULL, &services ); + ok( hr == S_OK, "failed to get IWbemServices interface %08x\n", hr ); + hr = CoSetProxyBlanket( (IUnknown *)services, RPC_C_AUTHN_WINNT, RPC_C_AUTHZ_NONE, NULL, + RPC_C_AUTHN_LEVEL_CALL, RPC_C_IMP_LEVEL_IMPERSONATE, NULL, EOAC_NONE ); + ok( hr == S_OK, "failed to set proxy blanket %08x\n", hr ); + + test_StdRegProv( services ); + SysFreeString( path ); IWbemServices_Release( services ); IWbemLocator_Release( locator ); -- 2.29.2

1 0

[PATCH 2/2] wbemprox/tests: Add some tests for SystemRestore class.
by Dmitry Timoshkov Dec. 18, 2020

Dec. 18, 2020

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wbemprox/tests/query.c | 58 +++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 73f055e8bd..ae7cddc684 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1760,6 +1760,62 @@ static void test_Win32_SoundDevice( IWbemServices *services ) SysFreeString( wql ); } +static void test_SystemRestore( IWbemServices *services ) +{ + WCHAR path[MAX_PATH]; + BSTR class, method; + IWbemClassObject *service, *sig_in, *in, *out; + VARIANT var; + HRESULT hr; + + class = SysAllocString( L"SystemRestore" ); + hr = IWbemServices_GetObject( services, class, 0, NULL, &service, NULL ); + if (hr != S_OK) + { + skip( "SystemRestore not available\n" ); + SysFreeString( class ); + return; + } + + check_property( service, L"CreationTime", VT_NULL, CIM_STRING ); + check_property( service, L"Description", VT_NULL, CIM_STRING ); + check_property( service, L"EventType", VT_NULL, CIM_UINT32 ); + check_property( service, L"RestorePointType", VT_NULL, CIM_UINT32 ); + check_property( service, L"SequenceNumber", VT_NULL, CIM_UINT32 ); + + method = SysAllocString( L"Enable" ); + sig_in = NULL; + hr = IWbemClassObject_GetMethod( service, method, 0, &sig_in, NULL ); + ok( hr == S_OK, "failed to get Enable method %08x\n", hr ); + + hr = IWbemClassObject_SpawnInstance( sig_in, 0, &in ); + ok( hr == S_OK, "failed to spawn instance %08x\n", hr ); + + GetWindowsDirectoryW(path, ARRAY_SIZE(path)); + path[3] = 0; /* otherwise XP fails */ + V_VT( &var ) = VT_BSTR; + V_BSTR( &var ) = SysAllocString( path ); + hr = IWbemClassObject_Put( in, L"Drive", 0, &var, 0 ); + ok( hr == S_OK, "failed to set Drive %08x\n", hr ); + SysFreeString( V_BSTR( &var ) ); + + out = NULL; + hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, in, &out, NULL ); + ok( hr == S_OK, "failed to execute method %08x\n", hr ); + + VariantInit( &var ); + hr = IWbemClassObject_Get( out, L"ReturnValue", 0, &var, NULL, NULL ); + ok( hr == S_OK, "failed to get return value %08x\n", hr ); + ok( V_I4( &var ) == ERROR_SUCCESS, "unexpected error %u\n", V_UI4( &var ) ); + + IWbemClassObject_Release( in ); + IWbemClassObject_Release( out ); + IWbemClassObject_Release( sig_in ); + IWbemClassObject_Release( service ); + SysFreeString( method ); + SysFreeString( class ); +} + START_TEST(query) { BSTR path = SysAllocString( L"ROOT\\CIMV2" ); @@ -1823,6 +1879,7 @@ START_TEST(query) test_Win32_SystemEnclosure( services ); test_Win32_VideoController( services ); test_Win32_WinSAT( services ); + test_SystemRestore( services ); SysFreeString( path ); IWbemServices_Release( services ); @@ -1836,6 +1893,7 @@ START_TEST(query) ok( hr == S_OK, "failed to set proxy blanket %08x\n", hr ); test_StdRegProv( services ); + test_SystemRestore( services ); SysFreeString( path ); IWbemServices_Release( services ); -- 2.29.2

2 1

[PATCH 1/2] wbemprox/tests: Run StdRegProv tests using ROOT\\DEFAULT connection point.
by Dmitry Timoshkov Dec. 18, 2020

Dec. 18, 2020

StdRegProv is not available on ROOT\\CIMV2 on some Windows configs. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wbemprox/tests/query.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 191b9f6c85..73f055e8bd 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1824,6 +1824,19 @@ START_TEST(query) test_Win32_VideoController( services ); test_Win32_WinSAT( services ); + SysFreeString( path ); + IWbemServices_Release( services ); + + /* Some tests need other connection point */ + path = SysAllocString( L"ROOT\\DEFAULT" ); + hr = IWbemLocator_ConnectServer( locator, path, NULL, NULL, NULL, 0, NULL, NULL, &services ); + ok( hr == S_OK, "failed to get IWbemServices interface %08x\n", hr ); + hr = CoSetProxyBlanket( (IUnknown *)services, RPC_C_AUTHN_WINNT, RPC_C_AUTHZ_NONE, NULL, + RPC_C_AUTHN_LEVEL_CALL, RPC_C_IMP_LEVEL_IMPERSONATE, NULL, EOAC_NONE ); + ok( hr == S_OK, "failed to set proxy blanket %08x\n", hr ); + + test_StdRegProv( services ); + SysFreeString( path ); IWbemServices_Release( services ); IWbemLocator_Release( locator ); -- 2.29.2

1 0

[PATCH 3/3] include: Add DEFINE_ENUM_FLAG_OPERATORS macro in directmanipulation.idl.
by Biswapriyo Nath Dec. 18, 2020

Dec. 18, 2020

1 0

[PATCH 2/3] include: Add DEFINE_ENUM_FLAG_OPERATORS macro in mfreadwrite.idl.
by Biswapriyo Nath Dec. 18, 2020

Dec. 18, 2020

1 0

[PATCH 1/3] include: Add more GUIDs in mfreadwrite.idl.
by Biswapriyo Nath Dec. 18, 2020

Dec. 18, 2020

1 0

[PATCH v2 1/2] winmm/tests: Test the mmioOpen() search path with various flags.
by Zebediah Figura Dec. 17, 2020

Dec. 17, 2020

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v2: don't assume cwd == executable directory dlls/winmm/tests/mmio.c | 60 +++++++++++++++++++++++++++++++++++------ 1 file changed, 52 insertions(+), 8 deletions(-) diff --git a/dlls/winmm/tests/mmio.c b/dlls/winmm/tests/mmio.c index e3984fbaf3a..0236855f246 100644 --- a/dlls/winmm/tests/mmio.c +++ b/dlls/winmm/tests/mmio.c @@ -478,23 +478,34 @@ static void test_mmioOpen_create(void) WCHAR cwd[MAX_PATH], temp_dir[MAX_PATH]; /* According to docs, filename must be no more than 128 bytes, but it will * actually allow longer than that. */ - WCHAR filename[] = L"very_long_filename_" + WCHAR long_filename[] = L"very_long_filename_" L"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" L"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" L"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"; + WCHAR buffer[MAX_PATH], expect[MAX_PATH]; + char exedir_filename[MAX_PATH]; + MMIOINFO info = {0}; + BOOL ret; + FILE *f; + + GetModuleFileNameA(NULL, exedir_filename, ARRAY_SIZE(exedir_filename)); + strcpy(strrchr(exedir_filename, '\\') + 1, "test_mmio_path"); + f = fopen(exedir_filename, "w"); + ok(!!f, "failed to create %s: %s\n", debugstr_a(exedir_filename), strerror(errno)); + fclose(f); GetCurrentDirectoryW(ARRAY_SIZE(cwd), cwd); GetTempPathW(ARRAY_SIZE(temp_dir), temp_dir); SetCurrentDirectoryW(temp_dir); - DeleteFileW(filename); + DeleteFileW(long_filename); /* open with MMIO_DENYNONE */ - hmmio = mmioOpenW(filename, NULL, MMIO_CREATE | MMIO_WRITE | MMIO_DENYNONE); + hmmio = mmioOpenW(long_filename, NULL, MMIO_CREATE | MMIO_WRITE | MMIO_DENYNONE); ok(hmmio != NULL, "mmioOpen failed\n"); /* MMIO_DENYNONE lets us open it here, too */ - handle = CreateFileW(filename, GENERIC_READ, + handle = CreateFileW(long_filename, GENERIC_READ, FILE_SHARE_WRITE | FILE_SHARE_READ | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); ok(handle != INVALID_HANDLE_VALUE, "Couldn't open non-exclusive file\n"); @@ -502,14 +513,14 @@ static void test_mmioOpen_create(void) mmioClose(hmmio, 0); - DeleteFileW(filename); + DeleteFileW(long_filename); /* open with MMIO_EXCLUSIVE */ - hmmio = mmioOpenW(filename, NULL, MMIO_CREATE | MMIO_WRITE | MMIO_EXCLUSIVE); + hmmio = mmioOpenW(long_filename, NULL, MMIO_CREATE | MMIO_WRITE | MMIO_EXCLUSIVE); ok(hmmio != NULL, "mmioOpen failed\n"); /* should fail due to MMIO_EXCLUSIVE */ - handle = CreateFileW(filename, GENERIC_READ, + handle = CreateFileW(long_filename, GENERIC_READ, FILE_SHARE_WRITE | FILE_SHARE_READ | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); ok(handle == INVALID_HANDLE_VALUE, "Opening exclusive file should have failed\n"); @@ -518,9 +529,42 @@ static void test_mmioOpen_create(void) mmioClose(hmmio, 0); - DeleteFileW(filename); + DeleteFileW(long_filename); + + wcscpy(buffer, L"test_mmio_path"); + hmmio = mmioOpenW(buffer, &info, MMIO_WRITE); + todo_wine ok(!!hmmio, "failed to open file, error %#x\n", info.wErrorRet); + mmioClose(hmmio, 0); + + wcscpy(buffer, L"test_mmio_path"); + hmmio = mmioOpenW(buffer, &info, MMIO_PARSE); + ok(hmmio == (HMMIO)TRUE, "failed to parse file name, error %#x\n", info.wErrorRet); + wcscpy(expect, temp_dir); + wcscat(expect, L"test_mmio_path"); + todo_wine ok(!wcscmp(buffer, expect), "expected %s, got %s\n", debugstr_w(expect), debugstr_w(buffer)); + + wcscpy(buffer, L"test_mmio_path"); + info.wErrorRet = 0xdead; + hmmio = mmioOpenW(buffer, &info, MMIO_EXIST); + ok(hmmio == (HMMIO)FALSE, "file should exist\n"); + todo_wine ok(info.wErrorRet == MMIOERR_FILENOTFOUND, "got error %#x\n", info.wErrorRet); + + ret = DeleteFileA("test_mmio_path"); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "got error %u\n", GetLastError()); + + wcscpy(buffer, L"test_mmio_path"); + hmmio = mmioOpenW(buffer, &info, MMIO_WRITE | MMIO_CREATE); + ok(!!hmmio, "failed to open file, error %#x\n", info.wErrorRet); + mmioClose(hmmio, 0); + + ret = DeleteFileA("test_mmio_path"); + ok(ret, "got error %u\n", GetLastError()); SetCurrentDirectoryW(cwd); + + ret = DeleteFileA(exedir_filename); + ok(ret, "got error %u\n", GetLastError()); } static void test_mmioSetBuffer(char *fname) -- 2.29.2

3 3

[PATCH] gdi32/tests: Use wide-char string literals.
by Michael Stefaniuc Dec. 17, 2020

Dec. 17, 2020

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdi32/tests/driver.c | 2 +- dlls/gdi32/tests/font.c | 24 +++++++++++------------- dlls/gdi32/tests/icm.c | 4 +--- dlls/gdi32/tests/metafile.c | 3 +-- 4 files changed, 14 insertions(+), 19 deletions(-) diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index 2110765835f..eb0da18b32e 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -32,7 +32,7 @@ #include "wine/test.h" -static const WCHAR display1W[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','1',0}; +static const WCHAR display1W[] = L"\\\\.\\DISPLAY1"; static NTSTATUS (WINAPI *pD3DKMTCheckOcclusion)(const D3DKMT_CHECKOCCLUSION *); static NTSTATUS (WINAPI *pD3DKMTCheckVidPnExclusiveOwnership)(const D3DKMT_CHECKVIDPNEXCLUSIVEOWNERSHIP *); diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 86ccddd05ea..ad7408f5620 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1136,7 +1136,6 @@ static void ABCWidths_helper(const char* description, HDC hdc, WORD *glyphs, con static void test_GetCharABCWidths(void) { - static const WCHAR str[] = {'i',0}; BOOL ret; HDC hdc; LOGFONTA lf; @@ -1201,7 +1200,7 @@ static void test_GetCharABCWidths(void) hdc = GetDC(0); hfont = SelectObject(hdc, hfont); - nb = pGetGlyphIndicesW(hdc, str, 1, glyphs, 0); + nb = pGetGlyphIndicesW(hdc, L"i", 1, glyphs, 0); ok(nb == 1, "GetGlyphIndicesW should have returned 1\n"); ret = GetCharABCWidthsI(NULL, 0, 1, glyphs, abc); @@ -1382,7 +1381,7 @@ static void test_GetCharABCWidths(void) SetMapMode(hdc, MM_ANISOTROPIC); SelectObject(hdc, hfont); - nb = pGetGlyphIndicesW(hdc, str, 1, glyphs, 0); + nb = pGetGlyphIndicesW(hdc, L"i", 1, glyphs, 0); ok(nb == 1, "GetGlyphIndicesW should have returned 1\n"); ret = GetCharABCWidthsI(hdc, 0, 1, glyphs, abc); @@ -1433,8 +1432,7 @@ static void test_GetCharABCWidths(void) static void test_text_extents(void) { - static const WCHAR wt[] = {'O','n','e','\n','t','w','o',' ','3',0}; - static const WCHAR emptyW[] = {0}; + static const WCHAR wt[] = L"One\ntwo 3"; LPINT extents; INT i, len, fit1, fit2, extents2[3]; LOGFONTA lf; @@ -1484,7 +1482,7 @@ static void test_text_extents(void) ok(sz.cx == 0 && sz.cy == 0, "cx %d, cy %d\n", sz.cx, sz.cy); memset(&sz, 0xcc, sizeof(sz)); - ret = GetTextExtentPointW(hdc, emptyW, 0, &sz); + ret = GetTextExtentPointW(hdc, L"", 0, &sz); ok(ret, "got %d\n", ret); ok(sz.cx == 0 && sz.cy == 0, "cx %d, cy %d\n", sz.cx, sz.cy); @@ -1633,7 +1631,7 @@ static void test_GetGlyphIndices(void) DWORD charcount; LOGFONTA lf; DWORD flags = 0; - WCHAR testtext[] = {'T','e','s','t',0xffff,0}; + WCHAR testtext[] = L"Test\xffff"; WORD glyphs[(sizeof(testtext)/2)-1]; TEXTMETRICA textm; HFONT hOldFont; @@ -4445,7 +4443,7 @@ static void test_RealizationInfo(void) static void test_GetTextFace(void) { static const char faceA[] = "Tahoma"; - static const WCHAR faceW[] = {'T','a','h','o','m','a', 0}; + static const WCHAR faceW[] = L"Tahoma"; LOGFONTA fA = {0}; LOGFONTW fW = {0}; char bufA[LF_FACESIZE]; @@ -6822,7 +6820,7 @@ static void test_fake_bold_font(void) static void test_bitmap_font_glyph_index(void) { - const WCHAR text[] = {'#','!','/','b','i','n','/','s','h',0}; + const WCHAR text[] = L"#!/bin/sh"; const struct { LPCSTR face; BYTE charset; @@ -7117,10 +7115,10 @@ static void test_ttf_names(void) static void test_lang_names(void) { - static const WCHAR name_cond_ja_w[] = {0x30d5,0x30a9,0x30f3,0x30c8,0x540d,' ','C','o','n','d',' ','(','j','a',')',0}; - static const WCHAR name_cond_ja_reg_w[] = {0x30d5,0x30a9,0x30f3,0x30c8,0x540d,' ','C','o','n','d',' ','(','j','a',')',' ','R','e','g',0}; - static const WCHAR name_cond_ja_reg_ja_w[] = {0x30d5,0x30a9,0x30f3,0x30c8,0x540d,' ','C','o','n','d',' ','(','j','a',')',' ','R','e','g',' ','(','j','a',')',0}; - static const WCHAR name_wws_ja_w[] = {0x30d5,0x30a9,0x30f3,0x30c8,0x540d,' ','W','W','S',' ','(','j','a',')',0}; + static const WCHAR name_cond_ja_w[] = L"\x30d5\x30a9\x30f3\x30c8\x540d Cond (ja)"; + static const WCHAR name_cond_ja_reg_w[] = L"\x30d5\x30a9\x30f3\x30c8\x540d Cond (ja) Reg"; + static const WCHAR name_cond_ja_reg_ja_w[] = L"\x30d5\x30a9\x30f3\x30c8\x540d Cond (ja) Reg (ja)"; + static const WCHAR name_wws_ja_w[] = L"\x30d5\x30a9\x30f3\x30c8\x540d WWS (ja)"; struct enum_fullname_data efnd; struct enum_fullname_data_w efnd_w; diff --git a/dlls/gdi32/tests/icm.c b/dlls/gdi32/tests/icm.c index 340ebeef55a..509d5c0c579 100644 --- a/dlls/gdi32/tests/icm.c +++ b/dlls/gdi32/tests/icm.c @@ -27,8 +27,6 @@ #include "wine/test.h" -static const WCHAR displayW[] = {'D','I','S','P','L','A','Y',0}; - static void test_GetICMProfileA( HDC dc ) { BOOL ret; @@ -167,7 +165,7 @@ static void test_SetICMMode( HDC dc ) ok( ret, "SetICMMode failed (%d)\n", GetLastError() ); SetLastError( 0xdeadbeef ); - dc = CreateDCW( displayW, NULL, NULL, NULL ); + dc = CreateDCW( L"DISPLAY", NULL, NULL, NULL ); if ( !dc && ( GetLastError() == ERROR_CALL_NOT_IMPLEMENTED ) ) { win_skip( "CreateDCW is not implemented\n" ); diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 5a64fe6d60a..8dae908126d 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -312,7 +312,6 @@ static int CALLBACK eto_scale_enum_proc(HDC hdc, HANDLETABLE *handle_table, static void test_ExtTextOutScale(void) { const RECT rc = { 0, 0, 100, 100 }; - const WCHAR str[] = {'a',0 }; struct eto_scale_test_record test; HDC hdcDisplay, hdcMetafile; HENHMETAFILE hMetafile; @@ -392,7 +391,7 @@ static void test_ExtTextOutScale(void) ok(ret, "SetViewportExtEx failed\n"); } - ret = ExtTextOutW(hdcMetafile, 0, 0, 0, 0, str, 1, NULL); + ret = ExtTextOutW(hdcMetafile, 0, 0, 0, 0, L"a", 1, NULL); ok(ret, "ExtTextOutW failed\n"); hMetafile = CloseEnhMetaFile(hdcMetafile); -- 2.26.2

1 0

[PATCH] inetcpl.cpl: If memory allocation fails,the program will carsh.
by Haidong Yu Dec. 17, 2020

Dec. 17, 2020

2 1

[PATCH 1/2] winmm/tests: Test the mmioOpen() search path with various flags.
by Zebediah Figura Dec. 17, 2020

Dec. 17, 2020

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winmm/tests/mmio.c | 57 +++++++++++++++++++++++++++++++++++------ 1 file changed, 49 insertions(+), 8 deletions(-) diff --git a/dlls/winmm/tests/mmio.c b/dlls/winmm/tests/mmio.c index e3984fbaf3a..5ad20eec521 100644 --- a/dlls/winmm/tests/mmio.c +++ b/dlls/winmm/tests/mmio.c @@ -478,23 +478,31 @@ static void test_mmioOpen_create(void) WCHAR cwd[MAX_PATH], temp_dir[MAX_PATH]; /* According to docs, filename must be no more than 128 bytes, but it will * actually allow longer than that. */ - WCHAR filename[] = L"very_long_filename_" + WCHAR long_filename[] = L"very_long_filename_" L"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" L"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" L"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"; + WCHAR buffer[MAX_PATH], expect[MAX_PATH]; + MMIOINFO info = {0}; + BOOL ret; + FILE *f; + + f = fopen("test_mmio_path", "w"); + ok(!!f, "failed to create file: %s\n", strerror(errno)); + fclose(f); GetCurrentDirectoryW(ARRAY_SIZE(cwd), cwd); GetTempPathW(ARRAY_SIZE(temp_dir), temp_dir); SetCurrentDirectoryW(temp_dir); - DeleteFileW(filename); + DeleteFileW(long_filename); /* open with MMIO_DENYNONE */ - hmmio = mmioOpenW(filename, NULL, MMIO_CREATE | MMIO_WRITE | MMIO_DENYNONE); + hmmio = mmioOpenW(long_filename, NULL, MMIO_CREATE | MMIO_WRITE | MMIO_DENYNONE); ok(hmmio != NULL, "mmioOpen failed\n"); /* MMIO_DENYNONE lets us open it here, too */ - handle = CreateFileW(filename, GENERIC_READ, + handle = CreateFileW(long_filename, GENERIC_READ, FILE_SHARE_WRITE | FILE_SHARE_READ | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); ok(handle != INVALID_HANDLE_VALUE, "Couldn't open non-exclusive file\n"); @@ -502,14 +510,14 @@ static void test_mmioOpen_create(void) mmioClose(hmmio, 0); - DeleteFileW(filename); + DeleteFileW(long_filename); /* open with MMIO_EXCLUSIVE */ - hmmio = mmioOpenW(filename, NULL, MMIO_CREATE | MMIO_WRITE | MMIO_EXCLUSIVE); + hmmio = mmioOpenW(long_filename, NULL, MMIO_CREATE | MMIO_WRITE | MMIO_EXCLUSIVE); ok(hmmio != NULL, "mmioOpen failed\n"); /* should fail due to MMIO_EXCLUSIVE */ - handle = CreateFileW(filename, GENERIC_READ, + handle = CreateFileW(long_filename, GENERIC_READ, FILE_SHARE_WRITE | FILE_SHARE_READ | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); ok(handle == INVALID_HANDLE_VALUE, "Opening exclusive file should have failed\n"); @@ -518,9 +526,42 @@ static void test_mmioOpen_create(void) mmioClose(hmmio, 0); - DeleteFileW(filename); + DeleteFileW(long_filename); + + wcscpy(buffer, L"test_mmio_path"); + hmmio = mmioOpenW(buffer, &info, MMIO_WRITE); + todo_wine ok(!!hmmio, "failed to open file, error %#x\n", info.wErrorRet); + mmioClose(hmmio, 0); + + wcscpy(buffer, L"test_mmio_path"); + hmmio = mmioOpenW(buffer, &info, MMIO_PARSE); + ok(hmmio == (HMMIO)TRUE, "failed to parse file name, error %#x\n", info.wErrorRet); + wcscpy(expect, temp_dir); + wcscat(expect, L"test_mmio_path"); + todo_wine ok(!wcscmp(buffer, expect), "expected %s, got %s\n", debugstr_w(expect), debugstr_w(buffer)); + + wcscpy(buffer, L"test_mmio_path"); + info.wErrorRet = 0xdead; + hmmio = mmioOpenW(buffer, &info, MMIO_EXIST); + ok(hmmio == (HMMIO)FALSE, "file should exist\n"); + todo_wine ok(info.wErrorRet == MMIOERR_FILENOTFOUND, "got error %#x\n", info.wErrorRet); + + ret = DeleteFileA("test_mmio_path"); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "got error %u\n", GetLastError()); + + wcscpy(buffer, L"test_mmio_path"); + hmmio = mmioOpenW(buffer, &info, MMIO_WRITE | MMIO_CREATE); + ok(!!hmmio, "failed to open file, error %#x\n", info.wErrorRet); + mmioClose(hmmio, 0); + + ret = DeleteFileA("test_mmio_path"); + ok(ret, "got error %u\n", GetLastError()); SetCurrentDirectoryW(cwd); + + ret = DeleteFileA("test_mmio_path"); + ok(ret, "got error %u\n", GetLastError()); } static void test_mmioSetBuffer(char *fname) -- 2.29.2

2 2

[RFC] Announcing Wayland driver development
by Alexandros Frantzis Dec. 17, 2020

Dec. 17, 2020

Hi all, For some time now I have been working on a Wayland driver for Wine, and it has now reached a good enough state to present it to the wider community. This driver allows users to run Windows GDI and OpenGL applications directly on Wayland compositors without an intermediate layer to translate from X11 to Wayland. This leads to a leaner and more efficient stack. The code currently resides at: https://gitlab.collabora.com/alf/wine/-/commits/wayland Get it with: $ git clone -b wayland https://gitlab.collabora.com/alf/wine/ Configure with (you need the wayland-client and wayland-egl packages): $ ./configure --with-wayland To run, ensure there is a Wayland compositor running, unset DISPLAY (so that Wayland is picked instead of X11) and set WAYLAND_DISPLAY (if needed): $ DISPLAY= WAYLAND_DISPLAY=wayland-0 ./wine ... Here is video showcasing a few Windows applications running with the Wayland driver on the Weston reference compositor: https://youtu.be/br2b8gUy5n8 The Wayland protocol is by design more constrained compared to more traditional display systems like X11. These constraints add some special challenges in the integration of Wayland with Win32. Since Wayland's window model is not based on a single flat 2D co-ordinate space, as X11's was, the Wayland protocol doesn't allow applications to control their absolute position on the screen. For Win32 transient windows (menus, tooltips, etc) the driver tries to work around the lack of absolute positioning by "anchoring" them to an owning Wayland surface and treating them as subsurfaces of that owner. Screen coordinates for such windows are transformed to local coordinates relative to the owning surface, allowing correct placement through relative subsurface movement, which is supported by Wayland. By using heuristics to select the proper owning surface, this approach has led to very good results. Absolute positioning of non-transient top level windows is not supported at this time, and will likely require a (possibly controversial) Wayland extension if it is to ever be pursued. The lack of absolute positioning also has an adverse effect on input handling, when parts of windows reside outside the visible windows display space, but are still full accessible in the Wayland compositor display space (and thus the user). Input events to such areas don't reach their intended coordinates (are clamped to Windows display bounds) leaving the user mystified about why they are unable to interact with a perfectly visible area in their Wayland compositor. The current partial workaround is to force all windows at (0,0) windows display coordinates, to maximize the area which can be interacted with. With this workaround, and as long as windows remain smaller than the display size, input works without issues. Here what's supported at the moment (modulo bugs): * GDI apps, including layered/translucent windows * OpenGL apps * Window resizing * Maximized and fullscreen window states * Mouse and keyboard (only QWERTY) input * Mouse cursors * Menus, tooltips, etc * Single display What needs more work (or is completely missing): * Minimize * Better z-order and activation handling * Keyboard layout support * Grabs * GTK menu mouse handling bug (cannot click to select items) * Multiple displays * Vulkan. Note that that there is another effort at https://github.com/varmd/wine-wayland/ focusing solely on vulkan. My hope is that we will be able to share efforts going forward. Programs I have tried and which are working well (again modulo bugs): * Native Wine/Win32 apps (notepad, regedit etc) * Supertuxkart * 010Editor * Firefox * Stellarium * Battle For Wesnoth * GIMP (except clicking items in GTK menus as noted above) * Unigine Valley My first question to the Wine community is how complete the driver should be before being considered for inclusion. Is the current Wayland driver state enough? If there is interest, I was hoping to get the driver in earlier rather than later, in an experimental capacity, in order to provide a single, official point of development for people wanting to contribute. My second question is about the best way to move forward with upstreaming. The code is currently split between just a few commits, mostly as a result of the experimental nature of this effort, and also because I used existing code from winex11 and wineandroid as my starting point. I would like to split this into smaller commits to make it more review-friendly for the mailing list. I was thinking of splitting by user32 function (and internal dependencies), but since this is going to be an artificial split, I am open to other ideas to make reviewers' lives easier. Looking forward to your feedback and questions! Thanks, Alexandros

5 8

[PATCH 1/2] widl: don't use local methods when writing async interfaces
by Steve Lhomme Dec. 17, 2020

Dec. 17, 2020

The same entries can have a different call_as between the synchronous and asynchronous interfaces and shouldn't be mixed up. --- tools/widl/header.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index 223ab5c5ca9..43be8d74cbe 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -1535,7 +1535,7 @@ static void write_com_interface_start(FILE *header, const type_t *iface) fprintf(header,"#define __%s_%sINTERFACE_DEFINED__\n\n", iface->c_name, dispinterface ? "DISP" : ""); } -static void write_com_interface_end(FILE *header, type_t *iface) +static void write_com_interface_end(FILE *header, type_t *iface, int as_async) { int dispinterface = is_attr(iface->attrs, ATTR_DISPINTERFACE); const UUID *uuid = get_attrp(iface->attrs, ATTR_UUID); @@ -1614,7 +1614,8 @@ static void write_com_interface_end(FILE *header, type_t *iface) if (!dispinterface && !winrt_mode) { write_method_proto(header, iface); - write_locals(header, iface, FALSE); + if (!as_async) + write_locals(header, iface, FALSE); fprintf(header, "\n"); } fprintf(header, "#endif /* __%s_%sINTERFACE_DEFINED__ */\n", iface->c_name, dispinterface ? "DISP" : ""); @@ -1808,11 +1809,11 @@ static void write_header_stmts(FILE *header, const statement_list_t *stmts, cons { write_com_interface_start(header, iface); write_header_stmts(header, type_iface_get_stmts(iface), stmt->u.type, TRUE); - write_com_interface_end(header, iface); + write_com_interface_end(header, iface, FALSE); if (async_iface) { write_com_interface_start(header, async_iface); - write_com_interface_end(header, async_iface); + write_com_interface_end(header, async_iface, TRUE); } } else -- 2.29.2

3 9

Re: TestBot job 83503 results: [PATCH] ws2_32: Fix buffer size check in WSAIoctl() for SIO_GET_INTERFACE_LIST.
by Paul Gofman Dec. 17, 2020

Dec. 17, 2020

On 12/16/20 12:10, Marvin wrote: > ws2_32: > sock.c:10534: Test failed: Got unexpected ret 0. > sock.c:10535: Test failed: Got unexpected error 6. > sock.c:10536: Test failed: Got unexpected size 76. Can it be that Wine is not getting updated on Testbot? The tests results are like the changes to test are applied but ws2_32.dll is unchanged.

2 4

[tools] testbot/RestoreVM: Explicitly deleting the old disks may not be necessary.
by Francois Gouget Dec. 17, 2020

Dec. 17, 2020

Normally virsh undefine --remove-all-storage handles it but it does not follow the symbolic links. So tell rm not to complain if it finds no file to delete. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/scripts/RestoreVM | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/scripts/RestoreVM b/testbot/scripts/RestoreVM index a31f3ea71d..bf99e4978a 100755 --- a/testbot/scripts/RestoreVM +++ b/testbot/scripts/RestoreVM @@ -641,7 +641,7 @@ then then fatal_no_cleanup "could not remove the existing '$opt_vm' VM" fi - [ -z "$olddisks" ] || dry_run rm $olddisks + [ -z "$olddisks" ] || dry_run rm -f $olddisks fi -- 2.20.1

1 0

[tools] testbot/TestAgent: Also dereference symbolic links to better find $::RootDir.
by Francois Gouget Dec. 17, 2020

Dec. 17, 2020

This allows putting a symbolic link to TestAgent in $PATH. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/scripts/TestAgent | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/testbot/scripts/TestAgent b/testbot/scripts/TestAgent index 40f443e462..10bdc63d1b 100755 --- a/testbot/scripts/TestAgent +++ b/testbot/scripts/TestAgent @@ -23,12 +23,10 @@ use strict; sub BEGIN { - if ($0 !~ m=^/=) - { - # Turn $0 into an absolute path so it can safely be used in @INC - require Cwd; - $0 = Cwd::cwd() . "/$0"; - } + # Turn $0 into an absolute path so it can safely be used in @INC. + # Also dereference symbolic links to better find $::RootDir. + use Cwd 'abs_path'; + $0 = abs_path($0); if ($0 =~ m=^(/.*)/[^/]+/[^/]+$=) { $::RootDir = $1; -- 2.20.1

1 0

[tools] testbot/RestoreVM: Avoid errors when restoring a VM with no snapshot.
by Francois Gouget Dec. 17, 2020

Dec. 17, 2020

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/scripts/RestoreVM | 1 + 1 file changed, 1 insertion(+) diff --git a/testbot/scripts/RestoreVM b/testbot/scripts/RestoreVM index bf99e4978a..a1b9d15846 100755 --- a/testbot/scripts/RestoreVM +++ b/testbot/scripts/RestoreVM @@ -677,6 +677,7 @@ then _dir="$1" for snapxml in "$_dir"/*.xml do + [ -f "$snapxml" ] || continue name=`basename "$snapxml" .xml` ctime=`sed -e 's~^.*<creationTime>$[0-9][0-9]*$</creationTime>.*$~\1~' -e t -e d "$snapxml"` echo "$ctime $name" -- 2.20.1

1 0

[PATCH] ws2_32/tests: Don't fail the test in test_wsaioctl() if only one interface is available.
by Paul Gofman Dec. 17, 2020

Dec. 17, 2020

Fixes test failure on Testbot. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ws2_32/tests/sock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 98cc3881853..2b0a7354f4b 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -10530,7 +10530,7 @@ static void test_wsaioctl(void) ok(size && size != 0xdeadbeef && !(size % sizeof(INTERFACE_INFO)), "Got unexpected size %u.\n", size); size = 0xdeadbeef; - ret = WSAIoctl(s, SIO_GET_INTERFACE_LIST, NULL, 0, buffer, sizeof(INTERFACE_INFO), &size, NULL, NULL); + ret = WSAIoctl(s, SIO_GET_INTERFACE_LIST, NULL, 0, buffer, sizeof(INTERFACE_INFO) - 1, &size, NULL, NULL); ok(ret == -1, "Got unexpected ret %d.\n", ret); ok(WSAGetLastError() == WSAEFAULT, "Got unexpected error %d.\n", WSAGetLastError()); ok(!size, "Got unexpected size %u.\n", size); -- 2.29.2

1 0

[PATCH v2] crypt32/tests: Fix a registerOIDInfo() failure when missing elevated privileges.
by Francois Gouget Dec. 17, 2020

Dec. 17, 2020

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- With my apologies for the previous botched attempt. dlls/crypt32/tests/oid.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/crypt32/tests/oid.c b/dlls/crypt32/tests/oid.c index ae03bba90e8..7e7c1310dd2 100644 --- a/dlls/crypt32/tests/oid.c +++ b/dlls/crypt32/tests/oid.c @@ -646,7 +646,8 @@ static void test_registerOIDInfo(void) SetLastError(0xdeadbeef); ret = CryptUnregisterOIDInfo(&info1); ok(!ret, "should fail\n"); - ok(GetLastError() == ERROR_FILE_NOT_FOUND, "got %u\n", GetLastError()); + ok(GetLastError() == ERROR_FILE_NOT_FOUND || + GetLastError() == ERROR_ACCESS_DENIED, "got %u\n", GetLastError()); info2 = CryptFindOIDInfo(CRYPT_OID_INFO_OID_KEY, (void *)test_oid, 0); ok(!info2, "should fail\n"); -- 2.20.1

1 0

[PATCH] winegcc: allow CROSSCC to have a suffix
by Damjan Jovanovic Dec. 17, 2020

Dec. 17, 2020

This allows eg. CROSSCC=i686-w64-mingw32-gcc10. Does not regenerate ./configure. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- configure.ac | 2 +- tools/winegcc/Makefile.in | 3 ++- tools/winegcc/winegcc.c | 5 ++++- 3 files changed, 7 insertions(+), 3 deletions(-)

2 1

[rebased PATCH v3 1/2] ntdll: Always copy context in call_user_apc_dispatcher() on x64.
by Paul Gofman Dec. 16, 2020

Dec. 16, 2020

Currently, if call_user_apc_dispatcher() is called with nonzero context, there is no guarantee that the provided context is stored above the rsp = context_ptr->Rsp - (sizeof(CONTEXT) + offsetof(frame,ret_addr)) being set. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v3: - properly align / reserve stack for setup_user_apc_dispatcher_stack() call. dlls/ntdll/unix/signal_x86_64.c | 62 +++++++++++++++++++++++++-------- 1 file changed, 48 insertions(+), 14 deletions(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 7181b48728c..3ae3b4c141e 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -250,6 +250,22 @@ C_ASSERT((offsetof(struct stack_layout, xstate) == sizeof(struct stack_layout))) C_ASSERT( sizeof(XSTATE) == 0x140 ); C_ASSERT( sizeof(struct stack_layout) == 0x590 ); /* Should match the size in call_user_exception_dispatcher(). */ +/* stack layout when calling an user apc function. + * FIXME: match Windows ABI. */ +struct apc_stack_layout +{ + ULONG64 save_regs[4]; + void *func; + ULONG64 align; + CONTEXT context; + ULONG64 rbp; + ULONG64 rip; +}; + +/* Should match size and offset in call_user_apc_dispatcher(). */ +C_ASSERT( offsetof(struct apc_stack_layout, context) == 0x30 ); +C_ASSERT( sizeof(struct apc_stack_layout) == 0x510 ); + struct syscall_frame { ULONG64 xmm[10 * 2]; /* xmm6-xmm15 */ @@ -266,6 +282,9 @@ struct syscall_frame ULONG64 ret_addr; }; +/* Should match the offset in call_user_apc_dispatcher(). */ +C_ASSERT( offsetof( struct syscall_frame, ret_addr ) == 0xf0); + struct amd64_thread_data { DWORD_PTR dr0; /* 02f0 debug registers */ @@ -2013,31 +2032,46 @@ static void setup_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec ) /*********************************************************************** * call_user_apc_dispatcher */ +struct apc_stack_layout * WINAPI setup_user_apc_dispatcher_stack( CONTEXT *context, struct apc_stack_layout *stack ) +{ + CONTEXT c; + + if (!context) + { + c.ContextFlags = CONTEXT_FULL; + NtGetContextThread( GetCurrentThread(), &c ); + context = &c; + } + memmove( &stack->context, context, sizeof(stack->context) ); + return stack; +} + __ASM_GLOBAL_FUNC( call_user_apc_dispatcher, "movq 0x28(%rsp),%rsi\n\t" /* func */ "movq 0x30(%rsp),%rdi\n\t" /* dispatcher */ "movq %gs:0x30,%rbx\n\t" - "jrcxz 1f\n\t" - "movq 0x98(%rcx),%rax\n\t" /* context_ptr->Rsp */ - "leaq -0x5c0(%rax),%rsp\n\t" /* sizeof(CONTEXT) + offsetof(frame,ret_addr) */ - "andq $~15,%rsp\n\t" - "jmp 2f\n" - "1:\tmovq 0x328(%rbx),%rax\n\t" /* amd64_thread_data()->syscall_frame */ - "leaq -0x4d0(%rax),%rsp\n\t" - "andq $~15,%rsp\n\t" "movq %rdx,%r12\n\t" /* ctx */ "movq %r8,%r13\n\t" /* arg1 */ "movq %r9,%r14\n\t" /* arg2 */ - "movq %rsp,%rdx\n\t" /* context */ - "movl $0x10000b,0x30(%rdx)\n\t" /* context.ContextFlags */ - "movq $~1,%rcx\n\t" - "call " __ASM_NAME("NtGetContextThread") "\n\t" - "movq %rsp,%rcx\n\t" /* context */ + "jrcxz 1f\n\t" + "movq 0x98(%rcx),%rdx\n\t" /* context->Rsp */ + "jmp 2f\n\t" + "1:\tmovq 0x328(%rbx),%rax\n\t" /* amd64_thread_data()->syscall_frame */ + "leaq 0xf0(%rax),%rdx\n\t" /* &amd64_thread_data()->syscall_frame->ret_addr */ + "2:\tsubq $0x510,%rdx\n\t" /* sizeof(struct apc_stack_layout) */ + "andq $~0xf,%rdx\n\t" + "addq $8,%rsp\n\t" /* pop return address */ + "cmpq %rsp,%rdx\n\t" + "cmovbq %rdx,%rsp\n\t" + "subq $0x20,%rsp\n\t" + "call " __ASM_NAME("setup_user_apc_dispatcher_stack") "\n\t" + "movq %rax,%rsp\n\t" + "leaq 0x30(%rsp),%rcx\n\t" /* context */ "movq $0xc0,0x78(%rcx)\n\t" /* context.Rax = STATUS_USER_APC */ "movq %r12,%rdx\n\t" /* ctx */ "movq %r13,%r8\n\t" /* arg1 */ "movq %r14,%r9\n" /* arg2 */ - "2:\tmovq $0,0x328(%rbx)\n\t" + "movq $0,0x328(%rbx)\n\t" /* amd64_thread_data()->syscall_frame */ "movq %rsi,0x20(%rsp)\n\t" /* func */ "movq 0xa0(%rcx),%rbp\n\t" /* context.Rbp */ "pushq 0xf8(%rcx)\n\t" /* context.Rip */ -- 2.29.2

1 1

[PATCH 2/2] conhost: Improve get_output_info debug traces.
by Jacek Caban Dec. 16, 2020

Dec. 16, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/conhost.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)

1 0

[PATCH 1/2] conhost: Don't create bitmap for hidden windows.
by Jacek Caban Dec. 16, 2020

Dec. 16, 2020

Fixes performance issues in ConEmu. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/window.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)

1 0

[PATCH v2] wintrust: Don't fail CryptCATOpen on empty file or invalid data.
by Rémi Bernon Dec. 16, 2020

Dec. 16, 2020

Fixes a regression from 699e0a55ea71e2506917e38fc85cb4ae23a9cd1a, making "winetricks dotnet30sp1" fail. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49831 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/wintrust/crypt.c | 14 ++++++++++++-- dlls/wintrust/tests/crypt.c | 12 ++++++------ 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/dlls/wintrust/crypt.c b/dlls/wintrust/crypt.c index be869ad8277..fcf419c76d1 100644 --- a/dlls/wintrust/crypt.c +++ b/dlls/wintrust/crypt.c @@ -908,6 +908,7 @@ HANDLE WINAPI CryptCATOpen(WCHAR *filename, DWORD flags, HCRYPTPROV hProv, BYTE *buffer = NULL; DWORD size, open_mode = OPEN_ALWAYS; struct cryptcat *cc; + BOOL valid; TRACE("filename %s, flags %#x, provider %#lx, version %#x, type %#x\n", debugstr_w(filename), flags, hProv, dwPublicVersion, dwEncodingType); @@ -941,13 +942,15 @@ HANDLE WINAPI CryptCATOpen(WCHAR *filename, DWORD flags, HCRYPTPROV hProv, HeapFree(GetProcessHeap(), 0, buffer); return INVALID_HANDLE_VALUE; } - if (!ReadFile(file, buffer, size, &size, NULL) || !CryptMsgUpdate(hmsg, buffer, size, TRUE)) + if (!size) valid = FALSE; + else if (!ReadFile(file, buffer, size, &size, NULL)) { CloseHandle(file); HeapFree(GetProcessHeap(), 0, buffer); CryptMsgClose(hmsg); return INVALID_HANDLE_VALUE; } + else valid = CryptMsgUpdate(hmsg, buffer, size, TRUE); HeapFree(GetProcessHeap(), 0, buffer); CloseHandle(file); @@ -961,7 +964,13 @@ HANDLE WINAPI CryptCATOpen(WCHAR *filename, DWORD flags, HCRYPTPROV hProv, cc->msg = hmsg; cc->encoding = dwEncodingType; - if (CryptMsgGetParam(hmsg, CMSG_ATTR_CERT_COUNT_PARAM, 0, &cc->attr_count, &size)) + if (!valid) + { + cc->magic = CRYPTCAT_MAGIC; + SetLastError(ERROR_SUCCESS); + return cc; + } + else if (CryptMsgGetParam(hmsg, CMSG_ATTR_CERT_COUNT_PARAM, 0, &cc->attr_count, &size)) { DWORD i, sum = 0; BYTE *p; @@ -1012,6 +1021,7 @@ HANDLE WINAPI CryptCATOpen(WCHAR *filename, DWORD flags, HCRYPTPROV hProv, return INVALID_HANDLE_VALUE; } cc->magic = CRYPTCAT_MAGIC; + SetLastError(ERROR_SUCCESS); return cc; } HeapFree(GetProcessHeap(), 0, cc); diff --git a/dlls/wintrust/tests/crypt.c b/dlls/wintrust/tests/crypt.c index 1b436e9f4ab..5f9c402e00f 100644 --- a/dlls/wintrust/tests/crypt.c +++ b/dlls/wintrust/tests/crypt.c @@ -429,10 +429,10 @@ static void test_CryptCATOpen(void) } else { - todo_wine ok(cat != INVALID_HANDLE_VALUE, "flags %#x: expected success\n", flags); - todo_wine ok(!GetLastError(), "flags %#x: got error %u\n", flags, GetLastError()); + ok(cat != INVALID_HANDLE_VALUE, "flags %#x: expected success\n", flags); + ok(!GetLastError(), "flags %#x: got error %u\n", flags, GetLastError()); ret = pCryptCATClose(cat); - todo_wine ok(ret, "flags %#x: failed to close file\n", flags); + ok(ret, "flags %#x: failed to close file\n", flags); ret = DeleteFileW(filename); ok(ret, "flags %#x: failed to delete file, error %u\n", flags, GetLastError()); } @@ -443,10 +443,10 @@ static void test_CryptCATOpen(void) SetLastError(0xdeadbeef); cat = pCryptCATOpen(filename, flags, 0, 0, 0); - todo_wine ok(cat != INVALID_HANDLE_VALUE, "flags %#x: expected success\n", flags); - todo_wine ok(!GetLastError(), "flags %#x: got error %u\n", flags, GetLastError()); + ok(cat != INVALID_HANDLE_VALUE, "flags %#x: expected success\n", flags); + ok(!GetLastError(), "flags %#x: got error %u\n", flags, GetLastError()); ret = pCryptCATClose(cat); - todo_wine ok(ret, "flags %#x: failed to close file\n", flags); + ok(ret, "flags %#x: failed to close file\n", flags); file = _wfopen(filename, L"r"); ret = fread(buffer, 1, sizeof(buffer), file); -- 2.29.2

1 0

[PATCH 1/3] wintrust: Refactor CryptCATOpen error handling.
by Rémi Bernon Dec. 16, 2020

Dec. 16, 2020

Make it simpler, handle all errors in the same place. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/wintrust/crypt.c | 118 +++++++++++++----------------------------- 1 file changed, 36 insertions(+), 82 deletions(-) diff --git a/dlls/wintrust/crypt.c b/dlls/wintrust/crypt.c index be869ad8277..4fbf75f7e0c 100644 --- a/dlls/wintrust/crypt.c +++ b/dlls/wintrust/crypt.c @@ -904,10 +904,10 @@ BOOL WINAPI CryptCATPersistStore(HANDLE catalog) HANDLE WINAPI CryptCATOpen(WCHAR *filename, DWORD flags, HCRYPTPROV hProv, DWORD dwPublicVersion, DWORD dwEncodingType) { - HANDLE file, hmsg; - BYTE *buffer = NULL; - DWORD size, open_mode = OPEN_ALWAYS; - struct cryptcat *cc; + HANDLE file, hmsg = NULL; + BYTE *buffer = NULL, *p; + DWORD i, sum = 0, size, open_mode = OPEN_ALWAYS; + struct cryptcat *cc = NULL; TRACE("filename %s, flags %#x, provider %#lx, version %#x, type %#x\n", debugstr_w(filename), flags, hProv, dwPublicVersion, dwEncodingType); @@ -929,92 +929,46 @@ HANDLE WINAPI CryptCATOpen(WCHAR *filename, DWORD flags, HCRYPTPROV hProv, if (file == INVALID_HANDLE_VALUE) return INVALID_HANDLE_VALUE; size = GetFileSize(file, NULL); - if (!(buffer = HeapAlloc(GetProcessHeap(), 0, size))) - { - CloseHandle(file); - SetLastError(ERROR_OUTOFMEMORY); - return INVALID_HANDLE_VALUE; - } - if (!(hmsg = CryptMsgOpenToDecode(dwEncodingType, 0, 0, hProv, NULL, NULL))) - { - CloseHandle(file); - HeapFree(GetProcessHeap(), 0, buffer); - return INVALID_HANDLE_VALUE; - } - if (!ReadFile(file, buffer, size, &size, NULL) || !CryptMsgUpdate(hmsg, buffer, size, TRUE)) - { - CloseHandle(file); - HeapFree(GetProcessHeap(), 0, buffer); - CryptMsgClose(hmsg); - return INVALID_HANDLE_VALUE; - } - HeapFree(GetProcessHeap(), 0, buffer); - CloseHandle(file); + if (!(buffer = HeapAlloc(GetProcessHeap(), 0, size))) goto failed_alloc; + if (!(hmsg = CryptMsgOpenToDecode(dwEncodingType, 0, 0, hProv, NULL, NULL))) goto failed; + if (!ReadFile(file, buffer, size, &size, NULL) || !CryptMsgUpdate(hmsg, buffer, size, TRUE)) goto failed; size = sizeof(DWORD); - if (!(cc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*cc)))) - { - CryptMsgClose(hmsg); - SetLastError(ERROR_OUTOFMEMORY); - return INVALID_HANDLE_VALUE; - } + if (!(cc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*cc)))) goto failed_alloc; cc->msg = hmsg; cc->encoding = dwEncodingType; - if (CryptMsgGetParam(hmsg, CMSG_ATTR_CERT_COUNT_PARAM, 0, &cc->attr_count, &size)) - { - DWORD i, sum = 0; - BYTE *p; + if (!CryptMsgGetParam(hmsg, CMSG_ATTR_CERT_COUNT_PARAM, 0, &cc->attr_count, &size)) goto failed; - for (i = 0; i < cc->attr_count; i++) - { - if (!CryptMsgGetParam(hmsg, CMSG_ATTR_CERT_PARAM, i, NULL, &size)) - { - CryptMsgClose(hmsg); - HeapFree(GetProcessHeap(), 0, cc); - return INVALID_HANDLE_VALUE; - } - sum += size; - } - if (!(cc->attr = HeapAlloc(GetProcessHeap(), 0, sizeof(*cc->attr) * cc->attr_count + sum))) - { - CryptMsgClose(hmsg); - HeapFree(GetProcessHeap(), 0, cc); - SetLastError(ERROR_OUTOFMEMORY); - return INVALID_HANDLE_VALUE; - } - p = (BYTE *)(cc->attr + cc->attr_count); - for (i = 0; i < cc->attr_count; i++) - { - if (!CryptMsgGetParam(hmsg, CMSG_ATTR_CERT_PARAM, i, NULL, &size)) - { - CryptMsgClose(hmsg); - HeapFree(GetProcessHeap(), 0, cc->attr); - HeapFree(GetProcessHeap(), 0, cc); - return INVALID_HANDLE_VALUE; - } - if (!CryptMsgGetParam(hmsg, CMSG_ATTR_CERT_PARAM, i, p, &size)) - { - CryptMsgClose(hmsg); - HeapFree(GetProcessHeap(), 0, cc->attr); - HeapFree(GetProcessHeap(), 0, cc); - return INVALID_HANDLE_VALUE; - } - p += size; - } - cc->inner = decode_inner_content(hmsg, dwEncodingType, &cc->inner_len); - if (!cc->inner || !CryptSIPRetrieveSubjectGuid(filename, NULL, &cc->subject)) - { - CryptMsgClose(hmsg); - HeapFree(GetProcessHeap(), 0, cc->attr); - HeapFree(GetProcessHeap(), 0, cc->inner); - HeapFree(GetProcessHeap(), 0, cc); - return INVALID_HANDLE_VALUE; - } - cc->magic = CRYPTCAT_MAGIC; - return cc; + for (i = 0; i < cc->attr_count; i++) + { + if (!CryptMsgGetParam(hmsg, CMSG_ATTR_CERT_PARAM, i, NULL, &size)) goto failed; + sum += size; + } + if (!(cc->attr = HeapAlloc(GetProcessHeap(), 0, sizeof(*cc->attr) * cc->attr_count + sum))) goto failed_alloc; + p = (BYTE *)(cc->attr + cc->attr_count); + for (i = 0; i < cc->attr_count; i++) + { + if (!CryptMsgGetParam(hmsg, CMSG_ATTR_CERT_PARAM, i, NULL, &size)) goto failed; + if (!CryptMsgGetParam(hmsg, CMSG_ATTR_CERT_PARAM, i, p, &size)) goto failed; + p += size; } + cc->inner = decode_inner_content(hmsg, dwEncodingType, &cc->inner_len); + if (!cc->inner || !CryptSIPRetrieveSubjectGuid(filename, NULL, &cc->subject)) goto failed; + cc->magic = CRYPTCAT_MAGIC; + HeapFree(GetProcessHeap(), 0, buffer); + CloseHandle(file); + return cc; + +failed_alloc: + SetLastError(ERROR_OUTOFMEMORY); +failed: + if (cc) HeapFree(GetProcessHeap(), 0, cc->inner); + if (cc) HeapFree(GetProcessHeap(), 0, cc->attr); HeapFree(GetProcessHeap(), 0, cc); + HeapFree(GetProcessHeap(), 0, buffer); + CryptMsgClose(hmsg); + CloseHandle(file); return INVALID_HANDLE_VALUE; } -- 2.29.2

2 4

[PATCH] httpapi/tests: Sleep before calling GetOverlappedResult() in test_v2_server().
by Zebediah Figura Dec. 16, 2020

Dec. 16, 2020

This seems to be a variation of a bug already encountered; here the kernel does not report the right value in the IOSB until after completion is signaled. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48587 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/httpapi/tests/httpapi.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/httpapi/tests/httpapi.c b/dlls/httpapi/tests/httpapi.c index d758dee6b2c..752d008fc6b 100644 --- a/dlls/httpapi/tests/httpapi.c +++ b/dlls/httpapi/tests/httpapi.c @@ -233,9 +233,11 @@ static void test_v1_server(void) ok(ret, "Got error %u.\n", GetLastError()); ok(ret_size > sizeof(*req), "Got size %u.\n", ret_size); - /* 64-bit Windows 10 version 1507 apparently suffers from a bug where it - * will report success before completely filling the buffer. Wait for a - * short interval to work around this. */ + /* Various versions of Windows (observed on 64-bit Windows 8 and Windows 10 + * version 1507, but probably affecting others) suffer from a bug where the + * kernel will report success before completely filling the buffer or + * reporting the correct buffer size. Wait for a short interval to work + * around this. */ Sleep(100); ok(!req->Flags, "Got flags %#x.\n", req->Flags); @@ -1306,10 +1308,14 @@ static void test_v2_server(void) ret = send(s, req_text, strlen(req_text), 0); ok(ret == strlen(req_text), "send() returned %d.\n", ret); + ret = WaitForSingleObject(ovl.hEvent, 100); + ok(!ret, "Got %u.\n", ret); + + Sleep(100); + ret = GetOverlappedResult(queue, &ovl, &ret_size, TRUE); ok(ret, "Got error %u.\n", GetLastError()); ok(ret_size > sizeof(*req), "Got size %u.\n", ret_size); - Sleep(100); ok(!req->Flags, "Got flags %#x.\n", req->Flags); ok(req->ConnectionId, "Expected nonzero connection ID.\n"); -- 2.29.2

2 1

[PATCH] wined3d: Do not create Vulkan 2D (array) views for UAVs on 3D resources.
by Henri Verbeet Dec. 16, 2020

Dec. 16, 2020

We should simply create 3D views. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50123 Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/view.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index f2c8ceab461..c3128c9ed4c 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -688,7 +688,7 @@ static VkBufferView wined3d_view_vk_create_buffer_view(struct wined3d_context_vk static VkImageView wined3d_view_vk_create_texture_view(struct wined3d_context_vk *context_vk, const struct wined3d_view_desc *desc, struct wined3d_texture_vk *texture_vk, - const struct wined3d_format_vk *view_format_vk, struct color_fixup_desc fixup, bool srv) + const struct wined3d_format_vk *view_format_vk, struct color_fixup_desc fixup, bool rtv) { const struct wined3d_resource *resource = &texture_vk->t.resource; const struct wined3d_vk_info *vk_info = context_vk->vk_info; @@ -730,7 +730,7 @@ static VkImageView wined3d_view_vk_create_texture_view(struct wined3d_context_vk create_info.flags = 0; create_info.image = texture_vk->vk_image; create_info.viewType = vk_image_view_type_from_wined3d(resource->type, desc->flags); - if (!srv && create_info.viewType == VK_IMAGE_VIEW_TYPE_3D) + if (rtv && create_info.viewType == VK_IMAGE_VIEW_TYPE_3D) { if (desc->u.texture.layer_count > 1) create_info.viewType = VK_IMAGE_VIEW_TYPE_2D_ARRAY; @@ -823,7 +823,7 @@ static void wined3d_render_target_view_vk_cs_init(void *object) context = context_acquire(resource->device, NULL, 0); view_vk->vk_image_view = wined3d_view_vk_create_texture_view(wined3d_context_vk(context), - desc, texture_vk, format_vk, COLOR_FIXUP_IDENTITY, false); + desc, texture_vk, format_vk, COLOR_FIXUP_IDENTITY, true); context_release(context); if (!view_vk->vk_image_view) @@ -1098,7 +1098,7 @@ static void wined3d_shader_resource_view_vk_cs_init(void *object) context = context_acquire(resource->device, NULL, 0); vk_image_view = wined3d_view_vk_create_texture_view(wined3d_context_vk(context), - desc, texture_vk, wined3d_format_vk(format), format->color_fixup, true); + desc, texture_vk, wined3d_format_vk(format), format->color_fixup, false); context_release(context); if (!vk_image_view) -- 2.20.1

1 0

[PATCH 4/5] msvcrt: Use __ASM_USE_THISCALL_WRAPPER in cxx.h.
by Jacek Caban Dec. 16, 2020

Dec. 16, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/msvcrt/cxx.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

2 1

[PATCH 3/5] msvcrt: Use GCC-style assembly on Clang MSVC target.
by Jacek Caban Dec. 16, 2020

Dec. 16, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/msvcrt/math.c | 14 +++++++------- dlls/msvcrt/misc.c | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-)

2 1

[PATCH 2/5 v2] msvcrt: Prefix *rot* functions.
by Piotr Caban Dec. 16, 2020

Dec. 16, 2020

From: Jacek Caban <jacek(a)codeweavers.com> MSVC does not allow overriding those intrinsic functions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/crtdll/crtdll.spec | 8 ++++---- dlls/msvcr100/msvcr100.spec | 12 ++++++------ dlls/msvcr110/msvcr110.spec | 12 ++++++------ dlls/msvcr120/msvcr120.spec | 12 ++++++------ dlls/msvcr70/msvcr70.spec | 8 ++++---- dlls/msvcr71/msvcr71.spec | 8 ++++---- dlls/msvcr80/msvcr80.spec | 12 ++++++------ dlls/msvcr90/msvcr90.spec | 12 ++++++------ dlls/msvcrt/math.c | 12 ++++++------ dlls/msvcrt/msvcrt.spec | 12 ++++++------ dlls/msvcrtd/msvcrtd.spec | 8 ++++---- dlls/ucrtbase/ucrtbase.spec | 12 ++++++------ 12 files changed, 64 insertions(+), 64 deletions(-)

1 0

[PATCH 1/5 v2] ucrtbase: Improve __intrinsic_abnormal_termination stub.
by Piotr Caban Dec. 16, 2020

Dec. 16, 2020

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- v2: - fix spec files dlls/crtdll/crtdll.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/except.c | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrtd/msvcrtd.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-)

1 0

[PATCH] ws2_32: Fix buffer size check in WSAIoctl() for SIO_GET_INTERFACE_LIST.
by Paul Gofman Dec. 16, 2020

Dec. 16, 2020

Fixes out of bound memory access in Anno 1404 Addon. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- This is not a (recent) regression, but this is out of bound memory acccess andd the fix is trivial, so suggesting during the code freeze. dlls/ws2_32/socket.c | 3 ++- dlls/ws2_32/tests/sock.c | 25 +++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 6cb35bcd135..05097ce53b8 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4618,10 +4618,11 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID if (ptr->IpAddressList.IpAddress.String[0] == '\0') continue; - if ((numInt + 1)*sizeof(INTERFACE_INFO)/sizeof(IP_ADAPTER_INFO) > out_size) + if ((numInt + 1) * sizeof(INTERFACE_INFO) > out_size) { WARN("Buffer too small = %u, out_size = %u\n", numInt + 1, out_size); status = WSAEFAULT; + if (ret_size) *ret_size = 0; break; } diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 8711b65fcea..98cc3881853 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -10514,6 +10514,30 @@ static void test_WSCGetProviderPath(void) ok(len == 256, "Got unexpected len %d.\n", len); } +static void test_wsaioctl(void) +{ + char buffer[4096]; + DWORD size; + SOCKET s; + int ret; + + s = WSASocketW(AF_INET, SOCK_STREAM, IPPROTO_TCP, NULL, 0, WSA_FLAG_OVERLAPPED); + ok(s != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); + + size = 0xdeadbeef; + ret = WSAIoctl(s, SIO_GET_INTERFACE_LIST, NULL, 0, buffer, sizeof(buffer), &size, NULL, NULL); + ok(!ret, "Got unexpected ret %d.\n", ret); + ok(size && size != 0xdeadbeef && !(size % sizeof(INTERFACE_INFO)), "Got unexpected size %u.\n", size); + + size = 0xdeadbeef; + ret = WSAIoctl(s, SIO_GET_INTERFACE_LIST, NULL, 0, buffer, sizeof(INTERFACE_INFO), &size, NULL, NULL); + ok(ret == -1, "Got unexpected ret %d.\n", ret); + ok(WSAGetLastError() == WSAEFAULT, "Got unexpected error %d.\n", WSAGetLastError()); + ok(!size, "Got unexpected size %u.\n", size); + + closesocket(s); +} + START_TEST( sock ) { int i; @@ -10595,6 +10619,7 @@ START_TEST( sock ) /* this is an io heavy test, do it at the end so the kernel doesn't start dropping packets */ test_send(); test_synchronous_WSAIoctl(); + test_wsaioctl(); Exit(); } -- 2.29.2

1 0

[PATCH] -Add SORT_DIGITSASNUMBERS flag to CompareStringsEx (Fixes FL Studio 20.8 crash on startup)
by John Zourlios Dec. 16, 2020

Dec. 16, 2020

--- dlls/kernelbase/locale.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index c60b796aa48..51085f4377a 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -3021,7 +3021,7 @@ INT WINAPI CompareStringEx( const WCHAR *locale, DWORD flags, const WCHAR *str1, { DWORD supported_flags = NORM_IGNORECASE | NORM_IGNORENONSPACE | NORM_IGNORESYMBOLS | SORT_STRINGSORT | NORM_IGNOREKANATYPE | NORM_IGNOREWIDTH | LOCALE_USE_CP_ACP; - DWORD semistub_flags = NORM_LINGUISTIC_CASING | LINGUISTIC_IGNORECASE | 0x10000000; + DWORD semistub_flags = NORM_LINGUISTIC_CASING | LINGUISTIC_IGNORECASE | 0x10000000 | SORT_DIGITSASNUMBERS; /* 0x10000000 is related to diacritics in Arabic, Japanese, and Hebrew */ INT ret; static int once; -- 2.29.2

1 1

[PATCH] po: Update Korean translation.
by Byeongsik Jeon Dec. 16, 2020

Dec. 16, 2020

Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> --- po/ko.po | 536 ++++++++++++++++++++----------------------------------- 1 file changed, 189 insertions(+), 347 deletions(-) diff --git a/po/ko.po b/po/ko.po index 6beee8a7c15..a8b4f84d583 100644 --- a/po/ko.po +++ b/po/ko.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: 2019-11-01 16:21+0900\n" +"PO-Revision-Date: 2020-12-16 13:14+0900\n" "Last-Translator: Byeongsik Jeon <bsjeon(a)hanmail.net>\n" "Language-Team: Korean\n" "Language: ko\n" @@ -702,7 +702,7 @@ msgstr "사용자 정의 색상(&C):" #: dlls/comdlg32/comdlg32.rc:289 msgid "|S&olid" -msgstr "" +msgstr "|단색(&O)" #: dlls/comdlg32/comdlg32.rc:290 msgid "&Red:" @@ -739,11 +739,9 @@ msgid "&Define Custom Colors >>" msgstr "사용자 정의 색상 결정(&D) >>" #: dlls/comdlg32/comdlg32.rc:312 -#, fuzzy -#| msgid "&No" msgctxt "Solid" msgid "&o" -msgstr "아니요(&N)" +msgstr "&O" #: dlls/comdlg32/comdlg32.rc:318 programs/regedit/regedit.rc:275 #: programs/regedit/regedit.rc:285 @@ -978,7 +976,7 @@ msgstr "파일이 없습니다" #: dlls/comdlg32/comdlg32.rc:41 msgid "The selection contains a non-folder object" -msgstr "선택 영역에 폴더가 아닌 객체가 들어 있습니다" +msgstr "선택 영역에 폴더가 아닌 개체가 들어 있습니다" #: dlls/comdlg32/comdlg32.rc:46 msgid "Up One Level" @@ -2292,7 +2290,7 @@ msgstr "용도 추가" #: dlls/cryptui/cryptui.rc:265 msgid "" "Add the object identifier (OID) for the certificate purpose you wish to add:" -msgstr "추가하고자 하는 인증서 용도의 객체 식별자(OID) 추가:" +msgstr "추가하고자 하는 인증서 용도의 개체 식별자(OID) 추가:" #: dlls/cryptui/cryptui.rc:273 dlls/cryptui/cryptui.rc:69 msgid "Select Certificate Store" @@ -2726,7 +2724,7 @@ msgid "" "The file contains objects that do not match the given criteria. Please " "select another file." msgstr "" -"이 파일에 주어진 기준에 맞지 않는 객체가 있습니다. 다른 파일을 선택하십시오." +"이 파일에 주어진 기준에 맞지 않는 개체가 있습니다. 다른 파일을 선택하십시오." #: dlls/cryptui/cryptui.rc:73 msgid "File to Import" @@ -3126,7 +3124,7 @@ msgstr "행동" #: dlls/dinput/dinput.rc:29 msgid "Object" -msgstr "객체" +msgstr "개체" #: dlls/dxdiagn/dxdiagn.rc:28 msgid "Regional Setting" @@ -3723,11 +3721,11 @@ msgstr "게임 컨트롤러" #: dlls/joy.cpl/joy.rc:32 msgid "Test and configure game controllers." -msgstr "" +msgstr "게임 컨트롤러를 테스트하고 구성합니다." #: dlls/jscript/jscript.rc:28 msgid "Error converting object to primitive type" -msgstr "객체를 기본 형식으로 변환하는 중에 오류 발생" +msgstr "개체를 기본 형식으로 변환하는 중에 오류 발생" #: dlls/jscript/jscript.rc:29 dlls/vbscript/vbscript.rc:29 msgid "Invalid procedure call or argument" @@ -3738,26 +3736,24 @@ msgid "Subscript out of range" msgstr "첨자가 범위를 벗어남" #: dlls/jscript/jscript.rc:31 -#, fuzzy -#| msgid "Out of paper; " msgid "Out of stack space" -msgstr "종이 초과; " +msgstr "스택 공간이 부족함" #: dlls/jscript/jscript.rc:32 msgid "Object required" -msgstr "객체가 필요함" +msgstr "개체가 필요함" #: dlls/jscript/jscript.rc:33 msgid "Automation server can't create object" -msgstr "자동화 서버가 객체를 만들 수 없음" +msgstr "자동화 서버가 개체를 만들 수 없음" #: dlls/jscript/jscript.rc:34 dlls/vbscript/vbscript.rc:49 msgid "Object doesn't support this property or method" -msgstr "객체는 이 속성이나 메소드를 지원하지 않음" +msgstr "개체는 이 속성이나 메소드를 지원하지 않음" #: dlls/jscript/jscript.rc:35 dlls/vbscript/vbscript.rc:50 msgid "Object doesn't support this action" -msgstr "객체는 이 행동을 지원하지 않음" +msgstr "개체는 이 행동을 지원하지 않음" #: dlls/jscript/jscript.rc:36 msgid "Argument not optional" @@ -3809,11 +3805,11 @@ msgstr "루프 바깥에는 'continue'를 사용할 수 없음" #: dlls/jscript/jscript.rc:48 msgid "Label redefined" -msgstr "레이블이 중복정의됨" +msgstr "레이블이 재정의되었습니다" #: dlls/jscript/jscript.rc:49 msgid "Label not found" -msgstr "레이블을 찾을 수 없음" +msgstr "레이블을 찾을 수 없습니다" #: dlls/jscript/jscript.rc:50 msgid "Expected '@end'" @@ -3821,7 +3817,7 @@ msgstr "'@end'가 필요합니다" #: dlls/jscript/jscript.rc:51 msgid "Conditional compilation is turned off" -msgstr "조건부 컴파일이 해제되어 있음" +msgstr "조건부 컴파일이 해제되었습니다" #: dlls/jscript/jscript.rc:52 msgid "Expected '@'" @@ -3829,17 +3825,15 @@ msgstr "'@'가 필요합니다" #: dlls/jscript/jscript.rc:78 msgid "Microsoft JScript compilation error" -msgstr "" +msgstr "Microsoft JScript 컴파일 오류" #: dlls/jscript/jscript.rc:79 msgid "Microsoft JScript runtime error" -msgstr "" +msgstr "Microsoft JScript 런타임 오류" #: dlls/jscript/jscript.rc:80 dlls/vbscript/vbscript.rc:64 -#, fuzzy -#| msgid "Unknown error" msgid "Unknown runtime error" -msgstr "알 수 없는 오류" +msgstr "알 수 없는 런타임 오류" #: dlls/jscript/jscript.rc:55 msgid "Number expected" @@ -3851,11 +3845,11 @@ msgstr "함수가 필요합니다" #: dlls/jscript/jscript.rc:54 msgid "'[object]' is not a date object" -msgstr "'[object]'가 날짜 객체가 아닙니다" +msgstr "'[object]'은(는) 날짜 개체가 아닙니다" #: dlls/jscript/jscript.rc:56 msgid "Object expected" -msgstr "객체가 필요합니다" +msgstr "개체가 필요합니다" #: dlls/jscript/jscript.rc:57 msgid "Illegal assignment" @@ -3863,43 +3857,39 @@ msgstr "잘못된 할당" #: dlls/jscript/jscript.rc:58 msgid "'|' is undefined" -msgstr "'|'가 정의도지 않았습니다" +msgstr "'|'이(가) 정의되지 않았습니다" #: dlls/jscript/jscript.rc:59 msgid "Boolean object expected" -msgstr "볼린 객제가 필요함" +msgstr "Boolean 개체가 필요합니다" #: dlls/jscript/jscript.rc:60 msgid "Cannot delete '|'" -msgstr "'|'를 지울 수 없음" +msgstr "'|'을(를) 삭제할 수 없습니다" #: dlls/jscript/jscript.rc:61 msgid "VBArray object expected" -msgstr "VBArray 갹체가 필요함" +msgstr "VBArray 개체가 필요합니다" #: dlls/jscript/jscript.rc:62 msgid "JScript object expected" -msgstr "JScript 객체가 필요함" +msgstr "JScript 개체가 필요합니다" #: dlls/jscript/jscript.rc:63 -#, fuzzy -#| msgid "Array object expected" msgid "Enumerator object expected" -msgstr "배열 객체가 필요합니다" +msgstr "열거형 개체가 필요합니다" #: dlls/jscript/jscript.rc:64 -#, fuzzy -#| msgid "Boolean object expected" msgid "Regular Expression object expected" -msgstr "볼린 객제가 필요함" +msgstr "정규식 개체가 필요합니다" #: dlls/jscript/jscript.rc:65 msgid "Syntax error in regular expression" -msgstr "정규 표현식에 문법오류가 있음" +msgstr "정규식에 구문 오류가 있습니다" #: dlls/jscript/jscript.rc:66 msgid "Exception thrown and not caught" -msgstr "" +msgstr "예외가 발생했지만 catch할 수 없습니다" #: dlls/jscript/jscript.rc:68 msgid "URI to be encoded contains invalid characters" @@ -3907,7 +3897,7 @@ msgstr "인코딩할 URI에 올바르지 않은 문자가 들어 있습니다" #: dlls/jscript/jscript.rc:67 msgid "URI to be decoded is incorrect" -msgstr "디코딩할 URI가 올바르지 않습니다" +msgstr "디코딩할 URI가 잘못되었습니다" #: dlls/jscript/jscript.rc:69 msgid "Number of fraction digits is out of range" @@ -3919,11 +3909,11 @@ msgstr "정밀도가 범위를 벗어났습니다" #: dlls/jscript/jscript.rc:71 msgid "Array length must be a finite positive integer" -msgstr "배열 길이는 유한한 양의 정수이어야 합니다" +msgstr "배열의 길이는 유한한 양의 정수이어야 합니다" #: dlls/jscript/jscript.rc:72 msgid "Array object expected" -msgstr "배열 객체가 필요합니다" +msgstr "배열 개체가 필요합니다" #: dlls/jscript/jscript.rc:73 msgid "" @@ -3934,15 +3924,15 @@ msgstr "" #: dlls/jscript/jscript.rc:74 msgid "Cannot redefine non-configurable property '|'" -msgstr "구성되지 않은 요소 '|'를 재처리할 수 없습니다" +msgstr "구성 가능하지 않은 속성 '|'을(를) 재정의할 수 없습니다" #: dlls/jscript/jscript.rc:75 msgid "Cannot modify non-writable property '|'" -msgstr "쓰기 가능하지 않은 요소 '|'를 편집할 수 없습니다" +msgstr "쓰기 가능하지 않은 속성 '|'을(를) 수정할 수 없습니다" #: dlls/jscript/jscript.rc:76 msgid "Property cannot have both accessors and a value" -msgstr "속성은 접근자와 값을 모두 가질 수 없습니다" +msgstr "속성에 접근자와 값을 둘 다 지정할 수는 없습니다" #: include/wine/wine_common_ver.rc:129 msgid "Wine kernel DLL" @@ -5975,7 +5965,7 @@ msgstr "목록상자에는 탭정지가 없음.\n" #: dlls/kernel32/winerror.mc:2573 msgid "Can't destroy object owned by another thread.\n" -msgstr "다른 스레드가 소유한 객체를 파괴할 수 없다.\n" +msgstr "다른 스레드가 소유한 개체를 파괴할 수 없다.\n" #: dlls/kernel32/winerror.mc:2578 msgid "Child window menus not allowed.\n" @@ -6303,7 +6293,7 @@ msgstr "올바르지 않은 시간 초과 값.\n" #: dlls/kernel32/winerror.mc:2983 msgid "Object UUID not found.\n" -msgstr "UUID 객체를 찾을 수 없습니다.\n" +msgstr "UUID 개체를 찾을 수 없습니다.\n" #: dlls/kernel32/winerror.mc:2988 msgid "UUID already registered.\n" @@ -6479,7 +6469,7 @@ msgstr "더 이상 회원은 없습니다.\n" #: dlls/kernel32/winerror.mc:3208 msgid "Not all objects unexported.\n" -msgstr "모든 객체가 내보내지지 못했습니다.\n" +msgstr "모든 개체가 내보내지지 못했습니다.\n" #: dlls/kernel32/winerror.mc:3213 msgid "Interface not found.\n" @@ -6763,7 +6753,7 @@ msgstr "잘못된 스텁 버전.\n" #: dlls/kernel32/winerror.mc:3563 msgid "Invalid pipe object.\n" -msgstr "올바르지 않은 파이프 객체.\n" +msgstr "올바르지 않은 파이프 개체.\n" #: dlls/kernel32/winerror.mc:3568 msgid "Wrong pipe order.\n" @@ -6783,7 +6773,7 @@ msgstr "엔드포인트 매퍼 DB를 만들 수 없습니다.\n" #: dlls/kernel32/winerror.mc:3588 msgid "Invalid object.\n" -msgstr "올바르지 않은 객체.\n" +msgstr "올바르지 않은 개체.\n" #: dlls/kernel32/winerror.mc:3593 msgid "Invalid time.\n" @@ -6831,7 +6821,7 @@ msgstr "올바르지 않은 드라이버.\n" #: dlls/kernel32/winerror.mc:3648 msgid "Invalid object resolver set.\n" -msgstr "잘못된 객체 확인자 세트.\n" +msgstr "잘못된 개체 확인자 세트.\n" #: dlls/kernel32/winerror.mc:3653 msgid "Incomplete RPC send.\n" @@ -6914,49 +6904,41 @@ msgid "Connection reset by peer.\n" msgstr "피어가 연결을 초기화 했습니다.\n" #: dlls/kernel32/winerror.mc:3767 -#, fuzzy -#| msgid "Not implemented" msgid "Not implemented.\n" -msgstr "구현되지 않음" +msgstr "구현되지 않았습니다.\n" #: dlls/kernel32/winerror.mc:3788 -#, fuzzy -#| msgid "RPC call failed.\n" msgid "Call failed.\n" -msgstr "RPC 호출 실패.\n" +msgstr "호출이 실패했습니다.\n" #: dlls/kernel32/winerror.mc:3760 msgid "No Signature found in file.\n" -msgstr "서명 또는 인증서를 찾을 수 없습니다.\n" +msgstr "파일에서 서명을 찾을 수 없습니다.\n" #: dlls/kernel32/winerror.mc:3774 -#, fuzzy -#| msgid "Invalid level.\n" msgid "Invalid call.\n" -msgstr "올바르지 않은 레벨.\n" +msgstr "올바르지 않은 호출입니다.\n" #: dlls/kernel32/winerror.mc:3781 -#, fuzzy -#| msgid "Value is not available.\n" msgid "Resource is not currently available.\n" -msgstr "값을 사용할 수 없습니다.\n" +msgstr "지금은 리소스를 사용할 수 없습니다.\n" #: dlls/localspl/localspl.rc:31 dlls/localui/localui.rc:31 #: dlls/winspool.drv/winspool.rc:30 msgid "Local Port" -msgstr "지역 포트" +msgstr "로컬 포트" #: dlls/localspl/localspl.rc:32 msgid "Local Monitor" -msgstr "지역 모니터" +msgstr "로컬 모니터" #: dlls/localui/localui.rc:39 msgid "Add a Local Port" -msgstr "지역 포트 더하기" +msgstr "로컬 포트 추가" #: dlls/localui/localui.rc:42 msgid "&Enter the port name to add:" -msgstr "더할 포트 이름 입력(&E):" +msgstr "추가할 포트 이름 입력(&E):" #: dlls/localui/localui.rc:51 msgid "Configure LPT Port" @@ -6964,11 +6946,11 @@ msgstr "LPT 포트 설정" #: dlls/localui/localui.rc:54 msgid "Timeout (seconds)" -msgstr "시간초과(초)" +msgstr "시간 제한(초)" #: dlls/localui/localui.rc:55 msgid "&Transmission Retry:" -msgstr "재 전송 횟수(&T):" +msgstr "전송 재시도(&T):" #: dlls/localui/localui.rc:32 msgid "'%s' is not a valid port name" @@ -6999,10 +6981,8 @@ msgid "Sink has not been finalized.\n" msgstr "싱크가 완료되지 않았습니다.\n" #: dlls/mferror/mferror.mc:732 -#, fuzzy -#| msgid "Sink was already stopped.\n" msgid "Clock was stopped\n" -msgstr "싱크가 이미 중지되었습니다.\n" +msgstr "시계가 중지되었습니다.\n" #: dlls/mferror/mferror.mc:32 msgid "Media Foundation platform is not initialized.\n" @@ -7030,7 +7010,7 @@ msgstr "더 이상 입력이 허용되지 않습니다.\n" #: dlls/mferror/mferror.mc:74 msgid "Object is not initialized.\n" -msgstr "객체가 초기화되지 않았습니다.\n" +msgstr "개체가 초기화되지 않았습니다.\n" #: dlls/mferror/mferror.mc:81 msgid "Representation is not supported.\n" @@ -7110,7 +7090,7 @@ msgstr "비율(rate) 변경이 선점되었습니다.\n" #: dlls/mferror/mferror.mc:228 msgid "Object or value wasn't found.\n" -msgstr "객체 또는 값을 찾을 수 없습니다.\n" +msgstr "개체 또는 값을 찾을 수 없습니다.\n" #: dlls/mferror/mferror.mc:235 msgid "Value is not available.\n" @@ -7381,10 +7361,8 @@ msgid "Clock state was already set.\n" msgstr "시계 상태가 이미 설정되었습니다.\n" #: dlls/mferror/mferror.mc:725 -#, fuzzy -#| msgid "Clock is not available.\n" msgid "Clock is not simple\n" -msgstr "시계를 사용할 수 없습니다.\n" +msgstr "시계가 단순하지 않습니다.\n" #: dlls/mpr/mpr.rc:35 dlls/wininet/wininet.rc:48 msgid "Enter Network Password" @@ -8043,7 +8021,7 @@ msgstr "Wine 비디오 1 비디오 코덱" #: dlls/oleacc/oleacc.rc:31 msgid "unknown object" -msgstr "알 수 없는 객체" +msgstr "알 수 없는 개체" #: dlls/oleacc/oleacc.rc:32 msgid "title bar" @@ -8478,214 +8456,168 @@ msgid "Off" msgstr "비작동" #: dlls/oledb32/version.rc:56 -#, fuzzy -#| msgid "video" msgid "Provider" -msgstr "비디오" +msgstr "공급자" #: dlls/oledb32/version.rc:59 -#, fuzzy -#| msgid "Select the format you want to use:" msgid "Select the data you want to connect to:" -msgstr "사용할 파일 형식 선택:" +msgstr "연결할 데이터 선택:" #: dlls/oledb32/version.rc:66 -#, fuzzy -#| msgid "Connections" msgid "Connection" msgstr "연결" #: dlls/oledb32/version.rc:69 -#, fuzzy -#| msgid "Select the format you want to use:" msgid "Specify the following to connect to ODBC data:" -msgstr "사용할 파일 형식 선택:" +msgstr "ODBC 데이터에 연결하려면 다음을 지정합니다:" #: dlls/oledb32/version.rc:70 msgid "1. Specify the source of data:" -msgstr "" +msgstr "1. 데이터 원본을 지정합니다:" #: dlls/oledb32/version.rc:71 -#, fuzzy -#| msgid "Please enter your name" msgid "Use &data source name" -msgstr "이름을 입력해 주세요" +msgstr "데이터 원본 이름 사용(&D)" #: dlls/oledb32/version.rc:74 -#, fuzzy -#| msgid "Reset Connections" msgid "Use c&onnection string" -msgstr "연결 재설정" +msgstr "연결 문자열 사용(&O)" #: dlls/oledb32/version.rc:75 -#, fuzzy -#| msgid "Connections" msgid "&Connection string:" -msgstr "연결" +msgstr "연결 문자열(&C):" #: dlls/oledb32/version.rc:77 -#, fuzzy -#| msgid "A&dd..." msgid "B&uild..." -msgstr "추가(&D)..." +msgstr "빌드(&U)..." #: dlls/oledb32/version.rc:78 msgid "2. Enter information to log on to the server" -msgstr "" +msgstr "2. 서버에 로그온할 정보를 입력합니다" #: dlls/oledb32/version.rc:79 -#, fuzzy -#| msgid "&User name:" msgid "User &name:" -msgstr "사용자 이름(&U):" +msgstr "사용자 이름(&N):" #: dlls/oledb32/version.rc:83 -#, fuzzy -#| msgid "&Blank page" msgid "&Blank password" -msgstr "빈 페이지(&B)" +msgstr "빈 암호(&B)" #: dlls/oledb32/version.rc:84 -#, fuzzy -#| msgid "Wrong password.\n" msgid "Allow &saving password" -msgstr "잘못된 암호.\n" +msgstr "암호 저장 허용(&S)" #: dlls/oledb32/version.rc:85 msgid "3. Enter the &initial catalog to use:" -msgstr "" +msgstr "3. 사용할 초기 카탈로그를 입력합니다(&I):" #: dlls/oledb32/version.rc:87 -#, fuzzy -#| msgid "Reset Connections" msgid "&Test Connection" -msgstr "연결 재설정" +msgstr "테스트 연결(&T)" #: dlls/oledb32/version.rc:92 msgid "Advanced" -msgstr "중급자" +msgstr "고급" #: dlls/oledb32/version.rc:95 -#, fuzzy -#| msgid "Network share" msgid "Network settings" -msgstr "네트워크 공유" +msgstr "네트워크 설정" #: dlls/oledb32/version.rc:96 -#, fuzzy -#| msgid "Bad impersonation level.\n" msgid "&Impersonation level:" -msgstr "나쁜 가장 수준.\n" +msgstr "개인화 수준(&I):" #: dlls/oledb32/version.rc:98 msgid "P&rotection level:" -msgstr "" +msgstr "보호 수준(&R):" #: dlls/oledb32/version.rc:101 -#, fuzzy -#| msgid "Connected" msgid "Connect:" -msgstr "연결됨" +msgstr "연결:" #: dlls/oledb32/version.rc:103 -#, fuzzy -#| msgid "seconds" msgid "seconds." -msgstr "초" +msgstr "초." #: dlls/oledb32/version.rc:104 -#, fuzzy -#| msgid "Success" msgid "A&ccess:" -msgstr "성공" +msgstr "접근(&C):" #: dlls/oledb32/version.rc:110 -#, fuzzy -#| msgid "&All" msgid "All" -msgstr "모두(&A)" +msgstr "모두" #: dlls/oledb32/version.rc:114 msgid "" "These are the initialization properties for this type of data. To edit a " "value, select a property, then choose Edit Value below." msgstr "" +"이러한 유형의 데이터에 대한 초기화 속성입니다. 값을 편집하려면 속성을 선택한 " +"다음 아래의 값 편집을 선택합니다." #: dlls/oledb32/version.rc:115 -#, fuzzy -#| msgid "&Edit..." msgid "&Edit Value..." -msgstr "편집(&E)..." +msgstr "값 편집(&E)..." #: dlls/oledb32/version.rc:49 -#, fuzzy -#| msgid "Properties" msgid "Data Link Error" -msgstr "속성" +msgstr "데이터 링크 오류" #: dlls/oledb32/version.rc:50 -#, fuzzy -#| msgid "Please select a file." msgid "Please select a provider." -msgstr "파일을 선택하십시오." +msgstr "공급자를 선택하십시오." #: dlls/oledb32/version.rc:51 msgid "" "Provider is no longer available. Ensure that the provider is installed " "properly." msgstr "" +"공급자를 더 이상 사용할 수 없습니다. 공급자가 올바르게 설치되었는지 확인하십" +"시오." #: dlls/oledb32/version.rc:36 -#, fuzzy -#| msgid "Properties" msgid "Data Link Properties" -msgstr "속성" +msgstr "데이터 링크 속성" #: dlls/oledb32/version.rc:37 msgid "OLE DB Provider(s)" -msgstr "" +msgstr "OLE DB 제공자" #: dlls/oledb32/version.rc:41 -#, fuzzy -#| msgid "Ready" msgid "Read" -msgstr "준비" +msgstr "읽기" #: dlls/oledb32/version.rc:42 -#, fuzzy -#| msgid "Readme:" msgid "ReadWrite" -msgstr "주의사항:" +msgstr "읽기 쓰기" #: dlls/oledb32/version.rc:43 msgid "Share Deny None" -msgstr "" +msgstr "거부 없음을 공유" #: dlls/oledb32/version.rc:44 msgid "Share Deny Read" -msgstr "" +msgstr "읽기 거부를 공유" #: dlls/oledb32/version.rc:45 msgid "Share Deny Write" -msgstr "" +msgstr "쓰기 거부를 공유" #: dlls/oledb32/version.rc:46 msgid "Share Exclusive" -msgstr "" +msgstr "독점적 공유" #: dlls/oledb32/version.rc:47 -#, fuzzy -#| msgid "I/O Writes" msgid "Write" -msgstr "I/O 쓰기" +msgstr "쓰기" #: dlls/oledlg/oledlg.rc:55 msgid "Insert Object" -msgstr "객체 삽입" +msgstr "개체 삽입" #: dlls/oledlg/oledlg.rc:61 msgid "Object Type:" -msgstr "객체 타입:" +msgstr "개체 타입:" #: dlls/oledlg/oledlg.rc:64 dlls/oledlg/oledlg.rc:102 msgid "Result" @@ -8753,14 +8685,14 @@ msgstr "아이콘 바꾸기(&I)..." #: dlls/oledlg/oledlg.rc:28 msgid "Insert a new %s object into your document" -msgstr "새 %s 객체를 문서에 삽입" +msgstr "새 %s 개체를 문서에 삽입" #: dlls/oledlg/oledlg.rc:29 msgid "" "Insert the contents of the file as an object into your document so that you " "may activate it using the program which created it." msgstr "" -"파일 내용을 문서에 객체로 삽입합니다. 파일을 만든 프로그램을 사용하여 활성화" +"파일 내용을 문서에 개체로 삽입합니다. 파일을 만든 프로그램을 사용하여 활성화" "합니다." #: dlls/oledlg/oledlg.rc:30 dlls/shell32/shell32.rc:197 @@ -8784,15 +8716,15 @@ msgstr "변환(&C)..." #: dlls/oledlg/oledlg.rc:36 msgid "%1 %2 &Object" -msgstr "%1 %2 객체(&O)" +msgstr "%1 %2 개체(&O)" #: dlls/oledlg/oledlg.rc:34 msgid "%1 &Object" -msgstr "%1 객체(&O)" +msgstr "%1 개체(&O)" #: dlls/oledlg/oledlg.rc:33 programs/oleview/oleview.rc:40 msgid "&Object" -msgstr "객체(&O)" +msgstr "개체(&O)" #: dlls/oledlg/oledlg.rc:41 msgid "Inserts the contents of the clipboard into your document as %s." @@ -8854,7 +8786,7 @@ msgstr "알 수 없는 원본" #: dlls/oledlg/oledlg.rc:50 msgid "the program which created it" -msgstr "객체를 만든 프로그램" +msgstr "개체를 만든 프로그램" #: dlls/sane.ds/sane.rc:41 msgid "Scanning" @@ -9228,7 +9160,7 @@ msgstr "Wine 인터넷 익스폴로어" #: 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:162 @@ -9906,16 +9838,12 @@ msgid "Cape Verde Daylight Time" msgstr "카보베르데 일광 절약 시간" #: dlls/tzres/tzres.rc:126 -#, fuzzy -#| msgid "Hawaiian Standard Time" msgid "Haiti Standard Time" -msgstr "하와이 표준 시간" +msgstr "아이티 표준 시간" #: dlls/tzres/tzres.rc:127 -#, fuzzy -#| msgid "Hawaiian Daylight Time" msgid "Haiti Daylight Time" -msgstr "하와이 일광 절약 시간" +msgstr "아이티 일광 절약 시간" #: dlls/tzres/tzres.rc:80 msgid "Central European Standard Time" @@ -9950,16 +9878,12 @@ msgid "Iran Daylight Time" msgstr "이란 일광 절약 시간" #: dlls/tzres/tzres.rc:204 -#, fuzzy -#| msgid "Hawaiian Standard Time" msgid "Saint Pierre Standard Time" -msgstr "하와이 표준 시간" +msgstr "생피에르 표준 시간" #: dlls/tzres/tzres.rc:205 -#, fuzzy -#| msgid "Hawaiian Daylight Time" msgid "Saint Pierre Daylight Time" -msgstr "하와이 일광 절약 시간" +msgstr "생피에르 일광 절약 시간" #: dlls/tzres/tzres.rc:170 msgid "Namibia Standard Time" @@ -10002,16 +9926,12 @@ msgid "Central Asia Daylight Time" msgstr "중앙 아시아 일광 절약 시간" #: dlls/tzres/tzres.rc:146 -#, fuzzy -#| msgid "Korea Standard Time" msgid "Lord Howe Standard Time" -msgstr "대한민국 표준 시간" +msgstr "로드하우 표준 시간" #: dlls/tzres/tzres.rc:147 -#, fuzzy -#| msgid "Korea Daylight Time" msgid "Lord Howe Daylight Time" -msgstr "대한민국 일광 절약 시간" +msgstr "로드하우 일광 절약 시간" #: dlls/tzres/tzres.rc:40 msgid "Arabic Standard Time" @@ -10062,16 +9982,12 @@ msgid "Azerbaijan Daylight Time" msgstr "아제르바이잔 일광 절약 시간" #: dlls/tzres/tzres.rc:150 -#, fuzzy -#| msgid "Magadan Standard Time" msgid "Magallanes Standard Time" -msgstr "마가단 표준 시간" +msgstr "마갈란스 표준 시간" #: dlls/tzres/tzres.rc:151 -#, fuzzy -#| msgid "Magadan Daylight Time" msgid "Magallanes Daylight Time" -msgstr "마가단 일광 절약 시간" +msgstr "마갈란스 일광 절약 시간" #: dlls/tzres/tzres.rc:206 msgid "Samoa Standard Time" @@ -10122,16 +10038,12 @@ msgid "Line Islands Daylight Time" msgstr "라인 제도 일광 절약 시간" #: dlls/tzres/tzres.rc:92 -#, fuzzy -#| msgid "China Standard Time" msgid "Cuba Standard Time" -msgstr "중국 표준 시간" +msgstr "쿠바 표준 시간" #: dlls/tzres/tzres.rc:93 -#, fuzzy -#| msgid "China Daylight Time" msgid "Cuba Daylight Time" -msgstr "중국 일광 절약 시간" +msgstr "쿠바 일광 절약 시간" #: dlls/tzres/tzres.rc:136 msgid "Jordan Standard Time" @@ -10174,16 +10086,12 @@ msgid "Argentina Daylight Time" msgstr "아르헨티나 일광 절약 시간" #: dlls/tzres/tzres.rc:152 -#, fuzzy -#| msgid "Mauritius Standard Time" msgid "Marquesas Standard Time" -msgstr "모리셔스 표준 시간" +msgstr "마키저스 표준 시간" #: dlls/tzres/tzres.rc:153 -#, fuzzy -#| msgid "Mauritius Daylight Time" msgid "Marquesas Daylight Time" -msgstr "모리셔스 일광 절약 시간" +msgstr "마키저스 일광 절약 시간" #: dlls/tzres/tzres.rc:166 msgid "Myanmar Standard Time" @@ -10334,16 +10242,12 @@ msgid "US Eastern Daylight Time" msgstr "미국 동부 일광 절약 시간" #: dlls/tzres/tzres.rc:182 -#, fuzzy -#| msgid "Korea Standard Time" msgid "North Korea Standard Time" -msgstr "대한민국 표준 시간" +msgstr "북한 표준 시간" #: dlls/tzres/tzres.rc:183 -#, fuzzy -#| msgid "Korea Daylight Time" msgid "North Korea Daylight Time" -msgstr "대한민국 일광 절약 시간" +msgstr "북한 일광 절약 시간" #: dlls/tzres/tzres.rc:220 msgid "Tasmania Standard Time" @@ -10434,16 +10338,12 @@ msgid "Arabian Daylight Time" msgstr "아라비아 일광 절약 시간" #: dlls/tzres/tzres.rc:222 -#, fuzzy -#| msgid "Mountain Standard Time" msgid "Tocantins Standard Time" -msgstr "산지 표준 시간" +msgstr "토칸칭스 표준 시간" #: dlls/tzres/tzres.rc:223 -#, fuzzy -#| msgid "Mountain Daylight Time" msgid "Tocantins Daylight Time" -msgstr "산지 일광 절약 시간" +msgstr "토칸칭스 일광 절약 시간" #: dlls/tzres/tzres.rc:196 msgid "Russian Standard Time" @@ -10454,14 +10354,10 @@ msgid "Russian Daylight Time" msgstr "러시아 일광 절약 시간" #: dlls/tzres/tzres.rc:48 -#, fuzzy -#| msgid "AUS Central Standard Time" msgid "Aus Central W. Standard Time" msgstr "오스트레일리아 중부 표준 시간" #: dlls/tzres/tzres.rc:49 -#, fuzzy -#| msgid "AUS Central Daylight Time" msgid "Aus Central W. Daylight Time" msgstr "오스트레일리아 중부 일광 절약 시간" @@ -10594,16 +10490,12 @@ msgid "Venezuela Daylight Time" msgstr "베네수엘라 일광 절약 시간" #: dlls/tzres/tzres.rc:62 -#, fuzzy -#| msgid "Mountain Standard Time" msgid "Bougainville Standard Time" -msgstr "산지 표준 시간" +msgstr "부건빌 표준 시간" #: dlls/tzres/tzres.rc:63 -#, fuzzy -#| msgid "Mountain Daylight Time" msgid "Bougainville Daylight Time" -msgstr "산지 일광 절약 시간" +msgstr "부건빌 일광 절약 시간" #: dlls/tzres/tzres.rc:128 msgid "Hawaiian Standard Time" @@ -10630,16 +10522,12 @@ msgid "New Zealand Daylight Time" msgstr "뉴질랜드 일광 절약 시간" #: dlls/tzres/tzres.rc:34 -#, fuzzy -#| msgid "Argentina Standard Time" msgid "Aleutian Standard Time" -msgstr "아르헨티나 표준 시간" +msgstr "알류샨 표준 시간" #: dlls/tzres/tzres.rc:35 -#, fuzzy -#| msgid "Argentina Daylight Time" msgid "Aleutian Daylight Time" -msgstr "아르헨티나 일광 절약 시간" +msgstr "알류샨 일광 절약 시간" #: dlls/tzres/tzres.rc:76 msgid "Central Brazilian Standard Time" @@ -10690,16 +10578,12 @@ msgid "Egypt Daylight Time" msgstr "이집트 일광 절약 시간" #: dlls/tzres/tzres.rc:106 -#, fuzzy -#| msgid "Central Standard Time (Mexico)" msgid "Eastern Standard Time (Mexico)" -msgstr "중부 표준 시간 (멕시코)" +msgstr "동부 표준 시간 (멕시코)" #: dlls/tzres/tzres.rc:107 -#, fuzzy -#| msgid "Central Daylight Time (Mexico)" msgid "Eastern Daylight Time (Mexico)" -msgstr "중부 일광 절약 시간 (멕시코)" +msgstr "동부 일광 절약 시간 (멕시코)" #: dlls/tzres/tzres.rc:154 msgid "Mauritius Standard Time" @@ -10734,16 +10618,12 @@ msgid "Korea Daylight Time" msgstr "대한민국 일광 절약 시간" #: dlls/tzres/tzres.rc:88 -#, fuzzy -#| msgid "Easter Island Standard Time" msgid "Chatham Islands Standard Time" -msgstr "이스터 섬 표준 시간" +msgstr "채텀 섬 표준 시간" #: dlls/tzres/tzres.rc:89 -#, fuzzy -#| msgid "Easter Island Daylight Time" msgid "Chatham Islands Daylight Time" -msgstr "이스터 섬 일광 절약 시간" +msgstr "채텀 섬 일광 절약 시간" #: dlls/tzres/tzres.rc:96 msgid "E. Africa Standard Time" @@ -10908,149 +10788,115 @@ 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 "올바르지 않은 널 사용" #: 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 msgid "Hide %@" @@ -11147,33 +10993,27 @@ 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 "bits" #: dlls/wininet/winineterror.mc:26 msgid "The request has timed out.\n" @@ -11918,7 +11758,7 @@ msgstr "잘못된 문법" #: dlls/wldap32/wldap32.rc:64 msgid "No Such Object" -msgstr "어떤 객체도 없음" +msgstr "어떤 개체도 없음" #: dlls/wldap32/wldap32.rc:65 msgid "Alias Problem" @@ -11978,7 +11818,7 @@ msgstr "명명 위반" #: dlls/wldap32/wldap32.rc:97 msgid "Object Class Violation" -msgstr "객체 클래스 위반" +msgstr "개체 클래스 위반" #: dlls/wldap32/wldap32.rc:98 msgid "Not allowed on Non-leaf" @@ -11994,7 +11834,7 @@ msgstr "이미 존재합니다" #: dlls/wldap32/wldap32.rc:101 msgid "No Object Class Mods" -msgstr "어떤 객체 클래스 모드도 없숩니다" +msgstr "어떤 개체 클래스 모드도 없숩니다" #: dlls/wldap32/wldap32.rc:102 msgid "Results Too Large" @@ -13176,6 +13016,9 @@ msgid "" "\n" "hardlink hardlink management\n" msgstr "" +"- 지원되는 명령 -\n" +"\n" +"hardlink 하드링크 관리\n" #: programs/fsutil/fsutil.mc:35 msgid "" @@ -13183,10 +13026,13 @@ 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>\n" #: programs/hostname/hostname.rc:30 msgid "Usage: hostname\n" @@ -13817,7 +13663,7 @@ msgstr "C&LSID를 클립보드로 복사" #: programs/oleview/oleview.rc:57 msgid "Copy &HTML object Tag to clipboard" -msgstr "&HTML 객체 태그를 클립보드로 복사" +msgstr "&HTML 개체 태그를 클립보드로 복사" #: programs/oleview/oleview.rc:63 msgid "&Expert mode" @@ -13930,7 +13776,7 @@ msgstr "ITypeLib 뷰어" #: programs/oleview/oleview.rc:99 msgid "OleView - OLE/COM Object Viewer" -msgstr "OleView - OLE/COM 객체 뷰어" +msgstr "OleView - OLE/COM 개체 뷰어" #: programs/oleview/oleview.rc:102 msgid "TypeLib files (*.tlb; *.olb; *.dll; *.ocx; *.exe)" @@ -13958,15 +13804,15 @@ msgstr "바뀐 것을 저장할지 물어보고 프로그램 끝내기" #: programs/oleview/oleview.rc:110 msgid "Create an instance of the selected object" -msgstr "선택된 객체의 인스턴트 만들기" +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" @@ -14027,15 +13873,15 @@ msgstr "컴포턴트 분류" #: programs/oleview/oleview.rc:132 msgid "OLE 1.0 Objects" -msgstr "OLE 1.0 객체" +msgstr "OLE 1.0 개체" #: programs/oleview/oleview.rc:133 msgid "COM Library Objects" -msgstr "COM 라이브러리 객체" +msgstr "COM 라이브러리 개체" #: programs/oleview/oleview.rc:134 msgid "All Objects" -msgstr "모든 객체" +msgstr "모든 개체" #: programs/oleview/oleview.rc:135 msgid "Application IDs" @@ -15625,7 +15471,7 @@ msgstr "페이지 실패(&F)" #: programs/taskmgr/taskmgr.rc:537 msgid "&USER Objects" -msgstr "사용자 객체(&U)" +msgstr "사용자 개체(&U)" #: programs/taskmgr/taskmgr.rc:539 programs/taskmgr/taskmgr.rc:281 msgid "I/O Reads" @@ -15673,7 +15519,7 @@ msgstr "스레드 카운트(&T)" #: programs/taskmgr/taskmgr.rc:561 programs/taskmgr/taskmgr.rc:292 msgid "GDI Objects" -msgstr "GDI 객체" +msgstr "GDI 개체" #: programs/taskmgr/taskmgr.rc:563 programs/taskmgr/taskmgr.rc:293 msgid "I/O Writes" @@ -15909,7 +15755,7 @@ msgstr "페이지 실패" #: programs/taskmgr/taskmgr.rc:280 msgid "USER Objects" -msgstr "사용자 객체" +msgstr "사용자 개체" #: programs/taskmgr/taskmgr.rc:283 msgid "Session ID" @@ -15937,7 +15783,7 @@ msgstr "NP 풀" #: programs/taskmgr/taskmgr.rc:289 msgid "Base Pri" -msgstr "기본 Pri" +msgstr "기본 우선 순위" #: programs/taskmgr/taskmgr.rc:301 msgid "Task Manager Warning" @@ -16983,14 +16829,12 @@ msgid "&Beginner" msgstr "초보자(&B)" #: programs/winemine/winemine.rc:45 -#, fuzzy -#| msgid "Interface" msgid "&Intermediate" -msgstr "인터페이스" +msgstr "중급자(&I)" #: programs/winemine/winemine.rc:46 msgid "&Expert" -msgstr "상급자(&E)" +msgstr "전문가(&E)" #: programs/winemine/winemine.rc:47 msgid "&Custom..." @@ -17017,10 +16861,8 @@ msgid "Beginner" msgstr "초보자" #: programs/winemine/winemine.rc:65 -#, fuzzy -#| msgid "Interface" msgid "Intermediate" -msgstr "인터페이스" +msgstr "중급자" #: programs/winemine/winemine.rc:66 msgid "Expert" -- 2.29.2

1 0

[PATCH vkd3d v2 2/2] vkd3d-shader: Move location tracking out of the vkd3d_shader_message_context structure.
by Zebediah Figura Dec. 15, 2020

Dec. 15, 2020

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- v2: Retain source names for shader_extract_from_dxbc(). I still think it's better and easier to get rid of the pointless "<anonymous>" for signature parsing and compilation, but that functional change can be reverted as well... libs/vkd3d-shader/dxbc.c | 63 +++++++++++++----------- libs/vkd3d-shader/spirv.c | 6 ++- libs/vkd3d-shader/vkd3d_shader_main.c | 61 ++++++++++++----------- libs/vkd3d-shader/vkd3d_shader_private.h | 19 ++++--- 4 files changed, 83 insertions(+), 66 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 9977d1a3..278912d8 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2021,9 +2021,11 @@ static const char *shader_get_string(const char *data, size_t data_size, DWORD o return data + offset; } -static int parse_dxbc(const char *data, size_t data_size, struct vkd3d_shader_message_context *message_context, +static int parse_dxbc(const char *data, size_t data_size, + struct vkd3d_shader_message_context *message_context, const char *source_name, int (*chunk_handler)(const char *data, DWORD data_size, DWORD tag, void *ctx), void *ctx) { + const struct vkd3d_shader_location location = {.source_name = source_name}; uint32_t checksum[4], calculated_checksum[4]; const char *ptr = data; int ret = VKD3D_OK; @@ -2036,7 +2038,7 @@ static int parse_dxbc(const char *data, size_t data_size, struct vkd3d_shader_me if (data_size < VKD3D_DXBC_HEADER_SIZE) { WARN("Invalid data size %zu.\n", data_size); - vkd3d_shader_error(message_context, VKD3D_SHADER_ERROR_DXBC_INVALID_SIZE, + vkd3d_shader_error(message_context, &location, VKD3D_SHADER_ERROR_DXBC_INVALID_SIZE, "DXBC size %zu is smaller than the DXBC header size.", data_size); return VKD3D_ERROR_INVALID_ARGUMENT; } @@ -2047,7 +2049,7 @@ static int parse_dxbc(const char *data, size_t data_size, struct vkd3d_shader_me if (tag != TAG_DXBC) { WARN("Wrong tag.\n"); - vkd3d_shader_error(message_context, VKD3D_SHADER_ERROR_DXBC_INVALID_MAGIC, "Invalid DXBC magic."); + vkd3d_shader_error(message_context, &location, VKD3D_SHADER_ERROR_DXBC_INVALID_MAGIC, "Invalid DXBC magic."); return VKD3D_ERROR_INVALID_ARGUMENT; } @@ -2063,7 +2065,8 @@ static int parse_dxbc(const char *data, size_t data_size, struct vkd3d_shader_me checksum[0], checksum[1], checksum[2], checksum[3], calculated_checksum[0], calculated_checksum[1], calculated_checksum[2], calculated_checksum[3]); - vkd3d_shader_error(message_context, VKD3D_SHADER_ERROR_DXBC_INVALID_CHECKSUM, "Invalid DXBC checksum."); + vkd3d_shader_error(message_context, &location, VKD3D_SHADER_ERROR_DXBC_INVALID_CHECKSUM, + "Invalid DXBC checksum."); return VKD3D_ERROR_INVALID_ARGUMENT; } @@ -2072,7 +2075,7 @@ static int parse_dxbc(const char *data, size_t data_size, struct vkd3d_shader_me if (version != 0x00000001) { WARN("Got unexpected DXBC version %#x.\n", version); - vkd3d_shader_error(message_context, VKD3D_SHADER_ERROR_DXBC_INVALID_VERSION, + vkd3d_shader_error(message_context, &location, VKD3D_SHADER_ERROR_DXBC_INVALID_VERSION, "DXBC version %#x is not supported.", version); return VKD3D_ERROR_INVALID_ARGUMENT; } @@ -2095,7 +2098,7 @@ static int parse_dxbc(const char *data, size_t data_size, struct vkd3d_shader_me if (chunk_offset >= data_size || !require_space(chunk_offset, 2, sizeof(DWORD), data_size)) { WARN("Invalid chunk offset %#x (data size %zu).\n", chunk_offset, data_size); - vkd3d_shader_error(message_context, VKD3D_SHADER_ERROR_DXBC_INVALID_CHUNK_OFFSET, + vkd3d_shader_error(message_context, &location, VKD3D_SHADER_ERROR_DXBC_INVALID_CHUNK_OFFSET, "DXBC chunk %u has invalid offset %#x (data size %#zx).", i, chunk_offset, data_size); return VKD3D_ERROR_INVALID_ARGUMENT; } @@ -2109,7 +2112,7 @@ static int parse_dxbc(const char *data, size_t data_size, struct vkd3d_shader_me { WARN("Invalid chunk size %#x (data size %zu, chunk offset %#x).\n", chunk_size, data_size, chunk_offset); - vkd3d_shader_error(message_context, VKD3D_SHADER_ERROR_DXBC_INVALID_CHUNK_SIZE, + vkd3d_shader_error(message_context, &location, VKD3D_SHADER_ERROR_DXBC_INVALID_CHUNK_SIZE, "DXBC chunk %u has invalid size %#x (data size %#zx, chunk offset %#x).", i, chunk_offset, data_size, chunk_offset); return VKD3D_ERROR_INVALID_ARGUMENT; @@ -2229,7 +2232,7 @@ int shader_parse_input_signature(const void *dxbc, size_t dxbc_length, int ret; memset(signature, 0, sizeof(*signature)); - if ((ret = parse_dxbc(dxbc, dxbc_length, message_context, isgn_handler, signature)) < 0) + if ((ret = parse_dxbc(dxbc, dxbc_length, message_context, NULL, isgn_handler, signature)) < 0) ERR("Failed to parse input signature.\n"); return ret; @@ -2304,7 +2307,7 @@ void free_shader_desc(struct vkd3d_shader_desc *desc) } int shader_extract_from_dxbc(const void *dxbc, size_t dxbc_length, - struct vkd3d_shader_message_context *message_context, struct vkd3d_shader_desc *desc) + struct vkd3d_shader_message_context *message_context, const char *source_name, struct vkd3d_shader_desc *desc) { int ret; @@ -2314,7 +2317,7 @@ int shader_extract_from_dxbc(const void *dxbc, size_t dxbc_length, memset(&desc->output_signature, 0, sizeof(desc->output_signature)); memset(&desc->patch_constant_signature, 0, sizeof(desc->patch_constant_signature)); - ret = parse_dxbc(dxbc, dxbc_length, message_context, shdr_handler, desc); + ret = parse_dxbc(dxbc, dxbc_length, message_context, source_name, shdr_handler, desc); if (!desc->byte_code) ret = VKD3D_ERROR_INVALID_ARGUMENT; @@ -2781,9 +2784,9 @@ int vkd3d_shader_parse_root_signature(const struct vkd3d_shader_code *dxbc, memset(root_signature, 0, sizeof(*root_signature)); if (messages) *messages = NULL; - vkd3d_shader_message_context_init(&message_context, VKD3D_SHADER_LOG_INFO, NULL); + vkd3d_shader_message_context_init(&message_context, VKD3D_SHADER_LOG_INFO); - ret = parse_dxbc(dxbc->code, dxbc->size, &message_context, rts0_handler, root_signature); + ret = parse_dxbc(dxbc->code, dxbc->size, &message_context, NULL, rts0_handler, root_signature); vkd3d_shader_message_context_trace_messages(&message_context); if (!vkd3d_shader_message_context_copy_messages(&message_context, messages)) ret = VKD3D_ERROR_OUT_OF_MEMORY; @@ -2935,7 +2938,7 @@ static int shader_write_root_signature_header(struct root_signature_writer_conte return VKD3D_OK; fail: - vkd3d_shader_error(&context->message_context, VKD3D_SHADER_ERROR_RS_OUT_OF_MEMORY, + vkd3d_shader_error(&context->message_context, NULL, VKD3D_SHADER_ERROR_RS_OUT_OF_MEMORY, "Out of memory while writing root signature header."); return VKD3D_ERROR_OUT_OF_MEMORY; } @@ -2963,7 +2966,7 @@ static int shader_write_descriptor_ranges(struct root_signature_writer_context * return VKD3D_OK; fail: - vkd3d_shader_error(&context->message_context, VKD3D_SHADER_ERROR_RS_OUT_OF_MEMORY, + vkd3d_shader_error(&context->message_context, NULL, VKD3D_SHADER_ERROR_RS_OUT_OF_MEMORY, "Out of memory while writing root signature descriptor ranges."); return VKD3D_ERROR_OUT_OF_MEMORY; } @@ -2993,7 +2996,7 @@ static int shader_write_descriptor_ranges1(struct root_signature_writer_context return VKD3D_OK; fail: - vkd3d_shader_error(&context->message_context, VKD3D_SHADER_ERROR_RS_OUT_OF_MEMORY, + vkd3d_shader_error(&context->message_context, NULL, VKD3D_SHADER_ERROR_RS_OUT_OF_MEMORY, "Out of memory while writing root signature descriptor ranges."); return VKD3D_ERROR_OUT_OF_MEMORY; } @@ -3009,7 +3012,7 @@ static int shader_write_descriptor_table(struct root_signature_writer_context *c return shader_write_descriptor_ranges(context, table); fail: - vkd3d_shader_error(&context->message_context, VKD3D_SHADER_ERROR_RS_OUT_OF_MEMORY, + vkd3d_shader_error(&context->message_context, NULL, VKD3D_SHADER_ERROR_RS_OUT_OF_MEMORY, "Out of memory while writing root signature root descriptor table."); return VKD3D_ERROR_OUT_OF_MEMORY; } @@ -3025,7 +3028,7 @@ static int shader_write_descriptor_table1(struct root_signature_writer_context * return shader_write_descriptor_ranges1(context, table); fail: - vkd3d_shader_error(&context->message_context, VKD3D_SHADER_ERROR_RS_OUT_OF_MEMORY, + vkd3d_shader_error(&context->message_context, NULL, VKD3D_SHADER_ERROR_RS_OUT_OF_MEMORY, "Out of memory while writing root signature root descriptor table."); return VKD3D_ERROR_OUT_OF_MEMORY; } @@ -3043,7 +3046,7 @@ static int shader_write_root_constants(struct root_signature_writer_context *con return VKD3D_OK; fail: - vkd3d_shader_error(&context->message_context, VKD3D_SHADER_ERROR_RS_OUT_OF_MEMORY, + vkd3d_shader_error(&context->message_context, NULL, VKD3D_SHADER_ERROR_RS_OUT_OF_MEMORY, "Out of memory while writing root signature root constants."); return VKD3D_ERROR_OUT_OF_MEMORY; } @@ -3059,7 +3062,7 @@ static int shader_write_root_descriptor(struct root_signature_writer_context *co return VKD3D_OK; fail: - vkd3d_shader_error(&context->message_context, VKD3D_SHADER_ERROR_RS_OUT_OF_MEMORY, + vkd3d_shader_error(&context->message_context, NULL, VKD3D_SHADER_ERROR_RS_OUT_OF_MEMORY, "Out of memory while writing root signature root descriptor."); return VKD3D_ERROR_OUT_OF_MEMORY; } @@ -3077,7 +3080,7 @@ static int shader_write_root_descriptor1(struct root_signature_writer_context *c return VKD3D_OK; fail: - vkd3d_shader_error(&context->message_context, VKD3D_SHADER_ERROR_RS_OUT_OF_MEMORY, + vkd3d_shader_error(&context->message_context, NULL, VKD3D_SHADER_ERROR_RS_OUT_OF_MEMORY, "Out of memory while writing root signature root descriptor."); return VKD3D_ERROR_OUT_OF_MEMORY; } @@ -3126,7 +3129,7 @@ static int shader_write_root_parameters(struct root_signature_writer_context *co break; default: FIXME("Unrecognized type %#x.\n", versioned_root_signature_get_parameter_type(desc, i)); - vkd3d_shader_error(&context->message_context, VKD3D_SHADER_ERROR_RS_INVALID_ROOT_PARAMETER_TYPE, + vkd3d_shader_error(&context->message_context, NULL, VKD3D_SHADER_ERROR_RS_INVALID_ROOT_PARAMETER_TYPE, "Invalid/unrecognised root signature root parameter type %#x.", versioned_root_signature_get_parameter_type(desc, i)); return VKD3D_ERROR_INVALID_ARGUMENT; @@ -3139,7 +3142,7 @@ static int shader_write_root_parameters(struct root_signature_writer_context *co return VKD3D_OK; fail: - vkd3d_shader_error(&context->message_context, VKD3D_SHADER_ERROR_RS_OUT_OF_MEMORY, + vkd3d_shader_error(&context->message_context, NULL, VKD3D_SHADER_ERROR_RS_OUT_OF_MEMORY, "Out of memory while writing root signature root parameters."); return VKD3D_ERROR_OUT_OF_MEMORY; } @@ -3183,7 +3186,7 @@ static int shader_write_static_samplers(struct root_signature_writer_context *co return VKD3D_OK; fail: - vkd3d_shader_error(&context->message_context, VKD3D_SHADER_ERROR_RS_OUT_OF_MEMORY, + vkd3d_shader_error(&context->message_context, NULL, VKD3D_SHADER_ERROR_RS_OUT_OF_MEMORY, "Out of memory while writing root signature static samplers."); return VKD3D_ERROR_OUT_OF_MEMORY; } @@ -3218,7 +3221,7 @@ static int shader_write_root_signature(struct root_signature_writer_context *con return shader_write_static_samplers(context, desc); fail: - vkd3d_shader_error(&context->message_context, VKD3D_SHADER_ERROR_RS_OUT_OF_MEMORY, + vkd3d_shader_error(&context->message_context, NULL, VKD3D_SHADER_ERROR_RS_OUT_OF_MEMORY, "Out of memory while writing root signature."); return VKD3D_ERROR_OUT_OF_MEMORY; } @@ -3247,7 +3250,7 @@ static int validate_descriptor_table_v_1_0(const struct vkd3d_shader_root_descri else { WARN("Invalid descriptor range type %#x.\n", r->range_type); - vkd3d_shader_error(message_context, VKD3D_SHADER_ERROR_RS_INVALID_DESCRIPTOR_RANGE_TYPE, + vkd3d_shader_error(message_context, NULL, VKD3D_SHADER_ERROR_RS_INVALID_DESCRIPTOR_RANGE_TYPE, "Invalid root signature descriptor range type %#x.", r->range_type); return VKD3D_ERROR_INVALID_ARGUMENT; } @@ -3256,7 +3259,7 @@ static int validate_descriptor_table_v_1_0(const struct vkd3d_shader_root_descri if (have_srv_uav_cbv && have_sampler) { WARN("Samplers cannot be mixed with CBVs/SRVs/UAVs in descriptor tables.\n"); - vkd3d_shader_error(message_context, VKD3D_SHADER_ERROR_RS_MIXED_DESCRIPTOR_RANGE_TYPES, + vkd3d_shader_error(message_context, NULL, VKD3D_SHADER_ERROR_RS_MIXED_DESCRIPTOR_RANGE_TYPES, "Encountered both CBV/SRV/UAV and sampler descriptor ranges in the same root descriptor table."); return VKD3D_ERROR_INVALID_ARGUMENT; } @@ -3288,7 +3291,7 @@ static int validate_descriptor_table_v_1_1(const struct vkd3d_shader_root_descri else { WARN("Invalid descriptor range type %#x.\n", r->range_type); - vkd3d_shader_error(message_context, VKD3D_SHADER_ERROR_RS_INVALID_DESCRIPTOR_RANGE_TYPE, + vkd3d_shader_error(message_context, NULL, VKD3D_SHADER_ERROR_RS_INVALID_DESCRIPTOR_RANGE_TYPE, "Invalid root signature descriptor range type %#x.", r->range_type); return VKD3D_ERROR_INVALID_ARGUMENT; } @@ -3297,7 +3300,7 @@ static int validate_descriptor_table_v_1_1(const struct vkd3d_shader_root_descri if (have_srv_uav_cbv && have_sampler) { WARN("Samplers cannot be mixed with CBVs/SRVs/UAVs in descriptor tables.\n"); - vkd3d_shader_error(message_context, VKD3D_SHADER_ERROR_RS_MIXED_DESCRIPTOR_RANGE_TYPES, + vkd3d_shader_error(message_context, NULL, VKD3D_SHADER_ERROR_RS_MIXED_DESCRIPTOR_RANGE_TYPES, "Encountered both CBV/SRV/UAV and sampler descriptor ranges in the same root descriptor table."); return VKD3D_ERROR_INVALID_ARGUMENT; } @@ -3345,14 +3348,14 @@ int vkd3d_shader_serialize_root_signature(const struct vkd3d_shader_versioned_ro *messages = NULL; memset(&context, 0, sizeof(context)); - vkd3d_shader_message_context_init(&context.message_context, VKD3D_SHADER_LOG_INFO, NULL); + vkd3d_shader_message_context_init(&context.message_context, VKD3D_SHADER_LOG_INFO); if (root_signature->version != VKD3D_SHADER_ROOT_SIGNATURE_VERSION_1_0 && root_signature->version != VKD3D_SHADER_ROOT_SIGNATURE_VERSION_1_1) { ret = VKD3D_ERROR_INVALID_ARGUMENT; WARN("Root signature version %#x not supported.\n", root_signature->version); - vkd3d_shader_error(&context.message_context, VKD3D_SHADER_ERROR_RS_INVALID_VERSION, + vkd3d_shader_error(&context.message_context, NULL, VKD3D_SHADER_ERROR_RS_INVALID_VERSION, "Root signature version %#x is not supported.", root_signature->version); goto done; } diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index cb9c7a12..61d0d472 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2155,6 +2155,7 @@ struct vkd3d_dxbc_compiler struct vkd3d_spirv_builder spirv_builder; struct vkd3d_shader_message_context *message_context; + struct vkd3d_shader_location location; bool failed; bool strip_debug; @@ -2245,6 +2246,8 @@ struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader memset(compiler, 0, sizeof(*compiler)); compiler->message_context = message_context; + compiler->location.source_name = compile_info->source_name; + compiler->location.line = 2; /* Line 1 is the version token. */ if ((target_info = vkd3d_find_struct(compile_info->next, SPIRV_TARGET_INFO))) { @@ -2452,7 +2455,7 @@ static void VKD3D_PRINTF_FUNC(3, 4) vkd3d_dxbc_compiler_error(struct vkd3d_dxbc_ va_list args; va_start(args, format); - vkd3d_shader_verror(compiler->message_context, error, format, args); + vkd3d_shader_verror(compiler->message_context, &compiler->location, error, format, args); va_end(args); compiler->failed = true; } @@ -9194,6 +9197,7 @@ int vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler, FIXME("Unhandled instruction %#x.\n", instruction->handler_idx); } + ++compiler->location.line; return ret; } diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 2ea233bb..173ff170 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -108,13 +108,9 @@ void vkd3d_string_buffer_trace_(const struct vkd3d_string_buffer *buffer, const } void vkd3d_shader_message_context_init(struct vkd3d_shader_message_context *context, - enum vkd3d_shader_log_level log_level, const char *source_name) + enum vkd3d_shader_log_level log_level) { context->log_level = log_level; - context->source_name = source_name ? source_name : "<anonymous>"; - context->line = 0; - context->column = 0; - vkd3d_string_buffer_init(&context->messages); } @@ -148,28 +144,37 @@ bool vkd3d_shader_message_context_copy_messages(struct vkd3d_shader_message_cont return true; } -void vkd3d_shader_verror(struct vkd3d_shader_message_context *context, +void vkd3d_shader_verror(struct vkd3d_shader_message_context *context, const struct vkd3d_shader_location *location, enum vkd3d_shader_error error, const char *format, va_list args) { if (context->log_level < VKD3D_SHADER_LOG_ERROR) return; - if (context->line) - vkd3d_string_buffer_printf(&context->messages, "%s:%u:%u: E%04u: ", - context->source_name, context->line, context->column, error); + if (location) + { + const char *source_name = location->source_name ? location->source_name : "<anonymous>"; + + if (location->line) + vkd3d_string_buffer_printf(&context->messages, "%s:%u:%u: E%04u: ", + source_name, location->line, location->column, error); + else + vkd3d_string_buffer_printf(&context->messages, "%s: E%04u: ", source_name, error); + } else - vkd3d_string_buffer_printf(&context->messages, "%s: E%04u: ", context->source_name, error); + { + vkd3d_string_buffer_printf(&context->messages, "E%04u: ", error); + } vkd3d_string_buffer_vprintf(&context->messages, format, args); vkd3d_string_buffer_printf(&context->messages, "\n"); } -void vkd3d_shader_error(struct vkd3d_shader_message_context *context, +void vkd3d_shader_error(struct vkd3d_shader_message_context *context, const struct vkd3d_shader_location *location, enum vkd3d_shader_error error, const char *format, ...) { va_list args; va_start(args, format); - vkd3d_shader_verror(context, error, format, args); + vkd3d_shader_verror(context, location, error, format, args); va_end(args); } @@ -222,12 +227,13 @@ struct vkd3d_shader_parser }; static int vkd3d_shader_parser_init(struct vkd3d_shader_parser *parser, - const struct vkd3d_shader_code *dxbc, struct vkd3d_shader_message_context *message_context) + const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_message_context *message_context) { struct vkd3d_shader_desc *shader_desc = &parser->shader_desc; int ret; - if ((ret = shader_extract_from_dxbc(dxbc->code, dxbc->size, message_context, shader_desc)) < 0) + if ((ret = shader_extract_from_dxbc(compile_info->source.code, compile_info->source.size, + message_context, compile_info->source_name, shader_desc)) < 0) { WARN("Failed to extract shader, vkd3d result %d.\n", ret); return ret; @@ -307,6 +313,7 @@ struct vkd3d_shader_scan_context size_t descriptors_size; struct vkd3d_shader_message_context *message_context; + struct vkd3d_shader_location location; struct vkd3d_shader_cf_info { @@ -332,12 +339,15 @@ struct vkd3d_shader_scan_context }; static void vkd3d_shader_scan_context_init(struct vkd3d_shader_scan_context *context, + const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_scan_descriptor_info *scan_descriptor_info, struct vkd3d_shader_message_context *message_context) { memset(context, 0, sizeof(*context)); context->scan_descriptor_info = scan_descriptor_info; context->message_context = message_context; + context->location.source_name = compile_info->source_name; + context->location.line = 2; /* Line 1 is the version token. */ } static void vkd3d_shader_scan_context_cleanup(struct vkd3d_shader_scan_context *context) @@ -606,7 +616,7 @@ static void vkd3d_shader_scan_error(struct vkd3d_shader_scan_context *context, va_list args; va_start(args, format); - vkd3d_shader_verror(context->message_context, error, format, args); + vkd3d_shader_verror(context->message_context, &context->location, error, format, args); va_end(args); } @@ -774,6 +784,7 @@ static int vkd3d_shader_scan_instruction(struct vkd3d_shader_scan_context *conte if (vkd3d_shader_instruction_is_uav_counter(instruction)) vkd3d_shader_scan_record_uav_counter(context, &instruction->src[0].reg); + ++context->location.line; return VKD3D_OK; } @@ -792,9 +803,9 @@ static int scan_dxbc(const struct vkd3d_shader_compile_info *compile_info, scan_descriptor_info->descriptor_count = 0; } - vkd3d_shader_scan_context_init(&context, scan_descriptor_info, message_context); + vkd3d_shader_scan_context_init(&context, compile_info, scan_descriptor_info, message_context); - if ((ret = vkd3d_shader_parser_init(&parser, &compile_info->source, message_context)) < 0) + if ((ret = vkd3d_shader_parser_init(&parser, compile_info, message_context)) < 0) { vkd3d_shader_scan_context_cleanup(&context); return ret; @@ -803,8 +814,6 @@ static int scan_dxbc(const struct vkd3d_shader_compile_info *compile_info, if (TRACE_ON()) vkd3d_shader_trace(parser.data); - message_context->line = 2; /* Line 1 is the version token. */ - message_context->column = 1; while (!shader_sm4_is_end(parser.data, &parser.ptr)) { shader_sm4_read_instruction(parser.data, &parser.ptr, &instruction); @@ -824,7 +833,6 @@ static int scan_dxbc(const struct vkd3d_shader_compile_info *compile_info, vkd3d_shader_free_scan_descriptor_info(scan_descriptor_info); goto done; } - ++message_context->line; } ret = VKD3D_OK; @@ -848,7 +856,7 @@ int vkd3d_shader_scan(const struct vkd3d_shader_compile_info *compile_info, char if ((ret = vkd3d_shader_validate_compile_info(compile_info, true)) < 0) return ret; - vkd3d_shader_message_context_init(&message_context, compile_info->log_level, compile_info->source_name); + vkd3d_shader_message_context_init(&message_context, compile_info->log_level); ret = scan_dxbc(compile_info, &message_context); @@ -877,7 +885,7 @@ static int compile_dxbc_tpf(const struct vkd3d_shader_compile_info *compile_info if ((ret = scan_dxbc(&scan_info, message_context)) < 0) return ret; - if ((ret = vkd3d_shader_parser_init(&parser, &compile_info->source, message_context)) < 0) + if ((ret = vkd3d_shader_parser_init(&parser, compile_info, message_context)) < 0) { vkd3d_shader_free_scan_descriptor_info(&scan_descriptor_info); return ret; @@ -902,8 +910,6 @@ static int compile_dxbc_tpf(const struct vkd3d_shader_compile_info *compile_info return VKD3D_ERROR; } - message_context->line = 2; /* Line 1 is the version token. */ - message_context->column = 1; while (!shader_sm4_is_end(parser.data, &parser.ptr)) { shader_sm4_read_instruction(parser.data, &parser.ptr, &instruction); @@ -917,7 +923,6 @@ static int compile_dxbc_tpf(const struct vkd3d_shader_compile_info *compile_info if ((ret = vkd3d_dxbc_compiler_handle_instruction(spirv_compiler, &instruction)) < 0) break; - ++message_context->line; } if (ret >= 0) @@ -949,7 +954,7 @@ int vkd3d_shader_compile(const struct vkd3d_shader_compile_info *compile_info, if ((ret = vkd3d_shader_validate_compile_info(compile_info, true)) < 0) return ret; - vkd3d_shader_message_context_init(&message_context, compile_info->log_level, compile_info->source_name); + vkd3d_shader_message_context_init(&message_context, compile_info->log_level); switch (compile_info->source_type) { @@ -1051,7 +1056,7 @@ int vkd3d_shader_parse_input_signature(const struct vkd3d_shader_code *dxbc, if (messages) *messages = NULL; - vkd3d_shader_message_context_init(&message_context, VKD3D_SHADER_LOG_INFO, NULL); + vkd3d_shader_message_context_init(&message_context, VKD3D_SHADER_LOG_INFO); ret = shader_parse_input_signature(dxbc->code, dxbc->size, &message_context, signature); vkd3d_shader_message_context_trace_messages(&message_context); @@ -1174,7 +1179,7 @@ int vkd3d_shader_preprocess(const struct vkd3d_shader_compile_info *compile_info if ((ret = vkd3d_shader_validate_compile_info(compile_info, false)) < 0) return ret; - vkd3d_shader_message_context_init(&message_context, compile_info->log_level, compile_info->source_name); + vkd3d_shader_message_context_init(&message_context, compile_info->log_level); ret = preproc_lexer_parse(compile_info, out, &message_context); diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 83038384..e974b928 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -844,11 +844,15 @@ int vkd3d_string_buffer_printf(struct vkd3d_string_buffer *buffer, void vkd3d_string_buffer_trace_(const struct vkd3d_string_buffer *buffer, const char *function) DECLSPEC_HIDDEN; int vkd3d_string_buffer_vprintf(struct vkd3d_string_buffer *buffer, const char *format, va_list args) DECLSPEC_HIDDEN; -struct vkd3d_shader_message_context +struct vkd3d_shader_location { - enum vkd3d_shader_log_level log_level; const char *source_name; unsigned int line, column; +}; + +struct vkd3d_shader_message_context +{ + enum vkd3d_shader_log_level log_level; struct vkd3d_string_buffer messages; }; @@ -856,18 +860,19 @@ void vkd3d_shader_message_context_cleanup(struct vkd3d_shader_message_context *c bool vkd3d_shader_message_context_copy_messages(struct vkd3d_shader_message_context *context, char **out) DECLSPEC_HIDDEN; void vkd3d_shader_message_context_init(struct vkd3d_shader_message_context *context, - enum vkd3d_shader_log_level log_level, const char *source_name) DECLSPEC_HIDDEN; + enum vkd3d_shader_log_level log_level) DECLSPEC_HIDDEN; void vkd3d_shader_message_context_trace_messages_(const struct vkd3d_shader_message_context *context, const char *function) DECLSPEC_HIDDEN; #define vkd3d_shader_message_context_trace_messages(context) \ vkd3d_shader_message_context_trace_messages_(context, __FUNCTION__) -void vkd3d_shader_error(struct vkd3d_shader_message_context *context, enum vkd3d_shader_error error, - const char *format, ...) VKD3D_PRINTF_FUNC(3, 4) DECLSPEC_HIDDEN; -void vkd3d_shader_verror(struct vkd3d_shader_message_context *context, +void vkd3d_shader_error(struct vkd3d_shader_message_context *context, const struct vkd3d_shader_location *location, + enum vkd3d_shader_error error, const char *format, ...) VKD3D_PRINTF_FUNC(4, 5) DECLSPEC_HIDDEN; +void vkd3d_shader_verror(struct vkd3d_shader_message_context *context, const struct vkd3d_shader_location *location, enum vkd3d_shader_error error, const char *format, va_list args) DECLSPEC_HIDDEN; int shader_extract_from_dxbc(const void *dxbc, size_t dxbc_length, - struct vkd3d_shader_message_context *message_context, struct vkd3d_shader_desc *desc) DECLSPEC_HIDDEN; + struct vkd3d_shader_message_context *message_context, const char *source_name, + struct vkd3d_shader_desc *desc) DECLSPEC_HIDDEN; void free_shader_desc(struct vkd3d_shader_desc *desc) DECLSPEC_HIDDEN; int shader_parse_input_signature(const void *dxbc, size_t dxbc_length, -- 2.29.2

2 1

[PATCH] wine.inf: Store Dynamic DST data for Asia/Tehran as "relative" dates.
by Henri Verbeet Dec. 15, 2020

Dec. 15, 2020

I.e., the "Nth <weekday> of <month>" form. This form is much less convenient for timezones where the DST change happens on specific dates, but some applications distribute old versions of Mono that don't bother checking the "wYear" fields of the SYSTEMTIME fields in the TIME_ZONE_INFORMATION structure returned by GetTimeZoneInformation(), and instead always convert the presumed "relative" dates to "absolute" dates. Unsurprisingly, the resulting dates are invalid, and these applications then end up throwing "System.NotSupportedException: Can't get timezone name." when run in such a timezone, typically early during startup. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This happens with at least "INSIDE" and "Life is Strange: Before the Storm", but the issue is much more widespread than that, typically affecting any application that does anything with times or dates and uses an affected version of Mono. loader/wine.inf.in | 90 +++++++++++++++++++++++----------------------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 0cbbcb710f6..d5dd2d5b66b 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -3240,53 +3240,53 @@ HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time,"MUI_Dlt",,"@tzres.dll,-55 HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time,"MUI_Std",,"@tzres.dll,-5568" HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time,"Std",,"Iran Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time,"TZI",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,00,00,04,00,00,00,00,00,00,00,00,00,00,00,03,00,05,00,04,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"1991",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,c7,07,09,00,00,00,16,00,00,00,00,00,00,00,00,00,c7,07,05,00,05,00,03,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"1992",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,c8,07,09,00,02,00,16,00,00,00,00,00,00,00,00,00,c8,07,03,00,00,00,16,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"1993",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,c9,07,09,00,03,00,16,00,00,00,00,00,00,00,00,00,c9,07,03,00,01,00,16,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"1994",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,ca,07,09,00,04,00,16,00,00,00,00,00,00,00,00,00,ca,07,03,00,02,00,16,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"1995",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,cb,07,09,00,05,00,16,00,00,00,00,00,00,00,00,00,cb,07,03,00,03,00,16,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"1996",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,cc,07,09,00,06,00,15,00,00,00,00,00,00,00,00,00,cc,07,03,00,04,00,15,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"1997",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,cd,07,09,00,01,00,16,00,00,00,00,00,00,00,00,00,cd,07,03,00,06,00,16,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"1998",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,ce,07,09,00,02,00,16,00,00,00,00,00,00,00,00,00,ce,07,03,00,00,00,16,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"1999",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,cf,07,09,00,03,00,16,00,00,00,00,00,00,00,00,00,cf,07,03,00,01,00,16,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2000",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,d0,07,09,00,04,00,15,00,00,00,00,00,00,00,00,00,d0,07,03,00,02,00,15,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2001",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,d1,07,09,00,06,00,16,00,00,00,00,00,00,00,00,00,d1,07,03,00,04,00,16,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2002",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,d2,07,09,00,00,00,16,00,00,00,00,00,00,00,00,00,d2,07,03,00,05,00,16,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2003",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,d3,07,09,00,01,00,16,00,00,00,00,00,00,00,00,00,d3,07,03,00,06,00,16,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2004",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,d4,07,09,00,02,00,15,00,00,00,00,00,00,00,00,00,d4,07,03,00,00,00,15,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2005",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,d5,07,09,00,04,00,16,00,00,00,00,00,00,00,00,00,d5,07,03,00,02,00,16,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"1991",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,00,00,04,00,00,00,00,00,00,00,00,00,00,00,05,00,05,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"1992",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,02,00,04,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"1993",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,03,00,04,00,00,00,00,00,00,00,00,00,00,00,03,00,01,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"1994",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,04,00,04,00,00,00,00,00,00,00,00,00,00,00,03,00,02,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"1995",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,05,00,04,00,00,00,00,00,00,00,00,00,00,00,03,00,03,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"1996",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,06,00,03,00,00,00,00,00,00,00,00,00,00,00,03,00,04,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"1997",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,01,00,04,00,00,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"1998",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,02,00,04,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"1999",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,03,00,04,00,00,00,00,00,00,00,00,00,00,00,03,00,01,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2000",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,04,00,03,00,00,00,00,00,00,00,00,00,00,00,03,00,02,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2001",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,06,00,04,00,00,00,00,00,00,00,00,00,00,00,03,00,04,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2002",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,00,00,04,00,00,00,00,00,00,00,00,00,00,00,03,00,05,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2003",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,01,00,04,00,00,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2004",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,02,00,03,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2005",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,04,00,04,00,00,00,00,00,00,00,00,00,00,00,03,00,02,00,04,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2006",1,2e,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2007",1,2e,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2008",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,d8,07,09,00,00,00,15,00,00,00,00,00,00,00,00,00,d8,07,03,00,05,00,15,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2009",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,d9,07,09,00,02,00,16,00,00,00,00,00,00,00,00,00,d9,07,03,00,00,00,16,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2010",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,da,07,09,00,03,00,16,00,00,00,00,00,00,00,00,00,da,07,03,00,01,00,16,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2011",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,db,07,09,00,04,00,16,00,00,00,00,00,00,00,00,00,db,07,03,00,02,00,16,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2012",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,dc,07,09,00,05,00,15,00,00,00,00,00,00,00,00,00,dc,07,03,00,03,00,15,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2013",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,dd,07,09,00,00,00,16,00,00,00,00,00,00,00,00,00,dd,07,03,00,05,00,16,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2014",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,de,07,09,00,01,00,16,00,00,00,00,00,00,00,00,00,de,07,03,00,06,00,16,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2015",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,df,07,09,00,02,00,16,00,00,00,00,00,00,00,00,00,df,07,03,00,00,00,16,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2016",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,e0,07,09,00,03,00,15,00,00,00,00,00,00,00,00,00,e0,07,03,00,01,00,15,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2017",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,e1,07,09,00,05,00,16,00,00,00,00,00,00,00,00,00,e1,07,03,00,03,00,16,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2018",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,e2,07,09,00,06,00,16,00,00,00,00,00,00,00,00,00,e2,07,03,00,04,00,16,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2019",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,e3,07,09,00,00,00,16,00,00,00,00,00,00,00,00,00,e3,07,03,00,05,00,16,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2020",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,e4,07,09,00,01,00,15,00,00,00,00,00,00,00,00,00,e4,07,03,00,06,00,15,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2021",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,e5,07,09,00,03,00,16,00,00,00,00,00,00,00,00,00,e5,07,03,00,01,00,16,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2022",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,e6,07,09,00,04,00,16,00,00,00,00,00,00,00,00,00,e6,07,03,00,02,00,16,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2023",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,e7,07,09,00,05,00,16,00,00,00,00,00,00,00,00,00,e7,07,03,00,03,00,16,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2024",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,e8,07,09,00,06,00,15,00,00,00,00,00,00,00,00,00,e8,07,03,00,04,00,15,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2025",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,e9,07,09,00,01,00,16,00,00,00,00,00,00,00,00,00,e9,07,03,00,06,00,16,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2026",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,ea,07,09,00,02,00,16,00,00,00,00,00,00,00,00,00,ea,07,03,00,00,00,16,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2027",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,eb,07,09,00,03,00,16,00,00,00,00,00,00,00,00,00,eb,07,03,00,01,00,16,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2028",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,ec,07,09,00,04,00,15,00,00,00,00,00,00,00,00,00,ec,07,03,00,02,00,15,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2029",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,ed,07,09,00,05,00,15,00,00,00,00,00,00,00,00,00,ed,07,03,00,03,00,15,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2030",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,ee,07,09,00,00,00,16,00,00,00,00,00,00,00,00,00,ee,07,03,00,05,00,16,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2031",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,ef,07,09,00,01,00,16,00,00,00,00,00,00,00,00,00,ef,07,03,00,06,00,16,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2032",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,f0,07,09,00,02,00,15,00,00,00,00,00,00,00,00,00,f0,07,03,00,00,00,15,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2033",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,f1,07,09,00,03,00,15,00,00,00,00,00,00,00,00,00,f1,07,03,00,01,00,15,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2034",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,f2,07,09,00,05,00,16,00,00,00,00,00,00,00,00,00,f2,07,03,00,03,00,16,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2035",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,f3,07,09,00,06,00,16,00,00,00,00,00,00,00,00,00,f3,07,03,00,04,00,16,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2036",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,f4,07,09,00,00,00,15,00,00,00,00,00,00,00,00,00,f4,07,03,00,05,00,15,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2037",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,f5,07,09,00,01,00,15,00,00,00,00,00,00,00,00,00,f5,07,03,00,06,00,15,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2008",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,03,00,05,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2009",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,02,00,04,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2010",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,03,00,04,00,00,00,00,00,00,00,00,00,00,00,03,00,01,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2011",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,04,00,04,00,00,00,00,00,00,00,00,00,00,00,03,00,02,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2012",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,05,00,03,00,00,00,00,00,00,00,00,00,00,00,03,00,03,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2013",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,00,00,04,00,00,00,00,00,00,00,00,00,00,00,03,00,05,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2014",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,01,00,04,00,00,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2015",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,02,00,04,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2016",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,03,00,03,00,00,00,00,00,00,00,00,00,00,00,03,00,01,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2017",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,05,00,04,00,00,00,00,00,00,00,00,00,00,00,03,00,03,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2018",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,06,00,04,00,00,00,00,00,00,00,00,00,00,00,03,00,04,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2019",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,00,00,04,00,00,00,00,00,00,00,00,00,00,00,03,00,05,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2020",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,01,00,03,00,00,00,00,00,00,00,00,00,00,00,03,00,06,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2021",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,03,00,04,00,00,00,00,00,00,00,00,00,00,00,03,00,01,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2022",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,04,00,04,00,00,00,00,00,00,00,00,00,00,00,03,00,02,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2023",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,05,00,04,00,00,00,00,00,00,00,00,00,00,00,03,00,03,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2024",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,06,00,03,00,00,00,00,00,00,00,00,00,00,00,03,00,04,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2025",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,01,00,04,00,00,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2026",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,02,00,04,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2027",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,03,00,04,00,00,00,00,00,00,00,00,00,00,00,03,00,01,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2028",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,04,00,03,00,00,00,00,00,00,00,00,00,00,00,03,00,02,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2029",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,05,00,03,00,00,00,00,00,00,00,00,00,00,00,03,00,03,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2030",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,00,00,04,00,00,00,00,00,00,00,00,00,00,00,03,00,05,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2031",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,01,00,04,00,00,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2032",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,02,00,03,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2033",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,03,00,03,00,00,00,00,00,00,00,00,00,00,00,03,00,01,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2034",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,05,00,04,00,00,00,00,00,00,00,00,00,00,00,03,00,03,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2035",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,06,00,04,00,00,00,00,00,00,00,00,00,00,00,03,00,04,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2036",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,03,00,05,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2037",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,01,00,03,00,00,00,00,00,00,00,00,00,00,00,03,00,06,00,03,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"FirstEntry",0x10001,1991 HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"LastEntry",0x10001,2037 HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time,"Display",,"Asia/Jerusalem" -- 2.20.1

1 0

[PATCH vkd3d 1/2] vkd3d-shader: Introduce a helper to report errors while scanning.
by Zebediah Figura Dec. 15, 2020

Dec. 15, 2020

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/vkd3d_shader_main.c | 32 ++++++++++++++++++--------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index eed0316c..2ea233bb 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -600,6 +600,16 @@ static void vkd3d_shader_scan_typed_resource_declaration(struct vkd3d_shader_sca semantic->resource_type, resource_data_type); } +static void vkd3d_shader_scan_error(struct vkd3d_shader_scan_context *context, + enum vkd3d_shader_error error, const char *format, ...) +{ + va_list args; + + va_start(args, format); + vkd3d_shader_verror(context->message_context, error, format, args); + va_end(args); +} + static int vkd3d_shader_scan_instruction(struct vkd3d_shader_scan_context *context, const struct vkd3d_shader_instruction *instruction) { @@ -636,7 +646,7 @@ static int vkd3d_shader_scan_instruction(struct vkd3d_shader_scan_context *conte case VKD3DSIH_ELSE: if (!(cf_info = vkd3d_shader_scan_get_current_cf_info(context)) || cf_info->type != VKD3D_SHADER_BLOCK_IF) { - vkd3d_shader_error(context->message_context, VKD3D_SHADER_ERROR_TPF_MISMATCHED_CF, + vkd3d_shader_scan_error(context, VKD3D_SHADER_ERROR_TPF_MISMATCHED_CF, "Encountered ‘else’ instruction without corresponding ‘if’ block."); return VKD3D_ERROR_INVALID_SHADER; } @@ -645,7 +655,7 @@ static int vkd3d_shader_scan_instruction(struct vkd3d_shader_scan_context *conte case VKD3DSIH_ENDIF: if (!(cf_info = vkd3d_shader_scan_get_current_cf_info(context)) || cf_info->type != VKD3D_SHADER_BLOCK_IF) { - vkd3d_shader_error(context->message_context, VKD3D_SHADER_ERROR_TPF_MISMATCHED_CF, + vkd3d_shader_scan_error(context, VKD3D_SHADER_ERROR_TPF_MISMATCHED_CF, "Encountered ‘endif’ instruction without corresponding ‘if’ block."); return VKD3D_ERROR_INVALID_SHADER; } @@ -658,7 +668,7 @@ static int vkd3d_shader_scan_instruction(struct vkd3d_shader_scan_context *conte case VKD3DSIH_ENDLOOP: if (!(cf_info = vkd3d_shader_scan_get_current_cf_info(context)) || cf_info->type != VKD3D_SHADER_BLOCK_LOOP) { - vkd3d_shader_error(context->message_context, VKD3D_SHADER_ERROR_TPF_MISMATCHED_CF, + vkd3d_shader_scan_error(context, VKD3D_SHADER_ERROR_TPF_MISMATCHED_CF, "Encountered ‘endloop’ instruction without corresponding ‘loop’ block."); return VKD3D_ERROR_INVALID_SHADER; } @@ -672,7 +682,7 @@ static int vkd3d_shader_scan_instruction(struct vkd3d_shader_scan_context *conte if (!(cf_info = vkd3d_shader_scan_get_current_cf_info(context)) || cf_info->type != VKD3D_SHADER_BLOCK_SWITCH || cf_info->inside_block) { - vkd3d_shader_error(context->message_context, VKD3D_SHADER_ERROR_TPF_MISMATCHED_CF, + vkd3d_shader_scan_error(context, VKD3D_SHADER_ERROR_TPF_MISMATCHED_CF, "Encountered ‘endswitch’ instruction without corresponding ‘switch’ block."); return VKD3D_ERROR_INVALID_SHADER; } @@ -682,7 +692,7 @@ static int vkd3d_shader_scan_instruction(struct vkd3d_shader_scan_context *conte if (!(cf_info = vkd3d_shader_scan_get_current_cf_info(context)) || cf_info->type != VKD3D_SHADER_BLOCK_SWITCH) { - vkd3d_shader_error(context->message_context, VKD3D_SHADER_ERROR_TPF_MISMATCHED_CF, + vkd3d_shader_scan_error(context, VKD3D_SHADER_ERROR_TPF_MISMATCHED_CF, "Encountered ‘case’ instruction outside switch block."); return VKD3D_ERROR_INVALID_SHADER; } @@ -692,13 +702,13 @@ static int vkd3d_shader_scan_instruction(struct vkd3d_shader_scan_context *conte if (!(cf_info = vkd3d_shader_scan_get_current_cf_info(context)) || cf_info->type != VKD3D_SHADER_BLOCK_SWITCH) { - vkd3d_shader_error(context->message_context, VKD3D_SHADER_ERROR_TPF_MISMATCHED_CF, + vkd3d_shader_scan_error(context, VKD3D_SHADER_ERROR_TPF_MISMATCHED_CF, "Encountered ‘default’ instruction outside switch block."); return VKD3D_ERROR_INVALID_SHADER; } if (cf_info->has_default) { - vkd3d_shader_error(context->message_context, VKD3D_SHADER_ERROR_TPF_MISMATCHED_CF, + vkd3d_shader_scan_error(context, VKD3D_SHADER_ERROR_TPF_MISMATCHED_CF, "Encountered duplicate ‘default’ instruction inside the current switch block."); return VKD3D_ERROR_INVALID_SHADER; } @@ -708,7 +718,7 @@ static int vkd3d_shader_scan_instruction(struct vkd3d_shader_scan_context *conte case VKD3DSIH_BREAK: if (!(cf_info = vkd3d_shader_scan_find_innermost_breakable_cf_info(context))) { - vkd3d_shader_error(context->message_context, VKD3D_SHADER_ERROR_TPF_MISMATCHED_CF, + vkd3d_shader_scan_error(context, VKD3D_SHADER_ERROR_TPF_MISMATCHED_CF, "Encountered ‘break’ instruction outside breakable block."); return VKD3D_ERROR_INVALID_SHADER; } @@ -717,7 +727,7 @@ static int vkd3d_shader_scan_instruction(struct vkd3d_shader_scan_context *conte case VKD3DSIH_BREAKP: if (!(cf_info = vkd3d_shader_scan_find_innermost_loop_cf_info(context))) { - vkd3d_shader_error(context->message_context, VKD3D_SHADER_ERROR_TPF_MISMATCHED_CF, + vkd3d_shader_scan_error(context, VKD3D_SHADER_ERROR_TPF_MISMATCHED_CF, "Encountered ‘breakp’ instruction outside loop."); return VKD3D_ERROR_INVALID_SHADER; } @@ -725,7 +735,7 @@ static int vkd3d_shader_scan_instruction(struct vkd3d_shader_scan_context *conte case VKD3DSIH_CONTINUE: if (!(cf_info = vkd3d_shader_scan_find_innermost_loop_cf_info(context))) { - vkd3d_shader_error(context->message_context, VKD3D_SHADER_ERROR_TPF_MISMATCHED_CF, + vkd3d_shader_scan_error(context, VKD3D_SHADER_ERROR_TPF_MISMATCHED_CF, "Encountered ‘continue’ instruction outside loop."); return VKD3D_ERROR_INVALID_SHADER; } @@ -734,7 +744,7 @@ static int vkd3d_shader_scan_instruction(struct vkd3d_shader_scan_context *conte case VKD3DSIH_CONTINUEP: if (!(cf_info = vkd3d_shader_scan_find_innermost_loop_cf_info(context))) { - vkd3d_shader_error(context->message_context, VKD3D_SHADER_ERROR_TPF_MISMATCHED_CF, + vkd3d_shader_scan_error(context, VKD3D_SHADER_ERROR_TPF_MISMATCHED_CF, "Encountered ‘continue’ instruction outside loop."); return VKD3D_ERROR_INVALID_SHADER; } -- 2.29.2

3 3

[PATCH vkd3d] build: Create object directories before running bison or flex.
by Zebediah Figura Dec. 15, 2020

Dec. 15, 2020

Vkd3d-Bug: https://bugs.winehq.org/show_bug.cgi?id=50334 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- Makefile.am | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile.am b/Makefile.am index 32c8777f..bf1d7bfa 100644 --- a/Makefile.am +++ b/Makefile.am @@ -119,9 +119,11 @@ vkd3d_v_bison_0 = @echo " BISON " $@; vkd3d_v_bison_1 = libs/vkd3d-shader/preproc.yy.c: libs/vkd3d-shader/preproc.l + @$(MKDIR_P) libs/vkd3d-shader $(VKD3D_V_FLEX)$(FLEX) $(LFLAGS) -o $@ $< libs/vkd3d-shader/preproc.tab.c libs/vkd3d-shader/preproc.tab.h &: libs/vkd3d-shader/preproc.y + @$(MKDIR_P) libs/vkd3d-shader $(VKD3D_V_BISON)$(BISON) $(YFLAGS) -d -o libs/vkd3d-shader/preproc.tab.c $< BUILT_SOURCES += libs/vkd3d-shader/preproc.tab.h -- 2.29.2

2 1

[PATCH] po: Update Japanese translation.
by Akihiro Sagawa Dec. 15, 2020

Dec. 15, 2020

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- po/ja.po | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-)

1 0

[PATCH 2/2] wined3d: Avoid referencing empty command buffers in wined3d_query_event_vk_issue().
by Henri Verbeet Dec. 15, 2020

Dec. 15, 2020

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This fixes a deadlock in "Ryse: Son of Rome" when starting a new campaign. dlls/wined3d/query.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 9e0e22b32e5..4670bbfddff 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -1720,6 +1720,14 @@ static BOOL wined3d_query_event_vk_issue(struct wined3d_query *query, uint32_t f { context_vk = wined3d_context_vk(context_acquire(&device_vk->d, NULL, 0)); wined3d_context_vk_reference_query(context_vk, query_vk); + /* Because we don't actually submit any commands to the command buffer + * for event queries, the context's current command buffer may still + * be empty, and we should wait on the preceding command buffer + * instead. That's not merely an optimisation; if the command buffer + * referenced by the query is still empty by the time the application + * waits for it, that wait will never complete. */ + if (!context_vk->current_command_buffer.vk_command_buffer) + --query_vk->command_buffer_id; context_release(&context_vk->c); return TRUE; -- 2.20.1

1 0

[PATCH 1/2] wined3d: Zero-initialise context_vk in wined3d_context_vk_init().
by Henri Verbeet Dec. 15, 2020

Dec. 15, 2020

wined3d_context_vk_init() assumes zero-initialised memory, but that's not necessarily true in case we previously went through an adapter_vk_init_3d()/adapter_vk_uninit_3d() pair. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This fixes a crash on startup with the Vulkan backend in Batman: Arkham Origins. dlls/wined3d/context_vk.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 9db363172f1..2d80c59ca32 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -3158,6 +3158,7 @@ HRESULT wined3d_context_vk_init(struct wined3d_context_vk *context_vk, struct wi TRACE("context_vk %p, swapchain %p.\n", context_vk, swapchain); + memset(context_vk, 0, sizeof(*context_vk)); wined3d_context_init(&context_vk->c, swapchain); device_vk = wined3d_device_vk(swapchain->device); adapter_vk = wined3d_adapter_vk(device_vk->d.adapter); -- 2.20.1

1 0

[PATCH v2 3/4] gdi32: Avoid best fit chars when mapping unicode character to a glyph index.
by Dmitry Timoshkov Dec. 15, 2020

Dec. 15, 2020

This part fixes drawing text. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/gdi32/font.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 9380d3efbe..850bbaab19 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2910,11 +2910,11 @@ static UINT get_glyph_index( struct gdi_font *font, UINT glyph ) glyph = get_glyph_index_symbol( font, wc ); if (!glyph) { - if (WideCharToMultiByte( CP_ACP, 0, &wc, 1, &ch, 1, NULL, NULL )) + if (WideCharToMultiByte( CP_ACP, WC_NO_BEST_FIT_CHARS, &wc, 1, &ch, 1, NULL, NULL )) glyph = get_glyph_index_symbol( font, (unsigned char)ch ); } } - else if (WideCharToMultiByte( font->codepage, 0, &wc, 1, &ch, 1, NULL, &used ) && !used) + else if (WideCharToMultiByte( font->codepage, WC_NO_BEST_FIT_CHARS, &wc, 1, &ch, 1, NULL, &used ) && !used) { glyph = (unsigned char)ch; font_funcs->get_glyph_index( font, &glyph, FALSE ); -- 2.29.2

1 0

[PATCH v2 1/4] gdi32/tests: Add some tests to show that GetGlyphIndices() should avoid best fit chars.
by Dmitry Timoshkov Dec. 15, 2020

Dec. 15, 2020

v2: Fix test failures under CJK Windows versions. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/gdi32/tests/font.c | 41 ++++++++++++++++++++++++++++++++++++----- 1 file changed, 36 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 86ccddd05e..c630b65e5e 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1634,6 +1634,7 @@ static void test_GetGlyphIndices(void) LOGFONTA lf; DWORD flags = 0; WCHAR testtext[] = {'T','e','s','t',0xffff,0}; + WCHAR c[] = { 0x25bc /* Black Down-Pointing Triangle */, 0x212a /* Kelvin Sign */ }; WORD glyphs[(sizeof(testtext)/2)-1]; TEXTMETRICA textm; HFONT hOldFont; @@ -1655,8 +1656,9 @@ static void test_GetGlyphIndices(void) lf.lfCharSet = ANSI_CHARSET; hfont = CreateFontIndirectA(&lf); - ok(hfont != 0, "CreateFontIndirectEx failed\n"); - ok(GetTextMetricsA(hdc, &textm), "GetTextMetric failed\n"); + ok(hfont != 0, "CreateFontIndirect failed\n"); + hOldFont = SelectObject(hdc, hfont); + ok(GetTextMetricsA(hdc, &textm), "GetTextMetrics failed\n"); if (textm.tmCharSet == ANSI_CHARSET) { flags |= GGI_MARK_NONEXISTING_GLYPHS; @@ -1666,16 +1668,44 @@ static void test_GetGlyphIndices(void) flags = 0; charcount = pGetGlyphIndicesW(hdc, testtext, (sizeof(testtext)/2)-1, glyphs, flags); ok(charcount == 5, "GetGlyphIndicesW count of glyphs should = 5 not %d\n", charcount); - ok(glyphs[4] == textm.tmDefaultChar, "GetGlyphIndicesW should have returned a %04x not %04x\n", - textm.tmDefaultChar, glyphs[4]); + ok(glyphs[4] == textm.tmDefaultChar || glyphs[4] == 0x20 /* CJK Windows */, + "GetGlyphIndicesW should have returned a %04x not %04x\n", textm.tmDefaultChar, glyphs[4]); } else /* FIXME: Write tests for non-ANSI charsets. */ skip("GetGlyphIndices System font tests only for ANSI_CHARSET\n"); + DeleteObject(SelectObject(hdc, hOldFont)); + + memset(&lf, 0, sizeof(lf)); + strcpy(lf.lfFaceName, "MS Sans Serif"); + lf.lfHeight = -13; + lf.lfCharSet = DEFAULT_CHARSET; + hfont = CreateFontIndirectA(&lf); + ok(hfont != 0, "CreateFontIndirect failed\n"); + hOldFont = SelectObject(hdc, hfont); + ok(GetTextMetricsA(hdc, &textm), "GetTextMetrics failed\n"); + + glyphs[0] = glyphs[1] = 0; + charcount = GetGlyphIndicesW(hdc, c, ARRAY_SIZE(c), glyphs, GGI_MARK_NONEXISTING_GLYPHS); + ok(charcount == ARRAY_SIZE(c), "got %u\n", charcount); + ok(glyphs[0] == 0x001f || glyphs[0] == 0xffff /* Vista */, "got %#x\n", glyphs[0]); +todo_wine + ok(glyphs[1] == 0x001f || glyphs[1] == 0xffff /* Vista */, "got %#x\n", glyphs[1]); + + glyphs[0] = glyphs[1] = 0; + charcount = GetGlyphIndicesW(hdc, c, ARRAY_SIZE(c), glyphs, 0); + ok(charcount == ARRAY_SIZE(c), "got %u\n", charcount); + ok(glyphs[0] == textm.tmDefaultChar || glyphs[0] == 0x20 /* CJK Windows */, "got %#x\n", glyphs[0]); +todo_wine + ok(glyphs[1] == textm.tmDefaultChar || glyphs[1] == 0x20 /* CJK Windows */, "got %#x\n", glyphs[1]); + + DeleteObject(SelectObject(hdc, hOldFont)); + if(!is_font_installed("Tahoma")) { skip("Tahoma is not installed so skipping this test\n"); + ReleaseDC(0, hdc); return; } memset(&lf, 0, sizeof(lf)); @@ -1720,12 +1750,13 @@ static void test_GetGlyphIndices(void) ok(glyphs[4] == 0, "GetGlyphIndicesW should have returned 0 not %04x\n", glyphs[4]); DeleteObject(SelectObject(hdc, hOldFont)); + ReleaseDC(0, hdc); + ret = pRemoveFontMemResourceEx(rsrc); ok(ret, "RemoveFontMemResourceEx error %d\n", GetLastError()); free_font(font); ret = DeleteFileA(ttf_name); ok(ret, "Failed to delete font file, %d.\n", GetLastError()); - } static void test_GetKerningPairs(void) -- 2.29.2

1 0

[PATCH v3 1/2] ntdll: Always copy context in call_user_apc_dispatcher() on x64.
by Paul Gofman Dec. 15, 2020

Dec. 15, 2020

Currently, if call_user_apc_dispatcher() is called with nonzero context, there is no guarantee that the provided context is stored above the rsp = context_ptr->Rsp - (sizeof(CONTEXT) + offsetof(frame,ret_addr)) being set. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v3: - properly align / reserve stack for setup_user_apc_dispatcher_stack() call. dlls/ntdll/unix/signal_x86_64.c | 62 +++++++++++++++++++++++++-------- 1 file changed, 48 insertions(+), 14 deletions(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 359f2d7c361..0fc7ad69584 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -254,6 +254,22 @@ C_ASSERT((offsetof(struct stack_layout, xstate) == sizeof(struct stack_layout))) C_ASSERT( sizeof(XSTATE) == 0x140 ); C_ASSERT( sizeof(struct stack_layout) == 0x5b0 ); /* Should match the size in call_user_exception_dispatcher(). */ +/* stack layout when calling an user apc function. + * FIXME: match Windows ABI. */ +struct apc_stack_layout +{ + ULONG64 save_regs[4]; + void *func; + ULONG64 align; + CONTEXT context; + ULONG64 rbp; + ULONG64 rip; +}; + +/* Should match size and offset in call_user_apc_dispatcher(). */ +C_ASSERT( offsetof(struct apc_stack_layout, context) == 0x30 ); +C_ASSERT( sizeof(struct apc_stack_layout) == 0x510 ); + struct syscall_frame { ULONG64 xmm[10 * 2]; /* xmm6-xmm15 */ @@ -270,6 +286,9 @@ struct syscall_frame ULONG64 ret_addr; }; +/* Should match the offset in call_user_apc_dispatcher(). */ +C_ASSERT( offsetof( struct syscall_frame, ret_addr ) == 0xf0); + struct amd64_thread_data { DWORD_PTR dr0; /* 02f0 debug registers */ @@ -2017,31 +2036,46 @@ static void setup_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec ) /*********************************************************************** * call_user_apc_dispatcher */ +struct apc_stack_layout * WINAPI setup_user_apc_dispatcher_stack( CONTEXT *context, struct apc_stack_layout *stack ) +{ + CONTEXT c; + + if (!context) + { + c.ContextFlags = CONTEXT_FULL; + NtGetContextThread( GetCurrentThread(), &c ); + context = &c; + } + memmove( &stack->context, context, sizeof(stack->context) ); + return stack; +} + __ASM_GLOBAL_FUNC( call_user_apc_dispatcher, "movq 0x28(%rsp),%rsi\n\t" /* func */ "movq 0x30(%rsp),%rdi\n\t" /* dispatcher */ "movq %gs:0x30,%rbx\n\t" - "jrcxz 1f\n\t" - "movq 0x98(%rcx),%rax\n\t" /* context_ptr->Rsp */ - "leaq -0x5c0(%rax),%rsp\n\t" /* sizeof(CONTEXT) + offsetof(frame,ret_addr) */ - "andq $~15,%rsp\n\t" - "jmp 2f\n" - "1:\tmovq 0x328(%rbx),%rax\n\t" /* amd64_thread_data()->syscall_frame */ - "leaq -0x4d0(%rax),%rsp\n\t" - "andq $~15,%rsp\n\t" "movq %rdx,%r12\n\t" /* ctx */ "movq %r8,%r13\n\t" /* arg1 */ "movq %r9,%r14\n\t" /* arg2 */ - "movq %rsp,%rdx\n\t" /* context */ - "movl $0x10000b,0x30(%rdx)\n\t" /* context.ContextFlags */ - "movq $~1,%rcx\n\t" - "call " __ASM_NAME("NtGetContextThread") "\n\t" - "movq %rsp,%rcx\n\t" /* context */ + "jrcxz 1f\n\t" + "movq 0x98(%rcx),%rdx\n\t" /* context->Rsp */ + "jmp 2f\n\t" + "1:\tmovq 0x328(%rbx),%rax\n\t" /* amd64_thread_data()->syscall_frame */ + "leaq 0xf0(%rax),%rdx\n\t" /* &amd64_thread_data()->syscall_frame->ret_addr */ + "2:\tsubq $0x510,%rdx\n\t" /* sizeof(struct apc_stack_layout) */ + "andq $~0xf,%rdx\n\t" + "addq $8,%rsp\n\t" /* pop return address */ + "cmpq %rsp,%rdx\n\t" + "cmovbq %rdx,%rsp\n\t" + "subq $0x20,%rsp\n\t" + "call " __ASM_NAME("setup_user_apc_dispatcher_stack") "\n\t" + "movq %rax,%rsp\n\t" + "leaq 0x30(%rsp),%rcx\n\t" /* context */ "movq $0xc0,0x78(%rcx)\n\t" /* context.Rax = STATUS_USER_APC */ "movq %r12,%rdx\n\t" /* ctx */ "movq %r13,%r8\n\t" /* arg1 */ "movq %r14,%r9\n" /* arg2 */ - "2:\tmovq $0,0x328(%rbx)\n\t" + "movq $0,0x328(%rbx)\n\t" /* amd64_thread_data()->syscall_frame */ "movq %rsi,0x20(%rsp)\n\t" /* func */ "movq 0xa0(%rcx),%rbp\n\t" /* context.Rbp */ "pushq 0xf8(%rcx)\n\t" /* context.Rip */ -- 2.29.2

1 1

[PATCH 2/3] gdi32: Avoid best fit chars when mapping unicode character to a glyph index.
by Dmitry Timoshkov Dec. 15, 2020

Dec. 15, 2020

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/gdi32/font.c | 4 ++-- dlls/gdi32/tests/font.c | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 00bbeb0a11..b8ba4258e9 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2910,11 +2910,11 @@ static UINT get_glyph_index( struct gdi_font *font, UINT glyph ) glyph = get_glyph_index_symbol( font, wc ); if (!glyph) { - if (WideCharToMultiByte( CP_ACP, 0, &wc, 1, &ch, 1, NULL, NULL )) + if (WideCharToMultiByte( CP_ACP, WC_NO_BEST_FIT_CHARS, &wc, 1, &ch, 1, NULL, NULL )) glyph = get_glyph_index_symbol( font, (unsigned char)ch ); } } - else if (WideCharToMultiByte( font->codepage, 0, &wc, 1, &ch, 1, NULL, &used ) && !used) + else if (WideCharToMultiByte( font->codepage, WC_NO_BEST_FIT_CHARS, &wc, 1, &ch, 1, NULL, &used ) && !used) { glyph = (unsigned char)ch; font_funcs->get_glyph_index( font, &glyph, FALSE ); diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index dde41b501a..f6d2a49c91 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1689,9 +1689,7 @@ static void test_GetGlyphIndices(void) glyphs[0] = glyphs[1] = 0; charcount = GetGlyphIndicesW(hdc, c, ARRAY_SIZE(c), glyphs, GGI_MARK_NONEXISTING_GLYPHS); ok(charcount == ARRAY_SIZE(c), "got %u\n", charcount); -todo_wine ok(glyphs[0] == 0x001f || glyphs[0] == 0xffff /* Vista */, "got %#x\n", glyphs[0]); -todo_wine ok(glyphs[1] == 0x001f || glyphs[0] == 0xffff /* Vista */, "got %#x\n", glyphs[1]); glyphs[0] = glyphs[1] = 0; -- 2.29.2

2 1

[PATCH 1/3] gdi32/tests: Add some tests to show that GetGlyphIndices() should avoid best fit chars.
by Dmitry Timoshkov Dec. 15, 2020

Dec. 15, 2020

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/gdi32/tests/font.c | 38 +++++++++++++++++++++++++++++++++++--- 1 file changed, 35 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 86ccddd05e..dde41b501a 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1634,6 +1634,7 @@ static void test_GetGlyphIndices(void) LOGFONTA lf; DWORD flags = 0; WCHAR testtext[] = {'T','e','s','t',0xffff,0}; + WCHAR c[] = { 0x25bc /* Black Down-Pointing Triangle */, 0x212a /* Kelvin Sign */ }; WORD glyphs[(sizeof(testtext)/2)-1]; TEXTMETRICA textm; HFONT hOldFont; @@ -1655,8 +1656,9 @@ static void test_GetGlyphIndices(void) lf.lfCharSet = ANSI_CHARSET; hfont = CreateFontIndirectA(&lf); - ok(hfont != 0, "CreateFontIndirectEx failed\n"); - ok(GetTextMetricsA(hdc, &textm), "GetTextMetric failed\n"); + ok(hfont != 0, "CreateFontIndirect failed\n"); + hOldFont = SelectObject(hdc, hfont); + ok(GetTextMetricsA(hdc, &textm), "GetTextMetrics failed\n"); if (textm.tmCharSet == ANSI_CHARSET) { flags |= GGI_MARK_NONEXISTING_GLYPHS; @@ -1673,9 +1675,38 @@ static void test_GetGlyphIndices(void) /* FIXME: Write tests for non-ANSI charsets. */ skip("GetGlyphIndices System font tests only for ANSI_CHARSET\n"); + DeleteObject(SelectObject(hdc, hOldFont)); + + memset(&lf, 0, sizeof(lf)); + strcpy(lf.lfFaceName, "MS Sans Serif"); + lf.lfHeight = -13; + lf.lfCharSet = DEFAULT_CHARSET; + hfont = CreateFontIndirectA(&lf); + ok(hfont != 0, "CreateFontIndirect failed\n"); + hOldFont = SelectObject(hdc, hfont); + ok(GetTextMetricsA(hdc, &textm), "GetTextMetrics failed\n"); + + glyphs[0] = glyphs[1] = 0; + charcount = GetGlyphIndicesW(hdc, c, ARRAY_SIZE(c), glyphs, GGI_MARK_NONEXISTING_GLYPHS); + ok(charcount == ARRAY_SIZE(c), "got %u\n", charcount); +todo_wine + ok(glyphs[0] == 0x001f || glyphs[0] == 0xffff /* Vista */, "got %#x\n", glyphs[0]); +todo_wine + ok(glyphs[1] == 0x001f || glyphs[0] == 0xffff /* Vista */, "got %#x\n", glyphs[1]); + + glyphs[0] = glyphs[1] = 0; + charcount = GetGlyphIndicesW(hdc, c, ARRAY_SIZE(c), glyphs, 0); + ok(charcount == ARRAY_SIZE(c), "got %u\n", charcount); + ok(glyphs[0] == textm.tmDefaultChar, "got %#x\n", glyphs[0]); +todo_wine + ok(glyphs[1] == textm.tmDefaultChar, "got %#x\n", glyphs[1]); + + DeleteObject(SelectObject(hdc, hOldFont)); + if(!is_font_installed("Tahoma")) { skip("Tahoma is not installed so skipping this test\n"); + ReleaseDC(0, hdc); return; } memset(&lf, 0, sizeof(lf)); @@ -1720,12 +1751,13 @@ static void test_GetGlyphIndices(void) ok(glyphs[4] == 0, "GetGlyphIndicesW should have returned 0 not %04x\n", glyphs[4]); DeleteObject(SelectObject(hdc, hOldFont)); + ReleaseDC(0, hdc); + ret = pRemoveFontMemResourceEx(rsrc); ok(ret, "RemoveFontMemResourceEx error %d\n", GetLastError()); free_font(font); ret = DeleteFileA(ttf_name); ok(ret, "Failed to delete font file, %d.\n", GetLastError()); - } static void test_GetKerningPairs(void) -- 2.29.2

2 1

[PATCH 4/4] include: Add IAudioAmbisonicsControl interface in audioclient.idl.
by Biswapriyo Nath Dec. 15, 2020

Dec. 15, 2020

1 0

[PATCH 3/4] include: Add AMBISONICS_PARAMS structure in audioclient.idl.
by Biswapriyo Nath Dec. 15, 2020

Dec. 15, 2020

1 0

[PATCH 2/4] include: Add error codes in audioclient.idl.
by Biswapriyo Nath Dec. 15, 2020

Dec. 15, 2020

1 0

[PATCH 1/4] include: Add AUDCLNT_STREAMOPTIONS_AMBISONICS in audioclient.idl.
by Biswapriyo Nath Dec. 15, 2020

Dec. 15, 2020

1 0

[PATCH 3/3] fonts: Correct default glyph index for MS Sans Serif font to match Windows.
by Dmitry Timoshkov Dec. 15, 2020

Dec. 15, 2020

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- fonts/ms_sans_serif.sfd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fonts/ms_sans_serif.sfd b/fonts/ms_sans_serif.sfd index 751b35d064..e8c720b528 100644 --- a/fonts/ms_sans_serif.sfd +++ b/fonts/ms_sans_serif.sfd @@ -4,7 +4,7 @@ FullName: MS Sans Serif FamilyName: MS Sans Serif Weight: Medium Copyright: Copyright (C) 2004 Huw D M Davies, Dmitry Timoshkov -UComments: "#pragma makedep font ssee1255.fon -d 129 13,1255,5 16,1255,7 20,1255,8+AAoA#pragma makedep font ssee1256.fon -d 129 13,1256,5 16,1256,7 20,1256,8+AAoA#pragma makedep font ssee1257.fon -d 129 13,1257,5 16,1257,7 20,1257,8+AAoA#pragma makedep font ssee874.fon -d 129 13,874,5 16,874,7 20,874,8+AAoA#pragma makedep font ssef1255.fon -d 129 -r 120 16,1255,7 20,1255,8+AAoA#pragma makedep font ssef1256.fon -d 129 -r 120 16,1256,7 20,1256,8+AAoA#pragma makedep font ssef1257.fon -d 129 -r 120 16,1257,7 20,1257,8+AAoA#pragma makedep font ssef874.fon -d 129 -r 120 16,874,7 20,874,8+AAoA#pragma makedep font sserife.fon -d 129 13,1252,5 16,1252,7 20,1252,8+AAoA#pragma makedep font sserifee.fon -d 129 13,1250,5 16,1250,7+AAoA#pragma makedep font sserifeg.fon -d 129 13,1253,5 16,1253,7 20,1253,8 +AAoA#pragma makedep font sserifer.fon -d 129 13,1251,5 16,1251,7 20,1251,8+AAoA#pragma makedep font sserifet.fon -d 129 13,1254,5 16,1254,7 20,1254,8+AAoA#pragma makedep font sseriff.fon -d 129 -r 120 16,1252,7 20,1252,8+AAoA#pragma makedep font sseriffe.fon -d 129 -r 120 16,1250,7+AAoA#pragma makedep font sseriffg.fon -d 129 -r 120 16,1253,7 20,1253,8 +AAoA#pragma makedep font sseriffr.fon -d 129 -r 120 16,1251,7 20,1251,8+AAoA#pragma makedep font sserifft.fon -d 129 -r 120 16,1254,7 20,1254,8" +UComments: "#pragma makedep font ssee1255.fon -d 129 13,1255,5 16,1255,7 20,1255,8+AAoA#pragma makedep font ssee1256.fon -d 129 13,1256,5 16,1256,7 20,1256,8+AAoA#pragma makedep font ssee1257.fon -d 128 13,1257,5 16,1257,7 20,1257,8+AAoA#pragma makedep font ssee874.fon -d 129 13,874,5 16,874,7 20,874,8+AAoA#pragma makedep font ssef1255.fon -d 129 -r 120 16,1255,7 20,1255,8+AAoA#pragma makedep font ssef1256.fon -d 129 -r 120 16,1256,7 20,1256,8+AAoA#pragma makedep font ssef1257.fon -d 128 -r 120 16,1257,7 20,1257,8+AAoA#pragma makedep font ssef874.fon -d 129 -r 120 16,874,7 20,874,8+AAoA#pragma makedep font sserife.fon -d 129 13,1252,5 16,1252,7 20,1252,8+AAoA#pragma makedep font sserifee.fon -d 128 13,1250,5 16,1250,7+AAoA#pragma makedep font sserifeg.fon -d 129 13,1253,5 16,1253,7 20,1253,8 +AAoA#pragma makedep font sserifer.fon -d 127 13,1251,5 16,1251,7 20,1251,8+AAoA#pragma makedep font sserifet.fon -d 129 13,1254,5 16,1254,7 20,1254,8+AAoA#pragma makedep font sseriff.fon -d 129 -r 120 16,1252,7 20,1252,8+AAoA#pragma makedep font sseriffe.fon -d 128 -r 120 16,1250,7+AAoA#pragma makedep font sseriffg.fon -d 129 -r 120 16,1253,7 20,1253,8 +AAoA#pragma makedep font sseriffr.fon -d 127 -r 120 16,1251,7 20,1251,8+AAoA#pragma makedep font sserifft.fon -d 129 -r 120 16,1254,7 20,1254,8" Version: 001.000 ItalicAngle: 0 UnderlinePosition: -15753.8 -- 2.29.2

1 0

[PATCH] po: Update Simplified Chinese translation.
by Jactry Zeng Dec. 15, 2020

Dec. 15, 2020

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- po/zh_CN.po | 228 ++++++++++++++++------------------------------------ 1 file changed, 70 insertions(+), 158 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index ae0d24b32c6..14771308488 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -5,14 +5,14 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2019-06-04 19:24-0600\n" -"Last-Translator: Zixing Liu <liushuyu011(a)gmail.com>\n" +"PO-Revision-Date: 2020-12-15 16:24+0800\n" +"Last-Translator: Jactry Zeng <jzeng(a)codeweavers.com>\n" "Language-Team: Chinese (PRC)\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.2.1\n" +"X-Generator: Poedit 2.4.2\n" "Plural-Forms: nplurals=1; plural=0;\n" #: dlls/appwiz.cpl/appwiz.rc:58 @@ -3686,7 +3686,7 @@ msgstr "游戏控制器" #: dlls/joy.cpl/joy.rc:32 msgid "Test and configure game controllers." -msgstr "" +msgstr "测试和配置游戏控制器。" #: dlls/jscript/jscript.rc:28 msgid "Error converting object to primitive type" @@ -3701,10 +3701,8 @@ msgid "Subscript out of range" msgstr "标记越界" #: dlls/jscript/jscript.rc:31 -#, fuzzy -#| msgid "Out of paper; " msgid "Out of stack space" -msgstr "缺纸；" +msgstr "堆栈空间不足" #: dlls/jscript/jscript.rc:32 msgid "Object required" @@ -3843,16 +3841,12 @@ msgid "JScript object expected" msgstr "期望得到 JScript 对象" #: dlls/jscript/jscript.rc:63 -#, fuzzy -#| msgid "Array object expected" msgid "Enumerator object expected" -msgstr "期望得到 Array 对象" +msgstr "期望得到枚举器对象" #: dlls/jscript/jscript.rc:64 -#, fuzzy -#| msgid "Boolean object expected" msgid "Regular Expression object expected" -msgstr "期望得到布尔型对象" +msgstr "期望得到正则表达式对象" #: dlls/jscript/jscript.rc:65 msgid "Syntax error in regular expression" @@ -6874,32 +6868,24 @@ msgid "Connection reset by peer.\n" msgstr "连接被重置。\n" #: dlls/kernel32/winerror.mc:3767 -#, fuzzy -#| msgid "Not implemented" msgid "Not implemented.\n" -msgstr "尚未实现" +msgstr "尚未实现。\n" #: dlls/kernel32/winerror.mc:3788 -#, fuzzy -#| msgid "RPC call failed.\n" msgid "Call failed.\n" -msgstr "RPC 调用失败。\n" +msgstr "调用失败。\n" #: dlls/kernel32/winerror.mc:3760 msgid "No Signature found in file.\n" msgstr "未在文件内找到签名。\n" #: dlls/kernel32/winerror.mc:3774 -#, fuzzy -#| msgid "Invalid level.\n" msgid "Invalid call.\n" -msgstr "无效的级别。\n" +msgstr "无效调用。\n" #: dlls/kernel32/winerror.mc:3781 -#, fuzzy -#| msgid "Value is not available.\n" msgid "Resource is not currently available.\n" -msgstr "值不可用。\n" +msgstr "资源当前不可用。\n" #: dlls/localspl/localspl.rc:31 dlls/localui/localui.rc:31 #: dlls/winspool.drv/winspool.rc:30 @@ -9838,16 +9824,12 @@ msgid "Iran Daylight Time" msgstr "伊朗夏令时" #: dlls/tzres/tzres.rc:204 -#, fuzzy -#| msgid "Haiti Standard Time" msgid "Saint Pierre Standard Time" -msgstr "海地标准时间" +msgstr "圣皮埃尔标准时间" #: dlls/tzres/tzres.rc:205 -#, fuzzy -#| msgid "Haiti Daylight Time" msgid "Saint Pierre Daylight Time" -msgstr "海地夏令时" +msgstr "圣皮埃尔夏令时" #: dlls/tzres/tzres.rc:170 msgid "Namibia Standard Time" @@ -9890,16 +9872,12 @@ msgid "Central Asia Daylight Time" msgstr "中亚夏令时" #: dlls/tzres/tzres.rc:146 -#, fuzzy -#| msgid "Korea Standard Time" msgid "Lord Howe Standard Time" -msgstr "韩国标准时间" +msgstr "豪勋爵标准时间" #: dlls/tzres/tzres.rc:147 -#, fuzzy -#| msgid "Korea Daylight Time" msgid "Lord Howe Daylight Time" -msgstr "韩国夏令时" +msgstr "豪勋爵夏令时" #: dlls/tzres/tzres.rc:40 msgid "Arabic Standard Time" @@ -9950,16 +9928,12 @@ msgid "Azerbaijan Daylight Time" msgstr "阿塞拜疆夏令时" #: dlls/tzres/tzres.rc:150 -#, fuzzy -#| msgid "Magadan Standard Time" msgid "Magallanes Standard Time" -msgstr "马加丹标准时间" +msgstr "麦哲伦标准时间" #: dlls/tzres/tzres.rc:151 -#, fuzzy -#| msgid "Magadan Daylight Time" msgid "Magallanes Daylight Time" -msgstr "马加丹夏令时" +msgstr "麦哲伦夏令时" #: dlls/tzres/tzres.rc:206 msgid "Samoa Standard Time" @@ -10010,16 +9984,12 @@ msgid "Line Islands Daylight Time" msgstr "莱恩群岛夏令时" #: dlls/tzres/tzres.rc:92 -#, fuzzy -#| msgid "China Standard Time" msgid "Cuba Standard Time" -msgstr "中国标准时间" +msgstr "古巴标准时间" #: dlls/tzres/tzres.rc:93 -#, fuzzy -#| msgid "China Daylight Time" msgid "Cuba Daylight Time" -msgstr "中国夏令时" +msgstr "古巴夏令时" #: dlls/tzres/tzres.rc:136 msgid "Jordan Standard Time" @@ -10218,16 +10188,12 @@ msgid "US Eastern Daylight Time" msgstr "美国东部夏令时" #: dlls/tzres/tzres.rc:182 -#, fuzzy -#| msgid "Korea Standard Time" msgid "North Korea Standard Time" -msgstr "韩国标准时间" +msgstr "朝鲜标准时间" #: dlls/tzres/tzres.rc:183 -#, fuzzy -#| msgid "Korea Daylight Time" msgid "North Korea Daylight Time" -msgstr "韩国夏令时" +msgstr "朝鲜夏令时" #: dlls/tzres/tzres.rc:220 msgid "Tasmania Standard Time" @@ -10318,16 +10284,12 @@ msgid "Arabian Daylight Time" msgstr "阿拉伯夏令时" #: dlls/tzres/tzres.rc:222 -#, fuzzy -#| msgid "Mountain Standard Time" msgid "Tocantins Standard Time" -msgstr "山地标准时间" +msgstr "托坎廷斯标准时间" #: dlls/tzres/tzres.rc:223 -#, fuzzy -#| msgid "Mountain Daylight Time" msgid "Tocantins Daylight Time" -msgstr "山地夏令时" +msgstr "托坎廷斯夏令时" #: dlls/tzres/tzres.rc:196 msgid "Russian Standard Time" @@ -10338,16 +10300,12 @@ msgid "Russian Daylight Time" msgstr "俄罗斯夏令时" #: dlls/tzres/tzres.rc:48 -#, fuzzy -#| msgid "AUS Central Standard Time" msgid "Aus Central W. Standard Time" -msgstr "澳大利亚中部标准时间" +msgstr "澳大利亚中西部标准时间" #: dlls/tzres/tzres.rc:49 -#, fuzzy -#| msgid "AUS Central Daylight Time" msgid "Aus Central W. Daylight Time" -msgstr "澳大利亚中部夏令时" +msgstr "澳大利亚中西部夏令时" #: dlls/tzres/tzres.rc:194 msgid "Romance Standard Time" @@ -10566,16 +10524,12 @@ msgid "Egypt Daylight Time" msgstr "埃及夏令时" #: dlls/tzres/tzres.rc:106 -#, fuzzy -#| msgid "Central Standard Time (Mexico)" msgid "Eastern Standard Time (Mexico)" -msgstr "中部标准时间（墨西哥）" +msgstr "东部标准时间（墨西哥）" #: dlls/tzres/tzres.rc:107 -#, fuzzy -#| msgid "Central Daylight Time (Mexico)" msgid "Eastern Daylight Time (Mexico)" -msgstr "中部夏令时（墨西哥）" +msgstr "东部夏令时（墨西哥）" #: dlls/tzres/tzres.rc:154 msgid "Mauritius Standard Time" @@ -10780,153 +10734,115 @@ 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 "对象不支持当前 locale 设置" #: 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 -#, fuzzy -#| msgid "Microsoft JScript compilation error" msgid "Microsoft VBScript compilation error" -msgstr "Microsoft JScript 编译错误" +msgstr "Microsoft VBScript 编译错误" #: dlls/vbscript/vbscript.rc:63 -#, fuzzy -#| msgid "Microsoft JScript runtime error" msgid "Microsoft VBScript runtime error" -msgstr "Microsoft JScript 运行时错误" +msgstr "Microsoft VBScript 运行时错误" #: dlls/winemac.drv/winemac.rc:33 msgid "Hide %@" @@ -11023,33 +10939,27 @@ 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 "bits" #: dlls/wininet/winineterror.mc:26 msgid "The request has timed out.\n" @@ -12937,6 +12847,9 @@ msgid "" "\n" "hardlink hardlink management\n" msgstr "" +"- 支持命令 -\n" +"\n" +"hardlink 硬链接管理\n" #: programs/fsutil/fsutil.mc:35 msgid "" @@ -12944,10 +12857,13 @@ 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>\n" #: programs/hostname/hostname.rc:30 msgid "Usage: hostname\n" @@ -16713,10 +16629,8 @@ msgid "&Beginner" msgstr "初学者(&B)" #: programs/winemine/winemine.rc:45 -#, fuzzy -#| msgid "Interface" msgid "&Intermediate" -msgstr "接口" +msgstr "&中等" #: programs/winemine/winemine.rc:46 msgid "&Expert" @@ -16747,10 +16661,8 @@ msgid "Beginner" msgstr "初学者" #: programs/winemine/winemine.rc:65 -#, fuzzy -#| msgid "Interface" msgid "Intermediate" -msgstr "接口" +msgstr "中等" #: programs/winemine/winemine.rc:66 msgid "Expert" -- 2.29.2

1 0

[PATCH] qcap/tests: Use wide-char string literals.
by Michael Stefaniuc Dec. 15, 2020

Dec. 15, 2020

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/qcap/tests/audiorecord.c | 9 ++---- dlls/qcap/tests/avico.c | 54 +++++++++++++------------------- dlls/qcap/tests/avimux.c | 31 +++++++++--------- dlls/qcap/tests/smartteefilter.c | 36 ++++++++++----------- 4 files changed, 55 insertions(+), 75 deletions(-) diff --git a/dlls/qcap/tests/audiorecord.c b/dlls/qcap/tests/audiorecord.c index dc74c3cfc15..350ae986b44 100644 --- a/dlls/qcap/tests/audiorecord.c +++ b/dlls/qcap/tests/audiorecord.c @@ -176,18 +176,15 @@ static ULONG WINAPI property_bag_Release(IPropertyBag *iface) ok(0, "Unexpected call.\n"); return 1; } - -static const WCHAR waveinidW[] = {'W','a','v','e','I','n','I','d',0}; -static const WCHAR usemixerW[] = {'U','s','e','M','i','x','e','r',0}; static int ppb_id; static unsigned int ppb_got_read; static HRESULT WINAPI property_bag_Read(IPropertyBag *iface, const WCHAR *name, VARIANT *var, IErrorLog *log) { - if (!lstrcmpW(name, usemixerW)) + if (!lstrcmpW(name, L"UseMixer")) return HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); - todo_wine ok(!lstrcmpW(name, waveinidW), "Got unexpected name %s.\n", wine_dbgstr_w(name)); + todo_wine ok(!lstrcmpW(name, L"WaveInId"), "Got unexpected name %s.\n", wine_dbgstr_w(name)); ok(V_VT(var) == VT_I4, "Got unexpected type %u.\n", V_VT(var)); ok(!log, "Got unexpected error log %p.\n", log); ppb_got_read++; @@ -222,7 +219,7 @@ static void test_property_bag(IMoniker *mon) ok(hr == S_OK, "Got hr %#x.\n", hr); VariantInit(&var); - hr = IPropertyBag_Read(devenum_bag, waveinidW, &var, NULL); + hr = IPropertyBag_Read(devenum_bag, L"WaveInId", &var, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); ppb_id = V_I4(&var); diff --git a/dlls/qcap/tests/avico.c b/dlls/qcap/tests/avico.c index b4f52f10210..332ca5a8e7d 100644 --- a/dlls/qcap/tests/avico.c +++ b/dlls/qcap/tests/avico.c @@ -23,11 +23,6 @@ #include "vfw.h" #include "wine/test.h" -static const WCHAR sink_id[] = {'I','n',0}; -static const WCHAR source_id[] = {'O','u','t',0}; -static const WCHAR sink_name[] = {'I','n','p','u','t',0}; -static const WCHAR source_name[] = {'O','u','t','p','u','t',0}; - static const DWORD test_fourcc = mmioFOURCC('w','t','s','t'); #define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) @@ -74,7 +69,7 @@ static void test_interfaces(IBaseFilter *filter) check_interface(filter, &IID_IReferenceClock, FALSE); check_interface(filter, &IID_IVideoWindow, FALSE); - IBaseFilter_FindPin(filter, sink_id, &pin); + IBaseFilter_FindPin(filter, L"In", &pin); check_interface(pin, &IID_IMemInputPin, TRUE); check_interface(pin, &IID_IPin, TRUE); @@ -85,7 +80,7 @@ static void test_interfaces(IBaseFilter *filter) check_interface(pin, &IID_IMediaSeeking, FALSE); IPin_Release(pin); - IBaseFilter_FindPin(filter, source_id, &pin); + IBaseFilter_FindPin(filter, L"Out", &pin); todo_wine check_interface(pin, &IID_IMediaPosition, TRUE); todo_wine check_interface(pin, &IID_IMediaSeeking, TRUE); @@ -319,7 +314,7 @@ static void test_find_pin(IBaseFilter *filter) hr = IBaseFilter_EnumPins(filter, &enum_pins); ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IBaseFilter_FindPin(filter, sink_id, &pin); + hr = IBaseFilter_FindPin(filter, L"In", &pin); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IEnumPins_Next(enum_pins, 1, &pin2, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -327,7 +322,7 @@ static void test_find_pin(IBaseFilter *filter) IPin_Release(pin); IPin_Release(pin2); - hr = IBaseFilter_FindPin(filter, source_id, &pin); + hr = IBaseFilter_FindPin(filter, L"Out", &pin); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IEnumPins_Next(enum_pins, 1, &pin2, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -335,9 +330,9 @@ static void test_find_pin(IBaseFilter *filter) IPin_Release(pin); IPin_Release(pin2); - hr = IBaseFilter_FindPin(filter, sink_name, &pin); + hr = IBaseFilter_FindPin(filter, L"Input", &pin); ok(hr == VFW_E_NOT_FOUND, "Got hr %#x.\n", hr); - hr = IBaseFilter_FindPin(filter, source_name, &pin); + hr = IBaseFilter_FindPin(filter, L"Output", &pin); ok(hr == VFW_E_NOT_FOUND, "Got hr %#x.\n", hr); IEnumPins_Release(enum_pins); @@ -351,14 +346,14 @@ static void test_pin_info(IBaseFilter *filter) WCHAR *id; IPin *pin; - hr = IBaseFilter_FindPin(filter, sink_id, &pin); + hr = IBaseFilter_FindPin(filter, L"In", &pin); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IPin_QueryPinInfo(pin, &info); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(info.pFilter == filter, "Expected filter %p, got %p.\n", filter, info.pFilter); ok(info.dir == PINDIR_INPUT, "Got direction %d.\n", info.dir); - todo_wine ok(!lstrcmpW(info.achName, sink_name), "Got name %s.\n", wine_dbgstr_w(info.achName)); + todo_wine ok(!lstrcmpW(info.achName, L"Input"), "Got name %s.\n", wine_dbgstr_w(info.achName)); IBaseFilter_Release(info.pFilter); hr = IPin_QueryDirection(pin, &dir); @@ -367,19 +362,19 @@ static void test_pin_info(IBaseFilter *filter) hr = IPin_QueryId(pin, &id); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(!lstrcmpW(id, sink_id), "Got id %s.\n", wine_dbgstr_w(id)); + ok(!lstrcmpW(id, L"In"), "Got id %s.\n", wine_dbgstr_w(id)); CoTaskMemFree(id); IPin_Release(pin); - hr = IBaseFilter_FindPin(filter, source_id, &pin); + hr = IBaseFilter_FindPin(filter, L"Out", &pin); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IPin_QueryPinInfo(pin, &info); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(info.pFilter == filter, "Expected filter %p, got %p.\n", filter, info.pFilter); ok(info.dir == PINDIR_OUTPUT, "Got direction %d.\n", info.dir); - todo_wine ok(!lstrcmpW(info.achName, source_name), "Got name %s.\n", wine_dbgstr_w(info.achName)); + todo_wine ok(!lstrcmpW(info.achName, L"Output"), "Got name %s.\n", wine_dbgstr_w(info.achName)); IBaseFilter_Release(info.pFilter); hr = IPin_QueryDirection(pin, &dir); @@ -388,7 +383,7 @@ static void test_pin_info(IBaseFilter *filter) hr = IPin_QueryId(pin, &id); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(!lstrcmpW(id, source_id), "Got id %s.\n", wine_dbgstr_w(id)); + ok(!lstrcmpW(id, L"Out"), "Got id %s.\n", wine_dbgstr_w(id)); CoTaskMemFree(id); IPin_Release(pin); @@ -397,7 +392,6 @@ static void test_pin_info(IBaseFilter *filter) static LRESULT CALLBACK driver_proc(DWORD_PTR id, HDRVR driver, UINT msg, LPARAM lparam1, LPARAM lparam2) { - static const WCHAR nameW[] = {'f','o','o',0}; if (winetest_debug > 1) trace("msg %#x, lparam1 %#lx, lparam2 %#lx.\n", msg, lparam1, lparam2); switch (msg) @@ -415,8 +409,8 @@ static LRESULT CALLBACK driver_proc(DWORD_PTR id, HDRVR driver, UINT msg, info->dwFlags = VIDCF_TEMPORAL; info->dwVersion = 0x10101; info->dwVersionICM = ICVERSION; - lstrcpyW(info->szName, nameW); - lstrcpyW(info->szDescription, nameW); + lstrcpyW(info->szName, L"foo"); + lstrcpyW(info->szDescription, L"foo"); return sizeof(ICINFO); } case ICM_COMPRESS_QUERY: @@ -446,14 +440,12 @@ static ULONG WINAPI property_bag_Release(IPropertyBag *iface) ok(0, "Unexpected call.\n"); return 1; } - -static const WCHAR fcchandlerW[] = {'F','c','c','H','a','n','d','l','e','r',0}; static BSTR ppb_handler; static unsigned int ppb_got_read; static HRESULT WINAPI property_bag_Read(IPropertyBag *iface, const WCHAR *name, VARIANT *var, IErrorLog *log) { - ok(!lstrcmpW(name, fcchandlerW), "Got unexpected name %s.\n", wine_dbgstr_w(name)); + ok(!lstrcmpW(name, L"FccHandler"), "Got unexpected name %s.\n", wine_dbgstr_w(name)); ok(V_VT(var) == VT_BSTR, "Got unexpected type %u.\n", V_VT(var)); ok(!log, "Got unexpected error log %p.\n", log); V_BSTR(var) = SysAllocString(ppb_handler); @@ -489,7 +481,7 @@ static void test_property_bag(IMoniker *mon) ok(hr == S_OK, "Got hr %#x.\n", hr); VariantInit(&var); - hr = IPropertyBag_Read(devenum_bag, fcchandlerW, &var, NULL); + hr = IPropertyBag_Read(devenum_bag, L"FccHandler", &var, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); ppb_handler = V_BSTR(&var); @@ -525,7 +517,7 @@ static void test_media_types(IBaseFilter *filter) HRESULT hr; IPin *pin; - IBaseFilter_FindPin(filter, sink_id, &pin); + IBaseFilter_FindPin(filter, L"In", &pin); hr = IPin_EnumMediaTypes(pin, &enummt); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -572,7 +564,7 @@ static void test_media_types(IBaseFilter *filter) IPin_Release(pin); - IBaseFilter_FindPin(filter, source_id, &pin); + IBaseFilter_FindPin(filter, L"Out", &pin); hr = IPin_EnumMediaTypes(pin, &enummt); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -592,7 +584,7 @@ static void test_enum_media_types(IBaseFilter *filter) HRESULT hr; IPin *pin; - IBaseFilter_FindPin(filter, sink_id, &pin); + IBaseFilter_FindPin(filter, L"In", &pin); hr = IPin_EnumMediaTypes(pin, &enum1); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -623,7 +615,7 @@ static void test_enum_media_types(IBaseFilter *filter) IEnumMediaTypes_Release(enum2); IPin_Release(pin); - IBaseFilter_FindPin(filter, source_id, &pin); + IBaseFilter_FindPin(filter, L"Out", &pin); hr = IPin_EnumMediaTypes(pin, &enum1); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -709,10 +701,8 @@ static void test_unconnected_filter_state(IBaseFilter *filter) START_TEST(avico) { - static const WCHAR test_display_name[] = {'@','d','e','v','i','c','e',':', - 'c','m',':','{','3','3','D','9','A','7','6','0','-','9','0','C','8', - '-','1','1','D','0','-','B','D','4','3','-','0','0','A','0','C','9', - '1','1','C','E','8','6','}','\\','w','t','s','t',0}; + static const WCHAR test_display_name[] = + L"@device:cm:{33D9A760-90C8-11D0-BD43-00A0C911CE86}\\wtst"; ICreateDevEnum *devenum; IEnumMoniker *enummon; IBaseFilter *filter; diff --git a/dlls/qcap/tests/avimux.c b/dlls/qcap/tests/avimux.c index d1a67a01a11..3f43ff569cf 100644 --- a/dlls/qcap/tests/avimux.c +++ b/dlls/qcap/tests/avimux.c @@ -23,9 +23,6 @@ #include "vfw.h" #include "wine/test.h" -static const WCHAR source_id[] = {'A','V','I',' ','O','u','t',0}; -static const WCHAR sink0_id[] = {'I','n','p','u','t',' ','0','1',0}; - static const GUID testguid = {0xfacade}; static IBaseFilter *create_avi_mux(void) @@ -86,7 +83,7 @@ static void test_interfaces(void) check_interface(filter, &IID_IReferenceClock, FALSE); check_interface(filter, &IID_IVideoWindow, FALSE); - IBaseFilter_FindPin(filter, source_id, &pin); + IBaseFilter_FindPin(filter, L"AVI Out", &pin); check_interface(pin, &IID_IPin, TRUE); check_interface(pin, &IID_IQualityControl, TRUE); @@ -99,7 +96,7 @@ static void test_interfaces(void) IPin_Release(pin); - IBaseFilter_FindPin(filter, sink0_id, &pin); + IBaseFilter_FindPin(filter, L"Input 01", &pin); check_interface(pin, &IID_IAMStreamControl, TRUE); check_interface(pin, &IID_IMemInputPin, TRUE); @@ -343,7 +340,7 @@ static void test_find_pin(void) hr = IBaseFilter_EnumPins(filter, &enum_pins); ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IBaseFilter_FindPin(filter, source_id, &pin); + hr = IBaseFilter_FindPin(filter, L"AVI Out", &pin); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IEnumPins_Next(enum_pins, 1, &pin2, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -351,7 +348,7 @@ static void test_find_pin(void) IPin_Release(pin); IPin_Release(pin2); - hr = IBaseFilter_FindPin(filter, sink0_id, &pin); + hr = IBaseFilter_FindPin(filter, L"Input 01", &pin); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IEnumPins_Next(enum_pins, 1, &pin2, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -374,7 +371,7 @@ static void test_pin_info(void) ULONG ref; IPin *pin; - hr = IBaseFilter_FindPin(filter, source_id, &pin); + hr = IBaseFilter_FindPin(filter, L"AVI Out", &pin); ok(hr == S_OK, "Got hr %#x.\n", hr); ref = get_refcount(filter); ok(ref == 2, "Got unexpected refcount %d.\n", ref); @@ -385,7 +382,7 @@ static void test_pin_info(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ok(info.pFilter == filter, "Expected filter %p, got %p.\n", filter, info.pFilter); ok(info.dir == PINDIR_OUTPUT, "Got direction %d.\n", info.dir); - ok(!lstrcmpW(info.achName, source_id), "Got name %s.\n", wine_dbgstr_w(info.achName)); + ok(!lstrcmpW(info.achName, L"AVI Out"), "Got name %s.\n", wine_dbgstr_w(info.achName)); ref = get_refcount(filter); ok(ref == 3, "Got unexpected refcount %d.\n", ref); ref = get_refcount(pin); @@ -398,7 +395,7 @@ static void test_pin_info(void) hr = IPin_QueryId(pin, &id); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(!lstrcmpW(id, source_id), "Got id %s.\n", wine_dbgstr_w(id)); + ok(!lstrcmpW(id, L"AVI Out"), "Got id %s.\n", wine_dbgstr_w(id)); CoTaskMemFree(id); hr = IPin_QueryInternalConnections(pin, NULL, NULL); @@ -406,14 +403,14 @@ static void test_pin_info(void) IPin_Release(pin); - hr = IBaseFilter_FindPin(filter, sink0_id, &pin); + hr = IBaseFilter_FindPin(filter, L"Input 01", &pin); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IPin_QueryPinInfo(pin, &info); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(info.pFilter == filter, "Expected filter %p, got %p.\n", filter, info.pFilter); ok(info.dir == PINDIR_INPUT, "Got direction %d.\n", info.dir); - ok(!lstrcmpW(info.achName, sink0_id), "Got name %s.\n", wine_dbgstr_w(info.achName)); + ok(!lstrcmpW(info.achName, L"Input 01"), "Got name %s.\n", wine_dbgstr_w(info.achName)); IBaseFilter_Release(info.pFilter); hr = IPin_QueryDirection(pin, &dir); @@ -422,7 +419,7 @@ static void test_pin_info(void) hr = IPin_QueryId(pin, &id); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(!lstrcmpW(id, sink0_id), "Got id %s.\n", wine_dbgstr_w(id)); + ok(!lstrcmpW(id, L"Input 01"), "Got id %s.\n", wine_dbgstr_w(id)); CoTaskMemFree(id); hr = IPin_QueryInternalConnections(pin, NULL, NULL); @@ -445,7 +442,7 @@ static void test_media_types(void) ULONG ref; IPin *pin; - IBaseFilter_FindPin(filter, source_id, &pin); + IBaseFilter_FindPin(filter, L"AVI Out", &pin); hr = IPin_EnumMediaTypes(pin, &enummt); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -498,7 +495,7 @@ static void test_media_types(void) IEnumMediaTypes_Release(enummt); IPin_Release(pin); - IBaseFilter_FindPin(filter, sink0_id, &pin); + IBaseFilter_FindPin(filter, L"Input 01", &pin); hr = IPin_EnumMediaTypes(pin, &enummt); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -565,7 +562,7 @@ static void test_enum_media_types(void) HRESULT hr; IPin *pin; - IBaseFilter_FindPin(filter, source_id, &pin); + IBaseFilter_FindPin(filter, L"AVI Out", &pin); hr = IPin_EnumMediaTypes(pin, &enum1); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -629,7 +626,7 @@ static void test_enum_media_types(void) IEnumMediaTypes_Release(enum2); IPin_Release(pin); - IBaseFilter_FindPin(filter, sink0_id, &pin); + IBaseFilter_FindPin(filter, L"Input 01", &pin); hr = IPin_EnumMediaTypes(pin, &enum1); ok(hr == S_OK, "Got hr %#x.\n", hr); diff --git a/dlls/qcap/tests/smartteefilter.c b/dlls/qcap/tests/smartteefilter.c index df741ba1284..e5ae66ff2d3 100644 --- a/dlls/qcap/tests/smartteefilter.c +++ b/dlls/qcap/tests/smartteefilter.c @@ -23,10 +23,6 @@ #include "wine/strmbase.h" #include "wine/test.h" -static const WCHAR sink_id[] = {'I','n','p','u','t',0}; -static const WCHAR capture_id[] = {'C','a','p','t','u','r','e',0}; -static const WCHAR preview_id[] = {'P','r','e','v','i','e','w',0}; - static HANDLE event; static IBaseFilter *create_smart_tee(void) @@ -90,7 +86,7 @@ static void test_interfaces(void) check_interface(filter, &IID_IReferenceClock, FALSE); check_interface(filter, &IID_IVideoWindow, FALSE); - IBaseFilter_FindPin(filter, sink_id, &pin); + IBaseFilter_FindPin(filter, L"Input", &pin); check_interface(pin, &IID_IMemInputPin, TRUE); check_interface(pin, &IID_IPin, TRUE); @@ -106,7 +102,7 @@ static void test_interfaces(void) IPin_Release(pin); - IBaseFilter_FindPin(filter, capture_id, &pin); + IBaseFilter_FindPin(filter, L"Capture", &pin); todo_wine check_interface(pin, &IID_IAMStreamControl, TRUE); check_interface(pin, &IID_IPin, TRUE); @@ -122,7 +118,7 @@ static void test_interfaces(void) IPin_Release(pin); - IBaseFilter_FindPin(filter, preview_id, &pin); + IBaseFilter_FindPin(filter, L"Preview", &pin); todo_wine check_interface(pin, &IID_IAMStreamControl, TRUE); check_interface(pin, &IID_IPin, TRUE); @@ -387,7 +383,7 @@ static void test_find_pin(void) hr = IBaseFilter_EnumPins(filter, &enum_pins); ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IBaseFilter_FindPin(filter, sink_id, &pin); + hr = IBaseFilter_FindPin(filter, L"Input", &pin); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IEnumPins_Next(enum_pins, 1, &pin2, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -395,7 +391,7 @@ static void test_find_pin(void) IPin_Release(pin2); IPin_Release(pin); - hr = IBaseFilter_FindPin(filter, capture_id, &pin); + hr = IBaseFilter_FindPin(filter, L"Capture", &pin); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IEnumPins_Next(enum_pins, 1, &pin2, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -403,7 +399,7 @@ static void test_find_pin(void) IPin_Release(pin2); IPin_Release(pin); - hr = IBaseFilter_FindPin(filter, preview_id, &pin); + hr = IBaseFilter_FindPin(filter, L"Preview", &pin); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IEnumPins_Next(enum_pins, 1, &pin2, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -427,7 +423,7 @@ static void test_pin_info(void) ULONG ref; IPin *pin; - hr = IBaseFilter_FindPin(filter, sink_id, &pin); + hr = IBaseFilter_FindPin(filter, L"Input", &pin); ok(hr == S_OK, "Got hr %#x.\n", hr); ref = get_refcount(filter); ok(ref == 2, "Got unexpected refcount %d.\n", ref); @@ -438,7 +434,7 @@ static void test_pin_info(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ok(info.pFilter == filter, "Expected filter %p, got %p.\n", filter, info.pFilter); ok(info.dir == PINDIR_INPUT, "Got direction %d.\n", info.dir); - ok(!lstrcmpW(info.achName, sink_id), "Got name %s.\n", wine_dbgstr_w(info.achName)); + ok(!lstrcmpW(info.achName, L"Input"), "Got name %s.\n", wine_dbgstr_w(info.achName)); ref = get_refcount(filter); ok(ref == 3, "Got unexpected refcount %d.\n", ref); ref = get_refcount(pin); @@ -451,7 +447,7 @@ static void test_pin_info(void) hr = IPin_QueryId(pin, &id); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(!lstrcmpW(id, sink_id), "Got id %s.\n", wine_dbgstr_w(id)); + ok(!lstrcmpW(id, L"Input"), "Got id %s.\n", wine_dbgstr_w(id)); CoTaskMemFree(id); hr = IPin_QueryInternalConnections(pin, NULL, &count); @@ -459,14 +455,14 @@ static void test_pin_info(void) IPin_Release(pin); - hr = IBaseFilter_FindPin(filter, capture_id, &pin); + hr = IBaseFilter_FindPin(filter, L"Capture", &pin); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IPin_QueryPinInfo(pin, &info); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(info.pFilter == filter, "Expected filter %p, got %p.\n", filter, info.pFilter); ok(info.dir == PINDIR_OUTPUT, "Got direction %d.\n", info.dir); - ok(!lstrcmpW(info.achName, capture_id), "Got name %s.\n", wine_dbgstr_w(info.achName)); + ok(!lstrcmpW(info.achName, L"Capture"), "Got name %s.\n", wine_dbgstr_w(info.achName)); ref = get_refcount(filter); ok(ref == 3, "Got unexpected refcount %d.\n", ref); ref = get_refcount(pin); @@ -479,7 +475,7 @@ static void test_pin_info(void) hr = IPin_QueryId(pin, &id); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(!lstrcmpW(id, capture_id), "Got id %s.\n", wine_dbgstr_w(id)); + ok(!lstrcmpW(id, L"Capture"), "Got id %s.\n", wine_dbgstr_w(id)); CoTaskMemFree(id); hr = IPin_QueryInternalConnections(pin, NULL, &count); @@ -487,14 +483,14 @@ static void test_pin_info(void) IPin_Release(pin); - hr = IBaseFilter_FindPin(filter, preview_id, &pin); + hr = IBaseFilter_FindPin(filter, L"Preview", &pin); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IPin_QueryPinInfo(pin, &info); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(info.pFilter == filter, "Expected filter %p, got %p.\n", filter, info.pFilter); ok(info.dir == PINDIR_OUTPUT, "Got direction %d.\n", info.dir); - ok(!lstrcmpW(info.achName, preview_id), "Got name %s.\n", wine_dbgstr_w(info.achName)); + ok(!lstrcmpW(info.achName, L"Preview"), "Got name %s.\n", wine_dbgstr_w(info.achName)); ref = get_refcount(filter); ok(ref == 3, "Got unexpected refcount %d.\n", ref); ref = get_refcount(pin); @@ -507,7 +503,7 @@ static void test_pin_info(void) hr = IPin_QueryId(pin, &id); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(!lstrcmpW(id, preview_id), "Got id %s.\n", wine_dbgstr_w(id)); + ok(!lstrcmpW(id, L"Preview"), "Got id %s.\n", wine_dbgstr_w(id)); CoTaskMemFree(id); hr = IPin_QueryInternalConnections(pin, NULL, &count); @@ -528,7 +524,7 @@ static void test_enum_media_types(void) HRESULT hr; IPin *pin; - IBaseFilter_FindPin(filter, sink_id, &pin); + IBaseFilter_FindPin(filter, L"Input", &pin); hr = IPin_EnumMediaTypes(pin, &enum1); ok(hr == S_OK, "Got hr %#x.\n", hr); -- 2.26.2

2 1

[PATCH v2 vkd3d 1/4] vkd3d-shader: Handle preprocessor parsing errors.
by Zebediah Figura Dec. 14, 2020

Dec. 14, 2020

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- v2: Avoid api.location.type, which is only available since Bison 3.4. libs/vkd3d-shader/preproc.h | 11 +++++++ libs/vkd3d-shader/preproc.l | 39 ++++++++++++++++++++++- libs/vkd3d-shader/preproc.y | 40 +++++++++++++++++++++++- libs/vkd3d-shader/vkd3d_shader_private.h | 2 ++ 4 files changed, 90 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/preproc.h b/libs/vkd3d-shader/preproc.h index cbd93229..769b8c23 100644 --- a/libs/vkd3d-shader/preproc.h +++ b/libs/vkd3d-shader/preproc.h @@ -23,11 +23,22 @@ #include "vkd3d_shader_private.h" +struct preproc_location +{ + const char *filename; + unsigned int first_line, first_column; +}; + struct preproc_ctx { void *scanner; + struct vkd3d_shader_message_context *message_context; struct vkd3d_string_buffer buffer; + unsigned int line, column; + const char *source_name; + + bool error; }; #endif diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l index 4d809b8f..116a7ed5 100644 --- a/libs/vkd3d-shader/preproc.l +++ b/libs/vkd3d-shader/preproc.l @@ -27,6 +27,10 @@ #define YY_DECL static int preproc_lexer_lex(YYSTYPE *yylval_param, YYLTYPE *yylloc_param, yyscan_t yyscanner) +static void update_location(struct preproc_ctx *ctx); + +#define YY_USER_ACTION update_location(yyget_extra(yyscanner)); + %} %option 8bit @@ -88,6 +92,28 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]* %% +static void update_location(struct preproc_ctx *ctx) +{ + unsigned int i, leng = yyget_leng(ctx->scanner); + const char *text = yyget_text(ctx->scanner); + + /* We want to do this here, rather than before calling yylex(), because + * some tokens are skipped by the lexer. */ + + yyget_lloc(ctx->scanner)->first_line = ctx->line; + yyget_lloc(ctx->scanner)->first_column = ctx->column; + + for (i = 0; i < leng; ++i) + { + ++ctx->column; + if (text[i] == '\n') + { + ctx->column = 1; + ++ctx->line; + } + } +} + int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner) { struct preproc_ctx *ctx = yyget_extra(scanner); @@ -101,7 +127,7 @@ int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner) return 0; text = yyget_text(scanner); - TRACE("Parsing token %d, string %s.\n", token, debugstr_a(text)); + TRACE("Parsing token %d, line %d, string %s.\n", token, lloc->first_line, debugstr_a(text)); vkd3d_string_buffer_printf(&ctx->buffer, "%s ", text); } @@ -115,6 +141,10 @@ int preproc_lexer_parse(const struct vkd3d_shader_compile_info *compile_info, void *output_code; vkd3d_string_buffer_init(&ctx.buffer); + ctx.message_context = message_context; + ctx.source_name = compile_info->source_name ? compile_info->source_name : "<anonymous>"; + ctx.line = 1; + ctx.column = 1; yylex_init_extra(&ctx, &ctx.scanner); top_buffer = yy_scan_bytes(compile_info->source.code, compile_info->source.size, ctx.scanner); @@ -124,6 +154,13 @@ int preproc_lexer_parse(const struct vkd3d_shader_compile_info *compile_info, yy_delete_buffer(top_buffer, ctx.scanner); yylex_destroy(ctx.scanner); + if (ctx.error) + { + WARN("Failed to preprocess.\n"); + vkd3d_string_buffer_cleanup(&ctx.buffer); + return VKD3D_ERROR_INVALID_SHADER; + } + if (!(output_code = vkd3d_malloc(ctx.buffer.content_size))) { vkd3d_string_buffer_cleanup(&ctx.buffer); diff --git a/libs/vkd3d-shader/preproc.y b/libs/vkd3d-shader/preproc.y index 92448f24..186a0e1d 100644 --- a/libs/vkd3d-shader/preproc.y +++ b/libs/vkd3d-shader/preproc.y @@ -24,6 +24,8 @@ #include "vkd3d_shader_private.h" #include "preproc.h" +#define PREPROC_YYLTYPE struct preproc_location + } %code provides @@ -36,9 +38,45 @@ int preproc_yylex(PREPROC_YYSTYPE *yylval_param, PREPROC_YYLTYPE *yylloc_param, %code { +#define YYLLOC_DEFAULT(cur, rhs, n) \ + do \ + { \ + if (n) \ + { \ + (cur).filename = YYRHSLOC(rhs, 1).filename; \ + (cur).first_line = YYRHSLOC(rhs, 1).first_line; \ + (cur).first_column = YYRHSLOC(rhs, 1).first_column; \ + } \ + else \ + { \ + (cur).filename = YYRHSLOC(rhs, 0).filename; \ + (cur).first_line = YYRHSLOC(rhs, 0).first_line; \ + (cur).first_column = YYRHSLOC(rhs, 0).first_column; \ + } \ + } while (0) + +static void set_location(struct preproc_ctx *ctx, const struct preproc_location *loc) +{ + ctx->message_context->source_name = loc->filename; + ctx->message_context->line = loc->first_line; + ctx->message_context->column = loc->first_column; +} + +static void preproc_error(struct preproc_ctx *ctx, const struct preproc_location *loc, + enum vkd3d_shader_error error, const char *format, ...) +{ + va_list args; + + set_location(ctx, loc); + va_start(args, format); + vkd3d_shader_verror(ctx->message_context, error, format, args); + va_end(args); + ctx->error = true; +} + static void yyerror(const YYLTYPE *loc, void *scanner, struct preproc_ctx *ctx, const char *string) { - FIXME("Error reporting is not implemented.\n"); + preproc_error(ctx, loc, VKD3D_SHADER_ERROR_PP_INVALID_SYNTAX, "%s", string); } } diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 83038384..5a022708 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -79,6 +79,8 @@ enum vkd3d_shader_error VKD3D_SHADER_ERROR_RS_INVALID_ROOT_PARAMETER_TYPE = 3002, VKD3D_SHADER_ERROR_RS_INVALID_DESCRIPTOR_RANGE_TYPE = 3003, VKD3D_SHADER_ERROR_RS_MIXED_DESCRIPTOR_RANGE_TYPES = 3004, + + VKD3D_SHADER_ERROR_PP_INVALID_SYNTAX = 4000, }; enum VKD3D_SHADER_INSTRUCTION_HANDLER -- 2.29.2

3 11

[PATCH] dbghelp: Fetch version info only for PE modules in minidumps.
by Jacek Caban Dec. 14, 2020

Dec. 14, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/dbghelp/minidump.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

1 0

[PATCH] gdi32/tests: Add tests for zero-width control characters.
by Sven Baars Dec. 14, 2020

Dec. 14, 2020

Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> --- Some tests with zero-width control characters for inconsistent behavior that I observed while trying to fix the ID3DXFont implementation. In our implementation these functions all use the same internal function, but on Windows none of them seem to do exactly the same. dlls/gdi32/tests/font.c | 151 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 151 insertions(+) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 86ccddd05ea..75a41f69ab9 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -7693,6 +7693,156 @@ done: ReleaseDC(0, hdc); } +static void test_zero_width_control(void) +{ + int len, dx[20], nfit, pos[20]; + DWORD size, charcount; + GCP_RESULTSW result; + WCHAR space_glyph; + WCHAR glyphs[20]; + unsigned int i; + LOGFONTA lf; + HFONT hfont; + BOOL ret; + SIZE sz; + HDC hdc; + ABC abc; + + static const WCHAR nul[] = {0}; + static const WCHAR space[] = {' '}; + static const WCHAR zero_width_control[] = { + 0x0009, /* \t */ + 0x000a, /* \n */ + 0x000d, /* \r */ + 0x001c, /* FS */ + 0x001d, /* GS */ + 0x001e, /* RS */ + 0x001f, /* US */ + 0x200b, /* ZWSP */ + 0x200c, /* ZWNJ */ + 0x200d, /* ZWJ */ + 0x200e, /* LRM */ + 0x200f, /* RLM */ + 0x202a, /* LRE */ + 0x202c, /* PDF */ + 0x202d, /* LRO */ + 0x202b, /* RLE */ + 0x202e, /* RLO */ + }; + + memset(&lf, 0, sizeof(lf)); + strcpy(lf.lfFaceName, "Tahoma"); + lf.lfHeight = 20; + + hfont = CreateFontIndirectA(&lf); + hdc = GetDC(NULL); + hfont = SelectObject(hdc, hfont); + + memset(&result, 0, sizeof(result)); + result.lStructSize = sizeof(result); + result.lpCaretPos = pos; + result.lpGlyphs = glyphs; + + for (i = 0; i < ARRAY_SIZE(zero_width_control); ++i) + { + WCHAR test[] = {'W', 'i', 'n', 'e', ' ', zero_width_control[i], 'T', 'e', 's', 't', 0}; + + /* Some control characters are treated as space */ + result.nGlyphs = 20; + size = GetCharacterPlacementW(hdc, test, 10, 0, &result, 0); + ok(size, "Test %d: GetCharacterPlacementA failed.\n", i); + ok(result.nGlyphs == 10, "Test %d: unexpected number of glyphs %u.\n", i, result.nGlyphs); + todo_wine ok(glyphs[5] == glyphs[4], "Test %d: unexpected glyphs %s.\n", i, wine_dbgstr_wn(glyphs, result.nGlyphs)); + if (i < 15) + todo_wine ok(pos[6] - pos[5] == 0, "Test %d: unexpected width %d.\n", i, pos[6] - pos[5]); + else + ok(pos[6] - pos[5] > 0, "Test %d: unexpected width %d.\n", i, pos[6] - pos[5]); + ok(pos[5] - pos[4] > 0, "Test %d: unexpected width %d.\n", i, pos[5] - pos[4]); + + /* They all have zero width in GetTextExtentExPoint */ + nfit = -1; + dx[0] = -1; + sz.cx = -1; + ret = GetTextExtentExPointW(hdc, zero_width_control + i, 1, 1000, &nfit, dx, &sz); + ok(ret, "Test %d: expected TRUE.\n", i); + ok(nfit == 1, "Test %d: got %d.\n", i, nfit); + todo_wine ok(dx[0] == 0, "Test %d: got %d.\n", i, dx[0]); + todo_wine ok(sz.cx == 0, "Test %d: got %d.\n", i, sz.cx); + + /* But are treated differently for the fit */ + nfit = -1; + sz.cx = -1; + ret = GetTextExtentExPointW(hdc, test, 10, 1000, &nfit, dx, &sz); + ok(ret, "Test %d: expected TRUE.\n", i); + ok(nfit == 10, "Test %d: got %d.\n", i, nfit); + todo_wine ok(dx[4] == dx[5], "Test %d: expected %d got %d.\n", i, dx[4], dx[5]); + + /* The ZW characters do fit, the others don't */ + ret = GetTextExtentExPointW(hdc, test, 10, dx[5], &nfit, NULL, &sz); + ok(ret, "Test %d: expected TRUE.\n", i); + if (i < 7 || i > 9) + todo_wine ok(nfit == 5, "Test %d: got %d.\n", i, nfit); + else + ok(nfit == 6, "Test %d: got %d.\n", i, nfit); + + /* They do not all have zero width in GetCharWidth32 */ + len = -1; + ret = GetCharWidth32W(hdc, zero_width_control[i], zero_width_control[i], &len); + ok(ret, "Test %d: expected TRUE.\n", i); + + /* In which case ABC also does not have zero width, but A+B+C + * is not always equal to the length from GetCharWidth32 */ + memset(&abc, 0, sizeof(abc)); + ret = GetCharABCWidthsW(hdc, zero_width_control[i], zero_width_control[i], &abc); + ok(ret, "Test %d: expected TRUE.\n", i); + + if (i < 7) + { + ok(len > 0, "Test %d: got %d.\n", i, len); + ok(abc.abcA + abc.abcB + abc.abcC <= len && abc.abcA + abc.abcB + abc.abcC > 0, + "Test %d: expected %d >= %d > 0.\n", i, len, abc.abcA + abc.abcB + abc.abcC); + ok(abc.abcB > 0, "Test %d: got %d.\n", i, abc.abcB); + } + else + { + todo_wine ok(len == 0 || broken(i > 11) /* before Win10 */, "Test %d: got %d.\n", i, len); + ok(abc.abcA + abc.abcB + abc.abcC == len, + "Test %d: expected %d == 0.\n", i, abc.abcA + abc.abcB + abc.abcC); + ok(abc.abcB > 0, "Test %d: got %d.\n", i, abc.abcB); + } + } + + /* The NUL character does not have zero width */ + nfit = -1; + dx[0] = -1; + sz.cx = -1; + ret = GetTextExtentExPointW(hdc, nul, 1, 1000, &nfit, dx, &sz); + ok(ret, "Expected TRUE.\n"); + ok(nfit == 1, "Got %d.\n", nfit); + ok(dx[0] > 0, "Got %d.\n", dx[0]); + ok(sz.cx > 0, "Got %d.\n", sz.cx); + + memset(&abc, 0, sizeof(abc)); + ret = GetCharABCWidthsW(hdc, 0, 0, &abc); + ok(ret, "Expected TRUE.\n"); + todo_wine ok(abc.abcA == 0, "Got %d.\n", abc.abcA); + ok(abc.abcB > 0, "Got %d.\n", abc.abcB); + ok(abc.abcC >= 0, "Got %d.\n", abc.abcC); + + /* Characters that are treated as spaces by GetCharacterPlacement */ + /* are not treated as spaces by GetGlyphIndices. */ + charcount = GetGlyphIndicesW(hdc, space, 1, &space_glyph, 0); + ok(charcount == 1, "Wrong character count %d.\n", charcount); + + charcount = GetGlyphIndicesW(hdc, zero_width_control, ARRAY_SIZE(zero_width_control), glyphs, 0); + ok(charcount == ARRAY_SIZE(zero_width_control), "Wrong character count %d.\n", charcount); + for (i = 0; i < ARRAY_SIZE(zero_width_control); ++i) + ok(glyphs[i] != space_glyph, "Test %d: glyph is a space: %04x\n", i, glyphs[i]); + + DeleteObject(hfont); + ReleaseDC(NULL, hdc); +} + START_TEST(font) { static const char *test_names[] = @@ -7779,6 +7929,7 @@ START_TEST(font) test_ttf_names(); test_lang_names(); test_char_width(); + test_zero_width_control(); /* These tests should be last test until RemoveFontResource * is properly implemented. -- 2.25.1

2 1

[PATCH 5/5] winapi: Use __alignof__ on clang.
by Jacek Caban Dec. 14, 2020

Dec. 14, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/tests/generated.c | 2 +- dlls/kernel32/tests/generated.c | 2 +- dlls/ntdll/tests/generated.c | 2 +- dlls/rpcrt4/tests/generated.c | 2 +- dlls/shell32/tests/generated.c | 2 +- dlls/shlwapi/tests/generated.c | 2 +- dlls/urlmon/tests/generated.c | 90 +-------------------------------- dlls/user32/tests/generated.c | 2 +- dlls/wininet/tests/generated.c | 2 +- dlls/winmm/tests/generated.c | 2 +- tools/winapi/winapi_test | 2 +- 11 files changed, 11 insertions(+), 99 deletions(-)

1 0

[PATCH 2/5] msvcrt: Prefix *rot* functions.
by Jacek Caban Dec. 14, 2020

Dec. 14, 2020

MSVC does not allow overriding those intrinsic functions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/crtdll/crtdll.spec | 8 ++++---- dlls/msvcr100/msvcr100.spec | 12 ++++++------ dlls/msvcr110/msvcr110.spec | 12 ++++++------ dlls/msvcr120/msvcr120.spec | 12 ++++++------ dlls/msvcr70/msvcr70.spec | 8 ++++---- dlls/msvcr71/msvcr71.spec | 8 ++++---- dlls/msvcr80/msvcr80.spec | 12 ++++++------ dlls/msvcr90/msvcr90.spec | 12 ++++++------ dlls/msvcrt/math.c | 12 ++++++------ dlls/msvcrt/msvcrt.spec | 12 ++++++------ dlls/msvcrtd/msvcrtd.spec | 8 ++++---- dlls/ucrtbase/ucrtbase.spec | 12 ++++++------ 12 files changed, 64 insertions(+), 64 deletions(-)

1 0

[PATCH 1/5] ucrtbase: Improve __intrinsic_abnormal_termination stub.
by Jacek Caban Dec. 14, 2020

Dec. 14, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- The real motivation is renaming _abnormal_termination, which is not allowed on MSVC. dlls/crtdll/crtdll.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/except.c | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrtd/msvcrtd.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-)

1 0

[PATCH] crypt32/tests: Fix a registerOIDInfo() failure when missing elevated privileges.
by Francois Gouget Dec. 14, 2020

Dec. 14, 2020

And only accept the access denied errors when running without elevated privileges. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/crypt32/tests/oid.c | 30 +++++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/dlls/crypt32/tests/oid.c b/dlls/crypt32/tests/oid.c index ae03bba90e8..d135092a3ad 100644 --- a/dlls/crypt32/tests/oid.c +++ b/dlls/crypt32/tests/oid.c @@ -30,6 +30,22 @@ #include "wine/test.h" +static BOOL is_process_elevated(void) +{ + HANDLE token; + if (OpenProcessToken( GetCurrentProcess(), TOKEN_QUERY, &token )) + { + TOKEN_ELEVATION_TYPE type; + DWORD size; + BOOL ret; + + ret = GetTokenInformation( token, TokenElevationType, &type, sizeof(type), &size ); + CloseHandle( token ); + return (ret && type == TokenElevationTypeFull); + } + return FALSE; +} + static BOOL (WINAPI *pCryptEnumOIDInfo)(DWORD,DWORD,void*,PFN_CRYPT_ENUM_OID_INFO); @@ -314,7 +330,7 @@ static void test_registerOIDFunction(void) SetLastError(0xdeadbeef); ret = CryptRegisterOIDFunction(X509_ASN_ENCODING, "CryptDllEncodeObject", "1.2.3.4.5.6.7.8.9.10", bogusDll, NULL); - if (!ret && GetLastError() == ERROR_ACCESS_DENIED) + if (!ret && GetLastError() == ERROR_ACCESS_DENIED && !is_process_elevated()) { skip("Need admin rights\n"); return; @@ -393,7 +409,7 @@ static void test_registerDefaultOIDFunction(void) SetLastError(0xdeadbeef); ret = CryptRegisterDefaultOIDFunction(0, "CertDllOpenStoreProv", 0, bogusDll); - if (!ret && GetLastError() == ERROR_ACCESS_DENIED) + if (!ret && GetLastError() == ERROR_ACCESS_DENIED && !is_process_elevated()) { skip("Need admin rights\n"); return; @@ -499,7 +515,7 @@ static void test_getDefaultOIDFunctionAddress(void) SetLastError(0xdeadbeef); ret = CryptRegisterDefaultOIDFunction(0, "CertDllOpenStoreProv", 0, bogusDll); - if (!ret && GetLastError() == ERROR_ACCESS_DENIED) + if (!ret && GetLastError() == ERROR_ACCESS_DENIED && !is_process_elevated()) skip("Need admin rights\n"); else ok(ret, "CryptRegisterDefaultOIDFunction failed: %08x\n", GetLastError()); @@ -645,7 +661,11 @@ static void test_registerOIDInfo(void) info1.pszOID = test_oid; SetLastError(0xdeadbeef); ret = CryptUnregisterOIDInfo(&info1); - ok(!ret, "should fail\n"); + if (!ret && GetLastError() == ERROR_ACCESS_DENIED && !is_process_elevated()) + { + skip("Need admin rights FIXME\n"); + return; + } ok(!ret, "should fail\n"); ok(GetLastError() == ERROR_FILE_NOT_FOUND, "got %u\n", GetLastError()); info2 = CryptFindOIDInfo(CRYPT_OID_INFO_OID_KEY, (void *)test_oid, 0); @@ -668,7 +688,7 @@ static void test_registerOIDInfo(void) info1.dwGroupId = CRYPT_HASH_ALG_OID_GROUP_ID; SetLastError(0xdeadbeef); ret = CryptRegisterOIDInfo(&info1, CRYPT_INSTALL_OID_INFO_BEFORE_FLAG); - if (!ret && GetLastError() == ERROR_ACCESS_DENIED) + if (!ret && GetLastError() == ERROR_ACCESS_DENIED && !is_process_elevated()) { skip("Need admin rights\n"); return; -- 2.20.1

2 4

[PATCH v2 1/2] ntdll: Always copy context in call_user_apc_dispatcher() on x64.
by Paul Gofman Dec. 14, 2020

Dec. 14, 2020

Currently, if call_user_apc_dispatcher() is called with nonzero context, there is no guarantee that the provided context is stored above the rsp = context_ptr->Rsp - (sizeof(CONTEXT) + offsetof(frame,ret_addr)) being set. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntdll/unix/signal_x86_64.c | 61 +++++++++++++++++++++++++-------- 1 file changed, 47 insertions(+), 14 deletions(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 359f2d7c361..09088b75750 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -254,6 +254,22 @@ C_ASSERT((offsetof(struct stack_layout, xstate) == sizeof(struct stack_layout))) C_ASSERT( sizeof(XSTATE) == 0x140 ); C_ASSERT( sizeof(struct stack_layout) == 0x5b0 ); /* Should match the size in call_user_exception_dispatcher(). */ +/* stack layout when calling an user apc function. + * FIXME: match Windows ABI. */ +struct apc_stack_layout +{ + ULONG64 save_regs[4]; + void *func; + ULONG64 align; + CONTEXT context; + ULONG64 rbp; + ULONG64 rip; +}; + +/* Should match size and offset in call_user_apc_dispatcher(). */ +C_ASSERT( offsetof(struct apc_stack_layout, context) == 0x30 ); +C_ASSERT( sizeof(struct apc_stack_layout) == 0x510 ); + struct syscall_frame { ULONG64 xmm[10 * 2]; /* xmm6-xmm15 */ @@ -270,6 +286,9 @@ struct syscall_frame ULONG64 ret_addr; }; +/* Should match the offset in call_user_apc_dispatcher(). */ +C_ASSERT( offsetof( struct syscall_frame, ret_addr ) == 0xf0); + struct amd64_thread_data { DWORD_PTR dr0; /* 02f0 debug registers */ @@ -2017,31 +2036,45 @@ static void setup_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec ) /*********************************************************************** * call_user_apc_dispatcher */ +struct apc_stack_layout * WINAPI setup_user_apc_dispatcher_stack( CONTEXT *context, struct apc_stack_layout *stack ) +{ + CONTEXT c; + + if (!context) + { + c.ContextFlags = CONTEXT_FULL; + NtGetContextThread( GetCurrentThread(), &c ); + context = &c; + } + memmove( &stack->context, context, sizeof(stack->context) ); + return stack; +} + __ASM_GLOBAL_FUNC( call_user_apc_dispatcher, "movq 0x28(%rsp),%rsi\n\t" /* func */ "movq 0x30(%rsp),%rdi\n\t" /* dispatcher */ "movq %gs:0x30,%rbx\n\t" - "jrcxz 1f\n\t" - "movq 0x98(%rcx),%rax\n\t" /* context_ptr->Rsp */ - "leaq -0x5c0(%rax),%rsp\n\t" /* sizeof(CONTEXT) + offsetof(frame,ret_addr) */ - "andq $~15,%rsp\n\t" - "jmp 2f\n" - "1:\tmovq 0x328(%rbx),%rax\n\t" /* amd64_thread_data()->syscall_frame */ - "leaq -0x4d0(%rax),%rsp\n\t" - "andq $~15,%rsp\n\t" "movq %rdx,%r12\n\t" /* ctx */ "movq %r8,%r13\n\t" /* arg1 */ "movq %r9,%r14\n\t" /* arg2 */ - "movq %rsp,%rdx\n\t" /* context */ - "movl $0x10000b,0x30(%rdx)\n\t" /* context.ContextFlags */ - "movq $~1,%rcx\n\t" - "call " __ASM_NAME("NtGetContextThread") "\n\t" - "movq %rsp,%rcx\n\t" /* context */ + "jrcxz 1f\n\t" + "movq 0x98(%rcx),%rdx\n\t" /* context->Rsp */ + "jmp 2f\n\t" + "1:\tmovq 0x328(%rbx),%rax\n\t" /* amd64_thread_data()->syscall_frame */ + "leaq 0xf0(%rax),%rdx\n\t" /* &amd64_thread_data()->syscall_frame->ret_addr */ + "2:\tsubq $0x510,%rdx\n\t" /* sizeof(struct apc_stack_layout) */ + "andq $~0xf,%rdx\n\t" + "cmpq %rsp,%rdx\n\t" + "cmovbq %rdx,%rsp\n\t" + "subq $0x18,%rsp\n\t" + "call " __ASM_NAME("setup_user_apc_dispatcher_stack") "\n\t" + "movq %rax,%rsp\n\t" + "leaq 0x30(%rsp),%rcx\n\t" /* context */ "movq $0xc0,0x78(%rcx)\n\t" /* context.Rax = STATUS_USER_APC */ "movq %r12,%rdx\n\t" /* ctx */ "movq %r13,%r8\n\t" /* arg1 */ "movq %r14,%r9\n" /* arg2 */ - "2:\tmovq $0,0x328(%rbx)\n\t" + "movq $0,0x328(%rbx)\n\t" /* amd64_thread_data()->syscall_frame */ "movq %rsi,0x20(%rsp)\n\t" /* func */ "movq 0xa0(%rcx),%rbp\n\t" /* context.Rbp */ "pushq 0xf8(%rcx)\n\t" /* context.Rip */ -- 2.29.2

1 1

[PATCH 1/2] ntdll: Always copy context in call_user_apc_dispatcher() on x64.
by Paul Gofman Dec. 14, 2020

Dec. 14, 2020

Currently, if call_user_apc_dispatcher() is called with nonzero context, there is no guarantee that the provided context is stored above the rsp = context_ptr->Rsp - (sizeof(CONTEXT) + offsetof(frame,ret_addr)) being set. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntdll/unix/signal_x86_64.c | 61 +++++++++++++++++++++++++-------- 1 file changed, 47 insertions(+), 14 deletions(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 359f2d7c361..09088b75750 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -254,6 +254,22 @@ C_ASSERT((offsetof(struct stack_layout, xstate) == sizeof(struct stack_layout))) C_ASSERT( sizeof(XSTATE) == 0x140 ); C_ASSERT( sizeof(struct stack_layout) == 0x5b0 ); /* Should match the size in call_user_exception_dispatcher(). */ +/* stack layout when calling an user apc function. + * FIXME: match Windows ABI. */ +struct apc_stack_layout +{ + ULONG64 save_regs[4]; + void *func; + ULONG64 align; + CONTEXT context; + ULONG64 rbp; + ULONG64 rip; +}; + +/* Should match size and offset in call_user_apc_dispatcher(). */ +C_ASSERT( offsetof(struct apc_stack_layout, context) == 0x30 ); +C_ASSERT( sizeof(struct apc_stack_layout) == 0x510 ); + struct syscall_frame { ULONG64 xmm[10 * 2]; /* xmm6-xmm15 */ @@ -270,6 +286,9 @@ struct syscall_frame ULONG64 ret_addr; }; +/* Should match the offset in call_user_apc_dispatcher(). */ +C_ASSERT( offsetof( struct syscall_frame, ret_addr ) == 0xf0); + struct amd64_thread_data { DWORD_PTR dr0; /* 02f0 debug registers */ @@ -2017,31 +2036,45 @@ static void setup_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec ) /*********************************************************************** * call_user_apc_dispatcher */ +struct apc_stack_layout * WINAPI setup_user_apc_dispatcher_stack( CONTEXT *context, struct apc_stack_layout *stack ) +{ + CONTEXT c; + + if (!context) + { + c.ContextFlags = CONTEXT_FULL; + NtGetContextThread( GetCurrentThread(), &c ); + context = &c; + } + memmove( &stack->context, context, sizeof(stack->context) ); + return stack; +} + __ASM_GLOBAL_FUNC( call_user_apc_dispatcher, "movq 0x28(%rsp),%rsi\n\t" /* func */ "movq 0x30(%rsp),%rdi\n\t" /* dispatcher */ "movq %gs:0x30,%rbx\n\t" - "jrcxz 1f\n\t" - "movq 0x98(%rcx),%rax\n\t" /* context_ptr->Rsp */ - "leaq -0x5c0(%rax),%rsp\n\t" /* sizeof(CONTEXT) + offsetof(frame,ret_addr) */ - "andq $~15,%rsp\n\t" - "jmp 2f\n" - "1:\tmovq 0x328(%rbx),%rax\n\t" /* amd64_thread_data()->syscall_frame */ - "leaq -0x4d0(%rax),%rsp\n\t" - "andq $~15,%rsp\n\t" "movq %rdx,%r12\n\t" /* ctx */ "movq %r8,%r13\n\t" /* arg1 */ "movq %r9,%r14\n\t" /* arg2 */ - "movq %rsp,%rdx\n\t" /* context */ - "movl $0x10000b,0x30(%rdx)\n\t" /* context.ContextFlags */ - "movq $~1,%rcx\n\t" - "call " __ASM_NAME("NtGetContextThread") "\n\t" - "movq %rsp,%rcx\n\t" /* context */ + "jrcxz 1f\n\t" + "movq 0x98(%rcx),%rdx\n\t" /* context->Rsp */ + "jmp 2f\n\t" + "1:\tmovq 0x328(%rbx),%rax\n\t" /* amd64_thread_data()->syscall_frame */ + "leaq 0xf0(%rax),%rdx\n\t" /* &amd64_thread_data()->syscall_frame->ret_addr */ + "2:\tsubq $0x510,%rdx\n\t" /* sizeof(struct apc_stack_layout) */ + "andq $~0xf,%rdx\n\t" + "cmpq %rsp,%rdx\n\t" + "cmovbq %rdx,%rsp\n\t" + "subq $0x18,%rsp\n\t" + "call " __ASM_NAME("setup_user_apc_dispatcher_stack") "\n\t" + "movq %rax,%rsp\n\t" + "leaq 0x30(%rsp),%rcx\n\t" /* context */ "movq $0xc0,0x78(%rcx)\n\t" /* context.Rax = STATUS_USER_APC */ "movq %r12,%rdx\n\t" /* ctx */ "movq %r13,%r8\n\t" /* arg1 */ "movq %r14,%r9\n" /* arg2 */ - "2:\tmovq $0,0x328(%rbx)\n\t" + "movq $0,0x328(%rbx)\n\t" /* amd64_thread_data()->syscall_frame */ "movq %rsi,0x20(%rsp)\n\t" /* func */ "movq 0xa0(%rcx),%rbp\n\t" /* context.Rbp */ "pushq 0xf8(%rcx)\n\t" /* context.Rip */ -- 2.29.2

2 2

[PATCH] ntdll/tests: The case-sensitivity tests don't need write access.
by Francois Gouget Dec. 14, 2020

Dec. 14, 2020

This fixes the tests when missing elevated privileges. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/ntdll/tests/reg.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 24832312460..9335d9cc927 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -614,6 +614,7 @@ static void test_NtCreateKey(void) pRtlFreeUnicodeString( &str ); /* the REGISTRY part is case-sensitive unless OBJ_CASE_INSENSITIVE is specified */ + am = GENERIC_READ; attr.Attributes = 0; pRtlCreateUnicodeStringFromAsciiz( &str, "\\Registry\\Machine\\Software\\Classes" ); status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 ); @@ -624,14 +625,14 @@ static void test_NtCreateKey(void) pRtlCreateUnicodeStringFromAsciiz( &str, "\\REGISTRY\\Machine\\Software\\Classes" ); status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 ); - ok( status == STATUS_SUCCESS || status == STATUS_ACCESS_DENIED, + ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status ); if (!status) pNtClose( subkey ); pRtlFreeUnicodeString( &str ); pRtlCreateUnicodeStringFromAsciiz( &str, "\\REGISTRY\\MACHINE\\SOFTWARE\\CLASSES" ); status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 ); - ok( status == STATUS_SUCCESS || status == STATUS_ACCESS_DENIED, + ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status ); if (!status) pNtClose( subkey ); pRtlFreeUnicodeString( &str ); -- 2.20.1

1 0

[PATCH] ntdll/tests: Skip some registry tests when missing elevated privileges.
by Francois Gouget Dec. 14, 2020

Dec. 14, 2020

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/ntdll/tests/reg.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 51562786e99..24832312460 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -1458,6 +1458,11 @@ static void test_redirection(void) pRtlInitUnicodeString( &str, wine64W ); status = pNtCreateKey( &root64, KEY_WOW64_64KEY | KEY_ALL_ACCESS, &attr, 0, 0, 0, 0 ); + if (status == STATUS_ACCESS_DENIED) + { + skip("Not authorized to modify KEY_WOW64_64KEY, no redirection\n"); + return; + } ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status ); pRtlInitUnicodeString( &str, wine32W ); -- 2.20.1

1 0

[PATCH] ws2_32/tests: Skip some raw socket tests when missing elevated privileges.
by Francois Gouget Dec. 14, 2020

Dec. 14, 2020

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/ws2_32/tests/sock.c | 46 +++++++++++++++++++++++----------------- 1 file changed, 26 insertions(+), 20 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 2d69a05aec5..8711b65fcea 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2551,29 +2551,35 @@ static void test_WSASocket(void) SOCK_RAW, socktype); closesocket(sock); - todo_wine { sock = WSASocketA(0, 0, IPPROTO_RAW, NULL, 0, 0); - ok(sock != INVALID_SOCKET, "Failed to create socket: %d\n", - WSAGetLastError()); - size = sizeof(socktype); - socktype = 0xdead; - err = getsockopt(sock, SOL_SOCKET, SO_TYPE, (char *) &socktype, &size); - ok(!err, "getsockopt failed with %d\n", WSAGetLastError()); - ok(socktype == SOCK_RAW, "Wrong socket type, expected %d received %d\n", - SOCK_RAW, socktype); - closesocket(sock); + if (sock != INVALID_SOCKET) + { + todo_wine { + size = sizeof(socktype); + socktype = 0xdead; + err = getsockopt(sock, SOL_SOCKET, SO_TYPE, (char *) &socktype, &size); + ok(!err, "getsockopt failed with %d\n", WSAGetLastError()); + ok(socktype == SOCK_RAW, "Wrong socket type, expected %d received %d\n", + SOCK_RAW, socktype); + closesocket(sock); + } + + sock = WSASocketA(AF_INET, SOCK_RAW, IPPROTO_TCP, NULL, 0, 0); + ok(sock != INVALID_SOCKET, "Failed to create socket: %d\n", + WSAGetLastError()); + size = sizeof(socktype); + socktype = 0xdead; + err = getsockopt(sock, SOL_SOCKET, SO_TYPE, (char *) &socktype, &size); + ok(!err, "getsockopt failed with %d\n", WSAGetLastError()); + ok(socktype == SOCK_RAW, "Wrong socket type, expected %d received %d\n", + SOCK_RAW, socktype); + closesocket(sock); } + else if (WSAGetLastError() == WSAEACCES) + skip("SOCK_RAW is not available\n"); + else + ok(0, "Failed to create socket: %d\n", WSAGetLastError()); - sock = WSASocketA(AF_INET, SOCK_RAW, IPPROTO_TCP, NULL, 0, 0); - ok(sock != INVALID_SOCKET, "Failed to create socket: %d\n", - WSAGetLastError()); - size = sizeof(socktype); - socktype = 0xdead; - err = getsockopt(sock, SOL_SOCKET, SO_TYPE, (char *) &socktype, &size); - ok(!err, "getsockopt failed with %d\n", WSAGetLastError()); - ok(socktype == SOCK_RAW, "Wrong socket type, expected %d received %d\n", - SOCK_RAW, socktype); - closesocket(sock); } /* IPX socket tests */ -- 2.20.1

1 0

[PATCH v3] dlls/d3d9: Fix handling of D3DENUM_WHQL_LEVEL
by Rafał Harabień Dec. 14, 2020

Dec. 14, 2020

D3DENUM_NO_WHQL_LEVEL was renamed to D3DENUM_WHQL_LEVEL and its meaning was negated in DirectX 9. Signed-off-by: Rafał Harabień <rafalh92(a)outlook.com> --- dlls/d3d8/directx.c | 3 +++ dlls/ddraw/ddraw.c | 2 +- dlls/wined3d/directx.c | 2 +- include/d3d9.h | 2 +- include/wine/wined3d.h | 2 +- 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index 0c0f2ecaadc..886100442fd 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -121,6 +121,9 @@ static HRESULT WINAPI d3d8_GetAdapterIdentifier(IDirect3D8 *iface, UINT adapter, adapter_id.description = identifier->Description; adapter_id.description_size = sizeof(identifier->Description); + // D3DENUM_NO_WHQL_LEVEL -> WINED3DENUM_WHQL_LEVEL + flags ^= D3DENUM_NO_WHQL_LEVEL; + wined3d_adapter = wined3d_output_get_adapter(d3d8->wined3d_outputs[output_idx]); if (SUCCEEDED(hr = wined3d_adapter_get_identifier(wined3d_adapter, flags, &adapter_id))) { diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index f78d344c085..d616330c307 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2642,7 +2642,7 @@ static HRESULT WINAPI ddraw7_GetDeviceIdentifier(IDirectDraw7 *iface, adapter_id.description = DDDI->szDescription; adapter_id.description_size = sizeof(DDDI->szDescription); wined3d_mutex_lock(); - hr = wined3d_adapter_get_identifier(ddraw->wined3d_adapter, 0x0, &adapter_id); + hr = wined3d_adapter_get_identifier(ddraw->wined3d_adapter, WINED3DENUM_WHQL_LEVEL, &adapter_id); wined3d_mutex_unlock(); if (FAILED(hr)) return hr; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 412842469b3..d35108710c2 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1513,7 +1513,7 @@ HRESULT CDECL wined3d_adapter_get_identifier(const struct wined3d_adapter *adapt identifier->device_identifier = IID_D3DDEVICE_D3DUID; identifier->driver_uuid = adapter->driver_uuid; identifier->device_uuid = adapter->device_uuid; - identifier->whql_level = (flags & WINED3DENUM_NO_WHQL_LEVEL) ? 0 : 1; + identifier->whql_level = (flags & WINED3DENUM_WHQL_LEVEL) ? 1 : 0; identifier->adapter_luid = adapter->luid; identifier->video_memory = min(~(SIZE_T)0, adapter->driver_info.vram_bytes); identifier->shared_system_memory = min(~(SIZE_T)0, adapter->driver_info.sysmem_bytes); diff --git a/include/d3d9.h b/include/d3d9.h index 3ebde4509af..d61461f0833 100644 --- a/include/d3d9.h +++ b/include/d3d9.h @@ -61,7 +61,7 @@ */ #define D3D_SDK_VERSION 32 #define D3DADAPTER_DEFAULT 0 -#define D3DENUM_NO_WHQL_LEVEL __MSABI_LONG(0x00000002) +#define D3DENUM_WHQL_LEVEL __MSABI_LONG(0x00000002) #define D3DPRESENT_DONOTWAIT __MSABI_LONG(1) #define D3DPRESENT_LINEAR_CONTENT __MSABI_LONG(2) #define D3DPRESENT_BACK_BUFFERS_MAX __MSABI_LONG(3) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 1f370d69a88..310911992ae 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -874,7 +874,7 @@ enum wined3d_shader_type #define WINED3DCOLORWRITEENABLE_ALPHA (1u << 3) #define WINED3DADAPTER_DEFAULT 0 -#define WINED3DENUM_NO_WHQL_LEVEL 2 +#define WINED3DENUM_WHQL_LEVEL 2 #define WINED3DTSS_TCI_PASSTHRU 0x00000 #define WINED3DTSS_TCI_CAMERASPACENORMAL 0x10000 -- 2.25.1

2 1

[PATCH 6/6] d3d9: Fix handling of D3DENUM_WHQL_LEVEL.
by Henri Verbeet Dec. 14, 2020

Dec. 14, 2020

From: Rafał Harabień <rafalh92(a)outlook.com> D3DENUM_NO_WHQL_LEVEL from Direct3D 8 was replaced with D3DENUM_WHQL_LEVEL in Direct3D 9. Signed-off-by: Rafał Harabień <rafalh92(a)outlook.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d8/directx.c | 3 +++ dlls/ddraw/ddraw.c | 2 +- dlls/wined3d/directx.c | 2 +- include/d3d9.h | 2 +- include/wine/wined3d.h | 2 +- 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index 0c0f2ecaadc..3818cb79952 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -121,6 +121,9 @@ static HRESULT WINAPI d3d8_GetAdapterIdentifier(IDirect3D8 *iface, UINT adapter, adapter_id.description = identifier->Description; adapter_id.description_size = sizeof(identifier->Description); + /* D3DENUM_NO_WHQL_LEVEL -> WINED3DENUM_WHQL_LEVEL */ + flags ^= D3DENUM_NO_WHQL_LEVEL; + wined3d_adapter = wined3d_output_get_adapter(d3d8->wined3d_outputs[output_idx]); if (SUCCEEDED(hr = wined3d_adapter_get_identifier(wined3d_adapter, flags, &adapter_id))) { diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index f78d344c085..d616330c307 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2642,7 +2642,7 @@ static HRESULT WINAPI ddraw7_GetDeviceIdentifier(IDirectDraw7 *iface, adapter_id.description = DDDI->szDescription; adapter_id.description_size = sizeof(DDDI->szDescription); wined3d_mutex_lock(); - hr = wined3d_adapter_get_identifier(ddraw->wined3d_adapter, 0x0, &adapter_id); + hr = wined3d_adapter_get_identifier(ddraw->wined3d_adapter, WINED3DENUM_WHQL_LEVEL, &adapter_id); wined3d_mutex_unlock(); if (FAILED(hr)) return hr; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 412842469b3..d35108710c2 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1513,7 +1513,7 @@ HRESULT CDECL wined3d_adapter_get_identifier(const struct wined3d_adapter *adapt identifier->device_identifier = IID_D3DDEVICE_D3DUID; identifier->driver_uuid = adapter->driver_uuid; identifier->device_uuid = adapter->device_uuid; - identifier->whql_level = (flags & WINED3DENUM_NO_WHQL_LEVEL) ? 0 : 1; + identifier->whql_level = (flags & WINED3DENUM_WHQL_LEVEL) ? 1 : 0; identifier->adapter_luid = adapter->luid; identifier->video_memory = min(~(SIZE_T)0, adapter->driver_info.vram_bytes); identifier->shared_system_memory = min(~(SIZE_T)0, adapter->driver_info.sysmem_bytes); diff --git a/include/d3d9.h b/include/d3d9.h index 3ebde4509af..d61461f0833 100644 --- a/include/d3d9.h +++ b/include/d3d9.h @@ -61,7 +61,7 @@ */ #define D3D_SDK_VERSION 32 #define D3DADAPTER_DEFAULT 0 -#define D3DENUM_NO_WHQL_LEVEL __MSABI_LONG(0x00000002) +#define D3DENUM_WHQL_LEVEL __MSABI_LONG(0x00000002) #define D3DPRESENT_DONOTWAIT __MSABI_LONG(1) #define D3DPRESENT_LINEAR_CONTENT __MSABI_LONG(2) #define D3DPRESENT_BACK_BUFFERS_MAX __MSABI_LONG(3) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 1f370d69a88..310911992ae 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -874,7 +874,7 @@ enum wined3d_shader_type #define WINED3DCOLORWRITEENABLE_ALPHA (1u << 3) #define WINED3DADAPTER_DEFAULT 0 -#define WINED3DENUM_NO_WHQL_LEVEL 2 +#define WINED3DENUM_WHQL_LEVEL 2 #define WINED3DTSS_TCI_PASSTHRU 0x00000 #define WINED3DTSS_TCI_CAMERASPACENORMAL 0x10000 -- 2.20.1

1 0

[PATCH 5/6] wined3d: The Vulkan blitter supports depth blits.
by Henri Verbeet Dec. 14, 2020

Dec. 14, 2020

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50123 Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- Note that this patch helps with the bug mentioned above, but isn't enough to fix it on its own. dlls/wined3d/texture.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 69f948c5fd2..b630f0dcfc5 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -6465,11 +6465,6 @@ static DWORD vk_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit_ src_aspect = vk_aspect_mask_from_format(src_texture_vk->t.resource.format); dst_aspect = vk_aspect_mask_from_format(dst_texture_vk->t.resource.format); - if ((src_aspect | dst_aspect) & (VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT)) - { - TRACE("Depth/stencil blits not supported.\n"); - goto next; - } if (wined3d_resource_get_sample_count(&src_texture_vk->t.resource) > 1) resolve = true; -- 2.20.1

1 0

[PATCH 4/6] wined3d: Unmap the slab if needed in wined3d_context_vk_destroy_bo().
by Henri Verbeet Dec. 14, 2020

Dec. 14, 2020

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_vk.c | 41 +++++++++++++++++++++++++--------- dlls/wined3d/context_vk.c | 9 +++++--- dlls/wined3d/wined3d_private.h | 5 +++++ 3 files changed, 42 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 4e804b60502..0404aa1877b 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -772,12 +772,11 @@ static void *wined3d_bo_vk_map(struct wined3d_bo_vk *bo, struct wined3d_context_ if ((slab = bo->slab)) { - if (!(bo->map_ptr = slab->map_ptr) && !(bo->map_ptr = wined3d_bo_vk_map(&slab->bo, context_vk))) + if (!(bo->map_ptr = wined3d_bo_slab_vk_map(slab, context_vk))) { ERR("Failed to map slab.\n"); return NULL; } - ++slab->map_count; } else if (bo->memory) { @@ -811,21 +810,43 @@ static void wined3d_bo_vk_unmap(struct wined3d_bo_vk *bo, struct wined3d_context if ((slab = bo->slab)) { - if (--slab->map_count) - return; + wined3d_bo_slab_vk_unmap(slab, context_vk); + return; + } - wined3d_bo_vk_unmap(&slab->bo, context_vk); - slab->map_ptr = NULL; + if (bo->memory) + { + wined3d_allocator_chunk_vk_unmap(wined3d_allocator_chunk_vk(bo->memory->chunk), context_vk); return; } vk_info = context_vk->vk_info; device_vk = wined3d_device_vk(context_vk->c.device); + VK_CALL(vkUnmapMemory(device_vk->vk_device, bo->vk_memory)); +} - if (bo->memory) - wined3d_allocator_chunk_vk_unmap(wined3d_allocator_chunk_vk(bo->memory->chunk), context_vk); - else - VK_CALL(vkUnmapMemory(device_vk->vk_device, bo->vk_memory)); +void *wined3d_bo_slab_vk_map(struct wined3d_bo_slab_vk *slab_vk, struct wined3d_context_vk *context_vk) +{ + TRACE("slab_vk %p, context_vk %p.\n", slab_vk, context_vk); + + if (!slab_vk->map_ptr && !(slab_vk->map_ptr = wined3d_bo_vk_map(&slab_vk->bo, context_vk))) + { + ERR("Failed to map slab.\n"); + return NULL; + } + + ++slab_vk->map_count; + + return slab_vk->map_ptr; +} + +void wined3d_bo_slab_vk_unmap(struct wined3d_bo_slab_vk *slab_vk, struct wined3d_context_vk *context_vk) +{ + if (--slab_vk->map_count) + return; + + wined3d_bo_vk_unmap(&slab_vk->bo, context_vk); + slab_vk->map_ptr = NULL; } static VkAccessFlags vk_access_mask_from_buffer_usage(VkBufferUsageFlags usage) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index bd3dc50ab01..9db363172f1 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -797,15 +797,18 @@ void wined3d_context_vk_destroy_bo(struct wined3d_context_vk *context_vk, const { struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); const struct wined3d_vk_info *vk_info = context_vk->vk_info; + struct wined3d_bo_slab_vk *slab_vk; size_t object_size, idx; TRACE("context_vk %p, bo %p.\n", context_vk, bo); - if (bo->slab) + if ((slab_vk = bo->slab)) { - object_size = bo->slab->bo.size / 32; + if (bo->map_ptr) + wined3d_bo_slab_vk_unmap(slab_vk, context_vk); + object_size = slab_vk->bo.size / 32; idx = bo->buffer_offset / object_size; - wined3d_context_vk_destroy_bo_slab_slice(context_vk, bo->slab, idx, bo->command_buffer_id); + wined3d_context_vk_destroy_bo_slab_slice(context_vk, slab_vk, idx, bo->command_buffer_id); return; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f48778ee345..0749f95f998 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1633,6 +1633,11 @@ struct wined3d_bo_slab_vk uint32_t map; }; +void *wined3d_bo_slab_vk_map(struct wined3d_bo_slab_vk *slab_vk, + struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN; +void wined3d_bo_slab_vk_unmap(struct wined3d_bo_slab_vk *slab_vk, + struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN; + struct wined3d_bo_address { UINT_PTR buffer_object; -- 2.20.1

1 0

[PATCH 3/6] wined3d: Unmap the chunk if needed in wined3d_context_vk_destroy_bo().
by Henri Verbeet Dec. 14, 2020

Dec. 14, 2020

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_vk.c | 16 +++++++--------- dlls/wined3d/context_vk.c | 2 ++ dlls/wined3d/wined3d_private.h | 5 +++++ 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 3da1615b1b5..4e804b60502 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -762,7 +762,6 @@ static void *wined3d_bo_vk_map(struct wined3d_bo_vk *bo, struct wined3d_context_ const struct wined3d_vk_info *vk_info; struct wined3d_device_vk *device_vk; struct wined3d_bo_slab_vk *slab; - void *map_ptr; VkResult vr; if (bo->map_ptr) @@ -773,7 +772,7 @@ static void *wined3d_bo_vk_map(struct wined3d_bo_vk *bo, struct wined3d_context_ if ((slab = bo->slab)) { - if (!(map_ptr = slab->map_ptr) && !(map_ptr = wined3d_bo_vk_map(&slab->bo, context_vk))) + if (!(bo->map_ptr = slab->map_ptr) && !(bo->map_ptr = wined3d_bo_vk_map(&slab->bo, context_vk))) { ERR("Failed to map slab.\n"); return NULL; @@ -784,22 +783,19 @@ static void *wined3d_bo_vk_map(struct wined3d_bo_vk *bo, struct wined3d_context_ { struct wined3d_allocator_chunk_vk *chunk_vk = wined3d_allocator_chunk_vk(bo->memory->chunk); - if (!(map_ptr = wined3d_allocator_chunk_vk_map(chunk_vk, context_vk))) + if (!(bo->map_ptr = wined3d_allocator_chunk_vk_map(chunk_vk, context_vk))) { ERR("Failed to map chunk.\n"); return NULL; } } - else if ((vr = VK_CALL(vkMapMemory(device_vk->vk_device, bo->vk_memory, 0, VK_WHOLE_SIZE, 0, &map_ptr))) < 0) + else if ((vr = VK_CALL(vkMapMemory(device_vk->vk_device, bo->vk_memory, 0, VK_WHOLE_SIZE, 0, &bo->map_ptr))) < 0) { ERR("Failed to map memory, vr %s.\n", wined3d_debug_vkresult(vr)); return NULL; } - if (sizeof(map_ptr) >= sizeof(uint64_t)) - bo->map_ptr = map_ptr; - - return map_ptr; + return bo->map_ptr; } static void wined3d_bo_vk_unmap(struct wined3d_bo_vk *bo, struct wined3d_context_vk *context_vk) @@ -808,9 +804,11 @@ static void wined3d_bo_vk_unmap(struct wined3d_bo_vk *bo, struct wined3d_context struct wined3d_device_vk *device_vk; struct wined3d_bo_slab_vk *slab; - if (bo->map_ptr) + if (wined3d_map_persistent()) return; + bo->map_ptr = NULL; + if ((slab = bo->slab)) { if (--slab->map_count) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 1b937dd3b21..bd3dc50ab01 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -812,6 +812,8 @@ void wined3d_context_vk_destroy_bo(struct wined3d_context_vk *context_vk, const wined3d_context_vk_destroy_buffer(context_vk, bo->vk_buffer, bo->command_buffer_id); if (bo->memory) { + if (bo->map_ptr) + wined3d_allocator_chunk_vk_unmap(wined3d_allocator_chunk_vk(bo->memory->chunk), context_vk); wined3d_context_vk_destroy_allocator_block(context_vk, bo->memory, bo->command_buffer_id); return; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 30b21a8225f..f48778ee345 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -6367,6 +6367,11 @@ static inline void wined3d_context_gl_reference_bo(struct wined3d_context_gl *co bo_gl->command_fence_id = device_gl->current_fence_id; } +static inline bool wined3d_map_persistent(void) +{ + return sizeof(void *) >= sizeof(uint64_t); +} + /* The WNDCLASS-Name for the fake window which we use to retrieve the GL capabilities */ #define WINED3D_OPENGL_WINDOW_CLASS_NAME "WineD3D_OpenGL" -- 2.20.1

1 0

[PATCH 2/6] wined3d: Only clear "map_ptr" if the memory was unmapped in wined3d_allocator_chunk_vk_unmap().
by Henri Verbeet Dec. 14, 2020

Dec. 14, 2020

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context_vk.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 66f5109dc87..1b937dd3b21 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -277,8 +277,10 @@ void wined3d_allocator_chunk_vk_unmap(struct wined3d_allocator_chunk_vk *chunk_v TRACE("chunk_vk %p, context_vk %p.\n", chunk_vk, context_vk); - if (!--chunk_vk->c.map_count) - VK_CALL(vkUnmapMemory(device_vk->vk_device, chunk_vk->vk_memory)); + if (--chunk_vk->c.map_count) + return; + + VK_CALL(vkUnmapMemory(device_vk->vk_device, chunk_vk->vk_memory)); chunk_vk->c.map_ptr = NULL; } -- 2.20.1

1 0

[PATCH 1/6] wined3d: Compare requested memory types in wined3d_bo_slab_vk_compare().
by Henri Verbeet Dec. 14, 2020

Dec. 14, 2020

Instead of comparing the requested memory type against what we actually got. For example, we may have gotten coherent memory without having explicitly requested it, in which case wined3d_context_vk_create_slab_bo() would fail to find an existing slab to allocate from. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This fixes a rather atrocious VRAM leak with some allocation patterns on some configurations. I don't think we have any explicit bug reports about this, but it affects for example the menu in Batman: Arkham Origins. dlls/wined3d/context_vk.c | 7 ++++--- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index f1258842152..66f5109dc87 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -371,6 +371,7 @@ static bool wined3d_context_vk_create_slab_bo(struct wined3d_context_vk *context return false; } + slab->requested_memory_type = memory_type; if (!wined3d_context_vk_create_bo(context_vk, key.size, usage, memory_type, &slab->bo)) { ERR("Failed to create slab bo.\n"); @@ -625,7 +626,7 @@ static void wined3d_bo_slab_vk_free_slice(struct wined3d_bo_slab_vk *slab, if (!slab->map) { - key.memory_type = slab->bo.memory_type; + key.memory_type = slab->requested_memory_type; key.usage = slab->bo.usage; key.size = slab->bo.size; @@ -1677,8 +1678,8 @@ static int wined3d_bo_slab_vk_compare(const void *key, const struct wine_rb_entr const struct wined3d_bo_slab_vk *slab = WINE_RB_ENTRY_VALUE(entry, const struct wined3d_bo_slab_vk, entry); const struct wined3d_bo_slab_vk_key *k = key; - if (k->memory_type != slab->bo.memory_type) - return k->memory_type - slab->bo.memory_type; + if (k->memory_type != slab->requested_memory_type) + return k->memory_type - slab->requested_memory_type; if (k->usage != slab->bo.usage) return k->usage - slab->bo.usage; return k->size - slab->bo.size; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index cf1a0bb0668..30b21a8225f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1626,6 +1626,7 @@ struct wined3d_bo_slab_vk { struct wine_rb_entry entry; struct wined3d_bo_slab_vk *next; + VkMemoryPropertyFlags requested_memory_type; struct wined3d_bo_vk bo; unsigned int map_count; void *map_ptr; -- 2.20.1

1 0

[PATCH] ntdll: Remove unwind registers save space from struct stack_layout on x64.
by Paul Gofman Dec. 14, 2020

Dec. 14, 2020

The unwind space used right below the context's Rsp and can currently potentially overlap with xstate. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntdll/unix/signal_x86_64.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 359f2d7c361..7181b48728c 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -240,10 +240,6 @@ struct stack_layout CONTEXT context; CONTEXT_EX context_ex; EXCEPTION_RECORD rec; - ULONG64 rsi; - ULONG64 rdi; - ULONG64 rbp; - ULONG64 rip; ULONG64 align; char xstate[0]; /* If xstate is present it is allocated * dynamically to provide 64 byte alignment. */ @@ -252,7 +248,7 @@ struct stack_layout C_ASSERT((offsetof(struct stack_layout, xstate) == sizeof(struct stack_layout))); C_ASSERT( sizeof(XSTATE) == 0x140 ); -C_ASSERT( sizeof(struct stack_layout) == 0x5b0 ); /* Should match the size in call_user_exception_dispatcher(). */ +C_ASSERT( sizeof(struct stack_layout) == 0x590 ); /* Should match the size in call_user_exception_dispatcher(). */ struct syscall_frame { @@ -1964,10 +1960,10 @@ static void setup_raise_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec /* fix up instruction pointer in context for EXCEPTION_BREAKPOINT */ if (rec->ExceptionCode == EXCEPTION_BREAKPOINT) context->Rip--; - stack_size = sizeof(*stack); + stack_size = sizeof(*stack) + 0x20; if ((src_xs = xstate_from_context( context ))) { - stack_size += (ULONG_PTR)stack_ptr - (((ULONG_PTR)stack_ptr + stack_size += (ULONG_PTR)stack_ptr - 0x20 - (((ULONG_PTR)stack_ptr - 0x20 - sizeof(XSTATE)) & ~(ULONG_PTR)63); } @@ -2120,12 +2116,13 @@ struct stack_layout * WINAPI setup_user_exception_dispatcher_stack( EXCEPTION_RE __ASM_GLOBAL_FUNC( call_user_exception_dispatcher, "movq 0x98(%rdx),%r9\n\t" /* context->Rsp */ + "subq $0x20,%r9\n\t" /* Unwind registers save space */ "andq $~0xf,%r9\n\t" "btl $6,0x30(%rdx)\n\t" /* context->ContextFlags, CONTEXT_XSTATE bit. */ "jnc 1f\n\t" "subq $0x140,%r9\n\t" /* sizeof(XSTATE) */ "andq $~63,%r9\n" - "1:\tsubq $0x5b0,%r9\n\t" /* sizeof(struct stack_layout) */ + "1:\tsubq $0x590,%r9\n\t" /* sizeof(struct stack_layout) */ "cmpq %rsp,%r9\n\t" "cmovbq %r9,%rsp\n\t" "pushq %r8\n\t" -- 2.29.2

1 0

[PATCH 2/2] po: Update Japanese translation style.
by Akihiro Sagawa Dec. 14, 2020

Dec. 14, 2020

Follow recent Microsoft Japanese Style Guide, especially Katakana prolonged sound mark. As of 2008, they followed the June 1991 Cabinet Notification on Loanword Orthography. It states prolonged the sound mark should be used for long vowels when English original terms have final -er, -or, -ar, in general. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- po/ja.po | 894 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 452 insertions(+), 442 deletions(-)

1 0

[PATCH 1/2] po: Update Japanese translation.
by Akihiro Sagawa Dec. 14, 2020

Dec. 14, 2020

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- po/ja.po | 196 ++++++++++++++++--------------------------------------- 1 file changed, 57 insertions(+), 139 deletions(-)

1 0

[website] German translation for release 6.0-rc2
by Julian Rüger Dec. 14, 2020

Dec. 14, 2020

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[PATCH] msi/tests: Use wide-char string literals.
by Michael Stefaniuc Dec. 14, 2020

Dec. 14, 2020

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msi/tests/custom.c | 4 +--- dlls/msi/tests/record.c | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index caf24356948..d74d0a2d097 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -518,12 +518,10 @@ static void test_db(MSIHANDLE hinst) for (i = 0; i < 20; i++) { - WCHAR emptyW[1] = { 0 }; - r = MsiSummaryInfoSetPropertyA(suminfo, i, prop_type[i], 1252, &ft, ""); ok(hinst, r == ERROR_FUNCTION_FAILED, "%u: got %u\n", i, r); - r = MsiSummaryInfoSetPropertyW(suminfo, i, prop_type[i], 1252, &ft, emptyW); + r = MsiSummaryInfoSetPropertyW(suminfo, i, prop_type[i], 1252, &ft, L""); ok(hinst, r == ERROR_FUNCTION_FAILED, "%u: got %u\n", i, r); } diff --git a/dlls/msi/tests/record.c b/dlls/msi/tests/record.c index 8e4c2df4294..407d756caae 100644 --- a/dlls/msi/tests/record.c +++ b/dlls/msi/tests/record.c @@ -56,7 +56,6 @@ static void test_msirecord(void) char buf[10]; WCHAR bufW[10]; const char str[] = "hello"; - const WCHAR strW[] = { 'h','e','l','l','o',0}; char filename[MAX_PATH]; /* check behaviour with an invalid record */ @@ -210,7 +209,7 @@ static void test_msirecord(void) r = MsiRecordGetStringW(h,0,bufW,&sz); ok(r == ERROR_MORE_DATA, "wrong error\n"); ok(sz == 5, "MsiRecordGetStringA returned the wrong length\n"); - ok(0==memcmp(bufW,strW,8), "MsiRecordGetStringA returned the wrong string\n"); + ok(!memcmp(bufW, L"hello", 8), "MsiRecordGetStringA returned the wrong string\n"); sz = 0; bufW[0] = 'x'; -- 2.26.2

2 1

[PATCH resend] winex11.drv: Call XIconifyWindow() after XMapWindow() with a minimized window.
by Zhiyi Zhang Dec. 14, 2020

Dec. 14, 2020

Mutter always unminimizes a window when handling map requests. So a window could be in normal state as far as Mutter concerns while Wine mistakenly considers it still minimized. Fix Disgaea PC black screen after Alt+Tab in fullscreen mode. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- See https://gitlab.gnome.org/GNOME/mutter/-/blob/master/src/x11/events.c#L1430 dlls/winex11.drv/window.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index f46cbfb088a..9ed5ef0b0b8 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1134,6 +1134,9 @@ static void map_window( HWND hwnd, DWORD new_style ) data->mapped = TRUE; data->iconic = (new_style & WS_MINIMIZE) != 0; + /* Mutter always unminimizes windows when handling map requests. Restore iconic state here */ + if (data->iconic) + XIconifyWindow( data->display, data->whole_window, data->vis.screen ); } release_win_data( data ); } -- 2.27.0

1 0

[PATCH] po: Update Catalan translation
by Alex Henrie Dec. 14, 2020

Dec. 14, 2020

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- po/ca.po | 387 +++++++++++++++++-------------------------------------- 1 file changed, 121 insertions(+), 266 deletions(-) diff --git a/po/ca.po b/po/ca.po index 916856d1a5c..7ba8be78fe1 100644 --- a/po/ca.po +++ b/po/ca.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: 2019-12-31 11:39-0700\n" +"PO-Revision-Date: 2020-12-13 20:27-0700\n" "Last-Translator: Alex Henrie <alexhenrie24(a)gmail.com>\n" "Language-Team: Catalan\n" "Language: ca\n" @@ -13,7 +13,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 2.2.4\n" +"X-Generator: Poedit 2.4.1\n" #: dlls/appwiz.cpl/appwiz.rc:58 msgid "Install/Uninstall" @@ -3668,7 +3668,7 @@ msgstr "Opcions d'Internet" #: dlls/inetcpl.cpl/inetcpl.rc:32 msgid "Configure Wine Internet Browser and related settings" -msgstr "Configura el Wine Internet Browser i els ajusts relacionats" +msgstr "Configura el Wine Internet Browser i les opcions relacionades" #: dlls/inetcpl.cpl/inetcpl.rc:33 msgid "Security settings for zone: " @@ -3756,7 +3756,7 @@ msgstr "Controladors de joc" #: dlls/joy.cpl/joy.rc:32 msgid "Test and configure game controllers." -msgstr "" +msgstr "Prova i configura controladors de joc." #: dlls/jscript/jscript.rc:28 msgid "Error converting object to primitive type" @@ -3771,10 +3771,8 @@ msgid "Subscript out of range" msgstr "El subíndex és fora d'interval" #: dlls/jscript/jscript.rc:31 -#, fuzzy -#| msgid "Out of paper; " msgid "Out of stack space" -msgstr "No queda paper; " +msgstr "No queda espai de pila" #: dlls/jscript/jscript.rc:32 msgid "Object required" @@ -3862,17 +3860,15 @@ msgstr "S'esperava '@'" #: dlls/jscript/jscript.rc:78 msgid "Microsoft JScript compilation error" -msgstr "" +msgstr "Error de compilació de Microsoft JScript" #: dlls/jscript/jscript.rc:79 msgid "Microsoft JScript runtime error" -msgstr "" +msgstr "Error d'entorn d'execució de Microsoft JScript" #: dlls/jscript/jscript.rc:80 dlls/vbscript/vbscript.rc:64 -#, fuzzy -#| msgid "Unknown error" msgid "Unknown runtime error" -msgstr "Error desconegut" +msgstr "Error d'entorn d'execució desconegut" #: dlls/jscript/jscript.rc:55 msgid "Number expected" @@ -3915,16 +3911,12 @@ msgid "JScript object expected" msgstr "S'esperava un objecte JScript" #: dlls/jscript/jscript.rc:63 -#, fuzzy -#| msgid "Array object expected" msgid "Enumerator object expected" -msgstr "S'esperava un objecte Array" +msgstr "S'esperava un objecte d'Enumerator" #: dlls/jscript/jscript.rc:64 -#, fuzzy -#| msgid "Boolean object expected" msgid "Regular Expression object expected" -msgstr "S'esperava un objecte booleà" +msgstr "S'esperava un objecte d'expressió regular" #: dlls/jscript/jscript.rc:65 msgid "Syntax error in regular expression" @@ -3932,7 +3924,7 @@ msgstr "Error de sintaxi en l'expressió regular" #: dlls/jscript/jscript.rc:66 msgid "Exception thrown and not caught" -msgstr "" +msgstr "S'ha llançat una excepció que no s'ha atrapat" #: dlls/jscript/jscript.rc:68 msgid "URI to be encoded contains invalid characters" @@ -6950,32 +6942,24 @@ msgid "Connection reset by peer.\n" msgstr "Un igual ha restablert la connexió.\n" #: dlls/kernel32/winerror.mc:3767 -#, fuzzy -#| msgid "Not implemented" msgid "Not implemented.\n" -msgstr "No implementat" +msgstr "No implementat.\n" #: dlls/kernel32/winerror.mc:3788 -#, fuzzy -#| msgid "RPC call failed.\n" msgid "Call failed.\n" -msgstr "La trucada RPC ha fallat.\n" +msgstr "La trucada ha fallat.\n" #: dlls/kernel32/winerror.mc:3760 msgid "No Signature found in file.\n" msgstr "No s'ha trobat cap signatura en el fitxer.\n" #: dlls/kernel32/winerror.mc:3774 -#, fuzzy -#| msgid "Invalid level.\n" msgid "Invalid call.\n" -msgstr "El nivell no és vàlid.\n" +msgstr "La trucada no és vàlida.\n" #: dlls/kernel32/winerror.mc:3781 -#, fuzzy -#| msgid "Value is not available.\n" msgid "Resource is not currently available.\n" -msgstr "El valor no està disponible.\n" +msgstr "El recurs actualment no està disponible.\n" #: dlls/localspl/localspl.rc:31 dlls/localui/localui.rc:31 #: dlls/winspool.drv/winspool.rc:30 @@ -7037,10 +7021,8 @@ msgid "Sink has not been finalized.\n" msgstr "No s'ha finalitzat el receptor.\n" #: dlls/mferror/mferror.mc:732 -#, fuzzy -#| msgid "Sink was already stopped.\n" msgid "Clock was stopped\n" -msgstr "El receptor ja s'ha aturat.\n" +msgstr "El rellotge s'ha aturat\n" #: dlls/mferror/mferror.mc:32 msgid "Media Foundation platform is not initialized.\n" @@ -7419,10 +7401,8 @@ msgid "Clock state was already set.\n" msgstr "Ja s'ha establert l'estat de rellotge.\n" #: dlls/mferror/mferror.mc:725 -#, fuzzy -#| msgid "Clock is not available.\n" msgid "Clock is not simple\n" -msgstr "El rellotge no està disponible.\n" +msgstr "El rellotge no és simple\n" #: dlls/mpr/mpr.rc:35 dlls/wininet/wininet.rc:48 msgid "Enter Network Password" @@ -8527,150 +8507,117 @@ msgid "Select the data you want to connect to:" msgstr "Seleccioneu les dades a les qualles voleu connectar:" #: dlls/oledb32/version.rc:66 -#, fuzzy -#| msgid "Connections" msgid "Connection" -msgstr "Connexions" +msgstr "Connexió" #: dlls/oledb32/version.rc:69 -#, fuzzy -#| msgid "Select the data you want to connect to:" msgid "Specify the following to connect to ODBC data:" -msgstr "Seleccioneu les dades a les qualles voleu connectar:" +msgstr "Especifiqueu ho següent per a connectar a les dades ODBC:" #: dlls/oledb32/version.rc:70 msgid "1. Specify the source of data:" -msgstr "" +msgstr "1. Especifiqueu la font de dades:" #: dlls/oledb32/version.rc:71 -#, fuzzy -#| msgid "Please enter your name" msgid "Use &data source name" -msgstr "Si us plau, introduïu el vostre nom" +msgstr "Utilitza el nom de font de &dades" #: dlls/oledb32/version.rc:74 -#, fuzzy -#| msgid "Reset Connections" msgid "Use c&onnection string" -msgstr "Connexions restablertes" +msgstr "Utilitza una cadena de c&onnexió" #: dlls/oledb32/version.rc:75 -#, fuzzy -#| msgid "Connections" msgid "&Connection string:" -msgstr "Connexions" +msgstr "Cadena de &connexió:" #: dlls/oledb32/version.rc:77 -#, fuzzy -#| msgid "A&dd..." msgid "B&uild..." -msgstr "A&fegeix..." +msgstr "Constr&ueix..." #: dlls/oledb32/version.rc:78 msgid "2. Enter information to log on to the server" -msgstr "" +msgstr "2. Introduïu la informació per a entrar al servidor" #: dlls/oledb32/version.rc:79 -#, fuzzy -#| msgid "&User name:" msgid "User &name:" msgstr "&Nom d'usuari:" #: dlls/oledb32/version.rc:83 -#, fuzzy -#| msgid "&Blank page" msgid "&Blank password" -msgstr "Pàgina en &blanc" +msgstr "Contrasenya en &blanc" #: dlls/oledb32/version.rc:84 -#, fuzzy -#| msgid "Wrong password.\n" msgid "Allow &saving password" -msgstr "La contrasenya està equivocada.\n" +msgstr "Permet &desar la contrasenya" #: dlls/oledb32/version.rc:85 msgid "3. Enter the &initial catalog to use:" -msgstr "" +msgstr "3. Introduïu el catàleg &inicial per a utilitzar:" #: dlls/oledb32/version.rc:87 -#, fuzzy -#| msgid "Reset Connections" msgid "&Test Connection" -msgstr "Connexions restablertes" +msgstr "&Prova la connexió" #: dlls/oledb32/version.rc:92 msgid "Advanced" msgstr "Avançat" #: dlls/oledb32/version.rc:95 -#, fuzzy -#| msgid "Network share" msgid "Network settings" -msgstr "Recurs compartit de xarxa" +msgstr "Opcions de xarxa" #: dlls/oledb32/version.rc:96 -#, fuzzy -#| msgid "Bad impersonation level.\n" msgid "&Impersonation level:" -msgstr "El nivell de suplantació és dolent.\n" +msgstr "Nivell de &suplantació:" #: dlls/oledb32/version.rc:98 msgid "P&rotection level:" -msgstr "" +msgstr "Nivell de p&rotecció:" #: dlls/oledb32/version.rc:101 -#, fuzzy -#| msgid "Connected" msgid "Connect:" -msgstr "Connectat" +msgstr "Connecta:" #: dlls/oledb32/version.rc:103 -#, fuzzy -#| msgid "seconds" msgid "seconds." -msgstr "segons" +msgstr "segons." #: dlls/oledb32/version.rc:104 -#, fuzzy -#| msgid "Success" msgid "A&ccess:" -msgstr "Èxit" +msgstr "A&ccés:" #: dlls/oledb32/version.rc:110 -#, fuzzy -#| msgid "&All" msgid "All" -msgstr "&Tot" +msgstr "Tot" #: dlls/oledb32/version.rc:114 msgid "" "These are the initialization properties for this type of data. To edit a " "value, select a property, then choose Edit Value below." msgstr "" +"Aquestes són les propietats d'inicialització per a aquest tipus de dades. " +"Per a editar un valor, seleccioneu una propietat, llavors trieu \"Edita el " +"valor\" a sota." #: dlls/oledb32/version.rc:115 -#, fuzzy -#| msgid "&Edit..." msgid "&Edit Value..." -msgstr "E&dita..." +msgstr "&Edita el valor..." #: dlls/oledb32/version.rc:49 -#, fuzzy -#| msgid "Data Link Properties" msgid "Data Link Error" -msgstr "Propietats d'enllaç de dades" +msgstr "Error d'enllaç de dades" #: dlls/oledb32/version.rc:50 -#, fuzzy -#| msgid "Please select a file." msgid "Please select a provider." -msgstr "Si us plau, seleccioneu un fitxer." +msgstr "Si us plau, seleccioneu un proveïdor." #: dlls/oledb32/version.rc:51 msgid "" "Provider is no longer available. Ensure that the provider is installed " "properly." msgstr "" +"El proveïdor ja no està disponible. Assegureu-vos que el proveïdor estigui " +"instal·lat correctament." #: dlls/oledb32/version.rc:36 msgid "Data Link Properties" @@ -8681,38 +8628,32 @@ msgid "OLE DB Provider(s)" msgstr "Proveïdors de base de dades OLE" #: dlls/oledb32/version.rc:41 -#, fuzzy -#| msgid "Ready" msgid "Read" -msgstr "Llest" +msgstr "Lectura" #: dlls/oledb32/version.rc:42 -#, fuzzy -#| msgid "Readme:" msgid "ReadWrite" -msgstr "Llegiu-me:" +msgstr "Lectura i escriptura" #: dlls/oledb32/version.rc:43 msgid "Share Deny None" -msgstr "" +msgstr "No deneguis res de la compartició" #: dlls/oledb32/version.rc:44 msgid "Share Deny Read" -msgstr "" +msgstr "Denega lectura de la compartició" #: dlls/oledb32/version.rc:45 msgid "Share Deny Write" -msgstr "" +msgstr "Denega escriptura a la compartició" #: dlls/oledb32/version.rc:46 msgid "Share Exclusive" -msgstr "" +msgstr "Compartició exclusiva" #: dlls/oledb32/version.rc:47 -#, fuzzy -#| msgid "I/O Writes" msgid "Write" -msgstr "Escriptures d'E/S" +msgstr "Escriptura" #: dlls/oledlg/oledlg.rc:55 msgid "Insert Object" @@ -9959,16 +9900,12 @@ msgid "Cape Verde Daylight Time" msgstr "Hora d'estiu de Cap Verd" #: dlls/tzres/tzres.rc:126 -#, fuzzy -#| msgid "Hawaiian Standard Time" msgid "Haiti Standard Time" -msgstr "Hora estàndard de Hawaii" +msgstr "Hora estàndard de Haití" #: dlls/tzres/tzres.rc:127 -#, fuzzy -#| msgid "Hawaiian Daylight Time" msgid "Haiti Daylight Time" -msgstr "Hora d'estiu de Hawaii" +msgstr "Hora d'estiu de Haití" #: dlls/tzres/tzres.rc:80 msgid "Central European Standard Time" @@ -10003,16 +9940,12 @@ msgid "Iran Daylight Time" msgstr "Hora d'estiu d'Iran" #: dlls/tzres/tzres.rc:204 -#, fuzzy -#| msgid "Hawaiian Standard Time" msgid "Saint Pierre Standard Time" -msgstr "Hora estàndard de Hawaii" +msgstr "Hora estàndard de Sant Pere" #: dlls/tzres/tzres.rc:205 -#, fuzzy -#| msgid "Hawaiian Daylight Time" msgid "Saint Pierre Daylight Time" -msgstr "Hora d'estiu de Hawaii" +msgstr "Hora d'estiu de Sant Pere" #: dlls/tzres/tzres.rc:170 msgid "Namibia Standard Time" @@ -10055,16 +9988,12 @@ msgid "Central Asia Daylight Time" msgstr "Hora d'estiu de l'Àsia Central" #: dlls/tzres/tzres.rc:146 -#, fuzzy -#| msgid "Korea Standard Time" msgid "Lord Howe Standard Time" -msgstr "Hora estàndard de Corea" +msgstr "Hora estàndard de Lord Howe" #: dlls/tzres/tzres.rc:147 -#, fuzzy -#| msgid "Korea Daylight Time" msgid "Lord Howe Daylight Time" -msgstr "Hora d'estiu de Corea" +msgstr "Hora d'estiu de Lord Howe" #: dlls/tzres/tzres.rc:40 msgid "Arabic Standard Time" @@ -10115,16 +10044,12 @@ msgid "Azerbaijan Daylight Time" msgstr "Hora d'estiu de l'Azerbaidjan" #: dlls/tzres/tzres.rc:150 -#, fuzzy -#| msgid "Magadan Standard Time" msgid "Magallanes Standard Time" -msgstr "Hora estàndard de Magadan" +msgstr "Hora estàndard de Magallanes" #: dlls/tzres/tzres.rc:151 -#, fuzzy -#| msgid "Magadan Daylight Time" msgid "Magallanes Daylight Time" -msgstr "Hora d'estiu de Magadan" +msgstr "Hora d'estiu de Magallanes" #: dlls/tzres/tzres.rc:206 msgid "Samoa Standard Time" @@ -10175,16 +10100,12 @@ msgid "Line Islands Daylight Time" msgstr "Hora d'estiu de les Illes de la Línia" #: dlls/tzres/tzres.rc:92 -#, fuzzy -#| msgid "China Standard Time" msgid "Cuba Standard Time" -msgstr "Hora estàndard de la Xina" +msgstr "Hora estàndard de Cuba" #: dlls/tzres/tzres.rc:93 -#, fuzzy -#| msgid "China Daylight Time" msgid "Cuba Daylight Time" -msgstr "Hora d'estiu de la Xina" +msgstr "Hora d'estiu de Cuba" #: dlls/tzres/tzres.rc:136 msgid "Jordan Standard Time" @@ -10227,16 +10148,12 @@ msgid "Argentina Daylight Time" msgstr "Hora d'estiu de l'Argentina" #: dlls/tzres/tzres.rc:152 -#, fuzzy -#| msgid "Mauritius Standard Time" msgid "Marquesas Standard Time" -msgstr "Hora estàndard de Maurici" +msgstr "Hora estàndard de Marqueses" #: dlls/tzres/tzres.rc:153 -#, fuzzy -#| msgid "Mauritius Daylight Time" msgid "Marquesas Daylight Time" -msgstr "Hora d'estiu de Maurici" +msgstr "Hora d'estiu de Marqueses" #: dlls/tzres/tzres.rc:166 msgid "Myanmar Standard Time" @@ -10387,16 +10304,12 @@ msgid "US Eastern Daylight Time" msgstr "Hora d'estiu oriental EUA" #: dlls/tzres/tzres.rc:182 -#, fuzzy -#| msgid "Korea Standard Time" msgid "North Korea Standard Time" -msgstr "Hora estàndard de Corea" +msgstr "Hora estàndard de Corea del Nord" #: dlls/tzres/tzres.rc:183 -#, fuzzy -#| msgid "Korea Daylight Time" msgid "North Korea Daylight Time" -msgstr "Hora d'estiu de Corea" +msgstr "Hora d'estiu de Corea del Nord" #: dlls/tzres/tzres.rc:220 msgid "Tasmania Standard Time" @@ -10487,16 +10400,12 @@ msgid "Arabian Daylight Time" msgstr "Hora d'estiu de l'Àrabia" #: dlls/tzres/tzres.rc:222 -#, fuzzy -#| msgid "Mountain Standard Time" msgid "Tocantins Standard Time" -msgstr "Hora estàndard de les muntanyes" +msgstr "Hora estàndard de Tocantins" #: dlls/tzres/tzres.rc:223 -#, fuzzy -#| msgid "Mountain Daylight Time" msgid "Tocantins Daylight Time" -msgstr "Hora d'estiu de les muntanyes" +msgstr "Hora d'estiu de Tocantins" #: dlls/tzres/tzres.rc:196 msgid "Russian Standard Time" @@ -10507,16 +10416,12 @@ msgid "Russian Daylight Time" msgstr "Hora d'estiu de Rússia" #: dlls/tzres/tzres.rc:48 -#, fuzzy -#| msgid "AUS Central Standard Time" msgid "Aus Central W. Standard Time" -msgstr "Hora estàndard central AUS" +msgstr "Hora estàndard central occident d'Austràlia" #: dlls/tzres/tzres.rc:49 -#, fuzzy -#| msgid "AUS Central Daylight Time" msgid "Aus Central W. Daylight Time" -msgstr "Hora d'estiu central AUS" +msgstr "Hora d'estiu central occident d'Austràlia" #: dlls/tzres/tzres.rc:194 msgid "Romance Standard Time" @@ -10647,16 +10552,12 @@ msgid "Venezuela Daylight Time" msgstr "Hora d'estiu de Veneçuela" #: dlls/tzres/tzres.rc:62 -#, fuzzy -#| msgid "Mountain Standard Time" msgid "Bougainville Standard Time" -msgstr "Hora estàndard de les muntanyes" +msgstr "Hora estàndard de Bougainville" #: dlls/tzres/tzres.rc:63 -#, fuzzy -#| msgid "Mountain Daylight Time" msgid "Bougainville Daylight Time" -msgstr "Hora d'estiu de les muntanyes" +msgstr "Hora d'estiu de Bougainville" #: dlls/tzres/tzres.rc:128 msgid "Hawaiian Standard Time" @@ -10683,16 +10584,12 @@ msgid "New Zealand Daylight Time" msgstr "Hora d'estiu de Nova Zelanda" #: dlls/tzres/tzres.rc:34 -#, fuzzy -#| msgid "Argentina Standard Time" msgid "Aleutian Standard Time" -msgstr "Hora estàndard de l'Argentina" +msgstr "Hora estàndard aleutiana" #: dlls/tzres/tzres.rc:35 -#, fuzzy -#| msgid "Argentina Daylight Time" msgid "Aleutian Daylight Time" -msgstr "Hora d'estiu de l'Argentina" +msgstr "Hora d'estiu aleutiana" #: dlls/tzres/tzres.rc:76 msgid "Central Brazilian Standard Time" @@ -10743,16 +10640,12 @@ msgid "Egypt Daylight Time" msgstr "Hora d'estiu d'Egipte" #: dlls/tzres/tzres.rc:106 -#, fuzzy -#| msgid "Central Standard Time (Mexico)" msgid "Eastern Standard Time (Mexico)" -msgstr "Hora estàndard central (Mèxic)" +msgstr "Hora estàndard oriental (Mèxic)" #: dlls/tzres/tzres.rc:107 -#, fuzzy -#| msgid "Central Daylight Time (Mexico)" msgid "Eastern Daylight Time (Mexico)" -msgstr "Hora d'estiu central (Mèxic)" +msgstr "Hora d'estiu oriental (Mèxic)" #: dlls/tzres/tzres.rc:154 msgid "Mauritius Standard Time" @@ -10787,16 +10680,12 @@ msgid "Korea Daylight Time" msgstr "Hora d'estiu de Corea" #: dlls/tzres/tzres.rc:88 -#, fuzzy -#| msgid "Easter Island Standard Time" msgid "Chatham Islands Standard Time" -msgstr "Hora estàndard de l'Illa de Pasqua" +msgstr "Hora estàndard de les Illes de Chatham" #: dlls/tzres/tzres.rc:89 -#, fuzzy -#| msgid "Easter Island Daylight Time" msgid "Chatham Islands Daylight Time" -msgstr "Hora d'estiu de l'Illa de Pasqua" +msgstr "Hora d'estiu de les Illes de Chatham" #: dlls/tzres/tzres.rc:96 msgid "E. Africa Standard Time" @@ -10962,149 +10851,119 @@ msgstr "&Més finestres..." #: dlls/vbscript/vbscript.rc:30 msgid "Overflow" -msgstr "" +msgstr "Desbordament" #: dlls/vbscript/vbscript.rc:31 -#, fuzzy -#| msgid "Out of memory." msgid "Out of memory" -msgstr "No queda memòria." +msgstr "No queda memòria" #: dlls/vbscript/vbscript.rc:33 msgid "This array is fixed or temporarily locked" -msgstr "" +msgstr "Aquest vector és fix o està bloquejat temporalment" #: dlls/vbscript/vbscript.rc:34 -#, fuzzy -#| msgid "Data type mismatch.\n" msgid "Type mismatch" -msgstr "Els tipus de dades no es coincideixen.\n" +msgstr "Els tipus de dades no es coincideixen" #: dlls/vbscript/vbscript.rc:36 -#, fuzzy -#| msgid "I/O device error.\n" msgid "Device I/O error" -msgstr "Hi ha hagut un error de dispositiu E/S.\n" +msgstr "Error de dispositiu E/S" #: dlls/vbscript/vbscript.rc:37 -#, fuzzy -#| msgid "File already exists.\n" msgid "File already exists" -msgstr "El fitxer ja existeix.\n" +msgstr "El fitxer ja existeix" #: dlls/vbscript/vbscript.rc:38 -#, fuzzy -#| msgid "Disk full.\n" msgid "Disk full" -msgstr "El disc està ple.\n" +msgstr "El disc està ple" #: dlls/vbscript/vbscript.rc:39 -#, fuzzy -#| msgid "Too many open files.\n" msgid "Too many files" -msgstr "Hi ha massa fitxers oberts.\n" +msgstr "Hi ha massa fitxers" #: dlls/vbscript/vbscript.rc:40 -#, fuzzy -#| msgid "Access denied.\n" msgid "Permission denied" -msgstr "S'ha denegat l'accés.\n" +msgstr "S'ha denegat el permís" #: dlls/vbscript/vbscript.rc:41 msgid "Path/File access error" -msgstr "" +msgstr "Error d'accés al camí/fitxer" #: dlls/vbscript/vbscript.rc:42 -#, fuzzy -#| msgid "Path not found.\n" msgid "Path not found" -msgstr "No s'ha trobat el camí.\n" +msgstr "No s'ha trobat el camí" #: dlls/vbscript/vbscript.rc:43 -#, fuzzy -#| msgid "(value not set)" msgid "Object variable not set" -msgstr "(valor no definit)" +msgstr "La variable d'objecte no està establerta" #: dlls/vbscript/vbscript.rc:44 -#, fuzzy -#| msgid "Invalid user buffer.\n" msgid "Invalid use of Null" -msgstr "La memòria intermèdia d'usuari no és vàlida.\n" +msgstr "Ús no vàlid de Null" #: dlls/vbscript/vbscript.rc:45 msgid "Can't create necessary temporary file" -msgstr "" +msgstr "No es pot crear el fitxer temporal necessari" #: dlls/vbscript/vbscript.rc:46 -#, fuzzy -#| msgid "Automation server can't create object" msgid "ActiveX component can't create object" -msgstr "El servidor d'automatització no pot crear l'objecte" +msgstr "El component d'ActiveX no pot crear l'objecte" #: dlls/vbscript/vbscript.rc:47 -#, fuzzy -#| msgid "Object doesn't support this action" msgid "Class doesn't support Automation" -msgstr "L'objecte no accepta aquesta acció" +msgstr "La classe no permet l'automatització" #: dlls/vbscript/vbscript.rc:48 msgid "File name or class name not found during Automation operation" msgstr "" +"No s'ha trobat el nom de fitxer o nom de classe durant l'operació " +"d'automatització" #: dlls/vbscript/vbscript.rc:51 -#, fuzzy -#| msgid "Object doesn't support this action" msgid "Object doesn't support named arguments" -msgstr "L'objecte no accepta aquesta acció" +msgstr "L'objecte no accepta arguments nombrats" #: dlls/vbscript/vbscript.rc:52 -#, fuzzy -#| msgid "Object doesn't support this action" msgid "Object doesn't support current locale setting" -msgstr "L'objecte no accepta aquesta acció" +msgstr "L'objecte no accepta la configuració de localització actual" #: dlls/vbscript/vbscript.rc:53 dlls/vbscript/vbscript.rc:54 -#, fuzzy -#| msgid "Element not found.\n" msgid "Named argument not found" -msgstr "No s'ha trobat l'element.\n" +msgstr "No s'ha trobat el argument anomenat" #: dlls/vbscript/vbscript.rc:55 msgid "Wrong number of arguments or invalid property assignment" msgstr "" +"El nombre d'arguments és incorrecte o l'assignació de propietat no és vàlida" #: dlls/vbscript/vbscript.rc:56 -#, fuzzy -#| msgid "Object Class Violation" msgid "Object not a collection" -msgstr "Violació de classe d'objecte" +msgstr "L'objecte no és una colecció" #: dlls/vbscript/vbscript.rc:57 -#, fuzzy -#| msgid "Specified control was not found in message" msgid "Specified DLL function not found" -msgstr "No s'ha trobat el control especificat en el missatge" +msgstr "No s'ha trobat la funció especificada de la DLL" #: dlls/vbscript/vbscript.rc:58 msgid "Variable uses an Automation type not supported in VBScript" msgstr "" +"La variable utilitza un tipus d'automatització que no s'admet en VBScript" #: dlls/vbscript/vbscript.rc:59 msgid "The remote server machine does not exist or is unavailable" -msgstr "" +msgstr "La maquinà de servidor remota no existeix o no està disponible" #: dlls/vbscript/vbscript.rc:60 msgid "Invalid or unqualified reference" -msgstr "" +msgstr "Referència no vàlida o no qualificada" #: dlls/vbscript/vbscript.rc:62 msgid "Microsoft VBScript compilation error" -msgstr "" +msgstr "Error de compilació de Microsoft VBScript" #: dlls/vbscript/vbscript.rc:63 msgid "Microsoft VBScript runtime error" -msgstr "" +msgstr "Error d'entorn d'execució de Microsoft VBScript" #: dlls/winemac.drv/winemac.rc:33 msgid "Hide %@" @@ -11202,33 +11061,27 @@ msgstr "" #: dlls/wininet/wininet.rc:35 msgid "Effective Date" -msgstr "" +msgstr "Data efectiva" #: dlls/wininet/wininet.rc:37 -#, fuzzy -#| msgid "Security" msgid "Security Protocol" -msgstr "Seguretat" +msgstr "Protocol de seguretat" #: dlls/wininet/wininet.rc:38 -#, fuzzy -#| msgid "Signature" msgid "Signature Type" -msgstr "Signatura" +msgstr "Tipus de signatura" #: dlls/wininet/wininet.rc:39 -#, fuzzy -#| msgid "Encrypting File System" msgid "Encryption Type" -msgstr "Sistema de fitxers xifrant" +msgstr "Tipus de xifratge" #: dlls/wininet/wininet.rc:40 msgid "Privacy Strength" -msgstr "" +msgstr "Força de privacitat" #: dlls/wininet/wininet.rc:43 msgid "bits" -msgstr "" +msgstr "bits" #: dlls/wininet/winineterror.mc:26 msgid "The request has timed out.\n" @@ -13303,6 +13156,9 @@ msgid "" "\n" "hardlink hardlink management\n" msgstr "" +"- Ordres admesos -\n" +"\n" +"hardlink gestió d'enllaços durs\n" #: programs/fsutil/fsutil.mc:35 msgid "" @@ -13310,10 +13166,13 @@ msgid "" "\n" "create create a hardlink\n" msgstr "" +"- Enllaços durs - Ordres admesos -\n" +"\n" +"create crea un enllaç dur\n" #: programs/fsutil/fsutil.mc:40 msgid "Syntax: fsutil hardlink create <new> <existing>\n" -msgstr "" +msgstr "Sintaxis: fsutil hardlink create <nou> <existent>\n" #: programs/hostname/hostname.rc:30 msgid "Usage: hostname\n" @@ -17159,10 +17018,8 @@ msgid "&Beginner" msgstr "&Principiant" #: programs/winemine/winemine.rc:45 -#, fuzzy -#| msgid "Interface" msgid "&Intermediate" -msgstr "Interfície" +msgstr "&Intermedi" #: programs/winemine/winemine.rc:46 msgid "&Expert" @@ -17193,10 +17050,8 @@ msgid "Beginner" msgstr "Principiant" #: programs/winemine/winemine.rc:65 -#, fuzzy -#| msgid "Interface" msgid "Intermediate" -msgstr "Interfície" +msgstr "Intermedi" #: programs/winemine/winemine.rc:66 msgid "Expert" -- 2.29.2

1 0

[PATCH] schedsvc/tests: Use wide-char string literals.
by Michael Stefaniuc Dec. 13, 2020

Dec. 13, 2020

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/schedsvc/tests/atsvcapi.c | 2 +- dlls/schedsvc/tests/rpcapi.c | 168 ++++++++++++++++----------------- 2 files changed, 80 insertions(+), 90 deletions(-) diff --git a/dlls/schedsvc/tests/atsvcapi.c b/dlls/schedsvc/tests/atsvcapi.c index f10c9d07232..5f5ca06627a 100644 --- a/dlls/schedsvc/tests/atsvcapi.c +++ b/dlls/schedsvc/tests/atsvcapi.c @@ -52,7 +52,7 @@ static LONG CALLBACK rpc_exception_filter(EXCEPTION_POINTERS *ptrs) START_TEST(atsvcapi) { static unsigned char ncalrpc[] = "ncalrpc"; - static WCHAR task1W[] = { 'T','a','s','k','1','.','e','x','e',0 }; + static WCHAR task1W[] = L"Task1.exe"; HRESULT hr; unsigned char *binding_str; WCHAR server_name[MAX_COMPUTERNAME_LENGTH + 1]; diff --git a/dlls/schedsvc/tests/rpcapi.c b/dlls/schedsvc/tests/rpcapi.c index b791a047dce..b806b97539d 100644 --- a/dlls/schedsvc/tests/rpcapi.c +++ b/dlls/schedsvc/tests/rpcapi.c @@ -42,19 +42,6 @@ static LONG CALLBACK rpc_exception_filter(EXCEPTION_POINTERS *ptrs) START_TEST(rpcapi) { static unsigned char ncalrpc[] = "ncalrpc"; - static const WCHAR empty[] = { 0 }; - static const WCHAR Wine[] = { '\\','W','i','n','e',0 }; - static const WCHAR Wine_Folder1[] = { '\\','W','i','n','e','\\','F','o','l','d','e','r','1',0 }; - static const WCHAR Wine_Folder2[] = { '\\','W','i','n','e','\\','F','o','l','d','e','r','2',0 }; - static const WCHAR Folder1[] = { 'F','o','l','d','e','r','1',0 }; - static const WCHAR Folder2[] = { 'F','o','l','d','e','r','2',0 }; - static const WCHAR Wine_Task1[] = { '\\','W','i','n','e','\\','T','a','s','k','1',0 }; - static const WCHAR Wine_Task2[] = { '\\','W','i','n','e','\\','T','a','s','k','2',0 }; - static const WCHAR Wine_Task3[] = { '\\','W','i','n','e','\\','T','a','s','k','3',0 }; - static const WCHAR Wine_Folder1_Task1[] = { '\\','W','i','n','e','\\','F','o','l','d','e','r','1','\\','T','a','s','k','1',0 }; - static const WCHAR Task1[] = { 'T','a','s','k','1',0 }; - static const WCHAR Task2[] = { 'T','a','s','k','2',0 }; - static const WCHAR Task3[] = { 'T','a','s','k','3',0 }; static const char xml1[] = "<?xml version=\"1.0\"?>\n" "<Task xmlns=\"http://schemas.microsoft.com/windows/2004/02/mit/task\">\n" @@ -121,49 +108,49 @@ START_TEST(rpcapi) SetUnhandledExceptionFilter(old_exception_filter); - hr = SchRpcCreateFolder(Wine_Folder1, NULL, 1); + hr = SchRpcCreateFolder(L"\\Wine\\Folder1", NULL, 1); ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); - hr = SchRpcCreateFolder(Wine_Folder1, NULL, 0); + hr = SchRpcCreateFolder(L"\\Wine\\Folder1", NULL, 0); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - hr = SchRpcCreateFolder(Wine_Folder1, NULL, 0); + hr = SchRpcCreateFolder(L"\\Wine\\Folder1", NULL, 0); ok(hr == HRESULT_FROM_WIN32(ERROR_ALREADY_EXISTS), "expected ERROR_ALREADY_EXISTS, got %#x\n", hr); - hr = SchRpcCreateFolder(Wine_Folder2+1, empty, 0); + hr = SchRpcCreateFolder(L"Wine\\Folder2", L"", 0); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - hr = SchRpcDelete(Wine+1, 0); + hr = SchRpcDelete(L"Wine", 0); ok(hr == HRESULT_FROM_WIN32(ERROR_DIR_NOT_EMPTY), "expected ERROR_DIR_NOT_EMPTY, got %#x\n", hr); - hr = SchRpcDelete(Wine_Folder1+1, 1); + hr = SchRpcDelete(L"Wine\\Folder1", 1); ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); - hr = SchRpcDelete(Wine_Folder1+1, 0); + hr = SchRpcDelete(L"Wine\\Folder1", 0); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - hr = SchRpcDelete(Wine_Folder2, 0); + hr = SchRpcDelete(L"\\Wine\\Folder2", 0); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - hr = SchRpcDelete(Wine, 0); + hr = SchRpcDelete(L"\\Wine", 0); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - hr = SchRpcDelete(Wine, 0); + hr = SchRpcDelete(L"\\Wine", 0); ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) || broken(hr == S_OK), /* Early versions of Win 10 */ "expected ERROR_FILE_NOT_FOUND, got %#x\n", hr); - hr = SchRpcDelete(empty, 0); + hr = SchRpcDelete(L"", 0); ok(hr == E_ACCESSDENIED /* win7 */ || hr == E_INVALIDARG /* vista */, "expected E_ACCESSDENIED, got %#x\n", hr); - hr = SchRpcCreateFolder(Wine, NULL, 0); + hr = SchRpcCreateFolder(L"\\Wine", NULL, 0); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); MultiByteToWideChar(CP_ACP, 0, xml1, -1, xmlW, ARRAY_SIZE(xmlW)); path = NULL; info = NULL; - hr = SchRpcRegisterTask(Wine+1, xmlW, TASK_VALIDATE_ONLY, NULL, TASK_LOGON_NONE, 0, NULL, &path, &info); + hr = SchRpcRegisterTask(L"Wine", xmlW, TASK_VALIDATE_ONLY, NULL, TASK_LOGON_NONE, 0, NULL, &path, &info); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); ok(!path, "expected NULL, path %p\n", path); ok(!info, "expected NULL, info %p\n", info); @@ -172,12 +159,13 @@ START_TEST(rpcapi) { path = NULL; info = NULL; - hr = SchRpcRegisterTask(Wine_Task1, xmlW, create_new_task[i].flags, NULL, TASK_LOGON_NONE, 0, NULL, &path, &info); + hr = SchRpcRegisterTask(L"\\Wine\\Task1", xmlW, create_new_task[i].flags, NULL, + TASK_LOGON_NONE, 0, NULL, &path, &info); ok(hr == create_new_task[i].hr, "%u: expected %#x, got %#x\n", i, create_new_task[i].hr, hr); if (hr == S_OK) { - hr = SchRpcDelete(Wine_Task1, 0); + hr = SchRpcDelete(L"\\Wine\\Task1", 0); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); ok(!info, "expected NULL, info %p\n", info); MIDL_user_free(path); @@ -186,7 +174,7 @@ START_TEST(rpcapi) path = NULL; info = NULL; - hr = SchRpcRegisterTask(Wine_Task1, xmlW, TASK_VALIDATE_ONLY, NULL, TASK_LOGON_NONE, 0, NULL, &path, &info); + hr = SchRpcRegisterTask(L"\\Wine\\Task1", xmlW, TASK_VALIDATE_ONLY, NULL, TASK_LOGON_NONE, 0, NULL, &path, &info); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); ok(!path, "expected NULL, path %p\n", path); ok(!info, "expected NULL, info %p\n", info); @@ -200,9 +188,9 @@ START_TEST(rpcapi) path = NULL; info = NULL; - hr = SchRpcRegisterTask(Wine_Folder1_Task1+1, xmlW, TASK_CREATE, NULL, TASK_LOGON_NONE, 0, NULL, &path, &info); + hr = SchRpcRegisterTask(L"Wine\\Folder1\\Task1", xmlW, TASK_CREATE, NULL, TASK_LOGON_NONE, 0, NULL, &path, &info); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - ok(!lstrcmpW(path, Wine_Folder1_Task1) /* win7 */ || !lstrcmpW(path, Wine_Folder1_Task1+1) /* vista */, + ok(!lstrcmpW(path, L"\\Wine\\Folder1\\Task1") /* win7 */ || !lstrcmpW(path, L"Wine\\Folder1\\Task1") /* vista */, "expected \\Wine\\Folder1\\Task1, task actual path %s\n", wine_dbgstr_w(path)); ok(!info, "expected NULL, info %p\n", info); MIDL_user_free(path); @@ -211,11 +199,13 @@ START_TEST(rpcapi) { path = NULL; info = NULL; - hr = SchRpcRegisterTask(Wine_Folder1_Task1+1, xmlW, open_existing_task[i].flags, NULL, TASK_LOGON_NONE, 0, NULL, &path, &info); + hr = SchRpcRegisterTask(L"Wine\\Folder1\\Task1", xmlW, open_existing_task[i].flags, NULL, + TASK_LOGON_NONE, 0, NULL, &path, &info); ok(hr == open_existing_task[i].hr, "%u: expected %#x, got %#x\n", i, open_existing_task[i].hr, hr); if (hr == S_OK) { - ok(!lstrcmpW(path, Wine_Folder1_Task1) /* win7 */ || !lstrcmpW(path, Wine_Folder1_Task1+1) /* vista */, + ok(!lstrcmpW(path, L"\\Wine\\Folder1\\Task1") /* win7 */ || + !lstrcmpW(path, L"Wine\\Folder1\\Task1") /* vista */, "expected \\Wine\\Folder1\\Task1, task actual path %s\n", wine_dbgstr_w(path)); MIDL_user_free(path); } @@ -226,55 +216,55 @@ START_TEST(rpcapi) path = NULL; info = NULL; - hr = SchRpcRegisterTask(Wine_Folder1_Task1+1, xmlW, TASK_CREATE, NULL, TASK_LOGON_NONE, 0, NULL, &path, &info); + hr = SchRpcRegisterTask(L"Wine\\Folder1\\Task1", xmlW, TASK_CREATE, NULL, TASK_LOGON_NONE, 0, NULL, &path, &info); ok(hr == HRESULT_FROM_WIN32(ERROR_ALREADY_EXISTS), "expected ERROR_ALREADY_EXISTS, got %#x\n", hr); ok(!path, "expected NULL, path %p\n", path); ok(!info, "expected NULL, info %p\n", info); count = 0; xml = NULL; - hr = SchRpcRetrieveTask(Wine_Folder1_Task1, empty, &count, &xml); + hr = SchRpcRetrieveTask(L"\\Wine\\Folder1\\Task1", L"", &count, &xml); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); if (hr == S_OK) trace("%s\n", wine_dbgstr_w(xml)); MIDL_user_free(xml); - hr = SchRpcDelete(Wine_Folder1_Task1+1, 0); + hr = SchRpcDelete(L"Wine\\Folder1\\Task1", 0); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - hr = SchRpcDelete(Wine_Folder1+1, 0); + hr = SchRpcDelete(L"Wine\\Folder1", 0); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - hr = SchRpcDelete(Wine+1, 0); + hr = SchRpcDelete(L"Wine", 0); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); start_index = 0; count = 0xdeadbeef; names = NULL; - hr = SchRpcEnumFolders(Wine, TASK_ENUM_HIDDEN, &start_index, 0, &count, &names); + hr = SchRpcEnumFolders(L"\\Wine", TASK_ENUM_HIDDEN, &start_index, 0, &count, &names); ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "expected ERROR_FILE_NOT_FOUND, got %#x\n", hr); ok(!count, "expected 0, got %u\n", count); ok(!start_index, "expected 0, got %u\n", start_index); ok(!names, "expected NULL, got %p\n", names); - hr = SchRpcCreateFolder(Wine, NULL, 0); + hr = SchRpcCreateFolder(L"\\Wine", NULL, 0); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); start_index = 0; count = 0xdeadbeef; names = NULL; - hr = SchRpcEnumFolders(Wine, 0, &start_index, 0, &count, &names); + hr = SchRpcEnumFolders(L"\\Wine", 0, &start_index, 0, &count, &names); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); ok(!count, "expected 0, got %u\n", count); ok(!start_index, "expected 0, got %u\n", start_index); ok(!names, "expected NULL, got %p\n", names); - hr = SchRpcCreateFolder(Wine_Folder1, NULL, 0); + hr = SchRpcCreateFolder(L"\\Wine\\Folder1", NULL, 0); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - hr = SchRpcCreateFolder(Wine_Folder2, NULL, 0); + hr = SchRpcCreateFolder(L"\\Wine\\Folder2", NULL, 0); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); start_index = 0; count = 0xdeadbeef; names = NULL; - hr = SchRpcEnumFolders(Wine, 0, &start_index, 0, &count, &names); + hr = SchRpcEnumFolders(L"\\Wine", 0, &start_index, 0, &count, &names); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); ok(count == 2, "expected 2, got %u\n", count); ok(start_index == 2, "expected 2, got %u\n", start_index); @@ -282,9 +272,9 @@ START_TEST(rpcapi) enumed = 0; for (i = 0; i < count; i++) { - if (!lstrcmpW(names[i], Folder1)) + if (!lstrcmpW(names[i], L"Folder1")) enumed += 1; - else if (!lstrcmpW(names[i], Folder2)) + else if (!lstrcmpW(names[i], L"Folder2")) enumed += 2; MIDL_user_free(names[i]); } @@ -294,19 +284,19 @@ START_TEST(rpcapi) start_index = 0; count = 0xdeadbeef; names = NULL; - hr = SchRpcEnumFolders(Wine, 0, &start_index, 1, &count, &names); + hr = SchRpcEnumFolders(L"\\Wine", 0, &start_index, 1, &count, &names); ok(hr == S_FALSE, "expected S_FALSE, got %#x\n", hr); ok(count == 1, "expected 1, got %u\n", count); ok(start_index == 1, "expected 1, got %u\n", start_index); ok(names != NULL, "names should not be NULL\n"); - ok(!lstrcmpW(names[0], Folder1) || !lstrcmpW(names[0], Folder2), "got %s\n", wine_dbgstr_w(names[0])); + ok(!lstrcmpW(names[0], L"Folder1") || !lstrcmpW(names[0], L"Folder2"), "got %s\n", wine_dbgstr_w(names[0])); MIDL_user_free(names[0]); MIDL_user_free(names); start_index = 0; count = 0xdeadbeef; names = NULL; - hr = SchRpcEnumFolders(Wine, 0, &start_index, 2, &count, &names); + hr = SchRpcEnumFolders(L"\\Wine", 0, &start_index, 2, &count, &names); ok(hr == S_FALSE, "expected S_FALSE, got %#x\n", hr); ok(count == 2, "expected 2, got %u\n", count); ok(start_index == 2, "expected 2, got %u\n", start_index); @@ -314,9 +304,9 @@ START_TEST(rpcapi) enumed = 0; for (i = 0; i < count; i++) { - if (!lstrcmpW(names[i], Folder1)) + if (!lstrcmpW(names[i], L"Folder1")) enumed += 1; - else if (!lstrcmpW(names[i], Folder2)) + else if (!lstrcmpW(names[i], L"Folder2")) enumed += 2; MIDL_user_free(names[i]); } @@ -326,7 +316,7 @@ START_TEST(rpcapi) start_index = 0; count = 0xdeadbeef; names = NULL; - hr = SchRpcEnumFolders(Wine, 0, &start_index, 10, &count, &names); + hr = SchRpcEnumFolders(L"\\Wine", 0, &start_index, 10, &count, &names); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); ok(count == 2, "expected 2, got %u\n", count); ok(start_index == 2, "expected 2, got %u\n", start_index); @@ -334,9 +324,9 @@ START_TEST(rpcapi) enumed = 0; for (i = 0; i < count; i++) { - if (!lstrcmpW(names[i], Folder1)) + if (!lstrcmpW(names[i], L"Folder1")) enumed += 1; - else if (!lstrcmpW(names[i], Folder2)) + else if (!lstrcmpW(names[i], L"Folder2")) enumed += 2; MIDL_user_free(names[i]); } @@ -346,21 +336,21 @@ START_TEST(rpcapi) start_index = 10; count = 0xdeadbeef; names = NULL; - hr = SchRpcEnumFolders(Wine, 0, &start_index, 0, &count, &names); + hr = SchRpcEnumFolders(L"\\Wine", 0, &start_index, 0, &count, &names); ok(hr == S_FALSE, "expected S_FALSE, got %#x\n", hr); ok(!count, "expected 0, got %u\n", count); ok(start_index == 10, "expected 10, got %u\n", start_index); ok(!names, "expected NULL, got %p\n", names); - hr = SchRpcDelete(Wine_Folder1+1, 0); + hr = SchRpcDelete(L"Wine\\Folder1", 0); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - hr = SchRpcDelete(Wine_Folder2, 0); + hr = SchRpcDelete(L"\\Wine\\Folder2", 0); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); start_index = 0; count = 0xdeadbeef; names = NULL; - hr = SchRpcEnumTasks(Wine_Folder1, TASK_ENUM_HIDDEN, &start_index, 0, &count, &names); + hr = SchRpcEnumTasks(L"\\Wine\\Folder1", TASK_ENUM_HIDDEN, &start_index, 0, &count, &names); ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "expected ERROR_FILE_NOT_FOUND, got %#x\n", hr); ok(!count, "expected 0, got %u\n", count); ok(!start_index, "expected 0, got %u\n", start_index); @@ -368,25 +358,25 @@ START_TEST(rpcapi) path = NULL; info = NULL; - hr = SchRpcRegisterTask(Wine_Task1+1, xmlW, TASK_CREATE, NULL, TASK_LOGON_NONE, 0, NULL, &path, &info); + hr = SchRpcRegisterTask(L"Wine\\Task1", xmlW, TASK_CREATE, NULL, TASK_LOGON_NONE, 0, NULL, &path, &info); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - ok(!lstrcmpW(path, Wine_Task1) /* win7 */ || !lstrcmpW(path, Wine_Task1+1) /* vista */, + ok(!lstrcmpW(path, L"\\Wine\\Task1") /* win7 */ || !lstrcmpW(path, L"Wine\\Task1") /* vista */, "expected \\Wine\\Task1, task actual path %s\n", wine_dbgstr_w(path)); ok(!info, "expected NULL, info %p\n", info); MIDL_user_free(path); path = NULL; info = NULL; - hr = SchRpcRegisterTask(Wine_Task2, xmlW, TASK_CREATE, NULL, TASK_LOGON_NONE, 0, NULL, &path, &info); + hr = SchRpcRegisterTask(L"\\Wine\\Task2", xmlW, TASK_CREATE, NULL, TASK_LOGON_NONE, 0, NULL, &path, &info); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - ok(!lstrcmpW(path, Wine_Task2), "expected \\Wine\\Task2, task actual path %s\n", wine_dbgstr_w(path)); + ok(!lstrcmpW(path, L"\\Wine\\Task2"), "expected \\Wine\\Task2, task actual path %s\n", wine_dbgstr_w(path)); ok(!info, "expected NULL, info %p\n", info); MIDL_user_free(path); start_index = 0; count = 0xdeadbeef; names = NULL; - hr = SchRpcEnumTasks(Wine, 0, &start_index, 0, &count, &names); + hr = SchRpcEnumTasks(L"\\Wine", 0, &start_index, 0, &count, &names); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); ok(count == 2, "expected 2, got %u\n", count); ok(start_index == 2, "expected 2, got %u\n", start_index); @@ -394,9 +384,9 @@ START_TEST(rpcapi) enumed = 0; for (i = 0; i < count; i++) { - if (!lstrcmpW(names[i], Task1)) + if (!lstrcmpW(names[i], L"Task1")) enumed += 1; - else if (!lstrcmpW(names[i], Task2)) + else if (!lstrcmpW(names[i], L"Task2")) enumed += 2; MIDL_user_free(names[i]); } @@ -406,13 +396,13 @@ START_TEST(rpcapi) start_index = 0; count = 0xdeadbeef; names = NULL; - hr = SchRpcEnumTasks(Wine, 0, &start_index, 1, &count, &names); + hr = SchRpcEnumTasks(L"\\Wine", 0, &start_index, 1, &count, &names); ok(hr == S_FALSE, "expected S_FALSE, got %#x\n", hr); ok(count == 1, "expected 1, got %u\n", count); ok(start_index == 1, "expected 1, got %u\n", start_index); ok(names != NULL, "names should not be NULL\n"); /* returned name depends whether directory randomization is on */ - ok(!lstrcmpW(names[0], Task1) || !lstrcmpW(names[0], Task2), + ok(!lstrcmpW(names[0], L"Task1") || !lstrcmpW(names[0], L"Task2"), "expected Task1, got %s\n", wine_dbgstr_w(names[0])); MIDL_user_free(names[0]); MIDL_user_free(names); @@ -420,7 +410,7 @@ START_TEST(rpcapi) start_index = 0; count = 0xdeadbeef; names = NULL; - hr = SchRpcEnumTasks(Wine, 0, &start_index, 2, &count, &names); + hr = SchRpcEnumTasks(L"\\Wine", 0, &start_index, 2, &count, &names); ok(hr == S_FALSE, "expected S_FALSE, got %#x\n", hr); ok(count == 2, "expected 2, got %u\n", count); ok(start_index == 2, "expected 2, got %u\n", start_index); @@ -428,9 +418,9 @@ START_TEST(rpcapi) enumed = 0; for (i = 0; i < count; i++) { - if (!lstrcmpW(names[i], Task1)) + if (!lstrcmpW(names[i], L"Task1")) enumed += 1; - else if (!lstrcmpW(names[i], Task2)) + else if (!lstrcmpW(names[i], L"Task2")) enumed += 2; MIDL_user_free(names[i]); } @@ -440,7 +430,7 @@ START_TEST(rpcapi) start_index = 0; count = 0xdeadbeef; names = NULL; - hr = SchRpcEnumTasks(Wine, 0, &start_index, 10, &count, &names); + hr = SchRpcEnumTasks(L"\\Wine", 0, &start_index, 10, &count, &names); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); ok(count == 2, "expected 2, got %u\n", count); ok(start_index == 2, "expected 2, got %u\n", start_index); @@ -448,9 +438,9 @@ START_TEST(rpcapi) enumed = 0; for (i = 0; i < count; i++) { - if (!lstrcmpW(names[i], Task1)) + if (!lstrcmpW(names[i], L"Task1")) enumed += 1; - else if (!lstrcmpW(names[i], Task2)) + else if (!lstrcmpW(names[i], L"Task2")) enumed += 2; MIDL_user_free(names[i]); } @@ -459,22 +449,22 @@ START_TEST(rpcapi) path = NULL; info = NULL; - hr = SchRpcRegisterTask(Wine_Task3+1, xmlW, TASK_CREATE, NULL, TASK_LOGON_NONE, 0, NULL, &path, &info); + hr = SchRpcRegisterTask(L"Wine\\Task3", xmlW, TASK_CREATE, NULL, TASK_LOGON_NONE, 0, NULL, &path, &info); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - ok(!lstrcmpW(path, Wine_Task3) /* win7 */ || !lstrcmpW(path, Wine_Task3+1) /* vista */, + ok(!lstrcmpW(path, L"\\Wine\\Task3") /* win7 */ || !lstrcmpW(path, L"Wine\\Task3") /* vista */, "expected \\Wine\\Task3, task actual path %s\n", wine_dbgstr_w(path)); ok(!info, "expected NULL, info %p\n", info); MIDL_user_free(path); count = 0xdeadbeef; names = NULL; - hr = SchRpcEnumTasks(Wine+1, 0, &start_index, 10, &count, &names); + hr = SchRpcEnumTasks(L"Wine", 0, &start_index, 10, &count, &names); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); ok(count == 1, "expected 1, got %u\n", count); ok(start_index == 3, "expected 3, got %u\n", start_index); ok(names != NULL, "names should not be NULL\n"); /* returned name depends whether directory randomization is on */ - ok(!lstrcmpW(names[0], Task1) || !lstrcmpW(names[0], Task2) || !lstrcmpW(names[0], Task3), + ok(!lstrcmpW(names[0], L"Task1") || !lstrcmpW(names[0], L"Task2") || !lstrcmpW(names[0], L"Task3"), "expected Task3, got %s\n", wine_dbgstr_w(names[0])); MIDL_user_free(names[0]); MIDL_user_free(names); @@ -482,45 +472,45 @@ START_TEST(rpcapi) if (0) /* crashes under win7 */ { hr = SchRpcGetTaskInfo(NULL, 0, NULL, NULL); - hr = SchRpcGetTaskInfo(Task1, 0, NULL, NULL); - hr = SchRpcGetTaskInfo(Task1, 0, &enabled, NULL); - hr = SchRpcGetTaskInfo(Task1, 0, NULL, &state); + hr = SchRpcGetTaskInfo(L"Task1", 0, NULL, NULL); + hr = SchRpcGetTaskInfo(L"Task1", 0, &enabled, NULL); + hr = SchRpcGetTaskInfo(L"Task1", 0, NULL, &state); } - hr = SchRpcGetTaskInfo(Task1, 0, &enabled, &state); + hr = SchRpcGetTaskInfo(L"Task1", 0, &enabled, &state); ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "expected ERROR_FILE_NOT_FOUND, got %#x\n", hr); enabled = state = 0xdeadbeef; - hr = SchRpcGetTaskInfo(Wine_Task1, 0, &enabled, &state); + hr = SchRpcGetTaskInfo(L"\\Wine\\Task1", 0, &enabled, &state); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); ok(enabled == 0, "expected 0, got %u\n", enabled); ok(state == TASK_STATE_UNKNOWN, "expected TASK_STATE_UNKNOWN, got %u\n", state); enabled = state = 0xdeadbeef; - hr = SchRpcGetTaskInfo(Wine_Task1, SCH_FLAG_STATE, &enabled, &state); + hr = SchRpcGetTaskInfo(L"\\Wine\\Task1", SCH_FLAG_STATE, &enabled, &state); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); ok(enabled == 0, "expected 0, got %u\n", enabled); ok(state == TASK_STATE_DISABLED, "expected TASK_STATE_DISABLED, got %u\n", state); - hr = SchRpcEnableTask(Wine_Task1, 0xdeadbeef); + hr = SchRpcEnableTask(L"\\Wine\\Task1", 0xdeadbeef); todo_wine ok(hr == S_OK, "expected S_OK, got %#x\n", hr); enabled = state = 0xdeadbeef; - hr = SchRpcGetTaskInfo(Wine_Task1, SCH_FLAG_STATE, &enabled, &state); + hr = SchRpcGetTaskInfo(L"\\Wine\\Task1", SCH_FLAG_STATE, &enabled, &state); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); todo_wine ok(enabled == 1, "expected 1, got %u\n", enabled); todo_wine ok(state == TASK_STATE_READY, "expected TASK_STATE_READY, got %u\n", state); - hr = SchRpcDelete(Wine_Task1+1, 0); + hr = SchRpcDelete(L"Wine\\Task1", 0); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - hr = SchRpcDelete(Wine_Task2+1, 0); + hr = SchRpcDelete(L"Wine\\Task2", 0); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - hr = SchRpcDelete(Wine_Task3+1, 0); + hr = SchRpcDelete(L"Wine\\Task3", 0); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - hr = SchRpcDelete(Wine, 0); + hr = SchRpcDelete(L"\\Wine", 0); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); path = NULL; -- 2.26.2

2 2

[PATCH] ntdll: Only build Linux-specific functions on Linux
by Gerald Pfeifer Dec. 13, 2020

Dec. 13, 2020

logical_proc_info_add_by_id, logical_proc_info_add_cache, logical_proc_info_add_group, and logical_proc_info_add_numa_node are only useful and invoked on Linux, so disable their build elsewhere. (Without this compilers will, rightfully, warn about unused functions. GCC definitely does.) Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> --- dlls/ntdll/unix/system.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index a889b2e020c..5130b4c18ba 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -506,6 +506,8 @@ void init_cpu_info(void) cpu_info.Architecture, cpu_info.Level, cpu_info.Revision, cpu_info.FeatureSet ); } +#ifdef linux + static BOOL grow_logical_proc_buf( SYSTEM_LOGICAL_PROCESSOR_INFORMATION **pdata, DWORD *max_len ) { SYSTEM_LOGICAL_PROCESSOR_INFORMATION *new_data; @@ -752,6 +754,8 @@ static BOOL logical_proc_info_add_group( SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX return TRUE; } +#endif + #ifdef linux /* Helper function for counting bitmap values as commonly used by the Linux kernel -- 2.28.0

2 2

[PATCH] hnetcfg/tests: Use wide-char string literals.
by Michael Stefaniuc Dec. 13, 2020

Dec. 13, 2020

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/hnetcfg/tests/policy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hnetcfg/tests/policy.c b/dlls/hnetcfg/tests/policy.c index 416049c0093..e2606933079 100644 --- a/dlls/hnetcfg/tests/policy.c +++ b/dlls/hnetcfg/tests/policy.c @@ -109,7 +109,7 @@ static void test_interfaces(void) static void test_NetFwAuthorizedApplication(void) { INetFwAuthorizedApplication *app; - static WCHAR empty[] = {0}; + static WCHAR empty[] = L""; UNIVERSAL_NAME_INFOW *info; WCHAR fullpath[MAX_PATH]; WCHAR netpath[MAX_PATH]; -- 2.26.2

1 0

[PATCH] wldap32/tests: Use wide-char string literals.
by Michael Stefaniuc Dec. 13, 2020

Dec. 13, 2020

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wldap32/tests/parse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wldap32/tests/parse.c b/dlls/wldap32/tests/parse.c index c982be9e592..9fdd4db03ad 100644 --- a/dlls/wldap32/tests/parse.c +++ b/dlls/wldap32/tests/parse.c @@ -98,7 +98,7 @@ static void test_ldap_parse_sort_control( LDAP *ld ) static void test_ldap_search_extW( LDAP *ld ) { ULONG ret, message, timelimit; - WCHAR base[] = {0}, filter[] = {'o','u','=','*',0}; + WCHAR base[] = L"", filter[] = L"ou=*"; timelimit = 20; ret = ldap_search_extW( ld, base, LDAP_SCOPE_SUBTREE, filter, NULL, 0, NULL, NULL, timelimit, 0, &message ); -- 2.26.2

1 0

[PATCH] atl100/tests: Use wide-char string literals.
by Michael Stefaniuc Dec. 13, 2020

Dec. 13, 2020

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/atl100/tests/atl.c | 59 +++++++++++++++-------------------------- 1 file changed, 21 insertions(+), 38 deletions(-) diff --git a/dlls/atl100/tests/atl.c b/dlls/atl100/tests/atl.c index d23c53c1047..71e25b3fb3e 100644 --- a/dlls/atl100/tests/atl.c +++ b/dlls/atl100/tests/atl.c @@ -43,24 +43,12 @@ static const GUID CATID_CatTest1 = static const GUID CATID_CatTest2 = {0x178fc163,0x0000,0x0000,{0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x46}}; #define CATID_CATTEST2_STR "178fc163-0000-0000-0000-000000000246" - -static const WCHAR emptyW[] = {'\0'}; -static const WCHAR randomW[] = {'r','a','n','d','o','m','\0'}; -static const WCHAR progid1W[] = {'S','h','e','l','l','.','E','x','p','l','o','r','e','r','.','2','\0'}; -static const WCHAR clsid1W[] = {'{','8','8','5','6','f','9','6','1','-','3','4','0','a','-', - '1','1','d','0','-','a','9','6','b','-', - '0','0','c','0','4','f','d','7','0','5','a','2','}','\0'}; -static const WCHAR url1W[] = {'h','t','t','p',':','/','/','t','e','s','t','.','w','i','n','e','h','q', - '.','o','r','g','/','t','e','s','t','s','/','w','i','n','e','h','q','_', - 's','n','a','p','s','h','o','t','/','\0'}; -static const WCHAR mshtml1W[] = {'m','s','h','t','m','l',':','<','h','t','m','l','>','<','b','o','d','y','>', - 't','e','s','t','<','/','b','o','d','y','>','<','/','h','t','m','l','>','\0'}; -static const WCHAR mshtml2W[] = {'M','S','H','T','M','L',':','<','h','t','m','l','>','<','b','o','d','y','>', - 't','e','s','t','<','/','b','o','d','y','>','<','/','h','t','m','l','>','\0'}; -static const WCHAR mshtml3W[] = {'<','h','t','m','l','>','<','b','o','d','y','>', 't','e','s','t', - '<','/','b','o','d','y','>','<','/','h','t','m','l','>','\0'}; -static const WCHAR fileW[] = {'f','i','l','e',':','/','/','/','\0'}; -static const WCHAR html_fileW[] = {'t','e','s','t','.','h','t','m','l','\0'}; +static const WCHAR progid1W[] = L"Shell.Explorer.2"; +static const WCHAR clsid1W[] = L"{8856f961-340a-11d0-a96b-00c04fd705a2}"; +static const WCHAR url1W[] = L"http://test.winehq.org/tests/winehq_snapshot/"; +static const WCHAR mshtml1W[] = L"mshtml:<html><body>test</body></html>"; +static const WCHAR mshtml2W[] = L"MSHTML:<html><body>test</body></html>"; +static const WCHAR mshtml3W[] = L"<html><body>test</body></html>"; static const char html_str[] = "<html><body>test</body><html>"; static BOOL is_token_admin(HANDLE token) @@ -292,9 +280,6 @@ static void test_typelib(void) BSTR path; HRESULT hres; - static const WCHAR scrrun_dll_suffixW[] = {'\\','s','c','r','r','u','n','.','d','l','l',0}; - static const WCHAR mshtml_tlb_suffixW[] = {'\\','m','s','h','t','m','l','.','t','l','b',0}; - inst = LoadLibraryA("scrrun.dll"); ok(inst != NULL, "Could not load scrrun.dll\n"); @@ -304,8 +289,8 @@ static void test_typelib(void) FreeLibrary(inst); len = SysStringLen(path); - ok(len > ARRAY_SIZE(scrrun_dll_suffixW) - && lstrcmpiW(path+len-ARRAY_SIZE(scrrun_dll_suffixW), scrrun_dll_suffixW), + ok(len > ARRAY_SIZE(L"\\scrrun.dll") + && lstrcmpiW(path+len-ARRAY_SIZE(L"\\scrrun.dll"), L"\\scrrun.dll"), "unexpected path %s\n", wine_dbgstr_w(path)); SysFreeString(path); ok(typelib != NULL, "typelib == NULL\n"); @@ -320,8 +305,8 @@ static void test_typelib(void) FreeLibrary(inst); len = SysStringLen(path); - ok(len > ARRAY_SIZE(mshtml_tlb_suffixW) - && lstrcmpiW(path+len-ARRAY_SIZE(mshtml_tlb_suffixW), mshtml_tlb_suffixW), + ok(len > ARRAY_SIZE(L"\\mshtml.tlb") + && lstrcmpiW(path+len-ARRAY_SIZE(L"\\mshtml.tlb"), L"\\mshtml.tlb"), "unexpected path %s\n", wine_dbgstr_w(path)); SysFreeString(path); ok(typelib != NULL, "typelib == NULL\n"); @@ -589,12 +574,10 @@ static HRESULT WINAPI Dispatch_GetTypeInfo(IDispatch *iface, UINT iTInfo, LCID l ITypeLib *typelib; HRESULT hres; - static const WCHAR mshtml_tlbW[] = {'m','s','h','t','m','l','.','t','l','b',0}; - ok(!iTInfo, "iTInfo = %d\n", iTInfo); ok(!lcid, "lcid = %x\n", lcid); - hres = LoadTypeLib(mshtml_tlbW, &typelib); + hres = LoadTypeLib(L"mshtml.tlb", &typelib); ok(hres == S_OK, "LoadTypeLib failed: %08x\n", hres); hres = ITypeLib_GetTypeInfoOfGuid(typelib, &IID_IHTMLElement, ppTInfo); @@ -679,8 +662,8 @@ static void test_ax_win(void) static HMODULE hinstance = 0; static const WCHAR cls_names[][16] = { - {'A','t','l','A','x','W','i','n','1','0','0',0}, - {'A','t','l','A','x','W','i','n','L','i','c','1','0','0',0} + L"AtlAxWin100", + L"AtlAxWinLic100" }; ret = AtlAxWinInit(); @@ -706,7 +689,7 @@ static void test_ax_win(void) if (control) IUnknown_Release(control); DestroyWindow(hwnd); - hwnd = CreateWindowW(cls_names[i], emptyW, 0, 100, 100, 100, 100, NULL, NULL, NULL, NULL); + hwnd = CreateWindowW(cls_names[i], L"", 0, 100, 100, 100, 100, NULL, NULL, NULL, NULL); ok(hwnd != NULL, "CreateWindow failed!\n"); control = (IUnknown *)0xdeadbeef; res = AtlAxGetControl(hwnd, &control); @@ -715,7 +698,7 @@ static void test_ax_win(void) if (control) IUnknown_Release(control); DestroyWindow(hwnd); - hwnd = CreateWindowW(cls_names[i], randomW, 0, 100, 100, 100, 100, NULL, NULL, NULL, NULL); + hwnd = CreateWindowW(cls_names[i], L"random", 0, 100, 100, 100, 100, NULL, NULL, NULL, NULL); todo_wine ok(!hwnd, "returned %p\n", hwnd); if(hwnd) DestroyWindow(hwnd); @@ -772,7 +755,7 @@ static void test_ax_win(void) ret = GetTempPathW(MAX_PATH, pathW); ok(ret, "GetTempPath failed!\n"); - lstrcatW(pathW, html_fileW); + lstrcatW(pathW, L"test.html"); hfile = CreateFileW(pathW, GENERIC_WRITE, 0, NULL, CREATE_NEW, 0, 0); ok(hfile != INVALID_HANDLE_VALUE, "failed to create file\n"); ret = WriteFile(hfile, html_str, sizeof(html_str), &ret_size, NULL); @@ -790,7 +773,7 @@ static void test_ax_win(void) DestroyWindow(hwnd); /* test file:// scheme */ - lstrcpyW(file_uri1W, fileW); + lstrcpyW(file_uri1W, L"file:///"); lstrcatW(file_uri1W, pathW); hwnd = CreateWindowW(cls_names[i], file_uri1W, 0, 100, 100, 100, 100, NULL, NULL, NULL, NULL); ok(hwnd != NULL, "CreateWindow failed!\n"); @@ -940,7 +923,7 @@ static void test_AtlAxCreateControl(void) control = (IUnknown *)0xdeadbeef; hwnd = create_container_window(); ok(hwnd != NULL, "create window failed!\n"); - hr = AtlAxCreateControlEx(emptyW, hwnd, NULL, &container, &control, &IID_NULL, NULL); + hr = AtlAxCreateControlEx(L"", hwnd, NULL, &container, &control, &IID_NULL, NULL); ok(hr == S_OK, "got 0x%08x\n", hr); todo_wine ok(container != NULL, "returned %p!\n", container); ok(!control, "returned %p\n", control); @@ -950,7 +933,7 @@ static void test_AtlAxCreateControl(void) control = (IUnknown *)0xdeadbeef; hwnd = create_container_window(); ok(hwnd != NULL, "create window failed!\n"); - hr = AtlAxCreateControlEx(randomW, hwnd, NULL, &container, &control, &IID_NULL, NULL); + hr = AtlAxCreateControlEx(L"random", hwnd, NULL, &container, &control, &IID_NULL, NULL); ok(hr == CO_E_CLASSSTRING, "got 0x%08x\n", hr); ok(!container, "returned %p!\n", container); ok(!control, "returned %p\n", control); @@ -1028,7 +1011,7 @@ static void test_AtlAxCreateControl(void) ret = GetTempPathW(MAX_PATH, pathW); ok(ret, "GetTempPath failed!\n"); - lstrcatW(pathW, html_fileW); + lstrcatW(pathW, L"test.html"); hfile = CreateFileW(pathW, GENERIC_WRITE, 0, NULL, CREATE_NEW, 0, 0); ok(hfile != INVALID_HANDLE_VALUE, "failed to create file\n"); ret = WriteFile(hfile, html_str, sizeof(html_str), &ret_size, NULL); @@ -1049,7 +1032,7 @@ static void test_AtlAxCreateControl(void) DestroyWindow(hwnd); /* test file:// scheme */ - lstrcpyW(file_uri1W, fileW); + lstrcpyW(file_uri1W, L"file:///"); lstrcatW(file_uri1W, pathW); container = NULL; control = NULL; -- 2.26.2

1 0

[PATCH v2] kernelbase: Implement SetFileInformationByHandle(FileEndOfFileInfo).
by Jiangyi Chen Dec. 13, 2020

Dec. 13, 2020

1 0

[PATCH] kernelbase: Setting FileEndOfFileInfo has been implemented in NtSetInformationFile. SetFileInformationByHandle should do the same call as SetEndOfFile in case of FileEndOfFileInfo.
by Jiangyi Chen Dec. 13, 2020

Dec. 13, 2020

1 0

[PATCH] kernelbase: Implement GetFileInformationByHandleEx(FileEndOfFileInfo).
by Jiangyi Chen Dec. 13, 2020

Dec. 13, 2020

1 0

Wine staging 6.0-rc2 release
by Alistair Leslie-Hughes Dec. 13, 2020

Dec. 13, 2020

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 6.0-rc2 (715 patches are applied to wine vanilla) Upstreamed (Either directly from staging or fixed with a similar patch). * None Added: * None Updated: * server-Stored_ACLs * ntdll-DOS_Attributes * ntdll-Junction_Points * libs-Unicode_Collation * eventfd_synchronization * mfplat-streaming-support 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] inetcpl.cpl: Fix memory leak in security_on_initdialog.
by Haidong Yu Dec. 13, 2020

Dec. 13, 2020

1 0

[PATCH v2 1/2] include: Remove two D3DCAPS2 defines in d3d9 headers
by Rafał Harabień Dec. 11, 2020

Dec. 11, 2020

* remove D3DCAPS2_NO2DDURING3DSCENE * remove D3DCAPS2_CANRENDERWINDOWED Removed macro-definitions seems to have been copied from d3d8.h and according to public docs do not exist in d3d9. Signed-off-by: Rafał Harabień <rafalh92(a)outlook.com> --- dlls/d3d9/tests/d3d9ex.c | 3 +-- dlls/d3d9/tests/device.c | 3 +-- include/d3d9caps.h | 2 -- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 462037b2e01..2afe73088c7 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -4020,8 +4020,7 @@ static void test_device_caps(void) ok(!(caps.Caps & ~(D3DCAPS_OVERLAY | D3DCAPS_READ_SCANLINE)), "Caps field has unexpected flags %#x.\n", caps.Caps); - ok(!(caps.Caps2 & ~(D3DCAPS2_NO2DDURING3DSCENE | D3DCAPS2_FULLSCREENGAMMA - | D3DCAPS2_CANRENDERWINDOWED | D3DCAPS2_CANCALIBRATEGAMMA | D3DCAPS2_RESERVED + ok(!(caps.Caps2 & ~(D3DCAPS2_FULLSCREENGAMMA | D3DCAPS2_CANCALIBRATEGAMMA | D3DCAPS2_RESERVED | D3DCAPS2_CANMANAGERESOURCE | D3DCAPS2_DYNAMICTEXTURES | D3DCAPS2_CANAUTOGENMIPMAP | D3DCAPS2_CANSHARERESOURCE)), "Caps2 field has unexpected flags %#x.\n", caps.Caps2); diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 2791e91a068..0343fade792 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -13172,8 +13172,7 @@ static void test_device_caps(void) test_device_caps_adapter_group(&caps, adapter_idx, adapter_count); ok(!(caps.Caps & ~D3DCAPS_READ_SCANLINE), "Adapter %u: Caps field has unexpected flags %#x.\n", adapter_idx, caps.Caps); - ok(!(caps.Caps2 & ~(D3DCAPS2_NO2DDURING3DSCENE | D3DCAPS2_FULLSCREENGAMMA - | D3DCAPS2_CANRENDERWINDOWED | D3DCAPS2_CANCALIBRATEGAMMA | D3DCAPS2_RESERVED + ok(!(caps.Caps2 & ~(D3DCAPS2_FULLSCREENGAMMA | D3DCAPS2_CANCALIBRATEGAMMA | D3DCAPS2_RESERVED | D3DCAPS2_CANMANAGERESOURCE | D3DCAPS2_DYNAMICTEXTURES | D3DCAPS2_CANAUTOGENMIPMAP | D3DCAPS2_CANSHARERESOURCE)), "Adapter %u: Caps2 field has unexpected flags %#x.\n", adapter_idx, caps.Caps2); diff --git a/include/d3d9caps.h b/include/d3d9caps.h index 1068a2c35a9..c62780b4a0a 100644 --- a/include/d3d9caps.h +++ b/include/d3d9caps.h @@ -258,9 +258,7 @@ #define D3DCAPS3_DXVAHD_LIMITED __MSABI_LONG(0x00000800) #define D3DCAPS3_RESERVED __MSABI_LONG(0x8000001F) -#define D3DCAPS2_NO2DDURING3DSCENE __MSABI_LONG(0x00000002) #define D3DCAPS2_FULLSCREENGAMMA __MSABI_LONG(0x00020000) -#define D3DCAPS2_CANRENDERWINDOWED __MSABI_LONG(0x00080000) #define D3DCAPS2_CANCALIBRATEGAMMA __MSABI_LONG(0x00100000) #define D3DCAPS2_RESERVED __MSABI_LONG(0x02000000) #define D3DCAPS2_CANMANAGERESOURCE __MSABI_LONG(0x10000000) -- 2.25.1

2 1

[PATCH] setjmp.h: Use GCC-style setjmp on Clang in MSVC mode.
by Jacek Caban Dec. 11, 2020

Dec. 11, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/msvcrt/setjmp.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[PATCH v2 2/2] dlls/d3d9: Fix handling of D3DENUM_WHQL_LEVEL
by Rafał Harabień Dec. 11, 2020

Dec. 11, 2020

D3DENUM_NO_WHQL_LEVEL was renamed to D3DENUM_WHQL_LEVEL and its meaning was negated in DirectX 9. Signed-off-by: Rafał Harabień <rafalh92(a)outlook.com> --- dlls/d3d8/directx.c | 5 +++++ dlls/wined3d/directx.c | 2 +- include/d3d9.h | 2 +- include/wine/wined3d.h | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index 0c0f2ecaadc..900e2782353 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -121,6 +121,11 @@ static HRESULT WINAPI d3d8_GetAdapterIdentifier(IDirect3D8 *iface, UINT adapter, adapter_id.description = identifier->Description; adapter_id.description_size = sizeof(identifier->Description); + if (flags & D3DENUM_NO_WHQL_LEVEL) + flags = flags & ~D3DENUM_NO_WHQL_LEVEL; + else + flags |= WINED3DENUM_WHQL_LEVEL; + wined3d_adapter = wined3d_output_get_adapter(d3d8->wined3d_outputs[output_idx]); if (SUCCEEDED(hr = wined3d_adapter_get_identifier(wined3d_adapter, flags, &adapter_id))) { diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 412842469b3..d35108710c2 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1513,7 +1513,7 @@ HRESULT CDECL wined3d_adapter_get_identifier(const struct wined3d_adapter *adapt identifier->device_identifier = IID_D3DDEVICE_D3DUID; identifier->driver_uuid = adapter->driver_uuid; identifier->device_uuid = adapter->device_uuid; - identifier->whql_level = (flags & WINED3DENUM_NO_WHQL_LEVEL) ? 0 : 1; + identifier->whql_level = (flags & WINED3DENUM_WHQL_LEVEL) ? 1 : 0; identifier->adapter_luid = adapter->luid; identifier->video_memory = min(~(SIZE_T)0, adapter->driver_info.vram_bytes); identifier->shared_system_memory = min(~(SIZE_T)0, adapter->driver_info.sysmem_bytes); diff --git a/include/d3d9.h b/include/d3d9.h index 3ebde4509af..d61461f0833 100644 --- a/include/d3d9.h +++ b/include/d3d9.h @@ -61,7 +61,7 @@ */ #define D3D_SDK_VERSION 32 #define D3DADAPTER_DEFAULT 0 -#define D3DENUM_NO_WHQL_LEVEL __MSABI_LONG(0x00000002) +#define D3DENUM_WHQL_LEVEL __MSABI_LONG(0x00000002) #define D3DPRESENT_DONOTWAIT __MSABI_LONG(1) #define D3DPRESENT_LINEAR_CONTENT __MSABI_LONG(2) #define D3DPRESENT_BACK_BUFFERS_MAX __MSABI_LONG(3) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 1f370d69a88..310911992ae 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -874,7 +874,7 @@ enum wined3d_shader_type #define WINED3DCOLORWRITEENABLE_ALPHA (1u << 3) #define WINED3DADAPTER_DEFAULT 0 -#define WINED3DENUM_NO_WHQL_LEVEL 2 +#define WINED3DENUM_WHQL_LEVEL 2 #define WINED3DTSS_TCI_PASSTHRU 0x00000 #define WINED3DTSS_TCI_CAMERASPACENORMAL 0x10000 -- 2.25.1

2 1

[PATCH 1/2] winevulkan: Check for NULL in vkDestroyDebugUtilsMessengerEXT.
by Georg Lehmann Dec. 11, 2020

Dec. 11, 2020

Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> --- dlls/winevulkan/vulkan.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index b0a8559fe2c..47f06f32bc3 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -1860,6 +1860,9 @@ void WINAPI wine_vkDestroyDebugUtilsMessengerEXT( TRACE("%p, 0x%s, %p\n", instance, wine_dbgstr_longlong(messenger), allocator); + if (!messenger) + return; + object = wine_debug_utils_messenger_from_handle(messenger); instance->funcs.p_vkDestroyDebugUtilsMessengerEXT(instance->instance, object->debug_messenger, NULL); -- 2.29.2

1 1

[website] German translation for release 6.0-rc1
by Julian Rüger Dec. 11, 2020

Dec. 11, 2020

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for release 5.22
by Julian Rüger Dec. 11, 2020

Dec. 11, 2020

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[PATCH] po: Update German translation.
by Julian Rüger Dec. 11, 2020

Dec. 11, 2020

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[PATCH] ntdll: Don't set xstate in context if xstate features are not supported.
by Paul Gofman Dec. 11, 2020

Dec. 11, 2020

Fixes a regression reproducible on CPUs without XSAVE support introduced by 419abd49a1f816e5a869dbf4cc81114cd516138b. The regression commit erroneously assumes that if XSAVE is not supported then the host signal context won't have xsave data set up. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50271 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntdll/unix/signal_i386.c | 4 ++-- dlls/ntdll/unix/signal_x86_64.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 2e75d0b84ff..f1fd2cd2e41 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -784,7 +784,7 @@ static inline void restore_xstate( const CONTEXT *context ) XSAVE_FORMAT *xrstor_base; XSTATE *xs; - if (!(xs = xstate_from_context( context ))) + if (!(user_shared_data->XState.EnabledFeatures && (xs = xstate_from_context( context )))) return; xrstor_base = (XSAVE_FORMAT *)xs - 1; @@ -901,7 +901,7 @@ static inline void save_context( struct xcontext *xcontext, const ucontext_t *si context->ContextFlags |= CONTEXT_FLOATING_POINT | CONTEXT_EXTENDED_REGISTERS; memcpy( context->ExtendedRegisters, fpux, sizeof(*fpux) ); if (!fpu) fpux_to_fpu( &context->FloatSave, fpux ); - if ((xs = XState_sig(fpux))) + if (user_shared_data->XState.EnabledFeatures && (xs = XState_sig(fpux))) { context_init_xstate( context, xs ); xcontext->host_compaction_mask = xs->CompactionMask; diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 1b5c2e59444..59b7a3750c4 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -1483,7 +1483,7 @@ static void save_context( struct xcontext *xcontext, const ucontext_t *sigcontex context->ContextFlags |= CONTEXT_FLOATING_POINT; context->u.FltSave = *FPU_sig(sigcontext); context->MxCsr = context->u.FltSave.MxCsr; - if ((xs = XState_sig(FPU_sig(sigcontext)))) + if (user_shared_data->XState.EnabledFeatures && (xs = XState_sig(FPU_sig(sigcontext)))) { /* xcontext and sigcontext are both on the signal stack, so we can * just reference sigcontext without overflowing 32 bit XState.Offset */ @@ -1563,7 +1563,7 @@ static void restore_context( const struct xcontext *xcontext, ucontext_t *sigcon amd64_thread_data()->dr7 = context->Dr7; set_sigcontext( context, sigcontext ); if (FPU_sig(sigcontext)) *FPU_sig(sigcontext) = context->u.FltSave; - if ((xs = XState_sig(FPU_sig(sigcontext)))) + if (user_shared_data->XState.EnabledFeatures && (xs = XState_sig(FPU_sig(sigcontext)))) xs->CompactionMask = xcontext->host_compaction_mask; } @@ -1637,7 +1637,7 @@ static void restore_xstate( const CONTEXT *context ) XSAVE_FORMAT *xrstor_base; XSTATE *xs; - if (!(xs = xstate_from_context( context ))) + if (!(user_shared_data->XState.EnabledFeatures && (xs = xstate_from_context( context )))) return; xrstor_base = (XSAVE_FORMAT *)xs - 1; -- 2.29.2

1 0

[PATCH] evr: Add missing LeaveCriticalSection on creating tracking thread.
by Haidong Yu Dec. 11, 2020

Dec. 11, 2020

2 1

Fw: FOSDEM 21 emulator devroom
by Mahmoud Abdelghany Dec. 11, 2020

Dec. 11, 2020

> Hey guys, > > We're hosting an emulator development room at FOSDEM 21, and were wondering if you guys would be interested in sharing some of your knowledge with the community. > > If the answer is yes :D, please let us know. > > You can find more info here: > https://github.com/blackbeard334/fosdem21-emulator-devroom-cfp > > Regards, > > Christophe Creeten & Mahmoud Abdelghany > > Sent with ProtonMail Secure Email.

1 0

[PATCH] winex11.drv: Minimizing a window with the owner property does not require a real minimization.
by Haoyang Chen Dec. 11, 2020

Dec. 11, 2020

1 0

[PATCH 1/4] kernel32: Print processor group in Get(Active|Maximum)ProcessorCount
by Alex Henrie Dec. 11, 2020

Dec. 11, 2020

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/kernel32/process.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index b8a0c823398..c1c3c484493 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -611,7 +611,7 @@ DWORD WINAPI GetActiveProcessorCount(WORD group) { DWORD cpus = system_info.NumberOfProcessors; - FIXME("semi-stub, returning %u\n", cpus); + FIXME("(0x%x): semi-stub, returning %u\n", group, cpus); return cpus; } @@ -622,7 +622,7 @@ DWORD WINAPI GetMaximumProcessorCount(WORD group) { DWORD cpus = system_info.NumberOfProcessors; - FIXME("semi-stub, returning %u\n", cpus); + FIXME("(0x%x): semi-stub, returning %u\n", group, cpus); return cpus; } -- 2.29.2

2 4