localui/tests: Enable compilation with long types.
Signed-off-by: Eric Pouech <eric.pouech@gmail.com> Signed-off-by: Huw Davies <huw@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
27a22e2acc
commit
a33ac68a12
|
@ -1,4 +1,3 @@
|
||||||
EXTRADEFS = -DWINE_NO_LONG_TYPES
|
|
||||||
TESTDLL = localui.dll
|
TESTDLL = localui.dll
|
||||||
IMPORTS = winspool
|
IMPORTS = winspool
|
||||||
|
|
||||||
|
|
|
@ -68,10 +68,10 @@ static PORT_INFO_2W * find_portinfo2(LPCWSTR pPort)
|
||||||
win_skip("The service 'Spooler' is required for many tests\n");
|
win_skip("The service 'Spooler' is required for many tests\n");
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
ok(!res, "EnumPorts succeeded: got %d\n", res);
|
ok(!res, "EnumPorts succeeded: got %ld\n", res);
|
||||||
pi_buffer = HeapAlloc(GetProcessHeap(), 0, pi_needed);
|
pi_buffer = HeapAlloc(GetProcessHeap(), 0, pi_needed);
|
||||||
res = EnumPortsW(NULL, 2, pi_buffer, pi_needed, &pi_needed, &pi_numports);
|
res = EnumPortsW(NULL, 2, pi_buffer, pi_needed, &pi_needed, &pi_numports);
|
||||||
ok(res == 1, "EnumPorts failed: got %d\n", res);
|
ok(res == 1, "EnumPorts failed: got %ld\n", res);
|
||||||
}
|
}
|
||||||
if (pi_buffer) {
|
if (pi_buffer) {
|
||||||
pi = (PORT_INFO_2W *) pi_buffer;
|
pi = (PORT_INFO_2W *) pi_buffer;
|
||||||
|
@ -137,21 +137,21 @@ static void test_AddPortUI(void)
|
||||||
res = pAddPortUI(NULL, NULL, NULL, NULL);
|
res = pAddPortUI(NULL, NULL, NULL, NULL);
|
||||||
ok( !res &&
|
ok( !res &&
|
||||||
((GetLastError() == ERROR_UNKNOWN_PORT) || (GetLastError() == ERROR_INVALID_PRINTER_NAME)),
|
((GetLastError() == ERROR_UNKNOWN_PORT) || (GetLastError() == ERROR_INVALID_PRINTER_NAME)),
|
||||||
"got %d with %u (expected '0' with: ERROR_UNKNOWN_PORT or "
|
"got %ld with %lu (expected '0' with: ERROR_UNKNOWN_PORT or "
|
||||||
"ERROR_INVALID_PRINTER_NAME)\n", res, GetLastError());
|
"ERROR_INVALID_PRINTER_NAME)\n", res, GetLastError());
|
||||||
|
|
||||||
SetLastError(0xdeadbeef);
|
SetLastError(0xdeadbeef);
|
||||||
res = pAddPortUI(NULL, NULL, L"", NULL);
|
res = pAddPortUI(NULL, NULL, L"", NULL);
|
||||||
ok( !res &&
|
ok( !res &&
|
||||||
((GetLastError() == ERROR_UNKNOWN_PORT) || (GetLastError() == ERROR_INVALID_PRINTER_NAME)),
|
((GetLastError() == ERROR_UNKNOWN_PORT) || (GetLastError() == ERROR_INVALID_PRINTER_NAME)),
|
||||||
"got %d with %u (expected '0' with: ERROR_UNKNOWN_PORT or "
|
"got %ld with %lu (expected '0' with: ERROR_UNKNOWN_PORT or "
|
||||||
"ERROR_INVALID_PRINTER_NAME)\n", res, GetLastError());
|
"ERROR_INVALID_PRINTER_NAME)\n", res, GetLastError());
|
||||||
|
|
||||||
SetLastError(0xdeadbeef);
|
SetLastError(0xdeadbeef);
|
||||||
res = pAddPortUI(NULL, NULL, L"does_not_exist", NULL);
|
res = pAddPortUI(NULL, NULL, L"does_not_exist", NULL);
|
||||||
ok( !res &&
|
ok( !res &&
|
||||||
((GetLastError() == ERROR_UNKNOWN_PORT) || (GetLastError() == ERROR_INVALID_PRINTER_NAME)),
|
((GetLastError() == ERROR_UNKNOWN_PORT) || (GetLastError() == ERROR_INVALID_PRINTER_NAME)),
|
||||||
"got %d with %u (expected '0' with: ERROR_UNKNOWN_PORT or "
|
"got %ld with %lu (expected '0' with: ERROR_UNKNOWN_PORT or "
|
||||||
"ERROR_INVALID_PRINTER_NAME)\n", res, GetLastError());
|
"ERROR_INVALID_PRINTER_NAME)\n", res, GetLastError());
|
||||||
|
|
||||||
if (winetest_interactive) {
|
if (winetest_interactive) {
|
||||||
|
@ -170,7 +170,7 @@ static void test_AddPortUI(void)
|
||||||
(GetLastError() == ERROR_CANCELLED) ||
|
(GetLastError() == ERROR_CANCELLED) ||
|
||||||
(GetLastError() == ERROR_ACCESS_DENIED) ||
|
(GetLastError() == ERROR_ACCESS_DENIED) ||
|
||||||
(GetLastError() == ERROR_NOT_SUPPORTED),
|
(GetLastError() == ERROR_NOT_SUPPORTED),
|
||||||
"got %d with %u and %p (expected '!= 0' or '0' with: "
|
"got %ld with %lu and %p (expected '!= 0' or '0' with: "
|
||||||
"ERROR_CANCELLED, ERROR_ACCESS_DENIED or ERROR_NOT_SUPPORTED)\n",
|
"ERROR_CANCELLED, ERROR_ACCESS_DENIED or ERROR_NOT_SUPPORTED)\n",
|
||||||
res, GetLastError(), new_portname);
|
res, GetLastError(), new_portname);
|
||||||
|
|
||||||
|
@ -194,14 +194,14 @@ static void test_ConfigurePortUI(void)
|
||||||
res = pConfigurePortUI(NULL, NULL, NULL);
|
res = pConfigurePortUI(NULL, NULL, NULL);
|
||||||
ok( !res &&
|
ok( !res &&
|
||||||
((GetLastError() == ERROR_UNKNOWN_PORT) || (GetLastError() == ERROR_INVALID_PRINTER_NAME)),
|
((GetLastError() == ERROR_UNKNOWN_PORT) || (GetLastError() == ERROR_INVALID_PRINTER_NAME)),
|
||||||
"got %d with %u (expected '0' with: ERROR_UNKNOWN_PORT or "
|
"got %ld with %lu (expected '0' with: ERROR_UNKNOWN_PORT or "
|
||||||
"ERROR_INVALID_PRINTER_NAME)\n", res, GetLastError());
|
"ERROR_INVALID_PRINTER_NAME)\n", res, GetLastError());
|
||||||
|
|
||||||
SetLastError(0xdeadbeef);
|
SetLastError(0xdeadbeef);
|
||||||
res = pConfigurePortUI(NULL, NULL, L"");
|
res = pConfigurePortUI(NULL, NULL, L"");
|
||||||
ok( !res &&
|
ok( !res &&
|
||||||
((GetLastError() == ERROR_UNKNOWN_PORT) || (GetLastError() == ERROR_INVALID_PRINTER_NAME)),
|
((GetLastError() == ERROR_UNKNOWN_PORT) || (GetLastError() == ERROR_INVALID_PRINTER_NAME)),
|
||||||
"got %d with %u (expected '0' with: ERROR_UNKNOWN_PORT or "
|
"got %ld with %lu (expected '0' with: ERROR_UNKNOWN_PORT or "
|
||||||
"ERROR_INVALID_PRINTER_NAME)\n", res, GetLastError());
|
"ERROR_INVALID_PRINTER_NAME)\n", res, GetLastError());
|
||||||
|
|
||||||
|
|
||||||
|
@ -209,7 +209,7 @@ static void test_ConfigurePortUI(void)
|
||||||
res = pConfigurePortUI(NULL, NULL, L"does_not_exist");
|
res = pConfigurePortUI(NULL, NULL, L"does_not_exist");
|
||||||
ok( !res &&
|
ok( !res &&
|
||||||
((GetLastError() == ERROR_UNKNOWN_PORT) || (GetLastError() == ERROR_INVALID_PRINTER_NAME)),
|
((GetLastError() == ERROR_UNKNOWN_PORT) || (GetLastError() == ERROR_INVALID_PRINTER_NAME)),
|
||||||
"got %d with %u (expected '0' with: ERROR_UNKNOWN_PORT or "
|
"got %ld with %lu (expected '0' with: ERROR_UNKNOWN_PORT or "
|
||||||
"ERROR_INVALID_PRINTER_NAME)\n", res, GetLastError());
|
"ERROR_INVALID_PRINTER_NAME)\n", res, GetLastError());
|
||||||
|
|
||||||
if (winetest_interactive && lpt_present) {
|
if (winetest_interactive && lpt_present) {
|
||||||
|
@ -217,7 +217,7 @@ static void test_ConfigurePortUI(void)
|
||||||
res = pConfigurePortUI(NULL, NULL, lpt_present->pPortName);
|
res = pConfigurePortUI(NULL, NULL, lpt_present->pPortName);
|
||||||
ok( res ||
|
ok( res ||
|
||||||
(GetLastError() == ERROR_CANCELLED) || (GetLastError() == ERROR_ACCESS_DENIED),
|
(GetLastError() == ERROR_CANCELLED) || (GetLastError() == ERROR_ACCESS_DENIED),
|
||||||
"got %d with %u (expected '!= 0' or '0' with: ERROR_CANCELLED or "
|
"got %ld with %lu (expected '!= 0' or '0' with: ERROR_CANCELLED or "
|
||||||
"ERROR_ACCESS_DENIED)\n", res, GetLastError());
|
"ERROR_ACCESS_DENIED)\n", res, GetLastError());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -226,7 +226,7 @@ static void test_ConfigurePortUI(void)
|
||||||
res = pConfigurePortUI(NULL, NULL, lpt_absent);
|
res = pConfigurePortUI(NULL, NULL, lpt_absent);
|
||||||
ok( !res &&
|
ok( !res &&
|
||||||
((GetLastError() == ERROR_UNKNOWN_PORT) || (GetLastError() == ERROR_INVALID_PRINTER_NAME)),
|
((GetLastError() == ERROR_UNKNOWN_PORT) || (GetLastError() == ERROR_INVALID_PRINTER_NAME)),
|
||||||
"got %d with %u (expected '0' with: ERROR_UNKNOWN_PORT or "
|
"got %ld with %lu (expected '0' with: ERROR_UNKNOWN_PORT or "
|
||||||
"ERROR_INVALID_PRINTER_NAME)\n", res, GetLastError());
|
"ERROR_INVALID_PRINTER_NAME)\n", res, GetLastError());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -235,7 +235,7 @@ static void test_ConfigurePortUI(void)
|
||||||
res = pConfigurePortUI(NULL, NULL, com_present->pPortName);
|
res = pConfigurePortUI(NULL, NULL, com_present->pPortName);
|
||||||
ok( res ||
|
ok( res ||
|
||||||
(GetLastError() == ERROR_CANCELLED) || (GetLastError() == ERROR_ACCESS_DENIED),
|
(GetLastError() == ERROR_CANCELLED) || (GetLastError() == ERROR_ACCESS_DENIED),
|
||||||
"got %d with %u (expected '!= 0' or '0' with: ERROR_CANCELLED or "
|
"got %ld with %lu (expected '!= 0' or '0' with: ERROR_CANCELLED or "
|
||||||
"ERROR_ACCESS_DENIED)\n", res, GetLastError());
|
"ERROR_ACCESS_DENIED)\n", res, GetLastError());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -244,7 +244,7 @@ static void test_ConfigurePortUI(void)
|
||||||
res = pConfigurePortUI(NULL, NULL, com_absent);
|
res = pConfigurePortUI(NULL, NULL, com_absent);
|
||||||
ok( !res &&
|
ok( !res &&
|
||||||
((GetLastError() == ERROR_UNKNOWN_PORT) || (GetLastError() == ERROR_INVALID_PRINTER_NAME)),
|
((GetLastError() == ERROR_UNKNOWN_PORT) || (GetLastError() == ERROR_INVALID_PRINTER_NAME)),
|
||||||
"got %d with %u (expected '0' with: ERROR_UNKNOWN_PORT or "
|
"got %ld with %lu (expected '0' with: ERROR_UNKNOWN_PORT or "
|
||||||
"ERROR_INVALID_PRINTER_NAME)\n", res, GetLastError());
|
"ERROR_INVALID_PRINTER_NAME)\n", res, GetLastError());
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -254,7 +254,7 @@ static void test_ConfigurePortUI(void)
|
||||||
res = pConfigurePortUI(NULL, NULL, L"FILE:");
|
res = pConfigurePortUI(NULL, NULL, L"FILE:");
|
||||||
ok( !res &&
|
ok( !res &&
|
||||||
((GetLastError() == ERROR_CANCELLED) || (GetLastError() == ERROR_ACCESS_DENIED)),
|
((GetLastError() == ERROR_CANCELLED) || (GetLastError() == ERROR_ACCESS_DENIED)),
|
||||||
"got %d with %u (expected '0' with: ERROR_CANCELLED or "
|
"got %ld with %lu (expected '0' with: ERROR_CANCELLED or "
|
||||||
"ERROR_ACCESS_DENIED)\n", res, GetLastError());
|
"ERROR_ACCESS_DENIED)\n", res, GetLastError());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -281,7 +281,7 @@ START_TEST(localui)
|
||||||
if (pui) {
|
if (pui) {
|
||||||
numentries = (pui->dwMonitorUISize - sizeof(DWORD)) / sizeof(VOID *);
|
numentries = (pui->dwMonitorUISize - sizeof(DWORD)) / sizeof(VOID *);
|
||||||
ok( numentries == 3,
|
ok( numentries == 3,
|
||||||
"dwMonitorUISize (%d) => %d Functions\n", pui->dwMonitorUISize, numentries);
|
"dwMonitorUISize (%ld) => %ld Functions\n", pui->dwMonitorUISize, numentries);
|
||||||
|
|
||||||
if (numentries > 2) {
|
if (numentries > 2) {
|
||||||
pAddPortUI = pui->pfnAddPortUI;
|
pAddPortUI = pui->pfnAddPortUI;
|
||||||
|
@ -302,7 +302,7 @@ START_TEST(localui)
|
||||||
/* "LPT1:" - "LPT9:" */
|
/* "LPT1:" - "LPT9:" */
|
||||||
while (((lpt_present == NULL) || (lpt_absent == NULL)) && id < 9) {
|
while (((lpt_present == NULL) || (lpt_absent == NULL)) && id < 9) {
|
||||||
id++;
|
id++;
|
||||||
sprintf(bufferA, "LPT%u:", id);
|
sprintf(bufferA, "LPT%lu:", id);
|
||||||
MultiByteToWideChar( CP_ACP, 0, bufferA, -1, bufferW, ARRAY_SIZE(bufferW));
|
MultiByteToWideChar( CP_ACP, 0, bufferA, -1, bufferW, ARRAY_SIZE(bufferW));
|
||||||
pi2 = find_portinfo2(bufferW);
|
pi2 = find_portinfo2(bufferW);
|
||||||
if (pi2 && (lpt_present == NULL)) lpt_present = pi2;
|
if (pi2 && (lpt_present == NULL)) lpt_present = pi2;
|
||||||
|
@ -313,7 +313,7 @@ START_TEST(localui)
|
||||||
/* "COM1:" - "COM9:" */
|
/* "COM1:" - "COM9:" */
|
||||||
while (((com_present == NULL) || (com_absent == NULL)) && id < 9) {
|
while (((com_present == NULL) || (com_absent == NULL)) && id < 9) {
|
||||||
id++;
|
id++;
|
||||||
sprintf(bufferA, "COM%u:", id);
|
sprintf(bufferA, "COM%lu:", id);
|
||||||
MultiByteToWideChar( CP_ACP, 0, bufferA, -1, bufferW, ARRAY_SIZE(bufferW));
|
MultiByteToWideChar( CP_ACP, 0, bufferA, -1, bufferW, ARRAY_SIZE(bufferW));
|
||||||
pi2 = find_portinfo2(bufferW);
|
pi2 = find_portinfo2(bufferW);
|
||||||
if (pi2 && (com_present == NULL)) com_present = pi2;
|
if (pi2 && (com_present == NULL)) com_present = pi2;
|
||||||
|
|
Loading…
Reference in New Issue