Detlef Riekenberg : localspl: Accept valid environments in AddMonitor.

[Alexandre Julliard]

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

Author: Detlef Riekenberg 
Date:   Fri Dec  2 19:09:54 2016 +0100

localspl: Accept valid environments in AddMonitor.

Signed-off-by: Detlef Riekenberg 
Signed-off-by: Alexandre Julliard

---

dlls/localspl/provider.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c
index b5fcdb1..f359b73 100644
--- a/dlls/localspl/provider.c
+++ b/dlls/localspl/provider.c
@@ -1465,6 +1465,7 @@ static BOOL myAddPrinterDriverEx(DWORD level, LPBYTE pDriverInfo, DWORD dwFileCo
  */
 static BOOL WINAPI fpAddMonitor(LPWSTR pName, DWORD Level, LPBYTE pMonitors)
 {
+    const printenv_t * env;
     monitor_t * pm = NULL;
     LPMONITOR_INFO_2W mi2w;
     HKEY    hroot = NULL;
@@ -1489,12 +1490,10 @@ static BOOL WINAPI fpAddMonitor(LPWSTR pName, DWORD Level, LPBYTE pMonitors)
         SetLastError(ERROR_INVALID_PARAMETER);
         return FALSE;
     }
-    if (!mi2w->pEnvironment || lstrcmpW(mi2w->pEnvironment, x86_envnameW)) {
-        WARN("Environment %s requested (we support only %s)\n",
-                debugstr_w(mi2w->pEnvironment), debugstr_w(x86_envnameW));
-        SetLastError(ERROR_INVALID_ENVIRONMENT);
-        return FALSE;
-    }
+
+    env = validate_envW(mi2w->pEnvironment);
+    if (!env)
+        return FALSE;   /* ERROR_INVALID_ENVIRONMENT */

if (!mi2w->pDLLName || (! mi2w->pDLLName[0])) {
         WARN("pDLLName not valid : %s\n", debugstr_w(mi2w->pDLLName));