Author: tfaber Date: Wed Aug 19 15:43:13 2015 New Revision: 68772
URL: http://svn.reactos.org/svn/reactos?rev=68772&view=rev Log: [SHELL32][RSHELL] - Fix some extern "C"
Modified: trunk/reactos/base/shell/rshell/misc.cpp trunk/reactos/dll/win32/shell32/shelldesktop/shelldesktop.h trunk/reactos/dll/win32/shell32/shellmenu/shellmenu.h
Modified: trunk/reactos/base/shell/rshell/misc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/misc.cpp?... ============================================================================== --- trunk/reactos/base/shell/rshell/misc.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/rshell/misc.cpp [iso-8859-1] Wed Aug 19 15:43:13 2015 @@ -20,7 +20,6 @@
#include "shellmenu.h"
-extern "C" HINSTANCE shell32_hInstance = NULL;
DWORD WINAPI WinList_Init(void)
Modified: trunk/reactos/dll/win32/shell32/shelldesktop/shelldesktop.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shelldesk... ============================================================================== --- trunk/reactos/dll/win32/shell32/shelldesktop/shelldesktop.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shelldesktop/shelldesktop.h [iso-8859-1] Wed Aug 19 15:43:13 2015 @@ -33,4 +33,7 @@
#include <wine/debug.h>
-extern "C" HINSTANCE shell32_hInstance; +extern "C" +{ +extern HINSTANCE shell32_hInstance; +}
Modified: trunk/reactos/dll/win32/shell32/shellmenu/shellmenu.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellmenu... ============================================================================== --- trunk/reactos/dll/win32/shell32/shellmenu/shellmenu.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellmenu/shellmenu.h [iso-8859-1] Wed Aug 19 15:43:13 2015 @@ -69,9 +69,15 @@ #pragma warning(pop) #endif
-extern "C" HRESULT WINAPI CStartMenu_Constructor(REFIID riid, void **ppv); -extern "C" HRESULT WINAPI CMenuDeskBar_Constructor(REFIID riid, LPVOID *ppv); -extern "C" HRESULT WINAPI CMenuSite_Constructor(REFIID riid, LPVOID *ppv); -extern "C" HRESULT WINAPI CMenuBand_Constructor(REFIID riid, LPVOID *ppv); -extern "C" HRESULT WINAPI CBandSite_Constructor(REFIID riid, LPVOID *ppv); -extern "C" HRESULT WINAPI CMergedFolder_Constructor(REFIID riid, LPVOID *ppv); +extern "C" +{ +extern HINSTANCE shell32_hInstance; + +HRESULT WINAPI CStartMenu_Constructor(REFIID riid, void **ppv); +HRESULT WINAPI CMenuDeskBar_Constructor(REFIID riid, LPVOID *ppv); +HRESULT WINAPI CMenuSite_Constructor(REFIID riid, LPVOID *ppv); +HRESULT WINAPI CMenuBand_Constructor(REFIID riid, LPVOID *ppv); +HRESULT WINAPI CBandSite_Constructor(REFIID riid, LPVOID *ppv); +HRESULT WINAPI CMergedFolder_Constructor(REFIID riid, LPVOID *ppv); + +}