April 2014 - Wine-commits - list.winehq.org

Piotr Caban : ole32: Don't write empty CLIPFORMAT in WriteFmtUserTypeStg.
by Alexandre Julliard 07 Apr '14

07 Apr '14

Module: wine Branch: master Commit: f83d24d4f7eb19df21d60458a48243dd6b5c44d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f83d24d4f7eb19df21d60458a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 7 18:55:31 2014 +0200 ole32: Don't write empty CLIPFORMAT in WriteFmtUserTypeStg. --- dlls/ole32/storage32.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index b859ad1..a6d30ab 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -8769,8 +8769,12 @@ HRESULT WINAPI WriteFmtUserTypeStg( TRACE("(%p,%x,%s)\n",pstg,cf,debugstr_w(lpszUserType)); /* get the clipboard format name */ - n = GetClipboardFormatNameW( cf, szwClipName, sizeof(szwClipName)/sizeof(szwClipName[0]) ); - szwClipName[n]=0; + if( cf ) + { + n = GetClipboardFormatNameW( cf, szwClipName, + sizeof(szwClipName)/sizeof(szwClipName[0]) ); + szwClipName[n]=0; + } TRACE("Clipboard name is %s\n", debugstr_w(szwClipName)); @@ -8784,8 +8788,8 @@ HRESULT WINAPI WriteFmtUserTypeStg( TRACE("progid is %s\n",debugstr_w(wstrProgID)); - r = STORAGE_WriteCompObj( pstg, &clsid, - lpszUserType, szwClipName, wstrProgID ); + r = STORAGE_WriteCompObj( pstg, &clsid, lpszUserType, + cf ? szwClipName : NULL, wstrProgID ); CoTaskMemFree(wstrProgID);

1 0

Piotr Caban : ole32: Try to open 1Ole stream before trying to create it in SetConvertStg function.
by Alexandre Julliard 07 Apr '14

07 Apr '14

Module: wine Branch: master Commit: 046d7c6d4281f66e060b9da46b9f35d4bec3d8b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=046d7c6d4281f66e060b9da46… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 7 18:55:41 2014 +0200 ole32: Try to open 1Ole stream before trying to create it in SetConvertStg function. --- dlls/ole32/storage32.c | 59 ++++++++++++++++++++++++------------------------ 1 file changed, 30 insertions(+), 29 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index a6d30ab..8ad3ff9 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -9510,51 +9510,52 @@ HRESULT WINAPI GetConvertStg(IStorage *stg) */ HRESULT WINAPI SetConvertStg(IStorage *storage, BOOL convert) { + static const WCHAR stream_1oleW[] = {1,'O','l','e',0}; DWORD flags = convert ? OleStream_Convert : 0; + IStream *stream; + DWORD header[2]; HRESULT hr; TRACE("(%p, %d)\n", storage, convert); - hr = STORAGE_CreateOleStream(storage, flags); - if (hr == STG_E_FILEALREADYEXISTS) + hr = IStorage_OpenStream(storage, stream_1oleW, NULL, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, &stream); + if (FAILED(hr)) { - static const WCHAR stream_1oleW[] = {1,'O','l','e',0}; - IStream *stream; - DWORD header[2]; + if (hr != STG_E_FILENOTFOUND) + return hr; + + return STORAGE_CreateOleStream(storage, flags); + } - hr = IStorage_OpenStream(storage, stream_1oleW, NULL, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, &stream); - if (FAILED(hr)) return hr; + hr = IStream_Read(stream, header, sizeof(header), NULL); + if (FAILED(hr)) + { + IStream_Release(stream); + return hr; + } - hr = IStream_Read(stream, header, sizeof(header), NULL); + /* update flag if differs */ + if ((header[1] ^ flags) & OleStream_Convert) + { + LARGE_INTEGER pos = {{0}}; + + if (header[1] & OleStream_Convert) + flags = header[1] & ~OleStream_Convert; + else + flags = header[1] | OleStream_Convert; + + pos.QuadPart = sizeof(DWORD); + hr = IStream_Seek(stream, pos, STREAM_SEEK_SET, NULL); if (FAILED(hr)) { IStream_Release(stream); return hr; } - /* update flag if differs */ - if ((header[1] ^ flags) & OleStream_Convert) - { - LARGE_INTEGER pos; - - if (header[1] & OleStream_Convert) - flags = header[1] & ~OleStream_Convert; - else - flags = header[1] | OleStream_Convert; - - pos.QuadPart = sizeof(DWORD); - hr = IStream_Seek(stream, pos, STREAM_SEEK_SET, NULL); - if (FAILED(hr)) - { - IStream_Release(stream); - return hr; - } - - hr = IStream_Write(stream, &flags, sizeof(flags), NULL); - } - IStream_Release(stream); + hr = IStream_Write(stream, &flags, sizeof(flags), NULL); } + IStream_Release(stream); return hr; }

1 0

Piotr Caban : ole32: Get CLSID from IStorage object in WriteFmtUserTypeStg.
by Alexandre Julliard 07 Apr '14

07 Apr '14

Module: wine Branch: master Commit: 2db5418e02d190282dd11c16574553bd8d3add27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2db5418e02d190282dd11c165… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 7 18:55:50 2014 +0200 ole32: Get CLSID from IStorage object in WriteFmtUserTypeStg. --- dlls/ole32/storage32.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 8ad3ff9..864a5ec 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -8760,9 +8760,10 @@ static HRESULT STORAGE_WriteCompObj( LPSTORAGE pstg, CLSID *clsid, HRESULT WINAPI WriteFmtUserTypeStg( LPSTORAGE pstg, CLIPFORMAT cf, LPOLESTR lpszUserType) { + STATSTG stat; HRESULT r; WCHAR szwClipName[0x40]; - CLSID clsid = CLSID_NULL; + CLSID clsid; LPWSTR wstrProgID = NULL; DWORD n; @@ -8778,12 +8779,12 @@ HRESULT WINAPI WriteFmtUserTypeStg( TRACE("Clipboard name is %s\n", debugstr_w(szwClipName)); - /* FIXME: There's room to save a CLSID and its ProgID, but - the CLSID is not looked up in the registry and in all the - tests I wrote it was CLSID_NULL. Where does it come from? - */ + r = IStorage_Stat(pstg, &stat, STATFLAG_NONAME); + if(SUCCEEDED(r)) + clsid = stat.clsid; + else + clsid = CLSID_NULL; - /* get the real program ID. This may fail, but that's fine */ ProgIDFromCLSID(&clsid, &wstrProgID); TRACE("progid is %s\n",debugstr_w(wstrProgID));

1 0

Piotr Caban : ole32: Add OleDoAutoConvert implementation.
by Alexandre Julliard 07 Apr '14

07 Apr '14

Module: wine Branch: master Commit: 0d4c693a7bce3255d896208a58d5094762090339 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d4c693a7bce3255d896208a5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 7 18:55:59 2014 +0200 ole32: Add OleDoAutoConvert implementation. --- dlls/ole32/ole2.c | 55 ++++++- dlls/ole32/tests/ole2.c | 366 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 419 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0d4c693a7bce3255d8962…

1 0

Piotr Caban : ole32: Add more SetConvertStg amd WriteFmtUserTypeStg tests.
by Alexandre Julliard 07 Apr '14

07 Apr '14

Module: wine Branch: master Commit: 2fbbe143beaf6720398e686267973ac9e01969d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fbbe143beaf6720398e68626… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 7 18:56:10 2014 +0200 ole32: Add more SetConvertStg amd WriteFmtUserTypeStg tests. --- dlls/ole32/tests/ole2.c | 34 ++++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 9761614..05e8c4f 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -2301,8 +2301,6 @@ static void test_OleDoAutoConvert(void) ok(!comp_obj_data.unicode_user_type_len, "unicode_user_type_len = %d\n", comp_obj_data.unicode_user_type_len); ok(!comp_obj_data.unicode_clipboard_format_len, "unicode_clipboard_format_len = %d\n", comp_obj_data.unicode_clipboard_format_len); ok(!comp_obj_data.reserved4, "reserved4 %d\n", comp_obj_data.reserved4); - ret = IStream_Release(comp_obj_stream); - ok(!ret, "comp_obj_stream was not freed\n"); hr = IStream_Seek(ole_stream, pos, STREAM_SEEK_SET, NULL); ok(hr == S_OK, "IStream_Seek returned %x\n", hr); @@ -2312,6 +2310,38 @@ static void test_OleDoAutoConvert(void) ok(ole_data.flags == 4, "flags = %x\n", ole_data.flags); for(i=2; i<sizeof(ole_data)/sizeof(DWORD); i++) ok(((DWORD*)&ole_data)[i] == 0, "ole_data[%d] = %x\n", i, ((DWORD*)&ole_data)[i]); + + SET_EXPECT(Storage_OpenStream_Ole); + hr = SetConvertStg(&Storage, TRUE); + ok(hr == S_OK, "SetConvertStg returned %x\n", hr); + CHECK_CALLED(Storage_OpenStream_Ole); + + SET_EXPECT(Storage_OpenStream_CompObj); + SET_EXPECT(Storage_Stat); + SET_EXPECT(Storage_CreateStream_CompObj); + hr = WriteFmtUserTypeStg(&Storage, 0, NULL); + ok(hr == S_OK, "WriteFmtUserTypeStg returned %x\n", hr); + todo_wine CHECK_CALLED(Storage_OpenStream_CompObj); + CHECK_CALLED(Storage_Stat); + CHECK_CALLED(Storage_CreateStream_CompObj); + hr = IStream_Seek(comp_obj_stream, pos, STREAM_SEEK_SET, NULL); + ok(hr == S_OK, "IStream_Seek returned %x\n", hr); + hr = IStream_Read(comp_obj_stream, &comp_obj_data, sizeof(comp_obj_data), NULL); + ok(hr == S_OK, "IStream_Read returned %x\n", hr); + ok(comp_obj_data.reserved1 == 0xfffe0001, "reserved1 = %x\n", comp_obj_data.reserved1); + ok(comp_obj_data.version == 0xa03, "version = %x\n", comp_obj_data.version); + ok(comp_obj_data.reserved2[0] == -1, "reserved2[0] = %x\n", comp_obj_data.reserved2[0]); + ok(IsEqualIID(comp_obj_data.reserved2+1, &CLSID_WineTestOld), "reserved2 = %s\n", wine_dbgstr_guid((CLSID*)(comp_obj_data.reserved2+1))); + ok(!comp_obj_data.ansi_user_type_len, "ansi_user_type_len = %d\n", comp_obj_data.ansi_user_type_len); + ok(!comp_obj_data.ansi_clipboard_format_len, "ansi_clipboard_format_len = %d\n", comp_obj_data.ansi_clipboard_format_len); + ok(!comp_obj_data.reserved3, "reserved3 = %x\n", comp_obj_data.reserved3); + ok(comp_obj_data.unicode_marker == 0x71b239f4, "unicode_marker = %x\n", comp_obj_data.unicode_marker); + ok(!comp_obj_data.unicode_user_type_len, "unicode_user_type_len = %d\n", comp_obj_data.unicode_user_type_len); + ok(!comp_obj_data.unicode_clipboard_format_len, "unicode_clipboard_format_len = %d\n", comp_obj_data.unicode_clipboard_format_len); + ok(!comp_obj_data.reserved4, "reserved4 %d\n", comp_obj_data.reserved4); + + ret = IStream_Release(comp_obj_stream); + ok(!ret, "comp_obj_stream was not freed\n"); ret = IStream_Release(ole_stream); ok(!ret, "ole_stream was not freed\n");

1 0

Nikolay Sivov : include: Added dwrite_2.idl.
by Alexandre Julliard 07 Apr '14

07 Apr '14

Module: wine Branch: master Commit: 071245475d1c24aef3297cc1f284619566a2bd78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=071245475d1c24aef3297cc1f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 7 09:22:50 2014 +0400 include: Added dwrite_2.idl. --- include/Makefile.in | 1 + include/dwrite_2.idl | 329 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 330 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=071245475d1c24aef3297…

1 0

Nikolay Sivov : msxml3/tests: Protect from invalid array access (Coverity) .
by Alexandre Julliard 07 Apr '14

07 Apr '14

Module: wine Branch: master Commit: 6ed7d9dd1c1d009d760cead40cc8599c3f71620a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ed7d9dd1c1d009d760cead40… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 7 09:24:19 2014 +0400 msxml3/tests: Protect from invalid array access (Coverity). --- dlls/msxml3/tests/saxreader.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 5b78e9a..1032b8c 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -1515,8 +1515,13 @@ static HRESULT WINAPI isaxattributes_getQName( ok(index >= 0 && index <= 2, "invalid index received %d\n", index); - *QName = attrqnamesW[index]; - *QNameLength = attrqnamelen[index]; + if (index >= 0 && index <= 2) { + *QName = attrqnamesW[index]; + *QNameLength = attrqnamelen[index]; + } else { + *QName = NULL; + *QNameLength = 0; + } return S_OK; } @@ -1601,8 +1606,13 @@ static HRESULT WINAPI isaxattributes_getValue(ISAXAttributes* iface, int index, ok(index >= 0 && index <= 2, "invalid index received %d\n", index); - *value = attrvaluesW[index]; - *nValue = attrvalueslen[index]; + if (index >= 0 && index <= 2) { + *value = attrvaluesW[index]; + *nValue = attrvalueslen[index]; + } else { + *value = NULL; + *nValue = 0; + } return S_OK; }

1 0

Nikolay Sivov : services: Remove redundant error code check (Coverity).
by Alexandre Julliard 07 Apr '14

07 Apr '14

Module: wine Branch: master Commit: 5300364dfdb1225afddb8962ce4703927fbe61fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=5300364dfdb1225afddb8962c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 7 09:25:51 2014 +0400 services: Remove redundant error code check (Coverity). --- programs/services/services.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/services/services.c b/programs/services/services.c index 37f3d65..f6de89d 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -718,8 +718,8 @@ static DWORD service_wait_for_startup(struct service_entry *service_entry, HANDL WINE_TRACE("Service started successfully\n"); return ERROR_SUCCESS; } - if (dwCurrentStatus != SERVICE_START_PENDING) - return ERROR_SERVICE_REQUEST_TIMEOUT; + + return ERROR_SERVICE_REQUEST_TIMEOUT; } }

1 0

Dmitry Timoshkov : schedsvc: Handle directory creation failure in SchRpcRegisterTask.
by Alexandre Julliard 07 Apr '14

07 Apr '14

Module: wine Branch: master Commit: 7e871b94d394e29ee95dad45220012684fef7a9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e871b94d394e29ee95dad452… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Apr 7 14:30:23 2014 +0900 schedsvc: Handle directory creation failure in SchRpcRegisterTask. --- dlls/schedsvc/schedsvc.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/schedsvc/schedsvc.c b/dlls/schedsvc/schedsvc.c index 1b62b94..aa99b03 100644 --- a/dlls/schedsvc/schedsvc.c +++ b/dlls/schedsvc/schedsvc.c @@ -189,6 +189,11 @@ HRESULT __cdecl SchRpcRegisterTask(const WCHAR *path, const WCHAR *xml, DWORD fl if (!p) p = strrchrW(full_name, '\\'); *p = 0; hr = create_directory(full_name); + if (hr != S_OK && hr != HRESULT_FROM_WIN32(ERROR_ALREADY_EXISTS)) + { + heap_free(full_name); + return hr; + } *p = '\\'; }

1 0

Dmitry Timoshkov : include/vfw.h: Properly declare implicit This* parameter.
by Alexandre Julliard 07 Apr '14

07 Apr '14

Module: wine Branch: master Commit: 22511c11aaaaed8224dc859dcfaccb8160785cf0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22511c11aaaaed8224dc859dc… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Apr 7 15:59:00 2014 +0900 include/vfw.h: Properly declare implicit This* parameter. --- include/vfw.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/include/vfw.h b/include/vfw.h index a2dad18..aa3d4f5 100644 --- a/include/vfw.h +++ b/include/vfw.h @@ -1148,8 +1148,8 @@ DECLARE_INTERFACE_(IAVIStreaming,IUnknown) STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE; /*** IAVIStreaming methods ***/ - STDMETHOD(Begin)(IAVIStreaming*iface,LONG lStart,LONG lEnd,LONG lRate) PURE; - STDMETHOD(End)(IAVIStreaming*iface) PURE; + STDMETHOD(Begin)(THIS_ LONG lStart,LONG lEnd,LONG lRate) PURE; + STDMETHOD(End)(THIS) PURE; }; #undef INTERFACE @@ -1174,11 +1174,11 @@ DECLARE_INTERFACE_(IAVIEditStream,IUnknown) STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE; /*** IAVIEditStream methods ***/ - STDMETHOD(Cut)(IAVIEditStream*iface,LONG*plStart,LONG*plLength,PAVISTREAM*ppResult) PURE; - STDMETHOD(Copy)(IAVIEditStream*iface,LONG*plStart,LONG*plLength,PAVISTREAM*ppResult) PURE; - STDMETHOD(Paste)(IAVIEditStream*iface,LONG*plStart,LONG*plLength,PAVISTREAM pSource,LONG lStart,LONG lEnd) PURE; - STDMETHOD(Clone)(IAVIEditStream*iface,PAVISTREAM*ppResult) PURE; - STDMETHOD(SetInfo)(IAVIEditStream*iface,LPAVISTREAMINFOW asi, LONG size) PURE; + STDMETHOD(Cut)(THIS_ LONG *plStart,LONG *plLength,PAVISTREAM *ppResult) PURE; + STDMETHOD(Copy)(THIS_ LONG *plStart,LONG *plLength,PAVISTREAM *ppResult) PURE; + STDMETHOD(Paste)(THIS_ LONG *plStart,LONG *plLength,PAVISTREAM pSource,LONG lStart,LONG lEnd) PURE; + STDMETHOD(Clone)(THIS_ PAVISTREAM *ppResult) PURE; + STDMETHOD(SetInfo)(THIS_ LPAVISTREAMINFOW asi, LONG size) PURE; }; #undef INTERFACE

1 0