Skip to content

W
wine-winehq
Commit 73d36423 authored by Detlef Riekenberg's avatar Detlef Riekenberg Committed by Alexandre Julliard
Browse files
Options

localspl/tests: Fallback to localmon.dll on NT4.0.

parent 75fb6780
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 4 deletions
dlls/localspl/tests/localmon.c
View file @ 73d36423
...@@ -36,6 +36,7 @@ ...@@ -36,6 +36,7 @@
/* ##### */ /* ##### */
static HMODULE hdll; static HMODULE hdll;
static HMODULE hlocalmon;
static LPMONITOREX (WINAPI *pInitializePrintMonitor)(LPWSTR); static LPMONITOREX (WINAPI *pInitializePrintMonitor)(LPWSTR);
static LPMONITOREX pm; static LPMONITOREX pm;
...@@ -74,16 +75,18 @@ static void test_InitializePrintMonitor(void) ...@@ -74,16 +75,18 @@ static void test_InitializePrintMonitor(void)
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
res = pInitializePrintMonitor(NULL); res = pInitializePrintMonitor(NULL);
ok( (res == NULL) && (GetLastError() == ERROR_INVALID_PARAMETER), /* The Parameter was unchecked before w2k */
"returned %p with %d\n (expected NULL with " \ ok( res || (GetLastError() == ERROR_INVALID_PARAMETER),
"returned %p with %d\n (expected '!= NULL' or: NULL with " \
"ERROR_INVALID_PARAMETER)\n", res, GetLastError()); "ERROR_INVALID_PARAMETER)\n", res, GetLastError());
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
res = pInitializePrintMonitor(emptyW); res = pInitializePrintMonitor(emptyW);
ok( (res == NULL) && (GetLastError() == ERROR_INVALID_PARAMETER), ok( res || (GetLastError() == ERROR_INVALID_PARAMETER),
"returned %p with %d\n (expected NULL with " \ "returned %p with %d\n (expected '!= NULL' or: NULL with " \
"ERROR_INVALID_PARAMETER)\n", res, GetLastError()); "ERROR_INVALID_PARAMETER)\n", res, GetLastError());
/* Every call with a non-empty string returns the same Pointer */ /* Every call with a non-empty string returns the same Pointer */
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
res = pInitializePrintMonitor(Monitors_LocalPortW); res = pInitializePrintMonitor(Monitors_LocalPortW);
...@@ -107,6 +110,13 @@ START_TEST(localmon) ...@@ -107,6 +110,13 @@ START_TEST(localmon)
if (!hdll) return; if (!hdll) return;
pInitializePrintMonitor = (void *) GetProcAddress(hdll, "InitializePrintMonitor"); pInitializePrintMonitor = (void *) GetProcAddress(hdll, "InitializePrintMonitor");
if (!pInitializePrintMonitor) {
/* The Monitor for "Local Ports" was in a seperate dll before w2k */
hlocalmon = LoadLibraryA("localmon.dll");
if (hlocalmon) {
pInitializePrintMonitor = (void *) GetProcAddress(hlocalmon, "InitializePrintMonitor");
}
}
if (!pInitializePrintMonitor) return; if (!pInitializePrintMonitor) return;
/* Native localmon.dll / localspl.dll need a vaild Port-Entry in: /* Native localmon.dll / localspl.dll need a vaild Port-Entry in:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment