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
9b1fc0fd
Commit
9b1fc0fd
authored
Aug 31, 2011
by
Octavian Voicu
Committed by
Alexandre Julliard
Aug 31, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ole32: Fix a few incorrect pointer/integer casts on 64-bit.
parent
f8d0afe4
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
pointermoniker.c
dlls/ole32/pointermoniker.c
+1
-1
moniker.c
dlls/ole32/tests/moniker.c
+2
-2
usrmarshal.c
dlls/ole32/usrmarshal.c
+2
-2
No files found.
dlls/ole32/pointermoniker.c
View file @
9b1fc0fd
...
...
@@ -370,7 +370,7 @@ static HRESULT WINAPI PointerMonikerImpl_Hash(IMoniker* iface,DWORD* pdwHash)
if
(
pdwHash
==
NULL
)
return
E_POINTER
;
*
pdwHash
=
(
DWORD
)
This
->
pObject
;
*
pdwHash
=
PtrToUlong
(
This
->
pObject
)
;
return
S_OK
;
}
...
...
dlls/ole32/tests/moniker.c
View file @
9b1fc0fd
...
...
@@ -1780,9 +1780,9 @@ static void test_pointer_moniker(void)
/* Hashing */
hr
=
IMoniker_Hash
(
moniker
,
&
hash
);
ok_ole_success
(
hr
,
IMoniker_Hash
);
ok
(
hash
==
(
DWORD
)
&
Test_ClassFactory
,
ok
(
hash
==
PtrToUlong
(
&
Test_ClassFactory
)
,
"Hash value should have been 0x%08x, instead of 0x%08x
\n
"
,
(
DWORD
)
&
Test_ClassFactory
,
hash
);
PtrToUlong
(
&
Test_ClassFactory
)
,
hash
);
/* IsSystemMoniker test */
hr
=
IMoniker_IsSystemMoniker
(
moniker
,
&
moniker_type
);
...
...
dlls/ole32/usrmarshal.c
View file @
9b1fc0fd
...
...
@@ -429,7 +429,7 @@ unsigned char * __RPC_USER HGLOBAL_UserMarshal(ULONG *pFlags, unsigned char *pBu
{
*
(
ULONG
*
)
pBuffer
=
WDT_REMOTE_CALL
;
pBuffer
+=
sizeof
(
ULONG
);
*
(
ULONG
*
)
pBuffer
=
(
ULONG
)
*
phGlobal
;
*
(
ULONG
*
)
pBuffer
=
HandleToULong
(
*
phGlobal
)
;
pBuffer
+=
sizeof
(
ULONG
);
if
(
*
phGlobal
)
{
...
...
@@ -437,7 +437,7 @@ unsigned char * __RPC_USER HGLOBAL_UserMarshal(ULONG *pFlags, unsigned char *pBu
SIZE_T
size
=
GlobalSize
(
*
phGlobal
);
*
(
ULONG
*
)
pBuffer
=
(
ULONG
)
size
;
pBuffer
+=
sizeof
(
ULONG
);
*
(
ULONG
*
)
pBuffer
=
(
ULONG
)
*
phGlobal
;
*
(
ULONG
*
)
pBuffer
=
HandleToULong
(
*
phGlobal
)
;
pBuffer
+=
sizeof
(
ULONG
);
*
(
ULONG
*
)
pBuffer
=
(
ULONG
)
size
;
pBuffer
+=
sizeof
(
ULONG
);
...
...
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