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
2a021b50
Commit
2a021b50
authored
Mar 09, 2007
by
Rob Shearman
Committed by
Alexandre Julliard
Mar 09, 2007
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ole32: Enable local server test and make it work with Win9x COM implementation.
parent
c826515e
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
12 deletions
+10
-12
marshal.c
dlls/ole32/tests/marshal.c
+10
-12
No files found.
dlls/ole32/tests/marshal.c
View file @
2a021b50
...
...
@@ -2178,7 +2178,7 @@ static const IClassFactoryVtbl TestClassFactoryOOP_Vtbl =
static
IClassFactory
TestOOP_ClassFactory
=
{
&
TestClassFactoryOOP_Vtbl
};
/* tests functions commonly used by out of process COM servers */
static
void
test_
out_of_process_com
(
void
)
static
void
test_
local_server
(
void
)
{
static
const
CLSID
CLSID_WineOOPTest
=
{
0x5201163f
,
...
...
@@ -2204,10 +2204,9 @@ static void test_out_of_process_com(void)
* class in the registry */
hr
=
CoGetClassObject
(
&
CLSID_WineOOPTest
,
CLSCTX_INPROC_SERVER
,
NULL
,
&
IID_IClassFactory
,
(
LPVOID
*
)
&
cf
);
todo_wine
{
ok
(
hr
==
REGDB_E_CLASSNOTREG
,
ok
(
hr
==
REGDB_E_CLASSNOTREG
||
/* NT */
hr
==
S_OK
/* Win9x */
,
"CoGetClassObject should have returned REGDB_E_CLASSNOTREG instead of 0x%08x
\n
"
,
hr
);
}
/* Resume the object suspended above ... */
hr
=
CoResumeClassObjects
();
...
...
@@ -2224,27 +2223,27 @@ static void test_out_of_process_com(void)
ok_no_locks
();
hr
=
IClassFactory_LockServer
(
cf
,
TRUE
);
trace
(
"IClassFactory_LockServer returned 0x%08x
\n
"
,
h
r
);
ok_ole_success
(
hr
,
IClassFactory_LockServe
r
);
ok_more_than_one_lock
();
IClassFactory_LockServer
(
cf
,
FALSE
);
ok_ole_success
(
hr
,
IClassFactory_LockServer
);
ok_no_locks
();
IClassFactory_Release
(
cf
);
/* wait for shutdown signal */
ret
=
WaitForSingleObject
(
heventShutdown
,
500
0
);
todo_wine
{
ok
(
ret
!=
WAIT_TIMEOUT
,
"Server didn't shut down
or machine is under very heavy load
\n
"
);
}
ret
=
WaitForSingleObject
(
heventShutdown
,
0
);
todo_wine
{
ok
(
ret
!=
WAIT_TIMEOUT
,
"Server didn't shut down
\n
"
);
}
/* try to connect again after SCM has suspended registered class objects */
hr
=
CoGetClassObject
(
&
CLSID_WineOOPTest
,
CLSCTX_INPROC_SERVER
|
CLSCTX_LOCAL_SERVER
,
NULL
,
&
IID_IClassFactory
,
(
LPVOID
*
)
&
cf
);
todo_wine
{
ok
(
hr
==
CO_E_SERVER_STOPPING
,
ok
(
hr
==
CO_E_SERVER_STOPPING
||
/* NT */
hr
==
S_OK
/* Win9x */
,
"CoGetClassObject should have returned CO_E_SERVER_STOPPING instead of 0x%08x
\n
"
,
hr
);
}
hr
=
CoRevokeClassObject
(
cookie
);
ok_ole_success
(
hr
,
CoRevokeClassObject
);
...
...
@@ -2582,8 +2581,7 @@ START_TEST(marshal)
test_inproc_handler
();
test_handler_marshaling
();
/* doesn't pass with Win9x COM DLLs (even though Essential COM says it should) */
if
(
0
)
test_out_of_process_com
();
test_local_server
();
test_globalinterfacetable
();
...
...
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