[PATCH v19 3/3] cabinet: implement GetDllVersion function use DllGetVersion as helper function read value from structure and return it as string

[tobi.goergens]

From: "tobi.goergens"

---
 dlls/cabinet/cabinet.spec   |  2 +-
 dlls/cabinet/cabinet_main.c | 63 +++++++++++++++++++++++++++++++++++++
 2 files changed, 64 insertions(+), 1 deletion(-)

diff --git a/dlls/cabinet/cabinet.spec b/dlls/cabinet/cabinet.spec
index 7cf709de60e..3a98245acc1 100644
--- a/dlls/cabinet/cabinet.spec
+++ b/dlls/cabinet/cabinet.spec
@@ -1,4 +1,4 @@
-1 stub GetDllVersion
+1 stdcall GetDllVersion()
 2 stdcall -private DllGetVersion (ptr) cabinet_dll_get_version
 3 stdcall Extract(ptr str)
 4 stub DeleteExtractedFiles
diff --git a/dlls/cabinet/cabinet_main.c b/dlls/cabinet/cabinet_main.c
index 5823fa7cc6a..2faa2af8be2 100644
--- a/dlls/cabinet/cabinet_main.c
+++ b/dlls/cabinet/cabinet_main.c
@@ -133,6 +133,69 @@ VOID WINAPI cabinet_dll_get_version (PCABINETDLLVERSIONINFO cabVerInfo)
     }
 }

+/***********************************************************************
+ * GetDllVersion (CABINET.2)
+ *
+ * Returns the version of the Cabinet.dll
+ *
+ * PARAMS
+ *     This function has to parameters
+ *
+ * RETURNS
+ *     Success: cabDllVer: string of Cabinet.dll version
+ *     Failure: empty string.
+ *     Use GetLastError() to find out more about why the function failed
+ *
+ */
+
+LPCSTR WINAPI GetDllVersion(void)
+{
+    PCABINETDLLVERSIONINFO  cabVerInfo;
+    LPSTR                   cabDllVer;
+    int                     sizeVerInfo;
+    DWORD                   FileVersionMS;
+    DWORD                   FileVersionLS;
+    int                     majorV;
+    int                     minorV;
+    int                     buildV;
+    int                     revisV;
+
+    cabVerInfo = malloc(sizeof(CABINETDLLVERSIONINFO));
+    if(cabVerInfo == NULL) {
+        SetLastError(ERROR_OUTOFMEMORY);
+        TRACE("Cannot create cabVerInfo: Out of memory: Error = %ld.\n", GetLastError());
+        return "";
+    }
+
+    cabinet_dll_get_version(cabVerInfo);
+    if (cabVerInfo->cbStruct==0) {
+        TRACE("Cannot access struct: The length of the version information structure is 0: Error = %ld.\n", GetLastError());
+        return "";
+    }
+
+    FileVersionMS = cabVerInfo->dwFileVersionMS;
+    FileVersionLS = cabVerInfo->dwFileVersionLS;
+
+    /*length of 4 DWORDs + buffer*/
+    sizeVerInfo = 32;
+
+    cabDllVer = malloc(sizeVerInfo);
+    if (cabDllVer == NULL) {
+        SetLastError(ERROR_OUTOFMEMORY);
+        TRACE("Cannot create cabDllVer: Out of memory: Error = %ld.\n", GetLastError());
+        return "";
+    }
+
+    majorV = (int)( FileVersionMS >> 16 ) & 0xffff;
+    minorV = (int)( FileVersionMS >>  0 ) & 0xffff;
+    buildV = (int)( FileVersionLS >> 16 ) & 0xffff;
+    revisV = (int)( FileVersionLS >>  0 ) & 0xffff;
+
+    snprintf(cabDllVer, sizeVerInfo, "%d.%d.%d.%d\n",majorV,minorV,buildV,revisV);
+
+    return cabDllVer;
+}
+
 /* FDI callback functions */

static void * CDECL mem_alloc(ULONG cb)