summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2015-06-16 12:02:48 +0000
committerGeorge Hazan <george.hazan@gmail.com>2015-06-16 12:02:48 +0000
commit621889cbc7c7ef16a777eb93d9ab7f91c4098f25 (patch)
treef6e25a8fc9b2d2079ac3b9f009c4fbc3589b370b
parentb7827bbbe8cba9a4be8b157b05d4be148ae6ea5d (diff)
fix for the %miranda_path% calculation
git-svn-id: http://svn.miranda-ng.org/main/trunk@14203 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
-rw-r--r--src/mir_app/src/langpack.cpp2
-rw-r--r--src/mir_core/src/path.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/mir_app/src/langpack.cpp b/src/mir_app/src/langpack.cpp
index 9e5e547c50..692dfa7634 100644
--- a/src/mir_app/src/langpack.cpp
+++ b/src/mir_app/src/langpack.cpp
@@ -75,7 +75,7 @@ BOOL EnumLangpacks(ENUM_PACKS_CALLBACK callback, WPARAM wParam, LPARAM lParam)
DWORD v = CallService(MS_SYSTEM_GETVERSION, 0, 0);
pack.szLastModifiedUsing.Format("%d.%d.%d", ((v >> 24) & 0xFF), ((v >> 16) & 0xFF), ((v >> 8) & 0xFF));
/* file date */
- if (GetModuleFileName(g_hInst, pack.tszFullPath, SIZEOF(pack.tszFullPath))) {
+ if (GetModuleFileName(NULL, pack.tszFullPath, SIZEOF(pack.tszFullPath))) {
mir_tstrcpy(pack.tszFileName, _T("default"));
HANDLE hFile = CreateFile(pack.tszFileName, 0, FILE_SHARE_READ, 0, OPEN_EXISTING, 0, 0);
if (hFile != INVALID_HANDLE_VALUE) {
diff --git a/src/mir_core/src/path.cpp b/src/mir_core/src/path.cpp
index 2b61a97928..6e17eaa53a 100644
--- a/src/mir_core/src/path.cpp
+++ b/src/mir_core/src/path.cpp
@@ -197,12 +197,12 @@ MIR_CORE_DLL(int) CreateDirectoryTreeW(const WCHAR *szDir)
int InitPathUtils(void)
{
- GetModuleFileNameA(hInst, szMirandaPath, SIZEOF(szMirandaPath));
+ GetModuleFileNameA(NULL, szMirandaPath, SIZEOF(szMirandaPath));
char *p = strrchr(szMirandaPath, '\\');
if (p)
p[1] = 0;
- GetModuleFileNameW(hInst, szMirandaPathW, SIZEOF(szMirandaPathW));
+ GetModuleFileNameW(NULL, szMirandaPathW, SIZEOF(szMirandaPathW));
WCHAR *tp = wcsrchr(szMirandaPathW, '\\');
if (tp)
tp[1] = 0;