Changeset 84735 in vbox for trunk/src/VBox/Additions

Timestamp:

Jun 9, 2020 10:47:05 AM (5 years ago)

Author:

vboxsync

Message:

Add/NT/Installer: WRP workaround is not needed any more, bugref:9725

Location:

trunk/src/VBox/Additions/WINNT/Installer

Files:

• InstallHelper/VBoxGuestInstallHelper.cpp (modified) (1 diff)
• VBoxGuestAdditionsCommon.nsh (modified) (2 diffs)

trunk/src/VBox/Additions/WINNT/Installer/InstallHelper/VBoxGuestInstallHelper.cpp

@@ -188 +188 @@
 }
 
-#ifndef UNICODE
-static void vboxChar2WCharFree(PWCHAR pwString)
-{
-    if (pwString)
-        HeapFree(GetProcessHeap(), 0, pwString);
-}
-
-static int vboxChar2WCharAlloc(const TCHAR *pszString, PWCHAR *ppwString)
-{
-    int rc = VINF_SUCCESS;
-
-    int iLen = (int)_tcslen(pszString) + 2;
-    WCHAR *pwString = (WCHAR*)HeapAlloc(GetProcessHeap(), 0, iLen * sizeof(WCHAR));
-    if (!pwString)
-    {
-        rc = VERR_NO_MEMORY;
-    }
-    else
-    {
-        if (MultiByteToWideChar(CP_ACP, 0, pszString, -1, pwString, iLen) == 0)
-        {
-            rc = VERR_INVALID_PARAMETER;
-            HeapFree(GetProcessHeap(), 0, pwString);
-        }
-        else
-        {
-            *ppwString = pwString;
-        }
-    }
-    return rc;
-}
-#endif /* !UNICODE */
-
-/**
- * Disables the Windows File Protection for a specified file
- * using an undocumented SFC API call. Don't try this at home!
- *
- * @param   hwndParent          Window handle of parent.
- * @param   string_size         Size of variable string.
- * @param   variables           The actual variable string.
- * @param   stacktop            Pointer to a pointer to the current stack.
- * @param   extra               Extra parameters. Currently unused.
- */
-VBOXINSTALLHELPER_EXPORT DisableWFP(HWND hwndParent, int string_size, TCHAR *variables, stack_t **stacktop,
-                                    extra_parameters *extra)
-{
-    RT_NOREF(hwndParent, extra);
-
-    EXDLL_INIT();
-
-    TCHAR szFile[MAX_PATH + 1];
-    int rc = vboxPopString(szFile, sizeof(szFile) / sizeof(TCHAR));
-    if (RT_SUCCESS(rc))
-    {
-        RTLDRMOD hSFC;
-        rc = RTLdrLoadSystem("sfc_os.dll", false /* fNoUnload */, &hSFC);
-        if (RT_SUCCESS(rc))
-        {
-            PFNSFCFILEEXCEPTION pfnSfcFileException = NULL;
-            rc = RTLdrGetSymbol(hSFC, "SfcFileException", (void **)&pfnSfcFileException);
-            if (RT_FAILURE(rc))
-            {
-                /* Native fallback. */
-                HMODULE hSFCNative = (HMODULE)RTLdrGetNativeHandle(hSFC);
-
-                /* If we didn't get the proc address with the call above, try it harder with
-                 * the (zero based) index of the function list (ordinal). */
-                pfnSfcFileException = (PFNSFCFILEEXCEPTION)GetProcAddress(hSFCNative, (LPCSTR)5);
-                if (pfnSfcFileException)
-                    rc = VINF_SUCCESS;
-            }
-
-            if (RT_SUCCESS(rc))
-            {
-#ifndef UNICODE
-                WCHAR *pwszFile;
-                rc = vboxChar2WCharAlloc(szFile, &pwszFile);
-                if (RT_SUCCESS(rc))
-                {
-#else
-                    TCHAR *pwszFile = szFile;
-#endif
-                    if (pfnSfcFileException(0, pwszFile, UINT32_MAX) != 0)
-                        rc = VERR_ACCESS_DENIED; /** @todo Find a better rc. */
-#ifndef UNICODE
-                    vboxChar2WCharFree(pwszFile);
-                }
-#endif
-            }
-
-            RTLdrClose(hSFC);
-        }
-    }
-
-    vboxPushRcAsString(rc);
-}
 
 /**

trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsCommon.nsh

@@ -789 +789 @@
 !define InstallFileVerify "!insertmacro InstallFileVerify"
 
-; Prepares the access rights for replacing
-; a WRP (Windows Resource Protection) protected file
-!macro PrepareWRPFile un
-Function ${un}PrepareWRPFile
-
-  Pop $0
-  Push $1
-
-  ${IfNot} ${FileExists} "$0"
-    ${LogVerbose} "WRP: File $\"$0$\" does not exist, skipping"
-    Return
-  ${EndIf}
-
-  ${Switch} $g_strWinVersion
-    ${Case} "NT4"
-    ${Case} "2000"
-    ${Case} "XP"
-      ${LogVerbose} "WRP: changing ownership or permissions is not required on NT4, 2000, XP."
-    ${Break}
-    ${Default}
-      ${CmdExecute} "$\"$g_strSystemDir\takeown.exe$\" /A /F $\"$0$\"" "true"
-      Pop $1
-      ${LogVerbose} "WRP: Changing ownership for $\"$0$\" returned: $1"
-
-      ${CmdExecute} "icacls.exe $\"$0$\" /grant *S-1-5-32-544:F" "true"
-      Pop $1
-      ${LogVerbose} "WRP: Changing DACL for $\"$0$\" returned: $1"
-
-      Sleep 1000 ; TrustedInstaller needs some time to forget about the file
-  ${EndSwitch}
-
-!if $%VBOX_WITH_GUEST_INSTALL_HELPER% == "1"
-  !ifdef WFP_FILE_EXCEPTION
-    VBoxGuestInstallHelper::DisableWFP "$0"
-    Pop $1 ; Get return value (ignored for now)
-    ${LogVerbose} "WRP: Setting WFP exception for $\"$0$\" returned: $1"
-  !endif
-!endif
-
-  Pop $1
-
-FunctionEnd
-!macroend
-!insertmacro PrepareWRPFile ""
-!insertmacro PrepareWRPFile "un."
-
-;
-; Macro for preparing the access rights for replacing
-; a WRP (Windows Resource Protection) protected file.
-; @return  None.
-; @param   Path of file to prepare.
-;
-!macro PrepareWRPFileEx un FileSrc
-  Push $0
-  Push "${FileSrc}"
-  Call ${un}PrepareWRPFile
-  Pop $0
-!macroend
-!define PrepareWRPFileEx "!insertmacro PrepareWRPFileEx"
 
 ; Note: We don't ship modified Direct3D files anymore, but we need to (try to)
@@ -879 +820 @@
   ${LogVerbose} "Restoring original D3D files ..."
 !if $%BUILD_TARGET_ARCH% == "x86"
-  ${PrepareWRPFileEx} "${un}" "$SYSDIR\d3d8.dll"
   ${CopyFileEx} "${un}" "$SYSDIR\msd3d8.dll" "$SYSDIR\d3d8.dll" "Microsoft Corporation" "$%BUILD_TARGET_ARCH%"
 !endif
-  ${PrepareWRPFileEx} "${un}" "$SYSDIR\d3d9.dll"
   ${CopyFileEx} "${un}" "$SYSDIR\msd3d9.dll" "$SYSDIR\d3d9.dll" "Microsoft Corporation" "$%BUILD_TARGET_ARCH%"
 
   ${If} $g_bCapDllCache == "true"
 !if $%BUILD_TARGET_ARCH% == "x86"
-    ${PrepareWRPFileEx} "${un}" "$SYSDIR\dllcache\d3d8.dll"
     ${CopyFileEx} "${un}" "$SYSDIR\dllcache\msd3d8.dll" "$SYSDIR\dllcache\d3d8.dll" "Microsoft Corporation" "$%BUILD_TARGET_ARCH%"
 !endif
-    ${PrepareWRPFileEx} "${un}" "$SYSDIR\dllcache\d3d9.dll"
     ${CopyFileEx} "${un}" "$SYSDIR\dllcache\msd3d9.dll" "$SYSDIR\dllcache\d3d9.dll" "Microsoft Corporation" "$%BUILD_TARGET_ARCH%"
   ${EndIf}
 
 !if $%BUILD_TARGET_ARCH% == "amd64"
-  ${PrepareWRPFileEx} "${un}" "$g_strSysWow64\d3d8.dll"
   ${CopyFileEx} "${un}" "$g_strSysWow64\msd3d8.dll" "$g_strSysWow64\d3d8.dll" "Microsoft Corporation" "x86"
-  ${PrepareWRPFileEx} "${un}" "$g_strSysWow64\d3d9.dll"
   ${CopyFileEx} "${un}" "$g_strSysWow64\msd3d9.dll" "$g_strSysWow64\d3d9.dll" "Microsoft Corporation" "x86"
 
   ${If} $g_bCapDllCache == "true"
-    ${PrepareWRPFileEx} "${un}" "$g_strSysWow64\dllcache\d3d8.dll"
     ${CopyFileEx} "${un}" "$g_strSysWow64\dllcache\msd3d8.dll" "$g_strSysWow64\dllcache\d3d8.dll" "Microsoft Corporation" "x86"
-    ${PrepareWRPFileEx} "${un}" "$g_strSysWow64\dllcache\d3d9.dll"
     ${CopyFileEx} "${un}" "$g_strSysWow64\dllcache\msd3d9.dll" "$g_strSysWow64\dllcache\d3d9.dll" "Microsoft Corporation" "x86"
   ${EndIf}