diff options
| author | Roy Frostig <[email protected]> | 2010-07-25 22:05:39 -0700 |
|---|---|---|
| committer | Roy Frostig <[email protected]> | 2010-07-25 22:05:39 -0700 |
| commit | b9f82d85f91169619064faf159cd33b4d7b3f353 (patch) | |
| tree | 7354fdeb708cbb4ab7a307286b4b89e17c1d6a8b /src | |
| parent | Expose an RNG (the one used by our runtime) to Rust via std. (diff) | |
| download | rust-b9f82d85f91169619064faf159cd33b4d7b3f353.tar.xz rust-b9f82d85f91169619064faf159cd33b4d7b3f353.zip | |
Attempt number 1 at extinguishing the windows tree remotely (apologies to those hacking on Sunday evening PST).
Diffstat (limited to 'src')
| -rw-r--r-- | src/rt/rust_dom.cpp | 19 | ||||
| -rw-r--r-- | src/rt/rust_util.h | 6 |
2 files changed, 3 insertions, 22 deletions
diff --git a/src/rt/rust_dom.cpp b/src/rt/rust_dom.cpp index 205084ff..81751a86 100644 --- a/src/rt/rust_dom.cpp +++ b/src/rt/rust_dom.cpp @@ -154,25 +154,6 @@ rust_dom::free(void *p) { srv->free(p); } -#ifdef __WIN32__ -void -rust_dom::win32_require(LPCTSTR fn, BOOL ok) { - if (!ok) { - LPTSTR buf; - DWORD err = GetLastError(); - FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | - FORMAT_MESSAGE_FROM_SYSTEM | - FORMAT_MESSAGE_IGNORE_INSERTS, - NULL, err, - MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), - (LPTSTR) &buf, 0, NULL ); - log(rust_log::ERR, "%s failed with error %ld: %s", fn, err, buf); - LocalFree((HLOCAL)buf); - I(this, ok); - } -} -#endif - size_t rust_dom::n_live_tasks() { diff --git a/src/rt/rust_util.h b/src/rt/rust_util.h index 95010f17..42082119 100644 --- a/src/rt/rust_util.h +++ b/src/rt/rust_util.h @@ -127,15 +127,15 @@ isaac_init(rust_dom *dom, randctx *rctx) #ifdef __WIN32__ { HCRYPTPROV hProv; - win32_require + dom->win32_require (_T("CryptAcquireContext"), CryptAcquireContext(&hProv, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT|CRYPT_SILENT)); - win32_require + dom->win32_require (_T("CryptGenRandom"), CryptGenRandom(hProv, sizeof(rctx->randrsl), (BYTE*)(&rctx->randrsl))); - win32_require + dom->win32_require (_T("CryptReleaseContext"), CryptReleaseContext(hProv, 0)); } |