From 665ab2181d58fa5c82f598c1188408f8711b1f0d Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 6 Mar 2013 18:58:49 +0000 Subject: mir_forkthead doesn't return a closeable thread handle, no need to call CreateThread to close it git-svn-id: http://svn.miranda-ng.org/main/trunk@3907 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Actman/i_actlow.inc | 4 ++-- plugins/Watrack/lastfm/lastfm.pas | 6 +++--- plugins/Watrack/myshows/myshows.pas | 6 +++--- plugins/Watrack/popup/popups.pas | 2 +- plugins/Watrack/stat/statlog.pas | 2 +- plugins/mRadio/i_cc.inc | 10 +++++----- plugins/mRadio/i_search.inc | 4 ++-- plugins/mRadio/i_service.inc | 4 ++-- 8 files changed, 19 insertions(+), 19 deletions(-) (limited to 'plugins') diff --git a/plugins/Actman/i_actlow.inc b/plugins/Actman/i_actlow.inc index a749aef27f..a620471398 100644 --- a/plugins/Actman/i_actlow.inc +++ b/plugins/Actman/i_actlow.inc @@ -600,7 +600,7 @@ begin tmp^.group :=group; tmp^.last :=alast; tmp^.event :=CreateEvent(nil,FALSE,FALSE,nil); - CloseHandle(mir_forkthread(@ThDoAction,tmp)); + mir_forkthread(@ThDoAction,tmp); WaitForSingleObjectEx(tmp.event,INFINITE,true); CloseHandle(tmp^.event); result:=tmp^.last; @@ -617,7 +617,7 @@ begin tmp^.group :=group; tmp^.last :=alast; tmp^.event :=0; - CloseHandle(mir_forkthread(@ThDoAction,tmp)); + mir_forkthread(@ThDoAction,tmp); end; procedure ReallocActionList(var ActList:pActList;var MaxAct:cardinal); diff --git a/plugins/Watrack/lastfm/lastfm.pas b/plugins/Watrack/lastfm/lastfm.pas index 7f2d90b0dd..1b7d3e0f3d 100644 --- a/plugins/Watrack/lastfm/lastfm.pas +++ b/plugins/Watrack/lastfm/lastfm.pas @@ -73,7 +73,7 @@ begin if (lfm_login <>nil) and (lfm_login^ <>#0) and (lfm_password<>nil) and (lfm_password^<>#0) then - CloseHandle(mir_forkthread(@ThScrobble,nil)); + mir_forkthread(@ThScrobble,nil); end; function NewPlStatus(wParam:WPARAM;lParam:LPARAM):int;cdecl; @@ -116,7 +116,7 @@ begin mi.flags :=CMIM_FLAGS+flag; CallService(MS_CLIST_MODIFYMENUITEM,hMenuLast,tlparam(@mi)); end; - + WAT_EVENT_PLAYERSTATUS: begin case Integer(loword(lParam)) of WAT_PLS_NOMUSIC,WAT_PLS_NOTFOUND: begin @@ -200,7 +200,7 @@ begin sid.szDescription.a:='LastFM'; Skin_AddIcon(@sid); DestroyIcon(sid.hDefaultIcon); - + FillChar(mi, sizeof(mi), 0); mi.cbSize :=sizeof(mi); mi.szPopupName.a:=PluginShort; diff --git a/plugins/Watrack/myshows/myshows.pas b/plugins/Watrack/myshows/myshows.pas index ce07ee0d68..0e6ff07da2 100644 --- a/plugins/Watrack/myshows/myshows.pas +++ b/plugins/Watrack/myshows/myshows.pas @@ -92,7 +92,7 @@ begin if (msh_login <>nil) and (msh_login^ <>#0) and (msh_password<>nil) and (msh_password^<>#0) then - CloseHandle(mir_forkthread(@ThScrobble,nil)); + mir_forkthread(@ThScrobble,nil); end; function NewPlStatus(wParam:WPARAM;lParam:LPARAM):int;cdecl; @@ -145,7 +145,7 @@ begin mi.flags :=CMIM_FLAGS+flag; CallService(MS_CLIST_MODIFYMENUITEM,hMenuMyShows,tlParam(@mi)); end; - + WAT_EVENT_PLAYERSTATUS: begin case Integer(loword(lParam)) of WAT_PLS_NOMUSIC,WAT_PLS_NOTFOUND: begin @@ -233,7 +233,7 @@ begin sid.szDescription.a:='MyShows'; Skin_AddIcon(@sid); DestroyIcon(sid.hDefaultIcon); - + FillChar(mi, sizeof(mi), 0); mi.cbSize :=sizeof(mi); mi.szPopupName.a:=PluginShort; diff --git a/plugins/Watrack/popup/popups.pas b/plugins/Watrack/popup/popups.pas index 9ef22df2a7..8fe3f69ae1 100644 --- a/plugins/Watrack/popup/popups.pas +++ b/plugins/Watrack/popup/popups.pas @@ -289,7 +289,7 @@ end; procedure ShowPopUp(si:pSongInfo); begin - CloseHandle(mir_forkthread(@ThShowPopup,si)); + mir_forkthread(@ThShowPopup,si); end; // --------------- Services and Hooks ---------------- diff --git a/plugins/Watrack/stat/statlog.pas b/plugins/Watrack/stat/statlog.pas index fa49bc5fb0..25ad6f1d6f 100644 --- a/plugins/Watrack/stat/statlog.pas +++ b/plugins/Watrack/stat/statlog.pas @@ -464,7 +464,7 @@ end; function PackLog(wParam:WPARAM;lParam:LPARAM):integer;cdecl; begin result:=0; - CloseHandle(mir_forkthread(@ThPackLog,nil)); + mir_forkthread(@ThPackLog,nil); end; function MakeReport(wParam:WPARAM;lParam:LPARAM):integer;cdecl; diff --git a/plugins/mRadio/i_cc.inc b/plugins/mRadio/i_cc.inc index deb993ec0c..c9364d1e8a 100644 --- a/plugins/mRadio/i_cc.inc +++ b/plugins/mRadio/i_cc.inc @@ -21,7 +21,7 @@ var p:pWideChar; begin astrlen:=StrLenW(artist); - + tstrlen:=0; // if need to remove duplicate if (title<>nil) and (title^<>#0) then @@ -159,7 +159,7 @@ begin if PlayFirst=BST_UNCHECKED then plist.Track:=DBReadWord(ActiveContact,PluginName,optCurElement); end; - + mFreeMem(ActiveURLw); ActiveURLw:=plist.GetSong; end; @@ -182,7 +182,7 @@ begin ControlCenter(MRC_STATUS,RD_STATUS_NEWSTATION); if Assigned(plist) then ControlCenter(MRC_STATUS,RD_STATUS_CONNECT); - CloseHandle(mir_forkthread(@OpenURL,ActiveURLw)); + mir_forkthread(@OpenURL,ActiveURLw); end; end // play current from start @@ -195,7 +195,7 @@ begin // play playlist entry? else if Assigned(plist) and (ActiveURLw<>nil) and (ActiveURLw^<>#0) then begin - CloseHandle(mir_forkthread(@OpenURL,ActiveURLw)); + mir_forkthread(@OpenURL,ActiveURLw); end; end; @@ -425,7 +425,7 @@ begin mFreeMem(artist); mFreeMem(title); end; - + NotifyEventHooks(hhRadioStatus,code,arg); end; diff --git a/plugins/mRadio/i_search.inc b/plugins/mRadio/i_search.inc index ffd0b8b6de..bcbe6662a7 100644 --- a/plugins/mRadio/i_search.inc +++ b/plugins/mRadio/i_search.inc @@ -182,7 +182,7 @@ begin else begin result:=AckHandle; - CloseHandle(mir_forkthread(@BasicSearch,StrDup(PAnsiChar(lParam),PAnsiChar(lParam)))); + mir_forkthread(@BasicSearch,StrDup(PAnsiChar(lParam),PAnsiChar(lParam))); end; end; @@ -193,7 +193,7 @@ begin else begin result:=AckHandle; - CloseHandle(mir_forkthread(@ExtSearch,pointer(lParam))); + mir_forkthread(@ExtSearch,pointer(lParam)); end; end; diff --git a/plugins/mRadio/i_service.inc b/plugins/mRadio/i_service.inc index 4f12544a81..05072dfd94 100644 --- a/plugins/mRadio/i_service.inc +++ b/plugins/mRadio/i_service.inc @@ -99,7 +99,7 @@ begin if (ccs^.hContact<>0) and (PluginStatus=ID_STATUS_ONLINE) and (DBReadWord(ccs^.hContact,PluginName,optStatus,ID_STATUS_OFFLINE)=ID_STATUS_ONLINE) then begin - CloseHandle(mir_forkthread(@GetAwayMsgProc,pointer(ccs^.hContact))); + mir_forkthread(@GetAwayMsgProc,pointer(ccs^.hContact)); result:=AckHandle; end else @@ -202,7 +202,7 @@ begin Asks protocol for the status message for a status wParam=(WORD) 0 for current status or a status id lParam=SGMA_xxx - Returns status msg or NULL if there is none. The protocol have to handle only the current + Returns status msg or NULL if there is none. The protocol have to handle only the current status. Handling messages for other statuses is optional. Remember to mir_free the return value } -- cgit v1.2.3