v 1.4.1

Address #6
hfiref0x · Dec 13, 2023 · 289bf9b · 289bf9b
1 parent a691cad
commit 289bf9b
Show file tree

Hide file tree

Showing 8 changed files with 104 additions and 48 deletions.
diff --git a/Binary/sxsexp32.exe b/Binary/sxsexp32.exe
diff --git a/Binary/sxsexp64.exe b/Binary/sxsexp64.exe
diff --git a/SXSEXP.sha256 b/SXSEXP.sha256
diff --git a/Source/sxsexp/main.c b/Source/sxsexp/main.c
@@ -4,9 +4,9 @@
 *
 *  TITLE:       MAIN.C
 *
-*  VERSION:     1.40
+*  VERSION:     1.41
 *
-*  DATE:        19 Jul 2023
+*  DATE:        10 Dec 2023
 *
 *  Program entry point.
 *
@@ -25,6 +25,7 @@
 HANDLE g_Heap = NULL;
 
 SUP_DECOMPRESSOR gDecompressor;
+SUP_DELTA_COMPRESSION gMsDeltaContext;
 SUP_CONSOLE gConsole;
 
 #define T_UNSUPFORMAT TEXT("This format is not supported by this tool")
@@ -33,7 +34,7 @@ SUP_CONSOLE gConsole;
 //
 // Help output.
 //
-#define T_TITLE TEXT("SXSEXP v1.4.0 from Jul 20 2023, (c) 2016 - 2023 hfiref0x\r\n\
+#define T_TITLE TEXT("SXSEXP v1.4.1 from Dec 10 2023, (c) 2016 - 2023 hfiref0x\r\n\
 Expand compressed files from WinSxS folder (DCD01, DCN01, DCM01, DCS01 formats).\r\n")
 
 #define T_HELP  TEXT("SXSEXP <Source File> <Destination File>\r\n\
@@ -75,7 +76,7 @@ VOID PrintDataHeader(
         inputDelta.lpStart = header.pDCD->Data;
         inputDelta.uSize = SourceFileSize - FIELD_OFFSET(DCD_HEADER, Data);  //size without header specific fields
         inputDelta.Editable = FALSE;
-        if (!GetDeltaInfoB(inputDelta, &dhi)) {
+        if (!gMsDeltaContext.GetDeltaInfoB(inputDelta, &dhi)) {
             supConsoleWriteLine(&gConsole, T_ERRORDELTA);
             break;
         }
@@ -98,7 +99,7 @@ VOID PrintDataHeader(
         inputDelta.lpStart = header.pDCN->Data;
         inputDelta.uSize = SourceFileSize - FIELD_OFFSET(DCN_HEADER, Data); //size without header
         inputDelta.Editable = FALSE;
-        if (!GetDeltaInfoB(inputDelta, &dhi)) {
+        if (!gMsDeltaContext.GetDeltaInfoB(inputDelta, &dhi)) {
             supConsoleWriteLine(&gConsole, T_ERRORDELTA);
             break;
         }
@@ -181,12 +182,12 @@ BOOL ProcessFileDCN(
     inputDelta.Editable = FALSE;
     inputDelta.lpStart = ((PDCN_HEADER)SourceFile)->Data;
     inputDelta.uSize = SourceFileSize - FIELD_OFFSET(DCN_HEADER, Data);
-    if (GetDeltaInfoB(inputDelta, &deltaHeaderInfo)) {
+    if (gMsDeltaContext.GetDeltaInfoB(inputDelta, &deltaHeaderInfo)) {
 
         RtlSecureZeroMemory(&sourceDelta, sizeof(DELTA_INPUT));
         RtlSecureZeroMemory(&targetOutput, sizeof(DELTA_OUTPUT));
 
-        bResult = ApplyDeltaB(DELTA_FLAG_NONE, sourceDelta, inputDelta, &targetOutput);
+        bResult = gMsDeltaContext.ApplyDeltaB(DELTA_FLAG_NONE, sourceDelta, inputDelta, &targetOutput);
         if (bResult) {
 
             pvData = HeapAlloc(g_Heap, HEAP_ZERO_MEMORY, targetOutput.uSize);
@@ -197,7 +198,7 @@ BOOL ProcessFileDCN(
             else {
                 dwLastError = GetLastError();
             }
-            DeltaFree(targetOutput.lpStart);
+            gMsDeltaContext.DeltaFree(targetOutput.lpStart);
         }
         else {
             dwLastError = GetLastError();
@@ -298,7 +299,7 @@ BOOL ProcessFileDCD(
 
         ioutput.lpStart = NULL;
         ioutput.uSize = 0;
-        bResult = ApplyDeltaB(DELTA_FLAG_NONE, isrc, idelta, &ioutput);
+        bResult = gMsDeltaContext.ApplyDeltaB(DELTA_FLAG_NONE, isrc, idelta, &ioutput);
         if (bResult) {
 
             pvData = HeapAlloc(g_Heap, HEAP_ZERO_MEMORY, ioutput.uSize);
@@ -309,7 +310,7 @@ BOOL ProcessFileDCD(
             else {
                 dwLastError = GetLastError();
             }
-            DeltaFree(ioutput.lpStart);
+            gMsDeltaContext.DeltaFree(ioutput.lpStart);
         }
         else {
             dwLastError = GetLastError();
@@ -495,7 +496,7 @@ BOOL ProcessFileDCM(
         inputDelta.Editable = FALSE;
         inputDelta.lpStart = ((PDCM_HEADER)SourceFile)->Data;
         inputDelta.uSize = SourceFileSize - FIELD_OFFSET(DCM_HEADER, Data);
-        if (!GetDeltaInfoB(inputDelta, &dhi)) {
+        if (!gMsDeltaContext.GetDeltaInfoB(inputDelta, &dhi)) {
             dwLastError = GetLastError();
             supConsoleWriteLine(&gConsole, T_ERRORDELTA);
             break;
@@ -508,7 +509,7 @@ BOOL ProcessFileDCM(
 
         RtlSecureZeroMemory(&targetDelta, sizeof(DELTA_OUTPUT));
 
-        bResult = ApplyDeltaB(DELTA_FLAG_NONE, sourceDelta, inputDelta, &targetDelta);
+        bResult = gMsDeltaContext.ApplyDeltaB(DELTA_FLAG_NONE, sourceDelta, inputDelta, &targetDelta);
         if (bResult) {
 
             pvData = HeapAlloc(g_Heap, HEAP_ZERO_MEMORY, targetDelta.uSize);
@@ -520,7 +521,7 @@ BOOL ProcessFileDCM(
                 dwLastError = GetLastError();
             }
 
-            DeltaFree(targetDelta.lpStart);
+            gMsDeltaContext.DeltaFree(targetDelta.lpStart);
         }
         else {
             dwLastError = GetLastError();
@@ -942,6 +943,21 @@ void main()
                 break;
             }
 
+            if (!supInitializeMsDeltaAPI(&gMsDeltaContext)) {
+                supConsoleDisplayWin32Error(&gConsole, TEXT("SXSEXP: Fatal error, failed to initialize MsDelta API"));
+                break;
+            }
+            else {
+                RtlSecureZeroMemory(szSourcePath, sizeof(szSourcePath));
+                if (GetModuleFileName(gMsDeltaContext.hModule,
+                    (LPWSTR)&szSourcePath,
+                    MAX_PATH))
+                {
+                    supConsoleWriteLine(&gConsole, TEXT("SXSEXP: Loaded MsDelta.dll"));
+                    supConsoleWriteLine(&gConsole, szSourcePath);
+                }
+            }
+
             if (_strcmpi(szBuffer, L"/d") == 0) {
                 uResult = DCDMode(lpCmdLine);
                 break;

diff --git a/Source/sxsexp/sup.c b/Source/sxsexp/sup.c
@@ -462,6 +462,52 @@ CFILE_TYPE supGetFileType(
     return Result;
 }
 
+/*
+* supInitializeMsDeltaAPI
+*
+* Purpose:
+*
+* Allocate pointers to MsDelta engine routines.
+*
+*/
+BOOL supInitializeMsDeltaAPI(
+    _Inout_ PSUP_DELTA_COMPRESSION MsDeltaContext
+)
+{
+    FARPROC pfn;
+    HMODULE hModule;
+
+    MsDeltaContext->ApplyDeltaB = NULL;
+    MsDeltaContext->DeltaFree = NULL;
+    MsDeltaContext->GetDeltaInfoB = NULL;
+
+    hModule = LoadLibrary(TEXT("msdelta.dll"));
+    MsDeltaContext->hModule = hModule;
+
+    if (hModule == NULL)
+        return FALSE;
+
+    pfn = GetProcAddress(hModule, "ApplyDeltaB");
+    if (pfn)
+        MsDeltaContext->ApplyDeltaB = (pfnApplyDeltaB)pfn;
+    else
+        return FALSE;
+
+    pfn = GetProcAddress(hModule, "DeltaFree");
+    if (pfn)
+        MsDeltaContext->DeltaFree = (pfnDeltaFree)pfn;
+    else
+        return FALSE;
+
+    pfn = GetProcAddress(hModule, "GetDeltaInfoB");
+    if (pfn)
+        MsDeltaContext->GetDeltaInfoB = (pfnGetDeltaInfoB)pfn;
+    else
+        return FALSE;
+
+    return TRUE;
+}
+
 /*
 * supInitCabinetDecompressionAPI
 *

diff --git a/Source/sxsexp/sup.h b/Source/sxsexp/sup.h
@@ -4,9 +4,9 @@
 *
 *  TITLE:       SUP.H
 *
-*  VERSION:     1.40
+*  VERSION:     1.41
 *
-*  DATE:        19 Jul 2023
+*  DATE:        10 Dec 2023
 *
 *  Program support routines header file.
 *
@@ -101,6 +101,27 @@ typedef struct _SUP_DECOMPRESSOR {
     pfnDecompress Decompress;
 } SUP_DECOMPRESSOR, * PSUP_DECOMPRESSOR;
 
+typedef BOOL (WINAPI* pfnApplyDeltaB)(
+    _In_ DELTA_FLAG_TYPE ApplyFlags,
+    _In_ DELTA_INPUT Source,
+    _In_ DELTA_INPUT Delta,
+    _Out_ LPDELTA_OUTPUT lpTarget);
+
+typedef BOOL (WINAPI* pfnDeltaFree)(
+    _In_ LPVOID lpMemory);
+
+typedef BOOL (WINAPI* pfnGetDeltaInfoB)(
+    _In_ DELTA_INPUT Delta,
+    _Out_ LPDELTA_HEADER_INFO lpHeaderInfo);
+
+typedef struct _SUP_DELTA_COMPRESSION {
+    HMODULE hModule;
+    pfnApplyDeltaB ApplyDeltaB;
+    pfnDeltaFree DeltaFree;
+    pfnGetDeltaInfoB GetDeltaInfoB;
+} SUP_DELTA_COMPRESSION, * PSUP_DELTA_COMPRESSION;
+
+
 //
 // CONSOLE START
 //
@@ -137,6 +158,11 @@ VOID supConsoleDisplayWin32Error(
 //
 // CONSOLE END
 //
+BOOL supInitializeMsDeltaAPI(
+    _Inout_ PSUP_DELTA_COMPRESSION MsDeltaContext);
+
+BOOL supInitCabinetDecompressionAPI(
+    _Inout_ PSUP_DECOMPRESSOR Decompressor);
 
 CFILE_TYPE supGetFileType(
     _In_ PVOID FileBuffer);
@@ -155,9 +181,6 @@ VOID supPrintDeltaHeaderInfo(
     _In_ PSUP_CONSOLE Console,
     _In_ LPDELTA_HEADER_INFO DeltaHeaderInfo);
 
-BOOL supInitCabinetDecompressionAPI(
-    _Inout_ PSUP_DECOMPRESSOR Decompressor);
-
 BOOL supMapInputFile(
     _In_ LPCWSTR FileName,
     _Out_ PULONG FileSize,

diff --git a/Source/sxsexp/sxsexp.vcxproj.user b/Source/sxsexp/sxsexp.vcxproj.user
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LocalDebuggerCommandArguments>
-    </LocalDebuggerCommandArguments>
+    <LocalDebuggerCommandArguments>c:\install\file.bin c:\install\file.unpacked</LocalDebuggerCommandArguments>
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

diff --git a/Source/sxsexp/sxsexpres.rc b/Source/sxsexp/sxsexpres.rc