zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-26 03:30:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Buildtools: Fix warnings in enumdisplay.c only revealed with the previous Makefile edits.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@2475 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2012-03-14 06:27:06 +00:00
parent 658c5448fe
commit 7b76865aaa
1 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
polymer/eduke32/build/src/misc/enumdisplay.c
View file

@ -3,6 +3,8 @@
#include <windows.h> #include <windows.h>
#include <ddraw.h> #include <ddraw.h>
#include "compat.h"
#define DEFAULT_OUTPUT_FILE "enumdisplay.txt" #define DEFAULT_OUTPUT_FILE "enumdisplay.txt"
char *outputfile = DEFAULT_OUTPUT_FILE; char *outputfile = DEFAULT_OUTPUT_FILE;
@ -27,26 +29,26 @@ void dumpdevmode(DEVMODE *devmode)
if (devmode->dmFields & DM_PELSWIDTH) fprintf(output, " DM_PELSWIDTH"); if (devmode->dmFields & DM_PELSWIDTH) fprintf(output, " DM_PELSWIDTH");
if (devmode->dmFields & DM_PELSHEIGHT) fprintf(output, " DM_PELSHEIGHT"); if (devmode->dmFields & DM_PELSHEIGHT) fprintf(output, " DM_PELSHEIGHT");
if (devmode->dmFields & DM_BITSPERPEL) fprintf(output, " DM_BITSPERPEL"); if (devmode->dmFields & DM_BITSPERPEL) fprintf(output, " DM_BITSPERPEL");
fprintf(output, "\n\tdmPelsWidth = %d\n", devmode->dmPelsWidth); fprintf(output, "\n\tdmPelsWidth = %lu\n", devmode->dmPelsWidth);
fprintf(output, "\tdmPelsHeight = %d\n", devmode->dmPelsHeight); fprintf(output, "\tdmPelsHeight = %lu\n", devmode->dmPelsHeight);
fprintf(output, "\tdmBitsPerPel = %d\n", devmode->dmBitsPerPel); fprintf(output, "\tdmBitsPerPel = %lu\n", devmode->dmBitsPerPel);
} }
HRESULT WINAPI ddenum(DDSURFACEDESC *ddsd, VOID *udata) HRESULT WINAPI ddenum(DDSURFACEDESC *ddsd, VOID *udata ATTRIBUTE((unused)))
{ {
fprintf(output, "\tdwFlags has"); fprintf(output, "\tdwFlags has");
if (ddsd->dwFlags & DDSD_WIDTH) fprintf(output, " DDSD_WIDTH"); if (ddsd->dwFlags & DDSD_WIDTH) fprintf(output, " DDSD_WIDTH");
if (ddsd->dwFlags & DDSD_HEIGHT) fprintf(output, " DDSD_HEIGHT"); if (ddsd->dwFlags & DDSD_HEIGHT) fprintf(output, " DDSD_HEIGHT");
if (ddsd->dwFlags & DDSD_PIXELFORMAT) fprintf(output, " DDSD_PIXELFORMAT"); if (ddsd->dwFlags & DDSD_PIXELFORMAT) fprintf(output, " DDSD_PIXELFORMAT");
fprintf(output, "\n\tdwWidth = %d\n", ddsd->dwWidth); fprintf(output, "\n\tdwWidth = %lu\n", ddsd->dwWidth);
fprintf(output, "\tdwHeight = %d\n", ddsd->dwHeight); fprintf(output, "\tdwHeight = %lu\n", ddsd->dwHeight);
fprintf(output, "\tddpfPixelFormat.dwFlags has"); fprintf(output, "\tddpfPixelFormat.dwFlags has");
if (ddsd->ddpfPixelFormat.dwFlags & DDPF_PALETTEINDEXED1) fprintf(output, " DDPF_PALETTEINDEXED1"); if (ddsd->ddpfPixelFormat.dwFlags & DDPF_PALETTEINDEXED1) fprintf(output, " DDPF_PALETTEINDEXED1");
if (ddsd->ddpfPixelFormat.dwFlags & DDPF_PALETTEINDEXED2) fprintf(output, " DDPF_PALETTEINDEXED2"); if (ddsd->ddpfPixelFormat.dwFlags & DDPF_PALETTEINDEXED2) fprintf(output, " DDPF_PALETTEINDEXED2");
if (ddsd->ddpfPixelFormat.dwFlags & DDPF_PALETTEINDEXED4) fprintf(output, " DDPF_PALETTEINDEXED4"); if (ddsd->ddpfPixelFormat.dwFlags & DDPF_PALETTEINDEXED4) fprintf(output, " DDPF_PALETTEINDEXED4");
if (ddsd->ddpfPixelFormat.dwFlags & DDPF_PALETTEINDEXED8) fprintf(output, " DDPF_PALETTEINDEXED8"); if (ddsd->ddpfPixelFormat.dwFlags & DDPF_PALETTEINDEXED8) fprintf(output, " DDPF_PALETTEINDEXED8");
if (ddsd->ddpfPixelFormat.dwFlags & DDPF_RGB) fprintf(output, " DDPF_RGB"); if (ddsd->ddpfPixelFormat.dwFlags & DDPF_RGB) fprintf(output, " DDPF_RGB");
fprintf(output, "\n\tddpfPixelFormat.dwRGBBitCount = %d\n", ddsd->ddpfPixelFormat.dwRGBBitCount); fprintf(output, "\n\tddpfPixelFormat.dwRGBBitCount = %lu\n", ddsd->ddpfPixelFormat.dwRGBBitCount);
fprintf(output, "\n"); fprintf(output, "\n");
return(DDENUMRET_OK); return(DDENUMRET_OK);
@ -57,7 +59,6 @@ int InitDirectDraw(void)
HRESULT result; HRESULT result;
HRESULT (WINAPI *aDirectDrawCreate)(GUID *, LPDIRECTDRAW *, IUnknown *); HRESULT (WINAPI *aDirectDrawCreate)(GUID *, LPDIRECTDRAW *, IUnknown *);
HRESULT (WINAPI *aDirectDrawEnumerate)(LPDDENUMCALLBACK, LPVOID); HRESULT (WINAPI *aDirectDrawEnumerate)(LPDDENUMCALLBACK, LPVOID);
DDCAPS ddcaps;
hDDrawDLL = LoadLibrary("DDRAW.DLL"); hDDrawDLL = LoadLibrary("DDRAW.DLL");
if (!hDDrawDLL) { fprintf(output, "Failed loading DDRAW.DLL\n"); return -1; } if (!hDDrawDLL) { fprintf(output, "Failed loading DDRAW.DLL\n"); return -1; }
@ -69,7 +70,7 @@ int InitDirectDraw(void)
if (!aDirectDrawCreate) { fprintf(output, "Error fetching DirectDrawCreate\n"); return -1; } if (!aDirectDrawCreate) { fprintf(output, "Error fetching DirectDrawCreate\n"); return -1; }
result = aDirectDrawCreate(NULL, &lpDD, NULL); result = aDirectDrawCreate(NULL, &lpDD, NULL);
if (result != DD_OK) { fprintf(output, "DirectDrawCreate() failed (%d)\n", result); return -1; } if (result != DD_OK) { fprintf(output, "DirectDrawCreate() failed (%ld)\n", result); return -1; }
return 0; return 0;
} }
@ -144,7 +145,7 @@ int main(int argc, char **argv)
); );
hresult = IDirectDraw_EnumDisplayModes(lpDD, 0, NULL, (LPVOID)0, ddenum); hresult = IDirectDraw_EnumDisplayModes(lpDD, 0, NULL, (LPVOID)0, ddenum);
if (hresult != DD_OK) { if (hresult != DD_OK) {
fprintf(output, "\tIDirectDraw::EnumDisplayModes() FAILED! (%d)\n", hresult); fprintf(output, "\tIDirectDraw::EnumDisplayModes() FAILED! (%ld)\n", hresult);
} }
} }
UninitDirectDraw(); UninitDirectDraw();