@@ -113,7 +113,7 @@ typedef struct _GDI_DEVICE_CONTEXT_SHARED { UCHAR unk6[30]; POINT CurrentPenPos; UCHAR unk7[2]; - ULONG unk8[0x57]; + ULONG unk8[0x4b]; POINT WindowOriginOffset; /* 0x174 */ ULONG unk9[8]; } GDI_DEVICE_CONTEXT_SHARED; include/common/ntgdi.h @@ -754,8 +754,9 @@ BOOL device_context_t::lineto(INT x, INT y) return FALSE; POINT& cur = get_current_pen_pos(); + POINT& winofs = get_window_offset(); - bm->line(cur.x, cur.y, x, y, pen); + bm->line(cur.x + winofs.x, cur.y + winofs.y, x + winofs.x, y + winofs.y, pen); // update the position cur.x = x; @@ -1016,6 +1017,13 @@ POINT& device_context_t::get_current_pen_pos() return dcshm->CurrentPenPos; } +POINT& device_context_t::get_window_offset() +{ + GDI_DEVICE_CONTEXT_SHARED *dcshm = get_dc_shared_mem(); + assert(dcshm != NULL); + return dcshm->WindowOriginOffset; +} + device_context_t* dc_from_handle( HGDIOBJ handle ) { gdi_handle_table_entry *entry = get_handle_table_entry( handle ); kernel/ntgdi.cpp @@ -231,6 +231,7 @@ public: virtual bitmap_t* get_bitmap(); virtual pen_t* get_selected_pen(); POINT& get_current_pen_pos(); + POINT& get_window_offset(); void set_bounds_rect( RECT& r ) {BoundsRect = r;} RECT& get_bounds_rect() {return BoundsRect;} int save_dc(); kernel/win32mgr.h f3219ce018959c093a3323a1a9489f547be970e2 Mike McCormack mikem@ring3k.org http://github.com/mikemccormack/ring3k/commit/3da7386ca8ea778cc204a0301e13e4bc593b4d52 3da7386ca8ea778cc204a0301e13e4bc593b4d52 2009-08-11T03:09:39-07:00 2009-08-11T03:09:39-07:00 Use the window offset in lineto. With this change, the shadow clock face is visible. 528340aac0d52aa1ceef8ea2d65bfd8fd4de6cf4 Mike McCormack mikem@ring3k.org