Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
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-winehq
Commits
e91be162
Commit
e91be162
authored
Mar 20, 2020
by
Piotr Caban
Committed by
Alexandre Julliard
Mar 20, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msvcp140: Don't load __processing_throw dynamically.
Signed-off-by:
Piotr Caban
<
piotr@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
6160e0ea
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
10 deletions
+2
-10
exception.c
dlls/msvcp90/exception.c
+2
-1
msvcp90.h
dlls/msvcp90/msvcp90.h
+0
-4
msvcp_main.c
dlls/msvcp90/msvcp_main.c
+0
-5
No files found.
dlls/msvcp90/exception.c
View file @
e91be162
...
...
@@ -30,6 +30,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcp);
#define CLASS_HAS_VIRTUAL_BASE_CLASS 4
void
WINAPI
_CxxThrowException
(
exception
*
,
const
cxx_exception_type
*
);
int
*
__cdecl
__processing_throw
(
void
);
#if _MSVCP_VER >= 70 || defined(_MSVCIRT)
typedef
const
char
**
exception_name
;
...
...
@@ -947,7 +948,7 @@ MSVCP_bool __cdecl MSVCP__uncaught_exception(void)
#if _MSVCP_VER >= 140
int
__cdecl
__uncaught_exceptions
(
void
)
{
return
*
UCRTBASE_
__processing_throw
();
return
*
__processing_throw
();
}
typedef
struct
...
...
dlls/msvcp90/msvcp90.h
View file @
e91be162
...
...
@@ -49,10 +49,6 @@ extern void* (__cdecl *MSVCRT_operator_new)(MSVCP_size_t);
extern
void
(
__cdecl
*
MSVCRT_operator_delete
)(
void
*
);
extern
void
*
(
__cdecl
*
MSVCRT_set_new_handler
)(
void
*
);
#if _MSVCP_VER >= 140
extern
int
*
(
__cdecl
*
UCRTBASE___processing_throw
)(
void
);
#endif
#if _MSVCP_VER >= 110
/* keep in sync with msvcrt/lock.c */
typedef
struct
cs_queue
...
...
dlls/msvcp90/msvcp_main.c
View file @
e91be162
...
...
@@ -58,10 +58,6 @@ void* (__cdecl *MSVCRT_operator_new)(MSVCP_size_t);
void
(
__cdecl
*
MSVCRT_operator_delete
)(
void
*
);
void
*
(
__cdecl
*
MSVCRT_set_new_handler
)(
void
*
);
#if _MSVCP_VER >= 140
int
*
(
__cdecl
*
UCRTBASE___processing_throw
)(
void
);
#endif
#if _MSVCP_VER >= 110
critical_section
*
(
__thiscall
*
critical_section_ctor
)(
critical_section
*
);
void
(
__thiscall
*
critical_section_dtor
)(
critical_section
*
);
...
...
@@ -129,7 +125,6 @@ static void init_cxx_funcs(void)
MSVCRT_operator_new
=
operator_new
;
MSVCRT_operator_delete
=
operator_delete
;
MSVCRT_set_new_handler
=
(
void
*
)
GetProcAddress
(
hmod
,
"_set_new_handler"
);
UCRTBASE___processing_throw
=
(
void
*
)
GetProcAddress
(
hmod
,
"__processing_throw"
);
hcon
=
LoadLibraryA
(
CONCRT_NAME
(
_MSVCP_VER
)
);
if
(
!
hcon
)
FIXME
(
"%s not loaded
\n
"
,
CONCRT_NAME
(
_MSVCP_VER
)
);
...
...
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