Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
bea2c6f2
Commit
bea2c6f2
authored
Jun 18, 2014
by
Francois Gouget
Committed by
Alexandre Julliard
Jun 18, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ole32: Treat STG_E_LOCKVIOLATION the same way as STG_E_ACCESSDENIED as both…
ole32: Treat STG_E_LOCKVIOLATION the same way as STG_E_ACCESSDENIED as both indicate locking contention.
parent
f4c7e6d6
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
storage32.c
dlls/ole32/storage32.c
+4
-4
No files found.
dlls/ole32/storage32.c
View file @
bea2c6f2
...
...
@@ -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
;
}
...
...
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