Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 65889: [GDI32] In Escape() make use of GdiGetDcAttr(), GreatLordish -> English and fix copy-pasta in comments, improve formatting, remove some code that (attention euphemism) wasn't exac...
by tkreuzer＠svn.reactos.org 29 Dec '14

29 Dec '14

Author: tkreuzer Date: Mon Dec 29 13:12:29 2014 New Revision: 65889 URL: http://svn.reactos.org/svn/reactos?rev=65889&view=rev Log: [GDI32] In Escape() make use of GdiGetDcAttr(), GreatLordish -> English and fix copy-pasta in comments, improve formatting, remove some code that (attention euphemism) wasn't exactly correct. Modified: trunk/reactos/win32ss/gdi/gdi32/misc/misc.c Modified: trunk/reactos/win32ss/gdi/gdi32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/misc/mis… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/misc/misc.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/misc/misc.c [iso-8859-1] Mon Dec 29 13:12:29 2014 @@ -50,33 +50,35 @@ /* * @unimplemented */ -int -WINAPI -Escape(HDC hdc, INT nEscape, INT cbInput, LPCSTR lpvInData, LPVOID lpvOutData) -{ - int retValue = SP_ERROR; - HGDIOBJ hObject = hdc; - UINT Type = 0; - LPVOID pUserData = NULL; - - Type = GDI_HANDLE_GET_TYPE(hObject); - - if (Type == GDI_OBJECT_TYPE_METADC) +INT +WINAPI +Escape( + _In_ HDC hdc, + _In_ INT nEscape, + _In_ INT cbInput, + _In_ LPCSTR lpvInData, + _Out_ LPVOID lpvOutData) +{ + INT retValue = SP_ERROR; + ULONG ulObjType; + + ulObjType = GDI_HANDLE_GET_TYPE(hdc); + + if (ulObjType == GDILoObjType_LO_METADC16_TYPE) { /* FIXME we do not support metafile */ UNIMPLEMENTED; SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - } - else - { - switch (nEscape) - { + return SP_ERROR; + } + + switch (nEscape) + { case ABORTDOC: - /* Note Winodws check see if the handle have any user data for ABORTDOC command - * ReactOS copy this behavior to be compatible with windows 2003 + /* Note: Windows checks if the handle has any user data for the ABORTDOC command + * ReactOS copies this behavior to be compatible with windows 2003 */ - if ( (!GdiGetHandleUserData(hObject, (DWORD)Type, (PVOID) &pUserData)) || - (pUserData == NULL) ) + if (GdiGetDcAttr(hdc) == NULL) { GdiSetLastError(ERROR_INVALID_HANDLE); retValue = FALSE; @@ -90,12 +92,11 @@ case DRAFTMODE: case FLUSHOUTPUT: case SETCOLORTABLE: - /* Note 1: DRAFTMODE, FLUSHOUTPUT, SETCOLORTABLE is outdated and been replace with other api */ - /* Note 2: Winodws check see if the handle have any user data for DRAFTMODE, FLUSHOUTPUT, SETCOLORTABLE command - * ReactOS copy this behavior to be compatible with windows 2003 + /* Note 1: DRAFTMODE, FLUSHOUTPUT, SETCOLORTABLE are outdated */ + /* Note 2: Windows checks if the handle has any user data for the DRAFTMODE, FLUSHOUTPUT, SETCOLORTABLE commands + * ReactOS copies this behavior to be compatible with windows 2003 */ - if ( (!GdiGetHandleUserData(hObject, (DWORD)Type, (PVOID) &pUserData)) || - (pUserData == NULL) ) + if (GdiGetDcAttr(hdc) == NULL) { GdiSetLastError(ERROR_INVALID_HANDLE); } @@ -103,11 +104,10 @@ break; case SETABORTPROC: - /* Note : Winodws check see if the handle have any user data for DRAFTMODE, FLUSHOUTPUT, SETCOLORTABLE command - * ReactOS copy this behavior to be compatible with windows 2003 + /* Note: Windows checks if the handle has any user data for the SETABORTPROC command + * ReactOS copies this behavior to be compatible with windows 2003 */ - if ( (!GdiGetHandleUserData(hObject, (DWORD)Type, (PVOID) &pUserData)) || - (pUserData == NULL) ) + if (GdiGetDcAttr(hdc) == NULL) { GdiSetLastError(ERROR_INVALID_HANDLE); retValue = FALSE; @@ -117,18 +117,17 @@ case GETCOLORTABLE: retValue = GetSystemPaletteEntries(hdc, (UINT)*lpvInData, 1, (LPPALETTEENTRY)lpvOutData); - if ( !retValue ) + if (!retValue) { retValue = SP_ERROR; } break; case ENDDOC: - /* Note : Winodws check see if the handle have any user data for DRAFTMODE, FLUSHOUTPUT, SETCOLORTABLE command - * ReactOS copy this behavior to be compatible with windows 2003 + /* Note: Windows checks if the handle has any user data for the ENDDOC command + * ReactOS copies this behavior to be compatible with windows 2003 */ - if ( (!GdiGetHandleUserData(hObject, (DWORD)Type, (PVOID) &pUserData)) || - (pUserData == NULL) ) + if (GdiGetDcAttr(hdc) == NULL) { GdiSetLastError(ERROR_INVALID_HANDLE); retValue = FALSE; @@ -136,14 +135,13 @@ retValue = EndDoc(hdc); break; - case GETSCALINGFACTOR: /* Note GETSCALINGFACTOR is outdated have been replace by GetDeviceCaps */ - if ( Type == GDI_OBJECT_TYPE_DC ) - { - if ( lpvOutData ) + if (ulObjType == GDI_OBJECT_TYPE_DC) + { + if (lpvOutData) { - PPOINT ptr = (PPOINT) lpvOutData; + PPOINT ptr = (PPOINT)lpvOutData; ptr->x = 0; ptr->y = 0; } @@ -152,46 +150,34 @@ break; case GETEXTENDEDTEXTMETRICS: - retValue = (int) GetETM( hdc, (EXTTEXTMETRIC *) lpvOutData) != 0; + retValue = GetETM(hdc, (EXTTEXTMETRIC *)lpvOutData) != 0; break; - case STARTDOC: + case STARTDOC: { - DOCINFOA *pUserDatalpdi; - DOCINFOA lpdi; - - /* Note : Winodws check see if the handle have any user data for STARTDOC command - * ReactOS copy this behavior to be compatible with windows 2003 + DOCINFOA di; + + /* Note: Windows checks if the handle has any user data for the STARTDOC command + * ReactOS copies this behavior to be compatible with windows 2003 */ - if ( (!GdiGetHandleUserData(hObject, (DWORD)Type, (PVOID) &pUserDatalpdi)) || - (pUserData == NULL) ) + if (GdiGetDcAttr(hdc) == NULL) { GdiSetLastError(ERROR_INVALID_HANDLE); retValue = FALSE; } - lpdi.cbSize = sizeof(DOCINFOA); - - /* NOTE lpszOutput will be store in handle userdata */ - lpdi.lpszOutput = 0; - - lpdi.lpszDatatype = 0; - lpdi.fwType = 0; - lpdi.lpszDocName = lpvInData; + di.cbSize = sizeof(DOCINFOA); + di.lpszOutput = 0; + di.lpszDatatype = 0; + di.fwType = 0; + di.lpszDocName = lpvInData; /* NOTE : doc for StartDocA/W at msdn http://msdn2.microsoft.com/en-us/library/ms535793(VS.85).aspx */ - retValue = StartDocA(hdc, &lpdi); - - /* StartDocA fail */ + retValue = StartDocA(hdc, &di); + + /* Check if StartDocA failed */ if (retValue < 0) { - /* check see if outbuffer contain any data, if it does abort */ - if ( (pUserDatalpdi->lpszOutput != 0) && - ( (*(WCHAR *)pUserDatalpdi->lpszOutput) != UNICODE_NULL) ) - { - retValue = SP_APPABORT; - } - else { retValue = GetLastError(); @@ -221,13 +207,9 @@ } break; - - - default: UNIMPLEMENTED; SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - } } return retValue;

1 0

[tkreuzer] 65888: [GDI32] Fix some parameters in the spec file
by tkreuzer＠svn.reactos.org 29 Dec '14

29 Dec '14

Author: tkreuzer Date: Mon Dec 29 13:12:23 2014 New Revision: 65888 URL: http://svn.reactos.org/svn/reactos?rev=65888&view=rev Log: [GDI32] Fix some parameters in the spec file Modified: trunk/reactos/win32ss/gdi/gdi32/gdi32.spec Modified: trunk/reactos/win32ss/gdi/gdi32/gdi32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/gdi32.sp… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/gdi32.spec [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/gdi32.spec [iso-8859-1] Mon Dec 29 13:12:23 2014 @@ -22,13 +22,13 @@ @ stdcall CLIPOBJ_ppoGetPath(ptr) NtGdiCLIPOBJ_ppoGetPath @ stdcall CancelDC(long) @ stdcall CheckColorsInGamut(ptr ptr ptr long) -@ stdcall ChoosePixelFormat(long ptr) -@ stdcall Chord(long long long long long long long long long) +@ stdcall ChoosePixelFormat(ptr ptr) +@ stdcall Chord(ptr long long long long long long long long) @ stdcall ClearBitmapAttributes(ptr long) @ stdcall ClearBrushAttributes(ptr long) -@ stdcall CloseEnhMetaFile(long) -@ stdcall CloseFigure(long) -@ stdcall CloseMetaFile(long) +@ stdcall CloseEnhMetaFile(ptr) +@ stdcall CloseFigure(ptr) +@ stdcall CloseMetaFile(ptr) @ stdcall ColorCorrectPalette(ptr ptr long long) @ stdcall ColorMatchToTarget(ptr ptr long) @ stdcall CombineRgn(long long long long) @@ -42,8 +42,8 @@ @ stdcall CreateBrushIndirect(ptr) @ stdcall CreateColorSpaceA(ptr) @ stdcall CreateColorSpaceW(ptr) -@ stdcall CreateCompatibleBitmap(long long long) -@ stdcall CreateCompatibleDC(long) +@ stdcall CreateCompatibleBitmap(ptr long long) +@ stdcall CreateCompatibleDC(ptr) @ stdcall CreateDCA(str str str ptr) @ stdcall CreateDCW(wstr wstr wstr ptr) @ stdcall CreateDIBPatternBrush(long long) @@ -148,10 +148,10 @@ @ stdcall DrawEscape(long long long ptr) @ stdcall Ellipse(long long long long long) @ stdcall EnableEUDC(long) NtGdiEnableEudc -@ stdcall EndDoc(long) +@ stdcall EndDoc(ptr) @ stdcall EndFormPage(ptr) -@ stdcall EndPage(long) -@ stdcall EndPath(long) +@ stdcall EndPage(ptr) +@ stdcall EndPath(ptr) @ stdcall EngAcquireSemaphore(ptr) @ stdcall EngAlphaBlend(ptr ptr ptr ptr ptr ptr ptr) NtGdiEngAlphaBlend @ stdcall EngAssociateSurface(ptr ptr long) NtGdiEngAssociateSurface @@ -198,19 +198,19 @@ @ stdcall EngUnicodeToMultiByteN(str long long wstr long) RtlUnicodeToMultiByteN @ stdcall EngUnlockSurface(ptr) NtGdiEngUnlockSurface @ stdcall EngWideCharToMultiByte(long wstr long str long) -@ stdcall EnumEnhMetaFile(long long ptr ptr ptr) -@ stdcall EnumFontFamiliesA(long str ptr long) -@ stdcall EnumFontFamiliesExA(long ptr ptr long long) -@ stdcall EnumFontFamiliesExW(long ptr ptr long long) -@ stdcall EnumFontFamiliesW(long wstr ptr long) -@ stdcall EnumFontsA(long str ptr long) -@ stdcall EnumFontsW(long wstr ptr long) +@ stdcall EnumEnhMetaFile(ptr long ptr ptr ptr) +@ stdcall EnumFontFamiliesA(ptr str ptr long) +@ stdcall EnumFontFamiliesExA(ptr ptr ptr long long) +@ stdcall EnumFontFamiliesExW(ptr ptr ptr long long) +@ stdcall EnumFontFamiliesW(ptr wstr ptr long) +@ stdcall EnumFontsA(ptr str ptr long) +@ stdcall EnumFontsW(ptr wstr ptr long) @ stdcall EnumICMProfilesA(long ptr long) @ stdcall EnumICMProfilesW(long ptr long) @ stdcall EnumMetaFile(long long ptr ptr) @ stdcall EnumObjects(long long ptr long) @ stdcall EqualRgn(long long) NtGdiEqualRgn -@ stdcall Escape(long long long ptr ptr) +@ stdcall Escape(ptr long long ptr ptr) @ stdcall EudcLoadLinkW(wstr wstr long long) @ stdcall EudcUnloadLinkW(wstr wstr) @ stdcall ExcludeClipRect(long long long long long) @@ -229,13 +229,13 @@ @ stdcall FONTOBJ_pvTrueTypeFontFile(ptr ptr) NtGdiFONTOBJ_pvTrueTypeFontFile @ stdcall FONTOBJ_pxoGetXform(ptr) NtGdiFONTOBJ_pxoGetXform @ stdcall FONTOBJ_vGetInfo(ptr long ptr) NtGdiFONTOBJ_vGetInfo -@ stdcall FillPath(long) -@ stdcall FillRgn(long long long) -@ stdcall FixBrushOrgEx(long long long ptr) -@ stdcall FlattenPath(long) -@ stdcall FloodFill(long long long long) -@ stdcall FontIsLinked(long) NtGdiFontIsLinked -@ stdcall FrameRgn(long long long long long) +@ stdcall FillPath(ptr) +@ stdcall FillRgn(ptr long long) +@ stdcall FixBrushOrgEx(ptr long long ptr) +@ stdcall FlattenPath(ptr) +@ stdcall FloodFill(ptr long long long) +@ stdcall FontIsLinked(ptr) NtGdiFontIsLinked +@ stdcall FrameRgn(ptr ptr ptr long long) @ stdcall GdiAddFontResourceW(ptr ptr ptr) @ stdcall GdiAddGlsBounds(ptr ptr) @ stdcall GdiAddGlsRecord(ptr long ptr ptr) @@ -350,8 +350,8 @@ @ stdcall GetCharWidthW(long long long long) @ stdcall GetCharacterPlacementA(long str long long ptr long) @ stdcall GetCharacterPlacementW(long wstr long long ptr long) -@ stdcall GetClipBox(long ptr) -@ stdcall GetClipRgn(long long) +@ stdcall GetClipBox(ptr ptr) +@ stdcall GetClipRgn(ptr long) @ stdcall GetColorAdjustment(long ptr) NtGdiGetColorAdjustment @ stdcall GetColorSpace(long) @ stdcall GetCurrentObject(long long)

1 0

[tkreuzer] 65887: [WINE] Add LOGBRUSH16 and LOGPEN16 to wingdi16.h
by tkreuzer＠svn.reactos.org 29 Dec '14

29 Dec '14

Author: tkreuzer Date: Mon Dec 29 13:12:15 2014 New Revision: 65887 URL: http://svn.reactos.org/svn/reactos?rev=65887&view=rev Log: [WINE] Add LOGBRUSH16 and LOGPEN16 to wingdi16.h Modified: trunk/reactos/include/reactos/wine/wingdi16.h Modified: trunk/reactos/include/reactos/wine/wingdi16.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/wingd… ============================================================================== --- trunk/reactos/include/reactos/wine/wingdi16.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/wingdi16.h [iso-8859-1] Mon Dec 29 13:12:15 2014 @@ -29,6 +29,13 @@ typedef struct { + UINT16 lbStyle; + COLORREF lbColor; + INT16 lbHatch; +} LOGBRUSH16, *LPLOGBRUSH16; + +typedef struct +{ INT16 lfHeight; INT16 lfWidth; INT16 lfEscapement; @@ -53,6 +60,13 @@ HMETAFILE16 hMF; } METAFILEPICT16, *LPMETAFILEPICT16; +typedef struct +{ + UINT16 lopnStyle; + POINT16 lopnWidth; + COLORREF lopnColor; +} LOGPEN16, *LPLOGPEN16; + #include <poppack.h> #endif /* __WINE_WINE_WINGDI16_H */

1 0

[tkreuzer] 65886: [WIN32K] Implement GdiGetEMFRestorDc case in NtGdiGetDCDword
by tkreuzer＠svn.reactos.org 29 Dec '14

29 Dec '14

Author: tkreuzer Date: Mon Dec 29 13:12:10 2014 New Revision: 65886 URL: http://svn.reactos.org/svn/reactos?rev=65886&view=rev Log: [WIN32K] Implement GdiGetEMFRestorDc case in NtGdiGetDCDword Modified: trunk/reactos/win32ss/gdi/ntgdi/dcutil.c Modified: trunk/reactos/win32ss/gdi/ntgdi/dcutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dcutil.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dcutil.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dcutil.c [iso-8859-1] Mon Dec 29 13:12:10 2014 @@ -429,6 +429,7 @@ break; case GdiGetEMFRestorDc: + SafeResult = pdc->dclevel.lSaveDepth; break; case GdiGetFontLanguageInfo:

1 0

[tkreuzer] 65885: [WIN32K] - Implement GreCreateCompatibleDC, allowing to pass in a boolean value, specifying the DC type (normal or "alternative" DC, aka metafile DC) - Properly implement NtGdiCre...
by tkreuzer＠svn.reactos.org 29 Dec '14

29 Dec '14

Author: tkreuzer Date: Mon Dec 29 13:12:05 2014 New Revision: 65885 URL: http://svn.reactos.org/svn/reactos?rev=65885&view=rev Log: [WIN32K] - Implement GreCreateCompatibleDC, allowing to pass in a boolean value, specifying the DC type (normal or "alternative" DC, aka metafile DC) - Properly implement NtGdiCreateMetafileDC around GreCreateCompatibleDC Modified: trunk/reactos/win32ss/gdi/ntgdi/dc.h trunk/reactos/win32ss/gdi/ntgdi/dclife.c trunk/reactos/win32ss/gdi/ntgdi/dcstate.c trunk/reactos/win32ss/gdi/ntgdi/metafile.c Modified: trunk/reactos/win32ss/gdi/ntgdi/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dc.h?rev… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dc.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dc.h [iso-8859-1] Mon Dec 29 13:12:05 2014 @@ -182,7 +182,7 @@ INIT_FUNCTION NTSTATUS NTAPI InitDcImpl(VOID); PPDEVOBJ FASTCALL IntEnumHDev(VOID); -PDC NTAPI DC_AllocDcWithHandle(VOID); +PDC NTAPI DC_AllocDcWithHandle(GDILOOBJTYPE eDcObjType); BOOL NTAPI DC_bAllocDcAttr(PDC pdc); VOID NTAPI DC_vCleanup(PVOID ObjectBody); BOOL FASTCALL IntGdiDeleteDC(HDC, BOOL); @@ -205,6 +205,7 @@ VOID FASTCALL IntvGetDeviceCaps(PPDEVOBJ, PDEVCAPS); BOOL NTAPI GreSetDCOwner(HDC hdc, ULONG ulOwner); +HDC APIENTRY GreCreateCompatibleDC(HDC hdc, BOOL bAltDc); VOID NTAPI @@ -219,7 +220,8 @@ pdc = GDIOBJ_LockObject(hdc, GDIObjType_DC_TYPE); if (pdc) { - ASSERT(GDI_HANDLE_GET_TYPE(pdc->BaseObject.hHmgr) == GDILoObjType_LO_DC_TYPE); + ASSERT((GDI_HANDLE_GET_TYPE(pdc->BaseObject.hHmgr) == GDILoObjType_LO_DC_TYPE) || + (GDI_HANDLE_GET_TYPE(pdc->BaseObject.hHmgr) == GDILoObjType_LO_ALTDC_TYPE)); ASSERT(pdc->dclevel.plfnt != NULL); ASSERT(GDI_HANDLE_GET_TYPE(((POBJ)pdc->dclevel.plfnt)->hHmgr) == GDILoObjType_LO_FONT_TYPE); } Modified: trunk/reactos/win32ss/gdi/ntgdi/dclife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dclife.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dclife.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dclife.c [iso-8859-1] Mon Dec 29 13:12:05 2014 @@ -66,10 +66,14 @@ PDC NTAPI -DC_AllocDcWithHandle() +DC_AllocDcWithHandle(GDILOOBJTYPE eDcObjType) { PDC pdc; + NT_ASSERT((eDcObjType == GDILoObjType_LO_DC_TYPE) || + (eDcObjType == GDILoObjType_LO_ALTDC_TYPE)); + + /* Allocate the object */ pdc = (PDC)GDIOBJ_AllocateObject(GDIObjType_DC_TYPE, sizeof(DC), BASEFLAG_LOOKASIDE); @@ -79,6 +83,10 @@ return NULL; } + /* Set the actual DC type */ + pdc->BaseObject.hHmgr = UlongToHandle(eDcObjType); + + /* Insert the object */ if (!GDIOBJ_hInsertObject(&pdc->BaseObject, GDI_OBJ_HMGR_POWNED)) { DPRINT1("Could not insert DC into handle table.\n"); @@ -95,6 +103,15 @@ void DC_InitHack(PDC pdc) { + if (defaultDCstate == NULL) + { + defaultDCstate = ExAllocatePoolWithTag(PagedPool, sizeof(DC), TAG_DC); + ASSERT(defaultDCstate); + RtlZeroMemory(defaultDCstate, sizeof(DC)); + defaultDCstate->pdcattr = &defaultDCstate->dcattr; + DC_vCopyState(pdc, defaultDCstate, TRUE); + } + TextIntRealizeFont(pdc->pdcattr->hlfntNew,NULL); pdc->pdcattr->iCS_CP = ftGdiGetTextCharsetInfo(pdc,NULL,0); @@ -327,15 +344,6 @@ pdc->dcattr.iGraphicsMode = GM_COMPATIBLE; pdc->dcattr.iCS_CP = 0; pdc->pSurfInfo = NULL; - - if (defaultDCstate == NULL) - { - defaultDCstate = ExAllocatePoolWithTag(PagedPool, sizeof(DC), TAG_DC); - ASSERT(defaultDCstate); - RtlZeroMemory(defaultDCstate, sizeof(DC)); - defaultDCstate->pdcattr = &defaultDCstate->dcattr; - DC_vCopyState(pdc, defaultDCstate, TRUE); - } } VOID @@ -631,7 +639,7 @@ DPRINT("GreOpenDCW - ppdev = %p\n", ppdev); - pdc = DC_AllocDcWithHandle(); + pdc = DC_AllocDcWithHandle(GDILoObjType_LO_DC_TYPE); if (!pdc) { DPRINT1("Could not Allocate a DC\n"); @@ -755,8 +763,9 @@ HDC APIENTRY -NtGdiCreateCompatibleDC(HDC hdc) -{ +GreCreateCompatibleDC(HDC hdc, BOOL bAltDc) +{ + GDILOOBJTYPE eDcObjType; HDC hdcNew; PPDEVOBJ ppdev; PDC pdc, pdcNew; @@ -794,7 +803,8 @@ } /* Allocate a new DC */ - pdcNew = DC_AllocDcWithHandle(); + eDcObjType = bAltDc ? GDILoObjType_LO_ALTDC_TYPE : GDILoObjType_LO_DC_TYPE; + pdcNew = DC_AllocDcWithHandle(eDcObjType); if (!pdcNew) { DPRINT1("Could not allocate a new DC\n"); @@ -804,7 +814,7 @@ hdcNew = pdcNew->BaseObject.hHmgr; /* Lock ppdev and initialize the new DC */ - DC_vInitDc(pdcNew, DCTYPE_MEMORY, ppdev); + DC_vInitDc(pdcNew, bAltDc ? DCTYPE_INFO : DCTYPE_MEMORY, ppdev); /* FIXME: HACK! */ DC_InitHack(pdcNew); @@ -816,6 +826,14 @@ DPRINT("Leave NtGdiCreateCompatibleDC hdcNew = %p\n", hdcNew); return hdcNew; +} + +HDC +APIENTRY +NtGdiCreateCompatibleDC(HDC hdc) +{ + /* Call the internal function to create a normal memory DC */ + return GreCreateCompatibleDC(hdc, FALSE); } BOOL Modified: trunk/reactos/win32ss/gdi/ntgdi/dcstate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dcstate.… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dcstate.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dcstate.c [iso-8859-1] Mon Dec 29 13:12:05 2014 @@ -262,7 +262,7 @@ } /* Allocate a new dc */ - pdcSave = DC_AllocDcWithHandle(); + pdcSave = DC_AllocDcWithHandle(GDILoObjType_LO_DC_TYPE); if (pdcSave == NULL) { DPRINT("Could not allocate a new DC\n"); Modified: trunk/reactos/win32ss/gdi/ntgdi/metafile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/metafile… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/metafile.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/metafile.c [iso-8859-1] Mon Dec 29 13:12:05 2014 @@ -34,23 +34,8 @@ APIENTRY NtGdiCreateMetafileDC(IN HDC hdc) { - PDC pDc; - HDC ret = NULL; - - if (hdc) - { - pDc = DC_LockDc(hdc); - if (pDc) - { // Not sure this is right for getting the HDEV handle, maybe Timo could help or just if'ed it out. - ret = IntGdiCreateDisplayDC(pDc->ppdev->BaseObject.hHmgr, DC_TYPE_INFO, TRUE); - DC_UnlockDc(pDc); - } - } - else - { - ret = UserGetDesktopDC(DC_TYPE_INFO, TRUE, FALSE); - } - return ret; + /* Call the internal function to create an alternative info DC */ + return GreCreateCompatibleDC(hdc, TRUE); } /* @@ -68,7 +53,7 @@ UNIMPLEMENTED; return NULL; } - + /* * @unimplemented */

1 0

[tkreuzer] 65884: [WIN32K] - Implement NtGdiGetObjectBitmapHandle - Set BR_IS_DIBPALCOLORS in IntGdiCreateDIBBrush
by tkreuzer＠svn.reactos.org 29 Dec '14

29 Dec '14

Author: tkreuzer Date: Mon Dec 29 13:11:59 2014 New Revision: 65884 URL: http://svn.reactos.org/svn/reactos?rev=65884&view=rev Log: [WIN32K] - Implement NtGdiGetObjectBitmapHandle - Set BR_IS_DIBPALCOLORS in IntGdiCreateDIBBrush Modified: trunk/reactos/win32ss/gdi/eng/stubs.c trunk/reactos/win32ss/gdi/ntgdi/brush.c Modified: trunk/reactos/win32ss/gdi/eng/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/stubs.c?re… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/stubs.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/stubs.c [iso-8859-1] Mon Dec 29 13:11:59 2014 @@ -923,18 +923,6 @@ return FALSE; } -/* - * @unimplemented - */ -HBRUSH -APIENTRY -NtGdiClearBrushAttributes( - IN HBRUSH hbm, - IN DWORD dwFlags) -{ - UNIMPLEMENTED; - return NULL; -} /* * @unimplemented @@ -1259,19 +1247,6 @@ /* * @unimplemented */ -HBITMAP -APIENTRY -NtGdiGetObjectBitmapHandle( - IN HBRUSH hbr, - OUT UINT *piUsage) -{ - UNIMPLEMENTED; - return 0; -} - -/* - * @unimplemented - */ BOOL APIENTRY NtGdiGetMonitorID( @@ -1408,19 +1383,6 @@ { UNIMPLEMENTED; return 0; -} - -/* - * @unimplemented - */ -HBRUSH -APIENTRY -NtGdiSetBrushAttributes( - IN HBRUSH hbm, - IN DWORD dwFlags) -{ - UNIMPLEMENTED; - return NULL; } /* Modified: trunk/reactos/win32ss/gdi/ntgdi/brush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/brush.c?… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/brush.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/brush.c [iso-8859-1] Mon Dec 29 13:11:59 2014 @@ -200,10 +200,10 @@ HBRUSH APIENTRY IntGdiCreateDIBBrush( - CONST BITMAPINFO *BitmapInfo, - UINT ColorSpec, + const BITMAPINFO *BitmapInfo, + UINT uUsage, UINT BitmapInfoSize, - CONST VOID *PackedDIB) + const VOID* pvClient) { HBRUSH hBrush; PBRUSH pbrush; @@ -217,9 +217,9 @@ return NULL; } - DataPtr = (ULONG_PTR)BitmapInfo + DIB_BitmapInfoSize(BitmapInfo, ColorSpec); - - hPattern = DIB_CreateDIBSection(NULL, BitmapInfo, ColorSpec, &pvDIBits, NULL, 0, 0); + DataPtr = (ULONG_PTR)BitmapInfo + DIB_BitmapInfoSize(BitmapInfo, uUsage); + + hPattern = DIB_CreateDIBSection(NULL, BitmapInfo, uUsage, &pvDIBits, NULL, 0, 0); if (hPattern == NULL) { EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); @@ -241,8 +241,10 @@ hBrush = pbrush->BaseObject.hHmgr; pbrush->flAttrs |= BR_IS_BITMAP | BR_IS_DIB; + if (uUsage == DIB_PAL_COLORS) + pbrush->flAttrs |= BR_IS_DIBPALCOLORS; pbrush->hbmPattern = hPattern; - pbrush->hbmClient = (HBITMAP)PackedDIB; + pbrush->hbmClient = (HBITMAP)pvClient; /* FIXME: Fill in the rest of fields!!! */ GreSetObjectOwner(hPattern, GDI_OBJ_HMGR_PUBLIC); @@ -460,5 +462,76 @@ return IntGdiCreateSolidBrush(Color); } +HBITMAP +APIENTRY +NtGdiGetObjectBitmapHandle( + _In_ HBRUSH hbr, + _Out_ UINT *piUsage) +{ + HBITMAP hbmPattern; + PBRUSH pbr; + + /* Lock the brush */ + pbr = BRUSH_ShareLockBrush(hbr); + if (pbr == NULL) + { + DPRINT1("Could not lock brush\n"); + return NULL; + } + + /* Get the pattern bitmap handle */ + hbmPattern = pbr->hbmPattern; + + _SEH2_TRY + { + ProbeForWrite(piUsage, sizeof(*piUsage), sizeof(*piUsage)); + + /* Set usage according to flags */ + if (pbr->flAttrs & BR_IS_DIBPALCOLORS) + *piUsage = DIB_PAL_COLORS; + else + *piUsage = DIB_RGB_COLORS; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + DPRINT1("Got exception!\n"); + hbmPattern = NULL; + } + _SEH2_END; + + /* Unlock the brush */ + BRUSH_ShareUnlockBrush(pbr); + + /* Return the pattern bitmap handle */ + return hbmPattern; +} + +/* + * @unimplemented + */ +HBRUSH +APIENTRY +NtGdiSetBrushAttributes( + IN HBRUSH hbm, + IN DWORD dwFlags) +{ + UNIMPLEMENTED; + return NULL; +} + + +/* + * @unimplemented + */ +HBRUSH +APIENTRY +NtGdiClearBrushAttributes( + IN HBRUSH hbr, + IN DWORD dwFlags) +{ + UNIMPLEMENTED; + return NULL; +} + /* EOF */

1 0

[tkreuzer] 65883: [GDI32] In DeleteObject handle ALTDC type, factor out GdiDeleteBrushOrPen, improve code a bit
by tkreuzer＠svn.reactos.org 29 Dec '14

29 Dec '14

Author: tkreuzer Date: Mon Dec 29 13:11:54 2014 New Revision: 65883 URL: http://svn.reactos.org/svn/reactos?rev=65883&view=rev Log: [GDI32] In DeleteObject handle ALTDC type, factor out GdiDeleteBrushOrPen, improve code a bit Modified: trunk/reactos/win32ss/gdi/gdi32/objects/gdiobj.c Modified: trunk/reactos/win32ss/gdi/gdi32/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/objects/gdiobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/objects/gdiobj.c [iso-8859-1] Mon Dec 29 13:11:54 2014 @@ -276,84 +276,92 @@ return cbResult; } - -/* - * @implemented - */ +static BOOL +GdiDeleteBrushOrPen( + HGDIOBJ hobj) +{ + GDILOOBJTYPE eObjectType; + PBRUSH_ATTR pbrattr; + PTEB pTeb; + PGDIBSOBJECT pgO; + + eObjectType = GDI_HANDLE_GET_TYPE(hobj); + + if ((GdiGetHandleUserData(hobj, eObjectType, (PVOID*)&pbrattr)) && + (pbrattr != NULL)) + { + pTeb = NtCurrentTeb(); + if (pTeb->Win32ThreadInfo != NULL) + { + pgO = GdiAllocBatchCommand(NULL, GdiBCDelObj); + if (pgO) + { + /// FIXME: we need to mark the object as deleted! + pgO->hgdiobj = hobj; + return TRUE; + } + } + } + + return NtGdiDeleteObjectApp(hobj); +} + +/* + * @implemented + */ +BOOL WINAPI DeleteObject(HGDIOBJ hObject) { - DWORD dwType = 0; - - /* From Wine: DeleteObject does not SetLastError() on a null object */ - if(!hObject) return FALSE; - - if ((DWORD)hObject & GDI_HANDLE_STOCK_MASK) - { - // Relax! This is a normal return! + /* Check if the handle is valid (FIXME: we need some special + sauce for the stock object flag) */ + if (!GdiIsHandleValid(hObject)) + return FALSE; + + /* Check if this is a stock object */ + if ((DWORD_PTR)hObject & GDI_HANDLE_STOCK_MASK) + { + /* Ignore the attempt to delete a stock object */ DPRINT("Trying to delete system object 0x%p\n", hObject); return TRUE; } - // If you dont own it?! Get OUT! - if(!GdiIsHandleValid(hObject)) return FALSE; - - dwType = GDI_HANDLE_GET_TYPE(hObject); - - if ((dwType == GDI_OBJECT_TYPE_METAFILE) || - (dwType == GDI_OBJECT_TYPE_ENHMETAFILE)) - return FALSE; - - switch (dwType) - { - case GDI_OBJECT_TYPE_DC: - return DeleteDC((HDC) hObject); - case GDI_OBJECT_TYPE_COLORSPACE: - return NtGdiDeleteColorSpace((HCOLORSPACE) hObject); - case GDI_OBJECT_TYPE_REGION: - return DeleteRegion((HRGN) hObject); + /* Switch by object type */ + switch (GDI_HANDLE_GET_TYPE(hObject)) + { + case GDILoObjType_LO_METAFILE16_TYPE: + case GDILoObjType_LO_METAFILE_TYPE: + return FALSE; + + case GDILoObjType_LO_DC_TYPE: + case GDILoObjType_LO_ALTDC_TYPE: + return DeleteDC(hObject); + + case GDILoObjType_LO_ICMLCS_TYPE: + return NtGdiDeleteColorSpace(hObject); + + case GDILoObjType_LO_REGION_TYPE: + return DeleteRegion(hObject); #if 0 - case GDI_OBJECT_TYPE_METADC: - return MFDRV_DeleteObject( hObject ); - case GDI_OBJECT_TYPE_EMF: - { - PLDC pLDC = GdiGetLDC(hObject); - if ( !pLDC ) return FALSE; - return EMFDRV_DeleteObject( hObject ); - } + case GDI_OBJECT_TYPE_METADC: + return MFDRV_DeleteObject( hObject ); + case GDI_OBJECT_TYPE_EMF: + { + PLDC pLDC = GdiGetLDC(hObject); + if ( !pLDC ) return FALSE; + return EMFDRV_DeleteObject( hObject ); + } #endif - case GDI_OBJECT_TYPE_FONT: - break; - - case GDI_OBJECT_TYPE_BRUSH: - case GDI_OBJECT_TYPE_EXTPEN: - case GDI_OBJECT_TYPE_PEN: - { - PBRUSH_ATTR Brh_Attr; - PTEB pTeb; - PGDIBSOBJECT pgO; - - if ((!GdiGetHandleUserData(hObject, dwType, (PVOID*)&Brh_Attr)) || - (Brh_Attr == NULL)) break; - - pTeb = NtCurrentTeb(); - - if (pTeb->Win32ThreadInfo == NULL) break; - - pgO = GdiAllocBatchCommand(NULL, GdiBCDelObj); - if (pgO) - { - pgO->hgdiobj = hObject; - return TRUE; - } - - break; - } - - case GDI_OBJECT_TYPE_BITMAP: - default: - break; + case GDILoObjType_LO_BRUSH_TYPE: + case GDILoObjType_LO_PEN_TYPE: + case GDILoObjType_LO_EXTPEN_TYPE: + return GdiDeleteBrushOrPen(hObject); + + case GDILoObjType_LO_FONT_TYPE: + case GDILoObjType_LO_BITMAP_TYPE: + default: + break; } return NtGdiDeleteObjectApp(hObject);

1 0

[tkreuzer] 65882: [GDI32] Improve client object code
by tkreuzer＠svn.reactos.org 29 Dec '14

29 Dec '14

Author: tkreuzer Date: Mon Dec 29 13:11:48 2014 New Revision: 65882 URL: http://svn.reactos.org/svn/reactos?rev=65882&view=rev Log: [GDI32] Improve client object code Modified: trunk/reactos/win32ss/gdi/gdi32/include/gdi32p.h trunk/reactos/win32ss/gdi/gdi32/objects/clientobj.c Modified: trunk/reactos/win32ss/gdi/gdi32/include/gdi32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/include/… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/include/gdi32p.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/include/gdi32p.h [iso-8859-1] Mon Dec 29 13:11:48 2014 @@ -446,18 +446,32 @@ HGDIOBJ WINAPI -GdiInsertClientObj( +GdiCreateClientObj( _In_ PVOID pvObject, _In_ GDILOOBJTYPE eObjType); PVOID WINAPI -GdiGetClientObject( +GdiDeleteClientObj( _In_ HGDIOBJ hobj); +BOOL +WINAPI +GdiCreateClientObjLink( + _In_ HGDIOBJ hobj, + _In_ PVOID pvObject); + PVOID WINAPI -GdiRemoveClientObject( +GdiGetClientObjLink( _In_ HGDIOBJ hobj); +PVOID +WINAPI +GdiRemoveClientObjLink( + _In_ HGDIOBJ hobj); + +extern ULONG gcClientObj; + + /* EOF */ Modified: trunk/reactos/win32ss/gdi/gdi32/objects/clientobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/objects/clientobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/objects/clientobj.c [iso-8859-1] Mon Dec 29 13:11:48 2014 @@ -8,6 +8,7 @@ #include <precomp.h> CRITICAL_SECTION gcsClientObjLinks; +ULONG gcClientObj; typedef struct _CLIENTOBJLINK { @@ -18,37 +19,28 @@ PCLIENTOBJLINK gapcolHashTable[127]; -HGDIOBJ +BOOL WINAPI -GdiInsertClientObj( - _In_ PVOID pvObject, - _In_ GDILOOBJTYPE eObjType) +GdiCreateClientObjLink( + _In_ HGDIOBJ hobj, + _In_ PVOID pvObject) { PCLIENTOBJLINK pcol; ULONG iHashIndex; - HGDIOBJ hobj; - - /* Call win32k to create a client object handle */ - hobj = NtGdiCreateClientObj(eObjType); - if (hobj == NULL) - { - return NULL; - } - - /* Calculate the hash index */ - iHashIndex = (ULONG_PTR)hobj % _countof(gapcolHashTable); /* Allocate a link structure */ pcol = HeapAlloc(GetProcessHeap(), 0, sizeof(*pcol)); if (pcol == NULL) { - NtGdiDeleteClientObj(hobj); - return NULL; + return FALSE; } /* Setup the link structure */ pcol->hobj = hobj; pcol->pvObj = pvObject; + + /* Calculate the hash index */ + iHashIndex = (ULONG_PTR)hobj % _countof(gapcolHashTable); /* Enter the critical section */ EnterCriticalSection(&gcsClientObjLinks); @@ -56,16 +48,17 @@ /* Insert the link structure */ pcol->pcolNext = gapcolHashTable[iHashIndex]; gapcolHashTable[iHashIndex] = pcol; + gcClientObj++; /* Leave the critical section */ LeaveCriticalSection(&gcsClientObjLinks); - return hobj; + return TRUE; } PVOID WINAPI -GdiGetClientObject( +GdiGetClientObjLink( _In_ HGDIOBJ hobj) { ULONG iHashIndex; @@ -102,7 +95,7 @@ PVOID WINAPI -GdiRemoveClientObject( +GdiRemoveClientObjLink( _In_ HGDIOBJ hobj) { PCLIENTOBJLINK pcol, *ppcol; @@ -127,6 +120,7 @@ { /* Update the link pointer, removing this link */ *ppcol = pcol->pcolNext; + gcClientObj--; /* Get the object pointer */ pvObject = pcol->pvObj; @@ -148,3 +142,51 @@ /* Return the object pointer, or NULL if we did not find it */ return pvObject; } + +HGDIOBJ +WINAPI +GdiCreateClientObj( + _In_ PVOID pvObject, + _In_ GDILOOBJTYPE eObjType) +{ + HGDIOBJ hobj; + + /* Call win32k to create a client object handle */ + hobj = NtGdiCreateClientObj(eObjType); + if (hobj == NULL) + { + return NULL; + } + + /* Create the client object link */ + if (!GdiCreateClientObjLink(hobj, pvObject)) + { + NtGdiDeleteClientObj(hobj); + return NULL; + } + + return hobj; +} + +PVOID +WINAPI +GdiDeleteClientObj( + _In_ HGDIOBJ hobj) +{ + PVOID pvObject; + + /* Remove the client object link */ + pvObject = GdiRemoveClientObjLink(hobj); + if (pvObject == NULL) + { + return NULL; + } + + /* Call win32k to delete the handle */ + if (!NtGdiDeleteClientObj(hobj)) + { + ASSERT(FALSE); + } + + return pvObject; +}

1 0

[tkreuzer] 65881: [GDI32] Improve GetROP2and SetROP2
by tkreuzer＠svn.reactos.org 29 Dec '14

29 Dec '14

Author: tkreuzer Date: Mon Dec 29 13:11:40 2014 New Revision: 65881 URL: http://svn.reactos.org/svn/reactos?rev=65881&view=rev Log: [GDI32] Improve GetROP2and SetROP2 Modified: trunk/reactos/win32ss/gdi/gdi32/objects/dc.c Modified: trunk/reactos/win32ss/gdi/gdi32/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/objects/dc.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/objects/dc.c [iso-8859-1] Mon Dec 29 13:11:40 2014 @@ -1152,11 +1152,20 @@ */ int WINAPI -GetROP2(HDC hdc) -{ - PDC_ATTR Dc_Attr; - if (!GdiGetHandleUserData((HGDIOBJ) hdc, GDI_OBJECT_TYPE_DC, (PVOID) &Dc_Attr)) return 0; - return Dc_Attr->jROP2; +GetROP2( + _In_ HDC hdc) +{ + PDC_ATTR pdcattr; + + /* Get the DC attribute */ + pdcattr = GdiGetDcAttr(hdc); + if (pdcattr == NULL) + { + /* Do not set LastError here! */ + return 0; + } + + return pdcattr->jROP2; } /* @@ -1164,18 +1173,19 @@ */ int WINAPI -SetROP2(HDC hdc, - int fnDrawMode) -{ - PDC_ATTR Dc_Attr; - INT Old_ROP2; +SetROP2( + _In_ HDC hdc, + _In_ int rop2) +{ + PDC_ATTR pdcattr; + INT rop2Old; #if 0 // Handle something other than a normal dc object. if (GDI_HANDLE_GET_TYPE(hdc) != GDI_OBJECT_TYPE_DC) { if (GDI_HANDLE_GET_TYPE(hdc) == GDI_OBJECT_TYPE_METADC) - return MFDRV_SetROP2( hdc, fnDrawMode); + return MFDRV_SetROP2( hdc, rop2); else { PLDC pLDC = GdiGetLDC(hdc); @@ -1186,27 +1196,34 @@ } if (pLDC->iType == LDC_EMFLDC) { - return EMFDRV_SetROP2(( hdc, fnDrawMode); + return EMFDRV_SetROP2(( hdc, rop2); } return FALSE; } } #endif - if (!GdiGetHandleUserData((HGDIOBJ) hdc, GDI_OBJECT_TYPE_DC, (PVOID) &Dc_Attr)) return FALSE; + + /* Get the DC attribute */ + pdcattr = GdiGetDcAttr(hdc); + if (pdcattr == NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } if (NtCurrentTeb()->GdiTebBatch.HDC == hdc) { - if (Dc_Attr->ulDirty_ & DC_MODE_DIRTY) + if (pdcattr->ulDirty_ & DC_MODE_DIRTY) { NtGdiFlush(); - Dc_Attr->ulDirty_ &= ~DC_MODE_DIRTY; - } - } - - Old_ROP2 = Dc_Attr->jROP2; - Dc_Attr->jROP2 = fnDrawMode; - - return Old_ROP2; + pdcattr->ulDirty_ &= ~DC_MODE_DIRTY; + } + } + + rop2Old = pdcattr->jROP2; + pdcattr->jROP2 = (BYTE)rop2; + + return rop2Old; }

1 0

[tkreuzer] 65880: [GDI32] - Do not call BitBlt from StretchBlt when extension matches, this is handled in win32k - Use GdiGetDcAttr
by tkreuzer＠svn.reactos.org 29 Dec '14

29 Dec '14

Author: tkreuzer Date: Mon Dec 29 13:11:35 2014 New Revision: 65880 URL: http://svn.reactos.org/svn/reactos?rev=65880&view=rev Log: [GDI32] - Do not call BitBlt from StretchBlt when extension matches, this is handled in win32k - Use GdiGetDcAttr Modified: trunk/reactos/win32ss/gdi/gdi32/objects/painting.c Modified: trunk/reactos/win32ss/gdi/gdi32/objects/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/objects/painting.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/objects/painting.c [iso-8859-1] Mon Dec 29 13:11:35 2014 @@ -66,7 +66,13 @@ } } #endif - if (!GdiGetHandleUserData((HGDIOBJ) hdc, GDI_OBJECT_TYPE_DC, (PVOID) &pdcattr)) return FALSE; + /* Get the DC attribute */ + pdcattr = GdiGetDcAttr(hdc); + if (pdcattr == NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } if (ppt) { @@ -852,33 +858,18 @@ _In_ INT cySrc, _In_ DWORD dwRop) { - if ((cxDest != cxSrc) || (cyDest != cySrc)) - { - return NtGdiStretchBlt(hdcDest, - xDest, - yDest, - cxDest, - cyDest, - hdcSrc, - xSrc, - ySrc, - cxSrc, - cySrc, - dwRop, - 0); - } - - return NtGdiBitBlt(hdcDest, - xDest, - yDest, - cxDest, - cyDest, - hdcSrc, - xSrc, - ySrc, - dwRop, - 0, - 0); + return NtGdiStretchBlt(hdcDest, + xDest, + yDest, + cxDest, + cyDest, + hdcSrc, + xSrc, + ySrc, + cxSrc, + cySrc, + dwRop, + 0); }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs