wine-commits May 2021

wine-commits@winehq.org

2 participants
770 discussions

Alexandre Julliard : kernel32: Fix GetLogicalProcessorInformationEx() usage.
by Alexandre Julliard 26 May '21

26 May '21

Module: wine Branch: master Commit: 171de0a7f6510a9fa1e2de4f601e31c3208254fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=171de0a7f6510a9fa1e2de4f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 26 21:19:42 2021 +0200 kernel32: Fix GetLogicalProcessorInformationEx() usage. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 57 ++++++++++++++++------------------------ dlls/ntoskrnl.exe/tests/driver.c | 2 +- 2 files changed, 24 insertions(+), 35 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index aa0922f5164..17a23cca08d 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -604,24 +604,34 @@ HRESULT WINAPI RegisterApplicationRecoveryCallback(APPLICATION_RECOVERY_CALLBACK return S_OK; } +static SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *get_logical_processor_info(void) +{ + DWORD size = 0; + SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *info; + + GetLogicalProcessorInformationEx( RelationGroup, NULL, &size ); + if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) return NULL; + if (!(info = HeapAlloc( GetProcessHeap(), 0, size ))) return NULL; + if (!GetLogicalProcessorInformationEx( RelationGroup, info, &size )) + { + HeapFree( GetProcessHeap(), 0, info ); + return NULL; + } + return info; +} + + /*********************************************************************** * GetActiveProcessorGroupCount (KERNEL32.@) */ WORD WINAPI GetActiveProcessorGroupCount(void) { WORD groups; - DWORD size = 0; SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *info; TRACE("()\n"); - if (!GetLogicalProcessorInformationEx(RelationGroup, NULL, &size)) return 0; - if (!(info = HeapAlloc(GetProcessHeap(), 0, size))) return 0; - if (!GetLogicalProcessorInformationEx(RelationGroup, info, &size)) - { - HeapFree(GetProcessHeap(), 0, info); - return 0; - } + if (!(info = get_logical_processor_info())) return 0; groups = info->Group.ActiveGroupCount; @@ -635,18 +645,11 @@ WORD WINAPI GetActiveProcessorGroupCount(void) DWORD WINAPI GetActiveProcessorCount(WORD group) { DWORD cpus = 0; - DWORD size = 0; SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *info; TRACE("(0x%x)\n", group); - if (!GetLogicalProcessorInformationEx(RelationGroup, NULL, &size)) return 0; - if (!(info = HeapAlloc(GetProcessHeap(), 0, size))) return 0; - if (!GetLogicalProcessorInformationEx(RelationGroup, info, &size)) - { - HeapFree(GetProcessHeap(), 0, info); - return 0; - } + if (!(info = get_logical_processor_info())) return 0; if (group == ALL_PROCESSOR_GROUPS) { @@ -669,27 +672,20 @@ DWORD WINAPI GetActiveProcessorCount(WORD group) DWORD WINAPI GetMaximumProcessorCount(WORD group) { DWORD cpus = 0; - DWORD size = 0; SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *info; TRACE("(0x%x)\n", group); - if (!GetLogicalProcessorInformationEx(RelationGroup, NULL, &size)) return 0; - if (!(info = HeapAlloc(GetProcessHeap(), 0, size))) return 0; - if (!GetLogicalProcessorInformationEx(RelationGroup, info, &size)) - { - HeapFree(GetProcessHeap(), 0, info); - return 0; - } + if (!(info = get_logical_processor_info())) return 0; if (group == ALL_PROCESSOR_GROUPS) { - for (group = 0; group < info->Group.ActiveGroupCount; group++) + for (group = 0; group < info->Group.MaximumGroupCount; group++) cpus += info->Group.GroupInfo[group].MaximumProcessorCount; } else { - if (group < info->Group.ActiveGroupCount) + if (group < info->Group.MaximumGroupCount) cpus = info->Group.GroupInfo[group].MaximumProcessorCount; } @@ -703,18 +699,11 @@ DWORD WINAPI GetMaximumProcessorCount(WORD group) WORD WINAPI GetMaximumProcessorGroupCount(void) { WORD groups; - DWORD size = 0; SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *info; TRACE("()\n"); - if (!GetLogicalProcessorInformationEx(RelationGroup, NULL, &size)) return 0; - if (!(info = HeapAlloc(GetProcessHeap(), 0, size))) return 0; - if (!GetLogicalProcessorInformationEx(RelationGroup, info, &size)) - { - HeapFree(GetProcessHeap(), 0, info); - return 0; - } + if (!(info = get_logical_processor_info())) return 0; groups = info->Group.MaximumGroupCount; diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 0d991cd98d6..f1c72d8fdaf 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -1832,7 +1832,7 @@ static void test_affinity(void) ok(!!pKeRevertToUserAffinityThreadEx, "KeRevertToUserAffinityThreadEx is not available.\n"); count = pKeQueryActiveProcessorCountEx(1); - todo_wine ok(!count, "Got unexpected count %u.\n", count); + ok(!count, "Got unexpected count %u.\n", count); cpu_count = pKeQueryActiveProcessorCountEx(0); ok(cpu_count, "Got unexpected cpu_count %u.\n", cpu_count);

1 0

Alexandre Julliard : ntdll: Remove no longer used syswow64 directory string.
by Alexandre Julliard 26 May '21

26 May '21

Module: wine Branch: master Commit: a71cb210f114ba6e29ae4b6fedf234c809111860 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a71cb210f114ba6e29ae4b6f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 26 11:57:42 2021 +0200 ntdll: Remove no longer used syswow64 directory string. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 1 - dlls/ntdll/ntdll_misc.h | 1 - 2 files changed, 2 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index a0d6573a526..f3a37d4e8a6 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -78,7 +78,6 @@ const struct unix_funcs *unix_funcs = NULL; const WCHAR windows_dir[] = L"C:\\windows"; /* system directory with trailing backslash */ const WCHAR system_dir[] = L"C:\\windows\\system32\\"; -const WCHAR syswow64_dir[] = L"C:\\windows\\syswow64\\"; HMODULE kernel32_handle = 0; diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 1e00dcda2ec..30640366f5b 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -74,7 +74,6 @@ extern void RELAY_SetupDLL( HMODULE hmod ) DECLSPEC_HIDDEN; extern void SNOOP_SetupDLL( HMODULE hmod ) DECLSPEC_HIDDEN; extern const WCHAR windows_dir[] DECLSPEC_HIDDEN; extern const WCHAR system_dir[] DECLSPEC_HIDDEN; -extern const WCHAR syswow64_dir[] DECLSPEC_HIDDEN; extern HMODULE kernel32_handle DECLSPEC_HIDDEN; extern void (FASTCALL *pBaseThreadInitThunk)(DWORD,LPTHREAD_START_ROUTINE,void *) DECLSPEC_HIDDEN;

1 0

Alistair Leslie-Hughes : wbemprox: Support using record in IWbemClassObject Next.
by Alexandre Julliard 26 May '21

26 May '21

Module: wine Branch: master Commit: d7de82fda01848cd85bae781dda21b983332627a URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7de82fda01848cd85bae781… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed May 26 15:59:27 2021 +1000 wbemprox: Support using record in IWbemClassObject Next. Makes the code the same as class_object_Get. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/class.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index 2f7752e8671..3b7bc066aea 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -546,7 +546,17 @@ static HRESULT WINAPI class_object_Next( if (is_method( table, i )) continue; if (!is_result_prop( view, table->columns[i].name )) continue; if (!(prop = SysAllocString( table->columns[i].name ))) return E_OUTOFMEMORY; - if ((hr = get_propval( view, obj->index, prop, pVal, pType, plFlavor )) != S_OK) + if (obj->record) + { + UINT index; + + if ((hr = get_column_index( table, table->columns[i].name, &index )) == S_OK) + hr = record_get_value( obj->record, index, pVal, pType ); + } + else + hr = get_propval( view, obj->index, prop, pVal, pType, plFlavor ); + + if (FAILED(hr)) { SysFreeString( prop ); return hr;

1 0

Alistair Leslie-Hughes : wbemprox: Support only getting type in record_get_value.
by Alexandre Julliard 26 May '21

26 May '21

Module: wine Branch: master Commit: 6daec612cf7effccb3d89bbad3d1ac1ea279bd68 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6daec612cf7effccb3d89bba… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed May 26 15:59:26 2021 +1000 wbemprox: Support only getting type in record_get_value. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/class.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index 2f2d3ef2bfb..2f7752e8671 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -354,6 +354,7 @@ static HRESULT record_get_value( const struct record *record, UINT index, VARIAN VARTYPE vartype = to_vartype( record->fields[index].type & CIM_TYPE_MASK ); if (type) *type = record->fields[index].type; + if (!var) return S_OK; if (record->fields[index].type & CIM_FLAG_ARRAY) {

1 0

Zebediah Figura : wtsapi32: Implement WTSEnumerateProcessesW().
by Alexandre Julliard 26 May '21

26 May '21

Module: wine Branch: master Commit: 5f8c7c25632ec520d42d3c1cb4adeecbcaaa2f9f URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f8c7c25632ec520d42d3c1c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 26 00:13:42 2021 -0500 wtsapi32: Implement WTSEnumerateProcessesW(). Based on a patch by Sebastian Lackner. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=29903 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wtsapi32/tests/Makefile.in | 2 +- dlls/wtsapi32/tests/wtsapi.c | 133 ++++++++++++++++++++++++++++++++----- dlls/wtsapi32/wtsapi32.c | 143 ++++++++++++++++++++++++++++++++++++---- include/wtsapi32.h | 1 + 4 files changed, 248 insertions(+), 31 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5f8c7c25632ec520d42d…

1 0

Jeremy Newman : switching IRC to irc.libera.chat
by Jeremy Newman 26 May '21

26 May '21

Module: website Branch: master Commit: 2d01ffc96add684d4faace0a95ed8f0c4df1d1ef URL: https://source.winehq.org/git/website.git/?a=commit;h=2d01ffc96add684d4faac… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Wed May 26 10:22:14 2021 -0500 switching IRC to irc.libera.chat --- templates/en/irc.template | 27 ++++++++++++++------------- templates/es/irc.template | 17 ++++++++--------- templates/fr/irc.template | 12 ++++++------ templates/ko/irc.template | 26 +++++++++++++------------- templates/nl/irc.template | 14 +++++++------- templates/pl/irc.template | 10 +++++----- templates/pt/irc.template | 10 +++++----- templates/tr/irc.template | 10 +++++----- templates/zh-cn/irc.template | 28 ++++++++++++++-------------- 9 files changed, 77 insertions(+), 77 deletions(-) Diff: https://source.winehq.org/git/website.git/?a=commitdiff;h=2d01ffc96add684d4…

1 0

Alex Henrie : kernel32: Reimplement GetMaximumProcessorGroupCount on top of GetLogicalProcessorInformationEx.
by Alexandre Julliard 25 May '21

25 May '21

Module: wine Branch: master Commit: 8ddff3f51faca2c0824e204a69f69e241fb93d15 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ddff3f51faca2c0824e204a… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon May 24 02:10:44 2021 -0600 kernel32: Reimplement GetMaximumProcessorGroupCount on top of GetLogicalProcessorInformationEx. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 6de094950e3..aa0922f5164 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -702,8 +702,24 @@ DWORD WINAPI GetMaximumProcessorCount(WORD group) */ WORD WINAPI GetMaximumProcessorGroupCount(void) { - FIXME("semi-stub, always returning 1\n"); - return 1; + WORD groups; + DWORD size = 0; + SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *info; + + TRACE("()\n"); + + if (!GetLogicalProcessorInformationEx(RelationGroup, NULL, &size)) return 0; + if (!(info = HeapAlloc(GetProcessHeap(), 0, size))) return 0; + if (!GetLogicalProcessorInformationEx(RelationGroup, info, &size)) + { + HeapFree(GetProcessHeap(), 0, info); + return 0; + } + + groups = info->Group.MaximumGroupCount; + + HeapFree(GetProcessHeap(), 0, info); + return groups; } /***********************************************************************

1 0

Alex Henrie : kernel32: Reimplement GetMaximumProcessorCount on top of GetLogicalProcessorInformationEx.
by Alexandre Julliard 25 May '21

25 May '21

Module: wine Branch: master Commit: 04114db90bf1abc5079417cfa948a3e9ab7a413d URL: https://source.winehq.org/git/wine.git/?a=commit;h=04114db90bf1abc5079417cf… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon May 24 02:10:43 2021 -0600 kernel32: Reimplement GetMaximumProcessorCount on top of GetLogicalProcessorInformationEx. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index acdedd979f3..6de094950e3 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -668,9 +668,32 @@ DWORD WINAPI GetActiveProcessorCount(WORD group) */ DWORD WINAPI GetMaximumProcessorCount(WORD group) { - DWORD cpus = system_info.NumberOfProcessors; + DWORD cpus = 0; + DWORD size = 0; + SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *info; - FIXME("(0x%x): semi-stub, returning %u\n", group, cpus); + TRACE("(0x%x)\n", group); + + if (!GetLogicalProcessorInformationEx(RelationGroup, NULL, &size)) return 0; + if (!(info = HeapAlloc(GetProcessHeap(), 0, size))) return 0; + if (!GetLogicalProcessorInformationEx(RelationGroup, info, &size)) + { + HeapFree(GetProcessHeap(), 0, info); + return 0; + } + + if (group == ALL_PROCESSOR_GROUPS) + { + for (group = 0; group < info->Group.ActiveGroupCount; group++) + cpus += info->Group.GroupInfo[group].MaximumProcessorCount; + } + else + { + if (group < info->Group.ActiveGroupCount) + cpus = info->Group.GroupInfo[group].MaximumProcessorCount; + } + + HeapFree(GetProcessHeap(), 0, info); return cpus; }

1 0

Alex Henrie : kernel32: Reimplement GetActiveProcessorCount on top of GetLogicalProcessorInformationEx.
by Alexandre Julliard 25 May '21

25 May '21

Module: wine Branch: master Commit: 6aeb297d20c3f2d0b3a41d2c06dc483668e1fc01 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6aeb297d20c3f2d0b3a41d2c… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon May 24 02:10:42 2021 -0600 kernel32: Reimplement GetActiveProcessorCount on top of GetLogicalProcessorInformationEx. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 710dfad8b7a..acdedd979f3 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -634,9 +634,32 @@ WORD WINAPI GetActiveProcessorGroupCount(void) */ DWORD WINAPI GetActiveProcessorCount(WORD group) { - DWORD cpus = system_info.NumberOfProcessors; + DWORD cpus = 0; + DWORD size = 0; + SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *info; - FIXME("(0x%x): semi-stub, returning %u\n", group, cpus); + TRACE("(0x%x)\n", group); + + if (!GetLogicalProcessorInformationEx(RelationGroup, NULL, &size)) return 0; + if (!(info = HeapAlloc(GetProcessHeap(), 0, size))) return 0; + if (!GetLogicalProcessorInformationEx(RelationGroup, info, &size)) + { + HeapFree(GetProcessHeap(), 0, info); + return 0; + } + + if (group == ALL_PROCESSOR_GROUPS) + { + for (group = 0; group < info->Group.ActiveGroupCount; group++) + cpus += info->Group.GroupInfo[group].ActiveProcessorCount; + } + else + { + if (group < info->Group.ActiveGroupCount) + cpus = info->Group.GroupInfo[group].ActiveProcessorCount; + } + + HeapFree(GetProcessHeap(), 0, info); return cpus; }

1 0

Alex Henrie : kernel32: Reimplement GetActiveProcessorGroupCount on top of GetLogicalProcessorInformationEx.
by Alexandre Julliard 25 May '21

25 May '21

Module: wine Branch: master Commit: 59e9a8ecf3b3ec5e81aa12fa53418ee036710ffe URL: https://source.winehq.org/git/wine.git/?a=commit;h=59e9a8ecf3b3ec5e81aa12fa… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon May 24 02:10:41 2021 -0600 kernel32: Reimplement GetActiveProcessorGroupCount on top of GetLogicalProcessorInformationEx. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 9041b00d512..710dfad8b7a 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -609,8 +609,24 @@ HRESULT WINAPI RegisterApplicationRecoveryCallback(APPLICATION_RECOVERY_CALLBACK */ WORD WINAPI GetActiveProcessorGroupCount(void) { - FIXME("semi-stub, always returning 1\n"); - return 1; + WORD groups; + DWORD size = 0; + SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *info; + + TRACE("()\n"); + + if (!GetLogicalProcessorInformationEx(RelationGroup, NULL, &size)) return 0; + if (!(info = HeapAlloc(GetProcessHeap(), 0, size))) return 0; + if (!GetLogicalProcessorInformationEx(RelationGroup, info, &size)) + { + HeapFree(GetProcessHeap(), 0, info); + return 0; + } + + groups = info->Group.ActiveGroupCount; + + HeapFree(GetProcessHeap(), 0, info); + return groups; } /***********************************************************************

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
77
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2021