Skip to content

Commit 5034cfa

Browse files
sylveonsylveon
authored
Fix: Address print strings regression from PR microsoft#175
Fix print strings (microsoft#184)
1 parent 8cbb9e2 commit 5034cfa

File tree

4 files changed

+59
-59
lines changed

4 files changed

+59
-59
lines changed

‎src/creatwth.cpp

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ static PVOID LoadNtHeaderFromProcess(_In_ HANDLE hProcess,
5252

5353
IMAGE_DOS_HEADER idh;
5454
if (!ReadProcessMemory(hProcess, pbModule, &idh, sizeof(idh), NULL)) {
55-
DETOUR_TRACE(("ReadProcessMemory(idh@%p..%p) failed: %lx\n",
55+
DETOUR_TRACE(("ReadProcessMemory(idh@%p..%p) failed: %lu\n",
5656
pbModule, pbModule + sizeof(idh), GetLastError()));
5757
return NULL;
5858
}
@@ -67,7 +67,7 @@ static PVOID LoadNtHeaderFromProcess(_In_ HANDLE hProcess,
6767

6868
if (!ReadProcessMemory(hProcess, pbModule + idh.e_lfanew,
6969
pNtHeader, sizeof(*pNtHeader), NULL)) {
70-
DETOUR_TRACE(("ReadProcessMemory(inh@%p..%p:%p) failed: %lx\n",
70+
DETOUR_TRACE(("ReadProcessMemory(inh@%p..%p:%p) failed: %lu\n",
7171
pbModule + idh.e_lfanew,
7272
pbModule + idh.e_lfanew + sizeof(*pNtHeader),
7373
pbModule,
@@ -161,7 +161,7 @@ static PVOID FindDetourSectionInRemoteModule(_In_ HANDLE hProcess,
161161
IMAGE_SECTION_HEADER header;
162162
for (DWORD n = 0; n < pNtHeader->FileHeader.NumberOfSections; ++n) {
163163
if (!ReadProcessMemory(hProcess, pRemoteSectionHeaders + n, &header, sizeof(header), NULL)) {
164-
DETOUR_TRACE(("ReadProcessMemory(ish@%p..%p) failed: %lx\n",
164+
DETOUR_TRACE(("ReadProcessMemory(ish@%p..%p) failed: %lu\n",
165165
pRemoteSectionHeaders + n,
166166
(PBYTE)(pRemoteSectionHeaders + n) + sizeof(header),
167167
GetLastError()));
@@ -198,7 +198,7 @@ static PVOID FindPayloadInRemoteDetourSection(_In_ HANDLE hProcess,
198198

199199
DETOUR_SECTION_HEADER header;
200200
if (!ReadProcessMemory(hProcess, pbData, &header, sizeof(header), NULL)) {
201-
DETOUR_TRACE(("ReadProcessMemory(dsh@%p..%p) failed: %lx\n",
201+
DETOUR_TRACE(("ReadProcessMemory(dsh@%p..%p) failed: %lu\n",
202202
pbData,
203203
pbData + sizeof(header),
204204
GetLastError()));
@@ -218,7 +218,7 @@ static PVOID FindPayloadInRemoteDetourSection(_In_ HANDLE hProcess,
218218
for (PVOID pvSection = pbData + header.nDataOffset; pvSection < pbData + header.cbDataSize;) {
219219
DETOUR_SECTION_RECORD section;
220220
if (!ReadProcessMemory(hProcess, pvSection, &section, sizeof(section), NULL)) {
221-
DETOUR_TRACE(("ReadProcessMemory(dsr@%p..%p) failed: %lx\n",
221+
DETOUR_TRACE(("ReadProcessMemory(dsr@%p..%p) failed: %lu\n",
222222
pvSection,
223223
(PBYTE)pvSection + sizeof(section),
224224
GetLastError()));
@@ -282,7 +282,7 @@ static PBYTE FindAndAllocateNearBase(HANDLE hProcess, PBYTE pbModule, PBYTE pbBa
282282
if (GetLastError() == ERROR_INVALID_PARAMETER) {
283283
break;
284284
}
285-
DETOUR_TRACE(("VirtualQueryEx(%p) failed: %lx\n",
285+
DETOUR_TRACE(("VirtualQueryEx(%p) failed: %lu\n",
286286
pbLast, GetLastError()));
287287
break;
288288
}
@@ -327,7 +327,7 @@ static PBYTE FindAndAllocateNearBase(HANDLE hProcess, PBYTE pbModule, PBYTE pbBa
327327
PBYTE pbAlloc = (PBYTE)VirtualAllocEx(hProcess, pbAddress, cbAlloc,
328328
MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE);
329329
if (pbAlloc == NULL) {
330-
DETOUR_TRACE(("VirtualAllocEx(%p) failed: %lx\n", pbAddress, GetLastError()));
330+
DETOUR_TRACE(("VirtualAllocEx(%p) failed: %lu\n", pbAddress, GetLastError()));
331331
continue;
332332
}
333333
#ifdef _WIN64
@@ -386,7 +386,7 @@ static BOOL RecordExeRestore(HANDLE hProcess, HMODULE hModule, DETOUR_EXE_RESTOR
386386
der.pidh = (PBYTE)hModule;
387387
der.cbidh = sizeof(der.idh);
388388
if (!ReadProcessMemory(hProcess, der.pidh, &der.idh, sizeof(der.idh), NULL)) {
389-
DETOUR_TRACE(("ReadProcessMemory(idh@%p..%p) failed: %lx\n",
389+
DETOUR_TRACE(("ReadProcessMemory(idh@%p..%p) failed: %lu\n",
390390
der.pidh, der.pidh + der.cbidh, GetLastError()));
391391
return FALSE;
392392
}
@@ -397,7 +397,7 @@ static BOOL RecordExeRestore(HANDLE hProcess, HMODULE hModule, DETOUR_EXE_RESTOR
397397
der.pinh = der.pidh + der.idh.e_lfanew;
398398
der.cbinh = FIELD_OFFSET(IMAGE_NT_HEADERS, OptionalHeader);
399399
if (!ReadProcessMemory(hProcess, der.pinh, &der.inh, der.cbinh, NULL)) {
400-
DETOUR_TRACE(("ReadProcessMemory(inh@%p..%p) failed: %lx\n",
400+
DETOUR_TRACE(("ReadProcessMemory(inh@%p..%p) failed: %lu\n",
401401
der.pinh, der.pinh + der.cbinh, GetLastError()));
402402
return FALSE;
403403
}
@@ -412,7 +412,7 @@ static BOOL RecordExeRestore(HANDLE hProcess, HMODULE hModule, DETOUR_EXE_RESTOR
412412
}
413413

414414
if (!ReadProcessMemory(hProcess, der.pinh, &der.inh, der.cbinh, NULL)) {
415-
DETOUR_TRACE(("ReadProcessMemory(inh@%p..%p) failed: %lx\n",
415+
DETOUR_TRACE(("ReadProcessMemory(inh@%p..%p) failed: %lu\n",
416416
der.pinh, der.pinh + der.cbinh, GetLastError()));
417417
return FALSE;
418418
}
@@ -424,7 +424,7 @@ static BOOL RecordExeRestore(HANDLE hProcess, HMODULE hModule, DETOUR_EXE_RESTOR
424424
if (der.inh32.CLR_DIRECTORY.VirtualAddress != 0 &&
425425
der.inh32.CLR_DIRECTORY.Size != 0) {
426426

427-
DETOUR_TRACE(("CLR32.VirtAddr=%lx, CLR.Size=%lx\n",
427+
DETOUR_TRACE(("CLR32.VirtAddr=%08lx, CLR.Size=%lu\n",
428428
der.inh32.CLR_DIRECTORY.VirtualAddress,
429429
der.inh32.CLR_DIRECTORY.Size));
430430

@@ -435,7 +435,7 @@ static BOOL RecordExeRestore(HANDLE hProcess, HMODULE hModule, DETOUR_EXE_RESTOR
435435
if (der.inh64.CLR_DIRECTORY.VirtualAddress != 0 &&
436436
der.inh64.CLR_DIRECTORY.Size != 0) {
437437

438-
DETOUR_TRACE(("CLR64.VirtAddr=%lx, CLR.Size=%lx\n",
438+
DETOUR_TRACE(("CLR64.VirtAddr=%08lx, CLR.Size=%lu\n",
439439
der.inh64.CLR_DIRECTORY.VirtualAddress,
440440
der.inh64.CLR_DIRECTORY.Size));
441441

@@ -446,7 +446,7 @@ static BOOL RecordExeRestore(HANDLE hProcess, HMODULE hModule, DETOUR_EXE_RESTOR
446446
if (der.pclr != 0) {
447447
der.cbclr = sizeof(der.clr);
448448
if (!ReadProcessMemory(hProcess, der.pclr, &der.clr, der.cbclr, NULL)) {
449-
DETOUR_TRACE(("ReadProcessMemory(clr@%p..%p) failed: %lx\n",
449+
DETOUR_TRACE(("ReadProcessMemory(clr@%p..%p) failed: %lu\n",
450450
der.pclr, der.pclr + der.cbclr, GetLastError()));
451451
return FALSE;
452452
}
@@ -516,7 +516,7 @@ static BOOL UpdateFrom32To64(HANDLE hProcess, HMODULE hModule, WORD machine,
516516
//////////////////////////////////////////////////////// Read old headers.
517517
//
518518
if (!ReadProcessMemory(hProcess, pbModule, &idh, sizeof(idh), NULL)) {
519-
DETOUR_TRACE(("ReadProcessMemory(idh@%p..%p) failed: %lx\n",
519+
DETOUR_TRACE(("ReadProcessMemory(idh@%p..%p) failed: %lu\n",
520520
pbModule, pbModule + sizeof(idh), GetLastError()));
521521
return FALSE;
522522
}
@@ -525,7 +525,7 @@ static BOOL UpdateFrom32To64(HANDLE hProcess, HMODULE hModule, WORD machine,
525525

526526
PBYTE pnh = pbModule + idh.e_lfanew;
527527
if (!ReadProcessMemory(hProcess, pnh, &inh32, sizeof(inh32), NULL)) {
528-
DETOUR_TRACE(("ReadProcessMemory(inh@%p..%p) failed: %lx\n",
528+
DETOUR_TRACE(("ReadProcessMemory(inh@%p..%p) failed: %lu\n",
529529
pnh, pnh + sizeof(inh32), GetLastError()));
530530
return FALSE;
531531
}
@@ -540,7 +540,7 @@ static BOOL UpdateFrom32To64(HANDLE hProcess, HMODULE hModule, WORD machine,
540540
inh32.FileHeader.SizeOfOptionalHeader;
541541
ULONG cb = inh32.FileHeader.NumberOfSections * sizeof(IMAGE_SECTION_HEADER);
542542
if (!ReadProcessMemory(hProcess, psects, &sects, cb, NULL)) {
543-
DETOUR_TRACE(("ReadProcessMemory(ish@%p..%p) failed: %lx\n",
543+
DETOUR_TRACE(("ReadProcessMemory(ish@%p..%p) failed: %lu\n",
544544
psects, psects + cb, GetLastError()));
545545
return FALSE;
546546
}
@@ -597,7 +597,7 @@ static BOOL UpdateFrom32To64(HANDLE hProcess, HMODULE hModule, WORD machine,
597597
}
598598

599599
if (!WriteProcessMemory(hProcess, pnh, &inh64, sizeof(inh64), NULL)) {
600-
DETOUR_TRACE(("WriteProcessMemory(inh@%p..%p) failed: %lx\n",
600+
DETOUR_TRACE(("WriteProcessMemory(inh@%p..%p) failed: %lu\n",
601601
pnh, pnh + sizeof(inh64), GetLastError()));
602602
return FALSE;
603603
}
@@ -608,7 +608,7 @@ static BOOL UpdateFrom32To64(HANDLE hProcess, HMODULE hModule, WORD machine,
608608
inh64.FileHeader.SizeOfOptionalHeader;
609609
cb = inh64.FileHeader.NumberOfSections * sizeof(IMAGE_SECTION_HEADER);
610610
if (!WriteProcessMemory(hProcess, psects, &sects, cb, NULL)) {
611-
DETOUR_TRACE(("WriteProcessMemory(ish@%p..%p) failed: %lx\n",
611+
DETOUR_TRACE(("WriteProcessMemory(ish@%p..%p) failed: %lu\n",
612612
psects, psects + cb, GetLastError()));
613613
return FALSE;
614614
}
@@ -625,7 +625,7 @@ static BOOL UpdateFrom32To64(HANDLE hProcess, HMODULE hModule, WORD machine,
625625
inh64.IMPORT_DIRECTORY.Size = 0;
626626

627627
if (!WriteProcessMemory(hProcess, pnh, &inh64, sizeof(inh64), NULL)) {
628-
DETOUR_TRACE(("WriteProcessMemory(inh@%p..%p) failed: %lx\n",
628+
DETOUR_TRACE(("WriteProcessMemory(inh@%p..%p) failed: %lu\n",
629629
pnh, pnh + sizeof(inh64), GetLastError()));
630630
return FALSE;
631631
}
@@ -655,15 +655,15 @@ static BOOL IsWow64ProcessHelper(HANDLE hProcess,
655655
//
656656
HMODULE hKernel32 = LoadLibraryW(L"KERNEL32.DLL");
657657
if (hKernel32 == NULL) {
658-
DETOUR_TRACE(("LoadLibraryW failed: %lx\n", GetLastError()));
658+
DETOUR_TRACE(("LoadLibraryW failed: %lu\n", GetLastError()));
659659
return FALSE;
660660
}
661661

662662
LPFN_ISWOW64PROCESS pfnIsWow64Process = (LPFN_ISWOW64PROCESS)GetProcAddress(
663663
hKernel32, "IsWow64Process");
664664

665665
if (pfnIsWow64Process == NULL) {
666-
DETOUR_TRACE(("GetProcAddress failed: %lx\n", GetLastError()));
666+
DETOUR_TRACE(("GetProcAddress failed: %lu\n", GetLastError()));
667667
return FALSE;
668668
}
669669
return pfnIsWow64Process(hProcess, Wow64Process);
@@ -685,7 +685,7 @@ BOOL WINAPI DetourUpdateProcessWithDll(_In_ HANDLE hProcess,
685685
HMODULE hModule = NULL;
686686
HMODULE hLast = NULL;
687687

688-
DETOUR_TRACE(("DetourUpdateProcessWithDll(%p,dlls=%lx)\n", hProcess, nDlls));
688+
DETOUR_TRACE(("DetourUpdateProcessWithDll(%p,dlls=%lu)\n", hProcess, nDlls));
689689

690690
for (;;) {
691691
IMAGE_NT_HEADERS32 inh;
@@ -757,7 +757,7 @@ BOOL WINAPI DetourUpdateProcessWithDllEx(_In_ HANDLE hProcess,
757757
//
758758
BOOL bIs32BitExe = FALSE;
759759

760-
DETOUR_TRACE(("DetourUpdateProcessWithDllEx(%p,%p,dlls=%lx)\n", hProcess, hModule, nDlls));
760+
DETOUR_TRACE(("DetourUpdateProcessWithDllEx(%p,%p,dlls=%lu)\n", hProcess, hModule, nDlls));
761761

762762
IMAGE_NT_HEADERS32 inh;
763763

@@ -859,17 +859,17 @@ BOOL WINAPI DetourUpdateProcessWithDllEx(_In_ HANDLE hProcess,
859859

860860
DWORD dwProtect;
861861
if (!DetourVirtualProtectSameExecuteEx(hProcess, der.pclr, sizeof(clr), PAGE_READWRITE, &dwProtect)) {
862-
DETOUR_TRACE(("VirtualProtectEx(clr) write failed: %lx\n", GetLastError()));
862+
DETOUR_TRACE(("VirtualProtectEx(clr) write failed: %lu\n", GetLastError()));
863863
return FALSE;
864864
}
865865

866866
if (!WriteProcessMemory(hProcess, der.pclr, &clr, sizeof(clr), NULL)) {
867-
DETOUR_TRACE(("WriteProcessMemory(clr) failed: %lx\n", GetLastError()));
867+
DETOUR_TRACE(("WriteProcessMemory(clr) failed: %lu\n", GetLastError()));
868868
return FALSE;
869869
}
870870

871871
if (!VirtualProtectEx(hProcess, der.pclr, sizeof(clr), dwProtect, &dwProtect)) {
872-
DETOUR_TRACE(("VirtualProtectEx(clr) restore failed: %lx\n", GetLastError()));
872+
DETOUR_TRACE(("VirtualProtectEx(clr) restore failed: %lu\n", GetLastError()));
873873
return FALSE;
874874
}
875875
DETOUR_TRACE(("CLR: %p..%p\n", der.pclr, der.pclr + der.cbclr));
@@ -888,7 +888,7 @@ BOOL WINAPI DetourUpdateProcessWithDllEx(_In_ HANDLE hProcess,
888888
//////////////////////////////// Save the undo data to the target process.
889889
//
890890
if (!DetourCopyPayloadToProcess(hProcess, DETOUR_EXE_RESTORE_GUID, &der, sizeof(der))) {
891-
DETOUR_TRACE(("DetourCopyPayloadToProcess failed: %lx\n", GetLastError()));
891+
DETOUR_TRACE(("DetourCopyPayloadToProcess failed: %lu\n", GetLastError()));
892892
return FALSE;
893893
}
894894
return TRUE;
@@ -1039,7 +1039,7 @@ PVOID WINAPI DetourCopyPayloadToProcessEx(_In_ HANDLE hProcess,
10391039
PBYTE pbBase = (PBYTE)VirtualAllocEx(hProcess, NULL, cbTotal,
10401040
MEM_COMMIT, PAGE_READWRITE);
10411041
if (pbBase == NULL) {
1042-
DETOUR_TRACE(("VirtualAllocEx(%lx) failed: %lx\n", cbTotal, GetLastError()));
1042+
DETOUR_TRACE(("VirtualAllocEx(%lu) failed: %lu\n", cbTotal, GetLastError()));
10431043
return NULL;
10441044
}
10451045

@@ -1056,7 +1056,7 @@ PVOID WINAPI DetourCopyPayloadToProcessEx(_In_ HANDLE hProcess,
10561056
idh.e_lfanew = sizeof(idh);
10571057
if (!WriteProcessMemory(hProcess, pbTarget, &idh, sizeof(idh), &cbWrote) ||
10581058
cbWrote != sizeof(idh)) {
1059-
DETOUR_TRACE(("WriteProcessMemory(idh) failed: %lx\n", GetLastError()));
1059+
DETOUR_TRACE(("WriteProcessMemory(idh) failed: %lu\n", GetLastError()));
10601060
return NULL;
10611061
}
10621062
pbTarget += sizeof(idh);
@@ -1113,7 +1113,7 @@ PVOID WINAPI DetourCopyPayloadToProcessEx(_In_ HANDLE hProcess,
11131113
return NULL;
11141114
}
11151115

1116-
DETOUR_TRACE(("Copied %lx byte payload into target process at %p\n",
1116+
DETOUR_TRACE(("Copied %lu byte payload into target process at %p\n",
11171117
cbData, pbTarget));
11181118

11191119
SetLastError(NO_ERROR);
@@ -1142,7 +1142,7 @@ VOID CALLBACK DetourFinishHelperProcess(_In_ HWND,
11421142

11431143
hProcess = OpenProcess(PROCESS_ALL_ACCESS, FALSE, s_pHelper->pid);
11441144
if (hProcess == NULL) {
1145-
DETOUR_TRACE(("OpenProcess(pid=%lx) failed: %lx\n",
1145+
DETOUR_TRACE(("OpenProcess(pid=%lu) failed: %lu\n",
11461146
s_pHelper->pid, GetLastError()));
11471147
Result = 9901;
11481148
goto Cleanup;
@@ -1163,7 +1163,7 @@ VOID CALLBACK DetourFinishHelperProcess(_In_ HWND,
11631163
}
11641164

11651165
if (!DetourUpdateProcessWithDll(hProcess, rlpDlls, s_pHelper->nDlls)) {
1166-
DETOUR_TRACE(("DetourUpdateProcessWithDll(pid=%lx) failed: %lx\n",
1166+
DETOUR_TRACE(("DetourUpdateProcessWithDll(pid=%lu) failed: %lu\n",
11671167
s_pHelper->pid, GetLastError()));
11681168
Result = 9903;
11691169
goto Cleanup;
@@ -1339,7 +1339,7 @@ BOOL WINAPI DetourProcessViaHelperDllsA(_In_ DWORD dwTargetPid,
13391339
HRESULT hr;
13401340
DWORD nLen = GetEnvironmentVariableA("WINDIR", szExe, ARRAYSIZE(szExe));
13411341

1342-
DETOUR_TRACE(("DetourProcessViaHelperDlls(pid=%lx,dlls=%lx)\n", dwTargetPid, nDlls));
1342+
DETOUR_TRACE(("DetourProcessViaHelperDlls(pid=%lu,dlls=%lu)\n", dwTargetPid, nDlls));
13431343
if (nDlls < 1 || nDlls > 4096) {
13441344
SetLastError(ERROR_INVALID_PARAMETER);
13451345
goto Cleanup;
@@ -1384,7 +1384,7 @@ BOOL WINAPI DetourProcessViaHelperDllsA(_In_ DWORD dwTargetPid,
13841384
if (!DetourCopyPayloadToProcess(pi.hProcess,
13851385
DETOUR_EXE_HELPER_GUID,
13861386
helper, helper->cb)) {
1387-
DETOUR_TRACE(("DetourCopyPayloadToProcess failed: %lx\n", GetLastError()));
1387+
DETOUR_TRACE(("DetourCopyPayloadToProcess failed: %lu\n", GetLastError()));
13881388
TerminateProcess(pi.hProcess, ~0u);
13891389
CloseHandle(pi.hProcess);
13901390
CloseHandle(pi.hThread);
@@ -1401,13 +1401,13 @@ BOOL WINAPI DetourProcessViaHelperDllsA(_In_ DWORD dwTargetPid,
14011401
CloseHandle(pi.hThread);
14021402

14031403
if (dwResult != 0) {
1404-
DETOUR_TRACE(("Rundll32.exe failed: result=%lx\n", dwResult));
1404+
DETOUR_TRACE(("Rundll32.exe failed: result=%lu\n", dwResult));
14051405
goto Cleanup;
14061406
}
14071407
Result = TRUE;
14081408
}
14091409
else {
1410-
DETOUR_TRACE(("CreateProcess failed: %lx\n", GetLastError()));
1410+
DETOUR_TRACE(("CreateProcess failed: %lu\n", GetLastError()));
14111411
goto Cleanup;
14121412
}
14131413

@@ -1439,7 +1439,7 @@ BOOL WINAPI DetourProcessViaHelperDllsW(_In_ DWORD dwTargetPid,
14391439
int cchWrittenWideChar;
14401440
DWORD nLen = GetEnvironmentVariableW(L"WINDIR", szExe, ARRAYSIZE(szExe));
14411441

1442-
DETOUR_TRACE(("DetourProcessViaHelperDlls(pid=%lx,dlls=%lx)\n", dwTargetPid, nDlls));
1442+
DETOUR_TRACE(("DetourProcessViaHelperDlls(pid=%lu,dlls=%lu)\n", dwTargetPid, nDlls));
14431443
if (nDlls < 1 || nDlls > 4096) {
14441444
SetLastError(ERROR_INVALID_PARAMETER);
14451445
goto Cleanup;
@@ -1489,7 +1489,7 @@ BOOL WINAPI DetourProcessViaHelperDllsW(_In_ DWORD dwTargetPid,
14891489
if (!DetourCopyPayloadToProcess(pi.hProcess,
14901490
DETOUR_EXE_HELPER_GUID,
14911491
helper, helper->cb)) {
1492-
DETOUR_TRACE(("DetourCopyPayloadToProcess failed: %lx\n", GetLastError()));
1492+
DETOUR_TRACE(("DetourCopyPayloadToProcess failed: %lu\n", GetLastError()));
14931493
TerminateProcess(pi.hProcess, ~0u);
14941494
CloseHandle(pi.hProcess);
14951495
CloseHandle(pi.hThread);
@@ -1506,13 +1506,13 @@ BOOL WINAPI DetourProcessViaHelperDllsW(_In_ DWORD dwTargetPid,
15061506
CloseHandle(pi.hThread);
15071507

15081508
if (dwResult != 0) {
1509-
DETOUR_TRACE(("Rundll32.exe failed: result=%lx\n", dwResult));
1509+
DETOUR_TRACE(("Rundll32.exe failed: result=%lu\n", dwResult));
15101510
goto Cleanup;
15111511
}
15121512
Result = TRUE;
15131513
}
15141514
else {
1515-
DETOUR_TRACE(("CreateProcess failed: %lx\n", GetLastError()));
1515+
DETOUR_TRACE(("CreateProcess failed: %lu\n", GetLastError()));
15161516
goto Cleanup;
15171517
}
15181518

‎src/detours.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1704,7 +1704,7 @@ LONG WINAPI DetourTransactionCommitEx(_Out_opt_ PVOID **pppFailedPointer)
17041704
#endif // DETOURS_ARM
17051705
}
17061706
else {
1707-
DETOUR_TRACE(("detours: pbTramp =%p, pbRemain=%p, pbDetour=%p, cbRestore=%x\n",
1707+
DETOUR_TRACE(("detours: pbTramp =%p, pbRemain=%p, pbDetour=%p, cbRestore=%u\n",
17081708
o->pTrampoline,
17091709
o->pTrampoline->pbRemain,
17101710
o->pTrampoline->pbDetour,
@@ -2183,7 +2183,7 @@ LONG WINAPI DetourAttachEx(_Inout_ PVOID *ppPointer,
21832183
pTrampoline->rAlign[n].obTrampoline == 0) {
21842184
break;
21852185
}
2186-
DETOUR_TRACE((" %x/%x",
2186+
DETOUR_TRACE((" %u/%u",
21872187
pTrampoline->rAlign[n].obTarget,
21882188
pTrampoline->rAlign[n].obTrampoline
21892189
));

0 commit comments

Comments
 (0)