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

libfreerdp-utils: moved registry out of the core to the utils

Browse Source
This commit is contained in:
Marc-André Moreau 2011-08-16 19:40:55 -04:00
parent 0eb91a2ce9
commit ed31248952
6 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libfreerdp-core/registry.h → include/freerdp/utils/registry.h
View File

@ -1,6 +1,6 @@
/**
* FreeRDP: A Remote Desktop Protocol Client
* Configuration Registry
* Registry Utils
*
* Copyright 2011 Marc-Andre Moreau <marcandre.moreau@gmail.com>
*
@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __REGISTRY_H
#define __REGISTRY_H
#ifndef __REGISTRY_UTILS_H
#define __REGISTRY_UTILS_H
typedef struct rdp_registry rdpRegistry;
@ -68,4 +68,4 @@ void registry_init(rdpRegistry* registry);
rdpRegistry* registry_new(rdpSettings* settings);
void registry_free(rdpRegistry* registry);
#endif /* __REGISTRY_H */
#endif /* __REGISTRY_UTILS_H */

2
libfreerdp-core/CMakeLists.txt
View File

@ -48,8 +48,6 @@ set(LIBFREERDP_CORE_SRCS
license.h
errinfo.c
errinfo.h
registry.c
registry.h
security.c
security.h
settings.c

1
libfreerdp-core/rdp.c
View File

@ -523,7 +523,6 @@ rdpRdp* rdp_new(freerdp* instance)
{
rdp->licensed = False;
rdp->settings = settings_new();
rdp->registry = registry_new(rdp->settings);
rdp->transport = transport_new(rdp->settings);
rdp->license = license_new(rdp);
rdp->input = input_new(rdp);

2
libfreerdp-core/rdp.h
View File

@ -32,7 +32,6 @@ typedef struct rdp_rdp rdpRdp;
#include "license.h"
#include "errinfo.h"
#include "security.h"
#include "registry.h"
#include "transport.h"
#include "connection.h"
#include "capabilities.h"
@ -123,7 +122,6 @@ struct rdp_rdp
struct rdp_fastpath* fastpath;
struct rdp_license* license;
struct rdp_settings* settings;
struct rdp_registry* registry;
struct rdp_transport* transport;
struct rdp_vchan* vchan;
};

1
libfreerdp-utils/CMakeLists.txt
View File

@ -32,6 +32,7 @@ set(FREERDP_UTILS_SRCS
mutex.c
profiler.c
rail.c
registry.c
semaphore.c
sleep.c
stopwatch.c

6
libfreerdp-core/registry.c → libfreerdp-utils/registry.c
View File

@ -1,6 +1,6 @@
/**
* FreeRDP: A Remote Desktop Protocol Client
* Configuration Registry
* Registry Utils
*
* Copyright 2011 Marc-Andre Moreau <marcandre.moreau@gmail.com>
*
@ -17,9 +17,7 @@
* limitations under the License.
*/
#include "registry.h"
#include <windows.h>
#include <freerdp/utils/registry.h>
static char registry_dir[] = "freerdp";
static char registry_file[] = "config.txt";