[SHIMENG] Pass shim commandline to shims. CORE-11329

svn path=/trunk/; revision=75359

diff --git a/reactos/dll/appcompat/apphelp/shimeng.c b/reactos/dll/appcompat/apphelp/shimeng.c
index b6bf2e8..8a708e1 100644 (file)
--- a/reactos/dll/appcompat/apphelp/shimeng.c
+++ b/reactos/dll/appcompat/apphelp/shimeng.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright 2015-2017 Mark Jansen
+ * Copyright 2015-2017 Mark Jansen (mark.jansen@reactos.org)

  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public


@@ -790,13 +790,13 @@ VOID SeiInit(PUNICODE_STRING ProcessImage, HSDB hsdb, SDBQUERYRESULT* pQuery)
         TAGID ShimRef;
         if (SdbTagRefToTagID(hsdb, Data[n], &pdb, &ShimRef))
         {
         TAGID ShimRef;
         if (SdbTagRefToTagID(hsdb, Data[n], &pdb, &ShimRef))
         {

-            LPCWSTR ShimName, DllName;
+            LPCWSTR ShimName, DllName, CommandLine = NULL;

             TAGID ShimTag;
             WCHAR FullNameBuffer[MAX_PATH];
             UNICODE_STRING UnicodeDllName;
             PVOID BaseAddress;
             PSHIMMODULE pShimInfo = NULL;
             TAGID ShimTag;
             WCHAR FullNameBuffer[MAX_PATH];
             UNICODE_STRING UnicodeDllName;
             PVOID BaseAddress;
             PSHIMMODULE pShimInfo = NULL;

-            const char* szCommandLine = "";
+            ANSI_STRING AnsiCommandLine = RTL_CONSTANT_STRING("");

             PHOOKAPIEX pHookApi;
             DWORD dwHookCount;
 
             PHOOKAPIEX pHookApi;
             DWORD dwHookCount;
 


@@ -807,6 +807,21 @@ VOID SeiInit(PUNICODE_STRING ProcessImage, HSDB hsdb, SDBQUERYRESULT* pQuery)
                 continue;
             }
 
                 continue;
             }
 

+            CommandLine = SeiGetStringPtr(pdb, ShimRef, TAG_COMMAND_LINE);
+            if (CommandLine && *CommandLine)
+            {
+                RtlInitUnicodeString(&UnicodeDllName, CommandLine);
+                if (NT_SUCCESS(RtlUnicodeStringToAnsiString(&AnsiCommandLine, &UnicodeDllName, TRUE)))
+                {
+                    SHIMENG_INFO("COMMAND LINE %s for %S", AnsiCommandLine.Buffer, ShimName);
+                }
+                else
+                {
+                    AnsiCommandLine.Buffer = "";
+                    CommandLine = NULL;
+                }
+            }
+

             ShimTag = SeiGetDWORD(pdb, ShimRef, TAG_SHIM_TAGID);
             if (!ShimTag)
             {
             ShimTag = SeiGetDWORD(pdb, ShimRef, TAG_SHIM_TAGID);
             if (!ShimTag)
             {


@@ -829,11 +844,6 @@ VOID SeiInit(PUNICODE_STRING ProcessImage, HSDB hsdb, SDBQUERYRESULT* pQuery)
                 continue;
             }
 
                 continue;
             }
 

-            /* TODO:
-            SeiGetShimCommandLine();
-            [SeiInit] COMMAND_LINE VirtualRegistry(WINNT;VistaRTMLie) from AcLayers.DLL
-            */
-

             RtlInitUnicodeString(&UnicodeDllName, FullNameBuffer);
             if (NT_SUCCESS(LdrGetDllHandle(NULL, NULL, &UnicodeDllName, &BaseAddress)))
             {
             RtlInitUnicodeString(&UnicodeDllName, FullNameBuffer);
             if (NT_SUCCESS(LdrGetDllHandle(NULL, NULL, &UnicodeDllName, &BaseAddress)))
             {


@@ -857,12 +867,14 @@ VOID SeiInit(PUNICODE_STRING ProcessImage, HSDB hsdb, SDBQUERYRESULT* pQuery)
             SHIMENG_INFO("Shim DLL 0x%p \"%wZ\" loaded\n", BaseAddress, &UnicodeDllName);
             SHIMENG_INFO("Using SHIM \"%S!%S\"\n", DllName, ShimName);
 
             SHIMENG_INFO("Shim DLL 0x%p \"%wZ\" loaded\n", BaseAddress, &UnicodeDllName);
             SHIMENG_INFO("Using SHIM \"%S!%S\"\n", DllName, ShimName);
 

-
-            pHookApi = pShimInfo->pGetHookAPIs(szCommandLine, ShimName, &dwHookCount);
+            pHookApi = pShimInfo->pGetHookAPIs(AnsiCommandLine.Buffer, ShimName, &dwHookCount);

             SHIMENG_INFO("GetHookAPIs returns %d hooks for DLL \"%wZ\" SHIM \"%S\"\n", dwHookCount, &UnicodeDllName, ShimName);
             if (dwHookCount)
                 SeiAppendHookInfo(pShimInfo, pHookApi, dwHookCount);
 
             SHIMENG_INFO("GetHookAPIs returns %d hooks for DLL \"%wZ\" SHIM \"%S\"\n", dwHookCount, &UnicodeDllName, ShimName);
             if (dwHookCount)
                 SeiAppendHookInfo(pShimInfo, pHookApi, dwHookCount);
 

+            if (CommandLine && *CommandLine)
+                RtlFreeAnsiString(&AnsiCommandLine);
+

             dwTotalHooks += dwHookCount;
             /*SeiBuildInclExclList*/
         }
             dwTotalHooks += dwHookCount;
             /*SeiBuildInclExclList*/
         }