Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
717bd664
Commit
717bd664
authored
Jun 10, 2011
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
widl: Default to the cdecl calling convention in client/server functions.
parent
e8567110
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
92 additions
and
115 deletions
+92
-115
server.c
dlls/rpcrt4/tests/server.c
+0
-0
epmp.c
programs/rpcss/epmp.c
+38
-38
irotp.c
programs/rpcss/irotp.c
+7
-7
rpc.c
programs/services/rpc.c
+43
-66
client.c
tools/widl/client.c
+2
-2
header.c
tools/widl/header.c
+2
-2
No files found.
dlls/rpcrt4/tests/server.c
View file @
717bd664
This diff is collapsed.
Click to expand it.
programs/rpcss/epmp.c
View file @
717bd664
...
...
@@ -89,11 +89,11 @@ void __RPC_USER ept_lookup_handle_t_rundown(ept_lookup_handle_t entry_handle)
WINE_FIXME
(
"%p
\n
"
,
entry_handle
);
}
void
ept_insert
(
handle_t
h
,
unsigned32
num_ents
,
ept_entry_t
entries
[],
boolean32
replace
,
error_status_t
*
status
)
void
__cdecl
ept_insert
(
handle_t
h
,
unsigned32
num_ents
,
ept_entry_t
entries
[],
boolean32
replace
,
error_status_t
*
status
)
{
unsigned32
i
;
RPC_STATUS
rpc_status
;
...
...
@@ -139,10 +139,10 @@ void ept_insert(handle_t h,
LeaveCriticalSection
(
&
csEpm
);
}
void
ept_delete
(
handle_t
h
,
unsigned32
num_ents
,
ept_entry_t
entries
[],
error_status_t
*
status
)
void
__cdecl
ept_delete
(
handle_t
h
,
unsigned32
num_ents
,
ept_entry_t
entries
[],
error_status_t
*
status
)
{
unsigned32
i
;
RPC_STATUS
rpc_status
;
...
...
@@ -180,30 +180,30 @@ void ept_delete(handle_t h,
LeaveCriticalSection
(
&
csEpm
);
}
void
ept_lookup
(
handle_t
h
,
unsigned32
inquiry_type
,
uuid_p_t
object
,
rpc_if_id_p_t
interface_id
,
unsigned32
vers_option
,
ept_lookup_handle_t
*
entry_handle
,
unsigned32
max_ents
,
unsigned32
*
num_ents
,
ept_entry_t
entries
[],
error_status_t
*
status
)
void
__cdecl
ept_lookup
(
handle_t
h
,
unsigned32
inquiry_type
,
uuid_p_t
object
,
rpc_if_id_p_t
interface_id
,
unsigned32
vers_option
,
ept_lookup_handle_t
*
entry_handle
,
unsigned32
max_ents
,
unsigned32
*
num_ents
,
ept_entry_t
entries
[],
error_status_t
*
status
)
{
WINE_FIXME
(
"(%p, %p, %p): stub
\n
"
,
h
,
entry_handle
,
status
);
*
status
=
EPT_S_CANT_PERFORM_OP
;
}
void
ept_map
(
handle_t
h
,
uuid_p_t
object
,
twr_p_t
map_tower
,
ept_lookup_handle_t
*
entry_handle
,
unsigned32
max_towers
,
unsigned32
*
num_towers
,
twr_p_t
*
towers
,
error_status_t
*
status
)
void
__cdecl
ept_map
(
handle_t
h
,
uuid_p_t
object
,
twr_p_t
map_tower
,
ept_lookup_handle_t
*
entry_handle
,
unsigned32
max_towers
,
unsigned32
*
num_towers
,
twr_p_t
*
towers
,
error_status_t
*
status
)
{
RPC_STATUS
rpc_status
;
RPC_SYNTAX_IDENTIFIER
iface
,
syntax
;
...
...
@@ -254,29 +254,29 @@ void ept_map(handle_t h,
LeaveCriticalSection
(
&
csEpm
);
}
void
ept_lookup_handle_free
(
handle_t
h
,
ept_lookup_handle_t
*
entry_handle
,
error_status_t
*
status
)
void
__cdecl
ept_lookup_handle_free
(
handle_t
h
,
ept_lookup_handle_t
*
entry_handle
,
error_status_t
*
status
)
{
WINE_FIXME
(
"(%p, %p, %p): stub
\n
"
,
h
,
entry_handle
,
status
);
*
status
=
EPT_S_CANT_PERFORM_OP
;
}
void
ept_inq_object
(
handle_t
h
,
GUID
*
ept_object
,
error_status_t
*
status
)
void
__cdecl
ept_inq_object
(
handle_t
h
,
GUID
*
ept_object
,
error_status_t
*
status
)
{
WINE_FIXME
(
"(%p, %p, %p): stub
\n
"
,
h
,
ept_object
,
status
);
*
status
=
EPT_S_CANT_PERFORM_OP
;
}
void
ept_mgmt_delete
(
handle_t
h
,
boolean32
object_speced
,
uuid_p_t
object
,
twr_p_t
tower
,
error_status_t
*
status
)
void
__cdecl
ept_mgmt_delete
(
handle_t
h
,
boolean32
object_speced
,
uuid_p_t
object
,
twr_p_t
tower
,
error_status_t
*
status
)
{
WINE_FIXME
(
"(%p, %d, %p, %p, %p): stub
\n
"
,
h
,
object_speced
,
object
,
tower
,
status
);
...
...
programs/rpcss/irotp.c
View file @
717bd664
...
...
@@ -68,7 +68,7 @@ static inline void rot_entry_release(struct rot_entry *rot_entry)
}
}
HRESULT
IrotRegister
(
HRESULT
__cdecl
IrotRegister
(
IrotHandle
h
,
const
MonikerComparisonData
*
data
,
const
InterfaceData
*
obj
,
...
...
@@ -148,7 +148,7 @@ HRESULT IrotRegister(
return
hr
;
}
HRESULT
IrotRevoke
(
HRESULT
__cdecl
IrotRevoke
(
IrotHandle
h
,
IrotCookie
cookie
,
IrotContextHandle
*
ctxt_handle
,
...
...
@@ -195,7 +195,7 @@ HRESULT IrotRevoke(
return
E_INVALIDARG
;
}
HRESULT
IrotIsRunning
(
HRESULT
__cdecl
IrotIsRunning
(
IrotHandle
h
,
const
MonikerComparisonData
*
data
)
{
...
...
@@ -220,7 +220,7 @@ HRESULT IrotIsRunning(
return
hr
;
}
HRESULT
IrotGetObject
(
HRESULT
__cdecl
IrotGetObject
(
IrotHandle
h
,
const
MonikerComparisonData
*
moniker_data
,
PInterfaceData
*
obj
,
...
...
@@ -262,7 +262,7 @@ HRESULT IrotGetObject(
return
MK_E_UNAVAILABLE
;
}
HRESULT
IrotNoteChangeTime
(
HRESULT
__cdecl
IrotNoteChangeTime
(
IrotHandle
h
,
IrotCookie
cookie
,
const
FILETIME
*
last_modified_time
)
...
...
@@ -286,7 +286,7 @@ HRESULT IrotNoteChangeTime(
return
E_INVALIDARG
;
}
HRESULT
IrotGetTimeOfLastChange
(
HRESULT
__cdecl
IrotGetTimeOfLastChange
(
IrotHandle
h
,
const
MonikerComparisonData
*
moniker_data
,
FILETIME
*
time
)
...
...
@@ -314,7 +314,7 @@ HRESULT IrotGetTimeOfLastChange(
return
hr
;
}
HRESULT
IrotEnumRunning
(
HRESULT
__cdecl
IrotEnumRunning
(
IrotHandle
h
,
PInterfaceList
*
list
)
{
...
...
programs/services/rpc.c
View file @
717bd664
...
...
@@ -147,7 +147,7 @@ static DWORD validate_service_handle(SC_RPC_HANDLE handle, DWORD needed_access,
return
err
;
}
DWORD
svcctl_OpenSCManagerW
(
DWORD
__cdecl
svcctl_OpenSCManagerW
(
MACHINE_HANDLEW
MachineName
,
/* Note: this parameter is ignored */
LPCWSTR
DatabaseName
,
DWORD
dwAccessMask
,
...
...
@@ -204,7 +204,7 @@ static void SC_RPC_HANDLE_destroy(SC_RPC_HANDLE handle)
}
}
DWORD
svcctl_GetServiceDisplayNameW
(
DWORD
__cdecl
svcctl_GetServiceDisplayNameW
(
SC_RPC_HANDLE
hSCManager
,
LPCWSTR
lpServiceName
,
WCHAR
*
lpBuffer
,
...
...
@@ -250,7 +250,7 @@ DWORD svcctl_GetServiceDisplayNameW(
return
err
;
}
DWORD
svcctl_GetServiceKeyNameW
(
DWORD
__cdecl
svcctl_GetServiceKeyNameW
(
SC_RPC_HANDLE
hSCManager
,
LPCWSTR
lpServiceDisplayName
,
WCHAR
*
lpBuffer
,
...
...
@@ -315,7 +315,7 @@ static DWORD create_handle_for_service(struct service_entry *entry, DWORD dwDesi
return
ERROR_SUCCESS
;
}
DWORD
svcctl_OpenServiceW
(
DWORD
__cdecl
svcctl_OpenServiceW
(
SC_RPC_HANDLE
hSCManager
,
LPCWSTR
lpServiceName
,
DWORD
dwDesiredAccess
,
...
...
@@ -416,7 +416,7 @@ static DWORD parse_dependencies(const WCHAR *dependencies, struct service_entry
return
ERROR_SUCCESS
;
}
DWORD
svcctl_CreateServiceW
(
DWORD
__cdecl
svcctl_CreateServiceW
(
SC_RPC_HANDLE
hSCManager
,
LPCWSTR
lpServiceName
,
LPCWSTR
lpDisplayName
,
...
...
@@ -510,7 +510,7 @@ DWORD svcctl_CreateServiceW(
return
create_handle_for_service
(
entry
,
dwDesiredAccess
,
phService
);
}
DWORD
svcctl_DeleteService
(
DWORD
__cdecl
svcctl_DeleteService
(
SC_RPC_HANDLE
hService
)
{
struct
sc_service_handle
*
service
;
...
...
@@ -533,7 +533,7 @@ DWORD svcctl_DeleteService(
return
err
;
}
DWORD
svcctl_QueryServiceConfigW
(
DWORD
__cdecl
svcctl_QueryServiceConfigW
(
SC_RPC_HANDLE
hService
,
QUERY_SERVICE_CONFIGW
*
config
)
{
...
...
@@ -560,7 +560,7 @@ DWORD svcctl_QueryServiceConfigW(
return
ERROR_SUCCESS
;
}
DWORD
svcctl_ChangeServiceConfigW
(
DWORD
__cdecl
svcctl_ChangeServiceConfigW
(
SC_RPC_HANDLE
hService
,
DWORD
dwServiceType
,
DWORD
dwStartType
,
...
...
@@ -673,7 +673,7 @@ DWORD svcctl_ChangeServiceConfigW(
return
err
;
}
DWORD
svcctl_SetServiceStatus
(
DWORD
__cdecl
svcctl_SetServiceStatus
(
SC_RPC_HANDLE
hServiceStatus
,
LPSERVICE_STATUS
lpServiceStatus
)
{
...
...
@@ -703,7 +703,7 @@ DWORD svcctl_SetServiceStatus(
return
ERROR_SUCCESS
;
}
DWORD
svcctl_ChangeServiceConfig2W
(
SC_RPC_HANDLE
hService
,
DWORD
level
,
SERVICE_CONFIG2W
*
config
)
DWORD
__cdecl
svcctl_ChangeServiceConfig2W
(
SC_RPC_HANDLE
hService
,
DWORD
level
,
SERVICE_CONFIG2W
*
config
)
{
struct
sc_service_handle
*
service
;
DWORD
err
;
...
...
@@ -745,8 +745,8 @@ DWORD svcctl_ChangeServiceConfig2W( SC_RPC_HANDLE hService, DWORD level, SERVICE
return
err
;
}
DWORD
svcctl_QueryServiceConfig2W
(
SC_RPC_HANDLE
hService
,
DWORD
level
,
BYTE
*
buffer
,
DWORD
size
,
LPDWORD
needed
)
DWORD
__cdecl
svcctl_QueryServiceConfig2W
(
SC_RPC_HANDLE
hService
,
DWORD
level
,
BYTE
*
buffer
,
DWORD
size
,
LPDWORD
needed
)
{
struct
sc_service_handle
*
service
;
DWORD
err
;
...
...
@@ -789,7 +789,7 @@ DWORD svcctl_QueryServiceConfig2W( SC_RPC_HANDLE hService, DWORD level,
return
err
;
}
DWORD
svcctl_QueryServiceStatusEx
(
DWORD
__cdecl
svcctl_QueryServiceStatusEx
(
SC_RPC_HANDLE
hService
,
SC_STATUS_TYPE
InfoLevel
,
BYTE
*
lpBuffer
,
...
...
@@ -948,7 +948,7 @@ static BOOL service_send_control(struct service_entry *service, HANDLE pipe, DWO
return
r
;
}
DWORD
svcctl_StartServiceW
(
DWORD
__cdecl
svcctl_StartServiceW
(
SC_RPC_HANDLE
hService
,
DWORD
dwNumServiceArgs
,
LPCWSTR
*
lpServiceArgVectors
)
...
...
@@ -966,7 +966,7 @@ DWORD svcctl_StartServiceW(
return
err
;
}
DWORD
svcctl_ControlService
(
DWORD
__cdecl
svcctl_ControlService
(
SC_RPC_HANDLE
hService
,
DWORD
dwControl
,
SERVICE_STATUS
*
lpServiceStatus
)
...
...
@@ -1080,7 +1080,7 @@ DWORD svcctl_ControlService(
}
}
DWORD
svcctl_CloseServiceHandle
(
DWORD
__cdecl
svcctl_CloseServiceHandle
(
SC_RPC_HANDLE
*
handle
)
{
WINE_TRACE
(
"(&%p)
\n
"
,
*
handle
);
...
...
@@ -1103,7 +1103,7 @@ void __RPC_USER SC_RPC_LOCK_rundown(SC_RPC_LOCK hLock)
SC_RPC_LOCK_destroy
(
hLock
);
}
DWORD
svcctl_LockServiceDatabase
(
DWORD
__cdecl
svcctl_LockServiceDatabase
(
SC_RPC_HANDLE
hSCManager
,
SC_RPC_LOCK
*
phLock
)
{
...
...
@@ -1133,7 +1133,7 @@ DWORD svcctl_LockServiceDatabase(
return
ERROR_SUCCESS
;
}
DWORD
svcctl_UnlockServiceDatabase
(
DWORD
__cdecl
svcctl_UnlockServiceDatabase
(
SC_RPC_LOCK
*
phLock
)
{
WINE_TRACE
(
"(&%p)
\n
"
,
*
phLock
);
...
...
@@ -1166,7 +1166,7 @@ static BOOL map_state(DWORD state, DWORD mask)
return
FALSE
;
}
DWORD
svcctl_EnumServicesStatusW
(
DWORD
__cdecl
svcctl_EnumServicesStatusW
(
SC_RPC_HANDLE
hmngr
,
DWORD
type
,
DWORD
state
,
...
...
@@ -1260,7 +1260,7 @@ static BOOL match_group(const WCHAR *g1, const WCHAR *g2)
return
FALSE
;
}
DWORD
svcctl_EnumServicesStatusExW
(
DWORD
__cdecl
svcctl_EnumServicesStatusExW
(
SC_RPC_HANDLE
hmngr
,
DWORD
type
,
DWORD
state
,
...
...
@@ -1345,164 +1345,141 @@ DWORD svcctl_EnumServicesStatusExW(
return
ERROR_SUCCESS
;
}
DWORD
svcctl_QueryServiceObjectSecurity
(
void
)
DWORD
__cdecl
svcctl_QueryServiceObjectSecurity
(
void
)
{
WINE_FIXME
(
"
\n
"
);
return
ERROR_CALL_NOT_IMPLEMENTED
;
}
DWORD
svcctl_SetServiceObjectSecurity
(
void
)
DWORD
__cdecl
svcctl_SetServiceObjectSecurity
(
void
)
{
WINE_FIXME
(
"
\n
"
);
return
ERROR_CALL_NOT_IMPLEMENTED
;
}
DWORD
svcctl_QueryServiceStatus
(
void
)
DWORD
__cdecl
svcctl_QueryServiceStatus
(
void
)
{
WINE_FIXME
(
"
\n
"
);
return
ERROR_CALL_NOT_IMPLEMENTED
;
}
DWORD
svcctl_NotifyBootConfigStatus
(
void
)
DWORD
__cdecl
svcctl_NotifyBootConfigStatus
(
void
)
{
WINE_FIXME
(
"
\n
"
);
return
ERROR_CALL_NOT_IMPLEMENTED
;
}
DWORD
svcctl_SCSetServiceBitsW
(
void
)
DWORD
__cdecl
svcctl_SCSetServiceBitsW
(
void
)
{
WINE_FIXME
(
"
\n
"
);
return
ERROR_CALL_NOT_IMPLEMENTED
;
}
DWORD
svcctl_EnumDependentServicesW
(
void
)
DWORD
__cdecl
svcctl_EnumDependentServicesW
(
void
)
{
WINE_FIXME
(
"
\n
"
);
return
ERROR_CALL_NOT_IMPLEMENTED
;
}
DWORD
svcctl_QueryServiceLockStatusW
(
void
)
DWORD
__cdecl
svcctl_QueryServiceLockStatusW
(
void
)
{
WINE_FIXME
(
"
\n
"
);
return
ERROR_CALL_NOT_IMPLEMENTED
;
}
DWORD
svcctl_SCSetServiceBitsA
(
void
)
DWORD
__cdecl
svcctl_SCSetServiceBitsA
(
void
)
{
WINE_FIXME
(
"
\n
"
);
return
ERROR_CALL_NOT_IMPLEMENTED
;
}
DWORD
svcctl_ChangeServiceConfigA
(
void
)
DWORD
__cdecl
svcctl_ChangeServiceConfigA
(
void
)
{
WINE_FIXME
(
"
\n
"
);
return
ERROR_CALL_NOT_IMPLEMENTED
;
}
DWORD
svcctl_CreateServiceA
(
void
)
DWORD
__cdecl
svcctl_CreateServiceA
(
void
)
{
WINE_FIXME
(
"
\n
"
);
return
ERROR_CALL_NOT_IMPLEMENTED
;
}
DWORD
svcctl_EnumDependentServicesA
(
void
)
DWORD
__cdecl
svcctl_EnumDependentServicesA
(
void
)
{
WINE_FIXME
(
"
\n
"
);
return
ERROR_CALL_NOT_IMPLEMENTED
;
}
DWORD
svcctl_EnumServicesStatusA
(
void
)
DWORD
__cdecl
svcctl_EnumServicesStatusA
(
void
)
{
WINE_FIXME
(
"
\n
"
);
return
ERROR_CALL_NOT_IMPLEMENTED
;
}
DWORD
svcctl_OpenSCManagerA
(
void
)
DWORD
__cdecl
svcctl_OpenSCManagerA
(
void
)
{
WINE_FIXME
(
"
\n
"
);
return
ERROR_CALL_NOT_IMPLEMENTED
;
}
DWORD
svcctl_OpenServiceA
(
void
)
DWORD
__cdecl
svcctl_OpenServiceA
(
void
)
{
WINE_FIXME
(
"
\n
"
);
return
ERROR_CALL_NOT_IMPLEMENTED
;
}
DWORD
svcctl_QueryServiceConfigA
(
void
)
DWORD
__cdecl
svcctl_QueryServiceConfigA
(
void
)
{
WINE_FIXME
(
"
\n
"
);
return
ERROR_CALL_NOT_IMPLEMENTED
;
}
DWORD
svcctl_QueryServiceLockStatusA
(
void
)
DWORD
__cdecl
svcctl_QueryServiceLockStatusA
(
void
)
{
WINE_FIXME
(
"
\n
"
);
return
ERROR_CALL_NOT_IMPLEMENTED
;
}
DWORD
svcctl_StartServiceA
(
void
)
DWORD
__cdecl
svcctl_StartServiceA
(
void
)
{
WINE_FIXME
(
"
\n
"
);
return
ERROR_CALL_NOT_IMPLEMENTED
;
}
DWORD
svcctl_GetServiceDisplayNameA
(
void
)
DWORD
__cdecl
svcctl_GetServiceDisplayNameA
(
void
)
{
WINE_FIXME
(
"
\n
"
);
return
ERROR_CALL_NOT_IMPLEMENTED
;
}
DWORD
svcctl_GetServiceKeyNameA
(
void
)
DWORD
__cdecl
svcctl_GetServiceKeyNameA
(
void
)
{
WINE_FIXME
(
"
\n
"
);
return
ERROR_CALL_NOT_IMPLEMENTED
;
}
DWORD
svcctl_GetCurrentGroupStateW
(
void
)
DWORD
__cdecl
svcctl_GetCurrentGroupStateW
(
void
)
{
WINE_FIXME
(
"
\n
"
);
return
ERROR_CALL_NOT_IMPLEMENTED
;
}
DWORD
svcctl_EnumServiceGroupW
(
void
)
DWORD
__cdecl
svcctl_EnumServiceGroupW
(
void
)
{
WINE_FIXME
(
"
\n
"
);
return
ERROR_CALL_NOT_IMPLEMENTED
;
}
DWORD
svcctl_ChangeServiceConfig2A
(
void
)
DWORD
__cdecl
svcctl_ChangeServiceConfig2A
(
void
)
{
WINE_FIXME
(
"
\n
"
);
return
ERROR_CALL_NOT_IMPLEMENTED
;
}
DWORD
svcctl_QueryServiceConfig2A
(
void
)
DWORD
__cdecl
svcctl_QueryServiceConfig2A
(
void
)
{
WINE_FIXME
(
"
\n
"
);
return
ERROR_CALL_NOT_IMPLEMENTED
;
...
...
tools/widl/client.c
View file @
717bd664
...
...
@@ -78,9 +78,9 @@ static void write_client_func_decl( const type_t *iface, const var_t *func )
const
var_list_t
*
args
=
type_get_function_args
(
func
->
type
);
type_t
*
rettype
=
type_function_get_rettype
(
func
->
type
);
if
(
!
callconv
)
callconv
=
"__cdecl"
;
write_type_decl_left
(
client
,
rettype
);
if
(
needs_space_after
(
rettype
))
fprintf
(
client
,
" "
);
if
(
callconv
)
fprintf
(
client
,
"%s "
,
callconv
);
fprintf
(
client
,
" %s "
,
callconv
);
fprintf
(
client
,
"%s%s(
\n
"
,
prefix_client
,
get_name
(
func
));
indent
++
;
if
(
args
)
...
...
tools/widl/header.c
View file @
717bd664
...
...
@@ -994,10 +994,10 @@ static void write_function_proto(FILE *header, const type_t *iface, const var_t
{
const
char
*
callconv
=
get_attrp
(
fun
->
type
->
attrs
,
ATTR_CALLCONV
);
if
(
!
callconv
)
callconv
=
"__cdecl"
;
/* FIXME: do we need to handle call_as? */
write_type_decl_left
(
header
,
type_function_get_rettype
(
fun
->
type
));
fprintf
(
header
,
" "
);
if
(
callconv
)
fprintf
(
header
,
"%s "
,
callconv
);
fprintf
(
header
,
" %s "
,
callconv
);
fprintf
(
header
,
"%s%s(
\n
"
,
prefix
,
get_name
(
fun
));
if
(
type_get_function_args
(
fun
->
type
))
write_args
(
header
,
type_get_function_args
(
fun
->
type
),
iface
->
name
,
0
,
TRUE
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment