From: YongHao Hu <christopherwuy@gmail.com>
Subject: [PATCH 08/12] msvcp110: Add tr2_sys__Symlink implementation and test.(resend)
Message-Id: <55ED9DAA.9060204@gmail.com>
Date: Mon, 7 Sep 2015 22:22:34 +0800

---
  dlls/msvcp110/msvcp110.spec         |  4 +--
  dlls/msvcp120/msvcp120.spec         |  4 +--
  dlls/msvcp120/tests/msvcp120.c      | 68 
+++++++++++++++++++++++++++++++++++++
  dlls/msvcp120_app/msvcp120_app.spec |  4 +--
  dlls/msvcp90/ios.c                  | 10 ++++++
  5 files changed, 84 insertions(+), 6 deletions(-)

diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec
index 1d40668..e46dea0 100644
--- a/dlls/msvcp110/msvcp110.spec
+++ b/dlls/msvcp110/msvcp110.spec
@@ -1771,8 +1771,8 @@
 @ cdecl -arch=arm ?_Swap_all@_Container_base12@std@@QAAXAAU12@@Z(ptr ptr) _Container_base12__Swap_all
 @ thiscall -arch=i386 ?_Swap_all@_Container_base12@std@@QAEXAAU12@@Z(ptr ptr) _Container_base12__Swap_all
 @ cdecl -arch=win64 ?_Swap_all@_Container_base12@std@@QEAAXAEAU12@@Z(ptr ptr) _Container_base12__Swap_all
-@ stub -arch=win32 ?_Symlink@sys@tr2@std@@YAHPBD0@Z
-@ stub -arch=win64 ?_Symlink@sys@tr2@std@@YAHPEBD0@Z
+@ cdecl -arch=win32 ?_Symlink@sys@tr2@std@@YAHPBD0@Z(str str) tr2_sys__Symlink
+@ cdecl -arch=win64 ?_Symlink@sys@tr2@std@@YAHPEBD0@Z(str str) tr2_sys__Symlink
 @ stub -arch=win32 ?_Symlink@sys@tr2@std@@YAHPB_W0@Z
 @ stub -arch=win64 ?_Symlink@sys@tr2@std@@YAHPEB_W0@Z
 @ extern ?_Sync@ios_base@std@@0_NA ios_base_Sync
diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec
index ba2fb52..298cd24 100644
--- a/dlls/msvcp120/msvcp120.spec
+++ b/dlls/msvcp120/msvcp120.spec
@@ -1732,8 +1732,8 @@
 @ cdecl -arch=arm ?_Swap_all@_Container_base12@std@@QAAXAAU12@@Z(ptr ptr) _Container_base12__Swap_all
 @ thiscall -arch=i386 ?_Swap_all@_Container_base12@std@@QAEXAAU12@@Z(ptr ptr) _Container_base12__Swap_all
 @ cdecl -arch=win64 ?_Swap_all@_Container_base12@std@@QEAAXAEAU12@@Z(ptr ptr) _Container_base12__Swap_all
-@ stub -arch=win32 ?_Symlink@sys@tr2@std@@YAHPBD0@Z
-@ stub -arch=win64 ?_Symlink@sys@tr2@std@@YAHPEBD0@Z
+@ cdecl -arch=win32 ?_Symlink@sys@tr2@std@@YAHPBD0@Z(str str) tr2_sys__Symlink
+@ cdecl -arch=win64 ?_Symlink@sys@tr2@std@@YAHPEBD0@Z(str str) tr2_sys__Symlink
 @ stub -arch=win32 ?_Symlink@sys@tr2@std@@YAHPB_W0@Z
 @ stub -arch=win64 ?_Symlink@sys@tr2@std@@YAHPEB_W0@Z
 @ extern ?_Sync@ios_base@std@@0_NA ios_base_Sync
diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c
index 063abe1..5ab4c8d 100644
--- a/dlls/msvcp120/tests/msvcp120.c
+++ b/dlls/msvcp120/tests/msvcp120.c
@@ -98,6 +98,7 @@ static void* (__cdecl *p_tr2_sys__Open_dir)(char*, char const*, int *, enum file
 static char* (__cdecl *p_tr2_sys__Read_dir)(char*, void*, enum file_type*);
 static void (__cdecl *p_tr2_sys__Close_dir)(void*);
 static int (__cdecl *p_tr2_sys__Link)(char const*, char const*);
+static int (__cdecl *p_tr2_sys__Symlink)(char const*, char const*);
 
 static HMODULE msvcp;
 #define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp,y)
@@ -178,6 +179,8 @@ static BOOL init(void)
                 "?_Close_dir@sys@tr2@std@@YAXPEAX@Z");
         SET(p_tr2_sys__Link,
                 "?_Link@sys@tr2@std@@YAHPEBD0@Z");
+        SET(p_tr2_sys__Symlink,
+                "?_Symlink@sys@tr2@std@@YAHPEBD0@Z");
     } else {
         SET(p_tr2_sys__File_size,
                 "?_File_size@sys@tr2@std@@YA_KPBD@Z");
@@ -231,6 +234,8 @@ static BOOL init(void)
                 "?_Close_dir@sys@tr2@std@@YAXPAX@Z");
         SET(p_tr2_sys__Link,
                 "?_Link@sys@tr2@std@@YAHPBD0@Z");
+        SET(p_tr2_sys__Symlink,
+                "?_Symlink@sys@tr2@std@@YAHPBD0@Z");
     }
 
     msvcr = GetModuleHandleA("msvcr120.dll");
@@ -1135,6 +1140,68 @@ static void test_tr2_sys__Link(void)
     ok(SetCurrentDirectoryA(current_path), "SetCurrentDirectoryA failed\n");
 }
 
+static void test_tr2_sys__Symlink(void)
+{
+    int ret, i, delete_flag;
+    HANDLE file;
+    LARGE_INTEGER file_size;
+    struct {
+        char const *existing_path;
+        char const *new_path;
+        int last_error;
+        MSVCP_bool is_todo;
+    } tests[] = {
+        { "f1", "f1_link", ERROR_SUCCESS, FALSE },
+        { "f1", "tr2_test_dir\\f1_link", ERROR_SUCCESS, FALSE },
+        { "tr2_test_dir\\f1_link", "tr2_test_dir\\f1_link_link", ERROR_SUCCESS, FALSE },
+        { "tr2_test_dir", "dir_link", ERROR_SUCCESS, FALSE },
+        { NULL, "NULL_link", ERROR_INVALID_PARAMETER, TRUE },
+        { "f1", NULL, ERROR_INVALID_PARAMETER, TRUE },
+        { "not_exist",   "not_exist_link", ERROR_SUCCESS, FALSE },
+        { "f1", "not_exist_dir\\f1_link", ERROR_PATH_NOT_FOUND, TRUE }
+    };
+
+    ret = p_tr2_sys__Make_dir("tr2_test_dir");
+    ok(ret == 1, "test_tr2_sys__Make_dir(): expect 1 got %d\n", ret);
+    file = CreateFileA("f1", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL);
+    ok(file != INVALID_HANDLE_VALUE, "create file failed: INVALID_HANDLE_VALUE\n");
+    file_size.QuadPart = 7;
+    ok(SetFilePointerEx(file, file_size, NULL, FILE_BEGIN), "SetFilePointerEx failed\n");
+    ok(SetEndOfFile(file), "SetEndOfFile failed\n");
+    CloseHandle(file);
+
+    delete_flag = 1;
+    for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) {
+        errno = 0xdeadbeef;
+        SetLastError(0xdeadbeef);
+        ret = p_tr2_sys__Symlink(tests[i].existing_path, tests[i].new_path);
+        if(ret==ERROR_PRIVILEGE_NOT_HELD || ret==ERROR_INVALID_FUNCTION) {
+            delete_flag = 0;
+            tests[i].last_error = ret;
+            win_skip("Privilege not held or symbolic link not supported, skipping symbolic link tests.\n");
+        }
+
+        ok(errno == 0xdeadbeef, "tr2_sys__Symlink(): test %d errno expect 0xdeadbeef, got %d\n", i+1, errno);
+        if(tests[i].is_todo)
+            todo_wine ok(ret == tests[i].last_error, "tr2_sys__Symlink(): test %d expect: %d, got %d\n", i+1, tests[i].last_error, ret);
+        else
+            ok(ret == tests[i].last_error, "tr2_sys__Symlink(): test %d expect: %d, got %d\n", i+1, tests[i].last_error, ret);
+        if(ret == ERROR_SUCCESS)
+            ok(p_tr2_sys__File_size(tests[i].new_path) == 0, "tr2_sys__Symlink(): expect 0, got %s\n", debugstr_longlong(p_tr2_sys__File_size(tests[i].new_path)));
+    }
+
+    ok(DeleteFileA("f1"), "expect f1 to exist\n");
+    if(delete_flag) {
+        todo_wine ok(DeleteFileA("f1_link"), "expect f1_link to exist\n");
+        todo_wine ok(DeleteFileA("tr2_test_dir/f1_link"), "expect tr2_test_dir/f1_link to exist\n");
+        todo_wine ok(DeleteFileA("tr2_test_dir/f1_link_link"), "expect tr2_test_dir/f1_link_link to exist\n");
+        todo_wine ok(DeleteFileA("not_exist_link"), "expect not_exist_link to exist\n");
+        todo_wine ok(DeleteFileA("dir_link"), "expect dir_link to exist\n");
+    }
+    ret = p_tr2_sys__Remove_dir("tr2_test_dir");
+    ok(ret == 1, "tr2_sys__Remove_dir(): expect 1 got %d\n", ret);
+}
+
 START_TEST(msvcp120)
 {
     if(!init()) return;
@@ -1157,5 +1224,6 @@ START_TEST(msvcp120)
     test_tr2_sys__Last_write_time();
     test_tr2_sys__dir_operation();
     test_tr2_sys__Link();
+    test_tr2_sys__Symlink();
     FreeLibrary(msvcp);
 }
diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec
index 6fc8404..5017c1f 100644
--- a/dlls/msvcp120_app/msvcp120_app.spec
+++ b/dlls/msvcp120_app/msvcp120_app.spec
@@ -1732,8 +1732,8 @@
 @ cdecl -arch=arm ?_Swap_all@_Container_base12@std@@QAAXAAU12@@Z(ptr ptr) msvcp120.?_Swap_all@_Container_base12@std@@QAAXAAU12@@Z
 @ thiscall -arch=i386 ?_Swap_all@_Container_base12@std@@QAEXAAU12@@Z(ptr ptr) msvcp120.?_Swap_all@_Container_base12@std@@QAEXAAU12@@Z
 @ cdecl -arch=win64 ?_Swap_all@_Container_base12@std@@QEAAXAEAU12@@Z(ptr ptr) msvcp120.?_Swap_all@_Container_base12@std@@QEAAXAEAU12@@Z
-@ stub -arch=win32 ?_Symlink@sys@tr2@std@@YAHPBD0@Z
-@ stub -arch=win64 ?_Symlink@sys@tr2@std@@YAHPEBD0@Z
+@ cdecl -arch=win32 ?_Symlink@sys@tr2@std@@YAHPBD0@Z(str str) msvcp120.?_Symlink@sys@tr2@std@@YAHPBD0@Z
+@ cdecl -arch=win64 ?_Symlink@sys@tr2@std@@YAHPEBD0@Z(str str) msvcp120.?_Symlink@sys@tr2@std@@YAHPEBD0@Z
 @ stub -arch=win32 ?_Symlink@sys@tr2@std@@YAHPB_W0@Z
 @ stub -arch=win64 ?_Symlink@sys@tr2@std@@YAHPEB_W0@Z
 @ extern ?_Sync@ios_base@std@@0_NA msvcp120.?_Sync@ios_base@std@@0_NA
diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c
index 17bd7c5..7f1caf0 100755
--- a/dlls/msvcp90/ios.c
+++ b/dlls/msvcp90/ios.c
@@ -14522,6 +14522,16 @@ int __cdecl tr2_sys__Link(char const* existing_path, char const* new_path)
     return GetLastError();
 }
 
+/* ?_Symlink@sys@tr2@std@@YAHPBD0@Z */
+/* ?_Symlink@sys@tr2@std@@YAHPEBD0@Z */
+int __cdecl tr2_sys__Symlink(char const* existing_file_name, char const* file_name)
+{
+    TRACE("(%s %s)\n", debugstr_a(existing_file_name), debugstr_a(file_name));
+    if(CreateSymbolicLinkA(file_name, existing_file_name, 0))
+        return ERROR_SUCCESS;
+    return GetLastError();
+}
+
 /* ??0strstream@std@@QAE@PADHH@Z */
 /* ??0strstream@std@@QEAA@PEAD_JH@Z */
 #if STREAMSIZE_BITS == 64