gitso Commit Details

Date:

2008-07-27 18:16:05 (16 years 9 months ago)

Author:

xburnerx

Branch:

master

Commit:

b72e8b7e02605c976108f5ec7b0e44bff6190432

Parents:

9620527b63480d4433ebcd4642cee35eb1794ccb

Message:

:Some windows fixes

Changes:

File differences

-178
179 179
180 180
181
182
183
184
181 185
186
182 187
183 188
184 189
... ...
280 285
281 286
282 287
283 
284 
285 
288
289
290
291
286 292
287 293
288 294
+                elif sys.platform.find('linux') != -1:␊
                    self.returnPID = os.spawnlp(os.P_NOWAIT, 'x11vnc', 'x11vnc', '-ncache 20 -solid black -connect' , '%s' % host)␊
                elif sys.platform == 'win32':␊
                    self.returnPID = os.spawnl(os.P_NOWAIT, 'c:\\windows\\WinVNC.exe', 'c:\\windows\\WinVNC.exe')␊
                    print "Launched WinVNC.exe, waiting to run -connect command..."␊
                    import time␊
                    time.sleep(3)␊
                    self.returnPID = os.spawnl(os.P_NOWAIT, 'c:\\windows\\WinVNC.exe', 'c:\\windows\\WinVNC.exe', '-connect', '%s' % host)␊
␊
                else:␊
                    print 'platform not detected'␊
            else:␊

        """␊
        if self.returnPID != 0:␊
            if sys.platform == 'win32':␊
                import win32api␊
                handle = win32api.OpenProcess(1, 0, pid)␊
                return (0 != win32api.TerminateProcess(handle, 0))␊
                #import win32api␊
                #handle = win32api.OpenProcess(1, 0, pid)␊
                #return (0 != win32api.TerminateProcess(handle, 0))␊
                print "windows doesn't kill processes yet"␊
            else:␊
                os.kill(self.returnPID, signal.SIGKILL)␊
            self.returnPID = 0␊
 ...
                 elif sys.platform.find('linux') != -1:␊
                     self.returnPID = os.spawnlp(os.P_NOWAIT, 'x11vnc', 'x11vnc', '-ncache 20 -solid black -connect' , '%s' % host)␊
                 elif sys.platform == 'win32':␊
+                    self.returnPID = os.spawnl(os.P_NOWAIT, 'c:\\windows\\WinVNC.exe', 'c:\\windows\\WinVNC.exe')␊
+                    print "Launched WinVNC.exe, waiting to run -connect command..."␊
+                    import time␊
+                    time.sleep(3)␊
                     self.returnPID = os.spawnl(os.P_NOWAIT, 'c:\\windows\\WinVNC.exe', 'c:\\windows\\WinVNC.exe', '-connect', '%s' % host)␊
+␊
                 else:␊
                     print 'platform not detected'␊
             else:␊
         """␊
         if self.returnPID != 0:␊
             if sys.platform == 'win32':␊
-                import win32api␊
-                handle = win32api.OpenProcess(1, 0, pid)␊
-                return (0 != win32api.TerminateProcess(handle, 0))␊
+                #import win32api␊
+                #handle = win32api.OpenProcess(1, 0, pid)␊
+                #return (0 != win32api.TerminateProcess(handle, 0))␊
+                print "windows doesn't kill processes yet"␊
             else:␊
                 os.kill(self.returnPID, signal.SIGKILL)␊
             self.returnPID = 0␊

Download the corresponding diff file

gitso

File differences

Branches