ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

localui/tests: Use CRT allocation functions. 

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Nikolay Sivov 2022-04-07 10:50:40 +03:00 committed by Alexandre Julliard
parent 151abafa54
commit 7efa1498aa
1 changed files with 8 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
dlls/localui/tests/localui.c
View File

@ -69,7 +69,7 @@ static PORT_INFO_2W * find_portinfo2(LPCWSTR pPort)
return NULL; return NULL;
} }
ok(!res, "EnumPorts succeeded: got %ld\n", res); ok(!res, "EnumPorts succeeded: got %ld\n", res);
pi_buffer = HeapAlloc(GetProcessHeap(), 0, pi_needed); pi_buffer = malloc(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 %ld\n", res); ok(res == 1, "EnumPorts failed: got %ld\n", res);
} }
@ -105,21 +105,6 @@ static LPCSTR load_functions(void)
return NULL; return NULL;
} }
/* ###########################
* strdupW [internal]
*/
static LPWSTR strdupW(LPCWSTR strW)
{
LPWSTR ptr;
ptr = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(strW) + 1) * sizeof(WCHAR));
if (ptr) {
lstrcpyW(ptr, strW);
}
return ptr;
}
/* ########################### */ /* ########################### */
static void test_AddPortUI(void) static void test_AddPortUI(void)
@ -267,7 +252,6 @@ START_TEST(localui)
DWORD numentries; DWORD numentries;
PORT_INFO_2W * pi2; PORT_INFO_2W * pi2;
WCHAR bufferW[16]; WCHAR bufferW[16];
CHAR bufferA[16];
DWORD id; DWORD id;
/* localui.dll does not exist before w2k */ /* localui.dll does not exist before w2k */
@ -302,29 +286,26 @@ 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%lu:", id); swprintf(bufferW, ARRAY_SIZE(bufferW), L"LPT%lu:", id);
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;
if (!pi2 && (lpt_absent == NULL)) lpt_absent = strdupW(bufferW); if (!pi2 && (lpt_absent == NULL)) lpt_absent = wcsdup(bufferW);
} }
id = 0; id = 0;
/* "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%lu:", id); swprintf(bufferW, ARRAY_SIZE(bufferW), L"COM%lu:", id);
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;
if (!pi2 && (com_absent == NULL)) com_absent = strdupW(bufferW); if (!pi2 && (com_absent == NULL)) com_absent = wcsdup(bufferW);
} }
test_AddPortUI(); test_AddPortUI();
test_ConfigurePortUI(); test_ConfigurePortUI();
/* cleanup */ free(lpt_absent);
HeapFree(GetProcessHeap(), 0, lpt_absent); free(com_absent);
HeapFree(GetProcessHeap(), 0, com_absent); free(pi_buffer);
HeapFree(GetProcessHeap(), 0, pi_buffer);
} }