diff options
Diffstat (limited to 'splashscreen/src/services.cpp')
| -rw-r--r-- | splashscreen/src/services.cpp | 97 |
1 files changed, 42 insertions, 55 deletions
diff --git a/splashscreen/src/services.cpp b/splashscreen/src/services.cpp index 8db2cc8..7d4730c 100644 --- a/splashscreen/src/services.cpp +++ b/splashscreen/src/services.cpp @@ -18,70 +18,57 @@ File name : $URL: http://svn.miranda.im/mainrepo/splashscreen/trunk/src/services.cpp $
Revision : $Rev: 951 $
- Last change on : $Date: 2007-10-16 16:46:53 +0200 (Вт, 16 окт 2007) $
+ Last change on : $Date: 2007-10-16 18:46:53 +0400 (Вт, 16 окт 2007) $
Last change by : $Author: Thief $
*/
#include "headers.h"
-extern bool bserviceinvoked;
-extern char szSplashFile[MAX_PATH], szMirDir[MAX_PATH];
-extern bool ShowSplash(bool bpreview);
-
-int ShowSplashService(WPARAM wparam,LPARAM lparam)
+INT_PTR ShowSplashService(WPARAM wparam,LPARAM lparam)
{
- bserviceinvoked = true;
- char szOldfn [256];
- char* pos;
- char* filename = (char*) wparam;
- int timetoshow = (int) lparam;
-
- lstrcpy(szOldfn, szSplashFile);
- options.showtime = timetoshow;
-
- ZeroMemory(&szSplashFile,sizeof(szSplashFile));
- pos = strrchr(filename, ':');
- if (pos == NULL)
- {
- lstrcpy(szSplashFile, szMirDir);
- lstrcat(szSplashFile, filename);
- }
- else
- {
- lstrcpy(szSplashFile, filename);
- }
-
- ShowSplash(false);
-
- //ZeroMemory(&szSplashFile,sizeof(szSplashFile));
- lstrcpy(szSplashFile, szOldfn);
-
- return 0;
+ bserviceinvoked = true;
+ TCHAR szOldfn [256];
+ TCHAR* pos;
+ TCHAR* filename = (TCHAR*) wparam;
+ int timetoshow = (int) lparam;
+
+ lstrcpy(szOldfn, szSplashFile);
+ options.showtime = timetoshow;
+
+ pos = _tcsrchr(filename, _T(':'));
+ if (pos == NULL)
+ mir_sntprintf(szSplashFile, SIZEOF(szSplashFile), _T("%s\\%s"), szMirDir, filename);
+ else
+ lstrcpy(szSplashFile, filename);
+
+ ShowSplash(false);
+
+ lstrcpy(szSplashFile, szOldfn);
+
+ return 0;
}
#ifdef _DEBUG
-int TestService(WPARAM wParam,LPARAM lParam)
+INT_PTR TestService(WPARAM wParam,LPARAM lParam)
{
- static char szTempPath[MAX_PATH];
-
- OPENFILENAMEA ofn={0};
- ofn.lStructSize = OPENFILENAME_SIZE_VERSION_400;
- ofn.lpstrFilter = "PNG and BMP files\0*.png;*.bmp\0\0";
- ofn.hwndOwner=0;
- ofn.lpstrFile = szTempPath;
- ofn.nMaxFile = MAX_PATH;
- ofn.nMaxFileTitle = MAX_PATH;
- ofn.Flags = OFN_HIDEREADONLY;
- ofn.lpstrInitialDir = szMirDir;
- *szTempPath = '\0';
- ofn.lpstrDefExt = "";
-
- if (GetOpenFileNameA(&ofn))
- {
- CallService(MS_SHOWSPLASH,(WPARAM)szTempPath,(LPARAM)0);
- }
-
- return 0;
+ TCHAR szTempPath[MAX_PATH];
+
+ OPENFILENAME ofn={0};
+ ofn.lStructSize = OPENFILENAME_SIZE_VERSION_400;
+ ofn.lpstrFilter = _T("PNG and BMP files\0*.png;*.bmp\0\0");
+ ofn.hwndOwner=0;
+ ofn.lpstrFile = szTempPath;
+ ofn.nMaxFile = MAX_PATH;
+ ofn.nMaxFileTitle = MAX_PATH;
+ ofn.Flags = OFN_HIDEREADONLY;
+ ofn.lpstrInitialDir = szSplashFile;
+ *szTempPath = '\0';
+ ofn.lpstrDefExt = _T("");
+
+ if (GetOpenFileName(&ofn))
+ CallService(MS_SHOWSPLASH,(WPARAM)szTempPath,(LPARAM)0);
+
+ return 0;
}
-#endif
+#endif
\ No newline at end of file |