[vidalia-svn] r3810: Merge r3808 and 3809 into trunk. (in vidalia/trunk/src: common tools/wixtool)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2009-06-01 03:00:35 -0400 (Mon, 01 Jun 2009)
New Revision: 3810

Modified:
   vidalia/trunk/src/common/win32.cpp
   vidalia/trunk/src/tools/wixtool/wixtool.cpp
Log:

Merge r3808 and 3809 into trunk.


Modified: vidalia/trunk/src/common/win32.cpp
===================================================================
--- vidalia/trunk/src/common/win32.cpp	2009-06-01 06:40:02 UTC (rev 3809)
+++ vidalia/trunk/src/common/win32.cpp	2009-06-01 07:00:35 UTC (rev 3810)
@@ -155,7 +155,8 @@
 /**
  * Callback for EnumThreadWindows which sends the WM_QUIT message
  */
-BOOL CALLBACK quitWindowCallback(HWND hwnd, LPARAM targetPID)
+BOOL CALLBACK 
+quitWindowCallback(HWND hwnd, LPARAM targetPID)
 {
   DWORD hwndPID = 0;
 
@@ -164,6 +165,7 @@
   GetWindowThreadProcessId(hwnd, &hwndPID);
   if (hwndPID == (DWORD)targetPID)
     PostMessage(hwnd, WM_QUIT, 0, (LPARAM)NULL);
+  return TRUE;
 }
 
 /**


Property changes on: vidalia/trunk/src/common/win32.cpp
___________________________________________________________________
Added: svn:mergeinfo
   + /vidalia/branches/breakpad/src/common/win32.cpp:3809
/vidalia/branches/marble/src/common/win32.cpp:3435-3484

Modified: vidalia/trunk/src/tools/wixtool/wixtool.cpp
===================================================================
--- vidalia/trunk/src/tools/wixtool/wixtool.cpp	2009-06-01 06:40:02 UTC (rev 3809)
+++ vidalia/trunk/src/tools/wixtool/wixtool.cpp	2009-06-01 07:00:35 UTC (rev 3810)
@@ -387,7 +387,7 @@
   return walkdoc(doc, &addfunc, &cbdata, errorMessage);
 }
 
-bool
+void
 createRegLocalComponent(QDomElement e,
  QString dirName,
  QString keyPath)
@@ -405,7 +405,7 @@
   e.appendChild(nrk);
 }
 
-bool
+void
 createDirMgmtComponent(QDomElement e,
  QString dirName)
 {


Property changes on: vidalia/trunk/src/tools/wixtool/wixtool.cpp
___________________________________________________________________
Added: svn:mergeinfo
   + /vidalia/branches/breakpad/src/tools/wixtool/wixtool.cpp:3808
/vidalia/branches/marble/src/tools/wixtool/wixtool.cpp:3435-3484