grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #6921 from paritytech/windows-fixes

Browse Source 
Windows fixes
This commit is contained in:
Kirill Pimenov 2017-11-01 11:06:03 +01:00 committed by GitHub
commit 4b3c26f991
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nsis/installer.nsi
View File

@ -11,8 +11,8 @@
!define VERSIONMAJOR 1 !define VERSIONMAJOR 1
!define VERSIONMINOR 9 !define VERSIONMINOR 9
!define VERSIONBUILD 0 !define VERSIONBUILD 0
!define ARGS "--warp" !define ARGS ""
!define FIRST_START_ARGS "ui --warp --mode=passive" !define FIRST_START_ARGS "--mode=passive ui"
!addplugindir .\ !addplugindir .\

BIN
nsis/logo.ico
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 66 KiB

After

Width:  |  Height:  |  Size: 114 KiB

4
parity/rpc.rs
View File

@ -304,10 +304,14 @@ pub fn new_ipc<D: rpc_apis::Dependencies>(
let handler = setup_apis(conf.apis, dependencies); let handler = setup_apis(conf.apis, dependencies);
let remote = dependencies.remote.clone(); let remote = dependencies.remote.clone();
let path = PathBuf::from(&conf.socket_addr); let path = PathBuf::from(&conf.socket_addr);
// Make sure socket file can be created on unix-like OS.
// Windows pipe paths are not on the FS.
if !cfg!(windows) {
if let Some(dir) = path.parent() { if let Some(dir) = path.parent() {
::std::fs::create_dir_all(&dir) ::std::fs::create_dir_all(&dir)
.map_err(|err| format!("Unable to create IPC directory at {}: {}", dir.display(), err))?; .map_err(|err| format!("Unable to create IPC directory at {}: {}", dir.display(), err))?;
} }
}
match rpc::start_ipc(&conf.socket_addr, handler, remote, rpc::RpcExtractor) { match rpc::start_ipc(&conf.socket_addr, handler, remote, rpc::RpcExtractor) {
Ok(server) => Ok(Some(server)), Ok(server) => Ok(Some(server)),

3
windows/ptray/ptray.cpp
View File

@ -315,8 +315,9 @@ void OpenUI()
STARTUPINFO startupInfo = { sizeof(STARTUPINFO) }; STARTUPINFO startupInfo = { sizeof(STARTUPINFO) };
LPWSTR args = new WCHAR[lstrlen(commandLineFiltered) + MAX_PATH + 2]; LPWSTR args = new WCHAR[lstrlen(commandLineFiltered) + MAX_PATH + 2];
lstrcpy(args, L"parity.exe ui "); lstrcpy(args, L"parity.exe ");
lstrcat(args, commandLineFiltered); lstrcat(args, commandLineFiltered);
lstrcat(args, L" ui");
CreateProcess(path, args, nullptr, nullptr, false, CREATE_NO_WINDOW, nullptr, nullptr, &startupInfo, &procInfo); CreateProcess(path, args, nullptr, nullptr, false, CREATE_NO_WINDOW, nullptr, nullptr, &startupInfo, &procInfo);
} }