Changeset 8343 for trunk/src


Ignore:
Timestamp:
Apr 30, 2002, 3:11:44 PM (23 years ago)
Author:
sandervl
Message:

update

Location:
trunk/src/gdi32
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/gdi32/dibsect.cpp

    r7717 r8343  
    1 /* $Id: dibsect.cpp,v 1.62 2001-12-31 12:08:20 sandervl Exp $ */
     1/* $Id: dibsect.cpp,v 1.63 2002-04-30 13:11:44 sandervl Exp $ */
    22
    33/*
    … …  
    609609            dprintf(("GDI32: DIBSect::BitBlt: WARNING! zero-length bitmap! %08xh", pOS2bmp));
    610610        }
    611 
    612 
    613611        rc = GpiDrawBits(hps, bmpBitsDblBuffer, pOS2bmp, 4, &point[0], Rop, os2mode);
    614612  }
    … …  
    728726  free(tmphdr);
    729727  if(rc != nDestHeight) {
    730     DebugInt3();
     728    dprintf(("!WARNING!: GpiQueryBitmapBits returned %d instead of %d scanlines", rc, nDestHeight));
    731729  }
    732730

  • trunk/src/gdi32/gdi32.cpp

    r7721 r8343  
    1 /* $Id: gdi32.cpp,v 1.80 2002-01-02 18:36:00 sandervl Exp $ */
     1/* $Id: gdi32.cpp,v 1.81 2002-04-30 13:09:55 sandervl Exp $ */
    22
    33/*
    … …  
    861861//******************************************************************************
    862862//******************************************************************************
    863 UINT WIN32API GetOutlineTextMetricsA( HDC arg1, UINT arg2, LPOUTLINETEXTMETRICA  arg3)
    864 {
    865     dprintf(("GDI32: GetOutlineTextMetricsA"));
    866     return O32_GetOutlineTextMetrics(arg1, arg2, arg3);
    867 }
    868 //******************************************************************************
    869 //******************************************************************************
    870 UINT WIN32API GetOutlineTextMetricsW( HDC arg1, UINT arg2, LPOUTLINETEXTMETRICW  arg3)
    871 {
    872     dprintf(("GDI32: GetOutlineTextMetricsW STUB"));
    873     // NOTE: This will not work as is (needs UNICODE support)
    874 //    return O32_GetOutlineTextMetrics(arg1, arg2, arg3);
    875     return 0;
    876 }
    877 //******************************************************************************
    878 //******************************************************************************
    879863INT WIN32API GetPath( HDC hdc, PPOINT arg2, PBYTE arg3, int  arg4)
    880864{
    … …  
    926910    dprintf(("GDI32: GetTextColor %x -> %x", hdc, color));
    927911    return color;
    928 }
    929 //******************************************************************************
    930 //******************************************************************************
    931 int WIN32API GetTextFaceA( HDC hdc, int arg2, LPSTR  arg3)
    932 {
    933     dprintf(("GDI32: GetTextFaceA %x %d %x", hdc, arg2, arg3));
    934     return O32_GetTextFace(hdc, arg2, arg3);
    935 }
    936 //******************************************************************************
    937 //******************************************************************************
    938 int WIN32API GetTextFaceW( HDC arg1, int arg2, LPWSTR  arg3)
    939 {
    940  char *astring = (char *)malloc(arg2+1);
    941  int   rc;
    942 
    943     dprintf(("GDI32: GetTextFaceW"));
    944     rc = GetTextFaceA(arg1, arg2, astring);
    945     AsciiToUnicode(astring, arg3);
    946     free(astring);
    947     return rc;
    948 }
    949 //******************************************************************************
    950 //******************************************************************************
    951 BOOL WIN32API GetTextMetricsA( HDC hdc, LPTEXTMETRICA  pwtm)
    952 {
    953  BOOL rc;
    954 
    955     rc = O32_GetTextMetrics(hdc, pwtm);
    956     dprintf(("GDI32: GetTextMetricsA %x %x returned %d", hdc, pwtm, rc));
    957     return(rc);
    958 }
    959 //******************************************************************************
    960 //******************************************************************************
    961 BOOL WIN32API GetTextMetricsW( HDC hdc, LPTEXTMETRICW pwtm)
    962 {
    963  BOOL rc;
    964  TEXTMETRICA atm;
    965 
    966     dprintf(("GDI32: GetTextMetricsW"));
    967 
    968     rc = O32_GetTextMetrics(hdc, &atm);
    969     pwtm->tmHeight = atm.tmHeight;
    970     pwtm->tmAscent = atm.tmAscent;
    971     pwtm->tmDescent = atm.tmDescent;
    972     pwtm->tmInternalLeading = atm.tmInternalLeading;
    973     pwtm->tmExternalLeading = atm.tmExternalLeading;
    974     pwtm->tmAveCharWidth = atm.tmAveCharWidth;
    975     pwtm->tmMaxCharWidth = atm.tmMaxCharWidth;
    976     pwtm->tmWeight = atm.tmWeight;
    977     pwtm->tmOverhang = atm.tmOverhang;
    978     pwtm->tmDigitizedAspectX = atm.tmDigitizedAspectX;
    979     pwtm->tmDigitizedAspectY = atm.tmDigitizedAspectY;
    980     pwtm->tmFirstChar = atm.tmFirstChar;
    981     pwtm->tmLastChar = atm.tmLastChar;
    982     pwtm->tmDefaultChar = atm.tmDefaultChar;
    983     pwtm->tmBreakChar = atm.tmBreakChar;
    984     pwtm->tmItalic = atm.tmItalic;
    985     pwtm->tmUnderlined = atm.tmUnderlined;
    986     pwtm->tmStruckOut = atm.tmStruckOut;
    987     pwtm->tmPitchAndFamily = atm.tmPitchAndFamily;
    988     pwtm->tmCharSet = atm.tmCharSet;
    989 
    990     dprintf(("GDI32: GetTextMetricsW %x %x returned %d", hdc, pwtm, rc));
    991     return(rc);
    992912}
    993913//******************************************************************************
Note: See TracChangeset for help on using the changeset viewer.