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

Sebastian Lackner : ole32: Fix call to free_stringtable with uninitialized pointer (Coverity).
by Alexandre Julliard March 11, 2015

March 11, 2015

Module: wine Branch: master Commit: 59a1bcd96ac3ca84290cb4449021d24b6f7abdcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=59a1bcd96ac3ca84290cb4449… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Mar 11 01:19:22 2015 +0100 ole32: Fix call to free_stringtable with uninitialized pointer (Coverity). --- dlls/ole32/filemoniker.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/filemoniker.c b/dlls/ole32/filemoniker.c index c7bbb66..732d6ac 100644 --- a/dlls/ole32/filemoniker.c +++ b/dlls/ole32/filemoniker.c @@ -924,7 +924,8 @@ static HRESULT WINAPI FileMonikerImpl_CommonPrefixWith(IMoniker* iface,IMoniker* pmkOther,IMoniker** ppmkPrefix) { - LPOLESTR pathThis = NULL, pathOther = NULL,*stringTable1,*stringTable2,commonPath = NULL; + LPOLESTR pathThis = NULL, pathOther = NULL, *stringTable1 = NULL; + LPOLESTR *stringTable2 = NULL, commonPath = NULL; IBindCtx *bindctx; DWORD mkSys; ULONG nb1,nb2,i,sameIdx; @@ -1012,8 +1013,8 @@ failed: CoTaskMemFree(pathThis); CoTaskMemFree(pathOther); CoTaskMemFree(commonPath); - free_stringtable(stringTable1); - free_stringtable(stringTable2); + if (stringTable1) free_stringtable(stringTable1); + if (stringTable2) free_stringtable(stringTable2); return ret; }

1 0

Bruno Jesus : ws2_32: Normalize socket tracing.
by Alexandre Julliard March 11, 2015

March 11, 2015

Module: wine Branch: master Commit: b1fc62a213241596bbb46b520b8ff3d7732e8ba3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1fc62a213241596bbb46b520… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Mar 10 21:41:21 2015 -0300 ws2_32: Normalize socket tracing. --- dlls/ws2_32/socket.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index a9f60cc..cce1bc8 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2340,7 +2340,7 @@ static int WS2_register_async_shutdown( SOCKET s, int type ) struct ws2_async_shutdown *wsa; NTSTATUS status; - TRACE("s %04lx type %d\n", s, type); + TRACE("socket %04lx type %d\n", s, type); wsa = (struct ws2_async_shutdown *)alloc_async_io( sizeof(*wsa) ); if ( !wsa ) @@ -2431,7 +2431,7 @@ static BOOL WINAPI WS2_AcceptEx(SOCKET listener, SOCKET acceptor, PVOID dest, DW struct ws2_accept_async *wsa; int fd; - TRACE("(%lx, %lx, %p, %d, %d, %d, %p, %p)\n", listener, acceptor, dest, dest_len, local_addr_len, + TRACE("(%04lx, %04lx, %p, %d, %d, %d, %p, %p)\n", listener, acceptor, dest, dest_len, local_addr_len, rem_addr_len, received, overlapped); if (!dest) @@ -3027,7 +3027,7 @@ int WINAPI WS_getpeername(SOCKET s, struct WS_sockaddr *name, int *namelen) int fd; int res; - TRACE("socket: %04lx, ptr %p, len %08x\n", s, name, namelen ? *namelen : 0); + TRACE("socket %04lx, ptr %p, len %08x\n", s, name, namelen ? *namelen : 0); fd = get_sock_fd( s, 0, NULL ); res = SOCKET_ERROR; @@ -3065,7 +3065,7 @@ int WINAPI WS_getsockname(SOCKET s, struct WS_sockaddr *name, int *namelen) int fd; int res; - TRACE("socket: %04lx, ptr %p, len %08x\n", s, name, namelen ? *namelen : 0); + TRACE("socket %04lx, ptr %p, len %08x\n", s, name, namelen ? *namelen : 0); /* Check if what we've received is valid. Should we use IsBadReadPtr? */ if( (name == NULL) || (namelen == NULL) ) @@ -3114,7 +3114,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, int fd; INT ret = 0; - TRACE("socket: %04lx, level 0x%x, name 0x%x, ptr %p, len %d\n", + TRACE("socket %04lx, level 0x%x, name 0x%x, ptr %p, len %d\n", s, level, optname, optval, optlen ? *optlen : 0); switch(level) @@ -4897,7 +4897,7 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, struct linger linger; struct timeval tval; - TRACE("socket: %04lx, level 0x%x, name 0x%x, ptr %p, len %d\n", + TRACE("socket %04lx, level 0x%x, name 0x%x, ptr %p, len %d\n", s, level, optname, optval, optlen); /* some broken apps pass the value directly instead of a pointer to it */ @@ -6082,7 +6082,7 @@ int WINAPI WSAEnumNetworkEvents(SOCKET s, WSAEVENT hEvent, LPWSANETWORKEVENTS lp int i; int errors[FD_MAX_EVENTS]; - TRACE("%08lx, hEvent %p, lpEvent %p\n", s, hEvent, lpEvent ); + TRACE("%04lx, hEvent %p, lpEvent %p\n", s, hEvent, lpEvent ); SERVER_START_REQ( get_socket_event ) { @@ -6110,7 +6110,7 @@ int WINAPI WSAEventSelect(SOCKET s, WSAEVENT hEvent, LONG lEvent) { int ret; - TRACE("%08lx, hEvent %p, event %08x\n", s, hEvent, lEvent); + TRACE("%04lx, hEvent %p, event %08x\n", s, hEvent, lEvent); SERVER_START_REQ( set_socket_event ) { @@ -6179,7 +6179,7 @@ INT WINAPI WSAAsyncSelect(SOCKET s, HWND hWnd, UINT uMsg, LONG lEvent) { int ret; - TRACE("%lx, hWnd %p, uMsg %08x, event %08x\n", s, hWnd, uMsg, lEvent); + TRACE("%04lx, hWnd %p, uMsg %08x, event %08x\n", s, hWnd, uMsg, lEvent); SERVER_START_REQ( set_socket_event ) { @@ -6913,7 +6913,7 @@ SOCKET WINAPI WSAAccept( SOCKET s, struct WS_sockaddr *addr, LPINT addrlen, SOCKET cs; SOCKADDR src_addr, dst_addr; - TRACE("Socket %04lx, sockaddr %p, addrlen %p, fnCondition %p, dwCallbackData %ld\n", + TRACE("socket %04lx, sockaddr %p, addrlen %p, fnCondition %p, dwCallbackData %ld\n", s, addr, addrlen, lpfnCondition, dwCallbackData); cs = WS_accept(s, addr, addrlen); @@ -7553,7 +7553,7 @@ INT WINAPI WSALookupServiceNextW( HANDLE lookup, DWORD flags, LPDWORD len, LPWSA */ INT WINAPI WSANtohl( SOCKET s, WS_u_long netlong, WS_u_long* lphostlong ) { - TRACE( "(0x%04lx 0x%08x %p)\n", s, netlong, lphostlong ); + TRACE( "(%04lx 0x%08x %p)\n", s, netlong, lphostlong ); if (!lphostlong) return WSAEFAULT; @@ -7566,7 +7566,7 @@ INT WINAPI WSANtohl( SOCKET s, WS_u_long netlong, WS_u_long* lphostlong ) */ INT WINAPI WSANtohs( SOCKET s, WS_u_short netshort, WS_u_short* lphostshort ) { - TRACE( "(0x%04lx 0x%08x %p)\n", s, netshort, lphostshort ); + TRACE( "(%04lx 0x%08x %p)\n", s, netshort, lphostshort ); if (!lphostshort) return WSAEFAULT; @@ -7589,7 +7589,7 @@ INT WINAPI WSAProviderConfigChange( LPHANDLE handle, LPWSAOVERLAPPED overlapped, */ INT WINAPI WSARecvDisconnect( SOCKET s, LPWSABUF disconnectdata ) { - TRACE( "(0x%04lx %p)\n", s, disconnectdata ); + TRACE( "(%04lx %p)\n", s, disconnectdata ); return WS_shutdown( s, SD_RECEIVE ); }

1 0

Sebastian Lackner : ole32: Fix a possible handle leak (Coverity).
by Alexandre Julliard March 11, 2015

March 11, 2015

Module: wine Branch: master Commit: 83aca6e7aa6ed8d32d987f6f81e917658484e398 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83aca6e7aa6ed8d32d987f6f8… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Mar 11 01:25:27 2015 +0100 ole32: Fix a possible handle leak (Coverity). --- dlls/ole32/rpc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index dd67546..ce39849 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -1850,6 +1850,7 @@ HRESULT RPC_GetLocalClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) bufferlen = 0; if (!ReadFile(hPipe,marshalbuffer,sizeof(marshalbuffer),&bufferlen,NULL)) { FIXME("Failed to read marshal id from classfactory of %s.\n",debugstr_guid(rclsid)); + CloseHandle(hPipe); Sleep(1000); continue; }

1 0

Vincent Povirk : ole32: Fail to open storage files that are locked incorrectly.
by Alexandre Julliard March 11, 2015

March 11, 2015

Module: wine Branch: master Commit: 0b7c05389b1c5068077775b50edf620bc3b69084 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b7c05389b1c5068077775b50… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Mar 10 15:21:29 2015 -0500 ole32: Fail to open storage files that are locked incorrectly. --- dlls/ole32/storage32.c | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 64b3e13..8963044 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -2876,6 +2876,11 @@ static HRESULT StorageImpl_LockRegionSync(StorageImpl *This, ULARGE_INTEGER offs HRESULT hr; int delay = 0; DWORD start_time = GetTickCount(); + DWORD last_sanity_check = start_time; + ULARGE_INTEGER sanity_offset, sanity_cb; + + sanity_offset.QuadPart = RANGELOCK_UNK1_FIRST; + sanity_cb.QuadPart = RANGELOCK_UNK1_LAST - RANGELOCK_UNK1_FIRST + 1; do { @@ -2883,11 +2888,36 @@ static HRESULT StorageImpl_LockRegionSync(StorageImpl *This, ULARGE_INTEGER offs if (hr == STG_E_ACCESSDENIED || hr == STG_E_LOCKVIOLATION) { - if (GetTickCount() - start_time >= 20000) + DWORD current_time = GetTickCount(); + if (current_time - start_time >= 20000) { /* timeout */ break; } + if (current_time - last_sanity_check >= 500) + { + /* Any storage implementation with the file open in a + * shared mode should not lock these bytes for writing. However, + * some programs (LibreOffice Writer) will keep ALL bytes locked + * when opening in exclusive mode. We can use a read lock to + * detect this case early, and not hang a full 20 seconds. + * + * This can collide with another attempt to open the file in + * exclusive mode, but it's unlikely, and someone would fail anyway. */ + hr = ILockBytes_LockRegion(This->lockBytes, sanity_offset, sanity_cb, 0); + if (hr == STG_E_ACCESSDENIED || hr == STG_E_LOCKVIOLATION) + break; + if (hr == STG_E_INVALIDFUNCTION) + { + /* ignore this, lockbytes might support dwLockType but not 0 */ + hr = STG_E_ACCESSDENIED; + } + if (SUCCEEDED(hr)) + { + ILockBytes_UnlockRegion(This->lockBytes, sanity_offset, sanity_cb, 0); + hr = STG_E_ACCESSDENIED; + } + } Sleep(delay); if (delay < 150) delay++; }

1 0

Bruno Jesus : ws2_32/tests: Test the behavior of reading data from an OOBINLINE'd socket.
by Alexandre Julliard March 11, 2015

March 11, 2015

Module: wine Branch: master Commit: 18b3f4cadddd4fb7bb6ce926ef8f46a75dd2e674 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18b3f4cadddd4fb7bb6ce926e… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Mar 10 22:47:23 2015 -0300 ws2_32/tests: Test the behavior of reading data from an OOBINLINE'd socket. --- dlls/ws2_32/tests/sock.c | 36 +++++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index f27d522..4abf7d5 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4450,7 +4450,9 @@ static void test_ioctlsocket(void) struct tcp_keepalive kalive; int ret, optval; static const LONG cmds[] = {FIONBIO, FIONREAD, SIOCATMARK}; - UINT i; + UINT i, bytes_rec; + char data; + WSABUF bufs; u_long arg = 0; sock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); @@ -4551,6 +4553,38 @@ static void test_ioctlsocket(void) ok(ret == 0, "WSAIoctl failed unexpectedly with error %d\n", WSAGetLastError()); ok(optval == 4, "FIONREAD should have returned 4 bytes, got %d instead\n", optval); + /* trying to read from an OOB inlined socket with MSG_OOB results in WSAEINVAL */ + set_blocking(dst, FALSE); + i = MSG_OOB; + SetLastError(0xdeadbeef); + ret = recv(dst, &data, 1, i); + ok(ret == SOCKET_ERROR, "expected -1, got %d\n", ret); + ret = GetLastError(); +todo_wine + ok(ret == WSAEWOULDBLOCK, "expected 10035, got %d\n", ret); + bufs.len = sizeof(char); + bufs.buf = &data; + ret = WSARecv(dst, &bufs, 1, &bytes_rec, &i, NULL, NULL); + ok(ret == SOCKET_ERROR, "expected -1, got %d\n", ret); + ret = GetLastError(); +todo_wine + ok(ret == WSAEWOULDBLOCK, "expected 10035, got %d\n", ret); + optval = 1; + ret = setsockopt(dst, SOL_SOCKET, SO_OOBINLINE, (void *)&optval, sizeof(optval)); + ok(ret != SOCKET_ERROR, "setsockopt failed unexpectedly\n"); + i = MSG_OOB; + SetLastError(0xdeadbeef); + ret = recv(dst, &data, 1, i); + ok(ret == SOCKET_ERROR, "expected -1, got %d\n", ret); + ret = GetLastError(); + ok(ret == WSAEINVAL, "expected 10022, got %d\n", ret); + bufs.len = sizeof(char); + bufs.buf = &data; + ret = WSARecv(dst, &bufs, 1, &bytes_rec, &i, NULL, NULL); + ok(ret == SOCKET_ERROR, "expected -1, got %d\n", ret); + ret = GetLastError(); + ok(ret == WSAEINVAL, "expected 10022, got %d\n", ret); + closesocket(dst); optval = 0xdeadbeef; ret = WSAIoctl(dst, FIONREAD, NULL, 0, &optval, sizeof(optval), &arg, NULL, NULL);

1 0

Christian Costa : d3dxof: Use assignment for GUID instead of memcpy with hardcoded size.
by Alexandre Julliard March 11, 2015

March 11, 2015

Module: wine Branch: master Commit: beff4323544be143363d6d971f6220d73376d597 URL: http://source.winehq.org/git/wine.git/?a=commit;h=beff4323544be143363d6d971… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Oct 22 21:00:52 2012 +0200 d3dxof: Use assignment for GUID instead of memcpy with hardcoded size. --- dlls/d3dxof/d3dxof.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index 88647cf..8888d8b 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -619,7 +619,7 @@ static HRESULT WINAPI IDirectXFileDataImpl_GetId(IDirectXFileData* iface, LPGUID if (!pGuid) return DXFILEERR_BADVALUE; - memcpy(pGuid, &This->pobj->class_id, 16); + *pGuid = This->pobj->class_id; return DXFILE_OK; } @@ -667,7 +667,7 @@ static HRESULT WINAPI IDirectXFileDataImpl_GetType(IDirectXFileData* iface, cons if (!pguid) return DXFILEERR_BADVALUE; - memcpy(&guid, &This->pobj->type, 16); + guid = This->pobj->type; *pguid = &guid; return DXFILE_OK; @@ -886,7 +886,7 @@ static HRESULT WINAPI IDirectXFileDataReferenceImpl_GetId(IDirectXFileDataRefere if (!pGuid) return DXFILEERR_BADVALUE; - memcpy(pGuid, &This->ptarget->class_id, 16); + *pGuid = This->ptarget->class_id; return DXFILE_OK; }

1 0

Vincent Povirk : ole32: Add a 20 second timeout when attempting to grab locks.
by Alexandre Julliard March 11, 2015

March 11, 2015

Module: wine Branch: master Commit: eead04803f045ba85d3a49c228e04c29ad484ff8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eead04803f045ba85d3a49c22… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Mar 10 14:47:33 2015 -0500 ole32: Add a 20 second timeout when attempting to grab locks. --- dlls/ole32/storage32.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index d3fb023..64b3e13 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -2875,6 +2875,7 @@ static HRESULT StorageImpl_LockRegionSync(StorageImpl *This, ULARGE_INTEGER offs { HRESULT hr; int delay = 0; + DWORD start_time = GetTickCount(); do { @@ -2882,6 +2883,11 @@ static HRESULT StorageImpl_LockRegionSync(StorageImpl *This, ULARGE_INTEGER offs if (hr == STG_E_ACCESSDENIED || hr == STG_E_LOCKVIOLATION) { + if (GetTickCount() - start_time >= 20000) + { + /* timeout */ + break; + } Sleep(delay); if (delay < 150) delay++; }

1 0

Vincent Povirk : ole32: Don' t use real synchronous locks for storage synchronization.
by Alexandre Julliard March 11, 2015

March 11, 2015

Module: wine Branch: master Commit: c8791edbdf58adcb5b83c82f30aec89edfb32438 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8791edbdf58adcb5b83c82f3… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Mar 10 14:37:09 2015 -0500 ole32: Don't use real synchronous locks for storage synchronization. --- dlls/ole32/filelockbytes.c | 18 ------------------ dlls/ole32/storage32.c | 5 ----- dlls/ole32/storage32.h | 2 -- 3 files changed, 25 deletions(-) diff --git a/dlls/ole32/filelockbytes.c b/dlls/ole32/filelockbytes.c index 7dc4843..594da1b 100644 --- a/dlls/ole32/filelockbytes.c +++ b/dlls/ole32/filelockbytes.c @@ -346,24 +346,6 @@ static HRESULT WINAPI FileLockBytesImpl_LockRegion(ILockBytes* iface, return get_lock_error(); } -HRESULT FileLockBytesImpl_LockRegionSync(ILockBytes* iface, - ULARGE_INTEGER libOffset, ULARGE_INTEGER cb) -{ - FileLockBytesImpl* This = impl_from_ILockBytes(iface); - OVERLAPPED ol; - - if (iface->lpVtbl != &FileLockBytesImpl_Vtbl) - return E_NOTIMPL; - - ol.hEvent = 0; - ol.u.s.Offset = libOffset.u.LowPart; - ol.u.s.OffsetHigh = libOffset.u.HighPart; - - if (LockFileEx(This->hfile, LOCKFILE_EXCLUSIVE_LOCK, 0, cb.u.LowPart, cb.u.HighPart, &ol)) - return S_OK; - return get_lock_error(); -} - static HRESULT WINAPI FileLockBytesImpl_UnlockRegion(ILockBytes* iface, ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) { diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 5e434e0..0a9b1ad 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -2876,11 +2876,6 @@ static HRESULT StorageImpl_LockRegionSync(StorageImpl *This, ULARGE_INTEGER offs HRESULT hr; int delay = 0; - /* if it's a FileLockBytesImpl use LockFileEx in blocking mode */ - if (SUCCEEDED(FileLockBytesImpl_LockRegionSync(This->lockBytes, offset, cb))) - return S_OK; - - /* otherwise we have to fake it based on an async lock */ do { hr = ILockBytes_LockRegion(This->lockBytes, offset, cb, dwLockType); diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index a49add9..e03bf31 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -159,8 +159,6 @@ struct DirEntry HRESULT FileLockBytesImpl_Construct(HANDLE hFile, DWORD openFlags, LPCWSTR pwcsName, ILockBytes **pLockBytes) DECLSPEC_HIDDEN; -HRESULT FileLockBytesImpl_LockRegionSync(ILockBytes* iface, ULARGE_INTEGER libOffset, ULARGE_INTEGER cb) DECLSPEC_HIDDEN; - /************************************************************************* * Ole Convert support */

1 0

Vincent Povirk : ole32: Test the entire range lock block for synchronization.
by Alexandre Julliard March 11, 2015

March 11, 2015

Module: wine Branch: master Commit: 06b735ae769c15f85d56edd2aa79c767900730dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=06b735ae769c15f85d56edd2a… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Mar 10 14:29:17 2015 -0500 ole32: Test the entire range lock block for synchronization. --- dlls/ole32/storage32.h | 7 +++++-- dlls/ole32/tests/storage32.c | 45 +++++++++++++++++++++++--------------------- 2 files changed, 29 insertions(+), 23 deletions(-) diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index 9831a27..a49add9 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -505,7 +505,10 @@ StgStreamImpl* StgStreamImpl_Construct( /* Range lock constants. * * The storage format reserves the region from 0x7fffff00-0x7fffffff for - * locking and synchronization. Unfortunately, the spec doesn't say which bytes + * locking and synchronization. Because it reserves the entire block containing + * that range, and the minimum block size is 512 bytes, 0x7ffffe00-0x7ffffeff + * also cannot be used for any other purpose. + * Unfortunately, the spec doesn't say which bytes * within that range are used, and for what. These are guesses based on testing. * In particular, ends of ranges may be wrong. @@ -524,7 +527,7 @@ StgStreamImpl* StgStreamImpl_Construct( 0xe2 through 0xff: Unknown. Causes read-only exclusive opens to fail. */ -#define RANGELOCK_UNK1_FIRST 0x7fffff00 +#define RANGELOCK_UNK1_FIRST 0x7ffffe00 #define RANGELOCK_UNK1_LAST 0x7fffff57 #define RANGELOCK_PRIORITY1_FIRST 0x7fffff58 #define RANGELOCK_PRIORITY1_LAST 0x7fffff6b diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index a373249..e83ae2a 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -3153,22 +3153,22 @@ struct lock_test BOOL todo; }; -static const int priority_locked_bytes[] = { 0x58, 0x81, 0x93, -1 }; -static const int rwex_locked_bytes[] = { 0x93, 0xa7, 0xbb, 0xcf, -1 }; -static const int rw_locked_bytes[] = { 0x93, 0xa7, -1 }; -static const int nosn_locked_bytes[] = { 0x6c, 0x93, 0xa7, 0xcf, -1 }; -static const int rwdw_locked_bytes[] = { 0x93, 0xa7, 0xcf, -1 }; -static const int wodw_locked_bytes[] = { 0xa7, 0xcf, -1 }; -static const int tr_locked_bytes[] = { 0x93, -1 }; +static const int priority_locked_bytes[] = { 0x158, 0x181, 0x193, -1 }; +static const int rwex_locked_bytes[] = { 0x193, 0x1a7, 0x1bb, 0x1cf, -1 }; +static const int rw_locked_bytes[] = { 0x193, 0x1a7, -1 }; +static const int nosn_locked_bytes[] = { 0x16c, 0x193, 0x1a7, 0x1cf, -1 }; +static const int rwdw_locked_bytes[] = { 0x193, 0x1a7, 0x1cf, -1 }; +static const int wodw_locked_bytes[] = { 0x1a7, 0x1cf, -1 }; +static const int tr_locked_bytes[] = { 0x193, -1 }; static const int no_locked_bytes[] = { -1 }; -static const int roex_locked_bytes[] = { 0x93, 0xbb, 0xcf, -1 }; - -static const int rwex_fail_ranges[] = { 0x93,0xe3, -1 }; -static const int rw_fail_ranges[] = { 0xbb,0xe3, -1 }; -static const int rwdw_fail_ranges[] = { 0xa7,0xe3, -1 }; -static const int dw_fail_ranges[] = { 0xa7,0xcf, -1 }; -static const int tr_fail_ranges[] = { 0xbb,0xcf, -1 }; -static const int pr_fail_ranges[] = { 0x80,0x81, 0xbb,0xcf, -1 }; +static const int roex_locked_bytes[] = { 0x193, 0x1bb, 0x1cf, -1 }; + +static const int rwex_fail_ranges[] = { 0x193,0x1e3, -1 }; +static const int rw_fail_ranges[] = { 0x1bb,0x1e3, -1 }; +static const int rwdw_fail_ranges[] = { 0x1a7,0x1e3, -1 }; +static const int dw_fail_ranges[] = { 0x1a7,0x1cf, -1 }; +static const int tr_fail_ranges[] = { 0x1bb,0x1cf, -1 }; +static const int pr_fail_ranges[] = { 0x180,0x181, 0x1bb,0x1cf, -1 }; static const int roex_fail_ranges[] = { 0x0,-1 }; static const struct lock_test lock_tests[] = { @@ -3313,7 +3313,7 @@ static void test_locking(void) ol.u.s.OffsetHigh = 0; ol.hEvent = NULL; - for (ol.u.s.Offset = 0x7fffff00; ol.u.s.Offset != 0x80000000; ol.u.s.Offset++) + for (ol.u.s.Offset = 0x7ffffe00; ol.u.s.Offset != 0x80000000; ol.u.s.Offset++) { if (LockFileEx(hfile, LOCKFILE_EXCLUSIVE_LOCK|LOCKFILE_FAIL_IMMEDIATELY, 0, 1, 0, &ol)) locked = FALSE; @@ -3325,7 +3325,7 @@ static void test_locking(void) UnlockFileEx(hfile, 0, 1, 0, &ol); - if ((ol.u.s.Offset&0xff) == *next_lock) + if ((ol.u.s.Offset&0x1ff) == *next_lock) { expect_locked = TRUE; next_lock++; @@ -3362,14 +3362,17 @@ static void test_locking(void) ol.u.s.OffsetHigh = 0; ol.hEvent = NULL; - for (ol.u.s.Offset = 0x7fffff00; ol.u.s.Offset != 0x80000000; ol.u.s.Offset++) + for (ol.u.s.Offset = 0x7ffffe00; ol.u.s.Offset != 0x80000000; ol.u.s.Offset++) { if (ol.u.s.Offset == 0x7fffff92 || (ol.u.s.Offset == 0x7fffff80 && current->stg_mode == (STGM_TRANSACTED|STGM_READWRITE)) || (ol.u.s.Offset == 0x7fffff80 && current->stg_mode == (STGM_TRANSACTED|STGM_READ))) continue; /* This makes opens hang */ - LockFileEx(hfile, LOCKFILE_EXCLUSIVE_LOCK, 0, 1, 0, &ol); + if (ol.u.s.Offset < 0x7fffff00) + LockFileEx(hfile, 0, 0, 1, 0, &ol); + else + LockFileEx(hfile, LOCKFILE_EXCLUSIVE_LOCK, 0, 1, 0, &ol); hr = StgOpenStorage(filename, NULL, current->stg_mode, NULL, 0, &stg); ok(hr == S_OK || hr == STG_E_LOCKVIOLATION || hr == STG_E_SHAREVIOLATION, "failed with unexpected hr %x\n", hr); @@ -3379,11 +3382,11 @@ static void test_locking(void) failed = FAILED(hr); - if (!expect_failed && (ol.u.s.Offset&0xff) == next_range[0]) + if (!expect_failed && (ol.u.s.Offset&0x1ff) == next_range[0]) { expect_failed = TRUE; } - else if (expect_failed && (ol.u.s.Offset&0xff) == next_range[1]) + else if (expect_failed && (ol.u.s.Offset&0x1ff) == next_range[1]) { expect_failed = FALSE; next_range += 2;

1 0

Vincent Povirk : ole32: Accept only STG_E_INVALIDFUNCTION or success from LockRegionSync.
by Alexandre Julliard March 11, 2015

March 11, 2015

Module: wine Branch: master Commit: 1645f7b9e30e01bc92a8bfd1febe76d4856e046e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1645f7b9e30e01bc92a8bfd1f… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Mar 10 14:41:10 2015 -0500 ole32: Accept only STG_E_INVALIDFUNCTION or success from LockRegionSync. --- dlls/ole32/storage32.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 0a9b1ad..d3fb023 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -2959,7 +2959,8 @@ static HRESULT StorageImpl_GrabLocks(StorageImpl *This, DWORD openFlags) hr = StorageImpl_LockRegionSync(This, offset, cb, LOCK_ONLYONCE); /* If the ILockBytes doesn't support locking that's ok. */ - if (FAILED(hr)) return S_OK; + if (hr == STG_E_INVALIDFUNCTION) return S_OK; + else if (FAILED(hr)) return hr; hr = S_OK;

1 0