ReactOS.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2024
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
List overview
Download
Ros-diffs
August 2008
----- 2024 -----
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
ros-diffs@reactos.org
27 participants
853 discussions
Start a n
N
ew thread
[dreimer] 35574: Some more work on the updater.
by dreimer@svn.reactos.org
Author: dreimer Date: Sat Aug 23 15:05:08 2008 New Revision: 35574 URL:
http://svn.reactos.org/svn/reactos?rev=35574&view=rev
Log: Some more work on the updater. Modified: trunk/tools/RosBE/RosBE-Windows/Root/update.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Root/update.cmd URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/upd…
============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/update.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/update.cmd [iso-8859-1] Sat Aug 23 15:05:08 2008 @@ -11,14 +11,18 @@ :: The Update Server set url=www.foo.bar +:: First check for a new Updater +"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/update.cmd +"%_ROSBE_BASEDIR%\update.cmd" + :: PS1 Files -if exist "%_ROSBE_BASEDIR%\"%_ROSBE_BASEDIR%\Build.ps1" ( +if exist "%_ROSBE_BASEDIR%\Build.ps1" ( "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/Build.ps1 ) -if exist "%_ROSBE_BASEDIR%\"%_ROSBE_BASEDIR%\Clean.ps1" ( +if exist "%_ROSBE_BASEDIR%\Clean.ps1" ( "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/Clean.ps1 ) -if exist "%_ROSBE_BASEDIR%\"%_ROSBE_BASEDIR%\Help.ps1" ( +if exist "%_ROSBE_BASEDIR%\Help.ps1" ( "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/Help.ps1 ) if exist "%_ROSBE_BASEDIR%\MinGW.ps1" ( @@ -74,4 +78,18 @@ "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/RosBE.mac "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/rosbe-gcc-env.cmd "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/TimeDate.cmd -"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/update.cmd + +:: Load GCC and Tool SRC packages +"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/GCC.7z +"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/Tools.7z + +:: Extract GCC +"%_ROSBE_BASEDIR%\Tools\7z.exe" x GCC.7z "%_ROSBE_BASEDIR%\4.1.3" +"%_ROSBE_BASEDIR%\Tools\7z.exe" x Tools.7z "%TEMP%" + +:: Build the tools +make -f %TEMP%\makefile +copy %TEMP%\*.exe "%_ROSBE_BASEDIR%\Tools" + +:: Unload Vars +set url=
16 years, 1 month
1
0
0
0
[pschweitzer] 35573: Take UpcaseTable into account. FsRtlIsNameInExpression should be rewritten...
by pschweitzer@svn.reactos.org
Author: pschweitzer Date: Sat Aug 23 13:55:05 2008 New Revision: 35573 URL:
http://svn.reactos.org/svn/reactos?rev=35573&view=rev
Log: Take UpcaseTable into account. FsRtlIsNameInExpression should be rewritten... Modified: branches/pierre-fsd/ntoskrnl/fsrtl/name.c Modified: branches/pierre-fsd/ntoskrnl/fsrtl/name.c URL:
http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/fsrtl/name.…
============================================================================== --- branches/pierre-fsd/ntoskrnl/fsrtl/name.c [iso-8859-1] (original) +++ branches/pierre-fsd/ntoskrnl/fsrtl/name.c [iso-8859-1] Sat Aug 23 13:55:05 2008 @@ -282,17 +282,24 @@ } else { - /* FIXME: Take UpcaseTable into account! */ - if (Expression->Buffer[ExpressionPosition] == L'?' || - (IgnoreCase && + if (Expression->Buffer[ExpressionPosition] == L'?' || ( + IgnoreCase && !UpcaseTable && RtlUpcaseUnicodeChar(Expression->Buffer[ExpressionPosition]) == RtlUpcaseUnicodeChar(Name->Buffer[NamePosition])) || - (!IgnoreCase && - Expression->Buffer[ExpressionPosition] == + (!IgnoreCase && Expression->Buffer[ExpressionPosition] == Name->Buffer[NamePosition])) { NamePosition++; ExpressionPosition++; + } + else if (IgnoreCase && UpcaseTable) + { + if (UpcaseTable[Expression->Buffer[ExpressionPosition]] == + UpcaseTable[Name->Buffer[NamePosition]]) + { + NamePosition++; + ExpressionPosition++; + } } else {
16 years, 1 month
1
0
0
0
[janderwald] 35572: - Refresh treeview when a folder item is deleted
by janderwald@svn.reactos.org
Author: janderwald Date: Sat Aug 23 13:10:04 2008 New Revision: 35572 URL:
http://svn.reactos.org/svn/reactos?rev=35572&view=rev
Log: - Refresh treeview when a folder item is deleted Modified: trunk/reactos/dll/win32/shell32/shv_def_cmenu.c Modified: trunk/reactos/dll/win32/shell32/shv_def_cmenu.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_def_…
============================================================================== --- trunk/reactos/dll/win32/shell32/shv_def_cmenu.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shv_def_cmenu.c [iso-8859-1] Sat Aug 23 13:10:04 2008 @@ -1313,7 +1313,6 @@ { (void)TreeView_DeleteItem(hwnd, hItem); } - return S_OK; } } NotifyShellViewWindow(lpcmi, TRUE);
16 years, 1 month
1
0
0
0
[gbrunmar] 35571: This seems to be more correct
by gbrunmar@svn.reactos.org
Author: gbrunmar Date: Sat Aug 23 12:52:35 2008 New Revision: 35571 URL:
http://svn.reactos.org/svn/reactos?rev=35571&view=rev
Log: This seems to be more correct Modified: trunk/reactos/dll/directx/d3d9/device.c Modified: trunk/reactos/dll/directx/d3d9/device.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/device.c?…
============================================================================== --- trunk/reactos/dll/directx/d3d9/device.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/device.c [iso-8859-1] Sat Aug 23 12:52:35 2008 @@ -59,11 +59,6 @@ // TODO: Query driver for correct DX version pThisBaseDevice->dwDXVersion = 9; - pThisBaseDevice->CurrentDisplayMode[0].Width = pDirect3D9->DisplayAdapters[0].DriverCaps.dwDisplayWidth; - pThisBaseDevice->CurrentDisplayMode[0].Height = pDirect3D9->DisplayAdapters[0].DriverCaps.dwDisplayHeight; - pThisBaseDevice->CurrentDisplayMode[0].RefreshRate = pDirect3D9->DisplayAdapters[0].DriverCaps.dwRefreshRate; - pThisBaseDevice->CurrentDisplayMode[0].Format = pDirect3D9->DisplayAdapters[0].DriverCaps.DisplayFormat; - for (i = 0; i < NumAdaptersToCreate; i++) { if (FALSE == CreateD3D9DeviceData(&pDirect3D9->DisplayAdapters[i], &pThisBaseDevice->DeviceData[i])) @@ -73,7 +68,10 @@ } pThisBaseDevice->AdapterIndexInGroup[i] = i; - pThisBaseDevice->CurrentDisplayMode[i] = pThisBaseDevice->CurrentDisplayMode[0]; + pThisBaseDevice->CurrentDisplayMode[i].Width = pDirect3D9->DisplayAdapters[i].DriverCaps.dwDisplayWidth; + pThisBaseDevice->CurrentDisplayMode[i].Height = pDirect3D9->DisplayAdapters[i].DriverCaps.dwDisplayHeight; + pThisBaseDevice->CurrentDisplayMode[i].RefreshRate = pDirect3D9->DisplayAdapters[i].DriverCaps.dwRefreshRate; + pThisBaseDevice->CurrentDisplayMode[i].Format = pDirect3D9->DisplayAdapters[i].DriverCaps.RawDisplayFormat; pThisBaseDevice->pSwapChains[i] = CreateDirect3DSwapChain9(RT_BUILTIN, pThisBaseDevice, i); pThisBaseDevice->pSwapChains2[i] = pThisBaseDevice->pSwapChains[i];
16 years, 1 month
1
0
0
0
[janderwald] 35570: - Check if source and destination is the same. Fixes creating a new directory and using the default name - Prevent a potential buffer overflow in the file properties dialog
by janderwald@svn.reactos.org
Author: janderwald Date: Sat Aug 23 12:32:17 2008 New Revision: 35570 URL:
http://svn.reactos.org/svn/reactos?rev=35570&view=rev
Log: - Check if source and destination is the same. Fixes creating a new directory and using the default name - Prevent a potential buffer overflow in the file properties dialog Modified: trunk/reactos/dll/win32/shell32/fprop.c trunk/reactos/dll/win32/shell32/shfldr_desktop.c Modified: trunk/reactos/dll/win32/shell32/fprop.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/fprop.c?…
============================================================================== --- trunk/reactos/dll/win32/shell32/fprop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/fprop.c [iso-8859-1] Sat Aug 23 12:32:17 2008 @@ -664,7 +664,7 @@ int EnumPropSheetExt(LPWSTR wFileName, PROPSHEETHEADERW *pinfo, int NumPages, HPSXA * hpsxa, IDataObject *pDataObj) { - WCHAR szName[100]; + WCHAR szName[MAX_PATH] = {0}; WCHAR * pOffset; UINT Length; DWORD dwName; @@ -675,7 +675,7 @@ if (!pOffset) { Length = wcslen(szName); - if (Length >=94) + if (Length + 6 > sizeof(szName)/sizeof(szName[0])) return 0; if (CLSIDFromString(wFileName, &clsid) == NOERROR) @@ -691,7 +691,7 @@ else { Length = wcslen(pOffset); - if (Length >= 100) + if (Length >= sizeof(szName)/sizeof(szName[0])) return 0; wcscpy(szName, pOffset); } @@ -799,7 +799,11 @@ hResult = SHCreateDataObject(pidlFolder, 1, apidl, NULL, &IID_IDataObject, (LPVOID*)&pDataObj); if (hResult == S_OK) { - EnumPropSheetExt(wFileName, &pinfo, MAX_PROPERTY_SHEET_PAGE-1, hpsxa, pDataObj); + if (!EnumPropSheetExt(wFileName, &pinfo, MAX_PROPERTY_SHEET_PAGE-1, hpsxa, pDataObj)) + { + hpsxa[0] = NULL; + hpsxa[1] = NULL; + } } if ( GetFileVersionInfoSizeW(lpf, &dwHandle)) @@ -813,8 +817,8 @@ if (hResult == S_OK) { - SHDestroyPropSheetExtArray(hpsxa[0]); - SHDestroyPropSheetExtArray(hpsxa[1]); + SHDestroyPropSheetExtArray(hpsxa[0]); + SHDestroyPropSheetExtArray(hpsxa[1]); IDataObject_Release(pDataObj); } Modified: trunk/reactos/dll/win32/shell32/shfldr_desktop.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_d…
============================================================================== --- trunk/reactos/dll/win32/shell32/shfldr_desktop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shfldr_desktop.c [iso-8859-1] Sat Aug 23 12:32:17 2008 @@ -864,6 +864,16 @@ } } + if (!memcmp(szSrc, szDest, (wcslen(szDest)+1) * sizeof(WCHAR))) + { + /* src and destination is the same */ + hr = S_OK; + if (pPidlOut) + hr = _ILCreateFromPathW(szDest, pPidlOut); + + return hr; + } + TRACE ("src=%s dest=%s\n", debugstr_w(szSrc), debugstr_w(szDest)); if (MoveFileW (szSrc, szDest)) {
16 years, 1 month
1
0
0
0
[janderwald] 35569: - Pass the msi package in quotes - Fixes launching msi packages from directories with spaces - See bug 3342
by janderwald@svn.reactos.org
Author: janderwald Date: Sat Aug 23 12:26:26 2008 New Revision: 35569 URL:
http://svn.reactos.org/svn/reactos?rev=35569&view=rev
Log: - Pass the msi package in quotes - Fixes launching msi packages from directories with spaces - See bug 3342 Modified: trunk/reactos/boot/bootdata/hivecls_arm.inf trunk/reactos/boot/bootdata/hivecls_i386.inf Modified: trunk/reactos/boot/bootdata/hivecls_arm.inf URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivecls_arm.…
============================================================================== --- trunk/reactos/boot/bootdata/hivecls_arm.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivecls_arm.inf [iso-8859-1] Sat Aug 23 12:26:26 2008 @@ -211,9 +211,9 @@ ; MSI files HKCR,".msi","",0x00000000,"MSI.Package" HKCR,"Msi.Package\DefaultIcon","",0x00000000,"msiexec.exe" -HKCR,"Msi.Package\shell\Open\command","",0x00020000,"%SystemRoot%\system32\msiexec /i %1" -HKCR,"Msi.Package\shell\Repair\command","",0x00020000,"%SystemRoot%\system32\msiexec /f %1" -HKCR,"Msi.Package\shell\Uninstall\command","",0x00020000,"%SystemRoot%\system32\msiexec /x %1" +HKCR,"Msi.Package\shell\Open\command","",0x00020000,"%SystemRoot%\system32\msiexec /i ""%1""" +HKCR,"Msi.Package\shell\Repair\command","",0x00020000,"%SystemRoot%\system32\msiexec /f ""%1""" +HKCR,"Msi.Package\shell\Uninstall\command","",0x00020000,"%SystemRoot%\system32\msiexec /x ""%1""" HKCR,".pif","",0x00000000,"piffile" Modified: trunk/reactos/boot/bootdata/hivecls_i386.inf URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivecls_i386…
============================================================================== --- trunk/reactos/boot/bootdata/hivecls_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivecls_i386.inf [iso-8859-1] Sat Aug 23 12:26:26 2008 @@ -211,9 +211,9 @@ ; MSI files HKCR,".msi","",0x00000000,"MSI.Package" HKCR,"Msi.Package\DefaultIcon","",0x00000000,"msiexec.exe" -HKCR,"Msi.Package\shell\Open\command","",0x00020000,"%SystemRoot%\system32\msiexec /i %1" -HKCR,"Msi.Package\shell\Repair\command","",0x00020000,"%SystemRoot%\system32\msiexec /f %1" -HKCR,"Msi.Package\shell\Uninstall\command","",0x00020000,"%SystemRoot%\system32\msiexec /x %1" +HKCR,"Msi.Package\shell\Open\command","",0x00020000,"%SystemRoot%\system32\msiexec /i ""%1""" +HKCR,"Msi.Package\shell\Repair\command","",0x00020000,"%SystemRoot%\system32\msiexec /f ""%1""" +HKCR,"Msi.Package\shell\Uninstall\command","",0x00020000,"%SystemRoot%\system32\msiexec /x ""%1""" HKCR,".pif","",0x00000000,"piffile"
16 years, 1 month
1
0
0
0
[gbrunmar] 35568: * Refactored GetDirect3D9AdapterInfo() to make life a little easier in InitD3D9BaseDevice(). * Filled IDirect3DDevice9::DeviceData[] with correct info
by gbrunmar@svn.reactos.org
Author: gbrunmar Date: Sat Aug 23 12:24:27 2008 New Revision: 35568 URL:
http://svn.reactos.org/svn/reactos?rev=35568&view=rev
Log: * Refactored GetDirect3D9AdapterInfo() to make life a little easier in InitD3D9BaseDevice(). * Filled IDirect3DDevice9::DeviceData[] with correct info Modified: trunk/reactos/dll/directx/d3d9/d3d9_create.c trunk/reactos/dll/directx/d3d9/d3d9_create.h trunk/reactos/dll/directx/d3d9/d3d9_device.c trunk/reactos/dll/directx/d3d9/d3d9_private.h trunk/reactos/dll/directx/d3d9/d3d9_swapchain.c trunk/reactos/dll/directx/d3d9/device.c Modified: trunk/reactos/dll/directx/d3d9/d3d9_create.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_crea…
============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_create.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_create.c [iso-8859-1] Sat Aug 23 12:24:27 2008 @@ -112,21 +112,14 @@ } } -static BOOL GetDirect3D9AdapterInfo(IN OUT LPDIRECT3D9_DISPLAYADAPTER pDisplayAdapters, IN DWORD AdapterIndex) +BOOL CreateD3D9DeviceData(IN LPDIRECT3D9_DISPLAYADAPTER pDisplayAdapter, IN LPD3D9_DEVICEDATA pDeviceData) { HDC hDC; - LPD3D9_DEVICEDATA pDeviceData; - LPDIRECT3D9_DISPLAYADAPTER pDisplayAdapter = &pDisplayAdapters[AdapterIndex]; /* Test DC creation for the display device */ if (NULL == (hDC = CreateDCA(NULL, pDisplayAdapter->szDeviceName, NULL, NULL))) - return FALSE; - - pDeviceData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(D3D9_DEVICEDATA)); - if (NULL == pDeviceData) - { - DPRINT1("Out of memory, could not initialize Direct3D adapter"); - DeleteDC(hDC); + { + DPRINT1("Could not create dc for display adapter: %s", pDisplayAdapter->szDeviceName); return FALSE; } @@ -147,17 +140,39 @@ if (FALSE == GetDeviceData(pDeviceData)) { - DeleteDC(hDC); - HeapFree(GetProcessHeap(), 0, pDeviceData->pUnknown6BC); - HeapFree(GetProcessHeap(), 0, pDeviceData); - return FALSE; - } - - DeleteDC(hDC); + DPRINT1("Could not get device data for display adapter: %s", pDisplayAdapter->szDeviceName); + return FALSE; + } + + return TRUE; +} + +VOID DestroyD3D9DeviceData(IN LPD3D9_DEVICEDATA pDeviceData) +{ + DeleteDC(pDeviceData->hDC); + HeapFree(GetProcessHeap(), 0, pDeviceData->pUnknown6BC); +} + +static BOOL GetDirect3D9AdapterInfo(IN OUT LPDIRECT3D9_DISPLAYADAPTER pDisplayAdapters, IN DWORD AdapterIndex) +{ + LPD3D9_DEVICEDATA pDeviceData; + + pDeviceData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(D3D9_DEVICEDATA)); + if (NULL == pDeviceData) + { + DPRINT1("Out of memory, could not initialize Direct3D adapter"); + return FALSE; + } + + if (FALSE == CreateD3D9DeviceData(&pDisplayAdapters[AdapterIndex], pDeviceData)) + { + DPRINT1("Could not create device data for adapter: %d", AdapterIndex); + return FALSE; + } GetDisplayAdapterFromDevice(pDisplayAdapters, AdapterIndex, pDeviceData); - HeapFree(GetProcessHeap(), 0, pDeviceData->pUnknown6BC); + DestroyD3D9DeviceData(pDeviceData); HeapFree(GetProcessHeap(), 0, pDeviceData); return TRUE; @@ -232,9 +247,6 @@ if (pDirect3D9 == 0) return DDERR_OUTOFMEMORY; - pDirect3D9->unknown000007 = 0; - pDirect3D9->lpInt = 0; - pDirect3D9->lpVtbl = &Direct3D9_Vtbl; pDirect3D9->dwProcessId = GetCurrentThreadId(); pDirect3D9->lRefCnt = 1; @@ -246,10 +258,15 @@ InitializeCriticalSection(&pDirect3D9->d3d9_cs); - GetDisplayDeviceInfo(pDirect3D9); + if (FALSE == GetDisplayDeviceInfo(pDirect3D9)) + { + DPRINT1("Could not create Direct3D9 object"); + AlignedFree(pDirect3D9); + return DDERR_GENERIC; + } *ppDirect3D9 = (LPDIRECT3D9)&pDirect3D9->lpVtbl; - return ERROR_SUCCESS; -} - + return D3D_OK; +} + Modified: trunk/reactos/dll/directx/d3d9/d3d9_create.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_crea…
============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_create.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_create.h [iso-8859-1] Sat Aug 23 12:24:27 2008 @@ -15,4 +15,7 @@ /* Creates a Direct3D9 object */ HRESULT CreateD3D9(OUT LPDIRECT3D9 *ppDirect3D9, UINT SDKVersion); +BOOL CreateD3D9DeviceData(IN LPDIRECT3D9_DISPLAYADAPTER pDisplayAdapter, IN LPD3D9_DEVICEDATA pDeviceData); +VOID DestroyD3D9DeviceData(IN LPD3D9_DEVICEDATA pDeviceData); + #endif // _D3D9_CREATE_H_ Modified: trunk/reactos/dll/directx/d3d9/d3d9_device.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_devi…
============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_device.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_device.c [iso-8859-1] Sat Aug 23 12:24:27 2008 @@ -8,7 +8,8 @@ #include "d3d9_device.h" #include "d3d9_helpers.h" #include "adapter.h" -#include "debug.h" +#include <debug.h> +#include "d3d9_create.h" #define LOCK_D3DDEVICE9() if (This->bLockDevice) EnterCriticalSection(&This->CriticalSection); #define UNLOCK_D3DDEVICE9() if (This->bLockDevice) LeaveCriticalSection(&This->CriticalSection); @@ -53,8 +54,16 @@ if (ref == 0) { + DWORD iAdapter; + EnterCriticalSection(&This->CriticalSection); + /* TODO: Free resources here */ + for (iAdapter = 0; iAdapter < This->NumAdaptersInDevice; iAdapter++) + { + DestroyD3D9DeviceData(&This->DeviceData[iAdapter]); + } + LeaveCriticalSection(&This->CriticalSection); AlignedFree(This); } Modified: trunk/reactos/dll/directx/d3d9/d3d9_private.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_priv…
============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_private.h [iso-8859-1] Sat Aug 23 12:24:27 2008 @@ -2667,6 +2667,6 @@ /* 0x47ac */ DWORD unknown004587; /* 0x47b0 */ DWORD unknown004588; /* 0x47b4 */ UINT SDKVersion; -} DIRECT3D9_INT, *LPDIRECT3D9_INT; +} DIRECT3D9_INT, FAR *LPDIRECT3D9_INT; #endif // _D3D9_PRIVATE_H_ Modified: trunk/reactos/dll/directx/d3d9/d3d9_swapchain.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_swap…
============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_swapchain.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_swapchain.c [iso-8859-1] Sat Aug 23 12:24:27 2008 @@ -150,6 +150,8 @@ pThisSwapChain->GammaRamp.blue[i] = i; } + pThisSwapChain->PresentParameters = pPresentationParameters[pThisSwapChain->ChainIndex]; + return Direct3DSwapChain9_Reset(pThisSwapChain, pPresentationParameters); } Modified: trunk/reactos/dll/directx/d3d9/device.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/device.c?…
============================================================================== --- trunk/reactos/dll/directx/d3d9/device.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/device.c [iso-8859-1] Sat Aug 23 12:24:27 2008 @@ -9,6 +9,7 @@ #include "device.h" #include <debug.h> #include "d3d9_helpers.h" +#include "d3d9_create.h" static HRESULT InitD3D9ResourceManager(D3D9ResourceManager* pThisResourceManager, LPDIRECT3DDEVICE9_INT pDirect3DDevice9) { @@ -36,7 +37,6 @@ { D3D9ResourceManager* pResourceManager; DWORD i; - D3DDISPLAYMODE DisplayMode; // Insert Reset/Ctor here @@ -59,16 +59,25 @@ // TODO: Query driver for correct DX version pThisBaseDevice->dwDXVersion = 9; - DisplayMode = pThisBaseDevice->CurrentDisplayMode[0]; + pThisBaseDevice->CurrentDisplayMode[0].Width = pDirect3D9->DisplayAdapters[0].DriverCaps.dwDisplayWidth; + pThisBaseDevice->CurrentDisplayMode[0].Height = pDirect3D9->DisplayAdapters[0].DriverCaps.dwDisplayHeight; + pThisBaseDevice->CurrentDisplayMode[0].RefreshRate = pDirect3D9->DisplayAdapters[0].DriverCaps.dwRefreshRate; + pThisBaseDevice->CurrentDisplayMode[0].Format = pDirect3D9->DisplayAdapters[0].DriverCaps.DisplayFormat; + for (i = 0; i < NumAdaptersToCreate; i++) { + if (FALSE == CreateD3D9DeviceData(&pDirect3D9->DisplayAdapters[i], &pThisBaseDevice->DeviceData[i])) + { + DPRINT1("Failed to get device data for adapter: %d", i); + return DDERR_GENERIC; + } + + pThisBaseDevice->AdapterIndexInGroup[i] = i; pThisBaseDevice->CurrentDisplayMode[i] = pThisBaseDevice->CurrentDisplayMode[0]; - pThisBaseDevice->AdapterIndexInGroup[i] = i; - // TODO: Fill pThisBaseDevice->DeviceData[i] pThisBaseDevice->pSwapChains[i] = CreateDirect3DSwapChain9(RT_BUILTIN, pThisBaseDevice, i); pThisBaseDevice->pSwapChains2[i] = pThisBaseDevice->pSwapChains[i]; - Direct3DSwapChain9_SetDisplayMode(pThisBaseDevice->pSwapChains[i], &DisplayMode); + Direct3DSwapChain9_SetDisplayMode(pThisBaseDevice->pSwapChains[i], &pThisBaseDevice->CurrentDisplayMode[i]); if (FAILED(Direct3DSwapChain9_Init(pThisBaseDevice->pSwapChains[i], pPresentationParameters))) {
16 years, 1 month
1
0
0
0
[sginsberg] 35565: - In IoAcquire/ReleaseCancelSpinLock, use the queued "IopCancelSpinLock" instead of a ros-specific "CancelSpinLock" standard spinlock - Misc fixes
by sginsberg@svn.reactos.org
Author: sginsberg Date: Sat Aug 23 11:30:14 2008 New Revision: 35565 URL:
http://svn.reactos.org/svn/reactos?rev=35565&view=rev
Log: - In IoAcquire/ReleaseCancelSpinLock, use the queued "IopCancelSpinLock" instead of a ros-specific "CancelSpinLock" standard spinlock - Misc fixes Modified: trunk/reactos/ntoskrnl/io/iomgr/error.c trunk/reactos/ntoskrnl/io/iomgr/iofunc.c trunk/reactos/ntoskrnl/io/iomgr/iomgr.c trunk/reactos/ntoskrnl/io/iomgr/irp.c trunk/reactos/ntoskrnl/io/iomgr/util.c Modified: trunk/reactos/ntoskrnl/io/iomgr/error.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/error.c?…
============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/error.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/error.c [iso-8859-1] Sat Aug 23 11:30:14 2008 @@ -122,7 +122,7 @@ NULL); if (NT_SUCCESS(Status)) { - /* Remmeber we're connected */ + /* Remember we're connected */ IopLogPortConnected = TRUE; return TRUE; } @@ -583,7 +583,7 @@ KeAcquireSpinLock(&IopLogListLock, &Irql); InsertHeadList(&IopErrorLogListHead, &LogEntry->ListEntry); - /* Check if the worker is runnign */ + /* Check if the worker is running */ if (!IopLogWorkerRunning) { #if 0 @@ -648,7 +648,7 @@ IN PKTHREAD Thread) { UNIMPLEMENTED; - return(FALSE); + return FALSE; } /* @@ -659,14 +659,12 @@ IoSetThreadHardErrorMode(IN BOOLEAN HardErrorEnabled) { PETHREAD Thread = PsGetCurrentThread(); - BOOLEAN Old; + BOOLEAN OldMode; /* Get the current value */ - Old = !Thread->HardErrorsAreDisabled; + OldMode = !Thread->HardErrorsAreDisabled; /* Set the new one and return the old */ Thread->HardErrorsAreDisabled = !HardErrorEnabled; - return Old; -} - -/* EOF */ + return OldMode; +} Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iofunc.c…
============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iofunc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iofunc.c [iso-8859-1] Sat Aug 23 11:30:14 2008 @@ -682,7 +682,7 @@ StackPtr->FileObject = FileObject; /* Call the Driver */ - return IofCallDriver(DeviceObject, Irp); + return IoCallDriver(DeviceObject, Irp); } /* @@ -732,7 +732,7 @@ StackPtr->FileObject = FileObject; /* Call the Driver */ - return IofCallDriver(DeviceObject, Irp); + return IoCallDriver(DeviceObject, Irp); } /* @@ -776,7 +776,7 @@ } /* - * @unimplemented + * @implemented */ NTSTATUS NTAPI @@ -2045,7 +2045,7 @@ CapturedByteOffset = FileObject->CurrentByteOffset; } - /* Rememer we are sync */ + /* Remember we are sync */ Synchronous = TRUE; } else if (!(ByteOffset) && @@ -2904,7 +2904,7 @@ CapturedByteOffset = FileObject->CurrentByteOffset; } - /* Rememer we are sync */ + /* Remember we are sync */ Synchronous = TRUE; } else if (!(ByteOffset) && Modified: trunk/reactos/ntoskrnl/io/iomgr/iomgr.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iomgr.c?…
============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iomgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iomgr.c [iso-8859-1] Sat Aug 23 11:30:14 2008 @@ -68,7 +68,6 @@ extern LIST_ENTRY IopTimerQueueHead; extern KDPC IopTimerDpc; extern KTIMER IopTimer; -extern KSPIN_LOCK CancelSpinLock; extern KSPIN_LOCK IoVpbLock; extern KSPIN_LOCK IoStatisticsLock; extern KSPIN_LOCK DriverReinitListLock; @@ -463,7 +462,6 @@ InitializeListHead(&LastChanceShutdownListHead); InitializeListHead(&FsChangeNotifyListHead); InitializeListHead(&IopErrorLogListHead); - KeInitializeSpinLock(&CancelSpinLock); KeInitializeSpinLock(&IoVpbLock); KeInitializeSpinLock(&IoStatisticsLock); KeInitializeSpinLock(&DriverReinitListLock); Modified: trunk/reactos/ntoskrnl/io/iomgr/irp.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/irp.c?re…
============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/irp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/irp.c [iso-8859-1] Sat Aug 23 11:30:14 2008 @@ -1,8 +1,7 @@ - /* * PROJECT: ReactOS Kernel * LICENSE: GPL - See COPYING in the top level directory - * FILE: ntoskrnl/io/irp.c + * FILE: ntoskrnl/io/iomgr/irp.c * PURPOSE: IRP Handling Functions * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) * Gunnar Dalsnes @@ -627,7 +626,7 @@ /* Allocate IRP */ Irp = IoAllocateIrp(DeviceObject->StackSize, FALSE); - if (!Irp) return Irp; + if (!Irp) return NULL; /* Get the Stack */ StackPtr = IoGetNextIrpStackLocation(Irp); @@ -731,7 +730,7 @@ Irp->UserIosb = IoStatusBlock; Irp->Tail.Overlay.Thread = PsGetCurrentThread(); - /* Set the Status Block after all is done */ + /* Return the IRP */ IOTRACE(IO_IRP_DEBUG, "%s - Built IRP %p with Major, Buffer, DO %lx %p %p\n", __FUNCTION__, @@ -763,7 +762,7 @@ /* Allocate IRP */ Irp = IoAllocateIrp(DeviceObject->StackSize, FALSE); - if (!Irp) return Irp; + if (!Irp) return NULL; /* Get the Stack */ StackPtr = IoGetNextIrpStackLocation(Irp); @@ -857,6 +856,7 @@ } else { + /* Clear the flags */ Irp->Flags = 0; } @@ -1058,7 +1058,12 @@ * Don't stay here forever if some broken driver doesn't complete * the IRP. */ - if (!(Retries--)) IopRemoveThreadIrp(); + if (!(Retries--)) + { + /* Print out a message and remove the IRP */ + DPRINT1("Broken driver did not complete!\n"); + IopRemoveThreadIrp(); + } /* Raise the IRQL Again */ KeRaiseIrql(APC_LEVEL, &OldIrql); @@ -1076,7 +1081,7 @@ IoCallDriver(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - /* Call fast call */ + /* Call fastcall */ return IofCallDriver(DeviceObject, Irp); } @@ -1112,7 +1117,7 @@ IN PIRP Irp) { PDRIVER_OBJECT DriverObject; - PIO_STACK_LOCATION Param; + PIO_STACK_LOCATION StackPtr; /* Get the Driver Object */ DriverObject = DeviceObject->DriverObject; @@ -1126,15 +1131,15 @@ } /* Now update the stack location */ - Param = IoGetNextIrpStackLocation(Irp); - Irp->Tail.Overlay.CurrentStackLocation = Param; + StackPtr = IoGetNextIrpStackLocation(Irp); + Irp->Tail.Overlay.CurrentStackLocation = StackPtr; /* Get the Device Object */ - Param->DeviceObject = DeviceObject; + StackPtr->DeviceObject = DeviceObject; /* Call it */ - return DriverObject->MajorFunction[Param->MajorFunction](DeviceObject, - Irp); + return DriverObject->MajorFunction[StackPtr->MajorFunction](DeviceObject, + Irp); } FORCEINLINE @@ -1417,10 +1422,9 @@ NTSTATUS NTAPI -IopSynchronousCompletion( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp, - IN PVOID Context) +IopSynchronousCompletion(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PVOID Context) { if (Irp->PendingReturned) KeSetEvent((PKEVENT)Context, IO_NO_INCREMENT, FALSE); @@ -1464,6 +1468,7 @@ KeWaitForSingleObject(&Event, Suspended, KernelMode, FALSE, NULL); } + /* Return success */ return TRUE; } @@ -1550,10 +1555,12 @@ /* * @implemented */ -PEPROCESS NTAPI +PEPROCESS +NTAPI IoGetRequestorProcess(IN PIRP Irp) { - return(Irp->Tail.Overlay.Thread->ThreadsProcess); + /* Return the requestor process */ + return Irp->Tail.Overlay.Thread->ThreadsProcess; } /* @@ -1563,6 +1570,7 @@ NTAPI IoGetRequestorProcessId(IN PIRP Irp) { + /* Return the requestor process' id */ return (ULONG)(IoGetRequestorProcess(Irp)->UniqueProcessId); } @@ -1586,6 +1594,7 @@ NTAPI IoGetTopLevelIrp(VOID) { + /* Return the IRP */ return (PIRP)PsGetCurrentThread()->TopLevelIrp; } @@ -1736,5 +1745,3 @@ /* Set the IRP */ PsGetCurrentThread()->TopLevelIrp = (ULONG)Irp; } - -/* EOF */ Modified: trunk/reactos/ntoskrnl/io/iomgr/util.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/util.c?r…
============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/util.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/util.c [iso-8859-1] Sat Aug 23 11:30:14 2008 @@ -1,9 +1,11 @@ /* * PROJECT: ReactOS Kernel * LICENSE: GPL - See COPYING in the top level directory - * FILE: ntoskrnl/io/util.c + * FILE: ntoskrnl/io/iomgr/util.c * PURPOSE: I/O Utility Functions - * PROGRAMMERS: <UNKNOWN> + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + * Aleksey Bragin (aleksey(a)reactos.org) + * Daniel Zimmerman (netzimme(a)aim.com) */ /* INCLUDES *****************************************************************/ @@ -17,10 +19,6 @@ RtlpGetStackLimits(PULONG_PTR StackBase, PULONG_PTR StackLimit); -/* DATA **********************************************************************/ - -KSPIN_LOCK CancelSpinLock; - /* FUNCTIONS *****************************************************************/ /* @@ -28,10 +26,10 @@ */ VOID NTAPI -IoAcquireCancelSpinLock(PKIRQL Irql) +IoAcquireCancelSpinLock(OUT PKIRQL Irql) { /* Just acquire the internal lock */ - KeAcquireSpinLock(&CancelSpinLock,Irql); + *Irql = KeAcquireQueuedSpinLock(LockQueueIoCancelLock); } /* @@ -113,6 +111,7 @@ NTAPI IoGetCurrentProcess(VOID) { + /* Return the current thread's process */ return (PEPROCESS)PsGetCurrentThread()->Tcb.ApcState.Process; } @@ -121,10 +120,10 @@ */ VOID NTAPI -IoReleaseCancelSpinLock(KIRQL Irql) +IoReleaseCancelSpinLock(IN KIRQL Irql) { /* Release the internal lock */ - KeReleaseSpinLock(&CancelSpinLock,Irql); + KeReleaseQueuedSpinLock(LockQueueIoCancelLock, Irql); } /* @@ -315,4 +314,3 @@ UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; } -/* EOF */
16 years, 1 month
2
1
0
0
[sginsberg] 35567: - Add THREAD_TERMINATE_HELD_MUTEX bugcode and make use of it
by sginsberg@svn.reactos.org
Author: sginsberg Date: Sat Aug 23 12:16:16 2008 New Revision: 35567 URL:
http://svn.reactos.org/svn/reactos?rev=35567&view=rev
Log: - Add THREAD_TERMINATE_HELD_MUTEX bugcode and make use of it Modified: trunk/reactos/include/reactos/mc/bugcodes.mc trunk/reactos/ntoskrnl/ke/thrdobj.c Modified: trunk/reactos/include/reactos/mc/bugcodes.mc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/mc/bugcode…
============================================================================== --- trunk/reactos/include/reactos/mc/bugcodes.mc [iso-8859-1] (original) +++ trunk/reactos/include/reactos/mc/bugcodes.mc [iso-8859-1] Sat Aug 23 12:16:16 2008 @@ -1397,6 +1397,14 @@ MultiProcessor Kernel . +MessageId=0x8A +Severity=Informational +Facility=System +SymbolicName=THREAD_TERMINATE_HELD_MUTEX +Language=English +A kernel thread terminated while holding a mutex +. + MessageId=0x9D Severity=Informational Facility=System Modified: trunk/reactos/ntoskrnl/ke/thrdobj.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/thrdobj.c?rev=…
============================================================================== --- trunk/reactos/ntoskrnl/ke/thrdobj.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/thrdobj.c [iso-8859-1] Sat Aug 23 12:16:16 2008 @@ -416,7 +416,7 @@ if (Mutant->ApcDisable) { /* Bugcheck the system */ - KEBUGCHECKEX(0, //THREAD_TERMINATE_HELD_MUTEX, + KeBugCheckEx(THREAD_TERMINATE_HELD_MUTEX, (ULONG_PTR)Thread, (ULONG_PTR)Mutant, 0,
16 years, 1 month
1
0
0
0
[fireball] 35566: - Implement IopGetRegistryValue (complementary function to IopOpenRegistryKeyEx). Not used yet.
by fireball@svn.reactos.org
Author: fireball Date: Sat Aug 23 12:11:12 2008 New Revision: 35566 URL:
http://svn.reactos.org/svn/reactos?rev=35566&view=rev
Log: - Implement IopGetRegistryValue (complementary function to IopOpenRegistryKeyEx). Not used yet. Modified: trunk/reactos/ntoskrnl/include/internal/io.h trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/include/internal/io.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/…
============================================================================== --- trunk/reactos/ntoskrnl/include/internal/io.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/io.h [iso-8859-1] Sat Aug 23 12:11:12 2008 @@ -593,6 +593,13 @@ PUNICODE_STRING Name, ACCESS_MASK DesiredAccess); +NTSTATUS +NTAPI +IopGetRegistryValue(IN HANDLE Handle, + IN PWSTR ValueName, + OUT PKEY_VALUE_FULL_INFORMATION *Information); + + // // Initialization Routines // Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.…
============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Sat Aug 23 12:11:12 2008 @@ -2775,6 +2775,51 @@ return Status; } +NTSTATUS +NTAPI +IopGetRegistryValue(IN HANDLE Handle, + IN PWSTR ValueName, + OUT PKEY_VALUE_FULL_INFORMATION *Information) +{ + UNICODE_STRING ValueString; + NTSTATUS Status; + PKEY_VALUE_FULL_INFORMATION FullInformation; + ULONG Size; + PAGED_CODE(); + + RtlInitUnicodeString(&ValueString, ValueName); + + Status = ZwQueryValueKey(Handle, + &ValueString, + KeyValueFullInformation, + NULL, + 0, + &Size); + if ((Status != STATUS_BUFFER_OVERFLOW) && + (Status != STATUS_BUFFER_TOO_SMALL)) + { + return Status; + } + + FullInformation = ExAllocatePool(NonPagedPool, Size); + if (!FullInformation) return STATUS_INSUFFICIENT_RESOURCES; + + Status = ZwQueryValueKey(Handle, + &ValueString, + KeyValueFullInformation, + FullInformation, + Size, + &Size); + if (!NT_SUCCESS(Status)) + { + ExFreePool(FullInformation); + return Status; + } + + *Information = FullInformation; + return STATUS_SUCCESS; +} + static NTSTATUS INIT_FUNCTION NTAPI PnpDriverInitializeEmpty(IN struct _DRIVER_OBJECT *DriverObject, IN PUNICODE_STRING RegistryPath)
16 years, 1 month
1
0
0
0
← Newer
1
...
25
26
27
28
29
30
31
...
86
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
Results per page:
10
25
50
100
200