Remove references to PCVOID and LPUINT.

Remove types that don't exist on Windows.
This commit is contained in:
Francois Gouget 2002-09-17 01:35:09 +00:00 committed by Alexandre Julliard
parent b7fa637c67
commit bba4bb1bc4
13 changed files with 22 additions and 21 deletions

View File

@ -227,7 +227,7 @@ static BOOL EDIT_EM_FmtLines(EDITSTATE *es, BOOL add_eol);
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 @@ static LRESULT WINAPI EditWndProc_common( HWND hwnd, UINT msg,
/* 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 @@ static INT EDIT_EM_GetLine(EDITSTATE *es, INT line, LPARAM lParam, BOOL unicode)
* 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;

View File

@ -218,7 +218,7 @@ COMCTL32_LibMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
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;

View File

@ -1292,7 +1292,7 @@ ULONG WINAPI RtlSizeHeap( HANDLE heap, ULONG flags, PVOID ptr )
/***********************************************************************
* 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;

View File

@ -384,7 +384,7 @@ static HRESULT WINAPI ISVBgCm_fnGetCommandString(
IContextMenu *iface,
UINT idCommand,
UINT uFlags,
LPUINT lpReserved,
UINT* lpReserved,
LPSTR lpszName,
UINT uMaxNameLen)
{

View File

@ -464,7 +464,7 @@ static HRESULT WINAPI ISvItemCm_fnGetCommandString(
IContextMenu *iface,
UINT idCommand,
UINT uFlags,
LPUINT lpReserved,
UINT* lpReserved,
LPSTR lpszName,
UINT uMaxNameLen)
{

View File

@ -83,7 +83,7 @@ static ULONG WINAPI Release(_IDummyStream *This)
}
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 Read(_IDummyStream* This, LPVOID lpMem, ULONG ulSize,
}
static HRESULT WINAPI Write(_IDummyStream* This, LPVOID lpMem, ULONG ulSize,
LPULONG lpWritten)
PULONG lpWritten)
{
HRESULT hRet = S_OK;

View File

@ -950,7 +950,7 @@ static BOOL SMB_Open(int fd, USHORT tree_id, USHORT user_id, USHORT dialect,
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;

View File

@ -324,7 +324,7 @@ VOID WINAPI DrawStatusTextA (HDC, LPRECT, LPCSTR, UINT);
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
{

View File

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

View File

@ -29,6 +29,7 @@ extern "C" {
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);

View File

@ -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;

View File

@ -990,7 +990,7 @@ NTSTATUS WINAPI RtlUpcaseUnicodeToOemN(LPSTR,DWORD,LPDWORD,LPCWSTR,DWORD);
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);

View File

@ -2269,9 +2269,9 @@ void WINPROC_UnmapMsg32ATo16( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam,
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: