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
84d9b250
Commit
84d9b250
authored
Sep 13, 2013
by
Nikolay Sivov
Committed by
Alexandre Julliard
Sep 13, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ntdll: Added compatible ProgID section.
parent
b8a973dc
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
5 deletions
+18
-5
actctx.c
dlls/kernel32/tests/actctx.c
+0
-5
actctx.c
dlls/ntdll/actctx.c
+0
-0
compobj.c
dlls/ole32/tests/compobj.c
+18
-0
No files found.
dlls/kernel32/tests/actctx.c
View file @
84d9b250
...
...
@@ -1506,11 +1506,6 @@ static void test_find_progid_redirection(HANDLE handle, const GUID *clsid, const
ret
=
pFindActCtxSectionStringA
(
0
,
NULL
,
ACTIVATION_CONTEXT_SECTION_COM_PROGID_REDIRECTION
,
progid
,
&
data
);
if
(
!
ret
)
{
skip
(
"failed for progid=%s
\n
"
,
progid
);
return
;
}
ok_
(
__FILE__
,
line
)(
ret
,
"FindActCtxSectionStringA failed: %u
\n
"
,
GetLastError
());
progiddata
=
(
struct
progidredirect_data
*
)
data
.
lpData
;
...
...
dlls/ntdll/actctx.c
View file @
84d9b250
This diff is collapsed.
Click to expand it.
dlls/ole32/tests/compobj.c
View file @
84d9b250
...
...
@@ -59,6 +59,8 @@ static const GUID IID_Testiface = { 0x22222222, 0x1234, 0x1234, { 0x12, 0x34, 0x
static
const
GUID
IID_Testiface2
=
{
0x32222222
,
0x1234
,
0x1234
,
{
0x12
,
0x34
,
0x56
,
0x78
,
0x9a
,
0xbc
,
0xde
,
0xf0
}
};
static
const
GUID
IID_Testiface3
=
{
0x42222222
,
0x1234
,
0x1234
,
{
0x12
,
0x34
,
0x56
,
0x78
,
0x9a
,
0xbc
,
0xde
,
0xf0
}
};
static
const
GUID
IID_Testiface4
=
{
0x52222222
,
0x1234
,
0x1234
,
{
0x12
,
0x34
,
0x56
,
0x78
,
0x9a
,
0xbc
,
0xde
,
0xf0
}
};
static
const
GUID
IID_Testiface5
=
{
0x62222222
,
0x1234
,
0x1234
,
{
0x12
,
0x34
,
0x56
,
0x78
,
0x9a
,
0xbc
,
0xde
,
0xf0
}
};
static
const
GUID
IID_Testiface6
=
{
0x72222222
,
0x1234
,
0x1234
,
{
0x12
,
0x34
,
0x56
,
0x78
,
0x9a
,
0xbc
,
0xde
,
0xf0
}
};
static
const
GUID
IID_TestPS
=
{
0x66666666
,
0x8888
,
0x7777
,
{
0x66
,
0x66
,
0x55
,
0x55
,
0x55
,
0x55
,
0x55
,
0x55
}
};
static
WCHAR
stdfont
[]
=
{
'S'
,
't'
,
'd'
,
'F'
,
'o'
,
'n'
,
't'
,
0
};
...
...
@@ -236,6 +238,9 @@ static const char actctx_manifest[] =
" <comClass clsid=
\"
{0be35203-8f91-11ce-9de3-00aa004bb852}
\"
"
" progid=
\"
StdFont
\"
"
" />"
" <comClass clsid=
\"
{62222222-1234-1234-1234-56789abcdef0}
\"
>"
" <progid>ProgId.ProgId.1</progid>"
" </comClass>"
" <comInterfaceProxyStub "
" name=
\"
Iifaceps
\"
"
" iid=
\"
{22222222-1234-1234-1234-56789abcdef0}
\"
"
...
...
@@ -256,6 +261,12 @@ static const char actctx_manifest[] =
" iid=
\"
{52222222-1234-1234-1234-56789abcdef0}
\"
"
" proxyStubClsid32=
\"
{00000000-0000-0000-0000-000000000000}
\"
"
" />"
" <clrClass "
" clsid=
\"
{72222222-1234-1234-1234-56789abcdef0}
\"
"
" name=
\"
clrclass
\"
"
" >"
" <progid>clrprogid.1</progid>"
" </clrClass>"
"</assembly>"
;
DEFINE_GUID
(
CLSID_Testclass
,
0x12345678
,
0x1234
,
0x1234
,
0x12
,
0x34
,
0x56
,
0x78
,
0x9a
,
0xbc
,
0xde
,
0xf0
);
...
...
@@ -304,6 +315,13 @@ todo_wine
ok
(
!
lstrcmpiW
(
progid
,
customfontW
),
"got wrong progid %s
\n
"
,
wine_dbgstr_w
(
progid
));
CoTaskMemFree
(
progid
);
/* classes without default progid, progid list is not used */
hr
=
ProgIDFromCLSID
(
&
IID_Testiface5
,
&
progid
);
ok
(
hr
==
REGDB_E_CLASSNOTREG
,
"got 0x%08x
\n
"
,
hr
);
hr
=
ProgIDFromCLSID
(
&
IID_Testiface6
,
&
progid
);
ok
(
hr
==
REGDB_E_CLASSNOTREG
,
"got 0x%08x
\n
"
,
hr
);
pDeactivateActCtx
(
0
,
cookie
);
pReleaseActCtx
(
handle
);
}
...
...
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