[4] include/setupapi.h

"Filip Navara" <xnavara-VIXq6x/[email protected]> Fri, 12 Dec 2003 16:35:42 +0100
Newsgroups gmane.comp.gnu.mingw.patches
Message-ID <002e01c3c0c5$cf50dfa0$fc4cb13e@hornet>
I already sent this patch twice along with some others and it wasn't
commited. If it's not commitable in the current form, please tell me why.

Thanks
Filip
patch4.log (application/octet-stream, 184 B)
2003-10-26  Filip Navara  <xnavara-VIXq6x/[email protected]>

	* include/setupapi.h: Corrected prototype for SetupGetLineTextA and
	added new constants for _SETUPAPI_VER >= 0x501.
patch4.diff (application/octet-stream, 2.7 KB)
--- include/setupapi.h	Sun Oct 26 18:04:00 2003
+++ include/setupapi.h	Sun Oct 26 17:20:24 2003
@@ -312,12 +312,33 @@
 #define FLG_ADDREG_APPEND	0x00000008
 #define FLG_ADDREG_KEYONLY	0x00000010
 #define FLG_ADDREG_OVERWRITEONLY	0x00000020
+#if (_SETUPAPI_VER >= 0x0501)
+#define FLG_ADDREG_64BITKEY	0x00001000
+#define FLG_ADDREG_KEYONLY_COMMON	0x00002000
+#define FLG_ADDREG_32BITKEY	0x00004000
+#define FLG_ADDREG_DELREG_BIT	0x00008000
+#endif
 #define FLG_ADDREG_TYPE_MULTI_SZ	0x00010000
 #define FLG_ADDREG_TYPE_EXPAND_SZ	0x00020000
 #define FLG_ADDREG_TYPE_BINARY	(0x00000000|FLG_ADDREG_BINVALUETYPE)
 #define FLG_ADDREG_TYPE_DWORD	(0x00010000|FLG_ADDREG_BINVALUETYPE)
 #define FLG_ADDREG_TYPE_NONE	(0x00020000|FLG_ADDREG_BINVALUETYPE)
 #define FLG_ADDREG_TYPE_MASK	(0xFFFF0000|FLG_ADDREG_BINVALUETYPE)
+#define FLG_DELREG_VALUE	0x00000000
+#if (_SETUPAPI_VER >= 0x0501)
+#define FLG_DELREG_TYPE_MASK	FLG_ADDREG_TYPE_MASK
+#define FLG_DELREG_TYPE_SZ	FLG_ADDREG_TYPE_SZ
+#define FLG_DELREG_TYPE_MULTI_SZ	FLG_ADDREG_TYPE_MULTI_SZ
+#define FLG_DELREG_TYPE_EXPAND_SZ	FLG_ADDREG_TYPE_EXPAND_SZ
+#define FLG_DELREG_TYPE_BINARY	FLG_ADDREG_TYPE_BINARY
+#define FLG_DELREG_TYPE_DWORD	FLG_ADDREG_TYPE_DWORD
+#define FLG_DELREG_TYPE_NONE	FLG_ADDREG_TYPE_NONE
+#define FLG_DELREG_64BITKEY	FLG_ADDREG_64BITKEY
+#define FLG_DELREG_KEYONLY_COMMON	FLG_ADDREG_KEYONLY_COMMON
+#define FLG_DELREG_32BITKEY	FLG_ADDREG_32BITKEY
+#define FLG_DELREG_OPERATION_MASK	0x000000FE
+#define FLG_DELREG_MULTI_SZ_DELSTRING	(0x00000002|FLG_DELREG_TYPE_MULTI_SZ|FLG_ADDREG_DELREG_BIT)
+#endif
 #define FLG_BITREG_CLEARBITS	0x00000000
 #define FLG_BITREG_SETBITS	0x00000001
 #define FLG_PROFITEM_CURRENTUSER	0x00000001
@@ -507,7 +528,12 @@
 #define SPINST_REGSVR	0x00000040
 #define SPINST_UNREGSVR	0x00000080
 #define SPINST_PROFILEITEMS	0x00000100
+#if (_SETUPAPI_VER >= 0x0501)
+#define SPINST_COPYINF	0x00000200
+#define SPINST_ALL	0x000003ff
+#else
 #define SPINST_ALL	0x000001ff
+#endif
 #define SPINST_SINGLESECTION	0x00010000
 #define SPINST_LOGCONFIG_IS_FORCED	0x00020000
 #define SPINST_LOGCONFIGS_ARE_OVERRIDES	0x00040000
@@ -1188,7 +1214,7 @@
 WINSETUPAPI BOOL WINAPI SetupGetLineByIndexW(HINF,PCWSTR,DWORD,PINFCONTEXT);
 WINSETUPAPI LONG WINAPI SetupGetLineCountA(HINF,PCSTR);
 WINSETUPAPI LONG WINAPI SetupGetLineCountW(HINF,PCWSTR);
-WINSETUPAPI BOOL WINAPI SetupGetLineTextA(PINFCONTEXT,HINF,PCSTR,PCSTR,DWORD,PDWORD);
+WINSETUPAPI BOOL WINAPI SetupGetLineTextA(PINFCONTEXT,HINF,PCSTR,PCSTR,PTSTR,DWORD,PDWORD);
 WINSETUPAPI BOOL WINAPI SetupGetLineTextW(PINFCONTEXT,HINF,PCWSTR,PCWSTR,PWSTR,DWORD,PDWORD);
 WINSETUPAPI BOOL WINAPI SetupGetMultiSzFieldA(PINFCONTEXT,DWORD,PSTR,DWORD,LPDWORD);
 WINSETUPAPI BOOL WINAPI SetupGetMultiSzFieldW(PINFCONTEXT,DWORD,PWSTR,DWORD,LPDWORD);