November 2020 - Wine-devel - list.winehq.org

[PATCH 1/2] msvcrt: Don't write Unicode BOM if file is not empty in _wsopen_dispatch.
by Piotr Caban 26 Nov '20

26 Nov '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/file.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)

1 0

[PATCH resend 1/2] comctl32: Set the selection if it's currently invalid in HandleTimer.
by Gabriel Ivăncescu 26 Nov '20

26 Nov '20

Don't skip MoveCaret if it would actually change the selection when it is invalid. This can happen, for example, in a combo box if the dropdown is shown by a mouse click + release followed by the mouse being moved into the dropped listbox, when the listbox has nothing selected. In this case, the item with the index zero would not be selected the first time the mouse moves over it, since the focus_item would be zero, despite the fact the item is not selected. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/comctl32/listbox.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index b905bee..299c414 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -2333,7 +2333,7 @@ static LRESULT LISTBOX_HandleTimer( LB_DESCR *descr, INT index, TIMER_DIRECTION case LB_TIMER_NONE: break; } - if (index == descr->focus_item) return FALSE; + if (index == descr->focus_item && descr->selected_item != -1) return FALSE; LISTBOX_MoveCaret( descr, index, FALSE ); return TRUE; } -- 2.21.0

1 1

[PATCH resend 1/2] comctl32: Don't redraw the Combo Box when dropped down if it has an editbox.
by Gabriel Ivăncescu 26 Nov '20

26 Nov '20

Some applications subclass the combo box and handle WM_ERASEBKGND themselves, without using WS_CLIPCHILDREN. This causes them to erase over the editbox child. There's no reason to redraw it in this case since the editbox is supposed to cover it, anyway. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=22260 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/comctl32/combo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/combo.c b/dlls/comctl32/combo.c index 572740b..007325d 100644 --- a/dlls/comctl32/combo.c +++ b/dlls/comctl32/combo.c @@ -1000,7 +1000,7 @@ static void CBDropDown( LPHEADCOMBO lphc ) SWP_NOACTIVATE | SWP_SHOWWINDOW ); - if( !(lphc->wState & CBF_NOREDRAW) ) + if( !(lphc->wState & (CBF_NOREDRAW | CBF_EDIT)) ) RedrawWindow( lphc->self, NULL, 0, RDW_INVALIDATE | RDW_ERASE | RDW_UPDATENOW | RDW_NOCHILDREN ); -- 2.21.0

1 1

[PATCH] mf/session: Propagate allocator initialization failure code (Coverity).
by Nikolay Sivov 26 Nov '20

26 Nov '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/session.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 6d4b58289d8..1a7439a13c3 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -794,6 +794,7 @@ static void session_shutdown_current_topology(struct media_session *session) IMFMediaSink *sink; IUnknown *object; WORD idx = 0; + HRESULT hr; topology = session->presentation.current_topology; force_shutdown = session->state == SESSION_STATE_SHUT_DOWN; @@ -813,7 +814,8 @@ static void session_shutdown_current_topology(struct media_session *session) if (SUCCEEDED(IMFTopologyNode_GetUnknown(node, &_MF_TOPONODE_IMFActivate, &IID_IMFActivate, (void **)&activate))) { - IMFActivate_ShutdownObject(activate); + if (FAILED(hr = IMFActivate_ShutdownObject(activate))) + WARN("Failed to shut down activation object for the sink, hr %#x.\n", hr); IMFActivate_Release(activate); } else if (SUCCEEDED(IMFTopologyNode_GetObject(node, &object))) @@ -1392,7 +1394,11 @@ static HRESULT session_append_node(struct media_session *session, IMFTopologyNod if (SUCCEEDED(MFGetService(topo_node->object.object, &MR_VIDEO_ACCELERATION_SERVICE, &IID_IMFVideoSampleAllocator, (void **)&topo_node->u.sink.allocator))) { - IMFVideoSampleAllocator_InitializeSampleAllocator(topo_node->u.sink.allocator, 2, media_type); + if (FAILED(hr = IMFVideoSampleAllocator_InitializeSampleAllocator(topo_node->u.sink.allocator, + 2, media_type))) + { + WARN("Failed to initialize sample allocator for the stream, hr %#x.\n", hr); + } IMFVideoSampleAllocator_QueryInterface(topo_node->u.sink.allocator, &IID_IMFVideoSampleAllocatorCallback, (void **)&topo_node->u.sink.allocator_cb); IMFVideoSampleAllocatorCallback_SetCallback(topo_node->u.sink.allocator_cb, -- 2.29.2

1 0

[PATCH] winegstreamer: Fix possible leak on error path (Coverity).
by Nikolay Sivov 26 Nov '20

26 Nov '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/winegstreamer/media_source.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 83424719d54..5c502cf3ed5 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -1235,17 +1235,14 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE("mf_src", GST_PAD_SRC, GST_PAD_ALWAYS, GST_STATIC_CAPS_ANY); - struct media_source *object = heap_alloc_zero(sizeof(*object)); IMFStreamDescriptor **descriptors = NULL; + struct media_source *object; gint64 total_pres_time = 0; DWORD bytestream_caps; unsigned int i; HRESULT hr; int ret; - if (!object) - return E_OUTOFMEMORY; - if (FAILED(hr = IMFByteStream_GetCapabilities(bytestream, &bytestream_caps))) return hr; @@ -1255,6 +1252,9 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ return MF_E_BYTESTREAM_NOT_SEEKABLE; } + if (!(object = heap_alloc_zero(sizeof(*object)))) + return E_OUTOFMEMORY; + object->IMFMediaSource_iface.lpVtbl = &IMFMediaSource_vtbl; object->async_commands_callback.lpVtbl = &source_async_commands_callback_vtbl; object->ref = 1; -- 2.29.2

1 0

[PATCH 1/3] ntdll/tests: Add tests for NtOpenProcess return status.
by Rémi Bernon 26 Nov '20

26 Nov '20

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntdll/tests/om.c | 53 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index d3b932bec1d..6687b8b6767 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -73,6 +73,7 @@ static NTSTATUS (WINAPI *pNtQuerySystemTime)( LARGE_INTEGER * ); static NTSTATUS (WINAPI *pRtlWaitOnAddress)( const void *, const void *, SIZE_T, const LARGE_INTEGER * ); static void (WINAPI *pRtlWakeAddressAll)( const void * ); static void (WINAPI *pRtlWakeAddressSingle)( const void * ); +static NTSTATUS (WINAPI *pNtOpenProcess)( HANDLE *, ACCESS_MASK, const OBJECT_ATTRIBUTES *, const CLIENT_ID * ); #define KEYEDEVENT_WAIT 0x0001 #define KEYEDEVENT_WAKE 0x0002 @@ -2034,6 +2035,56 @@ static void test_wait_on_address(void) ok(address == 0, "got %s\n", wine_dbgstr_longlong(address)); } +static void test_process(void) +{ + OBJECT_ATTRIBUTES attr; + CLIENT_ID cid; + NTSTATUS status; + HANDLE process; + + if (!pNtOpenProcess) + { + win_skip( "NtOpenProcess not supported, skipping test\n" ); + return; + } + + InitializeObjectAttributes( &attr, NULL, 0, 0, NULL ); + + cid.UniqueProcess = 0; + cid.UniqueThread = 0; + status = pNtOpenProcess( &process, PROCESS_QUERY_LIMITED_INFORMATION, NULL, &cid ); + todo_wine ok( status == STATUS_ACCESS_VIOLATION, "NtOpenProcess returned %x\n", status ); + status = pNtOpenProcess( &process, PROCESS_QUERY_LIMITED_INFORMATION, &attr, NULL ); + todo_wine ok( status == STATUS_INVALID_PARAMETER_MIX, "NtOpenProcess returned %x\n", status ); + + cid.UniqueProcess = 0; + cid.UniqueThread = 0; + status = pNtOpenProcess( &process, PROCESS_QUERY_LIMITED_INFORMATION, &attr, &cid ); + todo_wine ok( status == STATUS_INVALID_CID, "NtOpenProcess returned %x\n", status ); + + cid.UniqueProcess = ULongToHandle( 0xdeadbeef ); + cid.UniqueThread = ULongToHandle( 0xdeadbeef ); + status = pNtOpenProcess( &process, PROCESS_QUERY_LIMITED_INFORMATION, &attr, &cid ); + todo_wine ok( status == STATUS_INVALID_CID, "NtOpenProcess returned %x\n", status ); + + cid.UniqueProcess = ULongToHandle( GetCurrentThreadId() ); + cid.UniqueThread = 0; + status = pNtOpenProcess( &process, PROCESS_QUERY_LIMITED_INFORMATION, &attr, &cid ); + todo_wine ok( status == STATUS_INVALID_CID, "NtOpenProcess returned %x\n", status ); + + cid.UniqueProcess = ULongToHandle( GetCurrentProcessId() ); + cid.UniqueThread = 0; + status = pNtOpenProcess( &process, PROCESS_QUERY_LIMITED_INFORMATION, &attr, &cid ); + ok( !status, "NtOpenProcess returned %x\n", status ); + pNtClose( process ); + + cid.UniqueProcess = ULongToHandle( GetCurrentProcessId() ); + cid.UniqueThread = ULongToHandle( GetCurrentThreadId() ); + status = pNtOpenProcess( &process, PROCESS_QUERY_LIMITED_INFORMATION, &attr, &cid ); + ok( !status, "NtOpenProcess returned %x\n", status ); + pNtClose( process ); +} + START_TEST(om) { HMODULE hntdll = GetModuleHandleA("ntdll.dll"); @@ -2082,6 +2133,7 @@ START_TEST(om) pRtlWaitOnAddress = (void *)GetProcAddress(hntdll, "RtlWaitOnAddress"); pRtlWakeAddressAll = (void *)GetProcAddress(hntdll, "RtlWakeAddressAll"); pRtlWakeAddressSingle = (void *)GetProcAddress(hntdll, "RtlWakeAddressSingle"); + pNtOpenProcess = (void *)GetProcAddress(hntdll, "NtOpenProcess"); test_case_sensitive(); test_namespace_pipe(); @@ -2096,4 +2148,5 @@ START_TEST(om) test_keyed_events(); test_null_device(); test_wait_on_address(); + test_process(); } -- 2.29.2

2 5

[v2 PATCH] mf/samplegrabber: Evaluate type compatibility by comparison to the initial type.
by Nikolay Sivov 26 Nov '20

26 Nov '20

From: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: still keep a reference to the original type. dlls/mf/samplegrabber.c | 17 ++++--- dlls/mf/tests/mf.c | 104 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 115 insertions(+), 6 deletions(-) diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c index 54e28b466c5..f60ce2a8433 100644 --- a/dlls/mf/samplegrabber.c +++ b/dlls/mf/samplegrabber.c @@ -72,6 +72,7 @@ struct sample_grabber IMFSampleGrabberSinkCallback *callback; IMFSampleGrabberSinkCallback2 *callback2; IMFMediaType *media_type; + IMFMediaType *current_media_type; BOOL is_shut_down; IMFMediaEventQueue *event_queue; IMFMediaEventQueue *stream_event_queue; @@ -572,7 +573,8 @@ static ULONG WINAPI sample_grabber_stream_type_handler_Release(IMFMediaTypeHandl static HRESULT sample_grabber_stream_is_media_type_supported(struct sample_grabber *grabber, IMFMediaType *in_type) { - const DWORD supported_flags = MF_MEDIATYPE_EQUAL_MAJOR_TYPES | MF_MEDIATYPE_EQUAL_FORMAT_TYPES; + const DWORD supported_flags = MF_MEDIATYPE_EQUAL_MAJOR_TYPES | MF_MEDIATYPE_EQUAL_FORMAT_TYPES | + MF_MEDIATYPE_EQUAL_FORMAT_DATA; DWORD flags; if (grabber->is_shut_down) @@ -631,9 +633,9 @@ static HRESULT WINAPI sample_grabber_stream_type_handler_SetCurrentMediaType(IMF if (FAILED(hr = sample_grabber_stream_is_media_type_supported(grabber, media_type))) return hr; - IMFMediaType_Release(grabber->media_type); - grabber->media_type = media_type; - IMFMediaType_AddRef(grabber->media_type); + IMFMediaType_Release(grabber->current_media_type); + grabber->current_media_type = media_type; + IMFMediaType_AddRef(grabber->current_media_type); return S_OK; } @@ -651,7 +653,7 @@ static HRESULT WINAPI sample_grabber_stream_type_handler_GetCurrentMediaType(IMF if (grabber->is_shut_down) return MF_E_STREAMSINK_REMOVED; - *media_type = grabber->media_type; + *media_type = grabber->current_media_type; IMFMediaType_AddRef(*media_type); return S_OK; @@ -669,7 +671,7 @@ static HRESULT WINAPI sample_grabber_stream_type_handler_GetMajorType(IMFMediaTy if (grabber->is_shut_down) return MF_E_STREAMSINK_REMOVED; - return IMFMediaType_GetMajorType(grabber->media_type, type); + return IMFMediaType_GetMajorType(grabber->current_media_type, type); } static const IMFMediaTypeHandlerVtbl sample_grabber_stream_type_handler_vtbl = @@ -840,6 +842,7 @@ static ULONG WINAPI sample_grabber_sink_Release(IMFMediaSink *iface) IMFSampleGrabberSinkCallback_Release(grabber->callback); if (grabber->callback2) IMFSampleGrabberSinkCallback2_Release(grabber->callback2); + IMFMediaType_Release(grabber->current_media_type); IMFMediaType_Release(grabber->media_type); if (grabber->event_queue) IMFMediaEventQueue_Release(grabber->event_queue); @@ -1411,6 +1414,8 @@ static HRESULT sample_grabber_create_object(IMFAttributes *attributes, void *use } object->media_type = context->media_type; IMFMediaType_AddRef(object->media_type); + object->current_media_type = context->media_type; + IMFMediaType_AddRef(object->current_media_type); IMFAttributes_GetUINT32(attributes, &MF_SAMPLEGRABBERSINK_IGNORE_CLOCK, &object->ignore_clock); IMFAttributes_GetUINT64(attributes, &MF_SAMPLEGRABBERSINK_SAMPLE_TIME_OFFSET, &object->sample_time_offset); list_init(&object->items); diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 41ca385cc2b..fda80974724 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -2562,6 +2562,109 @@ static void test_sample_grabber(void) ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); } +static void test_sample_grabber_is_mediatype_supported(void) +{ + IMFMediaType *media_type, *media_type2, *media_type3; + IMFMediaTypeHandler *handler; + IMFActivate *activate; + IMFStreamSink *stream; + IMFMediaSink *sink; + ULONG refcount; + HRESULT hr; + GUID guid; + + /* IsMediaTypeSupported checks are done against the creation type, and check format data */ + hr = MFCreateMediaType(&media_type); + ok(hr == S_OK, "Failed to create media type, hr %#x.\n", hr); + + hr = IMFMediaType_SetGUID(media_type, &MF_MT_MAJOR_TYPE, &MFMediaType_Audio); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + hr = IMFMediaType_SetGUID(media_type, &MF_MT_SUBTYPE, &MFAudioFormat_PCM); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + hr = IMFMediaType_SetUINT32(media_type, &MF_MT_AUDIO_SAMPLES_PER_SECOND, 44100); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + hr = MFCreateSampleGrabberSinkActivate(media_type, &grabber_callback, &activate); + ok(hr == S_OK, "Failed to create grabber activate, hr %#x.\n", hr); + + hr = IMFActivate_ActivateObject(activate, &IID_IMFMediaSink, (void **)&sink); + ok(hr == S_OK, "Failed to activate object, hr %#x.\n", hr); + + hr = IMFMediaSink_GetStreamSinkByIndex(sink, 0, &stream); + ok(hr == S_OK, "Failed to get sink stream, hr %#x.\n", hr); + hr = IMFStreamSink_GetMediaTypeHandler(stream, &handler); + ok(hr == S_OK, "Failed to get type handler, hr %#x.\n", hr); + IMFStreamSink_Release(stream); + + IMFMediaSink_Release(sink); + + /* On Win8+ this initialization happens automatically. */ + hr = IMFMediaTypeHandler_SetCurrentMediaType(handler, media_type); + ok(hr == S_OK, "Failed to set media type, hr %#x.\n", hr); + + hr = MFCreateMediaType(&media_type2); + ok(hr == S_OK, "Failed to create media type, hr %#x.\n", hr); + + hr = IMFMediaType_SetGUID(media_type2, &MF_MT_MAJOR_TYPE, &MFMediaType_Audio); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + hr = IMFMediaType_SetGUID(media_type2, &MF_MT_SUBTYPE, &MFAudioFormat_PCM); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + hr = IMFMediaType_SetUINT32(media_type2, &MF_MT_AUDIO_SAMPLES_PER_SECOND, 48000); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_IsMediaTypeSupported(handler, media_type2, NULL); + ok(hr == MF_E_INVALIDMEDIATYPE, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_SetCurrentMediaType(handler, media_type2); + ok(hr == MF_E_INVALIDMEDIATYPE, "Failed to set media type, hr %#x.\n", hr); + + /* Make it match grabber type sample rate. */ + hr = IMFMediaType_SetUINT32(media_type2, &MF_MT_AUDIO_SAMPLES_PER_SECOND, 44100); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_IsMediaTypeSupported(handler, media_type2, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_SetCurrentMediaType(handler, media_type2); + ok(hr == S_OK, "Failed to set media type, hr %#x.\n", hr); + hr = IMFMediaTypeHandler_GetCurrentMediaType(handler, &media_type3); + ok(hr == S_OK, "Failed to set media type, hr %#x.\n", hr); + ok(media_type3 == media_type2, "Unexpected media type instance.\n"); + IMFMediaType_Release(media_type3); + + /* Change original type. */ + hr = IMFMediaType_SetUINT32(media_type, &MF_MT_AUDIO_SAMPLES_PER_SECOND, 48000); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_IsMediaTypeSupported(handler, media_type2, NULL); + ok(hr == MF_E_INVALIDMEDIATYPE, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaType_SetUINT32(media_type2, &MF_MT_AUDIO_SAMPLES_PER_SECOND, 48000); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_IsMediaTypeSupported(handler, media_type2, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_GetMajorType(handler, &guid); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(IsEqualGUID(&guid, &MFMediaType_Audio), "Unexpected major type.\n"); + + hr = IMFMediaType_SetGUID(media_type, &MF_MT_MAJOR_TYPE, &MFMediaType_Video); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_GetMajorType(handler, &guid); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(IsEqualGUID(&guid, &MFMediaType_Audio), "Unexpected major type.\n"); + + IMFMediaType_Release(media_type2); + IMFMediaType_Release(media_type); + + IMFMediaTypeHandler_Release(handler); + + refcount = IMFActivate_Release(activate); + ok(!refcount, "Unexpected refcount %u.\n", refcount); +} + static BOOL is_supported_video_type(const GUID *guid) { return IsEqualGUID(guid, &MFVideoFormat_L8) @@ -4263,6 +4366,7 @@ START_TEST(mf) test_MFShutdownObject(); test_presentation_clock(); test_sample_grabber(); + test_sample_grabber_is_mediatype_supported(); test_video_processor(); test_quality_manager(); test_sar(); -- 2.29.2

2 1

[PATCH 1/2] gdi32/tests: Add locale-dependent face matching test.
by Rémi Bernon 26 Nov '20

26 Nov '20

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- This brings another ~200ms prefix startup time improvement, from ~1.2s to ~1s for "wine cmd /c exit" execution time on average, as well as a ~50ms process startup time improvement, from ~0.25s to ~0.2s execution time when prefix is already started. The test shows that using wcsicmp is incorrect for face name comparison, or at least that we should not rely on the current locale, and perf also reports a high number of CPU cache miss coming from the locale refcounting, which is the main source of improvement here. IIUC RtlDowncaseUnicodeChar also does locale dependent case folding, but I'm not sure to see how it's controlled (it's the system default locale that defines the loaded tables right?), and we should probably check if case matching depends on it. If not, is there any canonical normalized unicode case folding that should be used instead? dlls/gdi32/tests/font.c | 19 ++++++++++++++----- dlls/gdi32/tests/wine_langnames3.sfd | 4 ++-- dlls/gdi32/tests/wine_langnames3.ttf | Bin 2048 -> 2076 bytes 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index d3ec971dce0..3bcbebaf91a 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -7269,12 +7269,21 @@ static void test_lang_names(void) /* either because it's the primary language, or because it's a secondary */ ok( efnd.total == min( 2, i + 1 ), "%d: EnumFontFamiliesExA unexpected count %u.\n", i, efnd.total ); - strcpy( font.lfFaceName, "Wine Lang Cond (fr)" ); - memset( &efnd, 0, sizeof(efnd) ); - EnumFontFamiliesExA( dc, &font, enum_fullname_data_proc, (LPARAM)&efnd, 0 ); + wcscpy( font_w.lfFaceName, L"Wine Police d'écriture (fr)" ); + memset( &efnd_w, 0, sizeof(efnd_w) ); + EnumFontFamiliesExW( dc, &font_w, enum_fullname_data_proc_w, (LPARAM)&efnd_w, 0 ); /* as wine_langnames3.sfd does not specify (en) name, (fr) is preferred */ - if (i == 2) ok( efnd.total == 1, "%d: EnumFontFamiliesExA unexpected count %u.\n", i, efnd.total ); - else ok( efnd.total == 0, "%d: EnumFontFamiliesExA unexpected count %u.\n", i, efnd.total ); + if (i == 2) ok( efnd_w.total == 1, "%d: EnumFontFamiliesExW unexpected count %u.\n", i, efnd_w.total ); + else ok( efnd_w.total == 0, "%d: EnumFontFamiliesExW unexpected count %u.\n", i, efnd_w.total ); + + /* case matching should not depend on the current locale */ + if (i == 2) + { + wcscpy( font_w.lfFaceName, L"Wine POLICE D'ÉCRITURE (fr)" ); + memset( &efnd_w, 0, sizeof(efnd_w) ); + EnumFontFamiliesExW( dc, &font_w, enum_fullname_data_proc_w, (LPARAM)&efnd_w, 0 ); + todo_wine ok( efnd_w.total == 1, "%d: EnumFontFamiliesExW unexpected count %u.\n", i, efnd_w.total ); + } strcpy( font.lfFaceName, "Wine Lang Cond (ko)" ); memset( &efnd, 0, sizeof(efnd) ); diff --git a/dlls/gdi32/tests/wine_langnames3.sfd b/dlls/gdi32/tests/wine_langnames3.sfd index ea0dbff57d9..55536fa58c1 100644 --- a/dlls/gdi32/tests/wine_langnames3.sfd +++ b/dlls/gdi32/tests/wine_langnames3.sfd @@ -39,8 +39,8 @@ MarkAttachClasses: 1 DEI: 91125 LangName: 1036 \ "" \ - "Wine Lang Cond (fr)" \ - "Reg (fr)" \ + "Wine Police d'+AOkA-criture (fr)" \ + "R+AOkA-guli+AOgA-re (fr)" \ "" \ "Wine Lang Cond Reg (fr)" LangName: 1042 \ diff --git a/dlls/gdi32/tests/wine_langnames3.ttf b/dlls/gdi32/tests/wine_langnames3.ttf index dd76bd478bbb2546cfbbb7e9184cc7f602c59303..408d127fb1ef2a1d74977aecfb6d70a4ae03d838 100644 GIT binary patch delta 236 zcmZn=m?JPjOo)R42xQz{T-_K%8AKQu*q=<)uxGq8F(X4`#|$<b1_tIi3=AwH1^LA# z|L-xF0TpZjYS3a}1d>4PxX7<-<Bw=&dow0I24)6E79IvB1{tO_D4T^rkEsRB76PhP zW7+~`GcgD--GQ<}YTj+0#G=c{ZpNU?V8~!N`53Dii<z#W;Uu=x_5lp}3^@#$49N_s w3<?Y>4C)Lof$SonNC`tJkOqlrFr)!lnm{K70cF#H;vgL_K(d?Pu?aB(09p|&jsO4v delta 192 zcmbOu&>%2DOo;sn0|SGMyNjzEgD8Ut0|Wbsi5m8d2PS4(a)Xsl=c_lALic(a)7Z&D9A4^ z`G1eW45(lVP=gi&Baj5*kW;bSHvWiawpU})V_;@rWZ_|8Vh~^ogR)r|^q4ZhY$2d( zHKrL*Hb~6(a)C>x~a(&kAlx{U0G3<eCk43?9Rv6`_M8t7V1Vmm##n_YxogCUKfh(Qx* PWe`IuL;7Yeb|FRpHXtN( -- 2.29.2

3 7

[PATCH] oleaut32: Use wide-char string literals.
by Nikolay Sivov 26 Nov '20

26 Nov '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/oleaut32/oleaut.c | 41 +++++--------- dlls/oleaut32/olefont.c | 50 ++++++----------- dlls/oleaut32/olepicture.c | 6 +- dlls/oleaut32/olepropframe.c | 4 +- dlls/oleaut32/typelib.c | 105 ++++++++++++----------------------- dlls/oleaut32/vartype.c | 17 ++---- 6 files changed, 73 insertions(+), 150 deletions(-) diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c index 9417969465e..a026c2bc374 100644 --- a/dlls/oleaut32/oleaut.c +++ b/dlls/oleaut32/oleaut.c @@ -505,9 +505,6 @@ void WINAPI SetOaNoCache(void) bstr_cache_enabled = FALSE; } -static const WCHAR _delimiter[] = {'!',0}; /* default delimiter apparently */ -static const WCHAR *pdelimiter = &_delimiter[0]; - /*********************************************************************** * RegisterActiveObject (OLEAUT32.33) * @@ -533,7 +530,7 @@ HRESULT WINAPI DECLSPEC_HOTPATCH RegisterActiveObject( DWORD rot_flags = ROTFLAGS_REGISTRATIONKEEPSALIVE; /* default registration is strong */ StringFromGUID2(rcid,guidbuf,39); - ret = CreateItemMoniker(pdelimiter,guidbuf,&moniker); + ret = CreateItemMoniker(L"!", guidbuf, &moniker); if (FAILED(ret)) return ret; ret = GetRunningObjectTable(0,&runobtable); @@ -597,7 +594,7 @@ HRESULT WINAPI DECLSPEC_HOTPATCH GetActiveObject(REFCLSID rcid,LPVOID preserved, LPMONIKER moniker; StringFromGUID2(rcid,guidbuf,39); - ret = CreateItemMoniker(pdelimiter,guidbuf,&moniker); + ret = CreateItemMoniker(L"!", guidbuf, &moniker); if (FAILED(ret)) return ret; ret = GetRunningObjectTable(0,&runobtable); @@ -1104,10 +1101,8 @@ HRESULT WINAPI DllCanUnloadNow(void) */ BOOL WINAPI DllMain(HINSTANCE hInstDll, DWORD fdwReason, LPVOID lpvReserved) { - static const WCHAR oanocacheW[] = {'o','a','n','o','c','a','c','h','e',0}; - if(fdwReason == DLL_PROCESS_ATTACH) - bstr_cache_enabled = !GetEnvironmentVariableW(oanocacheW, NULL, 0); + bstr_cache_enabled = !GetEnvironmentVariableW(L"oanocache", NULL, 0); return OLEAUTPS_DllMain( hInstDll, fdwReason, lpvReserved ); } @@ -1173,33 +1168,23 @@ HRESULT WINAPI GetAltMonthNames(LCID lcid, LPOLESTR **str) NULL }; - static const WCHAR pl_month1W[] = {'s','t','y','c','z','n','i','a',0}; - static const WCHAR pl_month2W[] = {'l','u','t','e','g','o',0}; - static const WCHAR pl_month3W[] = {'m','a','r','c','a',0}; - static const WCHAR pl_month4W[] = {'k','w','i','e','t','n','i','a',0}; - static const WCHAR pl_month5W[] = {'m','a','j','a',0}; - static const WCHAR pl_month6W[] = {'c','z','e','r','w','c','a',0}; - static const WCHAR pl_month7W[] = {'l','i','p','c','a',0}; - static const WCHAR pl_month8W[] = {'s','i','e','r','p','n','i','a',0}; static const WCHAR pl_month9W[] = {'w','r','z','e',0x15b,'n','i','a',0}; static const WCHAR pl_month10W[] = {'p','a',0x17a,'d','z','i','e','r','n','i','k','a',0}; - static const WCHAR pl_month11W[] = {'l','i','s','t','o','p','a','d','a',0}; - static const WCHAR pl_month12W[] = {'g','r','u','d','n','i','a',0}; static const WCHAR *polish_genitive_names[] = { - pl_month1W, - pl_month2W, - pl_month3W, - pl_month4W, - pl_month5W, - pl_month6W, - pl_month7W, - pl_month8W, + L"stycznia", + L"lutego", + L"marca", + L"kwietnia", + L"maja", + L"czerwca", + L"lipca", + L"sierpnia", pl_month9W, pl_month10W, - pl_month11W, - pl_month12W, + L"listopada", + L"grudnia", NULL }; diff --git a/dlls/oleaut32/olefont.c b/dlls/oleaut32/olefont.c index a08994e65e5..1fd67f9b1b7 100644 --- a/dlls/oleaut32/olefont.c +++ b/dlls/oleaut32/olefont.c @@ -374,25 +374,17 @@ HRESULT WINAPI OleCreateFontIndirect( */ static void OLEFont_SendNotify(OLEFontImpl* this, DISPID dispID) { - static const WCHAR wszName[] = {'N','a','m','e',0}; - static const WCHAR wszSize[] = {'S','i','z','e',0}; - static const WCHAR wszBold[] = {'B','o','l','d',0}; - static const WCHAR wszItalic[] = {'I','t','a','l','i','c',0}; - static const WCHAR wszUnder[] = {'U','n','d','e','r','l','i','n','e',0}; - static const WCHAR wszStrike[] = {'S','t','r','i','k','e','t','h','r','o','u','g','h',0}; - static const WCHAR wszWeight[] = {'W','e','i','g','h','t',0}; - static const WCHAR wszCharset[] = {'C','h','a','r','s','e','t',0}; static const LPCWSTR dispid_mapping[] = { - wszName, - NULL, - wszSize, - wszBold, - wszItalic, - wszUnder, - wszStrike, - wszWeight, - wszCharset + L"Name", + NULL, + L"Size", + L"Bold", + L"Italic", + L"Underline", + L"Strikethrough", + L"Weight", + L"Charset" }; IEnumConnections *pEnum; @@ -1237,7 +1229,6 @@ static HRESULT WINAPI OLEFontImpl_GetTypeInfo( LCID lcid, ITypeInfo** ppTInfo) { - static const WCHAR stdole2tlb[] = {'s','t','d','o','l','e','2','.','t','l','b',0}; ITypeLib *tl; HRESULT hres; @@ -1245,7 +1236,7 @@ static HRESULT WINAPI OLEFontImpl_GetTypeInfo( TRACE("(%p, iTInfo=%d, lcid=%04x, %p)\n", this, iTInfo, (int)lcid, ppTInfo); if (iTInfo != 0) return E_FAIL; - hres = LoadTypeLib(stdole2tlb, &tl); + hres = LoadTypeLib(L"stdole2.tlb", &tl); if (FAILED(hres)) { ERR("Could not load the stdole2.tlb?\n"); return hres; @@ -1912,20 +1903,13 @@ static HRESULT WINAPI OLEFontImpl_IPersistPropertyBag_Load( Italic = 0 'False Strikethrough = 0 'False */ - static const WCHAR sAttrName[] = {'N','a','m','e',0}; - static const WCHAR sAttrSize[] = {'S','i','z','e',0}; - static const WCHAR sAttrCharset[] = {'C','h','a','r','s','e','t',0}; - static const WCHAR sAttrWeight[] = {'W','e','i','g','h','t',0}; - static const WCHAR sAttrUnderline[] = {'U','n','d','e','r','l','i','n','e',0}; - static const WCHAR sAttrItalic[] = {'I','t','a','l','i','c',0}; - static const WCHAR sAttrStrikethrough[] = {'S','t','r','i','k','e','t','h','r','o','u','g','h',0}; OLEFontImpl *this = impl_from_IPersistPropertyBag(iface); VARIANT value; HRESULT iRes; VariantInit(&value); - iRes = IPropertyBag_Read(pPropBag, sAttrName, &value, pErrorLog); + iRes = IPropertyBag_Read(pPropBag, L"Name", &value, pErrorLog); if (iRes == S_OK) { iRes = VariantChangeType(&value, &value, 0, VT_BSTR); @@ -1938,7 +1922,7 @@ static HRESULT WINAPI OLEFontImpl_IPersistPropertyBag_Load( VariantClear(&value); if (iRes == S_OK) { - iRes = IPropertyBag_Read(pPropBag, sAttrSize, &value, pErrorLog); + iRes = IPropertyBag_Read(pPropBag, L"Size", &value, pErrorLog); if (iRes == S_OK) { iRes = VariantChangeType(&value, &value, 0, VT_CY); @@ -1952,7 +1936,7 @@ static HRESULT WINAPI OLEFontImpl_IPersistPropertyBag_Load( } if (iRes == S_OK) { - iRes = IPropertyBag_Read(pPropBag, sAttrCharset, &value, pErrorLog); + iRes = IPropertyBag_Read(pPropBag, L"Charset", &value, pErrorLog); if (iRes == S_OK) { iRes = VariantChangeType(&value, &value, 0, VT_I2); @@ -1966,7 +1950,7 @@ static HRESULT WINAPI OLEFontImpl_IPersistPropertyBag_Load( } if (iRes == S_OK) { - iRes = IPropertyBag_Read(pPropBag, sAttrWeight, &value, pErrorLog); + iRes = IPropertyBag_Read(pPropBag, L"Weight", &value, pErrorLog); if (iRes == S_OK) { iRes = VariantChangeType(&value, &value, 0, VT_I2); @@ -1980,7 +1964,7 @@ static HRESULT WINAPI OLEFontImpl_IPersistPropertyBag_Load( } if (iRes == S_OK) { - iRes = IPropertyBag_Read(pPropBag, sAttrUnderline, &value, pErrorLog); + iRes = IPropertyBag_Read(pPropBag, L"Underline", &value, pErrorLog); if (iRes == S_OK) { iRes = VariantChangeType(&value, &value, 0, VT_BOOL); @@ -1994,7 +1978,7 @@ static HRESULT WINAPI OLEFontImpl_IPersistPropertyBag_Load( } if (iRes == S_OK) { - iRes = IPropertyBag_Read(pPropBag, sAttrItalic, &value, pErrorLog); + iRes = IPropertyBag_Read(pPropBag, L"Italic", &value, pErrorLog); if (iRes == S_OK) { iRes = VariantChangeType(&value, &value, 0, VT_BOOL); @@ -2008,7 +1992,7 @@ static HRESULT WINAPI OLEFontImpl_IPersistPropertyBag_Load( } if (iRes == S_OK) { - iRes = IPropertyBag_Read(pPropBag, sAttrStrikethrough, &value, pErrorLog); + iRes = IPropertyBag_Read(pPropBag, L"Strikethrough", &value, pErrorLog); if (iRes == S_OK) { iRes = VariantChangeType(&value, &value, 0, VT_BOOL); diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 43a92ca58f4..5dac8e4ee61 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -1947,7 +1947,6 @@ static HRESULT WINAPI OLEPictureImpl_GetTypeInfo( LCID lcid, ITypeInfo** ppTInfo) { - static const WCHAR stdole2tlb[] = {'s','t','d','o','l','e','2','.','t','l','b',0}; ITypeLib *tl; HRESULT hres; @@ -1956,7 +1955,7 @@ static HRESULT WINAPI OLEPictureImpl_GetTypeInfo( if (iTInfo != 0) return E_FAIL; - hres = LoadTypeLib(stdole2tlb, &tl); + hres = LoadTypeLib(L"stdole2.tlb", &tl); if (FAILED(hres)) { ERR("Could not load stdole2.tlb\n"); @@ -2353,7 +2352,6 @@ HRESULT WINAPI OleLoadPicturePath( LPOLESTR szURLorPath, LPUNKNOWN punkCaller, DWORD dwReserved, OLE_COLOR clrReserved, REFIID riid, LPVOID *ppvRet ) { - static const WCHAR file[] = { 'f','i','l','e',':',0 }; IPicture *ipicture; HANDLE hFile; DWORD dwFileSize; @@ -2377,7 +2375,7 @@ HRESULT WINAPI OleLoadPicturePath( LPOLESTR szURLorPath, LPUNKNOWN punkCaller, *ppvRet = NULL; /* Convert file URLs to DOS paths. */ - if (wcsncmp(szURLorPath, file, 5) == 0) { + if (wcsncmp(szURLorPath, L"file:", 5) == 0) { DWORD size; hRes = CoInternetParseUrl(szURLorPath, PARSE_PATH_FROM_URL, 0, path_buf, ARRAY_SIZE(path_buf), &size, 0); diff --git a/dlls/oleaut32/olepropframe.c b/dlls/oleaut32/olepropframe.c index ecffdc9218a..a351d73d468 100644 --- a/dlls/oleaut32/olepropframe.c +++ b/dlls/oleaut32/olepropframe.c @@ -154,8 +154,6 @@ static IPropertyPageSiteVtbl PropertyPageSiteVtbl = { */ HRESULT WINAPI OleCreatePropertyFrameIndirect(LPOCPFIPARAMS lpParams) { - static const WCHAR comctlW[] = { 'c','o','m','c','t','l','3','2','.','d','l','l',0 }; - PROPSHEETHEADERW property_sheet; PROPSHEETPAGEW property_sheet_page; struct { @@ -198,7 +196,7 @@ HRESULT WINAPI OleCreatePropertyFrameIndirect(LPOCPFIPARAMS lpParams) FIXME("dispidInitialProperty not yet implemented\n"); hdc = GetDC(NULL); - hcomctl = LoadLibraryW(comctlW); + hcomctl = LoadLibraryW(L"comctl32.dll"); if(hcomctl) property_sheet_dialog_find = FindResourceW(hcomctl, MAKEINTRESOURCEW(1006 /*IDD_PROPSHEET*/), (LPWSTR)RT_DIALOG); diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index bef4f93748b..65d29734800 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -171,14 +171,13 @@ static void FromLEDWords(void *p_Val, int p_iSize) */ static BOOL find_typelib_key( REFGUID guid, WORD *wMaj, WORD *wMin ) { - static const WCHAR typelibW[] = {'T','y','p','e','l','i','b','\\',0}; WCHAR buffer[60]; char key_name[16]; DWORD len, i; INT best_maj = -1, best_min = -1; HKEY hkey; - memcpy( buffer, typelibW, sizeof(typelibW) ); + lstrcpyW( buffer, L"Typelib\\" ); StringFromGUID2( guid, buffer + lstrlenW(buffer), 40 ); if (RegOpenKeyExW( HKEY_CLASSES_ROOT, buffer, 0, KEY_READ, &hkey ) != ERROR_SUCCESS) @@ -239,12 +238,9 @@ static BOOL find_typelib_key( REFGUID guid, WORD *wMaj, WORD *wMin ) /* buffer must be at least 60 characters long */ static WCHAR *get_typelib_key( REFGUID guid, WORD wMaj, WORD wMin, WCHAR *buffer ) { - static const WCHAR TypelibW[] = {'T','y','p','e','l','i','b','\\',0}; - static const WCHAR VersionFormatW[] = {'\\','%','x','.','%','x',0}; - - memcpy( buffer, TypelibW, sizeof(TypelibW) ); + lstrcpyW( buffer, L"Typelib\\" ); StringFromGUID2( guid, buffer + lstrlenW(buffer), 40 ); - swprintf( buffer + lstrlenW(buffer), 20, VersionFormatW, wMaj, wMin ); + swprintf( buffer + lstrlenW(buffer), 20, L"\\%x.%x", wMaj, wMin ); return buffer; } @@ -252,9 +248,7 @@ static WCHAR *get_typelib_key( REFGUID guid, WORD wMaj, WORD wMin, WCHAR *buffer /* buffer must be at least 50 characters long */ static WCHAR *get_interface_key( REFGUID guid, WCHAR *buffer ) { - static const WCHAR InterfaceW[] = {'I','n','t','e','r','f','a','c','e','\\',0}; - - memcpy( buffer, InterfaceW, sizeof(InterfaceW) ); + lstrcpyW( buffer, L"Interface\\" ); StringFromGUID2( guid, buffer + lstrlenW(buffer), 40 ); return buffer; } @@ -263,17 +257,12 @@ static WCHAR *get_interface_key( REFGUID guid, WCHAR *buffer ) /* buffer must be at least 16 characters long */ static WCHAR *get_lcid_subkey( LCID lcid, SYSKIND syskind, WCHAR *buffer ) { - static const WCHAR LcidFormatW[] = {'%','l','x','\\',0}; - static const WCHAR win16W[] = {'w','i','n','1','6',0}; - static const WCHAR win32W[] = {'w','i','n','3','2',0}; - static const WCHAR win64W[] = {'w','i','n','6','4',0}; - - swprintf( buffer, 16, LcidFormatW, lcid ); + swprintf( buffer, 16, L"%lx\\", lcid ); switch(syskind) { - case SYS_WIN16: lstrcatW( buffer, win16W ); break; - case SYS_WIN32: lstrcatW( buffer, win32W ); break; - case SYS_WIN64: lstrcatW( buffer, win64W ); break; + case SYS_WIN16: lstrcatW( buffer, L"win16" ); break; + case SYS_WIN32: lstrcatW( buffer, L"win32" ); break; + case SYS_WIN64: lstrcatW( buffer, L"win64" ); break; default: TRACE("Typelib is for unsupported syskind %i\n", syskind); return NULL; @@ -562,26 +551,11 @@ HRESULT WINAPI LoadRegTypeLib( return res; } - -/* some string constants shared between RegisterTypeLib and UnRegisterTypeLib */ -static const WCHAR TypeLibW[] = {'T','y','p','e','L','i','b',0}; -static const WCHAR FLAGSW[] = {'F','L','A','G','S',0}; -static const WCHAR HELPDIRW[] = {'H','E','L','P','D','I','R',0}; -static const WCHAR ProxyStubClsidW[] = {'P','r','o','x','y','S','t','u','b','C','l','s','i','d',0}; -static const WCHAR ProxyStubClsid32W[] = {'P','r','o','x','y','S','t','u','b','C','l','s','i','d','3','2',0}; - static void TLB_register_interface(TLIBATTR *libattr, LPOLESTR name, TYPEATTR *tattr, DWORD flag) { WCHAR keyName[60]; HKEY key, subKey; - static const WCHAR typelib_proxy_clsid[] = {'{','0','0','0','2','0','4','2','4','-', - '0','0','0','0','-','0','0','0','0','-','C','0','0','0','-', - '0','0','0','0','0','0','0','0','0','0','4','6','}',0}; - static const WCHAR dispatch_proxy_clsid[] = {'{','0','0','0','2','0','4','2','0','-', - '0','0','0','0','-','0','0','0','0','-','C','0','0','0','-', - '0','0','0','0','0','0','0','0','0','0','4','6','}',0}; - get_interface_key( &tattr->guid, keyName ); if (RegCreateKeyExW(HKEY_CLASSES_ROOT, keyName, 0, NULL, 0, KEY_WRITE | flag, NULL, &key, NULL) == ERROR_SUCCESS) @@ -589,41 +563,36 @@ static void TLB_register_interface(TLIBATTR *libattr, LPOLESTR name, TYPEATTR *t const WCHAR *proxy_clsid; if (tattr->typekind == TKIND_INTERFACE || (tattr->wTypeFlags & TYPEFLAG_FDUAL)) - proxy_clsid = typelib_proxy_clsid; + proxy_clsid = L"{00020424-0000-0000-C000-000000000046}"; else - proxy_clsid = dispatch_proxy_clsid; + proxy_clsid = L"{00020420-0000-0000-C000-000000000046}"; if (name) RegSetValueExW(key, NULL, 0, REG_SZ, (BYTE *)name, (lstrlenW(name)+1) * sizeof(OLECHAR)); - if (RegCreateKeyExW(key, ProxyStubClsidW, 0, NULL, 0, - KEY_WRITE | flag, NULL, &subKey, NULL) == ERROR_SUCCESS) { - RegSetValueExW(subKey, NULL, 0, REG_SZ, - (const BYTE *)proxy_clsid, sizeof(typelib_proxy_clsid)); + if (!RegCreateKeyExW(key, L"ProxyStubClsid", 0, NULL, 0, KEY_WRITE | flag, NULL, &subKey, NULL)) + { + RegSetValueExW(subKey, NULL, 0, REG_SZ, (const BYTE *)proxy_clsid, (lstrlenW(proxy_clsid) + 1) * sizeof(WCHAR)); RegCloseKey(subKey); } - if (RegCreateKeyExW(key, ProxyStubClsid32W, 0, NULL, 0, - KEY_WRITE | flag, NULL, &subKey, NULL) == ERROR_SUCCESS) { - RegSetValueExW(subKey, NULL, 0, REG_SZ, - (const BYTE *)proxy_clsid, sizeof(typelib_proxy_clsid)); + if (!RegCreateKeyExW(key, L"ProxyStubClsid32", 0, NULL, 0, KEY_WRITE | flag, NULL, &subKey, NULL)) + { + RegSetValueExW(subKey, NULL, 0, REG_SZ, (const BYTE *)proxy_clsid, (lstrlenW(proxy_clsid) + 1) * sizeof(WCHAR)); RegCloseKey(subKey); } - if (RegCreateKeyExW(key, TypeLibW, 0, NULL, 0, + if (RegCreateKeyExW(key, L"TypeLib", 0, NULL, 0, KEY_WRITE | flag, NULL, &subKey, NULL) == ERROR_SUCCESS) { WCHAR buffer[40]; - static const WCHAR fmtver[] = {'%','x','.','%','x',0 }; - static const WCHAR VersionW[] = {'V','e','r','s','i','o','n',0}; StringFromGUID2(&libattr->guid, buffer, 40); RegSetValueExW(subKey, NULL, 0, REG_SZ, (BYTE *)buffer, (lstrlenW(buffer)+1) * sizeof(WCHAR)); - swprintf(buffer, ARRAY_SIZE(buffer), fmtver, libattr->wMajorVerNum, libattr->wMinorVerNum); - RegSetValueExW(subKey, VersionW, 0, REG_SZ, - (BYTE*)buffer, (lstrlenW(buffer)+1) * sizeof(WCHAR)); + swprintf(buffer, ARRAY_SIZE(buffer), L"%x.%x", libattr->wMajorVerNum, libattr->wMinorVerNum); + RegSetValueExW(subKey, L"Version", 0, REG_SZ, (BYTE *)buffer, (lstrlenW(buffer)+1) * sizeof(WCHAR)); RegCloseKey(subKey); } @@ -701,13 +670,13 @@ HRESULT WINAPI RegisterTypeLib(ITypeLib *ptlib, const WCHAR *szFullPath, const W res = E_FAIL; /* Create the flags subkey */ - if (res == S_OK && RegCreateKeyExW(key, FLAGSW, 0, NULL, 0, + if (res == S_OK && RegCreateKeyExW(key, L"FLAGS", 0, NULL, 0, KEY_WRITE, NULL, &subKey, NULL) == ERROR_SUCCESS) { - /* FIXME: is %u correct? */ - static const WCHAR formatW[] = {'%','u',0}; WCHAR buf[20]; - swprintf(buf, ARRAY_SIZE(buf), formatW, attr->wLibFlags); + + /* FIXME: is %u correct? */ + swprintf(buf, ARRAY_SIZE(buf), L"%u", attr->wLibFlags); if (RegSetValueExW(subKey, NULL, 0, REG_SZ, (BYTE *)buf, (lstrlenW(buf) + 1)*sizeof(WCHAR) ) != ERROR_SUCCESS) res = E_FAIL; @@ -718,7 +687,7 @@ HRESULT WINAPI RegisterTypeLib(ITypeLib *ptlib, const WCHAR *szFullPath, const W res = E_FAIL; /* create the helpdir subkey */ - if (res == S_OK && RegCreateKeyExW(key, HELPDIRW, 0, NULL, 0, + if (res == S_OK && RegCreateKeyExW(key, L"HELPDIR", 0, NULL, 0, KEY_WRITE, NULL, &subKey, &disposition) == ERROR_SUCCESS) { BSTR freeHelpDir = NULL; @@ -862,9 +831,9 @@ static void TLB_unregister_interface(GUID *guid, REGSAM flag) if (RegOpenKeyExW(HKEY_CLASSES_ROOT, subKeyName, 0, KEY_WRITE | flag, &subKey) != ERROR_SUCCESS) return; - RegDeleteKeyW(subKey, ProxyStubClsidW); - RegDeleteKeyW(subKey, ProxyStubClsid32W); - RegDeleteKeyW(subKey, TypeLibW); + RegDeleteKeyW(subKey, L"ProxyStubClsid"); + RegDeleteKeyW(subKey, L"ProxyStubClsid32"); + RegDeleteKeyW(subKey, L"TypeLib"); RegCloseKey(subKey); RegDeleteKeyExW(HKEY_CLASSES_ROOT, subKeyName, flag, 0); } @@ -985,16 +954,16 @@ enddeleteloop: tmpLength = ARRAY_SIZE(subKeyName); /* if its not FLAGS or HELPDIR, then we must keep the rest of the key */ - if (!wcscmp(subKeyName, FLAGSW)) continue; - if (!wcscmp(subKeyName, HELPDIRW)) continue; + if (!wcscmp(subKeyName, L"FLAGS")) continue; + if (!wcscmp(subKeyName, L"HELPDIR")) continue; deleteOtherStuff = FALSE; break; } /* only delete the other parts of the key if we're absolutely sure */ if (deleteOtherStuff) { - RegDeleteKeyW(key, FLAGSW); - RegDeleteKeyW(key, HELPDIRW); + RegDeleteKeyW(key, L"FLAGS"); + RegDeleteKeyW(key, L"HELPDIR"); RegCloseKey(key); key = NULL; @@ -2970,8 +2939,7 @@ static HRESULT TLB_PEFile_Open(LPCWSTR path, INT index, LPVOID *ppBase, DWORD *p if (This->dll) { - static const WCHAR TYPELIBW[] = {'T','Y','P','E','L','I','B',0}; - This->typelib_resource = FindResourceW(This->dll, MAKEINTRESOURCEW(index), TYPELIBW); + This->typelib_resource = FindResourceW(This->dll, MAKEINTRESOURCEW(index), L"TYPELIB"); if (This->typelib_resource) { This->typelib_global = LoadResource(This->dll, This->typelib_resource); @@ -7919,7 +7887,6 @@ struct search_res_tlb_params static BOOL CALLBACK search_res_tlb(HMODULE hModule, LPCWSTR lpszType, LPWSTR lpszName, LONG_PTR lParam) { struct search_res_tlb_params *params = (LPVOID)lParam; - static const WCHAR formatW[] = {'\\','%','d',0}; WCHAR szPath[MAX_PATH+1]; ITypeLib *pTLib = NULL; HRESULT ret; @@ -7931,7 +7898,7 @@ static BOOL CALLBACK search_res_tlb(HMODULE hModule, LPCWSTR lpszType, LPWSTR lp if (!(len = GetModuleFileNameW(hModule, szPath, MAX_PATH))) return TRUE; - if (swprintf(szPath + len, ARRAY_SIZE(szPath) - len, formatW, LOWORD(lpszName)) < 0) + if (swprintf(szPath + len, ARRAY_SIZE(szPath) - len, L"\\%d", LOWORD(lpszName)) < 0) return TRUE; ret = LoadTypeLibEx(szPath, REGKIND_NONE, &pTLib); @@ -8068,7 +8035,6 @@ static HRESULT WINAPI ITypeInfo_fnGetRefTypeInfo( if (!pTLib) { - static const WCHAR TYPELIBW[] = {'T','Y','P','E','L','I','B',0}; struct search_res_tlb_params params; TRACE("typeinfo in imported typelib that isn't already loaded\n"); @@ -8076,7 +8042,7 @@ static HRESULT WINAPI ITypeInfo_fnGetRefTypeInfo( /* Search in resource table */ params.guid = TLB_get_guid_null(ref_type->pImpTLInfo->guid); params.pTLib = NULL; - EnumResourceNamesW(NULL, TYPELIBW, search_res_tlb, (LONG_PTR)&params); + EnumResourceNamesW(NULL, L"TYPELIB", search_res_tlb, (LONG_PTR)&params); if(params.pTLib) { pTLib = params.pTLib; @@ -10624,13 +10590,12 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetTypeFlags(ICreateTypeInfo2 *iface, TRACE("%p %x\n", This, typeFlags); if (typeFlags & TYPEFLAG_FDUAL) { - static const WCHAR stdole2tlb[] = { 's','t','d','o','l','e','2','.','t','l','b',0 }; ITypeLib *stdole; ITypeInfo *dispatch; HREFTYPE hreftype; HRESULT hres; - hres = LoadTypeLib(stdole2tlb, &stdole); + hres = LoadTypeLib(L"stdole2.tlb", &stdole); if(FAILED(hres)) return hres; diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index 8b4060318f5..98b9762d896 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -38,9 +38,6 @@ extern HMODULE hProxyDll DECLSPEC_HIDDEN; #define CY_HALF (CY_MULTIPLIER/2) /* 0.5 */ #define CY_HALF_F (CY_MULTIPLIER_F/2.0) -static const WCHAR szFloatFormatW[] = { '%','.','7','G','\0' }; -static const WCHAR szDoubleFormatW[] = { '%','.','1','5','G','\0' }; - /* Copy data from one variant to another. */ static inline void VARIANT_CopyData(const VARIANT *srcVar, VARTYPE vt, void *pOut) { @@ -6111,9 +6108,6 @@ static BOOL VARIANT_GetLocalisedText(LANGID langId, DWORD dwId, WCHAR *lpszDest) */ HRESULT WINAPI VarBoolFromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, VARIANT_BOOL *pBoolOut) { - /* Any VB/VBA programmers out there should recognise these strings... */ - static const WCHAR szFalse[] = { '#','F','A','L','S','E','#','\0' }; - static const WCHAR szTrue[] = { '#','T','R','U','E','#','\0' }; WCHAR szBuff[64]; LANGID langId = MAKELANGID(LANG_ENGLISH, SUBLANG_DEFAULT); HRESULT hRes = S_OK; @@ -6170,9 +6164,9 @@ VarBoolFromStr_CheckLocalised: } /* All checks against localised text have failed, try #TRUE#/#FALSE# */ - if (!wcscmp(strIn, szFalse)) + if (!wcscmp(strIn, L"#FALSE#")) *pBoolOut = VARIANT_FALSE; - else if (!wcscmp(strIn, szTrue)) + else if (!wcscmp(strIn, L"#TRUE#")) *pBoolOut = VARIANT_TRUE; else { @@ -6521,8 +6515,7 @@ static HRESULT VARIANT_BstrFromReal(DOUBLE dblIn, LCID lcid, ULONG dwFlags, */ if (buff[0] == '-') { - static const WCHAR szAccept[] = {'0', '.', '\0'}; - if (lstrlenW(buff + 1) == wcsspn(buff + 1, szAccept)) + if (lstrlenW(buff + 1) == wcsspn(buff + 1, L"0.")) { buff[0] = '0'; buff[1] = '\0'; } } @@ -6563,7 +6556,7 @@ static HRESULT VARIANT_BstrFromReal(DOUBLE dblIn, LCID lcid, ULONG dwFlags, */ HRESULT WINAPI VarBstrFromR4(FLOAT fltIn, LCID lcid, ULONG dwFlags, BSTR* pbstrOut) { - return VARIANT_BstrFromReal(fltIn, lcid, dwFlags, pbstrOut, szFloatFormatW); + return VARIANT_BstrFromReal(fltIn, lcid, dwFlags, pbstrOut, L"%.7G"); } /****************************************************************************** @@ -6584,7 +6577,7 @@ HRESULT WINAPI VarBstrFromR4(FLOAT fltIn, LCID lcid, ULONG dwFlags, BSTR* pbstrO */ HRESULT WINAPI VarBstrFromR8(double dblIn, LCID lcid, ULONG dwFlags, BSTR* pbstrOut) { - return VARIANT_BstrFromReal(dblIn, lcid, dwFlags, pbstrOut, szDoubleFormatW); + return VARIANT_BstrFromReal(dblIn, lcid, dwFlags, pbstrOut, L"%.15G"); } /****************************************************************************** -- 2.29.2

1 0

[PATCH] kernelbase: Use wide-char string literals.
by Michael Stefaniuc 26 Nov '20

26 Nov '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernelbase/locale.c | 70 ++++++++++++++++++------------------ dlls/kernelbase/path.c | 2 +- dlls/kernelbase/registry.c | 3 +- dlls/kernelbase/tests/path.c | 12 +++---- dlls/kernelbase/volume.c | 10 +++--- 5 files changed, 47 insertions(+), 50 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 7218a159844..b60bd0dbd98 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -184,41 +184,41 @@ static const struct { UINT cp; const WCHAR *name; } codepage_names[] = /* Unicode expanded ligatures */ static const WCHAR ligatures[][5] = { - { 0x00c6, 'A','E',0 }, - { 0x00de, 'T','H',0 }, - { 0x00df, 's','s',0 }, - { 0x00e6, 'a','e',0 }, - { 0x00fe, 't','h',0 }, - { 0x0132, 'I','J',0 }, - { 0x0133, 'i','j',0 }, - { 0x0152, 'O','E',0 }, - { 0x0153, 'o','e',0 }, - { 0x01c4, 'D',0x017d,0 }, - { 0x01c5, 'D',0x017e,0 }, - { 0x01c6, 'd',0x017e,0 }, - { 0x01c7, 'L','J',0 }, - { 0x01c8, 'L','j',0 }, - { 0x01c9, 'l','j',0 }, - { 0x01ca, 'N','J',0 }, - { 0x01cb, 'N','j',0 }, - { 0x01cc, 'n','j',0 }, - { 0x01e2, 0x0100,0x0112,0 }, - { 0x01e3, 0x0101,0x0113,0 }, - { 0x01f1, 'D','Z',0 }, - { 0x01f2, 'D','z',0 }, - { 0x01f3, 'd','z',0 }, - { 0x01fc, 0x00c1,0x00c9,0 }, - { 0x01fd, 0x00e1,0x00e9,0 }, - { 0x05f0, 0x05d5,0x05d5,0 }, - { 0x05f1, 0x05d5,0x05d9,0 }, - { 0x05f2, 0x05d9,0x05d9,0 }, - { 0xfb00, 'f','f',0 }, - { 0xfb01, 'f','i',0 }, - { 0xfb02, 'f','l',0 }, - { 0xfb03, 'f','f','i',0 }, - { 0xfb04, 'f','f','l',0 }, - { 0xfb05, 0x017f,'t',0 }, - { 0xfb06, 's','t',0 }, + L"\x00c6" "AE", + L"\x00deTH", + L"\x00dfss", + L"\x00e6" "ae", + L"\x00feth", + L"\x0132IJ", + L"\x0133ij", + L"\x0152OE", + L"\x0153oe", + L"\x01c4" "D\x017d", + L"\x01c5" "D\x017e", + L"\x01c6" "d\x017e", + L"\x01c7LJ", + L"\x01c8Lj", + L"\x01c9lj", + L"\x01caNJ", + L"\x01cbNj", + L"\x01ccnj", + L"\x01e2\x0100\x0112", + L"\x01e3\x0101\x0113", + L"\x01f1" "DZ", + L"\x01f2" "Dz", + L"\x01f3" "dz", + L"\x01fc\x00c1\x00c9", + L"\x01fd\x00e1\x00e9", + L"\x05f0\x05d5\x05d5", + L"\x05f1\x05d5\x05d9", + L"\x05f2\x05d9\x05d9", + L"\xfb00" "ff", + L"\xfb01" "fi", + L"\xfb02" "fl", + L"\xfb03" "ffi", + L"\xfb04" "ffl", + L"\xfb05\x017ft", + L"\xfb06st", }; enum locationkind { LOCATION_NATION = 0, LOCATION_REGION, LOCATION_BOTH }; diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index d7e2f0a2347..f0c79bcc94c 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -2944,7 +2944,7 @@ HRESULT WINAPI UrlUnescapeW(WCHAR *url, WCHAR *unescaped, DWORD *unescaped_len, else if (*src == '%' && isxdigit(*(src + 1)) && isxdigit(*(src + 2)) && !stop_unescaping) { INT ih; - WCHAR buf[5] = {'0','x',0}; + WCHAR buf[5] = L"0x"; memcpy(buf + 2, src + 1, 2*sizeof(WCHAR)); buf[4] = 0; StrToIntExW(buf, STIF_SUPPORT_HEX, &ih); diff --git a/dlls/kernelbase/registry.c b/dlls/kernelbase/registry.c index d1588d0b265..574bf2f56b7 100644 --- a/dlls/kernelbase/registry.c +++ b/dlls/kernelbase/registry.c @@ -2775,7 +2775,6 @@ LSTATUS WINAPI RegLoadMUIStringW(HKEY hKey, LPCWSTR pwszValue, LPWSTR pwszBuffer /* Parse the value and load the string. */ { WCHAR *pComma = wcsrchr(pwszExpandedBuffer, ','), *pNewBuffer; - const WCHAR backslashW[] = {'\\',0}; UINT uiStringId; DWORD baseDirLen; int reqChars; @@ -2802,7 +2801,7 @@ LSTATUS WINAPI RegLoadMUIStringW(HKEY hKey, LPCWSTR pwszValue, LPWSTR pwszBuffer if (baseDirLen) { lstrcpyW(pwszTempBuffer, pwszBaseDir); if (pwszBaseDir[baseDirLen - 1] != '\\') - lstrcatW(pwszTempBuffer, backslashW); + lstrcatW(pwszTempBuffer, L"\\"); } lstrcatW(pwszTempBuffer, pwszExpandedBuffer + 1); diff --git a/dlls/kernelbase/tests/path.c b/dlls/kernelbase/tests/path.c index 2ee7b512b31..8d85542612f 100644 --- a/dlls/kernelbase/tests/path.c +++ b/dlls/kernelbase/tests/path.c @@ -546,9 +546,9 @@ static void test_PathAllocCombine(void) static void test_PathCchCombine(void) { - WCHAR expected[PATHCCH_MAX_CCH] = {'C', ':', '\\', 'a', 0}; - WCHAR p1[PATHCCH_MAX_CCH] = {'C', ':', '\\', 0}; - WCHAR p2[PATHCCH_MAX_CCH] = {'a', 0}; + WCHAR expected[PATHCCH_MAX_CCH] = L"C:\\a"; + WCHAR p1[PATHCCH_MAX_CCH] = L"C:\\"; + WCHAR p2[PATHCCH_MAX_CCH] = L"a"; WCHAR output[PATHCCH_MAX_CCH]; HRESULT hr; INT i; @@ -607,9 +607,9 @@ static void test_PathCchCombine(void) static void test_PathCchCombineEx(void) { - WCHAR expected[MAX_PATH] = {'C',':','\\','a',0}; - WCHAR p1[MAX_PATH] = {'C',':','\\',0}; - WCHAR p2[MAX_PATH] = {'a',0}; + WCHAR expected[MAX_PATH] = L"C:\\a"; + WCHAR p1[MAX_PATH] = L"C:\\"; + WCHAR p2[MAX_PATH] = L"a"; WCHAR output[MAX_PATH]; HRESULT hr; int i; diff --git a/dlls/kernelbase/volume.c b/dlls/kernelbase/volume.c index 53cc0d49b65..7daf9c98823 100644 --- a/dlls/kernelbase/volume.c +++ b/dlls/kernelbase/volume.c @@ -152,7 +152,6 @@ static DWORD get_mountmgr_drive_type( LPCWSTR root ) /* get the label by reading it from a file at the root of the filesystem */ static void get_filesystem_label( const UNICODE_STRING *device, WCHAR *label, DWORD len ) { - static const WCHAR labelW[] = {'.','w','i','n','d','o','w','s','-','l','a','b','e','l',0}; HANDLE handle; UNICODE_STRING name; IO_STATUS_BLOCK io; @@ -167,12 +166,12 @@ static void get_filesystem_label( const UNICODE_STRING *device, WCHAR *label, DW attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - name.MaximumLength = device->Length + sizeof(labelW); + name.MaximumLength = device->Length + sizeof(L".windows-label"); name.Length = name.MaximumLength - sizeof(WCHAR); if (!(name.Buffer = HeapAlloc( GetProcessHeap(), 0, name.MaximumLength ))) return; memcpy( name.Buffer, device->Buffer, device->Length ); - memcpy( name.Buffer + device->Length / sizeof(WCHAR), labelW, sizeof(labelW) ); + memcpy( name.Buffer + device->Length / sizeof(WCHAR), L".windows-label", sizeof(L".windows-label") ); if (!NtOpenFile( &handle, GENERIC_READ | SYNCHRONIZE, &attr, &io, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_NON_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT )) { @@ -193,7 +192,6 @@ static void get_filesystem_label( const UNICODE_STRING *device, WCHAR *label, DW /* get the serial number by reading it from a file at the root of the filesystem */ static DWORD get_filesystem_serial( const UNICODE_STRING *device ) { - static const WCHAR serialW[] = {'.','w','i','n','d','o','w','s','-','s','e','r','i','a','l',0}; HANDLE handle; UNICODE_STRING name; IO_STATUS_BLOCK io; @@ -207,12 +205,12 @@ static DWORD get_filesystem_serial( const UNICODE_STRING *device ) attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - name.MaximumLength = device->Length + sizeof(serialW); + name.MaximumLength = device->Length + sizeof(L".windows-serial"); name.Length = name.MaximumLength - sizeof(WCHAR); if (!(name.Buffer = HeapAlloc( GetProcessHeap(), 0, name.MaximumLength ))) return 0; memcpy( name.Buffer, device->Buffer, device->Length ); - memcpy( name.Buffer + device->Length / sizeof(WCHAR), serialW, sizeof(serialW) ); + memcpy( name.Buffer + device->Length / sizeof(WCHAR), L".windows-serial", sizeof(L".windows-serial") ); if (!NtOpenFile( &handle, GENERIC_READ | SYNCHRONIZE, &attr, &io, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_SYNCHRONOUS_IO_NONALERT )) { -- 2.26.2

2 1