Skip to content

Commit 399d4da

Browse files
author
johndoe
committed
ClipCopy: fix x64 version
Actually x86 also had the bug by xarx https://forum.farmanager.com/viewtopic.php?p=108803#p108803
1 parent a4af96a commit 399d4da

3 files changed

Lines changed: 279 additions & 9 deletions

File tree

ClipCopy/src/ClipCopy.cpp

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -346,8 +346,12 @@ HANDLE WINAPI EXP_NAME(OpenPlugin)(INT OpenFrom, INT_PTR Item)
346346
LPMALLOC pMalloc = NULL;
347347
LPITEMIDLIST *ppidl;
348348
LPVOID p;
349+
#ifdef FAR3
350+
PanelInfo PInfo = {sizeof(PanelInfo)};
351+
#else
349352
struct PanelInfo PInfo;
350-
DWORD effect;
353+
#endif
354+
DWORD effect;
351355

352356
INT ExitCode = DoNothing;
353357
LPTSTR *SelectedFiles;
@@ -643,7 +647,10 @@ HANDLE WINAPI EXP_NAME(OpenPlugin)(INT OpenFrom, INT_PTR Item)
643647
size = GetCurrDir(MY_MAX_PATH, (LPTSTR)&ci[1]) + sizeof(DWORD) + 2;
644648
}
645649
else
650+
{
646651
size = GetCurrDir(MY_MAX_PATH, (LPTSTR)&tgtPath);
652+
tgtPath[size++] = '\\';
653+
}
647654

648655
for (i = 0; i < count; i++)
649656
{
@@ -769,7 +776,7 @@ INT WINAPI EXP_NAME(GetMinFarVersion)(VOID)
769776
VOID WINAPI EXP_NAME(GetGlobalInfo)(struct GlobalInfo *Info) {
770777
Info->StructSize = sizeof(struct GlobalInfo);
771778
Info->MinFarVersion = FARMANAGERVERSION;
772-
Info->Version = MAKEFARVERSION(3,0,0,2,VS_RELEASE);
779+
Info->Version = MAKEFARVERSION(3,0,1,0,VS_RELEASE);
773780
Info->Guid = ClipCopyGuid;
774781
Info->Title = L"Clipboard";
775782
Info->Description = L"Explorer like copy using clipboard";

ClipCopy/src/ClipCopy.v3.def

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
LIBRARY ClipCopyW
21
EXPORTS
32
SetStartupInfoW
43
OpenW

0 commit comments

Comments
 (0)