February 2020 - Wine-Commits

Nikolay Sivov : xmllite/tests: Get rid of strcmp_wa().
by Alexandre Julliard Feb. 7, 2020

Feb. 7, 2020

Module: wine Branch: master Commit: 5066a678351c6930656ef586046130d8efe64ba1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5066a678351c6930656ef586… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 7 17:52:19 2020 +0300 xmllite/tests: Get rid of strcmp_wa(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/reader.c | 395 +++++++++++++++++++++----------------------- 1 file changed, 186 insertions(+), 209 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5066a678351c6930656e…

1 0

Zhiyi Zhang : d3d8/tests: Add multiple adapters tests.
by Alexandre Julliard Feb. 7, 2020

Feb. 7, 2020

Module: wine Branch: master Commit: c70222bf39ca3087facfa8a51b4678f93dabb677 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c70222bf39ca3087facfa8a5… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Feb 7 16:20:00 2020 +0330 d3d8/tests: Add multiple adapters tests. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 80bf62e361..19351da091 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -9760,6 +9760,48 @@ static void test_get_display_mode(void) DestroyWindow(window); } +static void test_multi_adapter(void) +{ + unsigned int i, adapter_count, expected_adapter_count = 0; + DISPLAY_DEVICEA display_device; + MONITORINFO monitor_info; + HMONITOR monitor; + IDirect3D8 *d3d; + + d3d = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + + display_device.cb = sizeof(display_device); + for (i = 0; EnumDisplayDevicesA(NULL, i, &display_device, 0); ++i) + { + if (display_device.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP) + ++expected_adapter_count; + } + + adapter_count = IDirect3D8_GetAdapterCount(d3d); + todo_wine_if(expected_adapter_count > 1) + ok(adapter_count == expected_adapter_count, "Got unexpected adapter count %u, expected %u.\n", + adapter_count, expected_adapter_count); + + for (i = 0; i < adapter_count; ++i) + { + monitor = IDirect3D8_GetAdapterMonitor(d3d, i); + ok(!!monitor, "Failed to get monitor for adapter %u.\n", i); + + monitor_info.cbSize = sizeof(monitor_info); + ok(GetMonitorInfoA(monitor, &monitor_info), + "Failed to get monitor info for adapter %u, error %#x.\n", i, GetLastError()); + + if (!i) + ok(monitor_info.dwFlags == MONITORINFOF_PRIMARY, + "Got unexpected monitor flags %#x for adapter %u.\n", monitor_info.dwFlags, i); + else + ok(!monitor_info.dwFlags, "Got unexpected monitor flags %#x for adapter %u.\n", monitor_info.dwFlags, i); + } + + IDirect3D8_Release(d3d); +} + START_TEST(device) { HMODULE d3d8_handle = GetModuleHandleA("d3d8.dll"); @@ -9876,6 +9918,7 @@ START_TEST(device) test_multiply_transform(); test_draw_primitive(); test_get_display_mode(); + test_multi_adapter(); UnregisterClassA("d3d8_test_wc", GetModuleHandleA(NULL)); }

1 0

Zhiyi Zhang : dxgi/tests: Add multiple adapters tests.
by Alexandre Julliard Feb. 7, 2020

Feb. 7, 2020

Module: wine Branch: master Commit: 9f676b71e9b65f572e4584eac9f2b979a385ab35 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f676b71e9b65f572e4584ea… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Feb 7 16:20:02 2020 +0330 dxgi/tests: Add multiple adapters tests. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/dxgi.c | 123 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 123 insertions(+) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index aaef811364..f8e63ea25e 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -4899,6 +4899,128 @@ static void flush_events(void) } } +struct adapter_info +{ + const WCHAR *name; + HMONITOR monitor; +}; + +static BOOL CALLBACK enum_monitor_proc(HMONITOR monitor, HDC dc, RECT *rect, LPARAM lparam) +{ + struct adapter_info *adapter_info = (struct adapter_info *)lparam; + MONITORINFOEXW monitor_info; + + monitor_info.cbSize = sizeof(monitor_info); + if (GetMonitorInfoW(monitor, (MONITORINFO *)&monitor_info) + && !lstrcmpiW(adapter_info->name, monitor_info.szDevice)) + { + adapter_info->monitor = monitor; + return FALSE; + } + + return TRUE; +} + +static HMONITOR get_monitor(const WCHAR *adapter_name) +{ + struct adapter_info info = {adapter_name, NULL}; + + EnumDisplayMonitors(NULL, NULL, enum_monitor_proc, (LPARAM)&info); + return info.monitor; +} + +static void test_multi_adapter(void) +{ + unsigned int output_count = 0, expected_output_count = 0; + unsigned int adapter_index, output_index, device_index; + DISPLAY_DEVICEW display_device; + DXGI_OUTPUT_DESC output_desc; + MONITORINFO monitor_info; + IDXGIFactory *factory; + IDXGIAdapter *adapter; + IDXGIOutput *output; + HMONITOR monitor; + BOOL found; + HRESULT hr; + + if (FAILED(hr = CreateDXGIFactory(&IID_IDXGIFactory, (void **)&factory))) + { + skip("Failed to create IDXGIFactory, hr %#x.\n", hr); + return; + } + + hr = IDXGIFactory_EnumAdapters(factory, 0, &adapter); + if (hr == DXGI_ERROR_NOT_FOUND) + { + skip("Could not enumerate adapters.\n"); + IDXGIFactory_Release(factory); + return; + } + ok(hr == S_OK, "Failed to enumerate adapter, hr %#x.\n", hr); + + for (adapter_index = 0; SUCCEEDED(IDXGIFactory_EnumAdapters(factory, adapter_index, &adapter)); ++adapter_index) + { + for (output_index = 0; SUCCEEDED(IDXGIAdapter_EnumOutputs(adapter, output_index, &output)); ++output_index) + { + hr = IDXGIOutput_GetDesc(output, &output_desc); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + found = FALSE; + display_device.cb = sizeof(display_device); + for (device_index = 0; EnumDisplayDevicesW(NULL, device_index, &display_device, 0); ++device_index) + { + if (!lstrcmpiW(display_device.DeviceName, output_desc.DeviceName)) + { + found = TRUE; + break; + } + } + ok(found, "Failed to find device %s for adapter %u, output %u.\n", + wine_dbgstr_w(output_desc.DeviceName), adapter_index, output_index); + + ok(display_device.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP, + "Got unexpected state flags %#x for adapter %u, output %u.\n", + display_device.StateFlags, adapter_index, output_index); + if (!adapter_index && !output_index) + ok(display_device.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE, + "Got unexpected state flags %#x for adapter %u, output %u.\n", + display_device.StateFlags, adapter_index, output_index); + else + ok(!(display_device.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE), + "Got unexpected state flags %#x for adapter %u, output %u.\n", + display_device.StateFlags, adapter_index, output_index); + + /* Should have the same monitor handle. */ + monitor = get_monitor(display_device.DeviceName); + ok(!!monitor, "Failed to find monitor %s.\n", wine_dbgstr_w(display_device.DeviceName)); + ok(monitor == output_desc.Monitor, "Got unexpected monitor %p, expected %p.\n", + monitor, output_desc.Monitor); + + /* Should have the same monitor rectangle. */ + monitor_info.cbSize = sizeof(monitor_info); + ok(GetMonitorInfoA(monitor, &monitor_info), + "Failed to get monitor info for adapter %u, output %u, error %#x.\n", + adapter_index, output_index, GetLastError()); + ok(EqualRect(&monitor_info.rcMonitor, &output_desc.DesktopCoordinates), + "Got unexpected output rect %s, expected %s for adapter %u, output %u.\n", + wine_dbgstr_rect(&monitor_info.rcMonitor), wine_dbgstr_rect(&output_desc.DesktopCoordinates), + adapter_index, output_index); + + IDXGIOutput_Release(output); + ++output_count; + } + + IDXGIAdapter_Release(adapter); + } + + IDXGIFactory_Release(factory); + + expected_output_count = GetSystemMetrics(SM_CMONITORS); + todo_wine_if(expected_output_count > 1) + ok(output_count == expected_output_count, "Expect output count %d, got %d\n", + expected_output_count, output_count); +} + struct message { unsigned int message; @@ -5824,6 +5946,7 @@ START_TEST(dxgi) queue_test(test_maximum_frame_latency); queue_test(test_output_desc); queue_test(test_object_wrapping); + queue_test(test_multi_adapter); run_queued_tests();

1 0

Henri Verbeet : wined3d: Properly validate the stage index in wined3d_stateblock_set_texture_stage_state() (Coverity).
by Alexandre Julliard Feb. 7, 2020

Feb. 7, 2020

Module: wine Branch: master Commit: 125ba807e0d56a2da15875cb485067216505271a URL: https://source.winehq.org/git/wine.git/?a=commit;h=125ba807e0d56a2da15875cb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 7 16:20:03 2020 +0330 wined3d: Properly validate the stage index in wined3d_stateblock_set_texture_stage_state() (Coverity). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/stateblock.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index f6d36f8c25..499d23fbbd 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1459,10 +1459,10 @@ void CDECL wined3d_stateblock_set_texture_stage_state(struct wined3d_stateblock return; } - if (stage > WINED3D_MAX_TEXTURES) + if (stage >= WINED3D_MAX_TEXTURES) { WARN("Attempting to set stage %u which is higher than the max stage %u, ignoring.\n", - stage, WINED3D_MAX_TEXTURES); + stage, WINED3D_MAX_TEXTURES - 1); return; }

1 0

Jacek Caban : quartz: Remove unused functions.
by Alexandre Julliard Feb. 7, 2020

Feb. 7, 2020

Module: wine Branch: master Commit: c4d77976ac9a5de000ff23874e7b6c8a4be47f42 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4d77976ac9a5de000ff2387… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 7 15:06:51 2020 +0100 quartz: Remove unused functions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/dsoundrender.c | 5 ----- dlls/quartz/videorenderer.c | 5 ----- 2 files changed, 10 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 4e991ff561..e65363dea4 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -64,11 +64,6 @@ static inline DSoundRenderImpl *impl_from_strmbase_renderer(struct strmbase_rend return CONTAINING_RECORD(iface, DSoundRenderImpl, renderer); } -static inline DSoundRenderImpl *impl_from_IBaseFilter(IBaseFilter *iface) -{ - return CONTAINING_RECORD(iface, DSoundRenderImpl, renderer.filter.IBaseFilter_iface); -} - static inline DSoundRenderImpl *impl_from_IBasicAudio(IBasicAudio *iface) { return CONTAINING_RECORD(iface, DSoundRenderImpl, IBasicAudio_iface); diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index e634a92fbe..9b671ff370 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -68,11 +68,6 @@ static inline VideoRendererImpl *impl_from_strmbase_renderer(struct strmbase_ren return CONTAINING_RECORD(iface, VideoRendererImpl, renderer); } -static inline VideoRendererImpl *impl_from_IBaseFilter(IBaseFilter *iface) -{ - return CONTAINING_RECORD(iface, VideoRendererImpl, renderer.filter.IBaseFilter_iface); -} - static inline VideoRendererImpl *impl_from_IVideoWindow(IVideoWindow *iface) { return CONTAINING_RECORD(iface, VideoRendererImpl, baseControlWindow.IVideoWindow_iface);

1 0

Zebediah Figura : d3d9: Stop setting the device state in d3d9_device_SetVertexDeclaration().
by Alexandre Julliard Feb. 7, 2020

Feb. 7, 2020

Module: wine Branch: master Commit: f4db2de5eb76030851c5c21e56d778ecbd2409d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4db2de5eb76030851c5c21e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 6 19:33:27 2020 -0600 d3d9: Stop setting the device state in d3d9_device_SetVertexDeclaration(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 789f5a9c18..c59d83b11a 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3317,9 +3317,6 @@ static HRESULT WINAPI d3d9_device_SetVertexDeclaration(IDirect3DDevice9Ex *iface wined3d_mutex_lock(); wined3d_stateblock_set_vertex_declaration(device->update_state, decl_impl ? decl_impl->wined3d_declaration : NULL); - if (!device->recording) - wined3d_device_set_vertex_declaration(device->wined3d_device, - decl_impl ? decl_impl->wined3d_declaration : NULL); device->has_vertex_declaration = !!decl_impl; wined3d_mutex_unlock();

1 0

Zebediah Figura : qedit/samplegrabber: Use strmbase media type helpers.
by Alexandre Julliard Feb. 7, 2020

Feb. 7, 2020

Module: wine Branch: master Commit: e09a47c4b732995f8fcba08a7092d67508fd1c1c URL: https://source.winehq.org/git/wine.git/?a=commit;h=e09a47c4b732995f8fcba08a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 6 16:49:14 2020 -0600 qedit/samplegrabber: Use strmbase media type helpers. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/samplegrabber.c | 50 +++++++++++++++++++--------------------------- 1 file changed, 21 insertions(+), 29 deletions(-) diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c index 8f30ebe46e..f0fa70708a 100644 --- a/dlls/qedit/samplegrabber.c +++ b/dlls/qedit/samplegrabber.c @@ -84,7 +84,7 @@ static void SampleGrabber_cleanup(SG_Impl *This) IMemAllocator_Release(This->allocator); if (This->grabberIface) ISampleGrabberCB_Release(This->grabberIface); - CoTaskMemFree(This->filter_mt.pbFormat); + FreeMediaType(&This->filter_mt); CoTaskMemFree(This->bufferData); if(This->seekthru_unk) IUnknown_Release(This->seekthru_unk); @@ -225,44 +225,36 @@ SampleGrabber_ISampleGrabber_SetOneShot(ISampleGrabber *iface, BOOL oneShot) } /* ISampleGrabber */ -static HRESULT WINAPI -SampleGrabber_ISampleGrabber_SetMediaType(ISampleGrabber *iface, const AM_MEDIA_TYPE *type) +static HRESULT WINAPI SampleGrabber_ISampleGrabber_SetMediaType(ISampleGrabber *iface, const AM_MEDIA_TYPE *mt) { - SG_Impl *This = impl_from_ISampleGrabber(iface); - TRACE("(%p)->(%p)\n", This, type); - if (!type) + SG_Impl *filter = impl_from_ISampleGrabber(iface); + + TRACE("filter %p, mt %p.\n", filter, mt); + strmbase_dump_media_type(mt); + + if (!mt) return E_POINTER; - TRACE("Media type: %s/%s ssize: %u format: %s (%u bytes)\n", - debugstr_guid(&type->majortype), debugstr_guid(&type->subtype), - type->lSampleSize, - debugstr_guid(&type->formattype), type->cbFormat); - CoTaskMemFree(This->filter_mt.pbFormat); - This->filter_mt = *type; - This->filter_mt.pUnk = NULL; - if (type->cbFormat) { - This->filter_mt.pbFormat = CoTaskMemAlloc(type->cbFormat); - CopyMemory(This->filter_mt.pbFormat, type->pbFormat, type->cbFormat); - } - else - This->filter_mt.pbFormat = NULL; + + FreeMediaType(&filter->filter_mt); + CopyMediaType(&filter->filter_mt, mt); return S_OK; } /* ISampleGrabber */ static HRESULT WINAPI -SampleGrabber_ISampleGrabber_GetConnectedMediaType(ISampleGrabber *iface, AM_MEDIA_TYPE *type) +SampleGrabber_ISampleGrabber_GetConnectedMediaType(ISampleGrabber *iface, AM_MEDIA_TYPE *mt) { - SG_Impl *This = impl_from_ISampleGrabber(iface); - TRACE("(%p)->(%p)\n", This, type); - if (!type) + SG_Impl *filter = impl_from_ISampleGrabber(iface); + + TRACE("filter %p, mt %p.\n", filter, mt); + + if (!mt) return E_POINTER; - if (!This->sink.pin.peer) + + if (!filter->sink.pin.peer) return VFW_E_NOT_CONNECTED; - *type = This->filter_mt; - if (type->cbFormat) { - type->pbFormat = CoTaskMemAlloc(type->cbFormat); - CopyMemory(type->pbFormat, This->filter_mt.pbFormat, type->cbFormat); - } + + CopyMediaType(mt, &filter->filter_mt); return S_OK; }

1 0

Zebediah Figura : d3d9: Stop setting the device state in d3d9_device_SetScissorRect().
by Alexandre Julliard Feb. 7, 2020

Feb. 7, 2020

Module: wine Branch: master Commit: c9959adc4095118d70cc515f5c53876cb3488e79 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9959adc4095118d70cc515f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 6 19:33:25 2020 -0600 d3d9: Stop setting the device state in d3d9_device_SetScissorRect(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index cff3a5c898..3609dddb39 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2739,8 +2739,6 @@ static HRESULT WINAPI d3d9_device_SetScissorRect(IDirect3DDevice9Ex *iface, cons wined3d_mutex_lock(); wined3d_stateblock_set_scissor_rect(device->update_state, rect); - if (!device->recording) - wined3d_device_set_scissor_rects(device->wined3d_device, 1, rect); wined3d_mutex_unlock(); return D3D_OK;

1 0

Dmitry Timoshkov : ntdll: Split logic for MemoryBasicInformation into a separate function.
by Alexandre Julliard Feb. 7, 2020

Feb. 7, 2020

Module: wine Branch: master Commit: bbd73667d7c7cdec6d811ee911b57c0bebc3f03e URL: https://source.winehq.org/git/wine.git/?a=commit;h=bbd73667d7c7cdec6d811ee9… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jan 24 12:19:37 2020 -0800 ntdll: Split logic for MemoryBasicInformation into a separate function. Signed-off-by: Andrew Wesie <awesie(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/virtual.c | 65 ++++++++++++++++++++++++++++++---------------------- 1 file changed, 37 insertions(+), 28 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 5890344f7a..ad91cffd8f 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -3011,40 +3011,16 @@ static int get_free_mem_state_callback( void *start, size_t size, void *arg ) return 1; } -#define UNIMPLEMENTED_INFO_CLASS(c) \ - case c: \ - FIXME("(process=%p,addr=%p) Unimplemented information class: " #c "\n", process, addr); \ - return STATUS_INVALID_INFO_CLASS - -/*********************************************************************** - * NtQueryVirtualMemory (NTDLL.@) - * ZwQueryVirtualMemory (NTDLL.@) - */ -NTSTATUS WINAPI NtQueryVirtualMemory( HANDLE process, LPCVOID addr, - MEMORY_INFORMATION_CLASS info_class, PVOID buffer, - SIZE_T len, SIZE_T *res_len ) +/* get basic information about a memory block */ +static NTSTATUS get_basic_memory_info( HANDLE process, LPCVOID addr, + MEMORY_BASIC_INFORMATION *info, + SIZE_T len, SIZE_T *res_len ) { struct file_view *view; char *base, *alloc_base = 0, *alloc_end = working_set_limit; struct wine_rb_entry *ptr; - MEMORY_BASIC_INFORMATION *info = buffer; sigset_t sigset; - if (info_class != MemoryBasicInformation) - { - switch(info_class) - { - UNIMPLEMENTED_INFO_CLASS(MemoryWorkingSetList); - UNIMPLEMENTED_INFO_CLASS(MemorySectionName); - UNIMPLEMENTED_INFO_CLASS(MemoryBasicVlmInformation); - - default: - FIXME("(%p,%p,info_class=%d,%p,%ld,%p) Unknown information class\n", - process, addr, info_class, buffer, len, res_len); - return STATUS_INVALID_INFO_CLASS; - } - } - if (len < sizeof(MEMORY_BASIC_INFORMATION)) return STATUS_INFO_LENGTH_MISMATCH; @@ -3159,6 +3135,39 @@ NTSTATUS WINAPI NtQueryVirtualMemory( HANDLE process, LPCVOID addr, } +#define UNIMPLEMENTED_INFO_CLASS(c) \ + case c: \ + FIXME("(process=%p,addr=%p) Unimplemented information class: " #c "\n", process, addr); \ + return STATUS_INVALID_INFO_CLASS + +/*********************************************************************** + * NtQueryVirtualMemory (NTDLL.@) + * ZwQueryVirtualMemory (NTDLL.@) + */ +NTSTATUS WINAPI NtQueryVirtualMemory( HANDLE process, LPCVOID addr, + MEMORY_INFORMATION_CLASS info_class, + PVOID buffer, SIZE_T len, SIZE_T *res_len ) +{ + TRACE("(%p, %p, info_class=%d, %p, %ld, %p)\n", + process, addr, info_class, buffer, len, res_len); + + switch(info_class) + { + case MemoryBasicInformation: + return get_basic_memory_info( process, addr, buffer, len, res_len ); + + UNIMPLEMENTED_INFO_CLASS(MemoryWorkingSetList); + UNIMPLEMENTED_INFO_CLASS(MemorySectionName); + UNIMPLEMENTED_INFO_CLASS(MemoryBasicVlmInformation); + + default: + FIXME("(%p,%p,info_class=%d,%p,%ld,%p) Unknown information class\n", + process, addr, info_class, buffer, len, res_len); + return STATUS_INVALID_INFO_CLASS; + } +} + + /*********************************************************************** * NtLockVirtualMemory (NTDLL.@) * ZwLockVirtualMemory (NTDLL.@)

1 0

Andrew Wesie : ntdll: Add NtQueryVirtualMemory(MemoryWorkingSetExInformation).
by Alexandre Julliard Feb. 7, 2020

Feb. 7, 2020

Module: wine Branch: master Commit: 64d70b103d65198614973e38422aec210db92360 URL: https://source.winehq.org/git/wine.git/?a=commit;h=64d70b103d65198614973e38… Author: Andrew Wesie <awesie(a)gmail.com> Date: Fri Jan 24 12:19:38 2020 -0800 ntdll: Add NtQueryVirtualMemory(MemoryWorkingSetExInformation). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45667 Signed-off-by: Andrew Wesie <awesie(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/virtual.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++ include/winternl.h | 21 +++++++++++++++++- 2 files changed, 80 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index ad91cffd8f..6ad2d21e01 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -3134,6 +3134,63 @@ static NTSTATUS get_basic_memory_info( HANDLE process, LPCVOID addr, return STATUS_SUCCESS; } +static NTSTATUS get_working_set_ex( HANDLE process, LPCVOID addr, + MEMORY_WORKING_SET_EX_INFORMATION *info, + SIZE_T len, SIZE_T *res_len ) +{ + FILE *f; + MEMORY_WORKING_SET_EX_INFORMATION *p; + sigset_t sigset; + + if (process != NtCurrentProcess()) + { + FIXME( "(process=%p,addr=%p) Unimplemented information class: MemoryWorkingSetExInformation\n", process, addr ); + return STATUS_INVALID_INFO_CLASS; + } + + f = fopen( "/proc/self/pagemap", "rb" ); + if (!f) + { + static int once; + if (!once++) WARN( "unable to open /proc/self/pagemap\n" ); + } + + server_enter_uninterrupted_section( &csVirtual, &sigset ); + for (p = info; (UINT_PTR)(p + 1) <= (UINT_PTR)info + len; p++) + { + BYTE vprot; + UINT64 pagemap; + struct file_view *view; + + memset( &p->VirtualAttributes, 0, sizeof(p->VirtualAttributes) ); + + /* If we don't have pagemap information, default to invalid. */ + if (!f || fseek( f, ((UINT_PTR)p->VirtualAddress >> 12) * sizeof(pagemap), SEEK_SET ) == -1 || + fread( &pagemap, sizeof(pagemap), 1, f ) != 1) + { + pagemap = 0; + } + + if ((view = VIRTUAL_FindView( p->VirtualAddress, 0 )) && + get_committed_size( view, p->VirtualAddress, &vprot ) && + (vprot & VPROT_COMMITTED)) + { + p->VirtualAttributes.Valid = !(vprot & VPROT_GUARD) && (vprot & 0x0f) && (pagemap >> 63); + p->VirtualAttributes.Shared = !is_view_valloc( view ) && ((pagemap >> 61) & 1); + if (p->VirtualAttributes.Shared && p->VirtualAttributes.Valid) + p->VirtualAttributes.ShareCount = 1; /* FIXME */ + if (p->VirtualAttributes.Valid) + p->VirtualAttributes.Win32Protection = VIRTUAL_GetWin32Prot( vprot, view->protect ); + } + } + server_leave_uninterrupted_section( &csVirtual, &sigset ); + + if (f) + fclose( f ); + if (res_len) + *res_len = (UINT_PTR)p - (UINT_PTR)info; + return STATUS_SUCCESS; +} #define UNIMPLEMENTED_INFO_CLASS(c) \ case c: \ @@ -3156,6 +3213,9 @@ NTSTATUS WINAPI NtQueryVirtualMemory( HANDLE process, LPCVOID addr, case MemoryBasicInformation: return get_basic_memory_info( process, addr, buffer, len, res_len ); + case MemoryWorkingSetExInformation: + return get_working_set_ex( process, addr, buffer, len, res_len ); + UNIMPLEMENTED_INFO_CLASS(MemoryWorkingSetList); UNIMPLEMENTED_INFO_CLASS(MemorySectionName); UNIMPLEMENTED_INFO_CLASS(MemoryBasicVlmInformation); diff --git a/include/winternl.h b/include/winternl.h index e5aed5acb1..ea6707714d 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1051,7 +1051,8 @@ typedef enum _MEMORY_INFORMATION_CLASS { MemoryBasicInformation, MemoryWorkingSetList, MemorySectionName, - MemoryBasicVlmInformation + MemoryBasicVlmInformation, + MemoryWorkingSetExInformation } MEMORY_INFORMATION_CLASS; typedef struct _MEMORY_SECTION_NAME @@ -1059,6 +1060,24 @@ typedef struct _MEMORY_SECTION_NAME UNICODE_STRING SectionFileName; } MEMORY_SECTION_NAME, *PMEMORY_SECTION_NAME; +typedef union _MEMORY_WORKING_SET_EX_BLOCK { + ULONG_PTR Flags; + struct { + ULONG_PTR Valid : 1; + ULONG_PTR ShareCount : 3; + ULONG_PTR Win32Protection : 11; + ULONG_PTR Shared : 1; + ULONG_PTR Node : 6; + ULONG_PTR Locked : 1; + ULONG_PTR LargePage : 1; + } DUMMYSTRUCTNAME; +} MEMORY_WORKING_SET_EX_BLOCK, *PMEMORY_WORKING_SET_EX_BLOCK; + +typedef struct _MEMORY_WORKING_SET_EX_INFORMATION { + PVOID VirtualAddress; + MEMORY_WORKING_SET_EX_BLOCK VirtualAttributes; +} MEMORY_WORKING_SET_EX_INFORMATION, *PMEMORY_WORKING_SET_EX_INFORMATION; + typedef enum _MUTANT_INFORMATION_CLASS { MutantBasicInformation

1 0