wine-commits June 2015

wine-commits@winehq.org

2 participants
610 discussions

Iván Matellanes : msvcirt: Add implementation of streambuf::sync.
by Alexandre Julliard 11 Jun '15

11 Jun '15

Module: wine Branch: master Commit: 1f1cf8a68e38c68fbdfbcaaf60d89930fff2dbef URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f1cf8a68e38c68fbdfbcaaf6… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Tue Jun 9 19:40:33 2015 +0200 msvcirt: Add implementation of streambuf::sync. --- dlls/msvcirt/msvcirt.c | 4 ++-- dlls/msvcirt/tests/msvcirt.c | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index a5b7141..e20fb68 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -437,8 +437,8 @@ void __thiscall streambuf_setp(streambuf *this, char *pb, char *ep) DEFINE_THISCALL_WRAPPER(streambuf_sync, 4) int __thiscall streambuf_sync(streambuf *this) { - FIXME("(%p): stub\n", this); - return EOF; + TRACE("(%p)\n", this); + return (this->gptr == this->egptr && this->pbase == this->pptr) ? 0 : EOF; } /* ?unbuffered@streambuf@@IAEXH@Z */ diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 2a45b04..057c6c8 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -61,6 +61,7 @@ static void (*__thiscall p_streambuf_pbump)(streambuf*, int); static void (*__thiscall p_streambuf_setb)(streambuf*, char*, char*, int); static void (*__thiscall p_streambuf_setlock)(streambuf*); static streambuf* (*__thiscall p_streambuf_setbuf)(streambuf*, char*, int); +static int (*__thiscall p_streambuf_sync)(streambuf*); static void (*__thiscall p_streambuf_unlock)(streambuf*); /* Emulate a __thiscall */ @@ -144,6 +145,7 @@ static BOOL init(void) SET(p_streambuf_setb, "?setb@streambuf@@IEAAXPEAD0H@Z"); SET(p_streambuf_setbuf, "?setbuf@streambuf@@UEAAPEAV1@PEADH@Z"); SET(p_streambuf_setlock, "?setlock@streambuf@@QEAAXXZ"); + SET(p_streambuf_sync, "?sync@streambuf@@UEAAHXZ"); SET(p_streambuf_unlock, "?unlock@streambuf@@QEAAXXZ"); } else { SET(p_streambuf_reserve_ctor, "??0streambuf@@IAE@PADH@Z"); @@ -158,6 +160,7 @@ static BOOL init(void) SET(p_streambuf_setb, "?setb@streambuf@@IAEXPAD0H@Z"); SET(p_streambuf_setbuf, "?setbuf@streambuf@@UAEPAV1@PADH@Z"); SET(p_streambuf_setlock, "?setlock@streambuf@@QAEXXZ"); + SET(p_streambuf_sync, "?sync@streambuf@@UAEHXZ"); SET(p_streambuf_unlock, "?unlock@streambuf@@QAEXXZ"); } @@ -341,6 +344,18 @@ static void test_streambuf(void) call_func2(p_streambuf_pbump, &sb, 20); ok(sb.pptr == sb.pbase + 18, "advance put pointer failed, expected %p got %p\n", sb.pbase + 18, sb.pptr); + /* sync */ + ret = (int) call_func1(p_streambuf_sync, &sb); + ok(ret == EOF, "sync failed, expected EOF got %d\n", ret); + sb.gptr = sb.egptr; + ret = (int) call_func1(p_streambuf_sync, &sb); + ok(ret == EOF, "sync failed, expected EOF got %d\n", ret); + sb.pptr = sb.pbase; + ret = (int) call_func1(p_streambuf_sync, &sb); + ok(ret == 0, "sync failed, expected 0 got %d\n", ret); + ret = (int) call_func1(p_streambuf_sync, &sb2); + ok(ret == 0, "sync failed, expected 0 got %d\n", ret); + SetEvent(lock_arg.test[3]); WaitForSingleObject(thread, INFINITE);

1 0

Michael Müller : kernel32: Forward SetFileInformationByHandle FileDispositionInfo class to ntdll.
by Alexandre Julliard 11 Jun '15

11 Jun '15

Module: wine Branch: master Commit: 7fe0b56e15a278dbd3a9def388321a2771785576 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fe0b56e15a278dbd3a9def38… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Jun 10 07:56:32 2015 +0200 kernel32: Forward SetFileInformationByHandle FileDispositionInfo class to ntdll. --- dlls/kernel32/file.c | 13 ++++++++++++- dlls/kernel32/tests/file.c | 16 ++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 9cdcd8d..bcb21c9 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -1046,6 +1046,9 @@ BOOL WINAPI SetEndOfFile( HANDLE hFile ) */ BOOL WINAPI SetFileInformationByHandle( HANDLE file, FILE_INFO_BY_HANDLE_CLASS class, VOID *info, DWORD size ) { + NTSTATUS status; + IO_STATUS_BLOCK io; + TRACE( "%p %u %p %u\n", file, class, info, size ); switch (class) @@ -1053,7 +1056,6 @@ BOOL WINAPI SetFileInformationByHandle( HANDLE file, FILE_INFO_BY_HANDLE_CLASS c case FileBasicInfo: case FileNameInfo: case FileRenameInfo: - case FileDispositionInfo: case FileAllocationInfo: case FileEndOfFileInfo: case FileStreamInfo: @@ -1071,6 +1073,10 @@ BOOL WINAPI SetFileInformationByHandle( HANDLE file, FILE_INFO_BY_HANDLE_CLASS c SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); return FALSE; + case FileDispositionInfo: + status = NtSetInformationFile( file, &io, info, size, FileDispositionInformation ); + break; + case FileStandardInfo: case FileCompressionInfo: case FileAttributeTagInfo: @@ -1080,6 +1086,11 @@ BOOL WINAPI SetFileInformationByHandle( HANDLE file, FILE_INFO_BY_HANDLE_CLASS c return FALSE; } + if (status != STATUS_SUCCESS) + { + SetLastError( RtlNtStatusToDosError( status ) ); + return FALSE; + } return TRUE; } diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index fb4cd9b..53d225c 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -38,6 +38,10 @@ #include "winnls.h" #include "fileapi.h" +#ifdef WINE_NO_UNICODE_MACROS +#undef DeleteFile /* needed for FILE_DISPOSITION_INFO */ +#endif + static HANDLE (WINAPI *pFindFirstFileExA)(LPCSTR,FINDEX_INFO_LEVELS,LPVOID,FINDEX_SEARCH_OPS,LPVOID,DWORD); static BOOL (WINAPI *pReplaceFileA)(LPCSTR, LPCSTR, LPCSTR, DWORD, LPVOID, LPVOID); static BOOL (WINAPI *pReplaceFileW)(LPCWSTR, LPCWSTR, LPCWSTR, DWORD, LPVOID, LPVOID); @@ -4589,6 +4593,7 @@ static void test_SetFileInformationByHandle(void) FILE_REMOTE_PROTOCOL_INFO protinfo = { 0 }; FILE_STANDARD_INFO stdinfo = { }; FILE_COMPRESSION_INFO compressinfo; + FILE_DISPOSITION_INFO dispinfo; char tempFileName[MAX_PATH]; char tempPath[MAX_PATH]; HANDLE file; @@ -4632,6 +4637,17 @@ static void test_SetFileInformationByHandle(void) ret = pSetFileInformationByHandle(file, FileRemoteProtocolInfo, &protinfo, sizeof(protinfo)); ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "got %d, error %d\n", ret, GetLastError()); + /* test FileDispositionInfo, additional details already covered by ntdll tests */ + SetLastError(0xdeadbeef); + ret = pSetFileInformationByHandle(file, FileDispositionInfo, &dispinfo, 0); +todo_wine + ok(!ret && GetLastError() == ERROR_BAD_LENGTH, "got %d, error %d\n", ret, GetLastError()); + + dispinfo.DeleteFile = TRUE; + ret = pSetFileInformationByHandle(file, FileDispositionInfo, &dispinfo, sizeof(dispinfo)); +todo_wine + ok(ret, "setting FileDispositionInfo failed, error %d\n", GetLastError()); + CloseHandle(file); }

1 0

Sebastian Lackner : ntdll/tests: Add tests for info struct size for FileDispositionInformation.
by Alexandre Julliard 11 Jun '15

11 Jun '15

Module: wine Branch: master Commit: bdef5c550894366f471d703e143da6332ede6c4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdef5c550894366f471d703e1… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Jun 10 07:47:51 2015 +0200 ntdll/tests: Add tests for info struct size for FileDispositionInformation. --- dlls/ntdll/tests/file.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 2df0edc..86a4516 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -1460,9 +1460,26 @@ static void test_file_disposition_information(void) IO_STATUS_BLOCK io; FILE_DISPOSITION_INFORMATION fdi; BOOL fileDeleted; + DWORD fdi2; GetTempPathA( MAX_PATH, tmp_path ); + /* tests for info struct size */ + GetTempFileNameA( tmp_path, "dis", 0, buffer ); + handle = CreateFileA( buffer, GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, 0, 0 ); + ok( handle != INVALID_HANDLE_VALUE, "failed to create temp file\n" ); + res = pNtSetInformationFile( handle, &io, &fdi, 0, FileDispositionInformation ); + todo_wine + ok( res == STATUS_INFO_LENGTH_MISMATCH, "expected STATUS_INFO_LENGTH_MISMATCH, got %x\n", res ); + fdi2 = 0x100; + res = pNtSetInformationFile( handle, &io, &fdi2, sizeof(fdi2), FileDispositionInformation ); + todo_wine + ok( res == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %x\n", res ); + CloseHandle( handle ); + fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; + ok( !fileDeleted, "File shouldn't have been deleted\n" ); + DeleteFileA( buffer ); + /* cannot set disposition on file not opened with delete access */ GetTempFileNameA( tmp_path, "dis", 0, buffer ); handle = CreateFileA(buffer, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0);

1 0

Michael Müller : kernel32: Improve stub for SetFileInformationByHandle.
by Alexandre Julliard 11 Jun '15

11 Jun '15

Module: wine Branch: master Commit: fd8fae105b68a2af131b070adea0bfcaf582ace3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd8fae105b68a2af131b070ad… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Feb 26 06:08:58 2015 +0100 kernel32: Improve stub for SetFileInformationByHandle. --- dlls/kernel32/file.c | 42 ++++++++++++++++++++++++++++++++++++++++-- dlls/kernel32/tests/file.c | 4 ---- include/winbase.h | 1 + 3 files changed, 41 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 0b208a5..9cdcd8d 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -1040,12 +1040,50 @@ BOOL WINAPI SetEndOfFile( HANDLE hFile ) return FALSE; } + +/*********************************************************************** + * SetFileInformationByHandle (KERNEL32.@) + */ BOOL WINAPI SetFileInformationByHandle( HANDLE file, FILE_INFO_BY_HANDLE_CLASS class, VOID *info, DWORD size ) { - FIXME("%p %u %p %u - stub\n", file, class, info, size); - return FALSE; + TRACE( "%p %u %p %u\n", file, class, info, size ); + + switch (class) + { + case FileBasicInfo: + case FileNameInfo: + case FileRenameInfo: + case FileDispositionInfo: + case FileAllocationInfo: + case FileEndOfFileInfo: + case FileStreamInfo: + case FileIdBothDirectoryInfo: + case FileIdBothDirectoryRestartInfo: + case FileIoPriorityHintInfo: + case FileFullDirectoryInfo: + case FileFullDirectoryRestartInfo: + case FileStorageInfo: + case FileAlignmentInfo: + case FileIdInfo: + case FileIdExtdDirectoryInfo: + case FileIdExtdDirectoryRestartInfo: + FIXME( "%p, %u, %p, %u\n", file, class, info, size ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; + + case FileStandardInfo: + case FileCompressionInfo: + case FileAttributeTagInfo: + case FileRemoteProtocolInfo: + default: + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + + return TRUE; } + /*********************************************************************** * SetFilePointer (KERNEL32.@) */ diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 384dd8d..fb4cd9b 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -4614,18 +4614,15 @@ static void test_SetFileInformationByHandle(void) /* invalid classes */ SetLastError(0xdeadbeef); ret = pSetFileInformationByHandle(file, FileStandardInfo, &stdinfo, sizeof(stdinfo)); -todo_wine ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "got %d, error %d\n", ret, GetLastError()); memset(&compressinfo, 0, sizeof(compressinfo)); SetLastError(0xdeadbeef); ret = pSetFileInformationByHandle(file, FileCompressionInfo, &compressinfo, sizeof(compressinfo)); -todo_wine ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "got %d, error %d\n", ret, GetLastError()); SetLastError(0xdeadbeef); ret = pSetFileInformationByHandle(file, FileAttributeTagInfo, &fileattrinfo, sizeof(fileattrinfo)); -todo_wine ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "got %d, error %d\n", ret, GetLastError()); memset(&protinfo, 0, sizeof(protinfo)); @@ -4633,7 +4630,6 @@ todo_wine protinfo.StructureSize = sizeof(protinfo); SetLastError(0xdeadbeef); ret = pSetFileInformationByHandle(file, FileRemoteProtocolInfo, &protinfo, sizeof(protinfo)); -todo_wine ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "got %d, error %d\n", ret, GetLastError()); CloseHandle(file); diff --git a/include/winbase.h b/include/winbase.h index c558b21..e20a675 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2460,6 +2460,7 @@ WINBASEAPI VOID WINAPI SetFileApisToOEM(void); WINBASEAPI BOOL WINAPI SetFileAttributesA(LPCSTR,DWORD); WINBASEAPI BOOL WINAPI SetFileAttributesW(LPCWSTR,DWORD); #define SetFileAttributes WINELIB_NAME_AW(SetFileAttributes) +WINBASEAPI BOOL WINAPI SetFileInformationByHandle(HANDLE,FILE_INFO_BY_HANDLE_CLASS,LPVOID,DWORD); WINBASEAPI DWORD WINAPI SetFilePointer(HANDLE,LONG,LPLONG,DWORD); WINBASEAPI BOOL WINAPI SetFilePointerEx(HANDLE,LARGE_INTEGER,LARGE_INTEGER*,DWORD); WINADVAPI BOOL WINAPI SetFileSecurityA(LPCSTR,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR);

1 0

Zhenbo Li : mshtml: Implement IHTMLXMLHttpRequest as a stub.
by Alexandre Julliard 11 Jun '15

11 Jun '15

Module: wine Branch: master Commit: 82d090dd6d7127fa8972bd78f863109e40d14694 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82d090dd6d7127fa8972bd78f… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Thu Jun 11 11:38:53 2015 +0800 mshtml: Implement IHTMLXMLHttpRequest as a stub. --- dlls/mshtml/mshtml_private.h | 2 + dlls/mshtml/tests/dom.c | 8 ++ dlls/mshtml/xmlhttprequest.c | 244 ++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 252 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=82d090dd6d7127fa8972b…

1 0

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

11 Jun '15

Module: wine Branch: master Commit: 45f14218f7b04088192e4dbb4d7550b06e4935ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=45f14218f7b04088192e4dbb4… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Jun 10 20:23:35 2015 -0300 dmstyle: Don't fake success on IDirectMusicUtils_IPersistStream_ParseReference. --- dlls/dmstyle/dmutils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dmstyle/dmutils.c b/dlls/dmstyle/dmutils.c index 5008134..e551410 100644 --- a/dlls/dmstyle/dmutils.c +++ b/dlls/dmstyle/dmutils.c @@ -213,7 +213,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

Michael Stefaniuc : dmstyle: Use the generic DirectMusicObject implementation for DMStyle.
by Alexandre Julliard 11 Jun '15

11 Jun '15

Module: wine Branch: master Commit: 3ebf41cc425570efc588a4783726a14f77fe8275 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ebf41cc425570efc588a4783… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 10 23:48:15 2015 +0200 dmstyle: Use the generic DirectMusicObject implementation for DMStyle. --- dlls/dmstyle/Makefile.in | 1 + dlls/dmstyle/dmobject.c | 185 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/dmstyle/dmobject.h | 55 ++++++++++++++ dlls/dmstyle/style.c | 171 ++++++++++--------------------------------- 4 files changed, 281 insertions(+), 131 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3ebf41cc425570efc588a…

1 0

Michael Stefaniuc : dmstyle: Pass the object instead of the iface to helper functions.
by Alexandre Julliard 11 Jun '15

11 Jun '15

Module: wine Branch: master Commit: b8149561ec573109063d233d075e758c9dd71834 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8149561ec573109063d233d0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 10 23:47:41 2015 +0200 dmstyle: Pass the object instead of the iface to helper functions. --- dlls/dmstyle/style.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/dmstyle/style.c b/dlls/dmstyle/style.c index 88f3d52..73a653a 100644 --- a/dlls/dmstyle/style.c +++ b/dlls/dmstyle/style.c @@ -706,9 +706,9 @@ static HRESULT parse_part_list(DMUS_PRIVATE_CHUNK *pChunk, IStream *pStm) return S_OK; } -static HRESULT IDirectMusicStyle8Impl_IPersistStream_ParsePatternList (LPPERSISTSTREAM iface, DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm) { - - ICOM_THIS_MULTI(IDirectMusicStyle8Impl, PersistStreamVtbl, iface); +static HRESULT parse_pattern_list(IDirectMusicStyle8Impl *This, DMUS_PRIVATE_CHUNK *pChunk, + IStream *pStm) +{ HRESULT hr = E_FAIL; DMUS_PRIVATE_CHUNK Chunk; DWORD ListSize[3], ListCount[3]; @@ -871,9 +871,9 @@ static HRESULT IDirectMusicStyle8Impl_IPersistStream_ParsePatternList (LPPERSIST return S_OK; } -static HRESULT IDirectMusicStyle8Impl_IPersistStream_ParseStyleForm (LPPERSISTSTREAM iface, DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm) { - ICOM_THIS_MULTI(IDirectMusicStyle8Impl, PersistStreamVtbl, iface); - +static HRESULT parse_style_form(IDirectMusicStyle8Impl *This, DMUS_PRIVATE_CHUNK *pChunk, + IStream *pStm) +{ HRESULT hr = E_FAIL; DMUS_PRIVATE_CHUNK Chunk; DWORD StreamSize, StreamCount, ListSize[3], ListCount[3]; @@ -998,7 +998,7 @@ static HRESULT IDirectMusicStyle8Impl_IPersistStream_ParseStyleForm (LPPERSISTST } case DMUS_FOURCC_PATTERN_LIST: { TRACE_(dmfile)(": PATTERN list\n"); - hr = IDirectMusicStyle8Impl_IPersistStream_ParsePatternList (iface, &Chunk, pStm); + hr = parse_pattern_list(This, &Chunk, pStm); if (FAILED(hr)) return hr; break; } @@ -1043,7 +1043,7 @@ static HRESULT WINAPI IDirectMusicStyle8Impl_IPersistStream_Load (LPPERSISTSTREA switch (Chunk.fccID) { case DMUS_FOURCC_STYLE_FORM: { TRACE_(dmfile)(": Style form\n"); - hr = IDirectMusicStyle8Impl_IPersistStream_ParseStyleForm (iface, &Chunk, pStm); + hr = parse_style_form(This, &Chunk, pStm); if (FAILED(hr)) return hr; break; }

1 0

Michael Stefaniuc : dmstyle: Remove unused arguments from helper functions.
by Alexandre Julliard 11 Jun '15

11 Jun '15

Module: wine Branch: master Commit: 774aad743cfe1c7f6a4c38b9a384fc35006d3d9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=774aad743cfe1c7f6a4c38b9a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 10 23:46:30 2015 +0200 dmstyle: Remove unused arguments from helper functions. --- dlls/dmstyle/style.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/dmstyle/style.c b/dlls/dmstyle/style.c index ed40791..88f3d52 100644 --- a/dlls/dmstyle/style.c +++ b/dlls/dmstyle/style.c @@ -452,8 +452,8 @@ static HRESULT WINAPI IDirectMusicStyle8Impl_IPersistStream_IsDirty (LPPERSISTST return S_FALSE; } -static HRESULT IDirectMusicStyle8Impl_IPersistStream_LoadBand (LPPERSISTSTREAM iface, IStream* pClonedStream, IDirectMusicBand** ppBand) { - +static HRESULT load_band(IStream *pClonedStream, IDirectMusicBand **ppBand) +{ HRESULT hr = E_FAIL; IPersistStream* pPersistStream = NULL; @@ -481,8 +481,9 @@ static HRESULT IDirectMusicStyle8Impl_IPersistStream_LoadBand (LPPERSISTSTREAM i return S_OK; } -static HRESULT IDirectMusicStyle8Impl_IPersistStream_ParsePartRefList (LPPERSISTSTREAM iface, DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm, LPDMUS_PRIVATE_STYLE_MOTIF pNewMotif) { - /*ICOM_THIS_MULTI(IDirectMusicStyle8Impl, PersistStreamVtbl, iface);*/ +static HRESULT parse_part_ref_list(DMUS_PRIVATE_CHUNK *pChunk, IStream *pStm, + DMUS_PRIVATE_STYLE_MOTIF *pNewMotif) +{ HRESULT hr = E_FAIL; DMUS_PRIVATE_CHUNK Chunk; DWORD ListSize[3], ListCount[3]; @@ -573,9 +574,8 @@ static HRESULT IDirectMusicStyle8Impl_IPersistStream_ParsePartRefList (LPPERSIST return S_OK; } -static HRESULT IDirectMusicStyle8Impl_IPersistStream_ParsePartList (LPPERSISTSTREAM iface, DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm) { - - /*ICOM_THIS_MULTI(IDirectMusicStyle8Impl, PersistStreamVtbl, iface);*/ +static HRESULT parse_part_list(DMUS_PRIVATE_CHUNK *pChunk, IStream *pStm) +{ HRESULT hr = E_FAIL; DMUS_PRIVATE_CHUNK Chunk; DWORD ListSize[3], ListCount[3]; @@ -785,8 +785,8 @@ static HRESULT IDirectMusicStyle8Impl_IPersistStream_ParsePatternList (LPPERSIST liMove.QuadPart = 0; liMove.QuadPart -= sizeof(FOURCC) + (sizeof(FOURCC)+sizeof(DWORD)); IStream_Seek (pClonedStream, liMove, STREAM_SEEK_CUR, NULL); - - hr = IDirectMusicStyle8Impl_IPersistStream_LoadBand (iface, pClonedStream, &pBand); + + hr = load_band(pClonedStream, &pBand); if (FAILED(hr)) { ERR(": could not load track\n"); return hr; @@ -845,7 +845,7 @@ static HRESULT IDirectMusicStyle8Impl_IPersistStream_ParsePatternList (LPPERSIST } case DMUS_FOURCC_PARTREF_LIST: { TRACE_(dmfile)(": PartRef list\n"); - hr = IDirectMusicStyle8Impl_IPersistStream_ParsePartRefList (iface, &Chunk, pStm, pNewMotif); + hr = parse_part_ref_list(&Chunk, pStm, pNewMotif); if (FAILED(hr)) return hr; break; } @@ -926,8 +926,8 @@ static HRESULT IDirectMusicStyle8Impl_IPersistStream_ParseStyleForm (LPPERSISTST liMove.QuadPart = 0; liMove.QuadPart -= sizeof(FOURCC) + (sizeof(FOURCC)+sizeof(DWORD)); IStream_Seek (pClonedStream, liMove, STREAM_SEEK_CUR, NULL); - - hr = IDirectMusicStyle8Impl_IPersistStream_LoadBand (iface, pClonedStream, &pBand); + + hr = load_band(pClonedStream, &pBand); if (FAILED(hr)) { ERR(": could not load track\n"); return hr; @@ -992,7 +992,7 @@ static HRESULT IDirectMusicStyle8Impl_IPersistStream_ParseStyleForm (LPPERSISTST } case DMUS_FOURCC_PART_LIST: { TRACE_(dmfile)(": PART list\n"); - hr = IDirectMusicStyle8Impl_IPersistStream_ParsePartList (iface, &Chunk, pStm); + hr = parse_part_list(&Chunk, pStm); if (FAILED(hr)) return hr; break; }

1 0

Nikolay Sivov : oledb32/tests: Improve IDataSourceLocator tests a bit.
by Alexandre Julliard 11 Jun '15

11 Jun '15

Module: wine Branch: master Commit: ea2387b2a7dc812796d16abb742a210211fc82cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea2387b2a7dc812796d16abb7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 10 01:14:45 2015 +0300 oledb32/tests: Improve IDataSourceLocator tests a bit. --- dlls/oledb32/tests/database.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index 696ae70..5393a91 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -737,10 +737,8 @@ static void test_dslocator(void) { COMPATIBLE_LONG hwnd = 0; - /* Crashes under Window 7 - hr = IDataSourceLocator_get_hWnd(dslocator, NULL); - ok(hr == E_INVALIDARG, "got %08x\n", hr); - */ + if (0) /* Crashes under Window 7 */ + hr = IDataSourceLocator_get_hWnd(dslocator, NULL); hr = IDataSourceLocator_get_hWnd(dslocator, &hwnd); ok(hr == S_OK, "got %08x\n", hr); @@ -755,7 +753,7 @@ static void test_dslocator(void) hr = IDataSourceLocator_put_hWnd(dslocator, hwnd); ok(hr == S_OK, "got %08x\n", hr); - hwnd = 0xDEADBEEF; + hwnd = 0; hr = IDataSourceLocator_get_hWnd(dslocator, &hwnd); ok(hr == S_OK, "got %08x\n", hr); ok(hwnd == 0xDEADBEEF, "got %p\n", (HWND)hwnd);

1 0

← Newer
1
...
37
38
39
40
41
42
43
...
61
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2015