marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix the prototypes of SQLCreateDataSource*(), SQLGetPrivateProfileString*(). 

Fix the return type of SQLInstallerError*() and
SQLPostInstallerError*().
Fix the SQLInstallDriver() and SQLInstallDriverEx() prototypes in the
spec file.
Add an odbccp32 section to win32.api for winapi_check.
oldstable
Francois Gouget 2005-06-17 21:26:31 +00:00 committed by Alexandre Julliard
parent 3257bcd48c
commit fd73829593
4 changed files with 49 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dlls/odbccp32/odbccp32.c
View File

@ -106,14 +106,14 @@ BOOL WINAPI SQLConfigDriver(HWND hwndParent, WORD fRequest, LPCSTR lpszDriver,
return FALSE;
}
BOOL WINAPI SQLCreateDataSourceW(HWND hwnd, LPWSTR lpszDS)
BOOL WINAPI SQLCreateDataSourceW(HWND hwnd, LPCWSTR lpszDS)
{
FIXME("\n");
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
BOOL WINAPI SQLCreateDataSource(HWND hwnd, LPSTR lpszDS)
BOOL WINAPI SQLCreateDataSource(HWND hwnd, LPCSTR lpszDS)
{
FIXME("\n");
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@ -160,7 +160,7 @@ BOOL WINAPI SQLGetInstalledDrivers(LPSTR lpszBuf, WORD cbBufMax,
}
int WINAPI SQLGetPrivateProfileStringW(LPCWSTR lpszSection, LPCWSTR lpszEntry,
LPCWSTR lpszDefault, LPCWSTR RetBuffer, INT cbRetBuffer,
LPCWSTR lpszDefault, LPCWSTR RetBuffer, int cbRetBuffer,
LPCWSTR lpszFilename)
{
FIXME("\n");
@ -169,7 +169,7 @@ int WINAPI SQLGetPrivateProfileStringW(LPCWSTR lpszSection, LPCWSTR lpszEntry,
}
int WINAPI SQLGetPrivateProfileString(LPCSTR lpszSection, LPCSTR lpszEntry,
LPCSTR lpszDefault, LPCSTR RetBuffer, INT cbRetBuffer,
LPCSTR lpszDefault, LPCSTR RetBuffer, int cbRetBuffer,
LPCSTR lpszFilename)
{
FIXME("\n");
@ -287,7 +287,7 @@ BOOL WINAPI SQLInstallODBC(HWND hwndParent, LPCSTR lpszInfFile,
return FALSE;
}
RETCODE WINAPI SQLInstallerErrorW(WORD iError, DWORD *pfErrorCode,
SQLRETURN WINAPI SQLInstallerErrorW(WORD iError, DWORD *pfErrorCode,
LPWSTR lpszErrorMsg, WORD cbErrorMsgMax, WORD *pcbErrorMsg)
{
FIXME("\n");
@ -295,7 +295,7 @@ RETCODE WINAPI SQLInstallerErrorW(WORD iError, DWORD *pfErrorCode,
return FALSE;
}
RETCODE WINAPI SQLInstallerError(WORD iError, DWORD *pfErrorCode,
SQLRETURN WINAPI SQLInstallerError(WORD iError, DWORD *pfErrorCode,
LPSTR lpszErrorMsg, WORD cbErrorMsgMax, WORD *pcbErrorMsg)
{
FIXME("\n");
@ -346,14 +346,14 @@ BOOL WINAPI SQLManageDataSources(HWND hwnd)
return FALSE;
}
RETCODE WINAPI SQLPostInstallerErrorW(DWORD fErrorCode, LPWSTR szErrorMsg)
SQLRETURN WINAPI SQLPostInstallerErrorW(DWORD fErrorCode, LPCWSTR szErrorMsg)
{
FIXME("\n");
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
RETCODE WINAPI SQLPostInstallerError(DWORD fErrorCode, LPSTR szErrorMsg)
SQLRETURN WINAPI SQLPostInstallerError(DWORD fErrorCode, LPCSTR szErrorMsg)
{
FIXME("\n");
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);

4
dlls/odbccp32/odbccp32.spec
View File

@ -16,8 +16,8 @@
@ stdcall SQLGetPrivateProfileStringW(wstr wstr wstr wstr long wstr)
@ stdcall SQLGetTranslator(ptr str long ptr ptr long ptr ptr)
@ stdcall SQLGetTranslatorW(ptr wstr long ptr ptr long ptr ptr)
@ stdcall SQLInstallDriver(str str str long ptr long ptr)
@ stdcall SQLInstallDriverEx(str str str long ptr)
@ stdcall SQLInstallDriver(str str str long ptr)
@ stdcall SQLInstallDriverEx(str str str long ptr long ptr)
@ stdcall SQLInstallDriverExW(wstr wstr wstr long ptr long ptr)
@ stdcall SQLInstallDriverManager(ptr long ptr)
@ stdcall SQLInstallDriverManagerW(ptr long ptr)

16
include/odbcinst.h
View File

@ -30,28 +30,28 @@ BOOL WINAPI SQLConfigDataSource(HWND,WORD,LPCSTR,LPCSTR);
BOOL WINAPI SQLConfigDataSourceW(HWND,WORD,LPCWSTR,LPCWSTR);
BOOL WINAPI SQLConfigDriver(HWND,WORD,LPCSTR,LPCSTR,LPSTR,WORD,WORD*);
BOOL WINAPI SQLConfigDriverW(HWND,WORD,LPCWSTR,LPCWSTR,LPWSTR,WORD,WORD*);
BOOL WINAPI SQLCreateDataSource(HWND,LPSTR);
BOOL WINAPI SQLCreateDataSourceW(HWND,LPWSTR);
BOOL WINAPI SQLCreateDataSource(HWND,LPCSTR);
BOOL WINAPI SQLCreateDataSourceW(HWND,LPCWSTR);
BOOL WINAPI SQLGetConfigMode(UWORD*);
BOOL WINAPI SQLGetInstalledDrivers(LPSTR,WORD,WORD*);
BOOL WINAPI SQLGetInstalledDriversW(LPWSTR,WORD,WORD*);
int WINAPI SQLGetPrivateProfileString(LPCSTR,LPCSTR,LPCSTR,LPCSTR,INT,LPCSTR);
int WINAPI SQLGetPrivateProfileStringW(LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR,INT,LPCWSTR);
int WINAPI SQLGetPrivateProfileString(LPCSTR,LPCSTR,LPCSTR,LPCSTR,int,LPCSTR);
int WINAPI SQLGetPrivateProfileStringW(LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR,int,LPCWSTR);
BOOL WINAPI SQLGetTranslator(HWND,LPSTR,WORD,WORD*,LPSTR,WORD,WORD*,DWORD*);
BOOL WINAPI SQLGetTranslatorW(HWND,LPWSTR,WORD,WORD*,LPWSTR,WORD,WORD*,DWORD*);
BOOL WINAPI SQLInstallDriverEx(LPCSTR,LPCSTR,LPSTR,WORD,WORD*,WORD,LPDWORD);
BOOL WINAPI SQLInstallDriverExW(LPCWSTR,LPCWSTR,LPWSTR,WORD,WORD*,WORD,LPDWORD);
BOOL WINAPI SQLInstallDriverManager(LPSTR,WORD,WORD*);
BOOL WINAPI SQLInstallDriverManagerW(LPWSTR,WORD,WORD*);
RETCODE WINAPI SQLInstallerError(WORD,DWORD*,LPSTR,WORD,WORD*);
RETCODE WINAPI SQLInstallerErrorW(WORD,DWORD*,LPWSTR,WORD,WORD*);
SQLRETURN WINAPI SQLInstallerError(WORD,DWORD*,LPSTR,WORD,WORD*);
SQLRETURN WINAPI SQLInstallerErrorW(WORD,DWORD*,LPWSTR,WORD,WORD*);
BOOL WINAPI SQLInstallTranslatorEx(LPCSTR,LPCSTR,LPSTR,WORD,WORD*,WORD,LPDWORD);
BOOL WINAPI SQLInstallTranslatorExW(LPCWSTR,LPCWSTR,LPWSTR,WORD,WORD*,WORD,LPDWORD);
BOOL WINAPI SQLInstallTranslator(LPCSTR,LPCSTR,LPCSTR,LPSTR,WORD,WORD*,WORD,LPDWORD);
BOOL WINAPI SQLInstallTranslatorW(LPCWSTR,LPCWSTR,LPCWSTR,LPWSTR,WORD,WORD*,WORD,LPDWORD);
BOOL WINAPI SQLManageDataSources(HWND hwnd);
RETCODE WINAPI SQLPostInstallerError(DWORD,LPSTR);
RETCODE WINAPI SQLPostInstallerErrorW(DWORD,LPWSTR);
SQLRETURN WINAPI SQLPostInstallerError(DWORD,LPCSTR);
SQLRETURN WINAPI SQLPostInstallerErrorW(DWORD,LPCWSTR);
BOOL WINAPI SQLReadFileDSN(LPCSTR,LPCSTR,LPCSTR,LPSTR,WORD,WORD*);
BOOL WINAPI SQLReadFileDSNW(LPCWSTR,LPCWSTR,LPCWSTR,LPWSTR,WORD,WORD*);
BOOL WINAPI SQLRemoveDefaultDataSource(void);

31
tools/winapi/win32.api
View File

@ -2708,6 +2708,37 @@ SQLUINTEGER *
SQLUSMALLINT *
WCHAR *
%%odbccp32.dll
%long
BOOL
DWORD
HWND
LONG
SQLRETURN
UWORD
WORD
int
%str
LPCSTR
LPSTR
%wstr
LPCWSTR
LPWSTR
%ptr
DWORD *
LONG *
LPDWORD
UWORD *
WORD *
%%ole32.dll
%long