[0.4.9] revert [NTDLL/LDR] Overhaul sxs work

This reverts commit 0.4.8-dev-502-g
7000fe2.

This reverts commit 0.4.8-dev-503-g
f318a25.

The two changes were done once to work towards better
shim-supporting APIs of newer Windows versions on demand
in the future. Luckily we do not depend on them yet.

Giannis already fixed most regressions of the 2 commits
before branching 0.4.8RC (e.g. 2nd stage theme-selector).

Unfortunately we still have issues atm with the existing mixture
of Wine comctl32 v5 vs v6.
The image-lists of both are not compatible as Giannis told us.

We revert both commits for this release to fix CORE-14433
(missing icons due to incompatible image-lists). We can not
simply add a manifest here, because 3rd party apps are affected.

I double-checked, all of those (formerly affected) apps
are working fine and show the icons after the revert:
2nd-stage-theme-selection, MS Excel Viewer 2007 open-dlg,
MSVCPP 6 installer open-dlg, FaxViewer save-dlg,
MS Word Viewer 2003 open-dlg

This revert also obsoletes works/fixes like
2f11904.

(cherry picked from commit 11bf8fa)

Author: JoachimHenze

dll/ntdll/ldr/ldrpe.c

@@ -803,6 +803,7 @@ LdrpWalkImportDescriptor(IN LPWSTR DllPath OPTIONAL,
     return Status;
 }
 
+/* FIXME: This function is missing SxS support */
 NTSTATUS
 NTAPI
 LdrpLoadImportModule(IN PWSTR DllPath OPTIONAL,
@@ -818,14 +819,9 @@ LdrpLoadImportModule(IN PWSTR DllPath OPTIONAL,
     NTSTATUS Status;
     PPEB Peb = RtlGetCurrentPeb();
     PTEB Teb = NtCurrentTeb();
-    UNICODE_STRING RedirectedImpDescName;
-    BOOLEAN RedirectedDll;
 
     DPRINT("LdrpLoadImportModule('%S' '%s' %p %p)\n", DllPath, ImportName, DataTableEntry, Existing);
 
-    RedirectedDll = FALSE;
-    RtlInitEmptyUnicodeString(&RedirectedImpDescName, NULL, 0);
-
     /* Convert import descriptor name to unicode string */
     ImpDescName = &Teb->StaticUnicodeString;
     RtlInitAnsiString(&AnsiString, ImportName);
@@ -875,59 +871,76 @@ LdrpLoadImportModule(IN PWSTR DllPath OPTIONAL,
                                              &LdrApiDefaultExtension);
     }
 
-    /* Check if the SxS Assemblies specify another file */
-    Status = RtlDosApplyFileIsolationRedirection_Ustr(TRUE,
-                                                      ImpDescName,
-                                                      &LdrApiDefaultExtension,
-                                                      NULL,
-                                                      &RedirectedImpDescName,
-                                                      &ImpDescName,
-                                                      NULL,
-                                                      NULL,
-                                                      NULL);
-
-    /* Check success */
-    if (NT_SUCCESS(Status))
-    {
-        /* Let Ldrp know */
-        RedirectedDll = TRUE;
-    }
-    else if (Status != STATUS_SXS_KEY_NOT_FOUND)
-    {
-        /* Unrecoverable SxS failure */
-        DPRINT1("LDR: RtlDosApplyFileIsolationRedirection_Ustr failed  with status %x for dll %wZ\n", Status, ImpDescName);
-        goto done;
-    }
-
     /* Check if it's loaded */
     if (LdrpCheckForLoadedDll(DllPath,
                               ImpDescName,
                               TRUE,
-                              RedirectedDll,
+                              FALSE,
                               DataTableEntry))
     {
         /* It's already existing in the list */
         *Existing = TRUE;
-        Status = STATUS_SUCCESS;
-        goto done;
+        return STATUS_SUCCESS;
     }
 
     /* We're loading it for the first time */
     *Existing = FALSE;
 
+#if 0
+    /* Load manifest */
+    {
+        ACTCTX_SECTION_KEYED_DATA data;
+        NTSTATUS status;
+
+        //DPRINT1("find_actctx_dll for %S\n", fullname);
+        //RtlInitUnicodeString(&nameW, libname);
+        data.cbSize = sizeof(data);
+        status = RtlFindActivationContextSectionString(
+                    FIND_ACTCTX_SECTION_KEY_RETURN_HACTCTX, NULL,
+                    ACTIVATION_CONTEXT_SECTION_DLL_REDIRECTION,
+                    ImpDescName,
+                    &data);
+        //if (status != STATUS_SUCCESS) return status;
+        DPRINT1("Status: 0x%08X\n", status);
+
+        if (NT_SUCCESS(status))
+        {
+            ACTIVATION_CONTEXT_ASSEMBLY_DETAILED_INFORMATION *info;
+            SIZE_T needed, size = 1024;
+
+            for (;;)
+            {
+                if (!(info = RtlAllocateHeap(RtlGetProcessHeap(), 0, size)))
+                {
+                    status = STATUS_NO_MEMORY;
+                    goto done;
+                }
+                status = RtlQueryInformationActivationContext(0, data.hActCtx, &data.ulAssemblyRosterIndex,
+                    AssemblyDetailedInformationInActivationContext,
+                    info, size, &needed);
+                if (status == STATUS_SUCCESS) break;
+                if (status != STATUS_BUFFER_TOO_SMALL) goto done;
+                RtlFreeHeap(RtlGetProcessHeap(), 0, info);
+                size = needed;
+            }
+
+            DPRINT("manifestpath === %S\n", info->lpAssemblyManifestPath);
+            DPRINT("DirectoryName === %S\n", info->lpAssemblyDirectoryName);
+        }
+    }
+done:
+#endif
+
     /* Map it */
     Status = LdrpMapDll(DllPath,
                         NULL,
                         ImpDescName->Buffer,
                         NULL,
                         TRUE,
-                        RedirectedDll,
+                        FALSE,
                         DataTableEntry);
-    if (!NT_SUCCESS(Status))
-    {
-        DPRINT1("LDR: LdrpMapDll failed  with status %x for dll %wZ\n", Status, ImpDescName);
-        goto done;
-    }
+
+    if (!NT_SUCCESS(Status)) return Status;
 
     /* Walk its import descriptor table */
     Status = LdrpWalkImportDescriptor(DllPath,
@@ -939,9 +952,6 @@ LdrpLoadImportModule(IN PWSTR DllPath OPTIONAL,
                        &(*DataTableEntry)->InInitializationOrderLinks);
     }
 
-done:
-    RtlFreeUnicodeString(&RedirectedImpDescName);
-
     return Status;
 }