| ...... | @@ -280,45 +280,61 @@ |
| 280 | 280 | }
|
| 281 | 281 | }
|
| 282 | 282 |
|
| 283 | | void ConvertPanelItemW(const PluginPanelItem *PanelItemW, oldfar::PluginPanelItem **PanelItemA, int ItemsNumber)
|
| 283 | void ConvertPanelItemToAnsi(const PluginPanelItem &PanelItem, oldfar::PluginPanelItem &PanelItemA)
|
| 284 | 284 | {
|
| 285 | | *PanelItemA = (oldfar::PluginPanelItem *)xf_malloc(ItemsNumber*sizeof(oldfar::PluginPanelItem));
|
| 285 | PanelItemA.Flags = PanelItem.Flags;
|
| 286 | PanelItemA.NumberOfLinks=PanelItem.NumberOfLinks;
|
| 286 | 287 |
|
| 287 | | memset(*PanelItemA,0,ItemsNumber*sizeof(oldfar::PluginPanelItem));
|
| 288 | if(PanelItem.Description)
|
| 289 | PanelItemA.Description=UnicodeToAnsi(PanelItem.Description);
|
| 288 | 290 |
|
| 289 | | for (int i=0; i<ItemsNumber; i++)
|
| 291 | if(PanelItem.Owner)
|
| 292 | PanelItemA.Owner=UnicodeToAnsi(PanelItem.Owner);
|
| 293 |
|
| 294 | if (PanelItem.CustomColumnNumber)
|
| 290 | 295 | {
|
| 291 | | (*PanelItemA)[i].Flags = PanelItemW[i].Flags;
|
| 292 | | (*PanelItemA)[i].NumberOfLinks = PanelItemW[i].NumberOfLinks;
|
| 296 | PanelItemA.CustomColumnNumber=PanelItem.CustomColumnNumber;
|
| 297 | PanelItemA.CustomColumnData=(char **)xf_malloc(PanelItem.CustomColumnNumber*sizeof(char *));
|
| 293 | 298 |
|
| 294 | | if (PanelItemW[i].Description)
|
| 295 | | (*PanelItemA)[i].Description = UnicodeToAnsi(PanelItemW[i].Description);
|
| 299 | for (int j=0; j<PanelItem.CustomColumnNumber; j++)
|
| 300 | PanelItemA.CustomColumnData[j] = UnicodeToAnsi(PanelItem.CustomColumnData[j]);
|
| 301 | }
|
| 296 | 302 |
|
| 297 | | if (PanelItemW[i].Owner)
|
| 298 | | (*PanelItemA)[i].Owner = UnicodeToAnsi(PanelItemW[i].Owner);
|
| 303 | PanelItemA.UserData = PanelItem.UserData;
|
| 304 | PanelItemA.CRC32 = PanelItem.CRC32;
|
| 299 | 305 |
|
| 300 | | if (PanelItemW[i].CustomColumnNumber)
|
| 301 | | {
|
| 302 | | (*PanelItemA)[i].CustomColumnNumber = PanelItemW[i].CustomColumnNumber;
|
| 303 | | (*PanelItemA)[i].CustomColumnData = (char **)xf_malloc(PanelItemW[i].CustomColumnNumber*sizeof(char *));
|
| 306 | PanelItemA.FindData.dwFileAttributes = PanelItem.FindData.dwFileAttributes;
|
| 307 | PanelItemA.FindData.ftCreationTime = PanelItem.FindData.ftCreationTime;
|
| 308 | PanelItemA.FindData.ftLastAccessTime = PanelItem.FindData.ftLastAccessTime;
|
| 309 | PanelItemA.FindData.ftLastWriteTime = PanelItem.FindData.ftLastWriteTime;
|
| 310 | PanelItemA.FindData.nFileSizeLow = (DWORD)PanelItem.FindData.nFileSize;
|
| 311 | PanelItemA.FindData.nFileSizeHigh = (DWORD)(PanelItem.FindData.nFileSize>>32);
|
| 312 | PanelItemA.PackSize = (DWORD)PanelItem.FindData.nPackSize;
|
| 313 | PanelItemA.PackSizeHigh = (DWORD)(PanelItem.FindData.nPackSize>>32);
|
| 314 | UnicodeToAnsi(PanelItem.FindData.lpwszFileName,PanelItemA.FindData.cFileName,sizeof(PanelItemA.FindData.cFileName));
|
| 315 | UnicodeToAnsi(PanelItem.FindData.lpwszAlternateFileName,PanelItemA.FindData.cAlternateFileName,sizeof(PanelItemA.FindData.cAlternateFileName));
|
| 316 | }
|
| 304 | 317 |
|
| 305 | | for (int j=0; j<PanelItemW[i].CustomColumnNumber; j++)
|
| 306 | | (*PanelItemA)[i].CustomColumnData[j] = UnicodeToAnsi(PanelItemW[i].CustomColumnData[j]);
|
| 307 | | }
|
| 308 | 318 |
|
| 309 | | (*PanelItemA)[i].UserData = PanelItemW[i].UserData;
|
| 310 | | (*PanelItemA)[i].CRC32 = PanelItemW[i].CRC32;
|
| 319 | void ConvertPanelItemsArrayToAnsi(const PluginPanelItem *PanelItemW, oldfar::PluginPanelItem *&PanelItemA, int ItemsNumber)
|
| 320 | {
|
| 321 | PanelItemA = (oldfar::PluginPanelItem *)xf_malloc(ItemsNumber*sizeof(oldfar::PluginPanelItem));
|
| 322 | memset(PanelItemA,0,ItemsNumber*sizeof(oldfar::PluginPanelItem));
|
| 311 | 323 |
|
| 312 | | (*PanelItemA)[i].FindData.dwFileAttributes = PanelItemW[i].FindData.dwFileAttributes;
|
| 313 | | (*PanelItemA)[i].FindData.ftCreationTime = PanelItemW[i].FindData.ftCreationTime;
|
| 314 | | (*PanelItemA)[i].FindData.ftLastAccessTime = PanelItemW[i].FindData.ftLastAccessTime;
|
| 315 | | (*PanelItemA)[i].FindData.ftLastWriteTime = PanelItemW[i].FindData.ftLastWriteTime;
|
| 316 | | (*PanelItemA)[i].FindData.nFileSizeLow = (DWORD)PanelItemW[i].FindData.nFileSize;
|
| 317 | | (*PanelItemA)[i].FindData.nFileSizeHigh = (DWORD)(PanelItemW[i].FindData.nFileSize>>32);
|
| 318 | | (*PanelItemA)[i].PackSize = (DWORD)PanelItemW[i].FindData.nPackSize;
|
| 319 | | (*PanelItemA)[i].PackSizeHigh = (DWORD)(PanelItemW[i].FindData.nPackSize>>32);
|
| 320 | | UnicodeToAnsi(PanelItemW[i].FindData.lpwszFileName,(*PanelItemA)[i].FindData.cFileName,sizeof((*PanelItemA)[i].FindData.cFileName));
|
| 321 | | UnicodeToAnsi(PanelItemW[i].FindData.lpwszAlternateFileName,(*PanelItemA)[i].FindData.cAlternateFileName,sizeof((*PanelItemA)[i].FindData.cAlternateFileName));
|
| 324 | for (int i=0; i<ItemsNumber; i++)
|
| 325 | {
|
| 326 | ConvertPanelItemToAnsi(PanelItemW[i],PanelItemA[i]);
|
| 327 | }
|
| 328 | }
|
| 329 |
|
| 330 | void ConvertPanelItemsPtrArrayToAnsi(PluginPanelItem **PanelItemW, oldfar::PluginPanelItem *&PanelItemA, int ItemsNumber)
|
| 331 | {
|
| 332 | PanelItemA = (oldfar::PluginPanelItem *)xf_malloc(ItemsNumber*sizeof(oldfar::PluginPanelItem));
|
| 333 | memset(PanelItemA,0,ItemsNumber*sizeof(oldfar::PluginPanelItem));
|
| 334 |
|
| 335 | for (int i=0; i<ItemsNumber; i++)
|
| 336 | {
|
| 337 | ConvertPanelItemToAnsi(*PanelItemW[i],PanelItemA[i]);
|
| 322 | 338 | }
|
| 323 | 339 | }
|
| 324 | 340 |
|
| ...... | @@ -2072,8 +2088,8 @@ |
| 2072 | 2088 | }
|
| 2073 | 2089 | else //FCTL_GET[ANOTHER]PANELINFO
|
| 2074 | 2090 | {
|
| 2075 | | ConvertPanelItemW(PIW->PanelItems, &PIA->PanelItems, PIW->ItemsNumber);
|
| 2076 | | ConvertPanelItemW(PIW->SelectedItems, &PIA->SelectedItems, PIW->SelectedItemsNumber);
|
| 2091 | ConvertPanelItemsArrayToAnsi(PIW->PanelItems, PIA->PanelItems, PIW->ItemsNumber);
|
| 2092 | ConvertPanelItemsPtrArrayToAnsi(PIW->SelectedItems, PIA->SelectedItems, PIW->SelectedItemsNumber);
|
| 2077 | 2093 | }
|
| 2078 | 2094 |
|
| 2079 | 2095 | PIA->CurrentItem = PIW->CurrentItem;
|
| ...... | @@ -2127,15 +2143,16 @@ |
| 2127 | 2143 | FreePanelItemA(PIA->PanelItems,PIA->ItemsNumber);
|
| 2128 | 2144 | if (PIA->SelectedItems)
|
| 2129 | 2145 | FreePanelItemA(PIA->SelectedItems,PIA->SelectedItemsNumber);
|
| 2130 | |
|
| 2131 | 2146 | memset(PIA,0,sizeof(oldfar::PanelInfo));
|
| 2132 | 2147 | }
|
| 2133 | 2148 |
|
| 2134 | 2149 | int WINAPI FarControlA(HANDLE hPlugin,int Command,void *Param)
|
| 2135 | 2150 | {
|
| 2136 | 2151 | static oldfar::PanelInfo PanelInfoA={0},AnotherPanelInfoA={0};
|
| 2137 | | oldfar::PanelInfo* CurrentPanelInfoA=&PanelInfoA;
|
| 2138 | | HANDLE hPluginW = PANEL_ACTIVE;
|
| 2152 | static PanelInfo PnI={0};
|
| 2153 |
|
| 2154 | if(hPlugin==INVALID_HANDLE_VALUE)
|
| 2155 | hPlugin=PANEL_ACTIVE;
|
| 2139 | 2156 |
|
| 2140 | 2157 | switch (Command)
|
| 2141 | 2158 | {
|
| ...... | @@ -2152,76 +2169,70 @@ |
| 2152 | 2169 | return ret;
|
| 2153 | 2170 | }
|
| 2154 | 2171 |
|
| 2172 | case oldfar::FCTL_GETANOTHERPANELSHORTINFO:
|
| 2155 | 2173 | case oldfar::FCTL_GETANOTHERPANELINFO:
|
| 2156 | | hPluginW = PANEL_PASSIVE;
|
| 2157 | | CurrentPanelInfoA=&AnotherPanelInfoA;
|
| 2158 | |
|
| 2174 | case oldfar::FCTL_GETPANELSHORTINFO:
|
| 2159 | 2175 | case oldfar::FCTL_GETPANELINFO:
|
| 2160 | | {
|
| 2161 | | if ( !Param )
|
| 2162 | | return FALSE;
|
| 2163 | |
|
| 2164 | | oldfar::PanelInfo *pPIA = (oldfar::PanelInfo *)Param;
|
| 2165 | | PanelInfo PIW;
|
| 2166 | |
|
| 2167 | | int ret = FarControl(hPluginW,FCTL_GETPANELINFO,(void *)&PIW);
|
| 2168 | |
|
| 2169 | | if ( ret )
|
| 2170 | 2176 | {
|
| 2171 | | FreeAnsiPanelInfo(CurrentPanelInfoA);
|
| 2172 | | ConvertUnicodePanelInfoToAnsi(&PIW, CurrentPanelInfoA, FALSE);
|
| 2173 | | *pPIA=*CurrentPanelInfoA;
|
| 2177 | if(!Param )
|
| 2178 | return FALSE;
|
| 2179 | bool Short=(Command==oldfar::FCTL_GETPANELSHORTINFO || Command==oldfar::FCTL_GETANOTHERPANELSHORTINFO);
|
| 2180 | bool Passive=(Command==oldfar::FCTL_GETANOTHERPANELINFO || Command==oldfar::FCTL_GETANOTHERPANELSHORTINFO);
|
| 2181 |
|
| 2182 | if(hPlugin==INVALID_HANDLE_VALUE)
|
| 2183 | hPlugin=PANEL_ACTIVE;
|
| 2184 | if(Passive)
|
| 2185 | hPlugin=PANEL_PASSIVE;
|
| 2186 | FarControl(hPlugin,FCTL_FREEPANELINFO,&PnI);
|
| 2187 | int ret = FarControl(hPlugin,Short?FCTL_GETPANELSHORTINFO:FCTL_GETPANELINFO,&PnI);
|
| 2188 | if(ret)
|
| 2189 | {
|
| 2190 | FreeAnsiPanelInfo(Passive?&AnotherPanelInfoA:&PanelInfoA);
|
| 2191 | ConvertUnicodePanelInfoToAnsi(&PnI, Passive?&AnotherPanelInfoA:&PanelInfoA,Short);
|
| 2192 | *(oldfar::PanelInfo*)Param=Passive?AnotherPanelInfoA:PanelInfoA;
|
| 2193 | }
|
| 2174 | 2194 | }
|
| 2195 | return TRUE;
|
| 2175 | 2196 |
|
| 2176 | | return ret;
|
| 2177 | | }
|
| 2178 | |
|
| 2179 | | case oldfar::FCTL_GETANOTHERPANELSHORTINFO:
|
| 2180 | | hPluginW = PANEL_PASSIVE;
|
| 2181 | | CurrentPanelInfoA=&AnotherPanelInfoA;
|
| 2182 | |
|
| 2183 | | case oldfar::FCTL_GETPANELSHORTINFO:
|
| 2184 | | {
|
| 2185 | | if ( !Param )
|
| 2186 | | return FALSE;
|
| 2187 | |
|
| 2188 | | oldfar::PanelInfo *pPIA = (oldfar::PanelInfo *)Param;
|
| 2189 | | PanelInfo PIW;
|
| 2190 | |
|
| 2191 | | int ret = FarControl(hPluginW,FCTL_GETPANELSHORTINFO,(void *)&PIW);
|
| 2192 | |
|
| 2193 | | if ( ret )
|
| 2197 | case oldfar::FCTL_SETANOTHERSELECTION:
|
| 2198 | hPlugin=PANEL_PASSIVE;
|
| 2199 | case oldfar::FCTL_SETSELECTION:
|
| 2194 | 2200 | {
|
| 2195 | | FreeAnsiPanelInfo(CurrentPanelInfoA);
|
| 2196 | | ConvertUnicodePanelInfoToAnsi(&PIW, CurrentPanelInfoA, TRUE);
|
| 2197 | | *pPIA=*CurrentPanelInfoA;
|
| 2201 | if(!Param )
|
| 2202 | return FALSE;
|
| 2203 | oldfar::PanelInfo *pPIA=(oldfar::PanelInfo*)Param;
|
| 2204 | for(int i=0;i<pPIA->ItemsNumber;i++)
|
| 2205 | {
|
| 2206 | if(pPIA->PanelItems[i].Flags & oldfar::PPIF_SELECTED)
|
| 2207 | PnI.PanelItems[i].Flags|=PPIF_SELECTED;
|
| 2208 | else
|
| 2209 | PnI.PanelItems[i].Flags&=~PPIF_SELECTED;
|
| 2210 | }
|
| 2211 | return FarControl(hPlugin,FCTL_SETSELECTION,&PnI);
|
| 2198 | 2212 | }
|
| 2199 | 2213 |
|
| 2200 | | return ret;
|
| 2201 | | }
|
| 2202 | |
|
| 2203 | 2214 | case oldfar::FCTL_REDRAWANOTHERPANEL:
|
| 2204 | | hPluginW = PANEL_PASSIVE;
|
| 2215 | hPlugin = PANEL_PASSIVE;
|
| 2205 | 2216 |
|
| 2206 | 2217 | case oldfar::FCTL_REDRAWPANEL:
|
| 2207 | 2218 | {
|
| 2208 | 2219 | if ( !Param )
|
| 2209 | | return FarControl(hPluginW, FCTL_REDRAWPANEL, NULL);
|
| 2220 | return FarControl(hPlugin, FCTL_REDRAWPANEL, NULL);
|
| 2210 | 2221 |
|
| 2211 | 2222 | oldfar::PanelRedrawInfo* priA = (oldfar::PanelRedrawInfo*)Param;
|
| 2212 | 2223 | PanelRedrawInfo pri = {priA->CurrentItem,priA->TopPanelItem};
|
| 2213 | 2224 |
|
| 2214 | | return FarControl(hPluginW, FCTL_REDRAWPANEL, &pri);
|
| 2225 | return FarControl(hPlugin, FCTL_REDRAWPANEL, &pri);
|
| 2215 | 2226 | }
|
| 2216 | 2227 |
|
| 2217 | 2228 | case oldfar::FCTL_SETANOTHERNUMERICSORT:
|
| 2218 | | hPluginW = PANEL_PASSIVE;
|
| 2229 | hPlugin = PANEL_PASSIVE;
|
| 2219 | 2230 |
|
| 2220 | 2231 | case oldfar::FCTL_SETNUMERICSORT:
|
| 2221 | | return FarControl(hPluginW, FCTL_SETNUMERICSORT, Param);
|
| 2232 | return FarControl(hPlugin, FCTL_SETNUMERICSORT, Param);
|
| 2222 | 2233 |
|
| 2223 | 2234 | case oldfar::FCTL_SETANOTHERPANELDIR:
|
| 2224 | | hPluginW = PANEL_PASSIVE;
|
| 2235 | hPlugin = PANEL_PASSIVE;
|
| 2225 | 2236 |
|
| 2226 | 2237 | case oldfar::FCTL_SETPANELDIR:
|
| 2227 | 2238 | {
|
| ...... | @@ -2229,81 +2240,54 @@ |
| 2229 | 2240 | return FALSE;
|
| 2230 | 2241 |
|
| 2231 | 2242 | wchar_t* Dir = AnsiToUnicode((char*)Param);
|
| 2232 | | int ret = FarControl(hPluginW, FCTL_SETPANELDIR, Dir);
|
| 2243 | int ret = FarControl(hPlugin, FCTL_SETPANELDIR, Dir);
|
| 2233 | 2244 | xf_free(Dir);
|
| 2234 | 2245 |
|
| 2235 | 2246 | return ret;
|
| 2236 | 2247 | }
|
| 2237 | 2248 |
|
| 2238 | | case oldfar::FCTL_SETANOTHERSELECTION:
|
| 2239 | | hPluginW = PANEL_PASSIVE;
|
| 2240 | |
|
| 2241 | | case oldfar::FCTL_SETSELECTION:
|
| 2242 | | return FALSE; //BUGBUG
|
| 2243 | |
|
| 2244 | 2249 | case oldfar::FCTL_SETANOTHERSORTMODE:
|
| 2245 | | hPluginW = PANEL_PASSIVE;
|
| 2250 | hPlugin = PANEL_PASSIVE;
|
| 2246 | 2251 | case oldfar::FCTL_SETSORTMODE:
|
| 2247 | 2252 |
|
| 2248 | 2253 | if ( !Param )
|
| 2249 | 2254 | return FALSE;
|
| 2250 | 2255 |
|
| 2251 | | return FarControl(hPluginW, FCTL_SETSORTMODE, Param);
|
| 2256 | return FarControl(hPlugin, FCTL_SETSORTMODE, Param);
|
| 2252 | 2257 |
|
| 2253 | 2258 | case oldfar::FCTL_SETANOTHERSORTORDER:
|
| 2254 | | hPluginW = PANEL_PASSIVE;
|
| 2255 | |
|
| 2259 | hPlugin = PANEL_PASSIVE;
|
| 2256 | 2260 | case oldfar::FCTL_SETSORTORDER:
|
| 2257 | | return FarControl(hPluginW, FCTL_SETSORTORDER, Param);
|
| 2261 | return FarControl(hPlugin, FCTL_SETSORTORDER, Param);
|
| 2258 | 2262 |
|
| 2259 | 2263 | case oldfar::FCTL_SETANOTHERVIEWMODE:
|
| 2260 | | hPluginW = PANEL_PASSIVE;
|
| 2261 | |
|
| 2264 | hPlugin = PANEL_PASSIVE;
|
| 2262 | 2265 | case oldfar::FCTL_SETVIEWMODE:
|
| 2263 | | return FarControl(hPluginW, FCTL_SETVIEWMODE, Param);
|
| 2266 | return FarControl(hPlugin, FCTL_SETVIEWMODE, Param);
|
| 2264 | 2267 |
|
| 2265 | 2268 | case oldfar::FCTL_UPDATEANOTHERPANEL:
|
| 2266 | | hPluginW = PANEL_PASSIVE;
|
| 2267 | |
|
| 2269 | hPlugin = PANEL_PASSIVE;
|
| 2268 | 2270 | case oldfar::FCTL_UPDATEPANEL:
|
| 2269 | | return FarControl(hPluginW, FCTL_UPDATEPANEL, Param);
|
| 2271 | return FarControl(hPlugin, FCTL_UPDATEPANEL, Param);
|
| 2270 | 2272 |
|
| 2271 | 2273 |
|
| 2272 | 2274 | case oldfar::FCTL_GETCMDLINE:
|
| 2275 | case oldfar::FCTL_GETCMDLINESELECTEDTEXT:
|
| 2273 | 2276 | {
|
| 2274 | 2277 | if ( !Param || IsBadWritePtr(Param, sizeof(char) * 1024) )
|
| 2275 | 2278 | return FALSE;
|
| 2276 | |
|
| 2277 | | wchar_t s[1024];
|
| 2278 | |
|
| 2279 | | int ret = FarControl(hPluginW, FCTL_GETCMDLINE, &s);
|
| 2280 | |
|
| 2281 | | if ( ret )
|
| 2282 | | UnicodeToAnsi(s, (char*)Param, 1024-1);
|
| 2283 | |
|
| 2284 | | return ret;
|
| 2279 | int CmdW=(Command==oldfar::FCTL_GETCMDLINE)?FCTL_GETCMDLINE:FCTL_GETCMDLINESELECTEDTEXT;
|
| 2280 | wchar_t *s=(wchar_t*)xf_malloc((FarControl(hPlugin,CmdW,NULL)+1)*sizeof(wchar_t));
|
| 2281 | FarControl(hPlugin,CmdW,s);
|
| 2282 | UnicodeToAnsi(s, (char*)Param, 1024-1);
|
| 2283 | return TRUE;
|
| 2285 | 2284 | }
|
| 2286 | 2285 |
|
| 2287 | 2286 | case oldfar::FCTL_GETCMDLINEPOS:
|
| 2288 | 2287 | if ( !Param )
|
| 2289 | 2288 | return FALSE;
|
| 2290 | 2289 |
|
| 2291 | | return FarControl(hPluginW,FCTL_GETCMDLINEPOS,Param);
|
| 2292 | |
|
| 2293 | | case oldfar::FCTL_GETCMDLINESELECTEDTEXT:
|
| 2294 | | {
|
| 2295 | | if ( !Param || IsBadWritePtr(Param, sizeof(char) * 1024) )
|
| 2296 | | return FALSE;
|
| 2297 | |
|
| 2298 | | wchar_t s[1024];
|
| 2299 | |
|
| 2300 | | int ret = FarControl(hPluginW, FCTL_GETCMDLINESELECTEDTEXT, &s);
|
| 2301 | |
|
| 2302 | | if ( ret )
|
| 2303 | | UnicodeToAnsi(s, (char*)Param, 1024-1);
|
| 2304 | |
|
| 2305 | | return ret;
|
| 2306 | | }
|
| 2290 | return FarControl(hPlugin,FCTL_GETCMDLINEPOS,Param);
|
| 2307 | 2291 |
|
| 2308 | 2292 | case oldfar::FCTL_GETCMDLINESELECTION:
|
| 2309 | 2293 | {
|
| ...... | @@ -2312,7 +2296,7 @@ |
| 2312 | 2296 |
|
| 2313 | 2297 | CmdLineSelect cls;
|
| 2314 | 2298 |
|
| 2315 | | int ret = FarControl(hPluginW, FCTL_GETCMDLINESELECTION, &cls);
|
| 2299 | int ret = FarControl(hPlugin, FCTL_GETCMDLINESELECTION, &cls);
|
| 2316 | 2300 |
|
| 2317 | 2301 | if ( ret )
|
| 2318 | 2302 | {
|
| ...... | @@ -2331,7 +2315,7 @@ |
| 2331 | 2315 |
|
| 2332 | 2316 | wchar_t* s = AnsiToUnicode((const char*)Param);
|
| 2333 | 2317 |
|
| 2334 | | int ret = FarControl(hPluginW, FCTL_INSERTCMDLINE, s);
|
| 2318 | int ret = FarControl(hPlugin, FCTL_INSERTCMDLINE, s);
|
| 2335 | 2319 |
|
| 2336 | 2320 | xf_free(s);
|
| 2337 | 2321 | return ret;
|
| ...... | @@ -2344,7 +2328,7 @@ |
| 2344 | 2328 |
|
| 2345 | 2329 | wchar_t* s = AnsiToUnicode((const char*)Param);
|
| 2346 | 2330 |
|
| 2347 | | int ret = FarControl(hPluginW, FCTL_SETCMDLINE, s);
|
| 2331 | int ret = FarControl(hPlugin, FCTL_SETCMDLINE, s);
|
| 2348 | 2332 |
|
| 2349 | 2333 | xf_free(s);
|
| 2350 | 2334 | return ret;
|
| ...... | @@ -2354,7 +2338,7 @@ |
| 2354 | 2338 | if ( !Param )
|
| 2355 | 2339 | return FALSE;
|
| 2356 | 2340 |
|
| 2357 | | return FarControl(hPluginW, FCTL_SETCMDLINEPOS, Param);
|
| 2341 | return FarControl(hPlugin, FCTL_SETCMDLINEPOS, Param);
|
| 2358 | 2342 |
|
| 2359 | 2343 | case oldfar::FCTL_SETCMDLINESELECTION:
|
| 2360 | 2344 | {
|
| ...... | @@ -2364,14 +2348,14 @@ |
| 2364 | 2348 | oldfar::CmdLineSelect* clsA = (oldfar::CmdLineSelect*)Param;
|
| 2365 | 2349 | CmdLineSelect cls = {clsA->SelStart,clsA->SelEnd};
|
| 2366 | 2350 |
|
| 2367 | | return FarControl(hPluginW, FCTL_SETCMDLINESELECTION, &cls);
|
| 2351 | return FarControl(hPlugin, FCTL_SETCMDLINESELECTION, &cls);
|
| 2368 | 2352 | }
|
| 2369 | 2353 |
|
| 2370 | 2354 | case oldfar::FCTL_GETUSERSCREEN:
|
| 2371 | | return FarControl(hPluginW, FCTL_GETUSERSCREEN, NULL);
|
| 2355 | return FarControl(hPlugin, FCTL_GETUSERSCREEN, NULL);
|
| 2372 | 2356 |
|
| 2373 | 2357 | case oldfar::FCTL_SETUSERSCREEN:
|
| 2374 | | return FarControl(hPluginW, FCTL_SETUSERSCREEN, NULL);
|
| 2358 | return FarControl(hPlugin, FCTL_SETUSERSCREEN, NULL);
|
| 2375 | 2359 | }
|
| 2376 | 2360 | return FALSE;
|
| 2377 | 2361 | }
|