Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
8d478518
Commit
8d478518
authored
Mar 02, 2022
by
Matteo Bruni
Committed by
Alexandre Julliard
Mar 02, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d3dx11/tests: Use CRT allocation functions.
Signed-off-by:
Matteo Bruni
<
mbruni@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
43058389
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
6 deletions
+5
-6
d3dx11.c
dlls/d3dx11_43/tests/d3dx11.c
+5
-6
No files found.
dlls/d3dx11_43/tests/d3dx11.c
View file @
8d478518
...
@@ -21,7 +21,6 @@
...
@@ -21,7 +21,6 @@
#include "d3d11.h"
#include "d3d11.h"
#include "d3dx11.h"
#include "d3dx11.h"
#include "wine/test.h"
#include "wine/test.h"
#include "wine/heap.h"
#ifndef MAKEFOURCC
#ifndef MAKEFOURCC
#define MAKEFOURCC(ch0, ch1, ch2, ch3) \
#define MAKEFOURCC(ch0, ch1, ch2, ch3) \
...
@@ -503,8 +502,8 @@ static HRESULT WINAPI test_d3dinclude_open(ID3DInclude *iface, D3D_INCLUDE_TYPE
...
@@ -503,8 +502,8 @@ static HRESULT WINAPI test_d3dinclude_open(ID3DInclude *iface, D3D_INCLUDE_TYPE
if
(
!
strcmp
(
filename
,
"include1.h"
))
if
(
!
strcmp
(
filename
,
"include1.h"
))
{
{
buffer
=
heap_
alloc
(
strlen
(
include1
));
buffer
=
m
alloc
(
strlen
(
include1
));
CopyMemor
y
(
buffer
,
include1
,
strlen
(
include1
));
memcp
y
(
buffer
,
include1
,
strlen
(
include1
));
*
bytes
=
strlen
(
include1
);
*
bytes
=
strlen
(
include1
);
ok
(
include_type
==
D3D_INCLUDE_LOCAL
,
"Unexpected include type %d.
\n
"
,
include_type
);
ok
(
include_type
==
D3D_INCLUDE_LOCAL
,
"Unexpected include type %d.
\n
"
,
include_type
);
ok
(
!
strncmp
(
include2
,
parent_data
,
strlen
(
include2
)),
ok
(
!
strncmp
(
include2
,
parent_data
,
strlen
(
include2
)),
...
@@ -512,8 +511,8 @@ static HRESULT WINAPI test_d3dinclude_open(ID3DInclude *iface, D3D_INCLUDE_TYPE
...
@@ -512,8 +511,8 @@ static HRESULT WINAPI test_d3dinclude_open(ID3DInclude *iface, D3D_INCLUDE_TYPE
}
}
else
if
(
!
strcmp
(
filename
,
"include
\\
include2.h"
))
else
if
(
!
strcmp
(
filename
,
"include
\\
include2.h"
))
{
{
buffer
=
heap_
alloc
(
strlen
(
include2
));
buffer
=
m
alloc
(
strlen
(
include2
));
CopyMemor
y
(
buffer
,
include2
,
strlen
(
include2
));
memcp
y
(
buffer
,
include2
,
strlen
(
include2
));
*
bytes
=
strlen
(
include2
);
*
bytes
=
strlen
(
include2
);
ok
(
!
parent_data
,
"Unexpected parent_data value.
\n
"
);
ok
(
!
parent_data
,
"Unexpected parent_data value.
\n
"
);
ok
(
include_type
==
D3D_INCLUDE_LOCAL
,
"Unexpected include type %d.
\n
"
,
include_type
);
ok
(
include_type
==
D3D_INCLUDE_LOCAL
,
"Unexpected include type %d.
\n
"
,
include_type
);
...
@@ -530,7 +529,7 @@ static HRESULT WINAPI test_d3dinclude_open(ID3DInclude *iface, D3D_INCLUDE_TYPE
...
@@ -530,7 +529,7 @@ static HRESULT WINAPI test_d3dinclude_open(ID3DInclude *iface, D3D_INCLUDE_TYPE
static
HRESULT
WINAPI
test_d3dinclude_close
(
ID3DInclude
*
iface
,
const
void
*
data
)
static
HRESULT
WINAPI
test_d3dinclude_close
(
ID3DInclude
*
iface
,
const
void
*
data
)
{
{
heap_
free
((
void
*
)
data
);
free
((
void
*
)
data
);
return
S_OK
;
return
S_OK
;
}
}
...
...
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