pEp.foundation
/
pEpEngine
16
2
Fork 17
Code Issues 22 Pull Requests 2 Releases 48 Wiki Activity

Windoze fixes

Browse Source
doc_update_sequoia
Volker Birk 8 years ago
parent 01f75d7246
commit 550a6c8ba5
18 changed files with 149 additions and 8 deletions
Show Stats Download Patch File Download Diff File

25
pEpEngine.vcxproj
Unescape View File

@ -81,24 +81,49 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="src\bloblist.c" />
<ClCompile Include="src\cryptotech.c" />
<ClCompile Include="src\email.c" />
<ClCompile Include="src\etpan_mime.c" />
<ClCompile Include="src\identity_list.c" />
<ClCompile Include="src\keymanagement.c" />
<ClCompile Include="src\message.c" />
<ClCompile Include="src\message_api.c" />
<ClCompile Include="src\mime.c" />
<ClCompile Include="src\pEpEngine.c" />
<ClCompile Include="src\pgp_gpg.c" />
<ClCompile Include="src\platform_windows.cpp" />
<ClCompile Include="src\sqlite3.c" />
<ClCompile Include="src\stringlist.c" />
<ClCompile Include="src\stringpair.c" />
<ClCompile Include="src\timestamp.c" />
<ClCompile Include="src\transport.c" />
<ClCompile Include="src\trans_auto.c" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="src\bloblist.h" />
<ClInclude Include="src\cryptotech.h" />
<ClInclude Include="src\dynamic_api.h" />
<ClInclude Include="src\email.h" />
<ClInclude Include="src\etpan_mime.h" />
<ClInclude Include="src\identity_list.h" />
<ClInclude Include="src\keymanagement.h" />
<ClInclude Include="src\message.h" />
<ClInclude Include="src\message_api.h" />
<ClInclude Include="src\mime.h" />
<ClInclude Include="src\pEpEngine.h" />
<ClInclude Include="src\pEp_internal.h" />
<ClInclude Include="src\pgp_gpg.h" />
<ClInclude Include="src\pgp_gpg_internal.h" />
<ClInclude Include="src\platform_windows.h" />
<ClInclude Include="src\resource.h" />
<ClInclude Include="src\sqlite3.h" />
<ClInclude Include="src\stringlist.h" />
<ClInclude Include="src\stringpair.h" />
<ClInclude Include="src\timestamp.h" />
<ClInclude Include="src\transport.h" />
<ClInclude Include="src\trans_auto.h" />
<ClInclude Include="src\wrappers.h" />
</ItemGroup>
<ItemGroup>
<Text Include="LICENSE.txt" />

75
pEpEngine.vcxproj.filters
Unescape View File

@ -36,6 +36,39 @@
<ClCompile Include="src\pgp_gpg.c">
<Filter>Quelldateien</Filter>
</ClCompile>
<ClCompile Include="src\email.c">
<Filter>Quelldateien</Filter>
</ClCompile>
<ClCompile Include="src\trans_auto.c">
<Filter>Quelldateien</Filter>
</ClCompile>
<ClCompile Include="src\stringlist.c">
<Filter>Quelldateien</Filter>
</ClCompile>
<ClCompile Include="src\stringpair.c">
<Filter>Quelldateien</Filter>
</ClCompile>
<ClCompile Include="src\timestamp.c">
<Filter>Quelldateien</Filter>
</ClCompile>
<ClCompile Include="src\bloblist.c">
<Filter>Quelldateien</Filter>
</ClCompile>
<ClCompile Include="src\etpan_mime.c">
<Filter>Quelldateien</Filter>
</ClCompile>
<ClCompile Include="src\identity_list.c">
<Filter>Quelldateien</Filter>
</ClCompile>
<ClCompile Include="src\message.c">
<Filter>Quelldateien</Filter>
</ClCompile>
<ClCompile Include="src\message_api.c">
<Filter>Quelldateien</Filter>
</ClCompile>
<ClCompile Include="src\mime.c">
<Filter>Quelldateien</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="src\keymanagement.h">
@ -65,6 +98,48 @@
<ClInclude Include="src\pgp_gpg_internal.h">
<Filter>Headerdateien</Filter>
</ClInclude>
<ClInclude Include="src\resource.h">
<Filter>Ressourcendateien</Filter>
</ClInclude>
<ClInclude Include="src\email.h">
<Filter>Headerdateien</Filter>
</ClInclude>
<ClInclude Include="src\stringlist.h">
<Filter>Headerdateien</Filter>
</ClInclude>
<ClInclude Include="src\stringpair.h">
<Filter>Headerdateien</Filter>
</ClInclude>
<ClInclude Include="src\timestamp.h">
<Filter>Headerdateien</Filter>
</ClInclude>
<ClInclude Include="src\trans_auto.h">
<Filter>Headerdateien</Filter>
</ClInclude>
<ClInclude Include="src\wrappers.h">
<Filter>Headerdateien</Filter>
</ClInclude>
<ClInclude Include="src\bloblist.h">
<Filter>Headerdateien</Filter>
</ClInclude>
<ClInclude Include="src\dynamic_api.h">
<Filter>Headerdateien</Filter>
</ClInclude>
<ClInclude Include="src\etpan_mime.h">
<Filter>Headerdateien</Filter>
</ClInclude>
<ClInclude Include="src\identity_list.h">
<Filter>Headerdateien</Filter>
</ClInclude>
<ClInclude Include="src\message.h">
<Filter>Headerdateien</Filter>
</ClInclude>
<ClInclude Include="src\message_api.h">
<Filter>Headerdateien</Filter>
</ClInclude>
<ClInclude Include="src\mime.h">
<Filter>Headerdateien</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Text Include="LICENSE.txt" />

2
src/bloblist.c
Unescape View File

@ -1,3 +1,5 @@
#include "pEp_internal.h"
#include <stdlib.h>
#include <assert.h>
#include <string.h>

2
src/etpan_mime.c
Unescape View File

@ -1,6 +1,8 @@
#include <string.h>
#include <stdlib.h>
#ifndef WIN32
#include <unistd.h>
#endif
#include <assert.h>
#include "etpan_mime.h"

2
src/identity_list.c
Unescape View File

@ -1,3 +1,5 @@
#include "pEp_internal.h"
#include <stdlib.h>
#include <assert.h>

2
src/message.c
Unescape View File

@ -1,3 +1,5 @@
#include "pEp_internal.h"
#include <stdlib.h>
#include <string.h>
#include <assert.h>

7
src/message_api.c
Unescape View File

@ -1,3 +1,4 @@
#include "pEp_internal.h"
#include "message_api.h"
#ifndef WIN32 // POSIX
@ -11,8 +12,6 @@
#include <string.h>
#include <stdlib.h>
#define NOT_IMPLEMENTED assert(0); return PEP_UNKNOWN_ERROR;
static char * combine_short_and_long(const char *shortmsg, const char *longmsg)
{
char * ptext;
@ -228,7 +227,6 @@ DYNAMIC_API PEP_STATUS encrypt_message(
{
PEP_STATUS status = PEP_STATUS_OK;
message * msg = NULL;
message * _src;
stringlist_t * keys = NULL;
bool free_src = false;
@ -333,6 +331,9 @@ DYNAMIC_API PEP_STATUS encrypt_message(
else if (src->longmsg) {
ptext = src->longmsg;
}
else {
ptext = "pEp";
}
message *_src = calloc(1, sizeof(message));
assert(_src);

3
src/mime.c
Unescape View File

@ -4,8 +4,9 @@
#include <stdlib.h>
#include <assert.h>
#include <errno.h>
#ifndef WIN32
#include <unistd.h>
#endif
#include "etpan_mime.h"
#include "wrappers.h"

5
src/pEpEngine.c
Unescape View File

@ -1,5 +1,5 @@
#include "dynamic_api.h"
#include "pEp_internal.h"
#include "dynamic_api.h"
#include "cryptotech.h"
#include "transport.h"
@ -377,7 +377,7 @@ DYNAMIC_API PEP_STATUS safewords(
{
const char *source = fingerprint;
char *buffer;
char *dest = buffer;
char *dest;
size_t fsize;
PEP_STATUS _status;
@ -394,6 +394,7 @@ DYNAMIC_API PEP_STATUS safewords(
assert(buffer);
if (buffer == NULL)
return PEP_OUT_OF_MEMORY;
dest = buffer;
fsize = strlen(fingerprint);

2
src/pEp_internal.h
Unescape View File

@ -54,7 +54,7 @@
#include "cryptotech.h"
#include "transport.h"
#define NOT_IMPLEMENTED assert(0)
#define NOT_IMPLEMENTED assert(0); return PEP_UNKNOWN_ERROR;
typedef struct _pEpSession {
const char *version;

6
src/platform_windows.h
Unescape View File

@ -4,6 +4,8 @@
#pragma warning(disable : 4996)
#include <string.h>
#ifdef __cplusplus
extern "C" {
#endif
@ -38,6 +40,10 @@ const char *gpg_conf(void);
long random(void);
#ifndef inline
#define inline _inline
#endif
#ifdef __cplusplus
}
#endif

BIN
src/platform_windows.obj
View File

Binary file not shown.

14
src/resource.h
Unescape View File

@ -0,0 +1,14 @@
//{{NO_DEPENDENCIES}}
// Microsoft Visual C++ generated include file.
// Used by pEpEngine.rc
// Next default values for new objects
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 101
#define _APS_NEXT_COMMAND_VALUE 40001
#define _APS_NEXT_CONTROL_VALUE 1001
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif

2
src/stringlist.c
Unescape View File

@ -1,3 +1,5 @@
#include "pEp_internal.h"
#include <stdlib.h>
#include <string.h>
#include <assert.h>

2
src/stringpair.c
Unescape View File

@ -1,3 +1,5 @@
#include "pEp_internal.h"
#include <stdlib.h>
#include <assert.h>
#include <string.h>

2
src/timestamp.c
Unescape View File

@ -1,3 +1,5 @@
#include "pEp_internal.h"
#include "timestamp.h"
#include <stdlib.h>

2
src/transport.c
Unescape View File

@ -23,7 +23,7 @@ PEP_STATUS init_transport_system(PEP_SESSION session, bool in_first)
return PEP_STATUS_OK;
}
DYNAMIC_API void release_transport_system(PEP_SESSION session, bool out_last)
void release_transport_system(PEP_SESSION session, bool out_last)
{
assert(session);
// nothing yet

4
src/wrappers.h
Unescape View File

@ -3,6 +3,10 @@
#include <errno.h>
#include <stdarg.h>
#ifdef WIN32
#include "platform_windows.h"
#endif
#ifdef EOF // stdio.h
static inline FILE * Fopen(const char *filename, const char *mode)

Write Preview
Loading…
Cancel
Save