May 2020 - Wine-Commits - list.winehq.org

Jacek Caban : rpcndr.h: Avoid error_status_t redefinition.
by Alexandre Julliard May 25, 2020

May 25, 2020

Module: wine Branch: master Commit: 4444d19ee37cfc20504dae2ea807458367410544 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4444d19ee37cfc20504dae2e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 25 19:43:55 2020 +0200 rpcndr.h: Avoid error_status_t redefinition. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/rpcndr.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/rpcndr.h b/include/rpcndr.h index 27b9096827..13711f2f2d 100644 --- a/include/rpcndr.h +++ b/include/rpcndr.h @@ -444,7 +444,11 @@ typedef struct _FULL_PTR_XLAT_TABLES { struct IRpcStubBuffer; +#ifndef _ERROR_STATUS_T_DEFINED typedef ULONG error_status_t; +#define _ERROR_STATUS_T_DEFINED +#endif + typedef void * NDR_CCONTEXT; typedef struct _SCONTEXT_QUEUE {

1 0

Paul Gofman : ntdll: Fill ActiveGroupCount field in _KUSER_SHARED_DATA.
by Alexandre Julliard May 25, 2020

May 25, 2020

Module: wine Branch: master Commit: ca56ef6739383350f2bff6a8be174e1181ed6e1f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca56ef6739383350f2bff6a8… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon May 25 18:42:02 2020 +0300 ntdll: Fill ActiveGroupCount field in _KUSER_SHARED_DATA. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/virtual.c | 3 +++ dlls/ntdll/thread.c | 1 + 2 files changed, 4 insertions(+) diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c index 59c2224816..beab744178 100644 --- a/dlls/ntdll/tests/virtual.c +++ b/dlls/ntdll/tests/virtual.c @@ -531,6 +531,9 @@ static void test_user_shared_data(void) ok(user_shared_data->ActiveProcessorCount == NtCurrentTeb()->Peb->NumberOfProcessors || broken(!user_shared_data->ActiveProcessorCount) /* before Win7 */, "Got unexpected ActiveProcessorCount %u.\n", user_shared_data->ActiveProcessorCount); + ok(user_shared_data->ActiveGroupCount == 1 + || broken(!user_shared_data->ActiveGroupCount) /* before Win7 */, + "Got unexpected ActiveGroupCount %u.\n", user_shared_data->ActiveGroupCount); } START_TEST(virtual) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 78574d0c5d..3d370f7a98 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -239,6 +239,7 @@ static void fill_user_shared_data( struct _KUSER_SHARED_DATA *data ) break; } data->ActiveProcessorCount = NtCurrentTeb()->Peb->NumberOfProcessors; + data->ActiveGroupCount = 1; } HANDLE user_shared_data_init_done(void)

1 0

Nikolay Sivov : dwrite: Fix array indexing when merging features.
by Alexandre Julliard May 25, 2020

May 25, 2020

Module: wine Branch: master Commit: 4490f8a2745ecf7d78425090b889a6af00e7e1a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4490f8a2745ecf7d78425090… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 25 14:54:27 2020 +0300 dwrite: Fix array indexing when merging features. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/shape.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/shape.c b/dlls/dwrite/shape.c index 3d25898cf7..77c5ba1f8a 100644 --- a/dlls/dwrite/shape.c +++ b/dlls/dwrite/shape.c @@ -231,7 +231,7 @@ static int features_sorting_compare(const void *a, const void *b) static void shape_merge_features(struct scriptshaping_context *context, struct shaping_features *features) { const DWRITE_TYPOGRAPHIC_FEATURES **user_features = context->user_features.features; - unsigned int j = 0, i; + unsigned int i, j; /* For now only consider global, enabled user features. */ if (user_features && context->user_features.range_lengths) @@ -250,7 +250,7 @@ static void shape_merge_features(struct scriptshaping_context *context, struct s /* Sort and merge duplicates. */ qsort(features->features, features->count, sizeof(*features->features), features_sorting_compare); - for (i = 1; i < features->count; ++i) + for (i = 1, j = 0; i < features->count; ++i) { if (features->features[i].tag != features->features[j].tag) features->features[++j] = features->features[i];

1 0

Aaro Altonen : msado15: Implement _Command get/put CommandType.
by Alexandre Julliard May 25, 2020

May 25, 2020

Module: wine Branch: master Commit: 6255b031af691988f96c4e648c4f0975575f0487 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6255b031af691988f96c4e64… Author: Aaro Altonen <a.altonen(a)hotmail.com> Date: Mon May 25 17:01:30 2020 +0300 msado15: Implement _Command get/put CommandType. Signed-off-by: Aaro Altonen <a.altonen(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/command.c | 34 ++++++++++++++++++++++++++++------ dlls/msado15/tests/msado15.c | 13 +++++++++++++ 2 files changed, 41 insertions(+), 6 deletions(-) diff --git a/dlls/msado15/command.c b/dlls/msado15/command.c index a96fd73990..9081f1554f 100644 --- a/dlls/msado15/command.c +++ b/dlls/msado15/command.c @@ -31,8 +31,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(msado15); struct command { - _Command Command_iface; - LONG ref; + _Command Command_iface; + LONG ref; + CommandTypeEnum type; }; static inline struct command *impl_from_Command( _Command *iface ) @@ -193,14 +194,34 @@ static HRESULT WINAPI command_get_Parameters( _Command *iface, Parameters **para static HRESULT WINAPI command_put_CommandType( _Command *iface, CommandTypeEnum type ) { - FIXME( "%p, %d\n", iface, type ); - return E_NOTIMPL; + struct command *command = impl_from_Command( iface ); + + TRACE( "%p, %d\n", iface, type ); + + switch (type) + { + case adCmdUnspecified: + case adCmdUnknown: + case adCmdText: + case adCmdTable: + case adCmdStoredProc: + case adCmdFile: + case adCmdTableDirect: + command->type = type; + return S_OK; + } + + return MAKE_ADO_HRESULT( adErrInvalidArgument ); } static HRESULT WINAPI command_get_CommandType( _Command *iface, CommandTypeEnum *type ) { - FIXME( "%p, %p\n", iface, type ); - return E_NOTIMPL; + struct command *command = impl_from_Command( iface ); + + TRACE( "%p, %p\n", iface, type ); + + *type = command->type; + return S_OK; } static HRESULT WINAPI command_get_Name(_Command *iface, BSTR *name) @@ -305,6 +326,7 @@ HRESULT Command_create( void **obj ) if (!(command = heap_alloc( sizeof(*command) ))) return E_OUTOFMEMORY; command->Command_iface.lpVtbl = &command_vtbl; + command->type = adCmdUnknown; command->ref = 1; *obj = &command->Command_iface; diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index fb77936bba..b17430a93d 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -742,6 +742,7 @@ static void test_Command(void) _ADO *ado; Command15 *command15; Command25 *command25; + CommandTypeEnum cmd_type = adCmdUnspecified; hr = CoCreateInstance( &CLSID_Command, NULL, CLSCTX_INPROC_SERVER, &IID__Command, (void **)&command ); ok( hr == S_OK, "got %08x\n", hr ); @@ -758,6 +759,18 @@ static void test_Command(void) ok( hr == S_OK, "got %08x\n", hr ); Command25_Release( command25 ); + hr = _Command_get_CommandType( command, &cmd_type ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( cmd_type == adCmdUnknown, "got %08x\n", cmd_type ); + + _Command_put_CommandType( command, adCmdText ); + hr = _Command_get_CommandType( command, &cmd_type ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( cmd_type == adCmdText, "got %08x\n", cmd_type ); + + hr = _Command_put_CommandType( command, 0xdeadbeef ); + ok( hr == MAKE_ADO_HRESULT( adErrInvalidArgument ), "got %08x\n", hr ); + _Command_Release( command ); }

1 0

Paul Gofman : include/ddk: Fix struct _KUSER_SHARED_DATA definition.
by Alexandre Julliard May 25, 2020

May 25, 2020

Module: wine Branch: master Commit: 0def647b6e5d9dc1648b0021e6a7a40bfdaaf2fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=0def647b6e5d9dc1648b0021… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon May 25 18:42:00 2020 +0300 include/ddk: Fix struct _KUSER_SHARED_DATA definition. HeapTracingPid, CritSecTracingPid are present in NT 6.0. But NT 6.0 has UserModeGlobalLogger array size of 8 instead of 16. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ddk/wdm.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 790d1a1247..1f80a5af29 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1258,8 +1258,6 @@ typedef struct _KUSER_SHARED_DATA { ULONG EnclaveFeatureMask[4]; /* 0x36c */ ULONG TelemetryCoverageRound; /* 0x37c */ USHORT UserModeGlobalLogger[16]; /* 0x380 */ - ULONG HeapTracingPid[2]; /* 0x390 */ - ULONG CritSecTracingPid[2]; /* 0x398 */ ULONG ImageFileExecutionOptions; /* 0x3a0 */ ULONG LangGenerationCount; /* 0x3a4 */ ULONG ActiveProcessorAffinity; /* 0x3a8 */

1 0

Nikolay Sivov : dwrite: Set glyph class for all initial glyphs.
by Alexandre Julliard May 25, 2020

May 25, 2020

Module: wine Branch: master Commit: a99e46654721da84e818b2bae9904cff8178d34e URL: https://source.winehq.org/git/wine.git/?a=commit;h=a99e46654721da84e818b2ba… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 25 14:54:28 2020 +0300 dwrite: Set glyph class for all initial glyphs. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/opentype.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 4cf1523f47..dd25c619c1 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -465,6 +465,7 @@ struct scriptshaping_cache struct shaping_glyph_info { unsigned int mask; + unsigned int props; }; struct scriptshaping_context diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 77ae1e8447..814e65b6cc 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -494,6 +494,13 @@ enum gsub_gpos_lookup_flags LOOKUP_FLAG_IGNORE_MASK = 0xe, }; +enum glyph_prop_flags +{ + GLYPH_PROP_BASE = LOOKUP_FLAG_IGNORE_BASE, + GLYPH_PROP_LIGATURE = LOOKUP_FLAG_IGNORE_LIGATURES, + GLYPH_PROP_MARK = LOOKUP_FLAG_IGNORE_MARKS, +}; + enum gpos_lookup_type { GPOS_LOOKUP_SINGLE_ADJUSTMENT = 1, @@ -4684,6 +4691,36 @@ static unsigned int unicode_get_mirrored_char(unsigned int codepoint) return mirror ? mirror : codepoint; } +static void opentype_subst_set_glyph_props(struct scriptshaping_context *context, unsigned int g) +{ + struct scriptshaping_cache *cache = context->cache; + unsigned int glyph_class = 0, props; + + if (cache->gdef.classdef) + { + glyph_class = opentype_layout_get_glyph_class(&cache->gdef.table, cache->gdef.classdef, context->u.subst.glyphs[g]); + } + + switch (glyph_class) + { + case GDEF_CLASS_BASE: + props = GLYPH_PROP_BASE; + break; + case GDEF_CLASS_LIGATURE: + props = GLYPH_PROP_LIGATURE; + break; + case GDEF_CLASS_MARK: + props = GLYPH_PROP_MARK; + context->u.subst.glyph_props[g].isDiacritic = 1; + context->u.subst.glyph_props[g].isZeroWidthSpace = 1; + break; + default: + props = 0; + } + + context->glyph_infos[g].props = props; +} + static void opentype_get_nominal_glyphs(struct scriptshaping_context *context, const struct shaping_features *features) { unsigned int rtlm_mask = shaping_features_get_mask(features, DWRITE_MAKE_OPENTYPE_TAG('r','t','l','m'), NULL); @@ -4724,6 +4761,7 @@ static void opentype_get_nominal_glyphs(struct scriptshaping_context *context, c context->u.subst.glyphs[g] = font->get_glyph(context->cache->context, codepoint); context->u.subst.glyph_props[g].justification = SCRIPT_JUSTIFY_CHARACTER; context->u.subst.glyph_props[g].isClusterStart = 1; + opentype_subst_set_glyph_props(context, g); context->glyph_count++; clustermap[i] = i;

1 0

Nikolay Sivov : dwrite: Use prefetched glyph class to match with lookup mask.
by Alexandre Julliard May 25, 2020

May 25, 2020

Module: wine Branch: master Commit: 7f427f258d82d80fb903147dc16fbafe1eda90bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f427f258d82d80fb903147d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 25 14:54:30 2020 +0300 dwrite: Use prefetched glyph class to match with lookup mask. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 0b9c6067b5..bb62488330 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -3425,21 +3425,21 @@ static void glyph_iterator_init(struct scriptshaping_context *context, unsigned iter->len = len; } -static BOOL glyph_iterator_match(const struct glyph_iterator *iter) +static BOOL lookup_is_glyph_match(unsigned int glyph_props, unsigned int lookup_flags) { - struct scriptshaping_cache *cache = iter->context->cache; + if (glyph_props & lookup_flags & LOOKUP_FLAG_IGNORE_MASK) + return FALSE; - if (cache->gdef.classdef) - { - unsigned int glyph_class = opentype_layout_get_glyph_class(&cache->gdef.table, cache->gdef.classdef, - iter->context->u.pos.glyphs[iter->pos]); - if ((1 << glyph_class) & iter->flags & LOOKUP_FLAG_IGNORE_MASK) - return FALSE; - } + /* FIXME: match mark properties */ return TRUE; } +static BOOL glyph_iterator_match(const struct glyph_iterator *iter) +{ + return lookup_is_glyph_match(iter->context->glyph_infos[iter->pos].props, iter->flags); +} + static BOOL glyph_iterator_next(struct glyph_iterator *iter) { while (iter->pos + iter->len < iter->context->glyph_count)

1 0

Damjan Jovanovic : libwine: Fix a regression in the return value check for mmap() on FreeBSD.
by Alexandre Julliard May 25, 2020

May 25, 2020

Module: wine Branch: master Commit: e0138c4a6a7a87f1d25badd43e05490e706bc666 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0138c4a6a7a87f1d25badd4… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sat May 23 11:01:49 2020 +0200 libwine: Fix a regression in the return value check for mmap() on FreeBSD. This fixes a regression from my previous patch in commit 55ba3648379d90642f174e74809b84130d6d1ddc, which was checking for mmap() returning NULL instead of MAP_FAILED. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49225 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/wine/mmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/wine/mmap.c b/libs/wine/mmap.c index 0fbe2efea7..af91b3e352 100644 --- a/libs/wine/mmap.c +++ b/libs/wine/mmap.c @@ -215,7 +215,7 @@ void *wine_anon_mmap( void *start, size_t size, int prot, int flags ) /* If available, this will attempt a fixed mapping in-kernel */ flags |= MAP_TRYFIXED; #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) - if ( start && mmap( start, size, prot, flags | MAP_FIXED | MAP_EXCL, get_fdzero(), 0 ) ) + if ( start && mmap( start, size, prot, flags | MAP_FIXED | MAP_EXCL, get_fdzero(), 0 ) != MAP_FAILED ) return start; #elif defined(__svr4__) || defined(__NetBSD__) || defined(__APPLE__) if ( try_mmap_fixed( start, size, prot, flags, get_fdzero(), 0 ) )

1 0

Matteo Bruni : ntdll: Use memcpy() in set_float_reg().
by Alexandre Julliard May 25, 2020

May 25, 2020

Module: wine Branch: master Commit: 2e5c2c7cdb11cae3a2b78bb0794368f431538efb URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e5c2c7cdb11cae3a2b78bb0… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri May 22 20:39:59 2020 +0200 ntdll: Use memcpy() in set_float_reg(). The source address might not be aligned although the compiler can expect alignment when using a plain assignment. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 31af1e98d3..e92470e960 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -3298,7 +3298,8 @@ static void set_int_reg( CONTEXT *context, KNONVOLATILE_CONTEXT_POINTERS *ctx_pt static void set_float_reg( CONTEXT *context, KNONVOLATILE_CONTEXT_POINTERS *ctx_ptr, int reg, M128A *val ) { - *(&context->u.s.Xmm0 + reg) = *val; + /* Use a memcpy() to avoid issues if val is misaligned. */ + memcpy(&context->u.s.Xmm0 + reg, val, sizeof(*val)); if (ctx_ptr) ctx_ptr->u.FloatingContext[reg] = val; }

1 0

Paul Gofman : ntoskrnl.exe: Add KeQueryActiveProcessorCountEx() function.
by Alexandre Julliard May 25, 2020

May 25, 2020

Module: wine Branch: master Commit: 2716e215df3aff2ccf2635289d10b938fdfc2069 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2716e215df3aff2ccf263528… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri May 22 20:37:43 2020 +0300 ntoskrnl.exe: Add KeQueryActiveProcessorCountEx() function. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 6 ++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + dlls/ntoskrnl.exe/tests/driver.c | 31 +++++++++++++++++++++++++++++++ include/ddk/wdm.h | 1 + include/winnt.h | 2 ++ 5 files changed, 41 insertions(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index f1259797f8..6d9ae44808 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2385,6 +2385,12 @@ KAFFINITY WINAPI KeQueryActiveProcessors( void ) return AffinityMask; } +ULONG WINAPI KeQueryActiveProcessorCountEx(USHORT group_number) +{ + TRACE("group_number %u.\n", group_number); + + return GetActiveProcessorCount(group_number); +} /********************************************************************** * KeQueryInterruptTime (NTOSKRNL.EXE.@) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 0490dcd691..f25ab9c5e0 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -587,6 +587,7 @@ @ stub KeProfileInterruptWithSource @ stub KePulseEvent @ stdcall KeQueryActiveProcessors() +@ stdcall KeQueryActiveProcessorCountEx(long) @ stdcall KeQueryInterruptTime() @ stub KeQueryPriorityThread @ stub KeQueryRuntimeThread diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 10f3865515..65be4a8d35 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -1710,6 +1710,36 @@ static void test_executable_pool(void) } #endif +static void test_affinity(void) +{ + ULONG (WINAPI *pKeQueryActiveProcessorCountEx)(USHORT); + KAFFINITY (WINAPI *pKeQueryActiveProcessors)(void); + ULONG cpu_count, count; + KAFFINITY mask; + + pKeQueryActiveProcessorCountEx = get_proc_address("KeQueryActiveProcessorCountEx"); + if (!pKeQueryActiveProcessorCountEx) + { + win_skip("KeQueryActiveProcessorCountEx is not available.\n"); + return; + } + + pKeQueryActiveProcessors = get_proc_address("KeQueryActiveProcessors"); + ok(!!pKeQueryActiveProcessors, "KeQueryActiveProcessors is not available.\n"); + + count = pKeQueryActiveProcessorCountEx(1); + todo_wine ok(!count, "Got unexpected count %u.\n", count); + + cpu_count = pKeQueryActiveProcessorCountEx(0); + ok(cpu_count, "Got unexpected cpu_count %u.\n", cpu_count); + + count = pKeQueryActiveProcessorCountEx(ALL_PROCESSOR_GROUPS); + ok(count == cpu_count, "Got unexpected count %u.\n", count); + + mask = pKeQueryActiveProcessors(); + ok(mask == ~((~0u) << cpu_count), "Got unexpected mask %#lx.\n", mask); +} + static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *stack) { ULONG length = stack->Parameters.DeviceIoControl.OutputBufferLength; @@ -1763,6 +1793,7 @@ static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *st #if defined(__i386__) || defined(__x86_64__) test_executable_pool(); #endif + test_affinity(); if (main_test_work_item) return STATUS_UNEXPECTED_IO_ERROR; diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 5b1f19e4f1..790d1a1247 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1696,6 +1696,7 @@ void WINAPI KeInitializeSpinLock(KSPIN_LOCK*); void WINAPI KeInitializeTimerEx(PKTIMER,TIMER_TYPE); void WINAPI KeInitializeTimer(KTIMER*); void WINAPI KeLeaveCriticalRegion(void); +ULONG WINAPI KeQueryActiveProcessorCountEx(USHORT); KAFFINITY WINAPI KeQueryActiveProcessors(void); void WINAPI KeQuerySystemTime(LARGE_INTEGER*); void WINAPI KeQueryTickCount(LARGE_INTEGER*); diff --git a/include/winnt.h b/include/winnt.h index 1f0a7e344e..3e3ac338bc 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6501,6 +6501,8 @@ typedef struct _GROUP_AFFINITY WORD Reserved[3]; } GROUP_AFFINITY, *PGROUP_AFFINITY; +#define ALL_PROCESSOR_GROUPS 0xffff + typedef struct _PROCESSOR_NUMBER { WORD Group;

1 0