diff options
| author | Luke Dunstan <infidel@users.sourceforge.net> | 2004-03-28 15:22:10 +0400 |
|---|---|---|
| committer | Luke Dunstan <infidel@users.sourceforge.net> | 2004-03-28 15:22:10 +0400 |
| commit | f241377ee17161d81cb128515a7a63ed43cae478 (patch) | |
| tree | feacafa2887053746c1f452f04b87175c64256dd /winsup | |
| parent | f19da5f77d0a7212f0767d1e2a07c54ccdb8acd8 (diff) | |
2004-03-27 Hosaka Yuji <hos@tamanegi.org>
* include/dbt.h (DBT_DEVTYP_DEVICEINTERFACE, DBT_DEVTYP_HANDLE):
Add define.
(DEV_BROADCAST_DEVICEINTERFACE, DEV_BROADCAST_HANDLE): Add struct.
* include/winuser.h (UnregisterDeviceNotification): Add prototype.
* lib/user32.def (UnregisterDeviceNotification): Add export stub.
Diffstat (limited to 'winsup')
| -rw-r--r-- | winsup/w32api/ChangeLog | 8 | ||||
| -rw-r--r-- | winsup/w32api/include/dbt.h | 40 | ||||
| -rw-r--r-- | winsup/w32api/include/winuser.h | 3 | ||||
| -rw-r--r-- | winsup/w32api/lib/user32.def | 1 |
4 files changed, 52 insertions, 0 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index f51e83f67..5f0909b0c 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,11 @@ +2004-03-27 Hosaka Yuji <hos@tamanegi.org> + + * include/dbt.h (DBT_DEVTYP_DEVICEINTERFACE, DBT_DEVTYP_HANDLE): + Add define. + (DEV_BROADCAST_DEVICEINTERFACE, DEV_BROADCAST_HANDLE): Add struct. + * include/winuser.h (UnregisterDeviceNotification): Add prototype. + * lib/user32.def (UnregisterDeviceNotification): Add export stub. + 2004-03-27 Filip Navara <xnavara@volny.cz> * include/directx: New subdir. diff --git a/winsup/w32api/include/dbt.h b/winsup/w32api/include/dbt.h index e804756a2..69c15afb9 100644 --- a/winsup/w32api/include/dbt.h +++ b/winsup/w32api/include/dbt.h @@ -20,6 +20,10 @@ extern "C" { #define DBT_DEVTYP_VOLUME 2 #define DBT_DEVTYP_PORT 3 #define DBT_DEVTYP_NET 4 +#if (_WIN32_WINDOWS >= 0x0410 || _WIN32_WINNT >= 0x0500) +#define DBT_DEVTYP_DEVICEINTERFACE 5 +#define DBT_DEVTYP_HANDLE 6 +#endif /* (_WIN32_WINDOWS >= 0x0410 || _WIN32_WINNT >= 0x0500) */ #define DBT_APPYBEGIN 0 #define DBT_APPYEND 1 #define DBT_DEVNODES_CHANGED 7 @@ -108,6 +112,42 @@ typedef DEV_BROADCAST_PORT_W DEV_BROADCAST_PORT, *PDEV_BROADCAST_PORT; typedef DEV_BROADCAST_PORT_A DEV_BROADCAST_PORT, *PDEV_BROADCAST_PORT; #endif +#if (_WIN32_WINDOWS >= 0x0410 || _WIN32_WINNT >= 0x0500) +typedef struct _DEV_BROADCAST_DEVICEINTERFACE_A { + DWORD dbcc_size; + DWORD dbcc_devicetype; + DWORD dbcc_reserved; + GUID dbcc_classguid; + char dbcc_name[1]; +} DEV_BROADCAST_DEVICEINTERFACE_A, *PDEV_BROADCAST_DEVICEINTERFACE_A; +typedef struct _DEV_BROADCAST_DEVICEINTERFACE_W { + DWORD dbcc_size; + DWORD dbcc_devicetype; + DWORD dbcc_reserved; + GUID dbcc_classguid; + wchar_t dbcc_name[1]; +} DEV_BROADCAST_DEVICEINTERFACE_W, *PDEV_BROADCAST_DEVICEINTERFACE_W; + +#ifdef UNICODE +typedef DEV_BROADCAST_DEVICEINTERFACE_W DEV_BROADCAST_DEVICEINTERFACE; +typedef PDEV_BROADCAST_DEVICEINTERFACE_W PDEV_BROADCAST_DEVICEINTERFACE; +#else +typedef DEV_BROADCAST_DEVICEINTERFACE_A DEV_BROADCAST_DEVICEINTERFACE; +typedef PDEV_BROADCAST_DEVICEINTERFACE_A PDEV_BROADCAST_DEVICEINTERFACE; +#endif + +typedef struct _DEV_BROADCAST_HANDLE { + DWORD dbch_size; + DWORD dbch_devicetype; + DWORD dbch_reserved; + HANDLE dbch_handle; + DWORD dbch_hdevnotify; + GUID dbch_eventguid; + LONG dbch_nameoffset; + BYTE dbch_data[1]; +} DEV_BROADCAST_HANDLE, *PDEV_BROADCAST_HANDLE; +#endif /* (_WIN32_WINDOWS >= 0x0410 || _WIN32_WINNT >= 0x0500) */ + #ifdef __cplusplus } #endif diff --git a/winsup/w32api/include/winuser.h b/winsup/w32api/include/winuser.h index 879860f47..1181c623c 100644 --- a/winsup/w32api/include/winuser.h +++ b/winsup/w32api/include/winuser.h @@ -3754,6 +3754,9 @@ BOOL WINAPI UnionRect(LPRECT,LPCRECT,LPCRECT); BOOL WINAPI UnloadKeyboardLayout(HKL); BOOL WINAPI UnregisterClassA(LPCSTR,HINSTANCE); BOOL WINAPI UnregisterClassW(LPCWSTR,HINSTANCE); +#if (_WIN32_WINDOWS >= 0x0410 || _WIN32_WINNT >= 0x0500) +BOOL WINAPI UnregisterDeviceNotification(HANDLE); +#endif BOOL WINAPI UnregisterHotKey(HWND,int); BOOL WINAPI UpdateWindow(HWND); #if (_WIN32_WINNT >= 0x0500) diff --git a/winsup/w32api/lib/user32.def b/winsup/w32api/lib/user32.def index 837995dc0..2c6f5702d 100644 --- a/winsup/w32api/lib/user32.def +++ b/winsup/w32api/lib/user32.def @@ -609,6 +609,7 @@ UnloadKeyboardLayout@4 UnpackDDElParam@16 UnregisterClassA@8 UnregisterClassW@8 +UnregisterDeviceNotification@4 UnregisterHotKey@8 UpdateLayeredWindow@36 UpdateWindow@4 |