[Winpt-commits] r335 - trunk/Include
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Sun Nov 27 13:20:22 CET 2011
Author: twoaday
Date: 2011-11-27 13:20:21 +0100 (Sun, 27 Nov 2011)
New Revision: 335
Modified:
trunk/Include/wptAgent.h
trunk/Include/wptCommonCtl.h
trunk/Include/wptContext.h
trunk/Include/wptCrypto.h
trunk/Include/wptErrors.h
trunk/Include/wptFileManager.h
trunk/Include/wptGPG.h
trunk/Include/wptGPGME.h
trunk/Include/wptImport.h
trunk/Include/wptKeyManager.h
trunk/Include/wptKeyserver.h
trunk/Include/wptUTF8.h
trunk/Include/wptVersion.h
Log:
Modified: trunk/Include/wptAgent.h
===================================================================
--- trunk/Include/wptAgent.h 2011-11-27 12:00:45 UTC (rev 334)
+++ trunk/Include/wptAgent.h 2011-11-27 12:20:21 UTC (rev 335)
@@ -12,10 +12,6 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with WinPT; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*/
#ifndef WPT_AGENT_H
Modified: trunk/Include/wptCommonCtl.h
===================================================================
--- trunk/Include/wptCommonCtl.h 2011-11-27 12:00:45 UTC (rev 334)
+++ trunk/Include/wptCommonCtl.h 2011-11-27 12:20:21 UTC (rev 335)
@@ -99,12 +99,7 @@
HICON *ico, DWORD nicons);
/*-- Image List --*/
-int imagelist_load (HWND hwnd, HIMAGELIST *r_il);
-int imagelist_destroy (HIMAGELIST il);
-int imagelist_getindex (HIMAGELIST il, int icon);
-
-int b_imagelist_load (HWND hwnd, HIMAGELIST *r_il);
-int b_imagelist_destroy (HIMAGELIST il);
-int b_imagelist_getindex (HIMAGELIST il, int bitmap);
-
+int km_imagelist_load (HWND hwnd, HIMAGELIST *r_il);
+int km_imagelist_destroy (HIMAGELIST il);
+int km_imagelist_getindex (HIMAGELIST il, int icon);
#endif /*WPT_COMMONCTL_H*/
Modified: trunk/Include/wptContext.h
===================================================================
--- trunk/Include/wptContext.h 2011-11-27 12:00:45 UTC (rev 334)
+++ trunk/Include/wptContext.h 2011-11-27 12:20:21 UTC (rev 335)
@@ -21,7 +21,7 @@
HWND dlg;
WNDPROC old; /* old window procedure */
WNDPROC current; /* the subclass window procedure */
- void * opaque;
+ void *opaque;
};
/* Container for a gpgme key. */
@@ -46,7 +46,7 @@
int internal;
unsigned int allocated:1;
};
-typedef struct winpt_key_s * winpt_key_t;
+typedef struct winpt_key_s *winpt_key_t;
/* Text input context for detached sigs. */
struct text_input_s {
@@ -91,7 +91,7 @@
struct URL_ctx_s {
const char *title; /* title for the dialog. */
const char *desc; /* description of what to do. */
- char url[256]; /* the selected URL. */
+ char url[512]; /* the selected URL. */
char proxy[64];
int port; /* the port to use. */
int cancel; /* user cancelled operation. */
Modified: trunk/Include/wptCrypto.h
===================================================================
--- trunk/Include/wptCrypto.h 2011-11-27 12:00:45 UTC (rev 334)
+++ trunk/Include/wptCrypto.h 2011-11-27 12:20:21 UTC (rev 335)
@@ -1,5 +1,5 @@
/* wptCrypto.h
- * Copyright (C) 2005, 2008 Timo Schulz
+ * Copyright (C) 2005, 2008, 2009 Timo Schulz
*
* This file is part of WinPT.
*
@@ -12,10 +12,6 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with WinPT; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*/
#ifndef WPT_CRYPTO_H
#define WPT_CRYPTO_H
@@ -31,16 +27,4 @@
PGP_DASH_ESCAPED = 32 /* actually not a type, just a flag */
};
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-int gpg_md_hash_file (int mdalgo, const char *file,
- byte *digest, size_t *nlen);
-int gpg_md_selftest (void);
-
-#ifdef __cplusplus
-}
-#endif
-
#endif /*WPT_CRYPTO_H*/
Modified: trunk/Include/wptErrors.h
===================================================================
--- trunk/Include/wptErrors.h 2011-11-27 12:00:45 UTC (rev 334)
+++ trunk/Include/wptErrors.h 2011-11-27 12:20:21 UTC (rev 335)
@@ -12,7 +12,6 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
-
*/
#ifndef WPT_ERRORS_H
@@ -63,14 +62,6 @@
WPTERR_NOCARD = 100,
WPTERR_NOREADER = 101,
WPTERR_NOPGPCARD = 102,
- /*
- WPTERR_CDISK_LOCK = 201,
- WPTERR_CDISK_MOUNT = 202,
- WPTERR_CDISK_UMOUNT = 203,
- WPTERR_CDISK_OPEN = 204,
- WPTERR_CDISK_BUSY = 205,
- WPTERR_CDISK_QUERY = 206,
- */
};
void debug_end (void);
Modified: trunk/Include/wptFileManager.h
===================================================================
--- trunk/Include/wptFileManager.h 2011-11-27 12:00:45 UTC (rev 334)
+++ trunk/Include/wptFileManager.h 2011-11-27 12:20:21 UTC (rev 335)
@@ -1,5 +1,5 @@
/* wptFileManager.h - File manager routines
- * Copyright (C) 2001-2006, 2008 Timo Schulz
+ * Copyright (C) 2001-2006, 2008-2009 Timo Schulz
*
* This file is part of WinPT.
*
@@ -12,10 +12,6 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with WinPT; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#ifndef WPT_FILE_MANAGER_H
@@ -32,8 +28,6 @@
FM_VERIFY = 6,
FM_IMPORT = 7,
FM_LIST = 8,
- FM_ENCRYPT_DIR = 10,
- FM_ENCRYPT_ZIP = 11
};
Modified: trunk/Include/wptGPG.h
===================================================================
--- trunk/Include/wptGPG.h 2011-11-27 12:00:45 UTC (rev 334)
+++ trunk/Include/wptGPG.h 2011-11-27 12:20:21 UTC (rev 335)
@@ -109,6 +109,7 @@
void gnupg_backup_keyrings (int auto_backup, int backup_mode,
int include_secr);
int gnupg_copy_keyrings (void);
+int gnupg_import_keypair (void);
int check_gnupg_engine (const char *need_gpg_ver,
int *r_major, int *r_minor, int *r_patch);
Modified: trunk/Include/wptGPGME.h
===================================================================
--- trunk/Include/wptGPGME.h 2011-11-27 12:00:45 UTC (rev 334)
+++ trunk/Include/wptGPGME.h 2011-11-27 12:20:21 UTC (rev 335)
@@ -12,10 +12,6 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with WinPT; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#ifndef WPT_GPGME_H
Modified: trunk/Include/wptImport.h
===================================================================
--- trunk/Include/wptImport.h 2011-11-27 12:00:45 UTC (rev 334)
+++ trunk/Include/wptImport.h 2011-11-27 12:20:21 UTC (rev 335)
@@ -12,10 +12,6 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with WinPT; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#ifndef WPT_IMPORT_H
#define WPT_IMPORT_H 1
Modified: trunk/Include/wptKeyManager.h
===================================================================
--- trunk/Include/wptKeyManager.h 2011-11-27 12:00:45 UTC (rev 334)
+++ trunk/Include/wptKeyManager.h 2011-11-27 12:20:21 UTC (rev 335)
@@ -12,10 +12,6 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with WinPT; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#ifndef WPT_KEYMANAGER_H
Modified: trunk/Include/wptKeyserver.h
===================================================================
--- trunk/Include/wptKeyserver.h 2011-11-27 12:00:45 UTC (rev 334)
+++ trunk/Include/wptKeyserver.h 2011-11-27 12:20:21 UTC (rev 335)
@@ -27,22 +27,18 @@
/* Valid proxy protocols. */
enum proxy_proto_t {
PROXY_PROTO_NONE = 0,
- PROXY_PROTO_HTTP,
- PROXY_PROTO_SOCKS4,
- PROXY_PROTO_SOCKS5
+ PROXY_PROTO_HTTP
};
/* Valid proxy authentications. */
enum proxy_auth_t {
- PROXY_AUTH_NONE = 0,
+ PROXY_AUTH_NONE = 0,
PROXY_AUTH_PLAIN = 2
};
/* Valid key server protocols. */
enum ksproto_t {
KSPROTO_HTTP = 0,
- KSPROTO_LDAP = 1,
- KSPROTO_FINGER = 2
};
#define KSPROTO_HKP 0 /* alias for http */
@@ -95,11 +91,6 @@
const struct keyserver_uid_s *main_uid;
};
-
-/*-- wptSOCKS.cpp --*/
-int socks_handshake (keyserver_proxy_t ctx, int conn_fd,
- const char *hostname, WORD port);
-
/*-- Winsock2 support --*/
int wsock_init (void);
void wsock_end (void);
Modified: trunk/Include/wptUTF8.h
===================================================================
--- trunk/Include/wptUTF8.h 2011-11-27 12:00:45 UTC (rev 334)
+++ trunk/Include/wptUTF8.h 2011-11-27 12:20:21 UTC (rev 335)
@@ -12,10 +12,6 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with WinPT; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*/
#ifndef WPT_UTF8_H
Modified: trunk/Include/wptVersion.h
===================================================================
--- trunk/Include/wptVersion.h 2011-11-27 12:00:45 UTC (rev 334)
+++ trunk/Include/wptVersion.h 2011-11-27 12:20:21 UTC (rev 335)
@@ -44,10 +44,7 @@
extern "C" {
#endif
BOOL PTD_initialize (void);
-void PTD_delete (void);
-HWND PTD_get_curr_hwnd (void);
-int PTD_is_used (void);
-BOOL PTD_keyb_send (UINT *keys, UINT n_keys);
+void PTD_delete_hook (void);
#ifdef __cplusplus
}
#endif
More information about the Winpt-commits
mailing list