Skip to content

Window creation lock-up fix #119

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DominikWitczakAMD merged 1 commit into from
Nov 5, 2018
Merged

Window creation lock-up fix #119

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 5 additions & 18 deletions src/misc/window_win3264.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,12 +88,10 @@ Anvil::WindowUniquePtr Anvil::WindowWin3264::create(const std::string&
/** Please see header for specification */
Anvil::WindowUniquePtr Anvil::WindowWin3264::create(HWND in_window_handle)
{
WindowUniquePtr result_ptr(nullptr,
std::default_delete<Window>() );
RECT window_rect;
uint32_t window_size[2] = {0};
std::vector<char> window_title;
uint32_t window_title_length = 0;
WindowUniquePtr result_ptr(nullptr,
std::default_delete<Window>() );
RECT window_rect;
uint32_t window_size[2] = {0};

/* The window has already been spawned by the user. Gather all the info we need in order to instantiate
* the wrapper instance.
Expand All @@ -116,21 +114,10 @@ Anvil::WindowUniquePtr Anvil::WindowWin3264::create(HWND in_window_handle)
window_size[0] = static_cast<uint32_t>(window_rect.right - window_rect.left);
window_size[1] = static_cast<uint32_t>(window_rect.bottom - window_rect.top);

window_title_length = static_cast<uint32_t>(::GetWindowTextLength(in_window_handle) );

if (window_title_length != 0)
{
window_title.resize(window_title_length);

::GetWindowText(in_window_handle,
static_cast<LPSTR>(&window_title.at(0) ),
static_cast<int> (window_title_length) );
}

/* Go ahead and create the window wrapper instance */
result_ptr.reset(
new Anvil::WindowWin3264(in_window_handle,
std::string(&window_title.at(0) ),
"HWND wrapper window instance",
window_size[0],
window_size[1],
nullptr) /* present_callback_func_ptr */
Expand Down