ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Moved HRASCONN from windef.h. 

Added missing Unicode type and function definitions.
Added a few missing macro definitions.
Enclose in an extern "C" for C++ Winelib applications.
Added the structure packing specification.
This commit is contained in:
François Gouget 2000-12-24 20:44:08 +00:00 committed by Alexandre Julliard
parent 55146dbe18
commit ce03ac889c
3 changed files with 78 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlls/rasapi32/rasapi.c
View File

@ -22,8 +22,8 @@ DWORD WINAPI RasEnumConnectionsA( LPRASCONNA rca, LPDWORD x, LPDWORD y) {
/************************************************************************** /**************************************************************************
* RasEnumEntriesA [RASAPI32.546] * RasEnumEntriesA [RASAPI32.546]
*/ */
DWORD WINAPI RasEnumEntriesA( LPSTR Reserved, LPSTR lpszPhoneBook, DWORD WINAPI RasEnumEntriesA( LPCSTR Reserved, LPCSTR lpszPhoneBook,
LPRASENTRYNAME lpRasEntryName, LPRASENTRYNAMEA lpRasEntryName,
LPDWORD lpcb, LPDWORD lpcEntries) LPDWORD lpcb, LPDWORD lpcEntries)
{ {
FIXME("(%p,%s,%p,%p,%p),stub!\n",Reserved,debugstr_a(lpszPhoneBook), FIXME("(%p,%s,%p,%p,%p),stub!\n",Reserved,debugstr_a(lpszPhoneBook),
@ -35,8 +35,8 @@ DWORD WINAPI RasEnumEntriesA( LPSTR Reserved, LPSTR lpszPhoneBook,
/************************************************************************** /**************************************************************************
* RasGetEntryDialParamsA [RASAPI32.550] * RasGetEntryDialParamsA [RASAPI32.550]
*/ */
DWORD WINAPI RasGetEntryDialParamsA( LPSTR lpszPhoneBook, DWORD WINAPI RasGetEntryDialParamsA( LPCSTR lpszPhoneBook,
LPRASDIALPARAMS lpRasDialParams, LPRASDIALPARAMSA lpRasDialParams,
LPBOOL lpfPassword) LPBOOL lpfPassword)
{ {
FIXME("(%s,%p,%p),stub!\n",debugstr_a(lpszPhoneBook), FIXME("(%s,%p,%p),stub!\n",debugstr_a(lpszPhoneBook),

90
include/ras.h
View File

@ -4,22 +4,68 @@
#include "windef.h" #include "windef.h"
#include "lmcons.h" #include "lmcons.h"
#define RAS_MaxEntryName 256 #ifdef __cplusplus
#define RAS_MaxPhoneNumber 128 extern "C" {
#endif
#include "pshpack4.h"
#define RAS_MaxCallbackNumber RAS_MaxPhoneNumber #define RAS_MaxCallbackNumber RAS_MaxPhoneNumber
#define RAS_MaxDeviceName 128
#define RAS_MaxDeviceType 16
#define RAS_MaxEntryName 256
#define RAS_MaxPhoneNumber 128
DECLARE_HANDLE(HRASCONN);
typedef struct tagRASCONNA { typedef struct tagRASCONNA {
DWORD dwSize; DWORD dwSize;
HRASCONN hRasConn; HRASCONN hRasConn;
CHAR szEntryName[RAS_MaxEntryName+1]; CHAR szEntryName[ RAS_MaxEntryName + 1 ];
CHAR szDeviceType[ RAS_MaxDeviceType + 1 ];
CHAR szDeviceName[ RAS_MaxDeviceName + 1 ];
CHAR szPhonebook[ MAX_PATH ];
DWORD dwSubEntry;
} RASCONNA,*LPRASCONNA; } RASCONNA,*LPRASCONNA;
typedef struct tagRASENTRYNAME { typedef struct tagRASCONNW {
DWORD dwSize;
HRASCONN hRasConn;
WCHAR szEntryName[ RAS_MaxEntryName + 1 ];
WCHAR szDeviceType[ RAS_MaxDeviceType + 1 ];
WCHAR szDeviceName[ RAS_MaxDeviceName + 1 ];
WCHAR szPhonebook[ MAX_PATH ];
DWORD dwSubEntry;
} RASCONNW,*LPRASCONNW;
DECL_WINELIB_TYPE_AW(RASCONN)
DECL_WINELIB_TYPE_AW(LPRASCONN)
typedef struct tagRASENTRYNAMEA {
DWORD dwSize; DWORD dwSize;
CHAR szEntryName[ RAS_MaxEntryName + 1 ]; CHAR szEntryName[ RAS_MaxEntryName + 1 ];
} RASENTRYNAME, *LPRASENTRYNAME; } RASENTRYNAMEA, *LPRASENTRYNAMEA;
typedef struct tagRASDIALPARAMS { typedef struct tagRASENTRYNAMEW {
DWORD dwSize;
WCHAR szEntryName[ RAS_MaxEntryName + 1 ];
} RASENTRYNAMEW, *LPRASENTRYNAMEW;
DECL_WINELIB_TYPE_AW(RASENTRYNAME)
DECL_WINELIB_TYPE_AW(LPRASENTRYNAME)
typedef struct tagRASDIALPARAMSA {
DWORD dwSize;
CHAR szEntryName[ RAS_MaxEntryName + 1 ];
CHAR szPhoneNumber[ RAS_MaxPhoneNumber + 1 ];
CHAR szCallbackNumber[ RAS_MaxCallbackNumber + 1 ];
CHAR szUserName[ UNLEN + 1 ];
CHAR szPassword[ PWLEN + 1 ];
CHAR szDomain[ DNLEN + 1 ];
DWORD dwSubEntry;
DWORD dwCallbackId;
} RASDIALPARAMSA, *LPRASDIALPARAMSA;
typedef struct tagRASDIALPARAMSW {
DWORD dwSize; DWORD dwSize;
WCHAR szEntryName[ RAS_MaxEntryName + 1 ]; WCHAR szEntryName[ RAS_MaxEntryName + 1 ];
WCHAR szPhoneNumber[ RAS_MaxPhoneNumber + 1 ]; WCHAR szPhoneNumber[ RAS_MaxPhoneNumber + 1 ];
@ -29,16 +75,28 @@ typedef struct tagRASDIALPARAMS {
WCHAR szDomain[ DNLEN + 1 ]; WCHAR szDomain[ DNLEN + 1 ];
DWORD dwSubEntry; DWORD dwSubEntry;
DWORD dwCallbackId; DWORD dwCallbackId;
} RASDIALPARAMS, *LPRASDIALPARAMS; } RASDIALPARAMSW, *LPRASDIALPARAMSW;
DECL_WINELIB_TYPE_AW(RASDIALPARAMS)
DECL_WINELIB_TYPE_AW(LPRASDIALPARAMS)
DWORD WINAPI RasEnumConnectionsA( LPRASCONNA rc, LPDWORD x, LPDWORD y); DWORD WINAPI RasEnumConnectionsA(LPRASCONNA,LPDWORD,LPDWORD);
DWORD WINAPI RasEnumEntriesA( LPSTR Reserved, LPSTR lpszPhoneBook, DWORD WINAPI RasEnumConnectionsW(LPRASCONNW,LPDWORD,LPDWORD);
LPRASENTRYNAME lpRasEntryName, #define RasEnumConnections WINELIB_NAME_AW(RasEnumConnections)
LPDWORD lpcb, LPDWORD lpcEntries); DWORD WINAPI RasEnumEntriesA(LPCSTR,LPCSTR,LPRASENTRYNAMEA,LPDWORD,LPDWORD);
DWORD WINAPI RasGetEntryDialParamsA( LPSTR lpszPhoneBook, DWORD WINAPI RasEnumEntriesW(LPCWSTR,LPCWSTR,LPRASENTRYNAMEW,LPDWORD,LPDWORD);
LPRASDIALPARAMS lpRasDialParams, #define RasEnumEntries WINELIB_NAME_AW(RasEnumEntries)
LPBOOL lpfPassword); DWORD WINAPI RasGetEntryDialParamsA(LPCSTR,LPRASDIALPARAMSA,LPBOOL);
DWORD WINAPI RasGetEntryDialParamsW(LPCWSTR,LPRASDIALPARAMSW,LPBOOL);
#define RasGetEntryDialParams WINELIB_NAME_AW(RasGetEntryDialParams)
DWORD WINAPI RasHangUpA(HRASCONN);
DWORD WINAPI RasHangUpW(HRASCONN);
#define RasHangUp WINELIB_NAME_AW(RasHangUp)
#include "poppack.h"
#ifdef __cplusplus
}
#endif
#endif #endif

1
include/windef.h
View File

@ -98,7 +98,6 @@ DECLARE_HANDLE(HWINSTA);
DECLARE_HANDLE(HDESK); DECLARE_HANDLE(HDESK);
DECLARE_HANDLE(HWND); DECLARE_HANDLE(HWND);
DECLARE_HANDLE(HKL); DECLARE_HANDLE(HKL);
DECLARE_HANDLE(HRASCONN);
/* Handle types that must remain interchangeable even with strict on */ /* Handle types that must remain interchangeable even with strict on */