Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Zsolt Vadász
wine
Commits
f42f727f
Commit
f42f727f
authored
18 years ago
by
Huw Davies
Committed by
Alexandre Julliard
18 years ago
Browse files
Options
Downloads
Patches
Plain Diff
rpcrt4: Tests for CStdStubBuffer_Connect and fixes to make them pass.
parent
cadc3984
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
dlls/rpcrt4/cstub.c
+11
-4
11 additions, 4 deletions
dlls/rpcrt4/cstub.c
dlls/rpcrt4/tests/cstub.c
+76
-1
76 additions, 1 deletion
dlls/rpcrt4/tests/cstub.c
with
87 additions
and
5 deletions
dlls/rpcrt4/cstub.c
+
11
−
4
View file @
f42f727f
...
...
@@ -134,10 +134,17 @@ ULONG WINAPI NdrCStdStubBuffer2_Release(LPRPCSTUBBUFFER iface,
HRESULT
WINAPI
CStdStubBuffer_Connect
(
LPRPCSTUBBUFFER
iface
,
LPUNKNOWN
lpUnkServer
)
{
CStdStubBuffer
*
This
=
(
CStdStubBuffer
*
)
iface
;
TRACE
(
"(%p)->Connect(%p)
\n
"
,
This
,
lpUnkServer
);
This
->
pvServerObject
=
lpUnkServer
;
return
S_OK
;
CStdStubBuffer
*
This
=
(
CStdStubBuffer
*
)
iface
;
HRESULT
r
;
IUnknown
*
new
=
NULL
;
TRACE
(
"(%p)->Connect(%p)
\n
"
,
This
,
lpUnkServer
);
r
=
IUnknown_QueryInterface
(
lpUnkServer
,
STUB_HEADER
(
This
).
piid
,
(
void
**
)
&
new
);
new
=
InterlockedExchangePointer
((
void
**
)
&
This
->
pvServerObject
,
new
);
if
(
new
)
IUnknown_Release
(
new
);
return
r
;
}
void
WINAPI
CStdStubBuffer_Disconnect
(
LPRPCSTUBBUFFER
iface
)
...
...
This diff is collapsed.
Click to expand it.
dlls/rpcrt4/tests/cstub.c
+
76
−
1
View file @
f42f727f
...
...
@@ -628,7 +628,81 @@ static void test_CreateStub(IPSFactoryBuffer *ppsf)
pstub
=
create_stub
(
ppsf
,
&
IID_if1
,
obj
,
E_NOINTERFACE
);
}
static
HRESULT
WINAPI
connect_test_orig_QI
(
IUnknown
*
This
,
REFIID
iid
,
void
**
ppv
)
{
ok
(
IsEqualIID
(
iid
,
&
IID_if1
),
"incorrect iid
\n
"
);
*
ppv
=
(
void
*
)
This
;
return
S_OK
;
}
static
int
connect_test_orig_release_called
;
static
ULONG
WINAPI
connect_test_orig_release
(
IUnknown
*
This
)
{
connect_test_orig_release_called
++
;
return
0
;
}
static
IUnknownVtbl
connect_test_orig_vtbl
=
{
connect_test_orig_QI
,
NULL
,
connect_test_orig_release
};
static
HRESULT
WINAPI
connect_test_new_QI
(
IUnknown
*
This
,
REFIID
iid
,
void
**
ppv
)
{
ok
(
IsEqualIID
(
iid
,
&
IID_if1
),
"incorrect iid
\n
"
);
*
ppv
=
(
void
*
)
0xcafebabe
;
return
S_OK
;
}
static
IUnknownVtbl
connect_test_new_vtbl
=
{
connect_test_new_QI
,
NULL
,
NULL
};
static
HRESULT
WINAPI
connect_test_new_fail_QI
(
IUnknown
*
This
,
REFIID
iid
,
void
**
ppv
)
{
ok
(
IsEqualIID
(
iid
,
&
IID_if1
),
"incorrect iid
\n
"
);
*
ppv
=
(
void
*
)
0xdeadbeef
;
return
E_NOINTERFACE
;
}
static
IUnknownVtbl
connect_test_new_fail_vtbl
=
{
connect_test_new_fail_QI
,
NULL
,
NULL
};
static
void
test_Connect
(
IPSFactoryBuffer
*
ppsf
)
{
IUnknownVtbl
*
orig_vtbl
=
&
connect_test_orig_vtbl
;
IUnknownVtbl
*
new_vtbl
=
&
connect_test_new_vtbl
;
IUnknownVtbl
*
new_fail_vtbl
=
&
connect_test_new_fail_vtbl
;
IUnknown
*
obj
=
(
IUnknown
*
)
&
orig_vtbl
;
IRpcStubBuffer
*
pstub
=
create_stub
(
ppsf
,
&
IID_if1
,
obj
,
S_OK
);
CStdStubBuffer
*
cstd_stub
=
(
CStdStubBuffer
*
)
pstub
;
HRESULT
r
;
obj
=
(
IUnknown
*
)
&
new_vtbl
;
r
=
IRpcStubBuffer_Connect
(
pstub
,
obj
);
ok
(
r
==
S_OK
,
"r %08lx
\n
"
,
r
);
ok
(
connect_test_orig_release_called
==
1
,
"release called %d
\n
"
,
connect_test_orig_release_called
);
ok
(
cstd_stub
->
pvServerObject
==
(
void
*
)
0xcafebabe
,
"pvServerObject %p
\n
"
,
cstd_stub
->
pvServerObject
);
cstd_stub
->
pvServerObject
=
(
IUnknown
*
)
&
orig_vtbl
;
obj
=
(
IUnknown
*
)
&
new_fail_vtbl
;
r
=
IRpcStubBuffer_Connect
(
pstub
,
obj
);
ok
(
r
==
E_NOINTERFACE
,
"r %08lx
\n
"
,
r
);
ok
(
cstd_stub
->
pvServerObject
==
(
void
*
)
0xdeadbeef
,
"pvServerObject %p
\n
"
,
cstd_stub
->
pvServerObject
);
ok
(
connect_test_orig_release_called
==
2
,
"release called %d
\n
"
,
connect_test_orig_release_called
);
}
START_TEST
(
cstub
)
{
IPSFactoryBuffer
*
ppsf
;
...
...
@@ -638,6 +712,7 @@ START_TEST( cstub )
ppsf
=
test_NdrDllGetClassObject
();
test_NdrStubForwardingFunction
();
test_CreateStub
(
ppsf
);
test_Connect
(
ppsf
);
OleUninitialize
();
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment