[Winpt-commits] r196 - in trunk: . Src

[scm-commit@wald.intevation.org]

Author: twoaday
Date: 2006-04-07 12:47:37 +0200 (Fri, 07 Apr 2006)
New Revision: 196

Modified:
   trunk/NEWS
   trunk/Src/ChangeLog
   trunk/Src/WinPT-en.rc
   trunk/Src/wptKeyCache.cpp
   trunk/Src/wptW32API.cpp
   trunk/configure.ac
Log:
2006-04-07  Timo Schulz  <ts at g10code.de>

        * wptW32API.cpp (set_clip_text): Change code so it also
        works again with non-XP systems.



Modified: trunk/NEWS
===================================================================
--- trunk/NEWS	2006-04-03 17:10:47 UTC (rev 195)
+++ trunk/NEWS	2006-04-07 10:47:37 UTC (rev 196)
@@ -782,3 +782,6 @@
 * Restore the original file name after decryption if possible.
 * Fix problem to send keys to some keyservers.
 * New edit key command to compact keys.
+
+(0.11.11)
+* Fix clipboard problem on non-XP systems.

Modified: trunk/Src/ChangeLog
===================================================================
--- trunk/Src/ChangeLog	2006-04-03 17:10:47 UTC (rev 195)
+++ trunk/Src/ChangeLog	2006-04-07 10:47:37 UTC (rev 196)
@@ -1,3 +1,8 @@
+2006-04-07  Timo Schulz  <ts at g10code.de>
+
+	* wptW32API.cpp (set_clip_text): Change code so it also
+	works again with non-XP systems.
+	
 2006-04-02  Timo Schulz  <ts at g10code.de>
 
 	* wptKeyserver.cpp: decrease general threshold for timeout.

Modified: trunk/Src/WinPT-en.rc
===================================================================
--- trunk/Src/WinPT-en.rc	2006-04-03 17:10:47 UTC (rev 195)
+++ trunk/Src/WinPT-en.rc	2006-04-07 10:47:37 UTC (rev 196)
@@ -1955,14 +1955,14 @@
             VALUE "Comments", "This is free software under the terms of the GNU GPL v2\0"
             VALUE "CompanyName", "\0"
             VALUE "FileDescription", "Windows Privacy Tray (WinPT)\0"
-            VALUE "FileVersion", "0.11.10\0"
+            VALUE "FileVersion", "0.11.11\0"
             VALUE "InternalName", "WinPT\0"
             VALUE "LegalCopyright", " Copyright (C) 2006 Timo Schulz\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "WinPT.exe\0"
             VALUE "PrivateBuild", "\0"
             VALUE "ProductName", "Windows Privacy Tray\0"
-            VALUE "ProductVersion", "0.11.10\0"
+            VALUE "ProductVersion", "0.11.11\0"
             VALUE "SpecialBuild", "\0"
         END
     END

Modified: trunk/Src/wptKeyCache.cpp
===================================================================
--- trunk/Src/wptKeyCache.cpp	2006-04-03 17:10:47 UTC (rev 195)
+++ trunk/Src/wptKeyCache.cpp	2006-04-07 10:47:37 UTC (rev 196)
@@ -1,14 +1,14 @@
 /* wptKeyCache.cpp- Caching for the pub- and the secring
  *	Copyright (C) 2001-2006 Timo Schulz
  *
- * This file is part of MyGPGME.
+ * This file is part of WinPT.
  *
- * MyGPGME is free software; you can redistribute it and/or modify
+ * WinPT is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * MyGPGME is distributed in the hope that it will be useful,
+ * WinPT is distributed in the hope that it will be useful,
  * 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.
@@ -57,8 +57,8 @@
     attr_list_t n;
     while (ctx) {
 	n = ctx->next;
-	free (ctx->fpr);
-	free (ctx->d);
+	safe_free (ctx->fpr);
+	safe_free (ctx->d);
 	ctx = n;
     }
 }
@@ -380,7 +380,7 @@
 	safe_free (c->sym_prefs);
 	safe_free (c->attrib.d);
 	safe_free (c->card_type);
-	free (c);
+	safe_free (c);
     }
     safe_free (ctx);
 }
@@ -894,7 +894,7 @@
 	    (*out)[i++] = enc[pos];
     }
     (*out)[i] = 0;
-    free (enc);
+    safe_free (enc);
     return 0;
 }
 

Modified: trunk/Src/wptW32API.cpp
===================================================================
--- trunk/Src/wptW32API.cpp	2006-04-03 17:10:47 UTC (rev 195)
+++ trunk/Src/wptW32API.cpp	2006-04-07 10:47:37 UTC (rev 196)
@@ -256,18 +256,18 @@
 	BUG (NULL);
     p = (char *) GlobalLock (clipmem);
     if (p == NULL) {
-	rc = WPTERR_GENERAL;;
-	goto leave;	
+	CloseClipboard ();
+	GlobalFree (clipmem);
+	return WPTERR_GENERAL;
     }
     memcpy (p, text, nbytes);
     p[nbytes] = '\0';
     
+    SetClipboardData (CF_TEXT, clipmem);
     GlobalUnlock (clipmem);
-    SetClipboardData (CF_TEXT, clipmem);
+    CloseClipboard ();
     GlobalFree (clipmem);
     
-leave:
-    CloseClipboard ();
     return rc;
 }
 

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2006-04-03 17:10:47 UTC (rev 195)
+++ trunk/configure.ac	2006-04-07 10:47:37 UTC (rev 196)
@@ -15,7 +15,7 @@
 
 # Version number: Remember to change it immediately *after* a release.
 #                 Add a "-cvs" prefix for non-released code.
-AC_INIT(WinPT, 0.11.10, http://www.winpt.org)
+AC_INIT(WinPT, 0.11.11rc1, http://www.winpt.org)
 NEED_GPG_VERSION=1.4.2
 NEED_GPGME_API=1
 NEED_GPGME_VERSION=1.1.1