Module: wine Branch: master Commit: eea0f37a1a8cda59ebcec698356af0cc46f2107b URL: http://source.winehq.org/git/wine.git/?a=commit;h=eea0f37a1a8cda59ebcec69835... Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Oct 10 17:09:43 2017 +0200 msvcp: Implement the WCHAR version of _Unlink. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp120/msvcp120.spec | 4 ++-- dlls/msvcp120_app/msvcp120_app.spec | 4 ++-- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp90/ios.c | 12 ++++++++++++ 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index b3f2223..4d46be4 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -1768,8 +1768,8 @@ @ cdecl -arch=win64 ?_Tidy(a)ios_base@std@@AEAAXXZ(ptr) ios_base_Tidy @ cdecl -arch=win32 ?_Unlink(a)sys@tr2(a)std@@YAHPBD(a)Z(str) tr2_sys__Unlink @ cdecl -arch=win64 ?_Unlink(a)sys@tr2(a)std@@YAHPEBD(a)Z(str) tr2_sys__Unlink -@ stub -arch=win32 ?_Unlink(a)sys@tr2(a)std@@YAHPB_W(a)Z -@ stub -arch=win64 ?_Unlink(a)sys@tr2(a)std@@YAHPEB_W(a)Z +@ cdecl -arch=win32 ?_Unlink(a)sys@tr2(a)std@@YAHPB_W(a)Z(wstr) tr2_sys__Unlink_wchar +@ cdecl -arch=win64 ?_Unlink(a)sys@tr2(a)std@@YAHPEB_W(a)Z(wstr) tr2_sys__Unlink_wchar @ cdecl -arch=arm ?_Unlock@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@UAAXXZ(ptr) basic_streambuf_char__Unlock @ thiscall -arch=i386 ?_Unlock@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@UAEXXZ(ptr) basic_streambuf_char__Unlock @ cdecl -arch=win64 ?_Unlock@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@UEAAXXZ(ptr) basic_streambuf_char__Unlock diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index 4d4c88e..fd99058 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -1768,8 +1768,8 @@ @ cdecl -arch=win64 ?_Tidy(a)ios_base@std@@AEAAXXZ(ptr) msvcp120.?_Tidy(a)ios_base@std@@AEAAXXZ @ cdecl -arch=win32 ?_Unlink(a)sys@tr2(a)std@@YAHPBD(a)Z(str) msvcp120.?_Unlink(a)sys@tr2(a)std@@YAHPBD(a)Z @ cdecl -arch=win64 ?_Unlink(a)sys@tr2(a)std@@YAHPEBD(a)Z(str) msvcp120.?_Unlink(a)sys@tr2(a)std@@YAHPEBD(a)Z -@ stub -arch=win32 ?_Unlink(a)sys@tr2(a)std@@YAHPB_W(a)Z -@ stub -arch=win64 ?_Unlink(a)sys@tr2(a)std@@YAHPEB_W(a)Z +@ cdecl -arch=win32 ?_Unlink(a)sys@tr2(a)std@@YAHPB_W(a)Z(wstr) msvcp120.?_Unlink(a)sys@tr2(a)std@@YAHPB_W(a)Z +@ cdecl -arch=win64 ?_Unlink(a)sys@tr2(a)std@@YAHPEB_W(a)Z(wstr) msvcp120.?_Unlink(a)sys@tr2(a)std@@YAHPEB_W(a)Z @ cdecl -arch=arm ?_Unlock@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@UAAXXZ(ptr) msvcp120.?_Unlock@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@UAAXXZ @ thiscall -arch=i386 ?_Unlock@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@UAEXXZ(ptr) msvcp120.?_Unlock@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@UAEXXZ @ cdecl -arch=win64 ?_Unlock@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@UEAAXXZ(ptr) msvcp120.?_Unlock@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@UEAAXXZ diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 80840db..74ff305 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3737,7 +3737,7 @@ @ cdecl _Toupper(long ptr) _Toupper @ cdecl _Towlower(long ptr) _Towlower @ cdecl _Towupper(long ptr) _Towupper -@ stub _Unlink +@ cdecl _Unlink(wstr) tr2_sys__Unlink_wchar @ cdecl _Unlock_shared_ptr_spin_lock() @ stub _WStod @ stub _WStodx diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 28deae0..36e5067 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -15060,6 +15060,18 @@ int __cdecl tr2_sys__Unlink(char const* path) return GetLastError(); } +/* ?_Unlink(a)sys@tr2(a)std@@YAHPB_W(a)Z */ +/* ?_Unlink(a)sys@tr2(a)std@@YAHPEB_W(a)Z */ +/* _Unlink */ +int __cdecl tr2_sys__Unlink_wchar(WCHAR const* path) +{ + TRACE("(%s)\n", debugstr_w(path)); + + if(DeleteFileW(path)) + return ERROR_SUCCESS; + return GetLastError(); +} + /* ??0strstream(a)std@@QAE(a)PADHH@Z */ /* ??0strstream(a)std@@QEAA(a)PEAD_JH@Z */ #if STREAMSIZE_BITS == 64