Index: include/psdk/setupapi.h
===================================================================
--- include/psdk/setupapi.h	(版本 60754)
+++ include/psdk/setupapi.h	(工作副本)
@@ -611,16 +611,25 @@
 #define SPQ_SCAN_INFORM_USER	0x00000010
 #define SPQ_SCAN_PRUNE_COPY_QUEUE	0x00000020
 #define SPRDI_FIND_DUPS	0x00000001
-#define SPSVCINST_TAGTOFRONT	0x00000001
-#define SPSVCINST_ASSOCSERVICE	0x00000002
-#define SPSVCINST_DELETEEVENTLOGENTRY	0x00000004
-#define SPSVCINST_NOCLOBBER_DISPLAYNAME	0x00000008
-#define SPSVCINST_NOCLOBBER_STARTTYPE	0x00000010
+#define SPSVCINST_TAGTOFRONT                    0x00000001
+#define SPSVCINST_ASSOCSERVICE	                0x00000002
+#define SPSVCINST_DELETEEVENTLOGENTRY	        0x00000004
+#define SPSVCINST_NOCLOBBER_DISPLAYNAME	        0x00000008
+#define SPSVCINST_NOCLOBBER_STARTTYPE	        0x00000010
 #define SPSVCINST_NOCLOBBER_ERRORCONTROL	0x00000020
 #define SPSVCINST_NOCLOBBER_LOADORDERGROUP	0x00000040
 #define SPSVCINST_NOCLOBBER_DEPENDENCIES	0x00000080
-#define SPSVCINST_NOCLOBBER_DESCRIPTION	0x00000100
-#define SPSVCINST_STOPSERVICE	0x00000200
+#define SPSVCINST_NOCLOBBER_DESCRIPTION 	0x00000100
+#define SPSVCINST_STOPSERVICE	                0x00000200
+#if _SETUPAPI_VER >= _WIN32_WINNT_WINXP
+#define SPSVCINST_CLOBBER_SECURITY	        0x00000400
+#endif
+#if _SETUPAPI_VER >= _WIN32_WINNT_LONGHORN
+#define SPSVCINST_STARTSERVICE	                0x00000800
+#endif
+#if _SETUPAPI_VER >= _WIN32_WINNT_WIN7
+#define SPSVCINST_NOCLOBBER_REQUIREDPRIVILEGES	0x00001000
+#endif
 #define SPWPT_SELECTDEVICE	0x00000001
 #define SPWP_USE_DEVINFO_DATA	0x00000001
 #define SRCINFO_PATH	1
@@ -2387,6 +2396,8 @@
 
 WINSETUPAPI DWORD WINAPI TakeOwnershipOfFile(PCWSTR);
 WINSETUPAPI PSTR WINAPI UnicodeToMultiByte(PCWSTR lpUnicodeStr, UINT uCodePage);
+WINSETUPAPI BOOL WINAPI SetupUninstallOEMInfW(PCWSTR inf_file, DWORD flags, PVOID reserved);
+WINSETUPAPI BOOL WINAPI SetupUninstallOEMInfA(PCSTR inf_file, DWORD flags, PVOID reserved);
 
 
 /* for backward compatability */
@@ -2520,6 +2531,7 @@
 #define SetupSetFileQueueAlternatePlatform	SetupSetFileQueueAlternatePlatformW
 #define SetupSetPlatformPathOverride	SetupSetPlatformPathOverrideW
 #define SetupSetSourceList	SetupSetSourceListW
+#define SetupUninstallOEMInf    SetupUninstallOEMInfW
 #else
 #define PSP_FILE_CALLBACK PSP_FILE_CALLBACK_A
 #define SetupAddInstallSectionToDiskSpaceList	SetupAddInstallSectionToDiskSpaceListA
@@ -2642,6 +2654,7 @@
 #define SetupSetFileQueueAlternatePlatform	SetupSetFileQueueAlternatePlatformA
 #define SetupSetPlatformPathOverride	SetupSetPlatformPathOverrideA
 #define SetupSetSourceList	SetupSetSourceListA
+#define SetupUninstallOEMInf    SetupUninstallOEMInfA
 #endif	/* UNICODE */
 
 #endif /* RC_INVOKED */