[ros-diffs] 01/01: [HNETCFG] Sync with Wine Staging 3.9. CORE-14656

[Amine Khaldi]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1d62a5beb50daccfe47c8105ef47cc9278ad1f42

commit 1d62a5beb50daccfe47c8105ef47cc9278ad1f42
Author:     Amine Khaldi <amine.kha...@reactos.org>
AuthorDate: Sun May 27 04:12:51 2018 +0100
Commit:     Amine Khaldi <amine.kha...@reactos.org>
CommitDate: Sun May 27 04:12:51 2018 +0100

    [HNETCFG] Sync with Wine Staging 3.9. CORE-14656
---
 dll/win32/hnetcfg/apps.c | 20 ++++++--------------
 media/doc/README.WINE    |  2 +-
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/dll/win32/hnetcfg/apps.c b/dll/win32/hnetcfg/apps.c
index e63da7f56e..fda714e3bb 100644
--- a/dll/win32/hnetcfg/apps.c
+++ b/dll/win32/hnetcfg/apps.c
@@ -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;
 }
diff --git a/media/doc/README.WINE b/media/doc/README.WINE
index e17deddf22..632e0ed069 100644
--- a/media/doc/README.WINE
+++ b/media/doc/README.WINE
@@ -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