- Make file names unix conform
- Cleanup code

svn path=/trunk/; revision=56941
This commit is contained in:
Timo Kreuzer 2012-07-22 20:24:10 +00:00
parent 3161623a23
commit d949749e32
25 changed files with 47 additions and 50 deletions

View file

@ -10,7 +10,7 @@
#define _DibDoRop(pBltData, M, D, S, P) ROP_MERGEPAINT(D,S,P)
#include "diblib_allsrcbpp.h"
#include "DibLib_AllSrcBPP.h"
VOID
FASTCALL

View file

@ -10,7 +10,7 @@
#define _DibDoRop(pBltData, M, D, S, P) (~(P))
#include "diblib_alldstbpp.h"
#include "DibLib_AllDstBPP.h"
extern PFN_DIBFUNCTION gapfnBitBlt_PATCOPY_Solid[];

View file

@ -10,7 +10,7 @@
#define _DibDoRop(pBltData, M, D, S, P) ROP_NOTSRCCOPY(D,S,P)
#include "diblib_allsrcbpp.h"
#include "DibLib_AllSrcBPP.h"
VOID
FASTCALL

View file

@ -10,7 +10,7 @@
#define _DibDoRop(pBltData, M, D, S, P) ROP_NOTSRCERASE(D,S,P)
#include "diblib_allsrcbpp.h"
#include "DibLib_AllSrcBPP.h"
VOID
FASTCALL

View file

@ -10,12 +10,12 @@
#define _DibDoRop(pBltData, M, D, S, P) ROP_PATCOPY(D,S,P)
#include "diblib_alldstbpp.h"
#include "DibLib_AllDstBPP.h"
#undef __FUNCTIONNAME
#define __FUNCTIONNAME BitBlt_PATCOPY_Solid
#define __USES_SOLID_BRUSH 1
#include "diblib_alldstbpp.h"
#include "DibLib_AllDstBPP.h"
VOID
FASTCALL

View file

@ -10,12 +10,12 @@
#define _DibDoRop(pBltData, M, D, S, P) ROP_PATINVERT(D,S,P)
#include "diblib_alldstbpp.h"
#include "DibLib_AllDstBPP.h"
#undef __FUNCTIONNAME
#define __FUNCTIONNAME BitBlt_PATINVERT_Solid
#define __USES_SOLID_BRUSH 1
#include "diblib_alldstbpp.h"
#include "DibLib_AllDstBPP.h"
VOID
FASTCALL

View file

@ -10,12 +10,12 @@
#define _DibDoRop(pBltData, M, D, S, P) ROP_PATPAINT(D,S,P)
#include "diblib_allsrcbpp.h"
#include "DibLib_AllSrcBPP.h"
#undef __FUNCTIONNAME
#define __FUNCTIONNAME BitBlt_PATPAINT_Solid
#define __USES_SOLID_BRUSH 1
#include "diblib_allsrcbpp.h"
#include "DibLib_AllSrcBPP.h"
VOID
FASTCALL

View file

@ -10,7 +10,7 @@
#define _DibDoRop(pBltData, M, D, S, P) ROP_SRCAND(D,S,P)
#include "diblib_allsrcbpp.h"
#include "DibLib_AllSrcBPP.h"
VOID
FASTCALL

View file

@ -50,10 +50,9 @@ Dib_BitBlt_SRCCOPY_S32_D32_EqSurf(PBLTDATA pBltData)
#define Dib_BitBlt_SRCCOPY_S32_D32_EqSurf Dib_BitBlt_SRCCOPY_EqSurf
#endif
/* This definition will be checked against in DibLib_BitBlt.h
for all "redirected" functions */
#define Dib_BitBlt_SRCCOPY_EqSurf_manual 1
// #define Dib_BitBlt_SRCCOPY_S16_D16_EqSurf_manual 1
// #define Dib_BitBlt_SRCCOPY_S24_D24_EqSurf_manual 1
// #define Dib_BitBlt_SRCCOPY_S32_D32_EqSurf_manual 1
#define __USES_SOURCE 1
#define __USES_PATTERN 0
@ -64,13 +63,12 @@ Dib_BitBlt_SRCCOPY_S32_D32_EqSurf(PBLTDATA pBltData)
#define _DibDoRop(pBltData, M, D, S, P) ROP_SRCCOPY(D,S,P)
#include "diblib_allsrcbpp.h"
#include "DibLib_AllSrcBPP.h"
VOID
FASTCALL
Dib_BitBlt_SRCCOPY(PBLTDATA pBltData)
{
// TODO: XLATEless same-surface variants
gapfnBitBlt_SRCCOPY[pBltData->siDst.iFormat][pBltData->siSrc.iFormat](pBltData);
}

View file

@ -10,7 +10,7 @@
#define _DibDoRop(pBltData, M, D, S, P) ROP_SRCERASE(D,S,P)
#include "diblib_allsrcbpp.h"
#include "DibLib_AllSrcBPP.h"
VOID
FASTCALL

View file

@ -10,7 +10,7 @@
#define _DibDoRop(pBltData, M, D, S, P) ROP_SRCINVERT(D,S,P)
#include "diblib_allsrcbpp.h"
#include "DibLib_AllSrcBPP.h"
VOID
FASTCALL

View file

@ -10,7 +10,7 @@
#define _DibDoRop(pBltData, M, D, S, P) ROP_SRCPAINT(D,S,P)
#include "diblib_allsrcbpp.h"
#include "DibLib_AllSrcBPP.h"
VOID
FASTCALL

View file

@ -30,7 +30,6 @@ extern const BYTE ajShift4[2];
#define __PASTE_(s1,s2) s1##s2
#define __PASTE(s1,s2) __PASTE_(s1,s2)
#define EVALUATE(x) x
#define __DIB_FUNCTION_NAME_SRCDST2(name, src_bpp, dst_bpp) Dib_ ## name ## _S ## src_bpp ## _D ## dst_bpp
#define __DIB_FUNCTION_NAME_SRCDST(name, src_bpp, dst_bpp) __DIB_FUNCTION_NAME_SRCDST2(name, src_bpp, dst_bpp)

View file

@ -8,27 +8,27 @@
#endif
#define _DEST_BPP 1
#include "diblib_bitblt.h"
#include "DibLib_BitBlt.h"
#undef _DEST_BPP
#define _DEST_BPP 4
#include "diblib_bitblt.h"
#include "DibLib_BitBlt.h"
#undef _DEST_BPP
#define _DEST_BPP 8
#include "diblib_bitblt.h"
#include "DibLib_BitBlt.h"
#undef _DEST_BPP
#define _DEST_BPP 16
#include "diblib_bitblt.h"
#include "DibLib_BitBlt.h"
#undef _DEST_BPP
#define _DEST_BPP 24
#include "diblib_bitblt.h"
#include "DibLib_BitBlt.h"
#undef _DEST_BPP
#define _DEST_BPP 32
#include "diblib_bitblt.h"
#include "DibLib_BitBlt.h"
#undef _DEST_BPP
#if (__USES_SOURCE == 0)

View file

@ -4,27 +4,27 @@
#endif
#define _SOURCE_BPP 1
#include "diblib_alldstbpp.h"
#include "DibLib_AllDstBPP.h"
#undef _SOURCE_BPP
#define _SOURCE_BPP 4
#include "diblib_alldstbpp.h"
#include "DibLib_AllDstBPP.h"
#undef _SOURCE_BPP
#define _SOURCE_BPP 8
#include "diblib_alldstbpp.h"
#include "DibLib_AllDstBPP.h"
#undef _SOURCE_BPP
#define _SOURCE_BPP 16
#include "diblib_alldstbpp.h"
#include "DibLib_AllDstBPP.h"
#undef _SOURCE_BPP
#define _SOURCE_BPP 24
#include "diblib_alldstbpp.h"
#include "DibLib_AllDstBPP.h"
#undef _SOURCE_BPP
#define _SOURCE_BPP 32
#include "diblib_alldstbpp.h"
#include "DibLib_AllDstBPP.h"
#undef _SOURCE_BPP
#undef _DibXlate
@ -33,12 +33,12 @@
#undef __DIB_FUNCTION_NAME
#define __DIB_FUNCTION_NAME __DIB_FUNCTION_NAME_SRCDSTEQ
#include "diblib_alldstbpp.h"
#include "DibLib_AllDstBPP.h"
#define _NextPixel_ _NextPixelR2L_
#undef __DIB_FUNCTION_NAME
#define __DIB_FUNCTION_NAME __DIB_FUNCTION_NAME_SRCDSTEQR2L
#include "diblib_alldstbpp.h"
#include "DibLib_AllDstBPP.h"
#undef _SOURCE_BPP
#undef _NextPixel_

View file

@ -10,12 +10,12 @@
#define _DibDoRop(pBltData, M, D, S, P) pBltData->apfnDoRop[M](D,S,P)
#include "diblib_allsrcbpp.h"
#include "DibLib_AllSrcBPP.h"
#undef __FUNCTIONNAME
#define __FUNCTIONNAME MaskBlt_Solid
#define __USES_SOLID_BRUSH 1
#include "diblib_allsrcbpp.h"
#include "DibLib_AllSrcBPP.h"
VOID
FASTCALL

View file

@ -10,7 +10,7 @@
#define _DibDoRop(pBltData, M, D, S, P) pBltData->apfnDoRop[M](D,0,0)
#include "diblib_alldstbpp.h"
#include "DibLib_AllDstBPP.h"
VOID
FASTCALL

View file

@ -10,12 +10,12 @@
#define _DibDoRop(pBltData, M, D, S, P) pBltData->apfnDoRop[M](0,0,P)
#include "diblib_alldstbpp.h"
#include "DibLib_AllDstBPP.h"
#undef __FUNCTIONNAME
#define __FUNCTIONNAME MaskPatBlt_Solid
#define __USES_SOLID_BRUSH 1
#include "diblib_alldstbpp.h"
#include "DibLib_AllDstBPP.h"
VOID
FASTCALL

View file

@ -10,12 +10,12 @@
#define _DibDoRop(pBltData, M, D, S, P) pBltData->apfnDoRop[M](D,0,P)
#include "diblib_alldstbpp.h"
#include "DibLib_AllDstBPP.h"
#undef __FUNCTIONNAME
#define __FUNCTIONNAME MaskPatPaint_Solid
#define __USES_SOLID_BRUSH 1
#include "diblib_alldstbpp.h"
#include "DibLib_AllDstBPP.h"
VOID
FASTCALL

View file

@ -10,7 +10,7 @@
#define _DibDoRop(pBltData, M, D, S, P) pBltData->apfnDoRop[M](D,S,0)
#include "diblib_allsrcbpp.h"
#include "DibLib_AllSrcBPP.h"
VOID
FASTCALL

View file

@ -10,7 +10,7 @@
#define _DibDoRop(pBltData, M, D, S, P) pBltData->apfnDoRop[M](D,S,0)
#include "diblib_allsrcbpp.h"
#include "DibLib_AllSrcBPP.h"
VOID
FASTCALL

View file

@ -10,12 +10,12 @@
#define _DibDoRop(pBltData, M, D, S, P) pBltData->apfnDoRop[M](D,S,P)
#include "diblib_allsrcbpp.h"
#include "DibLib_AllSrcBPP.h"
#undef __FUNCTIONNAME
#define __FUNCTIONNAME MaskSrcPatBlt_Solid
#define __USES_SOLID_BRUSH 1
#include "diblib_allsrcbpp.h"
#include "DibLib_AllSrcBPP.h"
VOID
FASTCALL

View file

@ -10,12 +10,12 @@
#define _DibDoRop(pBltData, M, D, S, P) pBltData->apfnDoRop[0](D,0,P)
#include "diblib_alldstbpp.h"
#include "DibLib_AllDstBPP.h"
#undef __FUNCTIONNAME
#define __FUNCTIONNAME PatPaint_Solid
#define __USES_SOLID_BRUSH 1
#include "diblib_alldstbpp.h"
#include "DibLib_AllDstBPP.h"
VOID
FASTCALL

View file

@ -10,7 +10,7 @@
#define _DibDoRop(pBltData, M, D, S, P) pBltData->apfnDoRop[0](D,S,0)
#include "diblib_allsrcbpp.h"
#include "DibLib_AllSrcBPP.h"
VOID
FASTCALL

View file

@ -10,12 +10,12 @@
#define _DibDoRop(pBltData, M, D, S, P) pBltData->apfnDoRop[0](0,S,P)
#include "diblib_allsrcbpp.h"
#include "DibLib_AllSrcBPP.h"
#undef __FUNCTIONNAME
#define __FUNCTIONNAME SrcPatBlt_Solid
#define __USES_SOLID_BRUSH 1
#include "diblib_allsrcbpp.h"
#include "DibLib_AllSrcBPP.h"
VOID
FASTCALL