[PATCH] mstask: Add stdcall to cdecl thunks for AT Service RPC API.

Dmitry Timoshkov dmitry at baikal.ru
Fri May 11 05:30:52 CDT 2018


Signed-off-by: Dmitry Timoshkov <dmitry at baikal.ru>
---
 dlls/mstask/mstask.spec   | 16 ++++++++--------
 dlls/mstask/mstask_main.c | 21 +++++++++++++++++++++
 2 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/dlls/mstask/mstask.spec b/dlls/mstask/mstask.spec
index dcfb20cab3..df8ea7ad78 100644
--- a/dlls/mstask/mstask.spec
+++ b/dlls/mstask/mstask.spec
@@ -2,10 +2,10 @@
 @ stdcall -private DllCanUnloadNow()
 @ stdcall -private DllGetClassObject(ptr ptr ptr)
 @ stub GetNetScheduleAccountInformation
-@ stdcall NetrJobAdd(wstr ptr ptr)
-@ stdcall NetrJobDel(wstr long long)
-@ stdcall NetrJobEnum(wstr ptr long ptr ptr)
-@ stdcall NetrJobGetInfo(wstr long ptr)
+@ stdcall NetrJobAdd(wstr ptr ptr) NetrJobAdd_wrapper
+@ stdcall NetrJobDel(wstr long long) NetrJobDel_wrapper
+@ stdcall NetrJobEnum(wstr ptr long ptr ptr) NetrJobEnum_wrapper
+@ stdcall NetrJobGetInfo(wstr long ptr) NetrJobGetInfo_wrapper
 @ stub SAGetAccountInformation
 @ stub SAGetNSAccountInformation
 @ stub SASetAccountInformation
@@ -15,10 +15,10 @@
 @ stub _DllCanUnloadNow at 0
 @ stub _DllGetClassObject at 12
 @ stub _GetNetScheduleAccountInformation at 12
-@ stdcall _NetrJobAdd at 12(wstr ptr ptr) NetrJobAdd
-@ stdcall _NetrJobDel at 12(wstr long long) NetrJobDel
-@ stdcall _NetrJobEnum at 20(wstr ptr long ptr ptr) NetrJobEnum
-@ stdcall _NetrJobGetInfo at 12(wstr long ptr) NetrJobGetInfo
+@ stdcall _NetrJobAdd at 12(wstr ptr ptr) NetrJobAdd_wrapper
+@ stdcall _NetrJobDel at 12(wstr long long) NetrJobDel_wrapper
+@ stdcall _NetrJobEnum at 20(wstr ptr long ptr ptr) NetrJobEnum_wrapper
+@ stdcall _NetrJobGetInfo at 12(wstr long ptr) NetrJobGetInfo_wrapper
 @ stub _SAGetAccountInformation at 16
 @ stub _SAGetNSAccountInformation at 12
 @ stub _SASetAccountInformation at 20
diff --git a/dlls/mstask/mstask_main.c b/dlls/mstask/mstask_main.c
index c1e9036819..e747af69e8 100644
--- a/dlls/mstask/mstask_main.c
+++ b/dlls/mstask/mstask_main.c
@@ -79,6 +79,27 @@ HRESULT WINAPI DllUnregisterServer(void)
     return __wine_unregister_resources( hInst );
 }
 
+DWORD WINAPI NetrJobAdd_wrapper(ATSVC_HANDLE server_name, LPAT_INFO info, LPDWORD jobid)
+{
+    return NetrJobAdd(server_name, info, jobid);
+}
+
+DWORD WINAPI NetrJobDel_wrapper(ATSVC_HANDLE server_name, DWORD min_jobid, DWORD max_jobid)
+{
+    return NetrJobDel(server_name, min_jobid, max_jobid);
+}
+
+DWORD WINAPI NetrJobEnum_wrapper(ATSVC_HANDLE server_name, LPAT_ENUM_CONTAINER container,
+                                 DWORD max_length, LPDWORD total, LPDWORD resume)
+{
+    return NetrJobEnum(server_name, container, max_length, total, resume);
+}
+
+DWORD WINAPI NetrJobGetInfo_wrapper(ATSVC_HANDLE server_name, DWORD jobid, LPAT_INFO *info)
+{
+    return NetrJobGetInfo(server_name, jobid, info);
+}
+
 DECLSPEC_HIDDEN void __RPC_FAR *__RPC_USER MIDL_user_allocate(SIZE_T n)
 {
     return HeapAlloc(GetProcessHeap(), 0, n);
-- 
2.16.3




More information about the wine-devel mailing list