diff --git a/spi00in.cpp b/spi00in.cpp index 6874ef8..b38e41c 100644 --- a/spi00in.cpp +++ b/spi00in.cpp @@ -190,7 +190,7 @@ int __stdcall IsSupportedW(LPCWSTR filename, DWORD_PTR dw) return 0; } -int __stdcall GetPictureInfo(LPCSTR buf, LONG_PTR len, unsigned int flag, PictureInfo* lpInfo) +int __stdcall GetPictureInfo(LPCSTR buf, LONG_PTR len, UINT flag, PictureInfo* lpInfo) { std::wstring unicode; if ((flag & 7) == 0) @@ -200,7 +200,7 @@ int __stdcall GetPictureInfo(LPCSTR buf, LONG_PTR len, unsigned int flag, Pictur return GetPictureInfoW(unicode.c_str(), len, flag, lpInfo); } -int __stdcall GetPictureInfoW(LPCWSTR buf, LONG_PTR len, unsigned int flag, PictureInfo* lpInfo) +int __stdcall GetPictureInfoW(LPCWSTR buf, LONG_PTR len, UINT flag, PictureInfo* lpInfo) { if (!lpInfo) { @@ -224,7 +224,7 @@ int __stdcall GetPictureInfoW(LPCWSTR buf, LONG_PTR len, unsigned int flag, Pict return GetPictureInfoEx(NULL, reinterpret_cast(const_cast(buf)), len, lpInfo); } -int __stdcall GetPicture(LPCSTR buf, LONG_PTR len, unsigned int flag, HANDLE* pHBInfo, HANDLE* pHBm, ProgressCallback lpPrgressCallback, LONG_PTR lData) +int __stdcall GetPicture(LPCSTR buf, LONG_PTR len, UINT flag, HANDLE* pHBInfo, HANDLE* pHBm, ProgressCallback lpPrgressCallback, LONG_PTR lData) { std::wstring unicode; if ((flag & 7) == 0) @@ -234,7 +234,7 @@ int __stdcall GetPicture(LPCSTR buf, LONG_PTR len, unsigned int flag, HANDLE* pH return GetPictureW(unicode.c_str(), len, flag, pHBInfo, pHBm, lpPrgressCallback, lData); } -int __stdcall GetPictureW(LPCWSTR buf, LONG_PTR len, unsigned int flag, HANDLE* pHBInfo, HANDLE* pHBm, ProgressCallback lpPrgressCallback, LONG_PTR lData) +int __stdcall GetPictureW(LPCWSTR buf, LONG_PTR len, UINT flag, HANDLE* pHBInfo, HANDLE* pHBm, ProgressCallback lpPrgressCallback, LONG_PTR lData) { if (!pHBInfo || !pHBm) { @@ -258,12 +258,12 @@ int __stdcall GetPictureW(LPCWSTR buf, LONG_PTR len, unsigned int flag, HANDLE* return GetPictureEx(NULL, reinterpret_cast(const_cast(buf)), len, pHBInfo, pHBm, lpPrgressCallback, lData); } -int __stdcall GetPreview(LPCSTR buf, LONG_PTR len, unsigned int flag, HANDLE* pHBInfo, HANDLE* pHBm, ProgressCallback lpPrgressCallback, LONG_PTR lData) +int __stdcall GetPreview(LPCSTR buf, LONG_PTR len, UINT flag, HANDLE* pHBInfo, HANDLE* pHBm, ProgressCallback lpPrgressCallback, LONG_PTR lData) { return GetPicture(buf, len, flag, pHBInfo, pHBm, lpPrgressCallback, lData); } -int __stdcall GetPreviewW(LPCWSTR buf, LONG_PTR len, unsigned int flag, HANDLE* pHBInfo, HANDLE* pHBm, ProgressCallback lpPrgressCallback, LONG_PTR lData) +int __stdcall GetPreviewW(LPCWSTR buf, LONG_PTR len, UINT flag, HANDLE* pHBInfo, HANDLE* pHBm, ProgressCallback lpPrgressCallback, LONG_PTR lData) { return GetPictureW(buf, len, flag, pHBInfo, pHBm, lpPrgressCallback, lData); } \ No newline at end of file diff --git a/spi00in.h b/spi00in.h index c9fdbb2..ace296c 100644 --- a/spi00in.h +++ b/spi00in.h @@ -26,6 +26,9 @@ struct PictureInfo { WORD x_density; WORD y_density; short colorDepth; +#ifdef _WIN64 + BYTE alignment[2]; +#endif HLOCAL hInfo; }; #pragma pack(pop) @@ -35,9 +38,9 @@ EXTERN_C int __stdcall GetPluginInfo(int infono, LPSTR buf, int buflen); EXTERN_C int __stdcall GetPluginInfoW(int infono, LPWSTR buf, int buflen); EXTERN_C int __stdcall IsSupported(LPCSTR filename, DWORD_PTR dw); EXTERN_C int __stdcall IsSupportedW(LPCWSTR filename, DWORD_PTR dw); -EXTERN_C int __stdcall GetPictureInfo(LPCSTR buf, LONG_PTR len, unsigned int flag, PictureInfo* lpInfo); -EXTERN_C int __stdcall GetPictureInfoW(LPCWSTR buf, LONG_PTR len, unsigned int flag, PictureInfo* lpInfo); -EXTERN_C int __stdcall GetPicture(LPCSTR buf, LONG_PTR len, unsigned int flag, HANDLE* pHBInfo, HANDLE* pHBm, ProgressCallback lpPrgressCallback, LONG_PTR lData); -EXTERN_C int __stdcall GetPictureW(LPCWSTR buf, LONG_PTR len, unsigned int flag, HANDLE* pHBInfo, HANDLE* pHBm, ProgressCallback lpPrgressCallback, LONG_PTR lData); -EXTERN_C int __stdcall GetPreview(LPCSTR buf, LONG_PTR len, unsigned int flag, HANDLE* pHBInfo, HANDLE* pHBm, ProgressCallback lpPrgressCallback, LONG_PTR lData); -EXTERN_C int __stdcall GetPreviewW(LPCWSTR buf, LONG_PTR len, unsigned int flag, HANDLE* pHBInfo, HANDLE* pHBm, ProgressCallback lpPrgressCallback, LONG_PTR lData); +EXTERN_C int __stdcall GetPictureInfo(LPCSTR buf, LONG_PTR len, UINT flag, PictureInfo* lpInfo); +EXTERN_C int __stdcall GetPictureInfoW(LPCWSTR buf, LONG_PTR len, UINT flag, PictureInfo* lpInfo); +EXTERN_C int __stdcall GetPicture(LPCSTR buf, LONG_PTR len, UINT flag, HANDLE* pHBInfo, HANDLE* pHBm, ProgressCallback lpPrgressCallback, LONG_PTR lData); +EXTERN_C int __stdcall GetPictureW(LPCWSTR buf, LONG_PTR len, UINT flag, HANDLE* pHBInfo, HANDLE* pHBm, ProgressCallback lpPrgressCallback, LONG_PTR lData); +EXTERN_C int __stdcall GetPreview(LPCSTR buf, LONG_PTR len, UINT flag, HANDLE* pHBInfo, HANDLE* pHBm, ProgressCallback lpPrgressCallback, LONG_PTR lData); +EXTERN_C int __stdcall GetPreviewW(LPCWSTR buf, LONG_PTR len, UINT flag, HANDLE* pHBInfo, HANDLE* pHBm, ProgressCallback lpPrgressCallback, LONG_PTR lData);