mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

include: rdpext.h->extension.h, rdpset.h->settings.h

Browse Source
This commit is contained in:
Marc-André Moreau 2011-07-04 19:52:24 -04:00
parent dd18348436
commit eed80301f4
5 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/freerdp/rdpext.h → include/freerdp/extension.h
View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __RDPEXT_H
#define __RDPEXT_H
#ifndef __RDP_EXTENSION_H
#define __RDP_EXTENSION_H
#include <freerdp/types/ui.h>
@ -61,4 +61,4 @@ typedef FREERDP_EXTENSION_ENTRY_POINTS * PFREERDP_EXTENSION_ENTRY_POINTS;
typedef int (RDPEXT_CC * PFREERDP_EXTENSION_ENTRY)(PFREERDP_EXTENSION_ENTRY_POINTS pEntryPoints);
#endif
#endif /* __RDP_EXTENSION_H */

8
include/freerdp/freerdp.h
View File

@ -20,9 +20,9 @@
#ifndef __FREERDP_H
#define __FREERDP_H
#include "rdpset.h"
#include "settings.h"
#include "types/ui.h"
#include "rdpext.h"
#include "extension.h"
#define FREERDP_INTERFACE_VERSION 4
@ -61,7 +61,7 @@ struct rdp_inst
{
int version;
int size;
rdpSet * settings;
rdpSettings * settings;
void * rdp;
void * param1;
void * param2;
@ -146,7 +146,7 @@ struct rdp_inst
};
FREERDP_API rdpInst *
freerdp_new(rdpSet * settings);
freerdp_new(rdpSettings * settings);
FREERDP_API void
freerdp_free(rdpInst * inst);

8
include/freerdp/rdpset.h → include/freerdp/settings.h
View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __RDPSET_H
#define __RDPSET_H
#ifndef __RDP_SETTINGS_H
#define __RDP_SETTINGS_H
struct rdp_chan
{
@ -43,7 +43,7 @@ struct rdp_monitor
int is_primary;
};
struct rdp_set
struct rdp_settings
{
int width;
int height;
@ -95,4 +95,4 @@ struct rdp_set
struct rdp_monitor monitors[16];
};
#endif /* __RDPSET_H */
#endif /* __RDP_SETTINGS_H */

6
include/freerdp/types/ui.h
View File

@ -133,8 +133,8 @@ typedef struct _FRDP_REDRAW_EVENT FRDP_REDRAW_EVENT;
struct rdp_inst;
typedef struct rdp_inst rdpInst;
/* defined in include/freerdp/rdpset.h */
struct rdp_set;
typedef struct rdp_set rdpSet;
/* defined in include/freerdp/settings.h */
struct rdp_settings;
typedef struct rdp_settings rdpSettings;
#endif

4
libfreerdp-core/credssp.c
View File

@ -30,7 +30,7 @@
#include <time.h>
#include "ntlmssp.h"
#include <freerdp/rdpset.h>
#include <freerdp/settings.h>
#include <freerdp/utils/memory.h>
#include "credssp.h"
@ -50,7 +50,7 @@ asn1_write(const void *buffer, size_t size, void *fd)
void credssp_ntlmssp_init(rdpCredssp *credssp)
{
NTLMSSP *ntlmssp = credssp->ntlmssp;
rdpSet *settings = credssp->net->rdp->settings;
rdpSettings *settings = credssp->net->rdp->settings;
ntlmssp_set_password(ntlmssp, settings->password);
ntlmssp_set_username(ntlmssp, settings->username);