Ros-diffs May 2008

ros-diffs@reactos.org

25 participants
586 discussions

[ekohl] 33579: - Rename CheckUserName() to CheckAccountName() and move it to a new source file (misc.c). - Also use CheckAccountName() to check group names for illegal characters.
by ekohl＠svn.reactos.org 18 May '08

18 May '08

Author: ekohl Date: Sun May 18 09:59:44 2008 New Revision: 33579 URL: http://svn.reactos.org/svn/reactos?rev=33579&view=rev Log: - Rename CheckUserName() to CheckAccountName() and move it to a new source file (misc.c). - Also use CheckAccountName() to check group names for illegal characters. Added: trunk/reactos/dll/cpl/usrmgr/misc.c (with props) Modified: trunk/reactos/dll/cpl/usrmgr/groups.c trunk/reactos/dll/cpl/usrmgr/users.c trunk/reactos/dll/cpl/usrmgr/usrmgr.h trunk/reactos/dll/cpl/usrmgr/usrmgr.rbuild Modified: trunk/reactos/dll/cpl/usrmgr/groups.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/groups.c?re… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/groups.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/groups.c [iso-8859-1] Sun May 18 09:59:44 2008 @@ -122,6 +122,12 @@ break; case IDOK: + if (!CheckAccountName(hwndDlg, IDC_GROUP_NEW_NAME, NULL)) + { + SetFocus(GetDlgItem(hwndDlg, IDC_GROUP_NEW_NAME)); + SendDlgItemMessage(hwndDlg, IDC_GROUP_NEW_NAME, EM_SETSEL, 0, -1); + break; + } nLength = SendDlgItemMessage(hwndDlg, IDC_GROUP_NEW_NAME, WM_GETTEXTLENGTH, 0, 0); if (nLength > 0) @@ -338,6 +344,9 @@ if (lstrcmp(szOldGroupName, szNewGroupName) == 0) return FALSE; + /* Check the group name for illegal characters */ + if (!CheckAccountName(NULL, 0, szNewGroupName)) + return FALSE; /* Change the user name */ lgrpi0.lgrpi0_name = szNewGroupName; Added: trunk/reactos/dll/cpl/usrmgr/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/misc.c?rev=… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/misc.c (added) +++ trunk/reactos/dll/cpl/usrmgr/misc.c [iso-8859-1] Sun May 18 09:59:44 2008 @@ -1,0 +1,38 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS User Manager Control Panel + * FILE: dll/cpl/usrmgr/misc.c + * PURPOSE: Miscellaneus functions + * + * PROGRAMMERS: Eric Kohl + */ + +#include "usrmgr.h" + + +BOOL +CheckAccountName(HWND hwndDlg, + INT nIdDlgItem, + LPTSTR lpAccountName) +{ + TCHAR szAccountName[256]; + UINT uLen; + + if (lpAccountName) + uLen = _tcslen(lpAccountName); + else + uLen = GetDlgItemText(hwndDlg, nIdDlgItem, szAccountName, 256); + + /* Check the account name */ + if (uLen > 0 && + _tcspbrk((lpAccountName) ? lpAccountName : szAccountName, TEXT("\"*+,/\\:;<=>?[]|")) != NULL) + { + MessageBox(hwndDlg, + TEXT("The account name you entered is invalid! An account name must not contain the following charecters: *+,/:;<=>?[\\]|"), + TEXT("ERROR"), + MB_OK | MB_ICONERROR); + return FALSE; + } + + return TRUE; +} Propchange: trunk/reactos/dll/cpl/usrmgr/misc.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/cpl/usrmgr/users.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/users.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/users.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/users.c [iso-8859-1] Sun May 18 09:59:44 2008 @@ -56,36 +56,6 @@ } -static BOOL -CheckUserName(HWND hwndDlg, - INT nIdDlgItem, - LPTSTR lpUserName) -{ - TCHAR szUserName[256]; - UINT uLen; - - if (lpUserName) - uLen = _tcslen(lpUserName); - else - uLen = GetDlgItemText(hwndDlg, nIdDlgItem, szUserName, 256); - - /* Check the user name */ - if (uLen > 0 && - _tcspbrk((lpUserName) ? lpUserName : szUserName, TEXT("\"*+,/\\:;<=>?[]|")) != NULL) - { - MessageBox(hwndDlg, - TEXT("The user name you entered is invalid! A user name must not contain the following charecters: *+,/:;<=>?[\\]|"), - TEXT("ERROR"), - MB_OK | MB_ICONERROR); - return FALSE; - } - - - return TRUE; -} - - - INT_PTR CALLBACK ChangePasswordDlgProc(HWND hwndDlg, UINT uMsg, @@ -204,7 +174,7 @@ break; case IDOK: - if (!CheckUserName(hwndDlg, IDC_USER_NEW_NAME, NULL)) + if (!CheckAccountName(hwndDlg, IDC_USER_NEW_NAME, NULL)) { SetFocus(GetDlgItem(hwndDlg, IDC_USER_NEW_NAME)); SendDlgItemMessage(hwndDlg, IDC_USER_NEW_NAME, EM_SETSEL, 0, -1); @@ -554,7 +524,7 @@ return FALSE; /* Check the user name for illegal characters */ - if (!CheckUserName(NULL, 0, szNewUserName)) + if (!CheckAccountName(NULL, 0, szNewUserName)) return FALSE; /* Change the user name */ Modified: trunk/reactos/dll/cpl/usrmgr/usrmgr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/usrmgr.h?re… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/usrmgr.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/usrmgr.h [iso-8859-1] Sun May 18 09:59:44 2008 @@ -29,6 +29,11 @@ INT_PTR CALLBACK GroupsPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK ExtraPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); +/* misc.c */ +BOOL +CheckAccountName(HWND hwndDlg, + INT nIdDlgItem, + LPTSTR lpAccountName); #endif /* __CPL_DESK_H__ */ Modified: trunk/reactos/dll/cpl/usrmgr/usrmgr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/usrmgr.rbui… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/usrmgr.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/usrmgr.rbuild [iso-8859-1] Sun May 18 09:59:44 2008 @@ -15,6 +15,7 @@ <library>msvcrt</library> <file>extra.c</file> <file>groups.c</file> + <file>misc.c</file> <file>users.c</file> <file>usrmgr.c</file> <file>usrmgr.rc</file>

1 0

[janderwald] 33578: - default to seperator item type - add the styles grayed and disabled in case they have not been added - initialize allocated user buffer to zero - allow support for bitmap items with MF_HELP style - check result of WideCharToMultiByte - always zero terminate a string buffer when enough space is available
by janderwald＠svn.reactos.org 18 May '08

18 May '08

Author: janderwald Date: Sun May 18 09:18:00 2008 New Revision: 33578 URL: http://svn.reactos.org/svn/reactos?rev=33578&view=rev Log: - default to seperator item type - add the styles grayed and disabled in case they have not been added - initialize allocated user buffer to zero - allow support for bitmap items with MF_HELP style - check result of WideCharToMultiByte - always zero terminate a string buffer when enough space is available Modified: trunk/reactos/dll/win32/user32/windows/menu.c Modified: trunk/reactos/dll/win32/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] Sun May 18 09:18:00 2008 @@ -1109,8 +1109,15 @@ } else /* Not a popup */ { - if (flags == 0 && id == 0 && *str == 0) - flags = MF_SEPARATOR | MF_GRAYED; + if (*str == 0) + flags = MF_SEPARATOR; + + if (flags & MF_SEPARATOR) + { + if (!(flags & (MF_GRAYED | MF_DISABLED))) + flags |= MF_GRAYED | MF_DISABLED; + } + if(!unicode) AppendMenuA(hMenu, flags, id, *str ? str : NULL); else @@ -3705,19 +3712,38 @@ */ if(Flags & MF_BITMAP) { - mii->fMask |= MIIM_BITMAP; /* Use the new way of seting hbmpItem.*/ - mii->hbmpItem = (HBITMAP) NewItem; - mii->fType &= ~MFT_BITMAP; /* just incase, Kill the old way */ + if (mii->fType & MFT_BITMAP) + { + /* use old way of storing bitmap */ + mii->fMask |= (MIIM_TYPE | MIIM_FTYPE); + mii->fType |= MF_BITMAP; + mii->dwTypeData = (LPWSTR)NewItem; + } + else + { + /* use new way of storing type */ + mii->hbmpItem = (HBITMAP) NewItem; + mii->fType |= MFT_BITMAP; + mii->fMask |= MIIM_BITMAP; + } + + if (Flags & MF_HELP) + { + /* increase ident */ + mii->fType |= MF_HELP; + } } else if(Flags & MF_OWNERDRAW) { mii->fType |= MFT_OWNERDRAW; - mii->fMask |= MIIM_DATA; - mii->dwItemData = (DWORD) NewItem; + mii->fMask |= (MIIM_TYPE | MIIM_FTYPE); + mii->dwTypeData = (LPWSTR) NewItem; } else if (Flags & MF_SEPARATOR) { mii->fType |= MFT_SEPARATOR; + if (!(Flags & (MF_GRAYED|MF_DISABLED))) + Flags |= MF_GRAYED|MF_DISABLED; } else /* Default action MF_STRING. */ { @@ -3742,15 +3768,23 @@ NewItem = (LPCWSTR) NewItemA; } } - } - mii->fMask |= MIIM_STRING; - mii->fType |= MFT_STRING; /* Zero */ - mii->dwTypeData = (LPWSTR)NewItem; - if (Unicode) - mii->cch = (NULL == NewItem ? 0 : strlenW(NewItem)); + + if (Flags & MF_HELP) + mii->fType |= MF_HELP; + mii->fMask |= MIIM_STRING; + mii->fType |= MFT_STRING; /* Zero */ + mii->dwTypeData = (LPWSTR)NewItem; + if (Unicode) + mii->cch = (NULL == NewItem ? 0 : strlenW(NewItem)); + else + mii->cch = (NULL == NewItem ? 0 : strlen((LPCSTR)NewItem)); + } else - mii->cch = (NULL == NewItem ? 0 : strlen((LPCSTR)NewItem)); - mii->hbmpItem = NULL; + { + mii->fType |= MFT_SEPARATOR; + if (!(Flags & (MF_GRAYED|MF_DISABLED))) + Flags |= MF_GRAYED|MF_DISABLED; + } } if(Flags & MF_RIGHTJUSTIFY) /* Same as MF_HELP */ @@ -3767,14 +3801,14 @@ mii->fType |= MFT_MENUBARBREAK; } - if(Flags & MF_GRAYED) + if(Flags & MF_GRAYED || Flags & MF_DISABLED) { - mii->fState |= MFS_GRAYED; - mii->fMask |= MIIM_STATE; - } - else if(Flags & MF_DISABLED) - { - mii->fState |= MFS_DISABLED; + if (Flags & MF_GRAYED) + mii->fState |= MF_GRAYED; + + if (Flags & MF_DISABLED) + mii->fState |= MF_DISABLED; + mii->fMask |= MIIM_STATE; } else if (Flags & MF_HILITE) @@ -4213,6 +4247,7 @@ miiW.dwTypeData = RtlAllocateHeap(GetProcessHeap(), 0, miiW.cch * sizeof(WCHAR)); if (miiW.dwTypeData == NULL) return FALSE; + miiW.dwTypeData[0] = 0; } if (!NtUserMenuItemInfo(Menu, Item, ByPosition, (PROSMENUITEMINFO)&miiW, FALSE)) @@ -4233,13 +4268,27 @@ if ((miiW.fMask & MIIM_STRING) || (IS_STRING_ITEM(miiW.fType))) { - WideCharToMultiByte(CP_ACP, 0, miiW.dwTypeData, miiW.cch, AnsiBuffer, - mii->cch, NULL, NULL); + if (miiW.cch) + { + if (!WideCharToMultiByte(CP_ACP, 0, miiW.dwTypeData, miiW.cch, AnsiBuffer, mii->cch, NULL, NULL)) + { + AnsiBuffer[0] = 0; + } + if (Count > miiW.cch) + { + AnsiBuffer[miiW.cch] = 0; + } + mii->cch = mii->cch; + } + } + else + { + AnsiBuffer[0] = 0; } RtlFreeHeap(GetProcessHeap(), 0, miiW.dwTypeData); mii->dwTypeData = AnsiBuffer; - mii->cch = strlen(AnsiBuffer); + return TRUE; } @@ -4281,6 +4330,7 @@ miiW.dwTypeData = RtlAllocateHeap(GetProcessHeap(), 0, miiW.cch * sizeof(WCHAR)); if (miiW.dwTypeData == NULL) return FALSE; + miiW.dwTypeData[0] = 0; } if (!NtUserMenuItemInfo(Menu, Item, ByPosition, (PROSMENUITEMINFO) &miiW, FALSE))

1 0

[hpoussin] 33577: Forward all IRPs, even unknown ones
by hpoussin＠svn.reactos.org 18 May '08

18 May '08

Author: hpoussin Date: Sun May 18 06:45:26 2008 New Revision: 33577 URL: http://svn.reactos.org/svn/reactos?rev=33577&view=rev Log: Forward all IRPs, even unknown ones Modified: trunk/reactos/drivers/serial/serenum/serenum.c Modified: trunk/reactos/drivers/serial/serenum/serenum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/serial/serenum/ser… ============================================================================== --- trunk/reactos/drivers/serial/serenum/serenum.c [iso-8859-1] (original) +++ trunk/reactos/drivers/serial/serenum/serenum.c [iso-8859-1] Sun May 18 06:45:26 2008 @@ -37,55 +37,16 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - NTSTATUS Status = STATUS_NOT_SUPPORTED; - if (((PCOMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->IsFDO) { - /* Forward some IRPs to lower device */ - switch (IoGetCurrentIrpStackLocation(Irp)->MajorFunction) - { - case IRP_MJ_CREATE: - case IRP_MJ_CLOSE: - case IRP_MJ_CLEANUP: - case IRP_MJ_QUERY_INFORMATION: - case IRP_MJ_READ: - case IRP_MJ_WRITE: - case IRP_MJ_DEVICE_CONTROL: - return ForwardIrpToLowerDeviceAndForget(DeviceObject, Irp); - default: - { - WARN_(SERENUM, "FDO stub for major function 0x%lx\n", - IoGetCurrentIrpStackLocation(Irp)->MajorFunction); - ASSERT(FALSE); - return ForwardIrpToLowerDeviceAndForget(DeviceObject, Irp); - } - } + /* Forward IRPs to lower device */ + return ForwardIrpToLowerDeviceAndForget(DeviceObject, Irp); } else { - /* Forward some IRPs to attached FDO */ - switch (IoGetCurrentIrpStackLocation(Irp)->MajorFunction) - { - case IRP_MJ_CREATE: - case IRP_MJ_CLOSE: - case IRP_MJ_CLEANUP: - case IRP_MJ_READ: - case IRP_MJ_WRITE: - case IRP_MJ_DEVICE_CONTROL: - return ForwardIrpToAttachedFdoAndForget(DeviceObject, Irp); - default: - { - WARN_(SERENUM, "PDO stub for major function 0x%lx\n", - IoGetCurrentIrpStackLocation(Irp)->MajorFunction); - ASSERT(FALSE); - return ForwardIrpToAttachedFdoAndForget(DeviceObject, Irp); - } - } + /* Forward IRPs to attached FDO */ + return ForwardIrpToAttachedFdoAndForget(DeviceObject, Irp); } - - Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return Status; } /*

1 0

[gbrunmar] 33576: Reverted winesync's wrongly updated msi.rbuild to get rid of "always build msi" problem again.
by gbrunmar＠svn.reactos.org 18 May '08

18 May '08

Author: gbrunmar Date: Sun May 18 06:45:17 2008 New Revision: 33576 URL: http://svn.reactos.org/svn/reactos?rev=33576&view=rev Log: Reverted winesync's wrongly updated msi.rbuild to get rid of "always build msi" problem again. Modified: trunk/reactos/dll/win32/msi/msi.rbuild Modified: trunk/reactos/dll/win32/msi/msi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi.rbuild?r… ============================================================================== --- trunk/reactos/dll/win32/msi/msi.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/msi.rbuild [iso-8859-1] Sun May 18 06:45:17 2008 @@ -70,13 +70,13 @@ <library>kernel32</library> <library>odbccp32</library> <library>ntdll</library> - <dependency>msi_msiserver_typelib</dependency> - <dependency>msi_msiserver_header</dependency> + <dependency>msiserver</dependency> + <dependency>msiheader</dependency> </module> -<module name="msi_msiserver_header" type="idlheader"> +<module name="msiserver" type="embeddedtypelib" allowwarnings="true"> <file>msiserver.idl</file> </module> -<module name="msi_msiserver_typelib" type="embeddedtypelib" allowwarnings="true"> +<module name="msiheader" type="idlheader"> <file>msiserver.idl</file> </module> </group>

1 0

[gbrunmar] 33575: Reminder to self: Don't rely on MSDN. This should get taskmgr working again.
by gbrunmar＠svn.reactos.org 18 May '08

18 May '08

Author: gbrunmar Date: Sun May 18 06:41:32 2008 New Revision: 33575 URL: http://svn.reactos.org/svn/reactos?rev=33575&view=rev Log: Reminder to self: Don't rely on MSDN. This should get taskmgr working again. Modified: trunk/reactos/dll/win32/user32/windows/dialog.c Modified: trunk/reactos/dll/win32/user32/windows/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/dialog.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/dialog.c [iso-8859-1] Sun May 18 06:41:32 2008 @@ -1684,7 +1684,7 @@ SetLastError(ERROR_RESOURCE_NAME_NOT_FOUND); return -1; } - if (!IsWindow(hWndParent)) + if (hWndParent != NULL && !IsWindow(hWndParent)) { SetLastError(ERROR_INVALID_WINDOW_HANDLE); return 0; @@ -1717,7 +1717,7 @@ SetLastError(ERROR_RESOURCE_NAME_NOT_FOUND); return -1; } - if (!IsWindow(hWndParent)) + if (hWndParent != NULL && !IsWindow(hWndParent)) { SetLastError(ERROR_INVALID_WINDOW_HANDLE); return 0;

1 0

[fireball] 33574: - Add a comment describing behavior in case of HvSyncHive failure.
by fireball＠svn.reactos.org 18 May '08

18 May '08

Author: fireball Date: Sun May 18 06:26:36 2008 New Revision: 33574 URL: http://svn.reactos.org/svn/reactos?rev=33574&view=rev Log: - Add a comment describing behavior in case of HvSyncHive failure. Modified: trunk/reactos/ntoskrnl/config/cmapi.c Modified: trunk/reactos/ntoskrnl/config/cmapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmapi.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmapi.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmapi.c [iso-8859-1] Sun May 18 06:26:36 2008 @@ -18,18 +18,18 @@ NTAPI CmpDoFlushAll(IN BOOLEAN ForceFlush) { - NTSTATUS Status; PLIST_ENTRY NextEntry; PCMHIVE Hive; - BOOLEAN Result = TRUE; + NTSTATUS Status; + BOOLEAN Result = TRUE; /* Make sure that the registry isn't read-only now */ if (CmpNoWrite) return TRUE; - + /* Otherwise, acquire the hive list lock and disable force flush */ CmpForceForceFlush = FALSE; ExAcquirePushLockShared(&CmpHiveListHeadLock); - + /* Loop the hive list */ NextEntry = CmpHiveListHead.Flink; while (NextEntry != &CmpHiveListHead) @@ -43,6 +43,8 @@ /* Do the sync */ Status = HvSyncHive(&Hive->Hive); + + /* If something failed - set the flag and continue looping*/ if (!NT_SUCCESS(Status)) Result = FALSE; /* Release the flusher lock */ @@ -52,7 +54,7 @@ /* Try the next entry */ NextEntry = NextEntry->Flink; } - + /* Release lock and return */ ExReleasePushLock(&CmpHiveListHeadLock); return Result;

1 0

[cfinck] 33573: Make 1000% sure that any regedit is started by launching regedit from the search path if the GetWindowsDirectory call failed. (suggested by Alex on ros-dev)
by cfinck＠svn.reactos.org 18 May '08

18 May '08

Author: cfinck Date: Sun May 18 06:24:56 2008 New Revision: 33573 URL: http://svn.reactos.org/svn/reactos?rev=33573&view=rev Log: Make 1000% sure that any regedit is started by launching regedit from the search path if the GetWindowsDirectory call failed. (suggested by Alex on ros-dev) Modified: trunk/reactos/base/applications/regedt32/regedt32.c Modified: trunk/reactos/base/applications/regedt32/regedt32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedt32… ============================================================================== --- trunk/reactos/base/applications/regedt32/regedt32.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedt32/regedt32.c [iso-8859-1] Sun May 18 06:24:56 2008 @@ -2,6 +2,8 @@ #include <tchar.h> #include <shellapi.h> #include <shlwapi.h> + +#define REGEDIT _T("regedit.exe") int WINAPI _tWinMain(HINSTANCE hCurInst, HINSTANCE hPrevInst, LPTSTR lpsCmdLine, int nCmdShow) @@ -10,8 +12,12 @@ if(GetWindowsDirectory(szPath, MAX_PATH)) { - PathAppend(szPath, _T("regedit.exe")); + PathAppend(szPath, REGEDIT); ShellExecute(NULL, NULL, szPath, lpsCmdLine, NULL, nCmdShow); + } + else + { + ShellExecute(NULL, NULL, REGEDIT, lpsCmdLine, NULL, nCmdShow); } return 0;

1 0

[cfinck] 33572: Oops, forgot to link to shlwapi now that we use PathAppend.
by cfinck＠svn.reactos.org 18 May '08

18 May '08

Author: cfinck Date: Sun May 18 06:08:11 2008 New Revision: 33572 URL: http://svn.reactos.org/svn/reactos?rev=33572&view=rev Log: Oops, forgot to link to shlwapi now that we use PathAppend. Modified: trunk/reactos/base/applications/regedt32/regedt32.rbuild Modified: trunk/reactos/base/applications/regedt32/regedt32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedt32… ============================================================================== --- trunk/reactos/base/applications/regedt32/regedt32.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedt32/regedt32.rbuild [iso-8859-1] Sun May 18 06:08:11 2008 @@ -4,6 +4,7 @@ <include base="regedt32">.</include> <library>kernel32</library> <library>shell32</library> + <library>shlwapi</library> <file>regedt32.c</file> <file>resource.rc</file> </module>

1 0

[cfinck] 33571: Check if the GetWindowsDirectory call succeeded and use PathAppend to prevent a buffer overflow, when WinDir + "\regedit.exe" > MAX_PATH
by cfinck＠svn.reactos.org 18 May '08

18 May '08

Author: cfinck Date: Sun May 18 05:56:31 2008 New Revision: 33571 URL: http://svn.reactos.org/svn/reactos?rev=33571&view=rev Log: Check if the GetWindowsDirectory call succeeded and use PathAppend to prevent a buffer overflow, when WinDir + "\regedit.exe" > MAX_PATH Modified: trunk/reactos/base/applications/regedt32/regedt32.c Modified: trunk/reactos/base/applications/regedt32/regedt32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedt32… ============================================================================== --- trunk/reactos/base/applications/regedt32/regedt32.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedt32/regedt32.c [iso-8859-1] Sun May 18 05:56:31 2008 @@ -1,16 +1,18 @@ #include <windows.h> #include <tchar.h> #include <shellapi.h> +#include <shlwapi.h> int WINAPI _tWinMain(HINSTANCE hCurInst, HINSTANCE hPrevInst, LPTSTR lpsCmdLine, int nCmdShow) { TCHAR szPath[MAX_PATH]; - GetWindowsDirectory(szPath, MAX_PATH); - _tcscat(szPath, _T("\\regedit.exe")); - - ShellExecute(NULL, NULL, szPath, lpsCmdLine, NULL, nCmdShow); + if(GetWindowsDirectory(szPath, MAX_PATH)) + { + PathAppend(szPath, _T("regedit.exe")); + ShellExecute(NULL, NULL, szPath, lpsCmdLine, NULL, nCmdShow); + } return 0; }

1 0

[dchapyshev] 33570: - Add hotkeys settings to registry
by dchapyshev＠svn.reactos.org 18 May '08

18 May '08

Author: dchapyshev Date: Sun May 18 05:37:32 2008 New Revision: 33570 URL: http://svn.reactos.org/svn/reactos?rev=33570&view=rev Log: - Add hotkeys settings to registry Modified: trunk/reactos/base/setup/usetup/mui.c Modified: trunk/reactos/base/setup/usetup/mui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui.c?re… ============================================================================== --- trunk/reactos/base/setup/usetup/mui.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/mui.c [iso-8859-1] Sun May 18 05:37:32 2008 @@ -274,6 +274,90 @@ } static BOOLEAN +AddHotkeySettings(IN LPCWSTR Hotkey, IN LPCWSTR LangHotkey, IN LPCWSTR LayoutHotkey) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING KeyName; + UNICODE_STRING ValueName; + HANDLE KeyHandle; + ULONG Disposition; + NTSTATUS Status; + + RtlInitUnicodeString(&KeyName, + L"\\Registry\\User\\.DEFAULT\\Keyboard Layout\\Toggle"); + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + Status = NtCreateKey(&KeyHandle, + KEY_ALL_ACCESS, + &ObjectAttributes, + 0, + NULL, + 0, + &Disposition); + + if(!NT_SUCCESS(Status)) + { + DPRINT1("NtCreateKey() failed (Status %lx)\n", Status); + return FALSE; + } + + RtlInitUnicodeString(&ValueName, + L"Hotkey"); + + Status = NtSetValueKey(KeyHandle, + &ValueName, + 0, + REG_SZ, + (PVOID)Hotkey, + (1 + 1) * sizeof(WCHAR)); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtSetValueKey() failed (Status %lx)\n", Status); + NtClose(KeyHandle); + return FALSE; + } + + RtlInitUnicodeString(&ValueName, + L"Language Hotkey"); + + Status = NtSetValueKey(KeyHandle, + &ValueName, + 0, + REG_SZ, + (PVOID)LangHotkey, + (1 + 1) * sizeof(WCHAR)); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtSetValueKey() failed (Status %lx)\n", Status); + NtClose(KeyHandle); + return FALSE; + } + + RtlInitUnicodeString(&ValueName, + L"Layout Hotkey"); + + Status = NtSetValueKey(KeyHandle, + &ValueName, + 0, + REG_SZ, + (PVOID)LayoutHotkey, + (1 + 1) * sizeof(WCHAR)); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtSetValueKey() failed (Status %lx)\n", Status); + NtClose(KeyHandle); + return FALSE; + } + + NtClose(KeyHandle); + return TRUE; +} + +static BOOLEAN AddKbLayoutsToRegistry(IN LPCWSTR DefKbLayout, IN LPCWSTR SecKbLayout) { OBJECT_ATTRIBUTES ObjectAttributes; @@ -374,7 +458,14 @@ NtClose(KeyHandle); return FALSE; } - } + + /* + Switching input languages - Ctrl + Shift + Switching keyboard layouts - Left Alt + Shift + */ + AddHotkeySettings(L"2", L"2", L"1"); + } + else AddHotkeySettings(L"3", L"3", L"3"); // Off all hotkeys NtClose(KeyHandle); return TRUE;

1 0

← Newer
1
...
19
20
21
22
23
24
25
...
59
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2008