From 0ed5d01cf1655cb9523156ed8b412afe49a09e88 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 8 Oct 2012 14:18:55 +0000 Subject: another compilation fix for Pascal git-svn-id: http://svn.miranda-ng.org/main/trunk@1817 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/!NotAdopted/ShlExt/shlcom.pas | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/plugins/!NotAdopted/ShlExt/shlcom.pas b/plugins/!NotAdopted/ShlExt/shlcom.pas index d3377d9cda..c33921e492 100644 --- a/plugins/!NotAdopted/ShlExt/shlcom.pas +++ b/plugins/!NotAdopted/ShlExt/shlcom.pas @@ -1868,27 +1868,24 @@ begin spi.pid := GetCurrentProcessId(); while protoCount > 0 do begin - if (pp^._type = PROTOTYPE_PROTOCOL) then + lstrcpya(szTmp, pp^.szName); + lstrcata(szTmp, PS_GETCAPS); + dwCaps := CallService(szTmp, PFLAGNUM_1, 0); + if (dwCaps and PF1_FILESEND) <> 0 then begin - lstrcpya(szTmp, pp^.szName); - lstrcata(szTmp, PS_GETCAPS); - dwCaps := CallService(szTmp, PFLAGNUM_1, 0); - if (dwCaps and PF1_FILESEND) <> 0 then + pct := ipcAlloc(ipch, sizeof(TSlotProtoIcons)); + if pct <> nil then begin - pct := ipcAlloc(ipch, sizeof(TSlotProtoIcons)); - if pct <> nil then + // capture all the icons! + spi.hProto := StrHash(pp^.szName); + for j := 0 to 9 do begin - // capture all the icons! - spi.hProto := StrHash(pp^.szName); - for j := 0 to 9 do - begin - spi.hIcons[j] := LoadSkinnedProtoIcon(pp^.szName, ID_STATUS_OFFLINE + j); - end; // for - pct^.fType := REQUEST_NEWICONS; - CopyMemory(Pointer(uint_ptr(pct) + sizeof(TSlotIPC)), @spi, sizeof(TSlotProtoIcons)); - if ipch^.NewIconsBegin = nil then - ipch^.NewIconsBegin := pct; - end; // if + spi.hIcons[j] := LoadSkinnedProtoIcon(pp^.szName, ID_STATUS_OFFLINE + j); + end; // for + pct^.fType := REQUEST_NEWICONS; + CopyMemory(Pointer(uint_ptr(pct) + sizeof(TSlotIPC)), @spi, sizeof(TSlotProtoIcons)); + if ipch^.NewIconsBegin = nil then + ipch^.NewIconsBegin := pct; end; // if end; // if inc(pp); -- cgit v1.2.3