diff options
| author | Danny Smith <dannysmith@users.sourceforge.net> | 2002-12-26 08:21:43 +0300 |
|---|---|---|
| committer | Danny Smith <dannysmith@users.sourceforge.net> | 2002-12-26 08:21:43 +0300 |
| commit | 6e29a31e99a8e1fd42e392cf967fe8d57908b7e9 (patch) | |
| tree | fbf4e7a59ec77537510d3729177f236910da0915 | |
| parent | 177a7cda75b2dfb3704e82ac3bcaa1067c6da31e (diff) | |
* include/dbt.h (DEV_BROADCAST_PORT): Add UNICODE version.
Thanks to: Dimitri Papadopoulos <dimitri_at@sourceforge.users.net>
| -rw-r--r-- | winsup/w32api/ChangeLog | 5 | ||||
| -rw-r--r-- | winsup/w32api/include/dbt.h | 16 |
2 files changed, 19 insertions, 2 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index c5d53539b..9b55ef002 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,5 +1,10 @@ 2002-12-26 Danny Smith <dannysmith@users.sourceforge.net> + * include/dbt.h (DEV_BROADCAST_PORT): Add UNICODE version. + Thanks to: Dimitri Papadopoulos <dimitri_at@sourceforge.users.net> + +2002-12-26 Danny Smith <dannysmith@users.sourceforge.net> + * include/unknwn.h: Include windows.h and ole2.h before header guard to avoid circular inclusion of COM headers. diff --git a/winsup/w32api/include/dbt.h b/winsup/w32api/include/dbt.h index f854b84e6..e79e431c1 100644 --- a/winsup/w32api/include/dbt.h +++ b/winsup/w32api/include/dbt.h @@ -66,12 +66,18 @@ typedef struct _DEV_BROADCAST_OEM { DWORD dbco_identifier; DWORD dbco_suppfunc; } DEV_BROADCAST_OEM,*PDEV_BROADCAST_OEM; -typedef struct _DEV_BROADCAST_PORT { +typedef struct _DEV_BROADCAST_PORT_A { DWORD dbcp_size; DWORD dbcp_devicetype; DWORD dbcp_reserved; char dbcp_name[1]; -} DEV_BROADCAST_PORT,*PDEV_BROADCAST_PORT; +} DEV_BROADCAST_PORT_A, *PDEV_BROADCAST_PORT_A; +typedef struct _DEV_BROADCAST_PORT_W { + DWORD dbcp_size; + DWORD dbcp_devicetype; + DWORD dbcp_reserved; + wchar_t dbcp_name[1]; +} DEV_BROADCAST_PORT_W, *PDEV_BROADCAST_PORT_W; typedef struct _DEV_BROADCAST_USERDEFINED { struct _DEV_BROADCAST_HDR dbud_dbh; char dbud_szName[1]; @@ -84,6 +90,12 @@ typedef struct _DEV_BROADCAST_VOLUME { WORD dbcv_flags; } DEV_BROADCAST_VOLUME,*PDEV_BROADCAST_VOLUME; +#ifdef UNICODE +typedef DEV_BROADCAST_PORT_W DEV_BROADCAST_PORT, *PDEV_BROADCAST_PORT; +#else +typedef DEV_BROADCAST_PORT_A DEV_BROADCAST_PORT, *PDEV_BROADCAST_PORT; +#endif + #ifdef __cplusplus } #endif |