Ros-diffs December 2007

ros-diffs@reactos.org

22 participants
605 discussions

[jimtabor] 31190: Add device caps and width data structures.
by jimtabor＠svn.reactos.org 13 Dec '07

13 Dec '07

Author: jimtabor Date: Thu Dec 13 11:51:02 2007 New Revision: 31190 URL: http://svn.reactos.org/svn/reactos?rev=31190&view=rev Log: Add device caps and width data structures. Modified: trunk/reactos/include/reactos/win32k/ntgdityp.h Modified: trunk/reactos/include/reactos/win32k/ntgdityp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdityp.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdityp.h Thu Dec 13 11:51:02 2007 @@ -129,9 +129,55 @@ typedef LONG FIX; /* FIXME: Unknown; easy to guess, usually based on public types and converted */ -typedef struct _WIDTHDATA WIDTHDATA, *PWIDTHDATA; -typedef struct _DEVCAPS DEVCAPS, *PDEVCAPS; typedef struct _REALIZATION_INFO 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; +} DEVCAPS, *PDEVCAPS; /* Font Structures */ typedef struct _TMDIFF

1 0

[greatlrd] 31189: patch from Kamil Hornicek tykef at atlas dot cz (irc nick : Pigglesworth) fix one fixme in createsurface.c support more that only dx7 surface in createsurface.c
by greatlrd＠svn.reactos.org 13 Dec '07

13 Dec '07

Author: greatlrd Date: Thu Dec 13 05:02:15 2007 New Revision: 31189 URL: http://svn.reactos.org/svn/reactos?rev=31189&view=rev Log: patch from Kamil Hornicek tykef at atlas dot cz (irc nick : Pigglesworth) fix one fixme in createsurface.c support more that only dx7 surface in createsurface.c Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw.h trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c trunk/reactos/dll/directx/ddraw/Surface/createsurface.c trunk/reactos/dll/directx/ddraw/rosdraw.h Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw.h (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw.h Thu Dec 13 05:02:15 2007 @@ -31,10 +31,17 @@ LPUNKNOWN pUnkOuter); HRESULT WINAPI +Main_DirectDraw_CreateSurface( + LPDDRAWI_DIRECTDRAW_INT This, + LPDDSURFACEDESC pDDSD, + LPDDRAWI_DDRAWSURFACE_INT *ppSurf, + IUnknown *pUnkOuter); + +HRESULT WINAPI Main_DirectDraw_CreateSurface4( LPDDRAWI_DIRECTDRAW_INT This, LPDDSURFACEDESC2 pDDSD, - LPDIRECTDRAWSURFACE7 *ppSurf, + LPDDRAWI_DDRAWSURFACE_INT *ppSurf, IUnknown *pUnkOuter); HRESULT WINAPI @@ -209,3 +216,4 @@ DWORD CALLBACK HelDdSurfUpdateOverlay(LPDDHAL_UPDATEOVERLAYDATA lpUpDateOveryLayData); + Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c Thu Dec 13 05:02:15 2007 @@ -434,7 +434,7 @@ /* For DirectDraw 1 - 3 */ HRESULT WINAPI Main_DirectDraw_CreateSurface (LPDDRAWI_DIRECTDRAW_INT This, LPDDSURFACEDESC pDDSD, - LPDIRECTDRAWSURFACE *ppSurf, IUnknown *pUnkOuter) + LPDDRAWI_DDRAWSURFACE_INT *ppSurf, IUnknown *pUnkOuter) { HRESULT ret = DDERR_GENERIC; DDSURFACEDESC2 dd_desc_v2; @@ -449,7 +449,7 @@ CopyDDSurfDescToDDSurfDesc2(&dd_desc_v2, (LPDDSURFACEDESC)pDDSD); ret = Internal_CreateSurface(This, &dd_desc_v2, - (LPDIRECTDRAWSURFACE7 *)ppSurf, + ppSurf, pUnkOuter); } else @@ -470,14 +470,14 @@ /* For DirectDraw 4 - 7 */ HRESULT WINAPI Main_DirectDraw_CreateSurface4(LPDDRAWI_DIRECTDRAW_INT This, LPDDSURFACEDESC2 pDDSD, - LPDIRECTDRAWSURFACE7 *ppSurf, IUnknown *pUnkOuter) + LPDDRAWI_DDRAWSURFACE_INT *ppSurf, IUnknown *pUnkOuter) { HRESULT ret; DX_WINDBG_trace(); // EnterCriticalSection(&ddcs); _SEH_TRY { - ret = Internal_CreateSurface(This, pDDSD, ppSurf,pUnkOuter); + ret = Internal_CreateSurface(This, pDDSD, ppSurf, pUnkOuter); } _SEH_HANDLE { @@ -499,3 +499,4 @@ + Modified: trunk/reactos/dll/directx/ddraw/Surface/createsurface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Surface/createsurface.c (original) +++ trunk/reactos/dll/directx/ddraw/Surface/createsurface.c Thu Dec 13 05:02:15 2007 @@ -22,7 +22,7 @@ HRESULT Internal_CreateSurface( LPDDRAWI_DIRECTDRAW_INT pDDraw, LPDDSURFACEDESC2 pDDSD, - LPDIRECTDRAWSURFACE7 *ppSurf, IUnknown *pUnkOuter) + LPDDRAWI_DDRAWSURFACE_INT *ppSurf, IUnknown *pUnkOuter) { DDHAL_CANCREATESURFACEDATA mDdCanCreateSurface = { 0 }; DDHAL_CREATESURFACEDATA mDdCreateSurface = { 0 }; @@ -175,8 +175,26 @@ ThisSurfaceGbl->dwLinearSize = pDDSD->lPitch; } - /* FIXME set right version */ - ThisSurfInt->lpVtbl = &DirectDrawSurface7_Vtable; + if(pDDraw->lpVtbl == &DirectDraw7_Vtable) + { + ThisSurfInt->lpVtbl = &DirectDrawSurface7_Vtable; + } + else if(pDDraw->lpVtbl == &DirectDraw4_Vtable) + { + ThisSurfInt->lpVtbl = &DirectDrawSurface4_Vtable; + } + else if(pDDraw->lpVtbl == &DirectDraw2_Vtable) + { + ThisSurfInt->lpVtbl = &DirectDrawSurface2_Vtable; + } + else if(pDDraw->lpVtbl == &DirectDraw_Vtable) + { + ThisSurfInt->lpVtbl = &DirectDrawSurface_Vtable; + } + else + { + return DDERR_NOTINITIALIZED; + } ThisSurfLcl->lpSurfMore = ThisSurfaceMore; ThisSurfaceMore->dwSize = sizeof(DDRAWI_DDRAWSURFACE_MORE); @@ -232,7 +250,7 @@ return mDdCreateSurface.ddRVal; } - *ppSurf = (LPDIRECTDRAWSURFACE7) &slist_int[0]->lpVtbl; + *ppSurf = (LPDDRAWI_DDRAWSURFACE_INT) &slist_int[0]->lpVtbl; return DD_OK; } @@ -248,3 +266,4 @@ + Modified: trunk/reactos/dll/directx/ddraw/rosdraw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/rosdraw.… ============================================================================== --- trunk/reactos/dll/directx/ddraw/rosdraw.h (original) +++ trunk/reactos/dll/directx/ddraw/rosdraw.h Thu Dec 13 05:02:15 2007 @@ -83,7 +83,7 @@ Internal_CreateSurface( LPDDRAWI_DIRECTDRAW_INT pDDraw, LPDDSURFACEDESC2 pDDSD, - LPDIRECTDRAWSURFACE7 *ppSurf, + LPDDRAWI_DDRAWSURFACE_INT *ppSurf, IUnknown *pUnkOuter); /* convert DDSURFACEDESC to DDSURFACEDESC2 */

1 0

[greatlrd] 31188: add support for IID_IDirectDrawColorControl, IsEqualGUID(&IID_IDirectDrawGammaControl, IID_IDirectDrawSurfaceKernel we are getting thues stubs api now from ddraw vtable now when some calls to surface_QueryInterface api
by greatlrd＠svn.reactos.org 13 Dec '07

13 Dec '07

Author: greatlrd Date: Thu Dec 13 04:55:06 2007 New Revision: 31188 URL: http://svn.reactos.org/svn/reactos?rev=31188&view=rev Log: add support for IID_IDirectDrawColorControl, IsEqualGUID(&IID_IDirectDrawGammaControl, IID_IDirectDrawSurfaceKernel we are getting thues stubs api now from ddraw vtable now when some calls to surface_QueryInterface api Modified: trunk/reactos/dll/directx/ddraw/Surface/surface_main.c Modified: trunk/reactos/dll/directx/ddraw/Surface/surface_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Surface/surface_main.c (original) +++ trunk/reactos/dll/directx/ddraw/Surface/surface_main.c Thu Dec 13 04:55:06 2007 @@ -59,13 +59,12 @@ } HRESULT WINAPI -Main_DDrawSurface_QueryInterface(LPDDRAWI_DDRAWSURFACE_INT iface, REFIID riid, - LPVOID* ppObj) -{ - LPDDRAWI_DDRAWSURFACE_INT This = (LPDDRAWI_DDRAWSURFACE_INT)iface; +Main_DDrawSurface_QueryInterface(LPDDRAWI_DDRAWSURFACE_INT This, REFIID riid, LPVOID* ppObj) +{ DX_WINDBG_trace(); HRESULT retVal = DD_OK; *ppObj = NULL; + _SEH_TRY { @@ -141,6 +140,51 @@ } } This->lpVtbl = &DirectDrawSurface_Vtable; + *ppObj = This; + Main_DDrawSurface_AddRef(This); + } + else if (IsEqualGUID(&IID_IDirectDrawColorControl, riid)) + { + if (This->lpVtbl != &DirectDrawSurface_Vtable) + { + This = internal_directdrawsurface_int_alloc(This); + if (!This) + { + retVal = DDERR_OUTOFVIDEOMEMORY; + _SEH_LEAVE; + } + } + This->lpVtbl = &DirectDrawColorControl_Vtable; + *ppObj = This; + Main_DDrawSurface_AddRef(This); + } + else if (IsEqualGUID(&IID_IDirectDrawGammaControl, riid)) + { + if (This->lpVtbl != &DirectDrawSurface_Vtable) + { + This = internal_directdrawsurface_int_alloc(This); + if (!This) + { + retVal = DDERR_OUTOFVIDEOMEMORY; + _SEH_LEAVE; + } + } + This->lpVtbl = &DirectDrawGammaControl_Vtable; + *ppObj = This; + Main_DDrawSurface_AddRef(This); + } + else if (IsEqualGUID(&IID_IDirectDrawSurfaceKernel, riid)) + { + if (This->lpVtbl != &DirectDrawSurface_Vtable) + { + This = internal_directdrawsurface_int_alloc(This); + if (!This) + { + retVal = DDERR_OUTOFVIDEOMEMORY; + _SEH_LEAVE; + } + } + This->lpVtbl = &DirectDrawSurfaceKernel_Vtable; *ppObj = This; Main_DDrawSurface_AddRef(This); }

1 0

[greatlrd] 31187: update dxguid to match dxsdk 2004 dec add two guids that does not belong to dxguid for they are need it for ddraw
by greatlrd＠svn.reactos.org 13 Dec '07

13 Dec '07

Author: greatlrd Date: Thu Dec 13 04:49:13 2007 New Revision: 31187 URL: http://svn.reactos.org/svn/reactos?rev=31187&view=rev Log: update dxguid to match dxsdk 2004 dec add two guids that does not belong to dxguid for they are need it for ddraw Modified: trunk/reactos/lib/sdk/dxguid/dxguid-mingw.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/lib/sdk/dxguid/dxguid-mingw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/dxguid/dxguid-ming…

1 0

[fireball] 31186: - Silence memory descriptors output, since it works good now. - Silence pci.sys's debugging message.
by fireball＠svn.reactos.org 12 Dec '07

12 Dec '07

Author: fireball Date: Thu Dec 13 00:15:17 2007 New Revision: 31186 URL: http://svn.reactos.org/svn/reactos?rev=31186&view=rev Log: - Silence memory descriptors output, since it works good now. - Silence pci.sys's debugging message. Modified: trunk/reactos/drivers/bus/pci/fdo.c trunk/reactos/ntoskrnl/mm/mminit.c Modified: trunk/reactos/drivers/bus/pci/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pci/fdo.c?rev=… ============================================================================== --- trunk/reactos/drivers/bus/pci/fdo.c (original) +++ trunk/reactos/drivers/bus/pci/fdo.c Thu Dec 13 00:15:17 2007 @@ -399,7 +399,7 @@ break; } default: - DPRINT1("Unknown resource descriptor type 0x%x\n", ResourceDescriptor->Type); + DPRINT("Unknown resource descriptor type 0x%x\n", ResourceDescriptor->Type); } } /* HACK due to a bug in ACPI driver, which doesn't report the bus number */ Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mminit.c (original) +++ trunk/reactos/ntoskrnl/mm/mminit.c Thu Dec 13 00:15:17 2007 @@ -263,17 +263,17 @@ PMEMORY_ALLOCATION_DESCRIPTOR Md; ULONG TotalPages = 0; - DPRINT1("Base\t\tLength\t\tType\n"); + DPRINT("Base\t\tLength\t\tType\n"); for (NextEntry = KeLoaderBlock->MemoryDescriptorListHead.Flink; NextEntry != &KeLoaderBlock->MemoryDescriptorListHead; NextEntry = NextEntry->Flink) { Md = CONTAINING_RECORD(NextEntry, MEMORY_ALLOCATION_DESCRIPTOR, ListEntry); - DPRINT1("%08lX\t%08lX\t%s\n", Md->BasePage, Md->PageCount, MemType[Md->MemoryType]); + DPRINT("%08lX\t%08lX\t%s\n", Md->BasePage, Md->PageCount, MemType[Md->MemoryType]); TotalPages += Md->PageCount; } - DPRINT1("Total: %08lX (%d MB)\n", TotalPages, (TotalPages * PAGE_SIZE) / 1024 / 1024); + DPRINT("Total: %08lX (%d MB)\n", TotalPages, (TotalPages * PAGE_SIZE) / 1024 / 1024); } /* Set the page directory */

1 0

[fireball] 31185: - Remove zeroing of PartialResourceList's fields (we allocate without that list). - Sync SetupLDR's BIOS MMap-code with FreeLDR's, fixes the "Total: 0A (0 MB") problem in bootcds.
by fireball＠svn.reactos.org 12 Dec '07

12 Dec '07

Author: fireball Date: Wed Dec 12 23:29:09 2007 New Revision: 31185 URL: http://svn.reactos.org/svn/reactos?rev=31185&view=rev Log: - Remove zeroing of PartialResourceList's fields (we allocate without that list). - Sync SetupLDR's BIOS MMap-code with FreeLDR's, fixes the "Total: 0A (0 MB") problem in bootcds. Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c Wed Dec 12 23:29:09 2007 @@ -261,9 +261,6 @@ memset(FullResourceDescriptor, 0, Size); FullResourceDescriptor->InterfaceType = Internal; FullResourceDescriptor->BusNumber = 0; - FullResourceDescriptor->PartialResourceList.Version = 0; - FullResourceDescriptor->PartialResourceList.Revision = 0; - FullResourceDescriptor->PartialResourceList.Count = 0; /* Set 'Configuration Data' value */ FldrSetConfigurationData(BiosKey, FullResourceDescriptor, Size); @@ -340,9 +337,6 @@ memset(FullResourceDescriptor, 0, Size); FullResourceDescriptor->InterfaceType = PCIBus; FullResourceDescriptor->BusNumber = i; - FullResourceDescriptor->PartialResourceList.Version = 0; - FullResourceDescriptor->PartialResourceList.Revision = 0; - FullResourceDescriptor->PartialResourceList.Count = 0; /* Set 'Configuration Data' value */ FldrSetConfigurationData(BusKey, FullResourceDescriptor, Size); Modified: trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c Wed Dec 12 23:29:09 2007 @@ -190,10 +190,13 @@ LoaderBlock.MmapLength = (unsigned long)MachGetMemoryMap((PBIOS_MEMORY_MAP)reactos_memory_map, 32) * sizeof(memory_map_t); if (LoaderBlock.MmapLength) { +#ifdef _M_IX86 ULONG i; - +#endif + LoaderBlock.Flags |= MB_FLAGS_MEM_INFO | MB_FLAGS_MMAP_INFO; LoaderBlock.MmapAddr = (unsigned long)&reactos_memory_map; reactos_memory_map_descriptor_size = sizeof(memory_map_t); // GetBiosMemoryMap uses a fixed value of 24 +#ifdef _M_IX86 for (i=0; i<(LoaderBlock.MmapLength/sizeof(memory_map_t)); i++) { if (BiosMemoryUsable == reactos_memory_map[i].type && @@ -212,6 +215,7 @@ LoaderBlock.MemHigher = (reactos_memory_map[i].base_addr_low + reactos_memory_map[i].length_low) / 1024 - 1024; } } +#endif } #ifdef USE_UI

1 0

[fireball] 31184: - Don't ignore empty resource descriptors (they still may have BusNumber info). - Change pci identifier from "PCI BIOS" to "PCI", so that PCI buses reported by the loader are discovered now.
by fireball＠svn.reactos.org 12 Dec '07

12 Dec '07

Author: fireball Date: Wed Dec 12 20:04:50 2007 New Revision: 31184 URL: http://svn.reactos.org/svn/reactos?rev=31184&view=rev Log: - Don't ignore empty resource descriptors (they still may have BusNumber info). - Change pci identifier from "PCI BIOS" to "PCI", so that PCI buses reported by the loader are discovered now. Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Wed Dec 12 20:04:50 2007 @@ -1299,11 +1299,6 @@ for (i = 0; i < DeviceNode->BootResources->Count; i++) { pPartialResourceList = &DeviceNode->BootResources->List[i].PartialResourceList; - if (pPartialResourceList->Version != 1 || pPartialResourceList->Revision != 1) - { - Status = STATUS_REVISION_MISMATCH; - goto ByeBye; - } Size += FIELD_OFFSET(CM_FULL_RESOURCE_DESCRIPTOR, PartialResourceList.PartialDescriptors) + pPartialResourceList->Count * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); for (j = 0; j < pPartialResourceList->Count; j++) @@ -2687,7 +2682,7 @@ ULONG BootResourcesLength; NTSTATUS Status; - const UNICODE_STRING IdentifierPci = RTL_CONSTANT_STRING(L"PCI BIOS"); + const UNICODE_STRING IdentifierPci = RTL_CONSTANT_STRING(L"PCI"); UNICODE_STRING HardwareIdPci = RTL_CONSTANT_STRING(L"*PNP0A03\0"); static ULONG DeviceIndexPci = 0; #ifdef ENABLE_ACPI @@ -2806,11 +2801,6 @@ { DPRINT("Wrong registry type: got 0x%lx, expected 0x%lx\n", pValueInformation->Type, REG_FULL_RESOURCE_DESCRIPTOR); goto nextdevice; - } - else if (((PCM_FULL_RESOURCE_DESCRIPTOR)pValueInformation->Data)->PartialResourceList.Count == 0) - { - BootResources = ParentBootResources; - BootResourcesLength = ParentBootResourcesLength; } else {

1 0

[greatlrd] 31183: patch from Kamil Hornicek tykef at atlas dot cz (irc nick : Pigglesworth) design cleanup bit. fix so each directdraw surface got own directdraw surface vtable. For some api are new in some version and some functions have more param or different struct in newer directdraw surface
by greatlrd＠svn.reactos.org 12 Dec '07

12 Dec '07

Author: greatlrd Date: Wed Dec 12 18:01:25 2007 New Revision: 31183 URL: http://svn.reactos.org/svn/reactos?rev=31183&view=rev Log: patch from Kamil Hornicek tykef at atlas dot cz (irc nick : Pigglesworth) design cleanup bit. fix so each directdraw surface got own directdraw surface vtable. For some api are new in some version and some functions have more param or different struct in newer directdraw surface Added: trunk/reactos/dll/directx/ddraw/Vtable/DirectDrawSurface2_Vtable.c (with props) trunk/reactos/dll/directx/ddraw/Vtable/DirectDrawSurface3_Vtable.c (with props) trunk/reactos/dll/directx/ddraw/Vtable/DirectDrawSurface4_Vtable.c (with props) trunk/reactos/dll/directx/ddraw/Vtable/DirectDrawSurface7_Vtable.c (with props) trunk/reactos/dll/directx/ddraw/Vtable/DirectDrawSurface_Vtable.c (with props) Modified: trunk/reactos/dll/directx/ddraw/Surface/createsurface.c trunk/reactos/dll/directx/ddraw/Surface/surface.h trunk/reactos/dll/directx/ddraw/Surface/surface_main.c trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw2_Vtable.c trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw4_Vtable.c trunk/reactos/dll/directx/ddraw/ddraw.rbuild trunk/reactos/dll/directx/ddraw/rosdraw.h Modified: trunk/reactos/dll/directx/ddraw/Surface/createsurface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Surface/createsurface.c (original) +++ trunk/reactos/dll/directx/ddraw/Surface/createsurface.c Wed Dec 12 18:01:25 2007 @@ -188,7 +188,7 @@ /* FIXME the lpLnk */ - Main_DDrawSurface_AddRef((LPDIRECTDRAWSURFACE7)ThisSurfInt); + Main_DDrawSurface_AddRef(ThisSurfInt); } pDDraw->lpLcl->lpGbl->dsList = (LPDDRAWI_DDRAWSURFACE_INT) slist_int; @@ -247,3 +247,4 @@ + Modified: trunk/reactos/dll/directx/ddraw/Surface/surface.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Surface/surface.h (original) +++ trunk/reactos/dll/directx/ddraw/Surface/surface.h Wed Dec 12 18:01:25 2007 @@ -1,8 +1,7 @@ // public interfaces -ULONG WINAPI Main_DDrawSurface_AddRef(LPDIRECTDRAWSURFACE7); +ULONG WINAPI Main_DDrawSurface_AddRef(LPDDRAWI_DDRAWSURFACE_INT); ULONG WINAPI Main_DDrawSurface_Release(LPDIRECTDRAWSURFACE7); -HRESULT WINAPI Main_DDrawSurface_QueryInterface(LPDIRECTDRAWSURFACE7, REFIID, LPVOID*); -HRESULT WINAPI Main_DDrawSurface_ReleaseDC(LPDIRECTDRAWSURFACE7, HDC); +HRESULT WINAPI Main_DDrawSurface_QueryInterface(LPDDRAWI_DDRAWSURFACE_INT, REFIID, LPVOID*); HRESULT WINAPI Main_DDrawSurface_Blt(LPDIRECTDRAWSURFACE7, LPRECT, LPDIRECTDRAWSURFACE7, LPRECT, DWORD, LPDDBLTFX); HRESULT WINAPI Main_DDrawSurface_BltBatch(LPDIRECTDRAWSURFACE7, LPDDBLTBATCH, DWORD, DWORD); HRESULT WINAPI Main_DDrawSurface_BltFast(LPDIRECTDRAWSURFACE7, DWORD, DWORD, LPDIRECTDRAWSURFACE7, LPRECT, DWORD); @@ -68,3 +67,4 @@ DWORD CALLBACK HelDdFlipToGDISurface(LPDDHAL_FLIPTOGDISURFACEDATA lpFlipToGDISurface); + Modified: trunk/reactos/dll/directx/ddraw/Surface/surface_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Surface/surface_main.c (original) +++ trunk/reactos/dll/directx/ddraw/Surface/surface_main.c Wed Dec 12 18:01:25 2007 @@ -20,19 +20,31 @@ SetPalette; */ +LPDDRAWI_DDRAWSURFACE_INT +internal_directdrawsurface_int_alloc(LPDDRAWI_DDRAWSURFACE_INT This) +{ + LPDDRAWI_DDRAWSURFACE_INT newThis; + DxHeapMemAlloc(newThis, sizeof(LPDDRAWI_DDRAWSURFACE_INT)); + if (newThis) + { + newThis->lpLcl = This->lpLcl; + newThis->lpLink = This; + } + return newThis; +} HRESULT WINAPI Main_DDrawSurface_Initialize (LPDIRECTDRAWSURFACE7 iface, LPDIRECTDRAW pDD, LPDDSURFACEDESC2 pDDSD2) { return DDERR_ALREADYINITIALIZED; } -ULONG WINAPI Main_DDrawSurface_AddRef(LPDIRECTDRAWSURFACE7 iface) +ULONG WINAPI Main_DDrawSurface_AddRef(LPDDRAWI_DDRAWSURFACE_INT iface) { LPDDRAWI_DDRAWSURFACE_INT This = (LPDDRAWI_DDRAWSURFACE_INT)iface; DX_WINDBG_trace(); - if (iface!=NULL) + if (This!=NULL) { This->dwIntRefCnt++; This->lpLcl->dwLocalRefCnt++; @@ -47,14 +59,102 @@ } HRESULT WINAPI -Main_DDrawSurface_QueryInterface(LPDIRECTDRAWSURFACE7 iface, REFIID riid, +Main_DDrawSurface_QueryInterface(LPDDRAWI_DDRAWSURFACE_INT iface, REFIID riid, LPVOID* ppObj) { + LPDDRAWI_DDRAWSURFACE_INT This = (LPDDRAWI_DDRAWSURFACE_INT)iface; DX_WINDBG_trace(); - - DX_STUB_str("Unimplement\n"); - - return E_NOINTERFACE; + HRESULT retVal = DD_OK; + *ppObj = NULL; + + _SEH_TRY + { + if (IsEqualGUID(&IID_IDirectDrawSurface7, riid)) + { + if (This->lpVtbl != &DirectDrawSurface7_Vtable) + { + This = internal_directdrawsurface_int_alloc(This); + if (!This) + { + retVal = DDERR_OUTOFVIDEOMEMORY; + _SEH_LEAVE; + } + } + This->lpVtbl = &DirectDrawSurface7_Vtable; + *ppObj = This; + Main_DDrawSurface_AddRef(This); + } + else if (IsEqualGUID(&IID_IDirectDrawSurface4, riid)) + { + if (This->lpVtbl != &DirectDrawSurface4_Vtable) + { + This = internal_directdrawsurface_int_alloc(This); + if (!This) + { + retVal = DDERR_OUTOFVIDEOMEMORY; + _SEH_LEAVE; + } + } + This->lpVtbl = &DirectDrawSurface4_Vtable; + *ppObj = This; + Main_DDrawSurface_AddRef(This); + } + else if (IsEqualGUID(&IID_IDirectDrawSurface3, riid)) + { + if (This->lpVtbl != &DirectDrawSurface3_Vtable) + { + This = internal_directdrawsurface_int_alloc(This); + if (!This) + { + retVal = DDERR_OUTOFVIDEOMEMORY; + _SEH_LEAVE; + } + } + This->lpVtbl = &DirectDrawSurface3_Vtable; + *ppObj = This; + Main_DDrawSurface_AddRef(This); + } + else if (IsEqualGUID(&IID_IDirectDrawSurface2, riid)) + { + if (This->lpVtbl != &DirectDrawSurface2_Vtable) + { + This = internal_directdrawsurface_int_alloc(This); + if (!This) + { + retVal = DDERR_OUTOFVIDEOMEMORY; + _SEH_LEAVE; + } + } + This->lpVtbl = &DirectDrawSurface2_Vtable; + *ppObj = This; + Main_DDrawSurface_AddRef(This); + } + else if (IsEqualGUID(&IID_IDirectDrawSurface, riid)) + { + if (This->lpVtbl != &DirectDrawSurface_Vtable) + { + This = internal_directdrawsurface_int_alloc(This); + if (!This) + { + retVal = DDERR_OUTOFVIDEOMEMORY; + _SEH_LEAVE; + } + } + This->lpVtbl = &DirectDrawSurface_Vtable; + *ppObj = This; + Main_DDrawSurface_AddRef(This); + } + else + { + DX_STUB_str("E_NOINTERFACE"); + retVal = E_NOINTERFACE; + } + } + _SEH_HANDLE + { + } + _SEH_END; + return retVal; } @@ -688,62 +788,3 @@ return DDERR_GENERIC; } - -IDirectDrawSurface7Vtbl DirectDrawSurface7_Vtable = -{ - /*** IUnknown ***/ - Main_DDrawSurface_QueryInterface, - Main_DDrawSurface_AddRef, /* (Compact done) */ - Main_DDrawSurface_Release, - /*** IDirectDrawSurface ***/ - Main_DDrawSurface_AddAttachedSurface, - Main_DDrawSurface_AddOverlayDirtyRect, - Main_DDrawSurface_Blt, - Main_DDrawSurface_BltBatch, - Main_DDrawSurface_BltFast, - Main_DDrawSurface_DeleteAttachedSurface, - Main_DDrawSurface_EnumAttachedSurfaces, - Main_DDrawSurface_EnumOverlayZOrders, - Main_DDrawSurface_Flip, - Main_DDrawSurface_GetAttachedSurface, - Main_DDrawSurface_GetBltStatus, - Main_DDrawSurface_GetCaps, - Main_DDrawSurface_GetClipper, - Main_DDrawSurface_GetColorKey, - Main_DDrawSurface_GetDC, - Main_DDrawSurface_GetFlipStatus, - Main_DDrawSurface_GetOverlayPosition, - Main_DDrawSurface_GetPalette, - Main_DDrawSurface_GetPixelFormat, - Main_DDrawSurface_GetSurfaceDesc, - Main_DDrawSurface_Initialize, - Main_DDrawSurface_IsLost, - Main_DDrawSurface_Lock, - Main_DDrawSurface_ReleaseDC, - Main_DDrawSurface_Restore, - Main_DDrawSurface_SetClipper, - Main_DDrawSurface_SetColorKey, - Main_DDrawSurface_SetOverlayPosition, - Main_DDrawSurface_SetPalette, - Main_DDrawSurface_Unlock, - Main_DDrawSurface_UpdateOverlay, - Main_DDrawSurface_UpdateOverlayDisplay, - Main_DDrawSurface_UpdateOverlayZOrder, - /*** IDirectDrawSurface2 ***/ - Main_DDrawSurface_GetDDInterface, - Main_DDrawSurface_PageLock, - Main_DDrawSurface_PageUnlock, - /*** IDirectDrawSurface3 ***/ - Main_DDrawSurface_SetSurfaceDesc, - /*** IDirectDrawSurface4 ***/ - Main_DDrawSurface_SetPrivateData, - Main_DDrawSurface_GetPrivateData, - Main_DDrawSurface_FreePrivateData, - Main_DDrawSurface_GetUniquenessValue, - Main_DDrawSurface_ChangeUniquenessValue, - /*** IDirectDrawSurface7 ***/ - Main_DDrawSurface_SetPriority, - Main_DDrawSurface_GetPriority, - Main_DDrawSurface_SetLOD, - Main_DDrawSurface_GetLOD -}; Modified: trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw2_Vtable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Vtable/D… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw2_Vtable.c (original) +++ trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw2_Vtable.c Wed Dec 12 18:01:25 2007 @@ -55,8 +55,8 @@ HRESULT WINAPI Main_DirectDraw_DuplicateSurface( LPDIRECTDRAW2 iface, - LPDIRECTDRAWSURFACE2 src, - LPDIRECTDRAWSURFACE2* dst); + LPDIRECTDRAWSURFACE src, + LPDIRECTDRAWSURFACE* dst); HRESULT WINAPI Main_DirectDraw_EnumDisplayModes( @@ -182,3 +182,4 @@ }; + Modified: trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw4_Vtable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Vtable/D… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw4_Vtable.c (original) +++ trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw4_Vtable.c Wed Dec 12 18:01:25 2007 @@ -72,7 +72,7 @@ DWORD dwFlags, LPDDSURFACEDESC2 lpDDSD2, LPVOID context, - LPDDENUMSURFACESCALLBACK7 callback); + LPDDENUMSURFACESCALLBACK2 callback); HRESULT WINAPI Main_DirectDraw_FlipToGDISurface(LPDIRECTDRAW4 iface); @@ -97,7 +97,7 @@ HRESULT WINAPI Main_DirectDraw_GetGDISurface( LPDIRECTDRAW4 iface, - LPDIRECTDRAWSURFACE7 *lplpGDIDDSSurface); + LPDIRECTDRAWSURFACE4 *lplpGDIDDSSurface); HRESULT WINAPI Main_DirectDraw_GetMonitorFrequency ( @@ -156,7 +156,7 @@ Main_DirectDraw_GetSurfaceFromDC( LPDIRECTDRAW4 iface, HDC hdc, - LPDIRECTDRAWSURFACE7 *lpDDS); + LPDIRECTDRAWSURFACE4 *lpDDS); HRESULT WINAPI Main_DirectDraw_RestoreAllSurfaces(LPDIRECTDRAW4 iface); Added: trunk/reactos/dll/directx/ddraw/Vtable/DirectDrawSurface2_Vtable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Vtable/D… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Vtable/DirectDrawSurface2_Vtable.c (added) +++ trunk/reactos/dll/directx/ddraw/Vtable/DirectDrawSurface2_Vtable.c Wed Dec 12 18:01:25 2007 @@ -1,0 +1,103 @@ +#include <windows.h> +#include <stdio.h> +#include <ddraw.h> +#include <ddrawi.h> +#include <d3dhal.h> +#include <ddrawgdi.h> + +#if defined(_WIN32) && !defined(_NO_COM ) +#define COM_NO_WINDOWS_H +#include <objbase.h> +#else +#define IUnknown void +#if !defined(NT_BUILD_ENVIRONMENT) && !defined(WINNT) + #define CO_E_NOTINITIALIZED 0x800401F0 +#endif +#endif + +ULONG WINAPI Main_DDrawSurface_AddRef(LPDIRECTDRAWSURFACE2); +ULONG WINAPI Main_DDrawSurface_Release(LPDIRECTDRAWSURFACE2); +HRESULT WINAPI Main_DDrawSurface_QueryInterface(LPDIRECTDRAWSURFACE2, REFIID, LPVOID*); +HRESULT WINAPI Main_DDrawSurface_ReleaseDC(LPDIRECTDRAWSURFACE2, HDC); +HRESULT WINAPI Main_DDrawSurface_Blt(LPDIRECTDRAWSURFACE2, LPRECT, LPDIRECTDRAWSURFACE2, LPRECT, DWORD, LPDDBLTFX); +HRESULT WINAPI Main_DDrawSurface_BltBatch(LPDIRECTDRAWSURFACE2, LPDDBLTBATCH, DWORD, DWORD); +HRESULT WINAPI Main_DDrawSurface_BltFast(LPDIRECTDRAWSURFACE2, DWORD, DWORD, LPDIRECTDRAWSURFACE2, LPRECT, DWORD); +HRESULT WINAPI Main_DDrawSurface_DeleteAttachedSurface(LPDIRECTDRAWSURFACE2, DWORD, LPDIRECTDRAWSURFACE2); +HRESULT WINAPI Main_DDrawSurface_EnumAttachedSurfaces(LPDIRECTDRAWSURFACE2, LPVOID, LPDDENUMSURFACESCALLBACK); +HRESULT WINAPI Main_DDrawSurface_EnumOverlayZOrders(LPDIRECTDRAWSURFACE2, DWORD, LPVOID,LPDDENUMSURFACESCALLBACK); +HRESULT WINAPI Main_DDrawSurface_Flip(LPDIRECTDRAWSURFACE2 , LPDIRECTDRAWSURFACE2, DWORD); +HRESULT WINAPI Main_DDrawSurface_GetAttachedSurface(LPDIRECTDRAWSURFACE2, LPDDSCAPS, LPDIRECTDRAWSURFACE2*); +HRESULT WINAPI Main_DDrawSurface_GetBltStatus(LPDIRECTDRAWSURFACE2, DWORD dwFlags); +HRESULT WINAPI Main_DDrawSurface_GetCaps(LPDIRECTDRAWSURFACE2, LPDDSCAPS pCaps); +HRESULT WINAPI Main_DDrawSurface_GetClipper(LPDIRECTDRAWSURFACE2, LPDIRECTDRAWCLIPPER*); +HRESULT WINAPI Main_DDrawSurface_GetColorKey(LPDIRECTDRAWSURFACE2, DWORD, LPDDCOLORKEY); +HRESULT WINAPI Main_DDrawSurface_GetDC(LPDIRECTDRAWSURFACE2, HDC *); +HRESULT WINAPI Main_DDrawSurface_GetDDInterface(LPDIRECTDRAWSURFACE2, LPVOID*); +HRESULT WINAPI Main_DDrawSurface_GetFlipStatus(LPDIRECTDRAWSURFACE2, DWORD); +HRESULT WINAPI Main_DDrawSurface_GetOverlayPosition(LPDIRECTDRAWSURFACE2, LPLONG, LPLONG); +HRESULT WINAPI Main_DDrawSurface_GetPalette(LPDIRECTDRAWSURFACE2, LPDIRECTDRAWPALETTE*); +HRESULT WINAPI Main_DDrawSurface_GetPixelFormat(LPDIRECTDRAWSURFACE2, LPDDPIXELFORMAT); +HRESULT WINAPI Main_DDrawSurface_GetSurfaceDesc(LPDIRECTDRAWSURFACE2, LPDDSURFACEDESC); +HRESULT WINAPI Main_DDrawSurface_IsLost(LPDIRECTDRAWSURFACE2); +HRESULT WINAPI Main_DDrawSurface_PageLock(LPDIRECTDRAWSURFACE2, DWORD); +HRESULT WINAPI Main_DDrawSurface_PageUnlock(LPDIRECTDRAWSURFACE2, DWORD); +HRESULT WINAPI Main_DDrawSurface_ReleaseDC(LPDIRECTDRAWSURFACE2, HDC); +HRESULT WINAPI Main_DDrawSurface_SetClipper (LPDIRECTDRAWSURFACE2, LPDIRECTDRAWCLIPPER); +HRESULT WINAPI Main_DDrawSurface_SetColorKey (LPDIRECTDRAWSURFACE2, DWORD, LPDDCOLORKEY); +HRESULT WINAPI Main_DDrawSurface_SetOverlayPosition (LPDIRECTDRAWSURFACE2, LONG, LONG); +HRESULT WINAPI Main_DDrawSurface_SetPalette (LPDIRECTDRAWSURFACE2, LPDIRECTDRAWPALETTE); +HRESULT WINAPI Main_DDrawSurface_UpdateOverlayDisplay (LPDIRECTDRAWSURFACE2, DWORD); +HRESULT WINAPI Main_DDrawSurface_UpdateOverlayZOrder (LPDIRECTDRAWSURFACE2, DWORD, LPDIRECTDRAWSURFACE2); +HRESULT WINAPI Main_DDrawSurface_Unlock (LPDIRECTDRAWSURFACE2, LPVOID); +HRESULT WINAPI Main_DDrawSurface_Initialize (LPDIRECTDRAWSURFACE2, LPDIRECTDRAW, LPDDSURFACEDESC); +HRESULT WINAPI Main_DDrawSurface_Lock (LPDIRECTDRAWSURFACE2, LPRECT, LPDDSURFACEDESC, DWORD, HANDLE); +HRESULT WINAPI Main_DDrawSurface_Restore(LPDIRECTDRAWSURFACE2); +HRESULT WINAPI Main_DDrawSurface_UpdateOverlay (LPDIRECTDRAWSURFACE2, LPRECT, LPDIRECTDRAWSURFACE2, LPRECT, + DWORD, LPDDOVERLAYFX); +HRESULT WINAPI Main_DDrawSurface_AddAttachedSurface(LPDIRECTDRAWSURFACE2, LPDIRECTDRAWSURFACE2); +HRESULT WINAPI Main_DDrawSurface_AddOverlayDirtyRect(LPDIRECTDRAWSURFACE2, LPRECT); +HRESULT WINAPI Main_DDrawSurface_SetSurfaceDesc(LPDIRECTDRAWSURFACE2, DDSURFACEDESC2, DWORD); + + +IDirectDrawSurface2Vtbl DirectDrawSurface2_Vtable = +{ + Main_DDrawSurface_QueryInterface, + Main_DDrawSurface_AddRef, /* (Compact done) */ + Main_DDrawSurface_Release, + Main_DDrawSurface_AddAttachedSurface, + Main_DDrawSurface_AddOverlayDirtyRect, + Main_DDrawSurface_Blt, + Main_DDrawSurface_BltBatch, + Main_DDrawSurface_BltFast, + Main_DDrawSurface_DeleteAttachedSurface, + Main_DDrawSurface_EnumAttachedSurfaces, + Main_DDrawSurface_EnumOverlayZOrders, + Main_DDrawSurface_Flip, + Main_DDrawSurface_GetAttachedSurface, + Main_DDrawSurface_GetBltStatus, + Main_DDrawSurface_GetCaps, + Main_DDrawSurface_GetClipper, + Main_DDrawSurface_GetColorKey, + Main_DDrawSurface_GetDC, + Main_DDrawSurface_GetFlipStatus, + Main_DDrawSurface_GetOverlayPosition, + Main_DDrawSurface_GetPalette, + Main_DDrawSurface_GetPixelFormat, + Main_DDrawSurface_GetSurfaceDesc, + Main_DDrawSurface_Initialize, + Main_DDrawSurface_IsLost, + Main_DDrawSurface_Lock, + Main_DDrawSurface_ReleaseDC, + Main_DDrawSurface_Restore, + Main_DDrawSurface_SetClipper, + Main_DDrawSurface_SetColorKey, + Main_DDrawSurface_SetOverlayPosition, + Main_DDrawSurface_SetPalette, + Main_DDrawSurface_Unlock, + Main_DDrawSurface_UpdateOverlay, + Main_DDrawSurface_UpdateOverlayDisplay, + Main_DDrawSurface_UpdateOverlayZOrder, + Main_DDrawSurface_GetDDInterface, + Main_DDrawSurface_PageLock, + Main_DDrawSurface_PageUnlock, +}; Propchange: trunk/reactos/dll/directx/ddraw/Vtable/DirectDrawSurface2_Vtable.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/directx/ddraw/Vtable/DirectDrawSurface3_Vtable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Vtable/D… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Vtable/DirectDrawSurface3_Vtable.c (added) +++ trunk/reactos/dll/directx/ddraw/Vtable/DirectDrawSurface3_Vtable.c Wed Dec 12 18:01:25 2007 @@ -1,0 +1,104 @@ +#include <windows.h> +#include <stdio.h> +#include <ddraw.h> +#include <ddrawi.h> +#include <d3dhal.h> +#include <ddrawgdi.h> + +#if defined(_WIN32) && !defined(_NO_COM ) +#define COM_NO_WINDOWS_H +#include <objbase.h> +#else +#define IUnknown void +#if !defined(NT_BUILD_ENVIRONMENT) && !defined(WINNT) + #define CO_E_NOTINITIALIZED 0x800401F0 +#endif +#endif + +ULONG WINAPI Main_DDrawSurface_AddRef(LPDIRECTDRAWSURFACE3); +ULONG WINAPI Main_DDrawSurface_Release(LPDIRECTDRAWSURFACE3); +HRESULT WINAPI Main_DDrawSurface_QueryInterface(LPDIRECTDRAWSURFACE3, REFIID, LPVOID*); +HRESULT WINAPI Main_DDrawSurface_ReleaseDC(LPDIRECTDRAWSURFACE3, HDC); +HRESULT WINAPI Main_DDrawSurface_Blt(LPDIRECTDRAWSURFACE3, LPRECT, LPDIRECTDRAWSURFACE3, LPRECT, DWORD, LPDDBLTFX); +HRESULT WINAPI Main_DDrawSurface_BltBatch(LPDIRECTDRAWSURFACE3, LPDDBLTBATCH, DWORD, DWORD); +HRESULT WINAPI Main_DDrawSurface_BltFast(LPDIRECTDRAWSURFACE3, DWORD, DWORD, LPDIRECTDRAWSURFACE3, LPRECT, DWORD); +HRESULT WINAPI Main_DDrawSurface_DeleteAttachedSurface(LPDIRECTDRAWSURFACE3, DWORD, LPDIRECTDRAWSURFACE3); +HRESULT WINAPI Main_DDrawSurface_EnumAttachedSurfaces(LPDIRECTDRAWSURFACE3, LPVOID, LPDDENUMSURFACESCALLBACK); +HRESULT WINAPI Main_DDrawSurface_EnumOverlayZOrders(LPDIRECTDRAWSURFACE3, DWORD, LPVOID,LPDDENUMSURFACESCALLBACK); +HRESULT WINAPI Main_DDrawSurface_Flip(LPDIRECTDRAWSURFACE3 , LPDIRECTDRAWSURFACE3, DWORD); +HRESULT WINAPI Main_DDrawSurface_GetAttachedSurface(LPDIRECTDRAWSURFACE3, LPDDSCAPS, LPDIRECTDRAWSURFACE3*); +HRESULT WINAPI Main_DDrawSurface_GetBltStatus(LPDIRECTDRAWSURFACE3, DWORD dwFlags); +HRESULT WINAPI Main_DDrawSurface_GetCaps(LPDIRECTDRAWSURFACE3, LPDDSCAPS pCaps); +HRESULT WINAPI Main_DDrawSurface_GetClipper(LPDIRECTDRAWSURFACE3, LPDIRECTDRAWCLIPPER*); +HRESULT WINAPI Main_DDrawSurface_GetColorKey(LPDIRECTDRAWSURFACE3, DWORD, LPDDCOLORKEY); +HRESULT WINAPI Main_DDrawSurface_GetDC(LPDIRECTDRAWSURFACE3, HDC *); +HRESULT WINAPI Main_DDrawSurface_GetDDInterface(LPDIRECTDRAWSURFACE3, LPVOID*); +HRESULT WINAPI Main_DDrawSurface_GetFlipStatus(LPDIRECTDRAWSURFACE3, DWORD); +HRESULT WINAPI Main_DDrawSurface_GetOverlayPosition(LPDIRECTDRAWSURFACE3, LPLONG, LPLONG); +HRESULT WINAPI Main_DDrawSurface_GetPalette(LPDIRECTDRAWSURFACE3, LPDIRECTDRAWPALETTE*); +HRESULT WINAPI Main_DDrawSurface_GetPixelFormat(LPDIRECTDRAWSURFACE3, LPDDPIXELFORMAT); +HRESULT WINAPI Main_DDrawSurface_GetSurfaceDesc(LPDIRECTDRAWSURFACE3, LPDDSURFACEDESC); +HRESULT WINAPI Main_DDrawSurface_IsLost(LPDIRECTDRAWSURFACE3); +HRESULT WINAPI Main_DDrawSurface_PageLock(LPDIRECTDRAWSURFACE3, DWORD); +HRESULT WINAPI Main_DDrawSurface_PageUnlock(LPDIRECTDRAWSURFACE3, DWORD); +HRESULT WINAPI Main_DDrawSurface_ReleaseDC(LPDIRECTDRAWSURFACE3, HDC); +HRESULT WINAPI Main_DDrawSurface_SetClipper (LPDIRECTDRAWSURFACE3, LPDIRECTDRAWCLIPPER); +HRESULT WINAPI Main_DDrawSurface_SetColorKey (LPDIRECTDRAWSURFACE3, DWORD, LPDDCOLORKEY); +HRESULT WINAPI Main_DDrawSurface_SetOverlayPosition (LPDIRECTDRAWSURFACE3, LONG, LONG); +HRESULT WINAPI Main_DDrawSurface_SetPalette (LPDIRECTDRAWSURFACE3, LPDIRECTDRAWPALETTE); +HRESULT WINAPI Main_DDrawSurface_UpdateOverlayDisplay (LPDIRECTDRAWSURFACE3, DWORD); +HRESULT WINAPI Main_DDrawSurface_UpdateOverlayZOrder (LPDIRECTDRAWSURFACE3, DWORD, LPDIRECTDRAWSURFACE3); +HRESULT WINAPI Main_DDrawSurface_SetSurfaceDesc(LPDIRECTDRAWSURFACE3, DDSURFACEDESC *, DWORD); +HRESULT WINAPI Main_DDrawSurface_Unlock (LPDIRECTDRAWSURFACE3, LPVOID); +HRESULT WINAPI Main_DDrawSurface_Initialize (LPDIRECTDRAWSURFACE3, LPDIRECTDRAW, LPDDSURFACEDESC); +HRESULT WINAPI Main_DDrawSurface_Lock (LPDIRECTDRAWSURFACE3, LPRECT, LPDDSURFACEDESC, DWORD, HANDLE); +HRESULT WINAPI Main_DDrawSurface_Restore(LPDIRECTDRAWSURFACE3); +HRESULT WINAPI Main_DDrawSurface_UpdateOverlay (LPDIRECTDRAWSURFACE3, LPRECT, LPDIRECTDRAWSURFACE3, LPRECT, + DWORD, LPDDOVERLAYFX); +HRESULT WINAPI Main_DDrawSurface_AddAttachedSurface(LPDIRECTDRAWSURFACE3, LPDIRECTDRAWSURFACE3); +HRESULT WINAPI Main_DDrawSurface_AddOverlayDirtyRect(LPDIRECTDRAWSURFACE3, LPRECT); + + +IDirectDrawSurface3Vtbl DirectDrawSurface3_Vtable = +{ + Main_DDrawSurface_QueryInterface, + Main_DDrawSurface_AddRef, /* (Compact done) */ + Main_DDrawSurface_Release, + Main_DDrawSurface_AddAttachedSurface, + Main_DDrawSurface_AddOverlayDirtyRect, + Main_DDrawSurface_Blt, + Main_DDrawSurface_BltBatch, + Main_DDrawSurface_BltFast, + Main_DDrawSurface_DeleteAttachedSurface, + Main_DDrawSurface_EnumAttachedSurfaces, + Main_DDrawSurface_EnumOverlayZOrders, + Main_DDrawSurface_Flip, + Main_DDrawSurface_GetAttachedSurface, + Main_DDrawSurface_GetBltStatus, + Main_DDrawSurface_GetCaps, + Main_DDrawSurface_GetClipper, + Main_DDrawSurface_GetColorKey, + Main_DDrawSurface_GetDC, + Main_DDrawSurface_GetFlipStatus, + Main_DDrawSurface_GetOverlayPosition, + Main_DDrawSurface_GetPalette, + Main_DDrawSurface_GetPixelFormat, + Main_DDrawSurface_GetSurfaceDesc, + Main_DDrawSurface_Initialize, + Main_DDrawSurface_IsLost, + Main_DDrawSurface_Lock, + Main_DDrawSurface_ReleaseDC, + Main_DDrawSurface_Restore, + Main_DDrawSurface_SetClipper, + Main_DDrawSurface_SetColorKey, + Main_DDrawSurface_SetOverlayPosition, + Main_DDrawSurface_SetPalette, + Main_DDrawSurface_Unlock, + Main_DDrawSurface_UpdateOverlay, + Main_DDrawSurface_UpdateOverlayDisplay, + Main_DDrawSurface_UpdateOverlayZOrder, + Main_DDrawSurface_GetDDInterface, + Main_DDrawSurface_PageLock, + Main_DDrawSurface_PageUnlock, + Main_DDrawSurface_SetSurfaceDesc, +}; Propchange: trunk/reactos/dll/directx/ddraw/Vtable/DirectDrawSurface3_Vtable.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/directx/ddraw/Vtable/DirectDrawSurface4_Vtable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Vtable/D… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Vtable/DirectDrawSurface4_Vtable.c (added) +++ trunk/reactos/dll/directx/ddraw/Vtable/DirectDrawSurface4_Vtable.c Wed Dec 12 18:01:25 2007 @@ -1,0 +1,114 @@ +#include <windows.h> +#include <stdio.h> +#include <ddraw.h> +#include <ddrawi.h> +#include <d3dhal.h> +#include <ddrawgdi.h> + +#if defined(_WIN32) && !defined(_NO_COM ) +#define COM_NO_WINDOWS_H +#include <objbase.h> +#else +#define IUnknown void +#if !defined(NT_BUILD_ENVIRONMENT) && !defined(WINNT) + #define CO_E_NOTINITIALIZED 0x800401F0 +#endif +#endif + +ULONG WINAPI Main_DDrawSurface_AddRef(LPDIRECTDRAWSURFACE4); +ULONG WINAPI Main_DDrawSurface_Release(LPDIRECTDRAWSURFACE4); +HRESULT WINAPI Main_DDrawSurface_QueryInterface(LPDIRECTDRAWSURFACE4, REFIID, LPVOID*); +HRESULT WINAPI Main_DDrawSurface_ReleaseDC(LPDIRECTDRAWSURFACE4, HDC); +HRESULT WINAPI Main_DDrawSurface_Blt(LPDIRECTDRAWSURFACE4, LPRECT, LPDIRECTDRAWSURFACE4, LPRECT, DWORD, LPDDBLTFX); +HRESULT WINAPI Main_DDrawSurface_BltBatch(LPDIRECTDRAWSURFACE4, LPDDBLTBATCH, DWORD, DWORD); +HRESULT WINAPI Main_DDrawSurface_BltFast(LPDIRECTDRAWSURFACE4, DWORD, DWORD, LPDIRECTDRAWSURFACE4, LPRECT, DWORD); +HRESULT WINAPI Main_DDrawSurface_DeleteAttachedSurface(LPDIRECTDRAWSURFACE4, DWORD, LPDIRECTDRAWSURFACE4); +HRESULT WINAPI Main_DDrawSurface_EnumAttachedSurfaces(LPDIRECTDRAWSURFACE4, LPVOID, LPDDENUMSURFACESCALLBACK2); +HRESULT WINAPI Main_DDrawSurface_EnumOverlayZOrders(LPDIRECTDRAWSURFACE4, DWORD, LPVOID,LPDDENUMSURFACESCALLBACK2); +HRESULT WINAPI Main_DDrawSurface_Flip(LPDIRECTDRAWSURFACE4 , LPDIRECTDRAWSURFACE4, DWORD); +HRESULT WINAPI Main_DDrawSurface_FreePrivateData(LPDIRECTDRAWSURFACE4, REFGUID); +HRESULT WINAPI Main_DDrawSurface_GetAttachedSurface(LPDIRECTDRAWSURFACE4, LPDDSCAPS2, LPDIRECTDRAWSURFACE4*); +HRESULT WINAPI Main_DDrawSurface_GetBltStatus(LPDIRECTDRAWSURFACE4, DWORD dwFlags); +HRESULT WINAPI Main_DDrawSurface_GetCaps(LPDIRECTDRAWSURFACE4, LPDDSCAPS2 pCaps); +HRESULT WINAPI Main_DDrawSurface_GetClipper(LPDIRECTDRAWSURFACE4, LPDIRECTDRAWCLIPPER*); +HRESULT WINAPI Main_DDrawSurface_GetColorKey(LPDIRECTDRAWSURFACE4, DWORD, LPDDCOLORKEY); +HRESULT WINAPI Main_DDrawSurface_GetDC(LPDIRECTDRAWSURFACE4, HDC *); +HRESULT WINAPI Main_DDrawSurface_GetDDInterface(LPDIRECTDRAWSURFACE4, LPVOID*); +HRESULT WINAPI Main_DDrawSurface_GetFlipStatus(LPDIRECTDRAWSURFACE4, DWORD); +HRESULT WINAPI Main_DDrawSurface_GetOverlayPosition(LPDIRECTDRAWSURFACE4, LPLONG, LPLONG); +HRESULT WINAPI Main_DDrawSurface_GetPalette(LPDIRECTDRAWSURFACE4, LPDIRECTDRAWPALETTE*); +HRESULT WINAPI Main_DDrawSurface_GetPixelFormat(LPDIRECTDRAWSURFACE4, LPDDPIXELFORMAT); +HRESULT WINAPI Main_DDrawSurface_GetPrivateData(LPDIRECTDRAWSURFACE4, REFGUID, LPVOID, LPDWORD); +HRESULT WINAPI Main_DDrawSurface_GetSurfaceDesc(LPDIRECTDRAWSURFACE4, LPDDSURFACEDESC2); +HRESULT WINAPI Main_DDrawSurface_GetUniquenessValue(LPDIRECTDRAWSURFACE4, LPDWORD); +HRESULT WINAPI Main_DDrawSurface_IsLost(LPDIRECTDRAWSURFACE4); +HRESULT WINAPI Main_DDrawSurface_PageLock(LPDIRECTDRAWSURFACE4, DWORD); +HRESULT WINAPI Main_DDrawSurface_PageUnlock(LPDIRECTDRAWSURFACE4, DWORD); +HRESULT WINAPI Main_DDrawSurface_ReleaseDC(LPDIRECTDRAWSURFACE4, HDC); +HRESULT WINAPI Main_DDrawSurface_SetClipper (LPDIRECTDRAWSURFACE4, LPDIRECTDRAWCLIPPER); +HRESULT WINAPI Main_DDrawSurface_SetColorKey (LPDIRECTDRAWSURFACE4, DWORD, LPDDCOLORKEY); +HRESULT WINAPI Main_DDrawSurface_SetOverlayPosition (LPDIRECTDRAWSURFACE4, LONG, LONG); +HRESULT WINAPI Main_DDrawSurface_SetPalette (LPDIRECTDRAWSURFACE4, LPDIRECTDRAWPALETTE); +HRESULT WINAPI Main_DDrawSurface_SetPrivateData (LPDIRECTDRAWSURFACE4, REFGUID, LPVOID, DWORD, DWORD); +HRESULT WINAPI Main_DDrawSurface_UpdateOverlayDisplay (LPDIRECTDRAWSURFACE4, DWORD); +HRESULT WINAPI Main_DDrawSurface_UpdateOverlayZOrder (LPDIRECTDRAWSURFACE4, DWORD, LPDIRECTDRAWSURFACE4); +HRESULT WINAPI Main_DDrawSurface_SetSurfaceDesc(LPDIRECTDRAWSURFACE4, DDSURFACEDESC2 *, DWORD); +HRESULT WINAPI Main_DDrawSurface_Unlock (LPDIRECTDRAWSURFACE4, LPRECT); +HRESULT WINAPI Main_DDrawSurface_Initialize (LPDIRECTDRAWSURFACE4, LPDIRECTDRAW, LPDDSURFACEDESC2); +HRESULT WINAPI Main_DDrawSurface_Lock (LPDIRECTDRAWSURFACE4, LPRECT, LPDDSURFACEDESC2, DWORD, HANDLE); +HRESULT WINAPI Main_DDrawSurface_Restore(LPDIRECTDRAWSURFACE4); +HRESULT WINAPI Main_DDrawSurface_UpdateOverlay (LPDIRECTDRAWSURFACE4, LPRECT, LPDIRECTDRAWSURFACE4, LPRECT, + DWORD, LPDDOVERLAYFX); +HRESULT WINAPI Main_DDrawSurface_ChangeUniquenessValue(LPDIRECTDRAWSURFACE4); +HRESULT WINAPI Main_DDrawSurface_AddAttachedSurface(LPDIRECTDRAWSURFACE4, LPDIRECTDRAWSURFACE4); +HRESULT WINAPI Main_DDrawSurface_AddOverlayDirtyRect(LPDIRECTDRAWSURFACE4, LPRECT); + + +IDirectDrawSurface4Vtbl DirectDrawSurface4_Vtable = +{ + Main_DDrawSurface_QueryInterface, + Main_DDrawSurface_AddRef, /* (Compact done) */ + Main_DDrawSurface_Release, + Main_DDrawSurface_AddAttachedSurface, + Main_DDrawSurface_AddOverlayDirtyRect, + Main_DDrawSurface_Blt, + Main_DDrawSurface_BltBatch, + Main_DDrawSurface_BltFast, + Main_DDrawSurface_DeleteAttachedSurface, + Main_DDrawSurface_EnumAttachedSurfaces, + Main_DDrawSurface_EnumOverlayZOrders, + Main_DDrawSurface_Flip, + Main_DDrawSurface_GetAttachedSurface, + Main_DDrawSurface_GetBltStatus, + Main_DDrawSurface_GetCaps, + Main_DDrawSurface_GetClipper, + Main_DDrawSurface_GetColorKey, + Main_DDrawSurface_GetDC, + Main_DDrawSurface_GetFlipStatus, + Main_DDrawSurface_GetOverlayPosition, + Main_DDrawSurface_GetPalette, + Main_DDrawSurface_GetPixelFormat, + Main_DDrawSurface_GetSurfaceDesc, + Main_DDrawSurface_Initialize, + Main_DDrawSurface_IsLost, + Main_DDrawSurface_Lock, + Main_DDrawSurface_ReleaseDC, + Main_DDrawSurface_Restore, + Main_DDrawSurface_SetClipper, + Main_DDrawSurface_SetColorKey, + Main_DDrawSurface_SetOverlayPosition, + Main_DDrawSurface_SetPalette, + Main_DDrawSurface_Unlock, + Main_DDrawSurface_UpdateOverlay, + Main_DDrawSurface_UpdateOverlayDisplay, + Main_DDrawSurface_UpdateOverlayZOrder, + Main_DDrawSurface_GetDDInterface, + Main_DDrawSurface_PageLock, + Main_DDrawSurface_PageUnlock, + Main_DDrawSurface_SetSurfaceDesc, + Main_DDrawSurface_SetPrivateData, + Main_DDrawSurface_GetPrivateData, + Main_DDrawSurface_FreePrivateData, + Main_DDrawSurface_GetUniquenessValue, + Main_DDrawSurface_ChangeUniquenessValue, +}; Propchange: trunk/reactos/dll/directx/ddraw/Vtable/DirectDrawSurface4_Vtable.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/directx/ddraw/Vtable/DirectDrawSurface7_Vtable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Vtable/D… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Vtable/DirectDrawSurface7_Vtable.c (added) +++ trunk/reactos/dll/directx/ddraw/Vtable/DirectDrawSurface7_Vtable.c Wed Dec 12 18:01:25 2007 @@ -1,0 +1,122 @@ +#include <windows.h> +#include <stdio.h> +#include <ddraw.h> +#include <ddrawi.h> +#include <d3dhal.h> +#include <ddrawgdi.h> + +#if defined(_WIN32) && !defined(_NO_COM ) +#define COM_NO_WINDOWS_H +#include <objbase.h> +#else +#define IUnknown void +#if !defined(NT_BUILD_ENVIRONMENT) && !defined(WINNT) + #define CO_E_NOTINITIALIZED 0x800401F0 +#endif +#endif + +ULONG WINAPI Main_DDrawSurface_AddRef(LPDIRECTDRAWSURFACE7); +ULONG WINAPI Main_DDrawSurface_Release(LPDIRECTDRAWSURFACE7); +HRESULT WINAPI Main_DDrawSurface_QueryInterface(LPDIRECTDRAWSURFACE7, REFIID, LPVOID*); +HRESULT WINAPI Main_DDrawSurface_ReleaseDC(LPDIRECTDRAWSURFACE7, HDC); +HRESULT WINAPI Main_DDrawSurface_Blt(LPDIRECTDRAWSURFACE7, LPRECT, LPDIRECTDRAWSURFACE7, LPRECT, DWORD, LPDDBLTFX); +HRESULT WINAPI Main_DDrawSurface_BltBatch(LPDIRECTDRAWSURFACE7, LPDDBLTBATCH, DWORD, DWORD); +HRESULT WINAPI Main_DDrawSurface_BltFast(LPDIRECTDRAWSURFACE7, DWORD, DWORD, LPDIRECTDRAWSURFACE7, LPRECT, DWORD); +HRESULT WINAPI Main_DDrawSurface_DeleteAttachedSurface(LPDIRECTDRAWSURFACE7, DWORD, LPDIRECTDRAWSURFACE7); +HRESULT WINAPI Main_DDrawSurface_EnumAttachedSurfaces(LPDIRECTDRAWSURFACE7, LPVOID, LPDDENUMSURFACESCALLBACK7); +HRESULT WINAPI Main_DDrawSurface_EnumOverlayZOrders(LPDIRECTDRAWSURFACE7, DWORD, LPVOID,LPDDENUMSURFACESCALLBACK7); +HRESULT WINAPI Main_DDrawSurface_Flip(LPDIRECTDRAWSURFACE7 , LPDIRECTDRAWSURFACE7, DWORD); +HRESULT WINAPI Main_DDrawSurface_FreePrivateData(LPDIRECTDRAWSURFACE7, REFGUID); +HRESULT WINAPI Main_DDrawSurface_GetAttachedSurface(LPDIRECTDRAWSURFACE7, LPDDSCAPS2, LPDIRECTDRAWSURFACE7*); +HRESULT WINAPI Main_DDrawSurface_GetBltStatus(LPDIRECTDRAWSURFACE7, DWORD dwFlags); +HRESULT WINAPI Main_DDrawSurface_GetCaps(LPDIRECTDRAWSURFACE7, LPDDSCAPS2 pCaps); +HRESULT WINAPI Main_DDrawSurface_GetClipper(LPDIRECTDRAWSURFACE7, LPDIRECTDRAWCLIPPER*); +HRESULT WINAPI Main_DDrawSurface_GetColorKey(LPDIRECTDRAWSURFACE7, DWORD, LPDDCOLORKEY); +HRESULT WINAPI Main_DDrawSurface_GetDC(LPDIRECTDRAWSURFACE7, HDC *); +HRESULT WINAPI Main_DDrawSurface_GetDDInterface(LPDIRECTDRAWSURFACE7, LPVOID*); +HRESULT WINAPI Main_DDrawSurface_GetFlipStatus(LPDIRECTDRAWSURFACE7, DWORD); +HRESULT WINAPI Main_DDrawSurface_GetLOD(LPDIRECTDRAWSURFACE7, LPDWORD); +HRESULT WINAPI Main_DDrawSurface_GetOverlayPosition(LPDIRECTDRAWSURFACE7, LPLONG, LPLONG); +HRESULT WINAPI Main_DDrawSurface_GetPalette(LPDIRECTDRAWSURFACE7, LPDIRECTDRAWPALETTE*); +HRESULT WINAPI Main_DDrawSurface_GetPixelFormat(LPDIRECTDRAWSURFACE7, LPDDPIXELFORMAT); +HRESULT WINAPI Main_DDrawSurface_GetPriority(LPDIRECTDRAWSURFACE7, LPDWORD); +HRESULT WINAPI Main_DDrawSurface_GetPrivateData(LPDIRECTDRAWSURFACE7, REFGUID, LPVOID, LPDWORD); +HRESULT WINAPI Main_DDrawSurface_GetSurfaceDesc(LPDIRECTDRAWSURFACE7, LPDDSURFACEDESC2); +HRESULT WINAPI Main_DDrawSurface_GetUniquenessValue(LPDIRECTDRAWSURFACE7, LPDWORD); +HRESULT WINAPI Main_DDrawSurface_IsLost(LPDIRECTDRAWSURFACE7); +HRESULT WINAPI Main_DDrawSurface_PageLock(LPDIRECTDRAWSURFACE7, DWORD); +HRESULT WINAPI Main_DDrawSurface_PageUnlock(LPDIRECTDRAWSURFACE7, DWORD); +HRESULT WINAPI Main_DDrawSurface_ReleaseDC(LPDIRECTDRAWSURFACE7, HDC); +HRESULT WINAPI Main_DDrawSurface_SetClipper (LPDIRECTDRAWSURFACE7, LPDIRECTDRAWCLIPPER); +HRESULT WINAPI Main_DDrawSurface_SetColorKey (LPDIRECTDRAWSURFACE7, DWORD, LPDDCOLORKEY); +HRESULT WINAPI Main_DDrawSurface_SetOverlayPosition (LPDIRECTDRAWSURFACE7, LONG, LONG); +HRESULT WINAPI Main_DDrawSurface_SetPalette (LPDIRECTDRAWSURFACE7, LPDIRECTDRAWPALETTE); +HRESULT WINAPI Main_DDrawSurface_SetPriority (LPDIRECTDRAWSURFACE7, DWORD); +HRESULT WINAPI Main_DDrawSurface_SetPrivateData (LPDIRECTDRAWSURFACE7, REFGUID, LPVOID, DWORD, DWORD); +HRESULT WINAPI Main_DDrawSurface_UpdateOverlayDisplay (LPDIRECTDRAWSURFACE7, DWORD); +HRESULT WINAPI Main_DDrawSurface_UpdateOverlayZOrder (LPDIRECTDRAWSURFACE7, DWORD, LPDIRECTDRAWSURFACE7); +HRESULT WINAPI Main_DDrawSurface_SetSurfaceDesc(LPDIRECTDRAWSURFACE7, DDSURFACEDESC2 *, DWORD); +HRESULT WINAPI Main_DDrawSurface_SetLOD(LPDIRECTDRAWSURFACE7, DWORD); +HRESULT WINAPI Main_DDrawSurface_Unlock (LPDIRECTDRAWSURFACE7, LPRECT); +HRESULT WINAPI Main_DDrawSurface_Initialize (LPDIRECTDRAWSURFACE7, LPDIRECTDRAW, LPDDSURFACEDESC2); +HRESULT WINAPI Main_DDrawSurface_Lock (LPDIRECTDRAWSURFACE7, LPRECT, LPDDSURFACEDESC2, DWORD, HANDLE); +HRESULT WINAPI Main_DDrawSurface_Restore(LPDIRECTDRAWSURFACE7); +HRESULT WINAPI Main_DDrawSurface_UpdateOverlay (LPDIRECTDRAWSURFACE7, LPRECT, LPDIRECTDRAWSURFACE7, LPRECT, + DWORD, LPDDOVERLAYFX); +HRESULT WINAPI Main_DDrawSurface_ChangeUniquenessValue(LPDIRECTDRAWSURFACE7); +HRESULT WINAPI Main_DDrawSurface_AddAttachedSurface(LPDIRECTDRAWSURFACE7, LPDIRECTDRAWSURFACE7); +HRESULT WINAPI Main_DDrawSurface_AddOverlayDirtyRect(LPDIRECTDRAWSURFACE7, LPRECT); + + +IDirectDrawSurface7Vtbl DirectDrawSurface7_Vtable = +{ + Main_DDrawSurface_QueryInterface, + Main_DDrawSurface_AddRef, /* (Compact done) */ + Main_DDrawSurface_Release, + Main_DDrawSurface_AddAttachedSurface, + Main_DDrawSurface_AddOverlayDirtyRect, + Main_DDrawSurface_Blt, + Main_DDrawSurface_BltBatch, + Main_DDrawSurface_BltFast, + Main_DDrawSurface_DeleteAttachedSurface, + Main_DDrawSurface_EnumAttachedSurfaces, + Main_DDrawSurface_EnumOverlayZOrders, + Main_DDrawSurface_Flip, + Main_DDrawSurface_GetAttachedSurface, + Main_DDrawSurface_GetBltStatus, + Main_DDrawSurface_GetCaps, + Main_DDrawSurface_GetClipper, + Main_DDrawSurface_GetColorKey, + Main_DDrawSurface_GetDC, + Main_DDrawSurface_GetFlipStatus, + Main_DDrawSurface_GetOverlayPosition, + Main_DDrawSurface_GetPalette, + Main_DDrawSurface_GetPixelFormat, + Main_DDrawSurface_GetSurfaceDesc, + Main_DDrawSurface_Initialize, + Main_DDrawSurface_IsLost, + Main_DDrawSurface_Lock, + Main_DDrawSurface_ReleaseDC, + Main_DDrawSurface_Restore, + Main_DDrawSurface_SetClipper, + Main_DDrawSurface_SetColorKey, + Main_DDrawSurface_SetOverlayPosition, + Main_DDrawSurface_SetPalette, + Main_DDrawSurface_Unlock, + Main_DDrawSurface_UpdateOverlay, + Main_DDrawSurface_UpdateOverlayDisplay, + Main_DDrawSurface_UpdateOverlayZOrder, + Main_DDrawSurface_GetDDInterface, + Main_DDrawSurface_PageLock, + Main_DDrawSurface_PageUnlock, + Main_DDrawSurface_SetSurfaceDesc, + Main_DDrawSurface_SetPrivateData, + Main_DDrawSurface_GetPrivateData, + Main_DDrawSurface_FreePrivateData, + Main_DDrawSurface_GetUniquenessValue, + Main_DDrawSurface_ChangeUniquenessValue, + Main_DDrawSurface_SetPriority, + Main_DDrawSurface_GetPriority, + Main_DDrawSurface_SetLOD, + Main_DDrawSurface_GetLOD +}; Propchange: trunk/reactos/dll/directx/ddraw/Vtable/DirectDrawSurface7_Vtable.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/directx/ddraw/Vtable/DirectDrawSurface_Vtable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Vtable/D… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Vtable/DirectDrawSurface_Vtable.c (added) +++ trunk/reactos/dll/directx/ddraw/Vtable/DirectDrawSurface_Vtable.c Wed Dec 12 18:01:25 2007 @@ -1,0 +1,95 @@ +#include <windows.h> +#include <stdio.h> +#include <ddraw.h> +#include <ddrawi.h> +#include <d3dhal.h> +#include <ddrawgdi.h> + +#if defined(_WIN32) && !defined(_NO_COM ) +#define COM_NO_WINDOWS_H +#include <objbase.h> +#else +#define IUnknown void +#if !defined(NT_BUILD_ENVIRONMENT) && !defined(WINNT) + #define CO_E_NOTINITIALIZED 0x800401F0 +#endif +#endif + +ULONG WINAPI Main_DDrawSurface_AddRef(LPDIRECTDRAWSURFACE); +ULONG WINAPI Main_DDrawSurface_Release(LPDIRECTDRAWSURFACE); +HRESULT WINAPI Main_DDrawSurface_QueryInterface(LPDIRECTDRAWSURFACE, REFIID, LPVOID*); +HRESULT WINAPI Main_DDrawSurface_Blt(LPDIRECTDRAWSURFACE, LPRECT, LPDIRECTDRAWSURFACE, LPRECT, DWORD, LPDDBLTFX); +HRESULT WINAPI Main_DDrawSurface_BltBatch(LPDIRECTDRAWSURFACE, LPDDBLTBATCH, DWORD, DWORD); +HRESULT WINAPI Main_DDrawSurface_BltFast(LPDIRECTDRAWSURFACE, DWORD, DWORD, LPDIRECTDRAWSURFACE, LPRECT, DWORD); +HRESULT WINAPI Main_DDrawSurface_DeleteAttachedSurface(LPDIRECTDRAWSURFACE, DWORD, LPDIRECTDRAWSURFACE); +HRESULT WINAPI Main_DDrawSurface_EnumAttachedSurfaces(LPDIRECTDRAWSURFACE, LPVOID, LPDDENUMSURFACESCALLBACK); +HRESULT WINAPI Main_DDrawSurface_EnumOverlayZOrders(LPDIRECTDRAWSURFACE, DWORD, LPVOID,LPDDENUMSURFACESCALLBACK); +HRESULT WINAPI Main_DDrawSurface_Flip(LPDIRECTDRAWSURFACE , LPDIRECTDRAWSURFACE, DWORD); +HRESULT WINAPI Main_DDrawSurface_GetAttachedSurface(LPDIRECTDRAWSURFACE, LPDDSCAPS, LPDIRECTDRAWSURFACE*); +HRESULT WINAPI Main_DDrawSurface_GetBltStatus(LPDIRECTDRAWSURFACE, DWORD dwFlags); +HRESULT WINAPI Main_DDrawSurface_GetCaps(LPDIRECTDRAWSURFACE, LPDDSCAPS pCaps); +HRESULT WINAPI Main_DDrawSurface_GetClipper(LPDIRECTDRAWSURFACE, LPDIRECTDRAWCLIPPER*); +HRESULT WINAPI Main_DDrawSurface_GetColorKey(LPDIRECTDRAWSURFACE, DWORD, LPDDCOLORKEY); +HRESULT WINAPI Main_DDrawSurface_GetDC(LPDIRECTDRAWSURFACE, HDC *); +HRESULT WINAPI Main_DDrawSurface_GetFlipStatus(LPDIRECTDRAWSURFACE, DWORD); +HRESULT WINAPI Main_DDrawSurface_GetOverlayPosition(LPDIRECTDRAWSURFACE, LPLONG, LPLONG); +HRESULT WINAPI Main_DDrawSurface_GetPalette(LPDIRECTDRAWSURFACE, LPDIRECTDRAWPALETTE*); +HRESULT WINAPI Main_DDrawSurface_GetPixelFormat(LPDIRECTDRAWSURFACE, LPDDPIXELFORMAT); +HRESULT WINAPI Main_DDrawSurface_GetSurfaceDesc(LPDIRECTDRAWSURFACE, LPDDSURFACEDESC); +HRESULT WINAPI Main_DDrawSurface_IsLost(LPDIRECTDRAWSURFACE); +HRESULT WINAPI Main_DDrawSurface_ReleaseDC(LPDIRECTDRAWSURFACE, HDC); +HRESULT WINAPI Main_DDrawSurface_SetClipper (LPDIRECTDRAWSURFACE, LPDIRECTDRAWCLIPPER); +HRESULT WINAPI Main_DDrawSurface_SetColorKey (LPDIRECTDRAWSURFACE, DWORD, LPDDCOLORKEY); +HRESULT WINAPI Main_DDrawSurface_SetOverlayPosition (LPDIRECTDRAWSURFACE, LONG, LONG); +HRESULT WINAPI Main_DDrawSurface_SetPalette (LPDIRECTDRAWSURFACE, LPDIRECTDRAWPALETTE); +HRESULT WINAPI Main_DDrawSurface_UpdateOverlayDisplay (LPDIRECTDRAWSURFACE, DWORD); +HRESULT WINAPI Main_DDrawSurface_UpdateOverlayZOrder (LPDIRECTDRAWSURFACE, DWORD, LPDIRECTDRAWSURFACE); +HRESULT WINAPI Main_DDrawSurface_Unlock (LPDIRECTDRAWSURFACE, LPVOID); +HRESULT WINAPI Main_DDrawSurface_Initialize (LPDIRECTDRAWSURFACE, LPDIRECTDRAW, LPDDSURFACEDESC); +HRESULT WINAPI Main_DDrawSurface_Lock (LPDIRECTDRAWSURFACE, LPRECT, LPDDSURFACEDESC, DWORD, HANDLE); +HRESULT WINAPI Main_DDrawSurface_Restore(LPDIRECTDRAWSURFACE); +HRESULT WINAPI Main_DDrawSurface_UpdateOverlay (LPDIRECTDRAWSURFACE, LPRECT, LPDIRECTDRAWSURFACE, LPRECT, + DWORD, LPDDOVERLAYFX); +HRESULT WINAPI Main_DDrawSurface_AddAttachedSurface(LPDIRECTDRAWSURFACE, LPDIRECTDRAWSURFACE); +HRESULT WINAPI Main_DDrawSurface_AddOverlayDirtyRect(LPDIRECTDRAWSURFACE, LPRECT); + + +IDirectDrawSurfaceVtbl DirectDrawSurface_Vtable = +{ + Main_DDrawSurface_QueryInterface, + Main_DDrawSurface_AddRef, /* (Compact done) */ + Main_DDrawSurface_Release, + Main_DDrawSurface_AddAttachedSurface, + Main_DDrawSurface_AddOverlayDirtyRect, + Main_DDrawSurface_Blt, + Main_DDrawSurface_BltBatch, + Main_DDrawSurface_BltFast, + Main_DDrawSurface_DeleteAttachedSurface, + Main_DDrawSurface_EnumAttachedSurfaces, + Main_DDrawSurface_EnumOverlayZOrders, + Main_DDrawSurface_Flip, + Main_DDrawSurface_GetAttachedSurface, + Main_DDrawSurface_GetBltStatus, + Main_DDrawSurface_GetCaps, + Main_DDrawSurface_GetClipper, + Main_DDrawSurface_GetColorKey, + Main_DDrawSurface_GetDC, + Main_DDrawSurface_GetFlipStatus, + Main_DDrawSurface_GetOverlayPosition, + Main_DDrawSurface_GetPalette, + Main_DDrawSurface_GetPixelFormat, + Main_DDrawSurface_GetSurfaceDesc, + Main_DDrawSurface_Initialize, + Main_DDrawSurface_IsLost, + Main_DDrawSurface_Lock, + Main_DDrawSurface_ReleaseDC, + Main_DDrawSurface_Restore, + Main_DDrawSurface_SetClipper, + Main_DDrawSurface_SetColorKey, + Main_DDrawSurface_SetOverlayPosition, + Main_DDrawSurface_SetPalette, + Main_DDrawSurface_Unlock, + Main_DDrawSurface_UpdateOverlay, + Main_DDrawSurface_UpdateOverlayDisplay, + Main_DDrawSurface_UpdateOverlayZOrder, +}; Propchange: trunk/reactos/dll/directx/ddraw/Vtable/DirectDrawSurface_Vtable.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/directx/ddraw/ddraw.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/ddraw.rb… ============================================================================== --- trunk/reactos/dll/directx/ddraw/ddraw.rbuild (original) +++ trunk/reactos/dll/directx/ddraw/ddraw.rbuild Wed Dec 12 18:01:25 2007 @@ -62,5 +62,10 @@ <file>DirectDraw4_Vtable.c</file> <file>DirectDraw2_Vtable.c</file> <file>DirectDraw_Vtable.c</file> + <file>DirectDrawSurface7_Vtable.c</file> + <file>DirectDrawSurface4_Vtable.c</file> + <file>DirectDrawSurface3_Vtable.c</file> + <file>DirectDrawSurface2_Vtable.c</file> + <file>DirectDrawSurface_Vtable.c</file> </directory> -</module> +</module> Modified: trunk/reactos/dll/directx/ddraw/rosdraw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/rosdraw.… ============================================================================== --- trunk/reactos/dll/directx/ddraw/rosdraw.h (original) +++ trunk/reactos/dll/directx/ddraw/rosdraw.h Wed Dec 12 18:01:25 2007 @@ -28,7 +28,10 @@ extern IDirectDrawSurface7Vtbl DirectDrawSurface7_Vtable; -extern IDirectDrawSurface3Vtbl DirectDrawSurface3_VTable; +extern IDirectDrawSurface4Vtbl DirectDrawSurface4_Vtable; +extern IDirectDrawSurface3Vtbl DirectDrawSurface3_Vtable; +extern IDirectDrawSurface2Vtbl DirectDrawSurface2_Vtable; +extern IDirectDrawSurfaceVtbl DirectDrawSurface_Vtable; extern IDirectDrawPaletteVtbl DirectDrawPalette_Vtable; extern IDirectDrawClipperVtbl DirectDrawClipper_Vtable; extern IDirectDrawColorControlVtbl DirectDrawColorControl_Vtable;

1 0

[hpoussin] 31182: Remove useless test
by hpoussin＠svn.reactos.org 12 Dec '07

12 Dec '07

Author: hpoussin Date: Wed Dec 12 15:08:11 2007 New Revision: 31182 URL: http://svn.reactos.org/svn/reactos?rev=31182&view=rev Log: Remove useless test Modified: trunk/reactos/drivers/video/videoprt/videoprt.c Modified: trunk/reactos/drivers/video/videoprt/videoprt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/vid… ============================================================================== --- trunk/reactos/drivers/video/videoprt/videoprt.c (original) +++ trunk/reactos/drivers/video/videoprt/videoprt.c Wed Dec 12 15:08:11 2007 @@ -1,7 +1,7 @@ /* * VideoPort driver * - * Copyright (C) 2002, 2003, 2004 ReactOS Team + * Copyright (C) ReactOS Team * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -18,7 +18,6 @@ * If not, write to the Free Software Foundation, * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: videoprt.c 29323 2007-10-01 08:14:24Z fireball $ */ @@ -669,15 +668,13 @@ return STATUS_UNSUCCESSFUL; } - /* add no PNP bus here, add more bus type if it needed */ - - if ( (HwInitializationData->AdapterInterfaceType == InterfaceTypeUndefined) || - (HwInitializationData->AdapterInterfaceType == Internal) ) - - { - DPRINT1("No PNP Videocard .\n"); - LegacyDetection = TRUE; - } + /* We can't check HwInitializationData->AdapterInterfaceType to know if + * we have to use legacy detection, as MSDN states that this member is + * ignored by videoprt and should remain zero-initialized. + * Force legacy detection, so NT4 drivers will still work on ReactOS. + * WARNING: this will cause all Plug-and-Play IRPs to fail. + */ + LegacyDetection = TRUE; DriverObject->MajorFunction[IRP_MJ_CREATE] = IntVideoPortDispatchOpen; DriverObject->MajorFunction[IRP_MJ_CLOSE] = IntVideoPortDispatchClose;

1 0

[hpoussin] 31181: Remove hack
by hpoussin＠svn.reactos.org 12 Dec '07

12 Dec '07

Author: hpoussin Date: Wed Dec 12 14:42:20 2007 New Revision: 31181 URL: http://svn.reactos.org/svn/reactos?rev=31181&view=rev Log: Remove hack Modified: trunk/reactos/ntoskrnl/config/ntapi.c Modified: trunk/reactos/ntoskrnl/config/ntapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/ntapi.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/config/ntapi.c (original) +++ trunk/reactos/ntoskrnl/config/ntapi.c Wed Dec 12 14:42:20 2007 @@ -564,7 +564,7 @@ { /* Fail */ DPRINT1("Restore Privilege missing!\n"); - //return STATUS_PRIVILEGE_NOT_HELD; + return STATUS_PRIVILEGE_NOT_HELD; } /* Block APCs */

1 0

← Newer
1
...
32
33
34
35
36
37
38
...
61
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2007