localspl/tests: [#3] Remove duplicate tests
Detlef Riekenberg
wine.dev at web.de
Fri Apr 6 15:47:23 CDT 2007
We have now a seperate testsuite for localui.dll
Changelog:
- localspl/tests: Remove duplicate tests
--
By by ... Detlef
-------------- next part --------------
>From 532536aaff4381a687cc3ae9fcb3346e6e06ff88 Mon Sep 17 00:00:00 2001
From: Detlef Riekenberg <wine.dev at web.de>
Date: Fri, 6 Apr 2007 22:42:23 +0200
Subject: [PATCH] localspl/tests: Move tests for the ui to localui/tests
---
dlls/localspl/tests/localmon.c | 33 ---------------------------------
1 files changed, 0 insertions(+), 33 deletions(-)
diff --git a/dlls/localspl/tests/localmon.c b/dlls/localspl/tests/localmon.c
index af2611e..6f4bd82 100644
--- a/dlls/localspl/tests/localmon.c
+++ b/dlls/localspl/tests/localmon.c
@@ -58,13 +58,6 @@ static BOOL (WINAPI *pXcvOpenPort)(LPCW
static DWORD (WINAPI *pXcvDataPort)(HANDLE, LPCWSTR, PBYTE, DWORD, PBYTE, DWORD, PDWORD);
static BOOL (WINAPI *pXcvClosePort)(HANDLE);
-static HMODULE hlocalui;
-static PMONITORUI (WINAPI *pInitializePrintMonitorUI)(VOID);
-static PMONITORUI pui;
-static BOOL (WINAPI *pAddPortUI)(PCWSTR, HWND, PCWSTR, PWSTR *);
-static BOOL (WINAPI *pConfigurePortUI)(PCWSTR, HWND, PCWSTR);
-static BOOL (WINAPI *pDeletePortUI)(PCWSTR, HWND, PCWSTR);
-
static HANDLE hXcv;
static HANDLE hXcv_noaccess;
@@ -975,7 +968,6 @@ START_TEST(localmon)
ok(res != 0, "with %u\n", GetLastError());
pInitializePrintMonitor = (void *) GetProcAddress(hdll, "InitializePrintMonitor");
- pInitializePrintMonitorUI = (void *) GetProcAddress(hdll, "InitializePrintMonitorUI");
if (!pInitializePrintMonitor) {
/* The Monitor for "Local Ports" was in a seperate dll before w2k */
@@ -1026,31 +1018,6 @@ START_TEST(localmon)
}
}
- if ((!pInitializePrintMonitorUI) && (hXcv)) {
- /* The user interface for "Local Ports" is in a separate dll since w2k */
- BYTE buffer[MAX_PATH];
- DWORD len;
-
- res = pXcvDataPort(hXcv, cmd_MonitorUIW, NULL, 0, buffer, MAX_PATH, &len);
- if (res == ERROR_SUCCESS) hlocalui = LoadLibraryW( (LPWSTR) buffer);
- if (hlocalui) pInitializePrintMonitorUI = (void *) GetProcAddress(hlocalui, "InitializePrintMonitorUI");
- }
-
- if (pInitializePrintMonitorUI) {
- pui = pInitializePrintMonitorUI();
- if (pui) {
- numentries = (pui->dwMonitorUISize - sizeof(DWORD)) / sizeof(VOID *);
- ok( numentries == 3,
- "dwMonitorUISize (%d) => %d Functions\n", pui->dwMonitorUISize, numentries);
-
- if (numentries > 2) {
- pAddPortUI = pui->pfnAddPortUI;
- pConfigurePortUI = pui->pfnConfigurePortUI;
- pDeletePortUI = pui->pfnDeletePortUI;
- }
- }
- }
-
test_InitializePrintMonitor();
test_AddPort();
--
1.4.1
More information about the wine-patches
mailing list