Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
0b7c0538
Commit
0b7c0538
authored
Mar 10, 2015
by
Vincent Povirk
Committed by
Alexandre Julliard
Mar 11, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ole32: Fail to open storage files that are locked incorrectly.
parent
eead0480
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
31 additions
and
1 deletion
+31
-1
storage32.c
dlls/ole32/storage32.c
+31
-1
No files found.
dlls/ole32/storage32.c
View file @
0b7c0538
...
@@ -2876,6 +2876,11 @@ static HRESULT StorageImpl_LockRegionSync(StorageImpl *This, ULARGE_INTEGER offs
...
@@ -2876,6 +2876,11 @@ static HRESULT StorageImpl_LockRegionSync(StorageImpl *This, ULARGE_INTEGER offs
HRESULT
hr
;
HRESULT
hr
;
int
delay
=
0
;
int
delay
=
0
;
DWORD
start_time
=
GetTickCount
();
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
do
{
{
...
@@ -2883,11 +2888,36 @@ static HRESULT StorageImpl_LockRegionSync(StorageImpl *This, ULARGE_INTEGER offs
...
@@ -2883,11 +2888,36 @@ static HRESULT StorageImpl_LockRegionSync(StorageImpl *This, ULARGE_INTEGER offs
if
(
hr
==
STG_E_ACCESSDENIED
||
hr
==
STG_E_LOCKVIOLATION
)
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 */
/* timeout */
break
;
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
);
Sleep
(
delay
);
if
(
delay
<
150
)
delay
++
;
if
(
delay
<
150
)
delay
++
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment