2
0
woollybah 5 жил өмнө
parent
commit
8e214c1055

+ 1 - 0
freeaudio.mod/dsounddevice.cpp

@@ -208,6 +208,7 @@ struct dsounddevice:audiodevice{
 		soundbuffer->Stop();
 		soundbuffer->Stop();
 //		printf("done...\n");
 //		printf("done...\n");
 //		fflush(stdout);
 //		fflush(stdout);
+		return 1;
 	}
 	}
 	
 	
 	static DWORD WINAPI soundproc(LPVOID lpParam){
 	static DWORD WINAPI soundproc(LPVOID lpParam){

+ 1 - 0
freeaudio.mod/mmdevice.cpp

@@ -103,6 +103,7 @@ struct winmmdevice:audiodevice {
 			buffer.finit(device); 
 			buffer.finit(device); 
 			waveOutClose(device);
 			waveOutClose(device);
 		}
 		}
+		return 0;
 	}
 	}
 		
 		
 	int init(int freq,int channels,int bits,int size)
 	int init(int freq,int channels,int bits,int size)

+ 8 - 8
freeprocess.mod/freeprocess.c

@@ -170,13 +170,6 @@ extern int _bbusew;
 #include <windows.h>
 #include <windows.h>
 #include <tlhelp32.h>
 #include <tlhelp32.h>
 
 
-int TerminateProcessGroup(HANDLE prochandle,int procid)
-{
-	//for now we just do a kill instead of politely asking all
-	//sub-windows (gui only) to gracefully end.
-	return KillProcessGroup(prochandle, procid);
-}
-
 
 
 // In the Windows world "TerminateProcess" kills a process without
 // In the Windows world "TerminateProcess" kills a process without
 // gracefully asking to stop I/O and other operations first.
 // gracefully asking to stop I/O and other operations first.
@@ -212,6 +205,13 @@ int KillProcessGroup(HANDLE prochandle,int procid)
 	return res;
 	return res;
 }
 }
 
 
+int TerminateProcessGroup(HANDLE prochandle,int procid)
+{
+	//for now we just do a kill instead of politely asking all
+	//sub-windows (gui only) to gracefully end.
+	return KillProcessGroup(prochandle, procid);
+}
+
 int fdClose(size_t fd)
 int fdClose(size_t fd)
 {
 {
 	return CloseHandle((HANDLE)fd);
 	return CloseHandle((HANDLE)fd);
@@ -341,7 +341,7 @@ size_t fdProcess( BBString *cmd,size_t *procin,size_t *procout,size_t *procerr,i
 		else {
 		else {
 			pflags|=DETACHED_PROCESS;
 			pflags|=DETACHED_PROCESS;
 		}
 		}
-		char *c = bbStringToWString(cmd);
+		BBChar *c = bbStringToWString(cmd);
 		res=CreateProcessW( 0,c,0,0,-1,pflags,0,0,&si,pi );
 		res=CreateProcessW( 0,c,0,0,-1,pflags,0,0,&si,pi );
 		bbMemFree(c);
 		bbMemFree(c);
 	}else{
 	}else{