Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 17:25:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

[HNETCFG] Sync with Wine Staging 3.9. CORE-14656

Browse source
This commit is contained in:
Amine Khaldi 2018-05-27 04:12:51 +01:00
parent 4f653a5538
commit 1d62a5beb5
2 changed files with 7 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

20
dll/win32/hnetcfg/apps.c
View file

@ -61,7 +61,7 @@ static ULONG WINAPI fw_app_Release(
if (!refs) if (!refs)
{ {
TRACE("destroying %p\n", fw_app); TRACE("destroying %p\n", fw_app);
if (fw_app->filename) SysFreeString( fw_app->filename ); SysFreeString( fw_app->filename );
HeapFree( GetProcessHeap(), 0, fw_app ); HeapFree( GetProcessHeap(), 0, fw_app );
} }
return refs; return refs;
@ -256,16 +256,10 @@ static HRESULT WINAPI fw_app_get_ProcessImageFileName(
FIXME("%p, %p\n", This, imageFileName); FIXME("%p, %p\n", This, imageFileName);
if (!imageFileName) if (!imageFileName)
return E_INVALIDARG; return E_POINTER;
if (!This->filename)
{
*imageFileName = NULL;
return S_OK;
}
*imageFileName = SysAllocString( This->filename ); *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( 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)); FIXME("%p, %s\n", This, debugstr_w(imageFileName));
if (!imageFileName) if (!imageFileName || !imageFileName[0])
{ return E_INVALIDARG;
This->filename = NULL;
return S_OK;
}
SysFreeString( This->filename );
This->filename = SysAllocString( imageFileName ); This->filename = SysAllocString( imageFileName );
return This->filename ? S_OK : E_OUTOFMEMORY; return This->filename ? S_OK : E_OUTOFMEMORY;
} }

2
media/doc/README.WINE
View 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/gdiplus # Synced to WineStaging-3.9
reactos/dll/win32/hhctrl.ocx # Synced to WineStaging-3.3 reactos/dll/win32/hhctrl.ocx # Synced to WineStaging-3.3
reactos/dll/win32/hlink # 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/httpapi # Synced to WineStaging-3.3
reactos/dll/win32/iccvid # Synced to WineStaging-3.3 reactos/dll/win32/iccvid # Synced to WineStaging-3.3
reactos/dll/win32/ieframe # Synced to WineStaging-3.3 reactos/dll/win32/ieframe # Synced to WineStaging-3.3