Author: markt
Date: Fri Nov 3 14:25:31 2017
New Revision: 1814191
URL: http://svn.apache.org/viewvc?rev=1814191&view=rev
Log:
Fix ANSI/Unicode warnings
Modified:
commons/proper/daemon/trunk/src/native/windows/apps/prunmgr/prunmgr.c
Modified: commons/proper/daemon/trunk/src/native/windows/apps/prunmgr/prunmgr.c
URL:
http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/windows/apps/prunmgr/prunmgr.c?rev=1814191&r1=1814190&r2=1814191&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/windows/apps/prunmgr/prunmgr.c
(original)
+++ commons/proper/daemon/trunk/src/native/windows/apps/prunmgr/prunmgr.c Fri
Nov 3 14:25:31 2017
@@ -1519,7 +1519,7 @@ LRESULT CALLBACK MainWndProc(HWND hWnd,
isRunning ? hIcoRun : hIcoStop);
}
else {
- apxManageTryIconA(hWnd, NIM_ADD, NULL,
+ apxManageTryIconW(hWnd, NIM_ADD, NULL,
apxLoadResourceW(IDS_APPLICATION, 0),
NULL);
}
@@ -1673,7 +1673,7 @@ int WINAPI WinMain(HINSTANCE hInstance,
/* Skip sytem error message */
SetLastError(ERROR_SUCCESS);
apxDisplayError(TRUE, NULL, 0,
- apxLoadResourceW(IDS_ERRORCMD, 0),
+ apxLoadResourceA(IDS_ERRORCMD, 0),
lpCmdLine);
goto cleanup;
}
@@ -1742,7 +1742,7 @@ int WINAPI WinMain(HINSTANCE hInstance,
/* Skip sytem error message */
SetLastError(ERROR_SUCCESS);
if (!quiet)
- apxDisplayError(TRUE, NULL, 0,
apxLoadResourceW(IDS_ALREAY_RUNING, 0),
+ apxDisplayError(TRUE, NULL, 0,
apxLoadResourceA(IDS_ALREAY_RUNING, 0),
lpCmdline->szApplication);
}
goto cleanup;
@@ -1759,7 +1759,7 @@ int WINAPI WinMain(HINSTANCE hInstance,
if (IS_INVALID_HANDLE(hRegserv)) {
if (!quiet)
- apxDisplayError(TRUE, NULL, 0, apxLoadResourceW(IDS_ERRSREG, 0));
+ apxDisplayError(TRUE, NULL, 0, apxLoadResourceA(IDS_ERRSREG, 0));
return FALSE;
}
isManagerRunning = TRUE;