aargonian/raw-gl-context
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

generate a unique WNDCLASS name and unregister it when done

Browse Source
This commit is contained in:
glowcoil
2022-01-24 07:53:31 -06:00
parent 01f6251e76
commit 598c4776a9
2 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Cargo.toml
View File

@@ -12,7 +12,8 @@ license = "MIT/Apache-2.0"
raw-window-handle = "0.3.3"
[target.'cfg(target_os="windows")'.dependencies]
winapi = { version = "0.3.8", features = ["libloaderapi", "minwindef", "windef", "wingdi", "winnt", "winuser"] }
winapi = { version = "0.3.8", features = ["libloaderapi", "minwindef", "ntdef", "windef", "wingdi", "winnt", "winuser"] }
uuid = { version = "0.8", features = ["v4"] }
[target.'cfg(target_os="linux")'.dependencies]
x11 = { version = "2.3", features = ["xlib", "glx"] }

24
src/win.rs
View File

@@ -3,7 +3,8 @@ use std::os::windows::ffi::OsStrExt;
use raw_window_handle::{HasRawWindowHandle, RawWindowHandle};
use winapi::shared::minwindef::{HMODULE, HINSTANCE};
use winapi::shared::minwindef::{HINSTANCE, HMODULE};
use winapi::shared::ntdef::WCHAR;
use winapi::shared::windef::{HDC, HGLRC, HWND};
use winapi::um::libloaderapi::{FreeLibrary, GetProcAddress, LoadLibraryA};
use winapi::um::wingdi::{
@@ -13,8 +14,8 @@ use winapi::um::wingdi::{
};
use winapi::um::winnt::IMAGE_DOS_HEADER;
use winapi::um::winuser::{
CreateWindowExW, DefWindowProcW, DestroyWindow, GetDC, RegisterClassW, ReleaseDC, CS_OWNDC,
CW_USEDEFAULT, WNDCLASSW,
CreateWindowExW, DefWindowProcW, DestroyWindow, GetDC, RegisterClassW, ReleaseDC,
UnregisterClassW, CS_OWNDC, CW_USEDEFAULT, WNDCLASSW,
};
use crate::{GlConfig, GlError, Profile};
@@ -92,8 +93,9 @@ impl GlContext {
unsafe {
// Create temporary window and context to load function pointers
let mut class_name: Vec<u16> =
OsStr::new("raw-gl-context-window").encode_wide().collect();
let class_name_str =
format!("raw-gl-context-window-{}", uuid::Uuid::new_v4().to_simple());
let mut class_name: Vec<WCHAR> = OsStr::new(&class_name_str).encode_wide().collect();
class_name.push(0);
let hinstance = &__ImageBase as *const IMAGE_DOS_HEADER as HINSTANCE;
@@ -106,13 +108,15 @@ impl GlContext {
..std::mem::zeroed()
};
// Ignore errors, since class might be registered multiple times
RegisterClassW(&wnd_class);
let class = RegisterClassW(&wnd_class);
if class == 0 {
return Err(GlError::CreationFailed);
}
let hwnd_tmp = CreateWindowExW(
0,
class_name.as_ptr(),
class_name.as_ptr(),
class as *const WCHAR,
[0].as_ptr(),
0,
CW_USEDEFAULT,
CW_USEDEFAULT,
@@ -148,6 +152,7 @@ impl GlContext {
let hglrc_tmp = wglCreateContext(hdc_tmp);
if hglrc_tmp.is_null() {
ReleaseDC(hwnd_tmp, hdc_tmp);
UnregisterClassW(class as *const WCHAR, hinstance);
DestroyWindow(hwnd_tmp);
return Err(GlError::CreationFailed);
}
@@ -189,6 +194,7 @@ impl GlContext {
wglMakeCurrent(hdc_tmp, std::ptr::null_mut());
ReleaseDC(hwnd_tmp, hdc_tmp);
UnregisterClassW(class as *const WCHAR, hinstance);
DestroyWindow(hwnd_tmp);
// Create actual context