b/minifb-zig-port
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix bug redefining window_data_win. Thanks to @nsmryan

Browse Source
This commit is contained in:
Carlos Aragonés 2021-01-14 19:48:31 +01:00
parent 33f5084410
commit 17df5633cd
1 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/windows/WinMiniFB.c
View File

@ -83,7 +83,7 @@ dpi_aware() {
} }
//-- //--
void void
get_monitor_dpi(HWND hWnd, float *dpi_x, float *dpi_y) { get_monitor_dpi(HWND hWnd, float *dpi_x, float *dpi_y) {
UINT x, y; UINT x, y;
@ -139,7 +139,7 @@ uint32_t translate_mod();
mfb_key translate_key(unsigned int wParam, unsigned long lParam); mfb_key translate_key(unsigned int wParam, unsigned long lParam);
void destroy_window_data(SWindowData *window_data); void destroy_window_data(SWindowData *window_data);
LRESULT CALLBACK LRESULT CALLBACK
WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) {
LRESULT res = 0; LRESULT res = 0;
@ -155,7 +155,7 @@ WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) {
case WM_PAINT: case WM_PAINT:
{ {
if (window_data && window_data->draw_buffer && window_data_win) { if (window_data && window_data->draw_buffer && window_data_win) {
StretchDIBits(window_data_win->hdc, window_data->dst_offset_x, window_data->dst_offset_y, window_data->dst_width, window_data->dst_height, 0, 0, window_data->buffer_width, window_data->buffer_height, window_data->draw_buffer, StretchDIBits(window_data_win->hdc, window_data->dst_offset_x, window_data->dst_offset_y, window_data->dst_width, window_data->dst_height, 0, 0, window_data->buffer_width, window_data->buffer_height, window_data->draw_buffer,
window_data_win->bitmapInfo, DIB_RGB_COLORS, SRCCOPY); window_data_win->bitmapInfo, DIB_RGB_COLORS, SRCCOPY);
} }
ValidateRect(hWnd, 0x0); ValidateRect(hWnd, 0x0);
@ -193,7 +193,7 @@ WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) {
case WM_CHAR: case WM_CHAR:
case WM_SYSCHAR: case WM_SYSCHAR:
case WM_UNICHAR: case WM_UNICHAR:
{ {
if (window_data) { if (window_data) {
@ -439,7 +439,7 @@ mfb_open_ex(const char *title, unsigned width, unsigned height, unsigned flags)
RegisterClass(&window_data_win->wc); RegisterClass(&window_data_win->wc);
calc_dst_factor(window_data, width, height); calc_dst_factor(window_data, width, height);
window_data->window_width = rect.right; window_data->window_width = rect.right;
window_data->window_height = rect.bottom; window_data->window_height = rect.bottom;
@ -512,7 +512,7 @@ mfb_open_ex(const char *title, unsigned width, unsigned height, unsigned flags)
mfb_update_state mfb_update_state
mfb_update_ex(struct mfb_window *window, void *buffer, unsigned width, unsigned height) { mfb_update_ex(struct mfb_window *window, void *buffer, unsigned width, unsigned height) {
MSG msg; MSG msg;
if (window == 0x0) { if (window == 0x0) {
return STATE_INVALID_WINDOW; return STATE_INVALID_WINDOW;
} }
@ -557,10 +557,10 @@ mfb_update_ex(struct mfb_window *window, void *buffer, unsigned width, unsigned
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
mfb_update_state mfb_update_state
mfb_update_events(struct mfb_window *window) { mfb_update_events(struct mfb_window *window) {
MSG msg; MSG msg;
if (window == 0x0) { if (window == 0x0) {
return STATE_INVALID_WINDOW; return STATE_INVALID_WINDOW;
} }
@ -589,7 +589,7 @@ extern double g_time_for_frame;
bool bool
mfb_wait_sync(struct mfb_window *window) { mfb_wait_sync(struct mfb_window *window) {
MSG msg; MSG msg;
if (window == 0x0) { if (window == 0x0) {
return false; return false;
} }
@ -631,7 +631,7 @@ mfb_wait_sync(struct mfb_window *window) {
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
void void
destroy_window_data(SWindowData *window_data) { destroy_window_data(SWindowData *window_data) {
if (window_data == 0x0) if (window_data == 0x0)
return; return;
@ -664,7 +664,7 @@ destroy_window_data(SWindowData *window_data) {
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
uint32_t uint32_t
translate_mod() { translate_mod() {
uint32_t mods = 0; uint32_t mods = 0;
@ -688,7 +688,7 @@ translate_mod() {
extern short int g_keycodes[512]; extern short int g_keycodes[512];
void void
init_keycodes() { init_keycodes() {
if(g_keycodes[0x00B] != KB_KEY_0) { if(g_keycodes[0x00B] != KB_KEY_0) {
g_keycodes[0x00B] = KB_KEY_0; g_keycodes[0x00B] = KB_KEY_0;
@ -817,7 +817,7 @@ init_keycodes() {
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
mfb_key mfb_key
translate_key(unsigned int wParam, unsigned long lParam) { translate_key(unsigned int wParam, unsigned long lParam) {
if (wParam == VK_CONTROL) { if (wParam == VK_CONTROL) {
MSG next; MSG next;
@ -843,7 +843,7 @@ translate_key(unsigned int wParam, unsigned long lParam) {
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
bool bool
mfb_set_viewport(struct mfb_window *window, unsigned offset_x, unsigned offset_y, unsigned width, unsigned height) { mfb_set_viewport(struct mfb_window *window, unsigned offset_x, unsigned offset_y, unsigned width, unsigned height) {
SWindowData *window_data = (SWindowData *) window; SWindowData *window_data = (SWindowData *) window;
SWindowData_Win *window_data_win = 0x0; SWindowData_Win *window_data_win = 0x0;
@ -872,8 +872,6 @@ mfb_set_viewport(struct mfb_window *window, unsigned offset_x, unsigned offset_y
calc_dst_factor(window_data, window_data->window_width, window_data->window_height); calc_dst_factor(window_data, window_data->window_width, window_data->window_height);
#if !defined(USE_OPENGL_API) #if !defined(USE_OPENGL_API)
SWindowData_Win *window_data_win = 0x0;
window_data_win = (SWindowData_Win *) window_data->specific; window_data_win = (SWindowData_Win *) window_data->specific;
BitBlt(window_data_win->hdc, 0, 0, window_data->window_width, window_data->window_height, 0, 0, 0, BLACKNESS); BitBlt(window_data_win->hdc, 0, 0, window_data->window_width, window_data->window_height, 0, 0, 0, BLACKNESS);
#endif #endif
@ -886,7 +884,7 @@ mfb_set_viewport(struct mfb_window *window, unsigned offset_x, unsigned offset_y
extern double g_timer_frequency; extern double g_timer_frequency;
extern double g_timer_resolution; extern double g_timer_resolution;
uint64_t uint64_t
mfb_timer_tick() { mfb_timer_tick() {
int64_t counter; int64_t counter;
@ -895,7 +893,7 @@ mfb_timer_tick() {
return counter; return counter;
} }
void void
mfb_timer_init() { mfb_timer_init() {
uint64_t frequency; uint64_t frequency;