From bba4bb1bc451b95ab1cce02d5a68ead606cd1b50 Mon Sep 17 00:00:00 2001 From: Francois Gouget Date: Tue, 17 Sep 2002 01:35:09 +0000 Subject: [PATCH] Remove references to PCVOID and LPUINT. Remove types that don't exist on Windows. --- controls/edit.c | 6 +++--- dlls/comctl32/commctrl.c | 2 +- dlls/ntdll/heap.c | 2 +- dlls/shell32/shv_bg_cmenu.c | 2 +- dlls/shell32/shv_item_cmenu.c | 2 +- dlls/shlwapi/tests/clist.c | 4 ++-- files/smb.c | 2 +- include/commctrl.h | 2 +- include/imagehlp.h | 2 +- include/mmsystem.h | 1 + include/winnt.h | 12 ++++++------ include/winternl.h | 2 +- windows/winproc.c | 4 ++-- 13 files changed, 22 insertions(+), 21 deletions(-) diff --git a/controls/edit.c b/controls/edit.c index 36a387ce1d9..fcd29d48fae 100644 --- a/controls/edit.c +++ b/controls/edit.c @@ -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; diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c index 356a795180b..4c4247fc17e 100644 --- a/dlls/comctl32/commctrl.c +++ b/dlls/comctl32/commctrl.c @@ -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; diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 67b77cfa3de..321bbe8d165 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -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; diff --git a/dlls/shell32/shv_bg_cmenu.c b/dlls/shell32/shv_bg_cmenu.c index 0fea3ae57d2..b1fa3d2b415 100644 --- a/dlls/shell32/shv_bg_cmenu.c +++ b/dlls/shell32/shv_bg_cmenu.c @@ -384,7 +384,7 @@ static HRESULT WINAPI ISVBgCm_fnGetCommandString( IContextMenu *iface, UINT idCommand, UINT uFlags, - LPUINT lpReserved, + UINT* lpReserved, LPSTR lpszName, UINT uMaxNameLen) { diff --git a/dlls/shell32/shv_item_cmenu.c b/dlls/shell32/shv_item_cmenu.c index 43b4078b5cd..a5e22707aef 100644 --- a/dlls/shell32/shv_item_cmenu.c +++ b/dlls/shell32/shv_item_cmenu.c @@ -464,7 +464,7 @@ static HRESULT WINAPI ISvItemCm_fnGetCommandString( IContextMenu *iface, UINT idCommand, UINT uFlags, - LPUINT lpReserved, + UINT* lpReserved, LPSTR lpszName, UINT uMaxNameLen) { diff --git a/dlls/shlwapi/tests/clist.c b/dlls/shlwapi/tests/clist.c index 7c0192865aa..600b0c4907e 100644 --- a/dlls/shlwapi/tests/clist.c +++ b/dlls/shlwapi/tests/clist.c @@ -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; diff --git a/files/smb.c b/files/smb.c index d772b809097..10be5343f36 100644 --- a/files/smb.c +++ b/files/smb.c @@ -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; diff --git a/include/commctrl.h b/include/commctrl.h index 84fe4211dea..33fdda1b956 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -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 { diff --git a/include/imagehlp.h b/include/imagehlp.h index d0cad79a413..38ec91f4678 100644 --- a/include/imagehlp.h +++ b/include/imagehlp.h @@ -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 ); diff --git a/include/mmsystem.h b/include/mmsystem.h index 038845208a3..874c6762462 100644 --- a/include/mmsystem.h +++ b/include/mmsystem.h @@ -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); diff --git a/include/winnt.h b/include/winnt.h index ae6ea6b100a..89bc8500f66 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -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; diff --git a/include/winternl.h b/include/winternl.h index 43ddb17d364..3568a36bc62 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -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); diff --git a/windows/winproc.c b/windows/winproc.c index 76a0658ad60..4b8f8c3f238 100644 --- a/windows/winproc.c +++ b/windows/winproc.c @@ -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: -- 2.11.4.GIT