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

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

25 May '20

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

Paul Gofman : ntdll: Fill ActiveProcessorCount field in _KUSER_SHARED_DATA.
by Alexandre Julliard 25 May '20

25 May '20

Module: wine Branch: master Commit: 1306bd941b7052a97910795a86aeae873f4fcb08 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1306bd941b7052a97910795a… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon May 25 18:42:01 2020 +0300 ntdll: Fill ActiveProcessorCount 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 3b0d74daeb..59c2224816 100644 --- a/dlls/ntdll/tests/virtual.c +++ b/dlls/ntdll/tests/virtual.c @@ -528,6 +528,9 @@ static void test_user_shared_data(void) ok(user_shared_data->ProcessorFeatures[PF_RDTSC_INSTRUCTION_AVAILABLE] /* Supported since Pentium CPUs. */, "_RDTSC not available.\n"); #endif + ok(user_shared_data->ActiveProcessorCount == NtCurrentTeb()->Peb->NumberOfProcessors + || broken(!user_shared_data->ActiveProcessorCount) /* before Win7 */, + "Got unexpected ActiveProcessorCount %u.\n", user_shared_data->ActiveProcessorCount); } START_TEST(virtual) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 19e09c7e38..78574d0c5d 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -238,6 +238,7 @@ static void fill_user_shared_data( struct _KUSER_SHARED_DATA *data ) features[PF_ARM_V8_CRYPTO_INSTRUCTIONS_AVAILABLE] = !!(sci.FeatureSet & CPU_FEATURE_ARM_V8_CRYPTO); break; } + data->ActiveProcessorCount = NtCurrentTeb()->Peb->NumberOfProcessors; } HANDLE user_shared_data_init_done(void)

1 0

Paul Gofman : ntdll: Fill ActiveGroupCount field in _KUSER_SHARED_DATA.
by Alexandre Julliard 25 May '20

25 May '20

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

Jacek Caban : rpcndr.h: Avoid error_status_t redefinition.
by Alexandre Julliard 25 May '20

25 May '20

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

Alexandre Julliard : server: Update shared user data timestamps on every request.
by Alexandre Julliard 25 May '20

25 May '20

Module: wine Branch: master Commit: 1ae10889647c1c84c36660749508a42e99e64a5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ae10889647c1c84c3666074… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 25 20:25:50 2020 +0200 server: Update shared user data timestamps on every request. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/fd.c | 50 +++++++++++++++++++++++++++++++++++++++++++---- server/file.h | 1 + server/mapping.c | 59 ++++---------------------------------------------------- 3 files changed, 51 insertions(+), 59 deletions(-) diff --git a/server/fd.c b/server/fd.c index 39fb419f25..06d1d81bdb 100644 --- a/server/fd.c +++ b/server/fd.c @@ -104,6 +104,7 @@ #include "winternl.h" #include "winioctl.h" +#include "ddk/wdm.h" #if defined(HAVE_SYS_EPOLL_H) && defined(HAVE_EPOLL_CREATE) # include <sys/epoll.h> @@ -374,6 +375,46 @@ static struct list rel_timeout_list = LIST_INIT(rel_timeout_list); /* sorted rel timeout_t current_time; timeout_t monotonic_time; +struct _KUSER_SHARED_DATA *user_shared_data = NULL; +static const int user_shared_data_timeout = 16; + +static void set_user_shared_data_time(void) +{ + timeout_t tick_count = monotonic_time / 10000; + + /* on X86 there should be total store order guarantees, so volatile is enough + * to ensure the stores aren't reordered by the compiler, and then they will + * always be seen in-order from other CPUs. On other archs, we need atomic + * intrinsics to guarantee that. */ +#if defined(__i386__) || defined(__x86_64__) + user_shared_data->SystemTime.High2Time = current_time >> 32; + user_shared_data->SystemTime.LowPart = current_time; + user_shared_data->SystemTime.High1Time = current_time >> 32; + + user_shared_data->InterruptTime.High2Time = monotonic_time >> 32; + user_shared_data->InterruptTime.LowPart = monotonic_time; + user_shared_data->InterruptTime.High1Time = monotonic_time >> 32; + + user_shared_data->TickCount.High2Time = tick_count >> 32; + user_shared_data->TickCount.LowPart = tick_count; + user_shared_data->TickCount.High1Time = tick_count >> 32; + *(volatile ULONG *)&user_shared_data->TickCountLowDeprecated = tick_count; +#else + __atomic_store_n(&user_shared_data->SystemTime.High2Time, current_time >> 32, __ATOMIC_SEQ_CST); + __atomic_store_n(&user_shared_data->SystemTime.LowPart, current_time, __ATOMIC_SEQ_CST); + __atomic_store_n(&user_shared_data->SystemTime.High1Time, current_time >> 32, __ATOMIC_SEQ_CST); + + __atomic_store_n(&user_shared_data->InterruptTime.High2Time, monotonic_time >> 32, __ATOMIC_SEQ_CST); + __atomic_store_n(&user_shared_data->InterruptTime.LowPart, monotonic_time, __ATOMIC_SEQ_CST); + __atomic_store_n(&user_shared_data->InterruptTime.High1Time, monotonic_time >> 32, __ATOMIC_SEQ_CST); + + __atomic_store_n(&user_shared_data->TickCount.High2Time, tick_count >> 32, __ATOMIC_SEQ_CST); + __atomic_store_n(&user_shared_data->TickCount.LowPart, tick_count, __ATOMIC_SEQ_CST); + __atomic_store_n(&user_shared_data->TickCount.High1Time, tick_count >> 32, __ATOMIC_SEQ_CST); + __atomic_store_n(&user_shared_data->TickCountLowDeprecated, tick_count, __ATOMIC_SEQ_CST); +#endif +} + void set_current_time(void) { static const timeout_t ticks_1601_to_1970 = (timeout_t)86400 * (369 * 365 + 89) * TICKS_PER_SEC; @@ -381,6 +422,7 @@ void set_current_time(void) gettimeofday( &now, NULL ); current_time = (timeout_t)now.tv_sec * TICKS_PER_SEC + now.tv_usec * 10 + ticks_1601_to_1970; monotonic_time = monotonic_counter(); + if (user_shared_data) set_user_shared_data_time(); } /* add a timeout user */ @@ -865,10 +907,11 @@ static void remove_poll_user( struct fd *fd, int user ) /* process pending timeouts and return the time until the next timeout, in milliseconds */ static int get_next_timeout(void) { + int ret = user_shared_data ? user_shared_data_timeout : -1; + if (!list_empty( &abs_timeout_list ) || !list_empty( &rel_timeout_list )) { struct list expired_list, *ptr; - int ret = -1; /* first remove all expired timers from the list */ @@ -911,7 +954,7 @@ static int get_next_timeout(void) struct timeout_user *timeout = LIST_ENTRY( ptr, struct timeout_user, entry ); int diff = (timeout->when - current_time + 9999) / 10000; if (diff < 0) diff = 0; - ret = diff; + if (ret == -1 || diff < ret) ret = diff; } if ((ptr = list_head( &rel_timeout_list )) != NULL) @@ -921,9 +964,8 @@ static int get_next_timeout(void) if (diff < 0) diff = 0; if (ret == -1 || diff < ret) ret = diff; } - return ret; } - return -1; /* no pending timeouts */ + return ret; } /* server main poll() loop */ diff --git a/server/file.h b/server/file.h index 4c454de4d4..aa5f6216c2 100644 --- a/server/file.h +++ b/server/file.h @@ -130,6 +130,7 @@ static inline struct fd *get_obj_fd( struct object *obj ) { return obj->ops->get struct timeout_user; extern timeout_t current_time; extern timeout_t monotonic_time; +extern struct _KUSER_SHARED_DATA *user_shared_data; #define TICKS_PER_SEC 10000000 diff --git a/server/mapping.c b/server/mapping.c index ffd20450df..0fcada7f8f 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -945,66 +945,15 @@ int get_page_size(void) return page_mask + 1; } -static KSHARED_USER_DATA *kusd = MAP_FAILED; -static const timeout_t kusd_timeout = 16 * -TICKS_PER_SEC / 1000; - -static void kusd_set_current_time( void *private ) -{ - ULONG system_time_high = current_time >> 32; - ULONG system_time_low = current_time & 0xffffffff; - ULONG interrupt_time_high = monotonic_time >> 32; - ULONG interrupt_time_low = monotonic_time & 0xffffffff; - ULONG tick_count_high = (monotonic_time * 1000 / TICKS_PER_SEC) >> 32; - ULONG tick_count_low = (monotonic_time * 1000 / TICKS_PER_SEC) & 0xffffffff; - KSHARED_USER_DATA *ptr = kusd; - - add_timeout_user( kusd_timeout, kusd_set_current_time, NULL ); - - /* on X86 there should be total store order guarantees, so volatile is enough - * to ensure the stores aren't reordered by the compiler, and then they will - * always be seen in-order from other CPUs. On other archs, we need atomic - * intrinsics to guarantee that. */ -#if defined(__i386__) || defined(__x86_64__) - ptr->SystemTime.High2Time = system_time_high; - ptr->SystemTime.LowPart = system_time_low; - ptr->SystemTime.High1Time = system_time_high; - - ptr->InterruptTime.High2Time = interrupt_time_high; - ptr->InterruptTime.LowPart = interrupt_time_low; - ptr->InterruptTime.High1Time = interrupt_time_high; - - ptr->TickCount.High2Time = tick_count_high; - ptr->TickCount.LowPart = tick_count_low; - ptr->TickCount.High1Time = tick_count_high; - *(volatile ULONG *)&ptr->TickCountLowDeprecated = tick_count_low; -#else - __atomic_store_n(&ptr->SystemTime.High2Time, system_time_high, __ATOMIC_SEQ_CST); - __atomic_store_n(&ptr->SystemTime.LowPart, system_time_low, __ATOMIC_SEQ_CST); - __atomic_store_n(&ptr->SystemTime.High1Time, system_time_high, __ATOMIC_SEQ_CST); - - __atomic_store_n(&ptr->InterruptTime.High2Time, interrupt_time_high, __ATOMIC_SEQ_CST); - __atomic_store_n(&ptr->InterruptTime.LowPart, interrupt_time_low, __ATOMIC_SEQ_CST); - __atomic_store_n(&ptr->InterruptTime.High1Time, interrupt_time_high, __ATOMIC_SEQ_CST); - - __atomic_store_n(&ptr->TickCount.High2Time, tick_count_high, __ATOMIC_SEQ_CST); - __atomic_store_n(&ptr->TickCount.LowPart, tick_count_low, __ATOMIC_SEQ_CST); - __atomic_store_n(&ptr->TickCount.High1Time, tick_count_high, __ATOMIC_SEQ_CST); - __atomic_store_n(&ptr->TickCountLowDeprecated, tick_count_low, __ATOMIC_SEQ_CST); -#endif -} - void init_kusd_mapping( struct mapping *mapping ) { - if (kusd != MAP_FAILED) return; + void *ptr; + if (user_shared_data) return; grab_object( mapping ); make_object_static( &mapping->obj ); - - if ((kusd = mmap( NULL, mapping->size, PROT_WRITE, MAP_SHARED, - get_unix_fd( mapping->fd ), 0 )) == MAP_FAILED) - set_error( STATUS_NO_MEMORY ); - else - kusd_set_current_time( NULL ); + ptr = mmap( NULL, mapping->size, PROT_WRITE, MAP_SHARED, get_unix_fd( mapping->fd ), 0 ); + if (ptr != MAP_FAILED) user_shared_data = ptr; } /* create a file mapping */

1 0

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

25 May '20

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 : ntoskrnl.exe: Return zero for unknown msr registers.
by Alexandre Julliard 25 May '20

25 May '20

Module: wine Branch: master Commit: 6ceb6c7f47c225c117dd514ffdb15a0cb4317753 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ceb6c7f47c225c117dd514f… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon May 25 11:19:30 2020 +0300 ntoskrnl.exe: Return zero for unknown msr registers. rdmsr should fault if called with the register not supported by CPU. But until we want to support the full range of CPU specific registers returning zero is probably a better fallback. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/instr.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/instr.c b/dlls/ntoskrnl.exe/instr.c index 68140c09ef..44f2ed4f51 100644 --- a/dlls/ntoskrnl.exe/instr.c +++ b/dlls/ntoskrnl.exe/instr.c @@ -815,7 +815,11 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) context->Rax = (ULONG)syscall_address; break; } - default: return ExceptionContinueSearch; + default: + FIXME("reg %#x, returning 0.\n", reg); + context->Rdx = 0; + context->Rax = 0; + break; } context->Rip += prefixlen + 2; return ExceptionContinueExecution;

1 0

Paul Gofman : ntoskrnl.exe: Add KdRefreshDebuggerNotPresent() function.
by Alexandre Julliard 25 May '20

25 May '20

Module: wine Branch: master Commit: b91b4b6de165c93a64cbff322287746ff5e032ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=b91b4b6de165c93a64cbff32… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri May 22 20:37:40 2020 +0300 ntoskrnl.exe: Add KdRefreshDebuggerNotPresent() function. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 7 +++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + 2 files changed, 8 insertions(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 316bc8f032..f1259797f8 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3957,3 +3957,10 @@ BOOLEAN WINAPI RtlIsNtDdiVersionAvailable(ULONG version) FIXME("stub: %d\n", version); return FALSE; } + +BOOLEAN WINAPI KdRefreshDebuggerNotPresent(void) +{ + TRACE(".\n"); + + return !KdDebuggerEnabled; +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 7d6baae31f..0490dcd691 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -517,6 +517,7 @@ @ stub KdEnteredDebugger @ stub KdPollBreakIn @ stub KdPowerTransition +@ stdcall KdRefreshDebuggerNotPresent() @ stub Ke386CallBios @ stdcall Ke386IoSetAccessProcess(ptr long) @ stub Ke386QueryIoAccessMap

1 0

Paul Gofman : include/ddk: Add prototype for KeQueryActiveProcessors().
by Alexandre Julliard 25 May '20

25 May '20

Module: wine Branch: master Commit: 1a1e2b81d2cc9fceab786f232602b640a84c0d32 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a1e2b81d2cc9fceab786f23… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri May 22 20:37:41 2020 +0300 include/ddk: Add prototype for KeQueryActiveProcessors(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ddk/wdm.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 707eca0b32..5b1f19e4f1 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); +KAFFINITY WINAPI KeQueryActiveProcessors(void); void WINAPI KeQuerySystemTime(LARGE_INTEGER*); void WINAPI KeQueryTickCount(LARGE_INTEGER*); ULONG WINAPI KeQueryTimeIncrement(void);

1 0

Paul Gofman : include: Add prototype for GetActiveProcessorCount().
by Alexandre Julliard 25 May '20

25 May '20

Module: wine Branch: master Commit: e3c0474b74df248ce753c15e97bacb5a2aa34987 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e3c0474b74df248ce753c15e… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri May 22 20:37:42 2020 +0300 include: Add prototype for GetActiveProcessorCount(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winbase.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/winbase.h b/include/winbase.h index 78ed660cc7..39a4a9c9ac 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2079,6 +2079,7 @@ WINBASEAPI BOOL WINAPI FreeResource(HGLOBAL); WINADVAPI PVOID WINAPI FreeSid(PSID); WINADVAPI BOOL WINAPI GetAce(PACL,DWORD,LPVOID*); WINADVAPI BOOL WINAPI GetAclInformation(PACL,LPVOID,DWORD,ACL_INFORMATION_CLASS); +WINBASEAPI DWORD WINAPI GetActiveProcessorCount(WORD); WINBASEAPI HRESULT WINAPI GetApplicationRestartSettings(HANDLE,WCHAR*,DWORD*,DWORD*); WINBASEAPI UINT WINAPI GetAtomNameA(ATOM,LPSTR,INT); WINBASEAPI UINT WINAPI GetAtomNameW(ATOM,LPWSTR,INT);

1 0