This NtGdiCreateCompatableDC misspelling has annoyed me long enough now Modified: trunk/reactos/include/win32k/dc.h Modified: trunk/reactos/lib/gdi32/gdi32.def Modified: trunk/reactos/subsys/win32k/ntuser/cursoricon.c Modified: trunk/reactos/subsys/win32k/ntuser/desktop.c Modified: trunk/reactos/subsys/win32k/objects/bitmaps.c Modified: trunk/reactos/subsys/win32k/objects/dc.c Modified: trunk/reactos/subsys/win32k/objects/dib.c Modified: trunk/reactos/tools/nci/w32ksvc.db _____
Modified: trunk/reactos/include/win32k/dc.h --- trunk/reactos/include/win32k/dc.h 2005-09-24 19:17:00 UTC (rev 18033) +++ trunk/reactos/include/win32k/dc.h 2005-09-24 19:30:12 UTC (rev 18034) @@ -173,7 +173,7 @@
/* 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, _____
Modified: trunk/reactos/lib/gdi32/gdi32.def --- trunk/reactos/lib/gdi32/gdi32.def 2005-09-24 19:17:00 UTC (rev 18033) +++ trunk/reactos/lib/gdi32/gdi32.def 2005-09-24 19:30:12 UTC (rev 18034) @@ -53,7 +53,7 @@
CreateColorSpaceA@4 CreateColorSpaceW@4 CreateCompatibleBitmap@12=NtGdiCreateCompatibleBitmap@12 -CreateCompatibleDC@4=NtGdiCreateCompatableDC@4 +CreateCompatibleDC@4=NtGdiCreateCompatibleDC@4 CreateDCA@16 CreateDCW@16 CreateDIBPatternBrush@8 _____
Modified: trunk/reactos/subsys/win32k/ntuser/cursoricon.c --- trunk/reactos/subsys/win32k/ntuser/cursoricon.c 2005-09-24 19:17:00 UTC (rev 18033) +++ trunk/reactos/subsys/win32k/ntuser/cursoricon.c 2005-09-24 19:30:12 UTC (rev 18034) @@ -1360,7 +1360,7 @@
r.right = cxWidth; r.bottom = cyWidth;
- hdcOff = NtGdiCreateCompatableDC(hdc); + hdcOff = NtGdiCreateCompatibleDC(hdc); if(!hdcOff) goto done;
@@ -1376,7 +1376,7 @@ NtGdiSelectObject(hdcOff, hbmOff); }
- hdcMem = NtGdiCreateCompatableDC(hdc); + hdcMem = NtGdiCreateCompatibleDC(hdc); if(!hdcMem) goto cleanup;
_____
Modified: trunk/reactos/subsys/win32k/ntuser/desktop.c --- trunk/reactos/subsys/win32k/ntuser/desktop.c 2005-09-24 19:17:00 UTC (rev 18033) +++ trunk/reactos/subsys/win32k/ntuser/desktop.c 2005-09-24 19:30:12 UTC (rev 18034) @@ -1232,7 +1232,7 @@
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; _____
Modified: trunk/reactos/subsys/win32k/objects/bitmaps.c --- trunk/reactos/subsys/win32k/objects/bitmaps.c 2005-09-24 19:17:00 UTC (rev 18033) +++ trunk/reactos/subsys/win32k/objects/bitmaps.c 2005-09-24 19:30:12 UTC (rev 18034) @@ -661,7 +661,7 @@
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 @@ 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 @@ /* 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);
_____
Modified: trunk/reactos/subsys/win32k/objects/dc.c --- trunk/reactos/subsys/win32k/objects/dc.c 2005-09-24 19:17:00 UTC (rev 18033) +++ trunk/reactos/subsys/win32k/objects/dc.c 2005-09-24 19:30:12 UTC (rev 18034) @@ -139,7 +139,7 @@
}
HDC STDCALL -NtGdiCreateCompatableDC(HDC hDC) +NtGdiCreateCompatibleDC(HDC hDC) { PDC NewDC, OrigDC; HBITMAP hBitmap; @@ -808,7 +808,7 @@ if ((hNewDC = DC_FindOpenDC(Driver)) != NULL) { hDC = hNewDC; - return NtGdiCreateCompatableDC(hDC); + return NtGdiCreateCompatibleDC(hDC); }
if (Driver != NULL && Driver->Buffer != NULL) _____
Modified: trunk/reactos/subsys/win32k/objects/dib.c --- trunk/reactos/subsys/win32k/objects/dib.c 2005-09-24 19:17:00 UTC (rev 18033) +++ trunk/reactos/subsys/win32k/objects/dib.c 2005-09-24 19:30:12 UTC (rev 18034) @@ -544,7 +544,7 @@
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 @@ // If the reference hdc is null, take the desktop dc if (hDC == 0) { - hDC = NtGdiCreateCompatableDC(0); + hDC = NtGdiCreateCompatibleDC(0); bDesktopDC = TRUE; }
_____
Modified: trunk/reactos/tools/nci/w32ksvc.db --- trunk/reactos/tools/nci/w32ksvc.db 2005-09-24 19:17:00 UTC (rev 18033) +++ trunk/reactos/tools/nci/w32ksvc.db 2005-09-24 19:30:12 UTC (rev 18034) @@ -24,7 +24,7 @@
NtGdiCreateBitmapIndirect 1 NtGdiCreateColorSpace 1 NtGdiCreateCompatibleBitmap 3 -NtGdiCreateCompatableDC 1 +NtGdiCreateCompatibleDC 1 NtGdiCreateDC 4 NtGdiCreateDIBitmap 6 NtGdiCreateDIBBrush 4
-
gvg＠svn.reactos.com