diff options
| author | Milan Crha <mcrha@redhat.com> | 2014-09-06 01:13:56 +0800 |
|---|---|---|
| committer | Milan Crha <mcrha@redhat.com> | 2014-09-06 01:13:56 +0800 |
| commit | 1dc1cf0b81b4e7f16fdd8f27bd3971d6c4ab4606 (patch) | |
| tree | 9ca3a2bb4b70a35359d04d1382be197e998f30b6 /modules/backup-restore | |
| parent | f863aa6d6c6728f7c66d6531c971b09ad4f10932 (diff) | |
| download | gsoc2013-evolution-1dc1cf0b81b4e7f16fdd8f27bd3971d6c4ab4606.tar.gz gsoc2013-evolution-1dc1cf0b81b4e7f16fdd8f27bd3971d6c4ab4606.tar.zst gsoc2013-evolution-1dc1cf0b81b4e7f16fdd8f27bd3971d6c4ab4606.zip | |
Miscellaneous Win32 related changes
* use e_util_win32_initialize() in main() to avoid code duplication
* e-spinner - correct image path build under win32
* export WIN32_SERVICELIBEXECDIR when building eds, which relies on it now
* update D-Bus patch and session-local.conf creation, thus D-Bus
can actually autostart services
Diffstat (limited to 'modules/backup-restore')
| -rw-r--r-- | modules/backup-restore/evolution-backup-tool.c | 36 |
1 files changed, 1 insertions, 35 deletions
diff --git a/modules/backup-restore/evolution-backup-tool.c b/modules/backup-restore/evolution-backup-tool.c index 728b8f96f4..1e0ff4bb38 100644 --- a/modules/backup-restore/evolution-backup-tool.c +++ b/modules/backup-restore/evolution-backup-tool.c @@ -34,14 +34,6 @@ #ifdef DATADIR #undef DATADIR #endif -#include <windows.h> -#include <conio.h> -#ifndef PROCESS_DEP_ENABLE -#define PROCESS_DEP_ENABLE 0x00000001 -#endif -#ifndef PROCESS_DEP_DISABLE_ATL_THUNK_EMULATION -#define PROCESS_DEP_DISABLE_ATL_THUNK_EMULATION 0x00000002 -#endif #endif #include "e-util/e-util-private.h" @@ -836,33 +828,7 @@ main (gint argc, GError *error = NULL; #ifdef G_OS_WIN32 - /* Reduce risks */ - { - typedef BOOL (WINAPI *t_SetDllDirectoryA) (LPCSTR lpPathName); - t_SetDllDirectoryA p_SetDllDirectoryA; - - p_SetDllDirectoryA = GetProcAddress ( - GetModuleHandle ("kernel32.dll"), - "SetDllDirectoryA"); - - if (p_SetDllDirectoryA != NULL) - p_SetDllDirectoryA (""); - } -#ifndef _WIN64 - { - typedef BOOL (WINAPI *t_SetProcessDEPPolicy) (DWORD dwFlags); - t_SetProcessDEPPolicy p_SetProcessDEPPolicy; - - p_SetProcessDEPPolicy = GetProcAddress ( - GetModuleHandle ("kernel32.dll"), - "SetProcessDEPPolicy"); - - if (p_SetProcessDEPPolicy) - p_SetProcessDEPPolicy ( - PROCESS_DEP_ENABLE | - PROCESS_DEP_DISABLE_ATL_THUNK_EMULATION); - } -#endif + e_util_win32_initialize (); #endif bindtextdomain (GETTEXT_PACKAGE, EVOLUTION_LOCALEDIR); |