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
0a8573a2
Commit
0a8573a2
authored
Jan 04, 2010
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
winedos: Link to DirectDrawCreate through delayed imports instead of doing it by hand.
parent
00b06dac
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
13 deletions
+2
-13
Makefile.in
dlls/winedos/Makefile.in
+1
-0
vga.c
dlls/winedos/vga.c
+1
-13
No files found.
dlls/winedos/Makefile.in
View file @
0a8573a2
...
...
@@ -4,6 +4,7 @@ SRCDIR = @srcdir@
VPATH
=
@srcdir@
MODULE
=
winedos.dll
IMPORTS
=
user32 kernel32 kernel ntdll
DELAYIMPORTS
=
ddraw
C_SRCS
=
\
devices.c
\
...
...
dlls/winedos/vga.c
View file @
0a8573a2
...
...
@@ -231,9 +231,6 @@ static CRITICAL_SECTION_DEBUG critsect_debug =
};
static
CRITICAL_SECTION
vga_lock
=
{
&
critsect_debug
,
-
1
,
0
,
0
,
0
,
0
};
typedef
HRESULT
(
WINAPI
*
DirectDrawCreateProc
)(
LPGUID
,
LPDIRECTDRAW
*
,
LPUNKNOWN
);
static
DirectDrawCreateProc
pDirectDrawCreate
;
static
void
CALLBACK
VGA_Poll
(
LPVOID
arg
,
DWORD
low
,
DWORD
high
);
static
HWND
vga_hwnd
=
NULL
;
...
...
@@ -787,16 +784,7 @@ static void WINAPI VGA_DoSetMode(ULONG_PTR arg)
if
(
lpddraw
)
VGA_DoExit
(
0
);
if
(
!
lpddraw
)
{
if
(
!
pDirectDrawCreate
)
{
HMODULE
hmod
=
LoadLibraryA
(
"ddraw.dll"
);
if
(
hmod
)
pDirectDrawCreate
=
(
DirectDrawCreateProc
)
GetProcAddress
(
hmod
,
"DirectDrawCreate"
);
if
(
!
pDirectDrawCreate
)
{
ERR
(
"Can't lookup DirectDrawCreate from ddraw.dll.
\n
"
);
return
;
}
}
res
=
pDirectDrawCreate
(
NULL
,
&
lpddraw
,
NULL
);
res
=
DirectDrawCreate
(
NULL
,
&
lpddraw
,
NULL
);
if
(
!
lpddraw
)
{
ERR
(
"DirectDraw is not available (res = 0x%x)
\n
"
,
res
);
return
;
...
...
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