Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 35569: - Pass the msi package in quotes - Fixes launching msi packages from directories with spaces - See bug 3342
by janderwald＠svn.reactos.org 23 Aug '08

23 Aug '08

Author: janderwald Date: Sat Aug 23 12:26:26 2008 New Revision: 35569 URL: http://svn.reactos.org/svn/reactos?rev=35569&view=rev Log: - Pass the msi package in quotes - Fixes launching msi packages from directories with spaces - See bug 3342 Modified: trunk/reactos/boot/bootdata/hivecls_arm.inf trunk/reactos/boot/bootdata/hivecls_i386.inf Modified: trunk/reactos/boot/bootdata/hivecls_arm.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivecls_arm.… ============================================================================== --- trunk/reactos/boot/bootdata/hivecls_arm.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivecls_arm.inf [iso-8859-1] Sat Aug 23 12:26:26 2008 @@ -211,9 +211,9 @@ ; MSI files HKCR,".msi","",0x00000000,"MSI.Package" HKCR,"Msi.Package\DefaultIcon","",0x00000000,"msiexec.exe" -HKCR,"Msi.Package\shell\Open\command","",0x00020000,"%SystemRoot%\system32\msiexec /i %1" -HKCR,"Msi.Package\shell\Repair\command","",0x00020000,"%SystemRoot%\system32\msiexec /f %1" -HKCR,"Msi.Package\shell\Uninstall\command","",0x00020000,"%SystemRoot%\system32\msiexec /x %1" +HKCR,"Msi.Package\shell\Open\command","",0x00020000,"%SystemRoot%\system32\msiexec /i ""%1""" +HKCR,"Msi.Package\shell\Repair\command","",0x00020000,"%SystemRoot%\system32\msiexec /f ""%1""" +HKCR,"Msi.Package\shell\Uninstall\command","",0x00020000,"%SystemRoot%\system32\msiexec /x ""%1""" HKCR,".pif","",0x00000000,"piffile" Modified: trunk/reactos/boot/bootdata/hivecls_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivecls_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivecls_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivecls_i386.inf [iso-8859-1] Sat Aug 23 12:26:26 2008 @@ -211,9 +211,9 @@ ; MSI files HKCR,".msi","",0x00000000,"MSI.Package" HKCR,"Msi.Package\DefaultIcon","",0x00000000,"msiexec.exe" -HKCR,"Msi.Package\shell\Open\command","",0x00020000,"%SystemRoot%\system32\msiexec /i %1" -HKCR,"Msi.Package\shell\Repair\command","",0x00020000,"%SystemRoot%\system32\msiexec /f %1" -HKCR,"Msi.Package\shell\Uninstall\command","",0x00020000,"%SystemRoot%\system32\msiexec /x %1" +HKCR,"Msi.Package\shell\Open\command","",0x00020000,"%SystemRoot%\system32\msiexec /i ""%1""" +HKCR,"Msi.Package\shell\Repair\command","",0x00020000,"%SystemRoot%\system32\msiexec /f ""%1""" +HKCR,"Msi.Package\shell\Uninstall\command","",0x00020000,"%SystemRoot%\system32\msiexec /x ""%1""" HKCR,".pif","",0x00000000,"piffile"

1 0

[gbrunmar] 35568: * Refactored GetDirect3D9AdapterInfo() to make life a little easier in InitD3D9BaseDevice(). * Filled IDirect3DDevice9::DeviceData[] with correct info
by gbrunmar＠svn.reactos.org 23 Aug '08

23 Aug '08

Author: gbrunmar Date: Sat Aug 23 12:24:27 2008 New Revision: 35568 URL: http://svn.reactos.org/svn/reactos?rev=35568&view=rev Log: * Refactored GetDirect3D9AdapterInfo() to make life a little easier in InitD3D9BaseDevice(). * Filled IDirect3DDevice9::DeviceData[] with correct info Modified: trunk/reactos/dll/directx/d3d9/d3d9_create.c trunk/reactos/dll/directx/d3d9/d3d9_create.h trunk/reactos/dll/directx/d3d9/d3d9_device.c trunk/reactos/dll/directx/d3d9/d3d9_private.h trunk/reactos/dll/directx/d3d9/d3d9_swapchain.c trunk/reactos/dll/directx/d3d9/device.c Modified: trunk/reactos/dll/directx/d3d9/d3d9_create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_crea… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_create.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_create.c [iso-8859-1] Sat Aug 23 12:24:27 2008 @@ -112,21 +112,14 @@ } } -static BOOL GetDirect3D9AdapterInfo(IN OUT LPDIRECT3D9_DISPLAYADAPTER pDisplayAdapters, IN DWORD AdapterIndex) +BOOL CreateD3D9DeviceData(IN LPDIRECT3D9_DISPLAYADAPTER pDisplayAdapter, IN LPD3D9_DEVICEDATA pDeviceData) { HDC hDC; - LPD3D9_DEVICEDATA pDeviceData; - LPDIRECT3D9_DISPLAYADAPTER pDisplayAdapter = &pDisplayAdapters[AdapterIndex]; /* Test DC creation for the display device */ if (NULL == (hDC = CreateDCA(NULL, pDisplayAdapter->szDeviceName, NULL, NULL))) - return FALSE; - - pDeviceData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(D3D9_DEVICEDATA)); - if (NULL == pDeviceData) - { - DPRINT1("Out of memory, could not initialize Direct3D adapter"); - DeleteDC(hDC); + { + DPRINT1("Could not create dc for display adapter: %s", pDisplayAdapter->szDeviceName); return FALSE; } @@ -147,17 +140,39 @@ if (FALSE == GetDeviceData(pDeviceData)) { - DeleteDC(hDC); - HeapFree(GetProcessHeap(), 0, pDeviceData->pUnknown6BC); - HeapFree(GetProcessHeap(), 0, pDeviceData); - return FALSE; - } - - DeleteDC(hDC); + DPRINT1("Could not get device data for display adapter: %s", pDisplayAdapter->szDeviceName); + return FALSE; + } + + return TRUE; +} + +VOID DestroyD3D9DeviceData(IN LPD3D9_DEVICEDATA pDeviceData) +{ + DeleteDC(pDeviceData->hDC); + HeapFree(GetProcessHeap(), 0, pDeviceData->pUnknown6BC); +} + +static BOOL GetDirect3D9AdapterInfo(IN OUT LPDIRECT3D9_DISPLAYADAPTER pDisplayAdapters, IN DWORD AdapterIndex) +{ + LPD3D9_DEVICEDATA pDeviceData; + + pDeviceData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(D3D9_DEVICEDATA)); + if (NULL == pDeviceData) + { + DPRINT1("Out of memory, could not initialize Direct3D adapter"); + return FALSE; + } + + if (FALSE == CreateD3D9DeviceData(&pDisplayAdapters[AdapterIndex], pDeviceData)) + { + DPRINT1("Could not create device data for adapter: %d", AdapterIndex); + return FALSE; + } GetDisplayAdapterFromDevice(pDisplayAdapters, AdapterIndex, pDeviceData); - HeapFree(GetProcessHeap(), 0, pDeviceData->pUnknown6BC); + DestroyD3D9DeviceData(pDeviceData); HeapFree(GetProcessHeap(), 0, pDeviceData); return TRUE; @@ -232,9 +247,6 @@ if (pDirect3D9 == 0) return DDERR_OUTOFMEMORY; - pDirect3D9->unknown000007 = 0; - pDirect3D9->lpInt = 0; - pDirect3D9->lpVtbl = &Direct3D9_Vtbl; pDirect3D9->dwProcessId = GetCurrentThreadId(); pDirect3D9->lRefCnt = 1; @@ -246,10 +258,15 @@ InitializeCriticalSection(&pDirect3D9->d3d9_cs); - GetDisplayDeviceInfo(pDirect3D9); + if (FALSE == GetDisplayDeviceInfo(pDirect3D9)) + { + DPRINT1("Could not create Direct3D9 object"); + AlignedFree(pDirect3D9); + return DDERR_GENERIC; + } *ppDirect3D9 = (LPDIRECT3D9)&pDirect3D9->lpVtbl; - return ERROR_SUCCESS; -} - + return D3D_OK; +} + Modified: trunk/reactos/dll/directx/d3d9/d3d9_create.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_crea… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_create.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_create.h [iso-8859-1] Sat Aug 23 12:24:27 2008 @@ -15,4 +15,7 @@ /* Creates a Direct3D9 object */ HRESULT CreateD3D9(OUT LPDIRECT3D9 *ppDirect3D9, UINT SDKVersion); +BOOL CreateD3D9DeviceData(IN LPDIRECT3D9_DISPLAYADAPTER pDisplayAdapter, IN LPD3D9_DEVICEDATA pDeviceData); +VOID DestroyD3D9DeviceData(IN LPD3D9_DEVICEDATA pDeviceData); + #endif // _D3D9_CREATE_H_ Modified: trunk/reactos/dll/directx/d3d9/d3d9_device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_devi… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_device.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_device.c [iso-8859-1] Sat Aug 23 12:24:27 2008 @@ -8,7 +8,8 @@ #include "d3d9_device.h" #include "d3d9_helpers.h" #include "adapter.h" -#include "debug.h" +#include <debug.h> +#include "d3d9_create.h" #define LOCK_D3DDEVICE9() if (This->bLockDevice) EnterCriticalSection(&This->CriticalSection); #define UNLOCK_D3DDEVICE9() if (This->bLockDevice) LeaveCriticalSection(&This->CriticalSection); @@ -53,8 +54,16 @@ if (ref == 0) { + DWORD iAdapter; + EnterCriticalSection(&This->CriticalSection); + /* TODO: Free resources here */ + for (iAdapter = 0; iAdapter < This->NumAdaptersInDevice; iAdapter++) + { + DestroyD3D9DeviceData(&This->DeviceData[iAdapter]); + } + LeaveCriticalSection(&This->CriticalSection); AlignedFree(This); } Modified: trunk/reactos/dll/directx/d3d9/d3d9_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_priv… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_private.h [iso-8859-1] Sat Aug 23 12:24:27 2008 @@ -2667,6 +2667,6 @@ /* 0x47ac */ DWORD unknown004587; /* 0x47b0 */ DWORD unknown004588; /* 0x47b4 */ UINT SDKVersion; -} DIRECT3D9_INT, *LPDIRECT3D9_INT; +} DIRECT3D9_INT, FAR *LPDIRECT3D9_INT; #endif // _D3D9_PRIVATE_H_ Modified: trunk/reactos/dll/directx/d3d9/d3d9_swapchain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_swap… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_swapchain.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_swapchain.c [iso-8859-1] Sat Aug 23 12:24:27 2008 @@ -150,6 +150,8 @@ pThisSwapChain->GammaRamp.blue[i] = i; } + pThisSwapChain->PresentParameters = pPresentationParameters[pThisSwapChain->ChainIndex]; + return Direct3DSwapChain9_Reset(pThisSwapChain, pPresentationParameters); } Modified: trunk/reactos/dll/directx/d3d9/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/device.c?… ============================================================================== --- trunk/reactos/dll/directx/d3d9/device.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/device.c [iso-8859-1] Sat Aug 23 12:24:27 2008 @@ -9,6 +9,7 @@ #include "device.h" #include <debug.h> #include "d3d9_helpers.h" +#include "d3d9_create.h" static HRESULT InitD3D9ResourceManager(D3D9ResourceManager* pThisResourceManager, LPDIRECT3DDEVICE9_INT pDirect3DDevice9) { @@ -36,7 +37,6 @@ { D3D9ResourceManager* pResourceManager; DWORD i; - D3DDISPLAYMODE DisplayMode; // Insert Reset/Ctor here @@ -59,16 +59,25 @@ // TODO: Query driver for correct DX version pThisBaseDevice->dwDXVersion = 9; - DisplayMode = pThisBaseDevice->CurrentDisplayMode[0]; + pThisBaseDevice->CurrentDisplayMode[0].Width = pDirect3D9->DisplayAdapters[0].DriverCaps.dwDisplayWidth; + pThisBaseDevice->CurrentDisplayMode[0].Height = pDirect3D9->DisplayAdapters[0].DriverCaps.dwDisplayHeight; + pThisBaseDevice->CurrentDisplayMode[0].RefreshRate = pDirect3D9->DisplayAdapters[0].DriverCaps.dwRefreshRate; + pThisBaseDevice->CurrentDisplayMode[0].Format = pDirect3D9->DisplayAdapters[0].DriverCaps.DisplayFormat; + for (i = 0; i < NumAdaptersToCreate; i++) { + if (FALSE == CreateD3D9DeviceData(&pDirect3D9->DisplayAdapters[i], &pThisBaseDevice->DeviceData[i])) + { + DPRINT1("Failed to get device data for adapter: %d", i); + return DDERR_GENERIC; + } + + pThisBaseDevice->AdapterIndexInGroup[i] = i; pThisBaseDevice->CurrentDisplayMode[i] = pThisBaseDevice->CurrentDisplayMode[0]; - pThisBaseDevice->AdapterIndexInGroup[i] = i; - // TODO: Fill pThisBaseDevice->DeviceData[i] pThisBaseDevice->pSwapChains[i] = CreateDirect3DSwapChain9(RT_BUILTIN, pThisBaseDevice, i); pThisBaseDevice->pSwapChains2[i] = pThisBaseDevice->pSwapChains[i]; - Direct3DSwapChain9_SetDisplayMode(pThisBaseDevice->pSwapChains[i], &DisplayMode); + Direct3DSwapChain9_SetDisplayMode(pThisBaseDevice->pSwapChains[i], &pThisBaseDevice->CurrentDisplayMode[i]); if (FAILED(Direct3DSwapChain9_Init(pThisBaseDevice->pSwapChains[i], pPresentationParameters))) {

1 0

[sginsberg] 35565: - In IoAcquire/ReleaseCancelSpinLock, use the queued "IopCancelSpinLock" instead of a ros-specific "CancelSpinLock" standard spinlock - Misc fixes
by sginsberg＠svn.reactos.org 23 Aug '08

23 Aug '08

Author: sginsberg Date: Sat Aug 23 11:30:14 2008 New Revision: 35565 URL: http://svn.reactos.org/svn/reactos?rev=35565&view=rev Log: - In IoAcquire/ReleaseCancelSpinLock, use the queued "IopCancelSpinLock" instead of a ros-specific "CancelSpinLock" standard spinlock - Misc fixes Modified: trunk/reactos/ntoskrnl/io/iomgr/error.c trunk/reactos/ntoskrnl/io/iomgr/iofunc.c trunk/reactos/ntoskrnl/io/iomgr/iomgr.c trunk/reactos/ntoskrnl/io/iomgr/irp.c trunk/reactos/ntoskrnl/io/iomgr/util.c Modified: trunk/reactos/ntoskrnl/io/iomgr/error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/error.c?… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/error.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/error.c [iso-8859-1] Sat Aug 23 11:30:14 2008 @@ -122,7 +122,7 @@ NULL); if (NT_SUCCESS(Status)) { - /* Remmeber we're connected */ + /* Remember we're connected */ IopLogPortConnected = TRUE; return TRUE; } @@ -583,7 +583,7 @@ KeAcquireSpinLock(&IopLogListLock, &Irql); InsertHeadList(&IopErrorLogListHead, &LogEntry->ListEntry); - /* Check if the worker is runnign */ + /* Check if the worker is running */ if (!IopLogWorkerRunning) { #if 0 @@ -648,7 +648,7 @@ IN PKTHREAD Thread) { UNIMPLEMENTED; - return(FALSE); + return FALSE; } /* @@ -659,14 +659,12 @@ IoSetThreadHardErrorMode(IN BOOLEAN HardErrorEnabled) { PETHREAD Thread = PsGetCurrentThread(); - BOOLEAN Old; + BOOLEAN OldMode; /* Get the current value */ - Old = !Thread->HardErrorsAreDisabled; + OldMode = !Thread->HardErrorsAreDisabled; /* Set the new one and return the old */ Thread->HardErrorsAreDisabled = !HardErrorEnabled; - return Old; -} - -/* EOF */ + return OldMode; +} Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iofunc.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iofunc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iofunc.c [iso-8859-1] Sat Aug 23 11:30:14 2008 @@ -682,7 +682,7 @@ StackPtr->FileObject = FileObject; /* Call the Driver */ - return IofCallDriver(DeviceObject, Irp); + return IoCallDriver(DeviceObject, Irp); } /* @@ -732,7 +732,7 @@ StackPtr->FileObject = FileObject; /* Call the Driver */ - return IofCallDriver(DeviceObject, Irp); + return IoCallDriver(DeviceObject, Irp); } /* @@ -776,7 +776,7 @@ } /* - * @unimplemented + * @implemented */ NTSTATUS NTAPI @@ -2045,7 +2045,7 @@ CapturedByteOffset = FileObject->CurrentByteOffset; } - /* Rememer we are sync */ + /* Remember we are sync */ Synchronous = TRUE; } else if (!(ByteOffset) && @@ -2904,7 +2904,7 @@ CapturedByteOffset = FileObject->CurrentByteOffset; } - /* Rememer we are sync */ + /* Remember we are sync */ Synchronous = TRUE; } else if (!(ByteOffset) && Modified: trunk/reactos/ntoskrnl/io/iomgr/iomgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iomgr.c?… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iomgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iomgr.c [iso-8859-1] Sat Aug 23 11:30:14 2008 @@ -68,7 +68,6 @@ extern LIST_ENTRY IopTimerQueueHead; extern KDPC IopTimerDpc; extern KTIMER IopTimer; -extern KSPIN_LOCK CancelSpinLock; extern KSPIN_LOCK IoVpbLock; extern KSPIN_LOCK IoStatisticsLock; extern KSPIN_LOCK DriverReinitListLock; @@ -463,7 +462,6 @@ InitializeListHead(&LastChanceShutdownListHead); InitializeListHead(&FsChangeNotifyListHead); InitializeListHead(&IopErrorLogListHead); - KeInitializeSpinLock(&CancelSpinLock); KeInitializeSpinLock(&IoVpbLock); KeInitializeSpinLock(&IoStatisticsLock); KeInitializeSpinLock(&DriverReinitListLock); Modified: trunk/reactos/ntoskrnl/io/iomgr/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/irp.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/irp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/irp.c [iso-8859-1] Sat Aug 23 11:30:14 2008 @@ -1,8 +1,7 @@ - /* * PROJECT: ReactOS Kernel * LICENSE: GPL - See COPYING in the top level directory - * FILE: ntoskrnl/io/irp.c + * FILE: ntoskrnl/io/iomgr/irp.c * PURPOSE: IRP Handling Functions * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) * Gunnar Dalsnes @@ -627,7 +626,7 @@ /* Allocate IRP */ Irp = IoAllocateIrp(DeviceObject->StackSize, FALSE); - if (!Irp) return Irp; + if (!Irp) return NULL; /* Get the Stack */ StackPtr = IoGetNextIrpStackLocation(Irp); @@ -731,7 +730,7 @@ Irp->UserIosb = IoStatusBlock; Irp->Tail.Overlay.Thread = PsGetCurrentThread(); - /* Set the Status Block after all is done */ + /* Return the IRP */ IOTRACE(IO_IRP_DEBUG, "%s - Built IRP %p with Major, Buffer, DO %lx %p %p\n", __FUNCTION__, @@ -763,7 +762,7 @@ /* Allocate IRP */ Irp = IoAllocateIrp(DeviceObject->StackSize, FALSE); - if (!Irp) return Irp; + if (!Irp) return NULL; /* Get the Stack */ StackPtr = IoGetNextIrpStackLocation(Irp); @@ -857,6 +856,7 @@ } else { + /* Clear the flags */ Irp->Flags = 0; } @@ -1058,7 +1058,12 @@ * Don't stay here forever if some broken driver doesn't complete * the IRP. */ - if (!(Retries--)) IopRemoveThreadIrp(); + if (!(Retries--)) + { + /* Print out a message and remove the IRP */ + DPRINT1("Broken driver did not complete!\n"); + IopRemoveThreadIrp(); + } /* Raise the IRQL Again */ KeRaiseIrql(APC_LEVEL, &OldIrql); @@ -1076,7 +1081,7 @@ IoCallDriver(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - /* Call fast call */ + /* Call fastcall */ return IofCallDriver(DeviceObject, Irp); } @@ -1112,7 +1117,7 @@ IN PIRP Irp) { PDRIVER_OBJECT DriverObject; - PIO_STACK_LOCATION Param; + PIO_STACK_LOCATION StackPtr; /* Get the Driver Object */ DriverObject = DeviceObject->DriverObject; @@ -1126,15 +1131,15 @@ } /* Now update the stack location */ - Param = IoGetNextIrpStackLocation(Irp); - Irp->Tail.Overlay.CurrentStackLocation = Param; + StackPtr = IoGetNextIrpStackLocation(Irp); + Irp->Tail.Overlay.CurrentStackLocation = StackPtr; /* Get the Device Object */ - Param->DeviceObject = DeviceObject; + StackPtr->DeviceObject = DeviceObject; /* Call it */ - return DriverObject->MajorFunction[Param->MajorFunction](DeviceObject, - Irp); + return DriverObject->MajorFunction[StackPtr->MajorFunction](DeviceObject, + Irp); } FORCEINLINE @@ -1417,10 +1422,9 @@ NTSTATUS NTAPI -IopSynchronousCompletion( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp, - IN PVOID Context) +IopSynchronousCompletion(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PVOID Context) { if (Irp->PendingReturned) KeSetEvent((PKEVENT)Context, IO_NO_INCREMENT, FALSE); @@ -1464,6 +1468,7 @@ KeWaitForSingleObject(&Event, Suspended, KernelMode, FALSE, NULL); } + /* Return success */ return TRUE; } @@ -1550,10 +1555,12 @@ /* * @implemented */ -PEPROCESS NTAPI +PEPROCESS +NTAPI IoGetRequestorProcess(IN PIRP Irp) { - return(Irp->Tail.Overlay.Thread->ThreadsProcess); + /* Return the requestor process */ + return Irp->Tail.Overlay.Thread->ThreadsProcess; } /* @@ -1563,6 +1570,7 @@ NTAPI IoGetRequestorProcessId(IN PIRP Irp) { + /* Return the requestor process' id */ return (ULONG)(IoGetRequestorProcess(Irp)->UniqueProcessId); } @@ -1586,6 +1594,7 @@ NTAPI IoGetTopLevelIrp(VOID) { + /* Return the IRP */ return (PIRP)PsGetCurrentThread()->TopLevelIrp; } @@ -1736,5 +1745,3 @@ /* Set the IRP */ PsGetCurrentThread()->TopLevelIrp = (ULONG)Irp; } - -/* EOF */ Modified: trunk/reactos/ntoskrnl/io/iomgr/util.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/util.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/util.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/util.c [iso-8859-1] Sat Aug 23 11:30:14 2008 @@ -1,9 +1,11 @@ /* * PROJECT: ReactOS Kernel * LICENSE: GPL - See COPYING in the top level directory - * FILE: ntoskrnl/io/util.c + * FILE: ntoskrnl/io/iomgr/util.c * PURPOSE: I/O Utility Functions - * PROGRAMMERS: <UNKNOWN> + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + * Aleksey Bragin (aleksey(a)reactos.org) + * Daniel Zimmerman (netzimme(a)aim.com) */ /* INCLUDES *****************************************************************/ @@ -17,10 +19,6 @@ RtlpGetStackLimits(PULONG_PTR StackBase, PULONG_PTR StackLimit); -/* DATA **********************************************************************/ - -KSPIN_LOCK CancelSpinLock; - /* FUNCTIONS *****************************************************************/ /* @@ -28,10 +26,10 @@ */ VOID NTAPI -IoAcquireCancelSpinLock(PKIRQL Irql) +IoAcquireCancelSpinLock(OUT PKIRQL Irql) { /* Just acquire the internal lock */ - KeAcquireSpinLock(&CancelSpinLock,Irql); + *Irql = KeAcquireQueuedSpinLock(LockQueueIoCancelLock); } /* @@ -113,6 +111,7 @@ NTAPI IoGetCurrentProcess(VOID) { + /* Return the current thread's process */ return (PEPROCESS)PsGetCurrentThread()->Tcb.ApcState.Process; } @@ -121,10 +120,10 @@ */ VOID NTAPI -IoReleaseCancelSpinLock(KIRQL Irql) +IoReleaseCancelSpinLock(IN KIRQL Irql) { /* Release the internal lock */ - KeReleaseSpinLock(&CancelSpinLock,Irql); + KeReleaseQueuedSpinLock(LockQueueIoCancelLock, Irql); } /* @@ -315,4 +314,3 @@ UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; } -/* EOF */

2 1

[sginsberg] 35567: - Add THREAD_TERMINATE_HELD_MUTEX bugcode and make use of it
by sginsberg＠svn.reactos.org 23 Aug '08

23 Aug '08

Author: sginsberg Date: Sat Aug 23 12:16:16 2008 New Revision: 35567 URL: http://svn.reactos.org/svn/reactos?rev=35567&view=rev Log: - Add THREAD_TERMINATE_HELD_MUTEX bugcode and make use of it Modified: trunk/reactos/include/reactos/mc/bugcodes.mc trunk/reactos/ntoskrnl/ke/thrdobj.c Modified: trunk/reactos/include/reactos/mc/bugcodes.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/mc/bugcode… ============================================================================== --- trunk/reactos/include/reactos/mc/bugcodes.mc [iso-8859-1] (original) +++ trunk/reactos/include/reactos/mc/bugcodes.mc [iso-8859-1] Sat Aug 23 12:16:16 2008 @@ -1397,6 +1397,14 @@ MultiProcessor Kernel . +MessageId=0x8A +Severity=Informational +Facility=System +SymbolicName=THREAD_TERMINATE_HELD_MUTEX +Language=English +A kernel thread terminated while holding a mutex +. + MessageId=0x9D Severity=Informational Facility=System Modified: trunk/reactos/ntoskrnl/ke/thrdobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/thrdobj.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/thrdobj.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/thrdobj.c [iso-8859-1] Sat Aug 23 12:16:16 2008 @@ -416,7 +416,7 @@ if (Mutant->ApcDisable) { /* Bugcheck the system */ - KEBUGCHECKEX(0, //THREAD_TERMINATE_HELD_MUTEX, + KeBugCheckEx(THREAD_TERMINATE_HELD_MUTEX, (ULONG_PTR)Thread, (ULONG_PTR)Mutant, 0,

1 0

[fireball] 35566: - Implement IopGetRegistryValue (complementary function to IopOpenRegistryKeyEx). Not used yet.
by fireball＠svn.reactos.org 23 Aug '08

23 Aug '08

Author: fireball Date: Sat Aug 23 12:11:12 2008 New Revision: 35566 URL: http://svn.reactos.org/svn/reactos?rev=35566&view=rev Log: - Implement IopGetRegistryValue (complementary function to IopOpenRegistryKeyEx). Not used yet. Modified: trunk/reactos/ntoskrnl/include/internal/io.h trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/include/internal/io.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/io.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/io.h [iso-8859-1] Sat Aug 23 12:11:12 2008 @@ -593,6 +593,13 @@ PUNICODE_STRING Name, ACCESS_MASK DesiredAccess); +NTSTATUS +NTAPI +IopGetRegistryValue(IN HANDLE Handle, + IN PWSTR ValueName, + OUT PKEY_VALUE_FULL_INFORMATION *Information); + + // // Initialization Routines // 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 [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Sat Aug 23 12:11:12 2008 @@ -2775,6 +2775,51 @@ return Status; } +NTSTATUS +NTAPI +IopGetRegistryValue(IN HANDLE Handle, + IN PWSTR ValueName, + OUT PKEY_VALUE_FULL_INFORMATION *Information) +{ + UNICODE_STRING ValueString; + NTSTATUS Status; + PKEY_VALUE_FULL_INFORMATION FullInformation; + ULONG Size; + PAGED_CODE(); + + RtlInitUnicodeString(&ValueString, ValueName); + + Status = ZwQueryValueKey(Handle, + &ValueString, + KeyValueFullInformation, + NULL, + 0, + &Size); + if ((Status != STATUS_BUFFER_OVERFLOW) && + (Status != STATUS_BUFFER_TOO_SMALL)) + { + return Status; + } + + FullInformation = ExAllocatePool(NonPagedPool, Size); + if (!FullInformation) return STATUS_INSUFFICIENT_RESOURCES; + + Status = ZwQueryValueKey(Handle, + &ValueString, + KeyValueFullInformation, + FullInformation, + Size, + &Size); + if (!NT_SUCCESS(Status)) + { + ExFreePool(FullInformation); + return Status; + } + + *Information = FullInformation; + return STATUS_SUCCESS; +} + static NTSTATUS INIT_FUNCTION NTAPI PnpDriverInitializeEmpty(IN struct _DRIVER_OBJECT *DriverObject, IN PUNICODE_STRING RegistryPath)

1 0

[gbrunmar] 35564: Added missing documentation
by gbrunmar＠svn.reactos.org 23 Aug '08

23 Aug '08

Author: gbrunmar Date: Sat Aug 23 10:17:00 2008 New Revision: 35564 URL: http://svn.reactos.org/svn/reactos?rev=35564&view=rev Log: Added missing documentation Modified: trunk/reactos/dll/directx/d3d9/d3d9_baseobject.c trunk/reactos/dll/directx/d3d9/d3d9_baseobject.h trunk/reactos/dll/directx/d3d9/d3d9_impl.c trunk/reactos/dll/directx/d3d9/d3d9_swapchain.c trunk/reactos/dll/directx/d3d9/d3d9_swapchain.h Modified: trunk/reactos/dll/directx/d3d9/d3d9_baseobject.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_base… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_baseobject.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_baseobject.c [iso-8859-1] Sat Aug 23 10:17:00 2008 @@ -1,3 +1,10 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS ReactX + * FILE: dll/directx/d3d9/d3d9_baseobject.c + * PURPOSE: Direct3D9's base object + * PROGRAMERS: Gregor Gullwi <gbrunmar (dot) ros (at) gmail (dot) com> + */ #include "d3d9_baseobject.h" #include "d3d9_device.h" Modified: trunk/reactos/dll/directx/d3d9/d3d9_baseobject.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_base… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_baseobject.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_baseobject.h [iso-8859-1] Sat Aug 23 10:17:00 2008 @@ -1,3 +1,10 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS ReactX + * FILE: dll/directx/d3d9/d3d9_baseobject.h + * PURPOSE: Direct3D9's base object + * PROGRAMERS: Gregor Gullwi <gbrunmar (dot) ros (at) gmail (dot) com> + */ #ifndef _D3D9_BASEOBJECT_H_ #define _D3D9_BASEOBJECT_H_ Modified: trunk/reactos/dll/directx/d3d9/d3d9_impl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_impl… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_impl.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_impl.c [iso-8859-1] Sat Aug 23 10:17:00 2008 @@ -889,6 +889,46 @@ return hAdapterMonitor; } +/*++ +* @name IDirect3D9::CreateDevice +* @implemented +* +* The function IDirect3D9Impl_CreateDevice creates an IDirect3DDevice9 object +* that represents the display adapter. +* +* @param LPDIRECT3D iface +* Pointer to the IDirect3D9 object returned from Direct3DCreate9() +* +* @param UINT Adapter +* Adapter index to get information about. D3DADAPTER_DEFAULT is the primary display. +* The maximum value for this is the value returned by IDirect3D::GetAdapterCount() - 1. +* +* @param D3DDEVTYPE DeviceType +* One of the D3DDEVTYPE enum members. +* +* @param HWND hFocusWindow +* A window handle that is used as a reference when Direct3D should switch between +* foreground mode and background mode. +* +* @param DWORD BehaviourFlags +* Any valid combination of the D3DCREATE constants. +* +* @param D3DPRESENT_PARAMETERS* pPresentationParameters +* Pointer to a D3DPRESENT_PARAMETERS structure describing the parameters for the device +* to be created. If D3DCREATE_ADAPTERGROUP_DEVICE is specified in the BehaviourFlags parameter, +* the pPresentationParameters is treated as an array. +* +* @param IDirect3DDevice9** ppReturnedDeviceInterface +* Return object that represents the created device. +* +* @return HRESULT +* If the method successfully creates a device and returns a valid ppReturnedDeviceInterface object, +* the return value is D3D_OK. +* If Adapter is out of range, DeviceType is invalid, hFocusWindow is not a valid, BehaviourFlags is invalid +* pPresentationParameters is invalid or ppReturnedDeviceInterface is a bad pointer, the return value +* will be D3DERR_INVALIDCALL. +* +*/ static HRESULT WINAPI IDirect3D9Impl_CreateDevice(LPDIRECT3D9 iface, UINT Adapter, D3DDEVTYPE DeviceType, HWND hFocusWindow, DWORD BehaviourFlags, D3DPRESENT_PARAMETERS* pPresentationParameters, Modified: trunk/reactos/dll/directx/d3d9/d3d9_swapchain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_swap… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_swapchain.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_swapchain.c [iso-8859-1] Sat Aug 23 10:17:00 2008 @@ -1,3 +1,10 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS ReactX + * FILE: dll/directx/d3d9/d3d9_swapchain.c + * PURPOSE: Direct3D9's swap chain object + * PROGRAMERS: Gregor Gullwi <gbrunmar (dot) ros (at) gmail (dot) com> + */ #include "d3d9_swapchain.h" #include <debug.h> Modified: trunk/reactos/dll/directx/d3d9/d3d9_swapchain.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_swap… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_swapchain.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_swapchain.h [iso-8859-1] Sat Aug 23 10:17:00 2008 @@ -1,3 +1,10 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS ReactX + * FILE: dll/directx/d3d9/d3d9_swapchain.h + * PURPOSE: Direct3D9's swap chain object + * PROGRAMERS: Gregor Gullwi <gbrunmar (dot) ros (at) gmail (dot) com> + */ #ifndef _D3D9_SWAPCHAIN_H_ #define _D3D9_SWAPCHAIN_H_

1 0

[gbrunmar] 35563: * Refactored D3D9 structures a bit * Started implementing IDirect3D9::CreateDevice()
by gbrunmar＠svn.reactos.org 23 Aug '08

23 Aug '08

Author: gbrunmar Date: Sat Aug 23 10:01:19 2008 New Revision: 35563 URL: http://svn.reactos.org/svn/reactos?rev=35563&view=rev Log: * Refactored D3D9 structures a bit * Started implementing IDirect3D9::CreateDevice() Added: trunk/reactos/dll/directx/d3d9/d3d9_baseobject.c (with props) trunk/reactos/dll/directx/d3d9/d3d9_baseobject.h (with props) trunk/reactos/dll/directx/d3d9/d3d9_surface.h (with props) trunk/reactos/dll/directx/d3d9/d3d9_swapchain.c (with props) trunk/reactos/dll/directx/d3d9/d3d9_swapchain.h (with props) trunk/reactos/dll/directx/d3d9/device.c (with props) trunk/reactos/dll/directx/d3d9/device.h (with props) Modified: trunk/reactos/dll/directx/d3d9/d3d9.rbuild trunk/reactos/dll/directx/d3d9/d3d9_device.h trunk/reactos/dll/directx/d3d9/d3d9_helpers.c trunk/reactos/dll/directx/d3d9/d3d9_impl.c trunk/reactos/dll/directx/d3d9/d3d9_private.h Modified: trunk/reactos/dll/directx/d3d9/d3d9.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9.rbui… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9.rbuild [iso-8859-1] Sat Aug 23 10:01:19 2008 @@ -15,10 +15,13 @@ <file>d3d9.c</file> <file>d3d9_helpers.c</file> <file>d3d9_impl.c</file> + <file>d3d9_baseobject.c</file> <file>d3d9_create.c</file> <file>d3d9_caps.c</file> <file>d3d9_device.c</file> + <file>d3d9_swapchain.c</file> <file>adapter.c</file> + <file>device.c</file> <file>format.c</file> <file>d3d9.rc</file> <file>d3d9.spec</file> Added: trunk/reactos/dll/directx/d3d9/d3d9_baseobject.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_base… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_baseobject.c (added) +++ trunk/reactos/dll/directx/d3d9/d3d9_baseobject.c [iso-8859-1] Sat Aug 23 10:01:19 2008 @@ -1,0 +1,36 @@ +#include "d3d9_baseobject.h" +#include "d3d9_device.h" + +#include <debug.h> + +VOID D3D9BaseObject_Destroy() +{ +} + +ID3D9BaseObjectVtbl D3D9BaseObject_Vtbl = +{ + /* D3D9BaseObject */ + D3D9BaseObject_Destroy +}; + +VOID InitD3D9BaseObject(D3D9BaseObject* pBaseObject, enum REF_TYPE RefType, struct _Direct3DDevice9_INT* pBaseDevice) +{ + // TODO: Add dtor to vtbl + pBaseObject->lpVtbl = &D3D9BaseObject_Vtbl; + pBaseObject->RefType = RefType; + pBaseObject->pBaseDevice = pBaseDevice; +} + +ULONG D3D9BaseObject_AddRef(D3D9BaseObject* pBaseObject) +{ + // TODO: Implement ref counting + UNIMPLEMENTED + return 1; +} + +ULONG D3D9BaseObject_Release(D3D9BaseObject* pBaseObject) +{ + // TODO: Implement ref counting + UNIMPLEMENTED + return 0; +} Propchange: trunk/reactos/dll/directx/d3d9/d3d9_baseobject.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/directx/d3d9/d3d9_baseobject.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_base… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_baseobject.h (added) +++ trunk/reactos/dll/directx/d3d9/d3d9_baseobject.h [iso-8859-1] Sat Aug 23 10:01:19 2008 @@ -1,0 +1,35 @@ +#ifndef _D3D9_BASEOBJECT_H_ +#define _D3D9_BASEOBJECT_H_ + +#include "d3d9_common.h" + +enum REF_TYPE +{ + RT_EXTERNAL, + RT_BUILTIN, + RT_INTERNAL, +}; + +typedef struct _D3D9BaseObjectVtbl +{ + VOID (*Destroy)(); +} ID3D9BaseObjectVtbl; + +typedef struct _D3D9BaseObject +{ +/* 0x0000 */ ID3D9BaseObjectVtbl* lpVtbl; +/* 0x0004 */ DWORD dwUnknown0004; +/* 0x0008 */ DWORD dwUnknown0008; +/* 0x000c */ struct _Direct3DDevice9_INT* pBaseDevice; +/* 0x0010 */ DWORD dwUnknown0010; // Index? Unique id? +/* 0x0014 */ HANDLE hKernelHandle; +/* 0x0018 */ LPDWORD dwUnknown0018; +/* 0x001c */ enum REF_TYPE RefType; +} D3D9BaseObject; + +VOID InitD3D9BaseObject(D3D9BaseObject* pBaseObject, enum REF_TYPE RefType, struct _Direct3DDevice9_INT* pBaseDevice); + +ULONG D3D9BaseObject_AddRef(D3D9BaseObject* pBaseObject); +ULONG D3D9BaseObject_Release(D3D9BaseObject* pBaseObject); + +#endif // _D3D9_BASEOBJECT_H_ Propchange: trunk/reactos/dll/directx/d3d9/d3d9_baseobject.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/directx/d3d9/d3d9_device.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_devi… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_device.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_device.h [iso-8859-1] Sat Aug 23 10:01:19 2008 @@ -11,83 +11,32 @@ #include "d3d9_common.h" #include <d3d9.h> #include "d3d9_private.h" +#include "d3d9_swapchain.h" +#include "d3d9_surface.h" extern struct IDirect3DDevice9Vtbl Direct3DDevice9_Vtbl; -enum REF_TYPE +typedef struct _D3D9HeapTexture { - RT_EXTERNAL, - RT_BUILTIN, - RT_INTERNAL, -}; - -typedef struct _tagD3D9BaseObject_ -{ -/* 0x0000 */ LPDWORD lpVtbl; -/* 0x0004 */ DWORD dwUnknown0004; -/* 0x0008 */ DWORD dwUnknown0008; -/* 0x000c */ struct _tagDirect3DDevice9_INT_* pBaseDevice; -/* 0x0010 */ DWORD dwUnknown0010; // Index? Unique id? -/* 0x0014 */ HANDLE hKernelHandle; -/* 0x0018 */ LPDWORD dwUnknown0018; -/* 0x001c */ enum REF_TYPE RefType; -} D3D9BaseObject; - -typedef struct _tagD3D9BaseSurface_ -{ -/* 0x0000 */ LPDWORD lpVtbl; -/* 0x0024 */ D3DFORMAT DisplayFormat2; // Back buffer format? -/* 0x0028 */ DWORD dwUnknown0028; // Constant/ref count? (1) -/* 0x002c */ DWORD dwUnknown002c; // Refresh rate? -/* 0x0030 */ D3DPOOL SurfacePool; -/* 0x0034 */ DWORD dwUnknown0034; -/* 0x0038 */ DWORD dwUnknown0038; -/* 0x003c */ DWORD dwWidth; -/* 0x0040 */ DWORD dwHeight; -/* 0x0044 */ D3DPOOL ResourcePool; -/* 0x0048 */ D3DFORMAT DisplayFormat; -/* 0x004c */ DWORD dwUnknown004c; -/* 0x0050 */ DWORD dwUnknown0050; -/* 0x0054 */ DWORD dwUnknown0054; -/* 0x0058 */ DWORD dwBpp; -} D3D9BaseSurface; - -typedef struct _tagD3D9Surface_ -{ -/* 0x0000 */ D3D9BaseObject BaseObject; -/* 0x0020 */ D3D9BaseSurface BaseSurface; -} D3D9Surface; - -typedef struct _tagD3D9DriverSurface_ -{ -/* 0x0000 */ D3D9Surface BaseD3D9Surface; -/* 0x005c */ DWORD dwUnknown5c; -/* 0x0060 */ DWORD dwUnknown60; -/* 0x0064 */ struct _tagD3D9DriverSurface_* pPreviousDriverSurface; -/* 0x0068 */ struct _tagD3D9DriverSurface_* pNextDriverSurface; -/* 0x006c */ DWORD dwUnknown6c[8]; -} D3D9DriverSurface; - -typedef struct _tagD3D9TextureHeap_ -{ -/* 0x0000 */ DWORD NumTextures; -/* 0x0004 */ LPDWORD pFirstTexture; -} D3D9TextureHeap; - -typedef struct _tagD3D9ResourceManager_ +/* 0x0000 */ DWORD dwUnknown00; +/* 0x0004 */ DWORD dwUnknown04; +/* 0x0008 */ LPDWORD pUnknown08; +} D3D9HeapTexture; + +typedef struct _D3D9ResourceManager { #ifdef D3D_DEBUG_INFO /* N/A - 0x0000 */ DDSURFACEDESC SurfaceDesc[8]; #endif -/* 0x0000 - 0x0160 */ struct _tagDirect3DDevice9_INT_* pBaseDevice; +/* 0x0000 - 0x0160 */ struct _Direct3DDevice9_INT* pBaseDevice; /* 0x0004 - 0x0164 */ DWORD dwUnknown0004; /* 0x0008 - 0x0168 */ DWORD dwUnknown0008; /* 0x000c - 0x016c */ DWORD MaxSimultaneousTextures; /* 0x0010 - 0x0170 */ DWORD dwUnknown0010; -/* 0x0014 - 0x0174 */ LPDWORD pFirstHeapTexture; +/* 0x0014 - 0x0174 */ D3D9HeapTexture* pTextureHeap; } D3D9ResourceManager; -typedef struct _tagDirect3D9Cursor_ +typedef struct _D3D9Cursor { /* 0x0000 */ DWORD dwUnknown0000; /* 0x0004 */ DWORD dwUnknown0004; @@ -98,71 +47,15 @@ /* 0x0018 */ DWORD dwWidth; /* 0x001c */ DWORD dwHeight; /* 0x0020 */ DWORD dwUnknown0020[18]; -/* 0x0070 */ struct _tagD3D9BaseDevice_* pBaseDevice; -/* 0x0074 */ struct _tagD3D9SwapChain_* pSwapChain; +/* 0x0070 */ struct _Direct3DDevice9_INT* pBaseDevice; +/* 0x0074 */ struct _Direct3DSwapChain9_INT* pSwapChain; /* 0x0078 */ DWORD dwUnknown0078; /* 0x007c */ DWORD dwMonitorVirtualX; /* 0x0080 */ DWORD dwMonitorVirtualY; /* 0x0084 */ DWORD dwUnknown0084; } D3D9Cursor; -typedef struct _tagDirect3DSwapChain9_INT_ -{ -/* 0x0000 */ D3D9BaseObject BaseObject; -/* 0x0020 */ struct IDirect3DSwapChain9Vtbl* lpVtbl; -/* 0x0024 */ DWORD dwUnknown0024; -/* 0x0028 */ D3D9Surface* pPrimarySurface; -/* 0x002c */ D3D9Surface* pExtendedPrimarySurface; -/* 0x0030 */ DWORD dwUnknown0030; -/* 0x0034 */ D3D9DriverSurface** ppBackBufferList; -/* 0x0038 */ DWORD dwNumBackBuffers; -/* 0x003c */ DWORD ChainIndex; -/* 0x0040 */ DWORD AdapterGroupIndex; -/* 0x0044 */ D3DPRESENT_PARAMETERS PresentParameters; -/* 0x007c */ DWORD dwUnknown007c; -/* 0x0080 */ DWORD dwUnknown0080[2]; /* Extended format? */ -/* 0x0088 */ D3D9Cursor* pCursor; -/* 0x008c */ DWORD dwUnknown008c[4]; -/* 0x009c */ D3D9_Unknown6BC* pUnknown6BC; -/* 0x00a0 */ LPDWORD dwUnknown00a0; -/* 0x00a4 */ DWORD dwUnknown00a4; -/* 0x00a8 */ DWORD dwUnknown00a8; -/* 0x00ac */ DWORD dwWidth; -/* 0x00b0 */ DWORD dwHeight; -/* 0x00b4 */ DWORD dwUnknown00b4; -/* 0x00b8 */ DWORD dwUnknown00b8; -/* 0x00bc */ DWORD dwUnknown00bc; -/* 0x00c0 */ DWORD dwWidth2; -/* 0x00c4 */ DWORD dwHeight2; -/* 0x00c8 */ DWORD dwUnknown00c8; -/* 0x00cc */ DWORD dwUnknown00cc; -/* 0x00d0 */ DWORD dwUnknown00d0; -/* 0x00d4 */ DWORD dwUnknown00d4; -/* 0x00d8 */ DWORD dwUnknown00d8; -/* 0x00dc */ DWORD dwUnknown00dc; -/* 0x00e0 */ DWORD dwDevModeScale; -/* 0x00e4 */ DWORD dwUnknown00e4; -/* 0x00e8 */ DWORD dwUnknown00e8; -/* 0x00ec */ DWORD dwUnknown00ec; -/* 0x00f0 */ DWORD dwUnknown00f0[27]; - -/* 0x015c */ LPDWORD pUnknown015c; -/* 0x0160 */ DWORD dwUnknown0160[4]; -/* 0x0170 */ HRESULT hResult; - -/* 0x0174 */ DWORD dwUnknown0174[26]; - -/* 0x01DC */ DWORD dwUnknownFlags; /* 1 = Show frame rate, 2 = Flip without vsync */ -/* 0x01E0 */ BOOL bForceRefreshRate; -/* 0x01E4 */ DWORD dwUnknown01dc[4]; - -/* 0x01f4 */ D3DSWAPEFFECT SwapEffect; -/* 0x01f8 */ DWORD dwUnknown01f8; -/* 0x01fc */ DWORD dwUnknown01fc; -/* 0x0200 */ DDGAMMARAMP GammaRamp; -} Direct3DSwapChain9_INT, FAR* LPDIRECT3DSWAPCHAIN9_INT; - -typedef struct _tagDirect3DDevice9_INT_ +typedef struct _Direct3DDevice9_INT { /* 0x0000 */ struct IDirect3DDevice9Vtbl* lpVtbl; /* 0x0004 */ CRITICAL_SECTION CriticalSection; @@ -184,7 +77,7 @@ #endif /* 0x001c - 0x0054 */ BOOL bLockDevice; /* 0x0020 - 0x0058 */ DWORD dwProcessId; -/* 0x0024 - 0x005c */ struct _tagD3D9PUREDEVICE_* lpThis; +/* 0x0024 - 0x005c */ struct _D3D9PUREDEVICE* lpThis; /* 0x0028 - 0x0060 */ DWORD dwDXVersion; /* 0x002c - 0x0064 */ DWORD unknown000011; /* 0x0030 - 0x0068 */ LONG lRefCnt; @@ -195,51 +88,7 @@ /* 0x0044 - 0x007c */ DWORD BehaviourFlags; /* 0x0048 - 0x0080 */ D3D9BaseSurface* pUnknown0010; /* 0x004c - 0x0084 */ DWORD NumAdaptersInDevice; -/* 0x0050 - 0x0088 */ D3DDISPLAYMODE CurrentDisplayMode; -/* 0x0060 - 0x0098 */ DWORD unknown000024; -/* 0x0064 - 0x009c */ DWORD unknown000025; -/* 0x0068 - 0x00a0 */ DWORD unknown000026; -/* 0x006c - 0x00a4 */ DWORD unknown000027; -/* 0x0070 - 0x00a8 */ DWORD unknown000028; -/* 0x0074 - 0x00ac */ DWORD unknown000029; -/* 0x0078 - 0x00b0 */ DWORD unknown000030; -/* 0x007c - 0x00b4 */ DWORD unknown000031; -/* 0x0080 - 0x00b8 */ DWORD unknown000032; -/* 0x0084 - 0x00bc */ DWORD unknown000033; -/* 0x0088 - 0x00c0 */ DWORD unknown000034; -/* 0x008c - 0x00c4 */ DWORD unknown000035; -/* 0x0090 - 0x00c8 */ DWORD unknown000036; -/* 0x0094 - 0x00cc */ DWORD unknown000037; -/* 0x0098 - 0x00d0 */ DWORD unknown000038; -/* 0x009c - 0x00d4 */ DWORD unknown000039; -/* 0x00a0 - 0x00d8 */ DWORD unknown000040; -/* 0x00a4 - 0x00dc */ DWORD unknown000041; -/* 0x00a8 - 0x00e0 */ DWORD unknown000042; -/* 0x00ac - 0x00e4 */ DWORD unknown000043; -/* 0x00b0 - 0x00e8 */ DWORD unknown000044; -/* 0x00b4 - 0x00ec */ DWORD unknown000045; -/* 0x00b8 - 0x00f0 */ DWORD unknown000046; -/* 0x00bc - 0x00f4 */ DWORD unknown000047; -/* 0x00c0 - 0x00f8 */ DWORD unknown000048; -/* 0x00c4 - 0x00fc */ DWORD unknown000049; -/* 0x00c8 - 0x0100 */ DWORD unknown000050; -/* 0x00cc - 0x0104 */ DWORD unknown000051; -/* 0x00d0 - 0x0108 */ DWORD unknown000052; -/* 0x00d4 - 0x010c */ DWORD unknown000053; -/* 0x00d8 - 0x0110 */ DWORD unknown000054; -/* 0x00dc - 0x0114 */ DWORD unknown000055; -/* 0x00e0 - 0x0118 */ DWORD unknown000056; -/* 0x00e4 - 0x011c */ DWORD unknown000057; -/* 0x00e8 - 0x0120 */ DWORD unknown000058; -/* 0x00ec - 0x0124 */ DWORD unknown000059; -/* 0x00f0 - 0x0128 */ DWORD unknown000060; -/* 0x00f4 - 0x012c */ DWORD unknown000061; -/* 0x00f8 - 0x0130 */ DWORD unknown000062; -/* 0x00fc - 0x0134 */ DWORD unknown000063; -/* 0x0100 - 0x0138 */ DWORD unknown000064; -/* 0x0104 - 0x013c */ DWORD unknown000065; -/* 0x0108 - 0x0140 */ DWORD unknown000066; -/* 0x010c - 0x0144 */ DWORD unknown000067; +/* 0x0050 - 0x0088 */ D3DDISPLAYMODE CurrentDisplayMode[D3D9_INT_MAX_NUM_ADAPTERS]; /* 0x0110 - 0x0148 */ DWORD AdapterIndexInGroup[D3D9_INT_MAX_NUM_ADAPTERS]; /* 0x0140 - 0x0178 */ D3D9_DEVICEDATA DeviceData[D3D9_INT_MAX_NUM_ADAPTERS]; /* 0x1df0 - 0x1e28 */ LPDIRECT3DSWAPCHAIN9_INT pSwapChains[D3D9_INT_MAX_NUM_ADAPTERS]; @@ -308,7 +157,7 @@ /* 0x1f44 */ DWORD unknown002001; } DIRECT3DDEVICE9_INT, FAR* LPDIRECT3DDEVICE9_INT; -typedef struct _tagD3D9PUREDEVICE_ +typedef struct _D3D9PUREDEVICE { /* 0x0000 - 0x0000 */ DIRECT3DDEVICE9_INT BaseDevice; /* 0x1f48 */ DWORD unknown002002; @@ -392,7 +241,7 @@ /* 0x2080 */ DWORD unknown002080; /* 0x2084 */ DWORD unknown002081; /* 0x2088 */ DWORD unknown002082; -/* 0x208c */ DWORD unknown002083; +/* 0x208c */ DWORD unknown002083; /* 0x2090 */ DWORD unknown002084; /* 0x2094 */ DWORD unknown002085; /* 0x2098 */ DWORD unknown002086; @@ -409,7 +258,7 @@ /* 0x20c4 */ DWORD unknown002097; /* 0x20c8 */ DWORD unknown002098; /* 0x20cc */ DWORD unknown002099; -/* 0x20d0 */ DWORD unknown002100; +/* 0x20d0 */ DWORD unknown002100; /* 0x20d4 */ DWORD unknown002101; /* 0x20d8 */ DWORD unknown002102; /* 0x20dc */ DWORD unknown002103; @@ -629,7 +478,7 @@ /* 0x2434 */ DWORD unknown002317; } D3D9PUREDEVICE, FAR *LPD3D9PUREDEVICE; -typedef struct _tagD3D9HALDEVICE_ +typedef struct _D3D9HALDEVICE { /* 0x0000 */ D3D9PUREDEVICE PureDevice; #ifdef D3D_DEBUG_INFO Modified: trunk/reactos/dll/directx/d3d9/d3d9_helpers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_help… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_helpers.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_helpers.c [iso-8859-1] Sat Aug 23 10:01:19 2008 @@ -81,7 +81,7 @@ HRESULT SafeAppendString(IN OUT LPSTR Dst, IN DWORD DstSize, IN LPCSTR Src) { - DWORD CurrentDstLength; + size_t CurrentDstLength; if (Dst == NULL || DstSize == 0) return DDERR_INVALIDPARAMS; Modified: trunk/reactos/dll/directx/d3d9/d3d9_impl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_impl… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_impl.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_impl.c [iso-8859-1] Sat Aug 23 10:01:19 2008 @@ -11,6 +11,7 @@ #include <debug.h> #include "d3d9_helpers.h" #include "adapter.h" +#include "device.h" #include "format.h" #define LOCK_D3D9() EnterCriticalSection(&This->d3d9_cs); @@ -894,6 +895,7 @@ struct IDirect3DDevice9** ppReturnedDeviceInterface) { DWORD NumAdaptersToCreate; + HRESULT Ret; LPDIRECT3D9_INT This = impl_from_IDirect3D9(iface); LOCK_D3D9(); @@ -977,9 +979,10 @@ *ppReturnedDeviceInterface = 0; - UNIMPLEMENTED - - return D3D_OK; + Ret = CreateD3D9HalDevice(This, Adapter, hFocusWindow, BehaviourFlags, pPresentationParameters, NumAdaptersToCreate, ppReturnedDeviceInterface); + + UNLOCK_D3D9(); + return Ret; } IDirect3D9Vtbl Direct3D9_Vtbl = Modified: trunk/reactos/dll/directx/d3d9/d3d9_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_priv… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_private.h [iso-8859-1] Sat Aug 23 10:01:19 2008 @@ -8,7 +8,7 @@ #ifndef _D3D9_PRIVATE_H_ #define _D3D9_PRIVATE_H_ -#include <windows.h> +#include "d3d9_common.h" #include <ddraw.h> #define D3D9_INT_MAX_NUM_ADAPTERS 12 @@ -25,14 +25,14 @@ typedef struct _D3D9_GETAVAILDRIVERMEMORYDATA { -/* 0x0000 */ struct _D3D9Unknown6BC_* pUnknown6BC; +/* 0x0000 */ struct _D3D9_Unknown6BC* pUnknown6BC; /* 0x0004 */ D3D9_GETAVAILDRIVERMEMORY_TYPE dwMemoryType; /* 0x0008 */ DWORD dwTextureType; /* 0x000c */ DWORD dwFree; } D3D9_GETAVAILDRIVERMEMORYDATA, FAR* LPD3D9_GETAVAILDRIVERMEMORYDATA; typedef BOOL (WINAPI FAR* LPD3D9_GETAVAILDRIVERMEMORY)(LPD3D9_GETAVAILDRIVERMEMORYDATA); -typedef struct _D3D9Unknown6BC_ +typedef struct _D3D9_Unknown6BC { /* 0x0000 */ HANDLE hDirectDrawLocal; /* 0x0004 */ LPDWORD pUnknown0004; @@ -78,7 +78,7 @@ /* 0x00BC */ DDGAMMARAMP GammaRamp; } D3D9_Unknown6BC; -typedef struct _tagD3D9_DRIVERCAPS +typedef struct _D3D9_DRIVERCAPS { /* 0x0000 */ D3DCAPS9 DriverCaps9; /* 0x0130 */ DWORD dwDisplayWidth; @@ -147,20 +147,20 @@ /* 0x00a4 */ D3DDEVTYPE DeviceType; } D3D9_CALLBACKS; -typedef struct _tagD3D9_DEVICEDATA_ +typedef struct _D3D9_DEVICEDATA { /* 0x0000 */ D3D9_DRIVERCAPS DriverCaps; /* 0x0178 */ D3D9_CALLBACKS D3D9Callbacks; /* 0x0220 */ CHAR szDeviceName[CCHDEVICENAME]; /* 0x0240 */ HDC hDC; /* 0x0244 */ GUID DisplayGuid; -/* 0x0254 */ D3D9_Unknown6BC* pUnknown6BC; +/* 0x0254 */ struct _D3D9_Unknown6BC* pUnknown6BC; /* 0x0258 */ D3DDEVTYPE DeviceType; /* 0x025c */ HMODULE hD3DRefDll; /* 0x0260 */ DWORD unknown0152; } D3D9_DEVICEDATA, FAR *LPD3D9_DEVICEDATA; -typedef struct _tagDIRECT3D9DisplayAdapterInfo_ +typedef struct _Direct3D9DisplayAdapterInfo { /* 0x0000 */ GUID DisplayGuid; /* 0x0010 */ CHAR szDeviceName[MAX_PATH]; @@ -179,13 +179,13 @@ /* 0x02b8 */ DWORD unknown000105; } Direct3D9DisplayAdapterInfo, FAR* LPDIRECT3D9_DISPLAYADAPTER; -typedef struct _tagDIRECT3D9_INT_ +typedef struct _DIRECT3D9_INT { /* 0x0000 */ struct IDirect3D9Vtbl *lpVtbl; /* LPDIRECTD3D9 function table */ /* 0x0004 */ CRITICAL_SECTION d3d9_cs; /* 0x001c */ DWORD unknown000007; /* 0x00000001 */ /* 0x0020 */ DWORD dwProcessId; -/* 0x0024 */ struct _tagDIRECT3D9_INT_ *lpInt; +/* 0x0024 */ struct _DIRECT3D9_INT *lpInt; /* 0x0028 */ LONG lRefCnt; /* Increases and decreases by AddRef() and Release() */ /* 0x002c */ UINT NumDisplayAdapters; /* 0x0030 */ Direct3D9DisplayAdapterInfo DisplayAdapters[D3D9_INT_MAX_NUM_ADAPTERS]; Added: trunk/reactos/dll/directx/d3d9/d3d9_surface.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_surf… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_surface.h (added) +++ trunk/reactos/dll/directx/d3d9/d3d9_surface.h [iso-8859-1] Sat Aug 23 10:01:19 2008 @@ -1,0 +1,41 @@ +#ifndef _D3D9_SURFACE_H_ +#define _D3D9_SURFACE_H_ + +#include "d3d9_baseobject.h" + +typedef struct _D3D9BaseSurface +{ +/* 0x0000 */ LPDWORD lpVtbl; +/* 0x0024 */ D3DFORMAT DisplayFormat2; // Back buffer format? +/* 0x0028 */ DWORD dwUnknown0028; // Constant/ref count? (1) +/* 0x002c */ DWORD dwUnknown002c; // Refresh rate? +/* 0x0030 */ D3DPOOL SurfacePool; +/* 0x0034 */ DWORD dwUnknown0034; +/* 0x0038 */ DWORD dwUnknown0038; +/* 0x003c */ DWORD dwWidth; +/* 0x0040 */ DWORD dwHeight; +/* 0x0044 */ D3DPOOL ResourcePool; +/* 0x0048 */ D3DFORMAT DisplayFormat; +/* 0x004c */ DWORD dwUnknown004c; +/* 0x0050 */ DWORD dwUnknown0050; +/* 0x0054 */ DWORD dwUnknown0054; +/* 0x0058 */ DWORD dwBpp; +} D3D9BaseSurface; + +typedef struct _D3D9Surface +{ +/* 0x0000 */ D3D9BaseObject BaseObject; +/* 0x0020 */ D3D9BaseSurface BaseSurface; +} D3D9Surface; + +typedef struct _D3D9DriverSurface +{ +/* 0x0000 */ D3D9Surface BaseD3D9Surface; +/* 0x005c */ DWORD dwUnknown5c; +/* 0x0060 */ DWORD dwUnknown60; +/* 0x0064 */ struct _D3D9DriverSurface* pPreviousDriverSurface; +/* 0x0068 */ struct _D3D9DriverSurface* pNextDriverSurface; +/* 0x006c */ DWORD dwUnknown6c[8]; +} D3D9DriverSurface; + +#endif // _D3D9_SURFACE_H_ Propchange: trunk/reactos/dll/directx/d3d9/d3d9_surface.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/directx/d3d9/d3d9_swapchain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_swap… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_swapchain.c (added) +++ trunk/reactos/dll/directx/d3d9/d3d9_swapchain.c [iso-8859-1] Sat Aug 23 10:01:19 2008 @@ -1,0 +1,153 @@ +#include "d3d9_swapchain.h" + +#include <debug.h> +#include <ddraw.h> + +#include "d3d9_helpers.h" +#include "d3d9_device.h" + +/* Convert a IDirect3DSwapChain9 pointer safely to the internal implementation struct */ +static LPDIRECT3DSWAPCHAIN9_INT IDirect3DSwapChain9ToImpl(LPDIRECT3DSWAPCHAIN9 iface) +{ + if (IsBadWritePtr(iface, sizeof(LPDIRECT3DSWAPCHAIN9_INT))) + return NULL; + + return (LPDIRECT3DSWAPCHAIN9_INT)((ULONG_PTR)iface - FIELD_OFFSET(Direct3DSwapChain9_INT, lpVtbl)); +} + +/* IDirect3DSwapChain9: IUnknown implementation */ +static HRESULT WINAPI Direct3DSwapChain9_QueryInterface(LPDIRECT3DSWAPCHAIN9 iface, REFIID riid, void** ppvObject) +{ + LPDIRECT3DSWAPCHAIN9_INT This = IDirect3DSwapChain9ToImpl(iface); + + if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirect3DSwapChain9)) + { + IUnknown_AddRef(iface); + *ppvObject = &This->lpVtbl; + return S_OK; + } + + *ppvObject = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI Direct3DSwapChain9_AddRef(LPDIRECT3DSWAPCHAIN9 iface) +{ + LPDIRECT3DSWAPCHAIN9_INT This = IDirect3DSwapChain9ToImpl(iface); + D3D9BaseObject* BaseObject = (D3D9BaseObject*)((ULONG_PTR)This - FIELD_OFFSET(Direct3DSwapChain9_INT, lpVtbl) - FIELD_OFFSET(Direct3DSwapChain9_INT, BaseObject)); + return D3D9BaseObject_AddRef(BaseObject); +} + +static ULONG WINAPI Direct3DSwapChain9_Release(LPDIRECT3DSWAPCHAIN9 iface) +{ + LPDIRECT3DSWAPCHAIN9_INT This = IDirect3DSwapChain9ToImpl(iface); + D3D9BaseObject* BaseObject = (D3D9BaseObject*)((ULONG_PTR)This - FIELD_OFFSET(Direct3DSwapChain9_INT, lpVtbl) - FIELD_OFFSET(Direct3DSwapChain9_INT, BaseObject)); + return D3D9BaseObject_Release(BaseObject); +} + +/* IDirect3DSwapChain9 interface */ +static HRESULT WINAPI Direct3DSwapChain9_Present(LPDIRECT3DSWAPCHAIN9 iface, CONST RECT* pSourceRect,CONST RECT* pDestRect,HWND hDestWindowOverride,CONST RGNDATA* pDirtyRegion,DWORD dwFlags) +{ + UNIMPLEMENTED + return D3D_OK; +} + +static HRESULT WINAPI Direct3DSwapChain9_GetFrontBufferData(LPDIRECT3DSWAPCHAIN9 iface, IDirect3DSurface9* pDestSurface) +{ + UNIMPLEMENTED + return D3D_OK; +} + +static HRESULT WINAPI Direct3DSwapChain9_GetBackBuffer(LPDIRECT3DSWAPCHAIN9 iface, UINT iBackBuffer,D3DBACKBUFFER_TYPE Type,IDirect3DSurface9** ppBackBuffer) +{ + UNIMPLEMENTED + return D3D_OK; +} + +static HRESULT WINAPI Direct3DSwapChain9_GetRasterStatus(LPDIRECT3DSWAPCHAIN9 iface, D3DRASTER_STATUS* pRasterStatus) +{ + UNIMPLEMENTED + return D3D_OK; +} + +static HRESULT WINAPI Direct3DSwapChain9_GetDisplayMode(LPDIRECT3DSWAPCHAIN9 iface, D3DDISPLAYMODE* pMode) +{ + UNIMPLEMENTED + return D3D_OK; +} + +static HRESULT WINAPI Direct3DSwapChain9_GetDevice(LPDIRECT3DSWAPCHAIN9 iface, IDirect3DDevice9** ppDevice) +{ + UNIMPLEMENTED + return D3D_OK; +} + +static HRESULT WINAPI Direct3DSwapChain9_GetPresentParameters(LPDIRECT3DSWAPCHAIN9 iface, D3DPRESENT_PARAMETERS* pPresentationParameters) +{ + UNIMPLEMENTED + return D3D_OK; +} + +static IDirect3DSwapChain9Vtbl Direct3DSwapChain9_Vtbl = +{ + /* IUnknown */ + Direct3DSwapChain9_QueryInterface, + Direct3DSwapChain9_AddRef, + Direct3DSwapChain9_Release, + + /* IDirect3DSwapChain9 */ + Direct3DSwapChain9_Present, + Direct3DSwapChain9_GetFrontBufferData, + Direct3DSwapChain9_GetBackBuffer, + Direct3DSwapChain9_GetRasterStatus, + Direct3DSwapChain9_GetDisplayMode, + Direct3DSwapChain9_GetDevice, + Direct3DSwapChain9_GetPresentParameters, +}; + +Direct3DSwapChain9_INT* CreateDirect3DSwapChain9(enum REF_TYPE RefType, struct _Direct3DDevice9_INT* pBaseDevice, DWORD ChainIndex) +{ + Direct3DSwapChain9_INT* pThisSwapChain; + if (FAILED(AlignedAlloc((LPVOID *)&pThisSwapChain, sizeof(Direct3DSwapChain9_INT)))) + { + DPRINT1("Could not create Direct3DSwapChain9_INT"); + return NULL; + } + + InitD3D9BaseObject(&pThisSwapChain->BaseObject, RefType, pBaseDevice); + + pThisSwapChain->lpVtbl = &Direct3DSwapChain9_Vtbl; + + pThisSwapChain->ChainIndex = ChainIndex; + pThisSwapChain->AdapterGroupIndex = ChainIndex; + pThisSwapChain->pUnknown6BC = pBaseDevice->DeviceData[ChainIndex].pUnknown6BC; + pThisSwapChain->pUnknown015c = (LPVOID)0xD3D9D3D9; + + return pThisSwapChain; +} + +VOID Direct3DSwapChain9_SetDisplayMode(Direct3DSwapChain9_INT* pThisSwapChain, D3DDISPLAYMODE* pMode) +{ + pThisSwapChain->dwWidth = pMode->Width; + pThisSwapChain->dwHeight = pMode->Height; +} + +HRESULT Direct3DSwapChain9_Init(Direct3DSwapChain9_INT* pThisSwapChain, D3DPRESENT_PARAMETERS* pPresentationParameters) +{ + int i; + + for (i = 0; i < 256; i++) + { + pThisSwapChain->GammaRamp.red[i] = + pThisSwapChain->GammaRamp.green[i] = + pThisSwapChain->GammaRamp.blue[i] = i; + } + + return Direct3DSwapChain9_Reset(pThisSwapChain, pPresentationParameters); +} + +HRESULT Direct3DSwapChain9_Reset(Direct3DSwapChain9_INT* pThisSwapChain, D3DPRESENT_PARAMETERS* pPresentationParameters) +{ + // TODO: Do all the dirty work... + return D3D_OK; +} Propchange: trunk/reactos/dll/directx/d3d9/d3d9_swapchain.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/directx/d3d9/d3d9_swapchain.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_swap… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_swapchain.h (added) +++ trunk/reactos/dll/directx/d3d9/d3d9_swapchain.h [iso-8859-1] Sat Aug 23 10:01:19 2008 @@ -1,0 +1,72 @@ +#ifndef _D3D9_SWAPCHAIN_H_ +#define _D3D9_SWAPCHAIN_H_ + +#include "d3d9_common.h" +#include <d3d9.h> +#include <ddraw.h> +#include "d3d9_baseobject.h" + +typedef struct _Direct3DSwapChain9_INT +{ +/* 0x0000 */ D3D9BaseObject BaseObject; +/* 0x0020 */ struct IDirect3DSwapChain9Vtbl* lpVtbl; +/* 0x0024 */ DWORD dwUnknown0024; +/* 0x0028 */ struct _D3D9Surface* pPrimarySurface; +/* 0x002c */ struct _D3D9Surface* pExtendedPrimarySurface; +/* 0x0030 */ DWORD dwUnknown0030; +/* 0x0034 */ struct _D3D9DriverSurface** ppBackBufferList; +/* 0x0038 */ DWORD dwNumBackBuffers; +/* 0x003c */ DWORD ChainIndex; +/* 0x0040 */ DWORD AdapterGroupIndex; +/* 0x0044 */ D3DPRESENT_PARAMETERS PresentParameters; +/* 0x007c */ DWORD dwUnknown007c; +/* 0x0080 */ DWORD dwUnknown0080[2]; /* Extended format? */ +/* 0x0088 */ struct _D3D9Cursor* pCursor; +/* 0x008c */ DWORD dwUnknown008c[4]; +/* 0x009c */ struct _D3D9_Unknown6BC* pUnknown6BC; +/* 0x00a0 */ LPDWORD dwUnknown00a0; +/* 0x00a4 */ DWORD dwUnknown00a4; +/* 0x00a8 */ DWORD dwUnknown00a8; +/* 0x00ac */ DWORD dwWidth; +/* 0x00b0 */ DWORD dwHeight; +/* 0x00b4 */ DWORD dwUnknown00b4; +/* 0x00b8 */ DWORD dwUnknown00b8; +/* 0x00bc */ DWORD dwUnknown00bc; +/* 0x00c0 */ DWORD dwWidth2; +/* 0x00c4 */ DWORD dwHeight2; +/* 0x00c8 */ DWORD dwUnknown00c8; +/* 0x00cc */ DWORD dwUnknown00cc; +/* 0x00d0 */ DWORD dwUnknown00d0; +/* 0x00d4 */ DWORD dwUnknown00d4; +/* 0x00d8 */ DWORD dwUnknown00d8; +/* 0x00dc */ DWORD dwUnknown00dc; +/* 0x00e0 */ DWORD dwDevModeScale; +/* 0x00e4 */ DWORD dwUnknown00e4; +/* 0x00e8 */ DWORD dwUnknown00e8; +/* 0x00ec */ DWORD dwUnknown00ec; +/* 0x00f0 */ DWORD dwUnknown00f0[27]; + +/* 0x015c */ LPVOID pUnknown015c; +/* 0x0160 */ DWORD dwUnknown0160[4]; +/* 0x0170 */ HRESULT hResult; + +/* 0x0174 */ DWORD dwUnknown0174[26]; + +/* 0x01DC */ DWORD dwUnknownFlags; /* 1 = Show frame rate, 2 = Flip without vsync */ +/* 0x01E0 */ BOOL bForceRefreshRate; +/* 0x01E4 */ DWORD dwUnknown01dc[4]; + +/* 0x01f4 */ D3DSWAPEFFECT SwapEffect; +/* 0x01f8 */ DWORD dwUnknown01f8; +/* 0x01fc */ DWORD dwUnknown01fc; +/* 0x0200 */ DDGAMMARAMP GammaRamp; +} Direct3DSwapChain9_INT, FAR* LPDIRECT3DSWAPCHAIN9_INT; + + +Direct3DSwapChain9_INT* CreateDirect3DSwapChain9(enum REF_TYPE RefType, struct _Direct3DDevice9_INT* pBaseDevice, DWORD ChainIndex); + +VOID Direct3DSwapChain9_SetDisplayMode(Direct3DSwapChain9_INT* pThisSwapChain, D3DDISPLAYMODE* pMode); +HRESULT Direct3DSwapChain9_Init(Direct3DSwapChain9_INT* pThisSwapChain, D3DPRESENT_PARAMETERS* pPresentationParameters); +HRESULT Direct3DSwapChain9_Reset(Direct3DSwapChain9_INT* pThisSwapChain, D3DPRESENT_PARAMETERS* pPresentationParameters); + +#endif // _D3D9_SWAPCHAIN_H_ Propchange: trunk/reactos/dll/directx/d3d9/d3d9_swapchain.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/directx/d3d9/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/device.c?… ============================================================================== --- trunk/reactos/dll/directx/d3d9/device.c (added) +++ trunk/reactos/dll/directx/d3d9/device.c [iso-8859-1] Sat Aug 23 10:01:19 2008 @@ -1,0 +1,108 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS ReactX + * FILE: dll/directx/d3d9/device.c + * PURPOSE: Direct3D9's device creation + * PROGRAMERS: Gregor Gullwi <gbrunmar (dot) ros (at) gmail (dot) com> + */ + +#include "device.h" +#include <debug.h> +#include "d3d9_helpers.h" + +static HRESULT InitD3D9ResourceManager(D3D9ResourceManager* pThisResourceManager, LPDIRECT3DDEVICE9_INT pDirect3DDevice9) +{ + DWORD MaxSimultaneousTextures; + + MaxSimultaneousTextures = max(1, pDirect3DDevice9->DeviceData[0].DriverCaps.DriverCaps9.MaxSimultaneousTextures); + + if (FAILED(AlignedAlloc((LPVOID *)&pThisResourceManager->pTextureHeap, sizeof(DWORD) + MaxSimultaneousTextures * sizeof(int) * 3))) + { + DPRINT1("Could not allocate texture heap"); + return DDERR_OUTOFMEMORY; + } + + // TODO: Init texture heap + + pThisResourceManager->MaxSimultaneousTextures = MaxSimultaneousTextures; + pThisResourceManager->pBaseDevice = pDirect3DDevice9; + + return D3D_OK; +} + +HRESULT InitD3D9BaseDevice(LPDIRECT3DDEVICE9_INT pThisBaseDevice, LPDIRECT3D9_INT pDirect3D9, + UINT Adapter, D3DDEVTYPE DeviceType, HWND hFocusWindow, DWORD BehaviourFlags, + D3DPRESENT_PARAMETERS* pPresentationParameters, DWORD NumAdaptersToCreate) +{ + D3D9ResourceManager* pResourceManager; + DWORD i; + D3DDISPLAYMODE DisplayMode; + + // Insert Reset/Ctor here + + if (FAILED(AlignedAlloc((LPVOID *)&pResourceManager, sizeof(D3D9ResourceManager))) || + FAILED(InitD3D9ResourceManager(pResourceManager, pThisBaseDevice))) + { + DPRINT1("Could not create resource manager"); + return DDERR_OUTOFMEMORY; + } + + pThisBaseDevice->pResourceManager = pResourceManager; + + pThisBaseDevice->pDirect3D9 = pDirect3D9; + pThisBaseDevice->DeviceType = DeviceType; + pThisBaseDevice->hWnd = hFocusWindow; + pThisBaseDevice->AdjustedBehaviourFlags = BehaviourFlags; + pThisBaseDevice->BehaviourFlags = BehaviourFlags; + pThisBaseDevice->NumAdaptersInDevice = NumAdaptersToCreate; + + // TODO: Query driver for correct DX version + pThisBaseDevice->dwDXVersion = 9; + + DisplayMode = pThisBaseDevice->CurrentDisplayMode[0]; + for (i = 0; i < NumAdaptersToCreate; i++) + { + pThisBaseDevice->CurrentDisplayMode[i] = pThisBaseDevice->CurrentDisplayMode[0]; + pThisBaseDevice->AdapterIndexInGroup[i] = i; + // TODO: Fill pThisBaseDevice->DeviceData[i] + + pThisBaseDevice->pSwapChains[i] = CreateDirect3DSwapChain9(RT_BUILTIN, pThisBaseDevice, i); + pThisBaseDevice->pSwapChains2[i] = pThisBaseDevice->pSwapChains[i]; + Direct3DSwapChain9_SetDisplayMode(pThisBaseDevice->pSwapChains[i], &DisplayMode); + + if (FAILED(Direct3DSwapChain9_Init(pThisBaseDevice->pSwapChains[i], pPresentationParameters))) + { + DPRINT1("Failed to init swap chain: %d", i); + return DDERR_GENERIC; + } + } + + return D3D_OK; +} + +HRESULT CreateD3D9HalDevice(LPDIRECT3D9_INT pDirect3D9, UINT Adapter, + HWND hFocusWindow, DWORD BehaviourFlags, + D3DPRESENT_PARAMETERS* pPresentationParameters, + DWORD NumAdaptersToCreate, + struct IDirect3DDevice9** ppReturnedDeviceInterface) +{ + HRESULT Ret; + + if (FAILED(AlignedAlloc((LPVOID *)ppReturnedDeviceInterface, sizeof(D3D9HALDEVICE)))) + { + DPRINT1("Not enough memory to create HAL device"); + return DDERR_OUTOFMEMORY; + } + + Ret = InitD3D9BaseDevice((LPDIRECT3DDEVICE9_INT)*ppReturnedDeviceInterface, pDirect3D9, Adapter, + D3DDEVTYPE_HAL, hFocusWindow, BehaviourFlags, + pPresentationParameters, NumAdaptersToCreate); + + if (FAILED(Ret)) + { + AlignedFree((LPVOID)*ppReturnedDeviceInterface); + return Ret; + } + + return D3D_OK; +} Propchange: trunk/reactos/dll/directx/d3d9/device.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/directx/d3d9/device.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/device.h?… ============================================================================== --- trunk/reactos/dll/directx/d3d9/device.h (added) +++ trunk/reactos/dll/directx/d3d9/device.h [iso-8859-1] Sat Aug 23 10:01:19 2008 @@ -1,0 +1,20 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS ReactX + * FILE: dll/directx/d3d9/device.h + * PURPOSE: Direct3D9's device creation + * PROGRAMERS: Gregor Gullwi <gbrunmar (dot) ros (at) gmail (dot) com> + */ + +#ifndef _DEVICE_H_ +#define _DEVICE_H_ + +#include "d3d9_device.h" + +HRESULT CreateD3D9HalDevice(LPDIRECT3D9_INT pDirect3D9, UINT Adapter, + HWND hFocusWindow, DWORD BehaviourFlags, + D3DPRESENT_PARAMETERS* pPresentationParameters, + DWORD NumAdaptersToCreate, + struct IDirect3DDevice9** ppReturnedDeviceInterface); + +#endif // _DEVICE_H_ Propchange: trunk/reactos/dll/directx/d3d9/device.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[hpoussin] 35562: Fix typo
by hpoussin＠svn.reactos.org 23 Aug '08

23 Aug '08

Author: hpoussin Date: Sat Aug 23 09:43:30 2008 New Revision: 35562 URL: http://svn.reactos.org/svn/reactos?rev=35562&view=rev Log: Fix typo Modified: trunk/reactos/dll/win32/browseui/bandsite.c Modified: trunk/reactos/dll/win32/browseui/bandsite.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/bandsit… ============================================================================== --- trunk/reactos/dll/win32/browseui/bandsite.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/bandsite.c [iso-8859-1] Sat Aug 23 09:43:30 2008 @@ -1,7 +1,7 @@ /* * Rebar band site * - * Copyright 2007 Hervé Poussineua + * Copyright 2007 Hervé Poussineau * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public

1 0

[dreimer] 35561: First Commit for the RosBE Update System. Still tbd: - Upload the stuff somewhere and set the Update Server to there. - Build our tools / load newer GnuWin32 Tools and copy to the right directions. - Prepare a GCC Update Function. - Let the tool be controllable with parameters.
by dreimer＠svn.reactos.org 23 Aug '08

23 Aug '08

Author: dreimer Date: Sat Aug 23 06:55:55 2008 New Revision: 35561 URL: http://svn.reactos.org/svn/reactos?rev=35561&view=rev Log: First Commit for the RosBE Update System. Still tbd: - Upload the stuff somewhere and set the Update Server to there. - Build our tools / load newer GnuWin32 Tools and copy to the right directions. - Prepare a GCC Update Function. - Let the tool be controllable with parameters. Added: trunk/tools/RosBE/RosBE-Windows/Root/update.cmd (with props) Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd trunk/tools/RosBE/RosBE-Windows/Root/RosBE.mac Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cha… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt [iso-8859-1] Sat Aug 23 06:55:55 2008 @@ -10,6 +10,7 @@ - Updated: ccache 2.4 is now a native Version Without Cygwin (Colin Finck) - Other small Fixes here and there (Daniel Reimer) - Added: Basic PowerShell Version of RosBE (Daniel Reimer) +- Added: Update command (Daniel Reimer) *** January 23rd, 2008 - RosBE 1.2 Released Modified: trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Hel… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd [iso-8859-1] Sat Aug 23 06:55:55 2008 @@ -73,6 +73,10 @@ echo options - Starts the RosBE configurator. ) + if exist "%_ROSBE_BASEDIR%\update.cmd" ( + echo update - Updates RosBE to the most recent files. + ) + echo. goto :EOC ) @@ -196,6 +200,14 @@ goto :EOC ) ) +if exist "%_ROSBE_BASEDIR%\update.cmd" ( + if /i "%1" == "update" ( + echo Usage: update + echo Updates all files of RosBE to the most recent files. + echo. + goto :EOC + ) +) if not "%1" == "" ( echo Unknown command specified. No help available for %1. goto :EOC Modified: trunk/tools/RosBE/RosBE-Windows/Root/RosBE.mac URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/RosBE.mac [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/RosBE.mac [iso-8859-1] Sat Aug 23 06:55:55 2008 @@ -13,4 +13,5 @@ SCUT = "%_ROSBE_BASEDIR%\scut.cmd" $* SSVN = "%_ROSBE_BASEDIR%\sSVN.cmd" $* SVN = "%_ROSBE_BASEDIR%\Tools\svn.exe" $* +UPDATE = "%_ROSBE_BASEDIR%\update.cmd" $* OPTIONS = "%_ROSBE_BASEDIR%\options.cmd" $* Added: trunk/tools/RosBE/RosBE-Windows/Root/update.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/upd… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/update.cmd (added) +++ trunk/tools/RosBE/RosBE-Windows/Root/update.cmd [iso-8859-1] Sat Aug 23 06:55:55 2008 @@ -1,0 +1,77 @@ +:: +:: PROJECT: RosBE - ReactOS Build Environment for Windows +:: LICENSE: GNU General Public License v2. (see LICENSE.txt) +:: FILE: Root/update.cmd +:: PURPOSE: RosBE Updater. +:: COPYRIGHT: Copyright 2008 Daniel Reimer <reimer.daniel(a)freenet.de> +:: +:: +@echo off + +:: The Update Server +set url=www.foo.bar + +:: PS1 Files +if exist "%_ROSBE_BASEDIR%\"%_ROSBE_BASEDIR%\Build.ps1" ( + "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/Build.ps1 +) +if exist "%_ROSBE_BASEDIR%\"%_ROSBE_BASEDIR%\Clean.ps1" ( + "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/Clean.ps1 +) +if exist "%_ROSBE_BASEDIR%\"%_ROSBE_BASEDIR%\Help.ps1" ( + "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/Help.ps1 +) +if exist "%_ROSBE_BASEDIR%\MinGW.ps1" ( + "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/MinGW.ps1 +) +if exist "%_ROSBE_BASEDIR%\RosBE.ps1" ( + "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/RosBE.ps1 +) +if exist "%_ROSBE_BASEDIR%\rosbe-gcc-env.ps1" ( + "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/rosbe-gcc-env.ps1 +) + +:: Options Files +if exist "%_ROSBE_BASEDIR%\options.cmd" ( + "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/options.cmd +) + +:: SVN Files +if exist "%_ROSBE_BASEDIR%\sSVN.cmd" ( + "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/sSVN.cmd +) + +:: SCut Files +if exist "%_ROSBE_BASEDIR%\scut.cmd" ( + "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/scut.cmd +) + +:: RelAddr2Line Files +if exist "%_ROSBE_BASEDIR%\reladdr2line.cmd" ( + "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/reladdr2line.cmd +) + +:: Other Tools Files +if exist "%_ROSBE_BASEDIR%\Config.cmd" ( + "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/Config.cmd +) +if exist "%_ROSBE_BASEDIR%\chdefdir.cmd" ( + "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/chdefdir.cmd +) + +"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/Build.cmd +"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/ChangeLog.txt +"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/chdefgcc.cmd +"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/Clean.cmd +"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/Help.cmd +"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/LICENSE.TXT +"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/MinGW.cmd +"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/mingw.ico +"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/MinGW.mac +"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/README.pdf +"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/RosBE.cmd +"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/rosbe.ico +"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/RosBE.mac +"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/rosbe-gcc-env.cmd +"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/TimeDate.cmd +"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/update.cmd Propchange: trunk/tools/RosBE/RosBE-Windows/Root/update.cmd ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[fireball] 35560: - Perform volume operations as described in http://msdn.microsoft.com/en-us/library/aa364562(VS.85).aspx : Open, Lock, Work, Dismount, Unlock, Close. - Our fastfat driver doesn't support lock/unlock and dismount operations, so no improvement yet.
by fireball＠svn.reactos.org 23 Aug '08

23 Aug '08

Author: fireball Date: Sat Aug 23 06:41:04 2008 New Revision: 35560 URL: http://svn.reactos.org/svn/reactos?rev=35560&view=rev Log: - Perform volume operations as described in http://msdn.microsoft.com/en-us/library/aa364562(VS.85).aspx : Open, Lock, Work, Dismount, Unlock, Close. - Our fastfat driver doesn't support lock/unlock and dismount operations, so no improvement yet. Modified: trunk/reactos/lib/fslib/vfatlib/check/io.c trunk/reactos/lib/fslib/vfatlib/check/io.h trunk/reactos/lib/fslib/vfatlib/vfatlib.c Modified: trunk/reactos/lib/fslib/vfatlib/check/io.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/check/io… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/check/io.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/check/io.c [iso-8859-1] Sat Aug 23 06:41:04 2008 @@ -72,6 +72,9 @@ return; } + // If rw is specified, then the volume should be exclusively locked + if (rw) fs_lock(TRUE); + // Query geometry and partition info, to have bytes per sector, etc CurrentOffset.QuadPart = 0LL; @@ -100,6 +103,43 @@ /* Convert Dirty mask to a boolean value */ return (DirtyMask & 1); +} + +NTSTATUS fs_lock(BOOLEAN LockVolume) +{ + NTSTATUS Status; + IO_STATUS_BLOCK IoSb; + + /* Check if volume is dirty */ + Status = NtFsControlFile(fd, + NULL, NULL, NULL, &IoSb, + LockVolume ? FSCTL_LOCK_VOLUME : + FSCTL_UNLOCK_VOLUME, + NULL, 0, NULL, 0); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtFsControlFile() failed with Status 0x%08x\n", Status); + } + + return Status; +} + +void fs_dismount() +{ + NTSTATUS Status; + IO_STATUS_BLOCK IoSb; + + /* Check if volume is dirty */ + Status = NtFsControlFile(fd, + NULL, NULL, NULL, &IoSb, + FSCTL_DISMOUNT_VOLUME, + NULL, 0, NULL, 0); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtFsControlFile() failed with Status 0x%08x\n", Status); + } } void fs_read(loff_t pos,int size,void *data) Modified: trunk/reactos/lib/fslib/vfatlib/check/io.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/check/io… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/check/io.h [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/check/io.h [iso-8859-1] Sat Aug 23 06:41:04 2008 @@ -51,6 +51,14 @@ /* Determines whether the file system has changed. See fs_close. */ +NTSTATUS fs_lock(BOOLEAN LockVolume); + +/* Lock or unlocks the volume */ + +void fs_dismount(); + +/* Dismounts the volume */ + extern unsigned device_no; /* Major number of device (0 if file) and size (in 512 byte sectors) */ Modified: trunk/reactos/lib/fslib/vfatlib/vfatlib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/vfatlib.… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/vfatlib.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/vfatlib.c [iso-8859-1] Sat Aug 23 06:41:04 2008 @@ -300,6 +300,16 @@ VfatPrint("%wZ: %u files, %lu/%lu clusters\n", DriveRoot, FsCheckTotalFiles, fs.clusters - free_clusters, fs.clusters ); + if (FixErrors) + { + /* Dismount the volume */ + fs_dismount(); + + /* Unlock the volume */ + fs_lock(FALSE); + } + + /* Close the volume */ return fs_close(FixErrors) ? STATUS_SUCCESS : STATUS_UNSUCCESSFUL; #else return STATUS_SUCCESS;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs