Skip to content

Commit 9800b03

Browse files
committed
Remove GetDocRelativePath function
Help is always located in the same folder as binary that is using it.
1 parent 4377817 commit 9800b03

File tree

11 files changed

+2
-57
lines changed

11 files changed

+2
-57
lines changed

Src/ClassicExplorer/dllmain.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,6 @@ static int g_LoadDialogs[]=
4848
0
4949
};
5050

51-
const wchar_t *GetDocRelativePath( void )
52-
{
53-
return DOC_PATH;
54-
}
55-
5651
struct FindChild
5752
{
5853
const wchar_t *className;

Src/ClassicExplorer/stdafx.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,4 @@ using namespace ATL;
2626
#include <shlguid.h>
2727
#include <shlobj.h>
2828

29-
#ifdef BUILD_SETUP
30-
#define DOC_PATH L""
31-
#else
32-
#define DOC_PATH L"..\\..\\Docs\\Help\\"
33-
#endif
34-
3529
#include "StringUtils.h"

Src/ClassicIE/ClassicIEDLL/dllmain.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,6 @@ static int g_LoadDialogs[]=
3333
0
3434
};
3535

36-
const wchar_t *GetDocRelativePath( void )
37-
{
38-
return DOC_PATH;
39-
}
40-
4136
static void NewVersionCallback( VersionData &data )
4237
{
4338
wchar_t path[_MAX_PATH];

Src/ClassicIE/ClassicIEDLL/stdafx.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,4 @@
2424

2525
using namespace ATL;
2626

27-
#ifdef BUILD_SETUP
28-
#define DOC_PATH L""
29-
#else
30-
#define DOC_PATH L"..\\..\\Docs\\Help\\"
31-
#endif
32-
3327
#include "StringUtils.h"

Src/Lib/Settings.cpp

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,6 @@
1818
#include <map>
1919
#include <algorithm>
2020

21-
#ifdef BUILD_SETUP
22-
#define DOC_PATH L""
23-
#else
24-
#define DOC_PATH L"..\\..\\Docs\\Help\\"
25-
#endif
26-
2721
///////////////////////////////////////////////////////////////////////////////
2822

2923
// Read/Write lock for accessing the settings. Can't be acquired recursively. Only the main UI thread (the one displaying the settings UI)
@@ -2185,7 +2179,7 @@ bool HasHelp( void )
21852179
GetModuleFileName(_AtlBaseModule.GetResourceInstance(),path,_countof(path));
21862180
*PathFindFileName(path)=0;
21872181
wchar_t topic[_MAX_PATH];
2188-
Sprintf(topic,_countof(topic),L"%s%sOpenShell.chm",path,GetDocRelativePath());
2182+
Sprintf(topic,_countof(topic),L"%sOpenShell.chm",path);
21892183
return (GetFileAttributes(topic)!=INVALID_FILE_ATTRIBUTES);
21902184
}
21912185

@@ -2195,7 +2189,7 @@ void ShowHelp( void )
21952189
GetModuleFileName(_AtlBaseModule.GetResourceInstance(),path,_countof(path));
21962190
*PathFindFileName(path)=0;
21972191
wchar_t topic[_MAX_PATH];
2198-
Sprintf(topic,_countof(topic),L"%s%sOpenShell.chm::/%s.html",path,GetDocRelativePath(),PathFindFileName(g_SettingsManager.GetRegPath()));
2192+
Sprintf(topic,_countof(topic),L"%sOpenShell.chm::/%s.html",path,PathFindFileName(g_SettingsManager.GetRegPath()));
21992193
HtmlHelp(GetDesktopWindow(),topic,HH_DISPLAY_TOPIC,NULL);
22002194
}
22012195

Src/Lib/Settings.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,6 @@ void SelectSettingsTab( int tab, bool bAdvanced, const CSetting *pSelect );
136136
void UpdateSettings( void ); // implemented by the user
137137
void UpgradeSettings( bool bShared ); // implemented by the user (called when converting 3.0 settings to 4.0)
138138
void ClosingSettings( HWND hWnd, int flags, int command ); // implemented by the user
139-
const wchar_t *GetDocRelativePath( void ); // implemented by the user
140139
void SettingChangedCallback( const CSetting *pSetting ); // implemented by the user
141140
bool IsSettingsMessage( MSG *msg );
142141
bool ImportSettingsXml( const wchar_t *fname );

Src/Setup/Utility/SaveLogFile.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,6 @@ void UpdateSettings( void )
5353
{
5454
}
5555

56-
const wchar_t *GetDocRelativePath( void )
57-
{
58-
return NULL;
59-
}
60-
6156
///////////////////////////////////////////////////////////////////////////////
6257

6358
static const wchar_t *g_Tabs=L"\t\t\t\t\t\t\t\t\t\t";

Src/StartMenu/StartMenuDLL/dllmain.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,6 @@ static int g_LoadDialogs[]=
4545
0
4646
};
4747

48-
const wchar_t *GetDocRelativePath( void )
49-
{
50-
return DOC_PATH;
51-
}
52-
5348
static HANDLE g_DllInitThread;
5449

5550
static DWORD CALLBACK DllInitThread( void* )

Src/StartMenu/StartMenuDLL/stdafx.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,6 @@
2222
#include <atlstr.h>
2323
#include <atlwin.h>
2424

25-
#ifdef BUILD_SETUP
26-
#define DOC_PATH L""
27-
#else
28-
#define DOC_PATH L"..\\..\\Docs\\Help\\"
29-
#endif
30-
3125
#include "StringUtils.h"
3226
#include "TrackResources.h"
3327
#include "Assert.h"

Src/StartMenu/StartMenuHelper/dllmain.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,6 @@ void SettingChangedCallback( const CSetting *pSetting )
3737
{
3838
}
3939

40-
const wchar_t *GetDocRelativePath( void )
41-
{
42-
return L"";
43-
}
44-
4540
CSetting g_Settings[]={
4641
{L"MenuStyleGroup",CSetting::TYPE_GROUP},
4742
{L"MenuStyle",CSetting::TYPE_INT,0,0,2},

0 commit comments

Comments
 (0)