ntdll: Make all exported wine functions CDECL.
This commit is contained in:
parent
d6bc9fc9f3
commit
768160e944
@ -102,7 +102,7 @@ static service_data **services;
|
|||||||
static unsigned int nb_services;
|
static unsigned int nb_services;
|
||||||
static HANDLE service_event;
|
static HANDLE service_event;
|
||||||
|
|
||||||
extern HANDLE __wine_make_process_system(void);
|
extern HANDLE CDECL __wine_make_process_system(void);
|
||||||
|
|
||||||
/******************************************************************************
|
/******************************************************************************
|
||||||
* SC_HANDLEs
|
* SC_HANDLEs
|
||||||
|
@ -43,7 +43,7 @@
|
|||||||
|
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(process);
|
WINE_DEFAULT_DEBUG_CHANNEL(process);
|
||||||
|
|
||||||
extern int __wine_set_signal_handler(unsigned, int (*)(unsigned));
|
extern int CDECL __wine_set_signal_handler(unsigned, int (*)(unsigned));
|
||||||
|
|
||||||
static ULONGLONG server_start_time;
|
static ULONGLONG server_start_time;
|
||||||
|
|
||||||
|
@ -2857,8 +2857,8 @@ int WINAPI lstrcmpiW(LPCWSTR str1, LPCWSTR str2)
|
|||||||
*/
|
*/
|
||||||
void LOCALE_Init(void)
|
void LOCALE_Init(void)
|
||||||
{
|
{
|
||||||
extern void __wine_init_codepages( const union cptable *ansi_cp, const union cptable *oem_cp,
|
extern void CDECL __wine_init_codepages( const union cptable *ansi_cp, const union cptable *oem_cp,
|
||||||
const union cptable *unix_cp );
|
const union cptable *unix_cp );
|
||||||
|
|
||||||
UINT ansi_cp = 1252, oem_cp = 437, mac_cp = 10000, unix_cp;
|
UINT ansi_cp = 1252, oem_cp = 437, mac_cp = 10000, unix_cp;
|
||||||
|
|
||||||
|
@ -786,7 +786,7 @@ done:
|
|||||||
*/
|
*/
|
||||||
static void init_windows_dirs(void)
|
static void init_windows_dirs(void)
|
||||||
{
|
{
|
||||||
extern void __wine_init_windows_dir( const WCHAR *windir, const WCHAR *sysdir );
|
extern void CDECL __wine_init_windows_dir( const WCHAR *windir, const WCHAR *sysdir );
|
||||||
|
|
||||||
static const WCHAR windirW[] = {'w','i','n','d','i','r',0};
|
static const WCHAR windirW[] = {'w','i','n','d','i','r',0};
|
||||||
static const WCHAR winsysdirW[] = {'w','i','n','s','y','s','d','i','r',0};
|
static const WCHAR winsysdirW[] = {'w','i','n','s','y','s','d','i','r',0};
|
||||||
|
@ -1919,8 +1919,8 @@ static inline int get_dos_prefix_len( const UNICODE_STRING *name )
|
|||||||
* element doesn't have to exist; in that case STATUS_NO_SUCH_FILE is
|
* element doesn't have to exist; in that case STATUS_NO_SUCH_FILE is
|
||||||
* returned, but the unix name is still filled in properly.
|
* returned, but the unix name is still filled in properly.
|
||||||
*/
|
*/
|
||||||
NTSTATUS wine_nt_to_unix_file_name( const UNICODE_STRING *nameW, ANSI_STRING *unix_name_ret,
|
NTSTATUS CDECL wine_nt_to_unix_file_name( const UNICODE_STRING *nameW, ANSI_STRING *unix_name_ret,
|
||||||
UINT disposition, BOOLEAN check_case )
|
UINT disposition, BOOLEAN check_case )
|
||||||
{
|
{
|
||||||
static const WCHAR unixW[] = {'u','n','i','x'};
|
static const WCHAR unixW[] = {'u','n','i','x'};
|
||||||
static const WCHAR invalid_charsW[] = { INVALID_NT_CHARS, 0 };
|
static const WCHAR invalid_charsW[] = { INVALID_NT_CHARS, 0 };
|
||||||
|
@ -2612,7 +2612,7 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved )
|
|||||||
*
|
*
|
||||||
* Windows and system dir initialization once kernel32 has been loaded.
|
* Windows and system dir initialization once kernel32 has been loaded.
|
||||||
*/
|
*/
|
||||||
void __wine_init_windows_dir( const WCHAR *windir, const WCHAR *sysdir )
|
void CDECL __wine_init_windows_dir( const WCHAR *windir, const WCHAR *sysdir )
|
||||||
{
|
{
|
||||||
PLIST_ENTRY mark, entry;
|
PLIST_ENTRY mark, entry;
|
||||||
LPWSTR buffer, p;
|
LPWSTR buffer, p;
|
||||||
|
@ -1015,7 +1015,7 @@ NTSTATUS WINAPI RtlSetCurrentDirectory_U(const UNICODE_STRING* dir)
|
|||||||
/******************************************************************
|
/******************************************************************
|
||||||
* wine_unix_to_nt_file_name (NTDLL.@) Not a Windows API
|
* wine_unix_to_nt_file_name (NTDLL.@) Not a Windows API
|
||||||
*/
|
*/
|
||||||
NTSTATUS wine_unix_to_nt_file_name( const ANSI_STRING *name, UNICODE_STRING *nt )
|
NTSTATUS CDECL wine_unix_to_nt_file_name( const ANSI_STRING *name, UNICODE_STRING *nt )
|
||||||
{
|
{
|
||||||
static const WCHAR prefixW[] = {'\\','?','?','\\','A',':','\\'};
|
static const WCHAR prefixW[] = {'\\','?','?','\\','A',':','\\'};
|
||||||
unsigned int lenW, lenA = name->Length;
|
unsigned int lenW, lenA = name->Length;
|
||||||
|
@ -77,7 +77,7 @@ PEB * WINAPI RtlGetCurrentPeb(void)
|
|||||||
* Mark the current process as a system process.
|
* Mark the current process as a system process.
|
||||||
* Returns the event that is signaled when all non-system processes have exited.
|
* Returns the event that is signaled when all non-system processes have exited.
|
||||||
*/
|
*/
|
||||||
HANDLE __wine_make_process_system(void)
|
HANDLE CDECL __wine_make_process_system(void)
|
||||||
{
|
{
|
||||||
HANDLE ret = 0;
|
HANDLE ret = 0;
|
||||||
SERVER_START_REQ( make_process_system )
|
SERVER_START_REQ( make_process_system )
|
||||||
|
@ -54,8 +54,8 @@ static const union cptable* unix_table; /* NULL if UTF8 */
|
|||||||
*
|
*
|
||||||
* Set the code page once kernel32 is loaded. Should be done differently.
|
* Set the code page once kernel32 is loaded. Should be done differently.
|
||||||
*/
|
*/
|
||||||
void __wine_init_codepages( const union cptable *ansi, const union cptable *oem,
|
void CDECL __wine_init_codepages( const union cptable *ansi, const union cptable *oem,
|
||||||
const union cptable *ucp)
|
const union cptable *ucp)
|
||||||
{
|
{
|
||||||
ansi_table = ansi;
|
ansi_table = ansi;
|
||||||
oem_table = oem;
|
oem_table = oem;
|
||||||
|
@ -358,7 +358,7 @@ void server_leave_uninterrupted_section( RTL_CRITICAL_SECTION *cs, sigset_t *sig
|
|||||||
* RETURNS
|
* RETURNS
|
||||||
* nothing
|
* nothing
|
||||||
*/
|
*/
|
||||||
void wine_server_send_fd( int fd )
|
void CDECL wine_server_send_fd( int fd )
|
||||||
{
|
{
|
||||||
#ifndef HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS
|
#ifndef HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS
|
||||||
struct cmsg_fd cmsg;
|
struct cmsg_fd cmsg;
|
||||||
@ -627,7 +627,7 @@ done:
|
|||||||
* RETURNS
|
* RETURNS
|
||||||
* NTSTATUS code
|
* NTSTATUS code
|
||||||
*/
|
*/
|
||||||
int wine_server_fd_to_handle( int fd, unsigned int access, unsigned int attributes, HANDLE *handle )
|
int CDECL wine_server_fd_to_handle( int fd, unsigned int access, unsigned int attributes, HANDLE *handle )
|
||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
@ -660,7 +660,7 @@ int wine_server_fd_to_handle( int fd, unsigned int access, unsigned int attribut
|
|||||||
* RETURNS
|
* RETURNS
|
||||||
* NTSTATUS code
|
* NTSTATUS code
|
||||||
*/
|
*/
|
||||||
int wine_server_handle_to_fd( HANDLE handle, unsigned int access, int *unix_fd,
|
int CDECL wine_server_handle_to_fd( HANDLE handle, unsigned int access, int *unix_fd,
|
||||||
unsigned int *options )
|
unsigned int *options )
|
||||||
{
|
{
|
||||||
int needs_close, ret = server_get_unix_fd( handle, access, unix_fd, &needs_close, NULL, options );
|
int needs_close, ret = server_get_unix_fd( handle, access, unix_fd, &needs_close, NULL, options );
|
||||||
@ -685,7 +685,7 @@ int wine_server_handle_to_fd( HANDLE handle, unsigned int access, int *unix_fd,
|
|||||||
* RETURNS
|
* RETURNS
|
||||||
* nothing
|
* nothing
|
||||||
*/
|
*/
|
||||||
void wine_server_release_fd( HANDLE handle, int unix_fd )
|
void CDECL wine_server_release_fd( HANDLE handle, int unix_fd )
|
||||||
{
|
{
|
||||||
close( unix_fd );
|
close( unix_fd );
|
||||||
}
|
}
|
||||||
|
@ -1560,7 +1560,7 @@ size_t get_signal_stack_total_size(void)
|
|||||||
/***********************************************************************
|
/***********************************************************************
|
||||||
* __wine_set_signal_handler (NTDLL.@)
|
* __wine_set_signal_handler (NTDLL.@)
|
||||||
*/
|
*/
|
||||||
int __wine_set_signal_handler(unsigned int sig, wine_signal_handler wsh)
|
int CDECL __wine_set_signal_handler(unsigned int sig, wine_signal_handler wsh)
|
||||||
{
|
{
|
||||||
if (sig >= sizeof(handlers) / sizeof(handlers[0])) return -1;
|
if (sig >= sizeof(handlers) / sizeof(handlers[0])) return -1;
|
||||||
if (handlers[sig] != NULL) return -2;
|
if (handlers[sig] != NULL) return -2;
|
||||||
|
@ -635,7 +635,7 @@ static int set_handler( int sig, void (*func)() )
|
|||||||
/***********************************************************************
|
/***********************************************************************
|
||||||
* __wine_set_signal_handler (NTDLL.@)
|
* __wine_set_signal_handler (NTDLL.@)
|
||||||
*/
|
*/
|
||||||
int __wine_set_signal_handler(unsigned int sig, wine_signal_handler wsh)
|
int CDECL __wine_set_signal_handler(unsigned int sig, wine_signal_handler wsh)
|
||||||
{
|
{
|
||||||
if (sig > sizeof(handlers) / sizeof(handlers[0])) return -1;
|
if (sig > sizeof(handlers) / sizeof(handlers[0])) return -1;
|
||||||
if (handlers[sig] != NULL) return -2;
|
if (handlers[sig] != NULL) return -2;
|
||||||
|
@ -448,7 +448,7 @@ static int set_handler( int sig, void (*func)() )
|
|||||||
/***********************************************************************
|
/***********************************************************************
|
||||||
* __wine_set_signal_handler (NTDLL.@)
|
* __wine_set_signal_handler (NTDLL.@)
|
||||||
*/
|
*/
|
||||||
int __wine_set_signal_handler(unsigned int sig, wine_signal_handler wsh)
|
int CDECL __wine_set_signal_handler(unsigned int sig, wine_signal_handler wsh)
|
||||||
{
|
{
|
||||||
if (sig > sizeof(handlers) / sizeof(handlers[0])) return -1;
|
if (sig > sizeof(handlers) / sizeof(handlers[0])) return -1;
|
||||||
if (handlers[sig] != NULL) return -2;
|
if (handlers[sig] != NULL) return -2;
|
||||||
|
@ -474,7 +474,7 @@ static int set_handler( int sig, void (*func)() )
|
|||||||
/***********************************************************************
|
/***********************************************************************
|
||||||
* __wine_set_signal_handler (NTDLL.@)
|
* __wine_set_signal_handler (NTDLL.@)
|
||||||
*/
|
*/
|
||||||
int __wine_set_signal_handler(unsigned int sig, wine_signal_handler wsh)
|
int CDECL __wine_set_signal_handler(unsigned int sig, wine_signal_handler wsh)
|
||||||
{
|
{
|
||||||
if (sig > sizeof(handlers) / sizeof(handlers[0])) return -1;
|
if (sig > sizeof(handlers) / sizeof(handlers[0])) return -1;
|
||||||
if (handlers[sig] != NULL) return -2;
|
if (handlers[sig] != NULL) return -2;
|
||||||
|
@ -50,10 +50,10 @@ struct __server_request_info
|
|||||||
};
|
};
|
||||||
|
|
||||||
extern unsigned int wine_server_call( void *req_ptr );
|
extern unsigned int wine_server_call( void *req_ptr );
|
||||||
extern void wine_server_send_fd( int fd );
|
extern void CDECL wine_server_send_fd( int fd );
|
||||||
extern int wine_server_fd_to_handle( int fd, unsigned int access, unsigned int attributes, HANDLE *handle );
|
extern int CDECL wine_server_fd_to_handle( int fd, unsigned int access, unsigned int attributes, HANDLE *handle );
|
||||||
extern int wine_server_handle_to_fd( HANDLE handle, unsigned int access, int *unix_fd, unsigned int *options );
|
extern int CDECL wine_server_handle_to_fd( HANDLE handle, unsigned int access, int *unix_fd, unsigned int *options );
|
||||||
extern void wine_server_release_fd( HANDLE handle, int unix_fd );
|
extern void CDECL wine_server_release_fd( HANDLE handle, int unix_fd );
|
||||||
|
|
||||||
/* do a server call and set the last error code */
|
/* do a server call and set the last error code */
|
||||||
static inline unsigned int wine_server_call_err( void *req_ptr )
|
static inline unsigned int wine_server_call_err( void *req_ptr )
|
||||||
|
@ -2505,9 +2505,9 @@ NTSYSAPI NTSTATUS WINAPI vDbgPrintExWithPrefix(LPCSTR,ULONG,ULONG,LPCSTR,va_lis
|
|||||||
|
|
||||||
/* Wine internal functions */
|
/* Wine internal functions */
|
||||||
|
|
||||||
NTSYSAPI NTSTATUS wine_nt_to_unix_file_name( const UNICODE_STRING *nameW, ANSI_STRING *unix_name_ret,
|
NTSYSAPI NTSTATUS CDECL wine_nt_to_unix_file_name( const UNICODE_STRING *nameW, ANSI_STRING *unix_name_ret,
|
||||||
UINT disposition, BOOLEAN check_case );
|
UINT disposition, BOOLEAN check_case );
|
||||||
NTSYSAPI NTSTATUS wine_unix_to_nt_file_name( const ANSI_STRING *name, UNICODE_STRING *nt );
|
NTSYSAPI NTSTATUS CDECL wine_unix_to_nt_file_name( const ANSI_STRING *name, UNICODE_STRING *nt );
|
||||||
|
|
||||||
|
|
||||||
/***********************************************************************
|
/***********************************************************************
|
||||||
|
@ -62,7 +62,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole);
|
|||||||
|
|
||||||
static HANDLE exit_event;
|
static HANDLE exit_event;
|
||||||
|
|
||||||
extern HANDLE __wine_make_process_system(void);
|
extern HANDLE CDECL __wine_make_process_system(void);
|
||||||
|
|
||||||
static BOOL RPCSS_Initialize(void)
|
static BOOL RPCSS_Initialize(void)
|
||||||
{
|
{
|
||||||
|
@ -34,7 +34,7 @@
|
|||||||
#include "services.h"
|
#include "services.h"
|
||||||
#include "svcctl.h"
|
#include "svcctl.h"
|
||||||
|
|
||||||
extern HANDLE __wine_make_process_system(void);
|
extern HANDLE CDECL __wine_make_process_system(void);
|
||||||
|
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(service);
|
WINE_DEFAULT_DEBUG_CHANNEL(service);
|
||||||
|
|
||||||
|
@ -815,7 +815,7 @@ static const struct option long_options[] =
|
|||||||
|
|
||||||
int main( int argc, char *argv[] )
|
int main( int argc, char *argv[] )
|
||||||
{
|
{
|
||||||
extern HANDLE __wine_make_process_system(void);
|
extern HANDLE CDECL __wine_make_process_system(void);
|
||||||
static const WCHAR wineboot_eventW[] = {'_','_','w','i','n','e','b','o','o','t','_','e','v','e','n','t',0};
|
static const WCHAR wineboot_eventW[] = {'_','_','w','i','n','e','b','o','o','t','_','e','v','e','n','t',0};
|
||||||
|
|
||||||
/* First, set the current directory to SystemRoot */
|
/* First, set the current directory to SystemRoot */
|
||||||
|
Loading…
x
Reference in New Issue
Block a user