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
18bdd435
Commit
18bdd435
authored
Feb 16, 2024
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
rpcrt4/tests: Fix some malloc/HeapAlloc mismatches.
Fixes regressions caused by
a38e0563
.
parent
4e74e9df
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
cstub.c
dlls/rpcrt4/tests/cstub.c
+2
-2
ndr_marshall.c
dlls/rpcrt4/tests/ndr_marshall.c
+4
-4
No files found.
dlls/rpcrt4/tests/cstub.c
View file @
18bdd435
...
...
@@ -62,13 +62,13 @@ static int my_free_called;
static
void
*
CALLBACK
my_alloc
(
SIZE_T
size
)
{
my_alloc_called
++
;
return
NdrOleAllocate
(
size
);
return
malloc
(
size
);
}
static
void
CALLBACK
my_free
(
void
*
ptr
)
{
my_free_called
++
;
NdrOleF
ree
(
ptr
);
f
ree
(
ptr
);
}
typedef
struct
_MIDL_PROC_FORMAT_STRING
...
...
dlls/rpcrt4/tests/ndr_marshall.c
View file @
18bdd435
...
...
@@ -41,13 +41,13 @@ static int my_free_called;
static
void
*
CALLBACK
my_alloc
(
SIZE_T
size
)
{
my_alloc_called
++
;
return
NdrOleAllocate
(
size
);
return
malloc
(
size
);
}
static
void
CALLBACK
my_free
(
void
*
ptr
)
{
my_free_called
++
;
NdrOleF
ree
(
ptr
);
f
ree
(
ptr
);
}
static
const
MIDL_STUB_DESC
Object_StubDesc
=
...
...
@@ -2222,7 +2222,7 @@ static void test_nonconformant_string(void)
ok
(
mem
!=
mem_orig
,
"mem not alloced
\n
"
);
ok
(
mem
!=
StubMsg
.
BufferStart
+
8
,
"mem pointing at buffer
\n
"
);
ok
(
my_alloc_called
==
1
,
"alloc called %d
\n
"
,
my_alloc_called
);
NdrOleF
ree
(
mem
);
f
ree
(
mem
);
my_alloc_called
=
0
;
mem
=
mem_orig
;
...
...
@@ -2295,7 +2295,7 @@ static void test_nonconformant_string(void)
ok
(
mem
!=
mem_orig
,
"mem not alloced
\n
"
);
ok
(
mem
!=
StubMsg
.
BufferStart
+
8
,
"mem pointing at buffer
\n
"
);
ok
(
my_alloc_called
==
1
,
"alloc called %d
\n
"
,
my_alloc_called
);
NdrOleF
ree
(
mem
);
f
ree
(
mem
);
my_alloc_called
=
0
;
mem
=
mem_orig
;
...
...
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