diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f2c7aa798..c7f664f27 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -362,7 +362,7 @@ windows: - curl -sL --url "https://github.com/ethcore/win-build/raw/master/SimpleFC.dll" -o nsis\SimpleFC.dll - curl -sL --url "https://github.com/ethcore/win-build/raw/master/vc_redist.x64.exe" -o nsis\vc_redist.x64.exe - signtool sign /f %keyfile% /p %certpass% target\release\parity.exe - - msbuild windows\ptray\ptray.vcxproj /p:Platform=x86 /p:Configuration=Release + - msbuild windows\ptray\ptray.vcxproj /p:Platform=x64 /p:Configuration=Release - signtool sign /f %keyfile% /p %certpass% windows\ptray\release\ptray.exe - cd nsis - makensis.exe installer.nsi diff --git a/appveyor.yml b/appveyor.yml index e04caf233..a82ee49d1 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -38,7 +38,7 @@ after_test: - cargo build --verbose --release - ps: if($env:cert) { Start-FileDownload $env:cert -FileName $env:keyfile } - ps: if($env:cert) { signtool sign /f $env:keyfile /p $env:certpass target\release\parity.exe } - - msbuild windows\ptray\ptray.vcxproj /p:Platform=x86 /p:Configuration=Release + - msbuild windows\ptray\ptray.vcxproj /p:Platform=x64 /p:Configuration=Release - ps: if($env:cert) { signtool sign /f $env:keyfile /p $env:certpass windows\ptray\release\ptray.exe } - makensis.exe nsis\installer.nsi - ps: if($env:cert) { signtool sign /f $env:keyfile /p $env:certpass nsis\installer.exe } diff --git a/nsis/installer.nsi b/nsis/installer.nsi index b6ecfe27c..889c8bc81 100644 --- a/nsis/installer.nsi +++ b/nsis/installer.nsi @@ -85,7 +85,7 @@ section "install" setOutPath $INSTDIR # Files added here should be removed by the uninstaller (see section "uninstall") file /oname=parity.exe ..\target\release\parity.exe - file /oname=ptray.exe ..\windows\ptray\Release\ptray.exe + file /oname=ptray.exe ..\windows\ptray\x64\Release\ptray.exe file "logo.ico" file vc_redist.x64.exe diff --git a/windows/ptray/ptray.cpp b/windows/ptray/ptray.cpp index 071b8704d..81c9b8a16 100644 --- a/windows/ptray/ptray.cpp +++ b/windows/ptray/ptray.cpp @@ -199,7 +199,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) UINT uFlag = MF_BYPOSITION | MF_STRING; GetCursorPos(&lpClickPoint); HMENU hPopMenu = CreatePopupMenu(); - InsertMenu(hPopMenu, 0xFFFFFFFF, MF_BYPOSITION | MF_STRING, IDM_EXIT, _T("Open")); + InsertMenu(hPopMenu, 0xFFFFFFFF, MF_BYPOSITION | MF_STRING, IDM_OPEN, _T("Open")); InsertMenu(hPopMenu, 0xFFFFFFFF, MF_SEPARATOR | MF_BYPOSITION, 0, nullptr); InsertMenu(hPopMenu, 0xFFFFFFFF, MF_BYPOSITION | MF_STRING, IDM_EXIT, _T("Exit")); @@ -275,4 +275,4 @@ void OpenUI() LPWSTR cmd = _T("parity.exe ui"); CreateProcess(path, cmd, nullptr, nullptr, false, CREATE_NO_WINDOW, nullptr, nullptr, &startupInfo, &procInfo); -} \ No newline at end of file +} diff --git a/windows/ptray/ptray.vcxproj b/windows/ptray/ptray.vcxproj index efe1d2e48..2d2fe87a8 100644 --- a/windows/ptray/ptray.vcxproj +++ b/windows/ptray/ptray.vcxproj @@ -124,7 +124,7 @@ Level3 - Use + NotUsing MaxSpeed true true