diff options
| author | Toni Uhlig <matzeton@googlemail.com> | 2019-10-13 16:25:21 +0200 |
|---|---|---|
| committer | Toni Uhlig <matzeton@googlemail.com> | 2019-10-13 16:25:21 +0200 |
| commit | 8fa32ec99a354c6031488519e7a55fcc227a723e (patch) | |
| tree | ee05a09d676fb0ebe1ffc776d4378d5f2c488b50 | |
| parent | afeca95d976e14e1e32dfb8636eb590cd399ed39 (diff) | |
using LRESULT and correct HINSTANCE conversion
| -rw-r--r-- | GdiRadar/GdiRadar.cpp | 13 | ||||
| -rw-r--r-- | GdiRadar/GdiRadar.h | 7 |
2 files changed, 12 insertions, 8 deletions
diff --git a/GdiRadar/GdiRadar.cpp b/GdiRadar/GdiRadar.cpp index 54cc1fe..430d100 100644 --- a/GdiRadar/GdiRadar.cpp +++ b/GdiRadar/GdiRadar.cpp @@ -15,7 +15,6 @@ struct gdi_radar_drawing { HBRUSH EnemyBrush; COLORREF TextCOLOR; - HFONT HFONT_Hunt; RECT DC_Dimensions; HDC hdc; }; @@ -233,20 +232,24 @@ gdi_process_events(struct gdi_radar_context * const ctx, MSG * const msg) return DispatchMessageW(msg); } -void gdi_radar_process_window_events_blocking(struct gdi_radar_context * const ctx) +LRESULT gdi_radar_process_window_events_blocking(struct gdi_radar_context * const ctx) { + LRESULT result = 0; MSG msg; while (GetMessageW(&msg, ctx->myDrawWnd, 0, 0)) { - gdi_process_events(ctx, &msg); + result = gdi_process_events(ctx, &msg); } + return result; } -void gdi_radar_process_window_events_nonblocking(struct gdi_radar_context * const ctx) +LRESULT gdi_radar_process_window_events_nonblocking(struct gdi_radar_context * const ctx) { + LRESULT result = 0; MSG msg; while (PeekMessageW(&msg, ctx->myDrawWnd, 0, 0, PM_REMOVE)) { - gdi_process_events(ctx, &msg); + result = gdi_process_events(ctx, &msg); } + return result; }
\ No newline at end of file diff --git a/GdiRadar/GdiRadar.h b/GdiRadar/GdiRadar.h index b8d73f6..2049605 100644 --- a/GdiRadar/GdiRadar.h +++ b/GdiRadar/GdiRadar.h @@ -16,7 +16,8 @@ struct gdi_radar_context; static HINSTANCE gdi_radar_get_fake_hinstance() { - return (HINSTANCE)GetWindowLongW(GetActiveWindow(), -6); + LONG_PTR hi = GetWindowLongW(GetActiveWindow(), -6); + return (HINSTANCE)hi; } struct gdi_radar_context * const gdi_radar_configure(struct gdi_radar_config const * const cfg, @@ -47,5 +48,5 @@ static void gdi_radar_set_game_dimensions(struct gdi_radar_context * const ctx, gdi_radar_set_game_dimensions(ctx, (UINT64)GameMapWidth, (UINT64)GameMapHeight); } -void gdi_radar_process_window_events_blocking(struct gdi_radar_context * const ctx); -void gdi_radar_process_window_events_nonblocking(struct gdi_radar_context * const ctx);
\ No newline at end of file +LRESULT gdi_radar_process_window_events_blocking(struct gdi_radar_context * const ctx); +LRESULT gdi_radar_process_window_events_nonblocking(struct gdi_radar_context * const ctx);
\ No newline at end of file |