November 2020 - Wine-Commits

Alexandre Julliard : include: Add CURRENT_SS/SP macros for 16-bit code.
by Alexandre Julliard Nov. 26, 2020

Nov. 26, 2020

Module: wine Branch: master Commit: f87262ea9935f5bc62d1f2f9c0146c7723ef7b59 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f87262ea9935f5bc62d1f2f9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 26 12:49:41 2020 +0100 include: Add CURRENT_SS/SP macros for 16-bit code. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/commdlg.dll16/filedlg.c | 4 ++-- dlls/krnl386.exe16/kernel.c | 7 +++--- dlls/krnl386.exe16/kernel16_private.h | 9 ++++---- dlls/krnl386.exe16/ne_module.c | 8 +++---- dlls/krnl386.exe16/ne_segment.c | 24 ++++++++++---------- dlls/krnl386.exe16/task.c | 37 +++++++++++++++--------------- dlls/krnl386.exe16/thunk.c | 42 ++++++++++++++++------------------- dlls/krnl386.exe16/wowthunk.c | 15 +++++-------- dlls/system.drv16/system.c | 2 +- dlls/user.exe16/message.c | 6 ++--- include/wine/winbase16.h | 2 ++ 11 files changed, 73 insertions(+), 83 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f87262ea9935f5bc62d1…

1 0

Alexandre Julliard : include: Make the CURRENT_STACK16 and CURRENT_DS macros available globally.
by Alexandre Julliard Nov. 26, 2020

Nov. 26, 2020

Module: wine Branch: master Commit: 6e1c296ef3b8cc37e595453365175f892f08b51f URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e1c296ef3b8cc37e5954533… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 26 12:42:54 2020 +0100 include: Make the CURRENT_STACK16 and CURRENT_DS macros available globally. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/kernel16_private.h | 3 --- dlls/krnl386.exe16/thunk.c | 2 +- dlls/toolhelp.dll16/toolhelp.c | 10 ++++----- dlls/user.exe16/message.c | 40 ++++++++++++++--------------------- dlls/user.exe16/user.c | 24 ++++++++++----------- dlls/user.exe16/window.c | 3 +-- include/wine/winbase16.h | 4 ++++ 7 files changed, 38 insertions(+), 48 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6e1c296ef3b8cc37e595…

1 0

Zebediah Figura : mountmgr.sys: Add a comment advertising the HKLM\Software\Wine\Ports registry key.
by Alexandre Julliard Nov. 26, 2020

Nov. 26, 2020

Module: wine Branch: master Commit: 067c077277a2fd5397419507698eda8f94101f57 URL: https://source.winehq.org/git/wine.git/?a=commit;h=067c077277a2fd5397419507… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Nov 25 20:20:45 2020 -0600 mountmgr.sys: Add a comment advertising the HKLM\Software\Wine\Ports registry key. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mountmgr.sys/device.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index 6db088f11ee..ed345d110a4 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -2067,6 +2067,8 @@ static void create_port_devices( DRIVER_OBJECT *driver ) } p += 3; + /* @@ Wine registry key: HKLM\Software\Wine\Ports */ + RegCreateKeyExW( HKEY_LOCAL_MACHINE, ports_keyW, 0, NULL, 0, KEY_QUERY_VALUE, NULL, &wine_ports_key, NULL ); RegCreateKeyExW( HKEY_LOCAL_MACHINE, windows_ports_key_name, 0, NULL, REG_OPTION_VOLATILE,

1 0

Zebediah Figura : qcap: Directly pass a VIDEOINFOHEADER pointer to the get_media_type() operation.
by Alexandre Julliard Nov. 26, 2020

Nov. 26, 2020

Module: wine Branch: master Commit: 6de7c227ed2da671ee9a08af7c81084959af7ffb URL: https://source.winehq.org/git/wine.git/?a=commit;h=6de7c227ed2da671ee9a08af… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Nov 25 17:43:39 2020 -0600 qcap: Directly pass a VIDEOINFOHEADER pointer to the get_media_type() operation. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/qcap_private.h | 3 ++- dlls/qcap/v4l.c | 15 +++++++++++---- dlls/qcap/vfwcapture.c | 15 ++++++++++++++- 3 files changed, 27 insertions(+), 6 deletions(-) diff --git a/dlls/qcap/qcap_private.h b/dlls/qcap/qcap_private.h index 50bc2525f0e..379d9908637 100644 --- a/dlls/qcap/qcap_private.h +++ b/dlls/qcap/qcap_private.h @@ -47,7 +47,8 @@ struct video_capture_funcs HRESULT (*check_format)(struct video_capture_device *device, const AM_MEDIA_TYPE *mt); HRESULT (*set_format)(struct video_capture_device *device, const AM_MEDIA_TYPE *mt); void (*get_format)(struct video_capture_device *device, AM_MEDIA_TYPE *mt, VIDEOINFOHEADER *format); - HRESULT (*get_media_type)(struct video_capture_device *device, unsigned int index, AM_MEDIA_TYPE *mt); + HRESULT (*get_media_type)(struct video_capture_device *device, + unsigned int index, AM_MEDIA_TYPE *mt, VIDEOINFOHEADER *format); void (*get_caps)(struct video_capture_device *device, LONG index, AM_MEDIA_TYPE *mt, VIDEOINFOHEADER *format, VIDEO_STREAM_CONFIG_CAPS *caps); LONG (*get_caps_count)(struct video_capture_device *device); diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index dd002f7b3ea..b5a599eb0bc 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -216,7 +216,7 @@ static void v4l_device_get_format(struct video_capture_device *device, AM_MEDIA_ } static HRESULT v4l_device_get_media_type(struct video_capture_device *device, - unsigned int index, AM_MEDIA_TYPE *mt) + unsigned int index, AM_MEDIA_TYPE *mt, VIDEOINFOHEADER *format) { unsigned int caps_count = (device->current_caps) ? 1 : device->caps_count; @@ -224,9 +224,16 @@ static HRESULT v4l_device_get_media_type(struct video_capture_device *device, return VFW_S_NO_MORE_ITEMS; if (device->current_caps) - return CopyMediaType(mt, &device->current_caps->media_type); - - return CopyMediaType(mt, &device->caps[index].media_type); + { + *mt = device->current_caps->media_type; + *format = device->current_caps->video_info; + } + else + { + *mt = device->caps[index].media_type; + *format = device->caps[index].video_info; + } + return S_OK; } static __u32 v4l2_cid_from_qcap_property(VideoProcAmpProperty property) diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index e98e97b7816..8123dc4f6f7 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -658,7 +658,20 @@ static HRESULT source_get_media_type(struct strmbase_pin *pin, unsigned int index, AM_MEDIA_TYPE *mt) { struct vfw_capture *filter = impl_from_strmbase_pin(pin); - return capture_funcs->get_media_type(filter->device, index, mt); + VIDEOINFOHEADER *format; + HRESULT hr; + + if (!(format = CoTaskMemAlloc(sizeof(*format)))) + return E_OUTOFMEMORY; + + if ((hr = capture_funcs->get_media_type(filter->device, index, mt, format)) != S_OK) + { + CoTaskMemFree(format); + return hr; + } + mt->cbFormat = sizeof(VIDEOINFOHEADER); + mt->pbFormat = (BYTE *)format; + return S_OK; } static HRESULT source_query_interface(struct strmbase_pin *iface, REFIID iid, void **out)

1 0

Zebediah Figura : qcap/tests: Add some tests for pin connection.
by Alexandre Julliard Nov. 26, 2020

Nov. 26, 2020

Module: wine Branch: master Commit: 2e6a55a5b1cee84becd3e3b541b88aee72f6f45a URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e6a55a5b1cee84becd3e3b5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Nov 25 17:43:34 2020 -0600 qcap/tests: Add some tests for pin connection. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/tests/videocapture.c | 207 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 198 insertions(+), 9 deletions(-) diff --git a/dlls/qcap/tests/videocapture.c b/dlls/qcap/tests/videocapture.c index e8175f5df9a..fafd18009f4 100644 --- a/dlls/qcap/tests/videocapture.c +++ b/dlls/qcap/tests/videocapture.c @@ -296,6 +296,191 @@ static void test_misc_flags(IBaseFilter *filter) IAMFilterMiscFlags_Release(misc_flags); } +struct testfilter +{ + struct strmbase_filter filter; + struct strmbase_sink sink; +}; + +static inline struct testfilter *impl_from_strmbase_filter(struct strmbase_filter *iface) +{ + return CONTAINING_RECORD(iface, struct testfilter, filter); +} + +static struct strmbase_pin *testfilter_get_pin(struct strmbase_filter *iface, unsigned int index) +{ + struct testfilter *filter = impl_from_strmbase_filter(iface); + if (!index) + return &filter->sink.pin; + return NULL; +} + +static void testfilter_destroy(struct strmbase_filter *iface) +{ + struct testfilter *filter = impl_from_strmbase_filter(iface); + strmbase_sink_cleanup(&filter->sink); + strmbase_filter_cleanup(&filter->filter); +} + +static const struct strmbase_filter_ops testfilter_ops = +{ + .filter_get_pin = testfilter_get_pin, + .filter_destroy = testfilter_destroy, +}; + +static HRESULT testsink_query_interface(struct strmbase_pin *iface, REFIID iid, void **out) +{ + struct testfilter *filter = impl_from_strmbase_filter(iface->filter); + + if (IsEqualGUID(iid, &IID_IMemInputPin)) + *out = &filter->sink.IMemInputPin_iface; + else + return E_NOINTERFACE; + + IUnknown_AddRef((IUnknown *)*out); + return S_OK; +} + +static HRESULT WINAPI testsink_Receive(struct strmbase_sink *iface, IMediaSample *sample) +{ + return S_OK; +} + +static const struct strmbase_sink_ops testsink_ops = +{ + .base.pin_query_interface = testsink_query_interface, + .pfnReceive = testsink_Receive, +}; + +static void testfilter_init(struct testfilter *filter) +{ + static const GUID clsid = {0xabacab}; + memset(filter, 0, sizeof(*filter)); + strmbase_filter_init(&filter->filter, NULL, &clsid, &testfilter_ops); + strmbase_sink_init(&filter->sink, &filter->filter, L"sink", &testsink_ops, NULL); +} + +static void test_connect_pin(IBaseFilter *filter, IPin *source) +{ + AM_MEDIA_TYPE req_mt, default_mt, mt, *mts[2]; + IAMStreamConfig *stream_config; + struct testfilter testsink; + IEnumMediaTypes *enummt; + IFilterGraph2 *graph; + ULONG count, ref; + HRESULT hr; + IPin *peer; + + CoCreateInstance(&CLSID_FilterGraph, NULL, CLSCTX_INPROC_SERVER, + &IID_IFilterGraph2, (void **)&graph); + testfilter_init(&testsink); + IFilterGraph2_AddFilter(graph, &testsink.filter.IBaseFilter_iface, L"sink"); + IFilterGraph2_AddFilter(graph, filter, L"source"); + hr = IPin_QueryInterface(source, &IID_IAMStreamConfig, (void **)&stream_config); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + peer = (IPin *)0xdeadbeef; + hr = IPin_ConnectedTo(source, &peer); + ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); + ok(!peer, "Got peer %p.\n", peer); + + hr = IPin_ConnectionMediaType(source, &mt); + ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); + + hr = IPin_EnumMediaTypes(source, &enummt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IEnumMediaTypes_Next(enummt, 2, mts, &count); + ok(SUCCEEDED(hr), "Got hr %#x.\n", hr); + CopyMediaType(&req_mt, mts[count - 1]); + CopyMediaType(&default_mt, mts[0]); + DeleteMediaType(mts[0]); + if (count > 1) + DeleteMediaType(mts[1]); + IEnumMediaTypes_Release(enummt); + + hr = IAMStreamConfig_GetFormat(stream_config, &mts[0]); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(compare_media_types(mts[0], &default_mt), "Media types didn't match.\n"); + DeleteMediaType(mts[0]); + + hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, &req_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_ConnectedTo(source, &peer); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(peer == &testsink.sink.pin.IPin_iface, "Got peer %p.\n", peer); + IPin_Release(peer); + + hr = IPin_ConnectionMediaType(source, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(compare_media_types(&mt, &req_mt), "Media types didn't match.\n"); + ok(compare_media_types(&testsink.sink.pin.mt, &req_mt), "Media types didn't match.\n"); + FreeMediaType(&mt); + + hr = IAMStreamConfig_GetFormat(stream_config, &mts[0]); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(compare_media_types(mts[0], &req_mt), "Media types didn't match.\n"); + DeleteMediaType(mts[0]); + + hr = IPin_EnumMediaTypes(source, &enummt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IEnumMediaTypes_Next(enummt, 1, mts, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(compare_media_types(mts[0], &default_mt), "Media types didn't match.\n"); + DeleteMediaType(mts[0]); + IEnumMediaTypes_Release(enummt); + + hr = IFilterGraph2_Disconnect(graph, source); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IFilterGraph2_Disconnect(graph, source); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(testsink.sink.pin.peer == source, "Got peer %p.\n", testsink.sink.pin.peer); + IFilterGraph2_Disconnect(graph, &testsink.sink.pin.IPin_iface); + + hr = IAMStreamConfig_GetFormat(stream_config, &mts[0]); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(compare_media_types(mts[0], &default_mt), "Media types didn't match.\n"); + DeleteMediaType(mts[0]); + + FreeMediaType(&req_mt); + FreeMediaType(&default_mt); + IAMStreamConfig_Release(stream_config); + ref = IFilterGraph2_Release(graph); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IBaseFilter_Release(&testsink.filter.IBaseFilter_iface); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + +static void test_connection(IMoniker *moniker) +{ + IEnumPins *enum_pins; + IBaseFilter *filter; + HRESULT hr; + ULONG ref; + IPin *pin; + + hr = IMoniker_BindToObject(moniker, NULL, NULL, &IID_IBaseFilter, (void **)&filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_EnumPins(filter, &enum_pins); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + while (IEnumPins_Next(enum_pins, 1, &pin, NULL) == S_OK) + { + PIN_DIRECTION dir; + IPin_QueryDirection(pin, &dir); + if (dir == PINDIR_OUTPUT) + { + test_connect_pin(filter, pin); + } + IPin_Release(pin); + } + + IEnumPins_Release(enum_pins); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(videocapture) { ICreateDevEnum *dev_enum; @@ -329,17 +514,21 @@ START_TEST(videocapture) trace("Testing device %s.\n", wine_dbgstr_w(name)); CoTaskMemFree(name); - hr = IMoniker_BindToObject(moniker, NULL, NULL, &IID_IBaseFilter, (void**)&filter); - if (hr == S_OK) + if (FAILED(hr = IMoniker_BindToObject(moniker, NULL, NULL, &IID_IBaseFilter, (void **)&filter))) { - test_filter_interfaces(filter); - test_pins(filter); - test_misc_flags(filter); - ref = IBaseFilter_Release(filter); - ok(!ref, "Got outstanding refcount %d.\n", ref); + skip("Failed to open device %s, hr %#x.\n", debugstr_w(name), hr); + IMoniker_Release(moniker); + continue; } - else - skip("Failed to open capture device, hr=%#x.\n", hr); + + test_filter_interfaces(filter); + test_pins(filter); + test_misc_flags(filter); + + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); + + test_connection(moniker); IMoniker_Release(moniker); }

1 0

Nikolay Sivov : oleaut32: Use wide-char string literals.
by Alexandre Julliard Nov. 26, 2020

Nov. 26, 2020

Module: wine Branch: master Commit: c4a9a296ba1e96af3cfc14e3da7c8612c7461b98 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4a9a296ba1e96af3cfc14e3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 26 11:07:57 2020 +0300 oleaut32: Use wide-char string literals. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c4a9a296ba1e96af3cfc…

1 0

Alexandre Julliard : ntdll: Store the syscall dispatcher also in the WOW32Reserved TEB field.
by Alexandre Julliard Nov. 26, 2020

Nov. 26, 2020

Module: wine Branch: master Commit: baec5f1eca35450e13f24b65605c9783e5dca1d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=baec5f1eca35450e13f24b65… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 26 13:33:52 2020 +0100 ntdll: Store the syscall dispatcher also in the WOW32Reserved TEB field. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/virtual.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index eaaf7242883..785583a340a 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -2542,6 +2542,7 @@ static void init_teb( TEB *teb, PEB *peb ) PtrToUlong( &teb64->ActivationContextStack.FrameListCache ); teb64->StaticUnicodeString.Buffer = PtrToUlong( teb64->StaticUnicodeBuffer ); teb64->StaticUnicodeString.MaximumLength = sizeof( teb64->StaticUnicodeBuffer ); + teb->WOW32Reserved = __wine_syscall_dispatcher; #endif teb->Peb = peb; teb->Tib.Self = &teb->Tib;

1 0

Zebediah Figura : qcap: Return the connection type from IAMStreamConfig::GetFormat() if connected.
by Alexandre Julliard Nov. 26, 2020

Nov. 26, 2020

Module: wine Branch: master Commit: 14088498eca61f8c4f17a04ed36749625c60ac39 URL: https://source.winehq.org/git/wine.git/?a=commit;h=14088498eca61f8c4f17a04e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Nov 25 17:43:35 2020 -0600 qcap: Return the connection type from IAMStreamConfig::GetFormat() if connected. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/vfwcapture.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index f0a985d5f4b..5c1ce9af980 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -344,8 +344,14 @@ static HRESULT WINAPI AMStreamConfig_GetFormat(IAMStreamConfig *iface, AM_MEDIA_ if (!(*mt = CoTaskMemAlloc(sizeof(**mt)))) return E_OUTOFMEMORY; - if (SUCCEEDED(hr = capture_funcs->get_format(filter->device, *mt))) + EnterCriticalSection(&filter->filter.csFilter); + + if (filter->source.pin.peer) + hr = CopyMediaType(*mt, &filter->source.pin.mt); + else if (SUCCEEDED(hr = capture_funcs->get_format(filter->device, *mt))) strmbase_dump_media_type(*mt); + + LeaveCriticalSection(&filter->filter.csFilter); return hr; }

1 0

Piotr Caban : msvcrt: Reimplement _configthreadlocale function.
by Alexandre Julliard Nov. 25, 2020

Nov. 25, 2020

Module: wine Branch: master Commit: a9dfe7aba20ab30743c838e378e2bfe02bb99a9d URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9dfe7aba20ab30743c838e3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 25 20:24:37 2020 +0100 msvcrt: Reimplement _configthreadlocale function. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/locale.c | 37 +++++++------------------------------ 1 file changed, 7 insertions(+), 30 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 3925678a9fd..2502e556ee2 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -2128,40 +2128,17 @@ int CDECL _configthreadlocale(int type) thread_data_t *data = msvcrt_get_thread_data(); int ret; - if(!data) - return -1; - ret = (data->locale_flags & LOCALE_THREAD ? MSVCRT__ENABLE_PER_THREAD_LOCALE : MSVCRT__DISABLE_PER_THREAD_LOCALE); - if(ret == type) - return ret; - - if(data->locale_flags & LOCALE_FREE) - { - free_locinfo(data->locinfo); - free_mbcinfo(data->mbcinfo); - data->locale_flags &= ~LOCALE_FREE; - } - - if(type == MSVCRT__ENABLE_PER_THREAD_LOCALE) { - MSVCRT__locale_tstruct locale; - get_current_locale_noalloc(&locale); - data->locinfo = locale.locinfo; - data->mbcinfo = locale.mbcinfo; - data->locale_flags = LOCALE_FREE | LOCALE_THREAD; - return ret; - } + if(type == MSVCRT__ENABLE_PER_THREAD_LOCALE) + data->locale_flags |= LOCALE_THREAD; + else if(type == MSVCRT__DISABLE_PER_THREAD_LOCALE) + data->locale_flags &= ~LOCALE_THREAD; + else if(type) + ret = -1; - if(type == MSVCRT__DISABLE_PER_THREAD_LOCALE) { - data->locale_flags = 0; - return ret; - } - - if(!type) - return ret; - - return -1; + return ret; } #endif

1 0

Piotr Caban : msvcrt: Simplify get_current_locale_noalloc implementation.
by Alexandre Julliard Nov. 25, 2020

Nov. 25, 2020

Module: wine Branch: master Commit: 40d4fbe45997a1820296e7909ba2212518bcfacc URL: https://source.winehq.org/git/wine.git/?a=commit;h=40d4fbe45997a1820296e790… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 25 20:24:56 2020 +0100 msvcrt: Simplify get_current_locale_noalloc implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/locale.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 6d891c3a8e0..73138bfd306 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -1174,20 +1174,11 @@ MSVCRT__locale_t CDECL get_current_locale_noalloc(MSVCRT__locale_t locale) { thread_data_t *data = msvcrt_get_thread_data(); - if(!data || !(data->locale_flags & LOCALE_THREAD)) - { - _lock_locales(); - *locale = *MSVCRT_locale; - } - else - { - locale->locinfo = data->locinfo; - locale->mbcinfo = data->mbcinfo; - } + update_thread_locale(data); + locale->locinfo = data->locinfo; + locale->mbcinfo = data->mbcinfo; grab_locinfo(locale->locinfo); - if(locale->locinfo == MSVCRT_locale->locinfo) - _unlock_locales(); InterlockedIncrement(&locale->mbcinfo->refcount); return locale; }

1 0