Amebis/MSICA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Distinct - more descriptive - error message added, when WlanOpenHandle() returns ERROR_SERVICE_NOT_ACTIVE.

Browse Source 
Version set to 1.0-pre4.
This commit is contained in:
Simon Rozman 2015-04-01 06:21:52 +00:00
parent 21fa6cdbcb
commit b588b89fdd
5 changed files with 47 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MSICA/MSICA.cpp
View File

@ -505,6 +505,10 @@ UINT MSICA_API MSICAInitialize(MSIHANDLE hInstall)
::WlanFreeMemory(pInterfaceList);
}
::WlanCloseHandle(hClientHandle, NULL);
} else if (dwError == ERROR_SERVICE_NOT_ACTIVE) {
uiResult = ERROR_INSTALL_WLAN_SVC_NOT_STARTED;
::MsiRecordSetInteger(hRecordProg, 1, uiResult);
::MsiProcessMessage(hInstall, INSTALLMESSAGE_ERROR, hRecordProg);
} else {
uiResult = ERROR_INSTALL_WLAN_HANDLE_OPEN;
::MsiRecordSetInteger(hRecordProg, 1, uiResult);

59
MSICALib/L10N/sl_SI.po
View File

@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: MSICALib\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-02-24 09:28+0100\n"
"POT-Creation-Date: 2015-04-01 08:17+0100\n"
"PO-Revision-Date: \n"
"Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n"
"Language-Team: Amebis, d. o. o., Kamnik <simon.rozman@amebis.si>\n"
@ -13,7 +13,7 @@ msgstr ""
"X-Poedit-SourceCharset: UTF-8\n"
"X-Poedit-KeywordsList: __\n"
"X-Poedit-Basepath: ..\n"
"X-Generator: Poedit 1.7.4\n"
"X-Generator: Poedit 1.7.5\n"
"X-Poedit-SearchPath-0: MSIBuild\n"
# Windows charset for this language (decimal)
@ -31,13 +31,13 @@ msgstr ""
"Pri pripravi seznama opravil je prišlo do napake [2]. Obrnite se na svojo "
"tehnično službo."
#: MSIBuild/En.Win32.Debug.Error-2.idtx:20
#: MSIBuild/En.Win32.Release.Error-2.idtx:20
#: MSIBuild/En.x64.Debug.Error-2.idtx:20
#: MSIBuild/En.x64.Release.Error-2.idtx:20
#: MSIBuild/En.Win32.Debug.Error-2.idtx:21
#: MSIBuild/En.Win32.Release.Error-2.idtx:21
#: MSIBuild/En.x64.Debug.Error-2.idtx:21
#: MSIBuild/En.x64.Release.Error-2.idtx:21
msgid "Error [2] opening WLAN handle. Please, contact your support personnel."
msgstr ""
"Pri odpiranju ročica WLAN je prišlo do napake [2]. Obrnite se na svojo "
"Pri odpiranju ročice WLAN je prišlo do napake [2]. Obrnite se na svojo "
"tehnično službo."
#: MSIBuild/En.Win32.Debug.Error-2.idtx:17
@ -175,10 +175,10 @@ msgstr ""
"Pri kopiranju razporejenega opravila »[2]« v »[3]« je prišlo do napake [4]. "
"Obrnite se na svojo tehnično službo."
#: MSIBuild/En.Win32.Debug.Error-2.idtx:22
#: MSIBuild/En.Win32.Release.Error-2.idtx:22
#: MSIBuild/En.x64.Debug.Error-2.idtx:22
#: MSIBuild/En.x64.Release.Error-2.idtx:22
#: MSIBuild/En.Win32.Debug.Error-2.idtx:23
#: MSIBuild/En.Win32.Release.Error-2.idtx:23
#: MSIBuild/En.x64.Debug.Error-2.idtx:23
#: MSIBuild/En.x64.Release.Error-2.idtx:23
msgid ""
"Error [4] deleting profile \"[3]\" on WLAN interface [2]. Please, contact "
"your support personnel."
@ -197,10 +197,10 @@ msgstr ""
"Pri premikanju datoteke »[2]« v »[3]« je prišlo do napake [4]. Obrnite se na "
"svojo tehnično službo."
#: MSIBuild/En.Win32.Debug.Error-2.idtx:23
#: MSIBuild/En.Win32.Release.Error-2.idtx:23
#: MSIBuild/En.x64.Debug.Error-2.idtx:23
#: MSIBuild/En.x64.Release.Error-2.idtx:23
#: MSIBuild/En.Win32.Debug.Error-2.idtx:24
#: MSIBuild/En.Win32.Release.Error-2.idtx:24
#: MSIBuild/En.x64.Debug.Error-2.idtx:24
#: MSIBuild/En.x64.Release.Error-2.idtx:24
msgid ""
"Error [5] renaming profile \"[3]\" to \"[4]\" on WLAN interface [2]. Please, "
"contact your support personnel."
@ -208,10 +208,10 @@ msgstr ""
"Pri preimenovanju profila »[3]« v »[4]« na vmesniku WLAN [2] je prišlo do "
"napake [5]. Obrnite se na svojo tehnično službo."
#: MSIBuild/En.Win32.Debug.Error-2.idtx:24
#: MSIBuild/En.Win32.Release.Error-2.idtx:24
#: MSIBuild/En.x64.Debug.Error-2.idtx:24
#: MSIBuild/En.x64.Release.Error-2.idtx:24
#: MSIBuild/En.Win32.Debug.Error-2.idtx:25
#: MSIBuild/En.Win32.Release.Error-2.idtx:25
#: MSIBuild/En.x64.Debug.Error-2.idtx:25
#: MSIBuild/En.x64.Release.Error-2.idtx:25
msgid ""
"Error [5] setting profile \"[3]\" on WLAN interface [2] (WLAN reason is "
"[4]). Please, contact your support personnel."
@ -228,10 +228,23 @@ msgstr ""
"Pri odpiranju namestitvenega paketa je prišlo do napake. Obrnite se na svojo "
"tehnično službo."
#: MSIBuild/En.Win32.Debug.Error-2.idtx:21
#: MSIBuild/En.Win32.Release.Error-2.idtx:21
#: MSIBuild/En.x64.Debug.Error-2.idtx:21
#: MSIBuild/En.x64.Release.Error-2.idtx:21
#: MSIBuild/En.Win32.Debug.Error-2.idtx:20
#: MSIBuild/En.Win32.Release.Error-2.idtx:20
#: MSIBuild/En.x64.Debug.Error-2.idtx:20
#: MSIBuild/En.x64.Release.Error-2.idtx:20
msgid ""
"Error opening WLAN handle, because WLAN AutoConfig service is not started. "
"Please, enable and start WLAN AutoConfig service, or contact your support "
"personnel."
msgstr ""
"Pri odpiranju ročice WLAN je prišlo do napake, ker storitev WLAN AutoConfig "
"ni zagnana. Omogočite in zaženite storitev WLAN AutoConfig, ali se obrnite "
"na svojo tehnično službo."
#: MSIBuild/En.Win32.Debug.Error-2.idtx:22
#: MSIBuild/En.Win32.Release.Error-2.idtx:22
#: MSIBuild/En.x64.Debug.Error-2.idtx:22
#: MSIBuild/En.x64.Release.Error-2.idtx:22
msgid ""
"WLAN profile \"[2]\" XML data is not UTF-16 encoded. Please, contact your "
"support personnel."

1
MSICALib/MSIBuild/Makefile
View File

@ -59,6 +59,7 @@ i2 L0
2571 Error [3] changing service "[2]" start type. Please, contact your support personnel.
2572 Error [3] starting service "[2]". Please, contact your support personnel.
2573 Error [3] stopping service "[2]". Please, contact your support personnel.
2579 Error opening WLAN handle, because WLAN AutoConfig service is not started. Please, enable and start WLAN AutoConfig service, or contact your support personnel.
2577 Error [2] opening WLAN handle. Please, contact your support personnel.
2578 WLAN profile "[2]" XML data is not UTF-16 encoded. Please, contact your support personnel.
2574 Error [4] deleting profile "[3]" on WLAN interface [2]. Please, contact your support personnel.

3
MSICALib/MSICALib.h
View File

@ -31,7 +31,7 @@
////////////////////////////////////////////////////////////////////
// Error codes (next unused 2579L)
// Error codes (next unused 2580L)
////////////////////////////////////////////////////////////////////
#define ERROR_INSTALL_DATABASE_OPEN 2550L
@ -58,6 +58,7 @@
#define ERROR_INSTALL_SVC_SET_START 2571L
#define ERROR_INSTALL_SVC_START 2572L
#define ERROR_INSTALL_SVC_STOP 2573L
#define ERROR_INSTALL_WLAN_SVC_NOT_STARTED 2579L
#define ERROR_INSTALL_WLAN_HANDLE_OPEN 2577L
#define ERROR_INSTALL_WLAN_PROFILE_NOT_UTF16 2578L
#define ERROR_INSTALL_WLAN_PROFILE_DELETE 2574L

8
include/version.h
View File

@ -17,12 +17,12 @@
along with MSICA. If not, see <http://www.gnu.org/licenses/>.
*/
#define MSICA_VERSION 0x00ff0300
#define MSICA_VERSION 0x00ff0400
#define MSICA_VERSION_MAJ 0
#define MSICA_VERSION_MIN 255
#define MSICA_VERSION_REV 3
#define MSICA_VERSION_REV 4
#define MSICA_VERSION_BUILD 0
#define MSICA_VERSION_STR "1.0-pre3"
#define MSICA_BUILD_YEAR_STR "2014"
#define MSICA_VERSION_STR "1.0-pre4"
#define MSICA_BUILD_YEAR_STR "2015"