Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Sam Joan Roque-Worcel
wine
Commits
b59bf98b
Commit
b59bf98b
authored
22 years ago
by
Alexandre Julliard
Browse files
Options
Downloads
Patches
Plain Diff
Moved errno_location support to sysdeps.c.
parent
9037f4bb
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
include/thread.h
+1
-0
1 addition, 0 deletions
include/thread.h
libs/wine/errno.c
+0
-39
0 additions, 39 deletions
libs/wine/errno.c
scheduler/sysdeps.c
+64
-0
64 additions, 0 deletions
scheduler/sysdeps.c
scheduler/thread.c
+1
-22
1 addition, 22 deletions
scheduler/thread.c
with
66 additions
and
61 deletions
include/thread.h
+
1
−
0
View file @
b59bf98b
...
...
@@ -147,6 +147,7 @@ extern TEB *THREAD_IdToTEB( DWORD id );
/* scheduler/sysdeps.c */
extern
int
SYSDEPS_SpawnThread
(
TEB
*
teb
);
extern
void
SYSDEPS_SetCurThread
(
TEB
*
teb
);
extern
void
SYSDEPS_InitErrno
(
void
);
extern
void
DECLSPEC_NORETURN
SYSDEPS_ExitThread
(
int
status
);
extern
void
DECLSPEC_NORETURN
SYSDEPS_AbortThread
(
int
status
);
extern
void
DECLSPEC_NORETURN
SYSDEPS_SwitchToThreadStack
(
void
(
*
func
)(
void
)
);
...
...
This diff is collapsed.
Click to expand it.
libs/wine/errno.c
+
0
−
39
View file @
b59bf98b
...
...
@@ -22,45 +22,6 @@
#include
<assert.h>
/* default errno before threading is initialized */
static
int
*
default_errno_location
(
void
)
{
static
int
errno
;
return
&
errno
;
}
/* default h_errno before threading is initialized */
static
int
*
default_h_errno_location
(
void
)
{
static
int
h_errno
;
return
&
h_errno
;
}
int
*
(
*
wine_errno_location
)(
void
)
=
default_errno_location
;
int
*
(
*
wine_h_errno_location
)(
void
)
=
default_h_errno_location
;
/***********************************************************************
* __errno_location/__error/___errno
*
* Get the per-thread errno location.
*/
#ifdef ERRNO_LOCATION
int
*
ERRNO_LOCATION
(
void
)
{
return
wine_errno_location
();
}
#endif
/* ERRNO_LOCATION */
/***********************************************************************
* __h_errno_location
*
* Get the per-thread h_errno location.
*/
int
*
__h_errno_location
(
void
)
{
return
wine_h_errno_location
();
}
/***********************************************************************
* pthread functions
*/
...
...
This diff is collapsed.
Click to expand it.
scheduler/sysdeps.c
+
64
−
0
View file @
b59bf98b
...
...
@@ -318,6 +318,70 @@ void SYSDEPS_AbortThread( int status )
}
/* default errno before threading is initialized */
static
int
*
default_errno_location
(
void
)
{
static
int
errno
;
return
&
errno
;
}
/* default h_errno before threading is initialized */
static
int
*
default_h_errno_location
(
void
)
{
static
int
h_errno
;
return
&
h_errno
;
}
/* errno once threading is working */
static
int
*
thread_errno_location
(
void
)
{
return
&
NtCurrentTeb
()
->
thread_errno
;
}
/* h_errno once threading is working */
static
int
*
thread_h_errno_location
(
void
)
{
return
&
NtCurrentTeb
()
->
thread_h_errno
;
}
static
int
*
(
*
errno_location_ptr
)(
void
)
=
default_errno_location
;
static
int
*
(
*
h_errno_location_ptr
)(
void
)
=
default_h_errno_location
;
/***********************************************************************
* __errno_location/__error/___errno
*
* Get the per-thread errno location.
*/
#ifdef ERRNO_LOCATION
int
*
ERRNO_LOCATION
(
void
)
{
return
errno_location_ptr
();
}
#endif
/* ERRNO_LOCATION */
/***********************************************************************
* __h_errno_location
*
* Get the per-thread h_errno location.
*/
int
*
__h_errno_location
(
void
)
{
return
h_errno_location_ptr
();
}
/***********************************************************************
* SYSDEPS_InitErrno
*
* Initialize errno handling.
*/
void
SYSDEPS_InitErrno
(
void
)
{
errno_location_ptr
=
thread_errno_location
;
h_errno_location_ptr
=
thread_h_errno_location
;
}
/**********************************************************************
* NtCurrentTeb (NTDLL.@)
*
...
...
This diff is collapsed.
Click to expand it.
scheduler/thread.c
+
1
−
22
View file @
b59bf98b
...
...
@@ -210,26 +210,6 @@ error:
}
/***********************************************************************
* thread_errno_location
*
* Get the per-thread errno location.
*/
static
int
*
thread_errno_location
(
void
)
{
return
&
NtCurrentTeb
()
->
thread_errno
;
}
/***********************************************************************
* thread_h_errno_location
*
* Get the per-thread h_errno location.
*/
static
int
*
thread_h_errno_location
(
void
)
{
return
&
NtCurrentTeb
()
->
thread_h_errno
;
}
/***********************************************************************
* THREAD_Init
*
...
...
@@ -245,8 +225,7 @@ void THREAD_Init(void)
assert
(
initial_teb
.
teb_sel
);
initial_teb
.
process
=
&
current_process
;
SYSDEPS_SetCurThread
(
&
initial_teb
);
wine_errno_location
=
thread_errno_location
;
wine_h_errno_location
=
thread_h_errno_location
;
SYSDEPS_InitErrno
();
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment