system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-31 10:13:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

winex11.drv: Sign-compare warnings fix.

Browse source
This commit is contained in:
Andrew Talbot 2008-12-06 13:18:43 +00:00 committed by Alexandre Julliard
parent 1bf1adcc95
commit ff380900c2
3 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
dlls/winex11.drv/opengl.c
View file

@ -1892,8 +1892,7 @@ static BOOL internal_wglUseFontBitmaps(HDC hdc, DWORD first, DWORD count, DWORD
{
/* We are running using client-side rendering fonts... */
GLYPHMETRICS gm;
unsigned int glyph;
int size = 0;
unsigned int glyph, size = 0;
void *bitmap = NULL, *gl_bitmap = NULL;
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++) {
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);
if (needed_size == GDI_ERROR) {
@ -1955,7 +1954,7 @@ static BOOL internal_wglUseFontBitmaps(HDC hdc, DWORD first, DWORD count, DWORD
if (needed_size != 0) {
width_int = (gm.gmBlackBoxX + 31) / 32;
for (height = 0; height < gm.gmBlackBoxY; height++) {
int width;
unsigned int width;
for (width = 0; width < width_int; width++) {
((int *) gl_bitmap)[(gm.gmBlackBoxY - height - 1) * 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;
GLXFBConfig* cfgs = NULL;
int nCfgs = 0;
UINT it;
int it;
int fmt_id;
WineGLPixelFormat *fmt;
int pfmt_it = 0;
UINT pfmt_it = 0;
int run;
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 ret;
int i;
UINT i;
TRACE("(%p, %d, %d, %d, %p, %p)\n", hdc, iPixelFormat, iLayerPlane, nAttributes, piAttributes, pfValues);

2
dlls/winex11.drv/text.c
View file

@ -151,7 +151,7 @@ X11DRV_ExtTextOut( X11DRV_PDEVICE *physDev, INT x, INT y, UINT flags,
{
/* have to render character by character. */
double offset = 0.0;
int i;
UINT i;
for (i=0; i<count; i++)
{

9
dlls/winex11.drv/xrandr.c
View file

@ -111,8 +111,8 @@ static int XRandRErrorHandler(Display *dpy, XErrorEvent *event, void *arg)
/* create the mode structures */
static void make_modes(void)
{
unsigned int i;
int j;
int i, j;
for (i=0; i<real_xrandr_sizes_count; i++)
{
if (real_xrandr_rates_count[i])
@ -240,8 +240,7 @@ static LONG X11DRV_XRandR_SetCurrentMode(int mode)
void X11DRV_XRandR_Init(void)
{
Bool ok;
int nmodes = 0;
unsigned int i;
int i, nmodes = 0;
if (xrandr_major) return; /* already initialized? */
if (!usexrandr) return; /* disabled in config */
@ -272,7 +271,7 @@ void X11DRV_XRandR_Init(void)
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]));
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])
{
int j;