Francois Gouget : setupapi: setupapi. h must not define HSTRING_TABLE and the StringTable* prototypes.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 7ab6d8522b614f6e9d9773fa86151ab05fb05a19
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=7ab6d8522b614f6e9d9773fa86151ab05fb05a19

Author: Francois Gouget <fgouget at free.fr>
Date:   Wed Nov  8 00:58:43 2006 +0100

setupapi: setupapi.h must not define HSTRING_TABLE and the StringTable* prototypes.

---

 dlls/setupapi/stringtable.c       |    2 ++
 dlls/setupapi/tests/stringtable.c |    5 +++++
 include/setupapi.h                |   13 -------------
 3 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/dlls/setupapi/stringtable.c b/dlls/setupapi/stringtable.c
index 84b1c14..7be6b18 100644
--- a/dlls/setupapi/stringtable.c
+++ b/dlls/setupapi/stringtable.c
@@ -37,6 +37,8 @@ #define TABLE_DEFAULT_SIZE 256
 
 WINE_DEFAULT_DEBUG_CHANNEL(setupapi);
 
+DECLARE_HANDLE(HSTRING_TABLE);
+
 typedef struct _TABLE_SLOT
 {
     LPWSTR pString;
diff --git a/dlls/setupapi/tests/stringtable.c b/dlls/setupapi/tests/stringtable.c
index 74a19c7..59e49c0 100644
--- a/dlls/setupapi/tests/stringtable.c
+++ b/dlls/setupapi/tests/stringtable.c
@@ -34,6 +34,11 @@ #include "setupapi.h"
 #include "wine/test.h"
 
 
+DECLARE_HANDLE(HSTRING_TABLE);
+
+/* Flags for StringTableAddString and StringTableLookUpString */
+#define ST_CASE_SENSITIVE_COMPARE	0x00000001
+
 static DWORD    (WINAPI *pStringTableAddString)(HSTRING_TABLE, LPWSTR, DWORD);
 static VOID     (WINAPI *pStringTableDestroy)(HSTRING_TABLE);
 static HSTRING_TABLE (WINAPI *pStringTableDuplicate)(HSTRING_TABLE hStringTable);
diff --git a/include/setupapi.h b/include/setupapi.h
index ada57db..231b30a 100644
--- a/include/setupapi.h
+++ b/include/setupapi.h
@@ -158,8 +158,6 @@ #define SP_MAX_MACHINENAME_LENGTH   (MAX
 
 typedef UINT DI_FUNCTION;
 
-DECLARE_HANDLE(HSTRING_TABLE);
-
 typedef struct _SP_CLASSINSTALL_HEADER
 {
   DWORD       cbSize;
@@ -417,9 +415,6 @@ #define SP_COPY_REPLACE_BOOT_FILE
 #define SP_COPY_NOPRUNE                   0x00100000
 #define SP_COPY_OEM_F6_INF                0x00200000
 
-/* Flags for StringTableAddString and StringTableLookUpString */
-#define ST_CASE_SENSITIVE_COMPARE	0x00000001
-
 #define FLG_ADDREG_DELREG_BIT             0x00008000
 #define FLG_ADDREG_BINVALUETYPE           0x00000001
 #define FLG_ADDREG_NOCLOBBER              0x00000002
@@ -885,14 +880,6 @@ #define         SetupSetFileQueueAlterna
 BOOL     WINAPI SetupSetFileQueueFlags( HSPFILEQ, DWORD, DWORD );
 void     WINAPI SetupTermDefaultQueueCallback( PVOID );
 DWORD    WINAPI StampFileSecurity(PCWSTR, PSECURITY_DESCRIPTOR);
-DWORD    WINAPI StringTableAddString(HSTRING_TABLE, LPWSTR, DWORD);
-VOID     WINAPI StringTableDestroy(HSTRING_TABLE);
-HSTRING_TABLE WINAPI StringTableDuplicate(HSTRING_TABLE hStringTable);
-HSTRING_TABLE WINAPI StringTableInitialize(VOID);
-DWORD    WINAPI StringTableLookUpString(HSTRING_TABLE, LPWSTR, DWORD);
-LPWSTR   WINAPI StringTableStringFromId(HSTRING_TABLE, DWORD);
-BOOL     WINAPI StringTableStringFromIdEx(HSTRING_TABLE, DWORD, LPWSTR, LPDWORD);
-VOID     WINAPI StringTableTrim(HSTRING_TABLE);
 DWORD    WINAPI TakeOwnershipOfFile(PCWSTR);
 PSTR     WINAPI UnicodeToMultiByte(PCWSTR lpUnicodeStr, UINT uCodePage);
 BOOL     WINAPI UnmapAndCloseFile(HANDLE, HANDLE, PVOID);