July 2020 - Wine-Devel - list.winehq.org

[PATCH 1/7] mf/evr: Do not set user context for activator object.
by Nikolay Sivov July 9, 2020

July 9, 2020

Window handle is passed as an attribute. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/evr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index d20fb1a395d..b35af55353d 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -619,7 +619,7 @@ HRESULT WINAPI MFCreateVideoRendererActivate(HWND hwnd, IMFActivate **activate) if (!activate) return E_POINTER; - hr = create_activation_object(hwnd, &evr_activate_funcs, activate); + hr = create_activation_object(NULL, &evr_activate_funcs, activate); if (SUCCEEDED(hr)) IMFActivate_SetUINT64(*activate, &MF_ACTIVATE_VIDEO_WINDOW, (ULONG_PTR)hwnd); -- 2.27.0

1 6

[PATCH] winebuild: Use asm_name for __wine_syscall.
by Jacek Caban July 9, 2020

July 9, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- Fixes compilation with llvm-mingw. function_declaration adds leading underscore to the symbol name and lld can't find the symbol if it doesn't match. tools/winebuild/import.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[PATCH v2] d3dx9: Simplify math in D3DXSphereBoundProbe
by Alex Henrie July 9, 2020

July 9, 2020

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- v2: Calculating b isn't actually necessary at all. --- dlls/d3dx9_36/mesh.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 5e0bb98efc..381d19a2ee 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -2413,16 +2413,13 @@ BOOL WINAPI D3DXSphereBoundProbe(const D3DXVECTOR3 *pcenter, float radius, const D3DXVECTOR3 *prayposition, const D3DXVECTOR3 *praydirection) { D3DXVECTOR3 difference; - FLOAT a, b, c, d; + FLOAT a, c; a = D3DXVec3LengthSq(praydirection); if (!D3DXVec3Subtract(&difference, prayposition, pcenter)) return FALSE; - b = D3DXVec3Dot(&difference, praydirection); c = D3DXVec3LengthSq(&difference) - radius * radius; - d = b * b - a * c; - if ( ( d <= 0.0f ) || ( sqrt(d) <= b ) ) return FALSE; - return TRUE; + return ( a * c < 0 ); } /************************************************************************* -- 2.27.0

3 2

[PATCH v2 4/4] msxml3: Use site's base URI when loading an XML file.
by Dmitry Timoshkov July 9, 2020

July 9, 2020

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/msxml3/bsc.c | 17 ++++++++++++++--- dlls/msxml3/domdoc.c | 2 +- dlls/msxml3/msxml_private.h | 2 +- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/dlls/msxml3/bsc.c b/dlls/msxml3/bsc.c index 0b9e679bda..5cebe09333 100644 --- a/dlls/msxml3/bsc.c +++ b/dlls/msxml3/bsc.c @@ -242,9 +242,10 @@ static const struct IBindStatusCallbackVtbl bsc_vtbl = bsc_OnObjectAvailable }; -HRESULT create_uri(const WCHAR *url, IUri **uri) +HRESULT create_uri(IUri *base, const WCHAR *url, IUri **uri) { WCHAR fileUrl[INTERNET_MAX_URL_LENGTH]; + HRESULT hr; TRACE("%s\n", debugstr_w(url)); @@ -271,7 +272,17 @@ HRESULT create_uri(const WCHAR *url, IUri **uri) url = fileUrl; } - return CreateUri(url, Uri_CREATE_ALLOW_RELATIVE | Uri_CREATE_ALLOW_IMPLICIT_FILE_SCHEME, 0, uri); + hr = CreateUri(url, Uri_CREATE_ALLOW_RELATIVE | Uri_CREATE_ALLOW_IMPLICIT_FILE_SCHEME, 0, uri); + if (hr == S_OK && base) + { + IUri *rebased_uri; + + hr = CoInternetCombineIUri(base, *uri, 0, &rebased_uri, 0); + IUri_Release(*uri); + *uri = rebased_uri; + } + + return hr; } HRESULT create_moniker_from_url(LPCWSTR url, IMoniker **mon) @@ -281,7 +292,7 @@ HRESULT create_moniker_from_url(LPCWSTR url, IMoniker **mon) TRACE("%s\n", debugstr_w(url)); - if (FAILED(hr = create_uri(url, &uri))) + if (FAILED(hr = create_uri(NULL, url, &uri))) return hr; hr = CreateURLMonikerEx2(NULL, uri, mon, 0); diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 6d611c590f..8d45c546fb 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -2304,7 +2304,7 @@ static HRESULT WINAPI domdoc_load( This->properties->uri = NULL; } - hr = create_uri(filename, &uri); + hr = create_uri(This->base_uri, filename, &uri); if (SUCCEEDED(hr)) hr = CreateURLMonikerEx2(NULL, uri, &mon, 0); if ( SUCCEEDED(hr) ) diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 918c0d3d44..5fce060985 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -532,7 +532,7 @@ static inline const CLSID* SchemaCache_version(MSXML_VERSION v) typedef struct bsc_t bsc_t; HRESULT create_moniker_from_url(LPCWSTR, IMoniker**) DECLSPEC_HIDDEN; -HRESULT create_uri(const WCHAR *, IUri **) DECLSPEC_HIDDEN; +HRESULT create_uri(IUri *base, const WCHAR *, IUri **) DECLSPEC_HIDDEN; HRESULT bind_url(IMoniker*, HRESULT (*onDataAvailable)(void*,char*,DWORD), void*, bsc_t**) DECLSPEC_HIDDEN; HRESULT detach_bsc(bsc_t*) DECLSPEC_HIDDEN; IUri *get_base_uri(IUnknown *) DECLSPEC_HIDDEN; -- 2.26.2

2 1

[PATCH 4/4] msxml3: Use site's base URI when loading an XML file. (resend)
by Dmitry Timoshkov July 9, 2020

July 9, 2020

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/msxml3/domdoc.c | 43 ++++++++++++++++++++++++++++--------------- 1 file changed, 28 insertions(+), 15 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 6d611c590f..9b001cc373 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -2158,16 +2158,38 @@ static HRESULT domdoc_onDataAvailable(void *obj, char *ptr, DWORD len) return E_FAIL; } -static HRESULT domdoc_load_moniker(domdoc *This, IMoniker *mon) +static HRESULT domdoc_load_file(domdoc *This, LPWSTR filename, IUri **uri) { + IMoniker *mon, *base_mon = NULL; bsc_t *bsc; HRESULT hr; - hr = bind_url(mon, domdoc_onDataAvailable, This, &bsc); - if(FAILED(hr)) - return hr; + if (This->base_uri) + { + hr = CreateURLMonikerEx2(NULL, This->base_uri, &base_mon, 0); + if (hr != S_OK) return hr; + } - return detach_bsc(bsc); + if (base_mon) /* look for file starting from base URL */ + hr = CreateUri(filename, Uri_CREATE_ALLOW_RELATIVE | Uri_CREATE_ALLOW_IMPLICIT_FILE_SCHEME, 0, uri); + else /* look for file in the PATH */ + hr = create_uri(filename, uri); + if (hr == S_OK) + { + hr = CreateURLMonikerEx2(base_mon, *uri, &mon, 0); + if (hr == S_OK) + { + hr = bind_url(mon, domdoc_onDataAvailable, This, &bsc); + if (hr == S_OK) + hr = detach_bsc(bsc); + IMoniker_Release(mon); + } + } + + if (base_mon) + IMoniker_Release(base_mon); + + return hr; } static HRESULT WINAPI domdoc_load( @@ -2296,7 +2318,6 @@ static HRESULT WINAPI domdoc_load( if ( filename ) { IUri *uri = NULL; - IMoniker *mon; if (This->properties->uri) { @@ -2304,15 +2325,7 @@ static HRESULT WINAPI domdoc_load( This->properties->uri = NULL; } - hr = create_uri(filename, &uri); - if (SUCCEEDED(hr)) - hr = CreateURLMonikerEx2(NULL, uri, &mon, 0); - if ( SUCCEEDED(hr) ) - { - hr = domdoc_load_moniker( This, mon ); - IMoniker_Release(mon); - } - + hr = domdoc_load_file(This, filename, &uri); if (SUCCEEDED(hr)) { get_doc(This)->name = (char *)xmlchar_from_wcharn(filename, -1, TRUE); -- 2.26.2

2 1

[PATCH 3/4] msxml3: IXMLDOMDocument2's ::SetSite implementation should query site for base URI. (resend)
by Dmitry Timoshkov July 9, 2020

July 9, 2020

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/msxml3/domdoc.c | 11 +++++++++++ dlls/msxml3/httprequest.c | 16 ++++++++-------- dlls/msxml3/msxml_private.h | 1 + dlls/msxml3/tests/domdoc.c | 4 ---- 4 files changed, 20 insertions(+), 12 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index b740b2e9d3..6d611c590f 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -135,6 +135,7 @@ struct domdoc /* IObjectWithSite */ IUnknown *site; + IUri *base_uri; /* IObjectSafety */ DWORD safeopt; @@ -963,6 +964,8 @@ static ULONG WINAPI domdoc_Release( IXMLDOMDocument3 *iface ) if (This->site) IUnknown_Release( This->site ); + if (This->base_uri) + IUri_Release( This->base_uri ); destroy_xmlnode(&This->node); for (eid = 0; eid < EVENTID_LAST; eid++) @@ -3551,6 +3554,12 @@ static HRESULT WINAPI domdoc_ObjectWithSite_SetSite( IObjectWithSite *iface, IUn This->site = NULL; } + if(This->base_uri) + { + IUri_Release(This->base_uri); + This->base_uri = NULL; + } + return S_OK; } @@ -3560,6 +3569,7 @@ static HRESULT WINAPI domdoc_ObjectWithSite_SetSite( IObjectWithSite *iface, IUn IUnknown_Release( This->site ); This->site = punk; + This->base_uri = get_base_uri(This->site); return S_OK; } @@ -3664,6 +3674,7 @@ HRESULT get_domdoc_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument3 **document) doc->properties = properties_from_xmlDocPtr(xmldoc); doc->error = S_OK; doc->site = NULL; + doc->base_uri = NULL; doc->safeopt = 0; doc->cp_list = NULL; doc->namespaces = NULL; diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index c6f9fdb33e..7286eb97bb 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -1598,7 +1598,7 @@ static HRESULT WINAPI httprequest_ObjectWithSite_GetSite( IObjectWithSite *iface return IUnknown_QueryInterface( This->site, iid, ppvSite ); } -static void get_base_uri(httprequest *This) +IUri *get_base_uri(IUnknown *site) { IServiceProvider *provider; IHTMLDocument2 *doc; @@ -1606,30 +1606,30 @@ static void get_base_uri(httprequest *This) BSTR url; HRESULT hr; - hr = IUnknown_QueryInterface(This->site, &IID_IServiceProvider, (void**)&provider); + hr = IUnknown_QueryInterface(site, &IID_IServiceProvider, (void**)&provider); if(FAILED(hr)) - return; + return NULL; hr = IServiceProvider_QueryService(provider, &SID_SContainerDispatch, &IID_IHTMLDocument2, (void**)&doc); if(FAILED(hr)) hr = IServiceProvider_QueryService(provider, &SID_SInternetHostSecurityManager, &IID_IHTMLDocument2, (void**)&doc); IServiceProvider_Release(provider); if(FAILED(hr)) - return; + return NULL; hr = IHTMLDocument2_get_URL(doc, &url); IHTMLDocument2_Release(doc); if(FAILED(hr) || !url || !*url) - return; + return NULL; TRACE("host url %s\n", debugstr_w(url)); hr = CreateUri(url, 0, 0, &uri); SysFreeString(url); if(FAILED(hr)) - return; + return NULL; - This->base_uri = uri; + return uri; } static HRESULT WINAPI httprequest_ObjectWithSite_SetSite( IObjectWithSite *iface, IUnknown *punk ) @@ -1648,7 +1648,7 @@ static HRESULT WINAPI httprequest_ObjectWithSite_SetSite( IObjectWithSite *iface if (punk) { IUnknown_AddRef( punk ); - get_base_uri(This); + This->base_uri = get_base_uri(This->site); } return S_OK; diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 08f944ab1b..918c0d3d44 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -535,6 +535,7 @@ HRESULT create_moniker_from_url(LPCWSTR, IMoniker**) DECLSPEC_HIDDEN; HRESULT create_uri(const WCHAR *, IUri **) DECLSPEC_HIDDEN; HRESULT bind_url(IMoniker*, HRESULT (*onDataAvailable)(void*,char*,DWORD), void*, bsc_t**) DECLSPEC_HIDDEN; HRESULT detach_bsc(bsc_t*) DECLSPEC_HIDDEN; +IUri *get_base_uri(IUnknown *) DECLSPEC_HIDDEN; /* Error Codes - not defined anywhere in the public headers */ #define E_XML_ELEMENT_UNDECLARED 0xC00CE00D diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index c86042bc70..f45364058a 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -13226,17 +13226,13 @@ static void test_load_with_site(void) qi_count = 0; hr = IObjectWithSite_SetSite(site, (IUnknown *)&sp); ok(hr == S_OK, "got %#x\n", hr); -todo_wine ok(qi_count != 0, "got %d QI calls\n", qi_count); todo_wine ok(qi_list_contains(&IID_IXMLDOMDocument), "QI(IID_IXMLDOMDocument) was not called\n"); -todo_wine ok(qi_list_contains(&IID_IHTMLDocument2), "QI(IID_IHTMLDocument2) was not called\n"); -todo_wine ok(qi_list_contains(&IID_IServiceProvider), "QI(IID_IServiceProvider) was not called\n"); todo_wine ok(qi_list_contains(&IID_IOleClientSite), "QI(IID_IOleClientSite) was not called\n"); -todo_wine ok(qi_list_contains_service(&SID_SContainerDispatch, &IID_IHTMLDocument2), "QI(SID_SContainerDispatch, IID_IHTMLDocument2) was not called\n"); todo_wine -- 2.26.2

2 1

[PATCH 2/4] msxml3/tests: Add some tests for XML loading with site assigned. (resend)
by Dmitry Timoshkov July 9, 2020

July 9, 2020

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/msxml3/tests/domdoc.c | 144 +++++++++++++++++++++++++++++++++++++ 1 file changed, 144 insertions(+) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index ef29bf6a59..c86042bc70 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -37,6 +37,7 @@ #include "dispex.h" #include "objsafe.h" #include "mshtml.h" +#include "docobj.h" #include "xmlparser.h" #include "initguid.h" #include "asptlb.h" @@ -13114,6 +13115,148 @@ static void test_namespaces_as_attributes(void) free_bstrs(); } +static const IID *qi_list[32]; +static int qi_count; + +static BOOL qi_list_contains(REFIID iid) +{ + int i; + + for (i = 0; i < qi_count; i++) + { + if (IsEqualGUID(qi_list[i], iid)) + return TRUE; + } + + return FALSE; +} + +static BOOL qi_list_contains_service(REFIID service, REFIID iid) +{ + int i; + + for (i = 0; i < qi_count; i++) + { + if (IsEqualGUID(qi_list[i], service) && IsEqualGUID(qi_list[i + 1], iid)) + return TRUE; + } + + return FALSE; +} + +static HRESULT WINAPI sp_QueryInterface(IServiceProvider *iface, REFIID iid, void **ppv) +{ + trace("sp_QueryInterface: %s\n", wine_dbgstr_guid(iid)); + + if (qi_count < ARRAY_SIZE(qi_list)) + qi_list[qi_count++] = iid; + else + ok(0, "qi_list overflow: %d\n", qi_count); + + if (IsEqualGUID(iid, &IID_IUnknown) || + IsEqualGUID(iid, &IID_IServiceProvider)) + { + *ppv = iface; + return S_OK; + } + + *ppv = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI sp_AddRef(IServiceProvider *iface) +{ + return 2; +} + +static ULONG WINAPI sp_Release(IServiceProvider *iface) +{ + return 1; +} + +static HRESULT WINAPI sp_QueryService(IServiceProvider *iface, REFGUID service, + REFIID iid, void **ppv) +{ + trace("sp_QueryService: %s, %s\n", wine_dbgstr_guid(service), wine_dbgstr_guid(iid)); + + if (IsEqualGUID(service, &SID_SContainerDispatch) || + IsEqualGUID(service, &SID_SInternetHostSecurityManager)) + { + if (qi_count + 1 < ARRAY_SIZE(qi_list)) + { + qi_list[qi_count++] = service; + qi_list[qi_count++] = iid; + } + else + ok(0, "qi_list overflow: %d\n", qi_count); + } + + *ppv = NULL; + return E_NOINTERFACE; +} + +static const IServiceProviderVtbl sp_vtbl = +{ + sp_QueryInterface, + sp_AddRef, + sp_Release, + sp_QueryService +}; + +static IServiceProvider sp = { &sp_vtbl }; + +static void test_load_with_site(void) +{ + char path[MAX_PATH]; + IXMLDOMDocument2 *doc; + IObjectWithSite *site; + VARIANT var; + VARIANT_BOOL b; + HRESULT hr; + + GetTempPathA(MAX_PATH, path); + strcat(path, "winetest.xml"); + write_to_file(path, win1252xml); + + doc = create_document(&IID_IXMLDOMDocument2); + + hr = IXMLDOMDocument2_QueryInterface(doc, &IID_IObjectWithSite, (void **)&site); + ok(hr == S_OK, "got %#x\n", hr); + + qi_count = 0; + hr = IObjectWithSite_SetSite(site, (IUnknown *)&sp); + ok(hr == S_OK, "got %#x\n", hr); +todo_wine + ok(qi_count != 0, "got %d QI calls\n", qi_count); +todo_wine + ok(qi_list_contains(&IID_IXMLDOMDocument), "QI(IID_IXMLDOMDocument) was not called\n"); +todo_wine + ok(qi_list_contains(&IID_IHTMLDocument2), "QI(IID_IHTMLDocument2) was not called\n"); +todo_wine + ok(qi_list_contains(&IID_IServiceProvider), "QI(IID_IServiceProvider) was not called\n"); +todo_wine + ok(qi_list_contains(&IID_IOleClientSite), "QI(IID_IOleClientSite) was not called\n"); +todo_wine + ok(qi_list_contains_service(&SID_SContainerDispatch, &IID_IHTMLDocument2), + "QI(SID_SContainerDispatch, IID_IHTMLDocument2) was not called\n"); +todo_wine + ok(qi_list_contains_service(&SID_SInternetHostSecurityManager, &IID_IXMLDOMDocument), + "QI(SID_SInternetHostSecurityManager, IID_IXMLDOMDocument) was not called\n"); + + qi_count = 0; + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = _bstr_(path); + hr = IXMLDOMDocument2_load(doc, var, &b); + ok(hr == S_OK, "got %#x\n", hr); + ok(b == VARIANT_TRUE, "got %d\n", b); + ok(qi_count == 0, "got %d QI calls\n", qi_count); + SysFreeString(V_BSTR(&var)); + + IXMLDOMDocument2_Release(doc); + + DeleteFileA(path); +} + START_TEST(domdoc) { HRESULT hr; @@ -13130,6 +13273,7 @@ START_TEST(domdoc) return; } + test_load_with_site(); test_domdoc(); test_persiststream(); test_domnode(); -- 2.26.2

2 1

[PATCH 1/4] MAINTAINERS: Remove Nikolay Sivov as an msxml maintainer.
by Dmitry Timoshkov July 8, 2020

July 8, 2020

Please find a more responsible maintainer for msxml. In general, assigning a patch for review to Nikolay takes weeks for a result (if any), while review from other maintainers usually takes reasonable 1-3 days. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- MAINTAINERS | 1 - 1 file changed, 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index 6cc1699665..4f420dda44 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -319,7 +319,6 @@ F: dlls/winex11.drv/ XML parsing M: Nikolay Sivov <nsivov(a)codeweavers.com> -F: dlls/msxml*/ F: dlls/xmllite/ THE REST -- 2.26.2

1 0

[PATCH v2] ntdll: Fill the VM counters in NtQuerySystemInformation(SystemProcessInformation).
by Zebediah Figura July 8, 2020

July 8, 2020

Process Hacker displays this information. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v2: Implement on the client side. dlls/ntdll/unix/process.c | 19 +++++++++++++------ dlls/ntdll/unix/system.c | 1 + dlls/ntdll/unix/unix_private.h | 1 + 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index 7061d8864db..0dc46284b03 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -1002,10 +1002,13 @@ NTSTATUS WINAPI NtTerminateProcess( HANDLE handle, LONG exit_code ) #if defined(HAVE_MACH_MACH_H) -static void fill_VM_COUNTERS( VM_COUNTERS_EX *pvmi ) +void fill_vm_counters( VM_COUNTERS_EX *pvmi, int unix_pid ) { #if defined(MACH_TASK_BASIC_INFO) struct mach_task_basic_info info; + + if (unix_pid != -1) return; /* FIXME: Retrieve information for other processes. */ + mach_msg_type_number_t infoCount = MACH_TASK_BASIC_INFO_COUNT; if(task_info(mach_task_self(), MACH_TASK_BASIC_INFO, (task_info_t)&info, &infoCount) == KERN_SUCCESS) { @@ -1019,13 +1022,17 @@ static void fill_VM_COUNTERS( VM_COUNTERS_EX *pvmi ) #elif defined(linux) -static void fill_VM_COUNTERS( VM_COUNTERS_EX *pvmi ) +void fill_vm_counters( VM_COUNTERS_EX *pvmi, int unix_pid ) { FILE *f; - char line[256]; + char line[256], path[26]; unsigned long value; - f = fopen("/proc/self/status", "r"); + if (unix_pid == -1) + strcpy( path, "/proc/self/status" ); + else + sprintf( path, "/proc/%u/status", unix_pid); + f = fopen( path, "r" ); if (!f) return; while (fgets(line, sizeof(line), f)) @@ -1050,7 +1057,7 @@ static void fill_VM_COUNTERS( VM_COUNTERS_EX *pvmi ) #else -static void fill_VM_COUNTERS( VM_COUNTERS_EX *pvmi ) +void fill_vm_counters( VM_COUNTERS_EX *pvmi, int unix_pid ) { /* FIXME : real data */ } @@ -1171,7 +1178,7 @@ NTSTATUS WINAPI NtQueryInformationProcess( HANDLE handle, PROCESSINFOCLASS class else { memset(&pvmi, 0, sizeof(pvmi)); - if (handle == GetCurrentProcess()) fill_VM_COUNTERS(&pvmi); + if (handle == GetCurrentProcess()) fill_vm_counters( &pvmi, -1 ); else { SERVER_START_REQ(get_process_vm_counters) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index a80d3c4fd4a..33fb37ec33d 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -2147,6 +2147,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, nt_process->ParentProcessId = UlongToHandle(server_process->parent_pid); nt_process->HandleCount = server_process->handle_count; get_thread_times( server_process->unix_pid, -1, &nt_process->KernelTime, &nt_process->UserTime ); + fill_vm_counters( &nt_process->vmCounters, server_process->unix_pid ); } pos = (pos + 7) & ~7; diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 82806463e53..6dfc866479d 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -224,6 +224,7 @@ extern void DECLSPEC_NORETURN signal_start_thread( PRTL_THREAD_START_ROUTINE ent BOOL suspend, void *relay, TEB *teb ) DECLSPEC_HIDDEN; extern void DECLSPEC_NORETURN signal_exit_thread( int status, void (*func)(int) ) DECLSPEC_HIDDEN; extern void __wine_syscall_dispatcher(void) DECLSPEC_HIDDEN; +extern void fill_vm_counters( VM_COUNTERS_EX *pvmi, int unix_pid ) DECLSPEC_HIDDEN; extern NTSTATUS cdrom_DeviceIoControl( HANDLE device, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, IO_STATUS_BLOCK *io, ULONG code, void *in_buffer, -- 2.27.0

1 0

[PATCH] Add check for totalram, mem_unit in struct sysinfo.
by Evgeny Litvinenko July 8, 2020

July 8, 2020

Signed-off-by: Evgeny Litvinenko <evgeny.v.litvinenko(a)gmail.com> diff --git a/configure.ac b/configure.ac index 4829648c3a..a2404aeb74 100644 --- a/configure.ac +++ b/configure.ac @@ -2215,6 +2215,7 @@ AC_CHECK_FUNCS(\ strtold \ symlink \ sysinfo \ + sysconf \ tcdrain \ thr_kill2 \ usleep @@ -2662,6 +2663,12 @@ AC_CHECK_MEMBERS([struct ifreq.ifr_hwaddr],,, # include <net/if.h> #endif]) +dnl Check for struct sysinfo members totalram and mem_unit +AC_CHECK_MEMBERS([struct sysinfo.totalram, struct sysinfo.mem_unit],,, +[#ifdef HAVE_SYS_SYSINFO_H +# include <sys/sysinfo.h> +#endif]) + dnl Check for isfinite ac_save_LIBS="$LIBS" LIBS="$LIBS -lm" diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index d16259e5ae..0dd72e445f 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -43,6 +43,9 @@ #ifdef HAVE_SYS_SYSINFO_H # include <sys/sysinfo.h> #endif +#ifdef HAVE_UNISTD_H +# include <unistd.h> +#endif #ifdef HAVE_VALGRIND_VALGRIND_H # include <valgrind/valgrind.h> #endif @@ -2475,22 +2478,30 @@ ULONG_PTR get_system_affinity_mask(void) */ void virtual_get_system_info( SYSTEM_BASIC_INFORMATION *info ) { -#ifdef HAVE_SYSINFO +#if defined(HAVE_STRUCT_SYSINFO_TOTALRAM) && defined(HAVE_STRUCT_SYSINFO_MEM_UNIT) struct sysinfo sinfo; +#elif defined(HAVE_SYSCONF) && defined(_SC_PHYS_PAGES) + LONG64 phys_pages; #endif info->unknown = 0; info->KeMaximumIncrement = 0; /* FIXME */ info->PageSize = page_size; info->MmLowestPhysicalPage = 1; - info->MmHighestPhysicalPage = 0x7fffffff / page_size; -#ifdef HAVE_SYSINFO + +#if defined(HAVE_STRUCT_SYSINFO_TOTALRAM) && defined(HAVE_STRUCT_SYSINFO_MEM_UNIT) if (!sysinfo(&sinfo)) { ULONG64 total = (ULONG64)sinfo.totalram * sinfo.mem_unit; info->MmHighestPhysicalPage = max(1, total / page_size); } +#elif defined(HAVE_SYSCONF) && defined(_SC_PHYS_PAGES) + phys_pages = sysconf( _SC_PHYS_PAGES ); + info->MmHighestPhysicalPage = max(1, phys_pages); +#else + info->MmHighestPhysicalPage = 0x7fffffff / page_size; #endif + info->MmNumberOfPhysicalPages = info->MmHighestPhysicalPage - info->MmLowestPhysicalPage; info->AllocationGranularity = granularity_mask + 1; info->LowestUserAddress = (void *)0x10000; -- 2.25.4

1 0