Jacek Caban : urlmon: Don't hardcode zone numbers.

Alexandre Julliard julliard at winehq.org
Tue Feb 8 17:23:48 CST 2011


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

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Tue Feb  8 15:09:06 2011 +0100

urlmon: Don't hardcode zone numbers.

---

 dlls/urlmon/sec_mgr.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c
index e3be8fe..2aca1a9 100644
--- a/dlls/urlmon/sec_mgr.c
+++ b/dlls/urlmon/sec_mgr.c
@@ -150,7 +150,7 @@ static HRESULT map_url_to_zone(LPCWSTR url, DWORD *zone, LPWSTR *ret_url)
     DWORD size=0;
     HRESULT hres;
 
-    *zone = -1;
+    *zone = URLZONE_INVALID;
 
     hres = CoInternetGetSecurityUrl(url, &secur_url, PSU_SECURITY_URL_ONLY, 0);
     if(hres != S_OK) {
@@ -193,11 +193,11 @@ static HRESULT map_url_to_zone(LPCWSTR url, DWORD *zone, LPWSTR *ret_url)
             case DRIVE_FIXED:
             case DRIVE_CDROM:
             case DRIVE_RAMDISK:
-                *zone = 0;
+                *zone = URLZONE_LOCAL_MACHINE;
                 hres = S_OK;
                 break;
             case DRIVE_REMOTE:
-                *zone = 3;
+                *zone = URLZONE_INTERNET;
                 hres = S_OK;
                 break;
             default:
@@ -206,7 +206,7 @@ static HRESULT map_url_to_zone(LPCWSTR url, DWORD *zone, LPWSTR *ret_url)
         }
     }
 
-    if(*zone == -1) {
+    if(*zone == URLZONE_INVALID) {
         WARN("domains are not yet implemented\n");
         hres = get_zone_from_reg(schema, zone);
     }
@@ -495,7 +495,7 @@ static HRESULT WINAPI SecManagerImpl_MapUrlToZone(IInternetSecurityManager *ifac
     }
 
     if(!pwszUrl) {
-        *pdwZone = -1;
+        *pdwZone = URLZONE_INVALID;
         return E_INVALIDARG;
     }
 




More information about the wine-cvs mailing list