diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index dcf47db2836..9ba32243e35 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -1718,8 +1718,8 @@ @ stub -arch=arm ?_Release@_Pad@std@@QAAXXZ @ stub -arch=i386 ?_Release@_Pad@std@@QAEXXZ @ stub -arch=win64 ?_Release@_Pad@std@@QEAAXXZ -@ stub -arch=win32 ?_Remove_dir@sys@tr2@std@@YA_NPBD@Z -@ stub -arch=win64 ?_Remove_dir@sys@tr2@std@@YA_NPEBD@Z +@ cdecl -arch=win32 ?_Remove_dir@sys@tr2@std@@YA_NPBD@Z(str) tr2_sys__Remove_dir +@ 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 diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index acfd380bf2a..488bb015959 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -1679,8 +1679,8 @@ @ stub -arch=arm ?_Release@_Pad@std@@QAAXXZ @ stub -arch=i386 ?_Release@_Pad@std@@QAEXXZ @ stub -arch=win64 ?_Release@_Pad@std@@QEAAXXZ -@ stub -arch=win32 ?_Remove_dir@sys@tr2@std@@YA_NPBD@Z -@ stub -arch=win64 ?_Remove_dir@sys@tr2@std@@YA_NPEBD@Z +@ cdecl -arch=win32 ?_Remove_dir@sys@tr2@std@@YA_NPBD@Z(str) tr2_sys__Remove_dir +@ 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 diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 90c317b0018..e97aa55223a 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -65,6 +65,7 @@ static int (__cdecl *p_tr2_sys__Equivalent)(char const*, char const*); static char* (__cdecl *p_tr2_sys__Current_get)(char *); 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 HMODULE msvcp; #define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp,y) @@ -103,6 +104,8 @@ static BOOL init(void) "?_Current_set@sys@tr2@std@@YA_NPEBD@Z"); SET(p_tr2_sys__Make_dir, "?_Make_dir@sys@tr2@std@@YAHPEBD@Z"); + SET(p_tr2_sys__Remove_dir, + "?_Remove_dir@sys@tr2@std@@YA_NPEBD@Z"); } else { SET(p_tr2_sys__File_size, "?_File_size@sys@tr2@std@@YA_KPBD@Z"); @@ -114,6 +117,8 @@ static BOOL init(void) "?_Current_set@sys@tr2@std@@YA_NPBD@Z"); SET(p_tr2_sys__Make_dir, "?_Make_dir@sys@tr2@std@@YAHPBD@Z"); + SET(p_tr2_sys__Remove_dir, + "?_Remove_dir@sys@tr2@std@@YA_NPBD@Z"); } msvcr = GetModuleHandleA("msvcr120.dll"); @@ -497,6 +502,30 @@ static void test_tr2_sys__Make_dir(void) ok(RemoveDirectoryA("tr2_test_dir"), "Expected tr2_test_dir to exist\n"); } +static void test_tr2_sys__Remove_dir(void) +{ + MSVCP_bool ret; + int i; + struct { + char const *path; + MSVCP_bool val; + } tests[] = { + { "tr2_test_dir", TRUE }, + { "tr2_test_dir", FALSE }, + { NULL, FALSE }, + { "??invalid_name>>", FALSE } + }; + + ok(p_tr2_sys__Make_dir("tr2_test_dir"), "tr2_sys__Make_dir() failed\n"); + + for(i=0; i