December 2018 - Wine-commits

Alex Henrie : uxtheme: Turn a variable and a constant into static constants.
by Alexandre Julliard 04 Dec '18

04 Dec '18

Module: wine Branch: master Commit: 53c8abbf8aecf96ef5d239984c6054a56f5a64cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=53c8abbf8aecf96ef5d23998… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Dec 3 21:42:59 2018 -0700 uxtheme: Turn a variable and a constant into static constants. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/metric.c | 6 +++--- dlls/uxtheme/system.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/uxtheme/metric.c b/dlls/uxtheme/metric.c index 5f6c36f..073422f 100644 --- a/dlls/uxtheme/metric.c +++ b/dlls/uxtheme/metric.c @@ -165,9 +165,7 @@ HRESULT WINAPI GetThemeSysInt(HTHEME hTheme, int iIntID, int *piValue) */ int WINAPI GetThemeSysSize(HTHEME hTheme, int iSizeID) { - PTHEME_PROPERTY tp; - int i, id = -1; - int metricMap[] = { + static const int metricMap[] = { SM_CXVSCROLL, TMT_SCROLLBARWIDTH, SM_CYHSCROLL, TMT_SCROLLBARHEIGHT, SM_CXSIZE, TMT_CAPTIONBARWIDTH, @@ -179,6 +177,8 @@ int WINAPI GetThemeSysSize(HTHEME hTheme, int iSizeID) SM_CXMENUSIZE, TMT_MENUBARWIDTH, SM_CYMENUSIZE, TMT_MENUBARHEIGHT }; + PTHEME_PROPERTY tp; + int i, id = -1; if(hTheme) { for(i=0; i<ARRAY_SIZE(metricMap); i+=2) { diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index db49754..c898ad3 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -813,7 +813,7 @@ HRESULT WINAPI GetThemeDocumentationProperty(LPCWSTR pszThemeName, LPWSTR pszValueBuff, int cchMaxValChars) { - const WORD wDocToRes[] = { + static const WORD wDocToRes[] = { TMT_DISPLAYNAME,5000, TMT_TOOLTIP,5001, TMT_COMPANY,5002,

1 0

Alex Henrie : wineandroid.drv: Turn variable 'options' into a static constant.
by Alexandre Julliard 04 Dec '18

04 Dec '18

Module: wine Branch: master Commit: 6367203572458fb5d680a6c298b82e13ff040102 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6367203572458fb5d680a6c2… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Dec 3 21:43:00 2018 -0700 wineandroid.drv: Turn variable 'options' into a static constant. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/mmdevdrv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wineandroid.drv/mmdevdrv.c b/dlls/wineandroid.drv/mmdevdrv.c index 8f428a8..3968536 100644 --- a/dlls/wineandroid.drv/mmdevdrv.c +++ b/dlls/wineandroid.drv/mmdevdrv.c @@ -287,8 +287,8 @@ static SLObjectItf outputmix; HRESULT AUDDRV_Init(void) { + static const SLEngineOption options[] = { {SL_ENGINEOPTION_THREADSAFE, SL_BOOLEAN_TRUE} }; SLresult sr; - SLEngineOption options[] = { {SL_ENGINEOPTION_THREADSAFE, SL_BOOLEAN_TRUE} }; sr = pslCreateEngine(&sl, 1, options, 0, NULL, NULL); if(sr != SL_RESULT_SUCCESS){

1 0

Alex Henrie : browseui: Have a single empty wide string at the top of progressdlg.c.
by Alexandre Julliard 04 Dec '18

04 Dec '18

Module: wine Branch: master Commit: be8870d5ea54865ba24a222cd5eec0d548b780cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=be8870d5ea54865ba24a222c… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Nov 30 00:14:00 2018 -0700 browseui: Have a single empty wide string at the top of progressdlg.c. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/browseui/progressdlg.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/browseui/progressdlg.c b/dlls/browseui/progressdlg.c index e10d8bd..61078a1 100644 --- a/dlls/browseui/progressdlg.c +++ b/dlls/browseui/progressdlg.c @@ -89,9 +89,10 @@ static inline ProgressDialog *impl_from_IOleWindow(IOleWindow *iface) return CONTAINING_RECORD(iface, ProgressDialog, IOleWindow_iface); } +static const WCHAR empty_string[] = {0}; + static void set_buffer(LPWSTR *buffer, LPCWSTR string) { - static const WCHAR empty_string[] = {0}; IMalloc *malloc; ULONG cb; @@ -132,15 +133,13 @@ static void set_progress_marquee(ProgressDialog *This) static void update_dialog(ProgressDialog *This, DWORD dwUpdate) { - WCHAR empty[] = {0}; - if (dwUpdate & UPDATE_TITLE) SetWindowTextW(This->hwnd, This->title); if (dwUpdate & UPDATE_LINE1) - SetDlgItemTextW(This->hwnd, IDC_TEXT_LINE, (This->isCancelled ? empty : This->lines[0])); + SetDlgItemTextW(This->hwnd, IDC_TEXT_LINE, (This->isCancelled ? empty_string : This->lines[0])); if (dwUpdate & UPDATE_LINE2) - SetDlgItemTextW(This->hwnd, IDC_TEXT_LINE+1, (This->isCancelled ? empty : This->lines[1])); + SetDlgItemTextW(This->hwnd, IDC_TEXT_LINE+1, (This->isCancelled ? empty_string : This->lines[1])); if (dwUpdate & UPDATE_LINE3) SetDlgItemTextW(This->hwnd, IDC_TEXT_LINE+2, (This->isCancelled ? This->cancelMsg : This->lines[2]));

1 0

Alex Henrie : cryptui: Have a single empty wide string at the top of main.c.
by Alexandre Julliard 04 Dec '18

04 Dec '18

Module: wine Branch: master Commit: 9b69fe2332e76984929f9aea49bc779035049513 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b69fe2332e76984929f9aea… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Nov 30 00:14:01 2018 -0700 cryptui: Have a single empty wide string at the top of main.c. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/cryptui/main.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 1fbe63e..a100419 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -46,6 +46,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(cryptui); static HINSTANCE hInstance; +static const WCHAR empty[] = {0}; + BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); @@ -804,8 +806,6 @@ static LRESULT CALLBACK cert_mgr_advanced_dlg_proc(HWND hwnd, UINT msg, static void cert_mgr_clear_cert_selection(HWND hwnd) { - WCHAR empty[] = { 0 }; - EnableWindow(GetDlgItem(hwnd, IDC_MGR_EXPORT), FALSE); EnableWindow(GetDlgItem(hwnd, IDC_MGR_REMOVE), FALSE); EnableWindow(GetDlgItem(hwnd, IDC_MGR_VIEW), FALSE); @@ -1166,7 +1166,6 @@ static LRESULT CALLBACK cert_mgr_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, break; case LVN_ITEMCHANGED: { - WCHAR empty[] = { 0 }; NMITEMACTIVATE *nm = (NMITEMACTIVATE*)lp; HWND lv = GetDlgItem(hwnd, IDC_MGR_CERTS); int numSelected = SendMessageW(lv, LVM_GETSELECTEDCOUNT, 0, 0);

1 0

Zebediah Figura : ntdll: Call the select request directly in RtlWaitOnAddress().
by Alexandre Julliard 04 Dec '18

04 Dec '18

Module: wine Branch: master Commit: 0ea963a4063395a7a4611b435eb74b5cf0830116 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ea963a4063395a7a4611b43… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Nov 30 19:03:56 2018 -0600 ntdll: Call the select request directly in RtlWaitOnAddress(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll_misc.h | 2 ++ dlls/ntdll/server.c | 4 +-- dlls/ntdll/sync.c | 86 +++++++++++++++++++++++++++++++++++++------------ 3 files changed, 70 insertions(+), 22 deletions(-) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index fdb443b..1630978 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -104,6 +104,8 @@ extern int server_pipe( int fd[2] ) DECLSPEC_HIDDEN; extern NTSTATUS alloc_object_attributes( const OBJECT_ATTRIBUTES *attr, struct object_attributes **ret, data_size_t *ret_len ) DECLSPEC_HIDDEN; extern NTSTATUS validate_open_object_attributes( const OBJECT_ATTRIBUTES *attr ) DECLSPEC_HIDDEN; +extern int wait_select_reply( void *cookie ) DECLSPEC_HIDDEN; +extern BOOL invoke_apc( const apc_call_t *call, apc_result_t *result ) DECLSPEC_HIDDEN; /* module handling */ extern LIST_ENTRY tls_links DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index ec03445..38356f4 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -349,7 +349,7 @@ void server_leave_uninterrupted_section( RTL_CRITICAL_SECTION *cs, sigset_t *sig * * Wait for a reply on the waiting pipe of the current thread. */ -static int wait_select_reply( void *cookie ) +int wait_select_reply( void *cookie ) { int signaled; struct wake_up_reply reply; @@ -386,7 +386,7 @@ static int wait_select_reply( void *cookie ) * * Invoke a single APC. Return TRUE if a user APC has been run. */ -static BOOL invoke_apc( const apc_call_t *call, apc_result_t *result ) +BOOL invoke_apc( const apc_call_t *call, apc_result_t *result ) { BOOL user_apc = FALSE; SIZE_T size; diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 0c373a4..e1a48d7 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -1961,35 +1961,81 @@ NTSTATUS WINAPI RtlSleepConditionVariableSRW( RTL_CONDITION_VARIABLE *variable, return status; } -/*********************************************************************** - * RtlWaitOnAddress (NTDLL.@) - */ -NTSTATUS WINAPI RtlWaitOnAddress( const void *addr, const void *cmp, SIZE_T size, - const LARGE_INTEGER *timeout ) +static BOOL compare_addr( const void *addr, const void *cmp, SIZE_T size ) { switch (size) { case 1: - if (*(const UCHAR *)addr != *(const UCHAR *)cmp) - return STATUS_SUCCESS; - break; + return (*(const UCHAR *)addr == *(const UCHAR *)cmp); case 2: - if (*(const USHORT *)addr != *(const USHORT *)cmp) - return STATUS_SUCCESS; - break; + return (*(const USHORT *)addr == *(const USHORT *)cmp); case 4: - if (*(const ULONG *)addr != *(const ULONG *)cmp) - return STATUS_SUCCESS; - break; + return (*(const ULONG *)addr == *(const ULONG *)cmp); case 8: - if (*(const ULONG64 *)addr != *(const ULONG64 *)cmp) - return STATUS_SUCCESS; - break; - default: - return STATUS_INVALID_PARAMETER; + return (*(const ULONG64 *)addr == *(const ULONG64 *)cmp); } - return NtWaitForKeyedEvent( 0, addr, 0, timeout ); + return FALSE; +} + +/*********************************************************************** + * RtlWaitOnAddress (NTDLL.@) + */ +NTSTATUS WINAPI RtlWaitOnAddress( const void *addr, const void *cmp, SIZE_T size, + const LARGE_INTEGER *timeout ) +{ + select_op_t select_op; + NTSTATUS ret; + int cookie; + BOOL user_apc = FALSE; + obj_handle_t apc_handle = 0; + apc_call_t call; + apc_result_t result; + timeout_t abs_timeout = timeout ? timeout->QuadPart : TIMEOUT_INFINITE; + + if (size != 1 && size != 2 && size != 4 && size != 8) + return STATUS_INVALID_PARAMETER; + + select_op.keyed_event.op = SELECT_KEYED_EVENT_WAIT; + select_op.keyed_event.handle = wine_server_obj_handle( keyed_event ); + select_op.keyed_event.key = wine_server_client_ptr( addr ); + + memset( &result, 0, sizeof(result) ); + + for (;;) + { + if (!compare_addr( addr, cmp, size )) + return STATUS_SUCCESS; + + SERVER_START_REQ( select ) + { + req->flags = SELECT_INTERRUPTIBLE; + req->cookie = wine_server_client_ptr( &cookie ); + req->prev_apc = apc_handle; + req->timeout = abs_timeout; + wine_server_add_data( req, &result, sizeof(result) ); + wine_server_add_data( req, &select_op, sizeof(select_op.keyed_event) ); + ret = wine_server_call( req ); + abs_timeout = reply->timeout; + apc_handle = reply->apc_handle; + call = reply->call; + } + SERVER_END_REQ; + if (ret == STATUS_PENDING) ret = wait_select_reply( &cookie ); + if (ret != STATUS_USER_APC) break; + if (invoke_apc( &call, &result )) + { + /* if we ran a user apc we have to check once more if additional apcs are queued, + * but we don't want to wait */ + abs_timeout = 0; + user_apc = TRUE; + size = 0; + } + } + + if (ret == STATUS_TIMEOUT && user_apc) ret = STATUS_USER_APC; + + return ret; } /***********************************************************************

1 0

Zebediah Figura : ntdll: Use a critical section to ensure that RtlWaitOnAddress compares and queues atomically.
by Alexandre Julliard 04 Dec '18

04 Dec '18

Module: wine Branch: master Commit: 6060d2703c2e1382f076ad40ea43980781eaca2c URL: https://source.winehq.org/git/wine.git/?a=commit;h=6060d2703c2e1382f076ad40… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Nov 30 19:03:57 2018 -0600 ntdll: Use a critical section to ensure that RtlWaitOnAddress compares and queues atomically. Currently a wake may occur between calling compare_addr() and performing the select request; in that case the thread will never be woken. Prevent this by taking a CS around both operations. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46099 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/sync.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index e1a48d7..62cb3cd 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -1961,6 +1961,15 @@ NTSTATUS WINAPI RtlSleepConditionVariableSRW( RTL_CONDITION_VARIABLE *variable, return status; } +static RTL_CRITICAL_SECTION addr_section; +static RTL_CRITICAL_SECTION_DEBUG addr_section_debug = +{ + 0, 0, &addr_section, + { &addr_section_debug.ProcessLocksList, &addr_section_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": addr_section") } +}; +static RTL_CRITICAL_SECTION addr_section = { &addr_section_debug, -1, 0, 0, 0, 0 }; + static BOOL compare_addr( const void *addr, const void *cmp, SIZE_T size ) { switch (size) @@ -2004,8 +2013,12 @@ NTSTATUS WINAPI RtlWaitOnAddress( const void *addr, const void *cmp, SIZE_T size for (;;) { + RtlEnterCriticalSection( &addr_section ); if (!compare_addr( addr, cmp, size )) + { + RtlLeaveCriticalSection( &addr_section ); return STATUS_SUCCESS; + } SERVER_START_REQ( select ) { @@ -2021,6 +2034,9 @@ NTSTATUS WINAPI RtlWaitOnAddress( const void *addr, const void *cmp, SIZE_T size call = reply->call; } SERVER_END_REQ; + + RtlLeaveCriticalSection( &addr_section ); + if (ret == STATUS_PENDING) ret = wait_select_reply( &cookie ); if (ret != STATUS_USER_APC) break; if (invoke_apc( &call, &result )) @@ -2043,7 +2059,9 @@ NTSTATUS WINAPI RtlWaitOnAddress( const void *addr, const void *cmp, SIZE_T size */ void WINAPI RtlWakeAddressAll( const void *addr ) { + RtlEnterCriticalSection( &addr_section ); while (NtReleaseKeyedEvent( 0, addr, 0, &zero_timeout ) == STATUS_SUCCESS) {} + RtlLeaveCriticalSection( &addr_section ); } /*********************************************************************** @@ -2051,5 +2069,7 @@ void WINAPI RtlWakeAddressAll( const void *addr ) */ void WINAPI RtlWakeAddressSingle( const void *addr ) { + RtlEnterCriticalSection( &addr_section ); NtReleaseKeyedEvent( 0, addr, 0, &zero_timeout ); + RtlLeaveCriticalSection( &addr_section ); }

1 0

Pierre Schweitzer : mpr: Implement remembered connection enumeration.
by Alexandre Julliard 04 Dec '18

04 Dec '18

Module: wine Branch: master Commit: 9988bb5e0729178b527052803d3ad670e5e0b46e URL: https://source.winehq.org/git/wine.git/?a=commit;h=9988bb5e0729178b52705280… Author: Pierre Schweitzer <pierre(a)reactos.org> Date: Sat Dec 1 13:23:06 2018 +0100 mpr: Implement remembered connection enumeration. Signed-off-by: Pierre Schweitzer <pierre(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mpr/wnet.c | 231 ++++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 207 insertions(+), 24 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9988bb5e0729178b5270…

1 0

Roderick Colenbrander : ntdll: Parse sysfs cpu_shared_map using helper function.
by Alexandre Julliard 04 Dec '18

04 Dec '18

Module: wine Branch: master Commit: ed75a7b3443e79f9d63e97eeebcce2d2f40c507b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed75a7b3443e79f9d63e97ee… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Sun Dec 2 22:53:15 2018 -0800 ntdll: Parse sysfs cpu_shared_map using helper function. Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/nt.c | 40 +++++++++++++++++++++++++++++++--------- 1 file changed, 31 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index aa6f846..0e11e0e 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1604,6 +1604,36 @@ static inline BOOL logical_proc_info_add_group(SYSTEM_LOGICAL_PROCESSOR_INFORMAT } #ifdef linux +/* Helper function for counting bitmap values as commonly used by the Linux kernel + * for storing CPU masks in sysfs. The format is comma separated lists of hex values + * each max 32-bit e.g. "00ff" or even "00,00000000,0000ffff". + * + * Example files include: + * - /sys/devices/system/cpu/cpu0/cache/index0/shared_cpu_map + * - /sys/devices/system/cpu/cpu0/topology/thread_siblings + */ +static BOOL sysfs_parse_bitmap(const char *filename, ULONG_PTR * const mask) +{ + FILE *f; + DWORD r; + + f = fopen(filename, "r"); + if (!f) + return FALSE; + + while (!feof(f)) + { + char op; + if (!fscanf(f, "%x%c ", &r, &op)) + break; + + *mask = (sizeof(ULONG_PTR)>sizeof(int) ? *mask<<(8*sizeof(DWORD)) : 0) + r; + } + + fclose(f); + return TRUE; +} + /* for 'data', max_len is the array count. for 'dataex', max_len is in bytes */ static NTSTATUS create_logical_proc_info(SYSTEM_LOGICAL_PROCESSOR_INFORMATION **data, SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX **dataex, DWORD *max_len) @@ -1693,15 +1723,7 @@ static NTSTATUS create_logical_proc_info(SYSTEM_LOGICAL_PROCESSOR_INFORMATION ** ULONG_PTR mask = 0; sprintf(name, cache_info, i, j, "shared_cpu_map"); - f = fopen(name, "r"); - if(!f) continue; - while(!feof(f)) - { - if(!fscanf(f, "%x%c ", &r, &op)) - break; - mask = (sizeof(ULONG_PTR)>sizeof(int) ? mask<<(8*sizeof(DWORD)) : 0) + r; - } - fclose(f); + if(!sysfs_parse_bitmap(name, &mask)) continue; sprintf(name, cache_info, i, j, "level"); f = fopen(name, "r");

1 0

Roderick Colenbrander : ntdll: Fix parsing thread_siblings bitmaps on high core count systems.
by Alexandre Julliard 04 Dec '18

04 Dec '18

Module: wine Branch: master Commit: b9af36933fdf47cbbe139626e98750da72142dce URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9af36933fdf47cbbe139626… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Sun Dec 2 22:53:16 2018 -0800 ntdll: Fix parsing thread_siblings bitmaps on high core count systems. Linux compiled for a high number of CPU cores, the bitmap is broken into sections of 32-bit by commas. Handle parsing this. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45453 Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/nt.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 0e11e0e..db51a98 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1704,13 +1704,8 @@ static NTSTATUS create_logical_proc_info(SYSTEM_LOGICAL_PROCESSOR_INFORMATION ** /* Mask of logical threads sharing same physical core in kernel core numbering. */ sprintf(name, core_info, i, "thread_siblings"); - f = fopen(name, "r"); - if(f) - { - fscanf(f, "%lx", &thread_mask); - fclose(f); - } - else thread_mask = 1<<i; + if(!sysfs_parse_bitmap(name, &thread_mask)) + thread_mask = 1<<i; if(!logical_proc_info_add_by_id(data, dataex, &len, max_len, RelationProcessorCore, phys_core, thread_mask)) { fclose(fcpu_list);

1 0

Roderick Colenbrander : ntdll: Print FIXME on systems supporting more CPU cores than supported.
by Alexandre Julliard 04 Dec '18

04 Dec '18

Module: wine Branch: master Commit: 3c329e28d9ffabacdf1a3075a1dab27f68b1a9fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c329e28d9ffabacdf1a3075… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Sun Dec 2 22:53:17 2018 -0800 ntdll: Print FIXME on systems supporting more CPU cores than supported. Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/nt.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 53 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index db51a98..dcf9123 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1634,6 +1634,44 @@ static BOOL sysfs_parse_bitmap(const char *filename, ULONG_PTR * const mask) return TRUE; } +/* Helper function for counting number of elements in interval lists as used by + * the Linux kernel. The format is comma separated list of intervals of which + * each interval has the format of "begin-end" where begin and end are decimal + * numbers. E.g. "0-7", "0-7,16-23" + * + * Example files include: + * - /sys/devices/system/cpu/online + * - /sys/devices/system/cpu/cpu0/cache/index0/shared_cpu_list + * - /sys/devices/system/cpu/cpu0/topology/thread_siblings_list. + */ +static BOOL sysfs_count_list_elements(const char *filename, DWORD *result) +{ + FILE *f; + + f = fopen(filename, "r"); + if (!f) + return FALSE; + + while (!feof(f)) + { + char op; + DWORD beg, end; + + if (!fscanf(f, "%u%c ", &beg, &op)) + break; + + if(op == '-') + fscanf(f, "%u%c ", &end, &op); + else + end = beg; + + *result += end - beg + 1; + } + + fclose(f); + return TRUE; +} + /* for 'data', max_len is the array count. for 'dataex', max_len is in bytes */ static NTSTATUS create_logical_proc_info(SYSTEM_LOGICAL_PROCESSOR_INFORMATION **data, SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX **dataex, DWORD *max_len) @@ -1643,10 +1681,24 @@ static NTSTATUS create_logical_proc_info(SYSTEM_LOGICAL_PROCESSOR_INFORMATION ** static const char numa_info[] = "/sys/devices/system/node/node%u/cpumap"; FILE *fcpu_list, *fnuma_list, *f; - DWORD len = 0, beg, end, i, j, r, num_cpus = 0; + DWORD len = 0, beg, end, i, j, r, num_cpus = 0, max_cpus = 0; char op, name[MAX_PATH]; ULONG_PTR all_cpus_mask = 0; + /* On systems with a large number of CPU cores (32 or 64 depending on 32-bit or 64-bit), + * we have issues parsing processor information: + * - ULONG_PTR masks as used in data structures can't hold all cores. Requires splitting + * data appropriately into "processor groups". We are hard coding 1. + * - Thread affinity code in wineserver and our CPU parsing code here work independently. + * So far the Windows mask applied directly to Linux, but process groups break that. + * (NUMA systems you may have multiple non-full groups.) + */ + if(sysfs_count_list_elements("/sys/devices/system/cpu/present", &max_cpus) && max_cpus > MAXIMUM_PROCESSORS) + { + FIXME("Improve CPU info reporting: system supports %u logical cores, but only %u supported!\n", + max_cpus, MAXIMUM_PROCESSORS); + } + fcpu_list = fopen("/sys/devices/system/cpu/online", "r"); if(!fcpu_list) return STATUS_NOT_IMPLEMENTED;

1 0