ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msvcp110: Add tr2_sys__Rename implementation and test.

This commit is contained in:
YongHao Hu 2015-07-07 15:09:39 +08:00 committed by Alexandre Julliard
parent 7692d400c9
commit de571b8a74
5 changed files with 103 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/msvcp110/msvcp110.spec
View File

@ -1722,8 +1722,8 @@
@ cdecl -arch=win64 ?_Remove_dir@sys@tr2@std@@YA_NPEBD@Z(str) tr2_sys__Remove_dir
@ stub -arch=win32 ?_Remove_dir@sys@tr2@std@@YA_NPB_W@Z
@ stub -arch=win64 ?_Remove_dir@sys@tr2@std@@YA_NPEB_W@Z
@ stub -arch=win32 ?_Rename@sys@tr2@std@@YAHPBD0@Z
@ stub -arch=win64 ?_Rename@sys@tr2@std@@YAHPEBD0@Z
@ cdecl -arch=win32 ?_Rename@sys@tr2@std@@YAHPBD0@Z(str str) tr2_sys__Rename
@ cdecl -arch=win64 ?_Rename@sys@tr2@std@@YAHPEBD0@Z(str str) tr2_sys__Rename
@ stub -arch=win32 ?_Rename@sys@tr2@std@@YAHPB_W0@Z
@ stub -arch=win64 ?_Rename@sys@tr2@std@@YAHPEB_W0@Z
@ cdecl -arch=win32 ?_Rep@?$num_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@ABA?AV?$ostreambuf_iterator@DU?$char_traits@D@std@@@2@V32@DI@Z(ptr ptr long ptr long long) num_put_char__Rep

4
dlls/msvcp120/msvcp120.spec
View File

@ -1683,8 +1683,8 @@
@ cdecl -arch=win64 ?_Remove_dir@sys@tr2@std@@YA_NPEBD@Z(str) tr2_sys__Remove_dir
@ stub -arch=win32 ?_Remove_dir@sys@tr2@std@@YA_NPB_W@Z
@ stub -arch=win64 ?_Remove_dir@sys@tr2@std@@YA_NPEB_W@Z
@ stub -arch=win32 ?_Rename@sys@tr2@std@@YAHPBD0@Z
@ stub -arch=win64 ?_Rename@sys@tr2@std@@YAHPEBD0@Z
@ cdecl -arch=win32 ?_Rename@sys@tr2@std@@YAHPBD0@Z(str str) tr2_sys__Rename
@ cdecl -arch=win64 ?_Rename@sys@tr2@std@@YAHPEBD0@Z(str str) tr2_sys__Rename
@ stub -arch=win32 ?_Rename@sys@tr2@std@@YAHPB_W0@Z
@ stub -arch=win64 ?_Rename@sys@tr2@std@@YAHPEB_W0@Z
@ cdecl -arch=win32 ?_Rep@?$num_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@ABA?AV?$ostreambuf_iterator@DU?$char_traits@D@std@@@2@V32@DI@Z(ptr ptr long ptr long long) num_put_char__Rep

83
dlls/msvcp120/tests/msvcp120.c
View File

@ -67,6 +67,7 @@ static MSVCP_bool (__cdecl *p_tr2_sys__Current_set)(char const*);
static int (__cdecl *p_tr2_sys__Make_dir)(char const*);
static MSVCP_bool (__cdecl *p_tr2_sys__Remove_dir)(char const*);
static int (__cdecl *p_tr2_sys__Copy_file)(char const*, char const*, MSVCP_bool);
static int (__cdecl *p_tr2_sys__Rename)(char const*, char const*);
static HMODULE msvcp;
#define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp,y)
@ -109,6 +110,8 @@ static BOOL init(void)
"?_Remove_dir@sys@tr2@std@@YA_NPEBD@Z");
SET(p_tr2_sys__Copy_file,
"?_Copy_file@sys@tr2@std@@YAHPEBD0_N@Z");
SET(p_tr2_sys__Rename,
"?_Rename@sys@tr2@std@@YAHPEBD0@Z");
} else {
SET(p_tr2_sys__File_size,
"?_File_size@sys@tr2@std@@YA_KPBD@Z");
@ -124,6 +127,8 @@ static BOOL init(void)
"?_Remove_dir@sys@tr2@std@@YA_NPBD@Z");
SET(p_tr2_sys__Copy_file,
"?_Copy_file@sys@tr2@std@@YAHPBD0_N@Z");
SET(p_tr2_sys__Rename,
"?_Rename@sys@tr2@std@@YAHPBD0@Z");
}
msvcr = GetModuleHandleA("msvcr120.dll");
@ -586,6 +591,83 @@ static void test_tr2_sys__Copy_file(void)
ok(ret == 1, "test_tr2_sys__Remove_dir(): expect 1 got %d\n", ret);
}
static void test_tr2_sys__Rename(void)
{
int ret, i;
HANDLE file, h1, h2;
BY_HANDLE_FILE_INFORMATION info1, info2;
char temp_path[MAX_PATH], current_path[MAX_PATH];
LARGE_INTEGER file_size;
struct {
char const *old_path;
char const *new_path;
int val;
} tests[] = {
{ "tr2_test_dir\\f1", "tr2_test_dir\\f1_rename", ERROR_SUCCESS },
{ "tr2_test_dir\\f1", NULL, ERROR_INVALID_PARAMETER },
{ "tr2_test_dir\\f1", "tr2_test_dir\\f1_rename", ERROR_FILE_NOT_FOUND },
{ NULL, "tr2_test_dir\\NULL_rename", ERROR_INVALID_PARAMETER },
{ "tr2_test_dir\\f1_rename", "tr2_test_dir\\??invalid_name>>", ERROR_INVALID_NAME },
{ "tr2_test_dir\\not_exist_file", "tr2_test_dir\\not_exist_rename", ERROR_FILE_NOT_FOUND }
};
memset(current_path, 0, MAX_PATH);
GetCurrentDirectoryA(MAX_PATH, current_path);
memset(temp_path, 0, MAX_PATH);
GetTempPathA(MAX_PATH, temp_path);
ok(SetCurrentDirectoryA(temp_path), "SetCurrentDirectoryA to temp_path failed\n");
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("tr2_test_dir\\f1", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL);
ok(file != INVALID_HANDLE_VALUE, "create file failed: INVALID_HANDLE_VALUE\n");
CloseHandle(file);
ret = p_tr2_sys__Rename("tr2_test_dir\\f1", "tr2_test_dir\\f1");
todo_wine ok(ERROR_SUCCESS == ret, "test_tr2_sys__Rename(): expect: ERROR_SUCCESS, got %d\n", ret);
for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) {
errno = 0xdeadbeef;
if(tests[i].val == ERROR_SUCCESS) {
h1 = CreateFileA(tests[i].old_path, 0, FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE,
NULL, OPEN_EXISTING, 0, 0);
ok(h1 != INVALID_HANDLE_VALUE, "create file failed: INVALID_HANDLE_VALUE\n");
ok(GetFileInformationByHandle(h1, &info1), "GetFileInformationByHandle failed\n");
CloseHandle(h1);
}
SetLastError(0xdeadbeef);
ret = p_tr2_sys__Rename(tests[i].old_path, tests[i].new_path);
ok(ret == tests[i].val, "test_tr2_sys__Rename(): test %d expect: %d, got %d\n", i+1, tests[i].val, ret);
ok(errno == 0xdeadbeef, "test_tr2_sys__Rename(): test %d errno expect 0xdeadbeef, got %d\n", i+1, errno);
if(ret == ERROR_SUCCESS) {
h2 = CreateFileA(tests[i].new_path, 0, FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE,
NULL, OPEN_EXISTING, 0, 0);
ok(h2 != INVALID_HANDLE_VALUE, "create file failed: INVALID_HANDLE_VALUE\n");
ok(GetFileInformationByHandle(h2, &info2), "GetFileInformationByHandle failed\n");
CloseHandle(h2);
ok(info1.nFileIndexHigh == info2.nFileIndexHigh
&& info1.nFileIndexLow == info2.nFileIndexLow,
"test_tr2_sys__Rename(): test %d expect two files equivalent\n", i+1);
}
}
file = CreateFileA("tr2_test_dir\\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);
ret = p_tr2_sys__Rename("tr2_test_dir\\f1", "tr2_test_dir\\f1_rename");
ok(ret == ERROR_ALREADY_EXISTS, "test_tr2_sys__Rename(): expect: ERROR_ALREADY_EXISTS, got %d\n", ret);
ok(p_tr2_sys__File_size("tr2_test_dir\\f1") == 7, "test_tr2_sys__Rename(): expect: 7, got %s\n", debugstr_longlong(p_tr2_sys__File_size("tr2_test_dir\\f1")));
ok(p_tr2_sys__File_size("tr2_test_dir\\f1_rename") == 0, "test_tr2_sys__Rename(): expect: 0, got %s\n",debugstr_longlong(p_tr2_sys__File_size("tr2_test_dir\\f1_rename")));
ok(DeleteFileA("tr2_test_dir\\f1"), "expect f1 to exist\n");
ok(DeleteFileA("tr2_test_dir\\f1_rename"), "expect f1_rename to exist\n");
ret = p_tr2_sys__Remove_dir("tr2_test_dir");
ok(ret == 1, "test_tr2_sys__Remove_dir(): expect %d got %d\n", 1, ret);
ok(SetCurrentDirectoryA(current_path), "SetCurrentDirectoryA failed\n");
}
START_TEST(msvcp120)
{
if(!init()) return;
@ -602,5 +684,6 @@ START_TEST(msvcp120)
test_tr2_sys__Make_dir();
test_tr2_sys__Remove_dir();
test_tr2_sys__Copy_file();
test_tr2_sys__Rename();
FreeLibrary(msvcp);
}

4
dlls/msvcp120_app/msvcp120_app.spec
View File

@ -1683,8 +1683,8 @@
@ cdecl -arch=win64 ?_Remove_dir@sys@tr2@std@@YA_NPEBD@Z(str) msvcp120.?_Remove_dir@sys@tr2@std@@YA_NPEBD@Z
@ stub -arch=win32 ?_Remove_dir@sys@tr2@std@@YA_NPB_W@Z
@ stub -arch=win64 ?_Remove_dir@sys@tr2@std@@YA_NPEB_W@Z
@ stub -arch=win32 ?_Rename@sys@tr2@std@@YAHPBD0@Z
@ stub -arch=win64 ?_Rename@sys@tr2@std@@YAHPEBD0@Z
@ cdecl -arch=win32 ?_Rename@sys@tr2@std@@YAHPBD0@Z(str str) msvcp120.?_Rename@sys@tr2@std@@YAHPBD0@Z
@ cdecl -arch=win64 ?_Rename@sys@tr2@std@@YAHPEBD0@Z(str str) msvcp120.?_Rename@sys@tr2@std@@YAHPEBD0@Z
@ stub -arch=win32 ?_Rename@sys@tr2@std@@YAHPB_W0@Z
@ stub -arch=win64 ?_Rename@sys@tr2@std@@YAHPEB_W0@Z
@ cdecl -arch=win32 ?_Rep@?$num_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@ABA?AV?$ostreambuf_iterator@DU?$char_traits@D@std@@@2@V32@DI@Z(ptr ptr long ptr long long) msvcp120.?_Rep@?$num_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@ABA?AV?$ostreambuf_iterator@DU?$char_traits@D@std@@@2@V32@DI@Z

14
dlls/msvcp90/ios.c
View File

@ -14295,6 +14295,20 @@ int __cdecl tr2_sys__Copy_file(char const* source, char const* dest, MSVCP_bool
return GetLastError();
}
/* ?_Rename@sys@tr2@std@@YAHPBD0@Z */
/* ?_Rename@sys@tr2@std@@YAHPEBD0@Z */
int __cdecl tr2_sys__Rename(char const* old_path, char const* new_path)
{
TRACE("(%s %s)\n", debugstr_a(old_path), debugstr_a(new_path));
if(!old_path || !new_path)
return ERROR_INVALID_PARAMETER;
if(MoveFileExA(old_path, new_path, MOVEFILE_COPY_ALLOWED))
return ERROR_SUCCESS;
return GetLastError();
}
/* ??0strstream@std@@QAE@PADHH@Z */
/* ??0strstream@std@@QEAA@PEAD_JH@Z */
#if STREAMSIZE_BITS == 64