Fix various function prototypes.
This commit is contained in:
parent
c3de6ef38f
commit
6c644d68cf
|
@ -2120,7 +2120,7 @@ ret:
|
||||||
*
|
*
|
||||||
* Initialisation of the shell objects
|
* Initialisation of the shell objects
|
||||||
*/
|
*/
|
||||||
static HRESULT FILEDLG95_SHELL_Init(HWND hwnd)
|
static LRESULT FILEDLG95_SHELL_Init(HWND hwnd)
|
||||||
{
|
{
|
||||||
FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *) GetPropA(hwnd,FileOpenDlgInfosStr);
|
FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *) GetPropA(hwnd,FileOpenDlgInfosStr);
|
||||||
|
|
||||||
|
|
|
@ -2599,7 +2599,7 @@ DWORD WINAPI GetPriorityClass(HANDLE hProcess)
|
||||||
/***********************************************************************
|
/***********************************************************************
|
||||||
* SetProcessAffinityMask (KERNEL32.@)
|
* SetProcessAffinityMask (KERNEL32.@)
|
||||||
*/
|
*/
|
||||||
BOOL WINAPI SetProcessAffinityMask( HANDLE hProcess, DWORD affmask )
|
BOOL WINAPI SetProcessAffinityMask( HANDLE hProcess, DWORD_PTR affmask )
|
||||||
{
|
{
|
||||||
BOOL ret;
|
BOOL ret;
|
||||||
SERVER_START_REQ( set_process_info )
|
SERVER_START_REQ( set_process_info )
|
||||||
|
|
|
@ -1583,10 +1583,10 @@ BOOL WINAPI SetMailslotInfo( HANDLE hMailslot, DWORD dwReadTimeout)
|
||||||
* CreateIoCompletionPort (KERNEL32.@)
|
* CreateIoCompletionPort (KERNEL32.@)
|
||||||
*/
|
*/
|
||||||
HANDLE WINAPI CreateIoCompletionPort(HANDLE hFileHandle, HANDLE hExistingCompletionPort,
|
HANDLE WINAPI CreateIoCompletionPort(HANDLE hFileHandle, HANDLE hExistingCompletionPort,
|
||||||
DWORD dwCompletionKey, DWORD dwNumberOfConcurrentThreads)
|
ULONG_PTR CompletionKey, DWORD dwNumberOfConcurrentThreads)
|
||||||
{
|
{
|
||||||
FIXME("(%p, %p, %08lx, %08lx): stub.\n",
|
FIXME("(%p, %p, %08lx, %08lx): stub.\n",
|
||||||
hFileHandle, hExistingCompletionPort, dwCompletionKey, dwNumberOfConcurrentThreads);
|
hFileHandle, hExistingCompletionPort, CompletionKey, dwNumberOfConcurrentThreads);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1595,11 +1595,11 @@ HANDLE WINAPI CreateIoCompletionPort(HANDLE hFileHandle, HANDLE hExistingComplet
|
||||||
* GetQueuedCompletionStatus (KERNEL32.@)
|
* GetQueuedCompletionStatus (KERNEL32.@)
|
||||||
*/
|
*/
|
||||||
BOOL WINAPI GetQueuedCompletionStatus( HANDLE CompletionPort, LPDWORD lpNumberOfBytesTransferred,
|
BOOL WINAPI GetQueuedCompletionStatus( HANDLE CompletionPort, LPDWORD lpNumberOfBytesTransferred,
|
||||||
LPDWORD lpCompletionKey, LPOVERLAPPED *lpOverlapped,
|
PULONG_PTR pCompletionKey, LPOVERLAPPED *lpOverlapped,
|
||||||
DWORD dwMilliseconds )
|
DWORD dwMilliseconds )
|
||||||
{
|
{
|
||||||
FIXME("(%p,%p,%p,%p,%ld), stub!\n",
|
FIXME("(%p,%p,%p,%p,%ld), stub!\n",
|
||||||
CompletionPort,lpNumberOfBytesTransferred,lpCompletionKey,lpOverlapped,dwMilliseconds);
|
CompletionPort,lpNumberOfBytesTransferred,pCompletionKey,lpOverlapped,dwMilliseconds);
|
||||||
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
|
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
|
@ -893,7 +893,7 @@ RPC_STATUS WINAPI RpcObjectSetType( UUID* ObjUuid, UUID* TypeUuid )
|
||||||
/***********************************************************************
|
/***********************************************************************
|
||||||
* RpcServerRegisterAuthInfoA (RPCRT4.@)
|
* RpcServerRegisterAuthInfoA (RPCRT4.@)
|
||||||
*/
|
*/
|
||||||
RPC_STATUS WINAPI RpcServerRegisterAuthInfoA( unsigned char *ServerPrincName, ULONG AuthnSvc, RPC_AUTH_KEY_RETRIEVAL_FN GetKeyFn,
|
RPC_STATUS WINAPI RpcServerRegisterAuthInfoA( unsigned char *ServerPrincName, unsigned long AuthnSvc, RPC_AUTH_KEY_RETRIEVAL_FN GetKeyFn,
|
||||||
LPVOID Arg )
|
LPVOID Arg )
|
||||||
{
|
{
|
||||||
FIXME( "(%s,%lu,%p,%p): stub\n", ServerPrincName, AuthnSvc, GetKeyFn, Arg );
|
FIXME( "(%s,%lu,%p,%p): stub\n", ServerPrincName, AuthnSvc, GetKeyFn, Arg );
|
||||||
|
@ -904,7 +904,7 @@ RPC_STATUS WINAPI RpcServerRegisterAuthInfoA( unsigned char *ServerPrincName, UL
|
||||||
/***********************************************************************
|
/***********************************************************************
|
||||||
* RpcServerRegisterAuthInfoW (RPCRT4.@)
|
* RpcServerRegisterAuthInfoW (RPCRT4.@)
|
||||||
*/
|
*/
|
||||||
RPC_STATUS WINAPI RpcServerRegisterAuthInfoW( LPWSTR ServerPrincName, ULONG AuthnSvc, RPC_AUTH_KEY_RETRIEVAL_FN GetKeyFn,
|
RPC_STATUS WINAPI RpcServerRegisterAuthInfoW( LPWSTR ServerPrincName, unsigned long AuthnSvc, RPC_AUTH_KEY_RETRIEVAL_FN GetKeyFn,
|
||||||
LPVOID Arg )
|
LPVOID Arg )
|
||||||
{
|
{
|
||||||
FIXME( "(%s,%lu,%p,%p): stub\n", debugstr_w( ServerPrincName ), AuthnSvc, GetKeyFn, Arg );
|
FIXME( "(%s,%lu,%p,%p): stub\n", debugstr_w( ServerPrincName ), AuthnSvc, GetKeyFn, Arg );
|
||||||
|
|
|
@ -101,7 +101,7 @@ DWORD WINAPI __SHGUIDToStringW (REFGUID guid, LPWSTR str)
|
||||||
|
|
||||||
/************************************************************************/
|
/************************************************************************/
|
||||||
|
|
||||||
LRESULT WINAPI SHCoCreateInstance(
|
HRESULT WINAPI SHCoCreateInstance(
|
||||||
LPCWSTR aclsid,
|
LPCWSTR aclsid,
|
||||||
const CLSID *clsid,
|
const CLSID *clsid,
|
||||||
LPUNKNOWN pUnkOuter,
|
LPUNKNOWN pUnkOuter,
|
||||||
|
|
|
@ -141,6 +141,6 @@ extern void CLASS_FreeModuleClasses( HMODULE16 hModule );
|
||||||
/* Timer functions */
|
/* Timer functions */
|
||||||
extern void TIMER_RemoveWindowTimers( HWND hwnd );
|
extern void TIMER_RemoveWindowTimers( HWND hwnd );
|
||||||
extern void TIMER_RemoveThreadTimers(void);
|
extern void TIMER_RemoveThreadTimers(void);
|
||||||
extern BOOL TIMER_IsTimerValid( HWND hwnd, UINT id, WNDPROC proc );
|
extern BOOL TIMER_IsTimerValid( HWND hwnd, UINT_PTR id, WNDPROC proc );
|
||||||
|
|
||||||
#endif /* __WINE_WINPROC_H */
|
#endif /* __WINE_WINPROC_H */
|
||||||
|
|
|
@ -468,7 +468,7 @@ HMODULE WINAPI GetDriverModuleHandle(HDRVR hDrvr)
|
||||||
* DefDriverProc [WINMM.@]
|
* DefDriverProc [WINMM.@]
|
||||||
* DrvDefDriverProc [WINMM.@]
|
* DrvDefDriverProc [WINMM.@]
|
||||||
*/
|
*/
|
||||||
LRESULT WINAPI DefDriverProc(DWORD dwDriverIdentifier, HDRVR hDrv,
|
LRESULT WINAPI DefDriverProc(DWORD_PTR dwDriverIdentifier, HDRVR hDrv,
|
||||||
UINT Msg, LPARAM lParam1, LPARAM lParam2)
|
UINT Msg, LPARAM lParam1, LPARAM lParam2)
|
||||||
{
|
{
|
||||||
switch (Msg) {
|
switch (Msg) {
|
||||||
|
|
|
@ -250,25 +250,25 @@ const char* MCI_MessageToString(UINT16 wMsg);
|
||||||
UINT WINAPI MCI_DefYieldProc(MCIDEVICEID wDevID, DWORD data);
|
UINT WINAPI MCI_DefYieldProc(MCIDEVICEID wDevID, DWORD data);
|
||||||
LRESULT MCI_CleanUp(LRESULT dwRet, UINT wMsg, DWORD dwParam2);
|
LRESULT MCI_CleanUp(LRESULT dwRet, UINT wMsg, DWORD dwParam2);
|
||||||
DWORD MCI_SendCommand(UINT wDevID, UINT16 wMsg, DWORD dwParam1, DWORD dwParam2, BOOL bFrom32);
|
DWORD MCI_SendCommand(UINT wDevID, UINT16 wMsg, DWORD dwParam1, DWORD dwParam2, BOOL bFrom32);
|
||||||
DWORD MCI_SendCommandFrom32(UINT wDevID, UINT16 wMsg, DWORD dwParam1, DWORD dwParam2);
|
DWORD MCI_SendCommandFrom32(UINT wDevID, UINT16 wMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2);
|
||||||
DWORD MCI_SendCommandFrom16(UINT wDevID, UINT16 wMsg, DWORD dwParam1, DWORD dwParam2);
|
DWORD MCI_SendCommandFrom16(UINT wDevID, UINT16 wMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2);
|
||||||
UINT MCI_SetCommandTable(void *table, UINT uDevType);
|
UINT MCI_SetCommandTable(void *table, UINT uDevType);
|
||||||
|
|
||||||
BOOL WINMM_CheckForMMSystem(void);
|
BOOL WINMM_CheckForMMSystem(void);
|
||||||
const char* WINMM_ErrorToString(MMRESULT error);
|
const char* WINMM_ErrorToString(MMRESULT error);
|
||||||
|
|
||||||
UINT MIXER_Open(LPHMIXER lphMix, UINT uDeviceID, DWORD dwCallback,
|
UINT MIXER_Open(LPHMIXER lphMix, UINT uDeviceID, DWORD_PTR dwCallback,
|
||||||
DWORD dwInstance, DWORD fdwOpen, BOOL bFrom32);
|
DWORD_PTR dwInstance, DWORD fdwOpen, BOOL bFrom32);
|
||||||
UINT MIDI_OutOpen(HMIDIOUT* lphMidiOut, UINT uDeviceID, DWORD dwCallback,
|
UINT MIDI_OutOpen(HMIDIOUT* lphMidiOut, UINT uDeviceID, DWORD_PTR dwCallback,
|
||||||
DWORD dwInstance, DWORD dwFlags, BOOL bFrom32);
|
DWORD_PTR dwInstance, DWORD dwFlags, BOOL bFrom32);
|
||||||
UINT MIDI_InOpen(HMIDIIN* lphMidiIn, UINT uDeviceID, DWORD dwCallback,
|
UINT MIDI_InOpen(HMIDIIN* lphMidiIn, UINT uDeviceID, DWORD_PTR dwCallback,
|
||||||
DWORD dwInstance, DWORD dwFlags, BOOL bFrom32);
|
DWORD_PTR dwInstance, DWORD dwFlags, BOOL bFrom32);
|
||||||
MMRESULT MIDI_StreamOpen(HMIDISTRM* lphMidiStrm, LPUINT lpuDeviceID,
|
MMRESULT MIDI_StreamOpen(HMIDISTRM* lphMidiStrm, LPUINT lpuDeviceID,
|
||||||
DWORD cMidi, DWORD dwCallback,
|
DWORD cMidi, DWORD_PTR dwCallback,
|
||||||
DWORD dwInstance, DWORD fdwOpen, BOOL bFrom32);
|
DWORD_PTR dwInstance, DWORD fdwOpen, BOOL bFrom32);
|
||||||
UINT WAVE_Open(HANDLE* lphndl, UINT uDeviceID, UINT uType,
|
UINT WAVE_Open(HANDLE* lphndl, UINT uDeviceID, UINT uType,
|
||||||
const LPWAVEFORMATEX lpFormat, DWORD dwCallback,
|
const LPWAVEFORMATEX lpFormat, DWORD_PTR dwCallback,
|
||||||
DWORD dwInstance, DWORD dwFlags, BOOL bFrom32);
|
DWORD_PTR dwInstance, DWORD dwFlags, BOOL bFrom32);
|
||||||
|
|
||||||
HMMIO MMIO_Open(LPSTR szFileName, MMIOINFO* refmminfo,
|
HMMIO MMIO_Open(LPSTR szFileName, MMIOINFO* refmminfo,
|
||||||
DWORD dwOpenFlags, enum mmioProcType type);
|
DWORD dwOpenFlags, enum mmioProcType type);
|
||||||
|
|
|
@ -1678,8 +1678,8 @@ UINT WINAPI midiInGetErrorTextA(UINT uError, LPSTR lpText, UINT uSize)
|
||||||
return MIDI_GetErrorText(uError, lpText, uSize);
|
return MIDI_GetErrorText(uError, lpText, uSize);
|
||||||
}
|
}
|
||||||
|
|
||||||
UINT MIDI_InOpen(HMIDIIN* lphMidiIn, UINT uDeviceID, DWORD dwCallback,
|
UINT MIDI_InOpen(HMIDIIN* lphMidiIn, UINT uDeviceID, DWORD_PTR dwCallback,
|
||||||
DWORD dwInstance, DWORD dwFlags, BOOL bFrom32)
|
DWORD_PTR dwInstance, DWORD dwFlags, BOOL bFrom32)
|
||||||
{
|
{
|
||||||
HANDLE hMidiIn;
|
HANDLE hMidiIn;
|
||||||
LPWINE_MIDI lpwm;
|
LPWINE_MIDI lpwm;
|
||||||
|
@ -1717,7 +1717,7 @@ UINT MIDI_InOpen(HMIDIIN* lphMidiIn, UINT uDeviceID, DWORD dwCallback,
|
||||||
* midiInOpen [WINMM.@]
|
* midiInOpen [WINMM.@]
|
||||||
*/
|
*/
|
||||||
UINT WINAPI midiInOpen(HMIDIIN* lphMidiIn, UINT uDeviceID,
|
UINT WINAPI midiInOpen(HMIDIIN* lphMidiIn, UINT uDeviceID,
|
||||||
DWORD dwCallback, DWORD dwInstance, DWORD dwFlags)
|
DWORD_PTR dwCallback, DWORD_PTR dwInstance, DWORD dwFlags)
|
||||||
{
|
{
|
||||||
return MIDI_InOpen(lphMidiIn, uDeviceID, dwCallback, dwInstance, dwFlags, TRUE);
|
return MIDI_InOpen(lphMidiIn, uDeviceID, dwCallback, dwInstance, dwFlags, TRUE);
|
||||||
}
|
}
|
||||||
|
@ -2226,7 +2226,7 @@ MMRESULT WINAPI midiStreamClose(HMIDISTRM hMidiStrm)
|
||||||
* MMSYSTEM_MidiStream_Open [internal]
|
* MMSYSTEM_MidiStream_Open [internal]
|
||||||
*/
|
*/
|
||||||
MMRESULT MIDI_StreamOpen(HMIDISTRM* lphMidiStrm, LPUINT lpuDeviceID, DWORD cMidi,
|
MMRESULT MIDI_StreamOpen(HMIDISTRM* lphMidiStrm, LPUINT lpuDeviceID, DWORD cMidi,
|
||||||
DWORD dwCallback, DWORD dwInstance, DWORD fdwOpen,
|
DWORD_PTR dwCallback, DWORD_PTR dwInstance, DWORD fdwOpen,
|
||||||
BOOL bFrom32)
|
BOOL bFrom32)
|
||||||
{
|
{
|
||||||
WINE_MIDIStream* lpMidiStrm;
|
WINE_MIDIStream* lpMidiStrm;
|
||||||
|
@ -2293,8 +2293,8 @@ MMRESULT MIDI_StreamOpen(HMIDISTRM* lphMidiStrm, LPUINT lpuDeviceID, DWORD cMidi
|
||||||
* midiStreamOpen [WINMM.@]
|
* midiStreamOpen [WINMM.@]
|
||||||
*/
|
*/
|
||||||
MMRESULT WINAPI midiStreamOpen(HMIDISTRM* lphMidiStrm, LPUINT lpuDeviceID,
|
MMRESULT WINAPI midiStreamOpen(HMIDISTRM* lphMidiStrm, LPUINT lpuDeviceID,
|
||||||
DWORD cMidi, DWORD dwCallback,
|
DWORD cMidi, DWORD_PTR dwCallback,
|
||||||
DWORD dwInstance, DWORD fdwOpen)
|
DWORD_PTR dwInstance, DWORD fdwOpen)
|
||||||
{
|
{
|
||||||
return MIDI_StreamOpen(lphMidiStrm, lpuDeviceID, cMidi, dwCallback,
|
return MIDI_StreamOpen(lphMidiStrm, lpuDeviceID, cMidi, dwCallback,
|
||||||
dwInstance, fdwOpen, TRUE);
|
dwInstance, fdwOpen, TRUE);
|
||||||
|
@ -2478,8 +2478,8 @@ MMRESULT WINAPI midiStreamStop(HMIDISTRM hMidiStrm)
|
||||||
}
|
}
|
||||||
|
|
||||||
UINT WAVE_Open(HANDLE* lphndl, UINT uDeviceID, UINT uType,
|
UINT WAVE_Open(HANDLE* lphndl, UINT uDeviceID, UINT uType,
|
||||||
const LPWAVEFORMATEX lpFormat, DWORD dwCallback,
|
const LPWAVEFORMATEX lpFormat, DWORD_PTR dwCallback,
|
||||||
DWORD dwInstance, DWORD dwFlags, BOOL bFrom32)
|
DWORD_PTR dwInstance, DWORD dwFlags, BOOL bFrom32)
|
||||||
{
|
{
|
||||||
HANDLE handle;
|
HANDLE handle;
|
||||||
LPWINE_MLD wmld;
|
LPWINE_MLD wmld;
|
||||||
|
@ -3046,8 +3046,8 @@ UINT WINAPI waveInGetErrorTextW(UINT uError, LPWSTR lpText, UINT uSize)
|
||||||
* waveInOpen [WINMM.@]
|
* waveInOpen [WINMM.@]
|
||||||
*/
|
*/
|
||||||
UINT WINAPI waveInOpen(HWAVEIN* lphWaveIn, UINT uDeviceID,
|
UINT WINAPI waveInOpen(HWAVEIN* lphWaveIn, UINT uDeviceID,
|
||||||
const LPWAVEFORMATEX lpFormat, DWORD dwCallback,
|
const LPWAVEFORMATEX lpFormat, DWORD_PTR dwCallback,
|
||||||
DWORD dwInstance, DWORD dwFlags)
|
DWORD_PTR dwInstance, DWORD dwFlags)
|
||||||
{
|
{
|
||||||
return WAVE_Open((HANDLE*)lphWaveIn, uDeviceID, MMDRV_WAVEIN, lpFormat,
|
return WAVE_Open((HANDLE*)lphWaveIn, uDeviceID, MMDRV_WAVEIN, lpFormat,
|
||||||
dwCallback, dwInstance, dwFlags, TRUE);
|
dwCallback, dwInstance, dwFlags, TRUE);
|
||||||
|
|
|
@ -2866,7 +2866,7 @@ int WINAPI WSAEnumNetworkEvents(SOCKET s, WSAEVENT hEvent, LPWSANETWORKEVENTS lp
|
||||||
/***********************************************************************
|
/***********************************************************************
|
||||||
* WSAEventSelect (WS2_32.39)
|
* WSAEventSelect (WS2_32.39)
|
||||||
*/
|
*/
|
||||||
int WINAPI WSAEventSelect(SOCKET s, WSAEVENT hEvent, LONG lEvent)
|
int WINAPI WSAEventSelect(SOCKET s, WSAEVENT hEvent, long lEvent)
|
||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
|
@ -2944,7 +2944,7 @@ BOOL WINAPI WSAGetOverlappedResult ( SOCKET s, LPWSAOVERLAPPED lpOverlapped,
|
||||||
/***********************************************************************
|
/***********************************************************************
|
||||||
* WSAAsyncSelect (WS2_32.101)
|
* WSAAsyncSelect (WS2_32.101)
|
||||||
*/
|
*/
|
||||||
INT WINAPI WSAAsyncSelect(SOCKET s, HWND hWnd, UINT uMsg, LONG lEvent)
|
INT WINAPI WSAAsyncSelect(SOCKET s, HWND hWnd, UINT uMsg, long lEvent)
|
||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
|
|
|
@ -298,13 +298,13 @@ HANDLE WINAPI GetProcessHeap(void)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void* WINAPI HeapAlloc( HANDLE heap, DWORD flags, DWORD size )
|
void* WINAPI HeapAlloc( HANDLE heap, DWORD flags, SIZE_T size )
|
||||||
{
|
{
|
||||||
assert(flags == 0);
|
assert(flags == 0);
|
||||||
return malloc(size);
|
return malloc(size);
|
||||||
}
|
}
|
||||||
|
|
||||||
void* WINAPI HeapReAlloc( HANDLE heap, DWORD flags, void* ptr, DWORD size)
|
void* WINAPI HeapReAlloc( HANDLE heap, DWORD flags, void* ptr, SIZE_T size)
|
||||||
{
|
{
|
||||||
assert(flags == 0);
|
assert(flags == 0);
|
||||||
return realloc(ptr, size);
|
return realloc(ptr, size);
|
||||||
|
|
Loading…
Reference in New Issue