Author: rharabien
Date: Thu May 26 21:25:57 2011
New Revision: 51936
URL: http://svn.reactos.org/svn/reactos?rev=51936&view=rev
Log:
[WIN32K]
- Remove unused ROS specific NtGdiSetDIBits syscall
Modified:
trunk/reactos/include/reactos/win32k/ntgdibad.h
trunk/reactos/subsystems/win32/win32k/objects/dibobj.c
trunk/reactos/subsystems/win32/win32k/w32ksvc.db
trunk/reactos/subsystems/win32/win32k/w32ksvc.h
Modified: trunk/reactos/include/reactos/win32k/ntgdibad.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntgdibad.h?rev=51936&r1=51935&r2=51936&view=diff
==============================================================================
--- trunk/reactos/include/reactos/win32k/ntgdibad.h [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/win32k/ntgdibad.h [iso-8859-1] Thu May 26
21:25:57 2011
@@ -111,19 +111,6 @@
LPPOINT Point
);
-/* Use SetDIBitsToDevice in gdi32. */
-INT
-APIENTRY
-NtGdiSetDIBits (
- HDC hDC,
- HBITMAP hBitmap,
- UINT StartScan,
- UINT ScanLines,
- CONST VOID * Bits,
- CONST BITMAPINFO * bmi,
- UINT ColorUse
- );
-
#endif /* WIN32K_NTGDI_BAD_INCLUDED */
Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/objects/dibobj.c?rev=51936&r1=51935&r2=51936&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1]
(original)
+++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Thu May
26 21:25:57 2011
@@ -319,71 +319,6 @@
GreDeleteObject(SourceBitmap);
return result;
-}
-
-// FIXME by Removing NtGdiSetDIBits!!!
-// This is a victim of the Win32k Initialization BUG!!!!!
-// Converts a DIB to a device-dependent bitmap
-INT
-APIENTRY
-NtGdiSetDIBits(
- HDC hDC,
- HBITMAP hBitmap,
- UINT StartScan,
- UINT ScanLines,
- CONST VOID *Bits,
- CONST BITMAPINFO *bmi,
- UINT ColorUse)
-{
- PDC Dc = NULL;
- INT Ret;
- NTSTATUS Status = STATUS_SUCCESS;
-
- if (!Bits) return 0;
-
- _SEH2_TRY
- {
- ProbeForRead(&bmi->bmiHeader.biSize, sizeof(DWORD), 1);
- ProbeForRead(bmi, bmi->bmiHeader.biSize, 1);
- ProbeForRead(bmi, DIB_BitmapInfoSize(bmi, ColorUse), 1);
- ProbeForRead(Bits,
- DIB_GetDIBImageBytes(bmi->bmiHeader.biWidth,
- ScanLines,
- bmi->bmiHeader.biBitCount),
- 1);
- }
- _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
- {
- Status = _SEH2_GetExceptionCode();
- }
- _SEH2_END
-
- if (!NT_SUCCESS(Status))
- {
- return 0;
- }
-
- /* Lock DC if asked to */
- if(ColorUse == DIB_PAL_COLORS)
- {
- Dc = DC_LockDc(hDC);
- if (NULL == Dc)
- {
- EngSetLastError(ERROR_INVALID_HANDLE);
- return 0;
- }
- if (Dc->dctype == DC_TYPE_INFO)
- {
- DC_UnlockDc(Dc);
- return 0;
- }
- }
-
- Ret = IntSetDIBits(Dc, hBitmap, StartScan, ScanLines, Bits, bmi, ColorUse);
-
- if(Dc) DC_UnlockDc(Dc);
-
- return Ret;
}
W32KAPI
Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w32ksvc.db?rev=51936&r1=51935&r2=51936&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] Thu May 26
21:25:57 2011
@@ -675,7 +675,6 @@
#
#
#ReactOS specific syscalls
-NtGdiSetDIBits 7
NtGdiSetViewportOrgEx 4
NtGdiSetWindowOrgEx 4
NtGdiGetFontFamilyInfo 4
Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w32ksvc.h?rev=51936&r1=51935&r2=51936&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/w32ksvc.h [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/w32ksvc.h [iso-8859-1] Thu May 26
21:25:57 2011
@@ -675,7 +675,6 @@
// ReactOS, specific, syscalls)
-SVC_(GdiSetDIBits, 7)
SVC_(GdiSetViewportOrgEx, 4)
SVC_(GdiSetWindowOrgEx, 4)
SVC_(GdiGetFontFamilyInfo, 4)
