Ros-diffs October 2005

ros-diffs@reactos.org

26 participants
737 discussions

[hbirr] 18849: - Lock always the address space if we changing the virtual mapping.
by hbirr＠svn.reactos.com 29 Oct '05

29 Oct '05

- Lock always the address space if we changing the virtual mapping. This is necessary because we can create or remove a page table. - If we unmap a section, we have to wait for all pending pageops for the section within the current process. We do this by waiting for all pageops for the section. Modified: trunk/reactos/ntoskrnl/mm/section.c _____ Modified: trunk/reactos/ntoskrnl/mm/section.c --- trunk/reactos/ntoskrnl/mm/section.c 2005-10-29 14:09:00 UTC (rev 18848) +++ trunk/reactos/ntoskrnl/mm/section.c 2005-10-29 14:10:35 UTC (rev 18849) @@ -1278,6 +1278,7 @@ */ MiCopyFromUserPage(NewPage, PAddress); + MmLockAddressSpace(AddressSpace); /* * Delete the old entry. */ @@ -1286,7 +1287,6 @@ /* * Set the PTE to point to the new page */ - MmLockAddressSpace(AddressSpace); Status = MmCreateVirtualMapping(AddressSpace->Process, Address, Region->Protect, @@ -1298,7 +1298,6 @@ KEBUGCHECK(0); return(Status); } - MmInsertRmap(NewPage, AddressSpace->Process, PAddress); if (!NT_SUCCESS(Status)) { DbgPrint("Unable to create virtual mapping\n"); @@ -1314,6 +1313,7 @@ * Unshare the old page. */ MmDeleteRmap(OldPage, AddressSpace->Process, PAddress); + MmInsertRmap(NewPage, AddressSpace->Process, PAddress); MmLockSectionSegment(Segment); MmUnsharePageEntrySectionSegment(Section, Segment, Offset, FALSE, FALSE); MmUnlockSectionSegment(Segment); @@ -1332,6 +1332,11 @@ PFN_TYPE Page; PageOutContext = (MM_SECTION_PAGEOUT_CONTEXT*)Context; + if (Process) + { + MmLockAddressSpace(&Process->AddressSpace); + } + MmDeleteVirtualMapping(Process, Address, FALSE, @@ -1343,14 +1348,21 @@ } if (!PageOutContext->Private) { + MmLockSectionSegment(PageOutContext->Segment); MmUnsharePageEntrySectionSegment(PageOutContext->Section, PageOutContext->Segment, PageOutContext->Offset, PageOutContext->WasDirty, TRUE); + MmUnlockSectionSegment(PageOutContext->Segment); } - else + if (Process) { + MmUnlockAddressSpace(&Process->AddressSpace); + } + + if (PageOutContext->Private) + { MmReleasePageMemoryConsumer(MC_USER, Page); } @@ -1561,9 +1573,11 @@ else if (!Context.WasDirty && Context.Private && SwapEntry != 0) { MmSetSavedSwapEntryPage(Page, 0); + MmLockAddressSpace(AddressSpace); Status = MmCreatePageFileMapping(AddressSpace->Process, Address, SwapEntry); + MmUnlockAddressSpace(AddressSpace); if (!NT_SUCCESS(Status)) { KEBUGCHECK(0); @@ -1583,7 +1597,7 @@ if (SwapEntry == 0) { MmShowOutOfSpaceMessagePagingFile(); - + MmLockAddressSpace(AddressSpace); /* * For private pages restore the old mappings. */ @@ -1618,6 +1632,7 @@ Entry = MAKE_SSE(Page << PAGE_SHIFT, 1); MmSetPageEntrySectionSegment(Context.Segment, Context.Offset, Entry); } + MmUnlockAddressSpace(AddressSpace); PageOp->Status = STATUS_UNSUCCESSFUL; MmspCompleteAndReleasePageOp(PageOp); return(STATUS_PAGEFILE_QUOTA); @@ -1636,6 +1651,7 @@ * As above: undo our actions. * FIXME: Also free the swap page. */ + MmLockAddressSpace(AddressSpace); if (Context.Private) { Status = MmCreateVirtualMapping(AddressSpace->Process, @@ -1662,6 +1678,7 @@ Entry = MAKE_SSE(Page << PAGE_SHIFT, 1); MmSetPageEntrySectionSegment(Context.Segment, Context.Offset, Entry); } + MmUnlockAddressSpace(AddressSpace); PageOp->Status = STATUS_UNSUCCESSFUL; MmspCompleteAndReleasePageOp(PageOp); return(STATUS_UNSUCCESSFUL); @@ -1684,9 +1701,11 @@ if (Context.Private) { + MmLockAddressSpace(AddressSpace); Status = MmCreatePageFileMapping(AddressSpace->Process, Address, SwapEntry); + MmUnlockAddressSpace(AddressSpace); if (!NT_SUCCESS(Status)) { KEBUGCHECK(0); @@ -3797,7 +3816,7 @@ } } -NTSTATUS +STATIC NTSTATUS MmUnmapViewOfSegment(PMADDRESS_SPACE AddressSpace, PVOID BaseAddress) { @@ -3860,6 +3879,8 @@ PMEMORY_AREA MemoryArea; PMADDRESS_SPACE AddressSpace; PSECTION_OBJECT Section; + PMM_PAGEOP PageOp; + ULONG_PTR Offset; DPRINT("Opening memory area Process %x BaseAddress %x\n", Process, BaseAddress); @@ -3867,15 +3888,53 @@ ASSERT(Process); AddressSpace = &Process->AddressSpace; + + MmLockAddressSpace(AddressSpace); MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, BaseAddress); if (MemoryArea == NULL || MemoryArea->Type != MEMORY_AREA_SECTION_VIEW || MemoryArea->DeleteInProgress) { + MmUnlockAddressSpace(AddressSpace); return STATUS_NOT_MAPPED_VIEW; } + MemoryArea->DeleteInProgress = TRUE; + + while (MemoryArea->PageOpCount) + { + Offset = PAGE_ROUND_UP((ULONG_PTR)MemoryArea->EndingAddress - (ULONG_PTR)MemoryArea->StartingAddress); + + while (Offset) + { + Offset -= PAGE_SIZE; + PageOp = MmCheckForPageOp(MemoryArea, NULL, NULL, + MemoryArea->Data.SectionData.Segment, + Offset + MemoryArea->Data.SectionData.ViewOffset); + if (PageOp) + { + MmUnlockAddressSpace(AddressSpace); + Status = MmspWaitForPageOpCompletionEvent(PageOp); + if (Status != STATUS_SUCCESS) + { + DPRINT1("Failed to wait for page op, status = %x\n", Status); + KEBUGCHECK(0); + } + MmLockAddressSpace(AddressSpace); + MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, + BaseAddress); + if (MemoryArea == NULL || + MemoryArea->Type != MEMORY_AREA_SECTION_VIEW) + { + MmUnlockAddressSpace(AddressSpace); + return STATUS_NOT_MAPPED_VIEW; + } + break; + } + } + } + Section = MemoryArea->Data.SectionData.Section; if (Section->AllocationAttributes & SEC_IMAGE) @@ -3925,6 +3984,7 @@ { Status = MmUnmapViewOfSegment(AddressSpace, BaseAddress); } + MmUnlockAddressSpace(AddressSpace); return(STATUS_SUCCESS); } @@ -3970,9 +4030,7 @@ return(Status); } - MmLockAddressSpace(&Process->AddressSpace); Status = MmUnmapViewOfSection(Process, BaseAddress); - MmUnlockAddressSpace(&Process->AddressSpace); ObDereferenceObject(Process);

1 0

[hbirr] 18848: Lock always the address space if we changing the virtual mapping.
by hbirr＠svn.reactos.com 29 Oct '05

29 Oct '05

Lock always the address space if we changing the virtual mapping. This is necessary because we can create or remove a page table. Modified: trunk/reactos/ntoskrnl/mm/anonmem.c _____ Modified: trunk/reactos/ntoskrnl/mm/anonmem.c --- trunk/reactos/ntoskrnl/mm/anonmem.c 2005-10-29 13:43:09 UTC (rev 18847) +++ trunk/reactos/ntoskrnl/mm/anonmem.c 2005-10-29 14:09:00 UTC (rev 18848) @@ -171,6 +171,7 @@ */ if (!WasDirty) { + MmLockAddressSpace(AddressSpace); MmDeleteVirtualMapping(AddressSpace->Process, Address, FALSE, NULL, NULL); MmDeleteAllRmaps(Page, NULL, NULL); if ((SwapEntry = MmGetSavedSwapEntryPage(Page)) != 0) @@ -178,6 +179,7 @@ MmCreatePageFileMapping(AddressSpace->Process, Address, SwapEntry); MmSetSavedSwapEntryPage(Page, 0); } + MmUnlockAddressSpace(AddressSpace); MmReleasePageMemoryConsumer(MC_USER, Page); PageOp->Status = STATUS_SUCCESS; KeSetEvent(&PageOp->CompletionEvent, IO_NO_INCREMENT, FALSE); @@ -222,8 +224,10 @@ * Otherwise we have succeeded, free the page */ DPRINT("MM: Swapped out virtual memory page 0x%.8X!\n", Page << PAGE_SHIFT); + MmLockAddressSpace(AddressSpace); MmDeleteVirtualMapping(AddressSpace->Process, Address, FALSE, NULL, NULL); MmCreatePageFileMapping(AddressSpace->Process, Address, SwapEntry); + MmUnlockAddressSpace(AddressSpace); MmDeleteAllRmaps(Page, NULL, NULL); MmSetSavedSwapEntryPage(Page, 0); MmReleasePageMemoryConsumer(MC_USER, Page); @@ -997,7 +1001,7 @@ Info->BaseAddress = RegionBase; Info->AllocationBase = MemoryArea->StartingAddress; Info->AllocationProtect = MemoryArea->Attributes; - Info->RegionSize = (char*)RegionBase + Region->Length - (char*)Info->BaseAddress; + Info->RegionSize = Region->Length; Info->State = Region->Type; Info->Protect = Region->Protect; Info->Type = MEM_PRIVATE;

1 0

[npwoods] 18847: Calc: Fixed Enter key
by npwoods＠svn.reactos.com 29 Oct '05

29 Oct '05

Calc: Fixed Enter key Modified: trunk/reactos/subsys/system/calc/winecalc.c _____ Modified: trunk/reactos/subsys/system/calc/winecalc.c --- trunk/reactos/subsys/system/calc/winecalc.c 2005-10-29 12:36:04 UTC (rev 18846) +++ trunk/reactos/subsys/system/calc/winecalc.c 2005-10-29 13:43:09 UTC (rev 18847) @@ -3412,12 +3412,11 @@ else { calc.memory = calc_atof(calc.buffer, calc.numBase); } + return 0; } - return 0; } - break; + // fall through for Enter processing - // fall through for Enter processing ... but there is a bug here in Ctrl+M vs. Return case TEXT('='): { calcfloat r = calc.operand;

1 0

[greatlrd] 18846: Fixed some hal insate problem
by greatlrd＠svn.reactos.com 29 Oct '05

29 Oct '05

Fixed some hal insate problem but it still is not right Modified: trunk/reactos/lib/ddraw/hal/ddraw.c _____ Modified: trunk/reactos/lib/ddraw/hal/ddraw.c --- trunk/reactos/lib/ddraw/hal/ddraw.c 2005-10-29 11:28:37 UTC (rev 18845) +++ trunk/reactos/lib/ddraw/hal/ddraw.c 2005-10-29 12:36:04 UTC (rev 18846) @@ -15,29 +15,32 @@ { IDirectDrawImpl* This = (IDirectDrawImpl*)iface; + + /* point to it self */ + This->DirectDrawGlobal.lp16DD = &This->DirectDrawGlobal; + /* get the object */ if(!DdCreateDirectDrawObject (&This->DirectDrawGlobal, This->hdc)) return DDERR_INVALIDPARAMS; - /* alloc some space */ - This->DirectDrawGlobal.lpDDCBtmp = (LPDDHAL_CALLBACKS)HeapAlloc(GetProcessHeap(), 0, sizeof(DDHAL_CALLBACKS)); - memset(This->DirectDrawGlobal.lpDDCBtmp, 0, sizeof(DDHAL_CALLBACKS)); - This->HalInfo.lpDDCallbacks = &This->DirectDrawGlobal.lpDDCBtmp->cbDDCallbacks; - This->HalInfo.lpDDSurfaceCallbacks = &This->DirectDrawGlobal.lpDDCBtmp->cbDDSurfaceCallbacks; - This->HalInfo.lpDDExeBufCallbacks = &This->DirectDrawGlobal.lpDDCBtmp->cbDDExeBufCallbacks; - This->HalInfo.lpDDPaletteCallbacks = &This->DirectDrawGlobal.lpDDCBtmp->cbDDPaletteCallbacks; - This->DirectDrawGlobal.lpD3DHALCallbacks = (ULONG_PTR)HeapAlloc(GetProcessHeap(), 0, sizeof(D3DHAL_CALLBACKS)); - This->DirectDrawGlobal.lpD3DGlobalDriverData = (ULONG_PTR)HeapAlloc(GetProcessHeap(), 0, sizeof(D3DHAL_GLOBALDRIVERDATA)); + + + + /* alloc all the space */ + This->DirectDrawGlobal.lpDDCBtmp = (LPDDHAL_CALLBACKS)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DDHAL_CALLBACKS)); + This->DirectDrawGlobal.lpD3DHALCallbacks = (ULONG_PTR)HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY, sizeof(D3DHAL_CALLBACKS)); + This->DirectDrawGlobal.lpD3DGlobalDriverData = (ULONG_PTR)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(D3DHAL_GLOBALDRIVERDATA)); + - /* fill the sizeofs */ - This->HalInfo.dwSize = sizeof(DDHALINFO); - This->HalInfo.lpDDCallbacks->dwSize = sizeof(DDHAL_DDCALLBACKS); - This->HalInfo.lpDDSurfaceCallbacks->dwSize = sizeof(DDHAL_DDSURFACECALLBACKS); - This->HalInfo.lpDDPaletteCallbacks->dwSize = sizeof(DDHAL_DDPALETTECALLBACKS); - This->HalInfo.lpDDExeBufCallbacks->dwSize = sizeof(DDHAL_DDEXEBUFCALLBACKS); - ((LPD3DHAL_CALLBACKS)This->DirectDrawGlobal.lpD3DHALCallbacks)->dwSize = sizeof(D3DHAL_CALLBACKS); - ((LPD3DHAL_GLOBALDRIVERDATA)This->DirectDrawGlobal.lpD3DGlobalDriverData )->dwSize = sizeof(D3DHAL_GLOBALDRIVERDATA); + /* Fill in some info */ + This->HalInfo.lpD3DGlobalDriverData = This->DirectDrawGlobal.lpD3DGlobalDriverData; + This->HalInfo.lpD3DHALCallbacks = This->DirectDrawGlobal.lpD3DHALCallbacks; + This->HalInfo.lpDDCallbacks = &This->DirectDrawGlobal.lpDDCBtmp->HALDD; + This->HalInfo.lpDDExeBufCallbacks = &This->DirectDrawGlobal.lpDDCBtmp->HALDDExeBuf; + This->HalInfo.lpDDPaletteCallbacks = &This->DirectDrawGlobal.lpDDCBtmp->HALDDPalette; + This->HalInfo.lpDDSurfaceCallbacks = &This->DirectDrawGlobal.lpDDCBtmp->HALDDSurface; + /* query all kinds of infos from the driver */ if(!DdQueryDirectDrawObject ( &This->DirectDrawGlobal, @@ -137,6 +140,7 @@ return DD_OK; } + VOID Hal_DirectDraw_Release (LPDIRECTDRAW7 iface) { IDirectDrawImpl* This = (IDirectDrawImpl*)iface;

1 0

[weiden] 18845: #include "w32k.h" -> #include <w32k.h>
by weiden＠svn.reactos.com 29 Oct '05

29 Oct '05

#include "w32k.h" -> #include <w32k.h> Modified: trunk/reactos/tools/gendib/gendib.c _____ Modified: trunk/reactos/tools/gendib/gendib.c --- trunk/reactos/tools/gendib/gendib.c 2005-10-29 11:05:23 UTC (rev 18844) +++ trunk/reactos/tools/gendib/gendib.c 2005-10-29 11:28:37 UTC (rev 18845) @@ -999,7 +999,7 @@ MARK(Out); Output(Out, "/* This is a generated file. Please do not edit */\n"); Output(Out, "\n"); - Output(Out, "#include \"w32k.h\"\n"); + Output(Out, "#include <w32k.h>\n"); CreateShiftTables(Out); RopInfo = FindRopInfo(ROPCODE_GENERIC);

1 0

[mbosma] 18844: Stub IDirectDrawKernel and IDirectDrawSurfaceKernel. This where the last two; now we got Stub for every COM-Interface in ddraw.dll.
by mbosma＠svn.reactos.com 29 Oct '05

29 Oct '05

Stub IDirectDrawKernel and IDirectDrawSurfaceKernel. This where the last two; now we got Stub for every COM-Interface in ddraw.dll. Modified: trunk/reactos/lib/ddraw/ddraw.xml Added: trunk/reactos/lib/ddraw/main/kernel.c _____ Modified: trunk/reactos/lib/ddraw/ddraw.xml --- trunk/reactos/lib/ddraw/ddraw.xml 2005-10-29 10:55:45 UTC (rev 18843) +++ trunk/reactos/lib/ddraw/ddraw.xml 2005-10-29 11:05:23 UTC (rev 18844) @@ -30,6 +30,7 @@ <file>gamma.c</file> <file>palette.c</file> <file>videoport.c</file> + <file>kernel.c</file> </directory> <directory name="soft"> _____ Added: trunk/reactos/lib/ddraw/main/kernel.c --- trunk/reactos/lib/ddraw/main/kernel.c 2005-10-29 10:55:45 UTC (rev 18843) +++ trunk/reactos/lib/ddraw/main/kernel.c 2005-10-29 11:05:23 UTC (rev 18844) @@ -0,0 +1,86 @@ +/* $Id$ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS + * FILE: lib/ddraw/main/kernel.c + * PURPOSE: IDirectDrawKernel and IDirectDrawSurfaceKernel Implementation + * PROGRAMMER: Maarten Bosma + * + */ + +#include "rosdraw.h" + + +/***** IDirectDrawKernel ****/ + +ULONG WINAPI Main_DirectDrawKernel_AddRef (LPDIRECTDRAWKERNEL iface) +{ + return 1; +} + +ULONG WINAPI Main_DirectDrawKernel_Release (LPDIRECTDRAWKERNEL iface) +{ + return 0; +} + +HRESULT WINAPI Main_DirectDrawKernel_QueryInterface (LPDIRECTDRAWKERNEL iface, REFIID riid, LPVOID* ppvObj) +{ + return E_NOINTERFACE; +} + +HRESULT WINAPI Main_DirectDrawKernel_GetKernelHandle (LPDIRECTDRAWKERNEL iface, ULONG* handle) +{ + DX_STUB; +} + +HRESULT WINAPI Main_DirectDrawKernel_ReleaseKernelHandle (LPDIRECTDRAWKERNEL iface) +{ + DX_STUB; +} + + +/***** IDirectDrawSurfaceKernel ****/ + +ULONG WINAPI Main_DDSurfaceKernel_AddRef (LPDIRECTDRAWSURFACEKERNEL iface) +{ + return 1; +} + +ULONG WINAPI Main_DDSurfaceKernel_Release (LPDIRECTDRAWSURFACEKERNEL iface) +{ + return 0; +} + +HRESULT WINAPI Main_DDSurfaceKernel_QueryInterface (LPDIRECTDRAWSURFACEKERNEL iface, REFIID riid, LPVOID* ppvObj) +{ + return E_NOINTERFACE; +} + +HRESULT WINAPI Main_DDSurfaceKernel_GetKernelHandle (LPDIRECTDRAWSURFACEKERNEL iface, ULONG* handle) +{ + DX_STUB; +} + +HRESULT WINAPI Main_DDSurfaceKernel_ReleaseKernelHandle (LPDIRECTDRAWSURFACEKERNEL iface) +{ + DX_STUB; +} + + +IDirectDrawKernelVtbl DirectDrawKernel_Vtable = +{ + Main_DirectDrawKernel_QueryInterface, + Main_DirectDrawKernel_AddRef, + Main_DirectDrawKernel_Release, + Main_DirectDrawKernel_GetKernelHandle, + Main_DirectDrawKernel_ReleaseKernelHandle +}; + +IDirectDrawSurfaceKernelVtbl DirectDrawSurfaceKernel_Vtable = +{ + Main_DDSurfaceKernel_QueryInterface, + Main_DDSurfaceKernel_AddRef, + Main_DDSurfaceKernel_Release, + Main_DDSurfaceKernel_GetKernelHandle, + Main_DDSurfaceKernel_ReleaseKernelHandle +}; Property changes on: trunk/reactos/lib/ddraw/main/kernel.c ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native

1 0

[mbosma] 18843: Define the GUIDs and other stuff.
by mbosma＠svn.reactos.com 29 Oct '05

29 Oct '05

Define the GUIDs and other stuff. Modified: trunk/reactos/w32api/include/ddk/ddkernel.h _____ Modified: trunk/reactos/w32api/include/ddk/ddkernel.h --- trunk/reactos/w32api/include/ddk/ddkernel.h 2005-10-29 10:37:26 UTC (rev 18842) +++ trunk/reactos/w32api/include/ddk/ddkernel.h 2005-10-29 10:55:45 UTC (rev 18843) @@ -1,4 +1,4 @@ -/* $Id: $ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -11,6 +11,11 @@ #ifndef __DDKM_INCLUDED__ #define __DDKM_INCLUDED__ +#if defined (_WIN32) && !defined (_NO_COM) +DEFINE_GUID (IID_IDirectDrawKernel, 0x8D56C120,0x6A08,0x11D0,0x9B,0x06,0x00,0xA0,0xC9,0x03,0xA3,0xB8); +DEFINE_GUID (IID_IDirectDrawSurfaceKernel, 0x60755DA0,0x6A40,0x11D0,0x9B,0x06,0x00,0xA0,0xC9,0x03,0xA3,0xB8); +#endif + typedef struct _DDKERNELCAPS { DWORD dwSize; @@ -51,6 +56,9 @@ #define DDIRQ_VPORT9_VSYNC 0x00010000 #define DDIRQ_VPORT9_LINE 0x00020000 +typedef struct IDirectDrawKernel* LPDIRECTDRAWKERNEL; +typedef struct IDirectDrawSurfaceKernel* LPDIRECTDRAWSURFACEKERNEL; + #if defined(_WIN32) && !defined(_NO_COM) #undef INTERFACE

1 0

[mbosma] 18842: Create Stubs for IDirectDrawVideoPortNotify and fix return values of IUnknown Stubs.
by mbosma＠svn.reactos.com 29 Oct '05

29 Oct '05

Create Stubs for IDirectDrawVideoPortNotify and fix return values of IUnknown Stubs. Modified: trunk/reactos/lib/ddraw/main/clipper.c Modified: trunk/reactos/lib/ddraw/main/color.c Modified: trunk/reactos/lib/ddraw/main/gamma.c Modified: trunk/reactos/lib/ddraw/main/palette.c Modified: trunk/reactos/lib/ddraw/main/surface.c Modified: trunk/reactos/lib/ddraw/main/videoport.c _____ Modified: trunk/reactos/lib/ddraw/main/clipper.c --- trunk/reactos/lib/ddraw/main/clipper.c 2005-10-29 10:33:12 UTC (rev 18841) +++ trunk/reactos/lib/ddraw/main/clipper.c 2005-10-29 10:37:26 UTC (rev 18842) @@ -58,7 +58,7 @@ HRESULT WINAPI Main_DirectDrawClipper_QueryInterface( LPDIRECTDRAWCLIPPER iface, REFIID riid, LPVOID* ppvObj) { - DX_STUB; + return E_NOINTERFACE; } HRESULT WINAPI Main_DirectDrawClipper_GetHWnd( _____ Modified: trunk/reactos/lib/ddraw/main/color.c --- trunk/reactos/lib/ddraw/main/color.c 2005-10-29 10:33:12 UTC (rev 18841) +++ trunk/reactos/lib/ddraw/main/color.c 2005-10-29 10:37:26 UTC (rev 18842) @@ -35,7 +35,7 @@ Main_DirectDrawColorControl_QueryInterface(LPDIRECTDRAWCOLORCONTROL iface, REFIID riid, LPVOID* ppvObj) { - DX_STUB; + return E_NOINTERFACE; } HRESULT WINAPI _____ Modified: trunk/reactos/lib/ddraw/main/gamma.c --- trunk/reactos/lib/ddraw/main/gamma.c 2005-10-29 10:33:12 UTC (rev 18841) +++ trunk/reactos/lib/ddraw/main/gamma.c 2005-10-29 10:37:26 UTC (rev 18842) @@ -35,7 +35,7 @@ Main_DirectDrawGammaControl_QueryInterface(LPDIRECTDRAWGAMMACONTROL iface, REFIID riid, LPVOID *ppObj) { - DX_STUB; + return E_NOINTERFACE; } HRESULT WINAPI _____ Modified: trunk/reactos/lib/ddraw/main/palette.c --- trunk/reactos/lib/ddraw/main/palette.c 2005-10-29 10:33:12 UTC (rev 18841) +++ trunk/reactos/lib/ddraw/main/palette.c 2005-10-29 10:37:26 UTC (rev 18842) @@ -63,7 +63,7 @@ Main_DirectDrawPalette_QueryInterface(LPDIRECTDRAWPALETTE iface, REFIID refiid, LPVOID *obj) { - DX_STUB; + return E_NOINTERFACE; } IDirectDrawPaletteVtbl DirectDrawPalette_Vtable = _____ Modified: trunk/reactos/lib/ddraw/main/surface.c --- trunk/reactos/lib/ddraw/main/surface.c 2005-10-29 10:33:12 UTC (rev 18841) +++ trunk/reactos/lib/ddraw/main/surface.c 2005-10-29 10:37:26 UTC (rev 18842) @@ -117,7 +117,7 @@ Main_DDrawSurface_QueryInterface(LPDIRECTDRAWSURFACE7 iface, REFIID riid, LPVOID* ppObj) { - DX_STUB; + return E_NOINTERFACE; } HRESULT WINAPI Main_DDrawSurface_Blt(LPDIRECTDRAWSURFACE7 iface, LPRECT rdst, _____ Modified: trunk/reactos/lib/ddraw/main/videoport.c --- trunk/reactos/lib/ddraw/main/videoport.c 2005-10-29 10:33:12 UTC (rev 18841) +++ trunk/reactos/lib/ddraw/main/videoport.c 2005-10-29 10:37:26 UTC (rev 18842) @@ -3,7 +3,7 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS * FILE: lib/ddraw/main/videoport.c - * PURPOSE: IDirectDrawVideoPort and DDVideoPortContainer Implementation + * PURPOSE: IDirectDrawVideoPort, DDVideoPortContainer and IDirectDrawVideoPortNotify Implementation * PROGRAMMER: Maarten Bosma * */ @@ -16,19 +16,19 @@ HRESULT WINAPI Main_DirectDrawVideoPort_QueryInterface (LPDIRECTDRAWVIDEOPORT iface, REFIID riid, LPVOID* ppvObj) { - DX_STUB; + return E_NOINTERFACE; } ULONG WINAPI Main_DirectDrawVideoPort_AddRef (LPDIRECTDRAWVIDEOPORT iface) { - DX_STUB; + return 1; } ULONG WINAPI Main_DirectDrawVideoPort_Release (LPDIRECTDRAWVIDEOPORT iface) { - DX_STUB; + return 0; } HRESULT WINAPI @@ -113,17 +113,17 @@ HRESULT WINAPI Main_DDVideoPortContainer_QueryInterface (LPDDVIDEOPORTCONTAINER iface, REFIID riid, LPVOID* ppvObj) { - DX_STUB; + return E_NOINTERFACE; } ULONG WINAPI Main_DDVideoPortContainer_AddRef (LPDDVIDEOPORTCONTAINER iface) { - DX_STUB; + return 1; } ULONG WINAPI Main_DDVideoPortContainer_Release (LPDDVIDEOPORTCONTAINER iface) { - DX_STUB; + return 0; } HRESULT WINAPI Main_DDVideoPortContainer_CreateVideoPort (LPDDVIDEOPORTCONTAINER iface, DWORD dwFlags, LPDDVIDEOPORTDESC pPortDesc, @@ -149,6 +149,33 @@ DX_STUB; } +/************* IDirectDrawVideoPortNotify *************/ + +HRESULT WINAPI Main_DDVideoPortNotify_QueryInterface (LPDIRECTDRAWVIDEOPORTNOTIFY iface, REFIID riid, LPVOID* ppvObj) +{ + return E_NOINTERFACE; +} + +ULONG WINAPI Main_DDVideoPortNotify_AddRef (LPDIRECTDRAWVIDEOPORTNOTIFY iface) +{ + return 1; +} + +ULONG WINAPI Main_DDVideoPortNotify_Release (LPDIRECTDRAWVIDEOPORTNOTIFY iface) +{ + return 0; +} + +HRESULT WINAPI Main_DDVideoPortNotify_AcquireNotification (LPDIRECTDRAWVIDEOPORTNOTIFY iface, HANDLE* h, LPDDVIDEOPORTNOTIFY pVideoPortNotify) +{ + DX_STUB; +} + +HRESULT WINAPI Main_DDVideoPortNotify_ReleaseNotification (LPDIRECTDRAWVIDEOPORTNOTIFY iface, HANDLE h) +{ + DX_STUB; +} + IDirectDrawVideoPortVtbl DirectDrawVideoPort_Vtable = { Main_DirectDrawVideoPort_QueryInterface, @@ -180,3 +207,12 @@ Main_DDVideoPortContainer_GetVideoPortConnectInfo, Main_DDVideoPortContainer_QueryVideoPortStatus }; + +IDirectDrawVideoPortNotifyVtbl DDVideoPortNotify_Vtable = +{ + Main_DDVideoPortNotify_QueryInterface, + Main_DDVideoPortNotify_AddRef, + Main_DDVideoPortNotify_Release, + Main_DDVideoPortNotify_AcquireNotification, + Main_DDVideoPortNotify_ReleaseNotification +};

1 0

[mbosma] 18841: Define COM-Interfaces for IDirectDrawKernel and SurfaceKernel and add a little typedef.
by mbosma＠svn.reactos.com 29 Oct '05

29 Oct '05

Define COM-Interfaces for IDirectDrawKernel and SurfaceKernel and add a little typedef. Modified: trunk/reactos/w32api/include/ddk/ddkernel.h Modified: trunk/reactos/w32api/include/ddk/dvp.h _____ Modified: trunk/reactos/w32api/include/ddk/ddkernel.h --- trunk/reactos/w32api/include/ddk/ddkernel.h 2005-10-29 09:59:30 UTC (rev 18840) +++ trunk/reactos/w32api/include/ddk/ddkernel.h 2005-10-29 10:33:12 UTC (rev 18841) @@ -51,6 +51,33 @@ #define DDIRQ_VPORT9_VSYNC 0x00010000 #define DDIRQ_VPORT9_LINE 0x00020000 +#if defined(_WIN32) && !defined(_NO_COM) + +#undef INTERFACE +#define INTERFACE IDirectDrawKernel +DECLARE_INTERFACE_ (IDirectDrawKernel, IUnknown) +{ + STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID* ppvObj) PURE; + STDMETHOD_(ULONG,AddRef) (THIS) PURE; + STDMETHOD_(ULONG,Release) (THIS) PURE; + STDMETHOD(GetKernelHandle) (THIS_ ULONG*) PURE; + STDMETHOD(ReleaseKernelHandle) (THIS) PURE; +}; + +#undef INTERFACE +#define INTERFACE IDirectDrawSurfaceKernel +DECLARE_INTERFACE_ (IDirectDrawSurfaceKernel, IUnknown) +{ + STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID* ppvObj) PURE; + STDMETHOD_(ULONG,AddRef) (THIS) PURE; + STDMETHOD_(ULONG,Release) (THIS) PURE; + STDMETHOD(GetKernelHandle) (THIS_ ULONG*) PURE; + STDMETHOD(ReleaseKernelHandle) (THIS) PURE; +}; + +#undef INTERFACE +#endif // defined(_WIN32) && !defined(_NO_COM) + #ifdef __cplusplus }; #endif _____ Modified: trunk/reactos/w32api/include/ddk/dvp.h --- trunk/reactos/w32api/include/ddk/dvp.h 2005-10-29 09:59:30 UTC (rev 18840) +++ trunk/reactos/w32api/include/ddk/dvp.h 2005-10-29 10:33:12 UTC (rev 18841) @@ -209,6 +209,7 @@ typedef struct IDirectDrawVideoPort* LPDIRECTDRAWVIDEOPORT; typedef struct IDDVideoPortContainer* LPDDVIDEOPORTCONTAINER; +typedef struct IDirectDrawVideoPortNotify* LPDIRECTDRAWVIDEOPORTNOTIFY; typedef HRESULT (FAR PASCAL * LPDDENUMVIDEOCALLBACK)(LPDDVIDEOPORTCAPS, LPVOID);

1 0

[weiden] 18840: implemented SetupDiCreateDevRegKeyA
by weiden＠svn.reactos.com 29 Oct '05

29 Oct '05

implemented SetupDiCreateDevRegKeyA Modified: trunk/reactos/lib/setupapi/devinst.c Modified: trunk/reactos/lib/setupapi/setupapi.spec _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-10-29 09:52:43 UTC (rev 18839) +++ trunk/reactos/lib/setupapi/devinst.c 2005-10-29 09:59:30 UTC (rev 18840) @@ -3486,8 +3486,43 @@ } /*********************************************************************** - * SetupDiCreateDevRegKey (SETUPAPI.@) + * SetupDiCreateDevRegKeyA (SETUPAPI.@) */ +HKEY WINAPI SetupDiCreateDevRegKeyA( + IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData, + IN DWORD Scope, + IN DWORD HwProfile, + IN DWORD KeyType, + IN HINF InfHandle OPTIONAL, + IN PCSTR InfSectionName OPTIONAL) +{ + PCWSTR InfSectionNameW = NULL; + HKEY ret = INVALID_HANDLE_VALUE; + + if (InfSectionName) + { + InfSectionNameW = MultiByteToUnicode(InfSectionName, CP_ACP); + if (InfSectionNameW == NULL) return INVALID_HANDLE_VALUE; + } + + ret = SetupDiCreateDevRegKeyW(DeviceInfoSet, + DeviceInfoData, + Scope, + HwProfile, + KeyType, + InfHandle, + InfSectionNameW); + + if (InfSectionNameW != NULL) + MyFree((PVOID)InfSectionNameW); + + return ret; +} + +/********************************************************************** * + * SetupDiCreateDevRegKeyW (SETUPAPI.@) + */ HKEY WINAPI SetupDiCreateDevRegKeyW( IN HDEVINFO DeviceInfoSet, IN PSP_DEVINFO_DATA DeviceInfoData, _____ Modified: trunk/reactos/lib/setupapi/setupapi.spec --- trunk/reactos/lib/setupapi/setupapi.spec 2005-10-29 09:52:43 UTC (rev 18839) +++ trunk/reactos/lib/setupapi/setupapi.spec 2005-10-29 09:59:30 UTC (rev 18840) @@ -281,7 +281,7 @@ @ stdcall SetupDiClassNameFromGuidExA(ptr str long ptr wstr ptr) @ stdcall SetupDiClassNameFromGuidExW(ptr wstr long ptr wstr ptr) @ stdcall SetupDiClassNameFromGuidW(ptr wstr long ptr) -@ stub SetupDiCreateDevRegKeyA +@ stdcall SetupDiCreateDevRegKeyA(ptr ptr long long long ptr str) @ stdcall SetupDiCreateDevRegKeyW(ptr ptr long long long ptr wstr) @ stdcall SetupDiCreateDeviceInfoA(ptr str ptr str ptr long ptr) @ stdcall SetupDiCreateDeviceInfoW(ptr wstr ptr wstr ptr long ptr)

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
74
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 October 2005