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
7eb63214
Commit
7eb63214
authored
Feb 24, 2020
by
Nikolay Sivov
Committed by
Alexandre Julliard
Feb 24, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ole32/tests: Link to activation context API directly.
Signed-off-by:
Nikolay Sivov
<
nsivov@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
7aa1f6ee
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
11 deletions
+2
-11
compobj.c
dlls/ole32/tests/compobj.c
+2
-11
No files found.
dlls/ole32/tests/compobj.c
View file @
7eb63214
...
...
@@ -81,8 +81,6 @@ static HRESULT (WINAPI * pCoDecrementMTAUsage)(CO_MTA_USAGE_COOKIE cookie);
static
LONG
(
WINAPI
*
pRegDeleteKeyExA
)(
HKEY
,
LPCSTR
,
REGSAM
,
DWORD
);
static
LONG
(
WINAPI
*
pRegOverridePredefKey
)(
HKEY
key
,
HKEY
override
);
static
BOOL
(
WINAPI
*
pActivateActCtx
)(
HANDLE
,
ULONG_PTR
*
);
static
HANDLE
(
WINAPI
*
pCreateActCtxW
)(
PCACTCTXW
);
static
BOOL
(
WINAPI
*
pIsWow64Process
)(
HANDLE
,
LPBOOL
);
#define ok_ole_success(hr, func) ok(hr == S_OK, func " failed with error 0x%08x\n", hr)
...
...
@@ -242,8 +240,6 @@ static HANDLE activate_context(const char *manifest, ULONG_PTR *cookie)
HANDLE
handle
;
BOOL
ret
;
if
(
!
pCreateActCtxW
)
return
NULL
;
create_manifest_file
(
"file.manifest"
,
manifest
);
MultiByteToWideChar
(
CP_ACP
,
0
,
"file.manifest"
,
-
1
,
path
,
MAX_PATH
);
...
...
@@ -251,7 +247,7 @@ static HANDLE activate_context(const char *manifest, ULONG_PTR *cookie)
actctx
.
cbSize
=
sizeof
(
ACTCTXW
);
actctx
.
lpSource
=
path
;
handle
=
p
CreateActCtxW
(
&
actctx
);
handle
=
CreateActCtxW
(
&
actctx
);
ok
(
handle
!=
INVALID_HANDLE_VALUE
||
broken
(
handle
==
INVALID_HANDLE_VALUE
)
/* some old XP/2k3 versions */
,
"handle == INVALID_HANDLE_VALUE, error %u
\n
"
,
GetLastError
());
if
(
handle
==
INVALID_HANDLE_VALUE
)
...
...
@@ -274,7 +270,7 @@ static HANDLE activate_context(const char *manifest, ULONG_PTR *cookie)
if
(
handle
)
{
ret
=
p
ActivateActCtx
(
handle
,
cookie
);
ret
=
ActivateActCtx
(
handle
,
cookie
);
ok
(
ret
,
"ActivateActCtx failed: %u
\n
"
,
GetLastError
());
}
...
...
@@ -3826,8 +3822,6 @@ static void init_funcs(void)
pRegDeleteKeyExA
=
(
void
*
)
GetProcAddress
(
hAdvapi32
,
"RegDeleteKeyExA"
);
pRegOverridePredefKey
=
(
void
*
)
GetProcAddress
(
hAdvapi32
,
"RegOverridePredefKey"
);
pActivateActCtx
=
(
void
*
)
GetProcAddress
(
hkernel32
,
"ActivateActCtx"
);
pCreateActCtxW
=
(
void
*
)
GetProcAddress
(
hkernel32
,
"CreateActCtxW"
);
pIsWow64Process
=
(
void
*
)
GetProcAddress
(
hkernel32
,
"IsWow64Process"
);
}
...
...
@@ -3966,9 +3960,6 @@ START_TEST(compobj)
lstrcatA
(
testlib
,
"
\\
testlib.dll"
);
extract_resource
(
"testlib.dll"
,
"TESTDLL"
,
testlib
);
if
(
!
pCreateActCtxW
)
win_skip
(
"Activation contexts are not supported, some tests will be skipped.
\n
"
);
test_ProgIDFromCLSID
();
test_CLSIDFromProgID
();
test_CLSIDFromString
();
...
...
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