[ros-diffs] [hbelusca] 75537: [SETUPLIB]: Fix compilation errors when using these headers with usetup (that doesn't use setupapi.dll) and "reactos" (the 1st-stage GUI installer, which uses setupapi.dll).

Author: hbelusca
Date: Mon Aug 14 16:29:01 2017
New Revision: 75537

URL: http://svn.reactos.org/svn/reactos?rev=75537&view=rev
Log:
[SETUPLIB]: Fix compilation errors when using these headers with usetup (that doesn't use setupapi.dll) and "reactos" (the 1st-stage GUI installer, which uses setupapi.dll).

Modified:
    branches/setup_improvements/base/setup/lib/errorcode.h
    branches/setup_improvements/base/setup/lib/infsupp.h

Modified: branches/setup_improvements/base/setup/lib/errorcode.h
URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/li...
==============================================================================
--- branches/setup_improvements/base/setup/lib/errorcode.h	[iso-8859-1] (original)
+++ branches/setup_improvements/base/setup/lib/errorcode.h	[iso-8859-1] Mon Aug 14 16:29:01 2017
@@ -8,7 +8,12 @@

#pragma once

-typedef enum
+/* setupapi.h defines ERROR_NOT_INSTALLED with another meaning */
+#ifdef ERROR_NOT_INSTALLED
+#undef ERROR_NOT_INSTALLED
+#endif
+
+typedef enum _ERROR_NUMBER
 {
     NOT_AN_ERROR = 0,   // ERROR_SUCCESS,
     ERROR_NOT_INSTALLED,

Modified: branches/setup_improvements/base/setup/lib/infsupp.h
URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/li...
==============================================================================
--- branches/setup_improvements/base/setup/lib/infsupp.h	[iso-8859-1] (original)
+++ branches/setup_improvements/base/setup/lib/infsupp.h	[iso-8859-1] Mon Aug 14 16:29:01 2017
@@ -8,13 +8,14 @@

#pragma once

+/* Make setupapi.h to not define the API as exports to the DLL */
 #ifdef __REACTOS__
 #define _SETUPAPI_
 #endif

// FIXME: Temporary measure until all the users of this header
 // (usetup...) use or define SetupAPI-conforming APIs.
-#if 0
+#if defined(_SETUPAPI_H_) || defined(_INC_SETUPAPI)

#include <setupapi.h>

@@ -64,11 +65,11 @@
                     PULONG RequiredSize);

// #define SetupGetIntField InfGetIntField
-BOOLEAN
+BOOL
 WINAPI
 SetupGetIntField(PINFCONTEXT Context,
                  ULONG FieldIndex,
-                 INT *IntegerValue);
+                 INT *IntegerValue); // PINT

// #define SetupGetMultiSzFieldW InfGetMultiSzField
 BOOL