reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2024-11-29 06:30:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

include: Fix packing of the setupapi structures.

Browse Source
This commit is contained in:
Alexandre Julliard 2009-01-09 14:03:57 +01:00
parent 3b6cab3f77
commit a2cf243776
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlls/setupapi/tests/devinst.c
View File

@ -833,12 +833,6 @@ static void testGetDeviceInterfaceDetail(void)
"Expected ERROR_INVALID_USER_BUFFER, got %08x\n", GetLastError());
detail->cbSize = sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_A);
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",

10
include/setupapi.h
View File

@ -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 */