Fixed some issues found by winapi_check
Patrik Stridvall
ps at leissner.se
Mon May 17 14:42:30 CDT 2004
*** winapi_checked
* dlls/dbghelp/symbol.c,
dlls/dsound/capture.c,
dlls/dxdiagn/dxdiag_main.c,
dlls/dxdiagn/regsvr.c,
dlls/kernel/wowthunk.c,
dlls/mpr/mpr_main.c,
dlls/msi/msi.c,
dlls/msvcrt/dir.c,
dlls/msvcrt/misc.c,
dlls/ntdll/thread.c,
dlls/ole32/storage32.c,
dlls/rpcrt4/rpc_binding.c,
dlls/secur32/secur32.c,
dlls/secur32/wrapper.c,
dlls/setupapi/devinst16.c,
dlls/setupapi/setupx16.h,
dlls/shell32/shellord.c,
dlls/uxtheme/uxtheme.spec,
dlls/wininet/wininet.spec,
dlls/x11drv/x11drv.spec:
Fixed some issues found by winapi_check.
---8<---
Index: wine/dlls/dbghelp/symbol.c
===================================================================
RCS file: /home/wine/wine/dlls/dbghelp/symbol.c,v
retrieving revision 1.3
diff -u -u -r1.3 symbol.c
--- wine/dlls/dbghelp/symbol.c 30 Apr 2004 04:15:41 -0000 1.3
+++ wine/dlls/dbghelp/symbol.c 17 May 2004 17:27:39 -0000
@@ -19,19 +19,22 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
+
#include "config.h"
+
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <limits.h>
#include <sys/types.h>
#include <assert.h>
-#include <regex.h>
-#include "wine/debug.h"
+#ifdef HAVE_REGEX_H
+# include <regex.h>
+#endif
+#include "wine/debug.h"
#include "dbghelp_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(dbghelp);
Index: wine/dlls/dsound/capture.c
===================================================================
RCS file: /home/wine/wine/dlls/dsound/capture.c,v
retrieving revision 1.22
diff -u -u -r1.22 capture.c
--- wine/dlls/dsound/capture.c 19 Apr 2004 02:58:45 -0000 1.22
+++ wine/dlls/dsound/capture.c 17 May 2004 17:27:40 -0000
@@ -1687,7 +1687,7 @@
IClassFactoryImpl DSOUND_CAPTURE_CF = { &DSCCF_Vtbl, 1 };
/***************************************************************************
- * DirectSoundFullDuplexCreate8 [DSOUND.10]
+ * DirectSoundFullDuplexCreate [DSOUND.10]
*
* Create and initialize a DirectSoundFullDuplex interface.
*
@@ -1709,7 +1709,7 @@
* DSERR_OUTOFMEMORY DSERR_INVALIDCALL DSERR_NODRIVER
*/
HRESULT WINAPI
-DirectSoundFullDuplexCreate8(
+DirectSoundFullDuplexCreate(
LPCGUID pcGuidCaptureDevice,
LPCGUID pcGuidRenderDevice,
LPCDSCBUFFERDESC pcDSCBufferDesc,
Index: wine/dlls/dxdiagn/dxdiag_main.c
===================================================================
RCS file: /home/wine/wine/dlls/dxdiagn/dxdiag_main.c,v
retrieving revision 1.1
diff -u -u -r1.1 dxdiag_main.c
--- wine/dlls/dxdiagn/dxdiag_main.c 16 Apr 2004 00:26:14 -0000 1.1
+++ wine/dlls/dxdiagn/dxdiag_main.c 17 May 2004 17:27:40 -0000
@@ -92,7 +92,7 @@
};
/***********************************************************************
- * DllCanUnloadNow (DXDiag.@)
+ * DllCanUnloadNow (DXDIAGN.@)
*/
HRESULT WINAPI DllCanUnloadNow(void)
{
@@ -100,7 +100,7 @@
}
/***********************************************************************
- * DllGetClassObject (DXDiag.@)
+ * DllGetClassObject (DXDIAGN.@)
*/
HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
{
Index: wine/dlls/dxdiagn/regsvr.c
===================================================================
RCS file: /home/wine/wine/dlls/dxdiagn/regsvr.c,v
retrieving revision 1.1
diff -u -u -r1.1 regsvr.c
--- wine/dlls/dxdiagn/regsvr.c 16 Apr 2004 00:26:14 -0000 1.1
+++ wine/dlls/dxdiagn/regsvr.c 17 May 2004 17:27:40 -0000
@@ -525,7 +525,7 @@
};
/***********************************************************************
- * DllRegisterServer (DPNET.@)
+ * DllRegisterServer (DXDIAGN.@)
*/
HRESULT WINAPI DllRegisterServer(void)
{
@@ -540,7 +540,7 @@
}
/***********************************************************************
- * DllUnregisterServer (DPNET.@)
+ * DllUnregisterServer (DXDIAGN.@)
*/
HRESULT WINAPI DllUnregisterServer(void)
{
Index: wine/dlls/kernel/wowthunk.c
===================================================================
RCS file: /home/wine/wine/dlls/kernel/wowthunk.c,v
retrieving revision 1.51
diff -u -u -r1.51 wowthunk.c
--- wine/dlls/kernel/wowthunk.c 25 Mar 2004 05:32:05 -0000 1.51
+++ wine/dlls/kernel/wowthunk.c 17 May 2004 17:27:41 -0000
@@ -78,7 +78,8 @@
/* symbols exported from relay16.s */
extern DWORD WINAPI wine_call_to_16( FARPROC16 target, DWORD cbArgs, PEXCEPTION_HANDLER handler );
extern void WINAPI wine_call_to_16_regs( CONTEXT86 *context, DWORD cbArgs, PEXCEPTION_HANDLER handler );
-extern void Call16_Ret_Start(), Call16_Ret_End();
+extern void Call16_Ret_Start();
+extern void Call16_Ret_End();
extern void CallTo16_Ret();
extern void CALL32_CBClient_Ret();
extern void CALL32_CBClientEx_Ret();
Index: wine/dlls/mpr/mpr_main.c
===================================================================
RCS file: /home/wine/wine/dlls/mpr/mpr_main.c,v
retrieving revision 1.11
diff -u -u -r1.11 mpr_main.c
--- wine/dlls/mpr/mpr_main.c 5 Apr 2004 23:14:26 -0000 1.11
+++ wine/dlls/mpr/mpr_main.c 17 May 2004 17:27:41 -0000
@@ -81,6 +81,9 @@
return S_OK;
}
+/*****************************************************************
+ * DllMain [MPR.init]
+ */
BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
{
switch (fdwReason) {
Index: wine/dlls/msi/msi.c
===================================================================
RCS file: /home/wine/wine/dlls/msi/msi.c,v
retrieving revision 1.19
diff -u -u -r1.19 msi.c
--- wine/dlls/msi/msi.c 28 Apr 2004 00:29:25 -0000 1.19
+++ wine/dlls/msi/msi.c 17 May 2004 17:27:41 -0000
@@ -1165,6 +1165,9 @@
static IClassFactoryImpl Msi_CF = {&MsiCF_Vtbl, 1 };
+/******************************************************************
+ * DllGetClassObject (MSI.@)
+ */
HRESULT WINAPI MSI_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) {
FIXME("(%s, %s, %p): almost a stub.\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv);
if (IsEqualCLSID (rclsid, &CLSID_IMsiServer)) {
@@ -1192,6 +1195,9 @@
return CLASS_E_CLASSNOTAVAILABLE;
}
+/******************************************************************
+ * DllGetVerison (MSI.@)
+ */
HRESULT WINAPI MSI_DllGetVersion(DLLVERSIONINFO *pdvi)
{
TRACE("%p\n",pdvi);
@@ -1207,6 +1213,9 @@
return S_OK;
}
+/******************************************************************
+ * DllCanUnloadNow (MSI.@)
+ */
BOOL WINAPI MSI_DllCanUnloadNow(void)
{
return S_FALSE;
Index: wine/dlls/msvcrt/dir.c
===================================================================
RCS file: /home/wine/wine/dlls/msvcrt/dir.c,v
retrieving revision 1.27
diff -u -u -r1.27 dir.c
--- wine/dlls/msvcrt/dir.c 16 Mar 2004 19:17:11 -0000 1.27
+++ wine/dlls/msvcrt/dir.c 17 May 2004 17:27:41 -0000
@@ -599,7 +599,7 @@
* NOTES
* See GetLastError().
*/
-unsigned int MSVCRT__getdiskfree(unsigned int disk, struct MSVCRT(_diskfree_t)* d)
+unsigned int MSVCRT__getdiskfree(unsigned int disk, struct MSVCRT__diskfree_t * d)
{
WCHAR drivespec[4] = {'@', ':', '\\', 0};
DWORD ret[4];
Index: wine/dlls/msvcrt/misc.c
===================================================================
RCS file: /home/wine/wine/dlls/msvcrt/misc.c,v
retrieving revision 1.10
diff -u -u -r1.10 misc.c
--- wine/dlls/msvcrt/misc.c 15 Mar 2003 22:26:09 -0000 1.10
+++ wine/dlls/msvcrt/misc.c 17 May 2004 17:27:41 -0000
@@ -121,6 +121,7 @@
#ifdef __i386__
# ifdef __GNUC__
+
__ASM_GLOBAL_FUNC(_chkesp,
"jnz 1f\n\t"
"ret\n"
@@ -143,7 +144,13 @@
}
# else /* __GNUC__ */
-void _chkesp(void) { }
+
+/**********************************************************************/
+
+void _chkesp(void)
+{
+}
+
# endif /* __GNUC__ */
#endif /* __i386__ */
Index: wine/dlls/ntdll/thread.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/thread.c,v
retrieving revision 1.17
diff -u -u -r1.17 thread.c
--- wine/dlls/ntdll/thread.c 15 Apr 2004 05:04:53 -0000 1.17
+++ wine/dlls/ntdll/thread.c 17 May 2004 17:27:42 -0000
@@ -565,12 +565,20 @@
* NtCurrentTeb (NTDLL.@)
*/
#if defined(__i386__) && defined(__GNUC__)
+
__ASM_GLOBAL_FUNC( NtCurrentTeb, ".byte 0x64\n\tmovl 0x18,%eax\n\tret" );
+
#elif defined(__i386__) && defined(_MSC_VER)
+
/* Nothing needs to be done. MS C "magically" exports the inline version from winnt.h */
+
#else
+
+/**********************************************************************/
+
TEB * WINAPI NtCurrentTeb(void)
{
return wine_pthread_get_current_teb();
}
+
#endif /* __i386__ */
Index: wine/dlls/ole32/storage32.c
===================================================================
RCS file: /home/wine/wine/dlls/ole32/storage32.c,v
retrieving revision 1.52
diff -u -u -r1.52 storage32.c
--- wine/dlls/ole32/storage32.c 4 May 2004 04:13:06 -0000 1.52
+++ wine/dlls/ole32/storage32.c 17 May 2004 17:27:44 -0000
@@ -5536,6 +5536,9 @@
return hr;
}
+/******************************************************************************
+ * StgCreateStorageEx [OLE32.@]
+ */
HRESULT WINAPI StgCreateStorageEx(const WCHAR* pwcsName, DWORD grfMode, DWORD stgfmt, DWORD grfAttrs, STGOPTIONS* pStgOptions, void* reserved, REFIID riid, void** ppObjectOpen)
{
TRACE("(%s, %lx, %lx, %lx, %p, %p, %p, %p)\n", debugstr_w(pwcsName),
Index: wine/dlls/rpcrt4/rpc_binding.c
===================================================================
RCS file: /home/wine/wine/dlls/rpcrt4/rpc_binding.c,v
retrieving revision 1.24
diff -u -u -r1.24 rpc_binding.c
--- wine/dlls/rpcrt4/rpc_binding.c 26 Apr 2004 23:33:39 -0000 1.24
+++ wine/dlls/rpcrt4/rpc_binding.c 17 May 2004 17:27:44 -0000
@@ -1121,7 +1121,7 @@
/***********************************************************************
* RpcNetworkIsProtseqValidA (RPCRT4.@)
*/
-RPC_STATUS RPC_ENTRY RpcNetworkIsProtseqValidA(unsigned char *protseq) {
+RPC_STATUS WINAPI RpcNetworkIsProtseqValidA(unsigned char *protseq) {
UNICODE_STRING protseqW;
if (!protseq) return RPC_S_INVALID_RPC_PROTSEQ; /* ? */
@@ -1143,7 +1143,7 @@
* ncalrpc local-only rpc over LPC (LPC is not really used)
* ncacn_np rpc over named pipes
*/
-RPC_STATUS RPC_ENTRY RpcNetworkIsProtseqValidW(LPWSTR protseq) {
+RPC_STATUS WINAPI RpcNetworkIsProtseqValidW(LPWSTR protseq) {
static const WCHAR protseqsW[][15] = {
{'n','c','a','l','r','p','c',0},
{'n','c','a','c','n','_','n','p',0}
Index: wine/dlls/secur32/secur32.c
===================================================================
RCS file: /home/wine/wine/dlls/secur32/secur32.c,v
retrieving revision 1.2
diff -u -u -r1.2 secur32.c
--- wine/dlls/secur32/secur32.c 20 Apr 2004 00:34:52 -0000 1.2
+++ wine/dlls/secur32/secur32.c 17 May 2004 17:27:45 -0000
@@ -154,12 +154,18 @@
SetContextAttributesW
};
-PSecurityFunctionTableA SEC_ENTRY InitSecurityInterfaceA(void)
+/***********************************************************************
+ * InitSecurityInterfaceA (SECUR32.@)
+ */
+PSecurityFunctionTableA WINAPI InitSecurityInterfaceA(void)
{
return &securityFunctionTableA;
}
-PSecurityFunctionTableW SEC_ENTRY InitSecurityInterfaceW(void)
+/***********************************************************************
+ * InitSecurityInterfaceW (SECUR32.@)
+ */
+PSecurityFunctionTableW WINAPI InitSecurityInterfaceW(void)
{
return &securityFunctionTableW;
}
@@ -686,11 +692,14 @@
DeleteCriticalSection(&cs);
}
-/* Doh--if pv was allocated by a crypto package, this may not be correct.
+/***********************************************************************
+ * FreeContextBuffer (SECUR32.@)
+ *
+ * Doh--if pv was allocated by a crypto package, this may not be correct.
* The sample ssp seems to use LocalAlloc/LocalFee, but there doesn't seem to
* be any guarantee, nor is there an alloc function in secur32.
*/
-SECURITY_STATUS SEC_ENTRY FreeContextBuffer(PVOID pv)
+SECURITY_STATUS WINAPI FreeContextBuffer(PVOID pv)
{
SECURITY_STATUS ret;
@@ -707,7 +716,10 @@
return ret;
}
-SECURITY_STATUS SEC_ENTRY EnumerateSecurityPackagesW(PULONG pcPackages,
+/***********************************************************************
+ * EnumerateSecurityPackagesW (SECUR32.@)
+ */
+SECURITY_STATUS WINAPI EnumerateSecurityPackagesW(PULONG pcPackages,
PSecPkgInfoW *ppPackageInfo)
{
SECURITY_STATUS ret = SEC_E_OK;
@@ -845,7 +857,10 @@
return ret;
}
-SECURITY_STATUS SEC_ENTRY EnumerateSecurityPackagesA(PULONG pcPackages,
+/***********************************************************************
+ * EnumerateSecurityPackagesA (SECUR32.@)
+ */
+SECURITY_STATUS WINAPI EnumerateSecurityPackagesA(PULONG pcPackages,
PSecPkgInfoA *ppPackageInfo)
{
SECURITY_STATUS ret;
@@ -865,6 +880,9 @@
return ret;
}
+/***********************************************************************
+ * DllMain (SECUR32.0)
+ */
BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
{
if (fdwReason == DLL_PROCESS_ATTACH)
Index: wine/dlls/secur32/wrapper.c
===================================================================
RCS file: /home/wine/wine/dlls/secur32/wrapper.c,v
retrieving revision 1.1
diff -u -u -r1.1 wrapper.c
--- wine/dlls/secur32/wrapper.c 2 Mar 2004 04:57:35 -0000 1.1
+++ wine/dlls/secur32/wrapper.c 17 May 2004 17:27:45 -0000
@@ -56,7 +56,10 @@
return ret;
}
-SECURITY_STATUS SEC_ENTRY AcquireCredentialsHandleA(
+/***********************************************************************
+ * AcquireCredentialsHandleA (SECUR32.@)
+ */
+SECURITY_STATUS WINAPI AcquireCredentialsHandleA(
SEC_CHAR *pszPrincipal, SEC_CHAR *pszPackage, ULONG fCredentialsUse,
PLUID pvLogonID, PVOID pAuthData, SEC_GET_KEY_FN pGetKeyFn,
PVOID pvGetKeyArgument, PCredHandle phCredential, PTimeStamp ptsExpiry)
@@ -99,7 +102,10 @@
return ret;
}
-SECURITY_STATUS SEC_ENTRY AcquireCredentialsHandleW(
+/***********************************************************************
+ * AcquireCredentialsHandleW (SECUR32.@)
+ */
+SECURITY_STATUS WINAPI AcquireCredentialsHandleW(
SEC_WCHAR *pszPrincipal, SEC_WCHAR *pszPackage, ULONG fCredentialsUse,
PLUID pvLogonID, PVOID pAuthData, SEC_GET_KEY_FN pGetKeyFn,
PVOID pvGetKeyArgument, PCredHandle phCredential, PTimeStamp ptsExpiry)
@@ -142,7 +148,10 @@
return ret;
}
-SECURITY_STATUS SEC_ENTRY FreeCredentialsHandle(
+/***********************************************************************
+ * FreeCredentialsHandle (SECUR32.@)
+ */
+SECURITY_STATUS WINAPI FreeCredentialsHandle(
PCredHandle phCredential)
{
SECURITY_STATUS ret;
@@ -165,7 +174,10 @@
return ret;
}
-SECURITY_STATUS SEC_ENTRY QueryCredentialsAttributesA(
+/***********************************************************************
+ * QueryCredentialsAttributesA (SECUR32.@)
+ */
+SECURITY_STATUS WINAPI QueryCredentialsAttributesA(
PCredHandle phCredential, unsigned long ulAttribute, void *pBuffer)
{
SECURITY_STATUS ret;
@@ -192,7 +204,10 @@
return ret;
}
-SECURITY_STATUS SEC_ENTRY QueryCredentialsAttributesW(
+/***********************************************************************
+ * QueryCredentialsAttributesW (SECUR32.@)
+ */
+SECURITY_STATUS WINAPI QueryCredentialsAttributesW(
PCredHandle phCredential, unsigned long ulAttribute, void *pBuffer)
{
SECURITY_STATUS ret;
@@ -219,7 +234,10 @@
return ret;
}
-SECURITY_STATUS SEC_ENTRY InitializeSecurityContextA(
+/***********************************************************************
+ * InitializeSecurityContextA (SECUR32.@)
+ */
+SECURITY_STATUS WINAPI InitializeSecurityContextA(
PCredHandle phCredential, PCtxtHandle phContext,
SEC_CHAR *pszTargetName, unsigned long fContextReq,
unsigned long Reserved1, unsigned long TargetDataRep, PSecBufferDesc pInput,
@@ -265,7 +283,10 @@
return ret;
}
-SECURITY_STATUS SEC_ENTRY InitializeSecurityContextW(
+/***********************************************************************
+ * InitializeSecurityContextW (SECUR32.@)
+ */
+SECURITY_STATUS WINAPI InitializeSecurityContextW(
PCredHandle phCredential, PCtxtHandle phContext,
SEC_WCHAR *pszTargetName, unsigned long fContextReq,
unsigned long Reserved1, unsigned long TargetDataRep, PSecBufferDesc pInput,
@@ -311,7 +332,10 @@
return ret;
}
-SECURITY_STATUS SEC_ENTRY AcceptSecurityContext(
+/***********************************************************************
+ * AcceptSecurityContext (SECUR32.@)
+ */
+SECURITY_STATUS WINAPI AcceptSecurityContext(
PCredHandle phCredential, PCtxtHandle phContext, PSecBufferDesc pInput,
unsigned long fContextReq, unsigned long TargetDataRep,
PCtxtHandle phNewContext, PSecBufferDesc pOutput,
@@ -355,7 +379,10 @@
return ret;
}
-SECURITY_STATUS SEC_ENTRY CompleteAuthToken(PCtxtHandle phContext,
+/***********************************************************************
+ * CompleteAuthToken (SECUR32.@)
+ */
+SECURITY_STATUS WINAPI CompleteAuthToken(PCtxtHandle phContext,
PSecBufferDesc pToken)
{
SECURITY_STATUS ret;
@@ -382,7 +409,10 @@
return ret;
}
-SECURITY_STATUS SEC_ENTRY DeleteSecurityContext(PCtxtHandle phContext)
+/***********************************************************************
+ * DeleteSecurityContext (SECUR32.@)
+ */
+SECURITY_STATUS WINAPI DeleteSecurityContext(PCtxtHandle phContext)
{
SECURITY_STATUS ret;
@@ -404,7 +434,10 @@
return ret;
}
-SECURITY_STATUS SEC_ENTRY ApplyControlToken(PCtxtHandle phContext,
+/***********************************************************************
+ * ApplyControlToken (SECUR32.@)
+ */
+SECURITY_STATUS WINAPI ApplyControlToken(PCtxtHandle phContext,
PSecBufferDesc pInput)
{
SECURITY_STATUS ret;
@@ -431,7 +464,10 @@
return ret;
}
-SECURITY_STATUS SEC_ENTRY QueryContextAttributesA(PCtxtHandle phContext,
+/***********************************************************************
+ * QueryContextAttributesA (SECUR32.@)
+ */
+SECURITY_STATUS WINAPI QueryContextAttributesA(PCtxtHandle phContext,
unsigned long ulAttribute, void *pBuffer)
{
SECURITY_STATUS ret;
@@ -458,7 +494,10 @@
return ret;
}
-SECURITY_STATUS SEC_ENTRY QueryContextAttributesW(PCtxtHandle phContext,
+/***********************************************************************
+ * QueryContextAttributesW (SECUR32.@)
+ */
+SECURITY_STATUS WINAPI QueryContextAttributesW(PCtxtHandle phContext,
unsigned long ulAttribute, void *pBuffer)
{
SECURITY_STATUS ret;
@@ -485,7 +524,10 @@
return ret;
}
-SECURITY_STATUS SEC_ENTRY ImpersonateSecurityContext(PCtxtHandle phContext)
+/***********************************************************************
+ * ImpersonateSecurityContext (SECUR32.@)
+ */
+SECURITY_STATUS WINAPI ImpersonateSecurityContext(PCtxtHandle phContext)
{
SECURITY_STATUS ret;
@@ -511,7 +553,10 @@
return ret;
}
-SECURITY_STATUS SEC_ENTRY RevertSecurityContext(PCtxtHandle phContext)
+/***********************************************************************
+ * RevertSecurityContext (SECUR32.@)
+ */
+SECURITY_STATUS WINAPI RevertSecurityContext(PCtxtHandle phContext)
{
SECURITY_STATUS ret;
@@ -537,7 +582,10 @@
return ret;
}
-SECURITY_STATUS SEC_ENTRY MakeSignature(PCtxtHandle phContext, ULONG fQOP,
+/***********************************************************************
+ * MakeSignature (SECUR32.@)
+ */
+SECURITY_STATUS WINAPI MakeSignature(PCtxtHandle phContext, ULONG fQOP,
PSecBufferDesc pMessage, ULONG MessageSeqNo)
{
SECURITY_STATUS ret;
@@ -564,7 +612,10 @@
return ret;
}
-SECURITY_STATUS SEC_ENTRY VerifySignature(PCtxtHandle phContext,
+/***********************************************************************
+ * VerifySignature (SECUR32.@)
+ */
+SECURITY_STATUS WINAPI VerifySignature(PCtxtHandle phContext,
PSecBufferDesc pMessage, ULONG MessageSeqNo, PULONG pfQOP)
{
SECURITY_STATUS ret;
@@ -591,7 +642,10 @@
return ret;
}
-SECURITY_STATUS SEC_ENTRY QuerySecurityPackageInfoA(SEC_CHAR *pszPackageName,
+/***********************************************************************
+ * QuerySecurityPackageInfoA (SECUR32.@)
+ */
+SECURITY_STATUS WINAPI QuerySecurityPackageInfoA(SEC_CHAR *pszPackageName,
PSecPkgInfoA *ppPackageInfo)
{
SECURITY_STATUS ret;
@@ -655,7 +709,10 @@
return ret;
}
-SECURITY_STATUS SEC_ENTRY QuerySecurityPackageInfoW(SEC_WCHAR *pszPackageName,
+/***********************************************************************
+ * QuerySecurityPackageInfoW (SECUR32.@)
+ */
+SECURITY_STATUS WINAPI QuerySecurityPackageInfoW(SEC_WCHAR *pszPackageName,
PSecPkgInfoW *ppPackageInfo)
{
SECURITY_STATUS ret;
@@ -710,7 +767,10 @@
return ret;
}
-SECURITY_STATUS SEC_ENTRY ExportSecurityContext(PCtxtHandle phContext,
+/***********************************************************************
+ * ExportSecurityContext (SECUR32.@)
+ */
+SECURITY_STATUS WINAPI ExportSecurityContext(PCtxtHandle phContext,
ULONG fFlags, PSecBuffer pPackedContext, void **pToken)
{
SECURITY_STATUS ret;
@@ -737,7 +797,10 @@
return ret;
}
-SECURITY_STATUS SEC_ENTRY ImportSecurityContextA(SEC_CHAR *pszPackage,
+/***********************************************************************
+ * ImportSecurityContextA (SECUR32.@)
+ */
+SECURITY_STATUS WINAPI ImportSecurityContextA(SEC_CHAR *pszPackage,
PSecBuffer pPackedContext, void *Token, PCtxtHandle phContext)
{
SECURITY_STATUS ret;
@@ -769,7 +832,10 @@
}
-SECURITY_STATUS SEC_ENTRY ImportSecurityContextW(SEC_WCHAR *pszPackage,
+/***********************************************************************
+ * ImportSecurityContextW (SECUR32.@)
+ */
+SECURITY_STATUS WINAPI ImportSecurityContextW(SEC_WCHAR *pszPackage,
PSecBuffer pPackedContext, void *Token, PCtxtHandle phContext)
{
SECURITY_STATUS ret;
@@ -800,7 +866,10 @@
return ret;
}
-SECURITY_STATUS SEC_ENTRY AddCredentialsA(PCredHandle hCredentials,
+/***********************************************************************
+ * AddCredentialsA (SECUR32.@)
+ */
+SECURITY_STATUS WINAPI AddCredentialsA(PCredHandle hCredentials,
SEC_CHAR *pszPrincipal, SEC_CHAR *pszPackage, unsigned long fCredentialUse,
void *pAuthData, SEC_GET_KEY_FN pGetKeyFn, void *pvGetKeyArgument,
PTimeStamp ptsExpiry)
@@ -832,7 +901,10 @@
return ret;
}
-SECURITY_STATUS SEC_ENTRY AddCredentialsW(PCredHandle hCredentials,
+/***********************************************************************
+ * AddCredentialsW (SECUR32.@)
+ */
+SECURITY_STATUS WINAPI AddCredentialsW(PCredHandle hCredentials,
SEC_WCHAR *pszPrincipal, SEC_WCHAR *pszPackage, unsigned long fCredentialUse,
void *pAuthData, SEC_GET_KEY_FN pGetKeyFn, void *pvGetKeyArgument,
PTimeStamp ptsExpiry)
@@ -864,7 +936,10 @@
return ret;
}
-SECURITY_STATUS SEC_ENTRY QuerySecurityContextToken(PCtxtHandle phContext,
+/***********************************************************************
+ * QuerySecurityContextToken (SECUR32.@)
+ */
+SECURITY_STATUS WINAPI QuerySecurityContextToken(PCtxtHandle phContext,
HANDLE *phToken)
{
SECURITY_STATUS ret;
@@ -891,7 +966,10 @@
return ret;
}
-SECURITY_STATUS SEC_ENTRY EncryptMessage(PCtxtHandle phContext, ULONG fQOP,
+/***********************************************************************
+ * EncryptMessage (SECUR32.@)
+ */
+SECURITY_STATUS WINAPI EncryptMessage(PCtxtHandle phContext, ULONG fQOP,
PSecBufferDesc pMessage, ULONG MessageSeqNo)
{
SECURITY_STATUS ret;
@@ -918,7 +996,10 @@
return ret;
}
-SECURITY_STATUS SEC_ENTRY DecryptMessage(PCtxtHandle phContext,
+/***********************************************************************
+ * DecryptMessage (SECUR32.@)
+ */
+SECURITY_STATUS WINAPI DecryptMessage(PCtxtHandle phContext,
PSecBufferDesc pMessage, ULONG MessageSeqNo, PULONG pfQOP)
{
SECURITY_STATUS ret;
@@ -945,7 +1026,10 @@
return ret;
}
-SECURITY_STATUS SEC_ENTRY SetContextAttributesA(PCtxtHandle phContext,
+/***********************************************************************
+ * SetContextAttributesA (SECUR32.@)
+ */
+SECURITY_STATUS WINAPI SetContextAttributesA(PCtxtHandle phContext,
unsigned long ulAttribute, void *pBuffer, unsigned long cbBuffer)
{
SECURITY_STATUS ret;
@@ -972,7 +1056,10 @@
return ret;
}
-SECURITY_STATUS SEC_ENTRY SetContextAttributesW(PCtxtHandle phContext,
+/***********************************************************************
+ * SetContextAttributesW (SECUR32.@)
+ */
+SECURITY_STATUS WINAPI SetContextAttributesW(PCtxtHandle phContext,
unsigned long ulAttribute, void *pBuffer, unsigned long cbBuffer)
{
SECURITY_STATUS ret;
Index: wine/dlls/setupapi/devinst16.c
===================================================================
RCS file: /home/wine/wine/dlls/setupapi/devinst16.c,v
retrieving revision 1.4
diff -u -u -r1.4 devinst16.c
--- wine/dlls/setupapi/devinst16.c 20 Jan 2004 21:51:46 -0000 1.4
+++ wine/dlls/setupapi/devinst16.c 17 May 2004 17:27:45 -0000
@@ -68,7 +68,7 @@
/***********************************************************************
* DiCallClassInstaller (SETUPX.308)
*/
-RETERR16 WINAPI DiCallClassInstaller16(/*DI_FUNCTIONS*/WORD diFctn, LPDEVICE_INFO16 lpdi)
+RETERR16 WINAPI DiCallClassInstaller16(DI_FUNCTION16 diFctn, LPDEVICE_INFO16 lpdi)
{
FIXME("(%x, %p): stub\n", diFctn, lpdi);
return FALSE;
Index: wine/dlls/setupapi/setupx16.h
===================================================================
RCS file: /home/wine/wine/dlls/setupapi/setupx16.h,v
retrieving revision 1.13
diff -u -u -r1.13 setupx16.h
--- wine/dlls/setupapi/setupx16.h 21 Oct 2003 23:45:43 -0000 1.13
+++ wine/dlls/setupapi/setupx16.h 17 May 2004 17:27:45 -0000
@@ -21,6 +21,7 @@
#include "wine/windef16.h"
+typedef UINT16 DI_FUNCTION16;
typedef UINT16 HINF16;
typedef UINT16 LOGDISKID16;
typedef UINT16 VHSTR;
Index: wine/dlls/shell32/shellord.c
===================================================================
RCS file: /home/wine/wine/dlls/shell32/shellord.c,v
retrieving revision 1.120
diff -u -u -r1.120 shellord.c
--- wine/dlls/shell32/shellord.c 29 Apr 2004 20:01:38 -0000 1.120
+++ wine/dlls/shell32/shellord.c 17 May 2004 17:27:46 -0000
@@ -1502,7 +1502,7 @@
/*************************************************************************
- * SHELL32_256
+ * SHELL32_256 (SHELL32.256)
*/
HRESULT WINAPI SHELL32_256(LPDWORD lpdw0, LPDWORD lpdw1)
{
@@ -1527,6 +1527,9 @@
return ret;
}
+/*************************************************************************
+ * SHFindFiles (SHELL32.90)
+ */
BOOL WINAPI SHFindFiles( LPCITEMIDLIST pidlFolder, LPCITEMIDLIST pidlSaveFile )
{
FIXME("%p %p\n", pidlFolder, pidlSaveFile );
Index: wine/dlls/uxtheme/uxtheme.spec
===================================================================
RCS file: /home/wine/wine/dlls/uxtheme/uxtheme.spec,v
retrieving revision 1.5
diff -u -u -r1.5 uxtheme.spec
--- wine/dlls/uxtheme/uxtheme.spec 7 Apr 2004 18:59:23 -0000 1.5
+++ wine/dlls/uxtheme/uxtheme.spec 17 May 2004 17:27:47 -0000
@@ -82,7 +82,7 @@
@ stdcall GetThemeTextExtent(ptr ptr long long wstr long long ptr ptr)
@ stdcall GetThemeTextMetrics(ptr ptr long long ptr)
@ stdcall GetWindowTheme(ptr)
-@ stdcall HitTestThemeBackground(ptr long long long long ptr long double ptr)
+@ stdcall HitTestThemeBackground(ptr long long long long ptr long long long ptr)
@ stdcall IsAppThemed()
@ stdcall IsThemeActive()
@ stdcall IsThemeBackgroundPartiallyTransparent(ptr long long)
Index: wine/dlls/wininet/wininet.spec
===================================================================
RCS file: /home/wine/wine/dlls/wininet/wininet.spec,v
retrieving revision 1.46
diff -u -u -r1.46 wininet.spec
--- wine/dlls/wininet/wininet.spec 30 Mar 2004 04:36:09 -0000 1.46
+++ wine/dlls/wininet/wininet.spec 17 May 2004 17:27:47 -0000
@@ -18,7 +18,7 @@
@ stdcall InternetInitializeAutoProxyDll(long)
@ stub ShowCertificate
-@ stdcall CommitUrlCacheEntryA(str str double double long str long str str)
+@ stdcall CommitUrlCacheEntryA(str str long long long long long str long str str)
@ stub CommitUrlCacheEntryW
@ stub CreateUrlCacheContainerA
@ stub CreateUrlCacheContainerW
Index: wine/dlls/x11drv/x11drv.spec
===================================================================
RCS file: /home/wine/wine/dlls/x11drv/x11drv.spec,v
retrieving revision 1.57
diff -u -u -r1.57 x11drv.spec
--- wine/dlls/x11drv/x11drv.spec 4 Mar 2004 06:26:11 -0000 1.57
+++ wine/dlls/x11drv/x11drv.spec 17 May 2004 17:27:47 -0000
@@ -86,7 +86,7 @@
@ cdecl CountClipboardFormats() X11DRV_CountClipboardFormats
@ cdecl CreateWindow(long ptr long) X11DRV_CreateWindow
@ cdecl DestroyWindow(long) X11DRV_DestroyWindow
-@ cdecl EmptyClipboard() X11DRV_EmptyClipboard
+@ cdecl EmptyClipboard(long) X11DRV_EmptyClipboard
@ cdecl EndClipboardUpdate() X11DRV_EndClipboardUpdate
@ cdecl EnumClipboardFormats(long) X11DRV_EnumClipboardFormats
@ cdecl ForceWindowRaise(long) X11DRV_ForceWindowRaise
@@ -99,7 +99,7 @@
@ cdecl ReleaseDC(long long) X11DRV_ReleaseDC
@ cdecl ResetSelectionOwner(long long) X11DRV_ResetSelectionOwner
@ cdecl ScrollWindowEx(long long long ptr ptr long ptr long) X11DRV_ScrollWindowEx
-@ cdecl SetClipboardData(long long long) X11DRV_SetClipboardData
+@ cdecl SetClipboardData(long long long long) X11DRV_SetClipboardData
@ cdecl SetFocus(long) X11DRV_SetFocus
@ cdecl SetParent(long long) X11DRV_SetParent
@ cdecl SetWindowIcon(long long long) X11DRV_SetWindowIcon
More information about the wine-patches
mailing list