Ros-diffs

ros-diffs@reactos.org

81390 discussions

[weiden] 18738: don't define DirectDrawClipper_Vtable statically
by weiden＠svn.reactos.com 24 Oct '05

24 Oct '05

don't define DirectDrawClipper_Vtable statically Modified: trunk/reactos/lib/ddraw/main/clipper.c _____ Modified: trunk/reactos/lib/ddraw/main/clipper.c --- trunk/reactos/lib/ddraw/main/clipper.c 2005-10-24 15:26:54 UTC (rev 18737) +++ trunk/reactos/lib/ddraw/main/clipper.c 2005-10-24 15:35:04 UTC (rev 18738) @@ -64,7 +64,7 @@ DX_STUB; } -static IDirectDrawClipperVtbl DirectDrawClipper_Vtable = +IDirectDrawClipperVtbl DirectDrawClipper_Vtable = { Main_DirectDrawClipper_QueryInterface, Main_DirectDrawClipper_AddRef,

1 0

[hbirr] 18737: Revert r18735 and add the missing definition to svcctl.idl.
by hbirr＠svn.reactos.com 24 Oct '05

24 Oct '05

Revert r18735 and add the missing definition to svcctl.idl. Modified: trunk/reactos/include/idl/svcctl.idl Modified: trunk/reactos/lib/advapi32/service/scm.c _____ Modified: trunk/reactos/include/idl/svcctl.idl --- trunk/reactos/include/idl/svcctl.idl 2005-10-24 14:00:14 UTC (rev 18736) +++ trunk/reactos/include/idl/svcctl.idl 2005-10-24 15:26:54 UTC (rev 18737) @@ -74,8 +74,22 @@ /* Function 9 */ DWORD ScmrNotifyBootConfigStatus([in] handle_t BindingHandle, [in] BOOL BootAcceptable); + /* Function 11 */ + DWORD ScmrChangeServiceConfigW([in] handle_t BiningHandle, + [in] SC_HANDLE hSCManager, + [in] DWORD dwServiceType, + [in] DWORD dwStartType, + [in] DWORD dwErrorControl, + [in, string, ref] LPCWSTR lpBinaryPathName, + [in, string, unique] LPCWSTR lpLoadOrderGroup, + [in, out, unique] LPDWORD lpdwTagId, + [in, size_is(dwDependenciesLength), unique] LPCWSTR lpDependencies, + [in] DWORD dwDependenciesLength, + [in, string, unique] LPCWSTR lpServiceStartName, + [in, size_is(dwPasswordLength), unique] LPCWSTR lpPassword, + [in] DWORD dwPasswordLength, + [in, string, unique] LPCWSTR lpDisplayName); - /* Function 12 */ DWORD ScmrCreateServiceW([in] handle_t BindingHandle, [in] SC_HANDLE hSCManager, _____ Modified: trunk/reactos/lib/advapi32/service/scm.c --- trunk/reactos/lib/advapi32/service/scm.c 2005-10-24 14:00:14 UTC (rev 18736) +++ trunk/reactos/lib/advapi32/service/scm.c 2005-10-24 15:26:54 UTC (rev 18737) @@ -121,7 +121,6 @@ LPCWSTR lpPassword, LPCWSTR lpDisplayName) { -#if 0 /* Temporarily deactivated to fix the build (ScmrChangeServiceConfigW is missing */ DWORD dwError; DWORD dwDependenciesLength = 0; DWORD dwLength; @@ -169,11 +168,6 @@ } return TRUE; -#else - DPRINT1("ChangeServiceConfigW temporarily disabled\n"); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -#endif }

1 0

[cwittich] 18736: added PCI interrupt link device
by cwittich＠svn.reactos.com 24 Oct '05

24 Oct '05

added PCI interrupt link device Modified: trunk/reactos/media/inf/machine.inf _____ Modified: trunk/reactos/media/inf/machine.inf --- trunk/reactos/media/inf/machine.inf 2005-10-24 12:55:54 UTC (rev 18735) +++ trunk/reactos/media/inf/machine.inf 2005-10-24 14:00:14 UTC (rev 18736) @@ -35,6 +35,7 @@ %*PNP0A05.DeviceDesc% = NO_DRV,*PNP0A05 %*PNP0B00.DeviceDesc% = NO_DRV,*PNP0B00 %*PNP0C02.DeviceDesc% = NO_DRV,*PNP0C02 +%*PNP0C0F.DeviceDesc% = NO_DRV,*PNP0C0F %ACPI\FixedButton.DeviceDesc% = NO_DRV,ACPI\FixedButton %PCI\CC_0600.DeviceDesc% = NO_DRV,PCI\CC_0600 %PCI\CC_0601.DeviceDesc% = PCI_Inst,PCI\CC_0604

1 0

[gvg] 18735: Temporary workaround to fix build
by gvg＠svn.reactos.com 24 Oct '05

24 Oct '05

Temporary workaround to fix build Modified: trunk/reactos/lib/advapi32/service/scm.c _____ Modified: trunk/reactos/lib/advapi32/service/scm.c --- trunk/reactos/lib/advapi32/service/scm.c 2005-10-24 12:49:05 UTC (rev 18734) +++ trunk/reactos/lib/advapi32/service/scm.c 2005-10-24 12:55:54 UTC (rev 18735) @@ -121,6 +121,7 @@ LPCWSTR lpPassword, LPCWSTR lpDisplayName) { +#if 0 /* Temporarily deactivated to fix the build (ScmrChangeServiceConfigW is missing */ DWORD dwError; DWORD dwDependenciesLength = 0; DWORD dwLength; @@ -168,6 +169,11 @@ } return TRUE; +#else + DPRINT1("ChangeServiceConfigW temporarily disabled\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +#endif }

1 0

[hpoussin] 18734: Install .CoInstallers section from .inf file
by hpoussin＠svn.reactos.com 24 Oct '05

24 Oct '05

Install .CoInstallers section from .inf file Call class coinstallers and device coinstallers when installing a device Modified: trunk/reactos/lib/setupapi/devinst.c _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-10-24 11:40:14 UTC (rev 18733) +++ trunk/reactos/lib/setupapi/devinst.c 2005-10-24 12:49:05 UTC (rev 18734) @@ -2997,14 +2997,6 @@ goto cleanup; } - /* W->A conversion for function name */ - FunctionNameA = UnicodeToMultiByte(Comma + 1, CP_ACP); - if (!FunctionNameA) - { - rc = GetLastError(); - goto cleanup; - } - /* Load library */ *Comma = '\0'; hModule = LoadLibraryW(InstallerName); @@ -3015,6 +3007,18 @@ goto cleanup; } + /* Skip comma spaces */ + while (*Comma == ',' || isspaceW(*Comma)) + Comma++; + + /* W->A conversion for function name */ + FunctionNameA = UnicodeToMultiByte(Comma, CP_ACP); + if (!FunctionNameA) + { + rc = GetLastError(); + goto cleanup; + } + /* Search function */ *FunctionPointer = GetProcAddress(hModule, FunctionNameA); if (!*FunctionPointer) @@ -3141,7 +3145,39 @@ if (CanHandle & DEVICE_COINSTALLER) { - FIXME("Doesn't use Device co-installers at the moment\n"); + hKey = SetupDiOpenDevRegKey(DeviceInfoSet, DeviceInfoData, DICS_FLAG_GLOBAL, 0, DIREG_DRV, KEY_QUERY_VALUE); + if (hKey != INVALID_HANDLE_VALUE) + { + rc = RegQueryValueExW(hKey, L"CoInstallers32", NULL, &dwRegType, NULL, &dwLength); + if (rc == ERROR_SUCCESS && dwRegType == REG_MULTI_SZ) + { + LPWSTR KeyBuffer = HeapAlloc(GetProcessHeap(), 0, dwLength); + if (KeyBuffer != NULL) + { + rc = RegQueryValueExW(hKey, L"CoInstallers32", NULL, NULL, (LPBYTE)KeyBuffer, &dwLength); + if (rc == ERROR_SUCCESS) + { + LPWSTR ptr; + for (ptr = KeyBuffer; *ptr; ptr += strlenW(ptr) + 1) + { + /* Add coinstaller to DeviceCoInstallersListHead list */ + struct CoInstallerElement *coinstaller; + TRACE("Got device coinstaller '%s'\n", debugstr_w(ptr)); + coinstaller = HeapAlloc(GetProcessHeap(), 0, sizeof(struct CoInstallerElement)); + if (!coinstaller) + continue; + memset(coinstaller, 0, sizeof(struct CoInstallerElement)); + if (GetFunctionPointer(ptr, &coinstaller->Module, (PVOID*)&coinstaller->Function) == ERROR_SUCCESS) + InsertTailList(&DeviceCoInstallersListHead, &coinstaller->ListEntry); + else + HeapFree(GetProcessHeap(), 0, coinstaller); + } + } + HeapFree(GetProcessHeap(), 0, KeyBuffer); + } + } + RegCloseKey(hKey); + } } if (CanHandle & CLASS_COINSTALLER) { @@ -3157,7 +3193,7 @@ if (UuidToStringW((UUID*)&DeviceInfoData->ClassGuid, &lpGuidString) == RPC_S_OK) { rc = RegQueryValueExW(hKey, lpGuidString, NULL, &dwRegType, NULL, &dwLength); - if (rc == ERROR_SUCCESS && dwRegType == REG_SZ) + if (rc == ERROR_SUCCESS && dwRegType == REG_MULTI_SZ) { LPWSTR KeyBuffer = HeapAlloc(GetProcessHeap(), 0, dwLength); if (KeyBuffer != NULL) @@ -3165,11 +3201,20 @@ rc = RegQueryValueExW(hKey, lpGuidString, NULL, NULL, (LPBYTE)KeyBuffer, &dwLength); if (rc == ERROR_SUCCESS) { - LPCWSTR ptr; + LPWSTR ptr; for (ptr = KeyBuffer; *ptr; ptr += strlenW(ptr) + 1) { /* Add coinstaller to ClassCoInstallersListHead list */ - FIXME("Class coinstaller is '%S'. UNIMPLEMENTED!\n", ptr); + struct CoInstallerElement *coinstaller; + TRACE("Got class coinstaller '%s'\n", debugstr_w(ptr)); + coinstaller = HeapAlloc(GetProcessHeap(), 0, sizeof(struct CoInstallerElement)); + if (!coinstaller) + continue; + memset(coinstaller, 0, sizeof(struct CoInstallerElement)); + if (GetFunctionPointer(ptr, &coinstaller->Module, (PVOID*)&coinstaller->Function) == ERROR_SUCCESS) + InsertTailList(&ClassCoInstallersListHead, &coinstaller->ListEntry); + else + HeapFree(GetProcessHeap(), 0, coinstaller); } } HeapFree(GetProcessHeap(), 0, KeyBuffer); @@ -3195,6 +3240,7 @@ if (rc == ERROR_SUCCESS) { /* Get ClassInstaller function pointer */ + TRACE("Got class installer '%s'\n", debugstr_w(KeyBuffer)); if (GetFunctionPointer(KeyBuffer, &ClassInstallerLibrary, (PVOID*)&ClassInstaller) != ERROR_SUCCESS) { InstallParams.FlagsEx |= DI_FLAGSEX_CI_FAILED; @@ -5337,13 +5383,13 @@ InstallParams.cbSize = sizeof(SP_DEVINSTALL_PARAMS_W); ret = SetupDiGetDeviceInstallParamsW(DeviceInfoSet, DeviceInfoData, &InstallParams); if (!ret) - goto cleanup; + goto done; SelectedDriver = (struct DriverInfoElement *)InstallParams.Reserved; if (!SelectedDriver) { SetLastError(ERROR_NO_DRIVER_SELECTED); - goto cleanup; + goto done; } ret = SetupDiGetActualSectionToInstallW( @@ -5351,34 +5397,22 @@ SelectedDriver->Details.SectionName, SectionName, MAX_PATH, &SectionNameLength, NULL); if (!ret) - goto cleanup; + goto done; - if (InstallParams.InstallMsgHandler) + if (!InstallParams.InstallMsgHandler) { - ret = SetupInstallFromInfSectionW(InstallParams.hwndParent, - SelectedDriver->InfFileDetails->hInf, SectionName, - SPINST_FILES, NULL, NULL, SP_COPY_NEWER, - InstallParams.InstallMsgHandler, InstallParams.InstallMsgHandlerContext, - DeviceInfoSet, DeviceInfoData); + InstallParams.InstallMsgHandler = SetupDefaultQueueCallbackW; + InstallParams.InstallMsgHandlerContext = SetupInitDefaultQueueCallback(InstallParams.hwndParent); + SetupDiSetDeviceInstallParamsW(DeviceInfoSet, DeviceInfoData, &InstallParams); } - else - { - PVOID callback_context = SetupInitDefaultQueueCallback(InstallParams.hwndParent); - ret = SetupInstallFromInfSectionW(InstallParams.hwndParent, - SelectedDriver->InfFileDetails->hInf, SectionName, - SPINST_FILES, NULL, NULL, SP_COPY_NEWER, - SetupDefaultQueueCallbackW, callback_context, - DeviceInfoSet, DeviceInfoData); - SetupTermDefaultQueueCallback(callback_context); - } -cleanup: - if (ret) - { - InstallParams.Flags |= DI_NOFILECOPY; - ret = SetupDiSetDeviceInstallParamsW(DeviceInfoSet, DeviceInfoData, &InstallParams); - } + ret = SetupInstallFromInfSectionW(InstallParams.hwndParent, + SelectedDriver->InfFileDetails->hInf, SectionName, + SPINST_FILES, NULL, NULL, SP_COPY_NEWER, + InstallParams.InstallMsgHandler, InstallParams.InstallMsgHandlerContext, + DeviceInfoSet, DeviceInfoData); } +done: TRACE("Returning %d\n", ret); return ret; } @@ -5391,12 +5425,91 @@ IN HDEVINFO DeviceInfoSet, IN PSP_DEVINFO_DATA DeviceInfoData) { + BOOL ret = FALSE; /* Return value */ + TRACE("%p %p\n", DeviceInfoSet, DeviceInfoData); - FIXME("SetupDiRegisterCoDeviceInstallers not implemented. Doing nothing\n"); - //SetLastError(ERROR_GEN_FAILURE); - //return FALSE; - return TRUE; + if (!DeviceInfoSet) + SetLastError(ERROR_INVALID_PARAMETER); + else if (DeviceInfoSet == (HDEVINFO)INVALID_HANDLE_VALUE) + SetLastError(ERROR_INVALID_HANDLE); + else if (((struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEV_INFO_SET_MAGIC) + SetLastError(ERROR_INVALID_HANDLE); + else if (!DeviceInfoData) + SetLastError(ERROR_INVALID_PARAMETER); + else if (DeviceInfoData->cbSize != sizeof(SP_DEVINFO_DATA)) + SetLastError(ERROR_INVALID_USER_BUFFER); + else + { + SP_DEVINSTALL_PARAMS_W InstallParams; + struct DriverInfoElement *SelectedDriver; + BOOL Result; + DWORD DoAction; + WCHAR SectionName[MAX_PATH]; + DWORD SectionNameLength = 0; + HKEY hKey = INVALID_HANDLE_VALUE;; + + InstallParams.cbSize = sizeof(SP_DEVINSTALL_PARAMS_W); + Result = SetupDiGetDeviceInstallParamsW(DeviceInfoSet, DeviceInfoData, &InstallParams); + if (!Result) + goto cleanup; + + SelectedDriver = (struct DriverInfoElement *)InstallParams.Reserved; + if (SelectedDriver == NULL) + { + SetLastError(ERROR_NO_DRIVER_SELECTED); + goto cleanup; + } + + /* Get .CoInstallers section name */ + Result = SetupDiGetActualSectionToInstallW( + SelectedDriver->InfFileDetails->hInf, + SelectedDriver->Details.SectionName, + SectionName, MAX_PATH, &SectionNameLength, NULL); + if (!Result || SectionNameLength > MAX_PATH - wcslen(L".CoInstallers") - 1) + goto cleanup; + wcscat(SectionName, L".CoInstallers"); + + /* Open/Create driver key information */ +#if _WIN32_WINNT >= 0x502 + hKey = SetupDiOpenDevRegKey(DeviceInfoSet, DeviceInfoData, DICS_FLAG_GLOBAL, 0, DIREG_DRV, KEY_READ | KEY_WRITE); +#else + hKey = SetupDiOpenDevRegKey(DeviceInfoSet, DeviceInfoData, DICS_FLAG_GLOBAL, 0, DIREG_DRV, KEY_ALL_ACCESS); +#endif + if (hKey == INVALID_HANDLE_VALUE && GetLastError() == ERROR_FILE_NOT_FOUND) + hKey = SetupDiCreateDevRegKeyW(DeviceInfoSet, DeviceInfoData, DICS_FLAG_GLOBAL, 0, DIREG_DRV, NULL, NULL); + if (hKey == INVALID_HANDLE_VALUE) + goto cleanup; + + /* Install .CoInstallers section */ + DoAction = SPINST_REGISTRY; + if (!(InstallParams.Flags & DI_NOFILECOPY)) + { + DoAction |= SPINST_FILES; + if (!InstallParams.InstallMsgHandler) + { + InstallParams.InstallMsgHandler = SetupDefaultQueueCallbackW; + InstallParams.InstallMsgHandlerContext = SetupInitDefaultQueueCallback(InstallParams.hwndParent); + SetupDiSetDeviceInstallParamsW(DeviceInfoSet, DeviceInfoData, &InstallParams); + } + } + Result = SetupInstallFromInfSectionW(InstallParams.hwndParent, + SelectedDriver->InfFileDetails->hInf, SectionName, + DoAction, hKey, NULL, SP_COPY_NEWER, + InstallParams.InstallMsgHandler, InstallParams.InstallMsgHandlerContext, + DeviceInfoSet, DeviceInfoData); + if (!Result) + goto cleanup; + + ret = TRUE; + +cleanup: + if (hKey != INVALID_HANDLE_VALUE) + RegCloseKey(hKey); + } + + TRACE("Returning %d\n", ret); + return ret; } /*********************************************************************** @@ -5525,9 +5638,15 @@ /* Install main section */ DoAction = SPINST_REGISTRY; if (!(InstallParams.Flags & DI_NOFILECOPY)) + { DoAction |= SPINST_FILES; - /* Files have already been copied in SetupDiInstallDriverFiles. - * Process only registry entries. */ + if (!InstallParams.InstallMsgHandler) + { + InstallParams.InstallMsgHandler = SetupDefaultQueueCallbackW; + InstallParams.InstallMsgHandlerContext = SetupInitDefaultQueueCallback(InstallParams.hwndParent); + SetupDiSetDeviceInstallParamsW(DeviceInfoSet, DeviceInfoData, &InstallParams); + } + } *pSectionName = '\0'; Result = SetupInstallFromInfSectionW(InstallParams.hwndParent, SelectedDriver->InfFileDetails->hInf, SectionName, @@ -5538,10 +5657,11 @@ goto cleanup; if (!(InstallParams.Flags & DI_NOFILECOPY) && !(InstallParams.Flags & DI_NOVCP)) { - Result = SetupCommitFileQueueW(InstallParams.hwndParent, - InstallParams.FileQueue, - InstallParams.InstallMsgHandler, - InstallParams.InstallMsgHandlerContext); + if (Result && InstallParams.InstallMsgHandler == SetupDefaultQueueCallbackW) + { + /* Delete resources allocated by SetupInitDefaultQueueCallback */ + SetupTermDefaultQueueCallback(InstallParams.InstallMsgHandlerContext); + } } InstallParams.Flags |= DI_NOFILECOPY; SetupDiSetDeviceInstallParamsW(DeviceInfoSet, DeviceInfoData, &InstallParams);

1 0

[hpoussin] 18733: Set NULL driver for LPT ports
by hpoussin＠svn.reactos.com 24 Oct '05

24 Oct '05

Set NULL driver for LPT ports Add more PnP IDs in machine.inf Modified: trunk/reactos/media/inf/machine.inf Modified: trunk/reactos/media/inf/ports.inf _____ Modified: trunk/reactos/media/inf/machine.inf --- trunk/reactos/media/inf/machine.inf 2005-10-24 09:39:53 UTC (rev 18732) +++ trunk/reactos/media/inf/machine.inf 2005-10-24 11:40:14 UTC (rev 18733) @@ -25,28 +25,29 @@ %GenericMfg% = GenericMfg %IntelMfg% = IntelMfg +[GenericMfg] +%*PNP0001.DeviceDesc% = NO_DRV,*PNP0001 +%*PNP0100.DeviceDesc% = NO_DRV,*PNP0100 +%*PNP0200.DeviceDesc% = NO_DRV,*PNP0200 +%*PNP0800.DeviceDesc% = NO_DRV,*PNP0800 +%*PNP0A00.DeviceDesc% = PCI_ISA_Inst,*PNP0A00 +%*PNP0A03.DeviceDesc% = PCI_Inst,*PNP0A03 +%*PNP0A05.DeviceDesc% = NO_DRV,*PNP0A05 +%*PNP0B00.DeviceDesc% = NO_DRV,*PNP0B00 +%*PNP0C02.DeviceDesc% = NO_DRV,*PNP0C02 +%ACPI\FixedButton.DeviceDesc% = NO_DRV,ACPI\FixedButton +%PCI\CC_0600.DeviceDesc% = NO_DRV,PCI\CC_0600 +%PCI\CC_0601.DeviceDesc% = PCI_Inst,PCI\CC_0604 +%PCI\CC_0604.DeviceDesc% = PCI_ISA_Inst,PCI\CC_0604 + [IntelMfg] -; DO NOT INSTALL ISAPNP -> FREEZES SYSTEM -;%PCI\VEN_8086&DEV_7110.DeviceDesc% = Intel_PCI_ISA_Inst, PCI\VEN_8086&DEV_7110 -%PCI\VEN_8086&DEV_7110.DeviceDesc% = NO_DRV, PCI\VEN_8086&DEV_7110 -%PCI\VEN_8086&DEV_7113.DeviceDesc% = NO_DRV, PCI\VEN_8086&DEV_7113 -%PCI\VEN_8086&DEV_7180.DeviceDesc% = NO_DRV, PCI\VEN_8086&DEV_7180 -%PCI\VEN_8086&DEV_7190.DeviceDesc% = NO_DRV, PCI\VEN_8086&DEV_7190 -%PCI\VEN_8086&DEV_7192.DeviceDesc% = NO_DRV, PCI\VEN_8086&DEV_7192 +%PCI\VEN_8086&DEV_7110.DeviceDesc% = PCI_ISA_Inst,PCI\VEN_8086&DEV_7110 +%PCI\VEN_8086&DEV_7110.DeviceDesc% = NO_DRV,PCI\VEN_8086&DEV_7110 +%PCI\VEN_8086&DEV_7113.DeviceDesc% = NO_DRV,PCI\VEN_8086&DEV_7113 +%PCI\VEN_8086&DEV_7180.DeviceDesc% = NO_DRV,PCI\VEN_8086&DEV_7180 +%PCI\VEN_8086&DEV_7190.DeviceDesc% = NO_DRV,PCI\VEN_8086&DEV_7190 +%PCI\VEN_8086&DEV_7192.DeviceDesc% = NO_DRV,PCI\VEN_8086&DEV_7192 -[GenericMfg] -%*PNP0001.DeviceDesc% = NO_DRV, *PNP0001 -%*PNP0100.DeviceDesc% = NO_DRV, *PNP0100 -%*PNP0200.DeviceDesc% = NO_DRV, *PNP0200 -%*PNP0800.DeviceDesc% = NO_DRV, *PNP0800 -%*PNP0A03.DeviceDesc% = PCI_Inst, *PNP0A03 -%*PNP0A05.DeviceDesc% = NO_DRV, *PNP0A05 -%*PNP0B00.DeviceDesc% = NO_DRV, *PNP0B00 -%*PNP0C02.DeviceDesc% = NO_DRV, *PNP0C02 -%*PNP0C0F.DeviceDesc% = NO_DRV, *PNP0C0F -%ACPI\FixedButton.DeviceDesc% = NO_DRV, ACPI\FixedButton -%PCI\CC_0604.DeviceDesc% = PCI_Inst,PCI\CC_0604 - ;---------------------------- NO DRIVER REQ ----------------------------- [NO_DRV] @@ -54,16 +55,18 @@ [NO_DRV.Services] AddService = , 0x00000002 -;----------------------------- INTEL DRIVER ----------------------------- +;-------------------------- PCI-ISA BUS DRIVER -------------------------- -[Intel_PCI_ISA_Inst] -CopyFiles = Intel_PCI_ISA_CopyFiles.NT +[PCI_ISA_Inst.NT] +CopyFiles = PCI_ISA_CopyFiles.NT -[Intel_PCI_ISA_CopyFiles.NT] +[PCI_ISA_CopyFiles.NT] isapnp.sys -[Intel_PCI_ISA_Inst.NT.Services] -AddService = isapnp, 0x00000002, isapnp_Service_Inst +[PCI_ISA_Inst.NT.Services] +;DO NOT INSTALL ISAPNP -> FREEZES SYSTEM +;AddService = isapnp, 0x00000002, isapnp_Service_Inst +AddService = , 0x00000002 [isapnp_Service_Inst] ServiceType = 1 @@ -107,11 +110,13 @@ *PNP0C02.DeviceDesc = "Motherboard resources" *PNP0C0F.DeviceDesc = "PCI interrupt link device" ACPI\FixedButton.DeviceDesc ="ACPI Fixed Feature Button" +PCI\CC_0600.DeviceDesc = "Standard CPU to PCI bridge" +PCI\CC_0601.DeviceDesc = "Standard PCI to ISA bridge" PCI\CC_0604.DeviceDesc = "Standard PCI to PCI bridge" IntelMfg = "Intel" +PCI\VEN_8086&DEV_7110.DeviceDesc = "Intel 82371AB/EB PCI to ISA Bridge" +PCI\VEN_8086&DEV_7113.DeviceDesc = "Intel 82371AB/EB Power Management Controller" PCI\VEN_8086&DEV_7180.DeviceDesc = "Intel 82443LX/EX Pentium(R) II CPU to PCI-Bridge" PCI\VEN_8086&DEV_7190.DeviceDesc = "Intel 82443BX/ZX/DX Pentium(R) II CPU to PCI-Bridge" PCI\VEN_8086&DEV_7192.DeviceDesc = "Intel 82443BX/ZX/DX Pentium(R) II CPU to PCI-Bridge" -PCI\VEN_8086&DEV_7113.DeviceDesc = "Intel 82371AB/EB Power Management Controller" -PCI\VEN_8086&DEV_7110.DeviceDesc = "Intel 82371AB/EB PCI to ISA Bridge" \ No newline at end of file _____ Modified: trunk/reactos/media/inf/ports.inf --- trunk/reactos/media/inf/ports.inf 2005-10-24 09:39:53 UTC (rev 18732) +++ trunk/reactos/media/inf/ports.inf 2005-10-24 11:40:14 UTC (rev 18733) @@ -34,9 +34,9 @@ ;---------------------------- LPT PORT DRIVER --------------------------- [LptPort_Inst.NT] -CopyFiles = LptPort_CopyFiles.NT -[LptPort_CopyFiles.NT] +[LptPort_Inst.NT.Services] +AddService = , 0x00000002 ;---------------------------- COM PORT DRIVER ---------------------------

1 0

[hpoussin] 18732: Add functions to reference/dereference InfFileDetails structure added in r18731 (suggestion by w3seek)
by hpoussin＠svn.reactos.com 24 Oct '05

24 Oct '05

Add functions to reference/dereference InfFileDetails structure added in r18731 (suggestion by w3seek) Modified: trunk/reactos/lib/setupapi/devinst.c _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-10-24 09:16:34 UTC (rev 18731) +++ trunk/reactos/lib/setupapi/devinst.c 2005-10-24 09:39:53 UTC (rev 18732) @@ -1943,13 +1943,23 @@ return ret; } -static BOOL DestroyDriverInfoElement(struct DriverInfoElement* driverInfo) +static VOID ReferenceInfFile(struct InfFileDetails* infFile) { - if (InterlockedDecrement(&driverInfo->InfFileDetails->References) == 0) + InterlockedIncrement(&infFile->References); +} + +static VOID DereferenceInfFile(struct InfFileDetails* infFile) +{ + if (InterlockedDecrement(&infFile->References) == 0) { - SetupCloseInfFile(driverInfo->InfFileDetails->hInf); - HeapFree(GetProcessHeap(), 0, driverInfo->InfFileDetails); + SetupCloseInfFile(infFile->hInf); + HeapFree(GetProcessHeap(), 0, infFile); } +} + +static BOOL DestroyDriverInfoElement(struct DriverInfoElement* driverInfo) +{ + DereferenceInfFile(driverInfo->InfFileDetails); HeapFree(GetProcessHeap(), 0, driverInfo->MatchingId); HeapFree(GetProcessHeap(), 0, driverInfo); return TRUE; @@ -3972,7 +3982,7 @@ driverInfo->Info.ProviderName[0] = '\0'; driverInfo->Info.DriverDate = DriverDate; driverInfo->Info.DriverVersion = DriverVersion; - InterlockedIncrement(&InfFileDetails->References); + ReferenceInfFile(InfFileDetails); driverInfo->InfFileDetails = InfFileDetails; /* Insert current driver in driver list, according to its rank */ @@ -4271,6 +4281,7 @@ memset(currentInfFileDetails, 0, sizeof(struct InfFileDetails)); currentInfFileDetails->hInf = SetupOpenInfFileW(filename, NULL, INF_STYLE_WIN4, NULL); + ReferenceInfFile(currentInfFileDetails); if (currentInfFileDetails->hInf == INVALID_HANDLE_VALUE) { HeapFree(GetProcessHeap(), 0, currentInfFileDetails); @@ -4456,12 +4467,8 @@ HeapFree(GetProcessHeap(), 0, ProviderName); ProviderName = NULL; - if (currentInfFileDetails->References == 0) - { - SetupCloseInfFile(currentInfFileDetails->hInf); - HeapFree(GetProcessHeap(), 0, currentInfFileDetails); - currentInfFileDetails = NULL; - } + DereferenceInfFile(currentInfFileDetails); + currentInfFileDetails = NULL; } ret = TRUE; } @@ -4487,11 +4494,8 @@ HeapFree(GetProcessHeap(), 0, ManufacturerName); HeapFree(GetProcessHeap(), 0, HardwareIDs); HeapFree(GetProcessHeap(), 0, CompatibleIDs); - if (currentInfFileDetails && currentInfFileDetails->References == 0) - { - SetupCloseInfFile(currentInfFileDetails->hInf); - HeapFree(GetProcessHeap(), 0, currentInfFileDetails); - } + if (currentInfFileDetails) + DereferenceInfFile(currentInfFileDetails); HeapFree(GetProcessHeap(), 0, Buffer); TRACE("Returning %d\n", ret);

1 0

[hpoussin] 18731: Don't leak memory when destroying device info set and driver lists
by hpoussin＠svn.reactos.com 24 Oct '05

24 Oct '05

Don't leak memory when destroying device info set and driver lists Try to keep .inf files handles instead of opening/parsing them at each device installation step Modified: trunk/reactos/lib/setupapi/devinst.c _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-10-24 05:05:07 UTC (rev 18730) +++ trunk/reactos/lib/setupapi/devinst.c 2005-10-24 09:16:34 UTC (rev 18731) @@ -116,6 +116,14 @@ WCHAR SymbolicLink[0]; /* \\?\ACPI#PNP0501#4&2658d0a0&0#{GUID} */ }; +/* We don't want to open the .inf file to read only one information in it, so keep a handle to it once it + * has been already loaded once. Keep also a reference counter */ +struct InfFileDetails +{ + HINF hInf; + ULONG References; +}; + struct DriverInfoElement /* Element of DeviceInfoSet.DriverListHead and DeviceInfoElement.DriverListHead */ { LIST_ENTRY ListEntry; @@ -125,6 +133,7 @@ SP_DRVINFO_DETAIL_DATA_W Details; GUID ClassGuid; LPWSTR MatchingId; + struct InfFileDetails *InfFileDetails; }; struct DeviceInfoElement /* Element of DeviceInfoSet.ListHead */ @@ -1934,6 +1943,57 @@ return ret; } +static BOOL DestroyDriverInfoElement(struct DriverInfoElement* driverInfo) +{ + if (InterlockedDecrement(&driverInfo->InfFileDetails->References) == 0) + { + SetupCloseInfFile(driverInfo->InfFileDetails->hInf); + HeapFree(GetProcessHeap(), 0, driverInfo->InfFileDetails); + } + HeapFree(GetProcessHeap(), 0, driverInfo->MatchingId); + HeapFree(GetProcessHeap(), 0, driverInfo); + return TRUE; +} + +static BOOL DestroyDeviceInfoElement(struct DeviceInfoElement* deviceInfo) +{ + PLIST_ENTRY ListEntry; + struct DriverInfoElement *driverInfo; + + while (!IsListEmpty(&deviceInfo->DriverListHead)) + { + ListEntry = RemoveHeadList(&deviceInfo->DriverListHead); + driverInfo = (struct DriverInfoElement *)ListEntry; + if (!DestroyDriverInfoElement(driverInfo)) + return FALSE; + } + while (!IsListEmpty(&deviceInfo->InterfaceListHead)) + { + ListEntry = RemoveHeadList(&deviceInfo->InterfaceListHead); + HeapFree(GetProcessHeap(), 0, ListEntry); + } + HeapFree(GetProcessHeap(), 0, deviceInfo); + return TRUE; +} + +static BOOL DestroyDeviceInfoSet(struct DeviceInfoSet* list) +{ + PLIST_ENTRY ListEntry; + struct DeviceInfoElement *deviceInfo; + + while (!IsListEmpty(&list->ListHead)) + { + ListEntry = RemoveHeadList(&list->ListHead); + deviceInfo = (struct DeviceInfoElement *)ListEntry; + if (!DestroyDeviceInfoElement(deviceInfo)) + return FALSE; + } + if (list->HKLM != HKEY_LOCAL_MACHINE) + RegCloseKey(list->HKLM); + HeapFree(GetProcessHeap(), 0, list); + return TRUE; +} + /*********************************************************************** * SetupDiDestroyDeviceInfoList (SETUPAPI.@) */ @@ -1947,25 +2007,7 @@ struct DeviceInfoSet *list = (struct DeviceInfoSet *)devinfo; if (list->magic == SETUP_DEV_INFO_SET_MAGIC) - { - PLIST_ENTRY ListEntry, InterfaceEntry; - struct DeviceInfoElement *deviceInfo; - while (!IsListEmpty(&list->ListHead)) - { - ListEntry = RemoveHeadList(&list->ListHead); - deviceInfo = (struct DeviceInfoElement *)ListEntry; - while (!IsListEmpty(&deviceInfo->InterfaceListHead)) - { - InterfaceEntry = RemoveHeadList(&deviceInfo->InterfaceListHead); - HeapFree(GetProcessHeap(), 0, InterfaceEntry); - } - HeapFree(GetProcessHeap(), 0, ListEntry); - } - if (list->HKLM != HKEY_LOCAL_MACHINE) - RegCloseKey(list->HKLM); - HeapFree(GetProcessHeap(), 0, list); - ret = TRUE; - } + ret = DestroyDeviceInfoSet(list); else SetLastError(ERROR_INVALID_HANDLE); } @@ -3824,6 +3866,7 @@ IN DWORD DriverType, /* SPDIT_CLASSDRIVER or SPDIT_COMPATDRIVER */ IN LPGUID ClassGuid, IN INFCONTEXT ContextDevice, + IN struct InfFileDetails *InfFileDetails, IN LPCWSTR InfFile, IN LPCWSTR ProviderName, IN LPCWSTR ManufacturerName, @@ -3929,6 +3972,8 @@ driverInfo->Info.ProviderName[0] = '\0'; driverInfo->Info.DriverDate = DriverDate; driverInfo->Info.DriverVersion = DriverVersion; + InterlockedIncrement(&InfFileDetails->References); + driverInfo->InfFileDetails = InfFileDetails; /* Insert current driver in driver list, according to its rank */ PreviousEntry = DriverListHead->Flink; @@ -4094,7 +4139,7 @@ struct DeviceInfoSet *list; SP_DEVINSTALL_PARAMS_W InstallParams; PVOID Buffer = NULL; - HINF hInf = INVALID_HANDLE_VALUE; + struct InfFileDetails *currentInfFileDetails = NULL; LPWSTR ProviderName = NULL; LPWSTR ManufacturerName = NULL; WCHAR ManufacturerSection[LINE_LEN + 1]; @@ -4220,19 +4265,29 @@ GUID ClassGuid; TRACE("Opening file %S\n", filename); - hInf = SetupOpenInfFileW(filename, NULL, INF_STYLE_WIN4, NULL); - if (hInf == INVALID_HANDLE_VALUE) + currentInfFileDetails = HeapAlloc(GetProcessHeap(), 0, sizeof(struct InfFileDetails)); + if (!currentInfFileDetails) continue; + memset(currentInfFileDetails, 0, sizeof(struct InfFileDetails)); + currentInfFileDetails->hInf = SetupOpenInfFileW(filename, NULL, INF_STYLE_WIN4, NULL); + if (currentInfFileDetails->hInf == INVALID_HANDLE_VALUE) + { + HeapFree(GetProcessHeap(), 0, currentInfFileDetails); + currentInfFileDetails = NULL; + continue; + } + if (!GetVersionInformationFromInfFile( - hInf, + currentInfFileDetails->hInf, &ClassGuid, &ProviderName, &DriverDate, &DriverVersion)) { - SetupCloseInfFile(hInf); - hInf = INVALID_HANDLE_VALUE; + SetupCloseInfFile(currentInfFileDetails->hInf); + HeapFree(GetProcessHeap(), 0, currentInfFileDetails->hInf); + currentInfFileDetails = NULL; continue; } @@ -4246,7 +4301,7 @@ } /* Get the manufacturers list */ - Result = SetupFindFirstLineW(hInf, L"Manufacturer", NULL, &ContextManufacturer); + Result = SetupFindFirstLineW(currentInfFileDetails->hInf, L"Manufacturer", NULL, &ContextManufacturer); while (Result) { Result = SetupGetStringFieldW( @@ -4280,11 +4335,11 @@ ManufacturerSection[RequiredSize] = 0; /* Final NULL char */ /* Add (possible) extension to manufacturer section name */ Result = SetupDiGetActualSectionToInstallW( - hInf, ManufacturerSection, ManufacturerSection, LINE_LEN, NULL, NULL); + currentInfFileDetails->hInf, ManufacturerSection, ManufacturerSection, LINE_LEN, NULL, NULL); if (Result) { TRACE("Enumerating devices in manufacturer %S\n", ManufacturerSection); - Result = SetupFindFirstLineW(hInf, ManufacturerSection, NULL, &ContextDevice); + Result = SetupFindFirstLineW(currentInfFileDetails->hInf, ManufacturerSection, NULL, &ContextDevice); } } while (Result) @@ -4297,6 +4352,7 @@ DriverType, &ClassGuid, ContextDevice, + currentInfFileDetails, filename, ProviderName, ManufacturerName, @@ -4352,6 +4408,7 @@ DriverType, &ClassGuid, ContextDevice, + currentInfFileDetails, filename, ProviderName, ManufacturerName, @@ -4372,6 +4429,7 @@ DriverType, &ClassGuid, ContextDevice, + currentInfFileDetails, filename, ProviderName, ManufacturerName, @@ -4398,8 +4456,12 @@ HeapFree(GetProcessHeap(), 0, ProviderName); ProviderName = NULL; - SetupCloseInfFile(hInf); - hInf = INVALID_HANDLE_VALUE; + if (currentInfFileDetails->References == 0) + { + SetupCloseInfFile(currentInfFileDetails->hInf); + HeapFree(GetProcessHeap(), 0, currentInfFileDetails); + currentInfFileDetails = NULL; + } } ret = TRUE; } @@ -4425,8 +4487,11 @@ HeapFree(GetProcessHeap(), 0, ManufacturerName); HeapFree(GetProcessHeap(), 0, HardwareIDs); HeapFree(GetProcessHeap(), 0, CompatibleIDs); - if (hInf != INVALID_HANDLE_VALUE) - SetupCloseInfFile(hInf); + if (currentInfFileDetails && currentInfFileDetails->References == 0) + { + SetupCloseInfFile(currentInfFileDetails->hInf); + HeapFree(GetProcessHeap(), 0, currentInfFileDetails); + } HeapFree(GetProcessHeap(), 0, Buffer); TRACE("Returning %d\n", ret); @@ -4505,8 +4570,7 @@ { ListEntry = RemoveHeadList(&list->DriverListHead); driverInfo = (struct DriverInfoElement *)ListEntry; - HeapFree(GetProcessHeap(), 0, driverInfo->MatchingId); - HeapFree(GetProcessHeap(), 0, driverInfo); + DestroyDriverInfoElement(driverInfo); } InstallParams.Reserved = 0; InstallParams.Flags &= ~(DI_DIDCLASS | DI_MULTMFGS); @@ -4531,8 +4595,7 @@ InstallParamsSet.Reserved = 0; SetupDiSetDeviceInstallParamsW(DeviceInfoSet, NULL, &InstallParamsSet); } - HeapFree(GetProcessHeap(), 0, driverInfo->MatchingId); - HeapFree(GetProcessHeap(), 0, driverInfo); + DestroyDriverInfoElement(driverInfo); } InstallParams.Reserved = 0; InstallParams.Flags &= ~DI_DIDCOMPAT; @@ -5263,7 +5326,6 @@ else { SP_DEVINSTALL_PARAMS_W InstallParams; - HINF hInf = INVALID_HANDLE_VALUE; struct DriverInfoElement *SelectedDriver; WCHAR SectionName[MAX_PATH]; DWORD SectionNameLength = 0; @@ -5280,18 +5342,17 @@ goto cleanup; } - hInf = SetupOpenInfFileW(SelectedDriver->Details.InfFileName, NULL, INF_STYLE_WIN4, NULL); - if (hInf == INVALID_HANDLE_VALUE) - goto cleanup; - - ret = SetupDiGetActualSectionToInstallW(hInf, SelectedDriver->Details.SectionName, + ret = SetupDiGetActualSectionToInstallW( + SelectedDriver->InfFileDetails->hInf, + SelectedDriver->Details.SectionName, SectionName, MAX_PATH, &SectionNameLength, NULL); if (!ret) goto cleanup; if (InstallParams.InstallMsgHandler) { - ret = SetupInstallFromInfSectionW(InstallParams.hwndParent, hInf, SectionName, + ret = SetupInstallFromInfSectionW(InstallParams.hwndParent, + SelectedDriver->InfFileDetails->hInf, SectionName, SPINST_FILES, NULL, NULL, SP_COPY_NEWER, InstallParams.InstallMsgHandler, InstallParams.InstallMsgHandlerContext, DeviceInfoSet, DeviceInfoData); @@ -5299,15 +5360,14 @@ else { PVOID callback_context = SetupInitDefaultQueueCallback(InstallParams.hwndParent); - ret = SetupInstallFromInfSectionW(InstallParams.hwndParent, hInf, SectionName, + ret = SetupInstallFromInfSectionW(InstallParams.hwndParent, + SelectedDriver->InfFileDetails->hInf, SectionName, SPINST_FILES, NULL, NULL, SP_COPY_NEWER, SetupDefaultQueueCallbackW, callback_context, DeviceInfoSet, DeviceInfoData); SetupTermDefaultQueueCallback(callback_context); } cleanup: - if (hInf != INVALID_HANDLE_VALUE) - SetupCloseInfFile(hInf); if (ret) { InstallParams.Flags |= DI_NOFILECOPY; @@ -5371,10 +5431,9 @@ INT Flags; ULONG DoAction; DWORD RequiredSize; - HINF hInf = INVALID_HANDLE_VALUE; LPCWSTR AssociatedService = NULL; LPWSTR pSectionName = NULL; - LPWSTR ClassName = NULL; + WCHAR ClassName[MAX_CLASS_NAME_LEN]; GUID ClassGuid; LPWSTR lpGuidString = NULL, lpFullGuidString = NULL; BOOL RebootRequired = FALSE; @@ -5422,32 +5481,17 @@ FileTimeToSystemTime(&SelectedDriver->Info.DriverDate, &DriverDate); - hInf = SetupOpenInfFileW(SelectedDriver->Details.InfFileName, NULL, INF_STYLE_WIN4, NULL); - if (hInf == INVALID_HANDLE_VALUE) - goto cleanup; - - Result = SetupDiGetActualSectionToInstallW(hInf, SelectedDriver->Details.SectionName, + Result = SetupDiGetActualSectionToInstallW( + SelectedDriver->InfFileDetails->hInf, + SelectedDriver->Details.SectionName, SectionName, MAX_PATH, &SectionNameLength, NULL); if (!Result || SectionNameLength > MAX_PATH - 9) goto cleanup; pSectionName = &SectionName[wcslen(SectionName)]; /* Get information from [Version] section */ - ClassName = NULL; - RequiredSize = 0; - if (!SetupDiGetINFClassW(SelectedDriver->Details.InfFileName, &ClassGuid, ClassName, RequiredSize, &RequiredSize)) - { - if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) - goto cleanup; - ClassName = HeapAlloc(GetProcessHeap(), 0, RequiredSize * sizeof(WCHAR)); - if (!ClassName) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - goto cleanup; - } - if (!SetupDiGetINFClassW(SelectedDriver->Details.InfFileName, &ClassGuid, ClassName, RequiredSize, &RequiredSize)) - goto cleanup; - } + if (!SetupDiGetINFClassW(SelectedDriver->Details.InfFileName, &ClassGuid, ClassName, MAX_CLASS_NAME_LEN, &RequiredSize)) + goto cleanup; /* Format ClassGuid to a string */ if (UuidToStringW((UUID*)&ClassGuid, &lpGuidString) != RPC_S_OK) goto cleanup; @@ -5481,7 +5525,8 @@ /* Files have already been copied in SetupDiInstallDriverFiles. * Process only registry entries. */ *pSectionName = '\0'; - Result = SetupInstallFromInfSectionW(InstallParams.hwndParent, hInf, SectionName, + Result = SetupInstallFromInfSectionW(InstallParams.hwndParent, + SelectedDriver->InfFileDetails->hInf, SectionName, DoAction, hKey, NULL, SP_COPY_NEWER, InstallParams.InstallMsgHandler, InstallParams.InstallMsgHandlerContext, DeviceInfoSet, DeviceInfoData); @@ -5541,7 +5586,7 @@ /* Install .Services section */ wcscpy(pSectionName, L".Services"); - Result = SetupFindFirstLineW(hInf, SectionName, NULL, &ContextService); + Result = SetupFindFirstLineW(SelectedDriver->InfFileDetails->hInf, SectionName, NULL, &ContextService); while (Result) { LPWSTR ServiceName = NULL; @@ -5600,12 +5645,14 @@ &ContextService, 3, /* Field index */ ServiceSection, RequiredSize, - &RequiredSize); + &RequiredSize); if (!Result) - goto nextfile; + goto nextfile; } SetLastError(ERROR_SUCCESS); - Result = SetupInstallServicesFromInfSectionExW(hInf, ServiceSection, Flags, DeviceInfoSet, DeviceInfoData, ServiceName, NULL); + Result = SetupInstallServicesFromInfSectionExW( + SelectedDriver->InfFileDetails->hInf, + ServiceSection, Flags, DeviceInfoSet, DeviceInfoData, ServiceName, NULL); if (Result && (Flags & SPSVCINST_ASSOCSERVICE)) { AssociatedService = ServiceName; @@ -5631,7 +5678,8 @@ /* Install .HW section */ wcscpy(pSectionName, L".HW"); - Result = SetupInstallFromInfSectionW(InstallParams.hwndParent, hInf, SectionName, + Result = SetupInstallFromInfSectionW(InstallParams.hwndParent, + SelectedDriver->InfFileDetails->hInf, SectionName, SPINST_REGISTRY, hKey, NULL, 0, InstallParams.InstallMsgHandler, InstallParams.InstallMsgHandlerContext, DeviceInfoSet, DeviceInfoData); @@ -5681,10 +5729,7 @@ if (lpGuidString) RpcStringFreeW(&lpGuidString); HeapFree(GetProcessHeap(), 0, (LPWSTR)AssociatedService); - HeapFree(GetProcessHeap(), 0, ClassName); HeapFree(GetProcessHeap(), 0, lpFullGuidString); - if (hInf != INVALID_HANDLE_VALUE) - SetupCloseInfFile(hInf); TRACE("Returning %d\n", ret); return ret;

1 0

[greatlrd] 18730: update the intddraw.h so it use some struct that was missing.
by greatlrd＠svn.reactos.com 24 Oct '05

24 Oct '05

update the intddraw.h so it use some struct that was missing. Modified: trunk/reactos/subsys/win32k/include/intddraw.h _____ Modified: trunk/reactos/subsys/win32k/include/intddraw.h --- trunk/reactos/subsys/win32k/include/intddraw.h 2005-10-23 23:40:19 UTC (rev 18729) +++ trunk/reactos/subsys/win32k/include/intddraw.h 2005-10-24 05:05:07 UTC (rev 18730) @@ -44,20 +44,21 @@ DD_COLORCONTROLCALLBACKS Color; // D3DHAL_CALLBACKS - //D3DHAL_CALLBACKS D3dHal; - //D3DHAL_CALLBACKS3 D3dHal3; - //D3DHAL_D3DEXTENDEDCAPS D3dHal3Ext; + // D3DHAL_CALLBACKS D3dHal; + // D3DHAL_CALLBACKS3 D3dHal3; + // D3DHAL_D3DEXTENDEDCAPS D3dHal3Ext; // Heap Callback - //DD_GETHEAPALIGNMENTDATA HeapData; + DD_GETHEAPALIGNMENTDATA HeapData; // Kernel Callback - //DD_KERNELCALLBACKS Kernel; - //DDKERNELCAPS KernelCaps; + DD_KERNELCALLBACKS Kernel; + DDKERNELCAPS KernelCaps; // Miscellaneous Callback DD_MISCELLANEOUSCALLBACKS Misc; + // NT-based Callback PDD_FLIPTOGDISURFACE DdFlipToGDISurface;

1 0

[hbirr] 18729: Delete some files which weren't deleted by the merge.
by hbirr＠svn.reactos.com 23 Oct '05

23 Oct '05

Delete some files which weren't deleted by the merge. Deleted: branches/cache_manager_rewrite/reactos/apps/utils/net/tcpsvcs/ Deleted: branches/cache_manager_rewrite/reactos/drivers/input/i8042prt/makefile Deleted: branches/cache_manager_rewrite/reactos/include/ddrawi.h Deleted: branches/cache_manager_rewrite/reactos/include/ndk/zwtypes.h Deleted: branches/cache_manager_rewrite/reactos/include/ntdll/ Deleted: branches/cache_manager_rewrite/reactos/lib/aclui/acluilib.h Deleted: branches/cache_manager_rewrite/reactos/lib/comctl32/winetest/ Deleted: branches/cache_manager_rewrite/reactos/lib/fslib/vfatxlib/Makefile Deleted: branches/cache_manager_rewrite/reactos/lib/midimap/ Deleted: branches/cache_manager_rewrite/reactos/lib/msgina/makefile Deleted: branches/cache_manager_rewrite/reactos/lib/ntdll/csr/lpc.c Deleted: branches/cache_manager_rewrite/reactos/lib/ntdll/csr/srv.c Deleted: branches/cache_manager_rewrite/reactos/lib/ntdll/rtl/critical.c Deleted: branches/cache_manager_rewrite/reactos/lib/ntdll/rtl/path.c Deleted: branches/cache_manager_rewrite/reactos/lib/objsel/Makefile.in Deleted: branches/cache_manager_rewrite/reactos/lib/setupapi/makefile Deleted: branches/cache_manager_rewrite/reactos/lib/smdll/connect.c Deleted: branches/cache_manager_rewrite/reactos/lib/smlib/makefile Deleted: branches/cache_manager_rewrite/reactos/lib/winmm/Makefile.in Deleted: branches/cache_manager_rewrite/reactos/ntoskrnl/ps/w32call.c Deleted: branches/cache_manager_rewrite/reactos/subsys/system/dhcp/ Deleted: branches/cache_manager_rewrite/reactos/subsys/system/expand/makefile Deleted: branches/cache_manager_rewrite/reactos/subsys/system/usetup/precomp.h Deleted: branches/cache_manager_rewrite/reactos/subsys/win32k/misc/object.c _____ Deleted: branches/cache_manager_rewrite/reactos/drivers/input/i8042prt/makefile --- branches/cache_manager_rewrite/reactos/drivers/input/i8042prt/makefile 2005-10-23 21:31:15 UTC (rev 18728) +++ branches/cache_manager_rewrite/reactos/drivers/input/i8042prt/makefile 2005-10-23 23:40:19 UTC (rev 18729) @@ -1,5 +0,0 @@ -# This file is automatically generated. - -TOP = ..\..\.. -DEFAULT = i8042prt -include $(TOP)/proxy.mak _____ Deleted: branches/cache_manager_rewrite/reactos/include/ddrawi.h --- branches/cache_manager_rewrite/reactos/include/ddrawi.h 2005-10-23 21:31:15 UTC (rev 18728) +++ branches/cache_manager_rewrite/reactos/include/ddrawi.h 2005-10-23 23:40:19 UTC (rev 18729) @@ -1,1331 +0,0 @@ -/* - * DirectDraw driver interface - * (DirectX 7 version) - * - * Copyright (C) 2001 Ove Kaaven - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef __DDRAWI_INCLUDED__ -#define __DDRAWI_INCLUDED__ - -#ifdef __cplusplus -extern "C" { -#endif - -#include <ddraw.h> - -#ifndef __DDK_DDRAWINT_H -typedef struct _DDVIDEOPORTCAPS *LPDDVIDEOPORTCAPS; /* should be in dvp.h */ -typedef struct _DDKERNELCAPS *LPDDKERNELCAPS; /* should be in ddkernel.h */ -typedef struct _VMEMHEAP *LPVMEMHEAP; /* should be in dmemmgr.h */ -#endif - -#define DDAPI WINAPI - -/* the DirectDraw versions */ -#define DD_VERSION 0x0200 /* compatibility version */ -#define DD_RUNTIME_VERSION 0x0700 /* actual version */ - -/* the HAL version returned from QUERYESCSUPPORT - DCICOMMAND */ -#define DD_HAL_VERSION 0x0100 - -/* more DCICOMMAND escapes */ -#define DDCREATEDRIVEROBJECT 10 -#define DDGET32BITDRIVERNAME 11 -#define DDNEWCALLBACKFNS 12 -#define DDVERSIONINFO 13 - -#define MAX_DRIVER_NAME CCHDEVICENAME - -/********************************************************************** ******* - * Initialization stuff - */ -typedef struct { - char szName[260]; - char szEntryPoint[64]; - DWORD dwContext; -} DD32BITDRIVERDATA,*LPDD32BITDRIVERDATA; - -typedef struct { - DWORD dwHALVersion; - ULONG_PTR dwReserved1; - ULONG_PTR dwReserved2; -} DDVERSIONDATA,*LPDDVERSIONDATA; - -typedef DWORD (PASCAL *LPDD32BITDRIVERINIT)(DWORD dwContext); - -#ifndef __DDK_DDRAWINT_H -/* pointer to video memory */ -typedef ULONG_PTR FLATPTR; -#endif - -/* predeclare some structures */ -typedef struct _DDHALINFO *LPDDHALINFO; -typedef struct _DDRAWI_DIRECTDRAW_INT *LPDDRAWI_DIRECTDRAW_INT; -typedef struct _DDRAWI_DIRECTDRAW_LCL *LPDDRAWI_DIRECTDRAW_LCL; -typedef struct _DDRAWI_DIRECTDRAW_GBL *LPDDRAWI_DIRECTDRAW_GBL; -typedef struct _DDRAWI_DDRAWSURFACE_INT *LPDDRAWI_DDRAWSURFACE_INT; -typedef struct _DDRAWI_DDRAWSURFACE_LCL *LPDDRAWI_DDRAWSURFACE_LCL; -typedef struct _DDRAWI_DDRAWSURFACE_GBL *LPDDRAWI_DDRAWSURFACE_GBL; -typedef struct _DDRAWI_DDRAWSURFACE_MORE *LPDDRAWI_DDRAWSURFACE_MORE; -typedef struct _DDRAWI_DDRAWSURFACE_GBL_MORE *LPDDRAWI_DDRAWSURFACE_GBL_MORE; -typedef struct _DDRAWI_DDRAWPALETTE_INT *LPDDRAWI_DDRAWPALETTE_INT; -typedef struct _DDRAWI_DDRAWPALETTE_LCL *LPDDRAWI_DDRAWPALETTE_LCL; -typedef struct _DDRAWI_DDRAWPALETTE_GBL *LPDDRAWI_DDRAWPALETTE_GBL; -typedef struct _DDRAWI_DDRAWCLIPPER_INT *LPDDRAWI_DDRAWCLIPPER_INT; -typedef struct _DDRAWI_DDRAWCLIPPER_LCL *LPDDRAWI_DDRAWCLIPPER_LCL; -typedef struct _DDRAWI_DDRAWCLIPPER_GBL *LPDDRAWI_DDRAWCLIPPER_GBL; -typedef struct _DDRAWI_DDVIDEOPORT_INT *LPDDRAWI_DDVIDEOPORT_INT; -typedef struct _DDRAWI_DDVIDEOPORT_LCL *LPDDRAWI_DDVIDEOPORT_LCL; -typedef struct _DDRAWI_DDMOTIONCOMP_INT *LPDDRAWI_DDMOTIONCOMP_INT; -typedef struct _DDRAWI_DDMOTIONCOMP_LCL *LPDDRAWI_DDMOTIONCOMP_LCL; - -/********************************************************************** ******* - * driver->ddraw callbacks - */ -typedef BOOL (DDAPI *LPDDHAL_SETINFO)(LPDDHALINFO lpDDHalInfo, BOOL reset); -typedef FLATPTR (DDAPI *LPDDHAL_VIDMEMALLOC)(LPDDRAWI_DIRECTDRAW_GBL lpDD, int heap, DWORD dwWidth, DWORD dwHeight); -typedef void (DDAPI *LPDDHAL_VIDMEMFREE)(LPDDRAWI_DIRECTDRAW_GBL lpDD, int heap, FLATPTR fpMem); - -typedef struct { - DWORD dwSize; - LPDDHAL_SETINFO lpSetInfo; - LPDDHAL_VIDMEMALLOC lpVidMemAlloc; - LPDDHAL_VIDMEMFREE lpVidMemFree; -} DDHALDDRAWFNS,*LPDDHALDDRAWFNS; - -/********************************************************************** ******* - * mode info structure - */ -typedef struct _DDHALMODEINFO { - DWORD dwWidth; - DWORD dwHeight; - LONG lPitch; - DWORD dwBPP; - WORD wFlags; - WORD wRefreshRate; - DWORD dwRBitMask; - DWORD dwGBitMask; - DWORD dwBBitMask; - DWORD dwAlphaBitMask; -} DDHALMODEINFO,*LPDDHALMODEINFO; - -#define DDMODEINFO_PALETTIZED 0x0001 -#define DDMODEINFO_MODEX 0x0002 -#define DDMODEINFO_UNSUPPORTED 0x0004 -#define DDMODEINFO_STANDARDVGA 0x0008 -#define DDMODEINFO_MAXREFRESH 0x0010 -#define DDMODEINFO_STEREO 0x0020 - -/********************************************************************** ******* - * video memory info structure - */ -typedef struct _VIDMEM { - DWORD dwFlags; - FLATPTR fpStart; - union { - FLATPTR fpEnd; - DWORD dwWidth; - } DUMMYUNIONNAME1; - DDSCAPS ddsCaps; - DDSCAPS ddsCapsAlt; - union { - LPVMEMHEAP lpHeap; - DWORD dwHeight; - } DUMMYUNIONNAME2; -} VIDMEM,*LPVIDMEM; - -#ifndef __DDK_DDRAWINT_H -#define VIDMEM_ISLINEAR 0x00000001 -#define VIDMEM_ISRECTANGULAR 0x00000002 -#define VIDMEM_ISHEAP 0x00000004 -#define VIDMEM_ISNONLOCAL 0x00000008 -#define VIDMEM_ISWC 0x00000010 -#define VIDMEM_ISDISABLED 0x00000020 -#endif - -typedef struct _VIDMEMINFO { - FLATPTR fpPrimary; - DWORD dwFlags; - DWORD dwDisplayWidth; - DWORD dwDisplayHeight; - LONG lDisplayPitch; - DDPIXELFORMAT ddpfDisplay; - DWORD dwOffscreenAlign; - DWORD dwOverlayAlign; - DWORD dwTextureAlign; - DWORD dwZBufferAlign; - DWORD dwAlphaAlign; - DWORD dwNumHeaps; - LPVIDMEM pvmList; -} VIDMEMINFO,*LPVIDMEMINFO; - -typedef struct _HEAPALIAS { - FLATPTR fpVidMem; - LPVOID lpAlias; - DWORD dwAliasSize; -} HEAPALIAS,*LPHEAPALIAS; - -typedef struct _HEAPALIASINFO { - DWORD dwRefCnt; - DWORD dwFlags; - DWORD dwNumHeaps; - LPHEAPALIAS lpAliases; -} HEAPALIASINFO,*LPHEAPALIASINFO; - -#define HEAPALIASINFO_MAPPEDREAL 0x00000001 -#define HEAPALIASINFO_MAPPEDDUMMY 0x00000002 - -/********************************************************************** ******* - * capabilities structures - */ -typedef struct _DDCORECAPS { - DWORD dwSize; - DWORD dwCaps; - DWORD dwCaps2; - DWORD dwCKeyCaps; - DWORD dwFXCaps; - DWORD dwFXAlphaCaps; - DWORD dwPalCaps; - DWORD dwSVCaps; - DWORD dwAlphaBltConstBitDepths; - DWORD dwAlphaBltPixelBitDepths; - DWORD dwAlphaBltSurfaceBitDepths; - DWORD dwAlphaOverlayConstBitDepths; - DWORD dwAlphaOverlayPixelBitDepths; - DWORD dwAlphaOverlaySurfaceBitDepths; - DWORD dwZBufferBitDepths; - DWORD dwVidMemTotal; - DWORD dwVidMemFree; - DWORD dwMaxVisibleOverlays; - DWORD dwCurrVisibleOverlays; - DWORD dwNumFourCCCodes; - DWORD dwAlignBoundarySrc; - DWORD dwAlignSizeSrc; - DWORD dwAlignBoundaryDest; - DWORD dwAlignSizeDest; - DWORD dwAlignStrideAlign; - DWORD dwRops[DD_ROP_SPACE]; - DDSCAPS ddsCaps; - DWORD dwMinOverlayStretch; - DWORD dwMaxOverlayStretch; - DWORD dwMinLiveVideoStretch; - DWORD dwMaxLiveVideoStretch; - DWORD dwMinHwCodecStretch; - DWORD dwMaxHwCodecStretch; - DWORD dwReserved1; - DWORD dwReserved2; - DWORD dwReserved3; - DWORD dwSVBCaps; - DWORD dwSVBCKeyCaps; - DWORD dwSVBFXCaps; - DWORD dwSVBRops[DD_ROP_SPACE]; - DWORD dwVSBCaps; - DWORD dwVSBCKeyCaps; - DWORD dwVSBFXCaps; - DWORD dwVSBRops[DD_ROP_SPACE]; - DWORD dwSSBCaps; - DWORD dwSSBCKeyCaps; - DWORD dwSSBFXCaps; - DWORD dwSSBRops[DD_ROP_SPACE]; - DWORD dwMaxVideoPorts; - DWORD dwCurrVideoPorts; - DWORD dwSVBCaps2; -} DDCORECAPS,*LPDDCORECAPS; - -typedef struct _DDNONLOCALVIDMEMCAPS { - DWORD dwSize; - DWORD dwNLVBCaps; - DWORD dwNLVBCaps2; - DWORD dwNLVBCKeyCaps; - DWORD dwNLVBFXCaps; - DWORD dwNLVBRops[DD_ROP_SPACE]; -} DDNONLOCALVIDMEMCAPS,*LPDDNONLOCALVIDMEMCAPS; - -#define DDSCAPS_EXECUTEBUFFER DDSCAPS_RESERVED2 -#define DDSCAPS2_VERTEXBUFFER DDSCAPS2_RESERVED1 -#define DDSCAPS2_COMMANDBUFFER DDSCAPS2_RESERVED2 - -/********************************************************************** ******* - * ddraw->driver callbacks - */ -#define DDHAL_DRIVER_NOTHANDLED 0 -#define DDHAL_DRIVER_HANDLED 1 -#define DDHAL_DRIVER_NOCKEYHW 2 - -typedef struct _DDHAL_DESTROYDRIVERDATA *LPDDHAL_DESTROYDRIVERDATA; -typedef struct _DDHAL_CREATESURFACEDATA *LPDDHAL_CREATESURFACEDATA; -typedef struct _DDHAL_DRVSETCOLORKEYDATA *LPDDHAL_DRVSETCOLORKEYDATA; -typedef struct _DDHAL_SETMODEDATA *LPDDHAL_SETMODEDATA; -typedef struct _DDHAL_WAITFORVERTICALBLANKDATA *LPDDHAL_WAITFORVERTICALBLANKDATA; -typedef struct _DDHAL_CANCREATESURFACEDATA *LPDDHAL_CANCREATESURFACEDATA; -typedef struct _DDHAL_CREATEPALETTEDATA *LPDDHAL_CREATEPALETTEDATA; -typedef struct _DDHAL_GETSCANLINEDATA *LPDDHAL_GETSCANLINEDATA; -typedef struct _DDHAL_SETEXCLUSIVEMODEDATA *LPDDHAL_SETEXCLUSIVEMODEDATA; -typedef struct _DDHAL_FLIPTOGDISURFACEDATA *LPDDHAL_FLIPTOGDISURFACEDATA; - -typedef DWORD (PASCAL *LPDDHAL_DESTROYDRIVER) (LPDDHAL_DESTROYDRIVERDATA); -typedef DWORD (PASCAL *LPDDHAL_CREATESURFACE) (LPDDHAL_CREATESURFACEDATA); -typedef DWORD (PASCAL *LPDDHAL_SETCOLORKEY) (LPDDHAL_DRVSETCOLORKEYDATA); -typedef DWORD (PASCAL *LPDDHAL_SETMODE) (LPDDHAL_SETMODEDATA); -typedef DWORD (PASCAL *LPDDHAL_WAITFORVERTICALBLANK)(LPDDHAL_WAITFORVERTICALBLANKDATA); -typedef DWORD (PASCAL *LPDDHAL_CANCREATESURFACE) (LPDDHAL_CANCREATESURFACEDATA ); -typedef DWORD (PASCAL *LPDDHAL_CREATEPALETTE) (LPDDHAL_CREATEPALETTEDATA); -typedef DWORD (PASCAL *LPDDHAL_GETSCANLINE) (LPDDHAL_GETSCANLINEDATA); -typedef DWORD (PASCAL *LPDDHAL_SETEXCLUSIVEMODE) (LPDDHAL_SETEXCLUSIVEMODEDATA); -typedef DWORD (PASCAL *LPDDHAL_FLIPTOGDISURFACE) (LPDDHAL_FLIPTOGDISURFACEDATA); - -typedef struct _DDHAL_DDCALLBACKS { - DWORD dwSize; - DWORD dwFlags; - LPDDHAL_DESTROYDRIVER DestroyDriver; - LPDDHAL_CREATESURFACE CreateSurface; - LPDDHAL_SETCOLORKEY SetColorKey; - LPDDHAL_SETMODE SetMode; - LPDDHAL_WAITFORVERTICALBLANK WaitForVerticalBlank; - LPDDHAL_CANCREATESURFACE CanCreateSurface; - LPDDHAL_CREATEPALETTE CreatePalette; - LPDDHAL_GETSCANLINE GetScanLine; - /* DirectX 2 */ - LPDDHAL_SETEXCLUSIVEMODE SetExclusiveMode; - LPDDHAL_FLIPTOGDISURFACE FlipToGDISurface; -} DDHAL_DDCALLBACKS,*LPDDHAL_DDCALLBACKS; - -typedef struct _DDHAL_DESTROYSURFACEDATA *LPDDHAL_DESTROYSURFACEDATA; -typedef struct _DDHAL_FLIPDATA *LPDDHAL_FLIPDATA; -typedef struct _DDHAL_SETCLIPLISTDATA *LPDDHAL_SETCLIPLISTDATA; -typedef struct _DDHAL_LOCKDATA *LPDDHAL_LOCKDATA; -typedef struct _DDHAL_UNLOCKDATA *LPDDHAL_UNLOCKDATA; -typedef struct _DDHAL_BLTDATA *LPDDHAL_BLTDATA; -typedef struct _DDHAL_SETCOLORKEYDATA *LPDDHAL_SETCOLORKEYDATA; -typedef struct _DDHAL_ADDATTACHEDSURFACEDATA *LPDDHAL_ADDATTACHEDSURFACEDATA; -typedef struct _DDHAL_GETBLTSTATUSDATA *LPDDHAL_GETBLTSTATUSDATA; -typedef struct _DDHAL_GETFLIPSTATUSDATA *LPDDHAL_GETFLIPSTATUSDATA; -typedef struct _DDHAL_UPDATEOVERLAYDATA *LPDDHAL_UPDATEOVERLAYDATA; -typedef struct _DDHAL_SETOVERLAYPOSITIONDATA *LPDDHAL_SETOVERLAYPOSITIONDATA; -typedef struct _DDHAL_SETPALETTEDATA *LPDDHAL_SETPALETTEDATA; - -typedef DWORD (PASCAL *LPDDHALSURFCB_DESTROYSURFACE) (LPDDHAL_DESTROYSURFACEDATA); -typedef DWORD (PASCAL *LPDDHALSURFCB_FLIP) (LPDDHAL_FLIPDATA); -typedef DWORD (PASCAL *LPDDHALSURFCB_SETCLIPLIST) (LPDDHAL_SETCLIPLISTDATA); -typedef DWORD (PASCAL *LPDDHALSURFCB_LOCK) (LPDDHAL_LOCKDATA); -typedef DWORD (PASCAL *LPDDHALSURFCB_UNLOCK) (LPDDHAL_UNLOCKDATA); -typedef DWORD (PASCAL *LPDDHALSURFCB_BLT) (LPDDHAL_BLTDATA); -typedef DWORD (PASCAL *LPDDHALSURFCB_SETCOLORKEY) (LPDDHAL_SETCOLORKEYDATA); -typedef DWORD (PASCAL *LPDDHALSURFCB_ADDATTACHEDSURFACE)(LPDDHAL_ADDATTACHEDSURFACEDATA); -typedef DWORD (PASCAL *LPDDHALSURFCB_GETBLTSTATUS) (LPDDHAL_GETBLTSTATUSDATA); -typedef DWORD (PASCAL *LPDDHALSURFCB_GETFLIPSTATUS) (LPDDHAL_GETFLIPSTATUSDATA); -typedef DWORD (PASCAL *LPDDHALSURFCB_UPDATEOVERLAY) (LPDDHAL_UPDATEOVERLAYDATA); -typedef DWORD (PASCAL *LPDDHALSURFCB_SETOVERLAYPOSITION)(LPDDHAL_SETOVERLAYPOSITIONDATA); -typedef DWORD (PASCAL *LPDDHALSURFCB_SETPALETTE) (LPDDHAL_SETPALETTEDATA); - -typedef struct _DDHAL_DDSURFACECALLBACKS { - DWORD dwSize; - DWORD dwFlags; - LPDDHALSURFCB_DESTROYSURFACE DestroySurface; - LPDDHALSURFCB_FLIP Flip; - LPDDHALSURFCB_SETCLIPLIST SetClipList; - LPDDHALSURFCB_LOCK Lock; - LPDDHALSURFCB_UNLOCK Unlock; - LPDDHALSURFCB_BLT Blt; - LPDDHALSURFCB_SETCOLORKEY SetColorKey; - LPDDHALSURFCB_ADDATTACHEDSURFACE AddAttachedSurface; - LPDDHALSURFCB_GETBLTSTATUS GetBltStatus; - LPDDHALSURFCB_GETFLIPSTATUS GetFlipStatus; - LPDDHALSURFCB_UPDATEOVERLAY UpdateOverlay; - LPDDHALSURFCB_SETOVERLAYPOSITION SetOverlayPosition; - LPVOID reserved4; - LPDDHALSURFCB_SETPALETTE SetPalette; -} DDHAL_DDSURFACECALLBACKS,*LPDDHAL_DDSURFACECALLBACKS; - -typedef struct _DDHAL_DESTROYPALETTEDATA *LPDDHAL_DESTROYPALETTEDATA; -typedef struct _DDHAL_SETENTRIESDATA *LPDDHAL_SETENTRIESDATA; - -typedef DWORD (PASCAL *LPDDHALPALCB_DESTROYPALETTE)(LPDDHAL_DESTROYPALETTEDATA); -typedef DWORD (PASCAL *LPDDHALPALCB_SETENTRIES) (LPDDHAL_SETENTRIESDATA); - -typedef struct _DDHAL_DDPALETTECALLBACKS { - DWORD dwSize; - DWORD dwFlags; - LPDDHALPALCB_DESTROYPALETTE DestroyPalette; - LPDDHALPALCB_SETENTRIES SetEntries; -} DDHAL_DDPALETTECALLBACKS,*LPDDHAL_DDPALETTECALLBACKS; - -typedef DWORD (PASCAL *LPDDHALEXEBUFCB_CANCREATEEXEBUF)(LPDDHAL_CANCREATESURFACEDATA); -typedef DWORD (PASCAL *LPDDHALEXEBUFCB_CREATEEXEBUF) (LPDDHAL_CREATESURFACEDATA); -typedef DWORD (PASCAL *LPDDHALEXEBUFCB_DESTROYEXEBUF) (LPDDHAL_DESTROYSURFACEDATA); -typedef DWORD (PASCAL *LPDDHALEXEBUFCB_LOCKEXEBUF) (LPDDHAL_LOCKDATA); -typedef DWORD (PASCAL *LPDDHALEXEBUFCB_UNLOCKEXEBUF) (LPDDHAL_UNLOCKDATA); - -typedef struct _DDHAL_DDEXEBUFCALLBACKS { - DWORD dwSize; - DWORD dwFlags; - LPDDHALEXEBUFCB_CANCREATEEXEBUF CanCreateExecuteBuffer; - LPDDHALEXEBUFCB_CREATEEXEBUF CreateExecuteBuffer; - LPDDHALEXEBUFCB_DESTROYEXEBUF DestroyExecuteBuffer; - LPDDHALEXEBUFCB_LOCKEXEBUF LockExecuteBuffer; - LPDDHALEXEBUFCB_UNLOCKEXEBUF UnlockExecuteBuffer; -} DDHAL_DDEXEBUFCALLBACKS,*LPDDHAL_DDEXEBUFCALLBACKS; - -typedef struct _DDHAL_GETAVAILDRIVERMEMORYDATA *LPDDHAL_GETAVAILDRIVERMEMORYDATA; -typedef struct _DDHAL_UPDATENONLOCALHEAPDATA *LPDDHAL_UPDATENONLOCALHEAPDATA; -typedef struct _DDHAL_GETHEAPALIGNMENTDATA *LPDDHAL_GETHEAPALIGNMENTDATA; - -typedef DWORD (PASCAL *LPDDHAL_GETAVAILDRIVERMEMORY)(LPDDHAL_GETAVAILDRIVERMEMORYDATA); -typedef DWORD (PASCAL *LPDDHAL_UPDATENONLOCALHEAP) (LPDDHAL_UPDATENONLOCALHEAPDATA); -typedef DWORD (PASCAL *LPDDHAL_GETHEAPALIGNMENT) (LPDDHAL_GETHEAPALIGNMENTDATA); - -typedef struct _DDHAL_DDMISCELLANEOUSCALLBACKS { - DWORD dwSize; - DWORD dwFlags; - LPDDHAL_GETAVAILDRIVERMEMORY GetAvailDriverMemory; - LPDDHAL_UPDATENONLOCALHEAP UpdateNonLocalHeap; - LPDDHAL_GETHEAPALIGNMENT GetHeapAlignment; - LPDDHALSURFCB_GETBLTSTATUS GetSysmemBltStatus; -} DDHAL_DDMISCELLANEOUSCALLBACKS,*LPDDHAL_DDMISCELLANEOUSCALLBACKS; - -typedef struct _DDHAL_CREATESURFACEEXDATA *LPDDHAL_CREATESURFACEEXDATA; -typedef struct _DDHAL_GETDRIVERSTATEDATA *LPDDHAL_GETDRIVERSTATEDATA; -typedef struct _DDHAL_DESTROYDDLOCALDATA *LPDDHAL_DESTROYDDLOCALDATA; - -typedef DWORD (PASCAL *LPDDHAL_CREATESURFACEEX)(LPDDHAL_CREATESURFACEEXDATA); -typedef DWORD (PASCAL *LPDDHAL_GETDRIVERSTATE) (LPDDHAL_GETDRIVERSTATEDATA); -typedef DWORD (PASCAL *LPDDHAL_DESTROYDDLOCAL) (LPDDHAL_DESTROYDDLOCALDATA); - -typedef struct _DDHAL_DDMISCELLANEOUS2CALLBACKS { - DWORD dwSize; - DWORD dwFlags; - LPVOID Reserved; - LPDDHAL_CREATESURFACEEX CreateSurfaceEx; - LPDDHAL_GETDRIVERSTATE GetDriverState; - LPDDHAL_DESTROYDDLOCAL DestroyDDLocal; -} DDHAL_DDMISCELLANEOUS2CALLBACKS,*LPDDHAL_DDMISCELLANEOUS2CALLBACKS; - -typedef HRESULT (WINAPI *LPDDGAMMACALIBRATORPROC)(LPDDGAMMARAMP, LPBYTE); - -/********************************************************************** ******* - * driver info structure - * - * The HAL is queried for additional callbacks via the GetDriverInfo callback. - */ -typedef struct _DDHAL_GETDRIVERINFODATA *LPDDHAL_GETDRIVERINFODATA; -typedef DWORD (PASCAL *LPDDHAL_GETDRIVERINFO)(LPDDHAL_GETDRIVERINFODATA); - -typedef struct _DDHALINFO { - DWORD dwSize; - LPDDHAL_DDCALLBACKS lpDDCallbacks; - LPDDHAL_DDSURFACECALLBACKS lpDDSurfaceCallbacks; - LPDDHAL_DDPALETTECALLBACKS lpDDPaletteCallbacks; - VIDMEMINFO vmiData; - DDCORECAPS ddCaps; - DWORD dwMonitorFrequency; - LPDDHAL_GETDRIVERINFO GetDriverInfo; - DWORD dwModeIndex; - LPDWORD lpdwFourCC; - DWORD dwNumModes; - LPDDHALMODEINFO lpModeInfo; - DWORD dwFlags; - LPVOID lpPDevice; - DWORD hInstance; - /* DirectX 2 */ - ULONG_PTR lpD3DGlobalDriverData; - ULONG_PTR lpD3DHALCallbacks; - LPDDHAL_DDEXEBUFCALLBACKS lpDDExeBufCallbacks; -} DDHALINFO; - -#define DDHALINFO_ISPRIMARYDISPLAY 0x00000001 -#define DDHALINFO_MODEXILLEGAL 0x00000002 -#define DDHALINFO_GETDRIVERINFOSET 0x00000004 - -/* where the high-level ddraw implementation stores the callbacks */ -typedef struct _DDHAL_CALLBACKS { - DDHAL_DDCALLBACKS cbDDCallbacks; - DDHAL_DDSURFACECALLBACKS cbDDSurfaceCallbacks; - DDHAL_DDPALETTECALLBACKS cbDDPaletteCallbacks; - DDHAL_DDCALLBACKS HALDD; - DDHAL_DDSURFACECALLBACKS HALDDSurface; - DDHAL_DDPALETTECALLBACKS HALDDPalette; - DDHAL_DDCALLBACKS HELDD; - DDHAL_DDSURFACECALLBACKS HELDDSurface; - DDHAL_DDPALETTECALLBACKS HELDDPalette; - DDHAL_DDEXEBUFCALLBACKS cbDDExeBufCallbacks; - DDHAL_DDEXEBUFCALLBACKS HALDDExeBuf; - DDHAL_DDEXEBUFCALLBACKS HELDDExeBuf; - /* there's more... videoport, colorcontrol, misc, and motion compensation callbacks... */ -} DDHAL_CALLBACKS,*LPDDHAL_CALLBACKS; - -/********************************************************************** ******* - * parameter structures - */ -typedef struct _DDHAL_DESTROYDRIVERDATA { - LPDDRAWI_DIRECTDRAW_GBL lpDD; - HRESULT ddRVal; - LPDDHAL_DESTROYDRIVER DestroyDriver; -} DDHAL_DESTROYDRIVERDATA; - -typedef struct _DDHAL_SETMODEDATA { - LPDDRAWI_DIRECTDRAW_GBL lpDD; - DWORD dwModeIndex; - HRESULT ddRVal; - LPDDHAL_SETMODE SetMode; - BOOL inexcl; - BOOL useRefreshRate; -} DDHAL_SETMODEDATA; - -typedef struct _DDHAL_CREATESURFACEDATA { - LPDDRAWI_DIRECTDRAW_GBL lpDD; - LPDDSURFACEDESC lpDDSurfaceDesc; - LPDDRAWI_DDRAWSURFACE_LCL * lplpSList; - DWORD dwSCnt; - HRESULT ddRVal; - LPDDHAL_CREATESURFACE CreateSurface; -} DDHAL_CREATESURFACEDATA; - -typedef struct _DDHAL_CANCREATESURFACEDATA { - LPDDRAWI_DIRECTDRAW_GBL lpDD; - LPDDSURFACEDESC lpDDSurfaceDesc; - DWORD bIsDifferentPixelFormat; - HRESULT ddRVal; - LPDDHAL_CANCREATESURFACE CanCreateSurface; -} DDHAL_CANCREATESURFACEDATA; - -typedef struct _DDHAL_CREATEPALETTEDATA { - LPDDRAWI_DIRECTDRAW_GBL lpDD; - LPDDRAWI_DDRAWPALETTE_GBL lpDDPalette; - LPPALETTEENTRY lpColorTable; - HRESULT ddRVal; - LPDDHAL_CREATEPALETTE CreatePalette; - BOOL is_excl; -} DDHAL_CREATEPALETTEDATA; - -typedef struct _DDHAL_SETEXCLUSIVEMODEDATA { - LPDDRAWI_DIRECTDRAW_GBL lpDD; - DWORD dwEnterExcl; - DWORD dwReserved; - HRESULT ddRVal; - LPDDHAL_SETEXCLUSIVEMODE SetExclusiveMode; -} DDHAL_SETEXCLUSIVEMODEDATA; - -/* surfaces */ -typedef struct _DDHAL_DESTROYSURFACEDATA { - LPDDRAWI_DIRECTDRAW_GBL lpDD; - LPDDRAWI_DDRAWSURFACE_LCL lpDDSurface; - HRESULT ddRVal; - LPDDHALSURFCB_DESTROYSURFACE DestroySurface; -} DDHAL_DESTROYSURFACEDATA; - -typedef struct _DDHAL_FLIPDATA { - LPDDRAWI_DIRECTDRAW_GBL lpDD; - LPDDRAWI_DDRAWSURFACE_LCL lpSurfCurr; - LPDDRAWI_DDRAWSURFACE_LCL lpSurfTarg; - DWORD dwFlags; - HRESULT ddRVal; - LPDDHALSURFCB_FLIP Flip; - LPDDRAWI_DDRAWSURFACE_LCL lpSurfCurrLeft; - LPDDRAWI_DDRAWSURFACE_LCL lpSurfTargLeft; -} DDHAL_FLIPDATA; - -typedef struct _DDHAL_LOCKDATA { - LPDDRAWI_DIRECTDRAW_GBL lpDD; - LPDDRAWI_DDRAWSURFACE_LCL lpDDSurface; - DWORD bHasRect; - RECTL rArea; - LPVOID lpSurfData; - HRESULT ddRVal; - LPDDHALSURFCB_LOCK Lock; - DWORD dwFlags; -} DDHAL_LOCKDATA; - -typedef struct _DDHAL_UNLOCKDATA { - LPDDRAWI_DIRECTDRAW_GBL lpDD; - LPDDRAWI_DDRAWSURFACE_LCL lpDDSurface; - HRESULT ddRVal; - LPDDHALSURFCB_UNLOCK Unlock; -} DDHAL_UNLOCKDATA; - -typedef struct _DDHAL_BLTDATA { - LPDDRAWI_DIRECTDRAW_GBL lpDD; - LPDDRAWI_DDRAWSURFACE_LCL lpDDDestSurface; - RECTL rDest; - LPDDRAWI_DDRAWSURFACE_LCL lpDDSrcSurface; - RECTL rSrc; - DWORD dwFlags; - DWORD dwROPFlags; - DDBLTFX bltFX; - HRESULT ddRVal; - LPDDHALSURFCB_BLT Blt; - BOOL IsClipped; - RECTL rOrigDest; - RECTL rOrigSrc; - DWORD dwRectCnt; - LPRECT prDestRects; -} DDHAL_BLTDATA; - -typedef struct _DDHAL_SETPALETTEDATA { - LPDDRAWI_DIRECTDRAW_GBL lpDD; - LPDDRAWI_DDRAWSURFACE_LCL lpDDSurface; - LPDDRAWI_DDRAWPALETTE_GBL lpDDPalette; - HRESULT ddRVal; - LPDDHALSURFCB_SETPALETTE SetPalette; - BOOL Attach; -} DDHAL_SETPALETTEDATA; - -/* palettes */ -typedef struct _DDHAL_DESTROYPALETTEDATA { - LPDDRAWI_DIRECTDRAW_GBL lpDD; - LPDDRAWI_DDRAWPALETTE_GBL lpDDPalette; - HRESULT ddRVal; - LPDDHALPALCB_DESTROYPALETTE DestroyPalette; -} DDHAL_DESTROYPALETTEDATA; - -typedef struct _DDHAL_SETENTRIESDATA { - LPDDRAWI_DIRECTDRAW_GBL lpDD; - LPDDRAWI_DDRAWPALETTE_GBL lpDDPalette; - DWORD dwBase; - DWORD dwNumEntries; - LPPALETTEENTRY lpEntries; - HRESULT ddRVal; - LPDDHALPALCB_SETENTRIES SetEntries; -} DDHAL_SETENTRIESDATA; - -typedef struct _DDHAL_GETDRIVERINFODATA { - DWORD dwSize; - DWORD dwFlags; - GUID guidInfo; - DWORD dwExpectedSize; - LPVOID lpvData; - DWORD dwActualSize; - HRESULT ddRVal; - ULONG_PTR dwContext; -} DDHAL_GETDRIVERINFODATA; - -/********************************************************************** ******* - * high-level ddraw implementation structures - */ -#ifndef __USE_W32API -typedef DWORD IUnknown; /* FIXME: implement proper definition */ -#endif -typedef struct _IUNKNOWN_LIST { - struct _IUNKNOWN_LIST * lpLink; - LPGUID lpGuid; - IUnknown * lpIUnknown; -} IUNKNOWN_LIST,*LPIUNKNOWN_LIST; - -typedef struct _PROCESS_LIST { - struct _PROCESS_LIST * lpLink; - DWORD dwProcessId; - DWORD dwRefCnt; - DWORD dwAlphaDepth; - DWORD dwZDepth; -} PROCESS_LIST,*LPPROCESS_LIST; - -typedef struct _ATTACHLIST { - DWORD dwFlags; - struct _ATTACHLIST * lpLink; - LPDDRAWI_DDRAWSURFACE_LCL lpAttached; - LPDDRAWI_DDRAWSURFACE_INT lpIAttached; -} ATTACHLIST,*LPATTACHLIST; - -#define DDAL_IMPLICIT 0x00000001 - -typedef struct _ACCESSRECTLIST { - struct _ACCESSRECTLIST * lpLink; - RECT rDest; - LPDDRAWI_DIRECTDRAW_LCL lpOwner; - LPVOID lpSurfaceData; - DWORD dwFlags; - LPHEAPALIASINFO lpHeapAliasInfo; -} ACCESSRECTLIST,*LPACCESSRECTLIST; - -#define ACCESSRECT_VRAMSTYLE 0x00000001 -#define ACCESSRECT_NOTHOLDINGWIN16LOCK 0x00000002 -#define ACCESSRECT_BROKEN 0x00000004 - -typedef struct _DBLNODE { - struct _DBLNODE * next; - struct _DBLNODE * prev; - LPDDRAWI_DDRAWSURFACE_LCL object; - LPDDRAWI_DDRAWSURFACE_INT object_int; -} DBLNODE,*LPDBLNODE; - -typedef struct _DDRAWI_DIRECTDRAW_INT { - LPVOID lpVtbl; - LPDDRAWI_DIRECTDRAW_LCL lpLcl; - LPDDRAWI_DIRECTDRAW_INT lpLink; - DWORD dwIntRefCnt; -} DDRAWI_DIRECTDRAW_INT; - -typedef struct _DDRAWI_DIRECTDRAW_LCL { - DWORD lpDDMore; - LPDDRAWI_DIRECTDRAW_GBL lpGbl; - DWORD dwUnused0; - DWORD dwLocalFlags; - DWORD dwLocalRefCnt; - DWORD dwProcessId; - IUnknown * pUnkOuter; - DWORD dwObsolete1; - ULONG_PTR hWnd; - ULONG_PTR hDC; - DWORD dwErrorMode; - LPDDRAWI_DDRAWSURFACE_INT lpPrimary; - LPDDRAWI_DDRAWSURFACE_INT lpCB; - DWORD dwPreferredMode; - /* DirectX 2 */ - HINSTANCE hD3DInstance; - IUnknown * pD3DIUnknown; - LPDDHAL_CALLBACKS lpDDCB; - ULONG_PTR hDDVxd; - /* DirectX 5.0 */ - DWORD dwAppHackFlags; - /* DirectX 5.0A */ - ULONG_PTR hFocusWnd; - DWORD dwHotTracking; - DWORD dwIMEState; - /* DirectX 6.0 */ - ULONG_PTR hWndPopup; - ULONG_PTR hDD; - ULONG_PTR hGammaCalibrator; - LPDDGAMMACALIBRATORPROC lpGammaCalibrator; -} DDRAWI_DIRECTDRAW_LCL; - -#define DDRAWILCL_HASEXCLUSIVEMODE 0x00000001 -#define DDRAWILCL_ISFULLSCREEN 0x00000002 -#define DDRAWILCL_SETCOOPCALLED 0x00000004 -#define DDRAWILCL_ACTIVEYES 0x00000008 -#define DDRAWILCL_ACTIVENO 0x00000010 -#define DDRAWILCL_HOOKEDHWND 0x00000020 -#define DDRAWILCL_ALLOWMODEX 0x00000040 -#define DDRAWILCL_V1SCLBEHAVIOUR 0x00000080 -#define DDRAWILCL_MODEHASBEENCHANGED 0x00000100 -#define DDRAWILCL_CREATEDWINDOW 0x00000200 -#define DDRAWILCL_DIRTYDC 0x00000400 -#define DDRAWILCL_DISABLEINACTIVATE 0x00000800 -#define DDRAWILCL_CURSORCLIPPED 0x00001000 -#define DDRAWILCL_EXPLICITMONITOR 0x00002000 -#define DDRAWILCL_MULTITHREADED 0x00004000 -#define DDRAWILCL_FPUSETUP 0x00008000 -#define DDRAWILCL_POWEREDDOWN 0x00010000 -#define DDRAWILCL_DIRECTDRAW7 0x00020000 -#define DDRAWILCL_ATTEMPTEDD3DCONTEXT 0x00040000 -#define DDRAWILCL_FPUPRESERVE 0x00080000 - -typedef struct _DDRAWI_DIRECTDRAW_GBL { - DWORD dwRefCnt; - DWORD dwFlags; - FLATPTR fpPrimaryOrig; - DDCORECAPS ddCaps; - DWORD dwInternal1; - DWORD dwUnused1[9]; - LPDDHAL_CALLBACKS lpDDCBtmp; - LPDDRAWI_DDRAWSURFACE_INT dsList; - LPDDRAWI_DDRAWPALETTE_INT palList; - LPDDRAWI_DDRAWCLIPPER_INT clipperList; - LPDDRAWI_DIRECTDRAW_GBL lp16DD; - DWORD dwMaxOverlays; - DWORD dwCurrOverlays; - DWORD dwMonitorFrequency; - DDCORECAPS ddHELCaps; - DWORD dwUnused2[50]; - DDCOLORKEY ddckCKDestOverlay; - DDCOLORKEY ddckCKSrcOverlay; - VIDMEMINFO vmiData; - LPVOID lpDriverHandle; - LPDDRAWI_DIRECTDRAW_LCL lpExclusiveOwner; - DWORD dwModeIndex; - DWORD dwModeIndexOrig; - DWORD dwNumFourCC; - LPDWORD lpdwFourCC; - DWORD dwNumModes; - LPDDHALMODEINFO lpModeInfo; - PROCESS_LIST plProcessList; - DWORD dwSurfaceLockCount; - DWORD dwAliasedLockCnt; - ULONG_PTR dwReserved3; - ULONG_PTR hDD; - char cObsolete[12]; - DWORD dwReserved1; - DWORD dwReserved2; - DBLNODE dbnOverlayRoot; - volatile LPWORD lpwPDeviceFlags; - DWORD dwPDevice; - DWORD dwWin16LockCnt; - DWORD dwUnused3; - DWORD hInstance; - DWORD dwEvent16; - DWORD dwSaveNumModes; - /* DirectX 2 */ - ULONG_PTR lpD3DGlobalDriverData; - ULONG_PTR lpD3DHALCallbacks; - DDCORECAPS ddBothCaps; - /* DirectX 5.0 */ - LPDDVIDEOPORTCAPS lpDDVideoPortCaps; - LPDDRAWI_DDVIDEOPORT_INT dvpList; - ULONG_PTR lpD3DHALCallbacks2; - RECT rectDevice; - DWORD cMonitors; - LPVOID gpbmiSrc; - LPVOID gpbmiDest; - LPHEAPALIASINFO phaiHeapAliases; - ULONG_PTR hKernelHandle; - ULONG_PTR pfnNotifyProc; - LPDDKERNELCAPS lpDDKernelCaps; - LPDDNONLOCALVIDMEMCAPS lpddNLVCaps; - LPDDNONLOCALVIDMEMCAPS lpddNLVHELCaps; - LPDDNONLOCALVIDMEMCAPS lpddNLVBothCaps; - ULONG_PTR lpD3DExtendedCaps; - /* DirectX 5.0A */ - DWORD dwDOSBoxEvent; - RECT rectDesktop; - char cDriverName[MAX_DRIVER_NAME]; - /* DirectX 6.0 */ - ULONG_PTR lpD3DHALCallbacks3; - DWORD dwNumZPixelFormats; - LPDDPIXELFORMAT lpZPixelFormats; - LPDDRAWI_DDMOTIONCOMP_INT mcList; - DWORD hDDVxd; - DDSCAPSEX ddsCapsMore; -} DDRAWI_DIRECTDRAW_GBL; - -#define DDRAWI_VIRTUALDESKTOP 0x00000008 -#define DDRAWI_MODEX 0x00000010 -#define DDRAWI_DISPLAYDRV 0x00000020 -#define DDRAWI_FULLSCREEN 0x00000040 -#define DDRAWI_MODECHANGED 0x00000080 -#define DDRAWI_NOHARDWARE 0x00000100 -#define DDRAWI_PALETTEINIT 0x00000200 -#define DDRAWI_NOEMULATION 0x00000400 -/* more... */ - -/* surfaces */ -typedef struct _DDRAWI_DDRAWSURFACE_INT { - LPVOID lpVtbl; - LPDDRAWI_DDRAWSURFACE_LCL lpLcl; - LPDDRAWI_DDRAWSURFACE_INT lpLink; - DWORD dwIntRefCnt; -} DDRAWI_DDRAWSURFACE_INT; - -typedef struct _DDRAWI_DDRAWSURFACE_GBL { - DWORD dwRefCnt; - DWORD dwGlobalFlags; - union { - LPACCESSRECTLIST lpRectList; - DWORD dwBlockSizeY; - } DUMMYUNIONNAME1; - union { - LPVMEMHEAP lpVidMemHeap; - DWORD dwBlockSizeX; - } DUMMYUNIONNAME2; - union { - LPDDRAWI_DIRECTDRAW_GBL lpDD; - LPVOID lpDDHandle; - } DUMMYUNIONNAME3; - FLATPTR fpVidMem; - union { - LONG lPitch; - DWORD dwLinearSize; - } DUMMYUNIONNAME4; - WORD wHeight; - WORD wWidth; - DWORD dwUsageCount; - ULONG_PTR dwReserved1; /* for display driver use */ - /* optional (defaults to primary surface pixelformat) */ - DDPIXELFORMAT ddpfSurface; -} DDRAWI_DDRAWSURFACE_GBL; - -#define DDRAWISURFGBL_MEMFREE 0x00000001 -#define DDRAWISURFGBL_SYSMEMREQUESTED 0x00000002 -#define DDRAWISURFGBL_ISGDISURFACE 0x00000004 -#define DDRAWISURFGBL_SOFTWAREAUTOFLIP 0x00000008 -#define DDRAWISURFGBL_LOCKNOTHOLDINGWIN16LOCK 0x00000010 -#define DDRAWISURFGBL_LOCKVRAMSTYLE 0x00000020 -#define DDRAWISURFGBL_LOCKBROKEN 0x00000040 -#define DDRAWISURFGBL_IMPLICITHANDLE 0x00000080 -#define DDRAWISURFGBL_ISCLIENTMEM 0x00000100 -#define DDRAWISURFGBL_HARDWAREOPSOURCE 0x00000200 -#define DDRAWISURFGBL_HARDWAREOPDEST 0x00000400 -#define DDRAWISURFGBL_HARDWAREOPSTARTED 0x00000600 -#define DDRAWISURFGBL_VPORTINTERLEAVED 0x00000800 -#define DDRAWISURFGBL_VPORTDATA 0x00001000 -#define DDRAWISURFGBL_LATEALLOCATELINEAR 0x00002000 -#define DDRAWISURFGBL_SYSMEMEXECUTEBUFFER 0x00004000 -#define DDRAWISURFGBL_FASTLOCKHELD 0x00008000 -#define DDRAWISURFGBL_READONLYLOCKHELD 0x00010000 - -typedef struct _DDRAWI_DDRAWSURFACE_GBL_MORE { - DWORD dwSize; - union { - DWORD dwPhysicalPageTable; - FLATPTR fpPhysicalVidMem; - } DUMMYUNIONNAME1; - LPDWORD pPageTable; - DWORD cPages; - ULONG_PTR dwSavedDCContext; - FLATPTR fpAliasedVidMem; - ULONG_PTR dwDriverReserved; - ULONG_PTR dwHELReserved; - DWORD cPageUnlocks; - ULONG_PTR hKernelSurface; - DWORD dwKernelRefCnt; - LPDDCOLORCONTROL lpColorInfo; - FLATPTR fpNTAlias; - DWORD dwContentsStamp; - LPVOID lpvUnswappedDriverReserved; - LPVOID lpDDRAWReserved2; - DWORD dwDDRAWReserved1; - DWORD dwDDRAWReserved2; - FLATPTR fpAliasOfVidMem; -} DDRAWI_DDRAWSURFACE_GBL_MORE; - -/* the MS version of this macro was somewhat obfuscated and unreadable - * (possibly because of mediocre MS coders)... so I simplified it... - * (and so I commit no copyright violations either, hah) */ -#define GET_LPDDRAWSURFACE_GBL_MORE(psurf_gbl) \ - (*(((LPDDRAWI_DDRAWSURFACE_GBL_MORE *)(psurf_gbl)) - 1)) - -typedef struct _DDRAWI_DDRAWSURFACE_MORE { - DWORD dwSize; - IUNKNOWN_LIST * lpIUnknowns; - LPDDRAWI_DIRECTDRAW_LCL lpDD_lcl; - DWORD dwPageLockCount; - DWORD dwBytesAllocated; - LPDDRAWI_DIRECTDRAW_INT lpDD_int; - DWORD dwMipMapCount; - LPDDRAWI_DDRAWCLIPPER_INT lpDDIClipper; - /* DirectX 5.0 */ - LPHEAPALIASINFO lpHeapAliasInfo; - DWORD dwOverlayFlags; - VOID *rgjunc; - LPDDRAWI_DDVIDEOPORT_LCL lpVideoPort; - LPDDOVERLAYFX lpddOverlayFX; - DDSCAPSEX ddsCapsEx; - DWORD dwTextureStage; - LPVOID lpDDRAWReserved; - LPVOID lpDDRAWReserved2; - LPVOID lpDDrawReserved3; - DWORD dwDDrawReserved4; - LPVOID lpDDrawReserved5; - LPDWORD lpGammaRamp; - LPDWORD lpOriginalGammaRamp; - LPVOID lpDDrawReserved6; - DWORD dwSurfaceHandle; - DWORD qwDDrawReserved8[2]; - LPVOID lpDDrawReserved9; - DWORD cSurfaces; - LPDDSURFACEDESC2 pCreatedDDSurfaceDesc2; - LPDDRAWI_DDRAWSURFACE_LCL *slist; - DWORD dwFVF; - LPVOID lpVB; -} DDRAWI_DDRAWSURFACE_MORE; - -typedef struct _DDRAWI_DDRAWSURFACE_LCL { - LPDDRAWI_DDRAWSURFACE_MORE lpSurfMore; - LPDDRAWI_DDRAWSURFACE_GBL lpGbl; - ULONG_PTR hDDSurface; - LPATTACHLIST lpAttachList; - LPATTACHLIST lpAttachListFrom; - DWORD dwLocalRefCnt; - DWORD dwProcessId; - DWORD dwFlags; - DDSCAPS ddsCaps; - LPDDRAWI_DDRAWPALETTE_INT lpDDPalette; - LPDDRAWI_DDRAWCLIPPER_LCL lpDDClipper; - DWORD dwModeCreatedIn; - DWORD dwBackBufferCount; - DDCOLORKEY ddckCKDestBlt; - DDCOLORKEY ddckCKSrcBlt; - ULONG_PTR hDC; - ULONG_PTR dwReserved1; /* for display driver use */ - /* overlays only */ - DDCOLORKEY ddckCKSrcOverlay; - DDCOLORKEY ddckCKDestOverlay; - LPDDRAWI_DDRAWSURFACE_INT lpSurfaceOverlaying; - DBLNODE dbnOverlayNode; - RECT rcOverlaySrc; - RECT rcOverlayDest; - DWORD dwClrXparent; - DWORD dwAlpha; - LONG lOverlayX; - LONG lOverlayY; -} DDRAWI_DDRAWSURFACE_LCL; - -#define DDRAWISURF_ATTACHED 0x00000001 -#define DDRAWISURF_IMPLICITCREATE 0x00000002 -#define DDRAWISURF_ISFREE 0x00000004 -#define DDRAWISURF_ATTACHED_FROM 0x00000008 -#define DDRAWISURF_IMPLICITROOT 0x00000010 -#define DDRAWISURF_PARTOFPRIMARYCHAIN 0x00000020 -#define DDRAWISURF_DATAISALIASED 0x00000040 -#define DDRAWISURF_HASDC 0x00000080 -#define DDRAWISURF_HASCKEYDESTOVERLAY 0x00000100 -#define DDRAWISURF_HASCKEYDESTBLT 0x00000200 -#define DDRAWISURF_HASCKEYSRCOVERLAY 0x00000400 -#ifndef DDRAWISURF_HASCKEYSRCBLT -#define DDRAWISURF_HASCKEYSRCBLT 0x00000800 -#endif -#define DDRAWISURF_LOCKEXCLUDEDCURSOR 0x00001000 -#ifndef DDRAWISURF_HASPIXELFORMAT -#define DDRAWISURF_HASPIXELFORMAT 0x00002000 -#endif -#ifndef DDRAWISURF_HASOVERLAYDATA -#define DDRAWISURF_HASOVERLAYDATA 0x00004000 -#endif [truncated at 1000 lines; 4728 more skipped]

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