From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Sat, 3 Jun 2017 22:32:11 +0000 (+0000)
Subject: [NTPRINT_WINETEST] Sync with Wine Staging 2.9. CORE-13362
X-Git-Tag: ReactOS-0.4.6~502
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=df088c988e5dec44c6ee24f77bc64cbfd45c994f

[NTPRINT_WINETEST] Sync with Wine Staging 2.9. CORE-13362

svn path=/trunk/; revision=74825
---

diff --git a/rostests/winetests/ntprint/ntprint.c b/rostests/winetests/ntprint/ntprint.c
index e0bc01ed850..1710220def0 100644
--- a/rostests/winetests/ntprint/ntprint.c
+++ b/rostests/winetests/ntprint/ntprint.c
@@ -32,7 +32,7 @@
 /* ##### */
 
 static HMODULE  hdll;
-static HANDLE (WINAPI *pPSetupCreateMonitorInfo)(LPVOID, LPVOID, LPVOID);
+static HANDLE (WINAPI *pPSetupCreateMonitorInfo)(DWORD, const WCHAR *);
 static VOID   (WINAPI *pPSetupDestroyMonitorInfo)(HANDLE);
 static BOOL   (WINAPI *pPSetupEnumMonitor)(HANDLE, DWORD, LPWSTR, LPDWORD);
 
@@ -66,10 +66,12 @@ static LPCSTR load_functions(void)
 static void test_PSetupCreateMonitorInfo(VOID)
 {
     HANDLE  mi;
-    BYTE    buffer[1024] ;
+    WCHAR buffer[1024] = {'\\','\\'};
+    UINT len = sizeof(buffer) / sizeof(buffer[0]) - 2;
+    GetComputerNameW(buffer + 2, &len);
 
     SetLastError(0xdeadbeef);
-    mi = pPSetupCreateMonitorInfo(NULL, NULL, NULL);
+    mi = pPSetupCreateMonitorInfo(0, NULL);
     if (!mi && (GetLastError() == RPC_S_SERVER_UNAVAILABLE)) {
         win_skip("The service 'Spooler' is required for many tests\n");
         return;
@@ -77,13 +79,18 @@ static void test_PSetupCreateMonitorInfo(VOID)
     ok( mi != NULL, "got %p with %u (expected '!= NULL')\n", mi, GetLastError());
     if (mi) pPSetupDestroyMonitorInfo(mi);
 
-
-    memset(buffer, 0, sizeof(buffer));
     SetLastError(0xdeadbeef);
-    mi = pPSetupCreateMonitorInfo(buffer, NULL, NULL);
+    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);
 }
 
 /* ########################### */
@@ -99,7 +106,7 @@ static void test_PSetupDestroyMonitorInfo(VOID)
     trace("returned with %u\n", GetLastError());
 
     SetLastError(0xdeadbeef);
-    mi = pPSetupCreateMonitorInfo(NULL, NULL, NULL);
+    mi = pPSetupCreateMonitorInfo(0, NULL);
     if (!mi && (GetLastError() == RPC_S_SERVER_UNAVAILABLE)) {
         win_skip("The service 'Spooler' is required for many tests\n");
         return;
@@ -134,7 +141,7 @@ static void test_PSetupEnumMonitor(VOID)
     DWORD   index=0;
 
     SetLastError(0xdeadbeef);
-    mi = pPSetupCreateMonitorInfo(NULL, NULL, NULL);
+    mi = pPSetupCreateMonitorInfo(0, NULL);
     if (!mi) {
         skip("PSetupCreateMonitorInfo\n");
         return;