| newdev.h (6.0.5054.0-Windows 6.0) | | newdev.h (6.0.5054.0-Windows 7.0) |
|---|
| | |
| skipping to change at line 72 | | skipping to change at line 72 |
|---|
| #if (WINVER >= _WIN32_WINNT_LONGHORN) | | #if (WINVER >= _WIN32_WINNT_LONGHORN) |
| // | | // |
| // Flags for DiInstallDevice | | // Flags for DiInstallDevice |
| // | | // |
| #define DIIDFLAG_SHOWSEARCHUI 0x00000001 // Show search UI if no
drivers can be found. | | #define DIIDFLAG_SHOWSEARCHUI 0x00000001 // Show search UI if no
drivers can be found. |
| #define DIIDFLAG_NOFINISHINSTALLUI 0x00000002 // Do NOT show the finis
h install UI. | | #define DIIDFLAG_NOFINISHINSTALLUI 0x00000002 // Do NOT show the finis
h install UI. |
| #define DIIDFLAG_INSTALLNULLDRIVER 0x00000004 // Install the NULL driv
er on this device. | | #define DIIDFLAG_INSTALLNULLDRIVER 0x00000004 // Install the NULL driv
er on this device. |
| #define DIIDFLAG_BITS 0x00000007 | | #define DIIDFLAG_BITS 0x00000007 |
| | |
| BOOL | | BOOL |
|
| | WINAPI |
| DiInstallDevice( | | DiInstallDevice( |
| __in_opt HWND hwndParent, | | __in_opt HWND hwndParent, |
| __in HDEVINFO DeviceInfoSet, | | __in HDEVINFO DeviceInfoSet, |
| __in PSP_DEVINFO_DATA DeviceInfoData, | | __in PSP_DEVINFO_DATA DeviceInfoData, |
| __in_opt PSP_DRVINFO_DATA DriverInfoData, | | __in_opt PSP_DRVINFO_DATA DriverInfoData, |
| __in DWORD Flags, | | __in DWORD Flags, |
|
| __out_opt PBOOL NeedReboot OPTIONAL | | __out_opt PBOOL NeedReboot |
| ); | | ); |
| #endif // (WINVER >= _WIN32_WINNT_LONGHORN) | | #endif // (WINVER >= _WIN32_WINNT_LONGHORN) |
| | |
| #if (WINVER >= _WIN32_WINNT_LONGHORN) | | #if (WINVER >= _WIN32_WINNT_LONGHORN) |
| | |
| // | | // |
| // Flags for DiInstallDriver | | // Flags for DiInstallDriver |
| // | | // |
| #define DIIRFLAG_INF_ALREADY_COPIED 0x00000001 // Don't copy inf, it has been
published | | #define DIIRFLAG_INF_ALREADY_COPIED 0x00000001 // Don't copy inf, it has been
published |
| #define DIIRFLAG_FORCE_INF 0x00000002 // use the inf as if users pick
ed it. | | #define DIIRFLAG_FORCE_INF 0x00000002 // use the inf as if users pick
ed it. |
| | |
| skipping to change at line 100 | | skipping to change at line 101 |
|---|
| #define DIIRFLAG_HOTPATCH 0x00000008 // Perform a hotpatch service p
ack install | | #define DIIRFLAG_HOTPATCH 0x00000008 // Perform a hotpatch service p
ack install |
| #define DIIRFLAG_NOBACKUP 0x00000010 // install w/o backup and no ro
llback | | #define DIIRFLAG_NOBACKUP 0x00000010 // install w/o backup and no ro
llback |
| #define DIIRFLAG_BITS ( DIIRFLAG_FORCE_INF | DIIRFLAG_HOTPATCH) | | #define DIIRFLAG_BITS ( DIIRFLAG_FORCE_INF | DIIRFLAG_HOTPATCH) |
| #define DIIRFLAG_SYSTEM_BITS ( DIIRFLAG_INF_ALREADY_COPIED |\ | | #define DIIRFLAG_SYSTEM_BITS ( DIIRFLAG_INF_ALREADY_COPIED |\ |
| DIIRFLAG_FORCE_INF |\ | | DIIRFLAG_FORCE_INF |\ |
| DIIRFLAG_HW_USING_THE_INF |\ | | DIIRFLAG_HW_USING_THE_INF |\ |
| DIIRFLAG_HOTPATCH |\ | | DIIRFLAG_HOTPATCH |\ |
| DIIRFLAG_NOBACKUP ) | | DIIRFLAG_NOBACKUP ) |
| | |
| BOOL | | BOOL |
|
| | WINAPI |
| DiInstallDriverW( | | DiInstallDriverW( |
| __in_opt HWND hwndParent, | | __in_opt HWND hwndParent, |
| __in LPCWSTR InfPath, | | __in LPCWSTR InfPath, |
| __in DWORD Flags, | | __in DWORD Flags, |
| __out_opt PBOOL NeedReboot | | __out_opt PBOOL NeedReboot |
| ); | | ); |
| | |
| BOOL | | BOOL |
|
| | WINAPI |
| DiInstallDriverA( | | DiInstallDriverA( |
|
| __in HWND hwndParent, | | __in_opt HWND hwndParent, |
| __in LPCSTR InfPath, | | __in LPCSTR InfPath, |
| __in DWORD Flags, | | __in DWORD Flags, |
| __out_opt PBOOL NeedReboot | | __out_opt PBOOL NeedReboot |
| ); | | ); |
| | |
| #ifdef UNICODE | | #ifdef UNICODE |
| #define DiInstallDriver DiInstallDriverW | | #define DiInstallDriver DiInstallDriverW |
| #else | | #else |
| #define DiInstallDriver DiInstallDriverA | | #define DiInstallDriver DiInstallDriverA |
| #endif | | #endif |
| #endif // (WINVER >= _WIN32_WINNT_LONGHORN) | | #endif // (WINVER >= _WIN32_WINNT_LONGHORN) |
| | |
|
| | #if (WINVER >= _WIN32_WINNT_WIN7) |
| | BOOL |
| | WINAPI |
| | DiUninstallDevice( |
| | __in HWND hwndParent, |
| | __in HDEVINFO DeviceInfoSet, |
| | __in PSP_DEVINFO_DATA DeviceInfoData, |
| | __in DWORD Flags, |
| | __out_opt PBOOL NeedReboot |
| | ); |
| | #endif // (WINVER >= _WIN32_WINNT_WIN7) |
| | |
| #if (WINVER >= _WIN32_WINNT_LONGHORN) | | #if (WINVER >= _WIN32_WINNT_LONGHORN) |
| BOOL | | BOOL |
|
| | WINAPI |
| DiShowUpdateDevice( | | DiShowUpdateDevice( |
| __in_opt HWND hwndParent, | | __in_opt HWND hwndParent, |
| __in HDEVINFO DeviceInfoSet, | | __in HDEVINFO DeviceInfoSet, |
| __in PSP_DEVINFO_DATA DeviceInfoData, | | __in PSP_DEVINFO_DATA DeviceInfoData, |
| __in DWORD Flags, | | __in DWORD Flags, |
| __out_opt PBOOL NeedReboot | | __out_opt PBOOL NeedReboot |
| ); | | ); |
| | |
| // | | // |
| // DiRollbackDriver Flag values | | // DiRollbackDriver Flag values |
| // | | // |
| #define ROLLBACK_FLAG_NO_UI 0x00000001 // don't show any UI (this c
ould cause failures if UI must be displayed) | | #define ROLLBACK_FLAG_NO_UI 0x00000001 // don't show any UI (this c
ould cause failures if UI must be displayed) |
| #define ROLLBACK_BITS 0x00000001 | | #define ROLLBACK_BITS 0x00000001 |
| | |
| BOOL | | BOOL |
|
| | WINAPI |
| DiRollbackDriver( | | DiRollbackDriver( |
| __in HDEVINFO DeviceInfoSet, | | __in HDEVINFO DeviceInfoSet, |
| __in PSP_DEVINFO_DATA DeviceInfoData, | | __in PSP_DEVINFO_DATA DeviceInfoData, |
| __in_opt HWND hwndParent, | | __in_opt HWND hwndParent, |
| __in DWORD Flags, | | __in DWORD Flags, |
| __out_opt PBOOL NeedReboot | | __out_opt PBOOL NeedReboot |
| ); | | ); |
| #endif // (WINVER >= _WIN32_WINNT_LONGHORN) | | #endif // (WINVER >= _WIN32_WINNT_LONGHORN) |
| | |
| #ifdef __cplusplus | | #ifdef __cplusplus |
| | |
| End of changes. 8 change blocks. |
|---|
| 2 lines changed or deleted | | 19 lines changed or added |
|---|
|