FDICopy is incorrectly declared

Describe the bug FDICopy inside the Cabinet declarations is not working right now, as the PFNFDINOTIFY does not correspond to what Windows accepts.

What code is involved Fdi.cs, FDICopy and PFNFDINOTIFY.

Expected behavior The function expects two pointers, PFNFDINOTIFY and PFNFDIDECRYPT. As can be seen here, the declaration of the first pointer should actually be something like this:

public delegate IntPtr PFNFDINOTIFY(int fdint, ref FDINOTIFICATION pfdin);

(the first parameter could be an enum FDINOTIFICATIONTYPE).

Right now, PFNFDINOTIFY is actually declared to match PFNFDIDECRYPT which is not named anywhere in Fdi.cs except the docs. Together, the rest should look like this:

public delegate int PFNFDIDECRYPT(ref FDIDECRYPT pfdid);

[DllImport("cabinet.dll", SetLastError = false, ExactSpelling = true, CharSet = CharSet.Ansi)]
public static extern bool FDICopy(HFDI hfdi, string pszCabinet, string pszCabPath, int flags, PFNFDINOTIFY pfnfdin, PFNFDIDECRYPT pfnfdid, IntPtr pvUser);

Edit: More issues have cropped up as I tried to use the API, so I have added them as separate comments. Frankly, I am not surprised there are so many of them, as cabinet.dll is like nothing I have ever seen in WinAPI before.

[dahall]

Thanks for validating it. I’ll get it pushed shortly.

[dahall]

@IllidanS4 I think I’ve addressed all your issues and then fixed a few other things while in there.

1. Implemented PFNFDINOTIFY as requested along with enum type for first param
2. Changed incorrect long fields to int and all HFILE references to IntPtr
3. Changed FDINOTIFICATION.psz2 to an IntPtr. Please let me know if your testing shows I need to attribute all delegates to explicitly be called as __cdecl.
4. All methods taking ERF now require a ref instance and the marshaled bool field now uses BOOL – a blittable structure defined in my lib that auto converts to bool in use.