Types removal

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 




When trying to compile tests on Windows, a few of them would fail to
compile because they were using types that don't exist on Windows!
These were PCVOID and LPUINT.
(whay can't MS use UINT* and const VOID* anyway?)

That's quite a dumb reason for a test not to compile so I just removed
these types and updated the code accordingly. This way it won't happen
again.


Changelog:

  * include/winnt.h,
    controls/edit.c,
    dlls/comctl32/commctrl.c,
    dlls/ntdll/heap.c,
    dlls/shell32/shv_bg_cmenu.c,
    dlls/shell32/shv_item_cmenu.c,
    dlls/shlwapi/tests/clist.c,
    files/smb.c,
    include/commctrl.h,
    include/imagehlp.h,
    include/mmsystem.h,
    include/winternl.h,
    windows/winproc.c

    Remove references to PCVOID and LPUINT
    Remove types that don't exist on Windows


Index: include/winnt.h
===================================================================
RCS file: /home/wine/wine/include/winnt.h,v
retrieving revision 1.124
diff -u -r1.124 winnt.h
--- include/winnt.h	12 Sep 2002 17:29:12 -0000	1.124
+++ include/winnt.h	16 Sep 2002 09:27:31 -0000
@@ -317,18 +317,18 @@
 #define ERROR_SEVERITY_ERROR         0xC0000000

 /* Standard data types */
-typedef const void                  *PCVOID,   *LPCVOID;
+typedef const void                             *LPCVOID;
 typedef int             BOOL,       *PBOOL,    *LPBOOL;
 typedef unsigned char   BYTE,       *PBYTE,    *LPBYTE;
 typedef unsigned char   UCHAR,      *PUCHAR;
-typedef unsigned short  USHORT,     *PUSHORT,  *LPUSHORT;
+typedef unsigned short  USHORT,     *PUSHORT;
 typedef unsigned short  WORD,       *PWORD,    *LPWORD;
 typedef int             INT,        *PINT,     *LPINT;
-typedef unsigned int    UINT,       *PUINT,    *LPUINT;
+typedef unsigned int    UINT,       *PUINT;
 typedef unsigned long   DWORD,      *PDWORD,   *LPDWORD;
-typedef unsigned long   ULONG,      *PULONG,   *LPULONG;
-typedef float           FLOAT,      *PFLOAT,   *LPFLOAT;
-typedef double          DOUBLE,     *PDOUBLE,  *LPDOUBLE;
+typedef unsigned long   ULONG,      *PULONG;
+typedef float           FLOAT,      *PFLOAT;
+typedef double          DOUBLE;
 typedef double          DATE;


Index: controls/edit.c
===================================================================
RCS file: /home/wine/wine/controls/edit.c,v
retrieving revision 1.100
diff -u -r1.100 edit.c
--- controls/edit.c	27 Aug 2002 18:15:26 -0000	1.100
+++ controls/edit.c	16 Sep 2002 09:27:12 -0000
@@ -227,7 +227,7 @@
 static HLOCAL	EDIT_EM_GetHandle(EDITSTATE *es);
 static HLOCAL16	EDIT_EM_GetHandle16(HWND hwnd, EDITSTATE *es);
 static INT	EDIT_EM_GetLine(EDITSTATE *es, INT line, LPARAM lParam, BOOL unicode);
-static LRESULT	EDIT_EM_GetSel(EDITSTATE *es, LPUINT start, LPUINT end);
+static LRESULT	EDIT_EM_GetSel(EDITSTATE *es, PUINT start, PUINT end);
 static LRESULT	EDIT_EM_GetThumb(HWND hwnd, EDITSTATE *es);
 static INT	EDIT_EM_LineFromChar(EDITSTATE *es, INT index);
 static INT	EDIT_EM_LineIndex(EDITSTATE *es, INT line);
@@ -448,7 +448,7 @@
 		/* fall through */
 	case EM_GETSEL:
 		DPRINTF_EDIT_MSG32("EM_GETSEL");
-		result = EDIT_EM_GetSel(es, (LPUINT)wParam, (LPUINT)lParam);
+		result = EDIT_EM_GetSel(es, (PUINT)wParam, (PUINT)lParam);
 		break;

 	case EM_SETSEL16:
@@ -2735,7 +2735,7 @@
  *	EM_GETSEL
  *
  */
-static LRESULT EDIT_EM_GetSel(EDITSTATE *es, LPUINT start, LPUINT end)
+static LRESULT EDIT_EM_GetSel(EDITSTATE *es, PUINT start, PUINT end)
 {
 	UINT s = es->selection_start;
 	UINT e = es->selection_end;
Index: dlls/comctl32/commctrl.c
===================================================================
RCS file: /home/wine/wine/dlls/comctl32/commctrl.c,v
retrieving revision 1.54
diff -u -r1.54 commctrl.c
--- dlls/comctl32/commctrl.c	6 Sep 2002 19:41:17 -0000	1.54
+++ dlls/comctl32/commctrl.c	16 Sep 2002 09:27:13 -0000
@@ -218,7 +218,7 @@

 VOID WINAPI
 MenuHelp (UINT uMsg, WPARAM wParam, LPARAM lParam, HMENU hMainMenu,
-	  HINSTANCE hInst, HWND hwndStatus, LPUINT lpwIDs)
+	  HINSTANCE hInst, HWND hwndStatus, UINT* lpwIDs)
 {
     UINT uMenuID = 0;

Index: dlls/ntdll/heap.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/heap.c,v
retrieving revision 1.8
diff -u -r1.8 heap.c
--- dlls/ntdll/heap.c	12 Sep 2002 22:07:03 -0000	1.8
+++ dlls/ntdll/heap.c	16 Sep 2002 09:27:16 -0000
@@ -1292,7 +1292,7 @@
 /***********************************************************************
  *           RtlValidateHeap   (NTDLL.@)
  */
-BOOLEAN WINAPI RtlValidateHeap( HANDLE heap, ULONG flags, PCVOID block )
+BOOLEAN WINAPI RtlValidateHeap( HANDLE heap, ULONG flags, LPCVOID block )
 {
     HEAP *heapPtr = HEAP_GetPtr( heap );
     if (!heapPtr) return FALSE;
Index: dlls/shell32/shv_bg_cmenu.c
===================================================================
RCS file: /home/wine/wine/dlls/shell32/shv_bg_cmenu.c,v
retrieving revision 1.19
diff -u -r1.19 shv_bg_cmenu.c
--- dlls/shell32/shv_bg_cmenu.c	16 Aug 2002 23:27:46 -0000	1.19
+++ dlls/shell32/shv_bg_cmenu.c	16 Sep 2002 09:27:18 -0000
@@ -384,7 +384,7 @@
 	IContextMenu *iface,
 	UINT idCommand,
 	UINT uFlags,
-	LPUINT lpReserved,
+	UINT* lpReserved,
 	LPSTR lpszName,
 	UINT uMaxNameLen)
 {
Index: dlls/shell32/shv_item_cmenu.c
===================================================================
RCS file: /home/wine/wine/dlls/shell32/shv_item_cmenu.c,v
retrieving revision 1.10
diff -u -r1.10 shv_item_cmenu.c
--- dlls/shell32/shv_item_cmenu.c	24 Jul 2002 01:56:03 -0000	1.10
+++ dlls/shell32/shv_item_cmenu.c	16 Sep 2002 09:27:19 -0000
@@ -464,7 +464,7 @@
 	IContextMenu *iface,
 	UINT idCommand,
 	UINT uFlags,
-	LPUINT lpReserved,
+	UINT* lpReserved,
 	LPSTR lpszName,
 	UINT uMaxNameLen)
 {
Index: dlls/shlwapi/tests/clist.c
===================================================================
RCS file: /home/wine/wine/dlls/shlwapi/tests/clist.c,v
retrieving revision 1.2
diff -u -r1.2 clist.c
--- dlls/shlwapi/tests/clist.c	16 Jul 2002 01:21:52 -0000	1.2
+++ dlls/shlwapi/tests/clist.c	16 Sep 2002 09:27:19 -0000
@@ -83,7 +83,7 @@
 }

 static HRESULT WINAPI Read(_IDummyStream* This, LPVOID lpMem, ULONG ulSize,
-                           LPULONG lpRead)
+                           PULONG lpRead)
 {
   HRESULT hRet = S_OK;
   ++This->readcalls;
@@ -134,7 +134,7 @@
 }

 static HRESULT WINAPI Write(_IDummyStream* This, LPVOID lpMem, ULONG ulSize,
-                            LPULONG lpWritten)
+                            PULONG lpWritten)
 {
   HRESULT hRet = S_OK;

Index: files/smb.c
===================================================================
RCS file: /home/wine/wine/files/smb.c,v
retrieving revision 1.11
diff -u -r1.11 smb.c
--- files/smb.c	27 Aug 2002 01:13:59 -0000	1.11
+++ files/smb.c	16 Sep 2002 09:27:22 -0000
@@ -950,7 +950,7 @@


 static BOOL SMB_Read(int fd, USHORT tree_id, USHORT user_id, USHORT dialect,
-       USHORT file_id, DWORD offset, LPVOID out, USHORT count, LPUSHORT read)
+       USHORT file_id, DWORD offset, LPVOID out, USHORT count, USHORT* read)
 {
     int buf_size,n,i;
     struct NB_Buffer rx,tx;
Index: include/commctrl.h
===================================================================
RCS file: /home/wine/wine/include/commctrl.h,v
retrieving revision 1.94
diff -u -r1.94 commctrl.h
--- include/commctrl.h	12 Sep 2002 00:50:39 -0000	1.94
+++ include/commctrl.h	16 Sep 2002 09:27:27 -0000
@@ -317,7 +317,7 @@
 VOID WINAPI DrawStatusTextW (HDC, LPRECT, LPCWSTR, UINT);
 #define DrawStatusText WINELIB_NAME_AW(DrawStatusText)
 VOID WINAPI MenuHelp (UINT, WPARAM, LPARAM, HMENU,
-                      HINSTANCE, HWND, LPUINT);
+                      HINSTANCE, HWND, UINT*);

 typedef struct tagCOLORSCHEME
 {
Index: include/imagehlp.h
===================================================================
RCS file: /home/wine/wine/include/imagehlp.h,v
retrieving revision 1.15
diff -u -r1.15 imagehlp.h
--- include/imagehlp.h	31 May 2002 23:06:48 -0000	1.15
+++ include/imagehlp.h	16 Sep 2002 09:27:28 -0000
@@ -324,7 +324,7 @@
 );

 typedef BOOL (CALLBACK *PREAD_PROCESS_MEMORY_ROUTINE)(
-  HANDLE  hProcess, PCVOID lpBaseAddress, PVOID lpBuffer,
+  HANDLE  hProcess, LPCVOID lpBaseAddress, PVOID lpBuffer,
   DWORD nSize, PDWORD lpNumberOfBytesRead
 );

Index: include/mmsystem.h
===================================================================
RCS file: /home/wine/wine/include/mmsystem.h,v
retrieving revision 1.56
diff -u -r1.56 mmsystem.h
--- include/mmsystem.h	9 Aug 2002 19:51:01 -0000	1.56
+++ include/mmsystem.h	16 Sep 2002 09:27:29 -0000
@@ -29,6 +29,7 @@

 typedef LPSTR		HPSTR;          /* a huge version of LPSTR */
 typedef LPCSTR		HPCSTR;         /* a huge version of LPCSTR */
+typedef UINT*           LPUINT;

 DECLARE_HANDLE(HDRVR);
 DECLARE_HANDLE(HWAVE);
Index: include/winternl.h
===================================================================
RCS file: /home/wine/wine/include/winternl.h,v
retrieving revision 1.2
diff -u -r1.2 winternl.h
--- include/winternl.h	12 Sep 2002 22:07:05 -0000	1.2
+++ include/winternl.h	16 Sep 2002 09:27:32 -0000
@@ -989,7 +990,7 @@

 NTSTATUS  WINAPI RtlValidSecurityDescriptor(PSECURITY_DESCRIPTOR);
 BOOL      WINAPI RtlValidSid(PSID);
-BOOLEAN   WINAPI RtlValidateHeap(HANDLE,ULONG,PCVOID);
+BOOLEAN   WINAPI RtlValidateHeap(HANDLE,ULONG,LPCVOID);

 NTSTATUS  WINAPI RtlWalkHeap(HANDLE,PVOID);

Index: windows/winproc.c
===================================================================
RCS file: /home/wine/wine/windows/winproc.c,v
retrieving revision 1.89
diff -u -r1.89 winproc.c
--- windows/winproc.c	4 Sep 2002 19:37:02 -0000	1.89
+++ windows/winproc.c	16 Sep 2002 09:27:41 -0000
@@ -2269,9 +2269,9 @@

     case CB_GETEDITSEL:
 	if( wParam )
-	    *((LPUINT)(wParam)) = LOWORD(p16->lResult);
+	    *((PUINT)(wParam)) = LOWORD(p16->lResult);
 	if( lParam )
-	    *((LPUINT)(lParam)) = HIWORD(p16->lResult);	/* FIXME: substract 1? */
+	    *((PUINT)(lParam)) = HIWORD(p16->lResult);	/* FIXME: substract 1? */
 	break;

     case WM_MEASUREITEM:


-- 
Francois Gouget         fgouget@free.fr        http://fgouget.free.fr/
                  Dieu dit: "M-x Lumière". Et la lumière fut.



[Index of Archives]     [Gimp for Windows]     [Red Hat]     [Samba]     [Yosemite Camping]     [Graphics Cards]     [Wine Home]

  Powered by Linux