From 2de608a0e7e7f46e2ce380e884056b0f5d476e8f Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Wed, 2 Mar 2016 10:11:41 +0000 Subject: [PATCH] [FUSION][FUSION_1_1][FUSION_2_0] Sync with Wine Staging 1.9.4. CORE-10912 svn path=/trunk/; revision=70860 --- reactos/dll/win32/fusion/fusion.c | 9 +++++++++ reactos/dll/win32/fusion/fusion.spec | 2 +- reactos/dll/win32/fusion/fusion_1_1/fusion.spec | 2 +- reactos/dll/win32/fusion/fusion_2_0/fusion.spec | 2 +- reactos/media/doc/README.WINE | 2 +- 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/reactos/dll/win32/fusion/fusion.c b/reactos/dll/win32/fusion/fusion.c index 5fd1f41b932..729356208eb 100644 --- a/reactos/dll/win32/fusion/fusion.c +++ b/reactos/dll/win32/fusion/fusion.c @@ -38,6 +38,15 @@ HRESULT WINAPI ClearDownloadCache(void) return E_NOTIMPL; } +/****************************************************************** + * CopyPDBs (FUSION.@) + */ +HRESULT WINAPI CopyPDBs(void *unknown) +{ + FIXME("(%p) stub!\n", unknown); + return E_NOTIMPL; +} + /****************************************************************** * CreateInstallReferenceEnum (FUSION.@) */ diff --git a/reactos/dll/win32/fusion/fusion.spec b/reactos/dll/win32/fusion/fusion.spec index 264aff70959..f3a89507617 100644 --- a/reactos/dll/win32/fusion/fusion.spec +++ b/reactos/dll/win32/fusion/fusion.spec @@ -1,4 +1,4 @@ -@ stub CopyPDBs +@ stdcall CopyPDBs(ptr) @ stdcall ClearDownloadCache() @ stdcall CreateApplicationContext(ptr ptr) @ stdcall CreateAssemblyCache(ptr long) diff --git a/reactos/dll/win32/fusion/fusion_1_1/fusion.spec b/reactos/dll/win32/fusion/fusion_1_1/fusion.spec index 264aff70959..f3a89507617 100644 --- a/reactos/dll/win32/fusion/fusion_1_1/fusion.spec +++ b/reactos/dll/win32/fusion/fusion_1_1/fusion.spec @@ -1,4 +1,4 @@ -@ stub CopyPDBs +@ stdcall CopyPDBs(ptr) @ stdcall ClearDownloadCache() @ stdcall CreateApplicationContext(ptr ptr) @ stdcall CreateAssemblyCache(ptr long) diff --git a/reactos/dll/win32/fusion/fusion_2_0/fusion.spec b/reactos/dll/win32/fusion/fusion_2_0/fusion.spec index 264aff70959..f3a89507617 100644 --- a/reactos/dll/win32/fusion/fusion_2_0/fusion.spec +++ b/reactos/dll/win32/fusion/fusion_2_0/fusion.spec @@ -1,4 +1,4 @@ -@ stub CopyPDBs +@ stdcall CopyPDBs(ptr) @ stdcall ClearDownloadCache() @ stdcall CreateApplicationContext(ptr ptr) @ stdcall CreateAssemblyCache(ptr long) diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE index c48e9249d81..89dae7dcc71 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.4 reactos/dll/win32/dciman32 # Synced to WineStaging-1.7.55 reactos/dll/win32/faultrep # Synced to WineStaging-1.7.55 reactos/dll/win32/fltlib # Synced to WineStaging-1.7.55 -reactos/dll/win32/fusion # Synced to WineStaging-1.7.55 +reactos/dll/win32/fusion # Synced to WineStaging-1.9.4 reactos/dll/win32/gdiplus # Synced to WineStaging-1.7.55 reactos/dll/win32/hhctrl.ocx # Synced to WineStaging-1.7.55 reactos/dll/win32/hlink # Synced to WineStaging-1.7.55