WCHAR* ExpectedSubString;
};
-struct test_data Tests[] =
+struct test_data Tests[] =
{
/* Not redirected file */
{__LINE__, STATUS_SXS_KEY_NOT_FOUND, L"somefilesomefile", NULL},
{__LINE__, STATUS_SUCCESS, L"COMCTL32.DLL", L"\\winsxs\\x86_microsoft.windows.common-controls_6595b64144ccf1df_5.82"},
{__LINE__, STATUS_SUCCESS, L"comctl32.DLL", L"\\winsxs\\x86_microsoft.windows.common-controls_6595b64144ccf1df_5.82"},
{__LINE__, STATUS_SUCCESS, L"c:\\windows\\system32\\comctl32.DLL", L"\\winsxs\\x86_microsoft.windows.common-controls_6595b64144ccf1df_5.82"},
+ /* Files not redirected with sxs */
+ {__LINE__, STATUS_SXS_KEY_NOT_FOUND, L"MSVCR90.DLL", NULL},
+ {__LINE__, STATUS_SXS_KEY_NOT_FOUND, L"c:\\windows\\system32\\MSVCR90.DLL", NULL},
/* Files defined in the manifest, one exists, one doesn't */
{__LINE__, STATUS_SUCCESS, L"deptest.dll", EXPECT_IN_SAME_DIR},
{__LINE__, STATUS_SUCCESS, L"adllfile.dll", EXPECT_IN_SAME_DIR},
SetLastError(0xdeaddead);
h = CreateActCtxW(&ActCtx);
ok_(__FILE__, line)(h != INVALID_HANDLE_VALUE, "CreateActCtx failed for %S\n", FileName);
- // In win10 last error is unchanged and in win2k3 it is ERROR_BAD_EXE_FORMAT
+ // In win10 last error is unchanged and in win2k3 it is ERROR_BAD_EXE_FORMAT
ok_(__FILE__, line)(GetLastError() == ERROR_BAD_EXE_FORMAT || GetLastError() == 0xdeaddead, "Wrong last error %lu\n", GetLastError());
return h;
RtlInitEmptyUnicodeString(&DynamicString, NULL, 0);
Status = RtlDosApplyFileIsolationRedirection_Ustr(TRUE,
- NULL,
+ NULL,
NULL,
NULL,
&DynamicString,
RtlInitEmptyUnicodeString(&Param, NULL, 0);
RtlInitEmptyUnicodeString(&DynamicString, NULL, 0);
Status = RtlDosApplyFileIsolationRedirection_Ustr(TRUE,
- &Param,
- NULL,
+ &Param,
+ NULL,
NULL,
&DynamicString,
&StringUsed,
Param.Buffer = L"comctl32.dllcrapcrap";
RtlInitEmptyUnicodeString(&DynamicString, NULL, 0);
Status = RtlDosApplyFileIsolationRedirection_Ustr(TRUE,
- &Param,
- NULL,
+ &Param,
+ NULL,
NULL,
&DynamicString,
&StringUsed,
RtlInitUnicodeString(&Param, L"comctl32.dll");
RtlInitEmptyUnicodeString(&DynamicString, NULL, 0);
Status = RtlDosApplyFileIsolationRedirection_Ustr(TRUE,
- &Param,
- NULL,
+ &Param,
+ NULL,
NULL,
&DynamicString,
&StringUsed,
RtlInitUnicodeString(&Param, L"comctl32");
RtlInitEmptyUnicodeString(&DynamicString, NULL, 0);
Status = RtlDosApplyFileIsolationRedirection_Ustr(TRUE,
- &Param,
- NULL,
+ &Param,
+ NULL,
NULL,
&DynamicString,
&StringUsed,
RtlInitUnicodeString(&Param, L"comctl32");
RtlInitEmptyUnicodeString(&DynamicString, NULL, 0);
Status = RtlDosApplyFileIsolationRedirection_Ustr(TRUE,
- &Param,
- &DotDll,
+ &Param,
+ &DotDll,
NULL,
&DynamicString,
&StringUsed,
RtlInitUnicodeString(&Param, L"comctl32.dll");
RtlInitEmptyUnicodeString(&DynamicString, NULL, 0);
Status = RtlDosApplyFileIsolationRedirection_Ustr(TRUE,
- &Param,
+ &Param,
NULL,
NULL,
&DynamicString,
StaticString.MaximumLength = sizeof(buffer);
Param = StaticString;
Status = RtlDosApplyFileIsolationRedirection_Ustr(TRUE,
- &Param,
- NULL,
+ &Param,
+ NULL,
&StaticString,
NULL,
&StringUsed,
StaticString.Length = sizeof(L"comctl32.dll");
StaticString.MaximumLength = sizeof(buffer);
Status = RtlDosApplyFileIsolationRedirection_Ustr(TRUE,
- &StaticString,
- NULL,
+ &StaticString,
+ NULL,
&StaticString,
NULL,
&StringUsed,
RtlInitUnicodeString(&Param, L"comctl32.dll");
RtlInitEmptyUnicodeString(&StaticString, buffer, sizeof(buffer));
Status = RtlDosApplyFileIsolationRedirection_Ustr(TRUE,
- &Param,
- NULL,
+ &Param,
+ NULL,
&StaticString,
NULL,
&StringUsed,
RtlInitEmptyUnicodeString(&StaticString, buffer, 5 * sizeof(WCHAR));
Status = RtlDosApplyFileIsolationRedirection_Ustr(TRUE,
- &Param,
- NULL,
+ &Param,
+ NULL,
&StaticString,
NULL,
&StringUsed,
RtlInitEmptyUnicodeString(&StaticString, buffer, sizeof(buffer));
RtlInitEmptyUnicodeString(&DynamicString, NULL, 0);
Status = RtlDosApplyFileIsolationRedirection_Ustr(TRUE,
- &Param,
- NULL,
+ &Param,
+ NULL,
&StaticString,
&DynamicString,
&StringUsed,
RtlInitEmptyUnicodeString(&DynamicString, NULL, 0);
StaticString.Buffer[0] = 1;
Status = RtlDosApplyFileIsolationRedirection_Ustr(TRUE,
- &Param,
- NULL,
+ &Param,
+ NULL,
&StaticString,
&DynamicString,
&StringUsed,
HANDLE h = _CreateActCtxFromFile(L"ntdlltest.manifest", __LINE__);
BOOL bactivated = FALSE;
ULONG_PTR cookie;
-
+
if (h != INVALID_HANDLE_VALUE)
bactivated = ActivateActCtx(h, &cookie);
separator = wcsrchr(TestPath, L'\\');
separator++;
wcscpy(separator, L"testdata\\ntdll_apitest.exe RtlDosApplyFileIsolationRedirection_Ustr DoTest");
-
+
created = CreateProcessW(NULL, TestPath, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi);
ok(created, "Expected CreateProcess to succeed\n");
if (created)
CloseHandle(pi.hProcess);
}
}
-}
\ No newline at end of file
+}