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
7d8648f2
Commit
7d8648f2
authored
Feb 01, 2022
by
Eric Pouech
Committed by
Alexandre Julliard
Feb 01, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d3d10_1: Build without -DWINE_NO_LONG_TYPES.
Signed-off-by:
Henri Verbeet
<
hverbeet@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
0201606b
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
12 deletions
+11
-12
Makefile.in
dlls/d3d10_1/Makefile.in
+0
-1
d3d10_1_main.c
dlls/d3d10_1/d3d10_1_main.c
+11
-11
No files found.
dlls/d3d10_1/Makefile.in
View file @
7d8648f2
EXTRADEFS
=
-DWINE_NO_LONG_TYPES
MODULE
=
d3d10_1.dll
IMPORTLIB
=
d3d10_1
IMPORTS
=
dxguid d3d10core dxgi
...
...
dlls/d3d10_1/d3d10_1_main.c
View file @
7d8648f2
...
...
@@ -89,7 +89,7 @@ static HRESULT d3d10_create_device1(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE dri
IDXGIAdapter_AddRef
(
adapter
);
if
(
FAILED
(
hr
=
IDXGIAdapter_GetParent
(
adapter
,
&
IID_IDXGIFactory
,
(
void
**
)
&
factory
)))
{
WARN
(
"Failed to get dxgi factory, hr %#x.
\n
"
,
hr
);
WARN
(
"Failed to get dxgi factory, hr %#
l
x.
\n
"
,
hr
);
return
hr
;
}
}
...
...
@@ -97,7 +97,7 @@ static HRESULT d3d10_create_device1(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE dri
{
if
(
FAILED
(
hr
=
CreateDXGIFactory
(
&
IID_IDXGIFactory
,
(
void
**
)
&
factory
)))
{
WARN
(
"Failed to create dxgi factory, hr %#x.
\n
"
,
hr
);
WARN
(
"Failed to create dxgi factory, hr %#
l
x.
\n
"
,
hr
);
return
hr
;
}
...
...
@@ -109,7 +109,7 @@ static HRESULT d3d10_create_device1(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE dri
{
if
(
FAILED
(
hr
=
IDXGIFactory_EnumAdapters
(
factory
,
0
,
&
adapter
)))
{
WARN
(
"No adapters found, hr %#x.
\n
"
,
hr
);
WARN
(
"No adapters found, hr %#
l
x.
\n
"
,
hr
);
IDXGIFactory_Release
(
factory
);
return
hr
;
}
...
...
@@ -133,7 +133,7 @@ static HRESULT d3d10_create_device1(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE dri
FreeLibrary
(
refrast
);
if
(
FAILED
(
hr
))
{
WARN
(
"Failed to create a software adapter, hr %#x.
\n
"
,
hr
);
WARN
(
"Failed to create a software adapter, hr %#
l
x.
\n
"
,
hr
);
IDXGIFactory_Release
(
factory
);
return
hr
;
}
...
...
@@ -150,7 +150,7 @@ static HRESULT d3d10_create_device1(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE dri
}
if
(
FAILED
(
hr
=
IDXGIFactory_CreateSoftwareAdapter
(
factory
,
swrast
,
&
adapter
)))
{
WARN
(
"Failed to create a software adapter, hr %#x.
\n
"
,
hr
);
WARN
(
"Failed to create a software adapter, hr %#
l
x.
\n
"
,
hr
);
IDXGIFactory_Release
(
factory
);
return
hr
;
}
...
...
@@ -170,7 +170,7 @@ static HRESULT d3d10_create_device1(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE dri
IDXGIFactory_Release
(
factory
);
if
(
FAILED
(
hr
))
{
WARN
(
"Failed to create a device, hr %#x.
\n
"
,
hr
);
WARN
(
"Failed to create a device, hr %#
l
x.
\n
"
,
hr
);
return
hr
;
}
...
...
@@ -208,7 +208,7 @@ HRESULT WINAPI D3D10CreateDeviceAndSwapChain1(IDXGIAdapter *adapter, D3D10_DRIVE
* hooking these entry-points. */
if
(
FAILED
(
hr
=
d3d10_create_device1
(
adapter
,
driver_type
,
swrast
,
flags
,
feature_level
,
sdk_version
,
device
)))
{
WARN
(
"Failed to create a device, returning %#x.
\n
"
,
hr
);
WARN
(
"Failed to create a device, returning %#
l
x.
\n
"
,
hr
);
*
device
=
NULL
;
return
hr
;
}
...
...
@@ -217,7 +217,7 @@ HRESULT WINAPI D3D10CreateDeviceAndSwapChain1(IDXGIAdapter *adapter, D3D10_DRIVE
{
if
(
FAILED
(
hr
=
ID3D10Device1_QueryInterface
(
*
device
,
&
IID_IDXGIDevice
,
(
void
**
)
&
dxgi_device
)))
{
ERR
(
"Failed to get a dxgi device from the d3d10 device, returning %#x.
\n
"
,
hr
);
ERR
(
"Failed to get a dxgi device from the d3d10 device, returning %#
l
x.
\n
"
,
hr
);
goto
cleanup
;
}
...
...
@@ -225,7 +225,7 @@ HRESULT WINAPI D3D10CreateDeviceAndSwapChain1(IDXGIAdapter *adapter, D3D10_DRIVE
IDXGIDevice_Release
(
dxgi_device
);
if
(
FAILED
(
hr
))
{
ERR
(
"Failed to get the device adapter, returning %#x.
\n
"
,
hr
);
ERR
(
"Failed to get the device adapter, returning %#
l
x.
\n
"
,
hr
);
goto
cleanup
;
}
...
...
@@ -233,7 +233,7 @@ HRESULT WINAPI D3D10CreateDeviceAndSwapChain1(IDXGIAdapter *adapter, D3D10_DRIVE
IDXGIAdapter_Release
(
adapter
);
if
(
FAILED
(
hr
))
{
ERR
(
"Failed to get the adapter factory, returning %#x.
\n
"
,
hr
);
ERR
(
"Failed to get the adapter factory, returning %#
l
x.
\n
"
,
hr
);
goto
cleanup
;
}
...
...
@@ -241,7 +241,7 @@ HRESULT WINAPI D3D10CreateDeviceAndSwapChain1(IDXGIAdapter *adapter, D3D10_DRIVE
IDXGIFactory_Release
(
factory
);
if
(
FAILED
(
hr
))
{
WARN
(
"Failed to create a swapchain, returning %#x.
\n
"
,
hr
);
WARN
(
"Failed to create a swapchain, returning %#
l
x.
\n
"
,
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