wine-commits June 2014

wine-commits@winehq.org

4 participants
378 discussions

André Hentschel : krnl386: Fix typo in a comment.
by Alexandre Julliard 19 Jun '14

19 Jun '14

Module: wine Branch: master Commit: 8cad71cd5e15a77f6f2e4006167b17086269dd44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cad71cd5e15a77f6f2e40061… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Jun 19 13:04:06 2014 +0200 krnl386: Fix typo in a comment. --- dlls/krnl386.exe16/wowthunk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/krnl386.exe16/wowthunk.c b/dlls/krnl386.exe16/wowthunk.c index feb882b..1f352bd 100644 --- a/dlls/krnl386.exe16/wowthunk.c +++ b/dlls/krnl386.exe16/wowthunk.c @@ -561,7 +561,7 @@ BOOL WINAPI K32WOWCallback16Ex( DWORD vpfn16, DWORD dwFlags, __wine_push_frame( &frame ); __wine_enter_vm86( context ); __wine_pop_frame( &frame ); - if (errno != 0) /* enter_vm86 will fall with ENOSYS on x64 kernels */ + if (errno != 0) /* enter_vm86 will fail with ENOSYS on x64 kernels */ { WARN("__wine_enter_vm86 failed (errno=%d)\n", errno); if (errno == ENOSYS)

1 0

Vincent Povirk : windowscodecs: Fix leak in test_QueryCapability.
by Alexandre Julliard 19 Jun '14

19 Jun '14

Module: wine Branch: master Commit: 0f2efcf0c528f9c6b831e5f13d495a26a38734e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f2efcf0c528f9c6b831e5f13… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jun 12 16:02:05 2014 -0500 windowscodecs: Fix leak in test_QueryCapability. --- dlls/windowscodecs/tests/tiffformat.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/windowscodecs/tests/tiffformat.c b/dlls/windowscodecs/tests/tiffformat.c index aac6618..5e01562 100644 --- a/dlls/windowscodecs/tests/tiffformat.c +++ b/dlls/windowscodecs/tests/tiffformat.c @@ -239,6 +239,8 @@ todo_wine hr = IStream_Seek(stream, pos, SEEK_SET, NULL); ok(hr == S_OK, "IStream_Seek error %#x\n", hr); + IWICBitmapDecoder_Release(decoder); + hr = IWICImagingFactory_CreateDecoderFromStream(factory, stream, NULL, 0, &decoder); ok(hr == S_OK, "CreateDecoderFromStream error %#x\n", hr);

1 0

Vincent Povirk : windowscodecs: Fix leak in test_propertybag_getpropertyinfo.
by Alexandre Julliard 19 Jun '14

19 Jun '14

Module: wine Branch: master Commit: ed92450d6f7474311561f0bc6322fd39a2c57b63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed92450d6f7474311561f0bc6… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jun 12 15:48:36 2014 -0500 windowscodecs: Fix leak in test_propertybag_getpropertyinfo. --- dlls/windowscodecs/tests/propertybag.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/windowscodecs/tests/propertybag.c b/dlls/windowscodecs/tests/propertybag.c index b3cf191..55f5f65 100644 --- a/dlls/windowscodecs/tests/propertybag.c +++ b/dlls/windowscodecs/tests/propertybag.c @@ -67,10 +67,12 @@ static void test_propertybag_getpropertyinfo(IPropertyBag2 *property, ULONG expe ok(pb[0].vt == VT_UI1, "Invalid variant type, pb[0].vt=%x\n", pb[0].vt); ok(pb[0].dwType == PROPBAG2_TYPE_DATA, "Invalid variant type, pb[0].dwType=%x\n", pb[0].dwType); ok(lstrcmpW(pb[0].pstrName, wszTestProperty1) == 0, "Invalid property name, pb[0].pstrName=%s\n", wine_dbgstr_w(pb[0].pstrName)); + CoTaskMemFree(pb[0].pstrName); ok(pb[1].vt == VT_R4, "Invalid variant type, pb[1].vt=%x\n", pb[1].vt); ok(pb[1].dwType == PROPBAG2_TYPE_DATA, "Invalid variant type, pb[1].dwType=%x\n", pb[1].dwType); ok(lstrcmpW(pb[1].pstrName, wszTestProperty2) == 0, "Invalid property name, pb[1].pstrName=%s\n", wine_dbgstr_w(pb[1].pstrName)); + CoTaskMemFree(pb[1].pstrName); } static void test_propertybag_countproperties(IPropertyBag2 *property, ULONG expected_count)

1 0

Andrew Eikum : packager: Implement IOleObject::Close.
by Alexandre Julliard 19 Jun '14

19 Jun '14

Module: wine Branch: master Commit: fae22c7c412c11c22b965b9d47d2a8ca9090bb65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fae22c7c412c11c22b965b9d4… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Jun 18 14:58:50 2014 -0500 packager: Implement IOleObject::Close. --- dlls/packager/packager_main.c | 10 ++++++++-- dlls/packager/tests/oleobj.c | 16 ++++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/packager/packager_main.c b/dlls/packager/packager_main.c index 0575fcf..3f05f88 100644 --- a/dlls/packager/packager_main.c +++ b/dlls/packager/packager_main.c @@ -142,8 +142,14 @@ static HRESULT WINAPI OleObject_SetHostNames(IOleObject *iface, LPCOLESTR szCont static HRESULT WINAPI OleObject_Close(IOleObject *iface, DWORD dwSaveOption) { struct Package *This = impl_from_IOleObject(iface); - FIXME("(%p)->(0x%x)\n", This, dwSaveOption); - return E_NOTIMPL; + + TRACE("(%p)->(0x%x)\n", This, dwSaveOption); + + if(dwSaveOption == OLECLOSE_SAVEIFDIRTY || + dwSaveOption == OLECLOSE_PROMPTSAVE) + WARN("Saving unsupported\n"); + + return S_OK; } static HRESULT WINAPI OleObject_SetMoniker(IOleObject *iface, DWORD dwWhichMoniker, IMoniker *pmk) diff --git a/dlls/packager/tests/oleobj.c b/dlls/packager/tests/oleobj.c index 6170e67..f81dc22 100644 --- a/dlls/packager/tests/oleobj.c +++ b/dlls/packager/tests/oleobj.c @@ -473,8 +473,24 @@ static void test_packager(void) CloseHandle(file); } + hr = IOleObject_Close(oleobj, OLECLOSE_NOSAVE); + ok(hr == S_OK, "Close failed: %08x\n", hr); + + if(extended){ + file = CreateFileW(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, + FILE_ATTRIBUTE_NORMAL, NULL); + ok(file != INVALID_HANDLE_VALUE, "Temporary file shouldn't be deleted\n"); + CloseHandle(file); + } + IPersistStorage_Release(persist); IOleObject_Release(oleobj); + + if(extended){ + file = CreateFileW(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, + FILE_ATTRIBUTE_NORMAL, NULL); + ok(file == INVALID_HANDLE_VALUE, "Temporary file should be deleted\n"); + } } START_TEST(oleobj)

1 0

Andrew Eikum : packager: Implement Activate verb for OleObject::DoVerb.
by Alexandre Julliard 19 Jun '14

19 Jun '14

Module: wine Branch: master Commit: 7c6899ba7be84dea1ccf5dea095d6a5b7be60eb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c6899ba7be84dea1ccf5dea0… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Jun 18 14:58:26 2014 -0500 packager: Implement Activate verb for OleObject::DoVerb. --- dlls/packager/packager_main.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/packager/packager_main.c b/dlls/packager/packager_main.c index 02e691c..0575fcf 100644 --- a/dlls/packager/packager_main.c +++ b/dlls/packager/packager_main.c @@ -175,12 +175,26 @@ static HRESULT WINAPI OleObject_GetClipboardData(IOleObject *iface, DWORD dwRese return E_NOTIMPL; } +static HRESULT do_activate_object(struct Package *This, HWND parent) +{ + static const WCHAR openW[] = {'o','p','e','n',0}; + ShellExecuteW(parent, openW, This->filename, NULL, NULL, SW_SHOW); + return S_OK; +} + static HRESULT WINAPI OleObject_DoVerb(IOleObject *iface, LONG iVerb, LPMSG lpmsg, IOleClientSite *pActiveSite, LONG lindex, HWND hwndParent, LPCRECT lprcPosRect) { struct Package *This = impl_from_IOleObject(iface); - FIXME("(%p)->(%d)\n", This, iVerb); - return E_NOTIMPL; + + TRACE("(%p)->(%d)\n", This, iVerb); + + switch(iVerb){ + case 0: + return do_activate_object(This, hwndParent); + } + + return E_INVALIDARG; } static HRESULT WINAPI OleObject_EnumVerbs(IOleObject *iface, IEnumOLEVERB **ppEnumOleVerb)

1 0

Andrew Eikum : packager: Implement IOleObject::GetMiscStatus.
by Alexandre Julliard 19 Jun '14

19 Jun '14

Module: wine Branch: master Commit: 04b6fc9d5ee2c44cdd94c1aaa6adb0c94b124a3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=04b6fc9d5ee2c44cdd94c1aaa… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Jun 18 14:57:45 2014 -0500 packager: Implement IOleObject::GetMiscStatus. --- dlls/packager/packager_main.c | 11 +++++++++-- dlls/packager/tests/oleobj.c | 11 ++++++++++- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/packager/packager_main.c b/dlls/packager/packager_main.c index 942ae72..02e691c 100644 --- a/dlls/packager/packager_main.c +++ b/dlls/packager/packager_main.c @@ -256,8 +256,15 @@ static HRESULT WINAPI OleObject_EnumAdvise(IOleObject *iface, IEnumSTATDATA **pp static HRESULT WINAPI OleObject_GetMiscStatus(IOleObject *iface, DWORD dwAspect, DWORD *pdwStatus) { struct Package *This = impl_from_IOleObject(iface); - FIXME("(%p)->(%d, %p)\n", This, dwAspect, pdwStatus); - return E_NOTIMPL; + + TRACE("(%p)->(%d, %p)\n", This, dwAspect, pdwStatus); + + if(!pdwStatus) + return E_INVALIDARG; + + *pdwStatus = OLEMISC_ONLYICONIC; + + return S_OK; } static HRESULT WINAPI OleObject_SetColorScheme(IOleObject *iface, LOGPALETTE *pLogpal) diff --git a/dlls/packager/tests/oleobj.c b/dlls/packager/tests/oleobj.c index 912dda9..6170e67 100644 --- a/dlls/packager/tests/oleobj.c +++ b/dlls/packager/tests/oleobj.c @@ -410,7 +410,7 @@ static void test_packager(void) { IOleObject *oleobj; IPersistStorage *persist; - DWORD len, bytes_read; + DWORD len, bytes_read, status; HRESULT hr; HANDLE file; WCHAR filename[MAX_PATH]; @@ -441,6 +441,15 @@ static void test_packager(void) hr = IOleObject_SetClientSite(oleobj, &clientsite); ok(hr == S_OK, "SetClientSite failed: %08x\n", hr); + hr = IOleObject_GetMiscStatus(oleobj, DVASPECT_CONTENT, NULL); + ok(hr == E_INVALIDARG, "GetMiscStatus failed: %08x\n", hr); + + hr = IOleObject_GetMiscStatus(oleobj, DVASPECT_CONTENT, &status); + ok(hr == S_OK, "GetMiscStatus failed: %08x\n", hr); + ok(status == OLEMISC_ONLYICONIC || + status == OLEMISC_CANTLINKINSIDE /* winxp */, + "Got wrong DVASPECT_CONTENT status: 0x%x\n", status); + hr = IOleObject_QueryInterface(oleobj, &IID_IPersistStorage, (void**)&persist); ok(hr == S_OK, "QueryInterface(IPersistStorage) failed: %08x\n", hr);

1 0

Andrew Eikum : packager: Implement IOleObject::SetClientSite.
by Alexandre Julliard 19 Jun '14

19 Jun '14

Module: wine Branch: master Commit: 07e9d33f39730ff50646bda53ca2d510140e118d URL: http://source.winehq.org/git/wine.git/?a=commit;h=07e9d33f39730ff50646bda53… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Jun 18 14:57:13 2014 -0500 packager: Implement IOleObject::SetClientSite. --- dlls/packager/packager_main.c | 18 ++++++++-- dlls/packager/tests/oleobj.c | 78 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 94 insertions(+), 2 deletions(-) diff --git a/dlls/packager/packager_main.c b/dlls/packager/packager_main.c index 4735383..942ae72 100644 --- a/dlls/packager/packager_main.c +++ b/dlls/packager/packager_main.c @@ -44,6 +44,8 @@ struct Package { LONG ref; WCHAR filename[MAX_PATH]; + + IOleClientSite *clientsite; }; static inline struct Package *impl_from_IOleObject(IOleObject *iface) @@ -95,6 +97,9 @@ static ULONG WINAPI OleObject_Release(IOleObject *iface) TRACE("(%p) ref=%d\n", This, ref); if(!ref){ + if(This->clientsite) + IOleClientSite_Release(This->clientsite); + if(*This->filename) DeleteFileW(This->filename); @@ -107,8 +112,17 @@ static ULONG WINAPI OleObject_Release(IOleObject *iface) static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite *pClientSite) { struct Package *This = impl_from_IOleObject(iface); - FIXME("(%p)->(%p)\n", This, pClientSite); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, pClientSite); + + if(This->clientsite) + IOleClientSite_Release(This->clientsite); + + This->clientsite = pClientSite; + if(pClientSite) + IOleClientSite_AddRef(pClientSite); + + return S_OK; } static HRESULT WINAPI OleObject_GetClientSite(IOleObject *iface, IOleClientSite **ppClientSite) diff --git a/dlls/packager/tests/oleobj.c b/dlls/packager/tests/oleobj.c index 5ff536a..912dda9 100644 --- a/dlls/packager/tests/oleobj.c +++ b/dlls/packager/tests/oleobj.c @@ -334,6 +334,78 @@ static IStorage stg = { &stg_vtbl }; +static HRESULT WINAPI clientsite_QueryInterface(IOleClientSite* This, + REFIID riid, void **ppvObject) +{ + ok(0, "query interface\n"); + return E_NOINTERFACE; +} + +static ULONG WINAPI clientsite_AddRef(IOleClientSite* This) +{ + return 2; +} + +static ULONG WINAPI clientsite_Release(IOleClientSite* This) +{ + return 1; +} + +static HRESULT WINAPI clientsite_SaveObject(IOleClientSite* This) +{ + ok(0, "saveobject\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI clientsite_GetMoniker(IOleClientSite* This, + DWORD dwAssign, DWORD dwWhichMoniker, IMoniker **ppmk) +{ + ok(0, "getmoniker\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI clientsite_GetContainer(IOleClientSite* This, + IOleContainer **ppContainer) +{ + ok(0, "getcontainer\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI clientsite_ShowObject(IOleClientSite* This) +{ + ok(0, "showobject\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI clientsite_OnShowWindow(IOleClientSite* This, + BOOL fShow) +{ + ok(0, "onshowwindow\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI clientsite_RequestNewObjectLayout(IOleClientSite* This) +{ + ok(0, "requestnewobjectlayout\n"); + return E_NOTIMPL; +} + +static IOleClientSiteVtbl clientsite_vtbl = { + clientsite_QueryInterface, + clientsite_AddRef, + clientsite_Release, + clientsite_SaveObject, + clientsite_GetMoniker, + clientsite_GetContainer, + clientsite_ShowObject, + clientsite_OnShowWindow, + clientsite_RequestNewObjectLayout +}; + +static IOleClientSite clientsite = { + &clientsite_vtbl +}; + static void test_packager(void) { IOleObject *oleobj; @@ -363,6 +435,12 @@ static void test_packager(void) &IID_IOleObject, (void**)&oleobj); ok(hr == S_OK, "CoCreateInstance(CLSID_Package_Alt) failed: %08x\n", hr); + hr = IOleObject_SetClientSite(oleobj, NULL); + ok(hr == S_OK, "SetClientSite failed: %08x\n", hr); + + hr = IOleObject_SetClientSite(oleobj, &clientsite); + ok(hr == S_OK, "SetClientSite failed: %08x\n", hr); + hr = IOleObject_QueryInterface(oleobj, &IID_IPersistStorage, (void**)&persist); ok(hr == S_OK, "QueryInterface(IPersistStorage) failed: %08x\n", hr);

1 0

Francois Gouget : msvcrt/tests: Add a trailing '\n' to an ok() call.
by Alexandre Julliard 18 Jun '14

18 Jun '14

Module: wine Branch: master Commit: eb4d39b9eec312dc880b8d78f17bd27a23c72671 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb4d39b9eec312dc880b8d78f… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jun 18 18:03:40 2014 +0200 msvcrt/tests: Add a trailing '\n' to an ok() call. --- dlls/msvcrt/tests/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 353ebb4..97e70f0 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -2270,7 +2270,7 @@ static void test_write_flush(void) ok(file != NULL, "unable to create test file\n"); iobuf[0] = 0; fwrite(iobuf, 1, 1, file); /* needed for wine to init _bufsiz */ - ok(file->_bufsiz == 4096, "incorrect default buffer size: %d", file->_bufsiz); + ok(file->_bufsiz == 4096, "incorrect default buffer size: %d\n", file->_bufsiz); test_write_flush_size(file, file->_bufsiz); setvbuf(file, iobuf, _IOFBF, sizeof(iobuf)); test_write_flush_size(file, sizeof(iobuf));

1 0

Francois Gouget : ole32: Return the correct error in FileLockBytesImpl_*LockRegion*().
by Alexandre Julliard 18 Jun '14

18 Jun '14

Module: wine Branch: master Commit: 082d0910290e609a58ccd1c7c6d5b866f36c6ca6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=082d0910290e609a58ccd1c7c… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jun 18 17:55:13 2014 +0200 ole32: Return the correct error in FileLockBytesImpl_*LockRegion*(). --- dlls/ole32/filelockbytes.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/ole32/filelockbytes.c b/dlls/ole32/filelockbytes.c index 1c8c938..605b5df 100644 --- a/dlls/ole32/filelockbytes.c +++ b/dlls/ole32/filelockbytes.c @@ -313,6 +313,19 @@ static HRESULT WINAPI FileLockBytesImpl_SetSize(ILockBytes* iface, ULARGE_INTEGE return hr; } +static HRESULT get_lock_error(void) +{ + switch (GetLastError()) + { + case ERROR_LOCK_VIOLATION: return STG_E_LOCKVIOLATION; break; + case ERROR_ACCESS_DENIED: return STG_E_ACCESSDENIED; break; + case ERROR_NOT_SUPPORTED: return STG_E_INVALIDFUNCTION; break; + default: + FIXME("no mapping for error %d\n", GetLastError()); + return STG_E_INVALIDFUNCTION; + } +} + static HRESULT WINAPI FileLockBytesImpl_LockRegion(ILockBytes* iface, ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) { @@ -334,8 +347,7 @@ static HRESULT WINAPI FileLockBytesImpl_LockRegion(ILockBytes* iface, if (LockFileEx(This->hfile, lock_flags, 0, cb.u.LowPart, cb.u.HighPart, &ol)) return S_OK; - else - return STG_E_ACCESSDENIED; + return get_lock_error(); } HRESULT FileLockBytesImpl_LockRegionSync(ILockBytes* iface, @@ -353,8 +365,7 @@ HRESULT FileLockBytesImpl_LockRegionSync(ILockBytes* iface, if (LockFileEx(This->hfile, LOCKFILE_EXCLUSIVE_LOCK, 0, cb.u.LowPart, cb.u.HighPart, &ol)) return S_OK; - else - return STG_E_ACCESSDENIED; + return get_lock_error(); } static HRESULT WINAPI FileLockBytesImpl_UnlockRegion(ILockBytes* iface, @@ -374,8 +385,7 @@ static HRESULT WINAPI FileLockBytesImpl_UnlockRegion(ILockBytes* iface, if (UnlockFileEx(This->hfile, 0, cb.u.LowPart, cb.u.HighPart, &ol)) return S_OK; - else - return STG_E_ACCESSDENIED; + return get_lock_error(); } static HRESULT WINAPI FileLockBytesImpl_Stat(ILockBytes* iface,

1 0

Francois Gouget : ole32: Treat STG_E_LOCKVIOLATION the same way as STG_E_ACCESSDENIED as both indicate locking contention.
by Alexandre Julliard 18 Jun '14

18 Jun '14

Module: wine Branch: master Commit: bea2c6f2d5a345b3e1b1a534eaa65fd80d429caf URL: http://source.winehq.org/git/wine.git/?a=commit;h=bea2c6f2d5a345b3e1b1a534e… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jun 18 17:53:48 2014 +0200 ole32: Treat STG_E_LOCKVIOLATION the same way as STG_E_ACCESSDENIED as both indicate locking contention. --- dlls/ole32/storage32.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index f425d87..6ebc1e7 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -2885,12 +2885,12 @@ static HRESULT StorageImpl_LockRegionSync(StorageImpl *This, ULARGE_INTEGER offs { hr = ILockBytes_LockRegion(This->lockBytes, offset, cb, dwLockType); - if (hr == STG_E_ACCESSDENIED) + if (hr == STG_E_ACCESSDENIED || hr == STG_E_LOCKVIOLATION) { Sleep(delay); if (delay < 150) delay++; } - } while (hr == STG_E_ACCESSDENIED); + } while (hr == STG_E_ACCESSDENIED || hr == STG_E_LOCKVIOLATION); return hr; } @@ -2907,7 +2907,7 @@ static HRESULT StorageImpl_CheckLockRange(StorageImpl *This, ULONG start, hr = ILockBytes_LockRegion(This->lockBytes, offset, cb, LOCK_ONLYONCE); if (SUCCEEDED(hr)) ILockBytes_UnlockRegion(This->lockBytes, offset, cb, LOCK_ONLYONCE); - if (hr == STG_E_ACCESSDENIED) + if (hr == STG_E_ACCESSDENIED || hr == STG_E_LOCKVIOLATION) return fail_hr; else return S_OK; @@ -2925,7 +2925,7 @@ static HRESULT StorageImpl_LockOne(StorageImpl *This, ULONG start, ULONG end) { offset.QuadPart = i; hr = ILockBytes_LockRegion(This->lockBytes, offset, cb, LOCK_ONLYONCE); - if (hr != STG_E_ACCESSDENIED) + if (hr != STG_E_ACCESSDENIED && hr != STG_E_LOCKVIOLATION) break; }

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
38
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 2014