Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cgutman] 35188: - Add some ASSERTs
by cgutman＠svn.reactos.org 08 Aug '08

08 Aug '08

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);

1 0

[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 08 Aug '08

08 Aug '08

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; }

1 0

[cgutman] 35186: - Remove duplicate code
by cgutman＠svn.reactos.org 08 Aug '08

08 Aug '08

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));

1 0

[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 08 Aug '08

08 Aug '08

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/…

1 0

[janderwald] 35184: - store all loaded global fonts under HKLM\Software\Microsoft\Windows NT\CurrentVersion\Fonts
by janderwald＠svn.reactos.org 08 Aug '08

08 Aug '08

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; }

1 0

[dchapyshev] 35183: - Add sxs.dll from Wine
by dchapyshev＠svn.reactos.org 08 Aug '08

08 Aug '08

Author: dchapyshev Date: Fri Aug 8 09:32:35 2008 New Revision: 35183 URL: http://svn.reactos.org/svn/reactos?rev=35183&view=rev Log: - Add sxs.dll from Wine Added: trunk/reactos/dll/win32/sxs/ (with props) trunk/reactos/dll/win32/sxs/sxs.c (with props) trunk/reactos/dll/win32/sxs/sxs.rbuild (with props) trunk/reactos/dll/win32/sxs/sxs.spec (with props) Modified: trunk/reactos/baseaddress.rbuild trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/dll/win32/win32.rbuild trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=351… ============================================================================== --- trunk/reactos/baseaddress.rbuild [iso-8859-1] (original) +++ trunk/reactos/baseaddress.rbuild [iso-8859-1] Fri Aug 8 09:32:35 2008 @@ -184,6 +184,7 @@ <property name="BASEADDRESS_KERNEL32" value="0x7c800000" /> <property name="BASEADDRESS_NTDLL" value="0x7c900000" /> <property name="BASEADDRESS_HHCTRL" value="0x7e410000" /> + <property name="BASEADDRESS_SXS" value="0x7e690000" /> <property name="BASEADDRESS_BEEPMIDI" value="0x7ef0000" /> <property name="BASEADDRESS_FREETYPE" value="0x7f000000" /> </group> Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Fri Aug 8 09:32:35 2008 @@ -325,6 +325,7 @@ dll\win32\smdll\smdll.dll 1 dll\win32\snmpapi\snmpapi.dll 1 dll\win32\stdole2.tlb\stdole2.tlb 1 +dll\win32\sxs\sxs.dll 1 dll\win32\syssetup\syssetup.dll 1 dll\win32\tapi32\tapi32.dll 1 dll\win32\tapiui\tapiui.dll 1 Propchange: trunk/reactos/dll/win32/sxs/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Fri Aug 8 09:32:35 2008 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/win32/sxs/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/win32/sxs/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/win32/sxs/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/dll/win32/sxs/sxs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sxs/sxs.c?rev=35… ============================================================================== --- trunk/reactos/dll/win32/sxs/sxs.c (added) +++ trunk/reactos/dll/win32/sxs/sxs.c [iso-8859-1] Fri Aug 8 09:32:35 2008 @@ -1,0 +1,45 @@ +/* + * sxs main + * + * Copyright 2007 EA Durbin + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(sxs); + + +/*********************************************************************** + * DllMain (SXS.@) + * + */ +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + switch(fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( hinstDLL ); + break; + } + return TRUE; +} Propchange: trunk/reactos/dll/win32/sxs/sxs.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/sxs/sxs.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sxs/sxs.rbuild?r… ============================================================================== --- trunk/reactos/dll/win32/sxs/sxs.rbuild (added) +++ trunk/reactos/dll/win32/sxs/sxs.rbuild [iso-8859-1] Fri Aug 8 09:32:35 2008 @@ -1,0 +1,17 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<group> +<module name="sxs" type="win32dll" baseaddress="${BASEADDRESS_SXS}" installbase="system32" installname="sxs.dll" allowwarnings="true" entrypoint="0"> + <importlibrary definition="sxs.spec.def" /> + <include base="sxs">.</include> + <include base="ReactOS">include/reactos/wine</include> + <define name="__WINESRC__" /> + <define name="WINVER">0x600</define> + <define name="_WIN32_WINNT">0x600</define> + <file>sxs.c</file> + <file>sxs.spec</file> + <library>wine</library> + <library>kernel32</library> + <library>ntdll</library> +</module> +</group> Propchange: trunk/reactos/dll/win32/sxs/sxs.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/sxs/sxs.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sxs/sxs.spec?rev… ============================================================================== --- trunk/reactos/dll/win32/sxs/sxs.spec (added) +++ trunk/reactos/dll/win32/sxs/sxs.spec [iso-8859-1] Fri Aug 8 09:32:35 2008 @@ -1,0 +1,2 @@ +@ stub CreateAssemblyCache +@ stub CreateAssemblyNameObject Propchange: trunk/reactos/dll/win32/sxs/sxs.spec ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev… ============================================================================== --- trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] Fri Aug 8 09:32:35 2008 @@ -313,6 +313,9 @@ <directory name="stdole2.tlb"> <xi:include href="stdole2.tlb/stdole2.rbuild" /> </directory> +<directory name="sxs"> + <xi:include href="sxs/sxs.rbuild" /> +</directory> <directory name="syssetup"> <xi:include href="syssetup/syssetup.rbuild" /> </directory> Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Fri Aug 8 09:32:35 2008 @@ -94,6 +94,7 @@ reactos/dll/win32/shfolder # Autosync reactos/dll/win32/shlwapi # Autosync reactos/dll/win32/stdole2.tlb # Autosync +reactos/dll/win32/sxs # Autosync reactos/dll/win32/tapi32 # Autosync reactos/dll/win32/twain_32 # Out of sync reactos/dll/win32/urlmon # Autosync

1 0

[janderwald] 35182: - add a key to list installed sys fonts
by janderwald＠svn.reactos.org 08 Aug '08

08 Aug '08

Author: janderwald Date: Fri Aug 8 09:06:28 2008 New Revision: 35182 URL: http://svn.reactos.org/svn/reactos?rev=35182&view=rev Log: - add a key to list installed sys fonts Modified: trunk/reactos/boot/bootdata/hivesft_i386.inf Modified: trunk/reactos/boot/bootdata/hivesft_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft_i386.inf [iso-8859-1] Fri Aug 8 09:06:28 2008 @@ -72,6 +72,7 @@ ; Font substitutes ; SysFontSubstitutes are also returned by EnumFontFamilies, FontSubstitutes aren't +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts",,0x00000012 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes",,0x00000012 ; Time zone settings

1 0

[janderwald] 35181: - fix typo
by janderwald＠svn.reactos.org 08 Aug '08

08 Aug '08

Author: janderwald Date: Fri Aug 8 08:33:50 2008 New Revision: 35181 URL: http://svn.reactos.org/svn/reactos?rev=35181&view=rev Log: - fix typo Modified: trunk/reactos/base/applications/regedit/lang/de-DE.rc Modified: trunk/reactos/base/applications/regedit/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/de-DE.rc [iso-8859-1] Fri Aug 8 08:33:50 2008 @@ -363,7 +363,7 @@ STRINGTABLE DISCARDABLE BEGIN IDS_EXPAND "&Expandieren" - IDS_COLLAPSE "&Schlissen" + IDS_COLLAPSE "&Schließen" IDS_GOTO_SUGGESTED_KEY "&Gehe zu '%s'" IDS_FINISHEDFIND "Durchsuchen der Registry beendet." END

1 0

[fireball] 35180: - Plugin the filesystem checker into vfatlib, however leave its invocation #if0-ed out until all problems are solved.
by fireball＠svn.reactos.org 08 Aug '08

08 Aug '08

Author: fireball Date: Fri Aug 8 04:53:13 2008 New Revision: 35180 URL: http://svn.reactos.org/svn/reactos?rev=35180&view=rev Log: - Plugin the filesystem checker into vfatlib, however leave its invocation #if0-ed out until all problems are solved. Modified: trunk/reactos/lib/fslib/vfatlib/vfatlib.c trunk/reactos/lib/fslib/vfatlib/vfatlib.h trunk/reactos/lib/fslib/vfatlib/vfatlib.rbuild Modified: trunk/reactos/lib/fslib/vfatlib/vfatlib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/vfatlib.… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/vfatlib.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/vfatlib.c [iso-8859-1] Fri Aug 8 04:53:13 2008 @@ -11,6 +11,11 @@ #define NDEBUG #include <debug.h> + +PFMIFSCALLBACK ChkdskCallback = NULL; +PVOID FsCheckMemQueue; +ULONG FsCheckFlags; +ULONG FsCheckTotalFiles; NTSTATUS NTAPI VfatFormat (PUNICODE_STRING DriveRoot, @@ -50,7 +55,7 @@ FILE_SYNCHRONOUS_IO_ALERT); if (!NT_SUCCESS(Status)) { - DPRINT("NtOpenFile() failed with status 0x%.08x\n", Status); + DPRINT1("NtOpenFile() failed with status 0x%.08x\n", Status); return Status; } @@ -203,6 +208,25 @@ } } +VOID +VfatPrint(PCHAR Format, ...) +{ + TEXTOUTPUT TextOut; + CHAR TextBuf[512]; + va_list valist; + + va_start(valist, Format); + _vsnprintf(TextBuf, sizeof(TextBuf), Format, valist); + va_end(valist); + + /* Prepare parameters */ + TextOut.Lines = 1; + TextOut.Output = TextBuf; + + /* Do the callback */ + if (ChkdskCallback) ChkdskCallback(OUTPUT, 0, &TextOut); +} + NTSTATUS WINAPI VfatChkdsk( IN PUNICODE_STRING DriveRoot, @@ -212,8 +236,74 @@ IN BOOLEAN ScanDrive, IN PFMIFSCALLBACK Callback) { - UNIMPLEMENTED; - return STATUS_SUCCESS; + BOOLEAN verify, salvage_files; + //ULONG free_clusters; + //DOS_FS fs; + + /* Store callback pointer */ + ChkdskCallback = Callback; + FsCheckMemQueue = NULL; + + /* Set parameters */ + FsCheckFlags = 0; + if (Verbose) FsCheckFlags |= FSCHECK_VERBOSE; + + FsCheckTotalFiles = 0; + + verify = TRUE; + salvage_files = TRUE; +#if 0 + /* Open filesystem */ + fs_open(DriveRoot,FixErrors); + + if (CheckOnlyIfDirty && !fs_isdirty(DriveRoot)) + { + /* No need to check FS */ + return fs_close(FALSE); + } + + read_boot(&fs); + if (verify) VfatPrint("Starting check/repair pass.\n"); + while (read_fat(&fs), scan_root(&fs)) qfree(&FsCheckMemQueue); + if (ScanDrive) fix_bad(&fs); + if (salvage_files) + reclaim_file(&fs); + else + reclaim_free(&fs); + free_clusters = update_free(&fs); + file_unused(); + qfree(&FsCheckMemQueue); + if (verify) + { + VfatPrint("Starting verification pass.\n"); + read_fat(&fs); + scan_root(&fs); + reclaim_free(&fs); + qfree(&FsCheckMemQueue); + } + + if (fs_changed()) + { + if (FixErrors) + { + if (FsCheckFlags & FSCHECK_INTERACTIVE) + FixErrors = get_key("yn","Perform changes ? (y/n)") == 'y'; + else + VfatPrint("Performing changes.\n"); + } + else + { + VfatPrint("Leaving file system unchanged.\n"); + } + } + + VfatPrint("%wZ: %u files, %lu/%lu clusters\n", DriveRoot, + FsCheckTotalFiles, fs.clusters - free_clusters, fs.clusters ); + + return fs_close(FixErrors) ? STATUS_SUCCESS : STATUS_UNSUCCESSFUL; +#else + return STATUS_SUCCESS; +#endif } /* EOF */ Modified: trunk/reactos/lib/fslib/vfatlib/vfatlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/vfatlib.… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/vfatlib.h [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/vfatlib.h [iso-8859-1] Fri Aug 8 04:53:13 2008 @@ -9,6 +9,15 @@ #define NTOS_MODE_USER #include <ndk/ntndk.h> #include <fmifs/fmifs.h> + +#include "check/dosfsck.h" +#include "check/common.h" +#include "check/io.h" +#include "check/lfn.h" +#include "check/boot.h" +#include "check/fat.h" +#include "check/file.h" +#include "check/check.h" #define SECTORSIZE 512 @@ -130,4 +139,7 @@ UpdateProgress (PFORMAT_CONTEXT Context, ULONG Increment); +VOID +VfatPrint(PCHAR Format, ...); + /* EOF */ Modified: trunk/reactos/lib/fslib/vfatlib/vfatlib.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/vfatlib.… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/vfatlib.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/vfatlib.rbuild [iso-8859-1] Fri Aug 8 04:53:13 2008 @@ -7,4 +7,14 @@ <file>fat16.c</file> <file>fat32.c</file> <file>vfatlib.c</file> + + <directory name="check"> + <file>boot.c</file> + <file>check.c</file> + <file>common.c</file> + <file>fat.c</file> + <file>file.c</file> + <file>io.c</file> + <file>lfn.c</file> + </directory> </module>

1 0

[fireball] 35179: - Fix tamlin's early dosfsck porting attempt (create a temporary buffer for reading 512 bytes, call reading function which creates another buffer for reading 512 bytes, reads data, copies 512 bytes to 512 byte buffer, then the caller copies sizeof(DIR_ENT) out of the last 512 bytes buffer - looks a bit redundant).
by fireball＠svn.reactos.org 08 Aug '08

08 Aug '08

Author: fireball Date: Fri Aug 8 04:34:23 2008 New Revision: 35179 URL: http://svn.reactos.org/svn/reactos?rev=35179&view=rev Log: - Fix tamlin's early dosfsck porting attempt (create a temporary buffer for reading 512 bytes, call reading function which creates another buffer for reading 512 bytes, reads data, copies 512 bytes to 512 byte buffer, then the caller copies sizeof(DIR_ENT) out of the last 512 bytes buffer - looks a bit redundant). Modified: trunk/reactos/lib/fslib/vfatlib/check/check.c Modified: trunk/reactos/lib/fslib/vfatlib/check/check.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/check/ch… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/check/check.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/check/check.c [iso-8859-1] Fri Aug 8 04:34:23 2008 @@ -749,12 +749,8 @@ DIR_ENT de; FD_TYPE type; - char tmpBuffer[512]; // TMN: - if (offset) { -// fs_read(offset,sizeof(DIR_ENT),&de); - fs_read(offset,sizeof(tmpBuffer),&tmpBuffer); // TMN: - memcpy(&de, tmpBuffer, sizeof(DIR_ENT)); // TMN: + fs_read(offset,sizeof(DIR_ENT),&de); } else { memcpy(de.name," ",MSDOS_NAME); de.attr = ATTR_DIR;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs