[PATCH v2] secur32: Use offsetof() instead of pointer substraction
Michael Stefaniuc
mstefani at winehq.org
Tue Feb 19 13:44:31 CST 2019
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
---
v2: Drop the const as that is unnecessary
dlls/secur32/secur32.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/dlls/secur32/secur32.c b/dlls/secur32/secur32.c
index b3ab80a850..8288286c61 100644
--- a/dlls/secur32/secur32.c
+++ b/dlls/secur32/secur32.c
@@ -247,8 +247,8 @@ static void _makeFnTableA(PSecurityFunctionTableA fnTableA,
* implemented (yikes)
*/
size_t tableSize = inFnTableA->dwVersion == 1 ?
- (const BYTE *)&inFnTableA->SetContextAttributesA -
- (const BYTE *)inFnTableA : sizeof(SecurityFunctionTableA);
+ offsetof(SecurityFunctionTableA, SetContextAttributesA) :
+ sizeof(SecurityFunctionTableA);
memcpy(fnTableA, inFnTableA, tableSize);
/* override this, since we can do it internally anyway */
@@ -318,8 +318,8 @@ static void _makeFnTableW(PSecurityFunctionTableW fnTableW,
* implemented (yikes)
*/
size_t tableSize = inFnTableW->dwVersion == 1 ?
- (const BYTE *)&inFnTableW->SetContextAttributesW -
- (const BYTE *)inFnTableW : sizeof(SecurityFunctionTableW);
+ offsetof(SecurityFunctionTableW, SetContextAttributesW) :
+ sizeof(SecurityFunctionTableW);
memcpy(fnTableW, inFnTableW, tableSize);
/* override this, since we can do it internally anyway */
--
2.20.1
More information about the wine-devel
mailing list