Detlef Riekenberg : localspl/tests: Remove duplicate tests.

Alexandre Julliard julliard at wine.codeweavers.com
Mon Apr 9 07:36:17 CDT 2007


Module: wine
Branch: master
Commit: d770f843c153daff3159a7412afd7541fbfcecfa
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=d770f843c153daff3159a7412afd7541fbfcecfa

Author: Detlef Riekenberg <wine.dev at web.de>
Date:   Fri Apr  6 22:47:23 2007 +0200

localspl/tests: Remove duplicate 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)(LPCWSTR, ACCESS_MASK, PHANDLE phXcv);
 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();




More information about the wine-cvs mailing list