Ros-diffs August 2008

ros-diffs@reactos.org

27 participants
853 discussions

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Fri Aug 8 14:08:27 2008 New Revision: 35193 URL: http://svn.reactos.org/svn/reactos?rev=35193&view=rev Log: - Fix a typo Modified: trunk/reactos/ntoskrnl/config/cmvalche.c Modified: trunk/reactos/ntoskrnl/config/cmvalche.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmvalche.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmvalche.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmvalche.c [iso-8859-1] Fri Aug 8 14:08:27 2008 @@ -55,7 +55,7 @@ *ValueListToRelease = HCELL_NIL; *IndexIsCached = FALSE; - /* Get the hive and value ceche */ + /* Get the hive and value cache */ Hive = Kcb->KeyHive; ChildList = &Kcb->ValueCache; KeyNode = (PCM_KEY_NODE)HvGetCell(Hive, Kcb->KeyCell);

16 years, 4 months

[arty] 35192: Merge aicom-network-fixes up to 35189

by arty＠svn.reactos.org

Author: arty Date: Fri Aug 8 13:38:16 2008 New Revision: 35192 URL: http://svn.reactos.org/svn/reactos?rev=35192&view=rev Log: Merge aicom-network-fixes up to 35189 Modified: trunk/reactos/drivers/network/afd/afd/tdi.c Modified: trunk/reactos/drivers/network/afd/afd/tdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/td… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/tdi.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/tdi.c [iso-8859-1] Fri Aug 8 13:38:16 2008 @@ -291,7 +291,11 @@ AFD_DbgPrint(MAX_TRACE, ("Called\n")); - assert(ConnectionObject); + if (!ConnectionObject) { + AFD_DbgPrint(MIN_TRACE, ("Bad connection object.\n")); + *Irp = NULL; + return STATUS_INVALID_PARAMETER; + } DeviceObject = IoGetRelatedDeviceObject(ConnectionObject); if (!DeviceObject) { @@ -345,7 +349,10 @@ AFD_DbgPrint(MAX_TRACE, ("Called. AddressHandle (0x%X) ConnectionObject (0x%X)\n", AddressHandle, ConnectionObject)); - assert(ConnectionObject); + if (!ConnectionObject) { + AFD_DbgPrint(MIN_TRACE, ("Bad connection object.\n")); + return STATUS_INVALID_PARAMETER; + } DeviceObject = IoGetRelatedDeviceObject(ConnectionObject); if (!DeviceObject) { @@ -398,6 +405,12 @@ NTSTATUS Status; AFD_DbgPrint(MAX_TRACE, ("Called\n")); + + if (!ConnectionObject) { + AFD_DbgPrint(MIN_TRACE, ("Bad connection object.\n")); + *Irp = NULL; + return STATUS_INVALID_PARAMETER; + } DeviceObject = IoGetRelatedDeviceObject(ConnectionObject); if (!DeviceObject) { @@ -463,7 +476,10 @@ AFD_DbgPrint(MAX_TRACE, ("Called\n")); - assert(FileObject); + if (!FileObject) { + AFD_DbgPrint(MIN_TRACE, ("Bad file object.\n")); + return STATUS_INVALID_PARAMETER; + } DeviceObject = IoGetRelatedDeviceObject(FileObject); if (!DeviceObject) { @@ -524,6 +540,11 @@ NTSTATUS Status; KEVENT Event; PIRP Irp; + + if (!FileObject) { + AFD_DbgPrint(MIN_TRACE, ("Bad file object.\n")); + return STATUS_INVALID_PARAMETER; + } DeviceObject = IoGetRelatedDeviceObject(FileObject); if (!DeviceObject) { @@ -573,6 +594,11 @@ NTSTATUS Status; KEVENT Event; PIRP Irp; + + if (!FileObject) { + AFD_DbgPrint(MIN_TRACE, ("Bad file object.\n")); + return STATUS_INVALID_PARAMETER; + } DeviceObject = IoGetRelatedDeviceObject(FileObject); if (!DeviceObject) { @@ -797,6 +823,12 @@ NTSTATUS Status = STATUS_SUCCESS; PMDL Mdl; + if (!TransportObject) { + AFD_DbgPrint(MIN_TRACE, ("Bad transport object.\n")); + *Irp = NULL; + return STATUS_INVALID_PARAMETER; + } + DeviceObject = IoGetRelatedDeviceObject(TransportObject); if (!DeviceObject) { AFD_DbgPrint(MIN_TRACE, ("Bad device object.\n")); @@ -877,6 +909,12 @@ PDEVICE_OBJECT DeviceObject; PMDL Mdl; + if (!TransportObject) { + AFD_DbgPrint(MIN_TRACE, ("Bad transport object.\n")); + *Irp = NULL; + return STATUS_INVALID_PARAMETER; + } + DeviceObject = IoGetRelatedDeviceObject(TransportObject); if (!DeviceObject) { AFD_DbgPrint(MIN_TRACE, ("Bad device object.\n")); @@ -975,6 +1013,12 @@ PDEVICE_OBJECT DeviceObject; NTSTATUS Status; PMDL Mdl; + + if (!TransportObject) { + AFD_DbgPrint(MIN_TRACE, ("Bad tranport object.\n")); + *Irp = NULL; + return STATUS_INVALID_PARAMETER; + } DeviceObject = IoGetRelatedDeviceObject(TransportObject); if (!DeviceObject) { @@ -1064,6 +1108,12 @@ PDEVICE_OBJECT DeviceObject; NTSTATUS Status; PMDL Mdl; + + if (!TransportObject) { + AFD_DbgPrint(MIN_TRACE, ("Bad transport object.\n")); + *Irp = NULL; + return STATUS_INVALID_PARAMETER; + } AFD_DbgPrint(MID_TRACE,("Called(TransportObject %x)\n", TransportObject)); @@ -1143,9 +1193,12 @@ KEVENT Event; PIRP Irp; - DeviceObject = IoGetRelatedDeviceObject(TransportObject); - KeInitializeEvent(&Event, NotificationEvent, FALSE); + + if (!TransportObject) { + AFD_DbgPrint(MIN_TRACE, ("Bad transport object.\n")); + return STATUS_INVALID_PARAMETER; + } AFD_DbgPrint(MID_TRACE,("Called(TransportObject %x)\n", TransportObject));

16 years, 4 months

[janderwald] 35191: - implement enumerating of font items

by janderwald＠svn.reactos.org

Author: janderwald Date: Fri Aug 8 13:34:51 2008 New Revision: 35191 URL: http://svn.reactos.org/svn/reactos?rev=35191&view=rev Log: - implement enumerating of font items Modified: trunk/reactos/dll/win32/shell32/shfldr_fonts.c Modified: trunk/reactos/dll/win32/shell32/shfldr_fonts.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_f… ============================================================================== --- trunk/reactos/dll/win32/shell32/shfldr_fonts.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shfldr_fonts.c [iso-8859-1] Fri Aug 8 13:34:51 2008 @@ -205,6 +205,102 @@ return hr; } +static LPITEMIDLIST _ILCreateFontItem(LPWSTR pszFont, LPWSTR pszFile) +{ + PIDLDATA tmp; + LPITEMIDLIST pidl; + PIDLFontStruct * p; + int size0 = (char*)&tmp.u.cfont.szName-(char*)&tmp.u.cfont; + int size = size0; + + tmp.type = 0x00; + tmp.u.cfont.dummy = 0xFF; + tmp.u.cfont.offsFile = wcslen(pszFont) + 1; + + size = (tmp.u.cfont.offsFile + wcslen(pszFile) + 1) * sizeof(WCHAR); + + pidl = (LPITEMIDLIST)SHAlloc(size + 4); + if (!pidl) + return pidl; + + pidl->mkid.cb = size+2; + memcpy(pidl->mkid.abID, &tmp, 2+size0); + + p = &((PIDLDATA*)pidl->mkid.abID)->u.cfont; + wcscpy(p->szName, pszFont); + wcscpy(p->szName + tmp.u.cfont.offsFile, pszFile); + + *(WORD*)((char*)pidl+(size+2)) = 0; + return pidl; +} + +static PIDLFontStruct * _ILGetFontStruct(LPCITEMIDLIST pidl) +{ + LPPIDLDATA pdata = _ILGetDataPointer(pidl); + + if (pdata && pdata->type==0x00) + return (PIDLFontStruct*)&(pdata->u.cfont); + + return NULL; +} + + + +/************************************************************************** + * CreateFontsEnumListss() + */ +static BOOL CreateFontsEnumList(IEnumIDList *list, DWORD dwFlags) +{ + WCHAR szPath[MAX_PATH]; + WCHAR szName[LF_FACESIZE+20]; + WCHAR szFile[MAX_PATH]; + LPWSTR pszPath; + UINT Length; + LONG ret; + DWORD dwType, dwName, dwFile, dwIndex; + LPITEMIDLIST pidl; + HKEY hKey; + + if (dwFlags & SHCONTF_NONFOLDERS) + { + if (!SHGetSpecialFolderPathW(NULL, szPath, CSIDL_FONTS, FALSE)) + return FALSE; + + pszPath = PathAddBackslashW(szPath); + if (!pszPath) + return FALSE; + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Windows NT\\CurrentVersion\\Fonts", 0, KEY_READ, &hKey)!= ERROR_SUCCESS) + return FALSE; + + Length = pszPath - szPath; + dwIndex = 0; + do + { + dwName = sizeof(szName)/sizeof(WCHAR); + dwFile = sizeof(szFile)/sizeof(WCHAR); + ret = RegEnumValueW(hKey, dwIndex++, szName, &dwName, NULL, &dwType, (LPVOID)szFile, &dwFile); + if (ret == ERROR_SUCCESS) + { + szFile[(sizeof(szFile)/sizeof(WCHAR))-1] = L'\0'; + if (dwType == REG_SZ && wcslen(szFile) + Length + 1< (sizeof(szPath)/sizeof(WCHAR))) + { + wcscpy(&szPath[Length], szFile); + pidl = _ILCreateFontItem(szName, szPath); + TRACE("pidl %p name %s path %s\n", pidl, debugstr_w(szName), debugstr_w(szPath)); + if (pidl) + { + if (!AddToEnumList(list, pidl)) + SHFree(pidl); + } + } + } + }while(ret != ERROR_NO_MORE_ITEMS); + RegCloseKey(hKey); + + } + return TRUE; +} + /************************************************************************** * ISF_Fonts_fnEnumObjects */ @@ -217,6 +313,8 @@ hwndOwner, dwFlags, ppEnumIDList); *ppEnumIDList = IEnumIDList_Constructor(); + if(*ppEnumIDList) + CreateFontsEnumList(*ppEnumIDList, dwFlags); TRACE ("-- (%p)->(new ID List: %p)\n", This, *ppEnumIDList); @@ -436,14 +534,26 @@ LPCITEMIDLIST pidl, DWORD dwFlags, LPSTRRET strRet) { IGenericSFImpl *This = (IGenericSFImpl *)iface; - - FIXME ("(%p)->(pidl=%p,0x%08x,%p)\n", This, pidl, dwFlags, strRet); + PIDLFontStruct * pfont; + + TRACE("ISF_Fonts_fnGetDisplayNameOf (%p)->(pidl=%p,0x%08x,%p)\n", This, pidl, dwFlags, strRet); pdump (pidl); if (!strRet) return E_INVALIDARG; - return E_NOTIMPL; + pfont = _ILGetFontStruct(pidl); + if (!pfont) + return E_INVALIDARG; + + strRet->u.pOleStr = CoTaskMemAlloc((wcslen(pfont->szName)+1) * sizeof(WCHAR)); + if (!strRet->u.pOleStr) + return E_OUTOFMEMORY; + + wcscpy(strRet->u.pOleStr, pfont->szName); + strRet->uType = STRRET_WSTR; + + return S_OK; } /************************************************************************** @@ -526,6 +636,9 @@ IGenericSFImpl *This = (IGenericSFImpl *)iface; WCHAR buffer[MAX_PATH] = {0}; HRESULT hr = E_FAIL; + PIDLFontStruct * pfont; + HANDLE hFile; + LARGE_INTEGER FileSize; TRACE("(%p, %p, %d, %p)\n", This, pidl, iColumn, psd); @@ -544,7 +657,58 @@ } if (iColumn == COLUMN_NAME) + { + psd->str.uType = STRRET_WSTR; return IShellFolder2_GetDisplayNameOf(iface, pidl, SHGDN_NORMAL, &psd->str); + } + + psd->str.uType = STRRET_CSTR; + psd->str.u.cStr[0] = '\0'; + + switch(iColumn) + { + case COLUMN_TYPE: + break; + case COLUMN_SIZE: + pfont = _ILGetFontStruct(pidl); + if (pfont) + { + hFile = CreateFileW(pfont->szName + pfont->offsFile, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL); + if (hFile) + { + if (GetFileSizeEx(hFile, &FileSize)) + { + if (StrFormatByteSizeW(FileSize.QuadPart, buffer, sizeof(buffer)/sizeof(WCHAR))) + { + psd->str.u.pOleStr = CoTaskMemAlloc(wcslen(buffer) + 1); + if (!psd->str.u.pOleStr) + return E_OUTOFMEMORY; + wcscpy(psd->str.u.pOleStr, buffer); + psd->str.uType = STRRET_WSTR; + CloseHandle(hFile); + return S_OK; + } + } + CloseHandle(hFile); + } + } + break; + case COLUMN_FILENAME: + pfont = _ILGetFontStruct(pidl); + if (pfont) + { + psd->str.u.pOleStr = CoTaskMemAlloc((wcslen(pfont->szName + pfont->offsFile) + 1) * sizeof(WCHAR)); + if (psd->str.u.pOleStr) + { + psd->str.uType = STRRET_WSTR; + wcscpy(psd->str.u.pOleStr, pfont->szName + pfont->offsFile); + return S_OK; + } + else + return E_OUTOFMEMORY; + } + break; + } FIXME ("(%p)->(%p %i %p)\n", This, pidl, iColumn, psd);

16 years, 4 months

[arty] 35190: Patches by Gregor Schneider <grschneider at gmail dot com> Added serial support, some bugfixes.

by arty＠svn.reactos.org

Author: arty Date: Fri Aug 8 13:03:59 2008 New Revision: 35190 URL: http://svn.reactos.org/svn/reactos?rev=35190&view=rev Log: Patches by Gregor Schneider <grschneider at gmail dot com> Added serial support, some bugfixes. Modified: trunk/tools/reactosdbg/DebugProtocol/DebugConnection.cs trunk/tools/reactosdbg/DebugProtocol/KDBG.cs trunk/tools/reactosdbg/Pipe/Pipe.csproj trunk/tools/reactosdbg/RosDBG/BackTrace.cs trunk/tools/reactosdbg/RosDBG/MainWindow.Designer.cs trunk/tools/reactosdbg/RosDBG/MainWindow.cs trunk/tools/reactosdbg/RosDBG/RosDBG.csproj trunk/tools/reactosdbg/RosDBG/Settings.cs Modified: trunk/tools/reactosdbg/DebugProtocol/DebugConnection.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/DebugProtocol/Deb… ============================================================================== --- trunk/tools/reactosdbg/DebugProtocol/DebugConnection.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/DebugProtocol/DebugConnection.cs [iso-8859-1] Fri Aug 8 13:03:59 2008 @@ -4,6 +4,7 @@ using System.Text; using System.Net; using System.Net.Sockets; +using System.IO.Ports; using AbstractPipe; using DebugProtocol; using KDBGProtocol; @@ -68,7 +69,7 @@ public class DebugConnection { #region Primary State - public enum Mode { ClosedMode, SocketMode } + public enum Mode { ClosedMode, SocketMode, SerialMode } public Mode ConnectionMode { get { return mConnectionMode; } @@ -104,6 +105,10 @@ SocketAsyncEventArgs mAsyncConnect; AsyncCallback mDnsLookup; IAsyncResult mDnsAsyncResult; + #endregion + + #region Serial Mode Members + SerialPort mSerialPort; #endregion public event DebugRegisterChangeEventHandler DebugRegisterChangeEvent; @@ -154,6 +159,33 @@ mDnsAsyncResult = Dns.BeginGetHostEntry(host, mDnsLookup, this); } + public void Start(int baudrate, string port) + { + Close(); + ConnectionMode = Mode.SerialMode; + mSerialPort = new SerialPort(port, baudrate, Parity.None, 8, StopBits.One); + mSerialPort.Handshake = Handshake.None; + try + { + //opening could fail for occupied, not existing or misconfigured ports + mSerialPort.Open(); + //create pipe and kdb instances, connect internal receive pipe + mMedium = new SerialPipe(mSerialPort); + mMedium.PipeReceiveEvent += PipeReceiveEvent; + mKdb = new KDBG(mMedium); + //set up tab handlers + mKdb.RegisterChangeEvent += RegisterChangeEvent; + mKdb.ModuleListEvent += ModuleListEvent; + mKdb.MemoryUpdateEvent += MemoryUpdateEvent; + Running = true; + } + catch (Exception) + { + ConnectionMode = Mode.ClosedMode; + //error signal? + } + } + public void Close() { switch (ConnectionMode) @@ -161,6 +193,11 @@ case Mode.SocketMode: mSocket.Close(); mSocket = null; + break; + case Mode.SerialMode: + mSerialPort.Close(); + mSerialPort = null; + Running = false; break; } @@ -231,7 +268,7 @@ DebugModuleChangedEvent(this, new DebugModuleChangedEventArgs((uint)args.Address, args.Module)); } - void RegisterChangeEvent(object sender, RegisterChangeEventArgs args) + void RegisterChangeEvent(object sender, RegisterChangeEventArgs args) { args.Registers.CopyTo(mRegisters.RegisterSet); Running = false; Modified: trunk/tools/reactosdbg/DebugProtocol/KDBG.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/DebugProtocol/KDB… ============================================================================== --- trunk/tools/reactosdbg/DebugProtocol/KDBG.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/DebugProtocol/KDBG.cs [iso-8859-1] Fri Aug 8 13:03:59 2008 @@ -287,7 +287,10 @@ { mCommandBuffer.Add(command); if (mCommandBuffer.Count == 1) + { mConnection.Write(command + "\r"); + mCommandBuffer.RemoveAt(0); //useful??? + } } } Modified: trunk/tools/reactosdbg/Pipe/Pipe.csproj URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/Pipe/Pipe.csproj?… ============================================================================== --- trunk/tools/reactosdbg/Pipe/Pipe.csproj [iso-8859-1] (original) +++ trunk/tools/reactosdbg/Pipe/Pipe.csproj [iso-8859-1] Fri Aug 8 13:03:59 2008 @@ -45,6 +45,7 @@ <Reference Include="System.Xml" /> </ItemGroup> <ItemGroup> + <Compile Include="serialpipe.cs" /> <Compile Include="pipe.cs" /> <Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="socketpipe.cs" /> Modified: trunk/tools/reactosdbg/RosDBG/BackTrace.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/BackTrace.… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/BackTrace.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/BackTrace.cs [iso-8859-1] Fri Aug 8 13:03:59 2008 @@ -135,8 +135,11 @@ private void StackFrames_SelectedIndexChanged(object sender, EventArgs e) { - string []parsedEntry = ((string)StackFrames.SelectedItem).Split(new char [] {' '}); - mSelectedAddr = ulong.Parse(parsedEntry[0], NumberStyles.HexNumber); + if (StackFrames.SelectedItem != null) //crashed with argumentnullexception + { + string[] parsedEntry = ((string)StackFrames.SelectedItem).Split(new char[] { ' ' }); + mSelectedAddr = ulong.Parse(parsedEntry[0], NumberStyles.HexNumber); + } } private void StackFrames_MouseDoubleClick(object sender, MouseEventArgs e) Modified: trunk/tools/reactosdbg/RosDBG/MainWindow.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/MainWindow… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/MainWindow.Designer.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/MainWindow.Designer.cs [iso-8859-1] Fri Aug 8 13:03:59 2008 @@ -131,6 +131,7 @@ this.connectSerialToolStripMenuItem.Name = "connectSerialToolStripMenuItem"; this.connectSerialToolStripMenuItem.Size = new System.Drawing.Size(175, 22); this.connectSerialToolStripMenuItem.Text = "Connect Serial ..."; + this.connectSerialToolStripMenuItem.Click += new System.EventHandler(this.connectSerialToolStripMenuItem_Click); // // connectPipeToolStripMenuItem // Modified: trunk/tools/reactosdbg/RosDBG/MainWindow.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/MainWindow… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/MainWindow.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/MainWindow.cs [iso-8859-1] Fri Aug 8 13:03:59 2008 @@ -251,6 +251,16 @@ mSourceRoot = Settings.SourceDirectory; mSymbolContext.ReactosOutputPath = Settings.OutputDirectory; } + + private void connectSerialToolStripMenuItem_Click(object sender, EventArgs e) + { + SerialTargetSelect targetSelect = new SerialTargetSelect(); + if (targetSelect.ShowDialog() == DialogResult.OK) + { + mConnection.Close(); + mConnection.Start(targetSelect.Baudrate, targetSelect.Port); + } + } } public class InteractiveInputEventArgs : EventArgs Modified: trunk/tools/reactosdbg/RosDBG/RosDBG.csproj URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/RosDBG.csp… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/RosDBG.csproj [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/RosDBG.csproj [iso-8859-1] Fri Aug 8 13:03:59 2008 @@ -166,6 +166,10 @@ <DependentUpon>Settings.cs</DependentUpon> <SubType>Designer</SubType> </EmbeddedResource> + <EmbeddedResource Include="SerialTargetSelect.resx"> + <DependentUpon>SerialTargetSelect.cs</DependentUpon> + <SubType>Designer</SubType> + </EmbeddedResource> <EmbeddedResource Include="SourceView.resx"> <DependentUpon>SourceView.cs</DependentUpon> <SubType>Designer</SubType> @@ -211,6 +215,12 @@ </Compile> <Compile Include="Settings.Designer.cs"> <DependentUpon>Settings.cs</DependentUpon> + </Compile> + <Compile Include="SerialTargetSelect.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="SerialTargetSelect.Designer.cs"> + <DependentUpon>SerialTargetSelect.cs</DependentUpon> </Compile> <Compile Include="SourceView.cs"> <SubType>UserControl</SubType> @@ -272,4 +282,4 @@ <PropertyGroup> <PostBuildEvent>copy $(SolutionDir)dbghelptest\dbghelp.dll $(TargetDir)</PostBuildEvent> </PropertyGroup> -</Project> +</Project> Modified: trunk/tools/reactosdbg/RosDBG/Settings.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Settings.c… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Settings.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Settings.cs [iso-8859-1] Fri Aug 8 13:03:59 2008 @@ -7,7 +7,6 @@ using System.Text; using System.Configuration; using System.Windows.Forms; -using System.ComponentModel; using System.Drawing.Design; namespace RosDBG

16 years, 4 months

[cgutman] 35189: - Remove ASSERTs and return STATUS_INVALID_PARAMETER - Should fix Christoph's problem with ROS crashing when closing emule

by cgutman＠svn.reactos.org

Author: cgutman Date: Fri Aug 8 12:50:00 2008 New Revision: 35189 URL: http://svn.reactos.org/svn/reactos?rev=35189&view=rev Log: - Remove ASSERTs and return STATUS_INVALID_PARAMETER - Should fix Christoph's problem with ROS crashing when closing emule Modified: branches/aicom-network-fixes/drivers/network/afd/afd/tdi.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/tdi.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/tdi.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/tdi.c [iso-8859-1] Fri Aug 8 12:50:00 2008 @@ -291,7 +291,11 @@ AFD_DbgPrint(MAX_TRACE, ("Called\n")); - assert(ConnectionObject); + if (!ConnectionObject) { + AFD_DbgPrint(MIN_TRACE, ("Bad connection object.\n")); + *Irp = NULL; + return STATUS_INVALID_PARAMETER; + } DeviceObject = IoGetRelatedDeviceObject(ConnectionObject); if (!DeviceObject) { @@ -345,7 +349,10 @@ AFD_DbgPrint(MAX_TRACE, ("Called. AddressHandle (0x%X) ConnectionObject (0x%X)\n", AddressHandle, ConnectionObject)); - assert(ConnectionObject); + if (!ConnectionObject) { + AFD_DbgPrint(MIN_TRACE, ("Bad connection object.\n")); + return STATUS_INVALID_PARAMETER; + } DeviceObject = IoGetRelatedDeviceObject(ConnectionObject); if (!DeviceObject) { @@ -399,7 +406,11 @@ AFD_DbgPrint(MAX_TRACE, ("Called\n")); - assert(ConnectionObject); + if (!ConnectionObject) { + AFD_DbgPrint(MIN_TRACE, ("Bad connection object.\n")); + *Irp = NULL; + return STATUS_INVALID_PARAMETER; + } DeviceObject = IoGetRelatedDeviceObject(ConnectionObject); if (!DeviceObject) { @@ -465,7 +476,10 @@ AFD_DbgPrint(MAX_TRACE, ("Called\n")); - assert(FileObject); + if (!FileObject) { + AFD_DbgPrint(MIN_TRACE, ("Bad file object.\n")); + return STATUS_INVALID_PARAMETER; + } DeviceObject = IoGetRelatedDeviceObject(FileObject); if (!DeviceObject) { @@ -527,7 +541,10 @@ KEVENT Event; PIRP Irp; - assert(FileObject); + if (!FileObject) { + AFD_DbgPrint(MIN_TRACE, ("Bad file object.\n")); + return STATUS_INVALID_PARAMETER; + } DeviceObject = IoGetRelatedDeviceObject(FileObject); if (!DeviceObject) { @@ -578,7 +595,10 @@ KEVENT Event; PIRP Irp; - assert(FileObject); + if (!FileObject) { + AFD_DbgPrint(MIN_TRACE, ("Bad file object.\n")); + return STATUS_INVALID_PARAMETER; + } DeviceObject = IoGetRelatedDeviceObject(FileObject); if (!DeviceObject) { @@ -803,7 +823,11 @@ NTSTATUS Status = STATUS_SUCCESS; PMDL Mdl; - assert(TransportObject); + if (!TransportObject) { + AFD_DbgPrint(MIN_TRACE, ("Bad transport object.\n")); + *Irp = NULL; + return STATUS_INVALID_PARAMETER; + } DeviceObject = IoGetRelatedDeviceObject(TransportObject); if (!DeviceObject) { @@ -885,7 +909,11 @@ PDEVICE_OBJECT DeviceObject; PMDL Mdl; - assert(TransportObject); + if (!TransportObject) { + AFD_DbgPrint(MIN_TRACE, ("Bad transport object.\n")); + *Irp = NULL; + return STATUS_INVALID_PARAMETER; + } DeviceObject = IoGetRelatedDeviceObject(TransportObject); if (!DeviceObject) { @@ -986,7 +1014,11 @@ NTSTATUS Status; PMDL Mdl; - assert(TransportObject); + if (!TransportObject) { + AFD_DbgPrint(MIN_TRACE, ("Bad tranport object.\n")); + *Irp = NULL; + return STATUS_INVALID_PARAMETER; + } DeviceObject = IoGetRelatedDeviceObject(TransportObject); if (!DeviceObject) { @@ -1077,7 +1109,11 @@ NTSTATUS Status; PMDL Mdl; - assert(TransportObject); + if (!TransportObject) { + AFD_DbgPrint(MIN_TRACE, ("Bad transport object.\n")); + *Irp = NULL; + return STATUS_INVALID_PARAMETER; + } AFD_DbgPrint(MID_TRACE,("Called(TransportObject %x)\n", TransportObject)); @@ -1159,7 +1195,10 @@ KeInitializeEvent(&Event, NotificationEvent, FALSE); - assert(TransportObject); + if (!TransportObject) { + AFD_DbgPrint(MIN_TRACE, ("Bad transport object.\n")); + return STATUS_INVALID_PARAMETER; + } AFD_DbgPrint(MID_TRACE,("Called(TransportObject %x)\n", TransportObject));

16 years, 4 months

[cgutman] 35188: - Add some ASSERTs

by cgutman＠svn.reactos.org

Author: cgutman Date: Fri Aug 8 11:56:51 2008 New Revision: 35188 URL: http://svn.reactos.org/svn/reactos?rev=35188&view=rev Log: - Add some ASSERTs Modified: branches/aicom-network-fixes/drivers/network/afd/afd/tdi.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/tdi.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/tdi.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/tdi.c [iso-8859-1] Fri Aug 8 11:56:51 2008 @@ -399,6 +399,8 @@ AFD_DbgPrint(MAX_TRACE, ("Called\n")); + assert(ConnectionObject); + DeviceObject = IoGetRelatedDeviceObject(ConnectionObject); if (!DeviceObject) { AFD_DbgPrint(MIN_TRACE, ("Bad device object.\n")); @@ -524,6 +526,8 @@ NTSTATUS Status; KEVENT Event; PIRP Irp; + + assert(FileObject); DeviceObject = IoGetRelatedDeviceObject(FileObject); if (!DeviceObject) { @@ -573,6 +577,8 @@ NTSTATUS Status; KEVENT Event; PIRP Irp; + + assert(FileObject); DeviceObject = IoGetRelatedDeviceObject(FileObject); if (!DeviceObject) { @@ -797,6 +803,8 @@ NTSTATUS Status = STATUS_SUCCESS; PMDL Mdl; + assert(TransportObject); + DeviceObject = IoGetRelatedDeviceObject(TransportObject); if (!DeviceObject) { AFD_DbgPrint(MIN_TRACE, ("Bad device object.\n")); @@ -877,6 +885,8 @@ PDEVICE_OBJECT DeviceObject; PMDL Mdl; + assert(TransportObject); + DeviceObject = IoGetRelatedDeviceObject(TransportObject); if (!DeviceObject) { AFD_DbgPrint(MIN_TRACE, ("Bad device object.\n")); @@ -975,6 +985,8 @@ PDEVICE_OBJECT DeviceObject; NTSTATUS Status; PMDL Mdl; + + assert(TransportObject); DeviceObject = IoGetRelatedDeviceObject(TransportObject); if (!DeviceObject) { @@ -1064,6 +1076,8 @@ PDEVICE_OBJECT DeviceObject; NTSTATUS Status; PMDL Mdl; + + assert(TransportObject); AFD_DbgPrint(MID_TRACE,("Called(TransportObject %x)\n", TransportObject)); @@ -1145,6 +1159,8 @@ KeInitializeEvent(&Event, NotificationEvent, FALSE); + assert(TransportObject); + AFD_DbgPrint(MID_TRACE,("Called(TransportObject %x)\n", TransportObject)); DeviceObject = IoGetRelatedDeviceObject(TransportObject);

16 years, 4 months

[jmorlan] 35187: - Fix cmd's SearchForExecutable: it was inside out, giving extension priority over directory. - Remove code that checked if the file's extension was in PATHEXT. Windows does not check, and it's very handy to be able to "run" non-executable files. - Allow explicit paths with no backslash (like "A:file") - Batch: use GetFullPathName to get the batch file's absolute path; this way %~dp0 will always give the right directory even in the weird case of running the .bat via a relative p

by jmorlan＠svn.reactos.org

Author: jmorlan Date: Fri Aug 8 11:48:21 2008 New Revision: 35187 URL: http://svn.reactos.org/svn/reactos?rev=35187&view=rev Log: - Fix cmd's SearchForExecutable: it was inside out, giving extension priority over directory. - Remove code that checked if the file's extension was in PATHEXT. Windows does not check, and it's very handy to be able to "run" non-executable files. - Allow explicit paths with no backslash (like "A:file") - Batch: use GetFullPathName to get the batch file's absolute path; this way %~dp0 will always give the right directory even in the weird case of running the .bat via a relative path in PATH. Remove code in SearchForExecutable which tried to make sure it returned an absolute path (but it didn't in that case). Modified: trunk/reactos/base/shell/cmd/batch.c trunk/reactos/base/shell/cmd/where.c Modified: trunk/reactos/base/shell/cmd/batch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/batch.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/batch.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/batch.c [iso-8859-1] Fri Aug 8 11:48:21 2008 @@ -263,10 +263,10 @@ cmd_free (bc->raw_params); } - ZeroMemory(bc->BatchFilePath, sizeof(bc->BatchFilePath)); + GetFullPathName(fullname, sizeof(bc->BatchFilePath), bc->BatchFilePath, &tmp); + *tmp = '\0'; + bc->hBatchFile = hFile; - tmp = _tcsrchr(fullname, '\\'); - _tcsncpy(bc->BatchFilePath, fullname, ((_tcslen(fullname) - _tcslen(tmp)) + 1)); SetFilePointer (bc->hBatchFile, 0, NULL, FILE_BEGIN); bc->bEcho = bEcho; /* Preserve echo across batch calls */ bc->shiftlevel = 0; Modified: trunk/reactos/base/shell/cmd/where.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/where.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/where.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/where.c [iso-8859-1] Fri Aug 8 11:48:21 2008 @@ -83,35 +83,49 @@ /* searches for file using path info. */ BOOL -SearchForExecutableSingle (LPCTSTR pFileName, LPTSTR pFullName, LPTSTR pExtension) +SearchForExecutableSingle (LPCTSTR pFileName, LPTSTR pFullName, LPTSTR pPathExt, LPTSTR pDirectory) { - TCHAR szPathBuffer[CMDLINE_LENGTH]; - LPTSTR pszBuffer = NULL; - DWORD dwBuffer, len; + TCHAR szPathBuffer[CMDLINE_LENGTH], *pszPathEnd; LPTSTR s,f; /* initialize full name buffer */ *pFullName = _T('\0'); - TRACE ("SearchForExecutableSingle: \'%s\' with ext: \'%s\'\n", - debugstr_aw(pFileName), debugstr_aw(pExtension)); - - /* Check if valid directly on specified path */ - if (_tcschr (pFileName, _T('\\')) != NULL) - { - LPTSTR pFilePart; - TRACE ("Absolute or relative path is given.\n"); - - if (GetFullPathName (pFileName, - CMDLINE_LENGTH, - szPathBuffer, - &pFilePart) ==0) - return FALSE; - - if(pFilePart == 0) - return FALSE; - /* Add extension and test file: */ - if (pExtension) - _tcscat(szPathBuffer, pExtension); + TRACE ("SearchForExecutableSingle: \'%s\' in dir: \'%s\'\n", + debugstr_aw(pFileName), debugstr_aw(pDirectory)); + + pszPathEnd = szPathBuffer; + if (pDirectory != NULL) + { + _tcscpy(szPathBuffer, pDirectory); + pszPathEnd += _tcslen(pszPathEnd); + *pszPathEnd++ = _T('\\'); + } + _tcscpy(pszPathEnd, pFileName); + pszPathEnd += _tcslen(pszPathEnd); + + if (IsExistingFile (szPathBuffer)) + { + TRACE ("Found: \'%s\'\n", debugstr_aw(szPathBuffer)); + _tcscpy (pFullName, szPathBuffer); + return TRUE; + } + + s = pPathExt; + while (s && *s) + { + f = _tcschr (s, _T(';')); + + if (f) + { + _tcsncpy (pszPathEnd, s, (size_t)(f-s)); + pszPathEnd[f-s] = _T('\0'); + s = f + 1; + } + else + { + _tcscpy (pszPathEnd, s); + s = NULL; + } if (IsExistingFile (szPathBuffer)) { @@ -119,78 +133,7 @@ _tcscpy (pFullName, szPathBuffer); return TRUE; } - return FALSE; - } - - /* search in current directory */ - len = GetCurrentDirectory (CMDLINE_LENGTH, szPathBuffer); - if (szPathBuffer[len - 1] != _T('\\')) - { - szPathBuffer[len] = _T('\\'); - szPathBuffer[len + 1] = _T('\0'); - } - _tcscat (szPathBuffer, pFileName); - - if (pExtension) - _tcscat (szPathBuffer, pExtension); - - if (IsExistingFile (szPathBuffer)) - { - TRACE ("Found: \'%s\'\n", debugstr_aw(szPathBuffer)); - _tcscpy (pFullName, szPathBuffer); - return TRUE; - } - - - - /* load environment varable PATH into buffer */ - pszBuffer = (LPTSTR)cmd_alloc (ENV_BUFFER_SIZE * sizeof(TCHAR)); - dwBuffer = GetEnvironmentVariable (_T("PATH"), pszBuffer, ENV_BUFFER_SIZE); - if (dwBuffer > ENV_BUFFER_SIZE) - { - pszBuffer = (LPTSTR)cmd_realloc (pszBuffer, dwBuffer * sizeof (TCHAR)); - GetEnvironmentVariable (_T("PATH"), pszBuffer, dwBuffer); - } - - - /* search in PATH */ - s = pszBuffer; - while (s && *s) - { - f = _tcschr (s, _T(';')); - - if (f) - { - _tcsncpy (szPathBuffer, s, (size_t)(f-s)); - szPathBuffer[f-s] = _T('\0'); - s = f + 1; - } - else - { - _tcscpy (szPathBuffer, s); - s = NULL; - } - - len = _tcslen(szPathBuffer); - if (szPathBuffer[len - 1] != _T('\\')) - { - szPathBuffer[len] = _T('\\'); - szPathBuffer[len + 1] = _T('\0'); - } - _tcscat (szPathBuffer, pFileName); - - if (pExtension) - _tcscat (szPathBuffer, pExtension); - - if (IsExistingFile (szPathBuffer)) - { - TRACE ("Found: \'%s\'\n", debugstr_aw(szPathBuffer)); - cmd_free (pszBuffer); - _tcscpy (pFullName, szPathBuffer); - return TRUE; - } - } - cmd_free (pszBuffer); + } return FALSE; } @@ -199,60 +142,64 @@ SearchForExecutable (LPCTSTR pFileName, LPTSTR pFullName) { static TCHAR pszDefaultPathExt[] = _T(".COM;.EXE;.BAT;.CMD"); - LPTSTR pszBuffer = NULL; + LPTSTR pszPathExt, pszPath; LPTSTR pCh; - LPTSTR pExt; DWORD dwBuffer; TRACE ("SearchForExecutable: \'%s\'\n", debugstr_aw(pFileName)); + /* load environment varable PATHEXT */ - pszBuffer = (LPTSTR)cmd_alloc (ENV_BUFFER_SIZE * sizeof(TCHAR)); - dwBuffer = GetEnvironmentVariable (_T("PATHEXT"), pszBuffer, ENV_BUFFER_SIZE); + pszPathExt = (LPTSTR)cmd_alloc (ENV_BUFFER_SIZE * sizeof(TCHAR)); + dwBuffer = GetEnvironmentVariable (_T("PATHEXT"), pszPathExt, ENV_BUFFER_SIZE); if (dwBuffer > ENV_BUFFER_SIZE) { - pszBuffer = (LPTSTR)cmd_realloc (pszBuffer, dwBuffer * sizeof (TCHAR)); - GetEnvironmentVariable (_T("PATHEXT"), pszBuffer, dwBuffer); + pszPathExt = (LPTSTR)cmd_realloc (pszPathExt, dwBuffer * sizeof (TCHAR)); + GetEnvironmentVariable (_T("PATHEXT"), pszPathExt, dwBuffer); } else if (0 == dwBuffer) { - _tcscpy(pszBuffer, pszDefaultPathExt); - } - - TRACE ("SearchForExecutable(): Loaded PATHEXT: %s\n", debugstr_aw(pszBuffer)); - - pExt = _tcsrchr(pFileName, _T('.')); - if (pExt != NULL) - { - LPTSTR pszBuffer2; - pszBuffer2 = cmd_dup(pszBuffer); - if (pszBuffer2) - { - pCh = _tcstok(pszBuffer2, _T(";")); - while (pCh) - { - if (0 == _tcsicmp(pCh, pExt)) - { - cmd_free(pszBuffer); - cmd_free(pszBuffer2); - return SearchForExecutableSingle(pFileName, pFullName, NULL); - } - pCh = _tcstok(NULL, _T(";")); - } - cmd_free(pszBuffer2); - } - } - - pCh = _tcstok(pszBuffer, _T(";")); + _tcscpy(pszPathExt, pszDefaultPathExt); + } + + /* Check if valid directly on specified path */ + if (SearchForExecutableSingle(pFileName, pFullName, pszPathExt, NULL)) + { + cmd_free(pszPathExt); + return TRUE; + } + + /* If an explicit directory was given, stop here - no need to search PATH. */ + if (pFileName[1] == _T(':') || _tcschr(pFileName, _T('\\'))) + { + cmd_free(pszPathExt); + return FALSE; + } + + /* load environment varable PATH into buffer */ + pszPath = (LPTSTR)cmd_alloc (ENV_BUFFER_SIZE * sizeof(TCHAR)); + dwBuffer = GetEnvironmentVariable (_T("PATH"), pszPath, ENV_BUFFER_SIZE); + if (dwBuffer > ENV_BUFFER_SIZE) + { + pszPath = (LPTSTR)cmd_realloc (pszPath, dwBuffer * sizeof (TCHAR)); + GetEnvironmentVariable (_T("PATH"), pszPath, dwBuffer); + } + + TRACE ("SearchForExecutable(): Loaded PATH: %s\n", debugstr_aw(pszPath)); + + /* search in PATH */ + pCh = _tcstok(pszPath, _T(";")); while (pCh) { - if (SearchForExecutableSingle(pFileName, pFullName, pCh)) - { - cmd_free(pszBuffer); + if (SearchForExecutableSingle(pFileName, pFullName, pszPathExt, pCh)) + { + cmd_free(pszPath); + cmd_free(pszPathExt); return TRUE; } pCh = _tcstok(NULL, _T(";")); } - cmd_free(pszBuffer); + cmd_free(pszPath); + cmd_free(pszPathExt); return FALSE; }

16 years, 4 months

[cgutman] 35186: - Remove duplicate code

by cgutman＠svn.reactos.org

Author: cgutman Date: Fri Aug 8 11:17:06 2008 New Revision: 35186 URL: http://svn.reactos.org/svn/reactos?rev=35186&view=rev Log: - Remove duplicate code Modified: branches/aicom-network-fixes/drivers/network/afd/afd/tdi.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/tdi.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/tdi.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/tdi.c [iso-8859-1] Fri Aug 8 11:17:06 2008 @@ -1143,8 +1143,6 @@ KEVENT Event; PIRP Irp; - DeviceObject = IoGetRelatedDeviceObject(TransportObject); - KeInitializeEvent(&Event, NotificationEvent, FALSE); AFD_DbgPrint(MID_TRACE,("Called(TransportObject %x)\n", TransportObject));

16 years, 4 months

[sginsberg] 35185: - Put NtUser* stubs into separate files. Still a bit messy, but now there is some form of layout at least. - Update some function prototypes which changed between XP and 2003

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Fri Aug 8 10:42:17 2008 New Revision: 35185 URL: http://svn.reactos.org/svn/reactos?rev=35185&view=rev Log: - Put NtUser* stubs into separate files. Still a bit messy, but now there is some form of layout at least. - Update some function prototypes which changed between XP and 2003 Added: branches/nwin32/subsystems/win32/win32k/ntuser/accel.c (with props) branches/nwin32/subsystems/win32/win32k/ntuser/caret.c (with props) branches/nwin32/subsystems/win32/win32k/ntuser/class.c (with props) branches/nwin32/subsystems/win32/win32k/ntuser/clipboard.c (with props) branches/nwin32/subsystems/win32/win32k/ntuser/colors.c (with props) branches/nwin32/subsystems/win32/win32k/ntuser/cursor.c (with props) branches/nwin32/subsystems/win32/win32k/ntuser/dde.c (with props) branches/nwin32/subsystems/win32/win32k/ntuser/desktop.c (with props) branches/nwin32/subsystems/win32/win32k/ntuser/display.c (with props) branches/nwin32/subsystems/win32/win32k/ntuser/event.c (with props) branches/nwin32/subsystems/win32/win32k/ntuser/hooks.c (with props) branches/nwin32/subsystems/win32/win32k/ntuser/icon.c (with props) branches/nwin32/subsystems/win32/win32k/ntuser/ime.c (with props) branches/nwin32/subsystems/win32/win32k/ntuser/input.c (with props) branches/nwin32/subsystems/win32/win32k/ntuser/keyboard.c (with props) branches/nwin32/subsystems/win32/win32k/ntuser/menu.c (with props) branches/nwin32/subsystems/win32/win32k/ntuser/message.c (with props) branches/nwin32/subsystems/win32/win32k/ntuser/misc.c (with props) branches/nwin32/subsystems/win32/win32k/ntuser/mouse.c (with props) branches/nwin32/subsystems/win32/win32k/ntuser/objects.c (with props) branches/nwin32/subsystems/win32/win32k/ntuser/painting.c (with props) branches/nwin32/subsystems/win32/win32k/ntuser/process.c (with props) branches/nwin32/subsystems/win32/win32k/ntuser/remote.c (with props) branches/nwin32/subsystems/win32/win32k/ntuser/scroll.c (with props) branches/nwin32/subsystems/win32/win32k/ntuser/simplecall.c (with props) branches/nwin32/subsystems/win32/win32k/ntuser/thread.c (with props) branches/nwin32/subsystems/win32/win32k/ntuser/timer.c (with props) branches/nwin32/subsystems/win32/win32k/ntuser/userinit.c (with props) branches/nwin32/subsystems/win32/win32k/ntuser/window.c (with props) branches/nwin32/subsystems/win32/win32k/ntuser/winsta.c (with props) Removed: branches/nwin32/subsystems/win32/win32k/ntuser/usrfuncs.c branches/nwin32/subsystems/win32/win32k/ntuser/usrstubs.c Modified: branches/nwin32/include/reactos/win32k/ntuser.h branches/nwin32/subsystems/win32/win32k/win32k.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/nwin32/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/branches/nwin32/include/reactos/win32k/n… Added: branches/nwin32/subsystems/win32/win32k/ntuser/accel.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Added: branches/nwin32/subsystems/win32/win32k/ntuser/caret.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Added: branches/nwin32/subsystems/win32/win32k/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Added: branches/nwin32/subsystems/win32/win32k/ntuser/clipboard.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Added: branches/nwin32/subsystems/win32/win32k/ntuser/colors.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Added: branches/nwin32/subsystems/win32/win32k/ntuser/cursor.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Added: branches/nwin32/subsystems/win32/win32k/ntuser/dde.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Added: branches/nwin32/subsystems/win32/win32k/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Added: branches/nwin32/subsystems/win32/win32k/ntuser/display.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Added: branches/nwin32/subsystems/win32/win32k/ntuser/event.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Added: branches/nwin32/subsystems/win32/win32k/ntuser/hooks.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Added: branches/nwin32/subsystems/win32/win32k/ntuser/icon.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Added: branches/nwin32/subsystems/win32/win32k/ntuser/ime.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Added: branches/nwin32/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Added: branches/nwin32/subsystems/win32/win32k/ntuser/keyboard.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Added: branches/nwin32/subsystems/win32/win32k/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Added: branches/nwin32/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Added: branches/nwin32/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Added: branches/nwin32/subsystems/win32/win32k/ntuser/mouse.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Added: branches/nwin32/subsystems/win32/win32k/ntuser/objects.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Added: branches/nwin32/subsystems/win32/win32k/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Added: branches/nwin32/subsystems/win32/win32k/ntuser/process.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Added: branches/nwin32/subsystems/win32/win32k/ntuser/remote.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Added: branches/nwin32/subsystems/win32/win32k/ntuser/scroll.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Added: branches/nwin32/subsystems/win32/win32k/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Added: branches/nwin32/subsystems/win32/win32k/ntuser/thread.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Added: branches/nwin32/subsystems/win32/win32k/ntuser/timer.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Added: branches/nwin32/subsystems/win32/win32k/ntuser/userinit.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Removed: branches/nwin32/subsystems/win32/win32k/ntuser/usrfuncs.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Removed: branches/nwin32/subsystems/win32/win32k/ntuser/usrstubs.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Added: branches/nwin32/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Added: branches/nwin32/subsystems/win32/win32k/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Modified: branches/nwin32/subsystems/win32/win32k/win32k.rbuild URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/…

16 years, 4 months

[janderwald] 35184: - store all loaded global fonts under HKLM\Software\Microsoft\Windows NT\CurrentVersion\Fonts

by janderwald＠svn.reactos.org

Author: janderwald Date: Fri Aug 8 09:43:43 2008 New Revision: 35184 URL: http://svn.reactos.org/svn/reactos?rev=35184&view=rev Log: - store all loaded global fonts under HKLM\Software\Microsoft\Windows NT\CurrentVersion\Fonts Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/text.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/text.c [iso-8859-1] Fri Aug 8 09:43:43 2008 @@ -268,7 +268,7 @@ { FONTGDI *FontGDI; NTSTATUS Status; - HANDLE FileHandle; + HANDLE FileHandle, KeyHandle; OBJECT_ATTRIBUTES ObjectAttributes; PVOID Buffer = NULL; IO_STATUS_BLOCK Iosb; @@ -279,6 +279,7 @@ PSECTION_OBJECT SectionObject; ULONG ViewSize = 0; FT_Fixed XScale, YScale; + UNICODE_STRING FontRegPath = RTL_CONSTANT_STRING(L"\\REGISTRY\\Machine\\Software\\Microsoft\\Windows NT\\CurrentVersion\\Fonts"); /* Open the font file */ @@ -384,7 +385,7 @@ - DPRINT("Font loaded: %s (%s)\n", Face->family_name, Face->style_name); + DPRINT1("Font loaded: %s (%s)\n", Face->family_name, Face->style_name); DPRINT("Num glyphs: %u\n", Face->num_glyphs); /* Add this font resource to the font table */ @@ -405,9 +406,20 @@ { IntLockGlobalFonts; InsertTailList(&FontListHead, &Entry->ListEntry); + InitializeObjectAttributes(&ObjectAttributes, &FontRegPath, OBJ_CASE_INSENSITIVE, NULL, NULL); + Status = ZwOpenKey(&KeyHandle, KEY_WRITE, &ObjectAttributes); + if (NT_SUCCESS(Status)) + { + LPWSTR pName = wcsrchr(FileName->Buffer, L'\\'); + if (pName) + { + pName++; + ZwSetValueKey(KeyHandle, &Entry->FaceName, 0, REG_SZ, pName, (wcslen(pName) + 1) * sizeof(WCHAR)); + } + ZwClose(KeyHandle); + } IntUnLockGlobalFonts; } - return 1; }

16 years, 4 months

← Newer
1
...
63
64
65
66
67
68
69
...
86
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2008