February 2021 - Wine-commits

Nikolay Sivov : mfplat/tests: Switch to a different texture format to enable more tests on older versions.
by Alexandre Julliard 03 Feb '21

03 Feb '21

Module: wine Branch: master Commit: b9dd3272ff7e10cdcafa54d34ce8868ee49b1753 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9dd3272ff7e10cdcafa54d3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 3 14:27:56 2021 +0300 mfplat/tests: Switch to a different texture format to enable more tests on older versions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 949e8e5feed..71294686ae0 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -6212,7 +6212,7 @@ static void test_dxgi_surface_buffer(void) desc.Width = 64; desc.Height = 64; desc.ArraySize = 1; - desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + desc.Format = DXGI_FORMAT_B8G8R8A8_UNORM; desc.SampleDesc.Count = 1; desc.SampleDesc.Quality = 0; @@ -6220,14 +6220,7 @@ static void test_dxgi_surface_buffer(void) ok(hr == S_OK, "Failed to create a texture, hr %#x.\n", hr); hr = pMFCreateDXGISurfaceBuffer(&IID_ID3D11Texture2D, (IUnknown *)texture, 0, FALSE, &buffer); - ok(hr == S_OK || broken(hr == MF_E_INVALIDMEDIATYPE) /* Win8 */, "Failed to create a buffer, hr %#x.\n", hr); - - if (FAILED(hr)) - { - ID3D11Texture2D_Release(texture); - ID3D11Device_Release(device); - return; - } + ok(hr == S_OK, "Failed to create a buffer, hr %#x.\n", hr); check_interface(buffer, &IID_IMF2DBuffer, TRUE); check_interface(buffer, &IID_IMF2DBuffer2, TRUE);

1 0

Nikolay Sivov : mfplat/tests: Add a workaround for test failures on Windows 7 VMs.
by Alexandre Julliard 03 Feb '21

03 Feb '21

Module: wine Branch: master Commit: f920f633d7ef6061ebe85f25e23a8d5a145b33e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f920f633d7ef6061ebe85f25… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 3 14:27:57 2021 +0300 mfplat/tests: Add a workaround for test failures on Windows 7 VMs. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 71294686ae0..a548e307783 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -5083,15 +5083,19 @@ static void test_queue_com_state(const char *name) queue_type = name[1] - '0'; hr = pMFAllocateWorkQueueEx(queue_type, &queue); - ok(hr == S_OK, "Failed to allocate a queue, hr %#x.\n", hr); + ok(hr == S_OK || broken(queue_type == MF_MULTITHREADED_WORKQUEUE && hr == E_INVALIDARG) /* Win7 */, + "Failed to allocate a queue of type %u, hr %#x.\n", queue_type, hr); - callback.param = queue; - hr = MFPutWorkItem(queue, &callback.IMFAsyncCallback_iface, NULL); - ok(SUCCEEDED(hr), "Failed to queue work item, hr %#x.\n", hr); - WaitForSingleObject(callback.event, INFINITE); + if (SUCCEEDED(hr)) + { + callback.param = queue; + hr = MFPutWorkItem(queue, &callback.IMFAsyncCallback_iface, NULL); + ok(SUCCEEDED(hr), "Failed to queue work item, hr %#x.\n", hr); + WaitForSingleObject(callback.event, INFINITE); - hr = MFUnlockWorkQueue(queue); - ok(hr == S_OK, "Failed to unlock the queue, hr %#x.\n", hr); + hr = MFUnlockWorkQueue(queue); + ok(hr == S_OK, "Failed to unlock the queue, hr %#x.\n", hr); + } } CloseHandle(callback.event);

1 0

Nikolay Sivov : mfplat: Add a stub implementation of DXGI surface buffer.
by Alexandre Julliard 03 Feb '21

03 Feb '21

Module: wine Branch: master Commit: 3bf4896669bc87b9c06ab47e6d373b617c19f217 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3bf4896669bc87b9c06ab47e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 3 14:27:58 2021 +0300 mfplat: Add a stub implementation of DXGI surface buffer. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/buffer.c | 279 +++++++++++++++++++++++++++++++++++++++++++++ dlls/mfplat/main.c | 2 +- dlls/mfplat/mfplat.spec | 1 + dlls/mfplat/tests/mfplat.c | 8 +- 4 files changed, 288 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3bf4896669bc87b9c06a…

1 0

Nikolay Sivov : mfplat/allocator: Add initial implementation of sample allocator.
by Alexandre Julliard 03 Feb '21

03 Feb '21

Module: wine Branch: master Commit: 0e7836c0ac8dca20864de33e86766cffdc4f2b5a URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e7836c0ac8dca20864de33e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 3 14:27:59 2021 +0300 mfplat/allocator: Add initial implementation of sample allocator. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mediatype.c | 2 +- dlls/mfplat/mfplat.spec | 1 + dlls/mfplat/sample.c | 671 +++++++++++++++++++++++++++++++++++++++++++++ dlls/mfplat/tests/mfplat.c | 5 +- 4 files changed, 677 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0e7836c0ac8dca20864d…

1 0

Nikolay Sivov : mfplat/tests: Add some tests for sample allocator using D3D9 device.
by Alexandre Julliard 03 Feb '21

03 Feb '21

Module: wine Branch: master Commit: 467a96e9e5b5a2b8974181ce6ce87c91798cb0ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=467a96e9e5b5a2b8974181ce… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 3 14:28:00 2021 +0300 mfplat/tests: Add some tests for sample allocator using D3D9 device. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/Makefile.in | 2 +- dlls/mfplat/tests/mfplat.c | 81 ++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 78 insertions(+), 5 deletions(-) diff --git a/dlls/mfplat/tests/Makefile.in b/dlls/mfplat/tests/Makefile.in index 4e9413e8da0..ae9cc378933 100644 --- a/dlls/mfplat/tests/Makefile.in +++ b/dlls/mfplat/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = mfplat.dll -IMPORTS = ole32 mfplat user32 d3d9 mfuuid propsys uuid strmiids +IMPORTS = ole32 mfplat user32 d3d9 dxva2 mfuuid propsys uuid strmiids C_SRCS = \ mfplat.c diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 2e2610a3827..3d6e553ce35 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -46,6 +46,7 @@ #include "d3d9types.h" #include "ks.h" #include "ksmedia.h" +#include "dxva2api.h" DEFINE_GUID(DUMMY_CLSID, 0x12345678,0x1234,0x1234,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19); DEFINE_GUID(DUMMY_GUID1, 0x12345678,0x1234,0x1234,0x21,0x21,0x21,0x21,0x21,0x21,0x21,0x21); @@ -6290,15 +6291,20 @@ static void test_sample_allocator(void) IMFDXGIDeviceManager *manager; IMFSample *sample, *sample2; IMFDXGIBuffer *dxgi_buffer; + IMFAttributes *attributes; D3D11_TEXTURE2D_DESC desc; + unsigned int buffer_count, token; ID3D11Texture2D *texture; IMFMediaBuffer *buffer; ID3D11Device *device; LONG refcount, count; - unsigned int token; IUnknown *unk; HRESULT hr; BYTE *data; + IDirect3D9 *d3d9; + HWND window; + IDirect3DDeviceManager9 *d3d9_manager; + IDirect3DDevice9 *d3d9_device; if (!pMFCreateVideoSampleAllocatorEx) { @@ -6407,12 +6413,20 @@ todo_wine check_interface(buffer, &IID_IMFDXGIBuffer, FALSE); IMFMediaBuffer_Release(buffer); + + hr = IMFSample_GetBufferCount(sample, &buffer_count); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(buffer_count == 1, "Unexpected buffer count %u.\n", buffer_count); + IMFSample_Release(sample); IMFVideoSampleAllocatorCallback_Release(allocator_cb); IMFVideoSampleAllocator_Release(allocator); /* IMFVideoSampleAllocatorEx */ + hr = MFCreateAttributes(&attributes, 0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = pMFCreateVideoSampleAllocatorEx(&IID_IMFVideoSampleAllocatorEx, (void **)&allocatorex); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); @@ -6422,9 +6436,15 @@ todo_wine hr = IMFVideoSampleAllocatorEx_InitializeSampleAllocatorEx(allocatorex, 1, 0, NULL, video_type); ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); - hr = IMFVideoSampleAllocatorEx_InitializeSampleAllocatorEx(allocatorex, 0, 0, NULL, video_type); + hr = IMFAttributes_SetUINT32(attributes, &MF_SA_BUFFERS_PER_SAMPLE, 2); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + EXPECT_REF(attributes, 1); + hr = IMFVideoSampleAllocatorEx_InitializeSampleAllocatorEx(allocatorex, 0, 0, attributes, video_type); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); +todo_wine + EXPECT_REF(attributes, 2); + count = 0; hr = IMFVideoSampleAllocatorCallback_GetFreeSampleCount(allocator_cb, &count); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); @@ -6433,6 +6453,11 @@ todo_wine hr = IMFVideoSampleAllocatorEx_AllocateSample(allocatorex, &sample); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFSample_GetBufferCount(sample, &buffer_count); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); +todo_wine + ok(buffer_count == 2, "Unexpected buffer count %u.\n", buffer_count); + hr = IMFVideoSampleAllocatorEx_AllocateSample(allocatorex, &sample2); ok(hr == MF_E_SAMPLEALLOCATOR_EMPTY, "Unexpected hr %#x.\n", hr); @@ -6440,6 +6465,7 @@ todo_wine IMFVideoSampleAllocatorCallback_Release(allocator_cb); IMFVideoSampleAllocatorEx_Release(allocatorex); + IMFAttributes_Release(attributes); /* Using device manager */ if (!(device = create_d3d11_device())) @@ -6511,10 +6537,57 @@ todo_wine IMFSample_Release(sample); IMFVideoSampleAllocator_Release(allocator); - - IMFMediaType_Release(media_type); IMFDXGIDeviceManager_Release(manager); ID3D11Device_Release(device); + + /* Use D3D9 device manager. */ + window = create_window(); + d3d9 = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d9, "Failed to create a D3D9 object.\n"); + if (!(d3d9_device = create_device(d3d9, window))) + { + skip("Failed to create a D3D9 device, skipping tests.\n"); + goto done; + } + + hr = DXVA2CreateDirect3DDeviceManager9(&token, &d3d9_manager); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IDirect3DDeviceManager9_ResetDevice(d3d9_manager, d3d9_device, token); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = pMFCreateVideoSampleAllocatorEx(&IID_IMFVideoSampleAllocator, (void **)&allocator); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoSampleAllocator_SetDirectXManager(allocator, (IUnknown *)d3d9_manager); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoSampleAllocator_InitializeSampleAllocator(allocator, 1, video_type); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoSampleAllocator_AllocateSample(allocator, &sample); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + check_interface(sample, &IID_IMFTrackedSample, TRUE); + check_interface(sample, &IID_IMFDesiredSample, FALSE); + + hr = IMFSample_GetBufferByIndex(sample, 0, &buffer); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + check_interface(buffer, &IID_IMF2DBuffer, TRUE); + check_interface(buffer, &IID_IMF2DBuffer2, TRUE); + check_interface(buffer, &IID_IMFGetService, TRUE); + check_interface(buffer, &IID_IMFDXGIBuffer, FALSE); + + IMFSample_Release(sample); + IMFMediaBuffer_Release(buffer); + + IMFVideoSampleAllocator_Release(allocator); + IMFMediaType_Release(media_type); + +done: + IDirect3D9_Release(d3d9); + DestroyWindow(window); } START_TEST(mfplat)

1 0

Nikolay Sivov : mfplat/allocator: Keep a reference to initialization attributes.
by Alexandre Julliard 03 Feb '21

03 Feb '21

Module: wine Branch: master Commit: d100d92f93ab607781c4254719e5614dc25847ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=d100d92f93ab607781c42547… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 3 14:28:01 2021 +0300 mfplat/allocator: Keep a reference to initialization attributes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/sample.c | 9 ++++++++- dlls/mfplat/tests/mfplat.c | 1 - 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/sample.c b/dlls/mfplat/sample.c index 266bb6f0726..8a0281abf6c 100644 --- a/dlls/mfplat/sample.c +++ b/dlls/mfplat/sample.c @@ -75,6 +75,8 @@ struct sample_allocator unsigned int buffer_count; } frame_desc; + IMFAttributes *attributes; + unsigned int free_sample_count; unsigned int cold_sample_count; struct list free_samples; @@ -1129,6 +1131,8 @@ static ULONG WINAPI sample_allocator_Release(IMFVideoSampleAllocatorEx *iface) IDirect3DDeviceManager9_Release(allocator->d3d9_device_manager); if (allocator->dxgi_device_manager) IMFDXGIDeviceManager_Release(allocator->dxgi_device_manager); + if (allocator->attributes) + IMFAttributes_Release(allocator->attributes); sample_allocator_release_samples(allocator); DeleteCriticalSection(&allocator->cs); heap_free(allocator); @@ -1348,7 +1352,10 @@ static HRESULT sample_allocator_initialize(struct sample_allocator *allocator, u max_sample_count = max(1, max_sample_count); if (attributes) - FIXME("Initialization attributes ignored.\n"); + { + allocator->attributes = attributes; + IMFAttributes_AddRef(allocator->attributes); + } allocator->frame_desc.d3d9_format = subtype.Data1; allocator->frame_desc.dxgi_format = MFMapDX9FormatToDXGIFormat(allocator->frame_desc.d3d9_format); diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 3d6e553ce35..ed862ab9bdb 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -6442,7 +6442,6 @@ todo_wine EXPECT_REF(attributes, 1); hr = IMFVideoSampleAllocatorEx_InitializeSampleAllocatorEx(allocatorex, 0, 0, attributes, video_type); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); -todo_wine EXPECT_REF(attributes, 2); count = 0;

1 0

Dmitry Timoshkov : wevtapi: Add EvtGetChannelConfigProperty(EvtChannelLoggingConfigLogFilePath) stub implementation.
by Alexandre Julliard 03 Feb '21

03 Feb '21

Module: wine Branch: master Commit: b7e8defd64bc6a28b5dd70f47eb865293d58554c URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7e8defd64bc6a28b5dd70f4… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Feb 3 11:11:21 2021 +0300 wevtapi: Add EvtGetChannelConfigProperty(EvtChannelLoggingConfigLogFilePath) stub implementation. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wevtapi/main.c | 26 ++++++++++++++++++++++++++ include/winevt.h | 30 ++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+) diff --git a/dlls/wevtapi/main.c b/dlls/wevtapi/main.c index 220987650a2..9bd70a4f6ee 100644 --- a/dlls/wevtapi/main.c +++ b/dlls/wevtapi/main.c @@ -19,6 +19,8 @@ #include <stdarg.h> +#define NONAMELESSUNION + #include "windef.h" #include "winbase.h" #include "winevt.h" @@ -26,6 +28,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(wevtapi); +static const WCHAR log_pathW[] = L"C:\\windows\\temp\\evt.log"; + BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); @@ -63,6 +67,28 @@ BOOL WINAPI EvtGetChannelConfigProperty(EVT_HANDLE ChannelConfig, { FIXME("(%p %i %u %u %p %p) stub\n", ChannelConfig, PropertyId, Flags, PropertyValueBufferSize, PropertyValueBuffer, PropertyValueBufferUsed); + + switch (PropertyId) + { + case EvtChannelLoggingConfigLogFilePath: + *PropertyValueBufferUsed = sizeof(log_pathW) + sizeof(EVT_VARIANT); + + if (PropertyValueBufferSize < sizeof(log_pathW) + sizeof(EVT_VARIANT) || !PropertyValueBuffer) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return FALSE; + } + + PropertyValueBuffer->u.StringVal = (LPWSTR)(PropertyValueBuffer + 1); + wcscpy((LPWSTR)PropertyValueBuffer->u.StringVal, log_pathW); + PropertyValueBuffer->Type = EvtVarTypeString; + return TRUE; + + default: + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + break; + } + return FALSE; } diff --git a/include/winevt.h b/include/winevt.h index a148dcbb094..a37cdb7297f 100644 --- a/include/winevt.h +++ b/include/winevt.h @@ -62,6 +62,36 @@ typedef enum _EVT_SUBSCRIBE_NOTIFY_ACTION { EvtSubscribeActionDeliver } EVT_SUBSCRIBE_NOTIFY_ACTION; +typedef enum _EVT_VARIANT_TYPE { + EvtVarTypeNull, + EvtVarTypeString, + EvtVarTypeAnsiString, + EvtVarTypeSByte, + EvtVarTypeByte, + EvtVarTypeInt16, + EvtVarTypeUInt16, + EvtVarTypeInt32, + EvtVarTypeUInt32, + EvtVarTypeInt64, + EvtVarTypeUInt64, + EvtVarTypeSingle, + EvtVarTypeDouble, + EvtVarTypeBoolean, + EvtVarTypeBinary, + EvtVarTypeGuid, + EvtVarTypeSizeT, + EvtVarTypeFileTime, + EvtVarTypeSysTime, + EvtVarTypeSid, + EvtVarTypeHexInt32, + EvtVarTypeHexInt64, + EvtVarTypeEvtHandle = 32, + EvtVarTypeEvtXml = 35 +} EVT_VARIANT_TYPE; + +#define EVT_VARIANT_TYPE_MASK 0x7f +#define EVT_VARIANT_TYPE_ARRAY 128 + typedef struct _EVT_VARIANT { union { BOOL BooleanVal;

1 0

Dmitry Timoshkov : wevtapi/tests: Add some EvtGetChannelConfigProperty() tests.
by Alexandre Julliard 03 Feb '21

03 Feb '21

Module: wine Branch: master Commit: 29eb6f51f74e896d676b96c35b6fde4c39fb49c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=29eb6f51f74e896d676b96c3… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Feb 3 11:11:35 2021 +0300 wevtapi/tests: Add some EvtGetChannelConfigProperty() tests. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/wevtapi/Makefile.in | 1 + dlls/wevtapi/tests/Makefile.in | 5 +++ dlls/wevtapi/tests/wevtapi.c | 74 ++++++++++++++++++++++++++++++++++++++++++ include/winevt.h | 1 + 6 files changed, 83 insertions(+) diff --git a/configure b/configure index fa0d6b0c15f..3fc223096ec 100755 --- a/configure +++ b/configure @@ -20831,6 +20831,7 @@ wine_fn_config_makefile dlls/webservices/tests enable_tests wine_fn_config_makefile dlls/wer enable_wer wine_fn_config_makefile dlls/wer/tests enable_tests wine_fn_config_makefile dlls/wevtapi enable_wevtapi +wine_fn_config_makefile dlls/wevtapi/tests enable_tests wine_fn_config_makefile dlls/wevtsvc enable_wevtsvc wine_fn_config_makefile dlls/wiaservc enable_wiaservc wine_fn_config_makefile dlls/wiaservc/tests enable_tests diff --git a/configure.ac b/configure.ac index a9003523700..3a0bc6e713a 100644 --- a/configure.ac +++ b/configure.ac @@ -3756,6 +3756,7 @@ WINE_CONFIG_MAKEFILE(dlls/webservices/tests) WINE_CONFIG_MAKEFILE(dlls/wer) WINE_CONFIG_MAKEFILE(dlls/wer/tests) WINE_CONFIG_MAKEFILE(dlls/wevtapi) +WINE_CONFIG_MAKEFILE(dlls/wevtapi/tests) WINE_CONFIG_MAKEFILE(dlls/wevtsvc) WINE_CONFIG_MAKEFILE(dlls/wiaservc) WINE_CONFIG_MAKEFILE(dlls/wiaservc/tests) diff --git a/dlls/wevtapi/Makefile.in b/dlls/wevtapi/Makefile.in index 9b742fe9aeb..c80aac26d3a 100644 --- a/dlls/wevtapi/Makefile.in +++ b/dlls/wevtapi/Makefile.in @@ -1,4 +1,5 @@ MODULE = wevtapi.dll +IMPORTLIB = wevtapi EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/wevtapi/tests/Makefile.in b/dlls/wevtapi/tests/Makefile.in new file mode 100644 index 00000000000..47fde74b0eb --- /dev/null +++ b/dlls/wevtapi/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = wevtapi.dll +IMPORTS = wevtapi advapi32 + +C_SRCS = \ + wevtapi.c diff --git a/dlls/wevtapi/tests/wevtapi.c b/dlls/wevtapi/tests/wevtapi.c new file mode 100644 index 00000000000..a0a21aa9971 --- /dev/null +++ b/dlls/wevtapi/tests/wevtapi.c @@ -0,0 +1,74 @@ +/* + * Copyright 2021 Dmitry Timoshkov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define NONAMELESSUNION + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winevt.h" +#include "wine/test.h" + +static void test_EvtGetChannelConfigProperty(void) +{ + HKEY key; + EVT_HANDLE config; + DWORD size, ret; + struct + { + EVT_VARIANT var; + WCHAR buf[MAX_PATH]; + } path; + + ret = RegCreateKeyW(HKEY_LOCAL_MACHINE, L"System\\CurrentControlSet\\Services\\EventLog\\Winetest", &key); + if (ret == ERROR_ACCESS_DENIED) + { + skip("Not enough privileges to modify HKLM\n"); + return; + } + ok(ret == ERROR_SUCCESS, "RegCreateKey error %u\n", ret); + + config = EvtOpenChannelConfig(NULL, L"Winetest", 0); + ok(config != NULL, "EvtOpenChannelConfig error %u\n", GetLastError()); + + ret = EvtGetChannelConfigProperty(config, EvtChannelLoggingConfigLogFilePath, 0, 0, NULL, &size); + ok(!ret, "EvtGetChannelConfigProperty should fail\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %u\n", GetLastError()); + ok(size < sizeof(path), "got %u\n", size); + + memset(&path, 0, sizeof(path)); + path.var.Count = 0xdeadbeef; + path.var.Type = 0xdeadbeef; + ret = EvtGetChannelConfigProperty(config, EvtChannelLoggingConfigLogFilePath, 0, size, (EVT_VARIANT *)&path, &size); + ok(ret, "EvtGetChannelConfigProperty error %u\n", GetLastError()); + ok(path.var.Count == 0xdeadbeef, "got %u\n", path.var.Count); + ok(path.var.Type == EvtVarTypeString, "got %u\n", path.var.Type); + ok(size == sizeof(EVT_VARIANT) + (wcslen(path.var.u.StringVal) + 1) * sizeof(WCHAR), "got %u\n", size); + ok(path.var.u.StringVal == path.buf, "path.var.u.StringVal = %p, path.buf = %p\n", path.var.u.StringVal, path.buf); + + EvtClose(config); + + RegDeleteKeyW(key, L""); + RegCloseKey(key); +} + +START_TEST(wevtapi) +{ + test_EvtGetChannelConfigProperty(); +} diff --git a/include/winevt.h b/include/winevt.h index a37cdb7297f..4f0e7d52a0e 100644 --- a/include/winevt.h +++ b/include/winevt.h @@ -144,6 +144,7 @@ typedef struct _EVT_VARIANT { typedef DWORD (WINAPI *EVT_SUBSCRIBE_CALLBACK)(EVT_SUBSCRIBE_NOTIFY_ACTION Action, PVOID UserContext, EVT_HANDLE Event); +BOOL WINAPI EvtClose(EVT_HANDLE); BOOL WINAPI EvtExportLog(EVT_HANDLE session, const WCHAR *path, const WCHAR *query, const WCHAR *file, DWORD flags); BOOL WINAPI EvtGetChannelConfigProperty(EVT_HANDLE ChannelConfig,

1 0

Piotr Caban : msvcr120/tests: Run strtof tests once.
by Alexandre Julliard 03 Feb '21

03 Feb '21

Module: wine Branch: master Commit: ae0ba3f4a33052a00bd2ef9d9352308ae267e5ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae0ba3f4a33052a00bd2ef9d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Feb 3 11:56:17 2021 +0100 msvcr120/tests: Run strtof tests once. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr120/tests/msvcr120.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index a68870ac77b..b3e3828156b 100644 --- a/dlls/msvcr120/tests/msvcr120.c +++ b/dlls/msvcr120/tests/msvcr120.c @@ -1111,7 +1111,6 @@ static void test_CurrentContext(void) START_TEST(msvcr120) { if (!init()) return; - test__strtof(); test_lconv(); test__dsign(); test__dpcomp();

1 0

Piotr Caban : msvcp90: Return required buffer size in _Strxfrm.
by Alexandre Julliard 03 Feb '21

03 Feb '21

Module: wine Branch: master Commit: 7c5b40ed2ac6b1a82418d5da71b5968dd7c3c1b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c5b40ed2ac6b1a82418d5da… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Feb 3 11:56:29 2021 +0100 msvcp90: Return required buffer size in _Strxfrm. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/locale.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 6b547c384a4..f968ce068ef 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -12663,7 +12663,8 @@ int __cdecl _To_wide(const char *src, wchar_t *dst) return MultiByteToWideChar(CP_ACP, 0, src, -1, dst, MAX_PATH); } -size_t __cdecl _Strxfrm(char *dest, char *dest_end, const char *src, const char *src_end, _Collvec *coll) +size_t __cdecl _Strxfrm(char *dest, char *dest_end, + const char *src, const char *src_end, _Collvec *coll) { size_t dest_len = dest_end - dest; size_t src_len = src_end - src; @@ -12691,12 +12692,14 @@ size_t __cdecl _Strxfrm(char *dest, char *dest_end, const char *src, const char } len = MultiByteToWideChar(cv.page, MB_ERR_INVALID_CHARS, src, src_len, NULL, 0); - if (!len) return 0; + if (!len) return INT_MAX; buf = heap_alloc(len * sizeof(WCHAR)); - if (!buf) return 0; + if (!buf) return INT_MAX; MultiByteToWideChar(cv.page, MB_ERR_INVALID_CHARS, src, src_len, buf, len); - len = LCMapStringW(lcid, LCMAP_SORTKEY, buf, len, (WCHAR*)dest, dest_len); + len = LCMapStringW(lcid, LCMAP_SORTKEY, buf, len, NULL, 0); + if (len <= dest_len) + LCMapStringW(lcid, LCMAP_SORTKEY, buf, len, (WCHAR*)dest, dest_len); heap_free(buf); return len; }

1 0