localspl: Code cleanup for XcvDataPort_AddPort

Detlef Riekenberg wine.dev at web.de
Mon Apr 30 03:35:50 CDT 2007


LastError is not set in XcvDataPort, so cleanup the code a bit
(PortIsValid fooled me, because LastError was set during CreateFile)



localspl: Code cleanup for XcvDataPort_AddPort


-- 
 
By by ... Detlef

-------------- next part --------------
>From 24229ec00d80713cf47a6623694b72df5be70ea3 Mon Sep 17 00:00:00 2001
From: Detlef Riekenberg <wine.dev at web.de>
Date: Mon, 30 Apr 2007 09:24:02 +0200
Subject: [PATCH 1/3] localspl: Code cleanup for XcvDataPort_AddPort
---
 dlls/localspl/localmon.c |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/dlls/localspl/localmon.c b/dlls/localspl/localmon.c
index 0dc128c..fda2c91 100644
--- a/dlls/localspl/localmon.c
+++ b/dlls/localspl/localmon.c
@@ -401,7 +401,7 @@ BOOL WINAPI localmon_XcvClosePort(HANDLE
  *
  * RETURNS
  *  Success: ERROR_SUCCESS
- *  Failure: win32 error code (same value is returned by GetLastError) 
+ *  Failure: win32 error code
  *
  * NOTES
  *
@@ -431,13 +431,13 @@ DWORD WINAPI localmon_XcvDataPort(HANDLE
         if (res == ERROR_SUCCESS) {
             if (does_port_exist((LPWSTR) pInputData)) {
                 RegCloseKey(hroot);
+                TRACE("=> %u\n", ERROR_ALREADY_EXISTS);
                 return ERROR_ALREADY_EXISTS;
             }
             res = RegSetValueExW(hroot, (LPWSTR) pInputData, 0, REG_SZ, (const BYTE *) emptyW, sizeof(emptyW));
             RegCloseKey(hroot);
-            SetLastError(ERROR_SUCCESS);
-            return res;
         }
+        TRACE("=> %u\n", res);
         return res;
     }
 
@@ -509,7 +509,8 @@ DWORD WINAPI localmon_XcvDataPort(HANDLE
         /* names, that we have recognized, are valid */
         if (res) return ERROR_SUCCESS;
 
-        /* ERROR_ACCESS_DENIED, ERROR_PATH_NOT_FOUND ore something else */
+        /* ERROR_ACCESS_DENIED, ERROR_PATH_NOT_FOUND or something else */
+        TRACE("=> %u\n", GetLastError());
         return GetLastError();
     }
 
-- 
1.4.1



More information about the wine-patches mailing list