[HNETCFG] Sync with Wine Staging 3.9. CORE-14656
authorAmine Khaldi <amine.khaldi@reactos.org>
Sun, 27 May 2018 03:12:51 +0000 (04:12 +0100)
committerAmine Khaldi <amine.khaldi@reactos.org>
Sun, 27 May 2018 03:12:51 +0000 (04:12 +0100)
dll/win32/hnetcfg/apps.c
media/doc/README.WINE

index e63da7f..fda714e 100644 (file)
@@ -61,7 +61,7 @@ static ULONG WINAPI fw_app_Release(
     if (!refs)
     {
         TRACE("destroying %p\n", fw_app);
-        if (fw_app->filename) SysFreeString( fw_app->filename );
+        SysFreeString( fw_app->filename );
         HeapFree( GetProcessHeap(), 0, fw_app );
     }
     return refs;
@@ -256,16 +256,10 @@ static HRESULT WINAPI fw_app_get_ProcessImageFileName(
     FIXME("%p, %p\n", This, imageFileName);
 
     if (!imageFileName)
-        return E_INVALIDARG;
-
-    if (!This->filename)
-    {
-        *imageFileName = NULL;
-        return S_OK;
-    }
+        return E_POINTER;
 
     *imageFileName = SysAllocString( This->filename );
-    return *imageFileName ? S_OK : E_OUTOFMEMORY;
+    return *imageFileName || !This->filename ? S_OK : E_OUTOFMEMORY;
 }
 
 static HRESULT WINAPI fw_app_put_ProcessImageFileName(
@@ -276,12 +270,10 @@ static HRESULT WINAPI fw_app_put_ProcessImageFileName(
 
     FIXME("%p, %s\n", This, debugstr_w(imageFileName));
 
-    if (!imageFileName)
-    {
-        This->filename = NULL;
-        return S_OK;
-    }
+    if (!imageFileName || !imageFileName[0])
+        return E_INVALIDARG;
 
+    SysFreeString( This->filename );
     This->filename = SysAllocString( imageFileName );
     return This->filename ? S_OK : E_OUTOFMEMORY;
 }
index e17dedd..632e0ed 100644 (file)
@@ -71,7 +71,7 @@ reactos/dll/win32/fusion              # Synced to WineStaging-3.3
 reactos/dll/win32/gdiplus             # Synced to WineStaging-3.9
 reactos/dll/win32/hhctrl.ocx          # Synced to WineStaging-3.3
 reactos/dll/win32/hlink               # Synced to WineStaging-3.3
-reactos/dll/win32/hnetcfg             # Synced to WineStaging-3.3
+reactos/dll/win32/hnetcfg             # Synced to WineStaging-3.9
 reactos/dll/win32/httpapi             # Synced to WineStaging-3.3
 reactos/dll/win32/iccvid              # Synced to WineStaging-3.3
 reactos/dll/win32/ieframe             # Synced to WineStaging-3.3