[vidalia-svn] r1556: Add the other half of the win98 compatibility fix to win32_p (trunk/src/util)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2006-12-25 18:46:04 -0500 (Mon, 25 Dec 2006)
New Revision: 1556

Modified:
   trunk/src/util/win32.cpp
Log:
Add the other half of the win98 compatibility fix to win32_process_list() in 
r1495, so it still works when we're building somewhere that does actually have 
unicode.


Modified: trunk/src/util/win32.cpp
===================================================================
--- trunk/src/util/win32.cpp	2006-12-25 06:58:27 UTC (rev 1555)
+++ trunk/src/util/win32.cpp	2006-12-25 23:46:04 UTC (rev 1556)
@@ -161,7 +161,7 @@
   PROCESSENTRY32 proc;
   QString exeFile;
   qint64 pid;
- 
+
   /* Create a snapshot of all active processes */
   hSnapshot = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0);
   if (hSnapshot != INVALID_HANDLE_VALUE) {
@@ -172,10 +172,8 @@
       do {
         /* Extract the PID and exe filename from the process record */
         pid = (qint64)proc.th32ProcessID;
-        QT_WA(
-          exeFile = QString::fromUtf16((const ushort *)proc.szExeFile);,
-          exeFile = QString::fromAscii((const char *)proc.szExeFile);
-        )
+        exeFile = QString::fromAscii((const char *)proc.szExeFile);
+        
         /* Add this process to our list */
         procList.insert(pid, exeFile);
       } while (Process32Next(hSnapshot, &proc));