Merge pull request #61 from dynarithmic/master-staging

v5.3.0.5 of DTWAIN

README.md

@@ -4,7 +4,7 @@
 
 * The Dynarithmic TWAIN Library is open source and licensed under the Apache 2.0 License.  Please read the [LICENSE](https://github.com/dynarithmic/twain_library/tree/master/LICENSE) file for more information.
 * The DTWAIN Library online help file can be found [here](http://www.dynarithmic.com/onlinehelp5/dtwain/index.html).
-* The current version is [**5.3.0.4** (See Version History)](https://github.com/dynarithmic/twain_library/tree/master/updates/updates.txt).
+* The current version is [**5.3.0.5** (See Version History)](https://github.com/dynarithmic/twain_library/tree/master/updates/updates.txt).
 
 **Please note that the source code and sample programs for the Dynarithmic TWAIN Library has moved to [this repository](https://github.com/dynarithmic/twain_library_source/tree/master)**.
 

binaries/32bit/32bit_FullDemo_hash.txt

@@ -1,4 +1,4 @@
-MD5: b5cc940f2353177e977e683a7d6f101c
-SHA1: 00a1a4969d4cb3c0f809da2b6c42adeafdd75d2b
-SHA256: ea59e8d5e026c9ff37eca91a2cf209cb7bf29a8f0fa54c8feaf8c6e1537d54e7
-SHA512: 9e69aaa8c61b969bba64f15cd873954127fc7424c2255b78a2aa4153cf9efbf9d4538a1c5d681cdef08bb017e3a2b1d9ba4c37042e26af52e147ac78a32624ff
+MD5: 2c46fd5c2f4d2114acc8063b0f34f5a9
+SHA1: d4de7fbde7a897609212a30c6a1c37e81fdc013b
+SHA256: 0f52cb0d7cc331f59bf9e562d4dfab65924c073f0608fdc9d5396fec86f68984
+SHA512: 13e8430963a91ea7e18416881424b7366516f3b90d0034e11d3867316e83951a050b43a125aa38a99c559501375bb355222876577e82a2baffb309041de8c5a5

binaries/32bit/release_ziphashes32.txt

@@ -1,4 +1,4 @@
-MD5 hash of "release_libraries.zip" (16 bytes) = 6259396e017ea7561cdf23f7d5f79180
-SHA1 hash of "release_libraries.zip" (20 bytes) = 6e1c51efc45edc2db016d49bceea6725ef26f722
-SHA256 hash of "release_libraries.zip" (32 bytes) = deb44983a599818e4b0bb874925752b7c8f7fa508689df162f2c43ac05c2d261
+MD5 hash of "release_libraries.zip" (16 bytes) = 07d2a2da46fd196c47ba0cbbf1bddfef
+SHA1 hash of "release_libraries.zip" (20 bytes) = b659b22902ccddf1537b1380e32b24dfeb128e0e
+SHA256 hash of "release_libraries.zip" (32 bytes) = 4ec3495271d701af1f6be422e90ebf06fbdb119331bb0b52fb4e4ae57b738461
 

binaries/64bit/64bit_FullDemo_hash.txt

@@ -1,4 +1,4 @@
-MD5: bd8a48c2944b20b77be354f8ae5ebe9c
-SHA1: ee179e338d4bf7e6733584e07a883bcc53e94e68
-SHA256: b8b6caa95b62a124abd0320a74af07e2970da20270093c0db3000451c371baee
-SHA512: 33c8675fe97b5c69a147caba849613bcbf384fd20e8cabe4187dc4bc4816662f67ff792faef91c3d9d069d9f7b50e582311b726a44e6766b51a9a3df8490c8f6
+MD5: 765a965f62384293657926ba9a7d6180
+SHA1: 987e0f88dd45862feb236453e6ab717d3774a129
+SHA256: d9e0bed617b6afb83b47426462dd84a5cbf4204a4d1ae10390b9f5b107de00aa
+SHA512: bf9628456c2a880e13afedccec9160244d04ba4ea03f5313c656df32cb64ead983d89710f02eec82e417ddbef299d858ec163c77fc8fca9bfa40e6b750647727

binaries/64bit/release_ziphashes64.txt

@@ -1,4 +1,4 @@
-MD5 hash of "release_libraries.zip" (16 bytes) = c0d5171f506332d205e4abba3e577350
-SHA1 hash of "release_libraries.zip" (20 bytes) = bd440fa6d73a78e6557b24c3fe7a371759f074d8
-SHA256 hash of "release_libraries.zip" (32 bytes) = cc0b0cd3bb402513c2c8681bd01b0ad267c09826c8ea927f186d573bf60cdc74
+MD5 hash of "release_libraries.zip" (16 bytes) = 88b4984b982276d3b95c4e5d16d6a54f
+SHA1 hash of "release_libraries.zip" (20 bytes) = 354b74b82cda80cdf9f7b33198bf6495f296d807
+SHA256 hash of "release_libraries.zip" (32 bytes) = d51858099822d37624c8bd3f8a06883da958d5e7acc36696178cdbd2523f9b28
 

c_cpp_includes/dtwain_version.h

@@ -24,11 +24,11 @@
 #define DTWAIN_MAJOR_VERSION           5
 #define DTWAIN_MINOR_VERSION           3
 #define DTWAIN_SUBMINOR_VERSION        0
-#define DTWAIN_PATCHLEVEL_VERSION      4
+#define DTWAIN_PATCHLEVEL_VERSION      5
 
 #define DTWAIN_VERINFO_BASEVERSION          "5.3"
 #define DTWAIN_VERINFO_FILEVERSION          "5.3.0.0"
-#define DTWAIN_VERINFO_PATCHLEVEL_VERSION   "4"
+#define DTWAIN_VERINFO_PATCHLEVEL_VERSION   "5"
 
 #ifdef USE_DTWAIN_DEBUG_LIB
     #define DTWAIN_DEVELOP_SUFFIX "d"

c_cpp_includes/dtwainx.h

@@ -70,6 +70,8 @@ LONG           DLLENTRY_DEF      DTWAIN_GetAPIHandleStatus(DTWAIN_HANDLE pHandle
 /* DTWAIN Message Notification functions */
 DTWAIN_BOOL    DLLENTRY_DEF      DTWAIN_EnableMsgNotify(DTWAIN_BOOL bSet);
 DTWAIN_BOOL    DLLENTRY_DEF      DTWAIN_IsMsgNotifyEnabled(VOID_PROTOTYPE);
+DTWAIN_BOOL    DLLENTRY_DEF      DTWAIN_EnableTripletsNotify(DTWAIN_BOOL bSet);
+DTWAIN_BOOL    DLLENTRY_DEF      DTWAIN_IsNotifyTripletsEnabled();
 
 /* Callback procedure for alternate DTWAIN message notification */
 DTWAIN_CALLBACK_PROC DLLENTRY_DEF DTWAIN_SetCallback(DTWAIN_CALLBACK_PROC Fn,LONG UserData);
@@ -89,6 +91,7 @@ DTWAIN_BOOL    DLLENTRY_DEF      DTWAIN_OpenSource(DTWAIN_SOURCE Source);
 DTWAIN_BOOL    DLLENTRY_DEF      DTWAIN_CloseSource(DTWAIN_SOURCE Source);
 DTWAIN_BOOL    DLLENTRY_DEF      DTWAIN_EnumSources(LPDTWAIN_ARRAY lpArray);
 DTWAIN_ARRAY   DLLENTRY_DEF      DTWAIN_EnumSourcesEx(VOID_PROTOTYPE);
+DTWAIN_BOOL    DLLENTRY_DEF      DTWAIN_IsSourceValid(DTWAIN_SOURCE Source);
 
 DTWAIN_SOURCE  DLLENTRY_DEF      DTWAIN_SelectSource(VOID_PROTOTYPE);
 DTWAIN_BOOL    DLLENTRY_DEF      DTWAIN_CloseSourceUI( DTWAIN_SOURCE Source);
@@ -605,6 +608,7 @@ DTWAIN_BOOL DLLENTRY_DEF DTWAIN_IsBlankPageDetectionOn(DTWAIN_SOURCE Source);
 DTWAIN_BOOL DLLENTRY_DEF DTWAIN_SetBlankPageDetectionEx(DTWAIN_SOURCE Source, DTWAIN_FLOAT threshold,
                                                         LONG autodetect, LONG detectOpts, DTWAIN_BOOL bSet);
 LONG DLLENTRY_DEF DTWAIN_IsDIBBlank(HANDLE hDib, DTWAIN_FLOAT threshold);
+DTWAIN_BOOL DLLENTRY_DEF DTWAIN_DeleteDIB(HANDLE hDib);
 
 /* Audio */
 DTWAIN_BOOL DLLENTRY_DEF DTWAIN_EnumAudioXferMechs(DTWAIN_SOURCE Source, LPDTWAIN_ARRAY pArray);

c_cpp_includes/dtwstrfn.h

@@ -289,8 +289,8 @@ DTWAIN_FRAME DLLENTRY_DEF DTWAIN_FrameCreateStringA(LPCSTR Left, LPCSTR Top, LPC
 DTWAIN_FRAME DLLENTRY_DEF DTWAIN_FrameCreateStringW(LPCWSTR Left, LPCWSTR Top, LPCWSTR Right, LPCWSTR Bottom);
 LONG        DLLENTRY_DEF DTWAIN_GetSessionDetailsW(LPWSTR szBuf, LONG nSize, LONG indentFactor, BOOL bRefresh);
 LONG        DLLENTRY_DEF DTWAIN_GetSessionDetailsA(LPSTR szBuf, LONG nSize, LONG indentFactor, BOOL bRefresh);
-LONG        DLLENTRY_DEF DTWAIN_GetSourceDetailsA(LPCSTR szSources, LPSTR szBuf, LONG nSize, LONG indentFactor);
-LONG        DLLENTRY_DEF DTWAIN_GetSourceDetailsW(LPCWSTR szSources, LPWSTR szBuf, LONG nSize, LONG indentFactor);
+LONG        DLLENTRY_DEF DTWAIN_GetSourceDetailsA(LPCSTR szSources, LPSTR szBuf, LONG nSize, LONG indentFactor, BOOL bRefresh);
+LONG        DLLENTRY_DEF DTWAIN_GetSourceDetailsW(LPCWSTR szSources, LPWSTR szBuf, LONG nSize, LONG indentFactor, BOOL bRefresh);
 LONG        DLLENTRY_DEF DTWAIN_GetVersionCopyrightA(LPSTR lpszApp, LONG nLength);
 LONG        DLLENTRY_DEF DTWAIN_GetVersionCopyrightW(LPWSTR lpszApp, LONG nLength);
 
@@ -462,6 +462,6 @@ LONG        DLLENTRY_DEF DTWAIN_GetPaperSizeName(LONG paperNumber, DTWAIN_CHARPT
 LONG        DLLENTRY_DEF DTWAIN_GetTwainNameFromConstant(LONG lConstantType, LONG lTwainConstant, DTWAIN_CHARPTRTYPE lpszOut, LONG nSize);
 LONG        DLLENTRY_DEF DTWAIN_GetWindowsVersionInfo(DTWAIN_CHARPTRTYPE lpszBuffer, LONG nMaxLen);
 LONG        DLLENTRY_DEF DTWAIN_GetSessionDetails(DTWAIN_CHARPTRTYPE szBuf, LONG nSize, LONG indentFactor, BOOL bRefresh);
-LONG        DLLENTRY_DEF DTWAIN_GetSourceDetails(DTWAIN_CCHARPTRTYPE szSources, DTWAIN_CHARPTRTYPE szBuf, LONG nSize, LONG indentFactor);
+LONG        DLLENTRY_DEF DTWAIN_GetSourceDetails(DTWAIN_CCHARPTRTYPE szSources, DTWAIN_CHARPTRTYPE szBuf, LONG nSize, LONG indentFactor, BOOL bRefresh);
 LONG        DLLENTRY_DEF DTWAIN_GetVersionCopyright(DTWAIN_CHARPTRTYPE lpszApp, LONG nLength);
 #endif

demos/AllDemos.sln

@@ -189,8 +189,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestImageFileCreation", "cp
 		{39C0A01F-B0C7-427C-B658-E2442F54C19E} = {39C0A01F-B0C7-427C-B658-E2442F54C19E}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharp_FullDemo", "csharp\Examples\FullDemo\CSharp_FullDemo.csproj", "{D60B44C1-0202-4713-A5F0-EC9955656A31}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ShowCustomDSData", "cpp_wrapper\ShowCustomDSData\ShowCustomDSData.vcxproj", "{2646A722-F9B3-441C-8D31-5E08F3FF3CB2}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MultiPageTiffCompressionDemo", "cpp_wrapper\MultiPageTiffCompressionDemo\MultiPageTiffCompressionDemo.vcxproj", "{968D811B-8C72-4EDD-8A32-F43786F65C1C}"
@@ -2418,66 +2416,6 @@ Global
 		{21C7B532-519B-4086-A21B-E7BE5EDC84D8}.Win64_DTWAINDLL|x64.ActiveCfg = Win64_DTWAINDLL|x64
 		{21C7B532-519B-4086-A21B-E7BE5EDC84D8}.Win64_DTWAINDLL|x64.Build.0 = Win64_DTWAINDLL|x64
 		{21C7B532-519B-4086-A21B-E7BE5EDC84D8}.Win64_DTWAINDLL|x86.ActiveCfg = Win64_DTWAINDLL|x64
-		{D60B44C1-0202-4713-A5F0-EC9955656A31}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D60B44C1-0202-4713-A5F0-EC9955656A31}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D60B44C1-0202-4713-A5F0-EC9955656A31}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D60B44C1-0202-4713-A5F0-EC9955656A31}.Debug|x64.Build.0 = Debug|Any CPU
-		{D60B44C1-0202-4713-A5F0-EC9955656A31}.Debug|x86.ActiveCfg = Debug|x86
-		{D60B44C1-0202-4713-A5F0-EC9955656A31}.Debug|x86.Build.0 = Debug|x86
-		{D60B44C1-0202-4713-A5F0-EC9955656A31}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D60B44C1-0202-4713-A5F0-EC9955656A31}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D60B44C1-0202-4713-A5F0-EC9955656A31}.Release|x64.ActiveCfg = Release|Any CPU
-		{D60B44C1-0202-4713-A5F0-EC9955656A31}.Release|x64.Build.0 = Release|Any CPU
-		{D60B44C1-0202-4713-A5F0-EC9955656A31}.Release|x86.ActiveCfg = Release|x86
-		{D60B44C1-0202-4713-A5F0-EC9955656A31}.Release|x86.Build.0 = Release|x86
-		{D60B44C1-0202-4713-A5F0-EC9955656A31}.Win32_DTWAINDLL_D|Any CPU.ActiveCfg = Debug|Any CPU
-		{D60B44C1-0202-4713-A5F0-EC9955656A31}.Win32_DTWAINDLL_D|Any CPU.Build.0 = Debug|Any CPU
-		{D60B44C1-0202-4713-A5F0-EC9955656A31}.Win32_DTWAINDLL_D|x64.ActiveCfg = Debug|Any CPU
-		{D60B44C1-0202-4713-A5F0-EC9955656A31}.Win32_DTWAINDLL_D|x64.Build.0 = Debug|Any CPU
-		{D60B44C1-0202-4713-A5F0-EC9955656A31}.Win32_DTWAINDLL_D|x86.ActiveCfg = Debug|x86
-		{D60B44C1-0202-4713-A5F0-EC9955656A31}.Win32_DTWAINDLL_D|x86.Build.0 = Debug|x86
-		{D60B44C1-0202-4713-A5F0-EC9955656A31}.Win32_DTWAINDLL_U_D|Any CPU.ActiveCfg = Debug|Any CPU
-		{D60B44C1-0202-4713-A5F0-EC9955656A31}.Win32_DTWAINDLL_U_D|Any CPU.Build.0 = Debug|Any CPU
-		{D60B44C1-0202-4713-A5F0-EC9955656A31}.Win32_DTWAINDLL_U_D|x64.ActiveCfg = Debug|Any CPU
-		{D60B44C1-0202-4713-A5F0-EC9955656A31}.Win32_DTWAINDLL_U_D|x64.Build.0 = Debug|Any CPU
-		{D60B44C1-0202-4713-A5F0-EC9955656A31}.Win32_DTWAINDLL_U_D|x86.ActiveCfg = Debug|x86
-		{D60B44C1-0202-4713-A5F0-EC9955656A31}.Win32_DTWAINDLL_U_D|x86.Build.0 = Debug|x86
-		{D60B44C1-0202-4713-A5F0-EC9955656A31}.Win32_DTWAINDLL_U|Any CPU.ActiveCfg = Debug|Any CPU
-		{D60B44C1-0202-4713-A5F0-EC9955656A31}.Win32_DTWAINDLL_U|Any CPU.Build.0 = Debug|Any CPU
-		{D60B44C1-0202-4713-A5F0-EC9955656A31}.Win32_DTWAINDLL_U|x64.ActiveCfg = Debug|Any CPU
-		{D60B44C1-0202-4713-A5F0-EC9955656A31}.Win32_DTWAINDLL_U|x64.Build.0 = Debug|Any CPU
-		{D60B44C1-0202-4713-A5F0-EC9955656A31}.Win32_DTWAINDLL_U|x86.ActiveCfg = Debug|x86
-		{D60B44C1-0202-4713-A5F0-EC9955656A31}.Win32_DTWAINDLL_U|x86.Build.0 = Debug|x86
-		{D60B44C1-0202-4713-A5F0-EC9955656A31}.Win32_DTWAINDLL|Any CPU.ActiveCfg = Debug|Any CPU
-		{D60B44C1-0202-4713-A5F0-EC9955656A31}.Win32_DTWAINDLL|Any CPU.Build.0 = Debug|Any CPU
-		{D60B44C1-0202-4713-A5F0-EC9955656A31}.Win32_DTWAINDLL|x64.ActiveCfg = Debug|Any CPU
-		{D60B44C1-0202-4713-A5F0-EC9955656A31}.Win32_DTWAINDLL|x64.Build.0 = Debug|Any CPU
-		{D60B44C1-0202-4713-A5F0-EC9955656A31}.Win32_DTWAINDLL|x86.ActiveCfg = Debug|x86
-		{D60B44C1-0202-4713-A5F0-EC9955656A31}.Win32_DTWAINDLL|x86.Build.0 = Debug|x86
-		{D60B44C1-0202-4713-A5F0-EC9955656A31}.Win64_DTWAINDLL_D|Any CPU.ActiveCfg = Debug|Any CPU
-		{D60B44C1-0202-4713-A5F0-EC9955656A31}.Win64_DTWAINDLL_D|Any CPU.Build.0 = Debug|Any CPU
-		{D60B44C1-0202-4713-A5F0-EC9955656A31}.Win64_DTWAINDLL_D|x64.ActiveCfg = Debug|Any CPU
-		{D60B44C1-0202-4713-A5F0-EC9955656A31}.Win64_DTWAINDLL_D|x64.Build.0 = Debug|Any CPU
-		{D60B44C1-0202-4713-A5F0-EC9955656A31}.Win64_DTWAINDLL_D|x86.ActiveCfg = Debug|x86
-		{D60B44C1-0202-4713-A5F0-EC9955656A31}.Win64_DTWAINDLL_D|x86.Build.0 = Debug|x86
-		{D60B44C1-0202-4713-A5F0-EC9955656A31}.Win64_DTWAINDLL_U_D|Any CPU.ActiveCfg = Debug|Any CPU
-		{D60B44C1-0202-4713-A5F0-EC9955656A31}.Win64_DTWAINDLL_U_D|Any CPU.Build.0 = Debug|Any CPU
-		{D60B44C1-0202-4713-A5F0-EC9955656A31}.Win64_DTWAINDLL_U_D|x64.ActiveCfg = Debug|Any CPU
-		{D60B44C1-0202-4713-A5F0-EC9955656A31}.Win64_DTWAINDLL_U_D|x64.Build.0 = Debug|Any CPU
-		{D60B44C1-0202-4713-A5F0-EC9955656A31}.Win64_DTWAINDLL_U_D|x86.ActiveCfg = Debug|x86
-		{D60B44C1-0202-4713-A5F0-EC9955656A31}.Win64_DTWAINDLL_U_D|x86.Build.0 = Debug|x86
-		{D60B44C1-0202-4713-A5F0-EC9955656A31}.Win64_DTWAINDLL_U|Any CPU.ActiveCfg = Debug|Any CPU
-		{D60B44C1-0202-4713-A5F0-EC9955656A31}.Win64_DTWAINDLL_U|Any CPU.Build.0 = Debug|Any CPU
-		{D60B44C1-0202-4713-A5F0-EC9955656A31}.Win64_DTWAINDLL_U|x64.ActiveCfg = Debug|Any CPU
-		{D60B44C1-0202-4713-A5F0-EC9955656A31}.Win64_DTWAINDLL_U|x64.Build.0 = Debug|Any CPU
-		{D60B44C1-0202-4713-A5F0-EC9955656A31}.Win64_DTWAINDLL_U|x86.ActiveCfg = Debug|x86
-		{D60B44C1-0202-4713-A5F0-EC9955656A31}.Win64_DTWAINDLL_U|x86.Build.0 = Debug|x86
-		{D60B44C1-0202-4713-A5F0-EC9955656A31}.Win64_DTWAINDLL|Any CPU.ActiveCfg = Debug|Any CPU
-		{D60B44C1-0202-4713-A5F0-EC9955656A31}.Win64_DTWAINDLL|Any CPU.Build.0 = Debug|Any CPU
-		{D60B44C1-0202-4713-A5F0-EC9955656A31}.Win64_DTWAINDLL|x64.ActiveCfg = Debug|Any CPU
-		{D60B44C1-0202-4713-A5F0-EC9955656A31}.Win64_DTWAINDLL|x64.Build.0 = Debug|Any CPU
-		{D60B44C1-0202-4713-A5F0-EC9955656A31}.Win64_DTWAINDLL|x86.ActiveCfg = Debug|x86
-		{D60B44C1-0202-4713-A5F0-EC9955656A31}.Win64_DTWAINDLL|x86.Build.0 = Debug|x86
 		{2646A722-F9B3-441C-8D31-5E08F3FF3CB2}.Debug|Any CPU.ActiveCfg = Win32_DTWAINDLL|Win32
 		{2646A722-F9B3-441C-8D31-5E08F3FF3CB2}.Debug|Any CPU.Build.0 = Win32_DTWAINDLL|Win32
 		{2646A722-F9B3-441C-8D31-5E08F3FF3CB2}.Debug|x64.ActiveCfg = Win64_DTWAINDLL_U_D|x64

demos/NoImportLib/dtwainx2.h

@@ -980,15 +980,18 @@ typedef DTWAIN_BOOL (DLLENTRY_DEF* D_SETBLANKPAGEDETECTIONEX)
 typedef DTWAIN_BOOL (DLLENTRY_DEF* D_SETBLANKPAGEDETECTIONEXSTRINGA)            (DTWAIN_SOURCE, LPCSTR, LONG, LONG, DTWAIN_BOOL);
 typedef DTWAIN_BOOL (DLLENTRY_DEF* D_SETBLANKPAGEDETECTIONEXSTRINGW)            (DTWAIN_SOURCE, LPCWSTR, LONG, LONG, DTWAIN_BOOL);
 typedef DTWAIN_BOOL (DLLENTRY_DEF* D_SETBLANKPAGEDETECTIONEXSTRING)             (DTWAIN_SOURCE, LPCTSTR, LONG, LONG, DTWAIN_BOOL);
-typedef LONG        (DLLENTRY_DEF* D_GETSOURCEDETAILSFUNC)                      (LPCTSTR, LPTSTR, LONG, DTWAIN_BOOL);
-typedef LONG        (DLLENTRY_DEF* D_GETSOURCEDETAILSAFUNC)                     (LPCSTR, LPSTR, LONG, DTWAIN_BOOL);
-typedef LONG        (DLLENTRY_DEF* D_GETSOURCEDETAILSWFUNC)                     (LPCWSTR, LPWSTR, LONG, DTWAIN_BOOL);
+typedef LONG        (DLLENTRY_DEF* D_GETSOURCEDETAILSFUNC)                      (LPCTSTR, LPTSTR, LONG, LONG, DTWAIN_BOOL);
+typedef LONG        (DLLENTRY_DEF* D_GETSOURCEDETAILSAFUNC)                     (LPCSTR, LPSTR, LONG, LONG, DTWAIN_BOOL);
+typedef LONG        (DLLENTRY_DEF* D_GETSOURCEDETAILSWFUNC)                     (LPCWSTR, LPWSTR, LONG, LONG, DTWAIN_BOOL);
 typedef LONG        (DLLENTRY_DEF* D_GETSESSIONDETAILSFUNC)                     (LPTSTR, LONG, LONG, DTWAIN_BOOL);
 typedef LONG        (DLLENTRY_DEF* D_GETSESSIONDETAILSAFUNC)                    (LPSTR, LONG, LONG, DTWAIN_BOOL);
 typedef LONG        (DLLENTRY_DEF* D_GETSESSIONDETAILSWFUNC)                    (LPWSTR, LONG, LONG, DTWAIN_BOOL);
 typedef LONG        (DLLENTRY_DEF* D_GETVERSIONCOPYRIGHTFUNC)                   (LPTSTR, LONG);
 typedef LONG        (DLLENTRY_DEF* D_GETVERSIONCOPYRIGHTAFUNC)                  (LPSTR, LONG);
 typedef LONG        (DLLENTRY_DEF* D_GETVERSIONCOPYRIGHTWFUNC)                  (LPWSTR, LONG);
+typedef DTWAIN_BOOL (DLLENTRY_DEF* D_ISSOURCEVALIDFUNC)                         (DTWAIN_SOURCE);
+typedef DTWAIN_BOOL (DLLENTRY_DEF* D_ENABLETRIPLETSNOTIFYFUNC)                  (DTWAIN_BOOL);
+typedef DTWAIN_BOOL (DLLENTRY_DEF* D_ISNOTIFYTRIPLETSENABLEDFUNC)               (VOID_PROTOTYPE);
 #ifdef __cplusplus
 }
 #endif
@@ -1150,6 +1153,7 @@ typedef LONG        (DLLENTRY_DEF* D_GETVERSIONCOPYRIGHTWFUNC)
     STATIC D_ENABLEPATCHDETECTFUNC                          DTWAIN_EnablePatchDetect;
     STATIC D_ENABLEPRINTERFUNC                              DTWAIN_EnablePrinter;
     STATIC D_ENABLETHUMBNAILFUNC                            DTWAIN_EnableThumbnail;
+    STATIC D_ENABLETRIPLETSNOTIFYFUNC                       DTWAIN_EnableTripletsNotify;
     STATIC D_ENDTHREADFUNC                                  DTWAIN_EndThread;
     STATIC D_ENDTWAINSESSIONFUNC                            DTWAIN_EndTwainSession;
     STATIC D_ENUMALARMSEXFUNC                               DTWAIN_EnumAlarmsEx;
@@ -1613,6 +1617,7 @@ typedef LONG        (DLLENTRY_DEF* D_GETVERSIONCOPYRIGHTWFUNC)
     STATIC D_ISLIGHTSOURCESUPPORTEDFUNC                     DTWAIN_IsLightSourceSupported;
     STATIC D_ISMAXBUFFERSSUPPORTEDFUNC                      DTWAIN_IsMaxBuffersSupported;
     STATIC D_ISMSGNOTIFYENABLEDFUNC                         DTWAIN_IsMsgNotifyEnabled;
+    STATIC D_ISNOTIFYTRIPLETSENABLEDFUNC                    DTWAIN_IsNotifyTripletsEnabled;
     STATIC D_ISOCRENGINEACTIVATEDFUNC                       DTWAIN_IsOCREngineActivated;
     STATIC D_ISORIENTATIONSUPPORTEDFUNC                     DTWAIN_IsOrientationSupported;
     STATIC D_ISOVERSCANSUPPORTEDFUNC                        DTWAIN_IsOverscanSupported;
@@ -1632,6 +1637,7 @@ typedef LONG        (DLLENTRY_DEF* D_GETVERSIONCOPYRIGHTWFUNC)
     STATIC D_ISSOURCEACQUIRINGFUNC                          DTWAIN_IsSourceAcquiring;
     STATIC D_ISSOURCEOPENFUNC                               DTWAIN_IsSourceOpen;
     STATIC D_ISSOURCESELECTEDFUNC                           DTWAIN_IsSourceSelected;
+    STATIC D_ISSOURCEVALIDFUNC                              DTWAIN_IsSourceValid;
     STATIC D_ISTHUMBNAILENABLEDFUNC                         DTWAIN_IsThumbnailEnabled;
     STATIC D_ISTHUMBNAILSUPPORTEDFUNC                       DTWAIN_IsThumbnailSupported;
     STATIC D_ISTIFFSUPPORTEDFUNC                            DTWAIN_IsTIFFSupported;