January 2016 - Wine-commits

Francois Gouget : shell32/tests: Fix the shortcut vs. class interaction test.
by Alexandre Julliard 12 Jan '16

12 Jan '16

Module: wine Branch: master Commit: 3dff8bc2133e1118a7e74ab44742cc168d4229c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3dff8bc2133e1118a7e74ab44… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jan 11 02:18:40 2016 +0100 shell32/tests: Fix the shortcut vs. class interaction test. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlexec.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index b765f7c..f67206d 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -2010,11 +2010,12 @@ static void test_lnks(void) okChildInt("argcA", 4); okChildString("argvA3", "Lnk"); - /* Lnk's ContextMenuHandler has priority over an explicit class */ - rc=shell_execute_ex(SEE_MASK_NOZONECHECKS, NULL, filename, NULL, NULL, "shlexec.shlexec"); + /* An explicit class overrides lnk's ContextMenuHandler */ + rc=shell_execute_ex(SEE_MASK_CLASSNAME | SEE_MASK_NOZONECHECKS, NULL, filename, NULL, NULL, "shlexec.shlexec"); ok(rc > 32, "%s failed: rc=%lu err=%u\n", shell_call, rc, GetLastError()); - okChildInt("argcA", 4); - okChildString("argvA3", "Lnk"); + okChildInt("argcA", 5); + okChildString("argvA3", "Open"); + okChildString("argvA4", filename); if (dllver.dwMajorVersion>=6) {

1 0

Anthony Fok : include: Suppress "use msvcrt" error in tchar.h when -mno-cygwin is used.
by Alexandre Julliard 12 Jan '16

12 Jan '16

Module: wine Branch: master Commit: e034c419533065e82e60a22e02e3812335a5b02b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e034c419533065e82e60a22e0… Author: Anthony Fok <foka(a)debian.org> Date: Tue Jan 5 10:50:23 2016 -0700 include: Suppress "use msvcrt" error in tchar.h when -mno-cygwin is used. Signed-off-by: Anthony Fok <foka(a)debian.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/tchar.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/tchar.h b/include/tchar.h index 38885d4..13c8ee6 100644 --- a/include/tchar.h +++ b/include/tchar.h @@ -23,8 +23,8 @@ #error Wine should not include tchar.h internally #endif -#if defined(_UNICODE) || defined(_MBCS) -#error You must use msvcrt when building in Unicode/MBCS mode +#if !defined(__MSVCRT__) && (defined(_UNICODE) || defined(_MBCS)) +#error You must use msvcrt when building in Unicode/MBCS mode [-mno-cygwin] #endif #ifdef __cplusplus

1 0

Anton Baskanov : quartz: Handle NULL target format in FilterGraph:: ConvertTimeFormat.
by Alexandre Julliard 12 Jan '16

12 Jan '16

Module: wine Branch: master Commit: e4dbaeebbd5c205ec48a824043093092c757753c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4dbaeebbd5c205ec48a82404… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Wed Jan 6 23:29:42 2016 +0600 quartz: Handle NULL target format in FilterGraph::ConvertTimeFormat. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 3 +++ dlls/quartz/tests/filtergraph.c | 21 +++++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 5b4b080..5cb670e 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -2530,6 +2530,9 @@ static HRESULT WINAPI MediaSeeking_ConvertTimeFormat(IMediaSeeking *iface, LONGL if (!pSourceFormat) pSourceFormat = &This->timeformatseek; + if (!pTargetFormat) + pTargetFormat = &This->timeformatseek; + if (IsEqualGUID(pTargetFormat, pSourceFormat)) *pTarget = Source; else diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 39d6e88..87b1123 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -255,6 +255,7 @@ static void test_mediacontrol(void) { HRESULT hr; LONGLONG pos = 0xdeadbeef; + GUID format = GUID_NULL; IMediaSeeking *seeking = NULL; IMediaFilter *filter = NULL; IMediaControl *control = NULL; @@ -282,6 +283,26 @@ static void test_mediacontrol(void) return; } + format = GUID_NULL; + hr = IMediaSeeking_GetTimeFormat(seeking, &format); + ok(hr == S_OK, "GetTimeFormat failed: %08x\n", hr); + ok(IsEqualGUID(&format, &TIME_FORMAT_MEDIA_TIME), "GetTimeFormat: unexpected format %s\n", wine_dbgstr_guid(&format)); + + pos = 0xdeadbeef; + hr = IMediaSeeking_ConvertTimeFormat(seeking, &pos, NULL, 0x123456789a, NULL); + ok(hr == S_OK, "ConvertTimeFormat failed: %08x\n", hr); + ok(pos == 0x123456789a, "ConvertTimeFormat: expected 123456789a, got (%x%08x)\n", (DWORD)(pos >> 32), (DWORD)pos); + + pos = 0xdeadbeef; + hr = IMediaSeeking_ConvertTimeFormat(seeking, &pos, &TIME_FORMAT_MEDIA_TIME, 0x123456789a, NULL); + ok(hr == S_OK, "ConvertTimeFormat failed: %08x\n", hr); + ok(pos == 0x123456789a, "ConvertTimeFormat: expected 123456789a, got (%x%08x)\n", (DWORD)(pos >> 32), (DWORD)pos); + + pos = 0xdeadbeef; + hr = IMediaSeeking_ConvertTimeFormat(seeking, &pos, NULL, 0x123456789a, &TIME_FORMAT_MEDIA_TIME); + ok(hr == S_OK, "ConvertTimeFormat failed: %08x\n", hr); + ok(pos == 0x123456789a, "ConvertTimeFormat: expected 123456789a, got (%x%08x)\n", (DWORD)(pos >> 32), (DWORD)pos); + hr = IMediaSeeking_GetCurrentPosition(seeking, &pos); ok(hr == S_OK, "GetCurrentPosition failed: %08x\n", hr); ok(pos == 0, "Position != 0 (%x%08x)\n", (DWORD)(pos >> 32), (DWORD)pos);

1 0

Andrew Eikum : include: Add TrySubmitThreadpoolCallback declaration.
by Alexandre Julliard 12 Jan '16

12 Jan '16

Module: wine Branch: master Commit: 6cecd59f66f258ed7b9629aac5e2441f85d24982 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cecd59f66f258ed7b9629aac… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Jan 11 14:09:54 2016 -0600 include: Add TrySubmitThreadpoolCallback declaration. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winbase.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/winbase.h b/include/winbase.h index 7216086..f35391d 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2545,6 +2545,7 @@ WINBASEAPI BOOL WINAPI TransmitCommChar(HANDLE,CHAR); WINBASEAPI BOOLEAN WINAPI TryAcquireSRWLockExclusive(PSRWLOCK); WINBASEAPI BOOLEAN WINAPI TryAcquireSRWLockShared(PSRWLOCK); WINBASEAPI BOOL WINAPI TryEnterCriticalSection(CRITICAL_SECTION *lpCrit); +WINBASEAPI BOOL WINAPI TrySubmitThreadpoolCallback(PTP_SIMPLE_CALLBACK,void*,TP_CALLBACK_ENVIRON*); WINBASEAPI BOOL WINAPI TzSpecificLocalTimeToSystemTime(const TIME_ZONE_INFORMATION*,const SYSTEMTIME*,LPSYSTEMTIME); WINBASEAPI LONG WINAPI UnhandledExceptionFilter(PEXCEPTION_POINTERS); WINBASEAPI BOOL WINAPI UnlockFile(HANDLE,DWORD,DWORD,DWORD,DWORD);

1 0

Nikolay Sivov : ole2disp: Implement SafeArrayDestroyDescriptor().
by Alexandre Julliard 12 Jan '16

12 Jan '16

Module: wine Branch: master Commit: 1529f082e6ee5e7a897b41e112b219480df6f82e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1529f082e6ee5e7a897b41e11… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 12 11:49:29 2016 +0300 ole2disp: Implement SafeArrayDestroyDescriptor(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole2disp.dll16/ole2disp.c | 25 +++++++++++++++++++++++++ dlls/ole2disp.dll16/ole2disp.dll16.spec | 2 +- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/dlls/ole2disp.dll16/ole2disp.c b/dlls/ole2disp.dll16/ole2disp.c index 1774211..539b515 100644 --- a/dlls/ole2disp.dll16/ole2disp.c +++ b/dlls/ole2disp.dll16/ole2disp.c @@ -67,6 +67,11 @@ static SEGPTR safearray_alloc(ULONG size) return WOWGlobalAllocLock16(GPTR, size, &h); } +static void safearray_free(SEGPTR ptr) +{ + WOWGlobalUnlockFree16(ptr); +} + /****************************************************************************** * SafeArrayAllocDescriptor [OLE2DISP.38] */ @@ -90,6 +95,26 @@ HRESULT WINAPI SafeArrayAllocDescriptor16(UINT16 dims, SEGPTR *ret) return S_OK; } +/****************************************************************************** + * SafeArrayDestroyDescriptor [OLE2DISP.40] + */ +HRESULT WINAPI SafeArrayDestroyDescriptor16(SEGPTR s) +{ + TRACE("0x%08x\n", s); + + if (s) + { + SAFEARRAY16 *sa = MapSL(s); + + if (sa->cLocks) + return DISP_E_ARRAYISLOCKED; + + safearray_free(s); + } + + return S_OK; +} + /* This implementation of the BSTR API is 16-bit only. It represents BSTR as a 16:16 far pointer, and the strings as ISO-8859 */ diff --git a/dlls/ole2disp.dll16/ole2disp.dll16.spec b/dlls/ole2disp.dll16/ole2disp.dll16.spec index 08372c5..997de31 100644 --- a/dlls/ole2disp.dll16/ole2disp.dll16.spec +++ b/dlls/ole2disp.dll16/ole2disp.dll16.spec @@ -37,7 +37,7 @@ 37 stub GETACTIVEOBJECT 38 pascal SafeArrayAllocDescriptor(word ptr) SafeArrayAllocDescriptor16 39 stub SAFEARRAYALLOCDATA -40 stub SAFEARRAYDESTROYDESCRIPTOR +40 pascal SafeArrayDestroyDescriptor(segptr) SafeArrayDestroyDescriptor16 41 stub SAFEARRAYDESTROYDATA 42 stub SAFEARRAYREDIM 43 stub VARI2FROMI4

1 0

Nikolay Sivov : ole2disp: Implement SafeArrayAllocData().
by Alexandre Julliard 12 Jan '16

12 Jan '16

Module: wine Branch: master Commit: beceaa82ca28b99ef49a3b34f691ff234f001344 URL: http://source.winehq.org/git/wine.git/?a=commit;h=beceaa82ca28b99ef49a3b34f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 12 11:49:30 2016 +0300 ole2disp: Implement SafeArrayAllocData(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole2disp.dll16/ole2disp.c | 34 +++++++++++++++++++++++++++++++++ dlls/ole2disp.dll16/ole2disp.dll16.spec | 2 +- 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/dlls/ole2disp.dll16/ole2disp.c b/dlls/ole2disp.dll16/ole2disp.c index 539b515..5831d86 100644 --- a/dlls/ole2disp.dll16/ole2disp.c +++ b/dlls/ole2disp.dll16/ole2disp.c @@ -72,6 +72,23 @@ static void safearray_free(SEGPTR ptr) WOWGlobalUnlockFree16(ptr); } +static ULONG safearray_getcellcount(const SAFEARRAY16 *sa) +{ + const SAFEARRAYBOUND16 *sab = sa->rgsabound; + USHORT count = sa->cDims; + ULONG cells = 1; + + while (count--) + { + if (!sab->cElements) + return 0; + cells *= sab->cElements; + sab++; + } + + return cells; +} + /****************************************************************************** * SafeArrayAllocDescriptor [OLE2DISP.38] */ @@ -96,6 +113,23 @@ HRESULT WINAPI SafeArrayAllocDescriptor16(UINT16 dims, SEGPTR *ret) } /****************************************************************************** + * SafeArrayAllocData [OLE2DISP.39] + */ +HRESULT WINAPI SafeArrayAllocData16(SAFEARRAY16 *sa) +{ + ULONG size; + + TRACE("%p\n", sa); + + if (!sa) + return E_INVALIDARG16; + + size = safearray_getcellcount(sa); + sa->pvData = safearray_alloc(size * sa->cbElements); + return sa->pvData ? S_OK : E_OUTOFMEMORY16; +} + +/****************************************************************************** * SafeArrayDestroyDescriptor [OLE2DISP.40] */ HRESULT WINAPI SafeArrayDestroyDescriptor16(SEGPTR s) diff --git a/dlls/ole2disp.dll16/ole2disp.dll16.spec b/dlls/ole2disp.dll16/ole2disp.dll16.spec index 997de31..919583d 100644 --- a/dlls/ole2disp.dll16/ole2disp.dll16.spec +++ b/dlls/ole2disp.dll16/ole2disp.dll16.spec @@ -36,7 +36,7 @@ 36 stub REVOKEACTIVEOBJECT 37 stub GETACTIVEOBJECT 38 pascal SafeArrayAllocDescriptor(word ptr) SafeArrayAllocDescriptor16 -39 stub SAFEARRAYALLOCDATA +39 pascal SafeArrayAllocData(ptr) SafeArrayAllocData16 40 pascal SafeArrayDestroyDescriptor(segptr) SafeArrayDestroyDescriptor16 41 stub SAFEARRAYDESTROYDATA 42 stub SAFEARRAYREDIM

1 0

André Hentschel : configure: Check for MinGW even when cross compiling.
by Alexandre Julliard 12 Jan '16

12 Jan '16

Module: wine Branch: master Commit: bbcb77cda539788d50dfa35b5583534aa9e8d71e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbcb77cda539788d50dfa35b5… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jan 11 22:24:13 2016 +0100 configure: Check for MinGW even when cross compiling. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 91c21aa..a46e6bb 100755 --- a/configure +++ b/configure @@ -8750,7 +8750,7 @@ test "$ac_cv_header_linux_joystick_h" = "yes" -o "$ac_cv_header_IOKit_hid_IOHIDL CROSSTARGET="" -if test "$cross_compiling" = "no" -a "x$enable_tests" != xno -a "$LIBEXT" != "dll" +if test "x$enable_tests" != xno -a "$LIBEXT" != "dll" then case "$host_cpu" in arm*) diff --git a/configure.ac b/configure.ac index 6535b4a..84a0ac6 100644 --- a/configure.ac +++ b/configure.ac @@ -943,7 +943,7 @@ test "$ac_cv_header_linux_joystick_h" = "yes" -o "$ac_cv_header_IOKit_hid_IOHIDL dnl Check for cross compiler to build test programs AC_SUBST(CROSSTARGET,"") -if test "$cross_compiling" = "no" -a "x$enable_tests" != xno -a "$LIBEXT" != "dll" +if test "x$enable_tests" != xno -a "$LIBEXT" != "dll" then WINE_CHECK_MINGW_PROG(CROSSCC,false) if test "$CROSSCC" != "false"

1 0

Alex Henrie : ntdll: Remove redundant avail_mode check and confusing comment.
by Alexandre Julliard 12 Jan '16

12 Jan '16

Module: wine Branch: master Commit: 63468b02b8a848fe80107ed654e825bd6f018b74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63468b02b8a848fe80107ed65… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Jan 11 02:02:32 2016 -0700 ntdll: Remove redundant avail_mode check and confusing comment. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 1027b54..b90695e 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -523,13 +523,7 @@ static NTSTATUS FILE_AsyncReadService( void *user, IO_STATUS_BLOCK *iosb, if (fileio->already >= fileio->count || fileio->avail_mode) status = STATUS_SUCCESS; else - { - /* if we only have to read the available data, and none is available, - * simply cancel the request. If data was available, it has been read - * while in by previous call (NtDelayExecution) - */ - status = (fileio->avail_mode) ? STATUS_SUCCESS : STATUS_PENDING; - } + status = STATUS_PENDING; } break;

1 0

YongHao Hu : msvcp110: Add tr2_sys__Link implementation and test.
by Alexandre Julliard 12 Jan '16

12 Jan '16

Module: wine Branch: master Commit: 7aeb1d3360eab3b957d2d2ea1df276a0843d8b2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7aeb1d3360eab3b957d2d2ea1… Author: YongHao Hu <christopherwuy(a)gmail.com> Date: Mon Jan 11 21:56:02 2016 +0800 msvcp110: Add tr2_sys__Link implementation and test. Signed-off-by: YongHao Hu <christopherwuy(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp110/msvcp110.spec | 4 +- dlls/msvcp120/msvcp120.spec | 4 +- dlls/msvcp120/tests/msvcp120.c | 90 +++++++++++++++++++++++++++++++++++++ dlls/msvcp120_app/msvcp120_app.spec | 4 +- dlls/msvcp90/ios.c | 13 ++++++ 5 files changed, 109 insertions(+), 6 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 6c8aee4..1df4c55 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -1570,8 +1570,8 @@ @ stub -arch=arm ?_Launch(a)_Pad@std@@QAAXPAU_Thrd_imp_t@@@Z @ stub -arch=i386 ?_Launch(a)_Pad@std@@QAEXPAU_Thrd_imp_t@@@Z @ stub -arch=win64 ?_Launch(a)_Pad@std@@QEAAXPEAU_Thrd_imp_t@@@Z -@ stub -arch=win32 ?_Link(a)sys@tr2(a)std@@YAHPBD0(a)Z -@ stub -arch=win64 ?_Link(a)sys@tr2(a)std@@YAHPEBD0(a)Z +@ cdecl -arch=win32 ?_Link(a)sys@tr2(a)std@@YAHPBD0(a)Z(str str) tr2_sys__Link +@ cdecl -arch=win64 ?_Link(a)sys@tr2(a)std@@YAHPEBD0(a)Z(str str) tr2_sys__Link @ stub -arch=win32 ?_Link(a)sys@tr2(a)std@@YAHPB_W0(a)Z @ stub -arch=win64 ?_Link(a)sys@tr2(a)std@@YAHPEB_W0(a)Z @ cdecl -arch=win32 ?_Locimp_Addfac(a)_Locimp@locale(a)std@@CAXPAV123(a)PAVfacet@23(a)I@Z(ptr ptr long) locale__Locimp__Locimp_Addfac diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index e3200a2..626ead8 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -1531,8 +1531,8 @@ @ stub -arch=arm ?_Launch(a)_Pad@std@@QAAXPAU_Thrd_imp_t@@@Z @ stub -arch=i386 ?_Launch(a)_Pad@std@@QAEXPAU_Thrd_imp_t@@@Z @ stub -arch=win64 ?_Launch(a)_Pad@std@@QEAAXPEAU_Thrd_imp_t@@@Z -@ stub -arch=win32 ?_Link(a)sys@tr2(a)std@@YAHPBD0(a)Z -@ stub -arch=win64 ?_Link(a)sys@tr2(a)std@@YAHPEBD0(a)Z +@ cdecl -arch=win32 ?_Link(a)sys@tr2(a)std@@YAHPBD0(a)Z(str str) tr2_sys__Link +@ cdecl -arch=win64 ?_Link(a)sys@tr2(a)std@@YAHPEBD0(a)Z(str str) tr2_sys__Link @ stub -arch=win32 ?_Link(a)sys@tr2(a)std@@YAHPB_W0(a)Z @ stub -arch=win64 ?_Link(a)sys@tr2(a)std@@YAHPEB_W0(a)Z @ cdecl -arch=win32 ?_Locimp_Addfac(a)_Locimp@locale(a)std@@CAXPAV123(a)PAVfacet@23(a)I@Z(ptr ptr long) locale__Locimp__Locimp_Addfac diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 2724470..77a6050 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -132,6 +132,7 @@ static void (__cdecl *p_tr2_sys__Last_write_time_set)(char const*, __int64); static void* (__cdecl *p_tr2_sys__Open_dir)(char*, char const*, int *, enum file_type*); 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*); /* thrd */ typedef struct @@ -265,6 +266,8 @@ static BOOL init(void) "?_Read_dir(a)sys@tr2(a)std@@YAPEADAEAY0BAE(a)DPEAXAEAW4file_type@123@@Z"); SET(p_tr2_sys__Close_dir, "?_Close_dir(a)sys@tr2(a)std@@YAXPEAX(a)Z"); + SET(p_tr2_sys__Link, + "?_Link(a)sys@tr2(a)std@@YAHPEBD0(a)Z"); SET(p__Thrd_current, "_Thrd_current"); } else { @@ -318,6 +321,8 @@ static BOOL init(void) "?_Read_dir(a)sys@tr2(a)std@@YAPADAAY0BAE(a)DPAXAAW4file_type@123@@Z"); SET(p_tr2_sys__Close_dir, "?_Close_dir(a)sys@tr2(a)std@@YAXPAX(a)Z"); + SET(p_tr2_sys__Link, + "?_Link(a)sys@tr2(a)std@@YAHPBD0(a)Z"); #ifdef __i386__ SET(p_i386_Thrd_current, "_Thrd_current"); @@ -1319,6 +1324,90 @@ static void test_tr2_sys__dir_operation(void) ok(RemoveDirectoryA("tr2_test_dir"), "expect tr2_test_dir to exist\n"); } +static void test_tr2_sys__Link(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 *existing_path; + char const *new_path; + MSVCP_bool fail_if_exists; + int last_error; + } tests[] = { + { "f1", "f1_link", TRUE, ERROR_SUCCESS }, + { "f1", "tr2_test_dir\\f1_link", TRUE, ERROR_SUCCESS }, + { "tr2_test_dir\\f1_link", "tr2_test_dir\\f1_link_link", TRUE, ERROR_SUCCESS }, + { "tr2_test_dir", "dir_link", TRUE, ERROR_ACCESS_DENIED }, + { NULL, "NULL_link", TRUE, ERROR_INVALID_PARAMETER }, + { "f1", NULL, TRUE, ERROR_INVALID_PARAMETER }, + { "not_exist", "not_exist_link", TRUE, ERROR_FILE_NOT_FOUND }, + { "f1", "not_exist_dir\\f1_link", TRUE, ERROR_PATH_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("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); + + for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + errno = 0xdeadbeef; + ret = p_tr2_sys__Link(tests[i].existing_path, tests[i].new_path); + ok(ret == tests[i].last_error, "tr2_sys__Link(): test %d expect: %d, got %d\n", + i+1, tests[i].last_error, ret); + ok(errno == 0xdeadbeef, "tr2_sys__Link(): test %d errno expect 0xdeadbeef, got %d\n", i+1, errno); + if(ret == ERROR_SUCCESS) + ok(p_tr2_sys__File_size(tests[i].existing_path) == p_tr2_sys__File_size(tests[i].new_path), + "tr2_sys__Link(): test %d failed, two files' size are not equal\n", i+1); + } + + ok(DeleteFileA("f1"), "expect f1 to exist\n"); + ok(p_tr2_sys__File_size("f1_link") == p_tr2_sys__File_size("tr2_test_dir/f1_link") && + p_tr2_sys__File_size("tr2_test_dir/f1_link") == p_tr2_sys__File_size("tr2_test_dir/f1_link_link"), + "tr2_sys__Link(): expect links' size are equal, got %s\n", debugstr_longlong(p_tr2_sys__File_size("tr2_test_dir/f1_link_link"))); + ok(p_tr2_sys__File_size("f1_link") == 7, "tr2_sys__Link(): expect f1_link's size equals to 7, got %s\n", debugstr_longlong(p_tr2_sys__File_size("f1_link"))); + + file = CreateFileA("f1_link", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "create file failed: INVALID_HANDLE_VALUE\n"); + file_size.QuadPart = 20; + ok(SetFilePointerEx(file, file_size, NULL, FILE_BEGIN), "SetFilePointerEx failed\n"); + ok(SetEndOfFile(file), "SetEndOfFile failed\n"); + CloseHandle(file); + h1 = CreateFileA("f1_link", 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); + h2 = CreateFileA("tr2_test_dir/f1_link", 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, + "tr2_sys__Link(): test %d expect two files equivalent\n", i+1); + ok(p_tr2_sys__File_size("f1_link") == 20, "tr2_sys__Link(): expect f1_link's size equals to 20, got %s\n", debugstr_longlong(p_tr2_sys__File_size("f1_link"))); + + ok(DeleteFileA("f1_link"), "expect f1_link to exist\n"); + ok(DeleteFileA("tr2_test_dir/f1_link"), "expect tr2_test_dir/f1_link to exist\n"); + ok(DeleteFileA("tr2_test_dir/f1_link_link"), "expect tr2_test_dir/f1_link_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); + ok(SetCurrentDirectoryA(current_path), "SetCurrentDirectoryA failed\n"); +} + static int __cdecl thrd_thread(void *arg) { _Thrd_t *thr = arg; @@ -1608,6 +1697,7 @@ START_TEST(msvcp120) test_tr2_sys__Stat(); test_tr2_sys__Last_write_time(); test_tr2_sys__dir_operation(); + test_tr2_sys__Link(); test_thrd(); test_cnd(); diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index 655e0e6..517e1b0 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -1531,8 +1531,8 @@ @ stub -arch=arm ?_Launch(a)_Pad@std@@QAAXPAU_Thrd_imp_t@@@Z @ stub -arch=i386 ?_Launch(a)_Pad@std@@QAEXPAU_Thrd_imp_t@@@Z @ stub -arch=win64 ?_Launch(a)_Pad@std@@QEAAXPEAU_Thrd_imp_t@@@Z -@ stub -arch=win32 ?_Link(a)sys@tr2(a)std@@YAHPBD0(a)Z -@ stub -arch=win64 ?_Link(a)sys@tr2(a)std@@YAHPEBD0(a)Z +@ cdecl -arch=win32 ?_Link(a)sys@tr2(a)std@@YAHPBD0(a)Z(str str) msvcp120.?_Link(a)sys@tr2(a)std@@YAHPBD0(a)Z +@ cdecl -arch=win64 ?_Link(a)sys@tr2(a)std@@YAHPEBD0(a)Z(str str) msvcp120.?_Link(a)sys@tr2(a)std@@YAHPEBD0(a)Z @ stub -arch=win32 ?_Link(a)sys@tr2(a)std@@YAHPB_W0(a)Z @ stub -arch=win64 ?_Link(a)sys@tr2(a)std@@YAHPEB_W0(a)Z @ cdecl -arch=win32 ?_Locimp_Addfac(a)_Locimp@locale(a)std@@CAXPAV123(a)PAVfacet@23(a)I@Z(ptr ptr long) msvcp120.?_Locimp_Addfac(a)_Locimp@locale(a)std@@CAXPAV123(a)PAVfacet@23(a)I@Z diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index c190ce4..12e2984 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -14756,6 +14756,19 @@ void __cdecl tr2_sys__Close_dir(void* handle) FindClose(handle); } +/* ?_Link(a)sys@tr2(a)std@@YAHPBD0(a)Z */ +/* ?_Link(a)sys@tr2(a)std@@YAHPEBD0(a)Z */ +int __cdecl tr2_sys__Link(char const* existing_path, char const* new_path) +{ + TRACE("(%s %s)\n", debugstr_a(existing_path), debugstr_a(new_path)); + if(!existing_path || !new_path) + return ERROR_INVALID_PARAMETER; + + if(CreateHardLinkA(new_path, existing_path, NULL)) + return ERROR_SUCCESS; + return GetLastError(); +} + /* ??0strstream(a)std@@QAE(a)PADHH@Z */ /* ??0strstream(a)std@@QEAA(a)PEAD_JH@Z */ #if STREAMSIZE_BITS == 64

1 0

Alexandre Julliard : msvcrt/tests: Don't check array pointer for NULL.
by Alexandre Julliard 12 Jan '16

12 Jan '16

Module: wine Branch: master Commit: 0ea5a01ca25f56372f1304214ae9c6db317bed8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ea5a01ca25f56372f1304214… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 13 01:55:39 2016 +0900 msvcrt/tests: Don't check array pointer for NULL. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/cpp.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c index c331db1..cbad1c1 100644 --- a/dlls/msvcrt/tests/cpp.c +++ b/dlls/msvcrt/tests/cpp.c @@ -452,8 +452,7 @@ static void test_exception(void) { /* Check the rtti */ type_info *ti = p__RTtypeid(&e); - ok (ti && ti->mangled && - !strcmp(ti->mangled, ".?AVexception@@"), "bad rtti for e\n"); + ok (ti && !strcmp(ti->mangled, ".?AVexception@@"), "bad rtti for e\n"); if (ti) { @@ -1036,15 +1035,13 @@ static void test_rtti(void) child_class_sig0_rtti.object_locator.type_hierarchy = RTTI_REF_SIG0(child_class_sig0_rtti, object_hierarchy, base); ti = p__RTtypeid(&simple_class_sig0); - ok (ti && ti->mangled && !strcmp(ti->mangled, "simple_class"), - "incorrect rtti data\n"); + ok (ti && !strcmp(ti->mangled, "simple_class"), "incorrect rtti data\n"); casted = p__RTCastToVoid(&simple_class_sig0); ok (casted == (void*)&simple_class_sig0, "failed cast to void\n"); ti = p__RTtypeid(&child_class_sig0); - ok (ti && ti->mangled && !strcmp(ti->mangled, "child_class"), - "incorrect rtti data\n"); + ok (ti && !strcmp(ti->mangled, "child_class"), "incorrect rtti data\n"); casted = p__RTCastToVoid(&child_class_sig0); ok (casted == (void*)&child_class_sig0, "failed cast to void\n"); @@ -1064,15 +1061,13 @@ static void test_rtti(void) } ti = p__RTtypeid(&simple_class); - ok (ti && ti->mangled && !strcmp(ti->mangled, "simple_class"), - "incorrect rtti data\n"); + ok (ti && !strcmp(ti->mangled, "simple_class"), "incorrect rtti data\n"); casted = p__RTCastToVoid(&simple_class); ok (casted == (void*)&simple_class, "failed cast to void\n"); ti = p__RTtypeid(&child_class); - ok (ti && ti->mangled && !strcmp(ti->mangled, "child_class"), - "incorrect rtti data\n"); + ok (ti && !strcmp(ti->mangled, "child_class"), "incorrect rtti data\n"); casted = p__RTCastToVoid(&child_class); ok (casted == (void*)&child_class, "failed cast to void\n");

1 0