From 959499b5adb8a5421e5e8184091adb550dec3308 Mon Sep 17 00:00:00 2001 From: "law%netscape.com" Date: Fri, 7 Aug 1998 00:05:00 +0000 Subject: [PATCH] Added new property pane for windows (98) Desktop integration --- cmd/winfe/prefs.cpp | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/cmd/winfe/prefs.cpp b/cmd/winfe/prefs.cpp index 6f2799471c85..41b9d19ac97c 100644 --- a/cmd/winfe/prefs.cpp +++ b/cmd/winfe/prefs.cpp @@ -25,6 +25,7 @@ #include #include "winprefs/isppageo.h" #include "winprefs/brprefid.h" +#include "winprefs/wprefid.h" #ifdef MOZ_LOC_INDEP #include "winprefs/liprefid.h" #include "winprefs/iliprefs.h" @@ -2251,7 +2252,7 @@ void wfe_DisplayPreferences(CGenericFrame *pFrame) { HINSTANCE hPrefDll; - LPSPECIFYPROPERTYPAGEOBJECTS categories[6]; + LPSPECIFYPROPERTYPAGEOBJECTS categories[7]; PFNPREFS pfnCreatePropertyFrame; ULONG nCategories = 0; ULONG nInitialCategory; @@ -2334,6 +2335,25 @@ wfe_DisplayPreferences(CGenericFrame *pFrame) if (CreateAdvancedCategory(pContext, &categories[nCategories])) { nCategories++; } + + // Windows Desktop Integration category. + if (SUCCEEDED(FEU_CoCreateInstance(CLSID_WindowsPrefs, + NULL, + CLSCTX_INPROC_SERVER, + IID_ISpecifyPropertyPageObjects, + (LPVOID *)&categories[nCategories]))) { + nCategories++; + } else { + // Register DLL and try again. + RegisterCLSIDForDll( "winpref.dll" ); + if (SUCCEEDED(FEU_CoCreateInstance(CLSID_WindowsPrefs, + NULL, + CLSCTX_INPROC_SERVER, + IID_ISpecifyPropertyPageObjects, + (LPVOID *)&categories[nCategories]))) { + nCategories++; + } + } // Make sure we have at least one category if (nCategories == 0) {