Fixes for the MSC build

diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index 40e528a778e4d3a054f6e35cfa00edc69e3ecaa4..1ed8d522f00a76851a20bd820c6a046d8fe3840d 100644 (file)
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,9 @@
+2010-11-15  Werner Koch  <wk@g10code.com>
+
+       * conf-w32ce-msc/build.mk (copy-static-source): Create stdint.h.
+       (all): Add ws2.lib
+       (clean): New.
+
 2010-11-04  Werner Koch  <wk@g10code.com>
 
        * conf-w32ce-msc/build.mk (copy-built-source): Revert last

diff --git a/contrib/conf-w32ce-msc/build.mk b/contrib/conf-w32ce-msc/build.mk
index 74e7ff74ca67ed44927be267ac0828025febe661..72b683afdaaf373c26c28ad4c528bb8f42af83cc 100755 (executable)
--- a/contrib/conf-w32ce-msc/build.mk
+++ b/contrib/conf-w32ce-msc/build.mk
@@ -209,6 +209,7 @@ built_sources = \
        gpgme.h         \
        status-table.h
 
+my_stdint = $(targetsrc)/libassuan/src/stdint.h
 
 copy-static-source:
        @if [ ! -f ./gpgme.c ]; then \
@@ -218,6 +219,14 @@ copy-static-source:
        cp -t $(targetsrc)/gpgme/src $(sources);
        cd ../contrib/conf-w32ce-msc ; \
             cp -t $(targetsrc)/gpgme/src $(conf_sources)
+       @echo typedef unsigned long long uint64_t;  >$(my_stdint)
+       @echo typedef long long int64_t;           >>$(my_stdint)
+       @echo typedef unsigned int uint32_t;       >>$(my_stdint)
+       @echo typedef int int32_t;                 >>$(my_stdint)
+       @echo typedef unsigned short uint16_t;     >>$(my_stdint)
+       @echo typedef short int16_t;               >>$(my_stdint)
+       @echo typedef unsigned int uintptr_t;      >>$(my_stdint)
+       @echo typedef int intptr_t;                >>$(my_stdint)
 
 copy-built-source:
        @if [ ! -f ./gpgme.h ]; then \
@@ -242,7 +251,7 @@ all:  $(sources) $(conf_sources) $(built_sources) $(objs)
                $(libdir)/libgpg-error-0-msc.lib \
                $(libdir)/libassuan-0-msc.lib \
                coredll.lib corelibc.lib ole32.lib oleaut32.lib uuid.lib \
-               commctrl.lib /subsystem:windowsce,5.02
+               commctrl.lib ws2.lib /subsystem:windowsce,5.02
 
 # Note that we don't need to create the install directories because
 # libgpg-error must have been build and installed prior to this
@@ -251,3 +260,8 @@ install: all
        copy /y gpgme.h $(incdir:/=\)
        copy /y libgpgme-11-msc.dll $(bindir:/=\)
        copy /y libgpgme-11-msc.lib $(libdir:/=\)
+
+
+clean:
+       del *.obj libgpgme-11-msc.lib libgpgme-11-msc.dll libgpgme-11-msc.exp
+

diff --git a/src/ChangeLog b/src/ChangeLog
index f4e0e7d038664b1bced006ebeca8ee79f530f230..8736644e942596ef4cd6a967c48ec7c4e95d576f 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,17 @@
+2010-11-15  Werner Koch  <wk@g10code.com>
+
+       * data-compat.c (gpgme_data_new_from_filepart)
+       (gpgme_data_new_from_file) [W32CE && _MSC_VER]: Return not
+       GPG_ERR_NOT_IMPLEMENTED.
+
+       * w32-ce.h (HKEY_PERFORMANCE_DATA, HKEY_CURRENT_CONFIG, _IOLBF)
+       (abort) [_MSC_VER]: Provide these macros.
+
+       * ath.h [W32CE && _MSC_VER]: Include winsock2.h.
+
+       * ath.c (ath_read, ath_write) [W32CE && _MSC_VER]: Do not call
+       non-available functions.
+
 2010-11-04  Werner Koch  <wk@g10code.com>
 
        * w32-ce.h [_MSC_VER && W32CE]: Undef leave.

diff --git a/src/ath.c b/src/ath.c
index e5acbdaa6fcd0111007b499f9c993b30ede9bfe4..e5b9964ebc95edb9da788ae6ef0db87138ce0a06 100644 (file)
--- a/src/ath.c
+++ b/src/ath.c
@@ -128,14 +128,22 @@ ath_mutex_unlock (ath_mutex_t *lock)
 ssize_t
 ath_read (int fd, void *buf, size_t nbytes)
 {
+#if defined(HAVE_W32CE_SYSTEM) && defined(_MSC_VER)
+  return -1; /* Not supported. */
+#else
   return read (fd, buf, nbytes);
+#endif
 }
 
 
 ssize_t
 ath_write (int fd, const void *buf, size_t nbytes)
 {
+#if defined(HAVE_W32CE_SYSTEM) && defined(_MSC_VER)
+  return -1; /* Not supported. */
+#else
   return write (fd, buf, nbytes);
+#endif
 }
 
 

diff --git a/src/ath.h b/src/ath.h
index 424e3456bac22794dd38e1013b289ab784462b72..9ada5502bb39b00eaa1a5cd4b7d8228029fb6d55 100644 (file)
--- a/src/ath.h
+++ b/src/ath.h
@@ -28,6 +28,9 @@
   /* fixme: Check how we did it in libgcrypt.  */
   struct msghdr { int dummy; };
   typedef int socklen_t;
+# if defined(HAVE_W32CE_SYSTEM) && defined(_MSC_VER)
+#  include <winsock2.h>
+# endif
 # include <windows.h>
 # include <io.h>
 

diff --git a/src/data-compat.c b/src/data-compat.c
index bf615386e190943d3f8e795f86d54c6cd2f910e0..39c743ef5d0b293ef52669c11b4aa292563f3700 100644 (file)
--- a/src/data-compat.c
+++ b/src/data-compat.c
@@ -43,6 +43,9 @@ gpgme_error_t
 gpgme_data_new_from_filepart (gpgme_data_t *r_dh, const char *fname,
                              FILE *stream, off_t offset, size_t length)
 {
+#if defined (HAVE_W32CE_SYSTEM) && defined (_MSC_VER)
+  return gpgme_error (GPG_ERR_NOT_IMPLEMENTED);
+#else
   gpgme_error_t err;
   char *buf = NULL;
   int res;
@@ -111,6 +114,7 @@ gpgme_data_new_from_filepart (gpgme_data_t *r_dh, const char *fname,
   (*r_dh)->data.mem.length = length;
 
   return TRACE_SUC1 ("r_dh=%p", *r_dh);
+#endif
 }
 
 \f
@@ -119,6 +123,9 @@ gpgme_data_new_from_filepart (gpgme_data_t *r_dh, const char *fname,
 gpgme_error_t
 gpgme_data_new_from_file (gpgme_data_t *r_dh, const char *fname, int copy)
 {
+#if defined (HAVE_W32CE_SYSTEM) && defined (_MSC_VER)
+  return gpgme_error (GPG_ERR_NOT_IMPLEMENTED);
+#else
   gpgme_error_t err;
   struct stat statbuf;
   TRACE_BEG3 (DEBUG_DATA, "gpgme_data_new_from_filepart", r_dh,
@@ -132,6 +139,7 @@ gpgme_data_new_from_file (gpgme_data_t *r_dh, const char *fname, int copy)
 
   err = gpgme_data_new_from_filepart (r_dh, fname, NULL, 0, statbuf.st_size);
   return TRACE_ERR (err);
+#endif
 }
 
 \f

diff --git a/src/w32-ce.h b/src/w32-ce.h
index fafaa06cb0c79f84eb4f0b390f4a3582bd8efb63..a74c6e1716015e9db503d819343cd7d1b01ba96d 100644 (file)
--- a/src/w32-ce.h
+++ b/src/w32-ce.h
@@ -32,7 +32,6 @@ typedef int pid_t;
 #include <ws2tcpip.h> /* For getaddrinfo.  */
 #include <windows.h>
 
-
 #define getenv _gpgme_wince_getenv
 char *getenv (const char *name);
 
@@ -75,11 +74,16 @@ void *_gpgme_wince_bsearch (const void *key, const void *base,
                             int (*compar) (const void *, const void *));
 #define bsearch(a,b,c,d,e) _gpgme_wince_bsearch ((a),(b),(c),(d),(e)) 
 
-/* Remove the redefined __leave keyword.  It is defined by MSC for W32
-   in excpt.h and not in sehmap.h as for the plain windows
-   version.  */
-#if defined(_MSC_VER) && defined(HAVE_W32CE_SYSTEM)
+#if defined(_MSC_VER)
+  /* Remove the redefined __leave keyword.  It is defined by MSC for
+     W32 in excpt.h and not in sehmap.h as for the plain windows
+     version.  */
 # undef leave
+# define HKEY_PERFORMANCE_DATA ((HKEY)0x80000004)
+# define HKEY_CURRENT_CONFIG  ((HKEY)0x80000005)
+  /* Replace the Mingw32CE provided abort function.  */
+# define abort() do { TerminateProcess (GetCurrentProcess(), 8); } while (0)
+# define _IOLBF 0x40
 #endif
 
 #endif /* GPGME_W32_CE_H */