[PATCH 10/11] apphelp: fix compilation.

[Mislav Blazevic]

---
 dlls/apphelp/apphelp.c | 12 ++++++------
 include/appcompatapi.h | 21 +++++++++++----------
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/dlls/apphelp/apphelp.c b/dlls/apphelp/apphelp.c
index 32dface..9d0da83 100644
--- a/dlls/apphelp/apphelp.c
+++ b/dlls/apphelp/apphelp.c
@@ -24,6 +24,8 @@

 #include "wine/debug.h"

+#define STATUS_SUCCESS ((NTSTATUS)0)
+
 WINE_DEFAULT_DEBUG_CHANNEL(apphelp);

 BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved )
@@ -521,19 +523,17 @@ TAG WINAPI SdbGetTagFromTagID(PDB db, TAGID parent)
  */
 TAGID WINAPI SdbGetFirstChild(PDB db, TAGID parent)
 {
-    TAG tag;
-
     /* if we are at beginning of database */
     if (parent == TAGID_NULL)
     {
         /* header only database: no tags */
-        if (db->size <= TAGID_ROOT)
+        if (db->size <= _TAGID_ROOT)
             return TAGID_NULL;
-        else return TAGID_ROOT;
+        else return _TAGID_ROOT;
     }

     /* only list tag can have children */
-    if (SdbGetTagFromTagID(db, parent) & TAG_TYPE_MASK != TAG_TYPE_LIST)
+    if ((SdbGetTagFromTagID(db, parent) & TAG_TYPE_MASK) != TAG_TYPE_LIST)
         return TAGID_NULL;

     /* first child is sizeof(TAG) + sizeof(DWORD) bytes after beginning */
@@ -643,7 +643,7 @@ static DWORD WINAPI SdbGetTagSize(PDB db, TAGID tagid)
         return sizes[(type >> 12) - 1];

     /* tag with dynamic size (e.g. list): must read size */
-    if (!SdbReadData(db, &size, parent + 2, 4))
+    if (!SdbReadData(db, &size, tagid + 2, 4))
     {
         TRACE("Failed to read size of tag!\n");
         return 0;
diff --git a/include/appcompatapi.h b/include/appcompatapi.h
index d7bbbf5..7ef62c1 100644
--- a/include/appcompatapi.h
+++ b/include/appcompatapi.h
@@ -24,16 +24,6 @@
 extern "C" {
 #endif

-BOOL WINAPI ApphelpCheckShellObject(REFCLSID, BOOL, ULONGLONG *);
-LPCWSTR WINAPI SdbTagToString(TAG);
-void WINAPI SdbCloseDatabase(PDB);
-PDB WINAPI SdbOpenDatabase(LPCWSTR, PATH_TYPE);
-TAG WINAPI SdbGetTagFromTagID(PDB, TAGID);
-TAGID WINAPI SdbGetFirstChild(PDB, TAGID);
-DWORD WINAPI SdbReadDWORDTag(PDB, TAGID, DWORD);
-QWORD WINAPI SdbReadQWORDTag(PDB, TAGID, QWORD);
-TAGID WINAPI SdbGetNextChild(PDB, TAGID, TAGID);
-
 typedef enum _PATH_TYPE {
     DOS_PATH,
     NT_PATH
@@ -45,9 +35,20 @@ typedef struct _DB {
     PBYTE data;
 } DB, *PDB;

+typedef UINT64 QWORD;
 typedef DWORD TAGID;
 typedef WORD TAG;

+BOOL WINAPI ApphelpCheckShellObject(REFCLSID, BOOL, ULONGLONG *);
+LPCWSTR WINAPI SdbTagToString(TAG);
+void WINAPI SdbCloseDatabase(PDB);
+PDB WINAPI SdbOpenDatabase(LPCWSTR, PATH_TYPE);
+TAG WINAPI SdbGetTagFromTagID(PDB, TAGID);
+TAGID WINAPI SdbGetFirstChild(PDB, TAGID);
+DWORD WINAPI SdbReadDWORDTag(PDB, TAGID, DWORD);
+QWORD WINAPI SdbReadQWORDTag(PDB, TAGID, QWORD);
+TAGID WINAPI SdbGetNextChild(PDB, TAGID, TAGID);
+
 #define TAGID_NULL 0x0
 #define TAGID_ROOT 0x0

-- 
1.8.3.4