flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Fixed MSVC warnings, improved comments.

Browse Source
This commit is contained in:
Mattes D 2015-04-06 22:01:25 +02:00
parent 6952f2295a
commit 4836d07bfa
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main.cpp
View File

@ -316,10 +316,10 @@ void WINAPI serviceMain(DWORD argc, TCHAR *argv[])
char applicationFilename[MAX_PATH]; char applicationFilename[MAX_PATH];
char applicationDirectory[MAX_PATH]; char applicationDirectory[MAX_PATH];
GetModuleFileName(NULL, applicationFilename, MAX_PATH); // This binaries fill path. GetModuleFileName(NULL, applicationFilename, sizeof(applicationFilename)); // This binary's file path.
// GetModuleFileName() returns the path and filename. Strip off the filename. // Strip off the filename, keep only the path:
strncpy(applicationDirectory, applicationFilename, (strrchr(applicationFilename, '\\') - applicationFilename)); strncpy_s(applicationDirectory, sizeof(applicationDirectory), applicationFilename, (strrchr(applicationFilename, '\\') - applicationFilename));
applicationDirectory[strlen(applicationDirectory)] = '\0'; // Make sure new path is null terminated applicationDirectory[strlen(applicationDirectory)] = '\0'; // Make sure new path is null terminated
// Services are run by the SCM, and inherit its working directory - usually System32. // Services are run by the SCM, and inherit its working directory - usually System32.
@ -330,7 +330,7 @@ void WINAPI serviceMain(DWORD argc, TCHAR *argv[])
if (g_StatusHandle == NULL) if (g_StatusHandle == NULL)
{ {
OutputDebugString("RegisterServiceCtrlHandler() failed\n"); OutputDebugStringA("RegisterServiceCtrlHandler() failed\n");
serviceSetState(0, SERVICE_STOPPED, GetLastError()); serviceSetState(0, SERVICE_STOPPED, GetLastError());
return; return;
} }
@ -340,7 +340,7 @@ void WINAPI serviceMain(DWORD argc, TCHAR *argv[])
g_ServiceThread = CreateThread(NULL, 0, serviceWorkerThread, NULL, 0, NULL); g_ServiceThread = CreateThread(NULL, 0, serviceWorkerThread, NULL, 0, NULL);
if (g_ServiceThread == NULL) if (g_ServiceThread == NULL)
{ {
OutputDebugString("CreateThread() failed\n"); OutputDebugStringA("CreateThread() failed\n");
serviceSetState(0, SERVICE_STOPPED, GetLastError()); serviceSetState(0, SERVICE_STOPPED, GetLastError());
return; return;
} }