amy/upiwin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

hackathon-dev #1

Merged
amy merged 101 commits from hackathon-dev into develop 2019-12-12 13:56:11 -07:00
Conversation 0 Commits 101 Files Changed 67 +5 -3
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4745d51361 - Show all commits

2
src/bitmap.c
View File

@ -2,7 +2,7 @@
#include <string.h> #include <string.h>
#include "bitmap.h" #include "bitmap.h"
PBITMAP BMP_Create(INT32 width, INT32 height, const VOID *bits) PBITMAP BMP_Create(INT32 width, INT32 height, const void *bits)
{ {
PBITMAP rc; PBITMAP rc;
UINT32 tot_size = sizeof(BITMAP) + (width * height * sizeof(UINT16)); UINT32 tot_size = sizeof(BITMAP) + (width * height * sizeof(UINT16));

2
src/bitmap.h
View File

@ -13,7 +13,7 @@ typedef struct tagBITMAP {
UINT16 bits[0]; UINT16 bits[0];
} BITMAP, *PBITMAP; } BITMAP, *PBITMAP;
extern PBITMAP BMP_Create(INT32 width, INT32 height, const VOID *bits); extern PBITMAP BMP_Create(INT32 width, INT32 height, const void *bits);
extern void BMP_Delete(PBITMAP pbmp); extern void BMP_Delete(PBITMAP pbmp);
#endif /* __BITMAP_H_INCLUDED */ #endif /* __BITMAP_H_INCLUDED */

4
src/devctxt.h
View File

@ -26,10 +26,12 @@
#define R2_MERGEPEN 15 #define R2_MERGEPEN 15
#define R2_WHITE 16 #define R2_WHITE 16
struct tagDCTXT; /* forward declaration */
typedef COLORREF (*DCtx_SetPixel)(PVOID privdata, INT32 x, INT32 y, COLORREF color, INT32 op); typedef COLORREF (*DCtx_SetPixel)(PVOID privdata, INT32 x, INT32 y, COLORREF color, INT32 op);
typedef BOOL (*DCtx_Line)(PVOID privdata, INT32 x1, INT32 y1, INT32 x2, INT32 y2, COLORREF color, INT32 op); typedef BOOL (*DCtx_Line)(PVOID privdata, INT32 x1, INT32 y1, INT32 x2, INT32 y2, COLORREF color, INT32 op);
typedef BOOL (*DCtx_SolidRect)(PVOID privdata, PRECT rect, COLORREF color, INT32 op); typedef BOOL (*DCtx_SolidRect)(PVOID privdata, PRECT rect, COLORREF color, INT32 op);
typedef PDCTXT (*DCtx_CreateCompat)(PVOID privdata); typedef struct tagDCTXT *(*DCtx_CreateCompat)(PVOID privdata);
typedef BOOL (*DCtx_NewBitmap)(PVOID privdata, PBITMAP pbmp); typedef BOOL (*DCtx_NewBitmap)(PVOID privdata, PBITMAP pbmp);
typedef BOOL (*DCtx_BitBlt)(PVOID p_dest, PRECT r_dest, PVOID p_src, PRECT r_src, UINT32 op); typedef BOOL (*DCtx_BitBlt)(PVOID p_dest, PRECT r_dest, PVOID p_src, PRECT r_src, UINT32 op);