June 2015 - Wine-commits - list.winehq.org

Bruno Jesus : dmband: Don' t fake success on IDirectMusicUtils_IPersistStream_ParseReference.
by Alexandre Julliard 16 Jun '15

16 Jun '15

Module: wine Branch: master Commit: 00303530822f5736a24b38d2a0347666aef138b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00303530822f5736a24b38d2a… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Jun 15 10:24:39 2015 -0300 dmband: Don't fake success on IDirectMusicUtils_IPersistStream_ParseReference. --- dlls/dmband/dmutils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dmband/dmutils.c b/dlls/dmband/dmutils.c index 760afe8..b121564 100644 --- a/dlls/dmband/dmutils.c +++ b/dlls/dmband/dmutils.c @@ -321,7 +321,7 @@ HRESULT IDirectMusicUtils_IPersistStream_ParseReference (LPPERSISTSTREAM iface, } TRACE_(dmfile)("** DM Reference End of Load ***\n"); - return S_OK; + return hr; } /* FOURCC to string conversion for debug messages */

1 0

Bruno Jesus : dmime: Don' t fake success on IDirectMusicUtils_IPersistStream_ParseReference.
by Alexandre Julliard 16 Jun '15

16 Jun '15

Module: wine Branch: master Commit: f9a83377bc7f95eef7bb518d33eeb71ffaae3d9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9a83377bc7f95eef7bb518d3… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Jun 15 10:26:03 2015 -0300 dmime: Don't fake success on IDirectMusicUtils_IPersistStream_ParseReference. --- dlls/dmime/dmutils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dmime/dmutils.c b/dlls/dmime/dmutils.c index 6e61e16..75a62a4 100644 --- a/dlls/dmime/dmutils.c +++ b/dlls/dmime/dmutils.c @@ -216,7 +216,7 @@ HRESULT IDirectMusicUtils_IPersistStream_ParseReference (LPPERSISTSTREAM iface, } TRACE("** DM Reference End of Load ***\n"); - return S_OK; + return hr; } /* FOURCC to string conversion for debug messages */

1 0

Bruno Jesus : ws2_32/tests: Add UDP select() test for unbound socket.
by Alexandre Julliard 16 Jun '15

16 Jun '15

Module: wine Branch: master Commit: 213419961ce5095f5fd9ba9904ca82e7da71da67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=213419961ce5095f5fd9ba990… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Jun 15 10:10:20 2015 -0300 ws2_32/tests: Add UDP select() test for unbound socket. --- dlls/ws2_32/tests/sock.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 610a563..7335faa 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3868,6 +3868,20 @@ todo_wine ok(GetLastError() == WSAENOTSOCK, "expected 10038, got %d\n", GetLastError()); WaitForSingleObject (thread_handle, 1000); closesocket(fdRead); + + /* test UDP behavior of unbound sockets */ + select_timeout.tv_sec = 0; + select_timeout.tv_usec = 250000; + fdWrite = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); + ok(fdWrite != INVALID_SOCKET, "socket call failed\n"); + FD_ZERO_ALL(); + FD_SET_ALL(fdWrite); + ret = select(0, &readfds, &writefds, &exceptfds, &select_timeout); +todo_wine + ok(ret == 1, "expected 1, got %d\n", ret); +todo_wine + ok(FD_ISSET(fdWrite, &writefds), "fdWrite socket is not in the set\n"); + closesocket(fdWrite); } #undef FD_SET_ALL #undef FD_ZERO_ALL

1 0

Bruno Jesus : ws2_32: Trace accepted socket.
by Alexandre Julliard 16 Jun '15

16 Jun '15

Module: wine Branch: master Commit: a0df3330c3839eba23bfbecb4e37d4d91264c1ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0df3330c3839eba23bfbecb4… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Jun 15 10:22:05 2015 -0300 ws2_32: Trace accepted socket. --- dlls/ws2_32/socket.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 1a4533b..d7c3ff3 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2572,6 +2572,7 @@ SOCKET WINAPI WS_accept(SOCKET s, struct WS_sockaddr *addr, int *addrlen32) WS_closesocket(as); return SOCKET_ERROR; } + TRACE("\taccepted %04lx\n", as); return as; } if (is_blocking && status == STATUS_CANT_WAIT)

1 0

Ken Thomases : configure: Only check for libunwind.h on OS X.
by Alexandre Julliard 16 Jun '15

16 Jun '15

Module: wine Branch: master Commit: 36a9f9dd05c3b9df77c44c91663e9bd6cae1c848 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36a9f9dd05c3b9df77c44c916… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Jun 15 20:42:33 2015 -0500 configure: Only check for libunwind.h on OS X. --- configure | 13 ++++++++++++- configure.ac | 2 +- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/configure b/configure index a104097..c0951db 100755 --- a/configure +++ b/configure @@ -6626,7 +6626,6 @@ for ac_header in \ lber.h \ ldap.h \ libproc.h \ - libunwind.h \ link.h \ linux/cdrom.h \ linux/compiler.h \ @@ -7849,6 +7848,18 @@ uninstall:: ;; darwin*|macosx*) + for ac_header in libunwind.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "libunwind.h" "ac_cv_header_libunwind_h" "$ac_includes_default" +if test "x$ac_cv_header_libunwind_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBUNWIND_H 1 +_ACEOF + +fi + +done + LIBEXT="dylib" DLLFLAGS="$DLLFLAGS -fPIC" LIBWINE_LDFLAGS="-multiply_defined suppress" diff --git a/configure.ac b/configure.ac index df28b27..f9df3f0 100644 --- a/configure.ac +++ b/configure.ac @@ -424,7 +424,6 @@ AC_CHECK_HEADERS(\ lber.h \ ldap.h \ libproc.h \ - libunwind.h \ link.h \ linux/cdrom.h \ linux/compiler.h \ @@ -751,6 +750,7 @@ uninstall:: ;; darwin*|macosx*) + AC_CHECK_HEADERS(libunwind.h) LIBEXT="dylib" DLLFLAGS="$DLLFLAGS -fPIC" LIBWINE_LDFLAGS="-multiply_defined suppress"

1 0

Michael Stefaniuc : dmstyle/tests: Add IPersistStream tests for DM*Track.
by Alexandre Julliard 16 Jun '15

16 Jun '15

Module: wine Branch: master Commit: 19b9c8fdb7fddbd094d0a67e0e7bf2816e4798b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19b9c8fdb7fddbd094d0a67e0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jun 16 09:34:51 2015 +0200 dmstyle/tests: Add IPersistStream tests for DM*Track. --- dlls/dmstyle/tests/dmstyle.c | 68 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/dlls/dmstyle/tests/dmstyle.c b/dlls/dmstyle/tests/dmstyle.c index 1401d75..0a0c5aa 100644 --- a/dlls/dmstyle/tests/dmstyle.c +++ b/dlls/dmstyle/tests/dmstyle.c @@ -239,6 +239,73 @@ static void test_dmstyle(void) while (IDirectMusicStyle_Release(dms)); } +static void test_track(void) +{ + IDirectMusicTrack8 *dmt8; + IPersistStream *ps; + CLSID classid; + ULARGE_INTEGER size; + HRESULT hr; +#define X(class) &CLSID_ ## class, #class + const struct { + REFCLSID clsid; + const char *name; + BOOL has_save; + BOOL todo; + } class[] = { + { X(DirectMusicAuditionTrack), TRUE, TRUE }, + { X(DirectMusicChordTrack), TRUE, FALSE }, + { X(DirectMusicCommandTrack), TRUE, TRUE }, + { X(DirectMusicMotifTrack), FALSE, TRUE }, + { X(DirectMusicMuteTrack), TRUE, TRUE }, + { X(DirectMusicStyleTrack), FALSE, FALSE }, + }; +#undef X + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(class); i++) { + trace("Testing %s\n", class[i].name); + hr = CoCreateInstance(class[i].clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicTrack8, + (void**)&dmt8); + if (hr == E_NOINTERFACE && !dmt8) { + skip("%s not created with CoCreateInstance()\n", class[i].name); + continue; + } + ok(hr == S_OK, "%s create failed: %08x, expected S_OK\n", class[i].name, hr); + + /* IPersistStream */ + hr = IDirectMusicTrack8_QueryInterface(dmt8, &IID_IPersistStream, (void**)&ps); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + hr = IPersistStream_GetClassID(ps, &classid); + if (class[i].todo) { + todo_wine { + ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr); + ok(IsEqualGUID(&classid, class[i].clsid), + "Expected class %s got %s\n", class[i].name, wine_dbgstr_guid(&classid)); + hr = IPersistStream_IsDirty(ps); + ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %08x\n", hr); + } + } else { + ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr); + ok(IsEqualGUID(&classid, class[i].clsid), + "Expected class %s got %s\n", class[i].name, wine_dbgstr_guid(&classid)); + hr = IPersistStream_IsDirty(ps); + ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %08x\n", hr); + } + + hr = IPersistStream_GetSizeMax(ps, &size); + ok(hr == E_NOTIMPL, "IPersistStream_GetSizeMax failed: %08x\n", hr); + + hr = IPersistStream_Save(ps, NULL, TRUE); + if (class[i].has_save) + todo_wine ok(hr == E_POINTER, "IPersistStream_Save failed: %08x\n", hr); + else + ok(hr == E_NOTIMPL, "IPersistStream_Save failed: %08x\n", hr); + + while (IDirectMusicTrack8_Release(dmt8)); + } +} + START_TEST(dmstyle) { CoInitialize(NULL); @@ -253,6 +320,7 @@ START_TEST(dmstyle) test_COM_section(); test_COM_track(); test_dmstyle(); + test_track(); CoUninitialize(); }

1 0

Qian Hong : include: Remove duplicate macro definition in shellapi.h.
by Alexandre Julliard 16 Jun '15

16 Jun '15

Module: wine Branch: master Commit: 0edeb9b9b10b1af0ca33b4202ab9d1d5037ae7d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0edeb9b9b10b1af0ca33b4202… Author: Qian Hong <qhong(a)codeweavers.com> Date: Tue Jun 16 15:58:21 2015 +0800 include: Remove duplicate macro definition in shellapi.h. --- include/shellapi.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/include/shellapi.h b/include/shellapi.h index ecf0b21..8492155 100644 --- a/include/shellapi.h +++ b/include/shellapi.h @@ -250,12 +250,6 @@ void WINAPI SHFreeNameMappings(HANDLE hNameMappings); /****************************************** * ShellExecute */ -#define SE_ERR_SHARE 26 -#define SE_ERR_ASSOCINCOMPLETE 27 -#define SE_ERR_DDETIMEOUT 28 -#define SE_ERR_DDEFAIL 29 -#define SE_ERR_DDEBUSY 30 -#define SE_ERR_NOASSOC 31 HINSTANCE WINAPI ShellExecuteA(HWND,LPCSTR,LPCSTR,LPCSTR,LPCSTR,INT); HINSTANCE WINAPI ShellExecuteW(HWND,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR,INT);

1 0

Julian Rüger : German translation for release 1.7.45
by Jeremy Newman 15 Jun '15

15 Jun '15

Module: website Branch: master Commit: fa76686423f20af15f8b3b8b28bf89c8ac65fba5 URL: http://source.winehq.org/git/website.git/?a=commit;h=fa76686423f20af15f8b3b… Author: Julian Rüger <jr98(a)gmx.net> Date: Sun Jun 14 15:56:19 2015 +0200 German translation for release 1.7.45 >From 8bde2c64ebcddddbea7adc50a44bfc7aac97f06a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20R=C3=BCger?= <jr98(a)gmx.net> Date: Sun, 14 Jun 2015 15:47:06 +0200 Subject: German translation for release 1.7.45 --- news/de/2015061201.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2015061201.xml b/news/de/2015061201.xml new file mode 100644 index 0000000..905cdfe --- /dev/null +++ b/news/de/2015061201.xml @@ -0,0 +1,16 @@ +<news> +<date>12. Juni 2015</date> +<title>Wine 1.7.45 freigegeben</title> +<body> + Die Entwicklungsversion 1.7.45 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.7.45">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Bessere Debugging-Unterstützung unter 64-Bit Mac OS X.</li> + <li>Kleinere Fortschritte der DirectWrite-Implementierung.</li> + <li>Einige Korrekturen am RichEdit-Steuerelement.</li> + <li>Anfänge einer Implementierung der alten MSVCIRT C++-Laufzeit.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.45.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Łukasz Wojniłowicz : Polish translation for release 1.7.45
by Jeremy Newman 15 Jun '15

15 Jun '15

Module: website Branch: master Commit: 65f185d15d9bd1556d68e847e0e765bebe5e5b08 URL: http://source.winehq.org/git/website.git/?a=commit;h=65f185d15d9bd1556d68e8… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Fri Jun 12 20:29:26 2015 +0200 Polish translation for release 1.7.45 --- news/pl/2015061201.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/pl/2015061201.xml b/news/pl/2015061201.xml new file mode 100644 index 0000000..f6ad156 --- /dev/null +++ b/news/pl/2015061201.xml @@ -0,0 +1,16 @@ +<news> +<date>Czerwiec 12, 2015</date> +<title>Wydano Wine 1.7.45</title> +<body> + Wydanie rozwojowe Wine 1.7.45 jest już dostępne. + <a href="{$root}/announce/1.7.45">Co nowego</a> w tym wydaniu: +<ul> + <li>Lepsza wsparcie diagnostyki na 64-bitowym Mac OS X.</li> + <li>Postęo w implementacji DirectWrite.</li> + <li>Kilka poprawek do kontrolek RichEdit.</li> + <li>Początki implementacji starej biblioteki uruchomieniowej MSVCIRT C++.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.45.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

YongHao Hu : msvcp110: Add tr2_sys__Current_set implementation and test.
by Alexandre Julliard 15 Jun '15

15 Jun '15

Module: wine Branch: master Commit: 64dfb0855070e6e33021a76570425a54a72f6e7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=64dfb0855070e6e33021a7657… Author: YongHao Hu <christopherwuy(a)gmail.com> Date: Sat Jun 13 00:30:49 2015 +0800 msvcp110: Add tr2_sys__Current_set implementation and test. --- dlls/msvcp110/msvcp110.spec | 4 ++-- dlls/msvcp120/msvcp120.spec | 4 ++-- dlls/msvcp120/tests/msvcp120.c | 47 +++++++++++++++++++++++++++++++++++++ dlls/msvcp120_app/msvcp120_app.spec | 4 ++-- dlls/msvcp90/ios.c | 8 +++++++ 5 files changed, 61 insertions(+), 6 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 13d790e..a06d260 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -1171,8 +1171,8 @@ @ cdecl -arch=win64 ?_Current_get(a)sys@tr2(a)std@@YAPEADPEAD(a)Z(ptr) tr2_sys__Current_get @ stub -arch=win32 ?_Current_get(a)sys@tr2(a)std@@YAPA_WPA_W(a)Z @ stub -arch=win64 ?_Current_get(a)sys@tr2(a)std@@YAPEA_WPEA_W(a)Z -@ stub -arch=win32 ?_Current_set(a)sys@tr2(a)std@@YA_NPBD(a)Z -@ stub -arch=win64 ?_Current_set(a)sys@tr2(a)std@@YA_NPEBD(a)Z +@ cdecl -arch=win32 ?_Current_set(a)sys@tr2(a)std@@YA_NPBD(a)Z(str) tr2_sys__Current_set +@ cdecl -arch=win64 ?_Current_set(a)sys@tr2(a)std@@YA_NPEBD(a)Z(str) tr2_sys__Current_set @ stub -arch=win32 ?_Current_set(a)sys@tr2(a)std@@YA_NPB_W(a)Z @ stub -arch=win64 ?_Current_set(a)sys@tr2(a)std@@YA_NPEB_W(a)Z @ cdecl -arch=arm ?_Decref(a)facet@locale(a)std@@UAAPAV_Facet_base(a)3@XZ(ptr) locale_facet__Decref diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index 9547473..275d7ab 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -1136,8 +1136,8 @@ @ cdecl -arch=win64 ?_Current_get(a)sys@tr2(a)std@@YAPEADAEAY0BAE(a)D@Z(ptr) tr2_sys__Current_get @ stub -arch=win32 ?_Current_get(a)sys@tr2(a)std@@YAPA_WAAY0BAE(a)_W@Z @ stub -arch=win64 ?_Current_get(a)sys@tr2(a)std@@YAPEA_WAEAY0BAE(a)_W@Z -@ stub -arch=win32 ?_Current_set(a)sys@tr2(a)std@@YA_NPBD(a)Z -@ stub -arch=win64 ?_Current_set(a)sys@tr2(a)std@@YA_NPEBD(a)Z +@ cdecl -arch=win32 ?_Current_set(a)sys@tr2(a)std@@YA_NPBD(a)Z(str) tr2_sys__Current_set +@ cdecl -arch=win64 ?_Current_set(a)sys@tr2(a)std@@YA_NPEBD(a)Z(str) tr2_sys__Current_set @ stub -arch=win32 ?_Current_set(a)sys@tr2(a)std@@YA_NPB_W(a)Z @ stub -arch=win64 ?_Current_set(a)sys@tr2(a)std@@YA_NPEB_W(a)Z @ cdecl -arch=arm ?_Decref(a)facet@locale(a)std@@UAAPAV_Facet_base(a)3@XZ(ptr) locale_facet__Decref diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 6760a13..5953fbe 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -23,6 +23,7 @@ #include "winbase.h" typedef int MSVCRT_long; +typedef unsigned char MSVCP_bool; /* xtime */ typedef struct { @@ -62,6 +63,7 @@ static void (CDECL *p__Do_call)(void *this); static ULONGLONG(__cdecl *p_tr2_sys__File_size)(char const*); 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 HMODULE msvcp; #define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp,y) @@ -96,6 +98,8 @@ static BOOL init(void) "?_Equivalent(a)sys@tr2(a)std@@YAHPEBD0(a)Z"); SET(p_tr2_sys__Current_get, "?_Current_get(a)sys@tr2(a)std@@YAPEADAEAY0BAE(a)D@Z"); + SET(p_tr2_sys__Current_set, + "?_Current_set(a)sys@tr2(a)std@@YA_NPEBD(a)Z"); } else { SET(p_tr2_sys__File_size, "?_File_size(a)sys@tr2(a)std@@YA_KPBD(a)Z"); @@ -103,6 +107,8 @@ static BOOL init(void) "?_Equivalent(a)sys@tr2(a)std@@YAHPBD0(a)Z"); SET(p_tr2_sys__Current_get, "?_Current_get(a)sys@tr2(a)std@@YAPADAAY0BAE(a)D@Z"); + SET(p_tr2_sys__Current_set, + "?_Current_set(a)sys@tr2(a)std@@YA_NPBD(a)Z"); } msvcr = GetModuleHandleA("msvcr120.dll"); @@ -423,6 +429,46 @@ static void test_tr2_sys__Current_get(void) ok(!strcmp(origin_path, current_path), "test_tr2_sys__Current_get(): expect: %s, got %s\n", origin_path, current_path); } +static void test_tr2_sys__Current_set(void) +{ + char temp_path[MAX_PATH], current_path[MAX_PATH], origin_path[MAX_PATH]; + char *temp; + memset(temp_path, 0, MAX_PATH); + GetTempPathA(MAX_PATH, temp_path); + memset(origin_path, 0, MAX_PATH); + GetCurrentDirectoryA(MAX_PATH, origin_path); + temp = p_tr2_sys__Current_get(origin_path); + ok(temp == origin_path, "p_tr2_sys__Current_get returned different buffer\n"); + + ok(p_tr2_sys__Current_set(temp_path), "p_tr2_sys__Current_set to temp_path failed\n"); + memset(current_path, 0, MAX_PATH); + temp = p_tr2_sys__Current_get(current_path); + ok(temp == current_path, "p_tr2_sys__Current_get returned different buffer\n"); + temp[strlen(temp)] = '\\'; + ok(!strcmp(temp_path, current_path), "test_tr2_sys__Current_get(): expect: %s, got %s\n", temp_path, current_path); + + ok(p_tr2_sys__Current_set("./"), "p_tr2_sys__Current_set to temp_path failed\n"); + memset(current_path, 0, MAX_PATH); + temp = p_tr2_sys__Current_get(current_path); + ok(temp == current_path, "p_tr2_sys__Current_get returned different buffer\n"); + temp[strlen(temp)] = '\\'; + ok(!strcmp(temp_path, current_path), "test_tr2_sys__Current_get(): expect: %s, got %s\n", temp_path, current_path); + + errno = 0xdeadbeef; + ok(!p_tr2_sys__Current_set("not_exisist_dir"), "p_tr2_sys__Current_set to not_exist_dir succeed\n"); + ok(errno == 0xdeadbeef, "errno = %d\n", errno); + + errno = 0xdeadbeef; + ok(!p_tr2_sys__Current_set("??invalid_name>>"), "p_tr2_sys__Current_set to ??invalid_name>> succeed\n"); + ok(errno == 0xdeadbeef, "errno = %d\n", errno); + + ok(p_tr2_sys__Current_set(origin_path), "p_tr2_sys__Current_set to origin_path failed\n"); + memset(current_path, 0, MAX_PATH); + temp = p_tr2_sys__Current_get(current_path); + ok(temp == current_path, "p_tr2_sys__Current_get returned different buffer\n"); + ok(!strcmp(origin_path, current_path), "test_tr2_sys__Current_get(): expect: %s, got %s\n", origin_path, current_path); +} + START_TEST(msvcp120) { if(!init()) return; @@ -435,5 +481,6 @@ START_TEST(msvcp120) test_tr2_sys__File_size(); test_tr2_sys__Equivalent(); test_tr2_sys__Current_get(); + test_tr2_sys__Current_set(); FreeLibrary(msvcp); } diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index 11e208a..596eee5 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -1136,8 +1136,8 @@ @ cdecl -arch=win64 ?_Current_get(a)sys@tr2(a)std@@YAPEADAEAY0BAE(a)D@Z(ptr) msvcp120.?_Current_get(a)sys@tr2(a)std@@YAPEADAEAY0BAE(a)D@Z @ stub -arch=win32 ?_Current_get(a)sys@tr2(a)std@@YAPA_WAAY0BAE(a)_W@Z @ stub -arch=win64 ?_Current_get(a)sys@tr2(a)std@@YAPEA_WAEAY0BAE(a)_W@Z -@ stub -arch=win32 ?_Current_set(a)sys@tr2(a)std@@YA_NPBD(a)Z -@ stub -arch=win64 ?_Current_set(a)sys@tr2(a)std@@YA_NPEBD(a)Z +@ cdecl -arch=win32 ?_Current_set(a)sys@tr2(a)std@@YA_NPBD(a)Z(str) msvcp120.?_Current_set(a)sys@tr2(a)std@@YA_NPBD(a)Z +@ cdecl -arch=win64 ?_Current_set(a)sys@tr2(a)std@@YA_NPEBD(a)Z(str) msvcp120.?_Current_set(a)sys@tr2(a)std@@YA_NPEBD(a)Z @ stub -arch=win32 ?_Current_set(a)sys@tr2(a)std@@YA_NPB_W(a)Z @ stub -arch=win64 ?_Current_set(a)sys@tr2(a)std@@YA_NPEB_W(a)Z @ cdecl -arch=arm ?_Decref(a)facet@locale(a)std@@UAAPAV_Facet_base(a)3@XZ(ptr) msvcp120.?_Decref(a)facet@locale(a)std@@UAAPAV_Facet_base(a)3@XZ diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index e11d8c4..e78c46b 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -14252,6 +14252,14 @@ char* __cdecl tr2_sys__Current_get(char *current_path) return current_path; } +/* ?_Current_set(a)sys@tr2(a)std@@YA_NPBD(a)Z */ +/* ?_Current_set(a)sys@tr2(a)std@@YA_NPEBD(a)Z */ +MSVCP_bool __cdecl tr2_sys__Current_set(char const* path) +{ + TRACE("(%p)\n", path); + return SetCurrentDirectoryA(path) != 0; +} + /* ??0strstream(a)std@@QAE(a)PADHH@Z */ /* ??0strstream(a)std@@QEAA(a)PEAD_JH@Z */ #if STREAMSIZE_BITS == 64

1 0