Header files fixes

[Francois Gouget]

On Thu, 30 Sep 2004, Peter Quiring wrote:

> I've recently got winelib working for me and I had a few problems with
> it's header files.  I couldn't get CVS working so could someone else
> look into these problems and get them fixed in the next release of
> Wine.  Thanks.

There you go:

Changelog:

 * include/lmcons.h
   include/tlhelp32.h
   include/winspool.h

   lmcons.h: Add API_RET_TYPE and NET_API_FUNCTION.
   tlhelp32.h: Add HEAPENTRY32 and the related APIs.
   winspool.h: Fix the JobId field case.


-- 
Francois Gouget         fgouget at free.fr        http://fgouget.free.fr/
     The software said it requires Win95 or better, so I installed Linux.
-------------- next part --------------
Index: include/lmcons.h
===================================================================
RCS file: /var/cvs/wine/include/lmcons.h,v
retrieving revision 1.6
diff -u -r1.6 lmcons.h
--- include/lmcons.h	1 Mar 2004 21:18:49 -0000	1.6
+++ include/lmcons.h	30 Sep 2004 22:41:27 -0000
@@ -22,6 +22,8 @@
 /* Types */
 
 #define NET_API_STATUS          DWORD
+#define API_RET_TYPE            NET_API_STATUS
+#define NET_API_FUNCTION        WINAPI
 
 #define MAX_PREFERRED_LENGTH            ((DWORD) -1)
 
Index: include/tlhelp32.h
===================================================================
RCS file: /var/cvs/wine/include/tlhelp32.h,v
retrieving revision 1.11
diff -u -r1.11 tlhelp32.h
--- include/tlhelp32.h	12 Jan 2004 21:05:53 -0000	1.11
+++ include/tlhelp32.h	30 Sep 2004 22:38:38 -0000
@@ -146,7 +146,8 @@
 #define LPMODULEENTRY32 LPMODULEENTRY32W
 #endif
 
-typedef struct tagHEAPLIST32 {
+typedef struct tagHEAPLIST32
+{
     SIZE_T dwSize;
     DWORD th32ProcessID;
     ULONG_PTR th32HeapID;
@@ -154,8 +155,25 @@
 } HEAPLIST32, *PHEAPLIST32, *LPHEAPLIST32;
 
 BOOL WINAPI Heap32ListFirst(HANDLE,LPHEAPLIST32);
+BOOL WINAPI Heap32ListNext(HANDLE,LPHEAPLIST32);
 BOOL WINAPI Toolhelp32ReadProcessMemory(DWORD,LPCVOID,LPVOID,SIZE_T,SIZE_T*);
 
+typedef struct tagHEAPENTRY32
+{
+    SIZE_T dwSize;
+    HANDLE hHandle;
+    ULONG_PTR dwAddress;
+    SIZE_T dwBlockSize;
+    DWORD dwFlags;
+    DWORD dwLockCount;
+    DWORD dwResvd;
+    DWORD th32ProcessID;
+    ULONG_PTR th32HeapID;
+} HEAPENTRY32, *PHEAPENTRY32, *LPHEAPENTRY32;
+
+BOOL WINAPI Heap32First(LPHEAPENTRY32,DWORD,ULONG_PTR);
+BOOL WINAPI Heap32Next(LPHEAPENTRY32);
+
 #ifdef __cplusplus
 } /* extern "C" */
 #endif
Index: include/winspool.h
===================================================================
RCS file: /var/cvs/wine/include/winspool.h,v
retrieving revision 1.25
diff -u -r1.25 winspool.h
--- include/winspool.h	20 Apr 2004 04:03:42 -0000	1.25
+++ include/winspool.h	30 Sep 2004 22:43:23 -0000
@@ -448,7 +448,7 @@
 } PRINTER_INFO_6, *PPRINTER_INFO_6, *LPPRINTER_INFO_6;
 
 typedef struct _JOB_INFO_1A {
-  DWORD JobID;
+  DWORD JobId;
   LPSTR pPrinterName;
   LPSTR pMachineName;
   LPSTR pUserName;
@@ -464,7 +464,7 @@
 } JOB_INFO_1A, *PJOB_INFO_1A, *LPJOB_INFO_1A;
 
 typedef struct _JOB_INFO_1W {
-  DWORD JobID;
+  DWORD JobId;
   LPWSTR pPrinterName;
   LPWSTR pMachineName;
   LPWSTR pUserName;
@@ -484,7 +484,7 @@
 DECL_WINELIB_TYPE_AW(LPJOB_INFO_1)
 
 typedef struct _JOB_INFO_2A {
-  DWORD JobID;
+  DWORD JobId;
   LPSTR pPrinterName;
   LPSTR pMachineName;
   LPSTR pUserName;
@@ -510,7 +510,7 @@
 } JOB_INFO_2A, *PJOB_INFO_2A, *LPJOB_INFO_2A;
 
 typedef struct _JOB_INFO_2W {
-  DWORD JobID;
+  DWORD JobId;
   LPWSTR pPrinterName;
   LPWSTR pMachineName;
   LPWSTR pUserName;
@@ -540,19 +540,19 @@
 DECL_WINELIB_TYPE_AW(LPJOB_INFO_2)
 
 typedef struct _JOB_INFO_3 {
-  DWORD JobID;
-  DWORD NextJobID;
+  DWORD JobId;
+  DWORD NextJobId;
   DWORD Reserved;
 } JOB_INFO_3, *PJOB_INFO_3, *LPJOB_INFO_3;
 
 typedef struct _ADDJOB_INFO_1A {
   LPSTR Path;
-  DWORD JobID;
+  DWORD JobId;
 } ADDJOB_INFO_1A, *PADDJOB_INFO_1A, *LPADDJOB_INFO_1A;
 
 typedef struct _ADDJOB_INFO_1W {
   LPWSTR Path;
-  DWORD  JobID;
+  DWORD  JobId;
 } ADDJOB_INFO_1W, *PADDJOB_INFO_1W, *LPADDJOB_INFO_1W;
 
 DECL_WINELIB_TYPE_AW(ADDJOB_INFO_1)
@@ -580,7 +580,7 @@
   LPSTR pOutputFile;
   LPSTR pDatatype;
   DWORD dwMode;
-  DWORD JobID;
+  DWORD JobId;
 } DOC_INFO_2A, *PDOC_INFO_2A, *LPDOC_INFO_2A;
 
 typedef struct _DOC_INFO_2W {
@@ -588,7 +588,7 @@
   LPWSTR pOutputFile;
   LPWSTR pDatatype;
   DWORD dwMode;
-  DWORD JobID;
+  DWORD JobId;
 } DOC_INFO_2W, *PDOC_INFO_2W, *LPDOC_INFO_2W;
 
 DECL_WINELIB_TYPE_AW(DOC_INFO_2)