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

Erich E. Hoover : kernel32/tests: Add a bunch more GetVolumePathName tests.
by Alexandre Julliard June 23, 2015

June 23, 2015

Module: wine Branch: master Commit: 62279b7f4d879d341e70879b10d842e1128ef395 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62279b7f4d879d341e70879b1… Author: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> Date: Wed Jun 17 19:29:16 2015 -0600 kernel32/tests: Add a bunch more GetVolumePathName tests. --- dlls/kernel32/tests/volume.c | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index 2bb2603..3eb7fed 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -635,6 +635,34 @@ static void test_GetVolumePathNameA(void) "\\\\$$$", "C:\\", 1, ERROR_INVALID_NAME, ERROR_FILENAME_EXCED_RANGE }, + { /* test 9: a reasonable DOS path that is guaranteed to exist */ + "C:\\windows\\system32", "C:\\", sizeof(volume_path), + NO_ERROR, NO_ERROR + }, + { /* test 10: a reasonable DOS path that shouldn't exist */ + "C:\\windows\\system32\\AnInvalidFolder", "C:\\", sizeof(volume_path), + NO_ERROR, NO_ERROR + }, + { /* test 11: a reasonable NT-converted DOS path that shouldn't exist */ + "\\\\?\\C:\\AnInvalidFolder", "\\\\?\\C:\\", sizeof(volume_path), + NO_ERROR, NO_ERROR + }, + { /* test 12: an unreasonable NT-converted DOS path */ + "\\\\?\\InvalidDrive:\\AnInvalidFolder", "\\\\?\\InvalidDrive:\\" /* win2k, winxp */, + sizeof(volume_path), + ERROR_INVALID_NAME, NO_ERROR + }, + { /* test 13: an unreasonable NT volume path */ + "\\\\?\\Volume{00000000-00-0000-0000-000000000000}\\AnInvalidFolder", + "\\\\?\\Volume{00000000-00-0000-0000-000000000000}\\" /* win2k, winxp */, + sizeof(volume_path), + ERROR_INVALID_NAME, NO_ERROR + }, + { /* test 14: an unreasonable NT-ish path */ + "\\\\ReallyBogus\\InvalidDrive:\\AnInvalidFolder", + "\\\\ReallyBogus\\InvalidDrive:\\" /* win2k, winxp */, sizeof(volume_path), + ERROR_INVALID_NAME, NO_ERROR + }, }; BOOL ret, success; DWORD error; @@ -649,6 +677,7 @@ static void test_GetVolumePathNameA(void) for (i=0; i<sizeof(test_paths)/sizeof(test_paths[0]); i++) { + BOOL broken_ret = test_paths[i].broken_error == NO_ERROR ? TRUE : FALSE; char *output = (test_paths[i].path_name != NULL ? volume_path : NULL); BOOL expected_ret = test_paths[i].error == NO_ERROR ? TRUE : FALSE; @@ -656,7 +685,8 @@ static void test_GetVolumePathNameA(void) SetLastError( 0xdeadbeef ); ret = pGetVolumePathNameA( test_paths[i].file_name, output, test_paths[i].path_len ); error = GetLastError(); - ok(ret == expected_ret, "GetVolumePathName test %d %s unexpectedly.\n", + ok(ret == expected_ret || broken(ret == broken_ret), + "GetVolumePathName test %d %s unexpectedly.\n", i, test_paths[i].error == NO_ERROR ? "failed" : "succeeded"); if (ret)

1 0

Nikolay Sivov : amstream: Forward IUnknown methods to IAMMediaStream for streams.
by Alexandre Julliard June 23, 2015

June 23, 2015

Module: wine Branch: master Commit: 147068453983bd1211e51251eaf885796fbc0e6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=147068453983bd1211e51251e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 23 10:09:08 2015 +0300 amstream: Forward IUnknown methods to IAMMediaStream for streams. --- dlls/amstream/mediastream.c | 72 +++++---------------------------------------- 1 file changed, 8 insertions(+), 64 deletions(-) diff --git a/dlls/amstream/mediastream.c b/dlls/amstream/mediastream.c index 1a31706..ca4f0ce 100644 --- a/dlls/amstream/mediastream.c +++ b/dlls/amstream/mediastream.c @@ -247,48 +247,22 @@ static HRESULT WINAPI DirectDrawMediaStreamImpl_IDirectDrawMediaStream_QueryInte REFIID riid, void **ret_iface) { DirectDrawMediaStreamImpl *This = impl_from_IDirectDrawMediaStream(iface); - TRACE("(%p/%p)->(%s,%p)\n", iface, This, debugstr_guid(riid), ret_iface); - - if (IsEqualGUID(riid, &IID_IUnknown) || - IsEqualGUID(riid, &IID_IMediaStream) || - IsEqualGUID(riid, &IID_IDirectDrawMediaStream)) - { - IDirectDrawMediaStream_AddRef(iface); - *ret_iface = iface; - return S_OK; - } - else if (IsEqualGUID(riid, &IID_IAMMediaStream)) - { - IDirectDrawMediaStream_AddRef(iface); - *ret_iface = &This->IAMMediaStream_iface; - return S_OK; - } - - ERR("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid), ret_iface); - return E_NOINTERFACE; + return IAMMediaStream_QueryInterface(&This->IAMMediaStream_iface, riid, ret_iface); } static ULONG WINAPI DirectDrawMediaStreamImpl_IDirectDrawMediaStream_AddRef(IDirectDrawMediaStream *iface) { DirectDrawMediaStreamImpl *This = impl_from_IDirectDrawMediaStream(iface); - TRACE("(%p/%p)\n", iface, This); - - return InterlockedIncrement(&This->ref); + return IAMMediaStream_AddRef(&This->IAMMediaStream_iface); } static ULONG WINAPI DirectDrawMediaStreamImpl_IDirectDrawMediaStream_Release(IDirectDrawMediaStream *iface) { DirectDrawMediaStreamImpl *This = impl_from_IDirectDrawMediaStream(iface); - ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p/%p)\n", iface, This); - - if (!ref) - HeapFree(GetProcessHeap(), 0, This); - - return ref; + return IAMMediaStream_Release(&This->IAMMediaStream_iface); } /*** IMediaStream methods ***/ @@ -673,52 +647,22 @@ static HRESULT WINAPI AudioMediaStreamImpl_IAudioMediaStream_QueryInterface(IAud REFIID riid, void **ret_iface) { AudioMediaStreamImpl *This = impl_from_IAudioMediaStream(iface); - TRACE("(%p/%p)->(%s,%p)\n", iface, This, debugstr_guid(riid), ret_iface); - - if (IsEqualGUID(riid, &IID_IUnknown) || - IsEqualGUID(riid, &IID_IMediaStream) || - IsEqualGUID(riid, &IID_IAudioMediaStream)) - { - IAudioMediaStream_AddRef(iface); - *ret_iface = iface; - return S_OK; - } - else if (IsEqualGUID(riid, &IID_IAMMediaStream)) - { - IAudioMediaStream_AddRef(iface); - *ret_iface = &This->IAMMediaStream_iface; - return S_OK; - } - - - *ret_iface = NULL; - - ERR("(%p/%p)->(%s,%p),not found\n", iface, This, debugstr_guid(riid), ret_iface); - return E_NOINTERFACE; + return IAMMediaStream_QueryInterface(&This->IAMMediaStream_iface, riid, ret_iface); } static ULONG WINAPI AudioMediaStreamImpl_IAudioMediaStream_AddRef(IAudioMediaStream *iface) { AudioMediaStreamImpl *This = impl_from_IAudioMediaStream(iface); - ULONG ref = InterlockedIncrement(&This->ref); - - TRACE("(%p/%p): new ref = %u\n", iface, This, ref); - - return ref; + TRACE("(%p/%p)\n", iface, This); + return IAMMediaStream_AddRef(&This->IAMMediaStream_iface); } static ULONG WINAPI AudioMediaStreamImpl_IAudioMediaStream_Release(IAudioMediaStream *iface) { AudioMediaStreamImpl *This = impl_from_IAudioMediaStream(iface); - ULONG ref = InterlockedDecrement(&This->ref); - - TRACE("(%p/%p): new ref = %u\n", iface, This, ref); - - if (!ref) - HeapFree(GetProcessHeap(), 0, This); - - return ref; + TRACE("(%p/%p)\n", iface, This); + return IAMMediaStream_Release(&This->IAMMediaStream_iface); } /*** IMediaStream methods ***/

1 0

Nikolay Sivov : amstream: Keep stream reference when creating sample.
by Alexandre Julliard June 23, 2015

June 23, 2015

Module: wine Branch: master Commit: 17283f9be50050fb0024635fd2701e8599d97ab7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17283f9be50050fb0024635fd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 22 22:56:10 2015 +0300 amstream: Keep stream reference when creating sample. --- dlls/amstream/mediastream.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/amstream/mediastream.c b/dlls/amstream/mediastream.c index f51d4dd..4a8c19b 100644 --- a/dlls/amstream/mediastream.c +++ b/dlls/amstream/mediastream.c @@ -906,6 +906,7 @@ static ULONG WINAPI IDirectDrawStreamSampleImpl_Release(IDirectDrawStreamSample { if (This->surface) IDirectDrawSurface_Release(This->surface); + IMediaStream_Release(This->parent); HeapFree(GetProcessHeap(), 0, This); } @@ -1011,6 +1012,8 @@ static HRESULT ddrawstreamsample_create(IDirectDrawMediaStream *parent, IDirectD object->IDirectDrawStreamSample_iface.lpVtbl = &DirectDrawStreamSample_Vtbl; object->ref = 1; object->parent = (IMediaStream*)parent; + IMediaStream_AddRef(object->parent); + if (surface) { object->surface = surface;

1 0

Erich E. Hoover : kernel32: Implement GetVolumePathName.
by Alexandre Julliard June 23, 2015

June 23, 2015

Module: wine Branch: master Commit: f6c7e247add306e757c6b75e99dd23eba087f9f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6c7e247add306e757c6b75e9… Author: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> Date: Wed Jun 17 19:28:39 2015 -0600 kernel32: Implement GetVolumePathName. The purpose of this function is to return the most fundamental path without leaving a filesystem. Steam uses this so that it can use inode searches, without this functionality some installations/validations will fail if the Steam Library is not on the same drive as Steam itself (symlink'd to another location). --- dlls/kernel32/tests/volume.c | 3 -- dlls/kernel32/volume.c | 121 ++++++++++++++++++++++++++++++++++++++----- 2 files changed, 107 insertions(+), 17 deletions(-) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index e934dee..2243da9 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -649,15 +649,12 @@ static void test_GetVolumePathNameA(void) volume[0] = '\0'; ret = pGetVolumePathNameA(pathC1, volume, sizeof(volume)); ok(ret, "expected success\n"); -todo_wine ok(!strcmp(expected, volume) || broken(!strcasecmp(expected, volume)) /* <=XP */, "expected name '%s', returned '%s'\n", expected, volume); volume[0] = '\0'; ret = pGetVolumePathNameA(pathC2, volume, sizeof(volume)); -todo_wine ok(ret, "expected success\n"); -todo_wine ok(!strcmp(expected, volume), "expected name '%s', returned '%s'\n", expected, volume); /* test an invalid path */ diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index d06dd05..a6b2b3d 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -1792,7 +1792,7 @@ BOOL WINAPI GetVolumePathNameA(LPCSTR filename, LPSTR volumepathname, DWORD bufl BOOL ret; WCHAR *filenameW = NULL, *volumeW = NULL; - FIXME("(%s, %p, %d), stub!\n", debugstr_a(filename), volumepathname, buflen); + TRACE("(%s, %p, %d)\n", debugstr_a(filename), volumepathname, buflen); if (filename && !(filenameW = FILE_name_AtoW( filename, FALSE ))) return FALSE; @@ -1808,12 +1808,27 @@ BOOL WINAPI GetVolumePathNameA(LPCSTR filename, LPSTR volumepathname, DWORD bufl /*********************************************************************** * GetVolumePathNameW (KERNEL32.@) + * + * This routine is intended to find the most basic path on the same filesystem + * for any particular path name. Since we can have very complicated drive/path + * relationships on Unix systems, due to symbolic links, the safest way to + * handle this is to start with the full path and work our way back folder by + * folder unil we find a folder on a different drive (or run out of folders). */ BOOL WINAPI GetVolumePathNameW(LPCWSTR filename, LPWSTR volumepathname, DWORD buflen) { - const WCHAR *p = filename; + static const WCHAR ntprefixW[] = { '\\','\\','?','\\',0 }; + static const WCHAR fallbackpathW[] = { 'C',':','\\',0 }; + NTSTATUS status = STATUS_SUCCESS; + WCHAR *volumenameW = NULL, *c; + int pos, last_pos, stop_pos; + UNICODE_STRING nt_name; + ANSI_STRING unix_name; + BOOL first_run = TRUE; + dev_t search_dev = 0; + struct stat st; - FIXME("(%s, %p, %d), stub!\n", debugstr_w(filename), volumepathname, buflen); + TRACE("(%s, %p, %d)\n", debugstr_w(filename), volumepathname, buflen); if (!filename || !volumepathname || !buflen) { @@ -1821,24 +1836,102 @@ BOOL WINAPI GetVolumePathNameW(LPCWSTR filename, LPWSTR volumepathname, DWORD bu return FALSE; } - if (p && tolowerW(p[0]) >= 'a' && tolowerW(p[0]) <= 'z' && p[1] ==':' && p[2] == '\\') + last_pos = pos = strlenW( filename ); + /* allocate enough memory for searching the path (need room for a slash and a NULL terminator) */ + if (!(volumenameW = HeapAlloc( GetProcessHeap(), 0, (pos + 2) * sizeof(WCHAR) ))) { - if (buflen < 4) + SetLastError( ERROR_NOT_ENOUGH_MEMORY ); + return FALSE; + } + strcpyW( volumenameW, filename ); + stop_pos = 0; + /* stop searching slashes early for NT-type and nearly NT-type paths */ + if (strncmpW(ntprefixW, filename, strlenW(ntprefixW)) == 0) + stop_pos = strlenW(ntprefixW)-1; + else if (strncmpW(ntprefixW, filename, 2) == 0) + stop_pos = 2; + + do + { + volumenameW[pos+0] = '\\'; + volumenameW[pos+1] = '\0'; + if (!RtlDosPathNameToNtPathName_U( volumenameW, &nt_name, NULL, NULL )) + goto cleanup; + volumenameW[pos] = '\0'; + status = wine_nt_to_unix_file_name( &nt_name, &unix_name, FILE_OPEN, FALSE ); + RtlFreeUnicodeString( &nt_name ); + if (status == STATUS_SUCCESS) { - SetLastError(ERROR_FILENAME_EXCED_RANGE); - return FALSE; + if (stat( unix_name.Buffer, &st ) != 0) + { + RtlFreeAnsiString( &unix_name ); + status = STATUS_OBJECT_NAME_INVALID; + goto cleanup; + } + if (first_run) + { + first_run = FALSE; + search_dev = st.st_dev; + } + else if (st.st_dev != search_dev) + { + /* folder is on a new filesystem, return the last folder */ + RtlFreeAnsiString( &unix_name ); + break; + } } - volumepathname[0] = p[0]; - volumepathname[1] = ':'; - volumepathname[2] = '\\'; - volumepathname[3] = 0; - return TRUE; + RtlFreeAnsiString( &unix_name ); + last_pos = pos; + c = strrchrW( volumenameW, '\\' ); + if (c != NULL) + pos = c-volumenameW; + } while (c != NULL && pos > stop_pos); + + if (status != STATUS_SUCCESS) + { + /* the path was completely invalid */ + if (filename[0] == '\\') + { + /* NT-style paths fail */ + status = STATUS_OBJECT_NAME_INVALID; + goto cleanup; + } + + /* DOS-style paths revert to C:\ (anything not beginning with a slash) */ + last_pos = strlenW(fallbackpathW) - 1; /* points to \\ */ + filename = fallbackpathW; + status = STATUS_SUCCESS; } - SetLastError(ERROR_INVALID_NAME); - return FALSE; + if (last_pos + 1 <= buflen) + { + WCHAR *p; + memcpy(volumepathname, filename, last_pos * sizeof(WCHAR)); + if (last_pos + 2 <= buflen) volumepathname[last_pos++] = '\\'; + volumepathname[last_pos] = '\0'; + + /* Normalize path */ + for (p = volumepathname; *p; p++) if (*p == '/') *p = '\\'; + + /* DOS-style paths always return upper-case drive letters */ + if (volumepathname[1] == ':') + volumepathname[0] = toupperW(volumepathname[0]); + + TRACE("Successfully translated path %s to mount-point %s\n", + debugstr_w(filename), debugstr_w(volumepathname)); + } + else + status = STATUS_NAME_TOO_LONG; + +cleanup: + HeapFree( GetProcessHeap(), 0, volumenameW ); + + if (status != STATUS_SUCCESS) + SetLastError( RtlNtStatusToDosError(status) ); + return (status == STATUS_SUCCESS); } + /*********************************************************************** * GetVolumePathNamesForVolumeNameA (KERNEL32.@) */

1 0

Iván Matellanes : msvcirt: Add implementation of streambuf::sgetn/sputn.
by Alexandre Julliard June 23, 2015

June 23, 2015

Module: wine Branch: master Commit: 7b877fbce8dab7d60faa29a1e97d0d73ee39a532 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b877fbce8dab7d60faa29a1e… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Sat Jun 20 16:40:21 2015 +0200 msvcirt: Add implementation of streambuf::sgetn/sputn. --- dlls/msvcirt/msvcirt.c | 18 ++++++++++++++++++ dlls/msvcirt/msvcirt.spec | 8 ++++---- dlls/msvcrt20/msvcrt20.spec | 8 ++++---- dlls/msvcrt40/msvcrt40.spec | 8 ++++---- 4 files changed, 30 insertions(+), 12 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index e8faa54..35777e3 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -502,6 +502,7 @@ void __thiscall streambuf_unlock(streambuf *this) /* ?xsgetn(a)streambuf@@UAEHPADH(a)Z */ /* ?xsgetn(a)streambuf@@UEAAHPEADH(a)Z */ DEFINE_THISCALL_WRAPPER(streambuf_xsgetn, 12) +#define call_streambuf_xsgetn(this, buffer, count) CALL_VTBL_FUNC(this, 24, int, (streambuf*, char*, int), (this, buffer, count)) int __thiscall streambuf_xsgetn(streambuf *this, char *buffer, int count) { int copied = 0, chunk; @@ -533,6 +534,7 @@ int __thiscall streambuf_xsgetn(streambuf *this, char *buffer, int count) /* ?xsputn(a)streambuf@@UAEHPBDH(a)Z */ /* ?xsputn(a)streambuf@@UEAAHPEBDH(a)Z */ DEFINE_THISCALL_WRAPPER(streambuf_xsputn, 12) +#define call_streambuf_xsputn(this, data, length) CALL_VTBL_FUNC(this, 20, int, (streambuf*, const char*, int), (this, data, length)) int __thiscall streambuf_xsputn(streambuf *this, const char *data, int length) { int copied = 0, chunk; @@ -579,6 +581,22 @@ int __thiscall streambuf_sputc(streambuf *this, int ch) return (this->pptr < this->epptr) ? *this->pptr++ = ch : call_streambuf_overflow(this, ch); } +/* ?sgetn(a)streambuf@@QAEHPADH(a)Z */ +/* ?sgetn(a)streambuf@@QEAAHPEADH(a)Z */ +DEFINE_THISCALL_WRAPPER(streambuf_sgetn, 12) +int __thiscall streambuf_sgetn(streambuf *this, char *buffer, int count) +{ + return call_streambuf_xsgetn(this, buffer, count); +} + +/* ?sputn(a)streambuf@@QAEHPBDH(a)Z */ +/* ?sputn(a)streambuf@@QEAAHPEBDH(a)Z */ +DEFINE_THISCALL_WRAPPER(streambuf_sputn, 12) +int __thiscall streambuf_sputn(streambuf *this, const char *data, int length) +{ + return call_streambuf_xsputn(this, data, length); +} + /****************************************************************** * ??1ios@@UAE(a)XZ (MSVCRTI.@) * class ios & __thiscall ios::-ios<<(void) diff --git a/dlls/msvcirt/msvcirt.spec b/dlls/msvcirt/msvcirt.spec index 7d6df5f..2a65e2f 100644 --- a/dlls/msvcirt/msvcirt.spec +++ b/dlls/msvcirt/msvcirt.spec @@ -695,8 +695,8 @@ @ stub -arch=win64 ?setrwbuf(a)stdiobuf@@QEAAHHH(a)Z @ thiscall -arch=win32 ?sgetc(a)streambuf@@QAEHXZ(ptr) streambuf_sgetc @ cdecl -arch=win64 ?sgetc(a)streambuf@@QEAAHXZ(ptr) streambuf_sgetc -@ stub -arch=win32 ?sgetn(a)streambuf@@QAEHPADH(a)Z # int __thiscall streambuf::sgetn(char *,int) -@ stub -arch=win64 ?sgetn(a)streambuf@@QEAAHPEADH(a)Z +@ thiscall -arch=win32 ?sgetn(a)streambuf@@QAEHPADH(a)Z(ptr ptr long) streambuf_sgetn +@ cdecl -arch=win64 ?sgetn(a)streambuf@@QEAAHPEADH(a)Z(ptr ptr long) streambuf_sgetn # @ extern ?sh_none(a)filebuf@@2HB # static int const filebuf::sh_none # @ extern ?sh_read(a)filebuf@@2HB # static int const filebuf::sh_read # @ extern ?sh_write(a)filebuf@@2HB # static int const filebuf::sh_write @@ -706,8 +706,8 @@ @ stub -arch=win64 ?sputbackc(a)streambuf@@QEAAHD(a)Z @ thiscall -arch=win32 ?sputc(a)streambuf@@QAEHH(a)Z(ptr long) streambuf_sputc @ cdecl -arch=win64 ?sputc(a)streambuf@@QEAAHH(a)Z(ptr long) streambuf_sputc -@ stub -arch=win32 ?sputn(a)streambuf@@QAEHPBDH(a)Z # int __thiscall streambuf::sputn(char const *,int) -@ stub -arch=win64 ?sputn(a)streambuf@@QEAAHPEBDH(a)Z +@ thiscall -arch=win32 ?sputn(a)streambuf@@QAEHPBDH(a)Z(ptr str long) streambuf_sputn +@ cdecl -arch=win64 ?sputn(a)streambuf@@QEAAHPEBDH(a)Z(ptr str long) streambuf_sputn @ stub -arch=win32 ?stdiofile(a)stdiobuf@@QAEPAU_iobuf@@XZ # struct _iobuf * __thiscall stdiobuf::stdiofile(void) @ stub -arch=win64 ?stdiofile(a)stdiobuf@@QEAAPEAU_iobuf@@XZ @ stub -arch=win32 ?stossc(a)streambuf@@QAEXXZ # void __thiscall streambuf::stossc(void) diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec index 79f5902..1be499b 100644 --- a/dlls/msvcrt20/msvcrt20.spec +++ b/dlls/msvcrt20/msvcrt20.spec @@ -683,8 +683,8 @@ @ stub -arch=win64 ?setrwbuf(a)stdiobuf@@QEAAHHH(a)Z @ thiscall -arch=win32 ?sgetc(a)streambuf@@QAEHXZ(ptr) msvcirt.?sgetc(a)streambuf@@QAEHXZ @ cdecl -arch=win64 ?sgetc(a)streambuf@@QEAAHXZ(ptr) msvcirt.?sgetc(a)streambuf@@QEAAHXZ -@ stub -arch=win32 ?sgetn(a)streambuf@@QAEHPADH(a)Z -@ stub -arch=win64 ?sgetn(a)streambuf@@QEAAHPEADH(a)Z +@ thiscall -arch=win32 ?sgetn(a)streambuf@@QAEHPADH(a)Z(ptr ptr long) msvcirt.?sgetn(a)streambuf@@QAEHPADH(a)Z +@ cdecl -arch=win64 ?sgetn(a)streambuf@@QEAAHPEADH(a)Z(ptr ptr long) msvcirt.?sgetn(a)streambuf@@QEAAHPEADH(a)Z # @ extern ?sh_none(a)filebuf@@2HB # @ extern ?sh_read(a)filebuf@@2HB # @ extern ?sh_write(a)filebuf@@2HB @@ -694,8 +694,8 @@ @ stub -arch=win64 ?sputbackc(a)streambuf@@QEAAHD(a)Z @ thiscall -arch=win32 ?sputc(a)streambuf@@QAEHH(a)Z(ptr long) msvcirt.?sputc(a)streambuf@@QAEHH(a)Z @ cdecl -arch=win64 ?sputc(a)streambuf@@QEAAHH(a)Z(ptr long) msvcirt.?sputc(a)streambuf@@QEAAHH(a)Z -@ stub -arch=win32 ?sputn(a)streambuf@@QAEHPBDH(a)Z -@ stub -arch=win64 ?sputn(a)streambuf@@QEAAHPEBDH(a)Z +@ thiscall -arch=win32 ?sputn(a)streambuf@@QAEHPBDH(a)Z(ptr str long) msvcirt.?sputn(a)streambuf@@QAEHPBDH(a)Z +@ cdecl -arch=win64 ?sputn(a)streambuf@@QEAAHPEBDH(a)Z(ptr str long) msvcirt.?sputn(a)streambuf@@QEAAHPEBDH(a)Z @ stub -arch=win32 ?stdiofile(a)stdiobuf@@QAEPAU_iobuf@@XZ @ stub -arch=win64 ?stdiofile(a)stdiobuf@@QEAAPEAU_iobuf@@XZ @ stub -arch=win32 ?stossc(a)streambuf@@QAEXXZ diff --git a/dlls/msvcrt40/msvcrt40.spec b/dlls/msvcrt40/msvcrt40.spec index 86d3985..94d9035 100644 --- a/dlls/msvcrt40/msvcrt40.spec +++ b/dlls/msvcrt40/msvcrt40.spec @@ -755,8 +755,8 @@ @ stub -arch=win64 ?setrwbuf(a)stdiobuf@@QEAAHHH(a)Z @ thiscall -arch=win32 ?sgetc(a)streambuf@@QAEHXZ(ptr) msvcirt.?sgetc(a)streambuf@@QAEHXZ @ cdecl -arch=win64 ?sgetc(a)streambuf@@QEAAHXZ(ptr) msvcirt.?sgetc(a)streambuf@@QEAAHXZ -@ stub -arch=win32 ?sgetn(a)streambuf@@QAEHPADH(a)Z -@ stub -arch=win64 ?sgetn(a)streambuf@@QEAAHPEADH(a)Z +@ thiscall -arch=win32 ?sgetn(a)streambuf@@QAEHPADH(a)Z(ptr ptr long) msvcirt.?sgetn(a)streambuf@@QAEHPADH(a)Z +@ cdecl -arch=win64 ?sgetn(a)streambuf@@QEAAHPEADH(a)Z(ptr ptr long) msvcirt.?sgetn(a)streambuf@@QEAAHPEADH(a)Z # @ extern ?sh_none(a)filebuf@@2HB # @ extern ?sh_read(a)filebuf@@2HB # @ extern ?sh_write(a)filebuf@@2HB @@ -766,8 +766,8 @@ @ stub -arch=win64 ?sputbackc(a)streambuf@@QEAAHD(a)Z @ thiscall -arch=win32 ?sputc(a)streambuf@@QAEHH(a)Z(ptr long) msvcirt.?sputc(a)streambuf@@QAEHH(a)Z @ cdecl -arch=win64 ?sputc(a)streambuf@@QEAAHH(a)Z(ptr long) msvcirt.?sputc(a)streambuf@@QEAAHH(a)Z -@ stub -arch=win32 ?sputn(a)streambuf@@QAEHPBDH(a)Z -@ stub -arch=win64 ?sputn(a)streambuf@@QEAAHPEBDH(a)Z +@ thiscall -arch=win32 ?sputn(a)streambuf@@QAEHPBDH(a)Z(ptr str long) msvcirt.?sputn(a)streambuf@@QAEHPBDH(a)Z +@ cdecl -arch=win64 ?sputn(a)streambuf@@QEAAHPEBDH(a)Z(ptr str long) msvcirt.?sputn(a)streambuf@@QEAAHPEBDH(a)Z @ stub -arch=win32 ?stdiofile(a)stdiobuf@@QAEPAU_iobuf@@XZ @ stub -arch=win64 ?stdiofile(a)stdiobuf@@QEAAPEAU_iobuf@@XZ @ stub -arch=win32 ?stossc(a)streambuf@@QAEXXZ

1 0

Iván Matellanes : msvcirt: Add implementation of streambuf::xsputn.
by Alexandre Julliard June 23, 2015

June 23, 2015

Module: wine Branch: master Commit: f71186b6450b0f5a345d4ec660667a4189ec905d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f71186b6450b0f5a345d4ec66… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Sat Jun 20 16:40:15 2015 +0200 msvcirt: Add implementation of streambuf::xsputn. --- dlls/msvcirt/msvcirt.c | 21 +++++++++++++++++++-- dlls/msvcirt/tests/msvcirt.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 2 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 6b440fd..e8faa54 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -535,8 +535,25 @@ int __thiscall streambuf_xsgetn(streambuf *this, char *buffer, int count) DEFINE_THISCALL_WRAPPER(streambuf_xsputn, 12) int __thiscall streambuf_xsputn(streambuf *this, const char *data, int length) { - FIXME("(%p %p %d): stub\n", this, data, length); - return 0; + int copied = 0, chunk; + + TRACE("(%p %p %d)\n", this, data, length); + + while (copied < length) { + if (this->unbuffered || this->pptr == this->epptr) { + if (call_streambuf_overflow(this, data[copied]) == EOF) + break; + copied++; + } else { + chunk = this->epptr - this->pptr; + if (chunk > length - copied) + chunk = length - copied; + memcpy(this->pptr, data+copied, chunk); + this->pptr += chunk; + copied += chunk; + } + } + return copied; } /* ?sgetc(a)streambuf@@QAEHXZ */ diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index c4777a2..a175531 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -66,6 +66,7 @@ static int (*__thiscall p_streambuf_sputc)(streambuf*, int); static int (*__thiscall p_streambuf_sync)(streambuf*); static void (*__thiscall p_streambuf_unlock)(streambuf*); static int (*__thiscall p_streambuf_xsgetn)(streambuf*, char*, int); +static int (*__thiscall p_streambuf_xsputn)(streambuf*, const char*, int); /* Emulate a __thiscall */ #ifdef __i386__ @@ -153,6 +154,7 @@ static BOOL init(void) SET(p_streambuf_sync, "?sync(a)streambuf@@UEAAHXZ"); SET(p_streambuf_unlock, "?unlock(a)streambuf@@QEAAXXZ"); SET(p_streambuf_xsgetn, "?xsgetn(a)streambuf@@UEAAHPEADH(a)Z"); + SET(p_streambuf_xsputn, "?xsputn(a)streambuf@@UEAAHPEBDH(a)Z"); } else { SET(p_streambuf_reserve_ctor, "??0streambuf@@IAE(a)PADH@Z"); SET(p_streambuf_ctor, "??0streambuf@@IAE(a)XZ"); @@ -171,6 +173,7 @@ static BOOL init(void) SET(p_streambuf_sync, "?sync(a)streambuf@@UAEHXZ"); SET(p_streambuf_unlock, "?unlock(a)streambuf@@QAEXXZ"); SET(p_streambuf_xsgetn, "?xsgetn(a)streambuf@@UAEHPADH(a)Z"); + SET(p_streambuf_xsputn, "?xsputn(a)streambuf@@UAEHPBDH(a)Z"); } init_thiscall_thunk(); @@ -189,6 +192,8 @@ static int __thiscall test_streambuf_overflow(streambuf *this, int ch) #endif { overflow_count++; + if (ch == 'L') /* simulate a failure */ + return EOF; if (!test_this->unbuffered) test_this->pptr = test_this->pbase + 5; return ch; @@ -527,6 +532,38 @@ static void test_streambuf(void) ok(sb3.stored_char == 'G', "wrong stored character, expected 'G' got %c\n", sb3.stored_char); ok(underflow_count == 37, "expected 6 calls to underflow, got %d\n", underflow_count - 31); + /* xsputn */ + ret = (int) call_func3(p_streambuf_xsputn, &sb, "Test\0ing", 8); + ok(ret == 8, "wrong return value, expected 8 got %d\n", ret); + ok(sb.pptr == sb.pbase + 9, "wrong put pointer, expected %p got %p\n", sb.pbase + 9, sb.pptr); + test_this = &sb2; + sb2.pptr = sb2.epptr - 7; + ret = (int) call_func3(p_streambuf_xsputn, &sb2, "Testing", 7); + ok(ret == 7, "wrong return value, expected 7 got %d\n", ret); + ok(sb2.pptr == sb2.epptr, "wrong put pointer, expected %p got %p\n", sb2.epptr, sb2.pptr); + ok(overflow_count == 2, "no call to overflow expected\n"); + sb2.pptr = sb2.epptr - 5; + sb2.pbase[5] = 'a'; + ret = (int) call_func3(p_streambuf_xsputn, &sb2, "Testing", 7); + ok(ret == 7, "wrong return value, expected 7 got %d\n", ret); + ok(sb2.pbase[5] == 'g', "expected 'g' got %c\n", sb2.pbase[5]); + ok(sb2.pptr == sb2.pbase + 6, "wrong put pointer, expected %p got %p\n", sb2.pbase + 6, sb2.pptr); + ok(overflow_count == 3, "expected call to overflow\n"); + sb2.pptr = sb2.epptr - 4; + ret = (int) call_func3(p_streambuf_xsputn, &sb2, "TestLing", 8); + ok(ret == 4, "wrong return value, expected 4 got %d\n", ret); + ok(sb2.pptr == sb2.epptr, "wrong put pointer, expected %p got %p\n", sb2.epptr, sb2.pptr); + ok(overflow_count == 4, "expected call to overflow\n"); + test_this = &sb3; + ret = (int) call_func3(p_streambuf_xsputn, &sb3, "Testing", 7); + ok(ret == 7, "wrong return value, expected 7 got %d\n", ret); + ok(sb3.stored_char == 'G', "wrong stored character, expected 'G' got %c\n", sb3.stored_char); + ok(overflow_count == 11, "expected 7 calls to overflow, got %d\n", overflow_count - 4); + ret = (int) call_func3(p_streambuf_xsputn, &sb3, "TeLephone", 9); + ok(ret == 2, "wrong return value, expected 2 got %d\n", ret); + ok(sb3.stored_char == 'G', "wrong stored character, expected 'G' got %c\n", sb3.stored_char); + ok(overflow_count == 14, "expected 3 calls to overflow, got %d\n", overflow_count - 11); + SetEvent(lock_arg.test[3]); WaitForSingleObject(thread, INFINITE);

1 0

Iván Matellanes : msvcirt: Add implementation of streambuf::xsgetn.
by Alexandre Julliard June 23, 2015

June 23, 2015

Module: wine Branch: master Commit: a507132cdc11c44efc7702e9bac14b7dfd6884d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a507132cdc11c44efc7702e9b… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Sat Jun 20 16:40:06 2015 +0200 msvcirt: Add implementation of streambuf::xsgetn. --- dlls/msvcirt/msvcirt.c | 26 ++++++++++++-- dlls/msvcirt/tests/msvcirt.c | 80 +++++++++++++++++++++++++++++++++++++------- 2 files changed, 92 insertions(+), 14 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 47a7f28..6b440fd 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -504,8 +504,30 @@ void __thiscall streambuf_unlock(streambuf *this) DEFINE_THISCALL_WRAPPER(streambuf_xsgetn, 12) int __thiscall streambuf_xsgetn(streambuf *this, char *buffer, int count) { - FIXME("(%p %p %d): stub\n", this, buffer, count); - return 0; + int copied = 0, chunk; + + TRACE("(%p %p %d)\n", this, buffer, count); + + if (this->unbuffered) { + if (this->stored_char == EOF) + this->stored_char = call_streambuf_underflow(this); + while (copied < count && this->stored_char != EOF) { + buffer[copied++] = this->stored_char; + this->stored_char = call_streambuf_underflow(this); + } + } else { + while (copied < count) { + if (call_streambuf_underflow(this) == EOF) + break; + chunk = this->egptr - this->gptr; + if (chunk > count - copied) + chunk = count - copied; + memcpy(buffer+copied, this->gptr, chunk); + this->gptr += chunk; + copied += chunk; + } + } + return copied; } /* ?xsputn(a)streambuf@@UAEHPBDH(a)Z */ diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 6c60dd0..c4777a2 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -65,6 +65,7 @@ static int (*__thiscall p_streambuf_sgetc)(streambuf*); static int (*__thiscall p_streambuf_sputc)(streambuf*, int); static int (*__thiscall p_streambuf_sync)(streambuf*); static void (*__thiscall p_streambuf_unlock)(streambuf*); +static int (*__thiscall p_streambuf_xsgetn)(streambuf*, char*, int); /* Emulate a __thiscall */ #ifdef __i386__ @@ -151,6 +152,7 @@ static BOOL init(void) SET(p_streambuf_sputc, "?sputc(a)streambuf@@QEAAHH(a)Z"); SET(p_streambuf_sync, "?sync(a)streambuf@@UEAAHXZ"); SET(p_streambuf_unlock, "?unlock(a)streambuf@@QEAAXXZ"); + SET(p_streambuf_xsgetn, "?xsgetn(a)streambuf@@UEAAHPEADH(a)Z"); } else { SET(p_streambuf_reserve_ctor, "??0streambuf@@IAE(a)PADH@Z"); SET(p_streambuf_ctor, "??0streambuf@@IAE(a)XZ"); @@ -168,6 +170,7 @@ static BOOL init(void) SET(p_streambuf_sputc, "?sputc(a)streambuf@@QAEHH(a)Z"); SET(p_streambuf_sync, "?sync(a)streambuf@@UAEHXZ"); SET(p_streambuf_unlock, "?unlock(a)streambuf@@QAEXXZ"); + SET(p_streambuf_xsgetn, "?xsgetn(a)streambuf@@UAEHPADH(a)Z"); } init_thiscall_thunk(); @@ -175,7 +178,9 @@ static BOOL init(void) } static int overflow_count, underflow_count; -static streambuf *test_overflow_this; +static streambuf *test_this; +static char test_get_buffer[24]; +static int buffer_pos, get_end; #ifdef __i386__ static int __thiscall test_streambuf_overflow(int ch) @@ -184,8 +189,8 @@ static int __thiscall test_streambuf_overflow(streambuf *this, int ch) #endif { overflow_count++; - if (!test_overflow_this->unbuffered) - test_overflow_this->pptr = test_overflow_this->pbase + 5; + if (!test_this->unbuffered) + test_this->pptr = test_this->pbase + 5; return ch; } @@ -196,7 +201,13 @@ static int __thiscall test_streambuf_underflow(streambuf *this) #endif { underflow_count++; - return 'u'; + if (test_this->unbuffered) { + return (buffer_pos < 23) ? test_get_buffer[buffer_pos++] : EOF; + } else if (test_this->gptr < test_this->egptr) { + return *test_this->gptr; + } else { + return get_end ? EOF : *(test_this->gptr = test_this->eback); + } } struct streambuf_lock_arg @@ -264,6 +275,8 @@ static void test_streambuf(void) sb2.vtable = test_streambuf_vtbl; sb3.vtable = test_streambuf_vtbl; overflow_count = underflow_count = 0; + strcpy(test_get_buffer, "CompuGlobalHyperMegaNet"); + buffer_pos = get_end = 0; /* setlock */ ok(sb.do_lock == -1, "expected do_lock value -1, got %d\n", sb.do_lock); @@ -426,21 +439,23 @@ static void test_streambuf(void) ok(ret == 0, "sync failed, expected 0 got %d\n", ret); /* sgetc */ + strcpy(sb2.eback, "WorstTestEver"); + test_this = &sb2; ret = (int) call_func1(p_streambuf_sgetc, &sb2); - ok(ret == 'u', "expected 'u' got '%c'\n", ret); + ok(ret == 'W', "expected 'W' got '%c'\n", ret); ok(underflow_count == 1, "expected call to underflow\n"); ok(sb2.stored_char == EOF, "wrong stored character, expected EOF got %c\n", sb2.stored_char); - sb2.gptr = sb2.eback; - *sb2.gptr = 'a'; + sb2.gptr++; ret = (int) call_func1(p_streambuf_sgetc, &sb2); - ok(ret == 'u', "expected 'u' got '%c'\n", ret); + ok(ret == 'o', "expected 'o' got '%c'\n", ret); ok(underflow_count == 2, "expected call to underflow\n"); ok(sb2.stored_char == EOF, "wrong stored character, expected EOF got %c\n", sb2.stored_char); sb2.gptr = sb2.egptr; + test_this = &sb3; ret = (int) call_func1(p_streambuf_sgetc, &sb3); - ok(ret == 'u', "expected 'u' got '%c'\n", ret); + ok(ret == 'C', "expected 'C' got '%c'\n", ret); ok(underflow_count == 3, "expected call to underflow\n"); - ok(sb3.stored_char == 'u', "wrong stored character, expected 'u' got %c\n", sb3.stored_char); + ok(sb3.stored_char == 'C', "wrong stored character, expected 'C' got %c\n", sb3.stored_char); sb3.stored_char = 'b'; ret = (int) call_func1(p_streambuf_sgetc, &sb3); ok(ret == 'b', "expected 'b' got '%c'\n", ret); @@ -454,12 +469,12 @@ static void test_streambuf(void) ok(overflow_count == 0, "no call to overflow expected\n"); ok(*sb.pbase == 'c', "expected 'c' in the put area, got %c\n", *sb.pbase); ok(sb.pptr == sb.pbase + 1, "wrong put pointer, expected %p got %p\n", sb.pbase + 1, sb.pptr); - test_overflow_this = &sb2; + test_this = &sb2; ret = (int) call_func2(p_streambuf_sputc, &sb2, 'c'); ok(ret == 'c', "wrong return value, expected 'c' got %d\n", ret); ok(overflow_count == 1, "expected call to overflow\n"); ok(sb2.pptr == sb2.pbase + 5, "wrong put pointer, expected %p got %p\n", sb2.pbase + 5, sb2.pptr); - test_overflow_this = &sb3; + test_this = &sb3; ret = (int) call_func2(p_streambuf_sputc, &sb3, 'c'); ok(ret == 'c', "wrong return value, expected 'c' got %d\n", ret); ok(overflow_count == 2, "expected call to overflow\n"); @@ -471,6 +486,47 @@ static void test_streambuf(void) ok(*sb3.pbase == 'c', "expected 'c' in the put area, got %c\n", *sb3.pbase); sb3.pbase = sb3.pptr = sb3.epptr = NULL; + /* xsgetn */ + sb2.gptr = sb2.egptr = sb2.eback + 13; + test_this = &sb2; + ret = (int) call_func3(p_streambuf_xsgetn, &sb2, reserve, 5); + ok(ret == 5, "wrong return value, expected 5 got %d\n", ret); + ok(!strncmp(reserve, "Worst", 5), "expected 'Worst' got %s\n", reserve); + ok(sb2.gptr == sb2.eback + 5, "wrong get pointer, expected %p got %p\n", sb2.eback + 5, sb2.gptr); + ok(underflow_count == 4, "expected call to underflow\n"); + ret = (int) call_func3(p_streambuf_xsgetn, &sb2, reserve, 4); + ok(ret == 4, "wrong return value, expected 4 got %d\n", ret); + ok(!strncmp(reserve, "Test", 4), "expected 'Test' got %s\n", reserve); + ok(sb2.gptr == sb2.eback + 9, "wrong get pointer, expected %p got %p\n", sb2.eback + 9, sb2.gptr); + ok(underflow_count == 5, "expected call to underflow\n"); + get_end = 1; + ret = (int) call_func3(p_streambuf_xsgetn, &sb2, reserve, 16); + ok(ret == 4, "wrong return value, expected 4 got %d\n", ret); + ok(!strncmp(reserve, "Ever", 4), "expected 'Ever' got %s\n", reserve); + ok(sb2.gptr == sb2.egptr, "wrong get pointer, expected %p got %p\n", sb2.egptr, sb2.gptr); + ok(underflow_count == 7, "expected 2 calls to underflow, got %d\n", underflow_count - 5); + test_this = &sb3; + ret = (int) call_func3(p_streambuf_xsgetn, &sb3, reserve, 11); + ok(ret == 11, "wrong return value, expected 11 got %d\n", ret); + ok(!strncmp(reserve, "bompuGlobal", 11), "expected 'bompuGlobal' got %s\n", reserve); + ok(sb3.stored_char == 'H', "wrong stored character, expected 'H' got %c\n", sb3.stored_char); + ok(underflow_count == 18, "expected 11 calls to underflow, got %d\n", underflow_count - 7); + ret = (int) call_func3(p_streambuf_xsgetn, &sb3, reserve, 16); + ok(ret == 12, "wrong return value, expected 12 got %d\n", ret); + ok(!strncmp(reserve, "HyperMegaNet", 12), "expected 'HyperMegaNet' got %s\n", reserve); + ok(sb3.stored_char == EOF, "wrong stored character, expected EOF got %c\n", sb3.stored_char); + ok(underflow_count == 30, "expected 12 calls to underflow, got %d\n", underflow_count - 18); + ret = (int) call_func3(p_streambuf_xsgetn, &sb3, reserve, 3); + ok(ret == 0, "wrong return value, expected 0 got %d\n", ret); + ok(sb3.stored_char == EOF, "wrong stored character, expected EOF got %c\n", sb3.stored_char); + ok(underflow_count == 31, "expected call to underflow\n"); + buffer_pos = 0; + ret = (int) call_func3(p_streambuf_xsgetn, &sb3, reserve, 5); + ok(ret == 5, "wrong return value, expected 5 got %d\n", ret); + ok(!strncmp(reserve, "Compu", 5), "expected 'Compu' got %s\n", reserve); + ok(sb3.stored_char == 'G', "wrong stored character, expected 'G' got %c\n", sb3.stored_char); + ok(underflow_count == 37, "expected 6 calls to underflow, got %d\n", underflow_count - 31); + SetEvent(lock_arg.test[3]); WaitForSingleObject(thread, INFINITE);

1 0

Alistair Leslie-Hughes : dpnet: Correct adding components in Duplicate.
by Alexandre Julliard June 23, 2015

June 23, 2015

Module: wine Branch: master Commit: 275364d919e35da8261644eece44412faf6f2ef7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=275364d919e35da8261644eec… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jun 11 08:55:48 2015 +1000 dpnet: Correct adding components in Duplicate. --- dlls/dpnet/address.c | 23 ++++++++++++++++++++++- dlls/dpnet/tests/address.c | 16 ++++++++++++++-- 2 files changed, 36 insertions(+), 3 deletions(-) diff --git a/dlls/dpnet/address.c b/dlls/dpnet/address.c index 7a33f8a..d2a05f6 100644 --- a/dlls/dpnet/address.c +++ b/dlls/dpnet/address.c @@ -232,9 +232,30 @@ static HRESULT WINAPI IDirectPlay8AddressImpl_Duplicate(IDirectPlay8Address *ifa { struct component *entry = This->components[i]; - hr = IDirectPlay8Address_AddComponent(dup, entry->name, &entry->data, entry->size, entry->type); + switch (entry->type) + { + case DPNA_DATATYPE_DWORD: + hr = IDirectPlay8Address_AddComponent(dup, entry->name, &entry->data.value, entry->size, entry->type); + break; + case DPNA_DATATYPE_GUID: + hr = IDirectPlay8Address_AddComponent(dup, entry->name, &entry->data.guid, entry->size, entry->type); + break; + case DPNA_DATATYPE_STRING: + hr = IDirectPlay8Address_AddComponent(dup, entry->name, entry->data.string, entry->size, entry->type); + break; + case DPNA_DATATYPE_STRING_ANSI: + hr = IDirectPlay8Address_AddComponent(dup, entry->name, entry->data.ansi, entry->size, entry->type); + break; + case DPNA_DATATYPE_BINARY: + hr = IDirectPlay8Address_AddComponent(dup, entry->name, entry->data.binary, entry->size, entry->type); + break; + } + if(hr != S_OK) + { ERR("Failed to copy component: %s - 0x%08x\n", debugstr_w(entry->name), hr); + break; + } } *ppdpaNewAddress = dup; diff --git a/dlls/dpnet/tests/address.c b/dlls/dpnet/tests/address.c index ee589f5..cb226f9 100644 --- a/dlls/dpnet/tests/address.c +++ b/dlls/dpnet/tests/address.c @@ -24,6 +24,7 @@ /* {6733C6E8-A0D6-450E-8C18-CEACF331DC27} */ static const GUID IID_Random = {0x6733c6e8, 0xa0d6, 0x450e, { 0x8c, 0x18, 0xce, 0xac, 0xf3, 0x31, 0xdc, 0x27 } }; +static const WCHAR localhost[] = {'l','o','c','a','l','h','o','s','t',0}; static void create_directplay_address(void) { @@ -70,7 +71,6 @@ static void create_directplay_address(void) static void address_addcomponents(void) { static const WCHAR UNKNOWN[] = { 'u','n','k','n','o','w','n',0 }; - static const WCHAR localhost[] = {'l','o','c','a','l','h','o','s','t',0}; static const char testing[] = "testing"; HRESULT hr; IDirectPlay8Address *localaddr = NULL; @@ -309,14 +309,20 @@ static void address_duplicate(void) hr = IDirectPlay8Address_SetSP(localaddr, &CLSID_DP8SP_TCPIP); ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDirectPlay8Address_AddComponent(localaddr, DPNA_KEY_HOSTNAME, &localhost, sizeof(localhost), DPNA_DATATYPE_STRING); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDirectPlay8Address_GetNumComponents(localaddr, &components); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(components == 1, "components=%d\n", components); + ok(components == 2, "components=%d\n", components); hr = IDirectPlay8Address_Duplicate(localaddr, &duplicate); ok(hr == S_OK, "got 0x%08x\n", hr); if(SUCCEEDED(hr)) { + DWORD size, type; + WCHAR buffer[256]; + hr = IDirectPlay8Address_GetSP(duplicate, &guid); ok(hr == S_OK, "got 0x%08x\n", hr); ok(IsEqualGUID(&guid, &CLSID_DP8SP_TCPIP), "wrong guid\n"); @@ -325,6 +331,12 @@ static void address_duplicate(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(components == dupcomps, "expected %d got %d\n", components, dupcomps); + size = sizeof(buffer); + hr = IDirectPlay8Address_GetComponentByName(duplicate, DPNA_KEY_HOSTNAME, buffer, &size, &type); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(type == DPNA_DATATYPE_STRING, "incorrect type %d\n", type); + ok(!lstrcmpW(buffer, localhost), "Invalid string: %s\n", wine_dbgstr_w(buffer)); + IDirectPlay8Address_Release(duplicate); }

1 0

Nikolay Sivov : dwrite: Call SetFillMode() once per run.
by Alexandre Julliard June 23, 2015

June 23, 2015

Module: wine Branch: master Commit: 69d5e351f97d448a7fd7cc52982d8c5a97fb24bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=69d5e351f97d448a7fd7cc529… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 22 17:58:40 2015 +0300 dwrite: Call SetFillMode() once per run. --- dlls/dwrite/font.c | 3 ++ dlls/dwrite/tests/font.c | 102 ++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 103 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 8ffad31..2091867 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -523,6 +523,9 @@ static HRESULT WINAPI dwritefontface_GetGlyphRunOutline(IDWriteFontFace2 *iface, if (is_sideways) FIXME("sideways mode is not supported.\n"); + if (count) + ID2D1SimplifiedGeometrySink_SetFillMode(sink, D2D1_FILL_MODE_WINDING); + for (g = 0; g < count; g++) { FLOAT xoffset = 0.0, yoffset = 0.0; struct glyph_outline *outline; diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 846b4da..111762c 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -37,6 +37,35 @@ #define EXPECT_HR(hr,hr_exp) \ ok(hr == hr_exp, "got 0x%08x, expected 0x%08x\n", hr, hr_exp) +#define DEFINE_EXPECT(func) \ + static BOOL expect_ ## func = FALSE, called_ ## func = FALSE + +#define SET_EXPECT(func) \ + do { called_ ## func = FALSE; expect_ ## func = TRUE; } while(0) + +#define CHECK_EXPECT2(func) \ + do { \ + ok(expect_ ##func, "unexpected call " #func "\n"); \ + called_ ## func = TRUE; \ + }while(0) + +#define CHECK_EXPECT(func) \ + do { \ + CHECK_EXPECT2(func); \ + expect_ ## func = FALSE; \ + }while(0) + +#define CHECK_CALLED(func) \ + do { \ + ok(called_ ## func, "expected " #func "\n"); \ + expect_ ## func = called_ ## func = FALSE; \ + }while(0) + +#define CLEAR_CALLED(func) \ + expect_ ## func = called_ ## func = FALSE + +DEFINE_EXPECT(setfillmode); + #define EXPECT_REF(obj,ref) _expect_ref((IUnknown*)obj, ref, __LINE__) static void _expect_ref(IUnknown* obj, ULONG ref, int line) { @@ -457,6 +486,7 @@ static ULONG WINAPI test_geometrysink_Release(ID2D1SimplifiedGeometrySink *iface static void WINAPI test_geometrysink_SetFillMode(ID2D1SimplifiedGeometrySink *iface, D2D1_FILL_MODE mode) { + CHECK_EXPECT(setfillmode); ok(mode == D2D1_FILL_MODE_WINDING, "fill mode %d\n", mode); } @@ -508,7 +538,44 @@ static const ID2D1SimplifiedGeometrySinkVtbl test_geometrysink_vtbl = { test_geometrysink_Close }; +static void WINAPI test_geometrysink2_BeginFigure(ID2D1SimplifiedGeometrySink *iface, + D2D1_POINT_2F startPoint, D2D1_FIGURE_BEGIN figureBegin) +{ + ok(0, "unexpected call\n"); +} + +static void WINAPI test_geometrysink2_AddLines(ID2D1SimplifiedGeometrySink *iface, + const D2D1_POINT_2F *points, UINT32 count) +{ + ok(0, "unexpected call\n"); +} + +static void WINAPI test_geometrysink2_AddBeziers(ID2D1SimplifiedGeometrySink *iface, + const D2D1_BEZIER_SEGMENT *beziers, UINT32 count) +{ + ok(0, "unexpected call\n"); +} + +static void WINAPI test_geometrysink2_EndFigure(ID2D1SimplifiedGeometrySink *iface, D2D1_FIGURE_END figureEnd) +{ + ok(0, "unexpected call\n"); +} + +static const ID2D1SimplifiedGeometrySinkVtbl test_geometrysink2_vtbl = { + test_geometrysink_QueryInterface, + test_geometrysink_AddRef, + test_geometrysink_Release, + test_geometrysink_SetFillMode, + test_geometrysink_SetSegmentFlags, + test_geometrysink2_BeginFigure, + test_geometrysink2_AddLines, + test_geometrysink2_AddBeziers, + test_geometrysink2_EndFigure, + test_geometrysink_Close +}; + static ID2D1SimplifiedGeometrySink test_geomsink = { &test_geometrysink_vtbl }; +static ID2D1SimplifiedGeometrySink test_geomsink2 = { &test_geometrysink2_vtbl }; static void test_CreateFontFromLOGFONT(void) { @@ -2991,6 +3058,7 @@ static void test_GetGlyphRunOutline(void) /* default advances, no offsets */ memset(g_startpoints, 0, sizeof(g_startpoints)); g_startpoint_count = 0; + SET_EXPECT(setfillmode); hr = IDWriteFontFace_GetGlyphRunOutline(face, 1024.0, glyphs, NULL, NULL, 2, FALSE, FALSE, &test_geomsink); ok(hr == S_OK, "got 0x%08x\n", hr); ok(g_startpoint_count == 2, "got %d\n", g_startpoint_count); @@ -2999,10 +3067,12 @@ static void test_GetGlyphRunOutline(void) ok(g_startpoints[0].x == 229.5 && g_startpoints[0].y == -629.0, "0: got (%.2f,%.2f)\n", g_startpoints[0].x, g_startpoints[0].y); ok(g_startpoints[1].x == 729.5 && g_startpoints[1].y == -629.0, "1: got (%.2f,%.2f)\n", g_startpoints[1].x, g_startpoints[1].y); } + CHECK_CALLED(setfillmode); /* default advances, no offsets, RTL */ memset(g_startpoints, 0, sizeof(g_startpoints)); g_startpoint_count = 0; + SET_EXPECT(setfillmode); hr = IDWriteFontFace_GetGlyphRunOutline(face, 1024.0, glyphs, NULL, NULL, 2, FALSE, TRUE, &test_geomsink); ok(hr == S_OK, "got 0x%08x\n", hr); ok(g_startpoint_count == 2, "got %d\n", g_startpoint_count); @@ -3011,10 +3081,12 @@ static void test_GetGlyphRunOutline(void) ok(g_startpoints[0].x == -270.5 && g_startpoints[0].y == -629.0, "0: got (%.2f,%.2f)\n", g_startpoints[0].x, g_startpoints[0].y); ok(g_startpoints[1].x == -770.5 && g_startpoints[1].y == -629.0, "1: got (%.2f,%.2f)\n", g_startpoints[1].x, g_startpoints[1].y); } + CHECK_CALLED(setfillmode); /* default advances, additional offsets */ memset(g_startpoints, 0, sizeof(g_startpoints)); g_startpoint_count = 0; + SET_EXPECT(setfillmode); hr = IDWriteFontFace_GetGlyphRunOutline(face, 1024.0, glyphs, NULL, offsets, 2, FALSE, FALSE, &test_geomsink); ok(hr == S_OK, "got 0x%08x\n", hr); ok(g_startpoint_count == 2, "got %d\n", g_startpoint_count); @@ -3023,10 +3095,12 @@ static void test_GetGlyphRunOutline(void) ok(g_startpoints[0].x == 230.5 && g_startpoints[0].y == -630.0, "0: got (%.2f,%.2f)\n", g_startpoints[0].x, g_startpoints[0].y); ok(g_startpoints[1].x == 729.5 && g_startpoints[1].y == -629.0, "1: got (%.2f,%.2f)\n", g_startpoints[1].x, g_startpoints[1].y); } + CHECK_CALLED(setfillmode); /* default advances, additional offsets, RTL */ memset(g_startpoints, 0, sizeof(g_startpoints)); g_startpoint_count = 0; + SET_EXPECT(setfillmode); hr = IDWriteFontFace_GetGlyphRunOutline(face, 1024.0, glyphs, NULL, offsets, 2, FALSE, TRUE, &test_geomsink); ok(hr == S_OK, "got 0x%08x\n", hr); ok(g_startpoint_count == 2, "got %d\n", g_startpoint_count); @@ -3034,10 +3108,12 @@ static void test_GetGlyphRunOutline(void) ok(g_startpoints[0].x == -271.5 && g_startpoints[0].y == -630.0, "0: got (%.2f,%.2f)\n", g_startpoints[0].x, g_startpoints[0].y); ok(g_startpoints[1].x == -770.5 && g_startpoints[1].y == -629.0, "1: got (%.2f,%.2f)\n", g_startpoints[1].x, g_startpoints[1].y); } + CHECK_CALLED(setfillmode); /* custom advances and offsets, offset turns total advance value to zero */ memset(g_startpoints, 0, sizeof(g_startpoints)); g_startpoint_count = 0; + SET_EXPECT(setfillmode); hr = IDWriteFontFace_GetGlyphRunOutline(face, 1024.0, glyphs, advances, offsets, 2, FALSE, FALSE, &test_geomsink); ok(hr == S_OK, "got 0x%08x\n", hr); ok(g_startpoint_count == 2, "got %d\n", g_startpoint_count); @@ -3045,11 +3121,33 @@ static void test_GetGlyphRunOutline(void) ok(g_startpoints[0].x == 230.5 && g_startpoints[0].y == -630.0, "0: got (%.2f,%.2f)\n", g_startpoints[0].x, g_startpoints[0].y); ok(g_startpoints[1].x == 230.5 && g_startpoints[1].y == -629.0, "1: got (%.2f,%.2f)\n", g_startpoints[1].x, g_startpoints[1].y); } + CHECK_CALLED(setfillmode); - IDWriteFontFace_Release(face); - IDWriteFactory_Release(factory); + /* 0 glyph count */ + hr = IDWriteFontFace_GetGlyphRunOutline(face, 1024.0, glyphs, NULL, NULL, 0, FALSE, FALSE, &test_geomsink2); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteFactory_Release(factory); + IDWriteFontFace_Release(face); DELETE_FONTFILE(path); + + /* space glyph */ + factory = create_factory(); + face = create_fontface(factory); + + codepoint = ' '; + glyphs[0] = 0; + hr = IDWriteFontFace_GetGlyphIndices(face, &codepoint, 1, glyphs); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(glyphs[0] > 0, "got %u\n", glyphs[0]); + + SET_EXPECT(setfillmode); + hr = IDWriteFontFace_GetGlyphRunOutline(face, 1024.0, glyphs, NULL, NULL, 1, FALSE, FALSE, &test_geomsink2); + ok(hr == S_OK, "got 0x%08x\n", hr); + CHECK_CALLED(setfillmode); + + IDWriteFactory_Release(factory); + IDWriteFontFace_Release(face); } static void test_GetEudcFontCollection(void)

1 0

Nikolay Sivov : dwrite: Set baseline origin Y for reported runs.
by Alexandre Julliard June 23, 2015

June 23, 2015

Module: wine Branch: master Commit: 643125e50f620137c30576a219d6e497f4d1a047 URL: http://source.winehq.org/git/wine.git/?a=commit;h=643125e50f620137c30576a21… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 22 11:56:25 2015 +0300 dwrite: Set baseline origin Y for reported runs. --- dlls/dwrite/layout.c | 73 +++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 67 insertions(+), 6 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index ba31ec6..25e8eac 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -181,6 +181,7 @@ struct layout_effective_run { FLOAT origin_x; /* baseline X position */ FLOAT origin_y; /* baseline Y position */ UINT16 *clustermap; /* effective clustermap, allocated separately, is not reused from nominal map */ + UINT32 line; }; struct layout_effective_inline { @@ -191,6 +192,7 @@ struct layout_effective_inline { FLOAT origin_y; BOOL is_sideways; BOOL is_rtl; + UINT32 line; }; struct layout_strikethrough { @@ -906,7 +908,7 @@ static inline IUnknown *layout_get_effect_from_pos(struct dwrite_textlayout *lay /* Effective run is built from consecutive clusters of a single nominal run, 'first_cluster' is 0 based cluster index, 'cluster_count' indicates how many clusters to add, including first one. */ static HRESULT layout_add_effective_run(struct dwrite_textlayout *layout, const struct layout_run *r, UINT32 first_cluster, - UINT32 cluster_count, FLOAT origin_x, BOOL strikethrough) + UINT32 cluster_count, UINT32 line, FLOAT origin_x, BOOL strikethrough) { UINT32 i, start, length, last_cluster; struct layout_effective_run *run; @@ -926,6 +928,7 @@ static HRESULT layout_add_effective_run(struct dwrite_textlayout *layout, const different ranges which differ in reading direction). */ inlineobject->is_sideways = FALSE; inlineobject->is_rtl = FALSE; + inlineobject->line = line; /* effect assigned from start position and on is used for inline objects */ inlineobject->effect = layout_get_effect_from_pos(layout, layout->clusters[first_cluster].position); @@ -954,7 +957,8 @@ static HRESULT layout_add_effective_run(struct dwrite_textlayout *layout, const run->start = start = layout->clusters[first_cluster].position; run->length = length; run->origin_x = origin_x; - run->origin_y = 0.0; /* FIXME: set after line is built */ + run->origin_y = 0.0; /* set after line is built */ + run->line = line; if (r->u.regular.run.glyphCount) { /* trim from the left */ @@ -1039,11 +1043,41 @@ static inline BOOL layout_get_strikethrough_from_pos(struct dwrite_textlayout *l return ((struct layout_range_bool*)h)->value; } +static inline struct layout_effective_run *layout_get_next_erun(struct dwrite_textlayout *layout, + const struct layout_effective_run *cur) +{ + struct list *e; + + if (!cur) + e = list_head(&layout->eruns); + else + e = list_next(&layout->eruns, &cur->entry); + if (!e) + return NULL; + return LIST_ENTRY(e, struct layout_effective_run, entry); +} + +static inline struct layout_effective_inline *layout_get_next_inline_run(struct dwrite_textlayout *layout, + const struct layout_effective_inline *cur) +{ + struct list *e; + + if (!cur) + e = list_head(&layout->inlineobjects); + else + e = list_next(&layout->inlineobjects, &cur->entry); + if (!e) + return NULL; + return LIST_ENTRY(e, struct layout_effective_inline, entry); +} + static HRESULT layout_compute_effective_runs(struct dwrite_textlayout *layout) { - DWRITE_LINE_METRICS metrics; + struct layout_effective_inline *inrun; + struct layout_effective_run *erun; const struct layout_run *run; - FLOAT width, origin_x; + DWRITE_LINE_METRICS metrics; + FLOAT width, origin_x, origin_y; UINT32 i, start, line, textpos; HRESULT hr; BOOL s[2]; @@ -1070,7 +1104,7 @@ static HRESULT layout_compute_effective_runs(struct dwrite_textlayout *layout) /* switched to next nominal run, at this point all previous pending clusters are already checked for layout line overflow, so new effective run will fit in current line */ if (run != layout->clusters[i].run || s[0] != s[1]) { - hr = layout_add_effective_run(layout, run, start, i - start, origin_x, s[0]); + hr = layout_add_effective_run(layout, run, start, i - start, line, origin_x, s[0]); if (FAILED(hr)) return hr; origin_x += get_cluster_range_width(layout, start, i); @@ -1096,7 +1130,7 @@ static HRESULT layout_compute_effective_runs(struct dwrite_textlayout *layout) last_cluster = i ? i - 1 : i; if (i >= start) { - hr = layout_add_effective_run(layout, run, start, i - start + 1, origin_x, s[0]); + hr = layout_add_effective_run(layout, run, start, i - start + 1, line, origin_x, s[0]); if (FAILED(hr)) return hr; /* we don't need to update origin for next run as we're going to wrap */ @@ -1165,6 +1199,33 @@ static HRESULT layout_compute_effective_runs(struct dwrite_textlayout *layout) } layout->line_count = line; + + /* Now all line info is here, update effective runs positions in flow direction */ + erun = layout_get_next_erun(layout, NULL); + inrun = layout_get_next_inline_run(layout, NULL); + + origin_y = 0.0; + for (line = 0; line < layout->line_count; line++) { + + origin_y += layout->lines[line].baseline; + + /* For all runs on this line */ + while (erun && erun->line == line) { + erun->origin_y = origin_y; + erun = layout_get_next_erun(layout, erun); + if (!erun) + break; + } + + /* Same for inline runs */ + while (inrun && inrun->line == line) { + inrun->origin_y = origin_y; + inrun = layout_get_next_inline_run(layout, inrun); + if (!inrun) + break; + } + } + layout->recompute &= ~RECOMPUTE_EFFECTIVE_RUNS; return hr; }

1 0