diff --git a/reactos/include/win32k/dc.h b/reactos/include/win32k/dc.h index f6505798b9a..74c4d092b81 100644 --- a/reactos/include/win32k/dc.h +++ b/reactos/include/win32k/dc.h @@ -173,7 +173,7 @@ BOOL FASTCALL DC_InvertXform(const XFORM *xformSrc, XFORM *xformDest); /* User entry points */ BOOL STDCALL NtGdiCancelDC(HDC hDC); -HDC STDCALL NtGdiCreateCompatableDC(HDC hDC); +HDC STDCALL NtGdiCreateCompatibleDC(HDC hDC); HDC STDCALL NtGdiCreateDC(PUNICODE_STRING Driver, PUNICODE_STRING Device, PUNICODE_STRING Output, diff --git a/reactos/lib/gdi32/gdi32.def b/reactos/lib/gdi32/gdi32.def index a99a73b713c..e3ac5cf18a0 100644 --- a/reactos/lib/gdi32/gdi32.def +++ b/reactos/lib/gdi32/gdi32.def @@ -53,7 +53,7 @@ CreateBrushIndirect@4 CreateColorSpaceA@4 CreateColorSpaceW@4 CreateCompatibleBitmap@12=NtGdiCreateCompatibleBitmap@12 -CreateCompatibleDC@4=NtGdiCreateCompatableDC@4 +CreateCompatibleDC@4=NtGdiCreateCompatibleDC@4 CreateDCA@16 CreateDCW@16 CreateDIBPatternBrush@8 diff --git a/reactos/subsys/win32k/ntuser/cursoricon.c b/reactos/subsys/win32k/ntuser/cursoricon.c index d092cae8add..86aac8b8c8f 100644 --- a/reactos/subsys/win32k/ntuser/cursoricon.c +++ b/reactos/subsys/win32k/ntuser/cursoricon.c @@ -1360,7 +1360,7 @@ NtUserDrawIconEx( r.right = cxWidth; r.bottom = cyWidth; - hdcOff = NtGdiCreateCompatableDC(hdc); + hdcOff = NtGdiCreateCompatibleDC(hdc); if(!hdcOff) goto done; @@ -1376,7 +1376,7 @@ NtUserDrawIconEx( NtGdiSelectObject(hdcOff, hbmOff); } - hdcMem = NtGdiCreateCompatableDC(hdc); + hdcMem = NtGdiCreateCompatibleDC(hdc); if(!hdcMem) goto cleanup; diff --git a/reactos/subsys/win32k/ntuser/desktop.c b/reactos/subsys/win32k/ntuser/desktop.c index d7853997e1c..f3fc283d8a4 100644 --- a/reactos/subsys/win32k/ntuser/desktop.c +++ b/reactos/subsys/win32k/ntuser/desktop.c @@ -1232,7 +1232,7 @@ NtUserPaintDesktop(HDC hDC) x = (sz.cx / 2) - (WinSta->cxWallpaper / 2); y = (sz.cy / 2) - (WinSta->cyWallpaper / 2); - hWallpaperDC = NtGdiCreateCompatableDC(hDC); + hWallpaperDC = NtGdiCreateCompatibleDC(hDC); if(hWallpaperDC != NULL) { HBITMAP hOldBitmap; diff --git a/reactos/subsys/win32k/objects/bitmaps.c b/reactos/subsys/win32k/objects/bitmaps.c index e9d0272c6e3..ce69a5fdf39 100644 --- a/reactos/subsys/win32k/objects/bitmaps.c +++ b/reactos/subsys/win32k/objects/bitmaps.c @@ -661,7 +661,7 @@ NtGdiGetPixel(HDC hDC, INT XPos, INT YPos) if ( bInRect && Result == CLR_INVALID ) { // FIXME: create a 1x1 32BPP DIB, and blit to it - HDC hDCTmp = NtGdiCreateCompatableDC(hDC); + HDC hDCTmp = NtGdiCreateCompatibleDC(hDC); if ( hDCTmp ) { static const BITMAPINFOHEADER bih = { sizeof(BITMAPINFOHEADER), 1, 1, 1, 32, BI_RGB, 0, 0, 0, 0, 0 }; @@ -860,13 +860,13 @@ NtGdiMaskBlt ( return NtGdiBitBlt(hdcDest, nXDest, nYDest, nWidth, nHeight, hdcSrc, nXSrc, nYSrc, FRGND_ROP3(dwRop)); /* 1. make mask bitmap's dc */ - hDCMask = NtGdiCreateCompatableDC(hdcDest); + hDCMask = NtGdiCreateCompatibleDC(hdcDest); hOldMaskBitmap = (HBITMAP)NtGdiSelectObject(hDCMask, hbmMask); /* 2. make masked Background bitmap */ /* 2.1 make bitmap */ - hDC1 = NtGdiCreateCompatableDC(hdcDest); + hDC1 = NtGdiCreateCompatibleDC(hdcDest); hBitmap2 = NtGdiCreateCompatibleBitmap(hdcDest, nWidth, nHeight); hOldBitmap2 = (HBITMAP)NtGdiSelectObject(hDC1, hBitmap2); @@ -878,7 +878,7 @@ NtGdiMaskBlt ( /* 3. make masked Foreground bitmap */ /* 3.1 make bitmap */ - hDC2 = NtGdiCreateCompatableDC(hdcDest); + hDC2 = NtGdiCreateCompatibleDC(hdcDest); hBitmap3 = NtGdiCreateCompatibleBitmap(hdcDest, nWidth, nHeight); hOldBitmap3 = (HBITMAP)NtGdiSelectObject(hDC2, hBitmap3); diff --git a/reactos/subsys/win32k/objects/dc.c b/reactos/subsys/win32k/objects/dc.c index b574cb1c953..95ae8bd7e61 100644 --- a/reactos/subsys/win32k/objects/dc.c +++ b/reactos/subsys/win32k/objects/dc.c @@ -139,7 +139,7 @@ NtGdiCancelDC(HDC hDC) } HDC STDCALL -NtGdiCreateCompatableDC(HDC hDC) +NtGdiCreateCompatibleDC(HDC hDC) { PDC NewDC, OrigDC; HBITMAP hBitmap; @@ -808,7 +808,7 @@ IntGdiCreateDC(PUNICODE_STRING Driver, if ((hNewDC = DC_FindOpenDC(Driver)) != NULL) { hDC = hNewDC; - return NtGdiCreateCompatableDC(hDC); + return NtGdiCreateCompatibleDC(hDC); } if (Driver != NULL && Driver->Buffer != NULL) diff --git a/reactos/subsys/win32k/objects/dib.c b/reactos/subsys/win32k/objects/dib.c index 60a3cc46d71..3ea2080a02c 100644 --- a/reactos/subsys/win32k/objects/dib.c +++ b/reactos/subsys/win32k/objects/dib.c @@ -544,7 +544,7 @@ INT STDCALL NtGdiStretchDIBits(HDC hDC, return 0; } - hdcMem = NtGdiCreateCompatableDC(hDC); + hdcMem = NtGdiCreateCompatibleDC(hDC); hBitmap = NtGdiCreateCompatibleBitmap(hDC, BitsInfo->bmiHeader.biWidth, BitsInfo->bmiHeader.biHeight); hOldBitmap = NtGdiSelectObject(hdcMem, hBitmap); @@ -772,7 +772,7 @@ HBITMAP STDCALL NtGdiCreateDIBSection(HDC hDC, // If the reference hdc is null, take the desktop dc if (hDC == 0) { - hDC = NtGdiCreateCompatableDC(0); + hDC = NtGdiCreateCompatibleDC(0); bDesktopDC = TRUE; } diff --git a/reactos/tools/nci/w32ksvc.db b/reactos/tools/nci/w32ksvc.db index 1616bda1a68..16e38103b72 100644 --- a/reactos/tools/nci/w32ksvc.db +++ b/reactos/tools/nci/w32ksvc.db @@ -24,7 +24,7 @@ NtGdiCreateBitmap 5 NtGdiCreateBitmapIndirect 1 NtGdiCreateColorSpace 1 NtGdiCreateCompatibleBitmap 3 -NtGdiCreateCompatableDC 1 +NtGdiCreateCompatibleDC 1 NtGdiCreateDC 4 NtGdiCreateDIBitmap 6 NtGdiCreateDIBBrush 4