wine-commits February 2020

wine-commits@winehq.org

2 participants
874 discussions

Alex Henrie : ntdll/tests: Add more tests for RtlIpv6StringToAddress.
by Alexandre Julliard 13 Feb '20

13 Feb '20

Module: wine Branch: master Commit: cdda13321057c61b29119d678f0436b89a9f2cf4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cdda13321057c61b29119d67… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Jan 30 22:57:33 2020 -0700 ntdll/tests: Add more tests for RtlIpv6StringToAddress. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/rtl.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index e49888022f..559a7d625c 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -1537,6 +1537,8 @@ static const struct { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0, 0 } }, { "1111:2222:3333:4444:5555:6666::8888", STATUS_SUCCESS, 35, { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0, 0x8888 } }, + { "1111:2222:3333:4444:5555:6666::7777:8888", STATUS_SUCCESS, 35, + { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0, 0x7777 }, ex_fail_6 }, { "1111:2222:3333:4444:5555::", STATUS_SUCCESS, 26, { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0, 0, 0 } }, { "1111:2222:3333:4444:5555::123.123.123.123", STATUS_SUCCESS, 41, @@ -1617,6 +1619,8 @@ static const struct { 0, 0, 0, 0, 0, 0, 0, 0 } }, { "::/16", STATUS_SUCCESS, 2, { 0, 0, 0, 0, 0, 0, 0, 0 }, ex_fail_6 }, + { "::01234", STATUS_INVALID_PARAMETER, 7, + { 0, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab } }, { "::0", STATUS_SUCCESS, 3, { 0, 0, 0, 0, 0, 0, 0, 0 } }, { "::0:0", STATUS_SUCCESS, 5, @@ -1650,6 +1654,12 @@ static const struct { 0x120, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab } }, { "2001:0000:01234:0000:0000:C1C0:ABCD:0876", STATUS_INVALID_PARAMETER, -1, { 0x120, 0, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab } }, + { "2001:0000::01234.0", STATUS_INVALID_PARAMETER, -1, + { 0x120, 0, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab } }, + { "2001:0::b.0", STATUS_SUCCESS, 9, + { 0x120, 0, 0, 0, 0, 0, 0, 0xb00 }, ex_fail_6 }, + { "2001::0:b.0", STATUS_SUCCESS, 9, + { 0x120, 0, 0, 0, 0, 0, 0, 0xb00 }, ex_fail_6 }, { "1.2.3.4", STATUS_INVALID_PARAMETER, 7, { 0x201, 0xab03, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab } }, { "1.2.3.4:1111::5555", STATUS_INVALID_PARAMETER, 7, @@ -1720,8 +1730,14 @@ static const struct { 0x100, 0x201, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab } }, { "1::1.256.3.4", STATUS_INVALID_PARAMETER, -1, { 0x100, 0xab01, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab } }, + { "1::1.256:3.4", STATUS_INVALID_PARAMETER, 8, + { 0x100, 0xab01, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab } }, + { "1::1.2a.3.4", STATUS_INVALID_PARAMETER, 6, + { 0x100, 0xab01, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab } }, { "1::256.2.3.4", STATUS_INVALID_PARAMETER, -1, { 0x100, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab } }, + { "1::1a.2.3.4", STATUS_SUCCESS, 5, + { 0x100, 0, 0, 0, 0, 0, 0, 0x1a00 }, ex_fail_6 }, { "1::2::3", STATUS_SUCCESS, 4, { 0x100, 0, 0, 0, 0, 0, 0, 0x200 }, ex_fail_6 }, { "2001:0000:1234: 0000:0000:C1C0:ABCD:0876", STATUS_INVALID_PARAMETER, 15,

1 0

Nikolay Sivov : ole32: Implement MTA pinning with CoIncrementMTAUsage()/CoDecrementMTAUsage().
by Alexandre Julliard 13 Feb '20

13 Feb '20

Module: wine Branch: master Commit: 03a7c25abe13e78127e72fdc2f0c290e8015757c URL: https://source.winehq.org/git/wine.git/?a=commit;h=03a7c25abe13e78127e72fdc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 13 13:50:13 2020 +0300 ole32: Implement MTA pinning with CoIncrementMTAUsage()/CoDecrementMTAUsage(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-com-l1-1-0.spec | 4 +- .../api-ms-win-core-com-l1-1-1.spec | 4 +- dlls/combase/combase.spec | 4 +- dlls/ole32/compobj.c | 67 ++++++++++++++++++++++ dlls/ole32/compobj_private.h | 2 + dlls/ole32/ole32.spec | 2 + dlls/ole32/tests/compobj.c | 41 +++++++++++++ include/objbase.h | 4 ++ 8 files changed, 122 insertions(+), 6 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=03a7c25abe13e78127e7…

1 0

Derek Lesho : mfplat/tests: Add more comprehensive media source tests.
by Alexandre Julliard 13 Feb '20

13 Feb '20

Module: wine Branch: master Commit: b7047b5ae9fc84a6414db9bb80c4264b1550c7a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7047b5ae9fc84a6414db9bb… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Thu Feb 13 13:38:43 2020 +0300 mfplat/tests: Add more comprehensive media source tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 135 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 130 insertions(+), 5 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 67123d0b69..66524f1b48 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -350,25 +350,62 @@ static const IMFAsyncCallbackVtbl test_create_from_file_handler_callback_vtbl = test_create_from_file_handler_callback_Invoke, }; +static BOOL get_event(IMFMediaEventGenerator *generator, MediaEventType expected_event_type, PROPVARIANT *value) +{ + MediaEventType event_type; + HRESULT hr, event_status; + IMFMediaEvent *event; + + hr = IMFMediaEventGenerator_GetEvent(generator, 0, &event); + ok(hr == S_OK, "Failed to get event, hr %#x.\n", hr); + + hr = IMFMediaEvent_GetStatus(event, &event_status); + ok(hr == S_OK, "Failed to get status code, hr %#x.\n", hr); + ok(event_status == S_OK, "Unexpected event status code %#x.\n", event_status); + + hr = IMFMediaEvent_GetType(event, &event_type); + ok(hr == S_OK, "Failed to event type, hr %#x.\n", hr); + ok(event_type == expected_event_type, "Unexpected event type %u, expected %u.\n", event_type, expected_event_type); + + if (event_type != expected_event_type) + { + IMFMediaEvent_Release(event); + return FALSE; + } + + if (value) + { + hr = IMFMediaEvent_GetValue(event, value); + ok(hr == S_OK, "Failed to get value of event, hr %#x.\n", hr); + } + + IMFMediaEvent_Release(event); + + return TRUE; +} + static void test_source_resolver(void) { - static const WCHAR file_type[] = {'v','i','d','e','o','/','m','p','4',0}; struct test_callback callback = { { &test_create_from_url_callback_vtbl } }; struct test_callback callback2 = { { &test_create_from_file_handler_callback_vtbl } }; IMFSourceResolver *resolver, *resolver2; + IMFPresentationDescriptor *descriptor; IMFSchemeHandler *scheme_handler; + IMFMediaStream *video_stream; IMFAttributes *attributes; IMFMediaSource *mediasource; - IMFPresentationDescriptor *descriptor; IMFMediaTypeHandler *handler; + IMFMediaType *media_type; BOOL selected, do_uninit; MF_OBJECT_TYPE obj_type; IMFStreamDescriptor *sd; IUnknown *cancel_cookie; IMFByteStream *stream; WCHAR pathW[MAX_PATH]; - HRESULT hr; + int i, sample_count; WCHAR *filename; + PROPVARIANT var; + HRESULT hr; GUID guid; if (!pMFCreateSourceResolver) @@ -428,7 +465,7 @@ static void test_source_resolver(void) hr = IMFByteStream_QueryInterface(stream, &IID_IMFAttributes, (void **)&attributes); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IMFAttributes_SetString(attributes, &MF_BYTESTREAM_CONTENT_TYPE, file_type); + hr = IMFAttributes_SetString(attributes, &MF_BYTESTREAM_CONTENT_TYPE, L"video/mp4"); ok(hr == S_OK, "Failed to set string value, hr %#x.\n", hr); IMFAttributes_Release(attributes); @@ -447,13 +484,101 @@ static void test_source_resolver(void) hr = IMFStreamDescriptor_GetMediaTypeHandler(sd, &handler); ok(hr == S_OK, "Failed to get type handler, hr %#x.\n", hr); + IMFStreamDescriptor_Release(sd); hr = IMFMediaTypeHandler_GetMajorType(handler, &guid); todo_wine ok(hr == S_OK, "Failed to get stream major type, hr %#x.\n", hr); + if (FAILED(hr)) + goto skip_source_tests; + + /* Check major/minor type for the test media. */ + ok(IsEqualGUID(&guid, &MFMediaType_Video), "Unexpected major type %s.\n", debugstr_guid(&guid)); + + hr = IMFMediaTypeHandler_GetCurrentMediaType(handler, &media_type); + ok(hr == S_OK, "Failed to get current media type, hr %#x.\n", hr); + hr = IMFMediaType_GetGUID(media_type, &MF_MT_SUBTYPE, &guid); + ok(hr == S_OK, "Failed to get media sub type, hr %#x.\n", hr); + ok(IsEqualGUID(&guid, &MFVideoFormat_M4S2), "Unexpected sub type %s.\n", debugstr_guid(&guid)); + IMFMediaType_Release(media_type); + + hr = IMFPresentationDescriptor_SelectStream(descriptor, 0); + ok(hr == S_OK, "Failed to select video stream, hr %#x.\n", hr); + + var.vt = VT_EMPTY; + hr = IMFMediaSource_Start(mediasource, descriptor, &GUID_NULL, &var); + ok(hr == S_OK, "Failed to start media source, hr %#x.\n", hr); + + get_event((IMFMediaEventGenerator *)mediasource, MENewStream, &var); + ok(var.vt == VT_UNKNOWN, "Unexpected value type %u from MENewStream event.\n", var.vt); + video_stream = (IMFMediaStream *)var.punkVal; + + get_event((IMFMediaEventGenerator *)mediasource, MESourceStarted, NULL); + + /* Request samples, our file is 10 frames at 25fps */ + get_event((IMFMediaEventGenerator *)video_stream, MEStreamStarted, NULL); + sample_count = 10; + + /* Request one beyond EOS, otherwise EndOfStream isn't queued. */ + for (i = 0; i <= sample_count; ++i) + { + hr = IMFMediaStream_RequestSample(video_stream, NULL); + if (i == sample_count) + break; + ok(hr == S_OK, "Failed to request sample %u, hr %#x.\n", i + 1, hr); + if (hr != S_OK) + break; + } + + for (i = 0; i < sample_count; ++i) + { + static const LONGLONG MILLI_TO_100_NANO = 10000; + LONGLONG duration, time; + DWORD buffer_count; + IMFSample *sample; + BOOL ret; + + ret = get_event((IMFMediaEventGenerator *)video_stream, MEMediaSample, &var); + ok(ret, "Sample %u not received.\n", i + 1); + if (!ret) + break; + + ok(var.vt == VT_UNKNOWN, "Unexpected value type %u from MEMediaSample event.\n", var.vt); + sample = (IMFSample *)var.punkVal; + + hr = IMFSample_GetBufferCount(sample, &buffer_count); + ok(hr == S_OK, "Failed to get buffer count, hr %#x.\n", hr); + ok(buffer_count == 1, "Unexpected buffer count %u.\n", buffer_count); + + hr = IMFSample_GetSampleDuration(sample, &duration); + ok(hr == S_OK, "Failed to get sample duration, hr %#x.\n", hr); + ok(duration == 40 * MILLI_TO_100_NANO, "Unexpected duration %s.\n", wine_dbgstr_longlong(duration)); + + hr = IMFSample_GetSampleTime(sample, &time); + ok(hr == S_OK, "Failed to get sample time, hr %#x.\n", hr); + ok(time == i * 40 * MILLI_TO_100_NANO, "Unexpected time %s.\n", wine_dbgstr_longlong(time)); + + IMFSample_Release(sample); + } + + if (i == sample_count) + get_event((IMFMediaEventGenerator *)video_stream, MEEndOfStream, NULL); + + hr = IMFMediaStream_RequestSample(video_stream, NULL); + ok(hr == MF_E_END_OF_STREAM, "Unexpected hr %#x.\n", hr); + IMFMediaStream_Release(video_stream); + + get_event((IMFMediaEventGenerator *)mediasource, MEEndOfPresentation, NULL); IMFMediaTypeHandler_Release(handler); - IMFStreamDescriptor_Release(sd); + + hr = IMFMediaSource_Shutdown(mediasource); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaSource_CreatePresentationDescriptor(mediasource, NULL); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + +skip_source_tests: IMFPresentationDescriptor_Release(descriptor); IMFMediaSource_Release(mediasource);

1 0

Daniel Lehman : tzres: Add Haiti Time Zone.
by Alexandre Julliard 13 Feb '20

13 Feb '20

Module: wine Branch: master Commit: a832b2b799921ba0825eda22986bb9ecb914ccfc URL: https://source.winehq.org/git/wine.git/?a=commit;h=a832b2b799921ba0825eda22… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Wed Feb 12 19:34:52 2020 -0800 tzres: Add Haiti Time Zone. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/tzres/tzres.rc | 2 + loader/wine.inf.in | 22 +++++ po/ar.po | 238 +++++++++++++++++++++++++++------------------------ po/ast.po | 238 +++++++++++++++++++++++++++------------------------ po/bg.po | 234 ++++++++++++++++++++++++++------------------------ po/ca.po | 238 +++++++++++++++++++++++++++------------------------ po/cs.po | 238 +++++++++++++++++++++++++++------------------------ po/da.po | 238 +++++++++++++++++++++++++++------------------------ po/de.po | 238 +++++++++++++++++++++++++++------------------------ po/el.po | 234 ++++++++++++++++++++++++++------------------------ po/en.po | 234 ++++++++++++++++++++++++++------------------------ po/en_US.po | 234 ++++++++++++++++++++++++++------------------------ po/eo.po | 238 +++++++++++++++++++++++++++------------------------ po/es.po | 238 +++++++++++++++++++++++++++------------------------ po/fa.po | 236 ++++++++++++++++++++++++++------------------------ po/fi.po | 238 +++++++++++++++++++++++++++------------------------ po/fr.po | 238 +++++++++++++++++++++++++++------------------------ po/he.po | 238 +++++++++++++++++++++++++++------------------------ po/hi.po | 234 ++++++++++++++++++++++++++------------------------ po/hr.po | 238 +++++++++++++++++++++++++++------------------------ po/hu.po | 238 +++++++++++++++++++++++++++------------------------ po/it.po | 238 +++++++++++++++++++++++++++------------------------ po/ja.po | 238 +++++++++++++++++++++++++++------------------------ po/ko.po | 238 +++++++++++++++++++++++++++------------------------ po/lt.po | 238 +++++++++++++++++++++++++++------------------------ po/ml.po | 234 ++++++++++++++++++++++++++------------------------ po/nb_NO.po | 238 +++++++++++++++++++++++++++------------------------ po/nl.po | 238 +++++++++++++++++++++++++++------------------------ po/or.po | 234 ++++++++++++++++++++++++++------------------------ po/pa.po | 234 ++++++++++++++++++++++++++------------------------ po/pl.po | 238 +++++++++++++++++++++++++++------------------------ po/pt_BR.po | 238 +++++++++++++++++++++++++++------------------------ po/pt_PT.po | 238 +++++++++++++++++++++++++++------------------------ po/rm.po | 234 ++++++++++++++++++++++++++------------------------ po/ro.po | 238 +++++++++++++++++++++++++++------------------------ po/ru.po | 234 ++++++++++++++++++++++++++------------------------ po/si.po | 238 +++++++++++++++++++++++++++------------------------ po/sk.po | 238 +++++++++++++++++++++++++++------------------------ po/sl.po | 238 +++++++++++++++++++++++++++------------------------ po/sr_RS(a)cyrillic.po | 236 ++++++++++++++++++++++++++------------------------ po/sr_RS(a)latin.po | 236 ++++++++++++++++++++++++++------------------------ po/sv.po | 238 +++++++++++++++++++++++++++------------------------ po/ta.po | 234 ++++++++++++++++++++++++++------------------------ po/te.po | 234 ++++++++++++++++++++++++++------------------------ po/th.po | 236 ++++++++++++++++++++++++++------------------------ po/tr.po | 238 +++++++++++++++++++++++++++------------------------ po/uk.po | 234 ++++++++++++++++++++++++++------------------------ po/wa.po | 236 ++++++++++++++++++++++++++------------------------ po/wine.pot | 234 ++++++++++++++++++++++++++------------------------ po/zh_CN.po | 238 +++++++++++++++++++++++++++------------------------ po/zh_TW.po | 238 +++++++++++++++++++++++++++------------------------ 51 files changed, 6083 insertions(+), 5537 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a832b2b799921ba0825e…

1 0

Dmitry Timoshkov : adsldp/tests: Add some tests for LDAPNamespace.
by Alexandre Julliard 13 Feb '20

13 Feb '20

Module: wine Branch: master Commit: 0bb5b0f21e16f2b9e8f033911d9075bb56de210c URL: https://source.winehq.org/git/wine.git/?a=commit;h=0bb5b0f21e16f2b9e8f03391… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Feb 13 10:46:38 2020 +0800 adsldp/tests: Add some tests for LDAPNamespace. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/tests/Makefile.in | 1 + dlls/adsldp/tests/ldap.c | 81 +++++++++++++++++++++++++++++++++++++++++++ dlls/adsldp/tests/sysinfo.c | 2 ++ 3 files changed, 84 insertions(+) diff --git a/dlls/adsldp/tests/Makefile.in b/dlls/adsldp/tests/Makefile.in index 777d2aa9de..52141139d5 100644 --- a/dlls/adsldp/tests/Makefile.in +++ b/dlls/adsldp/tests/Makefile.in @@ -2,4 +2,5 @@ TESTDLL = adsldp.dll IMPORTS = ole32 oleaut32 secur32 advapi32 uuid C_SRCS = \ + ldap.c \ sysinfo.c diff --git a/dlls/adsldp/tests/ldap.c b/dlls/adsldp/tests/ldap.c new file mode 100644 index 0000000000..e2ce9ee1a2 --- /dev/null +++ b/dlls/adsldp/tests/ldap.c @@ -0,0 +1,81 @@ +/* + * LDAPNamespace Tests + * + * Copyright 2019 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 + */ + +#include <stdarg.h> +#include <stdio.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "objbase.h" +#include "iads.h" + +#include "wine/test.h" + +#include "initguid.h" +DEFINE_GUID(CLSID_LDAPNamespace,0x228d9a82,0xc302,0x11cf,0x9a,0xa4,0x00,0xaa,0x00,0x4a,0x56,0x91); + +static void test_LDAP(void) +{ + HRESULT hr; + IUnknown *unk; + IADs *ads; + IADsOpenDSObject *ads_open; + IDispatch *disp; + BSTR path; + + hr = CoCreateInstance(&CLSID_LDAPNamespace, 0, CLSCTX_INPROC_SERVER, &IID_IADs, (void **)&ads); + ok(hr == S_OK, "got %#x\n", hr); + IADs_Release(ads); + + hr = CoCreateInstance(&CLSID_LDAPNamespace, 0, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&unk); + ok(hr == S_OK, "got %#x\n", hr); + + hr = IUnknown_QueryInterface(unk, &IID_IDispatch, (void **)&disp); + ok(hr == S_OK, "got %#x\n", hr); + IDispatch_Release(disp); + + hr = IUnknown_QueryInterface(unk, &IID_IADsOpenDSObject, (void **)&ads_open); + ok(hr == S_OK, "got %#x\n", hr); + IADsOpenDSObject_Release(ads_open); + + path = SysAllocString(L"LDAP:"); + hr = IADsOpenDSObject_OpenDSObject(ads_open, path, NULL, NULL, ADS_SECURE_AUTHENTICATION, &disp); + SysFreeString(path); +todo_wine + ok(hr == S_OK, "got %#x\n", hr); +if (hr == S_OK) + IDispatch_Release(disp); + + IUnknown_Release(unk); +} + +START_TEST(ldap) +{ + HRESULT hr; + + hr = CoInitialize(NULL); + ok(hr == S_OK, "got %#x\n", hr); + + test_LDAP(); + + CoUninitialize(); +} diff --git a/dlls/adsldp/tests/sysinfo.c b/dlls/adsldp/tests/sysinfo.c index f2fc92a1b2..c7495dcb88 100644 --- a/dlls/adsldp/tests/sysinfo.c +++ b/dlls/adsldp/tests/sysinfo.c @@ -210,4 +210,6 @@ START_TEST(sysinfo) test_ComputerName(); test_UserName(); test_sysinfo(); + + CoUninitialize(); }

1 0

Dmitry Timoshkov : adsldp: Add IADsOpenDSObject stubs.
by Alexandre Julliard 13 Feb '20

13 Feb '20

Module: wine Branch: master Commit: 9b3418d4b98cd6198972106fd13cc1e2d7435541 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b3418d4b98cd6198972106f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Feb 13 10:46:35 2020 +0800 adsldp: Add IADsOpenDSObject stubs. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/adsldp.c | 102 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 102 insertions(+) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index 7686da9a3c..7281375e91 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -258,6 +258,7 @@ static HRESULT ADSystemInfo_create(REFIID riid, void **obj) typedef struct { IADs IADs_iface; + IADsOpenDSObject IADsOpenDSObject_iface; LONG ref; } LDAP_namespace; @@ -268,6 +269,8 @@ static inline LDAP_namespace *impl_from_IADs(IADs *iface) static HRESULT WINAPI ldapns_QueryInterface(IADs *iface, REFIID riid, void **obj) { + LDAP_namespace *ldap = impl_from_IADs(iface); + TRACE("%p,%s,%p\n", iface, debugstr_guid(riid), obj); if (!riid || !obj) return E_INVALIDARG; @@ -281,6 +284,13 @@ static HRESULT WINAPI ldapns_QueryInterface(IADs *iface, REFIID riid, void **obj return S_OK; } + if (IsEqualGUID(riid, &IID_IADsOpenDSObject)) + { + IADs_AddRef(iface); + *obj = &ldap->IADsOpenDSObject_iface; + return S_OK; + } + FIXME("interface %s is not implemented\n", debugstr_guid(riid)); return E_NOINTERFACE; } @@ -434,6 +444,97 @@ static const IADsVtbl IADs_vtbl = ldapns_GetInfoEx }; +static inline LDAP_namespace *impl_from_IADsOpenDSObject(IADsOpenDSObject *iface) +{ + return CONTAINING_RECORD(iface, LDAP_namespace, IADsOpenDSObject_iface); +} + +static HRESULT WINAPI openobj_QueryInterface(IADsOpenDSObject *iface, REFIID riid, void **obj) +{ + TRACE("%p,%s,%p\n", iface, debugstr_guid(riid), obj); + + if (!riid || !obj) return E_INVALIDARG; + + if (IsEqualGUID(riid, &IID_IADsOpenDSObject) || + IsEqualGUID(riid, &IID_IDispatch) || + IsEqualGUID(riid, &IID_IUnknown)) + { + IADsOpenDSObject_AddRef(iface); + *obj = iface; + return S_OK; + } + + FIXME("interface %s is not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI openobj_AddRef(IADsOpenDSObject *iface) +{ + LDAP_namespace *ldap = impl_from_IADsOpenDSObject(iface); + return InterlockedIncrement(&ldap->ref); +} + +static ULONG WINAPI openobj_Release(IADsOpenDSObject *iface) +{ + LDAP_namespace *ldap = impl_from_IADsOpenDSObject(iface); + LONG ref = InterlockedDecrement(&ldap->ref); + + if (!ref) + { + TRACE("destroying %p\n", iface); + HeapFree(GetProcessHeap(), 0, ldap); + } + + return ref; +} + +static HRESULT WINAPI openobj_GetTypeInfoCount(IADsOpenDSObject *iface, UINT *count) +{ + FIXME("%p,%p: stub\n", iface, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI openobj_GetTypeInfo(IADsOpenDSObject *iface, UINT index, LCID lcid, ITypeInfo **info) +{ + FIXME("%p,%u,%#x,%p: stub\n", iface, index, lcid, info); + return E_NOTIMPL; +} + +static HRESULT WINAPI openobj_GetIDsOfNames(IADsOpenDSObject *iface, REFIID riid, LPOLESTR *names, + UINT count, LCID lcid, DISPID *dispid) +{ + FIXME("%p,%s,%p,%u,%u,%p: stub\n", iface, debugstr_guid(riid), names, count, lcid, dispid); + return E_NOTIMPL; +} + +static HRESULT WINAPI openobj_Invoke(IADsOpenDSObject *iface, DISPID dispid, REFIID riid, LCID lcid, WORD flags, + DISPPARAMS *params, VARIANT *result, EXCEPINFO *excepinfo, UINT *argerr) +{ + FIXME("%p,%d,%s,%04x,%04x,%p,%p,%p,%p: stub\n", iface, dispid, debugstr_guid(riid), lcid, flags, + params, result, excepinfo, argerr); + return E_NOTIMPL; +} + +static HRESULT WINAPI openobj_OpenDSObject(IADsOpenDSObject *iface, BSTR path, BSTR user, BSTR password, + LONG reserved, IDispatch **obj) +{ + FIXME("%p,%s,%s,%s,%d,%p: stub\n", iface, debugstr_w(path), debugstr_w(user), debugstr_w(password), + reserved, obj); + return E_NOTIMPL; +} + +static const IADsOpenDSObjectVtbl IADsOpenDSObject_vtbl = +{ + openobj_QueryInterface, + openobj_AddRef, + openobj_Release, + openobj_GetTypeInfoCount, + openobj_GetTypeInfo, + openobj_GetIDsOfNames, + openobj_Invoke, + openobj_OpenDSObject +}; + static HRESULT LDAPNamespace_create(REFIID riid, void **obj) { LDAP_namespace *ldap; @@ -443,6 +544,7 @@ static HRESULT LDAPNamespace_create(REFIID riid, void **obj) if (!ldap) return E_OUTOFMEMORY; ldap->IADs_iface.lpVtbl = &IADs_vtbl; + ldap->IADsOpenDSObject_iface.lpVtbl = &IADsOpenDSObject_vtbl; ldap->ref = 1; hr = IADs_QueryInterface(&ldap->IADs_iface, riid, obj);

1 0

Dmitry Timoshkov : adsldp: Add LDAPNamespace stubs.
by Alexandre Julliard 13 Feb '20

13 Feb '20

Module: wine Branch: master Commit: 5b1ea57821087386bf1b7d2019d31470deef64ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b1ea57821087386bf1b7d20… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Feb 13 10:46:32 2020 +0800 adsldp: Add LDAPNamespace stubs. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/Makefile.in | 2 + dlls/adsldp/adsldp.c | 294 ++++++++++++++++++++++++++++++++++++++++++++---- dlls/adsldp/adsldp.idl | 8 ++ dlls/adsldp/adsldp.rgs | 16 +++ dlls/adsldp/rsrc.rc | 20 ++++ 5 files changed, 315 insertions(+), 25 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5b1ea57821087386bf1b…

1 0

Jacek Caban : makedep: Use msvcrt headers for objects inside importlibs.
by Alexandre Julliard 13 Feb '20

13 Feb '20

Module: wine Branch: master Commit: 0d537c854c24f85a506a27e417b94d1410c50368 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d537c854c24f85a506a27e4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 12 15:55:31 2020 +0100 makedep: Use msvcrt headers for objects inside importlibs. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/crt_main.c | 2 +- dlls/msvcrt/crt_wmain.c | 2 +- dlls/msvcrt/iob.c | 6 +++--- dlls/msvcrt/mathf.c | 14 +++++++++++++- dlls/msvcrt/onexit.c | 1 + dlls/ucrtbase/printf.c | 1 + tools/makedep.c | 1 + 7 files changed, 21 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/crt_main.c b/dlls/msvcrt/crt_main.c index 7502f30075..d9e3e66964 100644 --- a/dlls/msvcrt/crt_main.c +++ b/dlls/msvcrt/crt_main.c @@ -24,7 +24,7 @@ #ifdef __MINGW32__ -#include "msvcrt.h" +#include <stdarg.h> #include "windef.h" #include "winbase.h" diff --git a/dlls/msvcrt/crt_wmain.c b/dlls/msvcrt/crt_wmain.c index 0588d5bdce..60a67bbe30 100644 --- a/dlls/msvcrt/crt_wmain.c +++ b/dlls/msvcrt/crt_wmain.c @@ -24,7 +24,7 @@ #ifdef __MINGW32__ -#include "msvcrt.h" +#include <stdarg.h> #include "windef.h" #include "winbase.h" diff --git a/dlls/msvcrt/iob.c b/dlls/msvcrt/iob.c index 5d289f6ba0..a499f19309 100644 --- a/dlls/msvcrt/iob.c +++ b/dlls/msvcrt/iob.c @@ -23,15 +23,15 @@ #pragma makedep implib #endif -#include "msvcrt.h" +#include <stdio.h> #undef __iob_func -extern MSVCRT_FILE * CDECL __iob_func(void); +extern FILE * __cdecl __iob_func(void); /********************************************************************* * __acrt_iob_func(UCRTBASE.@) */ -MSVCRT_FILE * CDECL __acrt_iob_func(unsigned idx) +FILE * __cdecl __acrt_iob_func(unsigned idx) { return __iob_func() + idx; } diff --git a/dlls/msvcrt/mathf.c b/dlls/msvcrt/mathf.c index c2db0c54c3..232740df15 100644 --- a/dlls/msvcrt/mathf.c +++ b/dlls/msvcrt/mathf.c @@ -23,7 +23,19 @@ #pragma makedep implib #endif -#include <math.h> +#include <corecrt.h> + +double __cdecl sin(double); +double __cdecl cos(double); +double __cdecl tan(double); +double __cdecl atan2(double, double); +double __cdecl exp(double); +double __cdecl log(double); +double __cdecl pow(double, double); +double __cdecl sqrt(double); +double __cdecl floor(double); +double __cdecl ceil(double); +float __cdecl powf(float, float); #if defined(__i386__) || (_MSVCR_VER > 0 && _MSVCR_VER < 80) float sinf(float x) { return sin(x); } diff --git a/dlls/msvcrt/onexit.c b/dlls/msvcrt/onexit.c index d1877a1c38..62d884f3ac 100644 --- a/dlls/msvcrt/onexit.c +++ b/dlls/msvcrt/onexit.c @@ -23,6 +23,7 @@ #pragma makedep implib #endif +#define _CRTIMP #include "msvcrt.h" #include "mtdll.h" diff --git a/dlls/ucrtbase/printf.c b/dlls/ucrtbase/printf.c index 8f58e6c3e5..099026950f 100644 --- a/dlls/ucrtbase/printf.c +++ b/dlls/ucrtbase/printf.c @@ -21,6 +21,7 @@ #pragma makedep implib #endif +#define _CRTIMP #include <stdarg.h> #include "msvcrt.h" diff --git a/tools/makedep.c b/tools/makedep.c index 1d9a1b5a59..1e33b1c673 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1628,6 +1628,7 @@ static void parse_file( struct makefile *make, struct incl_file *source, int src source->files_size = file->deps_count; source->files = xmalloc( source->files_size * sizeof(*source->files) ); if (file->flags & FLAG_C_UNIX) source->use_msvcrt = 0; + else if (file->flags & FLAG_C_IMPLIB) source->use_msvcrt = 1; if (source->sourcename) {

1 0

Jacek Caban : tchar.h: Fix some macros.
by Alexandre Julliard 13 Feb '20

13 Feb '20

Module: wine Branch: master Commit: 40c3662fb3d30458e20de7219973e97a70668740 URL: https://source.winehq.org/git/wine.git/?a=commit;h=40c3662fb3d30458e20de721… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 13 13:13:21 2020 +0100 tchar.h: Fix some macros. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/tchar.h | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/include/tchar.h b/include/tchar.h index 8de69c7466..e14aaf3884 100644 --- a/include/tchar.h +++ b/include/tchar.h @@ -104,7 +104,7 @@ extern "C" { #define _tchmod WINE_tchar_routine(chmod, _chmod, _wchmod) #define _tcreat WINE_tchar_routine(creat, _creat, _wcreat) #define _tcscat WINE_tchar_routine(strcat, _mbscat, wcscat) -#define _tcscat_s WINE_tchar_routine(strncat_s, _mbsncat_s, wcsncat_s) +#define _tcscat_s WINE_tchar_routine(strcat_s, _mbscat_s, wcscat_s) #define _tcschr WINE_tchar_routine(strchr, _mbschr, wcschr) #define _tcsclen WINE_tchar_routine(strlen, _mbslen, wcslen) #define _tcscmp WINE_tchar_routine(strcmp, _mbscmp, wcscmp) @@ -123,17 +123,15 @@ extern "C" { #define _tcslwr_s WINE_tchar_routine(_strlwr_s, _mbslwr_s, _wcslwr_s) #define _tcsnbcnt WINE_tchar_routine(_strncnt, _mbsnbcnt, _wcnscnt) #define _tcsncat WINE_tchar_routine(strncat, _mbsnbcat, wcsncat) -#define _tcscat_s WINE_tchar_routine(strcat_s, _mbsnbcat_s, wcscat_s) +#define _tcsncat_s WINE_tchar_routine(strncat_s, _mbsncat_s, wcsncat_s) #define _tcsnccat WINE_tchar_routine(strncat, _mbsncat, wcsncat) #define _tcsncmp WINE_tchar_routine(strncmp, _mbsnbcmp, wcsncmp) -#define _tcsncpy WINE_tchar_routine(strncpy, _mbsncpy, wcsncpy) -#define _tcsncpy_s WINE_tchar_routine(strncpy_s, _mbsncpy_s, wcsncpy_s) #define _tcsnccmp WINE_tchar_routine(strncmp, _mbsncmp, wcsncmp) #define _tcsnccnt WINE_tchar_routine(_strncnt, _mbsnccnt, _wcsncnt) #define _tcsnccpy WINE_tchar_routine(strncpy, _mbsncpy, wcsncpy) #define _tcsncicmp WINE_tchar_routine(_strnicmp, _mbsnicmp, _wcsnicmp) #define _tcsncpy WINE_tchar_routine(strncpy, _mbsnbcpy, wcsncpy) -#define _tcsncpy WINE_tchar_routine(strncpy_s, _mbsnbcpy_s, wcsncpy_s) +#define _tcsncpy_s WINE_tchar_routine(strncpy_s, _mbsnbcpy_s, wcsncpy_s) #define _tcsncset WINE_tchar_routine(_strnset, _mbsnset, _wcsnset) #define _tcsnextc WINE_tchar_routine(_strnextc, _mbsnextc, _wcsnextc) #define _tcsnicmp WINE_tchar_routine(_strnicmp, _mbsnicmp, _wcsnicmp)

1 0

Jacek Caban : corecrt_wstdio.h: Add new file and use it instead of duplicating declarations in stdio.h and wchar.h.
by Alexandre Julliard 13 Feb '20

13 Feb '20

Module: wine Branch: master Commit: ba07e25ccf71fcc073652d756b6aec6d8edb50a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba07e25ccf71fcc073652d75… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 13 15:24:09 2020 +0100 corecrt_wstdio.h: Add new file and use it instead of duplicating declarations in stdio.h and wchar.h. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/msvcrt/corecrt_wstdio.h | 123 ++++++++++++++++++++++++++++++++++++++++ include/msvcrt/stdio.h | 103 +-------------------------------- include/msvcrt/wchar.h | 99 +------------------------------- 4 files changed, 126 insertions(+), 200 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ba07e25ccf71fcc07365…

1 0

← Newer
1
...
41
42
43
44
45
46
47
...
88
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2020