Detlef Riekenberg : localspl/tests: Add tests for XcvOpenPort.
Alexandre Julliard
julliard at wine.codeweavers.com
Mon Dec 11 10:35:05 CST 2006
Module: wine
Branch: master
Commit: 9f90c74fd8eaaf7441d0f7715911c864ee35a6a7
URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f90c74fd8eaaf7441d0f7715911c864ee35a6a7
Author: Detlef Riekenberg <wine.dev at web.de>
Date: Fri Dec 8 14:02:17 2006 +0100
localspl/tests: Add tests for XcvOpenPort.
---
dlls/localspl/tests/localmon.c | 51 +++++++++++++++++++++++++++++++++++++++-
include/ddk/winsplp.h | 3 +-
2 files changed, 51 insertions(+), 3 deletions(-)
diff --git a/dlls/localspl/tests/localmon.c b/dlls/localspl/tests/localmon.c
index 55a1a9c..89dd757 100644
--- a/dlls/localspl/tests/localmon.c
+++ b/dlls/localspl/tests/localmon.c
@@ -54,7 +54,7 @@ static BOOL (WINAPI *pConfigurePort)(LP
static BOOL (WINAPI *pDeletePort)(LPWSTR, HWND, LPWSTR);
static BOOL (WINAPI *pGetPrinterDataFromPort)(HANDLE, DWORD, LPWSTR, LPWSTR, DWORD, LPWSTR, DWORD, LPDWORD);
static BOOL (WINAPI *pSetPortTimeOuts)(HANDLE, LPCOMMTIMEOUTS, DWORD);
-static BOOL (WINAPI *pXcvOpenPort)(HANDLE, LPCWSTR, ACCESS_MASK, PHANDLE phXcv);
+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);
@@ -291,6 +291,54 @@ static void test_InitializePrintMonitor(
"returned %p with %d (expected %p)\n", res, GetLastError(), pm);
}
+
+/* ########################### */
+
+static void test_XcvOpenPort(void)
+{
+ DWORD res;
+ HANDLE hXcv;
+
+ if ((pXcvOpenPort == NULL) || (pXcvClosePort == NULL)) return;
+
+#if 0
+ /* crash with native localspl.dll (w2k+xp) */
+ res = pXcvOpenPort(NULL, SERVER_ACCESS_ADMINISTER, &hXcv);
+ res = pXcvOpenPort(emptyW, SERVER_ACCESS_ADMINISTER, NULL);
+#endif
+
+
+ /* The returned handle is the result from a previous "spoolss.dll,DllAllocSplMem" */
+ SetLastError(0xdeadbeef);
+ hXcv = (HANDLE) 0xdeadbeef;
+ res = pXcvOpenPort(emptyW, SERVER_ACCESS_ADMINISTER, &hXcv);
+ ok(res, "returned %d with 0x%x and %p (expected '!= 0')\n", res, GetLastError(), hXcv);
+ if (res) pXcvClosePort(hXcv);
+
+
+ /* The ACCESS_MASK is not checked in XcvOpenPort */
+ SetLastError(0xdeadbeef);
+ hXcv = (HANDLE) 0xdeadbeef;
+ res = pXcvOpenPort(emptyW, 0, &hXcv);
+ ok(res, "returned %d with 0x%x and %p (expected '!= 0')\n", res, GetLastError(), hXcv);
+ if (res) pXcvClosePort(hXcv);
+
+
+ /* A copy of pszObject is saved in the Memory-Block */
+ SetLastError(0xdeadbeef);
+ hXcv = (HANDLE) 0xdeadbeef;
+ res = pXcvOpenPort(portname_lpt1W, SERVER_ALL_ACCESS, &hXcv);
+ ok(res, "returned %d with 0x%x and %p (expected '!= 0')\n", res, GetLastError(), hXcv);
+ if (res) pXcvClosePort(hXcv);
+
+ SetLastError(0xdeadbeef);
+ hXcv = (HANDLE) 0xdeadbeef;
+ res = pXcvOpenPort(portname_fileW, SERVER_ALL_ACCESS, &hXcv);
+ ok(res, "returned %d with 0x%x and %p (expected '!= 0')\n", res, GetLastError(), hXcv);
+ if (res) pXcvClosePort(hXcv);
+
+}
+
/* ########################### */
#define GET_MONITOR_FUNC(name) \
@@ -352,4 +400,5 @@ START_TEST(localmon)
test_ConfigurePort();
test_DeletePort();
test_EnumPorts();
+ test_XcvOpenPort();
}
diff --git a/include/ddk/winsplp.h b/include/ddk/winsplp.h
index f4cc663..4dfdb5b 100644
--- a/include/ddk/winsplp.h
+++ b/include/ddk/winsplp.h
@@ -71,8 +71,7 @@ typedef struct _MONITOR {
LPWSTR lpOutBuffer, DWORD cbOutBuffer, LPDWORD lpcbReturned);
BOOL (WINAPI *pfnSetPortTimeOuts)(HANDLE hPort, LPCOMMTIMEOUTS lpCTO,
DWORD reserved);
- BOOL (WINAPI *pfnXcvOpenPort)(HANDLE hMonitor, LPCWSTR pszObject,
- ACCESS_MASK GrantedAccess, PHANDLE phXcv);
+ BOOL (WINAPI *pfnXcvOpenPort)(LPCWSTR pszObject, ACCESS_MASK GrantedAccess, PHANDLE phXcv);
DWORD (WINAPI *pfnXcvDataPort)(HANDLE hXcv, LPCWSTR pszDataName,
PBYTE pInputData, DWORD cbInputData,
PBYTE pOutputData, DWORD cbOutputData, PDWORD pcbOutputNeeded);
More information about the wine-cvs
mailing list