Sebastian Lackner : shlwapi: Fix swapped argument order in SHMapHandle.

[Alexandre Julliard]

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

Author: Sebastian Lackner <sebastian at fds-team.de>
Date:   Thu Oct  2 14:43:33 2014 +0200

shlwapi: Fix swapped argument order in SHMapHandle.

---

 dlls/shlwapi/ordinal.c       | 4 ++--
 dlls/shlwapi/tests/ordinal.c | 6 +-----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c
index e5da1cf..756ed34 100644
--- a/dlls/shlwapi/ordinal.c
+++ b/dlls/shlwapi/ordinal.c
@@ -265,8 +265,8 @@ BOOL WINAPI SHFreeShared(HANDLE hShared, DWORD dwProcId)
  *
  * PARAMS
  * hShared     [I] Shared memory handle to duplicate
- * dwDstProcId [I] ID of the process wanting the duplicated handle
  * dwSrcProcId [I] ID of the process owning hShared
+ * dwDstProcId [I] ID of the process wanting the duplicated handle
  * dwAccess    [I] Desired DuplicateHandle() access
  * dwOptions   [I] Desired DuplicateHandle() options
  *
@@ -275,7 +275,7 @@ BOOL WINAPI SHFreeShared(HANDLE hShared, DWORD dwProcId)
  * Failure: A NULL handle.
  *
  */
-HANDLE WINAPI SHMapHandle(HANDLE hShared, DWORD dwDstProcId, DWORD dwSrcProcId,
+HANDLE WINAPI SHMapHandle(HANDLE hShared, DWORD dwSrcProcId, DWORD dwDstProcId,
                           DWORD dwAccess, DWORD dwOptions)
 {
   HANDLE hRet;
diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c
index 7c7c4a0..099907b 100644
--- a/dlls/shlwapi/tests/ordinal.c
+++ b/dlls/shlwapi/tests/ordinal.c
@@ -548,28 +548,24 @@ static void test_alloc_shared_remote(DWORD procid, HANDLE hmem)
 
     /* It seems like Windows Vista/2008 uses a different internal implementation
      * for shared memory, and calling SHMapHandle fails with ERROR_INVALID_HANDLE. */
-    todo_wine
     ok(hmem2 != NULL || broken(hmem2 == NULL && GetLastError() == ERROR_INVALID_HANDLE),
        "SHMapHandle failed: %u\n", GetLastError());
     if (hmem2 == NULL && GetLastError() == ERROR_INVALID_HANDLE)
     {
-        skip("Subprocess failed to map shared memory, skipping test\n");
+        win_skip("Subprocess failed to map shared memory, skipping test\n");
         return;
     }
 
     p = pSHLockShared(hmem2, GetCurrentProcessId());
-    todo_wine
     ok(p != NULL, "SHLockShared failed: %u\n", GetLastError());
 
     if (p != NULL)
         ok(p->value == 0x12345679, "Wrong value in shared memory: %d instead of %d\n", p->value, 0x12345679);
 
     ret = pSHUnlockShared(p);
-    todo_wine
     ok(ret, "SHUnlockShared failed: %u\n", GetLastError());
 
     ret = pSHFreeShared(hmem2, GetCurrentProcessId());
-    todo_wine
     ok(ret, "SHFreeShared failed: %u\n", GetLastError());
 }