pyrite-dev/milsko
pyrite-dev/milsko
12
1
Fork 3
Code Issues 5 Pull requests Projects Releases 7 Packages Wiki Activity Actions

underscore prefix for gdi dynloaded functions
Some checks failed
pyrite-dev/milsko/pipeline/head There was a failure building this commit
Details

Browse source
This commit is contained in:
IoIxD 2026-07-19 20:52:07 -07:00
commit 3dc4641ff9
2 changed files with 23 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -21,6 +21,8 @@ compile_flags.txt
.DS_Store .DS_Store
/vms /vms
/BorMakefile /BorMakefile
*.err
*.zip
*.pef *.pef
*.dsk *.dsk

42
src/text/gdi.c
View file

@ -1,10 +1,10 @@
#ifdef USE_GDI_TEXT #ifdef USE_GDI_TEXT
#include <Mw/Milsko.h> #include <Mw/Milsko.h>
static HANDLE WINAPI (*AddFontMemResourceEx)(PVOID pFileView, DWORD cjSize, PVOID pvResrved, DWORD* pNumFonts) = NULL; static HANDLE WINAPI (*_AddFontMemResourceEx)(PVOID pFileView, DWORD cjSize, PVOID pvResrved, DWORD* pNumFonts) = NULL;
static BOOL WINAPI (*RemoveFontMemResourceEx)(HANDLE h) = NULL; static BOOL WINAPI (*_RemoveFontMemResourceEx)(HANDLE h) = NULL;
static HANDLE WINAPI AddFontMemResourceExPolyFill(PVOID pFileView, DWORD cjSize, PVOID pvResrved, DWORD* pNumFonts); static HANDLE WINAPI _AddFontMemResourceExPolyFill(PVOID pFileView, DWORD cjSize, PVOID pvResrved, DWORD* pNumFonts);
static BOOL WINAPI RemoveFontMemResourceExPolyFill(HANDLE h); static BOOL WINAPI _RemoveFontMemResourceExPolyFill(HANDLE h);
struct _MwFLFont { struct _MwFLFont {
HANDLE handle; HANDLE handle;
@ -128,15 +128,15 @@ static void* GDI_MwFontLoad(unsigned char* data, unsigned int size, int px) {
ttf->handle = NULL; ttf->handle = NULL;
if(AddFontMemResourceEx) { if(_AddFontMemResourceEx) {
if((ttf->handle = AddFontMemResourceEx(data, size, 0, &c)) == NULL) { if((ttf->handle = _AddFontMemResourceEx(data, size, 0, &c)) == NULL) {
ReleaseDC(NULL, ttf->dc); ReleaseDC(NULL, ttf->dc);
MwTTFFreeInfo(info); MwTTFFreeInfo(info);
free(ttf); free(ttf);
return NULL; return NULL;
} }
} /*else { } /*else {
if((ttf->handle = AddFontMemResourceExPolyFill(data, size, 0, &c)) == NULL) { if((ttf->handle = _AddFontMemResourceExPolyFill(data, size, 0, &c)) == NULL) {
ReleaseDC(NULL, ttf->dc); ReleaseDC(NULL, ttf->dc);
MwTTFFreeInfo(info); MwTTFFreeInfo(info);
free(ttf); free(ttf);
@ -145,10 +145,10 @@ static void* GDI_MwFontLoad(unsigned char* data, unsigned int size, int px) {
}*/ }*/
if((ttf->font = CreateFont(-px, 0, 0, 0, info->weight, FALSE, FALSE, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH | FF_DONTCARE, ttf->handle ? info->family : "Sans Serif")) == NULL) { if((ttf->font = CreateFont(-px, 0, 0, 0, info->weight, FALSE, FALSE, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH | FF_DONTCARE, ttf->handle ? info->family : "Sans Serif")) == NULL) {
if(RemoveFontMemResourceEx) { if(_RemoveFontMemResourceEx) {
RemoveFontMemResourceEx(ttf->handle); _RemoveFontMemResourceEx(ttf->handle);
} else { } else {
RemoveFontMemResourceExPolyFill(ttf->handle); _RemoveFontMemResourceExPolyFill(ttf->handle);
} }
ReleaseDC(NULL, ttf->dc); ReleaseDC(NULL, ttf->dc);
MwTTFFreeInfo(info); MwTTFFreeInfo(info);
@ -167,16 +167,16 @@ static void GDI_MwFontFree(void* handle) {
MwFLFont ttf = handle; MwFLFont ttf = handle;
DeleteObject(ttf->font); DeleteObject(ttf->font);
if(RemoveFontMemResourceEx) { if(_RemoveFontMemResourceEx) {
RemoveFontMemResourceEx(ttf->handle); _RemoveFontMemResourceEx(ttf->handle);
} else { } else {
RemoveFontMemResourceExPolyFill(ttf->handle); _RemoveFontMemResourceExPolyFill(ttf->handle);
} }
ReleaseDC(NULL, ttf->dc); ReleaseDC(NULL, ttf->dc);
free(ttf); free(ttf);
} }
static HANDLE WINAPI AddFontMemResourceExPolyFill(PVOID pFileView, DWORD cjSize, PVOID pvResrved, DWORD* pNumFonts) { static HANDLE WINAPI _AddFontMemResourceExPolyFill(PVOID pFileView, DWORD cjSize, PVOID pvResrved, DWORD* pNumFonts) {
CHAR temp_path_dir[MAX_PATH]; CHAR temp_path_dir[MAX_PATH];
CHAR temp_path_name[MAX_PATH]; CHAR temp_path_name[MAX_PATH];
HANDLE tempFile = NULL; HANDLE tempFile = NULL;
@ -237,7 +237,7 @@ success:
return tempFile; return tempFile;
}; };
static BOOL WINAPI RemoveFontMemResourceExPolyFill(HANDLE h) { static BOOL WINAPI _RemoveFontMemResourceExPolyFill(HANDLE h) {
if(h) if(h)
CloseHandle(h); CloseHandle(h);
return TRUE; return TRUE;
@ -248,13 +248,13 @@ int MwFL_GDISetup(void) {
if(!gdilib) { if(!gdilib) {
printf("gdi32.dll not found(?????)\n"); printf("gdi32.dll not found(?????)\n");
} else { } else {
AddFontMemResourceEx = (void*)GetProcAddress(gdilib, "AddFontMemResourceEx"); _AddFontMemResourceEx = (void*)GetProcAddress(gdilib, "_AddFontMemResourceEx");
if(!AddFontMemResourceEx) { if(!_AddFontMemResourceEx) {
AddFontMemResourceEx = AddFontMemResourceExPolyFill; _AddFontMemResourceEx = _AddFontMemResourceExPolyFill;
} }
RemoveFontMemResourceEx = (void*)GetProcAddress(gdilib, "RemoveFontMemResourceEx"); _RemoveFontMemResourceEx = (void*)GetProcAddress(gdilib, "_RemoveFontMemResourceEx");
if(!RemoveFontMemResourceEx) { if(!_RemoveFontMemResourceEx) {
RemoveFontMemResourceEx = RemoveFontMemResourceExPolyFill; _RemoveFontMemResourceEx = _RemoveFontMemResourceExPolyFill;
} }
} }