From 427891e0d28becb428ae8435954399f2e4daa9fe Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 1 Mar 2013 22:52:26 +0000 Subject: service call replaced with helper: MS_UTILS_PATHTOABSOLUTEW git-svn-id: http://svn.miranda-ng.org/main/trunk@3827 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- src/modules/database/database.cpp | 4 ++-- src/modules/database/dbini.cpp | 6 +++--- src/modules/icolib/skin2icons.cpp | 8 ++++---- src/modules/icolib/skin2opts.cpp | 2 +- src/modules/netlib/netliblog.cpp | 4 ++-- src/modules/plugins/newplugins.cpp | 2 +- src/modules/skin/sounds.cpp | 8 ++++---- src/modules/utils/bmpfilter.cpp | 2 +- src/modules/utils/path.cpp | 2 +- 9 files changed, 19 insertions(+), 19 deletions(-) (limited to 'src/modules') diff --git a/src/modules/database/database.cpp b/src/modules/database/database.cpp index adea9e0caa..f9718181cf 100644 --- a/src/modules/database/database.cpp +++ b/src/modules/database/database.cpp @@ -71,7 +71,7 @@ int getProfilePath(TCHAR *buf, size_t cch) if (profiledir[0] == 0) _tcscpy(profiledir, _T("%miranda_path%\\Profiles")); - size_t len = PathToAbsoluteT( VARST(profiledir), buf, NULL); + size_t len = PathToAbsoluteT( VARST(profiledir), buf); if (buf[len-1] == '/' || buf[len-1] == '\\') buf[len-1] = 0; @@ -427,7 +427,7 @@ static int FindMirandaForProfile(TCHAR *szProfile) int LoadDatabaseModule(void) { TCHAR szProfile[MAX_PATH]; - PathToAbsoluteT(_T("."), szProfile, NULL); + PathToAbsoluteT(_T("."), szProfile); _tchdir(szProfile); szProfile[0] = 0; diff --git a/src/modules/database/dbini.cpp b/src/modules/database/dbini.cpp index 0445da160e..442bd35567 100644 --- a/src/modules/database/dbini.cpp +++ b/src/modules/database/dbini.cpp @@ -415,11 +415,11 @@ static void DoAutoExec(void) GetPrivateProfileString(_T("AutoExec"), _T("Glob"), _T("autoexec_*.ini"), szFindPath, SIZEOF(szFindPath), mirandabootini); if (g_bDbCreated && szOnCreateFilename[0]) { - PathToAbsoluteT( VARST(szOnCreateFilename), szIniPath, NULL); + PathToAbsoluteT( VARST(szOnCreateFilename), szIniPath); ProcessIniFile(szIniPath, szSafeSections, szUnsafeSections, 0, 1); } - PathToAbsoluteT( VARST(szFindPath), szFindPath, NULL); + PathToAbsoluteT( VARST(szFindPath), szFindPath); WIN32_FIND_DATA fd; HANDLE hFind = FindFirstFile(szFindPath, &fd); @@ -494,7 +494,7 @@ int InitIni(void) DoAutoExec(); TCHAR szMirandaDir[MAX_PATH]; - PathToAbsoluteT(_T("."), szMirandaDir, NULL); + PathToAbsoluteT(_T("."), szMirandaDir); hIniChangeNotification = FindFirstChangeNotification(szMirandaDir, 0, FILE_NOTIFY_CHANGE_FILE_NAME); if (hIniChangeNotification != INVALID_HANDLE_VALUE) { CreateServiceFunction("DB/Ini/CheckImportNow", CheckIniImportNow); diff --git a/src/modules/icolib/skin2icons.cpp b/src/modules/icolib/skin2icons.cpp index 9570709115..51b443197d 100644 --- a/src/modules/icolib/skin2icons.cpp +++ b/src/modules/icolib/skin2icons.cpp @@ -118,7 +118,7 @@ IconSourceFile* IconSourceFile_Get(const TCHAR* file, bool isPath) return NULL; if (isPath) - PathToAbsoluteT(file, fileFull, NULL); + PathToAbsoluteT(file, fileFull); /// TODO: convert path to long - eliminate duplicate items else _tcscpy(fileFull, file); @@ -539,9 +539,9 @@ HANDLE IcoLib_AddNewIcon(int hLangpack, SKINICONDESC* sid) if (sid->pszDefaultFile) { WCHAR fileFull[ MAX_PATH ]; if (utf_path) - PathToAbsoluteT(sid->pwszDefaultFile, fileFull, NULL); + PathToAbsoluteT(sid->pwszDefaultFile, fileFull); else - PathToAbsoluteT( StrConvT(sid->pszDefaultFile), fileFull, NULL); + PathToAbsoluteT( StrConvT(sid->pszDefaultFile), fileFull); item->default_file = mir_wstrdup(fileFull); } item->default_indx = sid->iDefaultIndex; @@ -681,7 +681,7 @@ HICON IconItem_GetIcon(IcolibItem* item, bool big) if ( !source && !DBGetContactSettingTString(NULL, "SkinIcons", item->name, &dbv)) { TCHAR tszFullPath[MAX_PATH]; - PathToAbsoluteT(dbv.ptszVal, tszFullPath, NULL); + PathToAbsoluteT(dbv.ptszVal, tszFullPath); int cx = item->cx ? item->cx : GetSystemMetrics(big ? SM_CXICON : SM_CXSMICON); int cy = item->cy ? item->cy : GetSystemMetrics(big ? SM_CYICON : SM_CYSMICON); source = GetIconSourceItemFromPath(tszFullPath, cx, cy); diff --git a/src/modules/icolib/skin2opts.cpp b/src/modules/icolib/skin2opts.cpp index bea305bf78..107149f087 100644 --- a/src/modules/icolib/skin2opts.cpp +++ b/src/modules/icolib/skin2opts.cpp @@ -56,7 +56,7 @@ static HICON ExtractIconFromPath(const TCHAR *path, int cxIcon, int cyIcon) n = _ttoi(comma+1); *comma = 0; } - PathToAbsoluteT(file, fileFull, NULL); + PathToAbsoluteT(file, fileFull); hIcon = NULL; //SHOULD BE REPLACED WITH GOOD ENOUGH FUNCTION diff --git a/src/modules/netlib/netliblog.cpp b/src/modules/netlib/netliblog.cpp index 81ae80c604..76331b51e3 100644 --- a/src/modules/netlib/netliblog.cpp +++ b/src/modules/netlib/netliblog.cpp @@ -145,7 +145,7 @@ static INT_PTR CALLBACK LogOptionsDlgProc(HWND hwndDlg, UINT message, WPARAM wPa TCHAR path[MAX_PATH]; GetWindowText((HWND)lParam, path, MAX_PATH); - PathToAbsoluteT( VARST(path), path, NULL); + PathToAbsoluteT( VARST(path), path); SetDlgItemText(hwndDlg, IDC_PATH, path); } break; @@ -567,7 +567,7 @@ void NetlibLogInit(void) logOptions.szUserFile = mir_tstrdup(dbv.ptszVal); TCHAR path[MAX_PATH]; - PathToAbsoluteT( VARST(dbv.ptszVal), path, NULL); + PathToAbsoluteT( VARST(dbv.ptszVal), path); logOptions.szFile = mir_tstrdup(path); db_free(&dbv); diff --git a/src/modules/plugins/newplugins.cpp b/src/modules/plugins/newplugins.cpp index 94c04b23e2..b3c46d4482 100644 --- a/src/modules/plugins/newplugins.cpp +++ b/src/modules/plugins/newplugins.cpp @@ -836,7 +836,7 @@ int LoadNewPluginsModuleInfos(void) mirandaVersion = (DWORD)CallService(MS_SYSTEM_GETVERSION, 0, 0); // remember where the mirandaboot.ini goes - PathToAbsoluteT(_T("mirandaboot.ini"), mirandabootini, NULL); + PathToAbsoluteT(_T("mirandaboot.ini"), mirandabootini); // look for all *.dll's enumPlugins(scanPluginsDir, 0, 0); return 0; diff --git a/src/modules/skin/sounds.cpp b/src/modules/skin/sounds.cpp index 19a469a13e..8133a7e5ef 100644 --- a/src/modules/skin/sounds.cpp +++ b/src/modules/skin/sounds.cpp @@ -127,7 +127,7 @@ static INT_PTR ServiceSkinPlaySound(WPARAM, LPARAM lParam) DBVARIANT dbv; if ( DBGetContactSettingTString(NULL, "SkinSounds", pszSoundName, &dbv) == 0) { TCHAR szFull[MAX_PATH]; - PathToAbsoluteT(dbv.ptszVal, szFull, NULL); + PathToAbsoluteT(dbv.ptszVal, szFull); NotifyEventHooks(hPlayEvent, 0, (LPARAM)szFull); db_free(&dbv); } @@ -251,7 +251,7 @@ INT_PTR CALLBACK DlgProcSoundOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM DBVARIANT dbv; if ( !DBGetContactSettingTString(NULL, "SkinSounds", arSounds[tvi.lParam].name, &dbv)) { TCHAR szPathFull[MAX_PATH]; - PathToAbsoluteT(dbv.ptszVal, szPathFull, NULL); + PathToAbsoluteT(dbv.ptszVal, szPathFull); NotifyEventHooks(hPlayEvent, 1, (LPARAM)szPathFull); db_free(&dbv); } @@ -281,12 +281,12 @@ INT_PTR CALLBACK DlgProcSoundOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM if (db_get_b(NULL, "SkinSoundsOff", snd.name, 0) == 0) { DBVARIANT dbv; if (DBGetContactSettingTString(NULL, "SkinSounds", snd.name, &dbv) == 0) { - PathToAbsoluteT(dbv.ptszVal, strdir, NULL); + PathToAbsoluteT(dbv.ptszVal, strdir); db_free(&dbv); } } } mir_sntprintf(strFull, SIZEOF(strFull), _T("%s"), snd.ptszTempFile ? snd.ptszTempFile : _T("")); - PathToAbsoluteT(strFull, strdir, NULL); + PathToAbsoluteT(strFull, strdir); OPENFILENAME ofn; ZeroMemory(&ofn, sizeof(ofn)); diff --git a/src/modules/utils/bmpfilter.cpp b/src/modules/utils/bmpfilter.cpp index 2f111f8ae6..411c822e33 100644 --- a/src/modules/utils/bmpfilter.cpp +++ b/src/modules/utils/bmpfilter.cpp @@ -37,7 +37,7 @@ static INT_PTR sttBitmapLoader(const TCHAR* ptszFileName) short picType; TCHAR szFilename[MAX_PATH]; - if ( !PathToAbsoluteT(ptszFileName, szFilename, NULL)) + if ( !PathToAbsoluteT(ptszFileName, szFilename)) mir_sntprintf(szFilename, SIZEOF(szFilename), _T("%s"), ptszFileName); int filenameLen = lstrlen(szFilename); diff --git a/src/modules/utils/path.cpp b/src/modules/utils/path.cpp index 0e9f38eb42..75fad634e8 100644 --- a/src/modules/utils/path.cpp +++ b/src/modules/utils/path.cpp @@ -35,7 +35,7 @@ static INT_PTR pathToRelative(WPARAM wParam, LPARAM lParam) static INT_PTR pathToAbsolute(WPARAM wParam, LPARAM lParam) { - return PathToAbsolute((char*)wParam, (char*)lParam, NULL); + return PathToAbsolute((char*)wParam, (char*)lParam); } static INT_PTR createDirTree(WPARAM, LPARAM lParam) -- cgit v1.2.3