MeshCentral/MeshAgent
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshAgent synced 2025-12-17 16:53:13 +00:00
Code Issues Releases Wiki Activity

Fixed gdiplus name collision

Browse Source
This commit is contained in:
Bryan Roe
2022-01-26 15:25:48 -08:00
parent a03200e910
commit 95f5e310f2
1 changed files with 45 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
meshservice/ServiceMain.c
View File

@@ -111,22 +111,22 @@ typedef int(__stdcall *_GdipDrawImageRectI)(void *graphics, void *image, int x,
typedef int(__stdcall *_GdipDisposeImage)(void *image); typedef int(__stdcall *_GdipDisposeImage)(void *image);
typedef HRESULT(__stdcall *DpiAwarenessFunc)(PROCESS_DPI_AWARENESS); typedef HRESULT(__stdcall *DpiAwarenessFunc)(PROCESS_DPI_AWARENESS);
_GdipCreateBitmapFromStream GdipCreateBitmapFromStream; _GdipCreateBitmapFromStream __GdipCreateBitmapFromStream;
_GdipCreateHBITMAPFromBitmap GdipCreateHBITMAPFromBitmap; _GdipCreateHBITMAPFromBitmap __GdipCreateHBITMAPFromBitmap;
_GdipGetImagePixelFormat GdipGetImagePixelFormat; _GdipGetImagePixelFormat __GdipGetImagePixelFormat;
_GdipCreateBitmapFromScan0 GdipCreateBitmapFromScan0; _GdipCreateBitmapFromScan0 __GdipCreateBitmapFromScan0;
_GdipGetImageHorizontalResolution GdipGetImageHorizontalResolution; _GdipGetImageHorizontalResolution __GdipGetImageHorizontalResolution;
_GdipGetImageVerticalResolution GdipGetImageVerticalResolution; _GdipGetImageVerticalResolution __GdipGetImageVerticalResolution;
_GdipBitmapSetResolution GdipBitmapSetResolution; _GdipBitmapSetResolution __GdipBitmapSetResolution;
_GdipGetImageGraphicsContext GdipGetImageGraphicsContext; _GdipGetImageGraphicsContext __GdipGetImageGraphicsContext;
_GdipSetSmoothingMode GdipSetSmoothingMode; _GdipSetSmoothingMode __GdipSetSmoothingMode;
_GdipSetInterpolationMode GdipSetInterpolationMode; _GdipSetInterpolationMode __GdipSetInterpolationMode;
_GdipDrawImageRectI GdipDrawImageRectI; _GdipDrawImageRectI __GdipDrawImageRectI;
_GdipDisposeImage GdipDisposeImage; _GdipDisposeImage __GdipDisposeImage;
_GdiplusShutdown GdiplusShutdown; _GdiplusShutdown __GdiplusShutdown;
_GdiplusStartup GdiplusStartup; _GdiplusStartup __GdiplusStartup;
_SHCreateMemStream SHCreateMemStream2; _SHCreateMemStream __SHCreateMemStream2;
void *GdiPlusToken = NULL; void *GdiPlusToken = NULL;
void GdiPlusFlat_Init() void GdiPlusFlat_Init()
@@ -139,28 +139,28 @@ void GdiPlusFlat_Init()
if (_shm == NULL) { _gdip = LoadLibraryExW(L"Shlwapi.dll", NULL, 0); } if (_shm == NULL) { _gdip = LoadLibraryExW(L"Shlwapi.dll", NULL, 0); }
if (_shm == NULL) { FreeLibrary(_gdip); _gdip = NULL; return; } if (_shm == NULL) { FreeLibrary(_gdip); _gdip = NULL; return; }
GdipCreateBitmapFromStream = (_GdipCreateBitmapFromStream)GetProcAddress(_gdip, (LPCSTR)"GdipCreateBitmapFromStream"); __GdipCreateBitmapFromStream = (_GdipCreateBitmapFromStream)GetProcAddress(_gdip, (LPCSTR)"GdipCreateBitmapFromStream");
GdiplusStartup = (_GdiplusStartup)GetProcAddress(_gdip, (LPCSTR)"GdiplusStartup"); __GdiplusStartup = (_GdiplusStartup)GetProcAddress(_gdip, (LPCSTR)"GdiplusStartup");
SHCreateMemStream2 = (_SHCreateMemStream)GetProcAddress(_shm, (LPCSTR)"SHCreateMemStream"); __SHCreateMemStream2 = (_SHCreateMemStream)GetProcAddress(_shm, (LPCSTR)"SHCreateMemStream");
GdipCreateHBITMAPFromBitmap = (_GdipCreateHBITMAPFromBitmap)GetProcAddress(_gdip, (LPCSTR)"GdipCreateHBITMAPFromBitmap"); __GdipCreateHBITMAPFromBitmap = (_GdipCreateHBITMAPFromBitmap)GetProcAddress(_gdip, (LPCSTR)"GdipCreateHBITMAPFromBitmap");
GdipGetImagePixelFormat = (_GdipGetImagePixelFormat)GetProcAddress(_gdip, (LPCSTR)"GdipGetImagePixelFormat"); __GdipGetImagePixelFormat = (_GdipGetImagePixelFormat)GetProcAddress(_gdip, (LPCSTR)"GdipGetImagePixelFormat");
GdipCreateBitmapFromScan0 = (_GdipCreateBitmapFromScan0)GetProcAddress(_gdip, (LPCSTR)"GdipCreateBitmapFromScan0"); __GdipCreateBitmapFromScan0 = (_GdipCreateBitmapFromScan0)GetProcAddress(_gdip, (LPCSTR)"GdipCreateBitmapFromScan0");
GdipGetImageHorizontalResolution = (_GdipGetImageHorizontalResolution)GetProcAddress(_gdip, (LPCSTR)"GdipGetImageHorizontalResolution"); __GdipGetImageHorizontalResolution = (_GdipGetImageHorizontalResolution)GetProcAddress(_gdip, (LPCSTR)"GdipGetImageHorizontalResolution");
GdipGetImageVerticalResolution = (_GdipGetImageVerticalResolution)GetProcAddress(_gdip, (LPCSTR)"GdipGetImageVerticalResolution"); __GdipGetImageVerticalResolution = (_GdipGetImageVerticalResolution)GetProcAddress(_gdip, (LPCSTR)"GdipGetImageVerticalResolution");
GdipBitmapSetResolution = (_GdipBitmapSetResolution)GetProcAddress(_gdip, (LPCSTR)"GdipBitmapSetResolution"); __GdipBitmapSetResolution = (_GdipBitmapSetResolution)GetProcAddress(_gdip, (LPCSTR)"GdipBitmapSetResolution");
GdipGetImageGraphicsContext = (_GdipGetImageGraphicsContext)GetProcAddress(_gdip, (LPCSTR)"GdipGetImageGraphicsContext"); __GdipGetImageGraphicsContext = (_GdipGetImageGraphicsContext)GetProcAddress(_gdip, (LPCSTR)"GdipGetImageGraphicsContext");
GdipSetSmoothingMode = (_GdipSetSmoothingMode)GetProcAddress(_gdip, (LPCSTR)"GdipSetSmoothingMode"); __GdipSetSmoothingMode = (_GdipSetSmoothingMode)GetProcAddress(_gdip, (LPCSTR)"GdipSetSmoothingMode");
GdipSetInterpolationMode = (_GdipSetInterpolationMode)GetProcAddress(_gdip, (LPCSTR)"GdipSetInterpolationMode"); __GdipSetInterpolationMode = (_GdipSetInterpolationMode)GetProcAddress(_gdip, (LPCSTR)"GdipSetInterpolationMode");
GdipDrawImageRectI = (_GdipDrawImageRectI)GetProcAddress(_gdip, (LPCSTR)"GdipDrawImageRectI"); __GdipDrawImageRectI = (_GdipDrawImageRectI)GetProcAddress(_gdip, (LPCSTR)"GdipDrawImageRectI");
GdipDisposeImage = (_GdipDisposeImage)GetProcAddress(_gdip, (LPCSTR)"GdipDisposeImage"); __GdipDisposeImage = (_GdipDisposeImage)GetProcAddress(_gdip, (LPCSTR)"GdipDisposeImage");
GdiplusShutdown = (_GdiplusShutdown)GetProcAddress(_gdip, (LPCSTR)"GdiplusShutdown"); __GdiplusShutdown = (_GdiplusShutdown)GetProcAddress(_gdip, (LPCSTR)"GdiplusShutdown");
((uint32_t*)input)[0] = 1; ((uint32_t*)input)[0] = 1;
GdiplusStartup(&GdiPlusToken, input, NULL); __GdiplusStartup(&GdiPlusToken, input, NULL);
} }
void GdiPlusFlat_Release() void GdiPlusFlat_Release()
{ {
if (GdiPlusToken != NULL) { GdiplusShutdown(GdiPlusToken); GdiPlusToken = NULL; } if (GdiPlusToken != NULL) { __GdiplusShutdown(GdiPlusToken); GdiPlusToken = NULL; }
if (_gdip != NULL) { FreeLibrary(_gdip); _gdip = NULL; } if (_gdip != NULL) { FreeLibrary(_gdip); _gdip = NULL; }
if (_shm != NULL) { FreeLibrary(_shm); _shm = NULL; } if (_shm != NULL) { FreeLibrary(_shm); _shm = NULL; }
} }
@@ -1031,25 +1031,25 @@ HBITMAP GetScaledImage(char *raw, size_t rawLen, int w, int h)
char *decoded = (char*)ILibMemory_SmartAllocate(newLen); char *decoded = (char*)ILibMemory_SmartAllocate(newLen);
newLen = ILibBase64Decode(raw, (int)rawLen, (unsigned char**)&decoded); newLen = ILibBase64Decode(raw, (int)rawLen, (unsigned char**)&decoded);
IStream *instream = SHCreateMemStream2(decoded, (uint32_t)newLen); IStream *instream = __SHCreateMemStream2(decoded, (uint32_t)newLen);
void *bm = NULL; void *bm = NULL;
void *g = NULL; void *g = NULL;
void *nb = NULL; void *nb = NULL;
HBITMAP hbm; HBITMAP hbm;
int format; int format;
float REAL_w, REAL_h; float REAL_w, REAL_h;
int s = GdipCreateBitmapFromStream((void*)instream, &bm); int s = __GdipCreateBitmapFromStream((void*)instream, &bm);
s = GdipGetImagePixelFormat(bm, &format); s = __GdipGetImagePixelFormat(bm, &format);
s = GdipCreateBitmapFromScan0(w, h, 0, format, NULL, &nb); s = __GdipCreateBitmapFromScan0(w, h, 0, format, NULL, &nb);
s = GdipGetImageHorizontalResolution(bm, &REAL_w); s = __GdipGetImageHorizontalResolution(bm, &REAL_w);
s = GdipGetImageVerticalResolution(bm, &REAL_h); s = __GdipGetImageVerticalResolution(bm, &REAL_h);
s = GdipBitmapSetResolution(nb, REAL_w, REAL_h); s = __GdipBitmapSetResolution(nb, REAL_w, REAL_h);
s = GdipGetImageGraphicsContext(nb, &g); s = __GdipGetImageGraphicsContext(nb, &g);
s = GdipSetSmoothingMode(g, SmoothingModeAntiAlias); s = __GdipSetSmoothingMode(g, SmoothingModeAntiAlias);
s = GdipSetInterpolationMode(g, InterpolationModeBicubic); s = __GdipSetInterpolationMode(g, InterpolationModeBicubic);
s = GdipDrawImageRectI(g, bm, 0, 0, w, h); s = __GdipDrawImageRectI(g, bm, 0, 0, w, h);
s = GdipCreateHBITMAPFromBitmap(nb, &hbm, RGB(105, 54, 0)); s = __GdipCreateHBITMAPFromBitmap(nb, &hbm, RGB(105, 54, 0));
s = GdipDisposeImage(bm); s = __GdipDisposeImage(bm);
ILibMemory_Free(decoded); ILibMemory_Free(decoded);
return(hbm); return(hbm);
} }