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
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
Alexey Alyaev
wine
Commits
57343604
Commit
57343604
authored
12 years ago
by
Ken Thomases
Committed by
Alexandre Julliard
12 years ago
Browse files
Options
Downloads
Patches
Plain Diff
libwine: Call the Mac Multi-Processing Services lib from the main thread first.
parent
bbb8c60c
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
libs/wine/Makefile.in
+1
-1
1 addition, 1 deletion
libs/wine/Makefile.in
libs/wine/loader.c
+16
-6
16 additions, 6 deletions
libs/wine/loader.c
with
17 additions
and
7 deletions
libs/wine/Makefile.in
+
1
−
1
View file @
57343604
DLLFLAGS
=
@DLLFLAGS@
MODULE
=
libwine.
$(
LIBEXT
)
VERSCRIPT
=
$(
srcdir
)
/wine.map
EXTRALIBS
=
$(
LIBPORT
)
@LIBDL@ @CRTLIBS@ @COREFOUNDATIONLIB@
EXTRALIBS
=
$(
LIBPORT
)
@LIBDL@ @CRTLIBS@ @COREFOUNDATIONLIB@
@CORESERVICESLIB@
DEFS
=
-D__WINESRC__
-DWINE_UNICODE_API
=
""
VERSION
=
1.0
...
...
This diff is collapsed.
Click to expand it.
libs/wine/loader.c
+
16
−
6
View file @
57343604
...
...
@@ -39,21 +39,26 @@
# include <unistd.h>
#endif
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#include
"windef.h"
#include
"winbase.h"
#include
"wine/library.h"
#ifdef __APPLE__
#include
<crt_externs.h>
#define environ (*_NSGetEnviron())
#include
<CoreFoundation/CoreFoundation.h>
#define LoadResource MacLoadResource
#define GetCurrentThread MacGetCurrentThread
#include
<CoreServices/CoreServices.h>
#undef LoadResource
#undef GetCurrentThread
#include
<pthread.h>
#else
extern
char
**
environ
;
#endif
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#include
"windef.h"
#include
"winbase.h"
#include
"wine/library.h"
/* argc/argv for the Windows application */
int
__wine_main_argc
=
0
;
char
**
__wine_main_argv
=
NULL
;
...
...
@@ -756,6 +761,11 @@ static void apple_main_thread( void (*init_func)(void) )
CFRunLoopSourceContext
source_context
=
{
0
};
CFRunLoopSourceRef
source
;
/* Multi-processing Services can get confused about the main thread if the
* first time it's used is on a secondary thread. Use it here to make sure
* that doesn't happen. */
MPTaskIsPreemptive
(
MPCurrentTaskID
());
/* Give ourselves the best chance of having the distributed notification
* center scheduled on this thread's run loop. In theory, it's scheduled
* in the first thread to ask for it. */
...
...
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