[MPlayer-cvslog] r32480 - in trunk: codec-cfg.c libmpdemux/demux_viv.c loader/dshow/DS_VideoDecoder.c loader/ext.c loader/pe_image.c loader/vfl.c loader/win32.c stream/stream_radio.c vidix/s3_vid.c

[Reimar Döffinger]

On Mon, Oct 11, 2010 at 02:33:57PM +0200, diego wrote:
> Modified: trunk/loader/pe_image.c
> ==============================================================================
> --- trunk/loader/pe_image.c	Sun Oct 10 13:20:57 2010	(r32479)
> +++ trunk/loader/pe_image.c	Mon Oct 11 14:33:57 2010	(r32480)
> @@ -292,7 +292,7 @@ static DWORD fixup_imports( WINE_MODREF 
>  	if (characteristics_detection && !pe_imp->u.Characteristics)
>  		break;
>  
> -//#warning FIXME: here we should fill imports
> +        /* FIXME: here we should fill imports */
>          TRACE("Loading imports for %s.dll\n", name);
>  
>  	if (pe_imp->u.OriginalFirstThunk != 0) {
> @@ -452,7 +452,7 @@ HMODULE PE_LoadImage( int handle, LPCSTR
>      file_size=lseek(handle, 0, SEEK_END);
>      lseek(handle, 0, SEEK_SET);
>  
> -//#warning fix CreateFileMappingA
> +    // fix CreateFileMappingA
>      mapping = CreateFileMappingA( handle, NULL, PAGE_READONLY | SEC_COMMIT,
>                                      0, 0, NULL );
>      if (!mapping)
> 
> Modified: trunk/loader/vfl.c
> ==============================================================================
> --- trunk/loader/vfl.c	Sun Oct 10 13:20:57 2010	(r32479)
> +++ trunk/loader/vfl.c	Mon Oct 11 14:33:57 2010	(r32480)
> @@ -218,7 +218,7 @@ LRESULT VFWAPI ICClose(HIC hic) {
>  	/* FIXME: correct? */
>  //	CloseDriver(whic->hdrv,0,0);
>          DrvClose(whic->hdrv);
> -//#warning FIXME: DrvClose
> +        /* FIXME: DrvClose */
>  	free(whic);
>  	return 0;
>  }
> 
> Modified: trunk/vidix/s3_vid.c
> ==============================================================================
> --- trunk/vidix/s3_vid.c	Sun Oct 10 13:20:57 2010	(r32479)
> +++ trunk/vidix/s3_vid.c	Mon Oct 11 14:33:57 2010	(r32480)
> @@ -385,7 +385,7 @@ static void S3InitStreamsOld (void)
>      format = 7 << 24;
>      break;
>    }
> -//#warning enable this again
> +  // FIXME: enable this again
>    OUTREG (PSTREAM_FBSIZE_REG, info->screen_y * info->screen_x * (info->bpp >> 3));
>    OUTREG (PSTREAM_WINDOW_START_REG, OS_XY (0, 0));
>    OUTREG (PSTREAM_WINDOW_SIZE_REG, OS_WH (info->screen_x, info->screen_y));

These warnings were commented-out before. And at least in the last two cases
these comments make no sense any more and should be removed.