Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-cw
Commits
daa1886a
Commit
daa1886a
authored
Aug 17, 2021
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ntdll: Add a stub for NtCallbackReturn().
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
4a6fb030
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
46 additions
and
1 deletion
+46
-1
ntdll.spec
dlls/ntdll/ntdll.spec
+1
-1
exception.c
dlls/ntdll/tests/exception.c
+9
-0
signal_arm.c
dlls/ntdll/unix/signal_arm.c
+9
-0
signal_arm64.c
dlls/ntdll/unix/signal_arm64.c
+9
-0
signal_i386.c
dlls/ntdll/unix/signal_i386.c
+9
-0
signal_x86_64.c
dlls/ntdll/unix/signal_x86_64.c
+9
-0
No files found.
dlls/ntdll/ntdll.spec
View file @
daa1886a
...
...
@@ -145,7 +145,7 @@
@ stdcall -syscall NtAllocateVirtualMemoryEx(long ptr ptr long long ptr long)
@ stdcall -syscall NtAreMappedFilesTheSame(ptr ptr)
@ stdcall -syscall NtAssignProcessToJobObject(long long)
# @ stub NtCallbackReturn
@ stdcall -syscall NtCallbackReturn(ptr long long)
# @ stub NtCancelDeviceWakeupRequest
@ stdcall -syscall NtCancelIoFile(long ptr)
@ stdcall -syscall NtCancelIoFileEx(long ptr ptr)
...
...
dlls/ntdll/tests/exception.c
View file @
daa1886a
...
...
@@ -39,6 +39,7 @@ static NTSTATUS (WINAPI *pNtGetContextThread)(HANDLE,CONTEXT*);
static
NTSTATUS
(
WINAPI
*
pNtSetContextThread
)(
HANDLE
,
CONTEXT
*
);
static
NTSTATUS
(
WINAPI
*
pNtQueueApcThread
)(
HANDLE
handle
,
PNTAPCFUNC
func
,
ULONG_PTR
arg1
,
ULONG_PTR
arg2
,
ULONG_PTR
arg3
);
static
NTSTATUS
(
WINAPI
*
pNtCallbackReturn
)(
void
*
ret_ptr
,
ULONG
ret_len
,
NTSTATUS
status
);
static
NTSTATUS
(
WINAPI
*
pRtlRaiseException
)(
EXCEPTION_RECORD
*
rec
);
static
PVOID
(
WINAPI
*
pRtlUnwind
)(
PVOID
,
PVOID
,
PEXCEPTION_RECORD
,
PVOID
);
static
VOID
(
WINAPI
*
pRtlCaptureContext
)(
CONTEXT
*
);
...
...
@@ -7252,6 +7253,12 @@ static void test_user_apc(void)
ok
(
test_apc_called
,
"Test user APC was not called.
\n
"
);
}
static
void
test_user_callback
(
void
)
{
NTSTATUS
status
=
pNtCallbackReturn
(
NULL
,
0
,
STATUS_SUCCESS
);
ok
(
status
==
STATUS_NO_CALLBACK_ACTIVE
,
"failed %x
\n
"
,
status
);
}
static
DWORD
WINAPI
suspend_thread_test
(
void
*
arg
)
{
HANDLE
event
=
arg
;
...
...
@@ -9135,6 +9142,7 @@ START_TEST(exception)
X
(
NtGetContextThread
);
X
(
NtSetContextThread
);
X
(
NtQueueApcThread
);
X
(
NtCallbackReturn
);
X
(
NtReadVirtualMemory
);
X
(
NtClose
);
X
(
RtlUnwind
);
...
...
@@ -9329,6 +9337,7 @@ START_TEST(exception)
NtCurrentTeb
()
->
Peb
->
BeingDebugged
=
0
;
test_user_apc
();
test_user_callback
();
test_vectored_continue_handler
();
test_suspend_thread
();
test_suspend_process
();
...
...
dlls/ntdll/unix/signal_arm.c
View file @
daa1886a
...
...
@@ -576,6 +576,15 @@ NTSTATUS call_user_exception_dispatcher( EXCEPTION_RECORD *rec, CONTEXT *context
/***********************************************************************
* NtCallbackReturn (NTDLL.@)
*/
NTSTATUS
WINAPI
NtCallbackReturn
(
void
*
ret_ptr
,
ULONG
ret_len
,
NTSTATUS
status
)
{
return
STATUS_NO_CALLBACK_ACTIVE
;
}
/***********************************************************************
* handle_syscall_fault
*
* Handle a page fault happening during a system call.
...
...
dlls/ntdll/unix/signal_arm64.c
View file @
daa1886a
...
...
@@ -723,6 +723,15 @@ NTSTATUS call_user_exception_dispatcher( EXCEPTION_RECORD *rec, CONTEXT *context
/***********************************************************************
* NtCallbackReturn (NTDLL.@)
*/
NTSTATUS
WINAPI
NtCallbackReturn
(
void
*
ret_ptr
,
ULONG
ret_len
,
NTSTATUS
status
)
{
return
STATUS_NO_CALLBACK_ACTIVE
;
}
/***********************************************************************
* handle_syscall_fault
*
* Handle a page fault happening during a system call.
...
...
dlls/ntdll/unix/signal_i386.c
View file @
daa1886a
...
...
@@ -1579,6 +1579,15 @@ NTSTATUS call_user_exception_dispatcher( EXCEPTION_RECORD *rec, CONTEXT *context
}
/***********************************************************************
* NtCallbackReturn (NTDLL.@)
*/
NTSTATUS
WINAPI
NtCallbackReturn
(
void
*
ret_ptr
,
ULONG
ret_len
,
NTSTATUS
status
)
{
return
STATUS_NO_CALLBACK_ACTIVE
;
}
/**********************************************************************
* get_fpu_code
*
...
...
dlls/ntdll/unix/signal_x86_64.c
View file @
daa1886a
...
...
@@ -2276,6 +2276,15 @@ NTSTATUS call_user_exception_dispatcher( EXCEPTION_RECORD *rec, CONTEXT *context
/***********************************************************************
* NtCallbackReturn (NTDLL.@)
*/
NTSTATUS
WINAPI
NtCallbackReturn
(
void
*
ret_ptr
,
ULONG
ret_len
,
NTSTATUS
status
)
{
return
STATUS_NO_CALLBACK_ACTIVE
;
}
/***********************************************************************
* is_privileged_instr
*
* Check if the fault location is a privileged instruction.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment