From 6d84ebb571de34f19f674b8fc48c82bf3ce9edf6 Mon Sep 17 00:00:00 2001 From: "John Hodge (sonata)" Date: Fri, 7 Nov 2014 12:00:56 +0800 Subject: [PATCH] Usermode/AxWin4 - Fix _DrawText deserialise, replace assert with log --- Usermode/Applications/axwin4_src/Server/ipc.cpp | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/Usermode/Applications/axwin4_src/Server/ipc.cpp b/Usermode/Applications/axwin4_src/Server/ipc.cpp index d41d2ce4..58cda2b8 100644 --- a/Usermode/Applications/axwin4_src/Server/ipc.cpp +++ b/Usermode/Applications/axwin4_src/Server/ipc.cpp @@ -329,9 +329,23 @@ void HandleMessage_DrawText(CClient& client, CDeserialiser& message) uint16_t y = message.ReadU16(); uint16_t w = message.ReadU16(); uint16_t h = message.ReadU16(); + uint16_t font = message.ReadU16(); ::std::string str = message.ReadString(); + _SysDebug("_DrawText: (%i (%i,%i) %ix%i Font%i \"%s\")", win_id, x, y, w, h, font, str.c_str()); - assert(!"TODO HandleMessage_DrawText"); + CWindow* win = client.GetWindow(win_id); + if(!win) { + throw IPC::CClientFailure("_DrawText: Bad window"); + } + + // 1. Get font from client structure + //CFont& font = client.GetFont(font_id); + + // 2. Render + //CRect area(x, y, w, h); + //font->Render(win->m_surface, area, str, h); + + _SysDebug("TODO: HandleMessage_DrawText"); } typedef void MessageHandler_op_t(CClient& client, CDeserialiser& message); -- 2.20.1