André Hentschel : sti/tests: Fix tests compilation with __WINESRC__ defined.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: c39eac6332b1bc0198fca4a54b4ccff8c4aa0c91
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=c39eac6332b1bc0198fca4a54b...

Author: André Hentschel 
Date:   Thu Oct 24 00:30:12 2013 +0200

sti/tests: Fix tests compilation with __WINESRC__ defined.

---

dlls/sti/tests/Makefile.in |    1 -
 dlls/sti/tests/sti.c       |   12 ++++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/dlls/sti/tests/Makefile.in b/dlls/sti/tests/Makefile.in
index 008b5be..fc01d8e 100644
--- a/dlls/sti/tests/Makefile.in
+++ b/dlls/sti/tests/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS
 TESTDLL   = sti.dll
 IMPORTS   = uuid ole32

diff --git a/dlls/sti/tests/sti.c b/dlls/sti/tests/sti.c
index 9c5e3c7..fa4db8c 100644
--- a/dlls/sti/tests/sti.c
+++ b/dlls/sti/tests/sti.c
@@ -86,7 +86,7 @@ static void test_version_flag_versus_aw(void)
     if (pStiCreateInstance)
     {
         PSTIW pStiW;
-        hr = pStiCreateInstance(GetModuleHandle(NULL), STI_VERSION_REAL, &pStiW, NULL);
+        hr = pStiCreateInstance(GetModuleHandleA(NULL), STI_VERSION_REAL, &pStiW, NULL);
         if (SUCCEEDED(hr))
         {
             IUnknown *pUnknown;
@@ -100,7 +100,7 @@ static void test_version_flag_versus_aw(void)
         }
         else
             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(GetModuleHandleA(NULL), STI_VERSION_REAL | STI_VERSION_FLAG_UNICODE, &pStiW, NULL);
         if (SUCCEEDED(hr))
         {
             IUnknown *pUnknown;
@@ -121,7 +121,7 @@ static void test_version_flag_versus_aw(void)
     if (pStiCreateInstanceA)
     {
         PSTIA pStiA;
-        hr = pStiCreateInstanceA(GetModuleHandle(NULL), STI_VERSION_REAL | STI_VERSION_FLAG_UNICODE, &pStiA, NULL);
+        hr = pStiCreateInstanceA(GetModuleHandleA(NULL), STI_VERSION_REAL | STI_VERSION_FLAG_UNICODE, &pStiA, NULL);
         if (SUCCEEDED(hr))
         {
             IUnknown *pUnknown;
@@ -142,7 +142,7 @@ static void test_version_flag_versus_aw(void)
     if (pStiCreateInstanceW)
     {
         PSTIW pStiW;
-        hr = pStiCreateInstanceW(GetModuleHandle(NULL), STI_VERSION_REAL, &pStiW, NULL);
+        hr = pStiCreateInstanceW(GetModuleHandleA(NULL), STI_VERSION_REAL, &pStiW, NULL);
         if (SUCCEEDED(hr))
         {
             IUnknown *pUnknown;
@@ -175,7 +175,7 @@ static void test_stillimage_aggregation(void)
            But StiCreateInstance* only take PSTI. So how does the non-delegating IUnknown
            come back to the outer object calling this function? */

-        hr = pStiCreateInstanceW(GetModuleHandle(NULL), STI_VERSION_REAL, &pStiW, &aggregator);
+        hr = pStiCreateInstanceW(GetModuleHandleA(NULL), STI_VERSION_REAL, &pStiW, &aggregator);
         if (SUCCEEDED(hr))
         {
             IStillImageW *pStiW2 = NULL;
@@ -240,7 +240,7 @@ static void test_launch_app_registry(void)
         return;
     }

-    hr = pStiCreateInstance(GetModuleHandle(NULL), STI_VERSION_REAL | STI_VERSION_FLAG_UNICODE, &pStiW, NULL);
+    hr = pStiCreateInstance(GetModuleHandleA(NULL), STI_VERSION_REAL | STI_VERSION_FLAG_UNICODE, &pStiW, NULL);
     if (SUCCEEDED(hr))
     {
         hr = IStillImage_RegisterLaunchApplication(pStiW, appName, appName);