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
5e4f15db
Commit
5e4f15db
authored
Oct 01, 2014
by
Sebastian Lackner
Committed by
Alexandre Julliard
Oct 01, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
shlwapi: Fixed swapped argument order in SHLWAPI_DupSharedHandle command.
parent
cad3e3e5
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
6 deletions
+3
-6
ordinal.c
dlls/shlwapi/ordinal.c
+3
-3
ordinal.c
dlls/shlwapi/tests/ordinal.c
+0
-3
No files found.
dlls/shlwapi/ordinal.c
View file @
5e4f15db
...
@@ -106,7 +106,7 @@ static HANDLE SHLWAPI_DupSharedHandle(HANDLE hShared, DWORD dwDstProcId,
...
@@ -106,7 +106,7 @@ static HANDLE SHLWAPI_DupSharedHandle(HANDLE hShared, DWORD dwDstProcId,
if
(
hSrc
)
if
(
hSrc
)
{
{
/* Make handle available to dest process */
/* Make handle available to dest process */
if
(
!
DuplicateHandle
(
h
Dst
,
hShared
,
hSrc
,
&
hRet
,
if
(
!
DuplicateHandle
(
h
Src
,
hShared
,
hDst
,
&
hRet
,
dwAccess
,
0
,
dwOptions
|
DUPLICATE_SAME_ACCESS
))
dwAccess
,
0
,
dwOptions
|
DUPLICATE_SAME_ACCESS
))
hRet
=
NULL
;
hRet
=
NULL
;
...
@@ -201,7 +201,7 @@ PVOID WINAPI SHLockShared(HANDLE hShared, DWORD dwProcId)
...
@@ -201,7 +201,7 @@ PVOID WINAPI SHLockShared(HANDLE hShared, DWORD dwProcId)
TRACE
(
"(%p %d)
\n
"
,
hShared
,
dwProcId
);
TRACE
(
"(%p %d)
\n
"
,
hShared
,
dwProcId
);
/* Get handle to shared memory for current process */
/* Get handle to shared memory for current process */
hDup
=
SHLWAPI_DupSharedHandle
(
hShared
,
dwProcId
,
GetCurrentProcessId
()
,
hDup
=
SHLWAPI_DupSharedHandle
(
hShared
,
GetCurrentProcessId
(),
dwProcId
,
FILE_MAP_ALL_ACCESS
,
0
);
FILE_MAP_ALL_ACCESS
,
0
);
/* Get View */
/* Get View */
pMapped
=
MapViewOfFile
(
hDup
,
FILE_MAP_READ
|
FILE_MAP_WRITE
,
0
,
0
,
0
);
pMapped
=
MapViewOfFile
(
hDup
,
FILE_MAP_READ
|
FILE_MAP_WRITE
,
0
,
0
,
0
);
...
@@ -252,7 +252,7 @@ BOOL WINAPI SHFreeShared(HANDLE hShared, DWORD dwProcId)
...
@@ -252,7 +252,7 @@ BOOL WINAPI SHFreeShared(HANDLE hShared, DWORD dwProcId)
TRACE
(
"(%p %d)
\n
"
,
hShared
,
dwProcId
);
TRACE
(
"(%p %d)
\n
"
,
hShared
,
dwProcId
);
/* Get a copy of the handle for our process, closing the source handle */
/* Get a copy of the handle for our process, closing the source handle */
hClose
=
SHLWAPI_DupSharedHandle
(
hShared
,
dwProcId
,
GetCurrentProcessId
()
,
hClose
=
SHLWAPI_DupSharedHandle
(
hShared
,
GetCurrentProcessId
(),
dwProcId
,
FILE_MAP_ALL_ACCESS
,
DUPLICATE_CLOSE_SOURCE
);
FILE_MAP_ALL_ACCESS
,
DUPLICATE_CLOSE_SOURCE
);
/* Close local copy */
/* Close local copy */
return
CloseHandle
(
hClose
);
return
CloseHandle
(
hClose
);
...
...
dlls/shlwapi/tests/ordinal.c
View file @
5e4f15db
...
@@ -505,16 +505,13 @@ static void test_alloc_shared(int argc, char **argv)
...
@@ -505,16 +505,13 @@ static void test_alloc_shared(int argc, char **argv)
if
(
hmem2
)
if
(
hmem2
)
{
{
p
=
pSHLockShared
(
hmem2
,
procid
);
p
=
pSHLockShared
(
hmem2
,
procid
);
todo_wine
ok
(
p
!=
NULL
,
"SHLockShared failed: %u
\n
"
,
GetLastError
());
ok
(
p
!=
NULL
,
"SHLockShared failed: %u
\n
"
,
GetLastError
());
if
(
p
!=
NULL
)
if
(
p
!=
NULL
)
ok
(
p
->
value
==
0xDEADBEEF
,
"Wrong value in shared memory: %d instead of %d
\n
"
,
p
->
value
,
0xDEADBEEF
);
ok
(
p
->
value
==
0xDEADBEEF
,
"Wrong value in shared memory: %d instead of %d
\n
"
,
p
->
value
,
0xDEADBEEF
);
ret
=
pSHUnlockShared
(
p
);
ret
=
pSHUnlockShared
(
p
);
todo_wine
ok
(
ret
,
"SHUnlockShared failed: %u
\n
"
,
GetLastError
());
ok
(
ret
,
"SHUnlockShared failed: %u
\n
"
,
GetLastError
());
ret
=
pSHFreeShared
(
hmem2
,
procid
);
ret
=
pSHFreeShared
(
hmem2
,
procid
);
todo_wine
ok
(
ret
,
"SHFreeShared failed: %u
\n
"
,
GetLastError
());
ok
(
ret
,
"SHFreeShared failed: %u
\n
"
,
GetLastError
());
}
}
}
}
...
...
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