October 2020 - Wine-Commits

Gerald Pfeifer : winevdm: Abstract references to /dosbox.
by Alexandre Julliard Oct. 9, 2020

Oct. 9, 2020

Module: wine Branch: master Commit: 689ff9c073785c0b462622c20dea8b30fe15d7d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=689ff9c073785c0b462622c2… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri Oct 2 16:52:41 2020 +0300 winevdm: Abstract references to /dosbox. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winevdm/winevdm.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/programs/winevdm/winevdm.c b/programs/winevdm/winevdm.c index bfc47b8853..e550232c9a 100644 --- a/programs/winevdm/winevdm.c +++ b/programs/winevdm/winevdm.c @@ -35,6 +35,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(winevdm); +#define DOSBOX "dosbox" /*** PIF file structures ***/ #include "pshpack1.h" @@ -118,7 +119,7 @@ static char *find_dosbox(void) envpath_len = strlen( envpath ); path = HeapAlloc( GetProcessHeap(), 0, envpath_len + 1 ); - buffer = HeapAlloc( GetProcessHeap(), 0, envpath_len + sizeof("/dosbox") ); + buffer = HeapAlloc( GetProcessHeap(), 0, envpath_len + strlen(DOSBOX) + 2 ); strcpy( path, envpath ); p = path; @@ -130,7 +131,7 @@ static char *find_dosbox(void) while (*p && *p != ':') p++; if (*p == ':') *p++ = 0; strcpy( buffer, dir ); - strcat( buffer, "/dosbox" ); + strcat( buffer, "/" DOSBOX ); if (!stat( buffer, &st )) { HeapFree( GetProcessHeap(), 0, path );

1 0

Jacek Caban : conhost: Rename version.rc to conhost.rc.
by Alexandre Julliard Oct. 9, 2020

Oct. 9, 2020

Module: wine Branch: master Commit: d2aa17dceeee847541f210ce8e68f1724f0316d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2aa17dceeee847541f210ce… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 9 17:27:20 2020 +0200 conhost: Rename version.rc to conhost.rc. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/Makefile.in | 2 +- programs/conhost/{version.rc => conhost.rc} | 0 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/conhost/Makefile.in b/programs/conhost/Makefile.in index 14cb593fb1..61abdb7908 100644 --- a/programs/conhost/Makefile.in +++ b/programs/conhost/Makefile.in @@ -7,4 +7,4 @@ C_SRCS = \ conhost.c \ window.c -RC_SRCS = version.rc +RC_SRCS = conhost.rc diff --git a/programs/conhost/version.rc b/programs/conhost/conhost.rc similarity index 100% rename from programs/conhost/version.rc rename to programs/conhost/conhost.rc

1 0

Nikolay Sivov : nls: Build codepage data for CP708.
by Alexandre Julliard Oct. 9, 2020

Oct. 9, 2020

Module: wine Branch: master Commit: 1ca4536f7edcc884711a7dab39870df5d20c9785 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ca4536f7edcc884711a7dab… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 9 18:06:25 2020 +0300 nls: Build codepage data for CP708. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/kernelbase.rgs | 1 + loader/wine.inf.in | 1 + nls/Makefile.in | 1 + nls/c_708.nls | Bin 0 -> 66082 bytes tools/make_unicode | 1 + 5 files changed, 4 insertions(+) diff --git a/dlls/kernelbase/kernelbase.rgs b/dlls/kernelbase/kernelbase.rgs index 82a3cecb3c..629f98ebaf 100644 --- a/dlls/kernelbase/kernelbase.rgs +++ b/dlls/kernelbase/kernelbase.rgs @@ -13,6 +13,7 @@ HKLM val '37' = s 'c_037.nls' val '437' = s 'c_437.nls' val '500' = s 'c_500.nls' + val '708' = s 'c_708.nls' val '737' = s 'c_737.nls' val '775' = s 'c_775.nls' val '850' = s 'c_850.nls' diff --git a/loader/wine.inf.in b/loader/wine.inf.in index a179474267..3580a32ca0 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -3986,6 +3986,7 @@ c_28603.nls c_28605.nls c_437.nls c_500.nls +c_708.nls c_737.nls c_775.nls c_850.nls diff --git a/nls/Makefile.in b/nls/Makefile.in index 9a87a73a5a..a3c3b69b02 100644 --- a/nls/Makefile.in +++ b/nls/Makefile.in @@ -44,6 +44,7 @@ SOURCES = \ c_28605.nls \ c_437.nls \ c_500.nls \ + c_708.nls \ c_737.nls \ c_775.nls \ c_850.nls \ diff --git a/nls/c_708.nls b/nls/c_708.nls new file mode 100644 index 0000000000..bfab7c9538 Binary files /dev/null and b/nls/c_708.nls differ diff --git a/tools/make_unicode b/tools/make_unicode index e18ec0a206..7aae54ccbb 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -44,6 +44,7 @@ my @allfiles = "CodpageFiles/037.txt", "CodpageFiles/437.txt", "CodpageFiles/500.txt", + "CodpageFiles/708.txt", "CodpageFiles/737.txt", "CodpageFiles/775.txt", "CodpageFiles/850.txt",

1 0

Henri Verbeet : include: Update d3d12sdklayers.idl from vkd3d.
by Alexandre Julliard Oct. 9, 2020

Oct. 9, 2020

Module: wine Branch: master Commit: 2278485d0225eb74bbeb415694de20bd6b0b6dd4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2278485d0225eb74bbeb4156… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 9 17:38:40 2020 +0330 include: Update d3d12sdklayers.idl from vkd3d. This corresponds to vkd3d as of commit 4eadd917c7cdbbcdf802a3475cdbc05aab7eaf77. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3d12sdklayers.idl | 956 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 956 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2278485d0225eb74bbeb…

1 0

Nikolay Sivov : evr/mixer: Add support for MFT_SET_TYPE_TEST_ONLY for inputs.
by Alexandre Julliard Oct. 9, 2020

Oct. 9, 2020

Module: wine Branch: master Commit: 24c9d77cee95a778c95a03c6083739cc31989e50 URL: https://source.winehq.org/git/wine.git/?a=commit;h=24c9d77cee95a778c95a03c6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 9 13:54:39 2020 +0300 evr/mixer: Add support for MFT_SET_TYPE_TEST_ONLY for inputs. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 12 +++++++----- dlls/evr/tests/evr.c | 12 ++++++++++++ 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 107438b1f1..54da3a9ce1 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -611,12 +611,12 @@ static int rt_formats_sort_compare(const void *left, const void *right) } static HRESULT video_mixer_collect_output_types(struct video_mixer *mixer, const DXVA2_VideoDesc *video_desc, - IDirectXVideoProcessorService *service, unsigned int device_count, const GUID *devices) + IDirectXVideoProcessorService *service, unsigned int device_count, const GUID *devices, unsigned int flags) { unsigned int i, j, format_count, count; D3DFORMAT *rt_formats = NULL, *formats, *ptr; + HRESULT hr = MF_E_INVALIDMEDIATYPE; GUID subtype; - HRESULT hr; count = 0; for (i = 0; i < device_count; ++i) @@ -640,7 +640,7 @@ static HRESULT video_mixer_collect_output_types(struct video_mixer *mixer, const } } - if (count) + if (count && !(flags & MFT_SET_TYPE_TEST_ONLY)) { qsort(rt_formats, count, sizeof(*rt_formats), rt_formats_sort_compare); @@ -690,7 +690,8 @@ static HRESULT WINAPI video_mixer_transform_SetInputType(IMFTransform *iface, DW EnterCriticalSection(&mixer->cs); - video_mixer_clear_types(mixer); + if (!(flags & MFT_SET_TYPE_TEST_ONLY)) + video_mixer_clear_types(mixer); if (!mixer->device_manager) hr = MF_E_NOT_INITIALIZED; @@ -708,7 +709,8 @@ static HRESULT WINAPI video_mixer_transform_SetInputType(IMFTransform *iface, DW if (SUCCEEDED(hr = IDirectXVideoProcessorService_GetVideoProcessorDeviceGuids(service, &video_desc, &count, &guids))) { - if (SUCCEEDED(hr = video_mixer_collect_output_types(mixer, &video_desc, service, count, guids))) + if (SUCCEEDED(hr = video_mixer_collect_output_types(mixer, &video_desc, service, count, + guids, flags)) && !(flags & MFT_SET_TYPE_TEST_ONLY)) { GUID subtype = { 0 }; diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 7ad011d2a0..175c30e818 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -862,6 +862,9 @@ static void test_default_mixer_type_negotiation(void) hr = IMFTransform_SetInputType(transform, 0, media_type, 0); ok(hr == MF_E_NOT_INITIALIZED, "Unexpected hr %#x.\n", hr); + hr = IMFTransform_SetInputType(transform, 0, media_type, MFT_SET_TYPE_TEST_ONLY); + ok(hr == MF_E_NOT_INITIALIZED, "Unexpected hr %#x.\n", hr); + /* Now try with device manager. */ window = create_window(); @@ -883,6 +886,9 @@ static void test_default_mixer_type_negotiation(void) hr = IMFTransform_SetInputType(transform, 0, media_type, 0); ok(hr == DXVA2_E_NOT_INITIALIZED, "Unexpected hr %#x.\n", hr); + hr = IMFTransform_SetInputType(transform, 0, media_type, MFT_SET_TYPE_TEST_ONLY); + ok(hr == DXVA2_E_NOT_INITIALIZED, "Unexpected hr %#x.\n", hr); + hr = IDirect3DDeviceManager9_ResetDevice(manager, device, token); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); @@ -904,6 +910,12 @@ static void test_default_mixer_type_negotiation(void) hr = IMFVideoMediaType_SetUINT32(video_type, &MF_MT_ALL_SAMPLES_INDEPENDENT, TRUE); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFTransform_SetInputType(transform, 0, (IMFMediaType *)video_type, MFT_SET_TYPE_TEST_ONLY); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFTransform_GetInputCurrentType(transform, 0, &media_type); + ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#x.\n", hr); + hr = IMFTransform_SetInputType(transform, 0, (IMFMediaType *)video_type, 0); ok(hr == S_OK, "Unexpected hr %#x.\n", hr);

1 0

Nikolay Sivov : mf/evr: Implement IsMediaTypeSupported().
by Alexandre Julliard Oct. 9, 2020

Oct. 9, 2020

Module: wine Branch: master Commit: e2bcf44080070436bfae9888c8e6001d511192e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2bcf44080070436bfae9888… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 9 13:54:40 2020 +0300 mf/evr: Implement IsMediaTypeSupported(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 60 ++++++++++++++++++++++++++++++++++++++++++++---------- dlls/mf/tests/mf.c | 12 +++++++++++ 2 files changed, 61 insertions(+), 11 deletions(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index 087ac2a88e..c3548170af 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -362,12 +362,57 @@ static ULONG WINAPI video_stream_typehandler_Release(IMFMediaTypeHandler *iface) return IMFStreamSink_Release(&stream->IMFStreamSink_iface); } +/* Mixer expects special video media type instance. */ +static HRESULT video_renderer_create_video_type(IMFMediaType *media_type, IMFVideoMediaType **video_type) +{ + GUID subtype; + HRESULT hr; + + *video_type = NULL; + + if (FAILED(hr = IMFMediaType_GetGUID(media_type, &MF_MT_SUBTYPE, &subtype))) + return hr; + + if (FAILED(hr = MFCreateVideoMediaTypeFromSubtype(&subtype, video_type))) + return hr; + + hr = IMFMediaType_CopyAllItems(media_type, (IMFAttributes *)*video_type); + if (FAILED(hr)) + { + IMFVideoMediaType_Release(*video_type); + *video_type = NULL; + } + + return hr; +} + static HRESULT WINAPI video_stream_typehandler_IsMediaTypeSupported(IMFMediaTypeHandler *iface, IMFMediaType *in_type, IMFMediaType **out_type) { - FIXME("%p, %p, %p.\n", iface, in_type, out_type); + struct video_stream *stream = impl_from_IMFMediaTypeHandler(iface); + IMFVideoMediaType *video_type; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %p, %p.\n", iface, in_type, out_type); + + if (!in_type) + return E_POINTER; + + if (!stream->parent) + return MF_E_INVALIDMEDIATYPE; + + if (FAILED(hr = video_renderer_create_video_type(in_type, &video_type))) + return hr; + + if (SUCCEEDED(hr = IMFTransform_SetInputType(stream->parent->mixer, stream->id, (IMFMediaType *)video_type, + MFT_SET_TYPE_TEST_ONLY))) + { + if (out_type) *out_type = NULL; + } + + IMFVideoMediaType_Release(video_type); + + return hr; } static HRESULT WINAPI video_stream_typehandler_GetMediaTypeCount(IMFMediaTypeHandler *iface, DWORD *count) @@ -394,7 +439,6 @@ static HRESULT WINAPI video_stream_typehandler_SetCurrentMediaType(IMFMediaTypeH { struct video_stream *stream = impl_from_IMFMediaTypeHandler(iface); IMFVideoMediaType *video_type; - GUID subtype; HRESULT hr; TRACE("%p, %p.\n", iface, type); @@ -405,16 +449,10 @@ static HRESULT WINAPI video_stream_typehandler_SetCurrentMediaType(IMFMediaTypeH if (!stream->parent) return MF_E_STREAMSINK_REMOVED; - if (FAILED(hr = IMFMediaType_GetGUID(type, &MF_MT_SUBTYPE, &subtype))) - return hr; - - /* Mixer expects special video media type instance. */ - if (FAILED(hr = MFCreateVideoMediaTypeFromSubtype(&subtype, &video_type))) + if (FAILED(hr = video_renderer_create_video_type(type, &video_type))) return hr; - if (SUCCEEDED(hr = IMFMediaType_CopyAllItems(type, (IMFAttributes *)video_type))) - hr = IMFTransform_SetInputType(stream->parent->mixer, stream->id, (IMFMediaType *)video_type, 0); - + hr = IMFTransform_SetInputType(stream->parent->mixer, stream->id, (IMFMediaType *)video_type, 0); IMFVideoMediaType_Release(video_type); return hr; diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 5ffc191667..351a6e1eda 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -3332,9 +3332,21 @@ static void test_evr(void) hr = IMFMediaType_SetUINT64(media_type, &MF_MT_FRAME_SIZE, (UINT64)640 << 32 | 480); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_IsMediaTypeSupported(type_handler, NULL, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_IsMediaTypeSupported(type_handler, media_type, &media_type2); + ok(hr == MF_E_INVALIDMEDIATYPE, "Unexpected hr %#x.\n", hr); + hr = IMFMediaType_SetUINT32(media_type, &MF_MT_ALL_SAMPLES_INDEPENDENT, TRUE); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + media_type2 = (void *)0x1; + hr = IMFMediaTypeHandler_IsMediaTypeSupported(type_handler, media_type, &media_type2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!media_type2, "Unexpected media type %p.\n", media_type2); + hr = IMFMediaTypeHandler_SetCurrentMediaType(type_handler, media_type); ok(hr == S_OK, "Unexpected hr %#x.\n", hr);

1 0

Nikolay Sivov : comctl32/ipaddress: Fix IPM_CLEARADDRESS return value.
by Alexandre Julliard Oct. 9, 2020

Oct. 9, 2020

Module: wine Branch: master Commit: 573b3eb432fb56dd949da48275f3d0162c8424eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=573b3eb432fb56dd949da482… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 9 13:35:17 2020 +0300 comctl32/ipaddress: Fix IPM_CLEARADDRESS return value. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/ipaddress.c | 7 ++++--- dlls/comctl32/tests/ipaddress.c | 43 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/ipaddress.c b/dlls/comctl32/ipaddress.c index 32816561e3..82d47d4e57 100644 --- a/dlls/comctl32/ipaddress.c +++ b/dlls/comctl32/ipaddress.c @@ -354,7 +354,7 @@ static BOOL IPADDRESS_SetRange (IPADDRESS_INFO *infoPtr, int index, WORD range) } -static void IPADDRESS_ClearAddress (const IPADDRESS_INFO *infoPtr) +static LRESULT IPADDRESS_ClearAddress (const IPADDRESS_INFO *infoPtr) { int i; @@ -362,6 +362,8 @@ static void IPADDRESS_ClearAddress (const IPADDRESS_INFO *infoPtr) for (i = 0; i < 4; i++) SetWindowTextW (infoPtr->Part[i].EditHwnd, L""); + + return 1; } @@ -614,8 +616,7 @@ IPADDRESS_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return 0; case IPM_CLEARADDRESS: - IPADDRESS_ClearAddress (infoPtr); - break; + return IPADDRESS_ClearAddress (infoPtr); case IPM_SETADDRESS: return IPADDRESS_SetAddress (infoPtr, (DWORD)lParam); diff --git a/dlls/comctl32/tests/ipaddress.c b/dlls/comctl32/tests/ipaddress.c index c87d0f5664..2df25a5a65 100644 --- a/dlls/comctl32/tests/ipaddress.c +++ b/dlls/comctl32/tests/ipaddress.c @@ -144,6 +144,47 @@ static void test_WM_SETFOCUS(void) DestroyWindow(hwnd); } +static void test_IPM_CLEARADDRESS(void) +{ + struct child_enum child_enum = {{ 0 }}; + char buff[16]; + int i, ret; + HWND hwnd; + + hwnd = create_ipaddress_control(); + ok(!!hwnd, "Failed to create control.\n"); + + ret = SendMessageA(hwnd, IPM_SETADDRESS, 0, MAKEIPADDRESS(0, 1, 2, 3)); + ok(ret == 1, "Unexpected return value %d.\n", ret); + + EnumChildWindows(hwnd, test_child_enum_proc, (LPARAM)&child_enum); + ok(child_enum.count == 4, "Unexpected child count %u.\n", child_enum.count); + + ret = SendMessageA(hwnd, IPM_SETADDRESS, 0, MAKEIPADDRESS(1, 2, 3, 4)); + ok(ret == 1, "Unexpected return value %d.\n", ret); + + ret = GetWindowTextA(hwnd, buff, ARRAY_SIZE(buff)); + ok(ret == 7, "Unexpected return value %d.\n", ret); + ok(!strcmp(buff, "1.2.3.4"), "Unexpected address %s.\n", buff); + + ret = SendMessageA(hwnd, IPM_CLEARADDRESS, 0, 0); + ok(ret, "Unexpected return value %d.\n", ret); + + ret = GetWindowTextA(hwnd, buff, ARRAY_SIZE(buff)); + ok(ret == 7, "Unexpected return value %d.\n", ret); + ok(!strcmp(buff, "0.0.0.0"), "Unexpected address %s.\n", buff); + + for (i = 0; i < 4; ++i) + { + buff[0] = 1; + ret = GetWindowTextA(child_enum.fields[i], buff, ARRAY_SIZE(buff)); + ok(ret == 0, "Unexpected return value %d.\n", ret); + ok(!*buff, "Unexpected field text %s.\n", buff); + } + + DestroyWindow(hwnd); +} + START_TEST(ipaddress) { ULONG_PTR cookie; @@ -152,6 +193,7 @@ START_TEST(ipaddress) test_get_set_text(); test_IPM_SETFOCUS(); test_WM_SETFOCUS(); + test_IPM_CLEARADDRESS(); if (!load_v6_module(&cookie, &ctxt)) return; @@ -159,6 +201,7 @@ START_TEST(ipaddress) test_get_set_text(); test_IPM_SETFOCUS(); test_WM_SETFOCUS(); + test_IPM_CLEARADDRESS(); unload_v6_module(cookie, ctxt); }

1 0

Myah Caron : ntoskrnl.exe: Stub MmProtectMdlSystemAddress.
by Alexandre Julliard Oct. 9, 2020

Oct. 9, 2020

Module: wine Branch: master Commit: c6d0d7f02a49afc85e00a451d0947b185d1bc55c URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6d0d7f02a49afc85e00a451… Author: Myah Caron <qsniyg(a)protonmail.com> Date: Thu Oct 8 20:50:04 2020 +0000 ntoskrnl.exe: Stub MmProtectMdlSystemAddress. Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 e94feabc82..4092e33db4 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 8892fde505..6ac70c718f 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)

1 0

Michael Stefaniuc : dpvoice: Use wide-char string literals.
by Alexandre Julliard Oct. 9, 2020

Oct. 9, 2020

Module: wine Branch: master Commit: 9301a644ecf77140c6e660d7dfddc52faf0d9552 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9301a644ecf77140c6e660d7… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Oct 8 23:28:00 2020 +0200 dpvoice: Use wide-char string literals. Simplify the calculation of the size of a WCHAR array too. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(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 714863f6b2..a476a2e585 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 2d77049a9b..4b44e1e108 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);

1 0

Michael Stefaniuc : eject: Use wide-char string literals.
by Alexandre Julliard Oct. 9, 2020

Oct. 9, 2020

Module: wine Branch: master Commit: 17c6e28513afe07f592f9d816faea1369a427c65 URL: https://source.winehq.org/git/wine.git/?a=commit;h=17c6e28513afe07f592f9d81… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Oct 8 23:27:58 2020 +0200 eject: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(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 0a081cfdf5..e6416eacff 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 );

1 0

Nikolay Sivov : mf/evr: Implement GetMediaTypeByIndex().
by Alexandre Julliard Oct. 9, 2020

Oct. 9, 2020

Module: wine Branch: master Commit: 7b54ce1e07fe09b0734407db012c754c48aee4d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b54ce1e07fe09b0734407db… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 9 13:54:37 2020 +0300 mf/evr: Implement GetMediaTypeByIndex(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index 7567b1a709..ebeb8899ee 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -385,9 +385,9 @@ static HRESULT WINAPI video_stream_typehandler_GetMediaTypeCount(IMFMediaTypeHan static HRESULT WINAPI video_stream_typehandler_GetMediaTypeByIndex(IMFMediaTypeHandler *iface, DWORD index, IMFMediaType **type) { - FIXME("%p, %u, %p.\n", iface, index, type); + TRACE("%p, %u, %p.\n", iface, index, type); - return E_NOTIMPL; + return MF_E_NO_MORE_TYPES; } static HRESULT WINAPI video_stream_typehandler_SetCurrentMediaType(IMFMediaTypeHandler *iface, IMFMediaType *type)

1 0

Hans Leidekker : dssenh: Implement CPGetHashParam.
by Alexandre Julliard Oct. 9, 2020

Oct. 9, 2020

Module: wine Branch: master Commit: 8ff5c52b14388e2d84f67a3a6c6f17b89d50100d URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ff5c52b14388e2d84f67a3a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Oct 9 12:45:59 2020 +0200 dssenh: Implement CPGetHashParam. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dssenh/main.c | 40 +++++++++++++++++++++++++++++++++++++++- dlls/dssenh/tests/dssenh.c | 5 ----- 2 files changed, 39 insertions(+), 6 deletions(-) diff --git a/dlls/dssenh/main.c b/dlls/dssenh/main.c index 44912ed498..a3a4e1b2c3 100644 --- a/dlls/dssenh/main.c +++ b/dlls/dssenh/main.c @@ -431,7 +431,45 @@ BOOL WINAPI CPHashData( HCRYPTPROV hprov, HCRYPTHASH hhash, const BYTE *data, DW BOOL WINAPI CPGetHashParam( HCRYPTPROV hprov, HCRYPTHASH hhash, DWORD param, BYTE *data, DWORD *len, DWORD flags ) { - return FALSE; + struct hash *hash = (struct hash *)hhash; + + TRACE( "%p, %p, %08x, %p, %p, %08x\n", (void *)hprov, (void *)hhash, param, data, len, flags ); + + if (hash->magic != MAGIC_HASH) return FALSE; + + switch (param) + { + case HP_HASHSIZE: + if (sizeof(hash->len) > *len) + { + *len = sizeof(hash->len); + SetLastError( ERROR_MORE_DATA ); + return FALSE; + } + *(DWORD *)data = hash->len; + *len = sizeof(hash->len); + return TRUE; + + case HP_HASHVAL: + if (!hash->finished) + { + if (BCryptFinishHash( hash->handle, hash->value, hash->len, 0 )) return FALSE; + hash->finished = TRUE; + } + if (hash->len > *len) + { + *len = hash->len; + SetLastError( ERROR_MORE_DATA ); + return FALSE; + } + memcpy( data, hash->value, hash->len ); + *len = hash->len; + return TRUE; + + default: + SetLastError( NTE_BAD_TYPE ); + return FALSE; + } } BOOL WINAPI CPDeriveKey( HCRYPTPROV hprov, ALG_ID algid, HCRYPTHASH hhash, DWORD flags, HCRYPTKEY *ret_key ) diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c index cc4650b2c8..3bd546524f 100644 --- a/dlls/dssenh/tests/dssenh.c +++ b/dlls/dssenh/tests/dssenh.c @@ -453,11 +453,6 @@ static void test_hash(const struct hash_test *tests, int testLen) dataLen = sizeof(DWORD); result = CryptGetHashParam(hHash, HP_HASHSIZE, (BYTE *)&hashLen, &dataLen, 0); - if (!result) - { - skip("skipping hash tests\n"); - return; - } ok(result && (hashLen == tests[i].hashLen), "Expected %d hash len, got %d.Error: %x\n", tests[i].hashLen, hashLen, GetLastError());

1 0

Nikolay Sivov : mf/evr: Set stream media type to the mixer.
by Alexandre Julliard Oct. 9, 2020

Oct. 9, 2020

Module: wine Branch: master Commit: 430c179fe86dd7f9b3ddfb6ef30f6359633ef0b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=430c179fe86dd7f9b3ddfb6e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 9 13:54:38 2020 +0300 mf/evr: Set stream media type to the mixer. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 39 +++++++++++++++++++++++++++++++++++---- dlls/mf/tests/mf.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+), 4 deletions(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index ebeb8899ee..087ac2a88e 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -392,16 +392,47 @@ static HRESULT WINAPI video_stream_typehandler_GetMediaTypeByIndex(IMFMediaTypeH static HRESULT WINAPI video_stream_typehandler_SetCurrentMediaType(IMFMediaTypeHandler *iface, IMFMediaType *type) { - FIXME("%p, %p.\n", iface, type); + struct video_stream *stream = impl_from_IMFMediaTypeHandler(iface); + IMFVideoMediaType *video_type; + GUID subtype; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, type); + + if (!type) + return E_POINTER; + + if (!stream->parent) + return MF_E_STREAMSINK_REMOVED; + + if (FAILED(hr = IMFMediaType_GetGUID(type, &MF_MT_SUBTYPE, &subtype))) + return hr; + + /* Mixer expects special video media type instance. */ + if (FAILED(hr = MFCreateVideoMediaTypeFromSubtype(&subtype, &video_type))) + return hr; + + if (SUCCEEDED(hr = IMFMediaType_CopyAllItems(type, (IMFAttributes *)video_type))) + hr = IMFTransform_SetInputType(stream->parent->mixer, stream->id, (IMFMediaType *)video_type, 0); + + IMFVideoMediaType_Release(video_type); + + return hr; } static HRESULT WINAPI video_stream_typehandler_GetCurrentMediaType(IMFMediaTypeHandler *iface, IMFMediaType **type) { - FIXME("%p, %p.\n", iface, type); + struct video_stream *stream = impl_from_IMFMediaTypeHandler(iface); - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, type); + + if (!type) + return E_POINTER; + + if (!stream->parent) + return MF_E_STREAMSINK_REMOVED; + + return IMFTransform_GetInputCurrentType(stream->parent->mixer, stream->id, type); } static HRESULT WINAPI video_stream_typehandler_GetMajorType(IMFMediaTypeHandler *iface, GUID *type) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index db442453d6..5ffc191667 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -3237,6 +3237,7 @@ static void test_evr(void) { IMFVideoSampleAllocatorCallback *allocator_callback; IMFStreamSink *stream_sink, *stream_sink2; + IMFMediaType *media_type, *media_type2; IMFMediaEventGenerator *ev_generator; IMFVideoSampleAllocator *allocator; IMFMediaTypeHandler *type_handler; @@ -3305,6 +3306,47 @@ static void test_evr(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(!count, "Unexpected count %u.\n", count); + hr = IMFMediaTypeHandler_GetMediaTypeByIndex(type_handler, 0, NULL); + ok(hr == MF_E_NO_MORE_TYPES, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_GetMediaTypeByIndex(type_handler, 0, &media_type); + ok(hr == MF_E_NO_MORE_TYPES, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_GetCurrentMediaType(type_handler, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_GetCurrentMediaType(type_handler, &media_type); + ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_SetCurrentMediaType(type_handler, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = MFCreateMediaType(&media_type); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaType_SetGUID(media_type, &MF_MT_MAJOR_TYPE, &MFMediaType_Video); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaType_SetGUID(media_type, &MF_MT_SUBTYPE, &MFVideoFormat_RGB32); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaType_SetUINT64(media_type, &MF_MT_FRAME_SIZE, (UINT64)640 << 32 | 480); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFMediaType_SetUINT32(media_type, &MF_MT_ALL_SAMPLES_INDEPENDENT, TRUE); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_SetCurrentMediaType(type_handler, media_type); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_GetCurrentMediaType(type_handler, &media_type2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFMediaType_QueryInterface(media_type2, &IID_IMFVideoMediaType, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IUnknown_Release(unk); + IMFMediaType_Release(media_type2); + + IMFMediaType_Release(media_type); + IMFMediaTypeHandler_Release(type_handler); /* Stream uses an allocator. */

1 0

Hans Leidekker : dssenh: Implement CPImportKey and CPDestroyKey.
by Alexandre Julliard Oct. 9, 2020

Oct. 9, 2020

Module: wine Branch: master Commit: c1371f356c1019e8d47ab8be0bdeda1cbc804c9b URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1371f356c1019e8d47ab8be… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Oct 9 12:46:00 2020 +0200 dssenh: Implement CPImportKey and CPDestroyKey. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dssenh/main.c | 144 ++++++++++++++++++++++++++++++++++++++++++++- dlls/dssenh/tests/dssenh.c | 10 ++-- 2 files changed, 147 insertions(+), 7 deletions(-) diff --git a/dlls/dssenh/main.c b/dlls/dssenh/main.c index a3a4e1b2c3..f02e04585a 100644 --- a/dlls/dssenh/main.c +++ b/dlls/dssenh/main.c @@ -317,13 +317,153 @@ BOOL WINAPI CPGenKey( HCRYPTPROV hprov, ALG_ID algid, DWORD flags, HCRYPTKEY *re BOOL WINAPI CPDestroyKey( HCRYPTPROV hprov, HCRYPTKEY hkey ) { - return FALSE; + struct key *key = (struct key *)hkey; + + TRACE( "%p, %p\n", (void *)hprov, (void *)hkey ); + + if (key->magic != MAGIC_KEY) + { + SetLastError( NTE_BAD_KEY ); + return FALSE; + } + + destroy_key( key ); + return TRUE; +} + +static BOOL store_key_pair( struct key *key, HKEY hkey, DWORD keyspec, DWORD flags ) +{ + const WCHAR *value; + DATA_BLOB blob_in, blob_out; + DWORD len; + BYTE *data; + BOOL ret = TRUE; + + if (!key) return TRUE; + if (!(value = map_keyspec_to_keypair_name( keyspec ))) return FALSE; + + if (BCryptExportKey( key->handle, NULL, LEGACY_DSA_V2_PRIVATE_BLOB, NULL, 0, &len, 0 )) return FALSE; + if (!(data = heap_alloc( len ))) return FALSE; + + if (!BCryptExportKey( key->handle, NULL, LEGACY_DSA_V2_PRIVATE_BLOB, data, len, &len, 0 )) + { + blob_in.pbData = data; + blob_in.cbData = len; + if ((ret = CryptProtectData( &blob_in, NULL, NULL, NULL, NULL, flags, &blob_out ))) + { + ret = !RegSetValueExW( hkey, value, 0, REG_BINARY, blob_out.pbData, blob_out.cbData ); + LocalFree( blob_out.pbData ); + } + } + + heap_free( data ); + return ret; +} + +static BOOL store_key_container_keys( struct container *container ) +{ + HKEY hkey; + DWORD flags; + BOOL ret; + + if (container->flags & CRYPT_MACHINE_KEYSET) + flags = CRYPTPROTECT_LOCAL_MACHINE; + else + flags = 0; + + if (!create_container_regkey( container, KEY_WRITE, &hkey )) return FALSE; + + ret = store_key_pair( container->exch_key, hkey, AT_KEYEXCHANGE, flags ); + if (ret) store_key_pair( container->sign_key, hkey, AT_SIGNATURE, flags ); + RegCloseKey( hkey ); + return ret; } +#define MAGIC_DSS1 ('D' | ('S' << 8) | ('S' << 16) | ('1' << 24)) +#define MAGIC_DSS2 ('D' | ('S' << 8) | ('S' << 16) | ('2' << 24)) + BOOL WINAPI CPImportKey( HCRYPTPROV hprov, const BYTE *data, DWORD len, HCRYPTKEY hpubkey, DWORD flags, HCRYPTKEY *ret_key ) { - return FALSE; + struct container *container = (struct container *)hprov; + struct key *key; + BLOBHEADER *hdr; + DSSPUBKEY *pubkey; + const WCHAR *type; + NTSTATUS status; + + TRACE( "%p, %p, %u, %p, %08x, %p\n", (void *)hprov, data, len, (void *)hpubkey, flags, ret_key ); + + if (container->magic != MAGIC_CONTAINER) return FALSE; + if (len < sizeof(*hdr)) return FALSE; + + hdr = (BLOBHEADER *)data; + if ((hdr->bType != PRIVATEKEYBLOB && hdr->bType != PUBLICKEYBLOB) || hdr->bVersion != 2 || + hdr->aiKeyAlg != CALG_DSS_SIGN) + { + FIXME( "bType %u\n", hdr->bType ); + FIXME( "bVersion %u\n", hdr->bVersion ); + FIXME( "reserved %u\n", hdr->reserved ); + FIXME( "aiKeyAlg %08x\n", hdr->aiKeyAlg ); + return FALSE; + } + + if (len < sizeof(*hdr) + sizeof(*pubkey)) return FALSE; + pubkey = (DSSPUBKEY *)(hdr + 1); + + switch (pubkey->magic) + { + case MAGIC_DSS1: + type = LEGACY_DSA_V2_PUBLIC_BLOB; + break; + + case MAGIC_DSS2: + type = LEGACY_DSA_V2_PRIVATE_BLOB; + break; + + default: + FIXME( "unsupported key magic %08x\n", pubkey->magic ); + return FALSE; + } + + if (!(key = create_key( hdr->aiKeyAlg, flags ))) return FALSE; + + if ((status = BCryptImportKeyPair( key->alg_handle, NULL, type, &key->handle, (UCHAR *)data, len, 0 ))) + { + TRACE( "failed to import key %08x\n", status ); + destroy_key( key ); + return FALSE; + } + + if (!wcscmp(type, LEGACY_DSA_V2_PRIVATE_BLOB)) + { + switch (hdr->aiKeyAlg) + { + case AT_KEYEXCHANGE: + case CALG_DH_SF: + container->exch_key = key; + break; + + case AT_SIGNATURE: + case CALG_DSS_SIGN: + container->sign_key = key; + break; + + default: + FIXME( "unhandled key algorithm %u\n", hdr->aiKeyAlg ); + destroy_key( key ); + return FALSE; + } + + if (!store_key_container_keys( container )) + { + destroy_key( key ); + return FALSE; + } + } + + *ret_key = (HCRYPTKEY)key; + return TRUE; } BOOL WINAPI CPExportKey( HCRYPTPROV hprov, HCRYPTKEY hkey, HCRYPTKEY hexpkey, DWORD blobtype, DWORD flags, diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c index 3bd546524f..d4a231562e 100644 --- a/dlls/dssenh/tests/dssenh.c +++ b/dlls/dssenh/tests/dssenh.c @@ -853,11 +853,6 @@ static void test_signhash_array(HCRYPTPROV hProv, const struct signature_test *t /* Get a private key of array specified ALG_ID */ result = CryptImportKey(hProv, tests[i].privateKey, tests[i].keyLen, 0, 0, &privKey); - if (!result) - { - skip("skipping sign tests\n"); - return; - } ok(result, "Failed to imported key, got %x\n", GetLastError()); /* Create hash object and add data for signature 1 */ @@ -895,6 +890,11 @@ static void test_signhash_array(HCRYPTPROV hProv, const struct signature_test *t /* Sign hash 1 */ result = CryptSignHashA(hHash1, AT_SIGNATURE, NULL, 0, NULL, &signLen1); + if (!result) + { + skip("skipping sign tests\n"); + return; + } ok(result, "Failed to get signature length, got %x\n", GetLastError()); ok(signLen1 == 40, "Expected a 40-byte signature, got %d\n", signLen1);

1 0

Hans Leidekker : dssenh: Implement CPHashData.
by Alexandre Julliard Oct. 9, 2020

Oct. 9, 2020

Module: wine Branch: master Commit: d5688169a8798790753a1578bbda22ae1345c4de URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5688169a8798790753a1578… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Oct 9 12:45:58 2020 +0200 dssenh: Implement CPHashData. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dssenh/main.c | 10 +++++++++- dlls/dssenh/tests/dssenh.c | 24 ++++++++++++------------ 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/dlls/dssenh/main.c b/dlls/dssenh/main.c index 66f3456d78..44912ed498 100644 --- a/dlls/dssenh/main.c +++ b/dlls/dssenh/main.c @@ -1,5 +1,6 @@ /* * Copyright 2008 Maarten Lankhorst + * 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 @@ -418,7 +419,14 @@ BOOL WINAPI CPDestroyHash( HCRYPTPROV hprov, HCRYPTHASH hhash ) BOOL WINAPI CPHashData( HCRYPTPROV hprov, HCRYPTHASH hhash, const BYTE *data, DWORD len, DWORD flags ) { - return FALSE; + struct hash *hash = (struct hash *)hhash; + + TRACE("%p, %p, %p, %u, %08x\n", (void *)hprov, (void *)hhash, data, len, flags ); + + if (hash->magic != MAGIC_HASH) return FALSE; + + if (hash->finished || BCryptHashData( hash->handle, (UCHAR *)data, len, 0 )) return FALSE; + return TRUE; } BOOL WINAPI CPGetHashParam( HCRYPTPROV hprov, HCRYPTHASH hhash, DWORD param, BYTE *data, DWORD *len, DWORD flags ) diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c index f06cdd1433..cc4650b2c8 100644 --- a/dlls/dssenh/tests/dssenh.c +++ b/dlls/dssenh/tests/dssenh.c @@ -449,15 +449,15 @@ static void test_hash(const struct hash_test *tests, int testLen) ok(result, "Expected creation of a hash.\n"); result = CryptHashData(hHash, data, dataLen, 0); + ok(result, "Expected data to be added to hash.\n"); + + dataLen = sizeof(DWORD); + result = CryptGetHashParam(hHash, HP_HASHSIZE, (BYTE *)&hashLen, &dataLen, 0); if (!result) { skip("skipping hash tests\n"); return; } - ok(result, "Expected data to be added to hash.\n"); - - dataLen = sizeof(DWORD); - result = CryptGetHashParam(hHash, HP_HASHSIZE, (BYTE *)&hashLen, &dataLen, 0); ok(result && (hashLen == tests[i].hashLen), "Expected %d hash len, got %d.Error: %x\n", tests[i].hashLen, hashLen, GetLastError()); @@ -608,15 +608,15 @@ static void test_data_encryption(const struct encrypt_test *tests, int testLen) ok(result, "Expected creation of a MD5 hash for key derivation.\n"); result = CryptHashData(hHash, (BYTE *)dataToHash, sizeof(dataToHash), 0); + ok(result, "Expected data to be added to hash for key derivation.\n"); + + /* Derive key */ + result = CryptDeriveKey(hProv, tests[i].algid, hHash, tests[i].keyLength, &pKey); if (!result) { skip("skipping encryption tests\n"); return; } - ok(result, "Expected data to be added to hash for key derivation.\n"); - - /* Derive key */ - result = CryptDeriveKey(hProv, tests[i].algid, hHash, tests[i].keyLength, &pKey); ok(result, "Expected a derived key.\n"); result = CryptDestroyHash(hHash); @@ -698,15 +698,15 @@ static void test_cipher_modes(const struct ciphermode_test *tests, int testLen) ok(result, "Expected creation of a MD5 hash for key derivation.\n"); result = CryptHashData(hHash, (BYTE *)dataToHash, sizeof(dataToHash), 0); + ok(result, "Expected data to be added to hash for key derivation.\n"); + + /* Derive a CALG_RC2 key, but could be any other encryption cipher */ + result = CryptDeriveKey(hProv, CALG_RC2, hHash, 40 << 16, &pKey); if (!result) { skip("skipping ciper modes tests\n"); return; } - ok(result, "Expected data to be added to hash for key derivation.\n"); - - /* Derive a CALG_RC2 key, but could be any other encryption cipher */ - result = CryptDeriveKey(hProv, CALG_RC2, hHash, 40 << 16, &pKey); ok(result, "Expected a derived key.\n"); result = CryptDestroyHash(hHash);

1 0

Hans Leidekker : dssenh: Implement CPCreateHash and CPDestroyHash.
by Alexandre Julliard Oct. 9, 2020

Oct. 9, 2020

Module: wine Branch: master Commit: e7a79ce4266751a44234da1f657015eae17106b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7a79ce4266751a44234da1f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Oct 9 12:45:57 2020 +0200 dssenh: Implement CPCreateHash and CPDestroyHash. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dssenh/main.c | 90 ++++++++++++++++++++++++++++++++++++++++++++-- dlls/dssenh/tests/dssenh.c | 18 +++++----- 2 files changed, 97 insertions(+), 11 deletions(-) diff --git a/dlls/dssenh/main.c b/dlls/dssenh/main.c index 32c31a48a8..66f3456d78 100644 --- a/dlls/dssenh/main.c +++ b/dlls/dssenh/main.c @@ -54,6 +54,17 @@ struct container char name[MAX_PATH]; }; +#define MAGIC_HASH (('H' << 24) | ('A' << 16) | ('S' << 8) | 'H') +struct hash +{ + DWORD magic; + BCRYPT_ALG_HANDLE alg_handle; + BCRYPT_HASH_HANDLE handle; + DWORD len; + UCHAR value[64]; + BOOL finished; +}; + static const char dss_path_fmt[] = "Software\\Wine\\Crypto\\DSS\\%s"; static BOOL create_container_regkey( struct container *container, REGSAM sam, HKEY *hkey ) @@ -320,14 +331,89 @@ BOOL WINAPI CPExportKey( HCRYPTPROV hprov, HCRYPTKEY hkey, HCRYPTKEY hexpkey, DW return FALSE; } +static struct hash *create_hash( ALG_ID algid ) +{ + struct hash *ret; + const WCHAR *alg; + DWORD len; + + switch (algid) + { + case CALG_MD5: + alg = BCRYPT_MD5_ALGORITHM; + len = 16; + break; + + case CALG_SHA1: + alg = BCRYPT_SHA1_ALGORITHM; + len = 20; + break; + + default: + FIXME( "unhandled algorithm %u\n", algid ); + return 0; + } + + if (!(ret = heap_alloc_zero( sizeof(*ret) ))) return 0; + + ret->magic = MAGIC_HASH; + ret->len = len; + if (BCryptOpenAlgorithmProvider( &ret->alg_handle, alg, MS_PRIMITIVE_PROVIDER, 0 )) + { + heap_free( ret ); + return 0; + } + if (BCryptCreateHash( ret->alg_handle, &ret->handle, NULL, 0, NULL, 0, 0 )) + { + BCryptCloseAlgorithmProvider( ret->alg_handle, 0 ); + heap_free( ret ); + return 0; + } + return ret; +} + BOOL WINAPI CPCreateHash( HCRYPTPROV hprov, ALG_ID algid, HCRYPTKEY hkey, DWORD flags, HCRYPTHASH *ret_hash ) { - return FALSE; + struct hash *hash; + + TRACE( "%p, %08x, %p, %08x, %p\n", (void *)hprov, algid, (void *)hkey, flags, ret_hash ); + + switch (algid) + { + case CALG_MD5: + case CALG_SHA1: + break; + + default: + FIXME( "algorithm %u not supported\n", algid ); + SetLastError( NTE_BAD_ALGID ); + return FALSE; + } + + if (!(hash = create_hash( algid ))) return FALSE; + + *ret_hash = (HCRYPTHASH)hash; + return TRUE; } BOOL WINAPI CPDestroyHash( HCRYPTPROV hprov, HCRYPTHASH hhash ) { - return FALSE; + struct hash *hash = (struct hash *)hhash; + + TRACE( "%p, %p\n", (void *)hprov, (void *)hhash); + + if (hash->magic != MAGIC_HASH) + { + SetLastError( NTE_BAD_HASH ); + return FALSE; + } + + BCryptDestroyHash( hash->handle ); + BCryptCloseAlgorithmProvider( hash->alg_handle, 0 ); + + hash->magic = 0; + heap_free( hash ); + return TRUE; } BOOL WINAPI CPHashData( HCRYPTPROV hprov, HCRYPTHASH hhash, const BYTE *data, DWORD len, DWORD flags ) diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c index d549b985d6..f06cdd1433 100644 --- a/dlls/dssenh/tests/dssenh.c +++ b/dlls/dssenh/tests/dssenh.c @@ -446,14 +446,14 @@ static void test_hash(const struct hash_test *tests, int testLen) /* test algid hash */ result = CryptCreateHash(hProv, tests[i].algid, 0, 0, &hHash); + ok(result, "Expected creation of a hash.\n"); + + result = CryptHashData(hHash, data, dataLen, 0); if (!result) { skip("skipping hash tests\n"); return; } - ok(result, "Expected creation of a hash.\n"); - - result = CryptHashData(hHash, data, dataLen, 0); ok(result, "Expected data to be added to hash.\n"); dataLen = sizeof(DWORD); @@ -605,14 +605,14 @@ static void test_data_encryption(const struct encrypt_test *tests, int testLen) SetLastError(0xdeadbeef); result = CryptCreateHash(hProv, CALG_MD5, 0, 0, &hHash); + ok(result, "Expected creation of a MD5 hash for key derivation.\n"); + + result = CryptHashData(hHash, (BYTE *)dataToHash, sizeof(dataToHash), 0); if (!result) { skip("skipping encryption tests\n"); return; } - ok(result, "Expected creation of a MD5 hash for key derivation.\n"); - - result = CryptHashData(hHash, (BYTE *)dataToHash, sizeof(dataToHash), 0); ok(result, "Expected data to be added to hash for key derivation.\n"); /* Derive key */ @@ -695,14 +695,14 @@ static void test_cipher_modes(const struct ciphermode_test *tests, int testLen) SetLastError(0xdeadbeef); result = CryptCreateHash(hProv, CALG_MD5, 0, 0, &hHash); + ok(result, "Expected creation of a MD5 hash for key derivation.\n"); + + result = CryptHashData(hHash, (BYTE *)dataToHash, sizeof(dataToHash), 0); if (!result) { skip("skipping ciper modes tests\n"); return; } - ok(result, "Expected creation of a MD5 hash for key derivation.\n"); - - result = CryptHashData(hHash, (BYTE *)dataToHash, sizeof(dataToHash), 0); ok(result, "Expected data to be added to hash for key derivation.\n"); /* Derive a CALG_RC2 key, but could be any other encryption cipher */

1 0

Hans Leidekker : dssenh: Implement CPAcquireContext and CPReleaseContext.
by Alexandre Julliard Oct. 9, 2020

Oct. 9, 2020

Module: wine Branch: master Commit: 0b8a12f39a4f0302bf0e8c670bdfd52d3b618c89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b8a12f39a4f0302bf0e8c67… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Oct 9 12:45:56 2020 +0200 dssenh: Implement CPAcquireContext and CPReleaseContext. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dssenh/Makefile.in | 1 + dlls/dssenh/main.c | 256 ++++++++++++++++++++++++++++++++++++++++++++- dlls/dssenh/tests/dssenh.c | 42 ++++++++ 3 files changed, 297 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0b8a12f39a4f0302bf0e…

1 0

Louis Lenders : kernelbase: Return S_OK in WerSetFlags.
by Alexandre Julliard Oct. 9, 2020

Oct. 9, 2020

Module: wine Branch: master Commit: 3d2add846cc69f2b218352d6808a58998540d85f URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d2add846cc69f2b218352d6… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Fri Oct 9 10:20:02 2020 +0200 kernelbase: Return S_OK in WerSetFlags. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49966 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/debug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernelbase/debug.c b/dlls/kernelbase/debug.c index 6acdf0f1ea..0382ea9f95 100644 --- a/dlls/kernelbase/debug.c +++ b/dlls/kernelbase/debug.c @@ -819,7 +819,7 @@ HRESULT WINAPI /* DECLSPEC_HOTPATCH */ WerRegisterRuntimeExceptionModule( const HRESULT WINAPI /* DECLSPEC_HOTPATCH */ WerSetFlags( DWORD flags ) { FIXME("(%d) stub\n", flags); - return E_NOTIMPL; + return S_OK; }

1 0

Michael Stefaniuc : credui: Use wide-char string literals.
by Alexandre Julliard Oct. 9, 2020

Oct. 9, 2020

Module: wine Branch: master Commit: 840afcbb4c53f44a3e5b746ae68e30aa8e82fd00 URL: https://source.winehq.org/git/wine.git/?a=commit;h=840afcbb4c53f44a3e5b746a… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Oct 8 23:27:59 2020 +0200 credui: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(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 93ccdc20de..f08d1406f9 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 13fbd41c07..f2b71d603c 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) {

1 0

Alistair Leslie-Hughes : msado15: Implement _Connection get/put CursorLocation.
by Alexandre Julliard Oct. 9, 2020

Oct. 9, 2020

Module: wine Branch: master Commit: 4a987b30e7b5b3f0934c86ddd4790762c2351f37 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a987b30e7b5b3f0934c86dd… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Oct 9 18:57:14 2020 +1100 msado15: Implement _Connection get/put CursorLocation. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/connection.c | 18 ++++++++++++++---- dlls/msado15/tests/msado15.c | 17 +++++++++++++++++ 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index 357834a95f..2773850236 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -55,6 +55,7 @@ struct connection WCHAR *datasource; WCHAR *provider; ConnectModeEnum mode; + CursorLocationEnum location; struct connection_point cp_connev; }; @@ -325,14 +326,22 @@ static HRESULT WINAPI connection_put_Attributes( _Connection *iface, LONG attr ) static HRESULT WINAPI connection_get_CursorLocation( _Connection *iface, CursorLocationEnum *cursor_loc ) { - FIXME( "%p, %p\n", iface, cursor_loc ); - return E_NOTIMPL; + struct connection *connection = impl_from_Connection( iface ); + + TRACE( "%p, %p\n", iface, cursor_loc ); + + *cursor_loc = connection->location; + return S_OK; } static HRESULT WINAPI connection_put_CursorLocation( _Connection *iface, CursorLocationEnum cursor_loc ) { - FIXME( "%p, %u\n", iface, cursor_loc ); - return E_NOTIMPL; + struct connection *connection = impl_from_Connection( iface ); + + TRACE( "%p, %u\n", iface, cursor_loc ); + + connection->location = cursor_loc; + return S_OK; } static HRESULT WINAPI connection_get_Mode( _Connection *iface, ConnectModeEnum *mode ) @@ -674,6 +683,7 @@ HRESULT Connection_create( void **obj ) connection->datasource = NULL; connection->provider = SysAllocString(L"MSDASQL"); connection->mode = adModeUnknown; + connection->location = adUseServer; connection->cp_connev.conn = connection; connection->cp_connev.riid = &DIID_ConnectionEvents; diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 8e8553c3b8..efcee58c56 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -676,6 +676,7 @@ static void test_Connection(void) LONG state, timeout; BSTR str, str2, str3; ConnectModeEnum mode; + CursorLocationEnum location; hr = CoCreateInstance(&CLSID_Connection, NULL, CLSCTX_INPROC_SERVER, &IID__Connection, (void**)&connection); ok( hr == S_OK, "got %08x\n", hr ); @@ -719,6 +720,22 @@ if (0) /* Crashes on windows */ ok(hr == S_OK, "Failed to get state, hr 0x%08x\n", hr); ok(timeout == 300, "Unexpected timeout value %d\n", timeout); + location = 0; + hr = _Connection_get_CursorLocation(connection, &location); + ok(hr == S_OK, "Failed, hr 0x%08x\n", hr); + ok(location == adUseServer, "Unexpected location value %d\n", location); + + hr = _Connection_put_CursorLocation(connection, adUseClient); + ok(hr == S_OK, "Failed, hr 0x%08x\n", hr); + + location = 0; + hr = _Connection_get_CursorLocation(connection, &location); + ok(hr == S_OK, "Failed, hr 0x%08x\n", hr); + ok(location == adUseClient, "Unexpected location value %d\n", location); + + hr = _Connection_put_CursorLocation(connection, adUseServer); + ok(hr == S_OK, "Failed, hr 0x%08x\n", hr); + mode = 0xdeadbeef; hr = _Connection_get_Mode(connection, &mode); ok(hr == S_OK, "Failed to get state, hr 0x%08x\n", hr);

1 0

Nikolay Sivov : comctl32/tests: Fix loop bounds.
by Alexandre Julliard Oct. 9, 2020

Oct. 9, 2020

Module: wine Branch: master Commit: c11fca37de27b6f7afc3487d99b69dd8ce422493 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c11fca37de27b6f7afc3487d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 9 13:35:18 2020 +0300 comctl32/tests: Fix loop bounds. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/ipaddress.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/ipaddress.c b/dlls/comctl32/tests/ipaddress.c index 2df25a5a65..5c4db5adc8 100644 --- a/dlls/comctl32/tests/ipaddress.c +++ b/dlls/comctl32/tests/ipaddress.c @@ -98,7 +98,7 @@ static void test_IPM_SETFOCUS(void) EnumChildWindows(hwnd, test_child_enum_proc, (LPARAM)&child_enum); ok(child_enum.count == 4, "Unexpected child count %u.\n", child_enum.count); - for (i = 0; i < 3; ++i) + for (i = 0; i < 4; ++i) SendMessageA(child_enum.fields[i], EM_SETSEL, -1, 0); SendMessageA(child_enum.fields[0], EM_GETSEL, (WPARAM)&from, (LPARAM)&to); @@ -130,7 +130,7 @@ static void test_WM_SETFOCUS(void) SetFocus(child_enum.fields[3]); - for (i = 0; i < 3; ++i) + for (i = 0; i < 4; ++i) SendMessageA(child_enum.fields[i], EM_SETSEL, -1, 0); SendMessageA(child_enum.fields[0], EM_GETSEL, (WPARAM)&from, (LPARAM)&to);

1 0

Nikolay Sivov : mf/evr: Implement GetMediaTypeCount().
by Alexandre Julliard Oct. 9, 2020

Oct. 9, 2020

Module: wine Branch: master Commit: 6408aa3ab74d4740f276c0b8cc444dd6a9e6842e URL: https://source.winehq.org/git/wine.git/?a=commit;h=6408aa3ab74d4740f276c0b8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 9 13:54:36 2020 +0300 mf/evr: Implement GetMediaTypeCount(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 9 +++++++-- dlls/mf/tests/mf.c | 9 +++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index ac3f17fa58..7567b1a709 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -372,9 +372,14 @@ static HRESULT WINAPI video_stream_typehandler_IsMediaTypeSupported(IMFMediaType static HRESULT WINAPI video_stream_typehandler_GetMediaTypeCount(IMFMediaTypeHandler *iface, DWORD *count) { - FIXME("%p, %p.\n", iface, count); + TRACE("%p, %p.\n", iface, count); - return E_NOTIMPL; + if (!count) + return E_POINTER; + + *count = 0; + + return S_OK; } static HRESULT WINAPI video_stream_typehandler_GetMediaTypeByIndex(IMFMediaTypeHandler *iface, DWORD index, diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index a63c353a4b..db442453d6 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -3296,6 +3296,15 @@ static void test_evr(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(IsEqualGUID(&guid, &MFMediaType_Video), "Unexpected type %s.\n", wine_dbgstr_guid(&guid)); + /* Supported types are not advertised. */ + hr = IMFMediaTypeHandler_GetMediaTypeCount(type_handler, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + count = 1; + hr = IMFMediaTypeHandler_GetMediaTypeCount(type_handler, &count); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!count, "Unexpected count %u.\n", count); + IMFMediaTypeHandler_Release(type_handler); /* Stream uses an allocator. */

1 0

Alistair Leslie-Hughes : msado15: Implement _Command get/putref ActiveConnection.
by Alexandre Julliard Oct. 9, 2020

Oct. 9, 2020

Module: wine Branch: master Commit: aff59389658461630206c3683d84bd754555bc30 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aff59389658461630206c368… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Oct 9 18:57:15 2020 +1100 msado15: Implement _Command get/putref ActiveConnection. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/command.c | 20 ++++++++++++++++---- dlls/msado15/tests/msado15.c | 9 +++++++++ 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/msado15/command.c b/dlls/msado15/command.c index eb7b3a035e..d19108a1a2 100644 --- a/dlls/msado15/command.c +++ b/dlls/msado15/command.c @@ -35,6 +35,7 @@ struct command LONG ref; CommandTypeEnum type; BSTR text; + _Connection *connection; }; static inline struct command *impl_from_Command( _Command *iface ) @@ -80,6 +81,7 @@ static ULONG WINAPI command_Release( _Command *iface ) if (!ref) { TRACE( "destroying %p\n", command ); + if (command->connection) _Connection_Release(command->connection); heap_free( command->text ); heap_free( command ); } @@ -121,14 +123,23 @@ static HRESULT WINAPI command_get_Properties( _Command *iface, Properties **prop static HRESULT WINAPI command_get_ActiveConnection( _Command *iface, _Connection **connection ) { - FIXME( "%p, %p\n", iface, connection ); - return E_NOTIMPL; + struct command *command = impl_from_Command( iface ); + TRACE( "%p, %p\n", iface, connection ); + + *connection = command->connection; + if (command->connection) _Connection_AddRef(command->connection); + return S_OK; } static HRESULT WINAPI command_putref_ActiveConnection( _Command *iface, _Connection *connection ) { - FIXME( "%p, %p\n", iface, connection ); - return E_NOTIMPL; + struct command *command = impl_from_Command( iface ); + TRACE( "%p, %p\n", iface, connection ); + + if (command->connection) _Connection_Release(command->connection); + command->connection = connection; + if (command->connection) _Connection_AddRef(command->connection); + return S_OK; } static HRESULT WINAPI command_put_ActiveConnection( _Command *iface, VARIANT connection ) @@ -343,6 +354,7 @@ HRESULT Command_create( void **obj ) command->Command_iface.lpVtbl = &command_vtbl; command->type = adCmdUnknown; command->text = NULL; + command->connection = NULL; command->ref = 1; *obj = &command->Command_iface; diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index efcee58c56..378c2eb918 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -850,6 +850,7 @@ static void test_Command(void) Command25 *command25; CommandTypeEnum cmd_type = adCmdUnspecified; BSTR cmd_text = (BSTR)"test"; + _Connection *connection; hr = CoCreateInstance( &CLSID_Command, NULL, CLSCTX_INPROC_SERVER, &IID__Command, (void **)&command ); ok( hr == S_OK, "got %08x\n", hr ); @@ -903,6 +904,14 @@ static void test_Command(void) ok( hr == S_OK, "got %08x\n", hr ); ok( !wcscmp( L"test", cmd_text ), "got %p\n", wine_dbgstr_w( cmd_text ) ); + connection = (_Connection*)0xdeadbeef; + hr = _Command_get_ActiveConnection( command, &connection ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( connection == NULL, "got %p\n", connection ); + + hr = _Command_putref_ActiveConnection( command, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + _Command_Release( command ); }

1 0

Zebediah Figura : qedit/tests: Add some basic tests for null renderer connection and streaming.
by Alexandre Julliard Oct. 8, 2020

Oct. 8, 2020

Module: wine Branch: master Commit: 944f91b1475a701c75e2fc0dd43112a4192a7e80 URL: https://source.winehq.org/git/wine.git/?a=commit;h=944f91b1475a701c75e2fc0d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Oct 8 11:52:28 2020 -0500 qedit/tests: Add some basic tests for null renderer connection and streaming. Adapted from the video renderer tests. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/tests/nullrenderer.c | 464 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 464 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=944f91b1475a701c75e2…

1 0

Hans Leidekker : dssenh: Register the DSS provider.
by Alexandre Julliard Oct. 8, 2020

Oct. 8, 2020

Module: wine Branch: master Commit: 3ae2dd164c2e8134af573e4dc9643317d30c758e URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ae2dd164c2e8134af573e4d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 8 18:02:44 2020 +0200 dssenh: Register the DSS provider. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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(-) diff --git a/dlls/dssenh/Makefile.in b/dlls/dssenh/Makefile.in index 4f05beee51..8015768f99 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 0000000000..0e9bad7c17 --- /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 80551cf578..5aa885c8b8 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 0000000000..ac5ba6258e --- /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 7a16acc679..c88fcd1466 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;

1 0