- Wine-Devel - list.winehq.org

[PATCH] dpvoice: Use wide-char string literals.
by Michael Stefaniuc Oct. 8, 2020

Oct. 8, 2020

Simplfy the calculation of the size of a WCHAR array too. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dpvoice/server.c | 3 +-- dlls/dpvoice/tests/voice.c | 9 ++++----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/dpvoice/server.c b/dlls/dpvoice/server.c index 714863f6b24..a476a2e585d 100644 --- a/dlls/dpvoice/server.c +++ b/dlls/dpvoice/server.c @@ -43,8 +43,7 @@ HRESULT DPVOICE_GetCompressionTypes(DVCOMPRESSIONINFO *pData, DWORD *pdwDataSize { static const DVCOMPRESSIONINFO pcm_type = {80, {0x8de12fd4,0x7cb3,0x48ce,{0xa7,0xe8,0x9c,0x47,0xa2,0x2e,0x8a,0xc5}}, NULL, NULL, 0, 64000}; - static const WCHAR pcm_name[] = - {'M','S','-','P','C','M',' ','6','4',' ','k','b','i','t','/','s',0}; + static const WCHAR pcm_name[] = L"MS-PCM 64 kbit/s"; HRESULT ret; LPWSTR string_loc; diff --git a/dlls/dpvoice/tests/voice.c b/dlls/dpvoice/tests/voice.c index 2d77049a9bd..4b44e1e1081 100644 --- a/dlls/dpvoice/tests/voice.c +++ b/dlls/dpvoice/tests/voice.c @@ -37,8 +37,7 @@ static DWORD port = 8888; static HANDLE connected = NULL; static const GUID appguid = { 0xcd0c3d4b, 0xe15e, 0x4cf2, { 0x9e, 0xa8, 0x6e, 0x1d, 0x65, 0x48, 0xc5, 0xa6 } }; -static WCHAR sessionname[] = {'w','i','n','e','g','a','m','e','s','s','e','r','v','e','r',0}; -static WCHAR localhost[] = {'l','o','c','a','l','h','o','s','t',0}; +static WCHAR sessionname[] = L"winegamesserver"; static HRESULT WINAPI DirectPlayMessageHandler(void *lpvUserContext, DWORD dwMessageId, void *lpMessage) @@ -102,7 +101,7 @@ static BOOL test_init_dpvoice_server(void) hr = IDirectPlay8Address_SetSP(localaddr, &CLSID_DP8SP_TCPIP); ok(hr == S_OK, "SetSP with 0x%08x\n", hr); - hr = IDirectPlay8Address_AddComponent(localaddr, DPNA_KEY_HOSTNAME, localhost, (lstrlenW(localhost)+1)*sizeof(WCHAR), + hr = IDirectPlay8Address_AddComponent(localaddr, DPNA_KEY_HOSTNAME, L"localhost", sizeof(L"localhost"), DPNA_DATATYPE_STRING ); ok(hr == S_OK, "AddComponent(addr) with 0x%08x\n", hr); @@ -150,7 +149,7 @@ static BOOL test_init_dpvoice_server(void) static BOOL test_init_dpvoice_client(void) { HRESULT hr; - WCHAR player[] = {'w','i','n','e','u','s','e','r',0}; + WCHAR player[] = L"wineuser"; hr = CoCreateInstance(&CLSID_DirectPlayVoiceClient, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectPlayVoiceClient, (void **)&vclient); if(hr == S_OK) @@ -183,7 +182,7 @@ static BOOL test_init_dpvoice_client(void) hr = IDirectPlay8Address_SetSP(localaddr, &CLSID_DP8SP_TCPIP); ok(hr == S_OK, "SetSP with 0x%08x\n", hr); - hr = IDirectPlay8Address_AddComponent(hostaddr, DPNA_KEY_HOSTNAME, localhost, (lstrlenW(localhost)+1)*sizeof(WCHAR), + hr = IDirectPlay8Address_AddComponent(hostaddr, DPNA_KEY_HOSTNAME, L"localhost", sizeof(L"localhost"), DPNA_DATATYPE_STRING ); ok(hr == S_OK, "AddComponent(addr) with 0x%08x\n", hr); -- 2.26.2

1 0

[PATCH] credui: Use wide-char string literals.
by Michael Stefaniuc Oct. 8, 2020

Oct. 8, 2020

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/credui/credui_main.c | 9 +++------ dlls/credui/tests/credui.c | 30 ++++++++++-------------------- 2 files changed, 13 insertions(+), 26 deletions(-) diff --git a/dlls/credui/credui_main.c b/dlls/credui/credui_main.c index 93ccdc20ded..f08d1406f90 100644 --- a/dlls/credui/credui_main.c +++ b/dlls/credui/credui_main.c @@ -868,9 +868,6 @@ ULONG SEC_ENTRY SspiPromptForCredentialsW( PCWSTR target, void *info, PSEC_WINNT_AUTH_IDENTITY_OPAQUE *output_id, BOOL *save, DWORD sspi_flags ) { - static const WCHAR basicW[] = {'B','a','s','i','c',0}; - static const WCHAR ntlmW[] = {'N','T','L','M',0}; - static const WCHAR negotiateW[] = {'N','e','g','o','t','i','a','t','e',0}; WCHAR username[CREDUI_MAX_USERNAME_LENGTH + 1] = {0}; WCHAR password[CREDUI_MAX_PASSWORD_LENGTH + 1] = {0}; DWORD len_username = ARRAY_SIZE(username); @@ -883,8 +880,8 @@ ULONG SEC_ENTRY SspiPromptForCredentialsW( PCWSTR target, void *info, error, debugstr_w(package), input_id, output_id, save, sspi_flags ); if (!target) return ERROR_INVALID_PARAMETER; - if (!package || (wcsicmp( package, basicW ) && wcsicmp( package, ntlmW ) && - wcsicmp( package, negotiateW ))) + if (!package || (wcsicmp( package, L"Basic" ) && wcsicmp( package, L"NTLM" ) && + wcsicmp( package, L"Negotiate" ))) { FIXME( "package %s not supported\n", debugstr_w(package) ); return ERROR_NO_SUCH_PACKAGE; @@ -923,7 +920,7 @@ ULONG SEC_ENTRY SspiPromptForCredentialsW( PCWSTR target, void *info, { user = ptr + 1; len_username = lstrlenW( user ); - if (!wcsicmp( package, ntlmW ) || !wcsicmp( package, negotiateW )) + if (!wcsicmp( package, L"NTLM" ) || !wcsicmp( package, L"Negotiate" )) { domain = username; len_domain = ptr - username; diff --git a/dlls/credui/tests/credui.c b/dlls/credui/tests/credui.c index 13fbd41c07c..f2b71d603cc 100644 --- a/dlls/credui/tests/credui.c +++ b/dlls/credui/tests/credui.c @@ -36,7 +36,7 @@ static ULONG (SEC_ENTRY *pSspiPromptForCredentialsW) static void test_CredUIPromptForCredentials(void) { - static const WCHAR wszServerName[] = {'W','i','n','e','T','e','s','t',0}; + static const WCHAR wszServerName[] = L"WineTest"; DWORD ret; WCHAR username[256]; WCHAR password[256]; @@ -77,14 +77,6 @@ static void test_CredUIPromptForCredentials(void) if (winetest_interactive) { - static const WCHAR wszCaption1[] = {'C','R','E','D','U','I','_','F','L','A','G','S','_','E','X','P','E','C','T','_','C','O','N','F','I','R','M','A','T','I','O','N',0}; - static const WCHAR wszCaption2[] = {'C','R','E','D','U','I','_','F','L','A','G','S','_','I','N','C','O','R','R','E','C','T','_','P','A','S','S','W','O','R','D','|', - 'C','R','E','D','U','I','_','F','L','A','G','S','_','E','X','P','E','C','T','_','C','O','N','F','I','R','M','A','T','I','O','N',0}; - static const WCHAR wszCaption3[] = {'C','R','E','D','U','I','_','F','L','A','G','S','_','D','O','_','N','O','T','_','P','E','R','S','I','S','T','|', - 'C','R','E','D','U','I','_','F','L','A','G','S','_','E','X','P','E','C','T','_','C','O','N','F','I','R','M','A','T','I','O','N',0}; - static const WCHAR wszCaption4[] = {'C','R','E','D','U','I','_','F','L','A','G','S','_','P','E','R','S','I','S','T','|', - 'C','R','E','D','U','I','_','F','L','A','G','S','_','E','X','P','E','C','T','_','C','O','N','F','I','R','M','A','T','I','O','N',0}; - ret = CredUIPromptForCredentialsW(NULL, wszServerName, NULL, 0, username, ARRAY_SIZE(username), password, ARRAY_SIZE(password), @@ -96,7 +88,7 @@ static void test_CredUIPromptForCredentials(void) ok(ret == ERROR_SUCCESS, "CredUIConfirmCredentials failed with error %d\n", ret); } - credui_info.pszCaptionText = wszCaption1; + credui_info.pszCaptionText = L"CREDUI_FLAGS_EXPECT_CONFIRMATION"; ret = CredUIPromptForCredentialsW(&credui_info, wszServerName, NULL, ERROR_ACCESS_DENIED, username, ARRAY_SIZE(username), password, ARRAY_SIZE(password), @@ -108,7 +100,7 @@ static void test_CredUIPromptForCredentials(void) ok(ret == ERROR_SUCCESS, "CredUIConfirmCredentials failed with error %d\n", ret); } - credui_info.pszCaptionText = wszCaption2; + credui_info.pszCaptionText = L"CREDUI_FLAGS_INCORRECT_PASSWORD|CREDUI_FLAGS_EXPECT_CONFIRMATION"; ret = CredUIPromptForCredentialsW(&credui_info, wszServerName, NULL, 0, username, ARRAY_SIZE(username), password, ARRAY_SIZE(password), @@ -122,7 +114,7 @@ static void test_CredUIPromptForCredentials(void) save = TRUE; - credui_info.pszCaptionText = wszCaption3; + credui_info.pszCaptionText = L"CREDUI_FLAGS_DO_NOT_PERSIST|CREDUI_FLAGS_EXPECT_CONFIRMATION"; ret = CredUIPromptForCredentialsW(&credui_info, wszServerName, NULL, 0, username, ARRAY_SIZE(username), password, ARRAY_SIZE(password), @@ -131,7 +123,7 @@ static void test_CredUIPromptForCredentials(void) ok(save, "save flag should have been untouched\n"); save = FALSE; - credui_info.pszCaptionText = wszCaption4; + credui_info.pszCaptionText = L"CREDUI_FLAGS_PERSIST|CREDUI_FLAGS_EXPECT_CONFIRMATION"; ret = CredUIPromptForCredentialsW(&credui_info, wszServerName, NULL, 0, username, ARRAY_SIZE(username), password, ARRAY_SIZE(password), @@ -149,8 +141,6 @@ static void test_CredUIPromptForCredentials(void) static void test_SspiPromptForCredentials(void) { - static const WCHAR targetW[] = {'S','s','p','i','T','e','s','t',0}; - static const WCHAR basicW[] = {'b','a','s','i','c',0}; ULONG ret; SECURITY_STATUS status; CREDUI_INFOW info; @@ -166,20 +156,20 @@ static void test_SspiPromptForCredentials(void) info.cbSize = sizeof(info); info.hwndParent = NULL; - info.pszMessageText = targetW; - info.pszCaptionText = basicW; + info.pszMessageText = L"SspiTest"; + info.pszCaptionText = L"basic"; info.hbmBanner = NULL; - ret = pSspiPromptForCredentialsW( NULL, &info, 0, basicW, NULL, &id, &save, 0 ); + ret = pSspiPromptForCredentialsW( NULL, &info, 0, L"basic", NULL, &id, &save, 0 ); ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); - ret = pSspiPromptForCredentialsW( targetW, &info, 0, NULL, NULL, &id, &save, 0 ); + ret = pSspiPromptForCredentialsW( L"SspiTest", &info, 0, NULL, NULL, &id, &save, 0 ); ok( ret == ERROR_NO_SUCH_PACKAGE, "got %u\n", ret ); if (winetest_interactive) { id = NULL; save = -1; - ret = pSspiPromptForCredentialsW( targetW, &info, 0, basicW, NULL, &id, &save, 0 ); + ret = pSspiPromptForCredentialsW( L"SspiTest", &info, 0, L"basic", NULL, &id, &save, 0 ); ok( ret == ERROR_SUCCESS || ret == ERROR_CANCELLED, "got %u\n", ret ); if (ret == ERROR_SUCCESS) { -- 2.26.2

1 0

[PATCH] eject: Use wide-char string literals.
by Michael Stefaniuc Oct. 8, 2020

Oct. 8, 2020

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/eject/eject.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/programs/eject/eject.c b/programs/eject/eject.c index 0a081cfdf56..e6416eacff7 100644 --- a/programs/eject/eject.c +++ b/programs/eject/eject.c @@ -37,17 +37,15 @@ static BOOL eject_all; /* wrapper for GetDriveTypeW */ static DWORD get_drive_type( WCHAR drive ) { - static const WCHAR rootW[] = {'a',':','\\',0}; WCHAR path[16]; - memcpy( path, rootW, sizeof(rootW) ); + lstrcpyW( path, L"a:\\" ); path[0] = drive; return GetDriveTypeW( path ); } static BOOL eject_cd( WCHAR drive ) { - static const WCHAR deviceW[] = {'\\','\\','.','\\','a',':',0}; PREVENT_MEDIA_REMOVAL removal; WCHAR buffer[16]; HANDLE handle; @@ -59,7 +57,7 @@ static BOOL eject_cd( WCHAR drive ) return FALSE; } - memcpy( buffer, deviceW, sizeof(deviceW) ); + lstrcpyW( buffer, L"\\\\.\\a:" ); buffer[4] = drive; handle = CreateFileW( buffer, 0, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0 ); -- 2.26.2

1 0

[PATCH] ntoskrnl.exe: Stub MmProtectMdlSystemAddress.
by Myah Caron Oct. 8, 2020

Oct. 8, 2020

Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index e94feabc826..4092e33db43 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3145,6 +3145,15 @@ BOOLEAN WINAPI MmIsThisAnNtAsSystem(void) return FALSE; } +/*********************************************************************** + * MmProtectMdlSystemAddress (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI MmProtectMdlSystemAddress(PMDL MemoryDescriptorList, ULONG NewProtect) +{ + FIXME("(%p, %u) stub\n", MemoryDescriptorList, NewProtect); + return STATUS_SUCCESS; +} + /*********************************************************************** * MmQuerySystemSize (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 8892fde5054..6ac70c718f1 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -733,7 +733,7 @@ @ stdcall MmProbeAndLockPages(ptr long long) @ stub MmProbeAndLockProcessPages @ stub MmProbeAndLockSelectedPages -@ stub MmProtectMdlSystemAddress +@ stdcall MmProtectMdlSystemAddress(ptr long) @ stdcall MmQuerySystemSize() @ stub MmRemovePhysicalMemory @ stdcall MmResetDriverPaging(ptr) -- 2.28.0

1 0

[PATCH v2 1/5] winegstreamer: Insert videoconvert into decoded-video streams.
by Derek Lesho Oct. 8, 2020

Oct. 8, 2020

Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- v2: - Use fixed list of supported formats in the videoconvert path instead of querying the template. - Moved code setting "caps" appsink property to patch 4, where it begins to be used. - Addressed some comments. --- dlls/winegstreamer/media_source.c | 124 ++++++++++++++++++++++++++---- 1 file changed, 110 insertions(+), 14 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 5f3c43a0204..cbee412030d 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -384,6 +384,43 @@ static const IMFMediaStreamVtbl media_stream_vtbl = media_stream_RequestSample }; +/* Setup a chain of elements which should hopefully allow transformations to any IMFMediaType + the user throws at us through gstreamer's caps negotiation. */ +static HRESULT media_stream_connect_to_sink(struct media_stream *stream) +{ + GstCaps *source_caps = gst_pad_query_caps(stream->their_src, NULL); + const gchar *stream_type; + + if (!source_caps) + return E_FAIL; + + stream_type = gst_structure_get_name(gst_caps_get_structure(source_caps, 0)); + gst_caps_unref(source_caps); + + if (!strcmp(stream_type, "video/x-raw")) + { + GstElement *videoconvert = gst_element_factory_make("videoconvert", NULL); + + gst_bin_add(GST_BIN(stream->parent_source->container), videoconvert); + + stream->my_sink = gst_element_get_static_pad(videoconvert, "sink"); + + if (!gst_element_link(videoconvert, stream->appsink)) + return E_FAIL; + + gst_element_sync_state_with_parent(videoconvert); + } + else + { + stream->my_sink = gst_element_get_static_pad(stream->appsink, "sink"); + } + + if (gst_pad_link(stream->their_src, stream->my_sink) != GST_PAD_LINK_OK) + return E_FAIL; + + return S_OK; +} + static HRESULT new_media_stream(struct media_source *source, GstPad *pad, DWORD stream_id, struct media_stream **out_stream) { struct media_stream *object = heap_alloc_zero(sizeof(*object)); @@ -414,8 +451,8 @@ static HRESULT new_media_stream(struct media_source *source, GstPad *pad, DWORD g_object_set(object->appsink, "sync", FALSE, NULL); g_object_set(object->appsink, "max-buffers", 5, NULL); - object->my_sink = gst_element_get_static_pad(object->appsink, "sink"); - gst_pad_link(object->their_src, object->my_sink); + if (FAILED(hr = media_stream_connect_to_sink(object))) + goto fail; gst_element_sync_state_with_parent(object->appsink); @@ -435,28 +472,87 @@ static HRESULT media_stream_init_desc(struct media_stream *stream) { GstCaps *current_caps = gst_pad_get_current_caps(stream->their_src); IMFMediaTypeHandler *type_handler; + IMFMediaType **stream_types = NULL; IMFMediaType *stream_type = NULL; + DWORD type_count = 0; + const gchar *major_type; + unsigned int i; HRESULT hr; - stream_type = mf_media_type_from_caps(current_caps); - gst_caps_unref(current_caps); - if (!stream_type) - return E_FAIL; + major_type = gst_structure_get_name(gst_caps_get_structure(current_caps, 0)); + + if (!strcmp(major_type, "video/x-raw")) + { + /* These are the most common native output types of decoders: https://docs.microsoft.com/en-us/windows/win32/medfound/mft-decoder-expose-… */ + static const GUID * video_types[] = + { + &MFVideoFormat_NV12, + &MFVideoFormat_YV12, + &MFVideoFormat_YUY2, + &MFVideoFormat_IYUV, + &MFVideoFormat_I420, + }; - hr = MFCreateStreamDescriptor(stream->stream_id, 1, &stream_type, &stream->descriptor); + IMFMediaType *base_type = mf_media_type_from_caps(current_caps); + GUID base_subtype; - IMFMediaType_Release(stream_type); + IMFMediaType_GetGUID(base_type, &MF_MT_SUBTYPE, &base_subtype); - if (FAILED(hr)) - return hr; + stream_types = heap_alloc( sizeof(IMFMediaType *) * ARRAY_SIZE(video_types) + 1); - if (FAILED(hr = IMFStreamDescriptor_GetMediaTypeHandler(stream->descriptor, &type_handler))) - return hr; + stream_types[0] = base_type; + type_count = 1; - hr = IMFMediaTypeHandler_SetCurrentMediaType(type_handler, stream_type); + for (i = 0; i < ARRAY_SIZE(video_types); i++) + { + IMFMediaType *new_type; - IMFMediaTypeHandler_Release(type_handler); + if (IsEqualGUID(&base_subtype, video_types[i])) + continue; + if (FAILED(hr = MFCreateMediaType(&new_type))) + goto done; + stream_types[type_count++] = new_type; + + if (FAILED(hr = IMFMediaType_CopyAllItems(base_type, (IMFAttributes *) new_type))) + goto done; + if (FAILED(hr = IMFMediaType_SetGUID(new_type, &MF_MT_SUBTYPE, video_types[i]))) + goto done; + } + } + else + { + stream_type = mf_media_type_from_caps(current_caps); + if (stream_type) + { + stream_types = &stream_type; + type_count = 1; + } + } + + if (!type_count) + { + ERR("Failed to establish an IMFMediaType from any of the possible stream caps!\n"); + return E_FAIL; + } + + if (FAILED(hr = MFCreateStreamDescriptor(stream->stream_id, type_count, stream_types, &stream->descriptor))) + goto done; + + if (FAILED(hr = IMFStreamDescriptor_GetMediaTypeHandler(stream->descriptor, &type_handler))) + goto done; + + if (FAILED(hr = IMFMediaTypeHandler_SetCurrentMediaType(type_handler, stream_types[0]))) + goto done; + +done: + gst_caps_unref(current_caps); + if (type_handler) + IMFMediaTypeHandler_Release(type_handler); + for (i = 0; i < type_count; i++) + IMFMediaType_Release(stream_types[i]); + if (stream_types != &stream_type) + heap_free(stream_types); return hr; } -- 2.28.0

4 21

[PATCH 1/2] qedit/tests: Add some basic tests for null renderer connection and streaming.
by Zebediah Figura Oct. 8, 2020

Oct. 8, 2020

Adapted from the video renderer tests. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- I had this patch in my local tree since a while, but never got around to finishing it. dlls/qedit/tests/nullrenderer.c | 464 ++++++++++++++++++++++++++++++++ 1 file changed, 464 insertions(+) diff --git a/dlls/qedit/tests/nullrenderer.c b/dlls/qedit/tests/nullrenderer.c index 8f26e4716ec..3285e22e5c7 100644 --- a/dlls/qedit/tests/nullrenderer.c +++ b/dlls/qedit/tests/nullrenderer.c @@ -20,6 +20,7 @@ #define COBJMACROS #include "dshow.h" +#include "wine/strmbase.h" #include "wine/test.h" static IBaseFilter *create_null_renderer(void) @@ -420,6 +421,468 @@ static void test_enum_media_types(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +struct testfilter +{ + struct strmbase_filter filter; + struct strmbase_source source; +}; + +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->source.pin; + return NULL; +} + +static void testfilter_destroy(struct strmbase_filter *iface) +{ + struct testfilter *filter = impl_from_strmbase_filter(iface); + strmbase_source_cleanup(&filter->source); + 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 WINAPI testsource_DecideAllocator(struct strmbase_source *iface, + IMemInputPin *peer, IMemAllocator **allocator) +{ + return S_OK; +} + +static const struct strmbase_source_ops testsource_ops = +{ + .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, + .pfnDecideAllocator = testsource_DecideAllocator, +}; + +static void testfilter_init(struct testfilter *filter) +{ + static const GUID clsid = {0xabacab}; + strmbase_filter_init(&filter->filter, NULL, &clsid, &testfilter_ops); + strmbase_source_init(&filter->source, &filter->filter, L"", &testsource_ops); +} + +static void test_allocator(IMemInputPin *input) +{ + IMemAllocator *req_allocator, *ret_allocator; + ALLOCATOR_PROPERTIES props; + HRESULT hr; + + hr = IMemInputPin_GetAllocatorRequirements(input, &props); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + + hr = IMemInputPin_GetAllocator(input, &ret_allocator); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + if (hr == S_OK) + { + hr = IMemAllocator_GetProperties(ret_allocator, &props); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!props.cBuffers, "Got %d buffers.\n", props.cBuffers); + ok(!props.cbBuffer, "Got size %d.\n", props.cbBuffer); + ok(!props.cbAlign, "Got alignment %d.\n", props.cbAlign); + ok(!props.cbPrefix, "Got prefix %d.\n", props.cbPrefix); + + hr = IMemInputPin_NotifyAllocator(input, ret_allocator, TRUE); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IMemAllocator_Release(ret_allocator); + } + + hr = IMemInputPin_NotifyAllocator(input, NULL, TRUE); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + CoCreateInstance(&CLSID_MemoryAllocator, NULL, CLSCTX_INPROC_SERVER, + &IID_IMemAllocator, (void **)&req_allocator); + + hr = IMemInputPin_NotifyAllocator(input, req_allocator, TRUE); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMemInputPin_GetAllocator(input, &ret_allocator); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(ret_allocator == req_allocator, "Allocators didn't match.\n"); + + IMemAllocator_Release(req_allocator); + IMemAllocator_Release(ret_allocator); +} + +struct frame_thread_params +{ + IMemInputPin *sink; + IMediaSample *sample; +}; + +static DWORD WINAPI frame_thread(void *arg) +{ + struct frame_thread_params *params = arg; + HRESULT hr; + + if (winetest_debug > 1) trace("%04x: Sending frame.\n", GetCurrentThreadId()); + hr = IMemInputPin_Receive(params->sink, params->sample); + if (winetest_debug > 1) trace("%04x: Returned %#x.\n", GetCurrentThreadId(), hr); + IMediaSample_Release(params->sample); + free(params); + return hr; +} + +static HANDLE send_frame_time(IMemInputPin *sink, REFERENCE_TIME start_time, unsigned char color) +{ + struct frame_thread_params *params = malloc(sizeof(*params)); + IMemAllocator *allocator; + REFERENCE_TIME end_time; + IMediaSample *sample; + HANDLE thread; + HRESULT hr; + BYTE *data; + + hr = IMemInputPin_GetAllocator(sink, &allocator); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMemAllocator_GetBuffer(allocator, &sample, NULL, NULL, 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaSample_GetPointer(sample, &data); + ok(hr == S_OK, "Got hr %#x.\n", hr); + memset(data, color, 32 * 16 * 2); + + hr = IMediaSample_SetActualDataLength(sample, 32 * 16 * 2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + start_time *= 10000000; + end_time = start_time + 10000000; + hr = IMediaSample_SetTime(sample, &start_time, &end_time); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + params->sink = sink; + params->sample = sample; + thread = CreateThread(NULL, 0, frame_thread, params, 0, NULL); + + IMemAllocator_Release(allocator); + return thread; +} + +static HANDLE send_frame(IMemInputPin *sink) +{ + return send_frame_time(sink, 0, 0x55); /* purple */ +} + +static HRESULT join_thread_(int line, HANDLE thread) +{ + DWORD ret; + ok_(__FILE__, line)(!WaitForSingleObject(thread, 1000), "Wait failed.\n"); + GetExitCodeThread(thread, &ret); + CloseHandle(thread); + return ret; +} +#define join_thread(a) join_thread_(__LINE__, a) + +static void test_filter_state(IMemInputPin *input, IFilterGraph2 *graph) +{ + IMemAllocator *allocator; + IMediaControl *control; + IMediaSample *sample; + OAFilterState state; + HANDLE thread; + HRESULT hr; + + IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&control); + + thread = send_frame(input); + hr = join_thread(thread); + todo_wine ok(hr == E_FAIL, "Got hr %#x.\n", hr); + + /* The renderer is not fully paused until it receives a sample. The thread + * sending the sample blocks in IMemInputPin_Receive() until the filter is + * stopped or run. */ + + hr = IMediaControl_Pause(control); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IMediaControl_GetState(control, 0, &state); + ok(hr == VFW_S_STATE_INTERMEDIATE, "Got hr %#x.\n", hr); + + thread = send_frame(input); + + hr = IMediaControl_GetState(control, 1000, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + todo_wine ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = join_thread(thread); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + /* The sink will decommit our allocator for us when stopping, and recommit + * it when pausing. */ + hr = IMemInputPin_GetAllocator(input, &allocator); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMemAllocator_GetBuffer(allocator, &sample, NULL, NULL, 0); + todo_wine ok(hr == VFW_E_NOT_COMMITTED, "Got hr %#x.\n", hr); + if (hr == S_OK) IMediaSample_Release(sample); + + hr = IMemAllocator_Commit(allocator); + ok(hr == S_OK, "Got hr %#x.\n", hr); + thread = send_frame(input); + hr = join_thread(thread); + todo_wine ok(hr == E_FAIL, "Got hr %#x.\n", hr); + + hr = IMediaControl_Pause(control); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IMediaControl_GetState(control, 0, &state); + ok(hr == VFW_S_STATE_INTERMEDIATE, "Got hr %#x.\n", hr); + + thread = send_frame(input); + + hr = IMediaControl_GetState(control, 1000, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + todo_wine ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); + + hr = IMediaControl_Run(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_GetState(control, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = join_thread(thread); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + thread = send_frame(input); + hr = join_thread(thread); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_Pause(control); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IMediaControl_GetState(control, 0, &state); + todo_wine ok(hr == VFW_S_STATE_INTERMEDIATE, "Got hr %#x.\n", hr); + + thread = send_frame(input); + + hr = IMediaControl_GetState(control, 1000, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + todo_wine ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); + + hr = IMediaControl_Run(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_GetState(control, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = join_thread(thread); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_Pause(control); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IMediaControl_GetState(control, 0, &state); + todo_wine ok(hr == VFW_S_STATE_INTERMEDIATE, "Got hr %#x.\n", hr); + ok(state == State_Paused, "Got state %u.\n", state); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_GetState(control, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_Pause(control); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IMediaControl_GetState(control, 0, &state); + ok(hr == VFW_S_STATE_INTERMEDIATE, "Got hr %#x.\n", hr); + ok(state == State_Paused, "Got state %u.\n", state); + + hr = IMediaControl_Run(control); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IMediaControl_GetState(control, 0, &state); + todo_wine ok(hr == VFW_S_STATE_INTERMEDIATE, "Got hr %#x.\n", hr); + ok(state == State_Running, "Got state %u.\n", state); + + thread = send_frame(input); + hr = join_thread(thread); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_GetState(control, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_GetState(control, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + IMemAllocator_Release(allocator); + IMediaControl_Release(control); +} + +static void test_flushing(IPin *pin, IMemInputPin *input, IFilterGraph2 *graph) +{ + IMediaControl *control; + OAFilterState state; + HANDLE thread; + HRESULT hr; + + IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&control); + + hr = IMediaControl_Pause(control); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + thread = send_frame(input); + todo_wine ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); + + hr = IMediaControl_GetState(control, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_BeginFlush(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = join_thread(thread); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + thread = send_frame(input); + hr = join_thread(thread); + todo_wine ok(hr == E_FAIL, "Got hr %#x.\n", hr); + + hr = IPin_EndFlush(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + /* We dropped the sample we were holding, so now we need a new one... */ + + hr = IMediaControl_GetState(control, 0, &state); + todo_wine ok(hr == VFW_S_STATE_INTERMEDIATE, "Got hr %#x.\n", hr); + + thread = send_frame(input); + todo_wine ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); + + hr = IMediaControl_Run(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = join_thread(thread); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_BeginFlush(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = join_thread(send_frame(input)); + todo_wine ok(hr == E_FAIL, "Got hr %#x.\n", hr); + + hr = IPin_EndFlush(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = join_thread(send_frame(input)); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + IMediaControl_Release(control); +} + +static void test_connect_pin(void) +{ + static const AM_MEDIA_TYPE req_mt = + { + .majortype = {0x111}, + .subtype = {0x222}, + .formattype = {0x333}, + }; + ALLOCATOR_PROPERTIES req_props = {1, 32 * 16 * 4, 1, 0}, ret_props; + IBaseFilter *filter = create_null_renderer(); + struct testfilter source; + IMemAllocator *allocator; + IFilterGraph2 *graph; + IMemInputPin *input; + AM_MEDIA_TYPE mt; + IPin *pin, *peer; + HRESULT hr; + ULONG ref; + + testfilter_init(&source); + + CoCreateInstance(&CLSID_FilterGraph, NULL, CLSCTX_INPROC_SERVER, + &IID_IFilterGraph2, (void **)&graph); + IFilterGraph2_AddFilter(graph, &source.filter.IBaseFilter_iface, L"source"); + IFilterGraph2_AddFilter(graph, filter, L"sink"); + + IBaseFilter_FindPin(filter, L"In", &pin); + + peer = (IPin *)0xdeadbeef; + hr = IPin_ConnectedTo(pin, &peer); + ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); + ok(!peer, "Got peer %p.\n", peer); + + hr = IPin_ConnectionMediaType(pin, &mt); + ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); + + hr = IFilterGraph2_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &req_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_ConnectedTo(pin, &peer); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(peer == &source.source.pin.IPin_iface, "Got peer %p.\n", peer); + IPin_Release(peer); + + hr = IPin_ConnectionMediaType(pin, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!memcmp(&mt, &req_mt, sizeof(AM_MEDIA_TYPE)), "Media types didn't match.\n"); + + IPin_QueryInterface(pin, &IID_IMemInputPin, (void **)&input); + + test_allocator(input); + + hr = IMemInputPin_GetAllocator(input, &allocator); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMemAllocator_SetProperties(allocator, &req_props, &ret_props); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!memcmp(&ret_props, &req_props, sizeof(req_props)), "Properties did not match.\n"); + hr = IMemAllocator_Commit(allocator); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IMemAllocator_Release(allocator); + + hr = IMemInputPin_ReceiveCanBlock(input); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + test_filter_state(input, graph); + test_flushing(pin, input, graph); + + hr = IFilterGraph2_Disconnect(graph, pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IFilterGraph2_Disconnect(graph, pin); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(source.source.pin.peer == pin, "Got peer %p.\n", peer); + IFilterGraph2_Disconnect(graph, &source.source.pin.IPin_iface); + + peer = (IPin *)0xdeadbeef; + hr = IPin_ConnectedTo(pin, &peer); + ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); + ok(!peer, "Got peer %p.\n", peer); + + hr = IPin_ConnectionMediaType(pin, &mt); + ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); + + IMemInputPin_Release(input); + IPin_Release(pin); + ref = IFilterGraph2_Release(graph); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IBaseFilter_Release(&source.filter.IBaseFilter_iface); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(nullrenderer) { IBaseFilter *filter; @@ -443,6 +906,7 @@ START_TEST(nullrenderer) test_aggregation(); test_media_types(); test_enum_media_types(); + test_connect_pin(); CoUninitialize(); } -- 2.28.0

1 1

[PATCH v2 2/2] dssenh: Register the DSS provider.
by Hans Leidekker Oct. 8, 2020

Oct. 8, 2020

Note that tests will fail on the testbot because the prefix isn't updated. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/dssenh/Makefile.in | 2 ++ dlls/dssenh/dssenh.rgs | 56 ++++++++++++++++++++++++++++++++++++++ dlls/dssenh/main.c | 22 +++++++++------ dlls/dssenh/rsrc.rc | 22 +++++++++++++++ dlls/dssenh/tests/dssenh.c | 5 ++-- 5 files changed, 95 insertions(+), 12 deletions(-) create mode 100644 dlls/dssenh/dssenh.rgs create mode 100644 dlls/dssenh/rsrc.rc diff --git a/dlls/dssenh/Makefile.in b/dlls/dssenh/Makefile.in index 4f05beee518..8015768f99b 100644 --- a/dlls/dssenh/Makefile.in +++ b/dlls/dssenh/Makefile.in @@ -4,3 +4,5 @@ EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ main.c + +RC_SRCS = rsrc.rc diff --git a/dlls/dssenh/dssenh.rgs b/dlls/dssenh/dssenh.rgs new file mode 100644 index 00000000000..0e9bad7c17c --- /dev/null +++ b/dlls/dssenh/dssenh.rgs @@ -0,0 +1,56 @@ +HKLM +{ + NoRemove Software + { + NoRemove Microsoft + { + NoRemove Cryptography + { + NoRemove Defaults + { + NoRemove Provider + { + ForceRemove 'Microsoft Base DSS Cryptographic Provider' + { + val 'Image Path' = s '%MODULE%' + val 'Type' = d 3 + } + ForceRemove 'Microsoft Base DSS and Diffie-Hellman Cryptographic Provider' + { + val 'Image Path' = s '%MODULE%' + val 'Type' = d 13 + } + ForceRemove 'Microsoft Enhanced DSS and Diffie-Hellman Cryptographic Provider' + { + val 'Image Path' = s '%MODULE%' + val 'Type' = d 13 + } + ForceRemove 'Microsoft DH SChannel Cryptographic Provider' + { + val 'Image Path' = s '%MODULE%' + val 'Type' = d 18 + } + } + NoRemove 'Provider Types' + { + ForceRemove 'Type 003' + { + val 'Name' = s 'Microsoft Base DSS Cryptographic Provider' + val 'TypeName' = s 'DSS Signature' + } + ForceRemove 'Type 013' + { + val 'Name' = s 'Microsoft Enhanced DSS and Diffie-Hellman Cryptographic Provider' + val 'TypeName' = s 'DSS Signature with Diffie-Hellman Key Exchange' + } + ForceRemove 'Type 018' + { + val 'Name' = s 'Microsoft DH SChannel Cryptographic Provider' + val 'TypeName' = s 'Diffie-Hellman SChannel' + } + } + } + } + } + } +} diff --git a/dlls/dssenh/main.c b/dlls/dssenh/main.c index 80551cf578b..5aa885c8b86 100644 --- a/dlls/dssenh/main.c +++ b/dlls/dssenh/main.c @@ -22,8 +22,13 @@ #include "windef.h" #include "winbase.h" #include "wincrypt.h" +#include "objbase.h" +#include "rpcproxy.h" + #include "wine/debug.h" +static HINSTANCE instance; + WINE_DEFAULT_DEBUG_CHANNEL(dssenh); BOOL WINAPI CPAcquireContext( HCRYPTPROV *ret_prov, LPSTR container, DWORD flags, PVTableProvStruc vtable ) @@ -106,11 +111,12 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) switch (fdwReason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + instance = hinstDLL; + DisableThreadLibraryCalls(hinstDLL); + break; } return TRUE; } @@ -120,8 +126,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) */ HRESULT WINAPI DllRegisterServer(void) { - FIXME("Not implemented.\n"); - return E_UNEXPECTED; + return __wine_register_resources( instance ); } /***************************************************** @@ -129,6 +134,5 @@ HRESULT WINAPI DllRegisterServer(void) */ HRESULT WINAPI DllUnregisterServer(void) { - FIXME("Not implemented.\n"); - return E_UNEXPECTED; + return __wine_unregister_resources( instance ); } diff --git a/dlls/dssenh/rsrc.rc b/dlls/dssenh/rsrc.rc new file mode 100644 index 00000000000..ac5ba6258e0 --- /dev/null +++ b/dlls/dssenh/rsrc.rc @@ -0,0 +1,22 @@ +/* + * Resources for dssenh + * + * Copyright 2020 Hans Leidekker for CodeWeavers + * + * 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 + */ + +/* @makedep: dssenh.rgs */ +1 WINE_REGISTRY dssenh.rgs diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c index 7a16acc6790..c88fcd14661 100644 --- a/dlls/dssenh/tests/dssenh.c +++ b/dlls/dssenh/tests/dssenh.c @@ -54,7 +54,6 @@ static void test_acquire_context(void) /* cannot acquire along with PROV_RSA_SIG, not compatible */ SetLastError(0xdeadbeef); result = CryptAcquireContextA(&hProv, NULL, MS_DEF_DSS_PROV_A, PROV_RSA_SIG, 0); - todo_wine ok(!result && GetLastError() == NTE_PROV_TYPE_NO_MATCH, "Expected NTE_PROV_TYPE_NO_MATCH, got %08x\n", GetLastError()); @@ -574,7 +573,7 @@ static void test_data_encryption(const struct encrypt_test *tests, int testLen) SetLastError(0xdeadbeef); result = CryptAcquireContextA( &hProv, NULL, MS_ENH_DSS_DH_PROV_A, PROV_DSS_DH, CRYPT_VERIFYCONTEXT); - if(!result && GetLastError() == NTE_KEYSET_NOT_DEF) + if (!result) { skip("DSSENH is currently not available, skipping encryption tests.\n"); return; @@ -665,7 +664,7 @@ static void test_cipher_modes(const struct ciphermode_test *tests, int testLen) SetLastError(0xdeadbeef); result = CryptAcquireContextA( &hProv, NULL, MS_ENH_DSS_DH_PROV_A, PROV_DSS_DH, CRYPT_VERIFYCONTEXT); - if(!result && GetLastError() == NTE_KEYSET_NOT_DEF) + if (!result) { skip("DSSENH is currently not available, skipping block cipher mode tests.\n"); return; -- 2.28.0

2 1

[PATCH v2 1/2] dssenh: Add stub implementations for a couple of functions.
by Hans Leidekker Oct. 8, 2020

Oct. 8, 2020

v2: Include CPGetProvParam. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/dssenh/dssenh.spec | 28 +++++++-------- dlls/dssenh/main.c | 75 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 89 insertions(+), 14 deletions(-) diff --git a/dlls/dssenh/dssenh.spec b/dlls/dssenh/dssenh.spec index c5c25452814..2d93a98796a 100644 --- a/dlls/dssenh/dssenh.spec +++ b/dlls/dssenh/dssenh.spec @@ -1,27 +1,27 @@ -@ stub CPAcquireContext -@ stub CPCreateHash +@ stdcall CPAcquireContext(ptr str long ptr) +@ stdcall CPCreateHash(ptr long ptr long ptr) @ stub CPDecrypt -@ stub CPDeriveKey -@ stub CPDestroyHash -@ stub CPDestroyKey +@ stdcall CPDeriveKey(ptr long ptr long ptr) +@ stdcall CPDestroyHash(ptr ptr) +@ stdcall CPDestroyKey(ptr ptr) @ stub CPDuplicateHash @ stub CPDuplicateKey @ stub CPEncrypt -@ stub CPExportKey -@ stub CPGenKey +@ stdcall CPExportKey(ptr ptr ptr long long ptr ptr) +@ stdcall CPGenKey(ptr long long ptr) @ stub CPGenRandom -@ stub CPGetHashParam +@ stdcall CPGetHashParam(ptr ptr long ptr ptr long) @ stub CPGetKeyParam -@ stub CPGetProvParam +@ stdcall CPGetProvParam(ptr long ptr ptr long) @ stub CPGetUserKey -@ stub CPHashData +@ stdcall CPHashData(ptr ptr ptr long long) @ stub CPHashSessionKey -@ stub CPImportKey -@ stub CPReleaseContext +@ stdcall CPImportKey(ptr ptr long ptr long ptr) +@ stdcall CPReleaseContext(ptr long) @ stub CPSetHashParam @ stub CPSetKeyParam @ stub CPSetProvParam -@ stub CPSignHash -@ stub CPVerifySignature +@ stdcall CPSignHash(ptr ptr long wstr long ptr ptr) +@ stdcall CPVerifySignature(ptr ptr ptr long ptr wstr long) @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() diff --git a/dlls/dssenh/main.c b/dlls/dssenh/main.c index b60b3447a36..80551cf578b 100644 --- a/dlls/dssenh/main.c +++ b/dlls/dssenh/main.c @@ -21,10 +21,85 @@ #include "windef.h" #include "winbase.h" +#include "wincrypt.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(dssenh); +BOOL WINAPI CPAcquireContext( HCRYPTPROV *ret_prov, LPSTR container, DWORD flags, PVTableProvStruc vtable ) +{ + return FALSE; +} + +BOOL WINAPI CPReleaseContext( HCRYPTPROV hprov, DWORD flags ) +{ + return FALSE; +} + +BOOL WINAPI CPGetProvParam( HCRYPTPROV hprov, DWORD param, BYTE *data, DWORD *len, DWORD flags ) +{ + return FALSE; +} + +BOOL WINAPI CPGenKey( HCRYPTPROV hprov, ALG_ID algid, DWORD flags, HCRYPTKEY *ret_key ) +{ + return FALSE; +} + +BOOL WINAPI CPDestroyKey( HCRYPTPROV hprov, HCRYPTKEY hkey ) +{ + return FALSE; +} + +BOOL WINAPI CPImportKey( HCRYPTPROV hprov, const BYTE *data, DWORD len, HCRYPTKEY hpubkey, DWORD flags, + HCRYPTKEY *ret_key ) +{ + return FALSE; +} + +BOOL WINAPI CPExportKey( HCRYPTPROV hprov, HCRYPTKEY hkey, HCRYPTKEY hexpkey, DWORD blobtype, DWORD flags, + BYTE *data, DWORD *len ) +{ + return FALSE; +} + +BOOL WINAPI CPCreateHash( HCRYPTPROV hprov, ALG_ID algid, HCRYPTKEY hkey, DWORD flags, HCRYPTHASH *ret_hash ) +{ + return FALSE; +} + +BOOL WINAPI CPDestroyHash( HCRYPTPROV hprov, HCRYPTHASH hhash ) +{ + return FALSE; +} + +BOOL WINAPI CPHashData( HCRYPTPROV hprov, HCRYPTHASH hhash, const BYTE *data, DWORD len, DWORD flags ) +{ + return FALSE; +} + +BOOL WINAPI CPGetHashParam( HCRYPTPROV hprov, HCRYPTHASH hhash, DWORD param, BYTE *data, DWORD *len, DWORD flags ) +{ + return FALSE; +} + +BOOL WINAPI CPDeriveKey( HCRYPTPROV hprov, ALG_ID algid, HCRYPTHASH hhash, DWORD flags, HCRYPTKEY *ret_key ) +{ + return FALSE; +} + +BOOL WINAPI CPSignHash( HCRYPTPROV hprov, HCRYPTHASH hhash, DWORD keyspec, const WCHAR *desc, DWORD flags, BYTE *sig, + DWORD *siglen ) +{ + return FALSE; +} + +BOOL WINAPI CPVerifySignature( HCRYPTPROV hprov, HCRYPTHASH hhash, const BYTE *sig, DWORD siglen, HCRYPTKEY hpubkey, + const WCHAR *desc, DWORD flags ) +{ + return FALSE; +} + BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); -- 2.28.0

1 0

[PATCH 7/7] conhost: Support painting screen buffer.
by Jacek Caban Oct. 8, 2020

Oct. 8, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/conhost.c | 12 ++++++++++-- programs/conhost/conhost.h | 1 + programs/conhost/window.c | 26 ++++++++++++++++++++++++++ 3 files changed, 37 insertions(+), 2 deletions(-)

1 0

[PATCH 6/7] conhost: Update window config in ioctl handlers when needed.
by Jacek Caban Oct. 8, 2020

Oct. 8, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/conhost.c | 13 ++++++++++--- programs/conhost/conhost.h | 2 ++ programs/conhost/window.c | 13 +++++++++++++ 3 files changed, 25 insertions(+), 3 deletions(-)

1 0