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
efbd38ae
Commit
efbd38ae
authored
Dec 07, 2009
by
Henri Verbeet
Committed by
Alexandre Julliard
Dec 08, 2009
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dxgi: The "unknown0" parameter to DXGID3D10CreateDevice() is a pointer.
Fixes stack corruption in the 64-bit tests. Thanks to Paul Vriens for debugging this.
parent
54f3dec8
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
15 additions
and
15 deletions
+15
-15
d3d10_main.c
dlls/d3d10/d3d10_main.c
+1
-1
d3d10_private.h
dlls/d3d10/d3d10_private.h
+1
-1
d3d10core.spec
dlls/d3d10core/d3d10core.spec
+1
-1
d3d10core_main.c
dlls/d3d10core/d3d10core_main.c
+2
-2
d3d10core_private.h
dlls/d3d10core/d3d10core_private.h
+1
-1
device.c
dlls/d3d10core/tests/device.c
+3
-3
dxgi.spec
dlls/dxgi/dxgi.spec
+1
-1
dxgi_main.c
dlls/dxgi/dxgi_main.c
+2
-2
device.c
dlls/dxgi/tests/device.c
+3
-3
No files found.
dlls/d3d10/d3d10_main.c
View file @
efbd38ae
...
...
@@ -124,7 +124,7 @@ HRESULT WINAPI D3D10CreateDevice(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver
}
}
hr
=
D3D10CoreCreateDevice
(
factory
,
adapter
,
flags
,
0
,
device
);
hr
=
D3D10CoreCreateDevice
(
factory
,
adapter
,
flags
,
NULL
,
device
);
IDXGIAdapter_Release
(
adapter
);
IDXGIFactory_Release
(
factory
);
if
(
FAILED
(
hr
))
...
...
dlls/d3d10/d3d10_private.h
View file @
efbd38ae
...
...
@@ -179,6 +179,6 @@ HRESULT d3d10_effect_parse(struct d3d10_effect *This, const void *data, SIZE_T d
/* D3D10Core */
HRESULT
WINAPI
D3D10CoreCreateDevice
(
IDXGIFactory
*
factory
,
IDXGIAdapter
*
adapter
,
UINT
flags
,
DWORD
unknown0
,
ID3D10Device
**
device
);
UINT
flags
,
void
*
unknown0
,
ID3D10Device
**
device
);
#endif
/* __WINE_D3D10_PRIVATE_H */
dlls/d3d10core/d3d10core.spec
View file @
efbd38ae
@ stdcall D3D10CoreCreateDevice(ptr ptr long
long
ptr)
@ stdcall D3D10CoreCreateDevice(ptr ptr long
ptr
ptr)
@ stdcall D3D10CoreRegisterLayers()
dlls/d3d10core/d3d10core_main.c
View file @
efbd38ae
...
...
@@ -102,13 +102,13 @@ HRESULT WINAPI D3D10CoreRegisterLayers(void)
}
HRESULT
WINAPI
D3D10CoreCreateDevice
(
IDXGIFactory
*
factory
,
IDXGIAdapter
*
adapter
,
UINT
flags
,
DWORD
unknown0
,
ID3D10Device
**
device
)
UINT
flags
,
void
*
unknown0
,
ID3D10Device
**
device
)
{
IUnknown
*
dxgi_device
;
HMODULE
d3d10core
;
HRESULT
hr
;
TRACE
(
"factory %p, adapter %p, flags %#x, unknown0 %
#x, device %p
\n
"
,
TRACE
(
"factory %p, adapter %p, flags %#x, unknown0 %
p, device %p.
\n
"
,
factory
,
adapter
,
flags
,
unknown0
,
device
);
d3d10core
=
GetModuleHandleA
(
"d3d10core.dll"
);
...
...
dlls/d3d10core/d3d10core_private.h
View file @
efbd38ae
...
...
@@ -257,7 +257,7 @@ struct dxgi_device_layer
};
HRESULT
WINAPI
DXGID3D10CreateDevice
(
HMODULE
d3d10core
,
IDXGIFactory
*
factory
,
IDXGIAdapter
*
adapter
,
UINT
flags
,
DWORD
unknown0
,
void
**
device
);
UINT
flags
,
void
*
unknown0
,
void
**
device
);
HRESULT
WINAPI
DXGID3D10RegisterLayers
(
const
struct
dxgi_device_layer
*
layers
,
UINT
layer_count
);
#endif
/* __WINE_D3D10CORE_PRIVATE_H */
dlls/d3d10core/tests/device.c
View file @
efbd38ae
...
...
@@ -22,7 +22,7 @@
#include "wine/test.h"
HRESULT
WINAPI
D3D10CoreCreateDevice
(
IDXGIFactory
*
factory
,
IDXGIAdapter
*
adapter
,
UINT
flags
,
DWORD
unknown0
,
ID3D10Device
**
device
);
UINT
flags
,
void
*
unknown0
,
ID3D10Device
**
device
);
static
ID3D10Device
*
create_device
(
void
)
{
...
...
@@ -38,7 +38,7 @@ static ID3D10Device *create_device(void)
ok
(
SUCCEEDED
(
hr
),
"EnumAdapters failed, hr %#x
\n
"
,
hr
);
if
(
FAILED
(
hr
))
goto
cleanup
;
hr
=
D3D10CoreCreateDevice
(
factory
,
adapter
,
0
,
0
,
&
device
);
hr
=
D3D10CoreCreateDevice
(
factory
,
adapter
,
0
,
NULL
,
&
device
);
if
(
FAILED
(
hr
))
{
HMODULE
d3d10ref
;
...
...
@@ -59,7 +59,7 @@ static ID3D10Device *create_device(void)
ok
(
SUCCEEDED
(
hr
),
"CreateSoftwareAdapter failed, hr %#x
\n
"
,
hr
);
if
(
FAILED
(
hr
))
goto
cleanup
;
hr
=
D3D10CoreCreateDevice
(
factory
,
adapter
,
0
,
0
,
&
device
);
hr
=
D3D10CoreCreateDevice
(
factory
,
adapter
,
0
,
NULL
,
&
device
);
ok
(
SUCCEEDED
(
hr
),
"Failed to create a REF device, hr %#x
\n
"
,
hr
);
if
(
FAILED
(
hr
))
goto
cleanup
;
}
...
...
dlls/dxgi/dxgi.spec
View file @
efbd38ae
@ stdcall CreateDXGIFactory(ptr ptr)
@ stdcall DXGID3D10CreateDevice(ptr ptr ptr long
long
ptr)
@ stdcall DXGID3D10CreateDevice(ptr ptr ptr long
ptr
ptr)
@ stdcall DXGID3D10RegisterLayers(ptr long)
dlls/dxgi/dxgi_main.c
View file @
efbd38ae
...
...
@@ -224,7 +224,7 @@ static HRESULT register_d3d10core_layers(HMODULE d3d10core)
}
HRESULT
WINAPI
DXGID3D10CreateDevice
(
HMODULE
d3d10core
,
IDXGIFactory
*
factory
,
IDXGIAdapter
*
adapter
,
UINT
flags
,
DWORD
unknown0
,
void
**
device
)
UINT
flags
,
void
*
unknown0
,
void
**
device
)
{
struct
layer_get_size_args
get_size_args
;
struct
dxgi_device
*
dxgi_device
;
...
...
@@ -233,7 +233,7 @@ HRESULT WINAPI DXGID3D10CreateDevice(HMODULE d3d10core, IDXGIFactory *factory, I
DWORD
count
;
HRESULT
hr
;
TRACE
(
"d3d10core %p, factory %p, adapter %p, flags %#x, unknown0 %
#x, device %p
\n
"
,
TRACE
(
"d3d10core %p, factory %p, adapter %p, flags %#x, unknown0 %
p, device %p.
\n
"
,
d3d10core
,
factory
,
adapter
,
flags
,
unknown0
,
device
);
hr
=
register_d3d10core_layers
(
d3d10core
);
...
...
dlls/dxgi/tests/device.c
View file @
efbd38ae
...
...
@@ -22,7 +22,7 @@
#include "wine/test.h"
HRESULT
WINAPI
DXGID3D10CreateDevice
(
HMODULE
d3d10core
,
IDXGIFactory
*
factory
,
IDXGIAdapter
*
adapter
,
UINT
flags
,
DWORD
arg5
,
void
**
device
);
IDXGIAdapter
*
adapter
,
UINT
flags
,
void
*
unknown0
,
void
**
device
);
static
IDXGIDevice
*
create_device
(
HMODULE
d3d10core
)
{
...
...
@@ -39,7 +39,7 @@ static IDXGIDevice *create_device(HMODULE d3d10core)
ok
(
SUCCEEDED
(
hr
),
"EnumAdapters failed, hr %#x
\n
"
,
hr
);
if
(
FAILED
(
hr
))
goto
cleanup
;
hr
=
DXGID3D10CreateDevice
(
d3d10core
,
factory
,
adapter
,
0
,
0
,
(
void
**
)
&
device
);
hr
=
DXGID3D10CreateDevice
(
d3d10core
,
factory
,
adapter
,
0
,
NULL
,
(
void
**
)
&
device
);
if
(
FAILED
(
hr
))
{
HMODULE
d3d10ref
;
...
...
@@ -60,7 +60,7 @@ static IDXGIDevice *create_device(HMODULE d3d10core)
ok
(
SUCCEEDED
(
hr
),
"CreateSoftwareAdapter failed, hr %#x
\n
"
,
hr
);
if
(
FAILED
(
hr
))
goto
cleanup
;
hr
=
DXGID3D10CreateDevice
(
d3d10core
,
factory
,
adapter
,
0
,
0
,
(
void
**
)
&
device
);
hr
=
DXGID3D10CreateDevice
(
d3d10core
,
factory
,
adapter
,
0
,
NULL
,
(
void
**
)
&
device
);
ok
(
SUCCEEDED
(
hr
),
"Failed to create a REF device, hr %#x
\n
"
,
hr
);
if
(
FAILED
(
hr
))
goto
cleanup
;
}
...
...
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