Fixed formating build warnings (-Wformat)
This commit is contained in:
parent
7dd4458532
commit
e8eb0d0b44
@ -545,7 +545,7 @@ MRDPRailView* g_mrdpRailView;
|
||||
- (void) keyDown:(NSEvent *) event
|
||||
{
|
||||
int key;
|
||||
BOOL extended;
|
||||
USHORT extended;
|
||||
DWORD vkcode;
|
||||
DWORD scancode;
|
||||
|
||||
@ -565,7 +565,7 @@ MRDPRailView* g_mrdpRailView;
|
||||
- (void) keyUp:(NSEvent *) event
|
||||
{
|
||||
int key;
|
||||
BOOL extended;
|
||||
USHORT extended;
|
||||
DWORD vkcode;
|
||||
DWORD scancode;
|
||||
|
||||
@ -573,7 +573,7 @@ MRDPRailView* g_mrdpRailView;
|
||||
|
||||
vkcode = GetVirtualKeyCodeFromKeycode(key, KEYCODE_TYPE_APPLE);
|
||||
scancode = GetVirtualScanCodeFromVirtualKeyCode(vkcode, 4);
|
||||
extended = (scancode & KBDEXT) ? KBDEXT : 0;
|
||||
extended = (scancode & KBDEXT) ? TRUE : FALSE;
|
||||
|
||||
rdp_instance->input->KeyboardEvent(rdp_instance->input, extended | KBD_FLAGS_RELEASE, scancode & 0xFF);
|
||||
}
|
||||
|
@ -370,7 +370,7 @@ const char* error_code_names[] =
|
||||
- (void) keyDown:(NSEvent *) event
|
||||
{
|
||||
int key;
|
||||
BOOL extended;
|
||||
USHORT extended;
|
||||
DWORD vkcode;
|
||||
DWORD scancode;
|
||||
|
||||
@ -393,7 +393,7 @@ const char* error_code_names[] =
|
||||
- (void) keyUp:(NSEvent *) event
|
||||
{
|
||||
int key;
|
||||
BOOL extended;
|
||||
USHORT extended;
|
||||
DWORD vkcode;
|
||||
DWORD scancode;
|
||||
|
||||
@ -595,7 +595,7 @@ const char* error_code_names[] =
|
||||
* save state info for use by other methods later on
|
||||
***********************************************************************/
|
||||
|
||||
- (void) saveStateInfo:(freerdp *) instance:(rdpContext *) context
|
||||
- (void) saveStateInfo:(freerdp *) instance :(rdpContext *) context
|
||||
{
|
||||
rdp_instance = instance;
|
||||
rdp_context = context;
|
||||
|
@ -269,19 +269,19 @@ int TestClientRdpFile(int argc, char* argv[])
|
||||
|
||||
if (file->UseMultiMon != 0)
|
||||
{
|
||||
printf("UseMultiMon mismatch: Actual: %d, Expected: %d\n", file->UseMultiMon, 0);
|
||||
printf("UseMultiMon mismatch: Actual: %ld, Expected: %d\n", file->UseMultiMon, 0);
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (file->ScreenModeId != 2)
|
||||
{
|
||||
printf("ScreenModeId mismatch: Actual: %d, Expected: %d\n", file->ScreenModeId, 2);
|
||||
printf("ScreenModeId mismatch: Actual: %ld, Expected: %d\n", file->ScreenModeId, 2);
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (file->GatewayProfileUsageMethod != 1)
|
||||
{
|
||||
printf("GatewayProfileUsageMethod mismatch: Actual: %d, Expected: %d\n", file->GatewayProfileUsageMethod, 1);
|
||||
printf("GatewayProfileUsageMethod mismatch: Actual: %ld, Expected: %d\n", file->GatewayProfileUsageMethod, 1);
|
||||
return -1;
|
||||
}
|
||||
|
||||
@ -301,19 +301,19 @@ int TestClientRdpFile(int argc, char* argv[])
|
||||
|
||||
if (file->UseMultiMon != 0)
|
||||
{
|
||||
printf("UseMultiMon mismatch: Actual: %d, Expected: %d\n", file->UseMultiMon, 0);
|
||||
printf("UseMultiMon mismatch: Actual: %ld, Expected: %d\n", file->UseMultiMon, 0);
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (file->ScreenModeId != 2)
|
||||
{
|
||||
printf("ScreenModeId mismatch: Actual: %d, Expected: %d\n", file->ScreenModeId, 2);
|
||||
printf("ScreenModeId mismatch: Actual: %ld, Expected: %d\n", file->ScreenModeId, 2);
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (file->GatewayProfileUsageMethod != 1)
|
||||
{
|
||||
printf("GatewayProfileUsageMethod mismatch: Actual: %d, Expected: %d\n", file->GatewayProfileUsageMethod, 1);
|
||||
printf("GatewayProfileUsageMethod mismatch: Actual: %ld, Expected: %d\n", file->GatewayProfileUsageMethod, 1);
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
@ -153,7 +153,7 @@ char* gdi_convert_postfix_to_infix(char* postfix)
|
||||
}
|
||||
else
|
||||
{
|
||||
printf("invalid operator: %s\n", c[0]);
|
||||
printf("invalid operator: %c\n", c[0]);
|
||||
}
|
||||
|
||||
//printf("Operator: %s\n", c);
|
||||
|
@ -26,7 +26,7 @@ int TestCredUICmdLinePromptForCredentials(int argc, char* argv[])
|
||||
|
||||
if (status != NO_ERROR)
|
||||
{
|
||||
printf("CredUIPromptForCredentials unexpected status: 0x%08X\n", status);
|
||||
printf("CredUIPromptForCredentials unexpected status: 0x%08lX\n", status);
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
@ -22,7 +22,7 @@ int TestCredUIParseUserName(int argc, char* argv[])
|
||||
status = CredUIParseUserName(testUserName1, User, sizeof(User) / sizeof(TCHAR),
|
||||
Domain, sizeof(Domain) / sizeof(TCHAR));
|
||||
|
||||
printf("CredUIParseUserName status: 0x%08X\n", status);
|
||||
printf("CredUIParseUserName status: 0x%08lX\n", status);
|
||||
|
||||
_tprintf(_T("UserName: %s -> Domain: %s User: %s\n"), testUserName1, Domain, User);
|
||||
|
||||
@ -34,7 +34,7 @@ int TestCredUIParseUserName(int argc, char* argv[])
|
||||
status = CredUIParseUserName(testUserName2, User, sizeof(User) / sizeof(TCHAR),
|
||||
Domain, sizeof(Domain) / sizeof(TCHAR));
|
||||
|
||||
printf("CredUIParseUserName status: 0x%08X\n", status);
|
||||
printf("CredUIParseUserName status: 0x%08lX\n", status);
|
||||
|
||||
_tprintf(_T("UserName: %s -> Domain: %s User: %s\n"), testUserName2, Domain, User);
|
||||
|
||||
|
@ -35,7 +35,7 @@ int TestCredUIPromptForCredentials(int argc, char* argv[])
|
||||
|
||||
if (status != NO_ERROR)
|
||||
{
|
||||
printf("CredUIPromptForCredentials unexpected status: 0x%08X\n", status);
|
||||
printf("CredUIPromptForCredentials unexpected status: 0x%08lX\n", status);
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
@ -26,7 +26,7 @@ int TestAlignment(int argc, char* argv[])
|
||||
|
||||
if (((size_t) ptr % alignment) != 0)
|
||||
{
|
||||
printf("This pointer, %d, is not aligned on %d\n", ptr, alignment);
|
||||
printf("This pointer, %p, is not aligned on %lu\n", ptr, alignment);
|
||||
return -1;
|
||||
}
|
||||
|
||||
@ -36,7 +36,7 @@ int TestAlignment(int argc, char* argv[])
|
||||
|
||||
if (((size_t) ptr % alignment) != 0)
|
||||
{
|
||||
printf("This pointer, %d, is not aligned on %d\n", ptr, alignment);
|
||||
printf("This pointer, %p, is not aligned on %lu\n", ptr, alignment);
|
||||
return -1;
|
||||
}
|
||||
|
||||
@ -54,7 +54,7 @@ int TestAlignment(int argc, char* argv[])
|
||||
|
||||
if (((((size_t) ptr) + offset) % alignment) != 0)
|
||||
{
|
||||
printf("This pointer, %d, does not satisfy offset %d and alignment %d\n", ptr, offset, alignment);
|
||||
printf("This pointer, %p, does not satisfy offset %lu and alignment %lu\n", ptr, offset, alignment);
|
||||
return -1;
|
||||
}
|
||||
|
||||
@ -70,7 +70,7 @@ int TestAlignment(int argc, char* argv[])
|
||||
|
||||
if (((((size_t) ptr) + offset) % alignment) != 0)
|
||||
{
|
||||
printf("This pointer, %d, does not satisfy offset %d and alignment %d\n", ptr, offset, alignment);
|
||||
printf("This pointer, %p, does not satisfy offset %lu and alignment %lu\n", ptr, offset, alignment);
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
@ -38,7 +38,7 @@ int TestString(int argc, char* argv[])
|
||||
|
||||
if (length != testStringW_Length)
|
||||
{
|
||||
printf("_wcslen error: length mismatch: Actual: %d, Expected: %d\n", length, testStringW_Length);
|
||||
printf("_wcslen error: length mismatch: Actual: %lu, Expected: %lu\n", length, testStringW_Length);
|
||||
return -1;
|
||||
}
|
||||
|
||||
@ -49,7 +49,7 @@ int TestString(int argc, char* argv[])
|
||||
|
||||
if (pos != 11)
|
||||
{
|
||||
printf("_wcschr error: position mismatch: Actual: %d, Expected: %d\n", pos, 11);
|
||||
printf("_wcschr error: position mismatch: Actual: %lu, Expected: %u\n", pos, 11);
|
||||
return -1;
|
||||
}
|
||||
|
||||
@ -58,7 +58,7 @@ int TestString(int argc, char* argv[])
|
||||
|
||||
if (pos != 29)
|
||||
{
|
||||
printf("_wcschr error: position mismatch: Actual: %d, Expected: %d\n", pos, 29);
|
||||
printf("_wcschr error: position mismatch: Actual: %lu, Expected: %u\n", pos, 29);
|
||||
return -1;
|
||||
}
|
||||
|
||||
@ -66,7 +66,7 @@ int TestString(int argc, char* argv[])
|
||||
|
||||
if (p != NULL)
|
||||
{
|
||||
printf("_wcschr error: return value mismatch: Actual: 0x%08X, Expected: 0x%08X\n", (size_t) p, (size_t) NULL);
|
||||
printf("_wcschr error: return value mismatch: Actual: 0x%08lX, Expected: 0x%08lX\n", (size_t) p, (size_t) NULL);
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
@ -139,7 +139,7 @@ int convert_utf8_to_utf16(BYTE* lpMultiByteStr, BYTE* expected_lpWideCharStr, in
|
||||
if (!length)
|
||||
{
|
||||
DWORD error = GetLastError();
|
||||
printf("MultiByteToWideChar error: 0x%08X\n", error);
|
||||
printf("MultiByteToWideChar error: 0x%08lX\n", error);
|
||||
return -1;
|
||||
}
|
||||
|
||||
@ -206,7 +206,7 @@ int convert_utf16_to_utf8(BYTE* lpWideCharStr, BYTE* expected_lpMultiByteStr, in
|
||||
if (!length)
|
||||
{
|
||||
DWORD error = GetLastError();
|
||||
printf("WideCharToMultiByte error: 0x%08X\n", error);
|
||||
printf("WideCharToMultiByte error: 0x%08lX\n", error);
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
@ -35,7 +35,7 @@ int TestDsMakeSpn(int argc, char* argv[])
|
||||
|
||||
if (SpnLength != 37)
|
||||
{
|
||||
_tprintf(_T("DsMakeSpn: SpnLength mismatch: Actual: %d, Expected: %d\n"), SpnLength, 37);
|
||||
_tprintf(_T("DsMakeSpn: SpnLength mismatch: Actual: %ld, Expected: %d\n"), SpnLength, 37);
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
@ -74,7 +74,7 @@ int main(int ac, char *av[])
|
||||
int testToRun = -1;
|
||||
|
||||
|
||||
|
||||
|
||||
for(count =0; cmakeGeneratedFunctionMapEntries[count].name != 0; count++)
|
||||
{
|
||||
}
|
||||
@ -151,8 +151,8 @@ int main(int ac, char *av[])
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
/* Nothing was run, display the test names. */
|
||||
printf("Available tests:\n");
|
||||
for (i =0; i < NumTests; ++i)
|
||||
@ -160,6 +160,6 @@ int main(int ac, char *av[])
|
||||
printf("%3d. %s\n", i, cmakeGeneratedFunctionMapEntries[i].name);
|
||||
}
|
||||
printf("Failed: %s is an invalid test name.\n", av[1]);
|
||||
|
||||
|
||||
return -1;
|
||||
}
|
||||
|
@ -41,7 +41,7 @@ int TestFileFindFirstFile(int argc, char* argv[])
|
||||
|
||||
if (hFind == INVALID_HANDLE_VALUE)
|
||||
{
|
||||
_tprintf(_T("FindFirstFile failure: %s (%d)\n"), FilePath, hFind);
|
||||
_tprintf(_T("FindFirstFile failure: %s (INVALID_HANDLE_VALUE -1)\n"), FilePath);
|
||||
return -1;
|
||||
}
|
||||
|
||||
@ -49,7 +49,7 @@ int TestFileFindFirstFile(int argc, char* argv[])
|
||||
|
||||
if (_tcscmp(FindData.cFileName, testFile1) != 0)
|
||||
{
|
||||
_tprintf(_T("FindFirstFile failure: Expected: %d, Actual: %s\n"),
|
||||
_tprintf(_T("FindFirstFile failure: Expected: %s, Actual: %s\n"),
|
||||
testFile1, FindData.cFileName);
|
||||
return -1;
|
||||
}
|
||||
|
@ -73,7 +73,7 @@ int TestFileFindNextFile(int argc, char* argv[])
|
||||
|
||||
if ((_tcscmp(FindData.cFileName, testDirectory2File1) != 0) && (_tcscmp(FindData.cFileName, testDirectory2File2) != 0))
|
||||
{
|
||||
_tprintf(_T("FindNextFile failure: Expected: %d, Actual: %s\n"),
|
||||
_tprintf(_T("FindNextFile failure: Expected: %s, Actual: %s\n"),
|
||||
testDirectory2File2, FindData.cFileName);
|
||||
return -1;
|
||||
}
|
||||
|
@ -23,7 +23,7 @@ int TestPathAllocCombine(int argc, char* argv[])
|
||||
|
||||
if (status != S_OK)
|
||||
{
|
||||
_tprintf(_T("PathAllocCombine status: 0x%08X\n"), status);
|
||||
_tprintf(_T("PathAllocCombine status: 0x%08lX\n"), status);
|
||||
return -1;
|
||||
}
|
||||
|
||||
@ -41,7 +41,7 @@ int TestPathAllocCombine(int argc, char* argv[])
|
||||
|
||||
if (status != S_OK)
|
||||
{
|
||||
_tprintf(_T("PathAllocCombine status: 0x%08X\n"), status);
|
||||
_tprintf(_T("PathAllocCombine status: 0x%08lX\n"), status);
|
||||
return -1;
|
||||
}
|
||||
|
||||
@ -59,7 +59,7 @@ int TestPathAllocCombine(int argc, char* argv[])
|
||||
|
||||
if (status != S_OK)
|
||||
{
|
||||
_tprintf(_T("PathAllocCombine status: 0x%08X\n"), status);
|
||||
_tprintf(_T("PathAllocCombine status: 0x%08lX\n"), status);
|
||||
return -1;
|
||||
}
|
||||
|
||||
@ -77,7 +77,7 @@ int TestPathAllocCombine(int argc, char* argv[])
|
||||
|
||||
if (status != S_OK)
|
||||
{
|
||||
_tprintf(_T("PathAllocCombine status: 0x%08X\n"), status);
|
||||
_tprintf(_T("PathAllocCombine status: 0x%08lX\n"), status);
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
@ -23,7 +23,7 @@ int TestPathCchAddBackslashEx(int argc, char* argv[])
|
||||
|
||||
if (status != S_OK)
|
||||
{
|
||||
_tprintf(_T("PathCchAddBackslash status: 0x%08X\n"), status);
|
||||
_tprintf(_T("PathCchAddBackslash status: 0x%08lX\n"), status);
|
||||
return -1;
|
||||
}
|
||||
|
||||
@ -41,7 +41,7 @@ int TestPathCchAddBackslashEx(int argc, char* argv[])
|
||||
|
||||
if (status != S_FALSE)
|
||||
{
|
||||
_tprintf(_T("PathCchAddBackslash status: 0x%08X\n"), status);
|
||||
_tprintf(_T("PathCchAddBackslash status: 0x%08lX\n"), status);
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
@ -23,7 +23,7 @@ int TestPathCchAddExtension(int argc, char* argv[])
|
||||
|
||||
if (status != S_OK)
|
||||
{
|
||||
_tprintf(_T("PathCchAddExtension status: 0x%08X\n"), status);
|
||||
_tprintf(_T("PathCchAddExtension status: 0x%08lX\n"), status);
|
||||
return -1;
|
||||
}
|
||||
|
||||
@ -41,7 +41,7 @@ int TestPathCchAddExtension(int argc, char* argv[])
|
||||
|
||||
if (status != S_OK)
|
||||
{
|
||||
_tprintf(_T("PathCchAddExtension status: 0x%08X\n"), status);
|
||||
_tprintf(_T("PathCchAddExtension status: 0x%08lX\n"), status);
|
||||
return -1;
|
||||
}
|
||||
|
||||
@ -59,7 +59,7 @@ int TestPathCchAddExtension(int argc, char* argv[])
|
||||
|
||||
if (status != S_FALSE)
|
||||
{
|
||||
_tprintf(_T("PathCchAddExtension status: 0x%08X\n"), status);
|
||||
_tprintf(_T("PathCchAddExtension status: 0x%08lX\n"), status);
|
||||
return -1;
|
||||
}
|
||||
|
||||
@ -77,7 +77,7 @@ int TestPathCchAddExtension(int argc, char* argv[])
|
||||
|
||||
if (status != S_FALSE)
|
||||
{
|
||||
_tprintf(_T("PathCchAddExtension status: 0x%08X\n"), status);
|
||||
_tprintf(_T("PathCchAddExtension status: 0x%08lX\n"), status);
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
@ -24,7 +24,7 @@ int TestPathCchAppend(int argc, char* argv[])
|
||||
|
||||
if (status != S_OK)
|
||||
{
|
||||
_tprintf(_T("PathCchAppend status: 0x%08X\n"), status);
|
||||
_tprintf(_T("PathCchAppend status: 0x%08lX\n"), status);
|
||||
return -1;
|
||||
}
|
||||
|
||||
@ -42,7 +42,7 @@ int TestPathCchAppend(int argc, char* argv[])
|
||||
|
||||
if (status != S_OK)
|
||||
{
|
||||
_tprintf(_T("PathCchAppend status: 0x%08X\n"), status);
|
||||
_tprintf(_T("PathCchAppend status: 0x%08lX\n"), status);
|
||||
return -1;
|
||||
}
|
||||
|
||||
@ -60,7 +60,7 @@ int TestPathCchAppend(int argc, char* argv[])
|
||||
|
||||
if (status != S_OK)
|
||||
{
|
||||
_tprintf(_T("PathCchAppend status: 0x%08X\n"), status);
|
||||
_tprintf(_T("PathCchAppend status: 0x%08lX\n"), status);
|
||||
return -1;
|
||||
}
|
||||
|
||||
@ -78,7 +78,7 @@ int TestPathCchAppend(int argc, char* argv[])
|
||||
|
||||
if (status != S_OK)
|
||||
{
|
||||
_tprintf(_T("PathCchAppend status: 0x%08X\n"), status);
|
||||
_tprintf(_T("PathCchAppend status: 0x%08lX\n"), status);
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
@ -28,7 +28,7 @@ int TestPathCchStripPrefix(int argc, char* argv[])
|
||||
|
||||
if (status != S_OK)
|
||||
{
|
||||
_tprintf(_T("PathCchStripPrefix status: 0x%08X\n"), status);
|
||||
_tprintf(_T("PathCchStripPrefix status: 0x%08lX\n"), status);
|
||||
return -1;
|
||||
}
|
||||
|
||||
@ -46,7 +46,7 @@ int TestPathCchStripPrefix(int argc, char* argv[])
|
||||
|
||||
if (status != S_FALSE)
|
||||
{
|
||||
_tprintf(_T("PathCchStripPrefix status: 0x%08X\n"), status);
|
||||
_tprintf(_T("PathCchStripPrefix status: 0x%08lX\n"), status);
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
@ -36,7 +36,7 @@ int TestPipeCreatePipe(int argc, char* argv[])
|
||||
|
||||
if (dwWrite != sizeof(writeBuffer))
|
||||
{
|
||||
_tprintf(_T("WriteFile: unexpected number of bytes written: Actual: %d, Expected: %d\n"),
|
||||
_tprintf(_T("WriteFile: unexpected number of bytes written: Actual: %ld, Expected: %ld\n"),
|
||||
dwWrite, sizeof(writeBuffer));
|
||||
return -1;
|
||||
}
|
||||
@ -52,7 +52,7 @@ int TestPipeCreatePipe(int argc, char* argv[])
|
||||
|
||||
if (dwRead != sizeof(readBuffer))
|
||||
{
|
||||
_tprintf(_T("ReadFile: unexpected number of bytes read: Actual: %d, Expected: %d\n"),
|
||||
_tprintf(_T("ReadFile: unexpected number of bytes read: Actual: %ld, Expected: %ld\n"),
|
||||
dwWrite, sizeof(readBuffer));
|
||||
return -1;
|
||||
}
|
||||
|
@ -12,7 +12,7 @@ void CALLBACK test_WorkCallback(PTP_CALLBACK_INSTANCE instance, void* context, P
|
||||
BYTE b[1024];
|
||||
BYTE c[1024];
|
||||
|
||||
printf("Hello %s: %d (thread: %d)\n", context,
|
||||
printf("Hello %s: %ld (thread: %lu)\n", context,
|
||||
InterlockedIncrement(&count), GetCurrentThreadId());
|
||||
|
||||
for (index = 0; index < 100; index++)
|
||||
|
@ -81,7 +81,7 @@ int schannel_send(PSecurityFunctionTable table, HANDLE hPipe, PCtxtHandle phCont
|
||||
|
||||
printf("EncryptMessage status: 0x%08X\n", status);
|
||||
|
||||
printf("EncryptMessage output: cBuffers: %d [0]: %d / %d [1]: %d / %d [2]: %d / %d [3]: %d / %d\n", Message.cBuffers,
|
||||
printf("EncryptMessage output: cBuffers: %ld [0]: %lu / %lu [1]: %lu / %lu [2]: %lu / %lu [3]: %lu / %lu\n", Message.cBuffers,
|
||||
Message.pBuffers[0].cbBuffer, Message.pBuffers[0].BufferType,
|
||||
Message.pBuffers[1].cbBuffer, Message.pBuffers[1].BufferType,
|
||||
Message.pBuffers[2].cbBuffer, Message.pBuffers[2].BufferType,
|
||||
@ -150,7 +150,7 @@ int schannel_recv(PSecurityFunctionTable table, HANDLE hPipe, PCtxtHandle phCont
|
||||
|
||||
printf("DecryptMessage status: 0x%08X\n", status);
|
||||
|
||||
printf("DecryptMessage output: cBuffers: %d [0]: %d / %d [1]: %d / %d [2]: %d / %d [3]: %d / %d\n", Message.cBuffers,
|
||||
printf("DecryptMessage output: cBuffers: %ld [0]: %lu / %lu [1]: %lu / %lu [2]: %lu / %lu [3]: %lu / %lu\n", Message.cBuffers,
|
||||
Message.pBuffers[0].cbBuffer, Message.pBuffers[0].BufferType,
|
||||
Message.pBuffers[1].cbBuffer, Message.pBuffers[1].BufferType,
|
||||
Message.pBuffers[2].cbBuffer, Message.pBuffers[2].BufferType,
|
||||
@ -159,7 +159,7 @@ int schannel_recv(PSecurityFunctionTable table, HANDLE hPipe, PCtxtHandle phCont
|
||||
if (status != SEC_E_OK)
|
||||
return -1;
|
||||
|
||||
printf("Decrypted Message (%d)\n", Message.pBuffers[1].cbBuffer);
|
||||
printf("Decrypted Message (%ld)\n", Message.pBuffers[1].cbBuffer);
|
||||
winpr_HexDump((BYTE*) Message.pBuffers[1].pvBuffer, Message.pBuffers[1].cbBuffer);
|
||||
|
||||
if (memcmp(Message.pBuffers[1].pvBuffer, test_LastDummyMessage, sizeof(test_LastDummyMessage)) == 0)
|
||||
@ -330,9 +330,9 @@ static void* schannel_test_server_thread(void* arg)
|
||||
else if (status == SEC_E_INCOMPLETE_MESSAGE)
|
||||
printf("AcceptSecurityContext status: SEC_E_INCOMPLETE_MESSAGE\n");
|
||||
|
||||
printf("Server cBuffers: %d pBuffers[0]: %d type: %d\n",
|
||||
printf("Server cBuffers: %lu pBuffers[0]: %lu type: %lu\n",
|
||||
SecBufferDesc_out.cBuffers, SecBufferDesc_out.pBuffers[0].cbBuffer, SecBufferDesc_out.pBuffers[0].BufferType);
|
||||
printf("Server Input cBuffers: %d pBuffers[0]: %d type: %d pBuffers[1]: %d type: %d\n", SecBufferDesc_in.cBuffers,
|
||||
printf("Server Input cBuffers: %ld pBuffers[0]: %lu type: %lu pBuffers[1]: %lu type: %lu\n", SecBufferDesc_in.cBuffers,
|
||||
SecBufferDesc_in.pBuffers[0].cbBuffer, SecBufferDesc_in.pBuffers[0].BufferType,
|
||||
SecBufferDesc_in.pBuffers[1].cbBuffer, SecBufferDesc_in.pBuffers[1].BufferType);
|
||||
|
||||
@ -351,7 +351,7 @@ static void* schannel_test_server_thread(void* arg)
|
||||
|
||||
if (pSecBuffer->cbBuffer > 0)
|
||||
{
|
||||
printf("Server > Client (%d)\n", pSecBuffer->cbBuffer);
|
||||
printf("Server > Client (%ld)\n", pSecBuffer->cbBuffer);
|
||||
winpr_HexDump((BYTE*) pSecBuffer->pvBuffer, pSecBuffer->cbBuffer);
|
||||
|
||||
if (!WriteFile(g_ClientWritePipe, pSecBuffer->pvBuffer, pSecBuffer->cbBuffer, &NumberOfBytesWritten, NULL))
|
||||
@ -479,7 +479,7 @@ int TestSchannel(int argc, char* argv[])
|
||||
* 0x800C 0x800D 0x800E 0x2400 0xAA02 0xAE06 0x2200 0x2203
|
||||
*/
|
||||
|
||||
printf("SupportedAlgs: %d\n", SupportedAlgs.cSupportedAlgs);
|
||||
printf("SupportedAlgs: %ld\n", SupportedAlgs.cSupportedAlgs);
|
||||
|
||||
for (index = 0; index < SupportedAlgs.cSupportedAlgs; index++)
|
||||
{
|
||||
@ -500,7 +500,7 @@ int TestSchannel(int argc, char* argv[])
|
||||
|
||||
/* CipherStrengths: Minimum: 40 Maximum: 256 */
|
||||
|
||||
printf("CipherStrengths: Minimum: %d Maximum: %d\n",
|
||||
printf("CipherStrengths: Minimum: %ld Maximum: %ld\n",
|
||||
CipherStrengths.dwMinimumCipherStrength, CipherStrengths.dwMaximumCipherStrength);
|
||||
|
||||
ZeroMemory(&SupportedProtocols, sizeof(SecPkgCred_SupportedProtocols));
|
||||
@ -514,7 +514,7 @@ int TestSchannel(int argc, char* argv[])
|
||||
|
||||
/* SupportedProtocols: 0x208A0 */
|
||||
|
||||
printf("SupportedProtocols: 0x%04X\n", SupportedProtocols.grbitProtocol);
|
||||
printf("SupportedProtocols: 0x%04lX\n", SupportedProtocols.grbitProtocol);
|
||||
|
||||
fContextReq = ISC_REQ_STREAM |
|
||||
ISC_REQ_SEQUENCE_DETECT | ISC_REQ_REPLAY_DETECT |
|
||||
@ -547,7 +547,7 @@ int TestSchannel(int argc, char* argv[])
|
||||
}
|
||||
|
||||
g_ClientWait = TRUE;
|
||||
printf("NumberOfBytesRead: %d\n", NumberOfBytesRead);
|
||||
printf("NumberOfBytesRead: %ld\n", NumberOfBytesRead);
|
||||
|
||||
SecBuffer_in[0].BufferType = SECBUFFER_TOKEN;
|
||||
SecBuffer_in[0].pvBuffer = lpTokenIn;
|
||||
@ -587,9 +587,9 @@ int TestSchannel(int argc, char* argv[])
|
||||
else if (status == SEC_E_INCOMPLETE_MESSAGE)
|
||||
printf("InitializeSecurityContext status: SEC_E_INCOMPLETE_MESSAGE\n");
|
||||
|
||||
printf("Client Output cBuffers: %d pBuffers[0]: %d type: %d\n",
|
||||
printf("Client Output cBuffers: %ld pBuffers[0]: %ld type: %ld\n",
|
||||
SecBufferDesc_out.cBuffers, SecBufferDesc_out.pBuffers[0].cbBuffer, SecBufferDesc_out.pBuffers[0].BufferType);
|
||||
printf("Client Input cBuffers: %d pBuffers[0]: %d type: %d pBuffers[1]: %d type: %d\n", SecBufferDesc_in.cBuffers,
|
||||
printf("Client Input cBuffers: %ld pBuffers[0]: %ld type: %ld pBuffers[1]: %ld type: %ld\n", SecBufferDesc_in.cBuffers,
|
||||
SecBufferDesc_in.pBuffers[0].cbBuffer, SecBufferDesc_in.pBuffers[0].BufferType,
|
||||
SecBufferDesc_in.pBuffers[1].cbBuffer, SecBufferDesc_in.pBuffers[1].BufferType);
|
||||
|
||||
@ -599,7 +599,7 @@ int TestSchannel(int argc, char* argv[])
|
||||
|
||||
if (pSecBuffer->cbBuffer > 0)
|
||||
{
|
||||
printf("Client > Server (%d)\n", pSecBuffer->cbBuffer);
|
||||
printf("Client > Server (%ld)\n", pSecBuffer->cbBuffer);
|
||||
winpr_HexDump((BYTE*) pSecBuffer->pvBuffer, pSecBuffer->cbBuffer);
|
||||
|
||||
if (!WriteFile(g_ServerWritePipe, pSecBuffer->pvBuffer, pSecBuffer->cbBuffer, &NumberOfBytesWritten, NULL))
|
||||
|
@ -11,13 +11,13 @@ int TestGetNativeSystemInfo(int argc, char* argv[])
|
||||
printf("SystemInfo:\n");
|
||||
printf("\twProcessorArchitecture: %d\n", sysinfo.wProcessorArchitecture);
|
||||
printf("\twReserved: %d\n", sysinfo.wReserved);
|
||||
printf("\tdwPageSize: 0x%08X\n", sysinfo.dwPageSize);
|
||||
printf("\tdwPageSize: 0x%08lX\n", sysinfo.dwPageSize);
|
||||
printf("\tlpMinimumApplicationAddress: %p\n", sysinfo.lpMinimumApplicationAddress);
|
||||
printf("\tlpMaximumApplicationAddress: %p\n", sysinfo.lpMaximumApplicationAddress);
|
||||
printf("\tdwActiveProcessorMask: 0x%08X\n", sysinfo.dwActiveProcessorMask);
|
||||
printf("\tdwNumberOfProcessors: %d\n", sysinfo.dwNumberOfProcessors);
|
||||
printf("\tdwProcessorType: %d\n", sysinfo.dwProcessorType);
|
||||
printf("\tdwAllocationGranularity: %d\n", sysinfo.dwAllocationGranularity);
|
||||
printf("\tdwActiveProcessorMask: 0x%08llX\n", sysinfo.dwActiveProcessorMask);
|
||||
printf("\tdwNumberOfProcessors: %ld\n", sysinfo.dwNumberOfProcessors);
|
||||
printf("\tdwProcessorType: %ld\n", sysinfo.dwProcessorType);
|
||||
printf("\tdwAllocationGranularity: %ld\n", sysinfo.dwAllocationGranularity);
|
||||
printf("\twProcessorLevel: %d\n", sysinfo.wProcessorLevel);
|
||||
printf("\twProcessorRevision: %d\n", sysinfo.wProcessorRevision);
|
||||
printf("\n");
|
||||
|
@ -50,7 +50,7 @@ int TestArrayList(int argc, char* argv[])
|
||||
ArrayList_RemoveAt(arrayList, 0);
|
||||
if (val != index)
|
||||
{
|
||||
printf("ArrayList: shifted %d entries, expected value %d, got %d\n", index, index, val);
|
||||
printf("ArrayList: shifted %d entries, expected value %d, got %ld\n", index, index, val);
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user