From: Amine Khaldi Date: Thu, 17 Nov 2016 22:27:46 +0000 (+0000) Subject: [FUSION] Sync with Wine Staging 1.9.23. CORE-12409 X-Git-Tag: ReactOS-0.4.4-FOSDEM2017~268 X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=48bef33818576f3f3844118c31339ac11323345f [FUSION] Sync with Wine Staging 1.9.23. CORE-12409 svn path=/trunk/; revision=73267 --- diff --git a/reactos/dll/win32/fusion/asmname.c b/reactos/dll/win32/fusion/asmname.c index cc9995b1908..28549037560 100644 --- a/reactos/dll/win32/fusion/asmname.c +++ b/reactos/dll/win32/fusion/asmname.c @@ -712,7 +712,7 @@ done: /****************************************************************** * CreateAssemblyNameObject (FUSION.@) */ -HRESULT WINAPI CreateAssemblyNameObject(LPASSEMBLYNAME *ppAssemblyNameObj, +HRESULT WINAPI CreateAssemblyNameObject(IAssemblyName **ppAssemblyNameObj, LPCWSTR szAssemblyName, DWORD dwFlags, LPVOID pvReserved) { diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE index 0bd0712d481..a694b917952 100644 --- a/reactos/media/doc/README.WINE +++ b/reactos/media/doc/README.WINE @@ -67,7 +67,7 @@ reactos/dll/win32/dbghelp # Synced to WineStaging-1.9.16 reactos/dll/win32/dciman32 # Synced to WineStaging-1.9.11 reactos/dll/win32/faultrep # Synced to WineStaging-1.9.11 reactos/dll/win32/fontsub # Synced to WineStaging-1.9.13 -reactos/dll/win32/fusion # Synced to WineStaging-1.9.11 +reactos/dll/win32/fusion # Synced to WineStaging-1.9.23 reactos/dll/win32/gdiplus # Synced to WineStaging-1.9.16 reactos/dll/win32/hhctrl.ocx # Synced to WineStaging-1.9.16 reactos/dll/win32/hlink # Synced to WineStaging-1.9.16