Ros-diffs December 2005

ros-diffs@reactos.org

40 participants
704 discussions

[greatlrd] 20066: sync the header with wine 0.9.2 part 2 of 4
by greatlrd＠svn.reactos.com 11 Dec '05

11 Dec '05

sync the header with wine 0.9.2 part 2 of 4 Modified: trunk/reactos/lib/dxdiagn/dxdiag_private.h _____ Modified: trunk/reactos/lib/dxdiagn/dxdiag_private.h --- trunk/reactos/lib/dxdiagn/dxdiag_private.h 2005-12-11 15:18:39 UTC (rev 20065) +++ trunk/reactos/lib/dxdiagn/dxdiag_private.h 2005-12-11 16:46:40 UTC (rev 20066) @@ -41,23 +41,12 @@ /* ---------------- */ /*********************************************************************** ****** - * Predeclare the interface implementation structures - */ -extern IDxDiagProviderVtbl DxDiagProvider_Vtbl; - -/********************************************************************** ******* * IDxDiagProvider implementation structure */ -typedef struct Contain_Property -{ - WCHAR *pwszPropName; - VARIANT pvarProp; -} Contain_Property; - struct IDxDiagProviderImpl { /* IUnknown fields */ - IDxDiagProviderVtbl *lpVtbl; - DWORD ref; + const IDxDiagProviderVtbl *lpVtbl; + LONG ref; /* IDxDiagProvider fields */ BOOL init; DXDIAG_INIT_PARAMS params; @@ -83,37 +72,34 @@ struct IDxDiagContainerImpl_SubContainer* next; } IDxDiagContainerImpl_SubContainer; -/********************************************************************** ******* - * Predeclare the interface implementation structures - */ -extern IDxDiagContainerVtbl DxDiagContainer_Vtbl; +typedef struct IDxDiagContainerImpl_Property { + LPWSTR vName; + VARIANT v; + struct IDxDiagContainerImpl_Property* next; +} IDxDiagContainerImpl_Property; + /*********************************************************************** ****** * IDxDiagContainer implementation structure */ struct IDxDiagContainerImpl { /* IUnknown fields */ - IDxDiagContainerVtbl *lpVtbl; - DWORD ref; + const IDxDiagContainerVtbl *lpVtbl; + LONG ref; /* IDxDiagContainer fields */ + IDxDiagContainerImpl_Property* properties; IDxDiagContainerImpl_SubContainer* subContainers; + DWORD nProperties; DWORD nSubContainers; - Contain_Property* pProperty; - DWORD nSubpProperty; }; /* IUnknown: */ extern HRESULT WINAPI IDxDiagContainerImpl_QueryInterface(PDXDIAGCONTAINER iface, REFIID riid, LPVOID *ppobj); extern ULONG WINAPI IDxDiagContainerImpl_AddRef(PDXDIAGCONTAINER iface); -extern ULONG WINAPI IDxDiagContainerImpl_Release(PDXDIAGCONTAINER iface); -/* IDxDiagContainer: */ -extern HRESULT WINAPI IDxDiagContainerImpl_GetNumberOfChildContainers(PDXDIAGCONTAINER iface, DWORD* pdwCount); -extern HRESULT WINAPI IDxDiagContainerImpl_EnumChildContainerNames(PDXDIAGCONTAINER iface, DWORD dwIndex, LPWSTR pwszContainer, DWORD cchContainer); -extern HRESULT WINAPI IDxDiagContainerImpl_GetChildContainer(PDXDIAGCONTAINER iface, LPCWSTR pwszContainer, IDxDiagContainer** ppInstance); -extern HRESULT WINAPI IDxDiagContainerImpl_GetNumberOfProps(PDXDIAGCONTAINER iface, DWORD* pdwCount); -extern HRESULT WINAPI IDxDiagContainerImpl_EnumPropNames(PDXDIAGCONTAINER iface, DWORD dwIndex, LPWSTR pwszPropName, DWORD cchPropName); -extern HRESULT WINAPI IDxDiagContainerImpl_GetProp(PDXDIAGCONTAINER iface, LPCWSTR pwszPropName, VARIANT* pvarProp); +/** Internal */ +extern HRESULT WINAPI IDxDiagContainerImpl_AddProp(PDXDIAGCONTAINER iface, LPCWSTR pwszPropName, VARIANT* pVarProp); +extern HRESULT WINAPI IDxDiagContainerImpl_AddChildContainer(PDXDIAGCONTAINER iface, LPCWSTR pszContName, PDXDIAGCONTAINER pSubCont); /** * factories @@ -122,7 +108,13 @@ /** internal factory */ extern HRESULT DXDiag_CreateDXDiagContainer(REFIID riid, LPVOID *ppobj); +extern HRESULT DXDiag_InitRootDXDiagContainer(IDxDiagContainer* pRootCont); +/********************************************************************** + * Dll lifetime tracking declaration for dxdiagn.dll + */ +extern LONG DXDIAGN_refCount; +static inline void DXDIAGN_LockModule(void) { InterlockedIncrement( &DXDIAGN_refCount ); } +static inline void DXDIAGN_UnlockModule(void) { InterlockedDecrement( &DXDIAGN_refCount ); } - #endif

1 0

[sgasiorek] 20065: find applet by name (fixes bug #1063)
by sgasiorek＠svn.reactos.com 11 Dec '05

11 Dec '05

find applet by name (fixes bug #1063) Modified: trunk/reactos/lib/shell32/control.c _____ Modified: trunk/reactos/lib/shell32/control.c --- trunk/reactos/lib/shell32/control.c 2005-12-11 14:35:33 UTC (rev 20064) +++ trunk/reactos/lib/shell32/control.c 2005-12-11 15:18:39 UTC (rev 20065) @@ -352,6 +352,7 @@ unsigned sp = 0; LPWSTR extraPmts = NULL; int quoted = 0; + BOOL spSet = FALSE; buffer = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(wszCmd) + 1) * sizeof(*wszCmd)); if (!buffer) return; @@ -366,8 +367,10 @@ if (beg) { if (*beg == '@') { sp = atoiW(beg + 1); + spSet = TRUE; } else if (*beg == '\0') { sp = 0; + spSet = TRUE; } else { extraPmts = beg; } @@ -381,6 +384,9 @@ while ((ptr = StrChrW(buffer, '"'))) memmove(ptr, ptr+1, lstrlenW(ptr)*sizeof(WCHAR)); + while ((ptr = StrChrW(extraPmts, '"'))) + memmove(ptr, ptr+1, lstrlenW(ptr)*sizeof(WCHAR)); + TRACE("cmd %s, extra %s, sp %d\n", debugstr_w(buffer), debugstr_w(extraPmts), sp); Control_LoadApplet(hWnd, buffer, panel); @@ -393,6 +399,13 @@ WARN("Out of bounds (%u >= %u), setting to 0\n", sp, applet->count); sp = 0; } + + if ((extraPmts)&&(!spSet)) + { + while ((lstrcmpiW(extraPmts, applet->info[sp].szName)) && (sp < applet->count)) + sp++; + } + if (applet->info[sp].dwSize) { if (!applet->proc(applet->hWnd, CPL_STARTWPARMSA, sp, (LPARAM)extraPmts)) applet->proc(applet->hWnd, CPL_DBLCLK, sp, applet->info[sp].lData);

1 0

[gvg] 20064: Merge from trunk:
by gvg＠svn.reactos.com 11 Dec '05

11 Dec '05

Merge from trunk: Use links.reactos.org redirection script Modified: branches/ros-branch-0_2_9/reactos/bootdata/hivesft.inf _____ Modified: branches/ros-branch-0_2_9/reactos/bootdata/hivesft.inf --- branches/ros-branch-0_2_9/reactos/bootdata/hivesft.inf 2005-12-11 11:27:08 UTC (rev 20063) +++ branches/ros-branch-0_2_9/reactos/bootdata/hivesft.inf 2005-12-11 14:35:33 UTC (rev 20064) @@ -740,6 +740,6 @@ HKLM,"SOFTWARE\ReactOS\Windows NT\CurrentVersion\Winlogon","Userinit",0x00020000,"%SystemRoot%\system32 \userinit.exe" ; Where to download the Mozilla ActiveX control -HKLM,"SOFTWARE\ReactOS\shdocvw","MozillaUrl",0x00000000,"http://source. winehq.org/mozactivex" +HKLM,"SOFTWARE\ReactOS\shdocvw","MozillaUrl",0x00000000,"http://links.r eactos.org/mozactivex" ; EOF

1 0

[hpoussin] 20063: Sort drivers by rank + date, so best driver would be the most recent for the best rank
by hpoussin＠svn.reactos.com 11 Dec '05

11 Dec '05

Sort drivers by rank + date, so best driver would be the most recent for the best rank Parse version field in .inf files Replace [0] in structures definition by [ANYSIZE_ARRAY], and use FIELD_OFFSET macro Remove some useless spaces Modified: trunk/reactos/lib/setupapi/devinst.c Modified: trunk/reactos/lib/setupapi/setupapi_private.h _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-12-11 11:27:05 UTC (rev 20062) +++ trunk/reactos/lib/setupapi/devinst.c 2005-12-11 11:27:08 UTC (rev 20063) @@ -633,7 +633,7 @@ /* FIXME */ return ERROR_GEN_FAILURE; } - + /* Does not happen */ } @@ -689,7 +689,7 @@ SetLastError(ERROR_NOT_ENOUGH_MEMORY); goto cleanup; } - + strcpyW(UNCServerName + 2, MachineName); list->szData[0] = list->szData[1] = '\\'; strcpyW(list->szData + 2, MachineName); @@ -750,7 +750,7 @@ else if (DeviceInfoSet && DeviceInfoSet != (HDEVINFO)INVALID_HANDLE_VALUE) { struct DeviceInfoSet *list = (struct DeviceInfoSet *)DeviceInfoSet; - + if (list->magic != SETUP_DEV_INFO_SET_MAGIC) SetLastError(ERROR_INVALID_HANDLE); else if (DeviceInfoData->cbSize != sizeof(SP_DEVINFO_DATA)) @@ -1186,7 +1186,8 @@ *pDeviceInterface = NULL; - deviceInterface = HeapAlloc(GetProcessHeap(), 0, sizeof(struct DeviceInterface) + (wcslen(SymbolicLink) + 1) * sizeof(WCHAR)); + deviceInterface = HeapAlloc(GetProcessHeap(), 0, + FIELD_OFFSET(struct DeviceInterface, SymbolicLink) + (wcslen(SymbolicLink) + 1) * sizeof(WCHAR)); if (!deviceInterface) { SetLastError(ERROR_NOT_ENOUGH_MEMORY); @@ -1215,7 +1216,7 @@ DWORD i = 0, j; DWORD dwLength, dwRegType; DWORD rc; - + /* Enumerate device IDs (subkeys of hEnumeratorKey) */ while (TRUE) { @@ -1632,7 +1633,7 @@ RegCloseKey(hDeviceInstanceKey); continue; } - + /* Enumerate subkeys of hDeviceInstanceKey (ie "#ReferenceString" in IoRegisterDeviceInterface). Skip entries that don't start with '#' */ j = 0; while (TRUE) @@ -2568,7 +2569,7 @@ { LPCWSTR RegistryPropertyName; DWORD BufferSize; - + switch (Property) { case SPDRP_CAPABILITIES: @@ -4657,6 +4658,7 @@ driverInfo->Details.DrvDescription, InfFile, InfInstallSection, Rank); driverInfo->DriverRank = Rank; + memcpy(&driverInfo->DriverDate, &DriverDate, sizeof(FILETIME)); memcpy(&driverInfo->ClassGuid, ClassGuid, sizeof(GUID)); driverInfo->Info.DriverType = DriverType; driverInfo->Info.Reserved = (ULONG_PTR)driverInfo; @@ -4680,7 +4682,10 @@ PreviousEntry = DriverListHead->Flink; while (PreviousEntry != DriverListHead) { - if (((struct DriverInfoElement *)PreviousEntry)->DriverRank >= Rank) + struct DriverInfoElement *CurrentDriver; + CurrentDriver = CONTAINING_RECORD(PreviousEntry, struct DriverInfoElement, ListEntry); + if (CurrentDriver->DriverRank > Rank || + (CurrentDriver->DriverRank == Rank && CurrentDriver->DriverDate.QuadPart > driverInfo->DriverDate.QuadPart)) { /* Insert before the current item */ InsertHeadList(PreviousEntry, &driverInfo->ListEntry); @@ -4816,8 +4821,37 @@ } /* Get driver version. Invalid version = 0.0.0.0 */ *DriverVersion = 0; - /* FIXME: use pVersion to fill DriverVersion variable */ + if (pVersion) + { + WORD Major, Minor = 0, Revision = 0, Build = 0; + LPWSTR pMinor = NULL, pRevision = NULL, pBuild = NULL; + LARGE_INTEGER fullVersion; + pMinor = strchrW(pVersion, '.'); + if (pMinor) + { + *pMinor = 0; + pRevision = strchrW(++pMinor, '.'); + Minor = atoiW(pMinor); + } + if (pRevision) + { + *pRevision = 0; + pBuild = strchrW(++pRevision, '.'); + Revision = atoiW(pRevision); + } + if (pBuild) + { + *pBuild = 0; + pBuild++; + Build = atoiW(pBuild); + } + Major = atoiW(pVersion); + fullVersion.u.HighPart = Major << 16 | Minor; + fullVersion.u.LowPart = Revision << 16 | Build; + memcpy(DriverVersion, &fullVersion, sizeof(LARGE_INTEGER)); + } + ret = TRUE; cleanup: @@ -5881,7 +5915,7 @@ DWORD BufSize = 0; DWORD HardwareIDLen = 0; BOOL ret = FALSE; - + /* do some sanity checks, the unicode version might do more thorough checks */ if (DriverInfoData == NULL || (DriverInfoDetailData == NULL && DriverInfoDetailDataSize != 0) || @@ -5909,7 +5943,7 @@ } DriverInfoDataW.DriverType = DriverInfoData->DriverType; DriverInfoDataW.Reserved = DriverInfoData->Reserved; - + /* convert the strings to unicode */ if (MultiByteToWideChar(CP_ACP, 0, @@ -6055,7 +6089,7 @@ } } } - + Cleanup: if (DriverInfoDetailDataW != NULL) { @@ -6403,6 +6437,7 @@ HKEY hKey = INVALID_HANDLE_VALUE; HKEY hClassKey = INVALID_HANDLE_VALUE; BOOL NeedtoCopyFile; + LARGE_INTEGER fullVersion; LONG rc; BOOL ret = FALSE; /* Return value */ @@ -6515,10 +6550,11 @@ /* Write information to driver key */ *pSectionName = UNICODE_NULL; + memcpy(&fullVersion, &SelectedDriver->Info.DriverVersion, sizeof(LARGE_INTEGER)); TRACE("Write information to driver key\n"); TRACE("DriverDate : '%u-%u-%u'\n", DriverDate.wMonth, DriverDate.wDay, DriverDate.wYear); TRACE("DriverDesc : '%S'\n", SelectedDriver->Info.Description); - TRACE("DriverVersion : '%u.%u.%u.%u'\n", SelectedDriver->Info.DriverVersion & 0xff, (SelectedDriver->Info.DriverVersion >> 8) & 0xff, (SelectedDriver->Info.DriverVersion >> 16) & 0xff, (SelectedDriver->Info.DriverVersion >> 24) & 0xff); + TRACE("DriverVersion : '%u.%u.%u.%u'\n", fullVersion.HighPart >> 16, fullVersion.HighPart & 0xffff, fullVersion.LowPart >> 16, fullVersion.LowPart & 0xffff); TRACE("InfPath : '%S'\n", SelectedDriver->Details.InfFileName); TRACE("InfSection : '%S'\n", SelectedDriver->Details.SectionName); TRACE("InfSectionExt : '%S'\n", &SectionName[wcslen(SelectedDriver->Details.SectionName)]); @@ -6532,7 +6568,7 @@ rc = RegSetValueEx(hKey, L"DriverDesc", 0, REG_SZ, (const BYTE *)SelectedDriver->Info.Description, (wcslen(SelectedDriver->Info.Description) + 1) * sizeof(WCHAR)); if (rc == ERROR_SUCCESS) { - swprintf(Buffer, L"%u.%u.%u.%u", SelectedDriver->Info.DriverVersion & 0xff, (SelectedDriver->Info.DriverVersion >> 8) & 0xff, (SelectedDriver->Info.DriverVersion >> 16) & 0xff, (SelectedDriver->Info.DriverVersion >> 24) & 0xff); + swprintf(Buffer, L"%u.%u.%u.%u", fullVersion.HighPart >> 16, fullVersion.HighPart & 0xffff, fullVersion.LowPart >> 16, fullVersion.LowPart & 0xffff); rc = RegSetValueEx(hKey, L"DriverVersion", 0, REG_SZ, (const BYTE *)Buffer, (wcslen(Buffer) + 1) * sizeof(WCHAR)); } if (rc == ERROR_SUCCESS) _____ Modified: trunk/reactos/lib/setupapi/setupapi_private.h --- trunk/reactos/lib/setupapi/setupapi_private.h 2005-12-11 11:27:05 UTC (rev 20062) +++ trunk/reactos/lib/setupapi/setupapi_private.h 2005-12-11 11:27:08 UTC (rev 20063) @@ -57,7 +57,7 @@ */ DWORD Flags; - WCHAR SymbolicLink[0]; /* \\?\ACPI#PNP0501#4&2658d0a0&0#{GUID} */ + WCHAR SymbolicLink[ANYSIZE_ARRAY]; /* \\?\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 @@ -68,7 +68,7 @@ LONG References; /* May contain no directory if the file is already in %SYSTEMROOT%\Inf */ - WCHAR FullInfFileName[0]; + WCHAR FullInfFileName[ANYSIZE_ARRAY]; }; struct DriverInfoElement /* Element of DeviceInfoSet.DriverListHead and DeviceInfoElement.DriverListHead */ @@ -76,6 +76,7 @@ LIST_ENTRY ListEntry; DWORD DriverRank; + ULARGE_INTEGER DriverDate; SP_DRVINFO_DATA_V2_W Info; SP_DRVINFO_DETAIL_DATA_W Details; GUID ClassGuid; @@ -129,7 +130,7 @@ /* List of interfaces implemented by this device */ LIST_ENTRY InterfaceListHead; /* List of struct DeviceInterface */ - WCHAR Data[0]; + WCHAR Data[ANYSIZE_ARRAY]; }; struct DeviceInfoSet /* HDEVINFO */ @@ -151,7 +152,7 @@ * or NULL if related to local machine. Points into szData field at the * end of the structure */ PCWSTR MachineName; - WCHAR szData[0]; + WCHAR szData[ANYSIZE_ARRAY]; }; struct ClassImageList @@ -162,7 +163,7 @@ * or NULL if related to local machine. Points into szData field at the * end of the structure */ PCWSTR MachineName; - WCHAR szData[0]; + WCHAR szData[ANYSIZE_ARRAY]; }; extern HINSTANCE hInstance;

1 0

[gvg] 20062: Files to create Mozilla Control installer with correct DLL
by gvg＠svn.reactos.com 11 Dec '05

11 Dec '05

Files to create Mozilla Control installer with correct DLL Added: trunk/tools/ Added: trunk/tools/MozillaControl/ Added: trunk/tools/MozillaControl/README.txt Added: trunk/tools/MozillaControl/control-ros.nsi Added: trunk/tools/MozillaControl/files.nsh Added: trunk/tools/MozillaControl/local.nsh Added: trunk/tools/MozillaControl/redist/ _____ Added: trunk/tools/MozillaControl/README.txt --- trunk/tools/MozillaControl/README.txt 2005-12-11 11:26:20 UTC (rev 20061) +++ trunk/tools/MozillaControl/README.txt 2005-12-11 11:27:05 UTC (rev 20062) @@ -0,0 +1,9 @@ +The distributed (by Adam Lock, http://www.iol.ie/~locka/mozilla/mozilla.htm) +MozillaControl1712.exe contains the Mozilla control compiled with MSVC6, but +with MSVCP70.DLL included instead of the required MSVCP60.DLL. So we repackaged +the control to include the correct DLL. + +To repackage: install the distributed MozillaControl1712 to its default location, +"C:\Program Files\Mozilla Control v1.7.12". Copy MSVCP60.DLL to subdir redist (of +this dir). Then run "makensis control-ros.nsi", this should result in a repackaged +MozillaControl1712-ReactOS.exe Property changes on: trunk/tools/MozillaControl/README.txt ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/tools/MozillaControl/control-ros.nsi --- trunk/tools/MozillaControl/control-ros.nsi 2005-12-11 11:26:20 UTC (rev 20061) +++ trunk/tools/MozillaControl/control-ros.nsi 2005-12-11 11:27:05 UTC (rev 20062) @@ -0,0 +1,44 @@ +!include "local.nsh" + +!define PRODUCT "Mozilla ActiveX Control ${VERSION}" + +Name "${PRODUCT}" + +InstallDir "$PROGRAMFILES\Mozilla ActiveX Control v1.7.12" + +OutFile MozillaControl${MAJOR_VERSION}${MINOR_VERSION}-ReactOS.exe + +SetCompressor bzip2 + +DirText "This will install the Mozilla ActiveX Control ${VERSION} on your computer. Pick an installation directory." + +Section "Mozilla Control (required)" + + ; MSVC++ redistributable DLLs + SetOutPath "$INSTDIR" + File ${REDISTDIR}\msvcp60.dll + + ; Now the Gecko embedding files + !include "files.nsh" + + RegDLL "$INSTDIR\mozctlx.dll" + + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT}" "DisplayName" "${PRODUCT}" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT}" "InstallLocation" "$INSTDIR" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT}" "UninstallString" "$INSTDIR\uninst.exe" + WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT}" "VersionMajor" "${MAJOR_VERSION}" + WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT}" "VersionMinor" "${MINOR_VERSION}" + WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\{PRODUCT}" "NoModify" "1" + WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT}" "NoRepair" "1" + WriteUninstaller Uninst.exe + +SectionEnd + +Section "uninstall" + + UnRegDLL "$INSTDIR\mozctlx.dll" + DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT}" + Delete $INSTDIR\Uninst.exe + RMDir /r $INSTDIR + +SectionEnd Property changes on: trunk/tools/MozillaControl/control-ros.nsi ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/tools/MozillaControl/files.nsh --- trunk/tools/MozillaControl/files.nsh 2005-12-11 11:26:20 UTC (rev 20061) +++ trunk/tools/MozillaControl/files.nsh 2005-12-11 11:27:05 UTC (rev 20062) @@ -0,0 +1,188 @@ +SetOutPath "$INSTDIR" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\gkgfx.dll" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\js3250.dll" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\mozctl.dll" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\mozctlx.dll" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\mozilla-ipcd.exe" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\mozz.dll" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\nspr4.dll" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\nss3.dll" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\nssckbi.dll" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\plc4.dll" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\plds4.dll" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\smime3.dll" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\softokn3.chk" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\softokn3.dll" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\ssl3.dll" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\xpcom.dll" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\xpcom_compat.dll" +SetOutPath "$INSTDIR\greprefs" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\greprefs\all.js" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\greprefs\non-shared.txt" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\greprefs\security-prefs.js" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\greprefs\xpinstall.js" +SetOutPath "$INSTDIR\chrome" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\chrome\chrome.rdf" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\chrome\embed.jar" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\chrome\installed-chrome.txt" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\chrome\pipnss.jar" +SetOutPath "$INSTDIR\chrome\overlayinfo\communicator\content" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\chrome\overlayinfo\communicator\content\overlays.rdf" +SetOutPath "$INSTDIR\chrome\overlayinfo\messenger\content" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\chrome\overlayinfo\messenger\content\overlays.rdf" +SetOutPath "$INSTDIR\chrome\overlayinfo\navigator\content" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\chrome\overlayinfo\navigator\content\overlays.rdf" +SetOutPath "$INSTDIR\components" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\components\accessibility-msaa.xpt" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\components\accessibility.dll" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\components\accessibility.xpt" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\components\appshell.dll" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\components\appshell.xpt" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\components\caps.dll" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\components\caps.xpt" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\components\chrome.dll" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\components\compreg.dat" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\components\content_base.xpt" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\components\cookie.dll" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\components\docshell.dll" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\components\docshell_base.xpt" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\components\dom.xpt" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\components\dom_base.xpt" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\components\dom_core.xpt" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\components\dom_css.xpt" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\components\dom_events.xpt" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\components\dom_html.xpt" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\components\dom_range.xpt" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\components\dom_stylesheets.xpt" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\components\dom_traversal.xpt" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\components\dom_views.xpt" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\components\dom_xbl.xpt" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\components\dom_xul.xpt" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\components\editor.dll" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\components\editor.xpt" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\components\embedcomponents.dll" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\components\embed_lite.dll" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\components\gfx.xpt" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\components\gkgfxwin.dll" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\components\gklayout.dll" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\components\gkparser.dll" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\components\gkplugin.dll" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\components\gkwidget.dll" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\components\i18n.dll" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\components\imglib2.dll" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\components\intl.xpt" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\components\ipcdc.dll" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\components\jar.xpt" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\components\jar50.dll" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\components\jsurl.xpt" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\components\layout_base.xpt" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\components\layout_xul.xpt" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\components\layout_xul_tree.xpt" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\components\locale.xpt" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\components\necko.dll" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\components\necko.xpt" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\components\necko2.dll" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\components\necko_about.xpt" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\components\necko_cache.xpt" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\components\necko_data.xpt" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\components\necko_dns.xpt" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\components\necko_ftp.xpt" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\components\necko_http.xpt" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\components\necko_jar.xpt" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\components\necko_res.xpt" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\components\necko_strconv.xpt" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\components\nsAxSecurityPolicy.js" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\components\pipboot.dll" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\components\pipboot.xpt" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\components\pipnss.dll" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\components\pipnss.xpt" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\components\pref.xpt" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\components\profile.dll" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\components\profile.xpt" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\components\rdf.dll" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\components\rdf.xpt" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\components\shistory.xpt" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\components\txtsvc.xpt" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\components\uconv.dll" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\components\uconv.xpt" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\components\ucvmath.dll" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\components\unicharutil.xpt" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\components\uriloader.xpt" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\components\webBrowser_core.xpt" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\components\webbrwsr.dll" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\components\widget.xpt" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\components\windowwatcher.xpt" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\components\xmlextras.dll" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\components\xmlextras.xpt" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\components\xpc3250.dll" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\components\xpcom_base.xpt" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\components\xpcom_compat_c.dll" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\components\xpcom_components.xpt" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\components\xpcom_ds.xpt" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\components\xpcom_io.xpt" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\components\xpcom_obsolete.xpt" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\components\xpcom_thread.xpt" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\components\xpcom_xpti.xpt" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\components\xpconnect.xpt" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\components\xppref32.dll" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\components\xpti.dat" +SetOutPath "$INSTDIR\defaults\pref" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\defaults\pref\activex.js" +SetOutPath "$INSTDIR\ipc\modules" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\ipc\modules\lockmodule.dll" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\ipc\modules\transmgr.dll" +SetOutPath "$INSTDIR\plugins" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\plugins\npmozax.dll" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\plugins\npnul32.dll" +SetOutPath "$INSTDIR\res" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\res\arrow.gif" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\res\arrowd.gif" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\res\broken-image.gif" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\res\charsetalias.properties" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\res\charsetData.properties" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\res\forms.css" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\res\hiddenWindow.html" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\res\html.css" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\res\langGroups.properties" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\res\language.properties" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\res\loading-image.gif" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\res\mathml.css" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\res\platform-forms.css" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\res\quirk.css" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\res\ua.css" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\res\viewsource.css" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\res\wincharset.properties" +SetOutPath "$INSTDIR\res\builtin" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\res\builtin\platformHTMLBindings.xml" +SetOutPath "$INSTDIR\res\dtd" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\res\dtd\mathml.dtd" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\res\dtd\xhtml11.dtd" +SetOutPath "$INSTDIR\res\entityTables" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\res\entityTables\html40Latin1.properties" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\res\entityTables\html40Special.properties" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\res\entityTables\html40Symbols.properties" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\res\entityTables\htmlEntityVersions.properties" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\res\entityTables\mathml20.properties" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\res\entityTables\transliterate.properties" +SetOutPath "$INSTDIR\res\fonts" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\res\fonts\fontEncoding.properties" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\res\fonts\mathfont.properties" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\res\fonts\mathfontCMEX10.properties" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\res\fonts\mathfontCMSY10.properties" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\res\fonts\mathfontMath1.properties" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\res\fonts\mathfontMath2.properties" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\res\fonts\mathfontMath4.properties" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\res\fonts\mathfontMTExtra.properties" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\res\fonts\mathfontPUA.properties" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\res\fonts\mathfontSymbol.properties" +SetOutPath "$INSTDIR\res\html" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\res\html\gopher-audio.gif" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\res\html\gopher-binary.gif" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\res\html\gopher-find.gif" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\res\html\gopher-image.gif" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\res\html\gopher-menu.gif" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\res\html\gopher-movie.gif" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\res\html\gopher-sound.gif" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\res\html\gopher-telnet.gif" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\res\html\gopher-text.gif" + File "C:\Program Files\Mozilla ActiveX Control v1.7.12\res\html\gopher-unknown.gif" Property changes on: trunk/tools/MozillaControl/files.nsh ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/tools/MozillaControl/local.nsh --- trunk/tools/MozillaControl/local.nsh 2005-12-11 11:26:20 UTC (rev 20061) +++ trunk/tools/MozillaControl/local.nsh 2005-12-11 11:27:05 UTC (rev 20062) @@ -0,0 +1,4 @@ +!define REDISTDIR "redist" +!define VERSION "v1.7.12 (ReactOS special)" +!define MAJOR_VERSION "1" +!define MINOR_VERSION "712" Property changes on: trunk/tools/MozillaControl/local.nsh ___________________________________________________________________ Name: svn:eol-style + native

1 0

[gvg] 20061: Use links.reactos.org redirection script
by gvg＠svn.reactos.com 11 Dec '05

11 Dec '05

Use links.reactos.org redirection script Modified: trunk/reactos/bootdata/hivesft.inf _____ Modified: trunk/reactos/bootdata/hivesft.inf --- trunk/reactos/bootdata/hivesft.inf 2005-12-11 09:57:53 UTC (rev 20060) +++ trunk/reactos/bootdata/hivesft.inf 2005-12-11 11:26:20 UTC (rev 20061) @@ -740,6 +740,6 @@ HKLM,"SOFTWARE\ReactOS\Windows NT\CurrentVersion\Winlogon","Userinit",0x00020000,"%SystemRoot%\system32 \userinit.exe" ; Where to download the Mozilla ActiveX control -HKLM,"SOFTWARE\ReactOS\shdocvw","MozillaUrl",0x00000000,"http://source. winehq.org/mozactivex" +HKLM,"SOFTWARE\ReactOS\shdocvw","MozillaUrl",0x00000000,"http://links.r eactos.org/mozactivex" ; EOF

1 0

[hpoussin] 20060: Rename mouse.inf to msmouse.inf to allow better compatibility with 3rd party mouse drivers
by hpoussin＠svn.reactos.com 11 Dec '05

11 Dec '05

Rename mouse.inf to msmouse.inf to allow better compatibility with 3rd party mouse drivers Modified: trunk/reactos/bootdata/packages/reactos.dff Modified: trunk/reactos/media/inf/inf.xml Deleted: trunk/reactos/media/inf/mouse.inf Added: trunk/reactos/media/inf/msmouse.inf Modified: trunk/reactos/media/inf/syssetup.inf.tpl _____ Modified: trunk/reactos/bootdata/packages/reactos.dff --- trunk/reactos/bootdata/packages/reactos.dff 2005-12-11 08:50:28 UTC (rev 20059) +++ trunk/reactos/bootdata/packages/reactos.dff 2005-12-11 09:57:53 UTC (rev 20060) @@ -312,7 +312,7 @@ media\inf\hdc.inf 6 media\inf\layout.inf 6 media\inf\machine.inf 6 -media\inf\mouse.inf 6 +media\inf\msmouse.inf 6 media\inf\keyboard.inf 6 media\inf\NET_NIC.inf 6 media\inf\netamd.inf 6 _____ Modified: trunk/reactos/media/inf/inf.xml --- trunk/reactos/media/inf/inf.xml 2005-12-11 08:50:28 UTC (rev 20059) +++ trunk/reactos/media/inf/inf.xml 2005-12-11 09:57:53 UTC (rev 20060) @@ -6,7 +6,7 @@ <installfile base="inf">keyboard.inf</installfile> <installfile base="inf">layout.inf</installfile> <installfile base="inf">machine.inf</installfile> -<installfile base="inf">mouse.inf</installfile> +<installfile base="inf">msmouse.inf</installfile> <installfile base="inf">NET_NIC.inf</installfile> <installfile base="inf">netamd.inf</installfile> <installfile base="inf">netisa.inf</installfile> _____ Deleted: trunk/reactos/media/inf/mouse.inf --- trunk/reactos/media/inf/mouse.inf 2005-12-11 08:50:28 UTC (rev 20059) +++ trunk/reactos/media/inf/mouse.inf 2005-12-11 09:57:53 UTC (rev 20060) @@ -1,147 +0,0 @@ -; MOUSE.INF - -; Installation file for mouse devices - -[Version] -Signature = "$Windows NT$" -;Signature = "$ReactOS$" -LayoutFile = layout.inf -Class = Mouse -ClassGUID = {4D36E96F-E325-11CE-BFC1-08002BE10318} -Provider = %ReactOS% -DriverVer = 10/08/2005,1.01.0.0 - -[DestinationDirs] -DefaultDestDir = 12 - -[ClassInstall32.NT] -AddReg = MouseClass.NT.AddReg - -[MouseClass.NT.AddReg] -HKR, , , 0, %MouseClassName% -HKR, , Icon, 0, "-2" -;HKR, , Installer32, 0, "syssetup.dll,MouseClassInstaller" -HKR, , NoInstallClass, 0, 1 - -[Manufacturer] -%StdMfg% = StdMfg -%IbmMfg% = IbmMfg -%LogMfg% = LogMfg -%MSMfg% = MSMfg - -[StdMfg] -%SERIAL_MOUSE.DeviceDesc% = Serial_Inst,*PNP0F0C,SERENUM\PNP0F0C,*PNP0F17,SERENUM\PNP0F17,SERIAL_MOU SE -%PS2_MOUSE.DeviceDesc% = PS2_Inst,*PNP0F0E,*PNP0F19,PS2_MOUSE -%HID_MOUSE.DeviceDesc% = HID_Inst,HID_DEVICE_SYSTEM_MOUSE -%*PNP0F13.DeviceDesc% = PS2_Inst,*PNP0F13 - -[IbmMfg] -*IBM3780.DeviceDesc = PS2_Inst,*IBM3780 - -[LogMfg] -%*PNP0F08.DeviceDesc% = Serial_Inst,*PNP0F08,SERENUM\PNP0F08 -%*PNP0F12.DeviceDesc% = PS2_Inst,*PNP0F12 - -[MSMfg] -%*PNP0F01.DeviceDesc% = Serial_Inst,*PNP0F01,SERENUM\PNP0F01 -%*PNP0F03.DeviceDesc% = PS2_Inst,*PNP0F03 - -;---------------------------- MOUCLASS DRIVER --------------------------- - -[Mouclass_CopyFiles.NT] -mouclass.sys - -[mouclass_Service_Inst] -ServiceType = 1 -StartType = 1 -ErrorControl = 1 -ServiceBinary = %12%\mouclass.sys -LoadOrderGroup = Pointer Class - -;----------------------------- SERIAL DRIVER ---------------------------- - -[Serial_Inst.NT] -CopyFiles = Serial_CopyFiles.NT, Mouclass_CopyFiles.NT - -[Serial_CopyFiles.NT] -sermouse.sys - -[Serial_Inst.NT.Services] -AddService = sermouse, 0x00000002, sermouse_Service_Inst -AddService = mouclass, , mouclass_Service_Inst - -[sermouse_Service_Inst] -ServiceType = 1 -StartType = 1 -ErrorControl = 1 -ServiceBinary = %12%\sermouse.sys -LoadOrderGroup = Pointer Port - -;------------------------------ PS/2 DRIVER ----------------------------- - -[PS2_Inst.NT] -CopyFiles = PS2_CopyFiles.NT, Mouclass_CopyFiles.NT -AddReg = PS2_AddReg - -[PS2_CopyFiles.NT] -i8042prt.sys - -[PS2_Inst.NT.Services] -;DO NOT INSTALL i8042prt driver, as long as it is not PnP-compatible -;AddService = i8042prt, 0x00000002, i8042prt_Service_Inst -AddService = , 0x00000002 -AddService = mouclass, , mouclass_Service_Inst - -[i8042prt_Service_Inst] -ServiceType = 1 -StartType = 3 -ErrorControl = 1 -ServiceBinary = %12%\i8042prt.sys -LoadOrderGroup = Keyboard Port - -[PS2_AddReg] -HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt\Parameters","SampleRat e",0x00010001,0x0000003c -HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt\Parameters","BreakOnSy sRq",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt\Parameters","MouseReso lution",0x00010001,0x00000003 - -;---------------------------- HID MOUSE DRIVER -------------------------- - -[HID_Inst.NT] -CopyFiles = HID_CopyFiles.NT, Mouclass_CopyFiles.NT - -[HID_CopyFiles] -mouhid.sys - -[HID_Inst.NT.Services] -AddService = mouhid, 0x00000002, mouhid_Service_Inst -AddService = mouclass, , mouclass_Service_Inst - -[mouhid_Service_Inst] -ServiceType = 1 -StartType = 3 -ErrorControl = 0 -ServiceBinary = %12%\mouhid.sys -LoadOrderGroup = Pointer Port - -;-------------------------------- STRINGS ------------------------------- - -[Strings] -ReactOS = "ReactOS Team" -MouseClassName = "Mice and other pointing devices" - -StdMfg = "(Standard mice)" -SERIAL_MOUSE.DeviceDesc = "Standard Serial Mouse" -PS2_MOUSE.DeviceDesc = "Standard PS/2 Mouse" -HID_MOUSE.DeviceDesc = "HID Mouse" -*PNP0F13.DeviceDesc = "PS/2 port for PS/2-style mice" - -IbmMfg = "IBM" -*IBM3780.DeviceDesc = "IBM PS/2 Trackpoint" - -LogMfg = "Logitech" -*PNP0F08.DeviceDesc = "Logitech Serial Mouse" -*PNP0F12.DeviceDesc = "Logitech PS/2-style Mouse" - -MSMfg = "Microsoft" -*PNP0F01.DeviceDesc = "Microsoft Serial Mouse" -*PNP0F03.DeviceDesc = "Microsoft PS/2-style Mouse" _____ Copied: trunk/reactos/media/inf/msmouse.inf (from rev 20046, trunk/reactos/media/inf/mouse.inf) _____ Modified: trunk/reactos/media/inf/syssetup.inf.tpl --- trunk/reactos/media/inf/syssetup.inf.tpl 2005-12-11 08:50:28 UTC (rev 20059) +++ trunk/reactos/media/inf/syssetup.inf.tpl 2005-12-11 09:57:53 UTC (rev 20060) @@ -19,7 +19,7 @@ hdc.inf keyboard.inf machine.inf -mouse.inf +msmouse.inf NET_NIC.inf ports.inf scsi.inf

1 0

[gvg] 20059: Usurp <petreolle@users.sourceforge.net>:
by gvg＠svn.reactos.com 11 Dec '05

11 Dec '05

Usurp <petreolle(a)users.sourceforge.net>: - Add French translation Modified: trunk/reactos/subsys/system/msconfig/En.rc Added: trunk/reactos/subsys/system/msconfig/Fr.rc Modified: trunk/reactos/subsys/system/msconfig/msconfig.rc _____ Modified: trunk/reactos/subsys/system/msconfig/En.rc --- trunk/reactos/subsys/system/msconfig/En.rc 2005-12-11 08:29:03 UTC (rev 20058) +++ trunk/reactos/subsys/system/msconfig/En.rc 2005-12-11 08:50:28 UTC (rev 20059) @@ -4,7 +4,7 @@ STYLE DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME -CAPTION "Systemkonfigurationsprogramm" +CAPTION "System configuration program" FONT 8, "Tahoma" BEGIN CONTROL "Tab1",IDC_TAB,"SysTabControl32",WS_TABSTOP,2,2,374,195 @@ -43,7 +43,7 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_MSCONFIG "Systemkonfigurationsprogramm" + IDS_MSCONFIG "System configuration program" IDS_TAB_GENERAL "General" IDS_TAB_SYSTEM "SYSTEM.INI" IDS_TAB_FREELDR "FREELDR.INI" @@ -77,7 +77,7 @@ IDS_TOOLS_REGEDIT_DESCR "Opens the Registry-Editor." IDS_TOOLS_REGEDIT_CMD "regedit.exe" - IDS_TOOLS_SYSDM_NAME "Systemproperties" + IDS_TOOLS_SYSDM_NAME "System properties" IDS_TOOLS_SYSDM_DESCR "Shows information about this computer." IDS_TOOLS_SYSDM_CMD "control" IDS_TOOLS_SYSDM_PARAM "sysdm.cpl" _____ Added: trunk/reactos/subsys/system/msconfig/Fr.rc --- trunk/reactos/subsys/system/msconfig/Fr.rc 2005-12-11 08:29:03 UTC (rev 20058) +++ trunk/reactos/subsys/system/msconfig/Fr.rc 2005-12-11 08:50:28 UTC (rev 20059) @@ -0,0 +1,96 @@ +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +IDD_MSCONFIG_DIALOG DIALOG DISCARDABLE 0, 0, 378, 220 +STYLE DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | + WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | + WS_THICKFRAME +CAPTION "Utilitaire de configuration systÞme" +FONT 8, "Tahoma" +BEGIN + CONTROL "Tab1",IDC_TAB,"SysTabControl32",WS_TABSTOP,2,2,374,195 + DEFPUSHBUTTON "OK", IDOK, 211, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Aide", IDC_BTN_HELP, 2, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Annuler", IDCANCEL, 267, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "A&ppliquer", IDC_BTN_APPLY, 323, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +IDD_STARTUP_PAGE DIALOG DISCARDABLE 0, 0, 362, 175 +STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "Tahoma" +BEGIN + CONTROL "List3",IDC_STARTUP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 2, 1, 360, 148 + PUSHBUTTON "&Activer tout",IDC_BTN_STARTUP_ACTIVATE,223,155,66,14 + PUSHBUTTON "&DÚsactiver tout",IDC_BTN_STARTUP_DEACTIVATE,295,155,66,14 +END + +IDD_TOOLS_PAGE DIALOG DISCARDABLE 0, 0, 362, 175 +STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "Tahoma" +BEGIN + CONTROL "List2",IDC_TOOLS_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 2, 1, 360, 134 + EDITTEXT IDC_TOOLS_CMDLINE, 1, 139, 360, 12, ES_READONLY + PUSHBUTTON "&Lancer", IDC_BTN_RUN, 311, 155, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +IDD_SERVICES_PAGE DIALOG DISCARDABLE 0, 0, 362, 175 +STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "Tahoma" +BEGIN + CONTROL "List1",IDC_SERVICES_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP,2,1,360,148 + PUSHBUTTON "&Activer tout",IDC_BTN_SERVICES_ACTIVATE,223,155,66,14 + PUSHBUTTON "&DÚsactiver tout",IDC_BTN_SERVICES_DEACTIVATE,295,155,66,14 +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_MSCONFIG "Utilitaire de configuration systÞme" + IDS_TAB_GENERAL "GÚnÚral" + IDS_TAB_SYSTEM "SYSTEM.INI" + IDS_TAB_FREELDR "FREELDR.INI" + IDS_TAB_SERVICES "Services" + IDS_TAB_STARTUP "DÚmarrage" + IDS_TAB_TOOLS "Outils" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_SERVICES_COLUMN_SERVICE "Service" + IDS_SERVICES_COLUMN_REQ "Requis" + IDS_SERVICES_COLUMN_VENDOR "Fabricant" + IDS_SERVICES_COLUMN_STATUS "Etat" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOOLS_COLUMN_NAME "Nom" + IDS_TOOLS_COLUMN_DESCR "Description" + + IDS_TOOLS_CMD_NAME "Console" + IDS_TOOLS_CMD_DESCR "" + IDS_TOOLS_CMD_CMD "cmd.exe" + + IDS_TOOLS_INFO_NAME "Version" + IDS_TOOLS_INFO_DESCR "Affiche les informations de version." + IDS_TOOLS_INFO_CMD "winver.exe" + + IDS_TOOLS_REGEDIT_NAME "Editeur de Registre" + IDS_TOOLS_REGEDIT_DESCR "Ouvre l'Úditeur de Registre" + IDS_TOOLS_REGEDIT_CMD "regedit.exe" + + IDS_TOOLS_SYSDM_NAME "PropriÚtÚs systÞme" + IDS_TOOLS_SYSDM_DESCR "Affiche/modifie des information a propos de l'ordinateur." + IDS_TOOLS_SYSDM_CMD "control" + IDS_TOOLS_SYSDM_PARAM "sysdm.cpl" + + IDS_STARTUP_COLUMN_ELEMENT "ElÚment" + IDS_STARTUP_COLUMN_CMD "Commande" + IDS_STARTUP_COLUMN_PATH "Chemin" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_SERVICES_STATUS_RUNNING "En cours" + IDS_SERVICES_STATUS_STOPPED "ArrÛtÚ" + IDS_SERVICES_YES "Oui" + IDS_SERVICES_UNKNOWN "Inconnu" +END Property changes on: trunk/reactos/subsys/system/msconfig/Fr.rc ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Modified: trunk/reactos/subsys/system/msconfig/msconfig.rc --- trunk/reactos/subsys/system/msconfig/msconfig.rc 2005-12-11 08:29:03 UTC (rev 20058) +++ trunk/reactos/subsys/system/msconfig/msconfig.rc 2005-12-11 08:50:28 UTC (rev 20059) @@ -15,4 +15,5 @@ #include "De.rc" #include "En.rc" +#include "Fr.rc" #include "Hu.rc"

1 0

[hpoussin] 20058: Remove some debug output for USB drivers
by hpoussin＠svn.reactos.com 11 Dec '05

11 Dec '05

Remove some debug output for USB drivers Modified: trunk/reactos/drivers/usb/miniport/common/common.xml Modified: trunk/reactos/drivers/usb/miniport/usbohci/usbohci.xml Modified: trunk/reactos/drivers/usb/miniport/usbuhci/usbuhci.xml Modified: trunk/reactos/drivers/usb/usbhub/usbhub.xml Modified: trunk/reactos/drivers/usb/usbport/usbport.xml _____ Modified: trunk/reactos/drivers/usb/miniport/common/common.xml --- trunk/reactos/drivers/usb/miniport/common/common.xml 2005-12-11 08:27:35 UTC (rev 20057) +++ trunk/reactos/drivers/usb/miniport/common/common.xml 2005-12-11 08:29:03 UTC (rev 20058) @@ -1,6 +1,5 @@ <module name="usbminiportcommon" type="objectlibrary"> <define name="__USE_W32API" /> - <define name="DEBUG_MODE" /> <include>../linux</include> <include base="usbport">.</include> <file>cleanup.c</file> _____ Modified: trunk/reactos/drivers/usb/miniport/usbohci/usbohci.xml --- trunk/reactos/drivers/usb/miniport/usbohci/usbohci.xml 2005-12-11 08:27:35 UTC (rev 20057) +++ trunk/reactos/drivers/usb/miniport/usbohci/usbohci.xml 2005-12-11 08:29:03 UTC (rev 20058) @@ -1,6 +1,5 @@ <module name="usbohci" type="kernelmodedriver" installbase="system32/drivers" installname="usbohci.sys"> <define name="__USE_W32API" /> - <define name="DEBUG_MODE" /> <include>../linux</include> <include base="usbminiportcommon"></include> <library>sys_base</library> _____ Modified: trunk/reactos/drivers/usb/miniport/usbuhci/usbuhci.xml --- trunk/reactos/drivers/usb/miniport/usbuhci/usbuhci.xml 2005-12-11 08:27:35 UTC (rev 20057) +++ trunk/reactos/drivers/usb/miniport/usbuhci/usbuhci.xml 2005-12-11 08:29:03 UTC (rev 20058) @@ -1,6 +1,5 @@ <module name="usbuhci" type="kernelmodedriver" installbase="system32/drivers" installname="usbuhci.sys"> <define name="__USE_W32API" /> - <define name="DEBUG_MODE" /> <include>../linux</include> <include base="usbminiportcommon"></include> <library>sys_base</library> _____ Modified: trunk/reactos/drivers/usb/usbhub/usbhub.xml --- trunk/reactos/drivers/usb/usbhub/usbhub.xml 2005-12-11 08:27:35 UTC (rev 20057) +++ trunk/reactos/drivers/usb/usbhub/usbhub.xml 2005-12-11 08:29:03 UTC (rev 20058) @@ -1,6 +1,5 @@ <module name="usbhub" type="kernelmodedriver" installbase="system32/drivers" installname="usbhub.sys"> <define name="__USE_W32API" /> - <define name="DEBUG_MODE" /> <include>../miniport/linux</include> <library>sys_base</library> <library>ntoskrnl</library> _____ Modified: trunk/reactos/drivers/usb/usbport/usbport.xml --- trunk/reactos/drivers/usb/usbport/usbport.xml 2005-12-11 08:27:35 UTC (rev 20057) +++ trunk/reactos/drivers/usb/usbport/usbport.xml 2005-12-11 08:29:03 UTC (rev 20058) @@ -1,8 +1,6 @@ <module name="usbport" type="kernelmodedriver" installbase="system32/drivers" installname="usbport.sys"> <importlibrary definition="usbport.def" /> <define name="__USE_W32API" /> - <define name="DEBUG_MODE" /> - <define name="DEBUG" /> <library>sys_base</library> <library>ntoskrnl</library> <library>hal</library>

1 0

[hpoussin] 20057: Don't include useless files
by hpoussin＠svn.reactos.com 11 Dec '05

11 Dec '05

Don't include useless files xboxvmp.c: use functions provided by videoprt instead of hal ones xboxvmp.c: replace DPRINT(1) by VideoPortDebugPrint Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.h Modified: trunk/reactos/drivers/video/miniport/vga/vgamp.h Modified: trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.c Modified: trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.h Modified: trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.xml _____ Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.h --- trunk/reactos/drivers/video/miniport/vbe/vbemp.h 2005-12-11 08:27:12 UTC (rev 20056) +++ trunk/reactos/drivers/video/miniport/vbe/vbemp.h 2005-12-11 08:27:35 UTC (rev 20057) @@ -26,7 +26,6 @@ #include <ntddk.h> #include <miniport.h> #include <video.h> -#include <ntddvdeo.h> #define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) #define TAG_VBE TAG('V', 'B', 'E', ' ') _____ Modified: trunk/reactos/drivers/video/miniport/vga/vgamp.h --- trunk/reactos/drivers/video/miniport/vga/vgamp.h 2005-12-11 08:27:12 UTC (rev 20056) +++ trunk/reactos/drivers/video/miniport/vga/vgamp.h 2005-12-11 08:27:35 UTC (rev 20057) @@ -26,7 +26,6 @@ #include <ntddk.h> #include <miniport.h> #include <video.h> -#include <ntddvdeo.h> #define UNIMPLEMENTED \ VideoPortDebugPrint(Error, "WARNING: %s at %s:%d is UNIMPLEMENTED!\n",__FUNCTION__,__FILE__,__LINE__); _____ Modified: trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.c --- trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.c 2005-12-11 08:27:12 UTC (rev 20056) +++ trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.c 2005-12-11 08:27:35 UTC (rev 20057) @@ -72,7 +72,7 @@ VIDEO_ACCESS_RANGE AccessRanges[3]; VP_STATUS Status; - DPRINT("XboxVmpFindAdapter\n"); + VideoPortDebugPrint(Trace, "XboxVmpFindAdapter\n"); XboxVmpDeviceExtension = (PXBOXVMP_DEVICE_EXTENSION) HwDeviceExtension; Status = VideoPortGetAccessRanges(HwDeviceExtension, 0, NULL, 3, AccessRanges, @@ -102,7 +102,7 @@ ULONG inIoSpace = VIDEO_MEMORY_SPACE_MEMORY; ULONG Length; - DPRINT("XboxVmpInitialize\n"); + VideoPortDebugPrint(Trace, "XboxVmpInitialize\n"); XboxVmpDeviceExtension = (PXBOXVMP_DEVICE_EXTENSION) HwDeviceExtension; @@ -113,10 +113,10 @@ &Length, &inIoSpace, &XboxVmpDeviceExtension->VirtControlStart)) { - DPRINT1("Failed to map control memory\n"); + VideoPortDebugPrint(Error, "Failed to map control memory\n"); return FALSE; } - DPRINT("Mapped 0x%x bytes of control mem at 0x%x to virt addr 0x%x\n", + VideoPortDebugPrint(Info, "Mapped 0x%x bytes of control mem at 0x%x to virt addr 0x%x\n", XboxVmpDeviceExtension->ControlLength, XboxVmpDeviceExtension->PhysControlStart.u.LowPart, XboxVmpDeviceExtension->VirtControlStart); @@ -142,7 +142,7 @@ switch (RequestPacket->IoControlCode) { case IOCTL_VIDEO_SET_CURRENT_MODE: - DPRINT("XboxVmpStartIO IOCTL_VIDEO_SET_CURRENT_MODE\n"); + VideoPortDebugPrint(Trace, "XboxVmpStartIO IOCTL_VIDEO_SET_CURRENT_MODE\n"); if (RequestPacket->InputBufferLength < sizeof(VIDEO_MODE)) { RequestPacket->StatusBlock->Status = ERROR_INSUFFICIENT_BUFFER; @@ -155,14 +155,14 @@ break; case IOCTL_VIDEO_RESET_DEVICE: - DPRINT("XboxVmpStartIO IOCTL_VIDEO_RESET_DEVICE\n"); + VideoPortDebugPrint(Trace, "XboxVmpStartIO IOCTL_VIDEO_RESET_DEVICE\n"); Result = XboxVmpResetDevice( (PXBOXVMP_DEVICE_EXTENSION)HwDeviceExtension, RequestPacket->StatusBlock); break; case IOCTL_VIDEO_MAP_VIDEO_MEMORY: - DPRINT("XboxVmpStartIO IOCTL_VIDEO_MAP_VIDEO_MEMORY\n"); + VideoPortDebugPrint(Trace, "XboxVmpStartIO IOCTL_VIDEO_MAP_VIDEO_MEMORY\n"); if (RequestPacket->OutputBufferLength < sizeof(VIDEO_MEMORY_INFORMATION) || RequestPacket->InputBufferLength < sizeof(VIDEO_MEMORY)) { @@ -177,7 +177,7 @@ break; case IOCTL_VIDEO_UNMAP_VIDEO_MEMORY: - DPRINT("XboxVmpStartIO IOCTL_VIDEO_UNMAP_VIDEO_MEMORY\n"); + VideoPortDebugPrint(Trace, "XboxVmpStartIO IOCTL_VIDEO_UNMAP_VIDEO_MEMORY\n"); if (RequestPacket->InputBufferLength < sizeof(VIDEO_MEMORY)) { RequestPacket->StatusBlock->Status = ERROR_INSUFFICIENT_BUFFER; @@ -190,7 +190,7 @@ break; case IOCTL_VIDEO_QUERY_NUM_AVAIL_MODES: - DPRINT("XboxVmpStartIO IOCTL_VIDEO_QUERY_NUM_AVAIL_MODES\n"); + VideoPortDebugPrint(Trace, "XboxVmpStartIO IOCTL_VIDEO_QUERY_NUM_AVAIL_MODES\n"); if (RequestPacket->OutputBufferLength < sizeof(VIDEO_NUM_MODES)) { RequestPacket->StatusBlock->Status = ERROR_INSUFFICIENT_BUFFER; @@ -203,7 +203,7 @@ break; case IOCTL_VIDEO_QUERY_AVAIL_MODES: - DPRINT("XboxVmpStartIO IOCTL_VIDEO_QUERY_AVAIL_MODES\n"); + VideoPortDebugPrint(Trace, "XboxVmpStartIO IOCTL_VIDEO_QUERY_AVAIL_MODES\n"); if (RequestPacket->OutputBufferLength < sizeof(VIDEO_MODE_INFORMATION)) { RequestPacket->StatusBlock->Status = ERROR_INSUFFICIENT_BUFFER; @@ -216,7 +216,7 @@ break; case IOCTL_VIDEO_QUERY_CURRENT_MODE: - DPRINT("XboxVmpStartIO IOCTL_VIDEO_QUERY_CURRENT_MODE\n"); + VideoPortDebugPrint(Trace, "XboxVmpStartIO IOCTL_VIDEO_QUERY_CURRENT_MODE\n"); if (RequestPacket->OutputBufferLength < sizeof(VIDEO_MODE_INFORMATION)) { RequestPacket->StatusBlock->Status = ERROR_INSUFFICIENT_BUFFER; @@ -229,7 +229,7 @@ break; default: - DPRINT("XboxVmpStartIO 0x%x not implemented\n"); + VideoPortDebugPrint(Warn, "XboxVmpStartIO 0x%x not implemented\n"); RequestPacket->StatusBlock->Status = STATUS_NOT_IMPLEMENTED; return FALSE; } @@ -254,7 +254,7 @@ ULONG Columns, ULONG Rows) { - DPRINT("XboxVmpResetHw\n"); + VideoPortDebugPrint(Trace, "XboxVmpResetHw\n"); if (! XboxVmpResetDevice((PXBOXVMP_DEVICE_EXTENSION) DeviceExtension, NULL)) { @@ -276,7 +276,7 @@ ULONG HwId, PVIDEO_POWER_MANAGEMENT VideoPowerControl) { - DPRINT1("XboxVmpGetPowerState is not supported\n"); + VideoPortDebugPrint(Error, "XboxVmpGetPowerState is not supported\n"); return ERROR_NOT_SUPPORTED; } @@ -293,7 +293,7 @@ ULONG HwId, PVIDEO_POWER_MANAGEMENT VideoPowerControl) { - DPRINT1("XboxVmpSetPowerState not supported\n"); + VideoPortDebugPrint(Error, "XboxVmpSetPowerState not supported\n"); return ERROR_NOT_SUPPORTED; } @@ -368,7 +368,7 @@ } else { - DPRINT1("ZwQueryBasicInformation failed, assuming 64MB total memory\n"); + VideoPortDebugPrint(Error, "ZwQueryBasicInformation failed, assuming 64MB total memory\n"); FrameBuffer.u.LowPart = 60 * 1024 * 1024; } @@ -385,7 +385,7 @@ /* Tell the nVidia controller about the framebuffer */ *((PULONG)((char *) DeviceExtension->VirtControlStart + CONTROL_FRAMEBUFFER_ADDRESS_OFFSET)) = FrameBuffer.u.LowPart; - DPRINT("Mapped 0x%x bytes of phys mem at 0x%x to virt addr 0x%x\n", + VideoPortDebugPrint(Info, "Mapped 0x%x bytes of phys mem at 0x%lx to virt addr 0x%p\n", MapInformation->VideoRamLength, FrameBuffer.u.LowPart, MapInformation->VideoRamBase); return TRUE; @@ -435,7 +435,7 @@ { int nRetriesToLive=50; - while (0 != (READ_PORT_USHORT((PUSHORT) (I2C_IO_BASE + 0)) & 0x0800)) + while (0 != (VideoPortReadPortUshort((PUSHORT) (I2C_IO_BASE + 0)) & 0x0800)) { ; /* Franz's spin while bus busy with any master traffic */ } @@ -445,22 +445,22 @@ UCHAR b; int temp; - WRITE_PORT_UCHAR((PUCHAR) (I2C_IO_BASE + 4), (Address << 1) | 1); - WRITE_PORT_UCHAR((PUCHAR) (I2C_IO_BASE + 8), bRegister); + VideoPortWritePortUchar((PUCHAR) (I2C_IO_BASE + 4), (Address << 1) | 1); + VideoPortWritePortUchar((PUCHAR) (I2C_IO_BASE + 8), bRegister); - temp = READ_PORT_USHORT((PUSHORT) (I2C_IO_BASE + 0)); - WRITE_PORT_USHORT((PUSHORT) (I2C_IO_BASE + 0), temp); /* clear down all preexisting errors */ + temp = VideoPortReadPortUshort((PUSHORT) (I2C_IO_BASE + 0)); + VideoPortWritePortUshort((PUSHORT) (I2C_IO_BASE + 0), temp); /* clear down all preexisting errors */ switch (Size) { case 4: - WRITE_PORT_UCHAR((PUCHAR) (I2C_IO_BASE + 2), 0x0d); /* DWORD modus ? */ + VideoPortWritePortUchar((PUCHAR) (I2C_IO_BASE + 2), 0x0d); /* DWORD modus ? */ break; case 2: - WRITE_PORT_UCHAR((PUCHAR) (I2C_IO_BASE + 2), 0x0b); /* WORD modus */ + VideoPortWritePortUchar((PUCHAR) (I2C_IO_BASE + 2), 0x0b); /* WORD modus */ break; default: - WRITE_PORT_UCHAR((PUCHAR) (I2C_IO_BASE + 2), 0x0a); // BYTE + VideoPortWritePortUchar((PUCHAR) (I2C_IO_BASE + 2), 0x0a); // BYTE break; } @@ -468,7 +468,7 @@ while (0 == (b & 0x36)) { - b = READ_PORT_UCHAR((PUCHAR) (I2C_IO_BASE + 0)); + b = VideoPortReadPortUchar((PUCHAR) (I2C_IO_BASE + 0)); } if (0 != (b & 0x24)) @@ -485,17 +485,17 @@ switch (Size) { case 4: - READ_PORT_UCHAR((PUCHAR) (I2C_IO_BASE + 6)); - READ_PORT_UCHAR((PUCHAR) (I2C_IO_BASE + 9)); - READ_PORT_UCHAR((PUCHAR) (I2C_IO_BASE + 9)); - READ_PORT_UCHAR((PUCHAR) (I2C_IO_BASE + 9)); - READ_PORT_UCHAR((PUCHAR) (I2C_IO_BASE + 9)); + VideoPortReadPortUchar((PUCHAR) (I2C_IO_BASE + 6)); + VideoPortReadPortUchar((PUCHAR) (I2C_IO_BASE + 9)); + VideoPortReadPortUchar((PUCHAR) (I2C_IO_BASE + 9)); + VideoPortReadPortUchar((PUCHAR) (I2C_IO_BASE + 9)); + VideoPortReadPortUchar((PUCHAR) (I2C_IO_BASE + 9)); break; case 2: - *Data_to_smbus = READ_PORT_USHORT((PUSHORT) (I2C_IO_BASE + 6)); + *Data_to_smbus = VideoPortReadPortUshort((PUSHORT) (I2C_IO_BASE + 6)); break; default: - *Data_to_smbus = READ_PORT_UCHAR((PUCHAR) (I2C_IO_BASE + 6)); + *Data_to_smbus = VideoPortReadPortUchar((PUCHAR) (I2C_IO_BASE + 6)); break; } _____ Modified: trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.h --- trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.h 2005-12-11 08:27:12 UTC (rev 20056) +++ trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.h 2005-12-11 08:27:35 UTC (rev 20057) @@ -28,12 +28,8 @@ #include <ntddk.h> #include <miniport.h> #include <video.h> -#include <ntddvdeo.h> -#include <ndk/ntndk.h> +#include <ndk/exfuncs.h> -#define NDEBUG -#include <debug.h> - typedef struct { PHYSICAL_ADDRESS PhysControlStart; _____ Modified: trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.xml --- trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.xml 2005-12-11 08:27:12 UTC (rev 20056) +++ trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.xml 2005-12-11 08:27:35 UTC (rev 20057) @@ -1,9 +1,7 @@ <module name="xboxvmp" type="kernelmodedriver"> <include base="xboxvmp">.</include> - <include base="ntoskrnl">include</include> <define name="__USE_W32API" /> <library>ntoskrnl</library> - <library>hal</library> <library>videoprt</library> <file>xboxvmp.c</file> <file>xboxvmp.rc</file>

1 0

← Newer
1
...
41
42
43
44
45
46
47
...
71
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2005