From: Jacek Caban jacek@codeweavers.com
Signed-off-by: Jacek Caban jacek@codeweavers.com Signed-off-by: Huw Davies huw@codeweavers.com --- dlls/gdi32/dib.c | 8 ++++---- dlls/gdi32/driver.c | 38 +++++++++++++++++++------------------- dlls/gdi32/gdi32.spec | 22 +++++++++++----------- include/ntgdi.h | 12 ++++++++++++ 4 files changed, 46 insertions(+), 34 deletions(-)
diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index de1942894de..5a8d29ae5bf 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -1579,9 +1579,9 @@ error:
/*********************************************************************** - * D3DKMTCreateDCFromMemory (GDI32.@) + * NtGdiDdDDICreateDCFromMemory (win32u.@) */ -NTSTATUS WINAPI D3DKMTCreateDCFromMemory( D3DKMT_CREATEDCFROMMEMORY *desc ) +NTSTATUS WINAPI NtGdiDdDDICreateDCFromMemory( D3DKMT_CREATEDCFROMMEMORY *desc ) { const struct d3dddi_format_info { @@ -1693,9 +1693,9 @@ error:
/*********************************************************************** - * D3DKMTDestroyDCFromMemory (GDI32.@) + * NtGdiDdDDIDestroyDCFromMemory (win32u.@) */ -NTSTATUS WINAPI D3DKMTDestroyDCFromMemory( const D3DKMT_DESTROYDCFROMMEMORY *desc ) +NTSTATUS WINAPI NtGdiDdDDIDestroyDCFromMemory( const D3DKMT_DESTROYDCFROMMEMORY *desc ) { if (!desc) return STATUS_INVALID_PARAMETER;
diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 1df4660211e..fba1f1cffea 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -1203,27 +1203,27 @@ ULONG WINAPI DdQueryDisplaySettingsUniqueness(VOID) }
/****************************************************************************** - * D3DKMTOpenAdapterFromHdc [GDI32.@] + * NtGdiDdDDIOpenAdapterFromHdc (win32u.@) */ -NTSTATUS WINAPI D3DKMTOpenAdapterFromHdc( void *pData ) +NTSTATUS WINAPI NtGdiDdDDIOpenAdapterFromHdc( void *pData ) { FIXME("(%p): stub\n", pData); return STATUS_NO_MEMORY; }
/****************************************************************************** - * D3DKMTEscape [GDI32.@] + * NtGdiDdDDIEscape (win32u.@) */ -NTSTATUS WINAPI D3DKMTEscape( const void *pData ) +NTSTATUS WINAPI NtGdiDdDDIEscape( const void *pData ) { FIXME("(%p): stub\n", pData); return STATUS_NO_MEMORY; }
/****************************************************************************** - * D3DKMTCloseAdapter [GDI32.@] + * NtGdiDdDDICloseAdapter (win32u.@) */ -NTSTATUS WINAPI D3DKMTCloseAdapter( const D3DKMT_CLOSEADAPTER *desc ) +NTSTATUS WINAPI NtGdiDdDDICloseAdapter( const D3DKMT_CLOSEADAPTER *desc ) { NTSTATUS status = STATUS_INVALID_PARAMETER; struct d3dkmt_adapter *adapter; @@ -1332,9 +1332,9 @@ done: }
/****************************************************************************** - * D3DKMTCreateDevice [GDI32.@] + * NtGdiDdDDICreateDevice (win32u.@) */ -NTSTATUS WINAPI D3DKMTCreateDevice( D3DKMT_CREATEDEVICE *desc ) +NTSTATUS WINAPI NtGdiDdDDICreateDevice( D3DKMT_CREATEDEVICE *desc ) { static D3DKMT_HANDLE handle_start = 0; struct d3dkmt_adapter *adapter; @@ -1377,9 +1377,9 @@ NTSTATUS WINAPI D3DKMTCreateDevice( D3DKMT_CREATEDEVICE *desc ) }
/****************************************************************************** - * D3DKMTDestroyDevice [GDI32.@] + * NtGdiDdDDIDestroyDevice (win32u.@) */ -NTSTATUS WINAPI D3DKMTDestroyDevice( const D3DKMT_DESTROYDEVICE *desc ) +NTSTATUS WINAPI NtGdiDdDDIDestroyDevice( const D3DKMT_DESTROYDEVICE *desc ) { NTSTATUS status = STATUS_INVALID_PARAMETER; D3DKMT_SETVIDPNSOURCEOWNER set_owner_desc; @@ -1397,7 +1397,7 @@ NTSTATUS WINAPI D3DKMTDestroyDevice( const D3DKMT_DESTROYDEVICE *desc ) { memset( &set_owner_desc, 0, sizeof(set_owner_desc) ); set_owner_desc.hDevice = desc->hDevice; - D3DKMTSetVidPnSourceOwner( &set_owner_desc ); + NtGdiDdDDISetVidPnSourceOwner( &set_owner_desc ); list_remove( &device->entry ); heap_free( device ); status = STATUS_SUCCESS; @@ -1410,27 +1410,27 @@ NTSTATUS WINAPI D3DKMTDestroyDevice( const D3DKMT_DESTROYDEVICE *desc ) }
/****************************************************************************** - * D3DKMTQueryStatistics [GDI32.@] + * NtGdiDdDDIQueryStatistics (win32u.@) */ -NTSTATUS WINAPI D3DKMTQueryStatistics(D3DKMT_QUERYSTATISTICS *stats) +NTSTATUS WINAPI NtGdiDdDDIQueryStatistics( D3DKMT_QUERYSTATISTICS *stats ) { FIXME("(%p): stub\n", stats); return STATUS_SUCCESS; }
/****************************************************************************** - * D3DKMTSetQueuedLimit [GDI32.@] + * NtGdiDdDDISetQueuedLimit (win32u.@) */ -NTSTATUS WINAPI D3DKMTSetQueuedLimit( D3DKMT_SETQUEUEDLIMIT *desc ) +NTSTATUS WINAPI NtGdiDdDDISetQueuedLimit( D3DKMT_SETQUEUEDLIMIT *desc ) { FIXME( "(%p): stub\n", desc ); return STATUS_NOT_IMPLEMENTED; }
/****************************************************************************** - * D3DKMTSetVidPnSourceOwner [GDI32.@] + * NtGdiDdDDISetVidPnSourceOwner (win32u.@) */ -NTSTATUS WINAPI D3DKMTSetVidPnSourceOwner( const D3DKMT_SETVIDPNSOURCEOWNER *desc ) +NTSTATUS WINAPI NtGdiDdDDISetVidPnSourceOwner( const D3DKMT_SETVIDPNSOURCEOWNER *desc ) { TRACE("(%p)\n", desc);
@@ -1448,9 +1448,9 @@ NTSTATUS WINAPI D3DKMTSetVidPnSourceOwner( const D3DKMT_SETVIDPNSOURCEOWNER *des }
/****************************************************************************** - * D3DKMTCheckVidPnExclusiveOwnership [GDI32.@] + * NtGdiDdDDICheckVidPnExclusiveOwnership (win32u.@) */ -NTSTATUS WINAPI D3DKMTCheckVidPnExclusiveOwnership( const D3DKMT_CHECKVIDPNEXCLUSIVEOWNERSHIP *desc ) +NTSTATUS WINAPI NtGdiDdDDICheckVidPnExclusiveOwnership( const D3DKMT_CHECKVIDPNEXCLUSIVEOWNERSHIP *desc ) { TRACE("(%p)\n", desc);
diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 6aef8c2dbf6..48ce04e3819 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -80,18 +80,18 @@ @ stdcall CreateScalableFontResourceA(long str str str) @ stdcall CreateScalableFontResourceW(long wstr wstr wstr) @ stdcall CreateSolidBrush(long) -@ stdcall D3DKMTCheckVidPnExclusiveOwnership(ptr) -@ stdcall D3DKMTCloseAdapter(ptr) -@ stdcall D3DKMTCreateDCFromMemory(ptr) -@ stdcall D3DKMTCreateDevice(ptr) -@ stdcall D3DKMTDestroyDCFromMemory(ptr) -@ stdcall D3DKMTDestroyDevice(ptr) -@ stdcall D3DKMTEscape(ptr) +@ stdcall D3DKMTCheckVidPnExclusiveOwnership(ptr) NtGdiDdDDICheckVidPnExclusiveOwnership +@ stdcall D3DKMTCloseAdapter(ptr) NtGdiDdDDICloseAdapter +@ stdcall D3DKMTCreateDCFromMemory(ptr) NtGdiDdDDICreateDCFromMemory +@ stdcall D3DKMTCreateDevice(ptr) NtGdiDdDDICreateDevice +@ stdcall D3DKMTDestroyDCFromMemory(ptr) NtGdiDdDDIDestroyDCFromMemory +@ stdcall D3DKMTDestroyDevice(ptr) NtGdiDdDDIDestroyDevice +@ stdcall D3DKMTEscape(ptr) NtGdiDdDDIEscape @ stdcall D3DKMTOpenAdapterFromGdiDisplayName(ptr) -@ stdcall D3DKMTOpenAdapterFromHdc(ptr) -@ stdcall D3DKMTQueryStatistics(ptr) -@ stdcall D3DKMTSetQueuedLimit(ptr) -@ stdcall D3DKMTSetVidPnSourceOwner(ptr) +@ stdcall D3DKMTOpenAdapterFromHdc(ptr) NtGdiDdDDIOpenAdapterFromHdc +@ stdcall D3DKMTQueryStatistics(ptr) NtGdiDdDDIQueryStatistics +@ stdcall D3DKMTSetQueuedLimit(ptr) NtGdiDdDDISetQueuedLimit +@ stdcall D3DKMTSetVidPnSourceOwner(ptr) NtGdiDdDDISetVidPnSourceOwner @ stdcall DPtoLP(long ptr long) @ stdcall DeleteColorSpace(long) @ stdcall DeleteDC(long) diff --git a/include/ntgdi.h b/include/ntgdi.h index e1bb6fb901d..7f3ecec8c64 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -20,7 +20,9 @@ #define _NTGDI_
#include <wingdi.h> +#include <winternl.h> #include <winspool.h> +#include <ddk/d3dkmthk.h>
typedef struct _GDI_HANDLE_ENTRY { @@ -325,4 +327,14 @@ BOOL WINAPI NtGdiUnrealizeObject( HGDIOBJ obj ); BOOL WINAPI NtGdiUpdateColors( HDC hdc ); BOOL WINAPI NtGdiWidenPath( HDC hdc );
+NTSTATUS WINAPI NtGdiDdDDICheckVidPnExclusiveOwnership( const D3DKMT_CHECKVIDPNEXCLUSIVEOWNERSHIP *desc ); +NTSTATUS WINAPI NtGdiDdDDICloseAdapter( const D3DKMT_CLOSEADAPTER *desc ); +NTSTATUS WINAPI NtGdiDdDDICreateDCFromMemory( D3DKMT_CREATEDCFROMMEMORY *desc ); +NTSTATUS WINAPI NtGdiDdDDICreateDevice( D3DKMT_CREATEDEVICE *desc ); +NTSTATUS WINAPI NtGdiDdDDIDestroyDCFromMemory( const D3DKMT_DESTROYDCFROMMEMORY *desc ); +NTSTATUS WINAPI NtGdiDdDDIDestroyDevice( const D3DKMT_DESTROYDEVICE *desc ); +NTSTATUS WINAPI NtGdiDdDDIQueryStatistics( D3DKMT_QUERYSTATISTICS *stats ); +NTSTATUS WINAPI NtGdiDdDDISetQueuedLimit( D3DKMT_SETQUEUEDLIMIT *desc ); +NTSTATUS WINAPI NtGdiDdDDISetVidPnSourceOwner( const D3DKMT_SETVIDPNSOURCEOWNER *desc ); + #endif /* _NTGDI_ */
-
Huw Davies