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