Alexandre Julliard : include: Fix packing of the setupapi structures.
Alexandre Julliard
julliard at winehq.org
Fri Jan 9 09:52:20 CST 2009
Module: wine
Branch: master
Commit: a2cf243776976d47996ee7259e578ba59fe0eaf8
URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2cf243776976d47996ee7259e578ba59fe0eaf8
Author: Alexandre Julliard <julliard at winehq.org>
Date: Fri Jan 9 14:03:57 2009 +0100
include: Fix packing of the setupapi structures.
---
dlls/setupapi/tests/devinst.c | 6 ------
include/setupapi.h | 10 +++++-----
2 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c
index 78b2ca3..9a5b1fc 100644
--- a/dlls/setupapi/tests/devinst.c
+++ b/dlls/setupapi/tests/devinst.c
@@ -835,12 +835,6 @@ static void testGetDeviceInterfaceDetail(void)
SetLastError(0xdeadbeef);
ret = pSetupDiGetDeviceInterfaceDetailA(set, &interfaceData, detail,
size, &size, NULL);
- ok(!ret && GetLastError() == ERROR_INVALID_USER_BUFFER,
- "Expected ERROR_INVALID_USER_BUFFER, got %08x\n", GetLastError());
- /* Windows 2000 and up check for the exact size */
- detail->cbSize = FIELD_OFFSET(SP_DEVICE_INTERFACE_DETAIL_DATA_A, DevicePath[1]);
- ret = pSetupDiGetDeviceInterfaceDetailA(set, &interfaceData, detail,
- size, &size, NULL);
ok(ret, "SetupDiGetDeviceInterfaceDetailA failed: %d\n",
GetLastError());
ok(!lstrcmpiA(path, detail->DevicePath) ||
diff --git a/include/setupapi.h b/include/setupapi.h
index 820c5c4..b36243a 100644
--- a/include/setupapi.h
+++ b/include/setupapi.h
@@ -22,8 +22,10 @@
#include <commctrl.h>
-#ifdef __cplusplus
-extern "C" {
+#ifdef _WIN64
+#include <pshpack8.h>
+#else
+#include <pshpack1.h>
#endif
/* setupapi doesn't use the normal convention, it adds an underscore before A/W */
@@ -1848,8 +1850,6 @@ BOOL WINAPI UnmapAndCloseFile(HANDLE, HANDLE, PVOID);
#undef DECL_WINELIB_SETUPAPI_TYPE_AW
-#ifdef __cplusplus
-}
-#endif
+#include <poppack.h>
#endif /* _INC_SETUPAPI */
More information about the wine-cvs
mailing list