Piotr Caban : localspl: Run EnumPorts tests when InitializePrintMonitor2 is used.
Module: wine Branch: master Commit: 9498fabfd32199182cf024a99db55a5394373583 URL: https://gitlab.winehq.org/wine/wine/-/commit/9498fabfd32199182cf024a99db55a5... Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 24 18:47:15 2022 +0100 localspl: Run EnumPorts tests when InitializePrintMonitor2 is used. --- dlls/localspl/tests/localmon.c | 43 ++++++++++++++++++++++++------------------ 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/dlls/localspl/tests/localmon.c b/dlls/localspl/tests/localmon.c index ccbc43f280d..dbc22a99c93 100644 --- a/dlls/localspl/tests/localmon.c +++ b/dlls/localspl/tests/localmon.c @@ -234,6 +234,14 @@ static BOOL delete_port(LPWSTR portname) (lstrlenW(portname) + 1) * sizeof(WCHAR), NULL, 0, NULL) == ERROR_SUCCESS; } +static BOOL call_EnumPorts(WCHAR *name, DWORD level, BYTE *buf, DWORD size, + DWORD *needed, DWORD *count) +{ + if (pEnumPorts) + return pEnumPorts(name, level, buf, size, needed, count); + return pEnumPorts2(hmon, name, level, buf, size, needed, count); +} + static BOOL call_AddPortEx(WCHAR *name, DWORD level, BYTE *buf, WCHAR *mon) { if (pAddPortEx) @@ -256,13 +264,13 @@ static void find_installed_ports(void) have_lpt[0] = '\0'; have_file[0] = '\0'; - if (!pEnumPorts) return; + if (!pEnumPorts && !pEnumPorts2) return; - res = pEnumPorts(NULL, 1, NULL, 0, &needed, &returned); + res = call_EnumPorts(NULL, 1, NULL, 0, &needed, &returned); if (!res && (GetLastError() == ERROR_INSUFFICIENT_BUFFER)) { pi = HeapAlloc(GetProcessHeap(), 0, needed); } - res = pEnumPorts(NULL, 1, (LPBYTE) pi, needed, &needed, &returned); + res = call_EnumPorts(NULL, 1, (LPBYTE) pi, needed, &needed, &returned); if (!res) { skip("no ports found\n"); @@ -619,7 +627,7 @@ static void test_EnumPorts(void) DWORD pcbNeeded; DWORD pcReturned; - if (!pEnumPorts) return; + if (!pEnumPorts && !pEnumPorts2) return; /* valid levels are 1 and 2 */ for(level = 0; level < 4; level++) { @@ -627,15 +635,14 @@ static void test_EnumPorts(void) cbBuf = 0xdeadbeef; pcReturned = 0xdeadbeef; SetLastError(0xdeadbeef); - res = pEnumPorts(NULL, level, NULL, 0, &cbBuf, &pcReturned); + res = call_EnumPorts(NULL, level, NULL, 0, &cbBuf, &pcReturned); /* use only a short test, when we test with an invalid level */ if(!level || (level > 2)) { - /* NT4 fails with ERROR_INVALID_LEVEL (as expected) - XP succeeds with ERROR_SUCCESS () */ - ok( (cbBuf == 0) && (pcReturned == 0), - "(%ld) returned %ld with %lu and %ld, %ld (expected 0, 0)\n", - level, res, GetLastError(), cbBuf, pcReturned); + todo_wine ok(!res || broken(res && !GetLastError()), + "EnumPorts succeeded with level %ld\n", level); + todo_wine ok(GetLastError() == ERROR_INVALID_LEVEL || broken(res && !GetLastError()), + "GetLastError() = %ld\n", GetLastError()); continue; } @@ -650,7 +657,7 @@ static void test_EnumPorts(void) pcbNeeded = 0xdeadbeef; pcReturned = 0xdeadbeef; SetLastError(0xdeadbeef); - res = pEnumPorts(NULL, level, buffer, cbBuf, &pcbNeeded, &pcReturned); + res = call_EnumPorts(NULL, level, buffer, cbBuf, &pcbNeeded, &pcReturned); ok( res, "(%ld) returned %ld with %lu and %ld, %ld (expected '!= 0')\n", level, res, GetLastError(), pcbNeeded, pcReturned); /* We can compare the returned Data with the Registry / "win.ini",[Ports] here */ @@ -658,14 +665,14 @@ static void test_EnumPorts(void) pcbNeeded = 0xdeadbeef; pcReturned = 0xdeadbeef; SetLastError(0xdeadbeef); - res = pEnumPorts(NULL, level, buffer, cbBuf+1, &pcbNeeded, &pcReturned); + res = call_EnumPorts(NULL, level, buffer, cbBuf+1, &pcbNeeded, &pcReturned); ok( res, "(%ld) returned %ld with %lu and %ld, %ld (expected '!= 0')\n", level, res, GetLastError(), pcbNeeded, pcReturned); pcbNeeded = 0xdeadbeef; pcReturned = 0xdeadbeef; SetLastError(0xdeadbeef); - res = pEnumPorts(NULL, level, buffer, cbBuf-1, &pcbNeeded, &pcReturned); + res = call_EnumPorts(NULL, level, buffer, cbBuf-1, &pcbNeeded, &pcReturned); ok( !res && (GetLastError() == ERROR_INSUFFICIENT_BUFFER), "(%ld) returned %ld with %lu and %ld, %ld (expected '0' with " "ERROR_INSUFFICIENT_BUFFER)\n", @@ -674,23 +681,23 @@ static void test_EnumPorts(void) if (0) { /* The following tests crash this app with native localmon/localspl */ - pEnumPorts(NULL, level, NULL, cbBuf, &pcbNeeded, &pcReturned); - pEnumPorts(NULL, level, buffer, cbBuf, NULL, &pcReturned); - pEnumPorts(NULL, level, buffer, cbBuf, &pcbNeeded, NULL); + call_EnumPorts(NULL, level, NULL, cbBuf, &pcbNeeded, &pcReturned); + call_EnumPorts(NULL, level, buffer, cbBuf, NULL, &pcReturned); + call_EnumPorts(NULL, level, buffer, cbBuf, &pcbNeeded, NULL); } /* The Servername is ignored */ pcbNeeded = 0xdeadbeef; pcReturned = 0xdeadbeef; SetLastError(0xdeadbeef); - res = pEnumPorts(emptyW, level, buffer, cbBuf+1, &pcbNeeded, &pcReturned); + res = call_EnumPorts(emptyW, level, buffer, cbBuf+1, &pcbNeeded, &pcReturned); ok( res, "(%ld) returned %ld with %lu and %ld, %ld (expected '!= 0')\n", level, res, GetLastError(), pcbNeeded, pcReturned); pcbNeeded = 0xdeadbeef; pcReturned = 0xdeadbeef; SetLastError(0xdeadbeef); - res = pEnumPorts(server_does_not_existW, level, buffer, cbBuf+1, &pcbNeeded, &pcReturned); + res = call_EnumPorts(server_does_not_existW, level, buffer, cbBuf+1, &pcbNeeded, &pcReturned); ok( res, "(%ld) returned %ld with %lu and %ld, %ld (expected '!= 0')\n", level, res, GetLastError(), pcbNeeded, pcReturned);
participants (1)
-
Alexandre Julliard