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
c39eac63
Commit
c39eac63
authored
Oct 24, 2013
by
André Hentschel
Committed by
Alexandre Julliard
Oct 24, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
sti/tests: Fix tests compilation with __WINESRC__ defined.
parent
4a8452df
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
7 deletions
+6
-7
Makefile.in
dlls/sti/tests/Makefile.in
+0
-1
sti.c
dlls/sti/tests/sti.c
+6
-6
No files found.
dlls/sti/tests/Makefile.in
View file @
c39eac63
EXTRADEFS
=
-U__WINESRC__
-DWINE_STRICT_PROTOTYPES
-DWINE_NO_NAMELESS_EXTENSION
-DWIDL_C_INLINE_WRAPPERS
TESTDLL
=
sti.dll
TESTDLL
=
sti.dll
IMPORTS
=
uuid ole32
IMPORTS
=
uuid ole32
...
...
dlls/sti/tests/sti.c
View file @
c39eac63
...
@@ -86,7 +86,7 @@ static void test_version_flag_versus_aw(void)
...
@@ -86,7 +86,7 @@ static void test_version_flag_versus_aw(void)
if
(
pStiCreateInstance
)
if
(
pStiCreateInstance
)
{
{
PSTIW
pStiW
;
PSTIW
pStiW
;
hr
=
pStiCreateInstance
(
GetModuleHandle
(
NULL
),
STI_VERSION_REAL
,
&
pStiW
,
NULL
);
hr
=
pStiCreateInstance
(
GetModuleHandle
A
(
NULL
),
STI_VERSION_REAL
,
&
pStiW
,
NULL
);
if
(
SUCCEEDED
(
hr
))
if
(
SUCCEEDED
(
hr
))
{
{
IUnknown
*
pUnknown
;
IUnknown
*
pUnknown
;
...
@@ -100,7 +100,7 @@ static void test_version_flag_versus_aw(void)
...
@@ -100,7 +100,7 @@ static void test_version_flag_versus_aw(void)
}
}
else
else
ok
(
0
,
"could not create StillImageA, hr = 0x%X
\n
"
,
hr
);
ok
(
0
,
"could not create StillImageA, hr = 0x%X
\n
"
,
hr
);
hr
=
pStiCreateInstance
(
GetModuleHandle
(
NULL
),
STI_VERSION_REAL
|
STI_VERSION_FLAG_UNICODE
,
&
pStiW
,
NULL
);
hr
=
pStiCreateInstance
(
GetModuleHandle
A
(
NULL
),
STI_VERSION_REAL
|
STI_VERSION_FLAG_UNICODE
,
&
pStiW
,
NULL
);
if
(
SUCCEEDED
(
hr
))
if
(
SUCCEEDED
(
hr
))
{
{
IUnknown
*
pUnknown
;
IUnknown
*
pUnknown
;
...
@@ -121,7 +121,7 @@ static void test_version_flag_versus_aw(void)
...
@@ -121,7 +121,7 @@ static void test_version_flag_versus_aw(void)
if
(
pStiCreateInstanceA
)
if
(
pStiCreateInstanceA
)
{
{
PSTIA
pStiA
;
PSTIA
pStiA
;
hr
=
pStiCreateInstanceA
(
GetModuleHandle
(
NULL
),
STI_VERSION_REAL
|
STI_VERSION_FLAG_UNICODE
,
&
pStiA
,
NULL
);
hr
=
pStiCreateInstanceA
(
GetModuleHandle
A
(
NULL
),
STI_VERSION_REAL
|
STI_VERSION_FLAG_UNICODE
,
&
pStiA
,
NULL
);
if
(
SUCCEEDED
(
hr
))
if
(
SUCCEEDED
(
hr
))
{
{
IUnknown
*
pUnknown
;
IUnknown
*
pUnknown
;
...
@@ -142,7 +142,7 @@ static void test_version_flag_versus_aw(void)
...
@@ -142,7 +142,7 @@ static void test_version_flag_versus_aw(void)
if
(
pStiCreateInstanceW
)
if
(
pStiCreateInstanceW
)
{
{
PSTIW
pStiW
;
PSTIW
pStiW
;
hr
=
pStiCreateInstanceW
(
GetModuleHandle
(
NULL
),
STI_VERSION_REAL
,
&
pStiW
,
NULL
);
hr
=
pStiCreateInstanceW
(
GetModuleHandle
A
(
NULL
),
STI_VERSION_REAL
,
&
pStiW
,
NULL
);
if
(
SUCCEEDED
(
hr
))
if
(
SUCCEEDED
(
hr
))
{
{
IUnknown
*
pUnknown
;
IUnknown
*
pUnknown
;
...
@@ -175,7 +175,7 @@ static void test_stillimage_aggregation(void)
...
@@ -175,7 +175,7 @@ static void test_stillimage_aggregation(void)
But StiCreateInstance* only take PSTI. So how does the non-delegating IUnknown
But StiCreateInstance* only take PSTI. So how does the non-delegating IUnknown
come back to the outer object calling this function? */
come back to the outer object calling this function? */
hr
=
pStiCreateInstanceW
(
GetModuleHandle
(
NULL
),
STI_VERSION_REAL
,
&
pStiW
,
&
aggregator
);
hr
=
pStiCreateInstanceW
(
GetModuleHandle
A
(
NULL
),
STI_VERSION_REAL
,
&
pStiW
,
&
aggregator
);
if
(
SUCCEEDED
(
hr
))
if
(
SUCCEEDED
(
hr
))
{
{
IStillImageW
*
pStiW2
=
NULL
;
IStillImageW
*
pStiW2
=
NULL
;
...
@@ -240,7 +240,7 @@ static void test_launch_app_registry(void)
...
@@ -240,7 +240,7 @@ static void test_launch_app_registry(void)
return
;
return
;
}
}
hr
=
pStiCreateInstance
(
GetModuleHandle
(
NULL
),
STI_VERSION_REAL
|
STI_VERSION_FLAG_UNICODE
,
&
pStiW
,
NULL
);
hr
=
pStiCreateInstance
(
GetModuleHandle
A
(
NULL
),
STI_VERSION_REAL
|
STI_VERSION_FLAG_UNICODE
,
&
pStiW
,
NULL
);
if
(
SUCCEEDED
(
hr
))
if
(
SUCCEEDED
(
hr
))
{
{
hr
=
IStillImage_RegisterLaunchApplication
(
pStiW
,
appName
,
appName
);
hr
=
IStillImage_RegisterLaunchApplication
(
pStiW
,
appName
,
appName
);
...
...
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