[ros-diffs] [akhaldi] 64605: [STI_WINETEST] * Sync with Wine 1.7.27. CORE-8540

Author: akhaldi
Date: Wed Oct  8 18:47:38 2014
New Revision: 64605

URL: http://svn.reactos.org/svn/reactos?rev=64605&view=rev
Log:
[STI_WINETEST]
* Sync with Wine 1.7.27.
CORE-8540

Modified:
    trunk/rostests/winetests/sti/sti.c

Modified: trunk/rostests/winetests/sti/sti.c
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/sti/sti.c?rev=64...
==============================================================================
--- trunk/rostests/winetests/sti/sti.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/sti/sti.c	[iso-8859-1] Wed Oct  8 18:47:38 2014
@@ -63,7 +63,7 @@

static BOOL init_function_pointers(void)
 {
-    sti_dll = LoadLibrary("sti.dll");
+    sti_dll = LoadLibraryA("sti.dll");
     if (sti_dll)
     {
         pStiCreateInstance = (void*)
@@ -86,7 +86,7 @@
     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 @@
         }
         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 @@
     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 @@
     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 @@
            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 @@
         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);