ReactOS.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
List overview
Download
Ros-diffs
May 2008
----- 2025 -----
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
ros-diffs@reactos.org
25 participants
586 discussions
Start a n
N
ew thread
[gbrunmar] 33599: ReactOS leads you to mysterious API calls. Added tests for RealGetWindowsClass() with some strange behaviours for later use when implementing RealGetWindowClass().
by gbrunmar@svn.reactos.org
Author: gbrunmar Date: Mon May 19 12:50:39 2008 New Revision: 33599 URL:
http://svn.reactos.org/svn/reactos?rev=33599&view=rev
Log: ReactOS leads you to mysterious API calls. Added tests for RealGetWindowsClass() with some strange behaviours for later use when implementing RealGetWindowClass(). Added: trunk/rostests/apitests/user32api/tests/RealGetWindowClass.c (with props) Modified: trunk/rostests/apitests/user32api/testlist.c Modified: trunk/rostests/apitests/user32api/testlist.c URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32api/testli…
============================================================================== --- trunk/rostests/apitests/user32api/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32api/testlist.c [iso-8859-1] Mon May 19 12:50:39 2008 @@ -1,23 +1,27 @@ #ifndef _USER32TESTLIST_H #define _USER32TESTLIST_H + +#define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0])) #include "user32api.h" /* include the tests */ #include "tests/ScrollDC.c" #include "tests/ScrollWindowEx.c" +#include "tests/RealGetWindowClass.c" /* The List of tests */ TESTENTRY TestList[] = { - { L"ScrollDC", Test_ScrollDC }, - { L"ScrollWindowEx", Test_ScrollWindowEx } + { L"ScrollDC", Test_ScrollDC }, + { L"ScrollWindowEx", Test_ScrollWindowEx }, + { L"RealGetWindowClass", Test_RealGetWindowClass }, }; /* The function that gives us the number of tests */ INT NumTests(void) { - return sizeof(TestList) / sizeof(TESTENTRY); + return ARRAY_SIZE(TestList); } #endif /* _USER32TESTLIST_H */ Added: trunk/rostests/apitests/user32api/tests/RealGetWindowClass.c URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32api/tests/…
============================================================================== --- trunk/rostests/apitests/user32api/tests/RealGetWindowClass.c (added) +++ trunk/rostests/apitests/user32api/tests/RealGetWindowClass.c [iso-8859-1] Mon May 19 12:50:39 2008 @@ -1,0 +1,119 @@ +#include "../user32api.h" + +typedef struct _TestData +{ + BOOL OverrideWndProc; /* TRUE if lpfnWndProc should be overridden */ + LPCSTR ClassName; /* Name of the new class to register */ + DWORD WndExtra; /* Remove these WNDCLASS::cbWndExtra flags */ + BOOL ExpectsHwnd; /* TRUE if a HWND should be created to run tests on */ + LPCSTR ExpectedClassNameBefore; /* Expected class name before any dialog function is called */ + LPCSTR ExpectedClassNameAfter; /* Expected class name after any dialog function is called */ +} TestData; + +static TestData RealClassTestData[] = +{ + { + TRUE, + "OverrideWndProc_with_DLGWINDOWEXTRA_TRUE", + 0, + TRUE, + "OverrideWndProc_with_DLGWINDOWEXTRA_TRUE", + "#32770", + }, + { + TRUE, + "OverrideWndProc_without_DLGWINDOWEXTRA_TRUE", + DLGWINDOWEXTRA, + TRUE, + "OverrideWndProc_without_DLGWINDOWEXTRA_TRUE", + "OverrideWndProc_without_DLGWINDOWEXTRA_TRUE", + }, + { + FALSE, + "DefaultWndProc_with_DLGWINDOWEXTRA_FALSE", + 0, + TRUE, + "#32770", + "#32770", + }, + { + FALSE, + "DefaultWndProc_without_DLGWINDOWEXTRA_FALSE", + DLGWINDOWEXTRA, + FALSE, + "N/A", + "N/A", + }, +}; + +INT +Test_RealGetWindowClass(PTESTINFO pti) +{ + int testNo; + UINT Result; + CHAR Buffer[1024]; + + Result = RealGetWindowClass( NULL, Buffer, ARRAY_SIZE(Buffer) ); + TEST(Result == 0); + TEST(GetLastError() == ERROR_INVALID_WINDOW_HANDLE); + + for (testNo = 0; testNo < ARRAY_SIZE(RealClassTestData); testNo++) + { + ATOM atom; + WNDCLASSA cls; + HWND hWnd; + + /* Register classes, "derived" from built-in dialog, with and without the DLGWINDOWEXTRA flag set */ + GetClassInfoA(0, "#32770", &cls); + if (RealClassTestData[testNo].OverrideWndProc) + cls.lpfnWndProc = DefWindowProcA; + cls.lpszClassName = RealClassTestData[testNo].ClassName; + cls.cbWndExtra &= ~RealClassTestData[testNo].WndExtra; + atom = RegisterClassA (&cls); + ASSERT(atom != 0); + + /* Create a window */ + hWnd = CreateWindowEx( WS_EX_LEFT | WS_EX_LTRREADING | WS_EX_RIGHTSCROLLBAR | + WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE | WS_EX_CONTROLPARENT | WS_EX_APPWINDOW, + RealClassTestData[testNo].ClassName, + RealClassTestData[testNo].ClassName, + WS_POPUPWINDOW | WS_CLIPSIBLINGS | WS_DLGFRAME | WS_OVERLAPPED | + WS_MINIMIZEBOX | WS_MAXIMIZEBOX | DS_3DLOOK | DS_SETFONT | DS_MODALFRAME, + CW_USEDEFAULT, CW_USEDEFAULT, 100, 100, + NULL, NULL, g_hInstance, 0); + + /* Do we expect a HWND at all? */ + if (RealClassTestData[testNo].ExpectsHwnd) + { + TEST(hWnd != NULL); + + if (hWnd != NULL) + { + /* Get the "real" class name */ + Result = RealGetWindowClass( hWnd, Buffer, ARRAY_SIZE(Buffer) ); + printf("Buffer: %s\nExpectedClassNameBefore(%d): %s\n", Buffer, testNo, RealClassTestData[testNo].ExpectedClassNameBefore); + TEST( Result != 0 ); + TEST( strcmp( Buffer, RealClassTestData[testNo].ExpectedClassNameBefore ) == 0 ); + + /* Call a function that requires a dialog window */ + DefDlgProcA( hWnd, DM_SETDEFID, IDCANCEL, 0 ); + + /* Get the "real" class name again */ + Result = RealGetWindowClass( hWnd, Buffer, ARRAY_SIZE(Buffer) ); + printf("Buffer: %s\nExpectedClassNameAfter(%d): %s\n", Buffer, testNo, RealClassTestData[testNo].ExpectedClassNameAfter); + TEST( Result != 0 ); + TEST( strcmp( Buffer, RealClassTestData[testNo].ExpectedClassNameAfter ) == 0 ); + } + } + else + { + TEST(hWnd == NULL); + } + + /* Cleanup */ + DestroyWindow(hWnd); + UnregisterClass(RealClassTestData[testNo].ClassName, g_hInstance); + } + + return APISTATUS_NORMAL; +} Propchange: trunk/rostests/apitests/user32api/tests/RealGetWindowClass.c ------------------------------------------------------------------------------ svn:eol-style = native
16 years, 8 months
1
0
0
0
[greatlrd] 33598: Bugfix EngBitBlt it did miss the prefix @44 in the def file
by greatlrd@svn.reactos.org
Author: greatlrd Date: Mon May 19 05:20:39 2008 New Revision: 33598 URL:
http://svn.reactos.org/svn/reactos?rev=33598&view=rev
Log: Bugfix EngBitBlt it did miss the prefix @44 in the def file Modified: trunk/reactos/dll/win32/gdi32/gdi32.def Modified: trunk/reactos/dll/win32/gdi32/gdi32.def URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.def?…
============================================================================== --- trunk/reactos/dll/win32/gdi32/gdi32.def [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/gdi32.def [iso-8859-1] Mon May 19 05:20:39 2008 @@ -164,7 +164,7 @@ EngAcquireSemaphore@4 EngAlphaBlend@28=NtGdiEngAlphaBlend@28 EngAssociateSurface@12=NtGdiEngAssociateSurface@12 -EngBitBlt=NtGdiEngBitBlt@44 +EngBitBlt@44=NtGdiEngBitBlt@44 EngCheckAbort@4=NtGdiEngCheckAbort@4 EngComputeGlyphSet@12 EngCopyBits@24=NtGdiEngCopyBits@24
16 years, 8 months
1
0
0
0
[fireball] 33597: - Implement restoring DRx registers if the thread is being debugged.
by fireball@svn.reactos.org
Author: fireball Date: Mon May 19 05:04:21 2008 New Revision: 33597 URL:
http://svn.reactos.org/svn/reactos?rev=33597&view=rev
Log: - Implement restoring DRx registers if the thread is being debugged. Modified: trunk/reactos/ntoskrnl/ke/i386/usercall_asm.S Modified: trunk/reactos/ntoskrnl/ke/i386/usercall_asm.S URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/usercall_…
============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/usercall_asm.S [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/usercall_asm.S [iso-8859-1] Mon May 19 05:04:21 2008 @@ -318,6 +318,8 @@ test byte ptr [eax+KTHREAD_DEBUG_ACTIVE], 0xFF jnz RestoreDebug +RestoreStack: + /* Get TSS */ mov edx, fs:[KPCR_TSS] @@ -379,10 +381,25 @@ jmp CheckDebug RestoreDebug: - - /* Not yet supported */ - int 3 - jmp $ + /* Get a pointer to thread's trap frame */ + mov esi, [eax+KTHREAD_TRAP_FRAME] + + /* Copy debug registers data from it */ + mov edx, [esi+KTRAP_FRAME_DR0] + mov [edi+KTRAP_FRAME_DR0], edx + mov edx, [esi+KTRAP_FRAME_DR1] + mov [edi+KTRAP_FRAME_DR1], edx + mov edx, [esi+KTRAP_FRAME_DR2] + mov [edi+KTRAP_FRAME_DR2], edx + mov edx, [esi+KTRAP_FRAME_DR3] + mov [edi+KTRAP_FRAME_DR3], edx + mov edx, [esi+KTRAP_FRAME_DR6] + mov [edi+KTRAP_FRAME_DR6], edx + mov edx, [esi+KTRAP_FRAME_DR7] + mov [edi+KTRAP_FRAME_DR7], edx + + /* Jump back */ + jmp RestoreStack NoStack:
16 years, 8 months
1
0
0
0
[hpoussin] 33596: Implement FSCTL_SET_COMPRESSION
by hpoussin@svn.reactos.org
Author: hpoussin Date: Sun May 18 14:22:31 2008 New Revision: 33596 URL:
http://svn.reactos.org/svn/reactos?rev=33596&view=rev
Log: Implement FSCTL_SET_COMPRESSION Modified: trunk/reactos/drivers/filesystems/cdfs/fsctl.c Modified: trunk/reactos/drivers/filesystems/cdfs/fsctl.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/f…
============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/fsctl.c [iso-8859-1] Sun May 18 14:22:31 2008 @@ -16,8 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: drivers/fs/cdfs/fsctl.c @@ -515,6 +514,27 @@ } +NTSTATUS NTAPI +CdfsSetCompression( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PIO_STACK_LOCATION Stack; + USHORT CompressionState; + + Stack = IoGetCurrentIrpStackLocation(Irp); + + if (Stack->Parameters.DeviceIoControl.InputBufferLength != sizeof(CompressionState)) + return STATUS_INVALID_DEVICE_REQUEST; + + CompressionState = *(USHORT *)Irp->AssociatedIrp.SystemBuffer; + if (CompressionState != COMPRESSION_FORMAT_NONE) + return STATUS_INVALID_PARAMETER; + + return STATUS_SUCCESS; +} + + NTSTATUS STDCALL CdfsFileSystemControl(PDEVICE_OBJECT DeviceObject, PIRP Irp) @@ -528,10 +548,20 @@ switch (Stack->MinorFunction) { - case IRP_MN_USER_FS_REQUEST: - DPRINT1("CDFS: IRP_MN_USER_FS_REQUEST\n"); - Status = STATUS_INVALID_DEVICE_REQUEST; - break; + case IRP_MN_USER_FS_REQUEST: + switch (Stack->Parameters.DeviceIoControl.IoControlCode) + { + case FSCTL_SET_COMPRESSION: + DPRINT("CDFS: IRP_MN_USER_FS_REQUEST / FSCTL_SET_COMPRESSION\n"); + Status = CdfsSetCompression(DeviceObject, Irp); + break; + + default: + DPRINT1("CDFS: IRP_MN_USER_FS_REQUEST / Unknown IoControlCode 0x%x\n", + Stack->Parameters.DeviceIoControl.IoControlCode); + Status = STATUS_INVALID_DEVICE_REQUEST; + } + break; case IRP_MN_MOUNT_VOLUME: DPRINT("CDFS: IRP_MN_MOUNT_VOLUME\n");
16 years, 8 months
1
0
0
0
[greatlrd] 33595: add vista specify api to gdi32 define file, not completed yet 1. fixed EngBitBlt it did miss @44 at end 2. redirect EngAcquireSemaphore to NtGdiEngAcquireSemaphore, EngFreeModule to FreeLibrary, EngReleaseSemaphore to LeaveCriticalSection 3. Plugin all new 64 vista syscall I commited early today.
by greatlrd@svn.reactos.org
Author: greatlrd Date: Sun May 18 14:17:53 2008 New Revision: 33595 URL:
http://svn.reactos.org/svn/reactos?rev=33595&view=rev
Log: add vista specify api to gdi32 define file, not completed yet 1. fixed EngBitBlt it did miss @44 at end 2. redirect EngAcquireSemaphore to NtGdiEngAcquireSemaphore, EngFreeModule to FreeLibrary, EngReleaseSemaphore to LeaveCriticalSection 3. Plugin all new 64 vista syscall I commited early today. Modified: branches/win32k-gdi-dx/dll/win32/gdi32/gdi32.def branches/win32k-gdi-dx/dll/win32/gdi32/objects/eng.c Modified: branches/win32k-gdi-dx/dll/win32/gdi32/gdi32.def URL:
http://svn.reactos.org/svn/reactos/branches/win32k-gdi-dx/dll/win32/gdi32/g…
============================================================================== --- branches/win32k-gdi-dx/dll/win32/gdi32/gdi32.def [iso-8859-1] (original) +++ branches/win32k-gdi-dx/dll/win32/gdi32/gdi32.def [iso-8859-1] Sun May 18 14:17:53 2008 @@ -42,6 +42,7 @@ ColorMatchToTarget@12 CombineRgn@16 CombineTransform@12=NtGdiCombineTransform@12 +ConfigureOPMProtectedOutput@16=NtGdiConfigureOPMProtectedOutput@16 CopyEnhMetaFileA@8 CopyEnhMetaFileW@8 CopyMetaFileA@8 @@ -76,6 +77,7 @@ CreateICW@16 CreateMetaFileA@4 CreateMetaFileW@4 +CreateOPMProtectedOutputs@20=NtGdiCreateOPMProtectedOutputs@20 CreatePalette@4 CreatePatternBrush@4 CreatePen@12 @@ -88,6 +90,69 @@ CreateScalableFontResourceA@16 CreateScalableFontResourceW@16 CreateSolidBrush@4 +D3DKMTCheckExclusiveOwnership@0=NtGdiDdDDICheckExclusiveOwnership@0 +D3DKMTCheckMonitorPowerState@4=NtGdiDdDDICheckMonitorPowerState@4 +D3DKMTCheckOcclusion@4=NtGdiDdDDICheckOcclusion@4 +D3DKMTCloseAdapter@4=NtGdiDdDDICloseAdapter@4 +D3DKMTCreateAllocation@4=NtGdiDdDDICreateAllocation@4 +D3DKMTCreateContext@4=NtGdiDdDDICreateContext@4 +D3DKMTCreateDCFromMemory@4=NtGdiDdDDICreateDCFromMemory@4 +D3DKMTCreateDevice@4=NtGdiDdDDICreateDevice@4 +D3DKMTCreateOverlay@4=NtGdiDdDDICreateOverlay@4 +D3DKMTCreateSynchronizationObject@4=NtGdiDdDDICreateSynchronizationObject@4 +D3DKMTDestroyAllocation@4=NtGdiDdDDIDestroyAllocation@4 +D3DKMTDestroyContext@4=NtGdiDdDDIDestroyContext@4 +D3DKMTDestroyDCFromMemory@4=NtGdiDdDDIDestroyDCFromMemory@4 +D3DKMTDestroyDevice@4=NtGdiDdDDIDestroyDevice@4 +D3DKMTDestroyOverlay@4=NtGdiDdDDIDestroyOverlay@4 +D3DKMTDestroySynchronizationObject@4=NtGdiDdDDIDestroySynchronizationObject@4 +D3DKMTEscape@4=NtGdiDdDDIEscape@4 +D3DKMTFlipOverlay@4=NtGdiDdDDIFlipOverlay@4 +D3DKMTGetContextSchedulingPriority@4=NtGdiDdDDIGetContextSchedulingPriority@4 +D3DKMTGetDeviceState@4=NtGdiDdDDIGetDeviceState@4 +D3DKMTGetDisplayModeList@4=NtGdiDdDDIGetDisplayModeList@4 +D3DKMTGetMultisampleMethodList@4=NtGdiDdDDIGetMultisampleMethodList@4 +D3DKMTGetPresentHistory@4=NtGdiDdDDIGetPresentHistory@4 +D3DKMTGetProcessSchedulingPriorityClass@8=NtGdiDdDDIGetProcessSchedulingPriorityClass@8 +D3DKMTGetRuntimeData@4=NtGdiDdDDIGetRuntimeData@4 +D3DKMTGetScanLine@4=NtGdiDdDDIGetScanLine@4 +D3DKMTGetSharedPrimaryHandle@4=NtGdiDdDDIGetSharedPrimaryHandle@4 +D3DKMTInvalidateActiveVidPn@4=NtGdiDdDDIInvalidateActiveVidPn@4 +D3DKMTLock@4=NtGdiDdDDILock@4 +D3DKMTOpenAdapterFromDeviceName@4=NtGdiDdDDIOpenAdapterFromDeviceName@4 +D3DKMTOpenAdapterFromGdiDisplayName@4 +D3DKMTOpenAdapterFromHdc@4=NtGdiDdDDIOpenAdapterFromHdc@4 +D3DKMTOpenResource@4=NtGdiDdDDIOpenResource@4 +D3DKMTPollDisplayChildren@4=NtGdiDdDDIPollDisplayChildren@4 +D3DKMTPresent@4=NtGdiDdDDIPresent@4 +D3DKMTQueryAdapterInfo@=NtGdiDdDDIQueryAdapterInfo@4 +D3DKMTQueryAllocationResidency@4=NtGdiDdDDIQueryAllocationResidency@4 +D3DKMTQueryResourceInfo@4=NtGdiDdDDIQueryResourceInfo@4 +D3DKMTQueryStatistics@4=NtGdiDdDDIQueryStatistics@4 +D3DKMTReleaseProcessVidPnSourceOwners@4=NtGdiDdDDIReleaseProcessVidPnSourceOwners@4 +D3DKMTRender@4=NtGdiDdDDIRender@4 +D3DKMTSetAllocationPriority@4=NtGdiDdDDISetAllocationPriority@4 +D3DKMTSetContextSchedulingPriority@4=NtGdiDdDDISetContextSchedulingPriority@4 +D3DKMTSetDisplayMode@4=NtGdiDdDDISetDisplayMode@4 +D3DKMTSetDisplayPrivateDriverFormat@4=NtGdiDdDDISetDisplayPrivateDriverFormat@4 +D3DKMTSetGammaRamp@4=NtGdiDdDDISetGammaRamp@4 +D3DKMTSetProcessSchedulingPriorityClass@8=NtGdiDdDDISetProcessSchedulingPriorityClass@8 +D3DKMTSetQueuedLimit@4=NtGdiDdDDISetQueuedLimit@4 +D3DKMTSetVidPnSourceOwner@4=NtGdiDdDDISetVidPnSourceOwner@4 +D3DKMTSharedPrimaryLockNotification@4=NtGdiDdDDISharedPrimaryLockNotification@4 +D3DKMTSharedPrimaryUnLockNotification@4=NtGdiDdDDISharedPrimaryUnLockNotification@4 +D3DKMTSignalSynchronizationObject@4=NtGdiDdDDISignalSynchronizationObject@4 +D3DKMTUnlock@4=NtGdiDdDDIUnlock@4 +D3DKMTUpdateOverlay@4=NtGdiDdDDIUpdateOverlay@4 +D3DKMTWaitForIdle@4=NtGdiDdDDIWaitForIdle@4 +D3DKMTWaitForSynchronizationObject@4=NtGdiDdDDIWaitForSynchronizationObject@4 +D3DKMTWaitForVerticalBlankEvent@4=NtGdiDdDDIWaitForVerticalBlankEvent@4 +DDCCIGetCapabilitiesString@12=NtGdiDDCCIGetCapabilitiesString@12 +DDCCIGetCapabilitiesStringLength@8=NtGdiDDCCIGetCapabilitiesStringLength@8 +DDCCIGetTimingReport@8=NtGdiDDCCIGetTimingReport@8 +DDCCIGetVCPFeature@20=NtGdiDDCCIGetVCPFeature@20 +DDCCISaveCurrentSettings@4=NtGdiDDCCISaveCurrentSettings@4 +DDCCISetVCPFeature@12=NtGdiDDCCISetVCPFeature@12 DPtoLP@12 DdEntry0@24=NtGdiDxgGenericThunk@24 DdEntry10@8=NtGdiDdBeginMoCompFrame@8 @@ -161,10 +226,10 @@ EndFormPage@4 EndPage@4 EndPath@4 -EngAcquireSemaphore@4 +EngAcquireSemaphore@4=EnterCriticalSection@4 EngAlphaBlend@28=NtGdiEngAlphaBlend@28 EngAssociateSurface@12=NtGdiEngAssociateSurface@12 -EngBitBlt=NtGdiEngBitBlt@44 +EngBitBlt@44=NtGdiEngBitBlt@44 EngCheckAbort@4=NtGdiEngCheckAbort@4 EngComputeGlyphSet@12 EngCopyBits@24=NtGdiEngCopyBits@24 @@ -182,7 +247,7 @@ EngEraseSurface@12=NtGdiEngEraseSurface@12 EngFillPath@28=NtGdiEngFillPath@28 EngFindResource@16 -EngFreeModule@4 +EngFreeModule@4=FreeLibrary@4 EngGetCurrentCodePage@8 EngGetDriverName@4 EngGetPrinterDataFileName@4 @@ -197,7 +262,7 @@ EngPlgBlt@44=NtGdiEngPlgBlt@44 EngQueryEMFInfo@8 EngQueryLocalTime@4 -EngReleaseSemaphore@4 +EngReleaseSemaphore@4=LeaveCriticalSection@4 EngStretchBlt@44=NtGdiEngStretchBlt@44 EngStretchBltROP@52=NtGdiEngStretchBltROP@52 EngStrokeAndFillPath@40=NtGdiEngStrokeAndFillPath@40 Modified: branches/win32k-gdi-dx/dll/win32/gdi32/objects/eng.c URL:
http://svn.reactos.org/svn/reactos/branches/win32k-gdi-dx/dll/win32/gdi32/o…
============================================================================== --- branches/win32k-gdi-dx/dll/win32/gdi32/objects/eng.c [iso-8859-1] (original) +++ branches/win32k-gdi-dx/dll/win32/gdi32/objects/eng.c [iso-8859-1] Sun May 18 14:17:53 2008 @@ -9,15 +9,7 @@ #include "precomp.h" -/* - * @implemented - */ -VOID -STDCALL -EngAcquireSemaphore ( IN HSEMAPHORE hsem ) -{ - RtlEnterCriticalSection((PRTL_CRITICAL_SECTION)hsem); -} + /* @@ -123,15 +115,6 @@ *pulSize = Size; return (PVOID) Lock; -} - -/* - * @implemented - */ -VOID STDCALL -EngFreeModule(HANDLE h) -{ - FreeLibrary(h); } /* @@ -227,19 +210,6 @@ /* * @implemented */ -VOID -STDCALL -EngReleaseSemaphore ( IN HSEMAPHORE hsem ) -{ - RtlLeaveCriticalSection( (PRTL_CRITICAL_SECTION) hsem); -} - - - - -/* - * @implemented - */ INT STDCALL EngWideCharToMultiByte( UINT CodePage,
16 years, 8 months
1
0
0
0
[hpoussin] 33594: Add a key to change the keyboard layout on the livecd
by hpoussin@svn.reactos.org
Author: hpoussin Date: Sun May 18 13:37:17 2008 New Revision: 33594 URL:
http://svn.reactos.org/svn/reactos?rev=33594&view=rev
Log: Add a key to change the keyboard layout on the livecd Modified: trunk/reactos/boot/bootdata/livecd.inf Modified: trunk/reactos/boot/bootdata/livecd.inf URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/livecd.inf?r…
============================================================================== --- trunk/reactos/boot/bootdata/livecd.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/livecd.inf [iso-8859-1] Sun May 18 13:37:17 2008 @@ -6,6 +6,9 @@ HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders" [AddReg] + +; Default locale for the keyboard layout +HKU,".DEFAULT\Keyboard Layout\Preload","1",0x00020000,"00000409" ; Cdfs (ISO96660) filesystem driver HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","Start",0x00010001,0x00000000
16 years, 8 months
1
0
0
0
[greatlrd] 33593: adding 1 new syscall from vista : NtGdiCreateOPMProtectedOutputs Adding 62 new syscall from vista, they are known as D3DKMT for the graphic drv and gdi32.dll, I have not fix the protype for I do not known if it same as the drv prototype or not, yet. NtGdiDdDDICheckExclusiveOwnership, NtGdiDdDDICheckMonitorPowerState, NtGdiDdDDICheckOcclusion, NtGdiDdDDICloseAdapter, NtGdiDdDDICreateAllocation, NtGdiDdDDICreateContext, NtGdiDdDDICreateDCFromMemory, NtGdiDdDDICreateDevice, NtGdiD
by greatlrd@svn.reactos.org
Author: greatlrd Date: Sun May 18 13:33:27 2008 New Revision: 33593 URL:
http://svn.reactos.org/svn/reactos?rev=33593&view=rev
Log: adding 1 new syscall from vista : NtGdiCreateOPMProtectedOutputs Adding 62 new syscall from vista, they are known as D3DKMT for the graphic drv and gdi32.dll, I have not fix the protype for I do not known if it same as the drv prototype or not, yet. NtGdiDdDDICheckExclusiveOwnership,NtGdiDdDDICheckMonitorPowerState,NtGdiDdDDICheckOcclusion,NtGdiDdDDICloseAdapter, NtGdiDdDDICreateAllocation, NtGdiDdDDICreateContext, NtGdiDdDDICreateDCFromMemory, NtGdiDdDDICreateDevice, NtGdiDdDDICreateOverlay, NtGdiDdDDICreateSynchronizationObject, NtGdiDdDDIDestroyAllocation, NtGdiDdDDIDestroyContext, NtGdiDdDDIDestroyDCFromMemory, NtGdiDdDDIDestroyDevice, NtGdiDdDDIDestroyOverlay, NtGdiDdDDIDestroySynchronizationObject, NtGdiDdDDIEscape, NtGdiDdDDIFlipOverlay, NtGdiDdDDIGetContextSchedulingPriority, NtGdiDdDDIGetDeviceState, NtGdiDdDDIGetDisplayModeList, NtGdiDdDDIGetMultisampleMethodList, NtGdiDdDDIGetPresentHistory, NtGdiDdDDIGetProcessSchedulingPriorityClass, NtGdiDdDDIGetRuntimeData, NtGdiDdDDIGetScanLine, NtGdiDdDDIGetSharedPrimaryHandle, NtGdiDdDDIInvalidateActiveVidPn, NtGdiDdDDILock, NtGdiDdDDIOpenAdapterFromDeviceName, NtGdiDdDDIOpenAdapterFromHdc, NtGdiDdDDIOpenResource, NtGdiDdDDIPollDisplayChildren, NtGdiDdDDIPresent, NtGdiDdDDIQueryAdapterInfo, NtGdiDdDDIQueryAllocationResidency, NtGdiDdDDIQueryResourceInfo, NtGdiDdDDIQueryStatistics, NtGdiDdDDIReleaseProcessVidPnSourceOwners, NtGdiDdDDIRender, NtGdiDdDDISetAllocationPriority, NtGdiDdDDISetContextSchedulingPriority, NtGdiDdDDISetDisplayMode, NtGdiDdDDISetDisplayPrivateDriverFormat, NtGdiDdDDISetGammaRamp, NtGdiDdDDISetProcessSchedulingPriorityClass, NtGdiDdDDISetQueuedLimit, NtGdiDdDDISetVidPnSourceOwner, NtGdiDdDDISharedPrimaryLockNotification, NtGdiDdDDISharedPrimaryUnLockNotification, NtGdiDdDDISignalSynchronizationObject, NtGdiDdDDIUnlock, NtGdiDdDDIUpdateOverlay, NtGdiDdDDIWaitForIdle, NtGdiDdDDIWaitForSynchronizationObject, NtGdiDdDDIWaitForVerticalBlankEvent, NtGdiDDCCIGetCapabilitiesString, NtGdiDDCCIGetCapabilitiesStringLength, NtGdiDDCCIGetTimingReport, NtGdiDDCCIGetVCPFeature, NtGdiDDCCISaveCurrentSettings, NtGdiDDCCISetVCPFeature, Added: branches/win32k-gdi-dx/subsystems/win32/win32k/ntddraw/d3dkmt.c (with props) Modified: branches/win32k-gdi-dx/include/reactos/win32k/ntgdityp.h branches/win32k-gdi-dx/subsystems/win32/win32k/stubs/stubs.c branches/win32k-gdi-dx/subsystems/win32/win32k/w32ksvc.db Modified: branches/win32k-gdi-dx/include/reactos/win32k/ntgdityp.h URL:
http://svn.reactos.org/svn/reactos/branches/win32k-gdi-dx/include/reactos/w…
============================================================================== --- branches/win32k-gdi-dx/include/reactos/win32k/ntgdityp.h [iso-8859-1] (original) +++ branches/win32k-gdi-dx/include/reactos/win32k/ntgdityp.h [iso-8859-1] Sun May 18 13:33:27 2008 @@ -1,667 +1,738 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS Win32 Graphical Subsystem (WIN32K) - * FILE: include/win32k/ntgdityp.h - * PURPOSE: Win32 Shared GDI Types for NtGdi* - * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) - */ - -/* INCLUDES ******************************************************************/ - -#ifndef _NTGDITYP_ -#define _NTGDITYP_ - -/* ENUMERATIONS **************************************************************/ - -typedef enum _ARCTYPE -{ - GdiTypeArc, - GdiTypeArcTo, - GdiTypeChord, - GdiTypePie, -} ARCTYPE, *PARCTYPE; - -typedef enum _PALFUNCTYPE -{ - GdiPalAnimate, - GdiPalSetEntries, - GdiPalGetEntries, - GdiPalGetSystemEntries, - GdiPalSetColorTable, - GdiPalGetColorTable, -} PALFUNCTYPE, *PPALFUNCTYPE; - -typedef enum _POLYFUNCTYPE -{ - GdiPolyPolygon = 1, - GdiPolyPolyLine, - GdiPolyBezier, - GdiPolyLineTo, - GdiPolyBezierTo, - GdiPolyPolyRgn, -} POLYFUNCTYPE, *PPOLYFUNCTYPE; - -typedef enum _GETDCDWORD -{ - GdiGetJournal, - GdiGetRelAbs, - GdiGetBreakExtra, - GdiGerCharBreak, - GdiGetArcDirection, - GdiGetEMFRestorDc, - GdiGetFontLanguageInfo, - GdiGetIsMemDc, - GdiGetMapMode, - GdiGetTextCharExtra, -} GETDCDWORD, *PGETDCDWORD; - -typedef enum _GETSETDCDWORD -{ - GdiGetSetCopyCount = 2, - GdiGetSetTextAlign, - GdiGetSetRelAbs, - GdiGetSetTextCharExtra, - GdiGetSetSelectFont, - GdiGetSetMapperFlagsInternal, - GdiGetSetMapMode, - GdiGetSetArcDirection, -} GETSETDCDWORD, *PGETSETDCDWORD; - -typedef enum _GETDCPOINT -{ - GdiGetViewPortExt = 1, - GdiGetWindowExt, - GdiGetViewPortOrg, - GdiGetWindowOrg, - GdiGetAspectRatioFilter, - GdiGetDCOrg = 6, -} GETDCPOINT, *PGETDCPOINT; - - -typedef enum _GDIBATCHCMD -{ - GdiBCPatBlt, - GdiBCPolyPatBlt, - GdiBCTextOut, - GdiBCExtTextOut, - GdiBCSetBrushOrg, - GdiBCExtSelClipRgn, - GdiBCSelObj, - GdiBCDelObj, - GdiBCDelRgn, -} GDIBATCHCMD, *PGDIBATCHCMD; - -typedef enum _TRANSFORMTYPE -{ - GdiDpToLp, - GdiLpToDp, -} TRANSFORMTYPE, *PTRANSFORMTYPE; - -typedef enum GDIObjType -{ - GDIObjType_DEF_TYPE = 0x00, - GDIObjType_DC_TYPE = 0x01, - GDIObjType_UNUSED1_TYPE = 0x02, - GDIObjType_UNUSED2_TYPE = 0x03, - GDIObjType_RGN_TYPE = 0x04, - GDIObjType_SURF_TYPE = 0x05, - GDIObjType_CLIENTOBJ_TYPE = 0x06, - GDIObjType_PATH_TYPE = 0x07, - GDIObjType_PAL_TYPE = 0x08, - GDIObjType_ICMLCS_TYPE = 0x09, - GDIObjType_LFONT_TYPE = 0x0a, - GDIObjType_RFONT_TYPE = 0x0b, - GDIObjType_PFE_TYPE = 0x0c, - GDIObjType_PFT_TYPE = 0x0d, - GDIObjType_ICMCXF_TYPE = 0x0e, - GDIObjType_SPRITE_TYPE = 0x0f, - GDIObjType_BRUSH_TYPE = 0x10, - GDIObjType_UMPD_TYPE = 0x11, - GDIObjType_UNUSED4_TYPE = 0x12, - GDIObjType_SPACE_TYPE = 0x13, - GDIObjType_UNUSED5_TYPE = 0x14, - GDIObjType_META_TYPE = 0x15, - GDIObjType_EFSTATE_TYPE = 0x16, - GDIObjType_BMFD_TYPE = 0x17, - GDIObjType_VTFD_TYPE = 0x18, - GDIObjType_TTFD_TYPE = 0x19, - GDIObjType_RC_TYPE = 0x1a, - GDIObjType_TEMP_TYPE = 0x1b, - GDIObjType_DRVOBJ_TYPE = 0x1c, - GDIObjType_DCIOBJ_TYPE = 0x1d, - GDIObjType_SPOOL_TYPE = 0x1e, - GDIObjType_MAX_TYPE = 0x1e, - GDIObjTypeTotal = 0x1f, -} GDIOBJTYPE, *PGDIOBJTYPE; - -typedef enum GDILoObjType -{ - GDILoObjType_LO_BRUSH_TYPE = 0x100000, - GDILoObjType_LO_DC_TYPE = 0x10000, - GDILoObjType_LO_BITMAP_TYPE = 0x50000, - GDILoObjType_LO_PALETTE_TYPE = 0x80000, - GDILoObjType_LO_FONT_TYPE = 0xa0000, - GDILoObjType_LO_REGION_TYPE = 0x40000, - GDILoObjType_LO_ICMLCS_TYPE = 0x90000, - GDILoObjType_LO_CLIENTOBJ_TYPE = 0x60000, - GDILoObjType_LO_ALTDC_TYPE = 0x210000, - GDILoObjType_LO_PEN_TYPE = 0x300000, - GDILoObjType_LO_EXTPEN_TYPE = 0x500000, - GDILoObjType_LO_DIBSECTION_TYPE = 0x250000, - GDILoObjType_LO_METAFILE16_TYPE = 0x260000, - GDILoObjType_LO_METAFILE_TYPE = 0x460000, - GDILoObjType_LO_METADC16_TYPE = 0x660000 -} GDILOOBJTYPE, *PGDILOOBJTYPE; - -#define GdiWorldSpaceToPageSpace 0x203 - -/* FIXME: Unknown */ -typedef DWORD FULLSCREENCONTROL; -typedef DWORD LFTYPE; - -/* Public LAST_STOCK = 19, plus 2 more internal entries */ -#define NB_STOCK_OBJECTS 22 - -/* extra stock object: default 1x1 bitmap for memory DCs */ -#define DEFAULT_BITMAP (21) - - -/* DEFINES *******************************************************************/ - -#define GDIBATCHBUFSIZE 0x136*4 -#define GDI_BATCH_LIMIT 20 - -// NtGdiGetCharWidthW Flags -#define GCW_WIN32 0x0001 -#define GCW_NOFLOAT 0x0002 -#define GCW_INDICES 0x0008 - -// NtGdiGetCharABCWidthW Flags -#define GCABCW_NOFLOAT 0x0001 -#define GCABCW_INDICES 0x0002 - -/* CAPS1 support */ -//#define C1_TRANSPARENT 0x0001 -#define TC_TT_ABLE 0x0002 -#define C1_TT_CR_ANY 0x0004 -#define C1_EMF_COMPLIANT 0x0008 -#define C1_DIBENGINE 0x0010 -#define C1_GAMMA_RAMP 0x0040 -#define C1_REINIT_ABLE 0x0080 -#define C1_GLYPH_INDEX 0x0100 -#define C1_BIT_PACKED 0x0200 -#define C1_BYTE_PACKED 0x0400 -#define C1_COLORCURSOR 0x0800 -#define C1_CMYK_ABLE 0x1000 -#define C1_SLOW_CARD 0x2000 - -/* TYPES *********************************************************************/ - -typedef PVOID KERNEL_PVOID; -typedef D3DNTHAL_CONTEXTCREATEDATA D3DNTHAL_CONTEXTCREATEI; -typedef LONG FIX; - -typedef struct _CHWIDTHINFO -{ - LONG lMaxNegA; - LONG lMaxNegC; - LONG lMinWidthD; -} CHWIDTHINFO, *PCHWIDTHINFO; - -typedef struct _UNIVERSAL_FONT_ID -{ - DWORD dwUfid[2]; -} UNIVERSAL_FONT_ID, *PUNIVERSAL_FONT_ID; - -typedef struct _REALIZATION_INFO // Based on LOCALESIGNATURE -{ - DWORD dwCsbDefault[2]; - DWORD dwCsbSupported0; -} REALIZATION_INFO, *PREALIZATION_INFO; - -typedef struct _WIDTHDATA -{ - USHORT sOverhang; - USHORT sHeight; - USHORT sCharInc; - USHORT sBreak; - BYTE jFirst; - BYTE jLast; - BYTE jBreak; - BYTE jDefault; - USHORT sDBCSInc; - USHORT sDefaultInc; -} WIDTHDATA, *PWIDTHDATA; - -typedef struct _DEVCAPS // Very similar to GDIINFO -{ - ULONG ulVersion; - ULONG ulTechnology; - ULONG ulHorzSizeM; - ULONG ulVertSizeM; - ULONG ulHorzSize; - ULONG ulVertSize; - ULONG ulHorzRes; - ULONG ulVertRes; - ULONG ulBitsPixel; - ULONG ulPlanes; - ULONG ulNumPens; - ULONG ulNumFonts; - ULONG ulNumColors; - ULONG ulRasterCaps; - ULONG ulAspectX; - ULONG ulAspectY; - ULONG ulAspectXY; - ULONG ulLogPixelsX; - ULONG ulLogPixelsY; - ULONG ulSizePalette; - ULONG ulColorRes; - ULONG ulPhysicalWidth; - ULONG ulPhysicalHeight; - ULONG ulPhysicalOffsetX; - ULONG ulPhysicalOffsetY; - ULONG ulTextCaps; - ULONG ulVRefresh; - ULONG ulDesktopHorzRes; - ULONG ulDesktopVertRes; - ULONG ulBltAlignment; - ULONG ulReserved[4]; - ULONG ulShadeBlend; - ULONG ulColorMgmtCaps; -} DEVCAPS, *PDEVCAPS; - -/* Gdi Handle Cache Types and Structures */ -#define GDI_CACHED_HADNLE_TYPES 4 -#define CACHE_BRUSH_ENTRIES 10 -#define CACHE_PEN_ENTRIES 8 -#define CACHE_REGION_ENTRIES 8 -#define CACHE_LFONT_ENTRIES 1 - -typedef enum _HANDLECACHETYPE -{ - hctBrushHandle, - hctPenHandle, - hctRegionHandle, - hctLFontHandle -} HANDLECACHETYPE,*PHANDLECACHETYPE; - -typedef struct _GDIHANDLECACHE -{ - ULONG ulLock; - ULONG ulNumHandles[GDI_CACHED_HADNLE_TYPES]; - HANDLE Handle[CACHE_BRUSH_ENTRIES+CACHE_PEN_ENTRIES+CACHE_REGION_ENTRIES+CACHE_LFONT_ENTRIES]; -} GDIHANDLECACHE, *PGDIHANDLECACHE; - -/* Font Structures */ -typedef struct _TMDIFF -{ - ULONG cjotma; - CHAR chFirst; - CHAR chLast; - CHAR ChDefault; - CHAR ChBreak; -} TMDIFF, *PTMDIFF; - -typedef struct _TMW_INTERNAL -{ - TEXTMETRICW TextMetric; - TMDIFF Diff; -} TMW_INTERNAL, *PTMW_INTERNAL; - -typedef struct _NTMW_INTERNAL -{ - TMDIFF tmd; - NEWTEXTMETRICEXW ntmw; -} NTMW_INTERNAL, *PNTMW_INTERNAL; - -typedef struct _ENUMFONTDATAW -{ - ULONG cbSize; - ULONG ulNtmwiOffset; - DWORD dwFontType; - ENUMLOGFONTEXDVW elfexdv; /* variable size! */ - /* NTMW_INTERNAL ntmwi; use ulNtwmOffset */ -} ENUMFONTDATAW, *PENUMFONTDATAW; - -/* Number Representation */ -typedef struct _EFLOAT_S -{ - LONG lMant; - LONG lExp; -} EFLOAT_S; - -/* XFORM Structures */ -typedef struct _MATRIX_S -{ - EFLOAT_S efM11; - EFLOAT_S efM12; - EFLOAT_S efM21; - EFLOAT_S efM22; - EFLOAT_S efDx; - EFLOAT_S efDy; - FIX fxDx; - FIX fxDy; - FLONG flAccel; -} MATRIX_S; - -/* Gdi XForm storage union */ -typedef union -{ - FLOAT f; - ULONG l; -} gxf_long; - -typedef struct _CFONT -{ - struct _CFONT *pcfNext; - HFONT hf; - ULONG cRef; // Count of all pointers to this CFONT. - FLONG fl; - LONG lHeight; // Precomputed logical height. - HDC hdc; // HDC of realization. 0 for display. - EFLOAT_S efM11; // efM11 of WtoD of DC of realization - EFLOAT_S efM22; // efM22 of WtoD of DC of realization - EFLOAT_S efDtoWBaseline; // Precomputed back transform. (FXtoL) - EFLOAT_S efDtoWAscent; // Precomputed back transform. (FXtoL) - WIDTHDATA wd; - FLONG flInfo; - USHORT sWidth[256]; // Widths in pels. - ULONG ulAveWidth; // bogus average used by USER - TMW_INTERNAL tmw; // cached metrics - LOCALESIGNATURE lsLocSig; // font signature information -} CFONT, *PCFONT; - -// -// GDI Batch structures. -// -typedef struct _GDIBATCHHDR -{ - SHORT Size; - SHORT Cmd; -} GDIBATCHHDR, *PGDIBATCHHDR; - -typedef struct _GDIBSPATBLT -{ - GDIBATCHHDR gbHdr; - int nXLeft; - int nYLeft; - int nWidth; - int nHeight; - HANDLE hbrush; - DWORD dwRop; - COLORREF crForegroundClr; - COLORREF crBackgroundClr; - COLORREF crBrushClr; - INT IcmBrushColor; - POINTL ptlViewportOrg; - ULONG ulForegroundClr; - ULONG ulBackgroundClr; - ULONG ulBrushClr; -} GDIBSPATBLT, *PGDIBSPATBLT; - -#ifndef _NTUSRTYP_ -typedef struct _PATRECT -{ - RECT r; - HBRUSH hBrush; -} PATRECT, * PPATRECT; - -typedef struct _W32CLIENTINFO -{ - ULONG CI_flags; - ULONG cSpins; - ULONG ulWindowsVersion; - ULONG ulAppCompatFlags; - ULONG ulAppCompatFlags2; - ULONG W32ClientInfo[57]; -} W32CLIENTINFO, *PW32CLIENTINFO; -#endif - -typedef struct _GDIBSPPATBLT -{ - GDIBATCHHDR gbHdr; - DWORD rop4; - DWORD Mode; - DWORD Count; - COLORREF crForegroundClr; - COLORREF crBackgroundClr; - COLORREF crBrushClr; - ULONG ulForegroundClr; - ULONG ulBackgroundClr; - ULONG ulBrushClr; - POINTL ptlViewportOrg; - PATRECT pRect[1]; // POLYPATBLT -} GDIBSPPATBLT, *PGDIBSPPATBLT; - -typedef struct _GDIBSTEXTOUT -{ - GDIBATCHHDR gbHdr; - COLORREF crForegroundClr; - COLORREF crBackgroundClr; - LONG lmBkMode; - ULONG ulForegroundClr; - ULONG ulBackgroundClr; - int x; - int y; - UINT Options; - RECT Rect; - DWORD iCS_CP; - UINT cbCount; - UINT Size; - HANDLE hlfntNew; - FLONG flTextAlign; - POINTL ptlViewportOrg; - WCHAR String[2]; -} GDIBSTEXTOUT, *PGDIBSTEXTOUT; - -typedef struct _GDIBSEXTTEXTOUT -{ - GDIBATCHHDR gbHdr; - UINT Count; - UINT Options; - RECT Rect; - POINTL ptlViewportOrg; - ULONG ulBackgroundClr; -} GDIBSEXTTEXTOUT, *PGDIBSEXTTEXTOUT; - -typedef struct _GDIBSSETBRHORG -{ - GDIBATCHHDR gbHdr; - POINTL ptlBrushOrigin; -} GDIBSSETBRHORG, *PGDIBSSETBRHORG; - -typedef struct _GDIBSEXTSELCLPRGN -{ - GDIBATCHHDR gbHdr; - int fnMode; - LONG right; - LONG bottom; - LONG left; - LONG top; -} GDIBSEXTSELCLPRGN, *PGDIBSEXTSELCLPRGN; -// -// Use with GdiBCSelObj, GdiBCDelObj and GdiBCDelRgn. -typedef struct _GDIBSOBJECT -{ - GDIBATCHHDR gbHdr; - HGDIOBJ hgdiobj; -} GDIBSOBJECT, *PGDIBSOBJECT; - -// -// Driver Functions -// -typedef BOOL (NTAPI *PGD_ENABLEDRIVER)(ULONG, ULONG, PDRVENABLEDATA); -typedef DHPDEV (NTAPI *PGD_ENABLEPDEV)(DEVMODEW *, LPWSTR, ULONG, HSURF *, ULONG, ULONG *, ULONG, DEVINFO *, LPWSTR, LPWSTR, HANDLE); -typedef VOID (NTAPI *PGD_COMPLETEPDEV)(DHPDEV, HDEV); -typedef VOID (NTAPI *PGD_DISABLEPDEV)(DHPDEV); -typedef HSURF (NTAPI *PGD_ENABLESURFACE)(DHPDEV); -typedef VOID (NTAPI *PGD_DISABLESURFACE)(DHPDEV); -typedef BOOL (NTAPI *PGD_ASSERTMODE)(DHPDEV, BOOL); -typedef BOOL (NTAPI *PGD_OFFSET)(SURFOBJ*, LONG, LONG, FLONG); -typedef BOOL (NTAPI *PGD_RESETPDEV)(DHPDEV, DHPDEV); -typedef VOID (NTAPI *PGD_DISABLEDRIVER)(VOID); -typedef HBITMAP (NTAPI *PGD_CREATEDEVICEBITMAP)(DHPDEV, SIZEL, ULONG); -typedef VOID (NTAPI *PGD_DELETEDEVICEBITMAP)(DHSURF); -typedef BOOL (NTAPI *PGD_ALPHABLEND)(SURFOBJ*, SURFOBJ*, CLIPOBJ*, XLATEOBJ*, RECTL*, RECTL*, BLENDOBJ*); -typedef BOOL (NTAPI *PGD_REALIZEBRUSH)(BRUSHOBJ*, SURFOBJ*, SURFOBJ*, SURFOBJ*, XLATEOBJ*, ULONG); -typedef ULONG (NTAPI *PGD_DITHERCOLOR)(DHPDEV, ULONG, ULONG, PULONG); -typedef BOOL (NTAPI *PGD_STROKEPATH)(SURFOBJ*, PATHOBJ*, CLIPOBJ*, XFORMOBJ*, BRUSHOBJ*, POINTL*, PLINEATTRS, MIX); -typedef BOOL (NTAPI *PGD_FILLPATH)(SURFOBJ*, PATHOBJ*, CLIPOBJ*, BRUSHOBJ*, POINTL*, MIX, ULONG); -typedef BOOL (NTAPI *PGD_STROKEANDFILLPATH)(SURFOBJ*, PATHOBJ*, CLIPOBJ*, XFORMOBJ*, BRUSHOBJ*, PLINEATTRS, BRUSHOBJ*, POINTL*, MIX, ULONG); -typedef BOOL (NTAPI *PGD_PAINT)(SURFOBJ*, CLIPOBJ*, BRUSHOBJ*, POINTL*, MIX); -typedef BOOL (NTAPI *PGD_BITBLT)(SURFOBJ*, SURFOBJ*, SURFOBJ*, CLIPOBJ*, XLATEOBJ*, RECTL*, POINTL*, POINTL*, BRUSHOBJ*, POINTL*, ROP4); -typedef BOOL (NTAPI *PGD_TRANSPARENTBLT)(SURFOBJ*, SURFOBJ*, CLIPOBJ*, XLATEOBJ*, RECTL*, RECTL*, ULONG, ULONG); -typedef BOOL (NTAPI *PGD_COPYBITS)(SURFOBJ*, SURFOBJ*, CLIPOBJ*, XLATEOBJ*, RECTL*, POINTL*); -typedef BOOL (NTAPI *PGD_STRETCHBLT)(SURFOBJ*, SURFOBJ*, SURFOBJ*, CLIPOBJ*, XLATEOBJ*, COLORADJUSTMENT*, POINTL*, RECTL*, RECTL*, POINTL*, ULONG); -typedef BOOL (NTAPI *PGD_STRETCHBLTROP)(SURFOBJ*, SURFOBJ*, SURFOBJ*, CLIPOBJ*, XLATEOBJ*, COLORADJUSTMENT*, POINTL*, RECTL*, RECTL*, POINTL*, ULONG, BRUSHOBJ*, DWORD); -typedef BOOL (NTAPI *PGD_SETPALETTE)(DHPDEV, PALOBJ*, ULONG, ULONG, ULONG); -typedef BOOL (NTAPI *PGD_TEXTOUT)(SURFOBJ*, STROBJ*, FONTOBJ*, CLIPOBJ*, RECTL*, RECTL*, BRUSHOBJ*, BRUSHOBJ*, POINTL*, MIX); -typedef ULONG (NTAPI *PGD_ESCAPE)(SURFOBJ*, ULONG, ULONG, PVOID *, ULONG, PVOID *); -typedef ULONG (NTAPI *PGD_DRAWESCAPE)(SURFOBJ*, ULONG, CLIPOBJ*, RECTL*, ULONG, PVOID *); -typedef PIFIMETRICS (NTAPI *PGD_QUERYFONT)(DHPDEV, ULONG, ULONG, PULONG); -typedef PVOID (NTAPI *PGD_QUERYFONTTREE)(DHPDEV, ULONG, ULONG, ULONG, PULONG); -typedef LONG (NTAPI *PGD_QUERYFONTDATA)(DHPDEV, FONTOBJ*, ULONG, HGLYPH, GLYPHDATA*, PVOID, ULONG); -typedef ULONG (NTAPI *PGD_SETPOINTERSHAPE)(SURFOBJ*, SURFOBJ*, SURFOBJ*, XLATEOBJ*, LONG, LONG, LONG, LONG, RECTL*, ULONG); -typedef VOID (NTAPI *PGD_MOVEPOINTER)(SURFOBJ*, LONG, LONG, RECTL*); -typedef BOOL (NTAPI *PGD_LINETO)(SURFOBJ*, CLIPOBJ*, BRUSHOBJ*, LONG, LONG, LONG, LONG, RECTL*, MIX); -typedef BOOL (NTAPI *PGD_SENDPAGE)(SURFOBJ*); -typedef BOOL (NTAPI *PGD_STARTPAGE)(SURFOBJ*); -typedef BOOL (NTAPI *PGD_ENDDOC)(SURFOBJ*, ULONG); -typedef BOOL (NTAPI *PGD_STARTDOC)(SURFOBJ*, PWSTR, DWORD); -typedef ULONG (NTAPI *PGD_GETGLYPHMODE)(DHPDEV, FONTOBJ*); -typedef VOID (NTAPI *PGD_SYNCHRONIZE)(DHPDEV, RECTL*); -typedef ULONG (NTAPI *PGD_SAVESCREENBITS)(SURFOBJ*, ULONG, ULONG, RECTL*); -typedef ULONG (NTAPI *PGD_GETMODES)(HANDLE, ULONG, PDEVMODEW); -typedef VOID (NTAPI *PGD_FREE)(PVOID, ULONG); -typedef VOID (NTAPI *PGD_DESTROYFONT)(FONTOBJ*); -typedef LONG (NTAPI *PGD_QUERYFONTCAPS)(ULONG, PULONG); -typedef ULONG (NTAPI *PGD_LOADFONTFILE)(ULONG, PVOID, ULONG, ULONG); -typedef BOOL (NTAPI *PGD_UNLOADFONTFILE)(ULONG); -typedef ULONG (NTAPI *PGD_FONTMANAGEMENT)(SURFOBJ*, FONTOBJ*, ULONG, ULONG, PVOID, ULONG, PVOID); -typedef LONG (NTAPI *PGD_QUERYTRUETYPETABLE)(ULONG, ULONG, ULONG, PTRDIFF, ULONG, PBYTE); -typedef LONG (NTAPI *PGD_QUERYTRUETYPEOUTLINE)(DHPDEV, FONTOBJ*, HGLYPH, BOOL, GLYPHDATA*, ULONG, TTPOLYGONHEADER*); -typedef PVOID (NTAPI *PGD_GETTRUETYPEFILE)(ULONG, PULONG); -typedef LONG (NTAPI *PGD_QUERYFONTFILE)(ULONG, ULONG, ULONG, PULONG); -typedef BOOL (NTAPI *PGD_QUERYADVANCEWIDTHS)(DHPDEV, FONTOBJ*, ULONG, HGLYPH *, PVOID *, ULONG); -typedef BOOL (NTAPI *PGD_SETPIXELFORMAT)(SURFOBJ*, LONG, ULONG); -typedef LONG (NTAPI *PGD_DESCRIBEPIXELFORMAT)(DHPDEV, LONG, ULONG, PPIXELFORMATDESCRIPTOR); -typedef BOOL (NTAPI *PGD_SWAPBUFFERS)(SURFOBJ*, PWNDOBJ); -typedef BOOL (NTAPI *PGD_STARTBANDING)(SURFOBJ*, POINTL*); -typedef BOOL (NTAPI *PGD_NEXTBAND)(SURFOBJ*, POINTL*); -typedef BOOL (NTAPI *PGD_GETDIRECTDRAWINFO)(DHPDEV, PDD_HALINFO, PDWORD, VIDEOMEMORY*, PDWORD, PDWORD); -typedef BOOL (NTAPI *PGD_ENABLEDIRECTDRAW)(DHPDEV, PDD_CALLBACKS, PDD_SURFACECALLBACKS, PDD_PALETTECALLBACKS); -typedef VOID (NTAPI *PGD_DISABLEDIRECTDRAW)(DHPDEV); -typedef LONG (NTAPI *PGD_QUERYSPOOLTYPE)(DHPDEV, LPWSTR); -typedef BOOL (NTAPI *PGD_GRADIENTFILL)(SURFOBJ*, CLIPOBJ*, XLATEOBJ*, TRIVERTEX*, ULONG, PVOID, ULONG, RECTL*, POINTL*, ULONG); -typedef VOID (NTAPI *PGD_SYNCHRONIZESURFACE)(SURFOBJ*, RECTL *, FLONG); - -// -// Most of these are definded in ddk/winddi.h -// -typedef struct _DRIVER_FUNCTIONS -{ - PGD_ENABLEPDEV EnablePDEV; - PGD_COMPLETEPDEV CompletePDEV; - PGD_DISABLEPDEV DisablePDEV; - PGD_ENABLESURFACE EnableSurface; - PGD_DISABLESURFACE DisableSurface; - PGD_ASSERTMODE AssertMode; - PGD_OFFSET Offset; - PGD_RESETPDEV ResetPDEV; - PGD_DISABLEDRIVER DisableDriver; - PVOID Unknown1; - PGD_CREATEDEVICEBITMAP CreateDeviceBitmap; - PGD_DELETEDEVICEBITMAP DeleteDeviceBitmap; - PGD_REALIZEBRUSH RealizeBrush; - PGD_DITHERCOLOR DitherColor; - PGD_STROKEPATH StrokePath; - PGD_FILLPATH FillPath; - PGD_STROKEANDFILLPATH StrokeAndFillPath; - PGD_PAINT Paint; - PGD_BITBLT BitBlt; - PGD_COPYBITS CopyBits; - PGD_STRETCHBLT StretchBlt; - PVOID Unknown2; - PGD_SETPALETTE SetPalette; - PGD_TEXTOUT TextOut; - PGD_ESCAPE Escape; - PGD_DRAWESCAPE DrawEscape; - PGD_QUERYFONT QueryFont; - PGD_QUERYFONTTREE QueryFontTree; - PGD_QUERYFONTDATA QueryFontData; - PGD_SETPOINTERSHAPE SetPointerShape; - PGD_MOVEPOINTER MovePointer; - PGD_LINETO LineTo; - PGD_SENDPAGE SendPage; - PGD_STARTPAGE StartPage; - PGD_ENDDOC EndDoc; - PGD_STARTDOC StartDoc; - PVOID Unknown3; - PGD_GETGLYPHMODE GetGlyphMode; - PGD_SYNCHRONIZE Synchronize; - PVOID Unknown4; - PGD_SAVESCREENBITS SaveScreenBits; - PGD_GETMODES GetModes; - PGD_FREE Free; - PGD_DESTROYFONT DestroyFont; - PGD_QUERYFONTCAPS QueryFontCaps; - PGD_LOADFONTFILE LoadFontFile; - PGD_UNLOADFONTFILE UnloadFontFile; - PGD_FONTMANAGEMENT FontManagement; - PGD_QUERYTRUETYPETABLE QueryTrueTypeTable; - PGD_QUERYTRUETYPEOUTLINE QueryTrueTypeOutline; - PGD_GETTRUETYPEFILE GetTrueTypeFile; - PGD_QUERYFONTFILE QueryFontFile; - PFN_DrvMovePanning MovePanning; - PGD_QUERYADVANCEWIDTHS QueryAdvanceWidths; - PGD_SETPIXELFORMAT SetPixelFormat; - PGD_DESCRIBEPIXELFORMAT DescribePixelFormat; - PGD_SWAPBUFFERS SwapBuffers; - PGD_STARTBANDING StartBanding; - PGD_NEXTBAND NextBand; - PGD_GETDIRECTDRAWINFO GetDirectDrawInfo; - PGD_ENABLEDIRECTDRAW EnableDirectDraw; - PGD_DISABLEDIRECTDRAW DisableDirectDraw; - PGD_QUERYSPOOLTYPE QuerySpoolType; - PVOID Unknown5; - PFN_DrvIcmCreateColorTransform IcmCreateColorTransform; - PFN_DrvIcmDeleteColorTransform IcmDeleteColorTransform; - PFN_DrvIcmCheckBitmapBits IcmCheckBitmapBits; - PFN_DrvIcmSetDeviceGammaRamp IcmSetDeviceGammaRamp; - PGD_GRADIENTFILL GradientFill; - PGD_STRETCHBLTROP StretchBltROP; - PFN_DrvPlgBlt PlgBlt; - PGD_ALPHABLEND AlphaBlend; - PVOID SynthesizeFont; - PVOID GetSynthesizedFontFiles; - PGD_TRANSPARENTBLT TransparentBlt; - PFN_DrvQueryPerBandInfo QueryPerBandInfo; - PFN_DrvQueryDeviceSupport QueryDeviceSupport; - PVOID Reserved1; - PVOID Reserved2; - PVOID Reserved3; - PVOID Reserved4; - PVOID Reserved5; - PVOID Reserved6; - PVOID Reserved7; - PVOID Reserved8; - PFN_DrvDeriveSurface DeriveSurface; - PFN_DrvQueryGlyphAttrs QueryGlyphAttrs; - PFN_DrvNotify Notify; - PGD_SYNCHRONIZESURFACE SynchronizeSurface; - PFN_DrvResetDevice ResetDevice; - PVOID Reserved9; - PVOID Reserved10; - PVOID Reserved11; /* 92 */ - - /* ReactOS specify */ - PGD_ENABLEDRIVER EnableDriver; //ReactOS Extra -} DRIVER_FUNCTIONS, *PDRIVER_FUNCTIONS; - -/* FIXME move to more proper place, Vista syscall */ -DWORD -STDCALL -NtGdiConfigureOPMProtectedOutput(DWORD x1, DWORD x2, DWORD x3, DWORD x4); - - -#endif +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Win32 Graphical Subsystem (WIN32K) + * FILE: include/win32k/ntgdityp.h + * PURPOSE: Win32 Shared GDI Types for NtGdi* + * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) + */ + +/* INCLUDES ******************************************************************/ + +#ifndef _NTGDITYP_ +#define _NTGDITYP_ + +/* ENUMERATIONS **************************************************************/ + +typedef enum _ARCTYPE +{ + GdiTypeArc, + GdiTypeArcTo, + GdiTypeChord, + GdiTypePie, +} ARCTYPE, *PARCTYPE; + +typedef enum _PALFUNCTYPE +{ + GdiPalAnimate, + GdiPalSetEntries, + GdiPalGetEntries, + GdiPalGetSystemEntries, + GdiPalSetColorTable, + GdiPalGetColorTable, +} PALFUNCTYPE, *PPALFUNCTYPE; + +typedef enum _POLYFUNCTYPE +{ + GdiPolyPolygon = 1, + GdiPolyPolyLine, + GdiPolyBezier, + GdiPolyLineTo, + GdiPolyBezierTo, + GdiPolyPolyRgn, +} POLYFUNCTYPE, *PPOLYFUNCTYPE; + +typedef enum _GETDCDWORD +{ + GdiGetJournal, + GdiGetRelAbs, + GdiGetBreakExtra, + GdiGerCharBreak, + GdiGetArcDirection, + GdiGetEMFRestorDc, + GdiGetFontLanguageInfo, + GdiGetIsMemDc, + GdiGetMapMode, + GdiGetTextCharExtra, +} GETDCDWORD, *PGETDCDWORD; + +typedef enum _GETSETDCDWORD +{ + GdiGetSetCopyCount = 2, + GdiGetSetTextAlign, + GdiGetSetRelAbs, + GdiGetSetTextCharExtra, + GdiGetSetSelectFont, + GdiGetSetMapperFlagsInternal, + GdiGetSetMapMode, + GdiGetSetArcDirection, +} GETSETDCDWORD, *PGETSETDCDWORD; + +typedef enum _GETDCPOINT +{ + GdiGetViewPortExt = 1, + GdiGetWindowExt, + GdiGetViewPortOrg, + GdiGetWindowOrg, + GdiGetAspectRatioFilter, + GdiGetDCOrg = 6, +} GETDCPOINT, *PGETDCPOINT; + + +typedef enum _GDIBATCHCMD +{ + GdiBCPatBlt, + GdiBCPolyPatBlt, + GdiBCTextOut, + GdiBCExtTextOut, + GdiBCSetBrushOrg, + GdiBCExtSelClipRgn, + GdiBCSelObj, + GdiBCDelObj, + GdiBCDelRgn, +} GDIBATCHCMD, *PGDIBATCHCMD; + +typedef enum _TRANSFORMTYPE +{ + GdiDpToLp, + GdiLpToDp, +} TRANSFORMTYPE, *PTRANSFORMTYPE; + +typedef enum GDIObjType +{ + GDIObjType_DEF_TYPE = 0x00, + GDIObjType_DC_TYPE = 0x01, + GDIObjType_UNUSED1_TYPE = 0x02, + GDIObjType_UNUSED2_TYPE = 0x03, + GDIObjType_RGN_TYPE = 0x04, + GDIObjType_SURF_TYPE = 0x05, + GDIObjType_CLIENTOBJ_TYPE = 0x06, + GDIObjType_PATH_TYPE = 0x07, + GDIObjType_PAL_TYPE = 0x08, + GDIObjType_ICMLCS_TYPE = 0x09, + GDIObjType_LFONT_TYPE = 0x0a, + GDIObjType_RFONT_TYPE = 0x0b, + GDIObjType_PFE_TYPE = 0x0c, + GDIObjType_PFT_TYPE = 0x0d, + GDIObjType_ICMCXF_TYPE = 0x0e, + GDIObjType_SPRITE_TYPE = 0x0f, + GDIObjType_BRUSH_TYPE = 0x10, + GDIObjType_UMPD_TYPE = 0x11, + GDIObjType_UNUSED4_TYPE = 0x12, + GDIObjType_SPACE_TYPE = 0x13, + GDIObjType_UNUSED5_TYPE = 0x14, + GDIObjType_META_TYPE = 0x15, + GDIObjType_EFSTATE_TYPE = 0x16, + GDIObjType_BMFD_TYPE = 0x17, + GDIObjType_VTFD_TYPE = 0x18, + GDIObjType_TTFD_TYPE = 0x19, + GDIObjType_RC_TYPE = 0x1a, + GDIObjType_TEMP_TYPE = 0x1b, + GDIObjType_DRVOBJ_TYPE = 0x1c, + GDIObjType_DCIOBJ_TYPE = 0x1d, + GDIObjType_SPOOL_TYPE = 0x1e, + GDIObjType_MAX_TYPE = 0x1e, + GDIObjTypeTotal = 0x1f, +} GDIOBJTYPE, *PGDIOBJTYPE; + +typedef enum GDILoObjType +{ + GDILoObjType_LO_BRUSH_TYPE = 0x100000, + GDILoObjType_LO_DC_TYPE = 0x10000, + GDILoObjType_LO_BITMAP_TYPE = 0x50000, + GDILoObjType_LO_PALETTE_TYPE = 0x80000, + GDILoObjType_LO_FONT_TYPE = 0xa0000, + GDILoObjType_LO_REGION_TYPE = 0x40000, + GDILoObjType_LO_ICMLCS_TYPE = 0x90000, + GDILoObjType_LO_CLIENTOBJ_TYPE = 0x60000, + GDILoObjType_LO_ALTDC_TYPE = 0x210000, + GDILoObjType_LO_PEN_TYPE = 0x300000, + GDILoObjType_LO_EXTPEN_TYPE = 0x500000, + GDILoObjType_LO_DIBSECTION_TYPE = 0x250000, + GDILoObjType_LO_METAFILE16_TYPE = 0x260000, + GDILoObjType_LO_METAFILE_TYPE = 0x460000, + GDILoObjType_LO_METADC16_TYPE = 0x660000 +} GDILOOBJTYPE, *PGDILOOBJTYPE; + +#define GdiWorldSpaceToPageSpace 0x203 + +/* FIXME: Unknown */ +typedef DWORD FULLSCREENCONTROL; +typedef DWORD LFTYPE; + +/* Public LAST_STOCK = 19, plus 2 more internal entries */ +#define NB_STOCK_OBJECTS 22 + +/* extra stock object: default 1x1 bitmap for memory DCs */ +#define DEFAULT_BITMAP (21) + + +/* DEFINES *******************************************************************/ + +#define GDIBATCHBUFSIZE 0x136*4 +#define GDI_BATCH_LIMIT 20 + +// NtGdiGetCharWidthW Flags +#define GCW_WIN32 0x0001 +#define GCW_NOFLOAT 0x0002 +#define GCW_INDICES 0x0008 + +// NtGdiGetCharABCWidthW Flags +#define GCABCW_NOFLOAT 0x0001 +#define GCABCW_INDICES 0x0002 + +/* CAPS1 support */ +//#define C1_TRANSPARENT 0x0001 +#define TC_TT_ABLE 0x0002 +#define C1_TT_CR_ANY 0x0004 +#define C1_EMF_COMPLIANT 0x0008 +#define C1_DIBENGINE 0x0010 +#define C1_GAMMA_RAMP 0x0040 +#define C1_REINIT_ABLE 0x0080 +#define C1_GLYPH_INDEX 0x0100 +#define C1_BIT_PACKED 0x0200 +#define C1_BYTE_PACKED 0x0400 +#define C1_COLORCURSOR 0x0800 +#define C1_CMYK_ABLE 0x1000 +#define C1_SLOW_CARD 0x2000 + +/* TYPES *********************************************************************/ + +typedef PVOID KERNEL_PVOID; +typedef D3DNTHAL_CONTEXTCREATEDATA D3DNTHAL_CONTEXTCREATEI; +typedef LONG FIX; + +typedef struct _CHWIDTHINFO +{ + LONG lMaxNegA; + LONG lMaxNegC; + LONG lMinWidthD; +} CHWIDTHINFO, *PCHWIDTHINFO; + +typedef struct _UNIVERSAL_FONT_ID +{ + DWORD dwUfid[2]; +} UNIVERSAL_FONT_ID, *PUNIVERSAL_FONT_ID; + +typedef struct _REALIZATION_INFO // Based on LOCALESIGNATURE +{ + DWORD dwCsbDefault[2]; + DWORD dwCsbSupported0; +} REALIZATION_INFO, *PREALIZATION_INFO; + +typedef struct _WIDTHDATA +{ + USHORT sOverhang; + USHORT sHeight; + USHORT sCharInc; + USHORT sBreak; + BYTE jFirst; + BYTE jLast; + BYTE jBreak; + BYTE jDefault; + USHORT sDBCSInc; + USHORT sDefaultInc; +} WIDTHDATA, *PWIDTHDATA; + +typedef struct _DEVCAPS // Very similar to GDIINFO +{ + ULONG ulVersion; + ULONG ulTechnology; + ULONG ulHorzSizeM; + ULONG ulVertSizeM; + ULONG ulHorzSize; + ULONG ulVertSize; + ULONG ulHorzRes; + ULONG ulVertRes; + ULONG ulBitsPixel; + ULONG ulPlanes; + ULONG ulNumPens; + ULONG ulNumFonts; + ULONG ulNumColors; + ULONG ulRasterCaps; + ULONG ulAspectX; + ULONG ulAspectY; + ULONG ulAspectXY; + ULONG ulLogPixelsX; + ULONG ulLogPixelsY; + ULONG ulSizePalette; + ULONG ulColorRes; + ULONG ulPhysicalWidth; + ULONG ulPhysicalHeight; + ULONG ulPhysicalOffsetX; + ULONG ulPhysicalOffsetY; + ULONG ulTextCaps; + ULONG ulVRefresh; + ULONG ulDesktopHorzRes; + ULONG ulDesktopVertRes; + ULONG ulBltAlignment; + ULONG ulReserved[4]; + ULONG ulShadeBlend; + ULONG ulColorMgmtCaps; +} DEVCAPS, *PDEVCAPS; + +/* Gdi Handle Cache Types and Structures */ +#define GDI_CACHED_HADNLE_TYPES 4 +#define CACHE_BRUSH_ENTRIES 10 +#define CACHE_PEN_ENTRIES 8 +#define CACHE_REGION_ENTRIES 8 +#define CACHE_LFONT_ENTRIES 1 + +typedef enum _HANDLECACHETYPE +{ + hctBrushHandle, + hctPenHandle, + hctRegionHandle, + hctLFontHandle +} HANDLECACHETYPE,*PHANDLECACHETYPE; + +typedef struct _GDIHANDLECACHE +{ + ULONG ulLock; + ULONG ulNumHandles[GDI_CACHED_HADNLE_TYPES]; + HANDLE Handle[CACHE_BRUSH_ENTRIES+CACHE_PEN_ENTRIES+CACHE_REGION_ENTRIES+CACHE_LFONT_ENTRIES]; +} GDIHANDLECACHE, *PGDIHANDLECACHE; + +/* Font Structures */ +typedef struct _TMDIFF +{ + ULONG cjotma; + CHAR chFirst; + CHAR chLast; + CHAR ChDefault; + CHAR ChBreak; +} TMDIFF, *PTMDIFF; + +typedef struct _TMW_INTERNAL +{ + TEXTMETRICW TextMetric; + TMDIFF Diff; +} TMW_INTERNAL, *PTMW_INTERNAL; + +typedef struct _NTMW_INTERNAL +{ + TMDIFF tmd; + NEWTEXTMETRICEXW ntmw; +} NTMW_INTERNAL, *PNTMW_INTERNAL; + +typedef struct _ENUMFONTDATAW +{ + ULONG cbSize; + ULONG ulNtmwiOffset; + DWORD dwFontType; + ENUMLOGFONTEXDVW elfexdv; /* variable size! */ + /* NTMW_INTERNAL ntmwi; use ulNtwmOffset */ +} ENUMFONTDATAW, *PENUMFONTDATAW; + +/* Number Representation */ +typedef struct _EFLOAT_S +{ + LONG lMant; + LONG lExp; +} EFLOAT_S; + +/* XFORM Structures */ +typedef struct _MATRIX_S +{ + EFLOAT_S efM11; + EFLOAT_S efM12; + EFLOAT_S efM21; + EFLOAT_S efM22; + EFLOAT_S efDx; + EFLOAT_S efDy; + FIX fxDx; + FIX fxDy; + FLONG flAccel; +} MATRIX_S; + +/* Gdi XForm storage union */ +typedef union +{ + FLOAT f; + ULONG l; +} gxf_long; + +typedef struct _CFONT +{ + struct _CFONT *pcfNext; + HFONT hf; + ULONG cRef; // Count of all pointers to this CFONT. + FLONG fl; + LONG lHeight; // Precomputed logical height. + HDC hdc; // HDC of realization. 0 for display. + EFLOAT_S efM11; // efM11 of WtoD of DC of realization + EFLOAT_S efM22; // efM22 of WtoD of DC of realization + EFLOAT_S efDtoWBaseline; // Precomputed back transform. (FXtoL) + EFLOAT_S efDtoWAscent; // Precomputed back transform. (FXtoL) + WIDTHDATA wd; + FLONG flInfo; + USHORT sWidth[256]; // Widths in pels. + ULONG ulAveWidth; // bogus average used by USER + TMW_INTERNAL tmw; // cached metrics + LOCALESIGNATURE lsLocSig; // font signature information +} CFONT, *PCFONT; + +// +// GDI Batch structures. +// +typedef struct _GDIBATCHHDR +{ + SHORT Size; + SHORT Cmd; +} GDIBATCHHDR, *PGDIBATCHHDR; + +typedef struct _GDIBSPATBLT +{ + GDIBATCHHDR gbHdr; + int nXLeft; + int nYLeft; + int nWidth; + int nHeight; + HANDLE hbrush; + DWORD dwRop; + COLORREF crForegroundClr; + COLORREF crBackgroundClr; + COLORREF crBrushClr; + INT IcmBrushColor; + POINTL ptlViewportOrg; + ULONG ulForegroundClr; + ULONG ulBackgroundClr; + ULONG ulBrushClr; +} GDIBSPATBLT, *PGDIBSPATBLT; + +#ifndef _NTUSRTYP_ +typedef struct _PATRECT +{ + RECT r; + HBRUSH hBrush; +} PATRECT, * PPATRECT; + +typedef struct _W32CLIENTINFO +{ + ULONG CI_flags; + ULONG cSpins; + ULONG ulWindowsVersion; + ULONG ulAppCompatFlags; + ULONG ulAppCompatFlags2; + ULONG W32ClientInfo[57]; +} W32CLIENTINFO, *PW32CLIENTINFO; +#endif + +typedef struct _GDIBSPPATBLT +{ + GDIBATCHHDR gbHdr; + DWORD rop4; + DWORD Mode; + DWORD Count; + COLORREF crForegroundClr; + COLORREF crBackgroundClr; + COLORREF crBrushClr; + ULONG ulForegroundClr; + ULONG ulBackgroundClr; + ULONG ulBrushClr; + POINTL ptlViewportOrg; + PATRECT pRect[1]; // POLYPATBLT +} GDIBSPPATBLT, *PGDIBSPPATBLT; + +typedef struct _GDIBSTEXTOUT +{ + GDIBATCHHDR gbHdr; + COLORREF crForegroundClr; + COLORREF crBackgroundClr; + LONG lmBkMode; + ULONG ulForegroundClr; + ULONG ulBackgroundClr; + int x; + int y; + UINT Options; + RECT Rect; + DWORD iCS_CP; + UINT cbCount; + UINT Size; + HANDLE hlfntNew; + FLONG flTextAlign; + POINTL ptlViewportOrg; + WCHAR String[2]; +} GDIBSTEXTOUT, *PGDIBSTEXTOUT; + +typedef struct _GDIBSEXTTEXTOUT +{ + GDIBATCHHDR gbHdr; + UINT Count; + UINT Options; + RECT Rect; + POINTL ptlViewportOrg; + ULONG ulBackgroundClr; +} GDIBSEXTTEXTOUT, *PGDIBSEXTTEXTOUT; + +typedef struct _GDIBSSETBRHORG +{ + GDIBATCHHDR gbHdr; + POINTL ptlBrushOrigin; +} GDIBSSETBRHORG, *PGDIBSSETBRHORG; + +typedef struct _GDIBSEXTSELCLPRGN +{ + GDIBATCHHDR gbHdr; + int fnMode; + LONG right; + LONG bottom; + LONG left; + LONG top; +} GDIBSEXTSELCLPRGN, *PGDIBSEXTSELCLPRGN; +// +// Use with GdiBCSelObj, GdiBCDelObj and GdiBCDelRgn. +typedef struct _GDIBSOBJECT +{ + GDIBATCHHDR gbHdr; + HGDIOBJ hgdiobj; +} GDIBSOBJECT, *PGDIBSOBJECT; + +// +// Driver Functions +// +typedef BOOL (NTAPI *PGD_ENABLEDRIVER)(ULONG, ULONG, PDRVENABLEDATA); +typedef DHPDEV (NTAPI *PGD_ENABLEPDEV)(DEVMODEW *, LPWSTR, ULONG, HSURF *, ULONG, ULONG *, ULONG, DEVINFO *, LPWSTR, LPWSTR, HANDLE); +typedef VOID (NTAPI *PGD_COMPLETEPDEV)(DHPDEV, HDEV); +typedef VOID (NTAPI *PGD_DISABLEPDEV)(DHPDEV); +typedef HSURF (NTAPI *PGD_ENABLESURFACE)(DHPDEV); +typedef VOID (NTAPI *PGD_DISABLESURFACE)(DHPDEV); +typedef BOOL (NTAPI *PGD_ASSERTMODE)(DHPDEV, BOOL); +typedef BOOL (NTAPI *PGD_OFFSET)(SURFOBJ*, LONG, LONG, FLONG); +typedef BOOL (NTAPI *PGD_RESETPDEV)(DHPDEV, DHPDEV); +typedef VOID (NTAPI *PGD_DISABLEDRIVER)(VOID); +typedef HBITMAP (NTAPI *PGD_CREATEDEVICEBITMAP)(DHPDEV, SIZEL, ULONG); +typedef VOID (NTAPI *PGD_DELETEDEVICEBITMAP)(DHSURF); +typedef BOOL (NTAPI *PGD_ALPHABLEND)(SURFOBJ*, SURFOBJ*, CLIPOBJ*, XLATEOBJ*, RECTL*, RECTL*, BLENDOBJ*); +typedef BOOL (NTAPI *PGD_REALIZEBRUSH)(BRUSHOBJ*, SURFOBJ*, SURFOBJ*, SURFOBJ*, XLATEOBJ*, ULONG); +typedef ULONG (NTAPI *PGD_DITHERCOLOR)(DHPDEV, ULONG, ULONG, PULONG); +typedef BOOL (NTAPI *PGD_STROKEPATH)(SURFOBJ*, PATHOBJ*, CLIPOBJ*, XFORMOBJ*, BRUSHOBJ*, POINTL*, PLINEATTRS, MIX); +typedef BOOL (NTAPI *PGD_FILLPATH)(SURFOBJ*, PATHOBJ*, CLIPOBJ*, BRUSHOBJ*, POINTL*, MIX, ULONG); +typedef BOOL (NTAPI *PGD_STROKEANDFILLPATH)(SURFOBJ*, PATHOBJ*, CLIPOBJ*, XFORMOBJ*, BRUSHOBJ*, PLINEATTRS, BRUSHOBJ*, POINTL*, MIX, ULONG); +typedef BOOL (NTAPI *PGD_PAINT)(SURFOBJ*, CLIPOBJ*, BRUSHOBJ*, POINTL*, MIX); +typedef BOOL (NTAPI *PGD_BITBLT)(SURFOBJ*, SURFOBJ*, SURFOBJ*, CLIPOBJ*, XLATEOBJ*, RECTL*, POINTL*, POINTL*, BRUSHOBJ*, POINTL*, ROP4); +typedef BOOL (NTAPI *PGD_TRANSPARENTBLT)(SURFOBJ*, SURFOBJ*, CLIPOBJ*, XLATEOBJ*, RECTL*, RECTL*, ULONG, ULONG); +typedef BOOL (NTAPI *PGD_COPYBITS)(SURFOBJ*, SURFOBJ*, CLIPOBJ*, XLATEOBJ*, RECTL*, POINTL*); +typedef BOOL (NTAPI *PGD_STRETCHBLT)(SURFOBJ*, SURFOBJ*, SURFOBJ*, CLIPOBJ*, XLATEOBJ*, COLORADJUSTMENT*, POINTL*, RECTL*, RECTL*, POINTL*, ULONG); +typedef BOOL (NTAPI *PGD_STRETCHBLTROP)(SURFOBJ*, SURFOBJ*, SURFOBJ*, CLIPOBJ*, XLATEOBJ*, COLORADJUSTMENT*, POINTL*, RECTL*, RECTL*, POINTL*, ULONG, BRUSHOBJ*, DWORD); +typedef BOOL (NTAPI *PGD_SETPALETTE)(DHPDEV, PALOBJ*, ULONG, ULONG, ULONG); +typedef BOOL (NTAPI *PGD_TEXTOUT)(SURFOBJ*, STROBJ*, FONTOBJ*, CLIPOBJ*, RECTL*, RECTL*, BRUSHOBJ*, BRUSHOBJ*, POINTL*, MIX); +typedef ULONG (NTAPI *PGD_ESCAPE)(SURFOBJ*, ULONG, ULONG, PVOID *, ULONG, PVOID *); +typedef ULONG (NTAPI *PGD_DRAWESCAPE)(SURFOBJ*, ULONG, CLIPOBJ*, RECTL*, ULONG, PVOID *); +typedef PIFIMETRICS (NTAPI *PGD_QUERYFONT)(DHPDEV, ULONG, ULONG, PULONG); +typedef PVOID (NTAPI *PGD_QUERYFONTTREE)(DHPDEV, ULONG, ULONG, ULONG, PULONG); +typedef LONG (NTAPI *PGD_QUERYFONTDATA)(DHPDEV, FONTOBJ*, ULONG, HGLYPH, GLYPHDATA*, PVOID, ULONG); +typedef ULONG (NTAPI *PGD_SETPOINTERSHAPE)(SURFOBJ*, SURFOBJ*, SURFOBJ*, XLATEOBJ*, LONG, LONG, LONG, LONG, RECTL*, ULONG); +typedef VOID (NTAPI *PGD_MOVEPOINTER)(SURFOBJ*, LONG, LONG, RECTL*); +typedef BOOL (NTAPI *PGD_LINETO)(SURFOBJ*, CLIPOBJ*, BRUSHOBJ*, LONG, LONG, LONG, LONG, RECTL*, MIX); +typedef BOOL (NTAPI *PGD_SENDPAGE)(SURFOBJ*); +typedef BOOL (NTAPI *PGD_STARTPAGE)(SURFOBJ*); +typedef BOOL (NTAPI *PGD_ENDDOC)(SURFOBJ*, ULONG); +typedef BOOL (NTAPI *PGD_STARTDOC)(SURFOBJ*, PWSTR, DWORD); +typedef ULONG (NTAPI *PGD_GETGLYPHMODE)(DHPDEV, FONTOBJ*); +typedef VOID (NTAPI *PGD_SYNCHRONIZE)(DHPDEV, RECTL*); +typedef ULONG (NTAPI *PGD_SAVESCREENBITS)(SURFOBJ*, ULONG, ULONG, RECTL*); +typedef ULONG (NTAPI *PGD_GETMODES)(HANDLE, ULONG, PDEVMODEW); +typedef VOID (NTAPI *PGD_FREE)(PVOID, ULONG); +typedef VOID (NTAPI *PGD_DESTROYFONT)(FONTOBJ*); +typedef LONG (NTAPI *PGD_QUERYFONTCAPS)(ULONG, PULONG); +typedef ULONG (NTAPI *PGD_LOADFONTFILE)(ULONG, PVOID, ULONG, ULONG); +typedef BOOL (NTAPI *PGD_UNLOADFONTFILE)(ULONG); +typedef ULONG (NTAPI *PGD_FONTMANAGEMENT)(SURFOBJ*, FONTOBJ*, ULONG, ULONG, PVOID, ULONG, PVOID); +typedef LONG (NTAPI *PGD_QUERYTRUETYPETABLE)(ULONG, ULONG, ULONG, PTRDIFF, ULONG, PBYTE); +typedef LONG (NTAPI *PGD_QUERYTRUETYPEOUTLINE)(DHPDEV, FONTOBJ*, HGLYPH, BOOL, GLYPHDATA*, ULONG, TTPOLYGONHEADER*); +typedef PVOID (NTAPI *PGD_GETTRUETYPEFILE)(ULONG, PULONG); +typedef LONG (NTAPI *PGD_QUERYFONTFILE)(ULONG, ULONG, ULONG, PULONG); +typedef BOOL (NTAPI *PGD_QUERYADVANCEWIDTHS)(DHPDEV, FONTOBJ*, ULONG, HGLYPH *, PVOID *, ULONG); +typedef BOOL (NTAPI *PGD_SETPIXELFORMAT)(SURFOBJ*, LONG, ULONG); +typedef LONG (NTAPI *PGD_DESCRIBEPIXELFORMAT)(DHPDEV, LONG, ULONG, PPIXELFORMATDESCRIPTOR); +typedef BOOL (NTAPI *PGD_SWAPBUFFERS)(SURFOBJ*, PWNDOBJ); +typedef BOOL (NTAPI *PGD_STARTBANDING)(SURFOBJ*, POINTL*); +typedef BOOL (NTAPI *PGD_NEXTBAND)(SURFOBJ*, POINTL*); +typedef BOOL (NTAPI *PGD_GETDIRECTDRAWINFO)(DHPDEV, PDD_HALINFO, PDWORD, VIDEOMEMORY*, PDWORD, PDWORD); +typedef BOOL (NTAPI *PGD_ENABLEDIRECTDRAW)(DHPDEV, PDD_CALLBACKS, PDD_SURFACECALLBACKS, PDD_PALETTECALLBACKS); +typedef VOID (NTAPI *PGD_DISABLEDIRECTDRAW)(DHPDEV); +typedef LONG (NTAPI *PGD_QUERYSPOOLTYPE)(DHPDEV, LPWSTR); +typedef BOOL (NTAPI *PGD_GRADIENTFILL)(SURFOBJ*, CLIPOBJ*, XLATEOBJ*, TRIVERTEX*, ULONG, PVOID, ULONG, RECTL*, POINTL*, ULONG); +typedef VOID (NTAPI *PGD_SYNCHRONIZESURFACE)(SURFOBJ*, RECTL *, FLONG); + +// +// Most of these are definded in ddk/winddi.h +// +typedef struct _DRIVER_FUNCTIONS +{ + PGD_ENABLEPDEV EnablePDEV; + PGD_COMPLETEPDEV CompletePDEV; + PGD_DISABLEPDEV DisablePDEV; + PGD_ENABLESURFACE EnableSurface; + PGD_DISABLESURFACE DisableSurface; + PGD_ASSERTMODE AssertMode; + PGD_OFFSET Offset; + PGD_RESETPDEV ResetPDEV; + PGD_DISABLEDRIVER DisableDriver; + PVOID Unknown1; + PGD_CREATEDEVICEBITMAP CreateDeviceBitmap; + PGD_DELETEDEVICEBITMAP DeleteDeviceBitmap; + PGD_REALIZEBRUSH RealizeBrush; + PGD_DITHERCOLOR DitherColor; + PGD_STROKEPATH StrokePath; + PGD_FILLPATH FillPath; + PGD_STROKEANDFILLPATH StrokeAndFillPath; + PGD_PAINT Paint; + PGD_BITBLT BitBlt; + PGD_COPYBITS CopyBits; + PGD_STRETCHBLT StretchBlt; + PVOID Unknown2; + PGD_SETPALETTE SetPalette; + PGD_TEXTOUT TextOut; + PGD_ESCAPE Escape; + PGD_DRAWESCAPE DrawEscape; + PGD_QUERYFONT QueryFont; + PGD_QUERYFONTTREE QueryFontTree; + PGD_QUERYFONTDATA QueryFontData; + PGD_SETPOINTERSHAPE SetPointerShape; + PGD_MOVEPOINTER MovePointer; + PGD_LINETO LineTo; + PGD_SENDPAGE SendPage; + PGD_STARTPAGE StartPage; + PGD_ENDDOC EndDoc; + PGD_STARTDOC StartDoc; + PVOID Unknown3; + PGD_GETGLYPHMODE GetGlyphMode; + PGD_SYNCHRONIZE Synchronize; + PVOID Unknown4; + PGD_SAVESCREENBITS SaveScreenBits; + PGD_GETMODES GetModes; + PGD_FREE Free; + PGD_DESTROYFONT DestroyFont; + PGD_QUERYFONTCAPS QueryFontCaps; + PGD_LOADFONTFILE LoadFontFile; + PGD_UNLOADFONTFILE UnloadFontFile; + PGD_FONTMANAGEMENT FontManagement; + PGD_QUERYTRUETYPETABLE QueryTrueTypeTable; + PGD_QUERYTRUETYPEOUTLINE QueryTrueTypeOutline; + PGD_GETTRUETYPEFILE GetTrueTypeFile; + PGD_QUERYFONTFILE QueryFontFile; + PFN_DrvMovePanning MovePanning; + PGD_QUERYADVANCEWIDTHS QueryAdvanceWidths; + PGD_SETPIXELFORMAT SetPixelFormat; + PGD_DESCRIBEPIXELFORMAT DescribePixelFormat; + PGD_SWAPBUFFERS SwapBuffers; + PGD_STARTBANDING StartBanding; + PGD_NEXTBAND NextBand; + PGD_GETDIRECTDRAWINFO GetDirectDrawInfo; + PGD_ENABLEDIRECTDRAW EnableDirectDraw; + PGD_DISABLEDIRECTDRAW DisableDirectDraw; + PGD_QUERYSPOOLTYPE QuerySpoolType; + PVOID Unknown5; + PFN_DrvIcmCreateColorTransform IcmCreateColorTransform; + PFN_DrvIcmDeleteColorTransform IcmDeleteColorTransform; + PFN_DrvIcmCheckBitmapBits IcmCheckBitmapBits; + PFN_DrvIcmSetDeviceGammaRamp IcmSetDeviceGammaRamp; + PGD_GRADIENTFILL GradientFill; + PGD_STRETCHBLTROP StretchBltROP; + PFN_DrvPlgBlt PlgBlt; + PGD_ALPHABLEND AlphaBlend; + PVOID SynthesizeFont; + PVOID GetSynthesizedFontFiles; + PGD_TRANSPARENTBLT TransparentBlt; + PFN_DrvQueryPerBandInfo QueryPerBandInfo; + PFN_DrvQueryDeviceSupport QueryDeviceSupport; + PVOID Reserved1; + PVOID Reserved2; + PVOID Reserved3; + PVOID Reserved4; + PVOID Reserved5; + PVOID Reserved6; + PVOID Reserved7; + PVOID Reserved8; + PFN_DrvDeriveSurface DeriveSurface; + PFN_DrvQueryGlyphAttrs QueryGlyphAttrs; + PFN_DrvNotify Notify; + PGD_SYNCHRONIZESURFACE SynchronizeSurface; + PFN_DrvResetDevice ResetDevice; + PVOID Reserved9; + PVOID Reserved10; + PVOID Reserved11; /* 92 */ + + /* ReactOS specify */ + PGD_ENABLEDRIVER EnableDriver; //ReactOS Extra +} DRIVER_FUNCTIONS, *PDRIVER_FUNCTIONS; + +/* FIXME move to more proper place, Vista syscall */ +DWORD STDCALL NtGdiConfigureOPMProtectedOutput(DWORD x1, DWORD x2, DWORD x3, DWORD x4); +DWORD STDCALL NtGdiCreateOPMProtectedOutputs(DWORD x1, DWORD x2, DWORD x3, DWORD x4, DWORD x5); + +/* Doc exists in msdn see ReactOS def file which D3DKMT* it is, rember I have not check if the doc are correct, + * it is for the drv, which api it should export. + * comucate way + * gdi32.dll -- Direcly syscall --> win33k.sys + * win33k.sys -- doing direct call to -->dxkrnl.sys (note dxkrnl doing allot work here) + * dxkrnl.sys (note dxkrnl doing allot work here) -- the drv export function --> graphic drv, + * this api should move to more proper place later. + */ +DWORD STDCALL NtGdiDdDDICheckExclusiveOwnership(); +DWORD STDCALL NtGdiDdDDICheckMonitorPowerState(DWORD x1); +DWORD STDCALL NtGdiDdDDICheckOcclusion(DWORD x1); +DWORD STDCALL NtGdiDdDDICloseAdapter(DWORD x1); +DWORD STDCALL NtGdiDdDDICreateAllocation(DWORD x1); +DWORD STDCALL NtGdiDdDDICreateContext(DWORD x1); +DWORD STDCALL NtGdiDdDDICreateDCFromMemory(DWORD x1); +DWORD STDCALL NtGdiDdDDICreateDevice(DWORD x1); +DWORD STDCALL NtGdiDdDDICreateOverlay(DWORD x1); +DWORD STDCALL NtGdiDdDDICreateSynchronizationObject(DWORD x1); +DWORD STDCALL NtGdiDdDDIDestroyAllocation(DWORD x1); +DWORD STDCALL NtGdiDdDDIDestroyContext(DWORD x1); +DWORD STDCALL NtGdiDdDDIDestroyDCFromMemory(DWORD x1); +DWORD STDCALL NtGdiDdDDIDestroyDevice(DWORD x1); +DWORD STDCALL NtGdiDdDDIDestroyOverlay(DWORD x1); +DWORD STDCALL NtGdiDdDDIDestroySynchronizationObject(DWORD x1); +DWORD STDCALL NtGdiDdDDIEscape(DWORD x1); +DWORD STDCALL NtGdiDdDDIFlipOverlay(DWORD x1); +DWORD STDCALL NtGdiDdDDIGetContextSchedulingPriority(DWORD x1); +DWORD STDCALL NtGdiDdDDIGetDeviceState(DWORD x1); +DWORD STDCALL NtGdiDdDDIGetDisplayModeList(DWORD x1); +DWORD STDCALL NtGdiDdDDIGetMultisampleMethodList(DWORD x1); +DWORD STDCALL NtGdiDdDDIGetPresentHistory(DWORD x1); +DWORD STDCALL NtGdiDdDDIGetProcessSchedulingPriorityClass(DWORD x1, DWORD x2); +DWORD STDCALL NtGdiDdDDIGetRuntimeData(DWORD x1); +DWORD STDCALL NtGdiDdDDIGetScanLine(DWORD x1); +DWORD STDCALL NtGdiDdDDIGetSharedPrimaryHandle(DWORD x1); +DWORD STDCALL NtGdiDdDDIInvalidateActiveVidPn(DWORD x1); +DWORD STDCALL NtGdiDdDDILock(DWORD x1); +DWORD STDCALL NtGdiDdDDIOpenAdapterFromDeviceName(DWORD x1); +DWORD STDCALL NtGdiDdDDIOpenAdapterFromHdc(DWORD x1); +DWORD STDCALL NtGdiDdDDIOpenResource(DWORD x1); +DWORD STDCALL NtGdiDdDDIPollDisplayChildren(DWORD x1); +DWORD STDCALL NtGdiDdDDIPresent(DWORD x1); +DWORD STDCALL NtGdiDdDDIQueryAdapterInfo(DWORD x1); +DWORD STDCALL NtGdiDdDDIQueryAllocationResidency(DWORD x1); +DWORD STDCALL NtGdiDdDDIQueryResourceInfo(DWORD x1); +DWORD STDCALL NtGdiDdDDIQueryStatistics(DWORD x1); +DWORD STDCALL NtGdiDdDDIReleaseProcessVidPnSourceOwners(DWORD x1); +DWORD STDCALL NtGdiDdDDIRender(DWORD x1); +DWORD STDCALL NtGdiDdDDISetAllocationPriority(DWORD x1); +DWORD STDCALL NtGdiDdDDISetContextSchedulingPriority(DWORD x1); +DWORD STDCALL NtGdiDdDDISetDisplayMode(DWORD x1); +DWORD STDCALL NtGdiDdDDISetDisplayPrivateDriverFormat(DWORD x1); +DWORD STDCALL NtGdiDdDDISetGammaRamp(DWORD x1); +DWORD STDCALL NtGdiDdDDISetProcessSchedulingPriorityClass(DWORD x1, x2); +DWORD STDCALL NtGdiDdDDISetQueuedLimit(DWORD x1); +DWORD STDCALL NtGdiDdDDISetVidPnSourceOwner(DWORD x1); +DWORD STDCALL NtGdiDdDDISharedPrimaryLockNotification(DWORD x1); +DWORD STDCALL NtGdiDdDDISharedPrimaryUnLockNotification(DWORD x1); +DWORD STDCALL NtGdiDdDDISignalSynchronizationObject(DWORD x1); +DWORD STDCALL NtGdiDdDDIUnlock(DWORD x1); +DWORD STDCALL NtGdiDdDDIUpdateOverlay(DWORD x1); +DWORD STDCALL NtGdiDdDDIWaitForIdle(DWORD x1); +DWORD STDCALL NtGdiDdDDIWaitForSynchronizationObject(DWORD x1); +DWORD STDCALL NtGdiDdDDIWaitForVerticalBlankEvent(DWORD x1); +DWORD STDCALL NtGdiDDCCIGetCapabilitiesString(DWORD x1, DWORD x2, DWORD x3); +DWORD STDCALL NtGdiDDCCIGetCapabilitiesStringLength(DWORD x1, DWORD x2); +DWORD STDCALL NtGdiDDCCIGetTimingReport(DWORD x1, DWORD x2); +DWORD STDCALL NtGdiDDCCIGetVCPFeature(DWORD x1, DWORD x2, DWORD x3, DWORD x4); +DWORD STDCALL NtGdiDDCCISaveCurrentSettings(DWORD x1); +DWORD STDCALL NtGdiDDCCISetVCPFeature(DWORD x1, DWORD x2, DWORD x3); + + + +#endif Added: branches/win32k-gdi-dx/subsystems/win32/win32k/ntddraw/d3dkmt.c URL:
http://svn.reactos.org/svn/reactos/branches/win32k-gdi-dx/subsystems/win32/…
============================================================================== --- branches/win32k-gdi-dx/subsystems/win32/win32k/ntddraw/d3dkmt.c (added) +++ branches/win32k-gdi-dx/subsystems/win32/win32k/ntddraw/d3dkmt.c [iso-8859-1] Sun May 18 13:33:27 2008 @@ -1,0 +1,507 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * PURPOSE: Native DirectDraw implementation + * FILE: subsys/win32k/ntddraw/d3d.c + * PROGRAMER: Magnus olsen (magnus(a)greatlord.com) + * REVISION HISTORY: + * 18/5-2008 Magnus Olsen + */ + + +#include <w32k.h> +#include <debug.h> + +DWORD +STDCALL +NtGdiDdDDICheckExclusiveOwnership() +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDICheckMonitorPowerState(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDICheckOcclusion(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDICloseAdapter(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDICreateAllocation(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDICreateContext(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDICreateDCFromMemory(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDICreateDevice(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDICreateOverlay(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDICreateSynchronizationObject(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDIDestroyAllocation(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +NtGdiDdDDIDestroyContext(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDIDestroyDCFromMemory(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDIDestroyDevice(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDIDestroyOverlay(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDIDestroySynchronizationObject(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDIEscape(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDIFlipOverlay(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDIGetContextSchedulingPriority(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDIGetDeviceState(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDIGetDisplayModeList(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDIGetMultisampleMethodList(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDIGetPresentHistory(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDIGetProcessSchedulingPriorityClass +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDIGetRuntimeData(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDIGetScanLine(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDIGetSharedPrimaryHandle(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDIInvalidateActiveVidPn(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDILock(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDIOpenAdapterFromDeviceName(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDIOpenAdapterFromHdc(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDIOpenResource(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDIPollDisplayChildren(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDIPresent(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDIQueryAdapterInfo(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDIQueryAllocationResidency(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDIQueryResourceInfo(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDIQueryStatistics(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDIReleaseProcessVidPnSourceOwners(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDIRender(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDISetAllocationPriority(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDISetContextSchedulingPriority(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDISetDisplayMode(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDISetDisplayPrivateDriverFormat(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDISetGammaRamp(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDISetProcessSchedulingPriorityClass(DWORD x1, x2) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDISetQueuedLimit(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDISetVidPnSourceOwner(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDISharedPrimaryLockNotification(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDISharedPrimaryUnLockNotification(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDISignalSynchronizationObject(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDIUnlock(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDIUpdateOverlay(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDIWaitForIdle(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDIWaitForSynchronizationObject(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDIWaitForVerticalBlankEvent(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDDCCIGetCapabilitiesString(DWORD x1, DWORD x2, DWORD x3) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDDCCIGetCapabilitiesStringLength(DWORD x1, DWORD x2) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDDCCIGetTimingReport(DWORD x1, DWORD x2) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDDCCIGetVCPFeature(DWORD x1, DWORD x2, DWORD x3, DWORD x4) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDDCCISaveCurrentSettings(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDDCCISetVCPFeature(DWORD x1, DWORD x2, DWORD x3) +{ + UNIMPLEMENTED; + return 0 +} Propchange: branches/win32k-gdi-dx/subsystems/win32/win32k/ntddraw/d3dkmt.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/win32k-gdi-dx/subsystems/win32/win32k/stubs/stubs.c URL:
http://svn.reactos.org/svn/reactos/branches/win32k-gdi-dx/subsystems/win32/…
============================================================================== --- branches/win32k-gdi-dx/subsystems/win32/win32k/stubs/stubs.c [iso-8859-1] (original) +++ branches/win32k-gdi-dx/subsystems/win32/win32k/stubs/stubs.c [iso-8859-1] Sun May 18 13:33:27 2008 @@ -2974,3 +2974,11 @@ UNIMPLEMENTED; return 0 } + +DWORD +STDCALL +NtGdiCreateOPMProtectedOutputs(DWORD x1, DWORD x2, DWORD x3, DWORD x4, DWORD x5) +{ + UNIMPLEMENTED; + return 0 +} Modified: branches/win32k-gdi-dx/subsystems/win32/win32k/w32ksvc.db URL:
http://svn.reactos.org/svn/reactos/branches/win32k-gdi-dx/subsystems/win32/…
============================================================================== --- branches/win32k-gdi-dx/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] (original) +++ branches/win32k-gdi-dx/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] Sun May 18 13:33:27 2008 @@ -674,7 +674,70 @@ # # # Vista Syscall add on -NtGdiConfigureOPMProtectedOutput 4 +NtGdiConfigureOPMProtectedOutput 4 +NtGdiCreateOPMProtectedOutputs 5 +NtGdiDdDDICheckExclusiveOwnership 0 +NtGdiDdDDICheckMonitorPowerState 1 +NtGdiDdDDICheckOcclusion 1 +NtGdiDdDDICloseAdapter 1 +NtGdiDdDDICreateAllocation 1 +NtGdiDdDDICreateContext 1 +NtGdiDdDDICreateDCFromMemory 1 +NtGdiDdDDICreateDevice 1 +NtGdiDdDDICreateOverlay 1 +NtGdiDdDDICreateSynchronizationObject 1 +NtGdiDdDDIDestroyAllocation 1 +NtGdiDdDDIDestroyContext 1 +NtGdiDdDDIDestroyDCFromMemory 1 +NtGdiDdDDIDestroyDevice 1 +NtGdiDdDDIDestroyOverlay 1 +NtGdiDdDDIDestroySynchronizationObject 1 +NtGdiDdDDIEscape 1 +NtGdiDdDDIFlipOverlay 1 +NtGdiDdDDIGetContextSchedulingPriority 1 +NtGdiDdDDIGetDeviceState 1 +NtGdiDdDDIGetDisplayModeList 1 +NtGdiDdDDIGetMultisampleMethodList 1 +NtGdiDdDDIGetPresentHistory 1 +NtGdiDdDDIGetProcessSchedulingPriorityClass 2 +NtGdiDdDDIGetRuntimeData 1 +NtGdiDdDDIGetScanLine 1 +NtGdiDdDDIGetSharedPrimaryHandle 1 +NtGdiDdDDIInvalidateActiveVidPn 1 +NtGdiDdDDILock 1 +NtGdiDdDDIOpenAdapterFromDeviceName 1 +NtGdiDdDDIOpenAdapterFromHdc 1 +NtGdiDdDDIOpenResource 1 +NtGdiDdDDIPollDisplayChildren 1 +NtGdiDdDDIPresent 1 +NtGdiDdDDIQueryAdapterInfo 1 +NtGdiDdDDIQueryAllocationResidency 1 +NtGdiDdDDIQueryResourceInfo 1 +NtGdiDdDDIQueryStatistics 1 +NtGdiDdDDIReleaseProcessVidPnSourceOwners 1 +NtGdiDdDDIRender 1 +NtGdiDdDDISetAllocationPriority 1 +NtGdiDdDDISetContextSchedulingPriority 1 +NtGdiDdDDISetDisplayMode 1 +NtGdiDdDDISetDisplayPrivateDriverFormat 1 +NtGdiDdDDISetGammaRamp 1 +NtGdiDdDDISetProcessSchedulingPriorityClass 1 +NtGdiDdDDISetQueuedLimit 1 +NtGdiDdDDISetVidPnSourceOwner 1 +NtGdiDdDDISharedPrimaryLockNotification 1 +NtGdiDdDDISharedPrimaryUnLockNotification 1 +NtGdiDdDDISignalSynchronizationObject 1 +NtGdiDdDDIUnlock 1 +NtGdiDdDDIUpdateOverlay 1 +NtGdiDdDDIWaitForIdle 1 +NtGdiDdDDIWaitForSynchronizationObject 1 +NtGdiDdDDIWaitForVerticalBlankEvent 1 +NtGdiDDCCIGetCapabilitiesString 3 +NtGdiDDCCIGetCapabilitiesStringLength 2 +NtGdiDDCCIGetTimingReport 2 +NtGdiDDCCIGetVCPFeature 4 +NtGdiDDCCISaveCurrentSettings 1 +NtGdiDDCCISetVCPFeature 3 # # #ReactOS specific syscalls
16 years, 8 months
1
0
0
0
[hpoussin] 33592: Display again the 'New' context menu, which was broken in r30366 See issue #3183 for more details.
by hpoussin@svn.reactos.org
Author: hpoussin Date: Sun May 18 13:07:00 2008 New Revision: 33592 URL:
http://svn.reactos.org/svn/reactos?rev=33592&view=rev
Log: Display again the 'New' context menu, which was broken in r30366 See issue #3183 for more details. Modified: trunk/reactos/dll/win32/shell32/shv_bg_cmenu.c trunk/reactos/dll/win32/shell32/shv_item_new.c Modified: trunk/reactos/dll/win32/shell32/shv_bg_cmenu.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_bg_c…
============================================================================== --- trunk/reactos/dll/win32/shell32/shv_bg_cmenu.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shv_bg_cmenu.c [iso-8859-1] Sun May 18 13:07:00 2008 @@ -170,6 +170,8 @@ * ISVBgCm_fnQueryContextMenu() */ +VOID INewItem_SetParent(LPSHELLFOLDER pSFParent); /* FIXME: remove that, shouldn't be needed */ + static HRESULT WINAPI ISVBgCm_fnQueryContextMenu( IContextMenu2 *iface, HMENU hMenu, @@ -225,8 +227,7 @@ * FIXME * load other shell extensions */ -#if 0 - if (SUCCEEDED(INewItem_Constructor(This->pSFParent, &IID_IContextMenu2, (LPVOID*)&icm))) + if (SUCCEEDED(INewItem_Constructor(NULL, &IID_IContextMenu2, (LPVOID*)&icm))) { if (SUCCEEDED(IContextMenu_QueryContextMenu(icm, hMenu, 10, idCmdFirst, idCmdLast, uFlags))) { @@ -238,7 +239,10 @@ This->icm_new = NULL; } } -#endif + + /* Prepare 'New item' shell extension */ + /* FIXME: shouldn't be needed... */ + INewItem_SetParent(This->pSFParent); if (This->bDesktop) { Modified: trunk/reactos/dll/win32/shell32/shv_item_new.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_item…
============================================================================== --- trunk/reactos/dll/win32/shell32/shv_item_new.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shv_item_new.c [iso-8859-1] Sun May 18 13:07:00 2008 @@ -756,8 +756,8 @@ LPARAM lParam) { INewMenuImpl *This = impl_from_IContextMenu(iface); - DRAWITEMSTRUCT * lpids = (DRAWITEMSTRUCT*) lParam; - MEASUREITEMSTRUCT *lpmis = (MEASUREITEMSTRUCT*) lParam; + //DRAWITEMSTRUCT * lpids = (DRAWITEMSTRUCT*) lParam; + //MEASUREITEMSTRUCT *lpmis = (MEASUREITEMSTRUCT*) lParam; TRACE("INewItem_IContextMenu_fnHandleMenuMsg (%p)->(msg=%x wp=%lx lp=%lx)\n",This, uMsg, wParam, lParam); @@ -789,11 +789,11 @@ INewItem_IContextMenu_fnHandleMenuMsg }; +static INewMenuImpl *cached_ow; HRESULT WINAPI INewItem_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID *ppv) { INewMenuImpl * ow; HRESULT res; - static INewMenuImpl *cached_ow; if (!cached_ow) { @@ -814,13 +814,17 @@ } TRACE("(%p)->()\n",cached_ow); + + res = INewItem_fnQueryInterface( cached_ow, riid, ppv ); + return res; +} + +VOID INewItem_SetParent(LPSHELLFOLDER pSFParent) +{ if (cached_ow->pSFParent) { IShellFolder_Release(cached_ow->pSFParent); } - // cached_ow->pSFParent = pSFParent; - // IShellFolder_AddRef(pSFParent); - - res = INewItem_fnQueryInterface( cached_ow, riid, ppv ); - return res; -} + cached_ow->pSFParent = pSFParent; + IShellFolder_AddRef(pSFParent); +}
16 years, 8 months
1
0
0
0
[greatlrd] 33591: Adding vista syscall NtGdiConfigureOPMProtectedOutput it is stub for now
by greatlrd@svn.reactos.org
Author: greatlrd Date: Sun May 18 11:33:14 2008 New Revision: 33591 URL:
http://svn.reactos.org/svn/reactos?rev=33591&view=rev
Log: Adding vista syscall NtGdiConfigureOPMProtectedOutput it is stub for now Modified: branches/win32k-gdi-dx/include/reactos/win32k/ntgdityp.h branches/win32k-gdi-dx/subsystems/win32/win32k/stubs/stubs.c branches/win32k-gdi-dx/subsystems/win32/win32k/w32ksvc.db Modified: branches/win32k-gdi-dx/include/reactos/win32k/ntgdityp.h URL:
http://svn.reactos.org/svn/reactos/branches/win32k-gdi-dx/include/reactos/w…
============================================================================== --- branches/win32k-gdi-dx/include/reactos/win32k/ntgdityp.h [iso-8859-1] (original) +++ branches/win32k-gdi-dx/include/reactos/win32k/ntgdityp.h [iso-8859-1] Sun May 18 11:33:14 2008 @@ -658,4 +658,10 @@ PGD_ENABLEDRIVER EnableDriver; //ReactOS Extra } DRIVER_FUNCTIONS, *PDRIVER_FUNCTIONS; +/* FIXME move to more proper place, Vista syscall */ +DWORD +STDCALL +NtGdiConfigureOPMProtectedOutput(DWORD x1, DWORD x2, DWORD x3, DWORD x4); + + #endif Modified: branches/win32k-gdi-dx/subsystems/win32/win32k/stubs/stubs.c URL:
http://svn.reactos.org/svn/reactos/branches/win32k-gdi-dx/subsystems/win32/…
============================================================================== --- branches/win32k-gdi-dx/subsystems/win32/win32k/stubs/stubs.c [iso-8859-1] (original) +++ branches/win32k-gdi-dx/subsystems/win32/win32k/stubs/stubs.c [iso-8859-1] Sun May 18 11:33:14 2008 @@ -2964,3 +2964,13 @@ UNIMPLEMENTED; return FALSE; } + + +/* Vista Syscall that are stub */ +DWORD +STDCALL +NtGdiConfigureOPMProtectedOutput(DWORD x1, DWORD x2, DWORD x3, DWORD x4) +{ + UNIMPLEMENTED; + return 0 +} Modified: branches/win32k-gdi-dx/subsystems/win32/win32k/w32ksvc.db URL:
http://svn.reactos.org/svn/reactos/branches/win32k-gdi-dx/subsystems/win32/…
============================================================================== --- branches/win32k-gdi-dx/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] (original) +++ branches/win32k-gdi-dx/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] Sun May 18 11:33:14 2008 @@ -673,6 +673,10 @@ NtGdiDrawStream 3 # # +# Vista Syscall add on +NtGdiConfigureOPMProtectedOutput 4 +# +# #ReactOS specific syscalls NtGdiSetDIBits 7 NtGdiSetViewportExtEx 4
16 years, 8 months
1
0
0
0
[hpoussin] 33590: Add stub implementation for ElfrOpenELW()
by hpoussin@svn.reactos.org
Author: hpoussin Date: Sun May 18 11:14:34 2008 New Revision: 33590 URL:
http://svn.reactos.org/svn/reactos?rev=33590&view=rev
Log: Add stub implementation for ElfrOpenELW() Modified: trunk/reactos/base/services/eventlog/rpc.c Modified: trunk/reactos/base/services/eventlog/rpc.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/rpc…
============================================================================== --- trunk/reactos/base/services/eventlog/rpc.c [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/rpc.c [iso-8859-1] Sun May 18 11:14:34 2008 @@ -129,7 +129,8 @@ IELF_HANDLE *LogHandle) { UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + *LogHandle = 1; + return STATUS_SUCCESS; }
16 years, 8 months
1
0
0
0
← Newer
1
...
17
18
19
20
21
22
23
...
59
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
Results per page:
10
25
50
100
200