winex11.drv: Sign-compare warnings fix.
This commit is contained in:
parent
1bf1adcc95
commit
ff380900c2
|
@ -1892,8 +1892,7 @@ static BOOL internal_wglUseFontBitmaps(HDC hdc, DWORD first, DWORD count, DWORD
|
||||||
{
|
{
|
||||||
/* We are running using client-side rendering fonts... */
|
/* We are running using client-side rendering fonts... */
|
||||||
GLYPHMETRICS gm;
|
GLYPHMETRICS gm;
|
||||||
unsigned int glyph;
|
unsigned int glyph, size = 0;
|
||||||
int size = 0;
|
|
||||||
void *bitmap = NULL, *gl_bitmap = NULL;
|
void *bitmap = NULL, *gl_bitmap = NULL;
|
||||||
int org_alignment;
|
int org_alignment;
|
||||||
|
|
||||||
|
@ -1904,7 +1903,7 @@ static BOOL internal_wglUseFontBitmaps(HDC hdc, DWORD first, DWORD count, DWORD
|
||||||
|
|
||||||
for (glyph = first; glyph < first + count; glyph++) {
|
for (glyph = first; glyph < first + count; glyph++) {
|
||||||
unsigned int needed_size = GetGlyphOutline_ptr(hdc, glyph, GGO_BITMAP, &gm, 0, NULL, NULL);
|
unsigned int needed_size = GetGlyphOutline_ptr(hdc, glyph, GGO_BITMAP, &gm, 0, NULL, NULL);
|
||||||
int height, width_int;
|
unsigned int height, width_int;
|
||||||
|
|
||||||
TRACE("Glyph : %3d / List : %d\n", glyph, listBase);
|
TRACE("Glyph : %3d / List : %d\n", glyph, listBase);
|
||||||
if (needed_size == GDI_ERROR) {
|
if (needed_size == GDI_ERROR) {
|
||||||
|
@ -1955,7 +1954,7 @@ static BOOL internal_wglUseFontBitmaps(HDC hdc, DWORD first, DWORD count, DWORD
|
||||||
if (needed_size != 0) {
|
if (needed_size != 0) {
|
||||||
width_int = (gm.gmBlackBoxX + 31) / 32;
|
width_int = (gm.gmBlackBoxX + 31) / 32;
|
||||||
for (height = 0; height < gm.gmBlackBoxY; height++) {
|
for (height = 0; height < gm.gmBlackBoxY; height++) {
|
||||||
int width;
|
unsigned int width;
|
||||||
for (width = 0; width < width_int; width++) {
|
for (width = 0; width < width_int; width++) {
|
||||||
((int *) gl_bitmap)[(gm.gmBlackBoxY - height - 1) * width_int + width] =
|
((int *) gl_bitmap)[(gm.gmBlackBoxY - height - 1) * width_int + width] =
|
||||||
((int *) bitmap)[height * width_int + width];
|
((int *) bitmap)[height * width_int + width];
|
||||||
|
@ -2603,10 +2602,10 @@ static GLboolean WINAPI X11DRV_wglChoosePixelFormatARB(HDC hdc, const int *piAtt
|
||||||
int nAttribs = 0;
|
int nAttribs = 0;
|
||||||
GLXFBConfig* cfgs = NULL;
|
GLXFBConfig* cfgs = NULL;
|
||||||
int nCfgs = 0;
|
int nCfgs = 0;
|
||||||
UINT it;
|
int it;
|
||||||
int fmt_id;
|
int fmt_id;
|
||||||
WineGLPixelFormat *fmt;
|
WineGLPixelFormat *fmt;
|
||||||
int pfmt_it = 0;
|
UINT pfmt_it = 0;
|
||||||
int run;
|
int run;
|
||||||
|
|
||||||
TRACE("(%p, %p, %p, %d, %p, %p): hackish\n", hdc, piAttribIList, pfAttribFList, nMaxFormats, piFormats, nNumFormats);
|
TRACE("(%p, %p, %p, %d, %p, %p): hackish\n", hdc, piAttribIList, pfAttribFList, nMaxFormats, piFormats, nNumFormats);
|
||||||
|
@ -2925,7 +2924,7 @@ static GLboolean WINAPI X11DRV_wglGetPixelFormatAttribfvARB(HDC hdc, int iPixelF
|
||||||
{
|
{
|
||||||
int *attr;
|
int *attr;
|
||||||
int ret;
|
int ret;
|
||||||
int i;
|
UINT i;
|
||||||
|
|
||||||
TRACE("(%p, %d, %d, %d, %p, %p)\n", hdc, iPixelFormat, iLayerPlane, nAttributes, piAttributes, pfValues);
|
TRACE("(%p, %d, %d, %d, %p, %p)\n", hdc, iPixelFormat, iLayerPlane, nAttributes, piAttributes, pfValues);
|
||||||
|
|
||||||
|
|
|
@ -151,7 +151,7 @@ X11DRV_ExtTextOut( X11DRV_PDEVICE *physDev, INT x, INT y, UINT flags,
|
||||||
{
|
{
|
||||||
/* have to render character by character. */
|
/* have to render character by character. */
|
||||||
double offset = 0.0;
|
double offset = 0.0;
|
||||||
int i;
|
UINT i;
|
||||||
|
|
||||||
for (i=0; i<count; i++)
|
for (i=0; i<count; i++)
|
||||||
{
|
{
|
||||||
|
|
|
@ -111,8 +111,8 @@ static int XRandRErrorHandler(Display *dpy, XErrorEvent *event, void *arg)
|
||||||
/* create the mode structures */
|
/* create the mode structures */
|
||||||
static void make_modes(void)
|
static void make_modes(void)
|
||||||
{
|
{
|
||||||
unsigned int i;
|
int i, j;
|
||||||
int j;
|
|
||||||
for (i=0; i<real_xrandr_sizes_count; i++)
|
for (i=0; i<real_xrandr_sizes_count; i++)
|
||||||
{
|
{
|
||||||
if (real_xrandr_rates_count[i])
|
if (real_xrandr_rates_count[i])
|
||||||
|
@ -240,8 +240,7 @@ static LONG X11DRV_XRandR_SetCurrentMode(int mode)
|
||||||
void X11DRV_XRandR_Init(void)
|
void X11DRV_XRandR_Init(void)
|
||||||
{
|
{
|
||||||
Bool ok;
|
Bool ok;
|
||||||
int nmodes = 0;
|
int i, nmodes = 0;
|
||||||
unsigned int i;
|
|
||||||
|
|
||||||
if (xrandr_major) return; /* already initialized? */
|
if (xrandr_major) return; /* already initialized? */
|
||||||
if (!usexrandr) return; /* disabled in config */
|
if (!usexrandr) return; /* disabled in config */
|
||||||
|
@ -272,7 +271,7 @@ void X11DRV_XRandR_Init(void)
|
||||||
for (i=0; i < real_xrandr_sizes_count; i++)
|
for (i=0; i < real_xrandr_sizes_count; i++)
|
||||||
{
|
{
|
||||||
real_xrandr_rates[i] = pXRRRates (gdi_display, DefaultScreen(gdi_display), i, &(real_xrandr_rates_count[i]));
|
real_xrandr_rates[i] = pXRRRates (gdi_display, DefaultScreen(gdi_display), i, &(real_xrandr_rates_count[i]));
|
||||||
TRACE("- at %u: %dx%d (%d rates):", i, real_xrandr_sizes[i].width, real_xrandr_sizes[i].height, real_xrandr_rates_count[i]);
|
TRACE("- at %d: %dx%d (%d rates):", i, real_xrandr_sizes[i].width, real_xrandr_sizes[i].height, real_xrandr_rates_count[i]);
|
||||||
if (real_xrandr_rates_count[i])
|
if (real_xrandr_rates_count[i])
|
||||||
{
|
{
|
||||||
int j;
|
int j;
|
||||||
|
|
Loading…
Reference in New Issue