17 Mar
2018
17 Mar
'18
8:22 p.m.
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0dff328003d02823992c9…
commit 0dff328003d02823992c9375ca52456a236f4404
Author: Mark Jansen <mark.jansen(a)reactos.org>
AuthorDate: Sat Mar 17 21:22:42 2018 +0100
Commit: Mark Jansen <mark.jansen(a)reactos.org>
CommitDate: Sat Mar 17 21:22:42 2018 +0100
[NTPRINT_WINETEST] Remove a crashing test for a dll we don't have anymore.
---
modules/rostests/winetests/CMakeLists.txt | 1 -
modules/rostests/winetests/ntprint/CMakeLists.txt | 5 -
modules/rostests/winetests/ntprint/ntprint.c | 238 ----------------------
modules/rostests/winetests/ntprint/testlist.c | 12 --
4 files changed, 256 deletions(-)
diff --git a/modules/rostests/winetests/CMakeLists.txt
b/modules/rostests/winetests/CMakeLists.txt
index 01ab53e093..fff038fc27 100644
--- a/modules/rostests/winetests/CMakeLists.txt
+++ b/modules/rostests/winetests/CMakeLists.txt
@@ -63,7 +63,6 @@ add_subdirectory(netapi32)
add_subdirectory(netcfgx)
add_subdirectory(ntdll)
add_subdirectory(ntdsapi)
-add_subdirectory(ntprint)
add_subdirectory(odbccp32)
add_subdirectory(ole32)
add_subdirectory(oleacc)
diff --git a/modules/rostests/winetests/ntprint/CMakeLists.txt
b/modules/rostests/winetests/ntprint/CMakeLists.txt
deleted file mode 100644
index 3b6942d3a9..0000000000
--- a/modules/rostests/winetests/ntprint/CMakeLists.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-
-add_executable(ntprint_winetest ntprint.c testlist.c)
-set_module_type(ntprint_winetest win32cui)
-add_importlibs(ntprint_winetest msvcrt kernel32)
-add_rostests_file(TARGET ntprint_winetest)
diff --git a/modules/rostests/winetests/ntprint/ntprint.c
b/modules/rostests/winetests/ntprint/ntprint.c
deleted file mode 100644
index 1710220def..0000000000
--- a/modules/rostests/winetests/ntprint/ntprint.c
+++ /dev/null
@@ -1,238 +0,0 @@
-/*
- * Unit test suite for the Spooler Setup API (Printing)
- *
- * Copyright 2007 Detlef Riekenberg
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- *
- */
-
-#include <stdarg.h>
-#include <stdio.h>
-
-#include "windef.h"
-#include "winbase.h"
-#include "winerror.h"
-#include "wingdi.h"
-#include "wine/test.h"
-
-
-/* ##### */
-
-static HMODULE hdll;
-static HANDLE (WINAPI *pPSetupCreateMonitorInfo)(DWORD, const WCHAR *);
-static VOID (WINAPI *pPSetupDestroyMonitorInfo)(HANDLE);
-static BOOL (WINAPI *pPSetupEnumMonitor)(HANDLE, DWORD, LPWSTR, LPDWORD);
-
-/* ########################### */
-
-static LPCSTR load_functions(void)
-{
- LPCSTR ptr;
-
- ptr = "ntprint.dll";
- hdll = LoadLibraryA(ptr);
- if (!hdll) return ptr;
-
- ptr = "PSetupCreateMonitorInfo";
- pPSetupCreateMonitorInfo = (VOID *) GetProcAddress(hdll, ptr);
- if (!pPSetupCreateMonitorInfo) return ptr;
-
- ptr = "PSetupDestroyMonitorInfo";
- pPSetupDestroyMonitorInfo = (VOID *) GetProcAddress(hdll, ptr);
- if (!pPSetupDestroyMonitorInfo) return ptr;
-
- ptr = "PSetupEnumMonitor";
- pPSetupEnumMonitor = (VOID *) GetProcAddress(hdll, ptr);
- if (!pPSetupEnumMonitor) return ptr;
-
- return NULL;
-}
-
-/* ########################### */
-
-static void test_PSetupCreateMonitorInfo(VOID)
-{
- HANDLE mi;
- WCHAR buffer[1024] = {'\\','\\'};
- UINT len = sizeof(buffer) / sizeof(buffer[0]) - 2;
- GetComputerNameW(buffer + 2, &len);
-
- SetLastError(0xdeadbeef);
- mi = pPSetupCreateMonitorInfo(0, NULL);
- if (!mi && (GetLastError() == RPC_S_SERVER_UNAVAILABLE)) {
- win_skip("The service 'Spooler' is required for many
tests\n");
- return;
- }
- ok( mi != NULL, "got %p with %u (expected '!= NULL')\n", mi,
GetLastError());
- if (mi) pPSetupDestroyMonitorInfo(mi);
-
- SetLastError(0xdeadbeef);
- mi = pPSetupCreateMonitorInfo(0, buffer);
- ok( mi != NULL, "got %p with %u (expected '!= NULL')\n", mi,
GetLastError());
- if (mi) pPSetupDestroyMonitorInfo(mi);
-
- SetLastError(0xdeadbeef);
- mi = pPSetupCreateMonitorInfo(0, buffer + 1);
- todo_wine {
- ok( mi == NULL, "got %p\n", mi );
- ok( GetLastError() == ERROR_INVALID_NAME, "got %d\n", GetLastError() );
- }
- if (mi) pPSetupDestroyMonitorInfo(mi);
-}
-
-/* ########################### */
-
-static void test_PSetupDestroyMonitorInfo(VOID)
-{
- HANDLE mi;
-
-
- SetLastError(0xdeadbeef);
- pPSetupDestroyMonitorInfo(NULL);
- /* lasterror is returned */
- trace("returned with %u\n", GetLastError());
-
- SetLastError(0xdeadbeef);
- mi = pPSetupCreateMonitorInfo(0, NULL);
- if (!mi && (GetLastError() == RPC_S_SERVER_UNAVAILABLE)) {
- win_skip("The service 'Spooler' is required for many
tests\n");
- return;
- }
- ok( mi != NULL, "got %p with %u (expected '!= NULL')\n", mi,
GetLastError());
-
- if (!mi) return;
-
- SetLastError(0xdeadbeef);
- pPSetupDestroyMonitorInfo(mi);
- /* lasterror is returned */
- trace("returned with %u\n", GetLastError());
-
- /* Trying to destroy the handle twice crashes with native ntprint.dll */
- if (0) {
- SetLastError(0xdeadbeef);
- pPSetupDestroyMonitorInfo(mi);
- trace(" with %u\n", GetLastError());
- }
-
-}
-
-/* ########################### */
-
-static void test_PSetupEnumMonitor(VOID)
-{
- HANDLE mi;
- WCHAR buffer[MAX_PATH+2];
- DWORD minsize = 0;
- DWORD size;
- DWORD res;
- DWORD index=0;
-
- SetLastError(0xdeadbeef);
- mi = pPSetupCreateMonitorInfo(0, NULL);
- if (!mi) {
- skip("PSetupCreateMonitorInfo\n");
- return;
- }
-
- minsize = 0;
- SetLastError(0xdeadbeef);
- res = pPSetupEnumMonitor(mi, 0, NULL, &minsize);
- ok( !res && (GetLastError() == ERROR_INSUFFICIENT_BUFFER) && (minsize
> 0),
- "got %u with %u and %u (expected '0' with ERROR_INSUFFICIENT_BUFFER
"
- "and '> 0')\n", res, GetLastError(), minsize);
-
-
- size = sizeof(buffer) / sizeof(buffer[0]);
- if ((minsize + 1) > size) {
- skip("overflow: %u\n", minsize);
- pPSetupDestroyMonitorInfo(mi);
- return;
- }
-
- if (0) {
- /* XP: ERROR_INVALID_PARAMETER, w2k: Crash */
- SetLastError(0xdeadbeef);
- size = sizeof(buffer) / sizeof(buffer[0]);
- res = pPSetupEnumMonitor(NULL, 0, buffer, &size);
- ok( !res && (GetLastError() == ERROR_INVALID_PARAMETER),
- "got %u with %u (expected '0' with
ERROR_INVALID_PARAMETER)\n",
- res, GetLastError());
- }
-
- if (0) {
- /* XP: Crash, w2k: Success (how can that work?) */
- SetLastError(0xdeadbeef);
- size = sizeof(buffer) / sizeof(buffer[0]);
- res = pPSetupEnumMonitor(mi, 0, NULL, &size);
- trace("got %u with %u and %u\n", res, GetLastError(), size);
- }
-
- if (0) {
- /* XP: ERROR_INVALID_PARAMETER, w2k: Crash */
- SetLastError(0xdeadbeef);
- res = pPSetupEnumMonitor(mi, 0, buffer, NULL);
- ok( !res && (GetLastError() == ERROR_INVALID_PARAMETER),
- "got %u with %u (expected '0' with
ERROR_INVALID_PARAMETER)\n",
- res, GetLastError());
- }
-
- SetLastError(0xdeadbeef);
- size = minsize - 1;
- res = pPSetupEnumMonitor(mi, 0, buffer, &size);
- ok( !res && (GetLastError() == ERROR_INSUFFICIENT_BUFFER),
- "got %u with %u and %u (expected '0' with
ERROR_INSUFFICIENT_BUFFER)\n",
- res, GetLastError(), size);
-
-
- SetLastError(0xdeadbeef);
- size = minsize;
- res = pPSetupEnumMonitor(mi, 0, buffer, &size);
- ok( res, "got %u with %u and %u (expected '!= 0')\n",
- res, GetLastError(), size);
-
- SetLastError(0xdeadbeef);
- size = minsize + 1;
- res = pPSetupEnumMonitor(mi, 0, buffer, &size);
- ok( res, "got %u with %u and %u (expected '!= 0')\n",
- res, GetLastError(), size);
-
- /* try max. 20 monitors */
- while (res && (index < 20)) {
- SetLastError(0xdeadbeef);
- buffer[0] = '\0';
- size = sizeof(buffer) / sizeof(buffer[0]);
- res = pPSetupEnumMonitor(mi, index, buffer, &size);
- ok( res || (GetLastError() == ERROR_NO_MORE_ITEMS),
- "(%u) got %u with %u and %u (expected '!=0' or: '0' with
"
- "ERROR_NO_MORE_ITEMS)\n", index, res, GetLastError(), size);
-
- if (res) index++;
- }
- pPSetupDestroyMonitorInfo(mi);
-
-}
-
-/* ########################### */
-
-START_TEST(ntprint)
-{
- load_functions();
-
- test_PSetupCreateMonitorInfo();
- test_PSetupDestroyMonitorInfo();
- test_PSetupEnumMonitor();
-
-}
diff --git a/modules/rostests/winetests/ntprint/testlist.c
b/modules/rostests/winetests/ntprint/testlist.c
deleted file mode 100644
index 1e11b97b46..0000000000
--- a/modules/rostests/winetests/ntprint/testlist.c
+++ /dev/null
@@ -1,12 +0,0 @@
-/* Automatically generated file; DO NOT EDIT!! */
-
-#define STANDALONE
-#include "wine/test.h"
-
-extern void func_ntprint(void);
-
-const struct test winetest_testlist[] =
-{
- { "ntprint", func_ntprint },
- { 0, 0 }
-};
2379
days inactive
2379
days old
0 comments
1 participants
participants (1)
-
Mark Jansen