Ros-diffs

ros-diffs@reactos.org

81390 discussions

[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

[pschweitzer] 33569: Synced uxtheme.dll with Wine HEAD
by pschweitzer＠svn.reactos.org 18 May '08

18 May '08

Author: pschweitzer Date: Sun May 18 05:03:29 2008 New Revision: 33569 URL: http://svn.reactos.org/svn/reactos?rev=33569&view=rev Log: Synced uxtheme.dll with Wine HEAD Modified: trunk/reactos/dll/win32/uxtheme/draw.c trunk/reactos/dll/win32/uxtheme/system.c Modified: trunk/reactos/dll/win32/uxtheme/draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/draw.c?r… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/draw.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/draw.c [iso-8859-1] Sun May 18 05:03:29 2008 @@ -196,7 +196,6 @@ WCHAR szPath[MAX_PATH]; int imagelayout = IL_HORIZONTAL; int imagecount = 1; - int imagenum; BITMAP bmp; HBITMAP hBmp; BOOL hasAlpha; @@ -209,7 +208,6 @@ GetThemeEnumValue(hTheme, iPartId, iStateId, TMT_IMAGELAYOUT, &imagelayout); GetThemeInt(hTheme, iPartId, iStateId, TMT_IMAGECOUNT, &imagecount); - imagenum = max (min (imagecount, iStateId), 1) - 1; GetObjectW(hBmp, sizeof(bmp), &bmp); if(imagelayout == IL_VERTICAL) { reqsize.x = bmp.bmWidth; @@ -340,27 +338,81 @@ { if (sizingtype == ST_TILE) { - int yOfs = nYOriginDst; - int yRemaining = nHeightDst; - while (yRemaining > 0) + HDC hdcTemp; + BOOL result = FALSE; + + if (!nWidthSrc || !nHeightSrc) return TRUE; + + /* For destination width/height less than or equal to source + width/height, do not bother with memory bitmap optimization */ + if (nWidthSrc >= nWidthDst && nHeightSrc >= nHeightDst) { - int bltHeight = min (yRemaining, nHeightSrc); - int xOfs = nXOriginDst; - int xRemaining = nWidthDst; + int bltWidth = min (nWidthDst, nWidthSrc); + int bltHeight = min (nHeightDst, nHeightSrc); + + return UXTHEME_Blt (hdcDst, nXOriginDst, nYOriginDst, bltWidth, bltHeight, + hdcSrc, nXOriginSrc, nYOriginSrc, + transparent, transcolor); + } + + /* Create a DC with a bitmap consisting of a tiling of the source + bitmap, with standard GDI functions. This is faster than an + iteration with UXTHEME_Blt(). */ + hdcTemp = CreateCompatibleDC(hdcSrc); + if (hdcTemp != 0) + { + HBITMAP bitmapTemp; + HBITMAP bitmapOrig; + int nWidthTemp, nHeightTemp; + int xOfs, xRemaining; + int yOfs, yRemaining; + int growSize; + + /* Calculate temp dimensions of integer multiples of source dimensions */ + nWidthTemp = ((nWidthDst + nWidthSrc - 1) / nWidthSrc) * nWidthSrc; + nHeightTemp = ((nHeightDst + nHeightSrc - 1) / nHeightSrc) * nHeightSrc; + bitmapTemp = CreateCompatibleBitmap(hdcSrc, nWidthTemp, nHeightTemp); + bitmapOrig = SelectObject(hdcTemp, bitmapTemp); + + /* Initial copy of bitmap */ + BitBlt(hdcTemp, 0, 0, nWidthSrc, nHeightSrc, hdcSrc, nXOriginSrc, nYOriginSrc, SRCCOPY); + + /* Extend bitmap in the X direction. Growth of width is exponential */ + xOfs = nWidthSrc; + xRemaining = nWidthTemp - nWidthSrc; + growSize = nWidthSrc; while (xRemaining > 0) { - int bltWidth = min (xRemaining, nWidthSrc); - if (!UXTHEME_Blt (hdcDst, xOfs, yOfs, bltWidth, bltHeight, - hdcSrc, nXOriginSrc, nYOriginSrc, - transparent, transcolor)) - return FALSE; - xOfs += nWidthSrc; - xRemaining -= nWidthSrc; + growSize = min(growSize, xRemaining); + BitBlt(hdcTemp, xOfs, 0, growSize, nHeightSrc, hdcTemp, 0, 0, SRCCOPY); + xOfs += growSize; + xRemaining -= growSize; + growSize *= 2; } - yOfs += nHeightSrc; - yRemaining -= nHeightSrc; + + /* Extend bitmap in the Y direction. Growth of height is exponential */ + yOfs = nHeightSrc; + yRemaining = nHeightTemp - nHeightSrc; + growSize = nHeightSrc; + while (yRemaining > 0) + { + growSize = min(growSize, yRemaining); + BitBlt(hdcTemp, 0, yOfs, nWidthTemp, growSize, hdcTemp, 0, 0, SRCCOPY); + yOfs += growSize; + yRemaining -= growSize; + growSize *= 2; + } + + /* Use temporary hdc for source */ + result = UXTHEME_Blt (hdcDst, nXOriginDst, nYOriginDst, nWidthDst, nHeightDst, + hdcTemp, 0, 0, + transparent, transcolor); + + SelectObject(hdcTemp, bitmapOrig); + DeleteObject(bitmapTemp); } - return TRUE; + DeleteDC(hdcTemp); + return result; } else { @@ -853,7 +905,7 @@ /* FIXME: This only accounts for 2 gradient colors (out of 5) and ignores the gradient ratios (no idea how those work) Few themes use this, and the ones I've seen only use 2 colors with - a gradient ratio of 0 and 255 respectivly + a gradient ratio of 0 and 255 respectively */ COLORREF gradient1 = RGB(0,0,0); Modified: trunk/reactos/dll/win32/uxtheme/system.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/system.c… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/system.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/system.c [iso-8859-1] Sun May 18 05:03:29 2008 @@ -1171,7 +1171,7 @@ * 0x800706488 (Unknown property) when enumeration is canceled from callback * * NOTES - * When pszUnknown is NULL the callback is never called, the value does not seem to surve + * When pszUnknown is NULL the callback is never called, the value does not seem to serve * any other purpose */ HRESULT WINAPI ParseThemeIniFile(LPCWSTR pszIniFileName, LPWSTR pszUnknown,

1 0

[hpoussin] 33568: Free memory only we allocated it
by hpoussin＠svn.reactos.org 18 May '08

18 May '08

Author: hpoussin Date: Sun May 18 04:34:31 2008 New Revision: 33568 URL: http://svn.reactos.org/svn/reactos?rev=33568&view=rev Log: Free memory only we allocated it Modified: trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c Modified: trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c [iso-8859-1] Sun May 18 04:34:31 2008 @@ -356,6 +356,7 @@ LPSTR NtStatusString; UNICODE_STRING MessageU; ANSI_STRING MessageA; + USHORT CaptionSize = 0; if( !MessageResource->Flags ) { /* we've got an ansi string */ @@ -369,7 +370,6 @@ RtlUnicodeStringToAnsiString(&MessageA, &MessageU, TRUE); } - USHORT CaptionSize = 0; // check whether a caption exists if( *MessageA.Buffer == '{' ) { // get size of the caption @@ -464,7 +464,10 @@ RtlFreeHeap (RtlGetProcessHeap(), 0, NtStatusString); } - RtlFreeAnsiString(&MessageA); + if( MessageResource->Flags ) { + /* we've got a unicode string */ + RtlFreeAnsiString(&MessageA); + } } if( ClientFileNameU.Buffer ) { RtlFreeHeap (RtlGetProcessHeap(), 0, ClientFileNameU.Buffer);

1 0

[dchapyshev] 33567: - Implement "Advanced Key Settings" and "Change Key Sequence" dialogs
by dchapyshev＠svn.reactos.org 18 May '08

18 May '08

Author: dchapyshev Date: Sun May 18 04:06:48 2008 New Revision: 33567 URL: http://svn.reactos.org/svn/reactos?rev=33567&view=rev Log: - Implement "Advanced Key Settings" and "Change Key Sequence" dialogs Modified: trunk/reactos/dll/cpl/input/changekeyseq.c trunk/reactos/dll/cpl/input/input.h trunk/reactos/dll/cpl/input/keysettings.c Modified: trunk/reactos/dll/cpl/input/changekeyseq.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/changekeyseq… ============================================================================== --- trunk/reactos/dll/cpl/input/changekeyseq.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/changekeyseq.c [iso-8859-1] Sun May 18 04:06:48 2008 @@ -20,7 +20,7 @@ if (RegOpenKeyEx(HKEY_CURRENT_USER, _T("Keyboard Layout\\Toggle"), 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) { - dwSize = sizeof(szHotkey); + dwSize = (1 + 1) * sizeof(TCHAR); if (RegQueryValueEx(hKey, _T("Hotkey"), NULL, NULL, (LPBYTE)szHotkey, &dwSize) != ERROR_SUCCESS) { @@ -28,7 +28,7 @@ return FALSE; } - dwSize = sizeof(szLangHotkey); + dwSize = (1 + 1) * sizeof(TCHAR); if (RegQueryValueEx(hKey, _T("Language Hotkey"), NULL, NULL, (LPBYTE)szLangHotkey, &dwSize) != ERROR_SUCCESS) { @@ -36,7 +36,7 @@ return FALSE; } - dwSize = sizeof(szLayoutHotkey); + dwSize = (1 + 1) * sizeof(TCHAR); if (RegQueryValueEx(hKey, _T("Layout Hotkey"), NULL, NULL, (LPBYTE)szLayoutHotkey, &dwSize) != ERROR_SUCCESS) { @@ -49,6 +49,66 @@ else return FALSE; return TRUE; +} + +static VOID +SaveKeySeq(HWND hDlg) +{ + TCHAR szLang[1 + 1], szLayout[1 + 1]; + HKEY hKey; + + if (SendDlgItemMessage(hDlg, IDC_SWITCH_INPUT_LANG_CB, BM_GETCHECK, 0, 0) == BST_CHECKED) + { + if (SendDlgItemMessage(hDlg, IDC_CTRL_LANG, BM_GETCHECK, 0, 0) == BST_CHECKED) + _tcscpy(szLang, _T("2")); + else + _tcscpy(szLang, _T("1")); + } + else + { + _tcscpy(szLang, _T("3")); + } + + if (SendDlgItemMessage(hDlg, IDC_SWITCH_KBLAYOUTS_CB, BM_GETCHECK, 0, 0) == BST_CHECKED) + { + if (SendDlgItemMessage(hDlg, IDC_CTRL_LAYOUT, BM_GETCHECK, 0, 0) == BST_CHECKED) + _tcscpy(szLayout, _T("2")); + else + _tcscpy(szLayout, _T("1")); + } + else + { + _tcscpy(szLayout, _T("3")); + } + + if (RegCreateKeyEx(HKEY_CURRENT_USER, _T("Keyboard Layout\\Toggle"), 0, NULL, + REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, + NULL, &hKey, NULL) == ERROR_SUCCESS) + { + if (RegSetValueEx(hKey, _T("Hotkey"), 0, REG_SZ, (LPBYTE)szLang, + (DWORD)((1 + 1) * sizeof(TCHAR))) != ERROR_SUCCESS) + { + RegCloseKey(hKey); + return; + } + + if (RegSetValueEx(hKey, _T("Language Hotkey"), 0, REG_SZ, (LPBYTE)szLang, + (DWORD)((1 + 1) * sizeof(TCHAR))) != ERROR_SUCCESS) + { + RegCloseKey(hKey); + return; + } + + if (RegSetValueEx(hKey, _T("Layout Hotkey"), 0, REG_SZ, (LPBYTE)szLayout, + (DWORD)((1 + 1) * sizeof(TCHAR))) != ERROR_SUCCESS) + { + RegCloseKey(hKey); + return; + } + + RegCloseKey(hKey); + UpdateKeySettingsList(); + } } static VOID @@ -174,6 +234,8 @@ break; case IDOK: + SaveKeySeq(hDlg); + EndDialog(hDlg, LOWORD(wParam)); break; case IDCANCEL: Modified: trunk/reactos/dll/cpl/input/input.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/input.h?rev=… ============================================================================== --- trunk/reactos/dll/cpl/input/input.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/input.h [iso-8859-1] Sun May 18 04:06:48 2008 @@ -47,6 +47,8 @@ /* keysettings.c */ INT_PTR CALLBACK KeySettingsDlgProc(HWND hDlg,UINT message,WPARAM wParam,LPARAM lParam); +VOID +UpdateKeySettingsList(); /* add.c */ INT_PTR CALLBACK Modified: trunk/reactos/dll/cpl/input/keysettings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/keysettings.… ============================================================================== --- trunk/reactos/dll/cpl/input/keysettings.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/keysettings.c [iso-8859-1] Sun May 18 04:06:48 2008 @@ -11,6 +11,8 @@ #include "resource.h" #include "input.h" + +static HWND hKeySettingsWnd; static VOID AddListColumn(HWND hDlg) @@ -57,6 +59,27 @@ } static VOID +SaveKeySettings(HWND hDlg) +{ + HKEY hKey; + DWORD dwValue; + + if (SendDlgItemMessage(hDlg, IDC_PRESS_CL_KEY_RB, BM_GETCHECK, 0, 0) == BST_CHECKED) + dwValue = 0x0; + else + dwValue = 0x10000; + + if (RegCreateKeyEx(HKEY_CURRENT_USER, _T("Keyboard Layout"), 0, NULL, + REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, + NULL, &hKey, NULL) == ERROR_SUCCESS) + { + RegSetValueEx(hKey, _T("Attributes"), 0, REG_DWORD, (LPBYTE)&dwValue, sizeof(DWORD)); + + RegCloseKey(hKey); + } +} + +static VOID InitKeySettingsDlg(HWND hDlg) { TCHAR szHotkey[1 + 1], szLangHotkey[1 + 1], szLayoutHotkey[1 + 1], @@ -78,8 +101,10 @@ if (_tcscmp(szLangHotkey, _T("2")) == 0) LoadString(hApplet, IDS_CTRL_SHIFT, szText, sizeof(szText) / sizeof(TCHAR)); + else if (_tcscmp(szLangHotkey, _T("1")) == 0) + LoadString(hApplet, IDS_LEFT_ALT_SHIFT, szText, sizeof(szText) / sizeof(TCHAR)); else - LoadString(hApplet, IDS_LEFT_ALT_SHIFT, szText, sizeof(szText) / sizeof(TCHAR)); + LoadString(hApplet, IDS_NONE, szText, sizeof(szText) / sizeof(TCHAR)); item.mask = LVIF_TEXT | LVIF_PARAM | LVIF_STATE; item.pszText = szTitle; @@ -90,6 +115,13 @@ (VOID) ListView_SetHotItem(hHotkeyList, i); ListView_SetItemState(hHotkeyList, i, LVIS_SELECTED, LVIS_OVERLAYMASK); +} + +VOID +UpdateKeySettingsList() +{ + (VOID) ListView_DeleteAllItems(GetDlgItem(hKeySettingsWnd, IDC_KEY_LISTVIEW)); + InitKeySettingsDlg(hKeySettingsWnd); } INT_PTR CALLBACK @@ -103,6 +135,7 @@ switch (message) { case WM_INITDIALOG: + hKeySettingsWnd = hDlg; AddListColumn(hDlg); (VOID) ListView_SetExtendedListViewStyle(GetDlgItem(hDlg, IDC_KEY_LISTVIEW), LVS_EX_FULLROWSELECT); @@ -120,6 +153,8 @@ break; case IDOK: + SaveKeySettings(hDlg); + EndDialog(hDlg, LOWORD(wParam)); break; case IDCANCEL:

1 0

[gbrunmar] 33566: More correct include for PSEH support
by gbrunmar＠svn.reactos.org 18 May '08

18 May '08

Author: gbrunmar Date: Sun May 18 03:40:03 2008 New Revision: 33566 URL: http://svn.reactos.org/svn/reactos?rev=33566&view=rev Log: More correct include for PSEH support Modified: trunk/reactos/dll/win32/user32/include/user32.h Modified: trunk/reactos/dll/win32/user32/include/user32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/u… ============================================================================== --- trunk/reactos/dll/win32/user32/include/user32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/user32.h [iso-8859-1] Sun May 18 03:40:03 2008 @@ -39,8 +39,8 @@ /* Internal User32 Headers */ #include "user32p.h" -#include <libs/pseh/pseh.h> -#include <libs/pseh/framebased.h> +/* SEH Support with PSEH */ +#include <pseh/pseh.h> /* FIXME: Use ntgdi.h then cleanup... */ HGDIOBJ STDCALL NtGdiSelectObject(HDC hDC, HGDIOBJ hGDIObj);

1 0

[ekohl] 33565: Check user name for illegal characters when it is changed from within the user list.
by ekohl＠svn.reactos.org 17 May '08

17 May '08

Author: ekohl Date: Sat May 17 17:33:04 2008 New Revision: 33565 URL: http://svn.reactos.org/svn/reactos?rev=33565&view=rev Log: Check user name for illegal characters when it is changed from within the user list. Modified: trunk/reactos/dll/cpl/usrmgr/users.c 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] Sat May 17 17:33:04 2008 @@ -58,15 +58,20 @@ static BOOL CheckUserName(HWND hwndDlg, - INT nIdDlgItem) + INT nIdDlgItem, + LPTSTR lpUserName) { TCHAR szUserName[256]; UINT uLen; - uLen = GetDlgItemText(hwndDlg, nIdDlgItem, szUserName, 256); + if (lpUserName) + uLen = _tcslen(lpUserName); + else + uLen = GetDlgItemText(hwndDlg, nIdDlgItem, szUserName, 256); /* Check the user name */ - if (uLen > 0 && _tcspbrk(szUserName, TEXT("\"*+,/\\:;<=>?[]|")) != NULL) + 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: *+,/:;<=>?[\\]|"), @@ -199,7 +204,7 @@ break; case IDOK: - if (!CheckUserName(hwndDlg, IDC_USER_NEW_NAME)) + if (!CheckUserName(hwndDlg, IDC_USER_NEW_NAME, NULL)) { SetFocus(GetDlgItem(hwndDlg, IDC_USER_NEW_NAME)); SendDlgItemMessage(hwndDlg, IDC_USER_NEW_NAME, EM_SETSEL, 0, -1); @@ -333,6 +338,24 @@ } +static VOID +UserRename(HWND hwndDlg) +{ + HWND hwndLV; + INT nItem; + + hwndLV = GetDlgItem(hwndDlg, IDC_USERS_LIST); + if (hwndLV == NULL) + return; + + nItem = ListView_GetNextItem(hwndLV, -1, LVNI_SELECTED); + if (nItem != -1) + { + (void)ListView_EditLabel(hwndLV, nItem); + } +} + + static BOOL UserDelete(HWND hwndDlg) { @@ -530,6 +553,9 @@ if (lstrcmp(szOldUserName, szNewUserName) == 0) return FALSE; + /* Check the user name for illegal characters */ + if (!CheckUserName(NULL, 0, szNewUserName)) + return FALSE; /* Change the user name */ useri0.usri0_name = szNewUserName; @@ -633,17 +659,7 @@ break; case IDM_USER_RENAME: - { - INT nItem; - HWND hwndLV; - - hwndLV = GetDlgItem(hwndDlg, IDC_USERS_LIST); - nItem = ListView_GetNextItem(hwndLV, -1, LVNI_SELECTED); - if (nItem != -1) - { - (void)ListView_EditLabel(hwndLV, nItem); - } - } + UserRename(hwndDlg); break; case IDM_USER_NEW:

1 0

[pschweitzer] 33564: Forgot to commit urlmon.dll tests synced with Wine HEAD
by pschweitzer＠svn.reactos.org 17 May '08

17 May '08

Author: pschweitzer Date: Sat May 17 17:29:12 2008 New Revision: 33564 URL: http://svn.reactos.org/svn/reactos?rev=33564&view=rev Log: Forgot to commit urlmon.dll tests synced with Wine HEAD Modified: trunk/rostests/winetests/urlmon/protocol.c trunk/rostests/winetests/urlmon/urlmon.rbuild Modified: trunk/rostests/winetests/urlmon/protocol.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/urlmon/protocol… ============================================================================== --- trunk/rostests/winetests/urlmon/protocol.c [iso-8859-1] (original) +++ trunk/rostests/winetests/urlmon/protocol.c [iso-8859-1] Sat May 17 17:29:12 2008 @@ -27,6 +27,7 @@ #include "winbase.h" #include "ole2.h" #include "urlmon.h" +#include "wininet.h" #include "initguid.h" @@ -1383,11 +1384,21 @@ CHECK_CALLED(ReportProgress_SENDINGREQUEST); CHECK_CALLED(ReportResult); + SET_EXPECT(GetBindInfo); + hres = IInternetProtocol_Start(protocol, NULL, &protocol_sink, &bind_info, 0, 0); + ok(hres == E_INVALIDARG, "Start failed: %08x, expected E_INVALIDARG\n", hres); + CHECK_CALLED(GetBindInfo); + + SET_EXPECT(GetBindInfo); + hres = IInternetProtocol_Start(protocol, emptyW, &protocol_sink, &bind_info, 0, 0); + ok(hres == E_INVALIDARG, "Start failed: %08x, expected E_INVALIDARG\n", hres); + CHECK_CALLED(GetBindInfo); + IInternetProtocol_Release(protocol); } static void test_file_protocol(void) { - WCHAR buf[MAX_PATH]; + WCHAR buf[INTERNET_MAX_URL_LENGTH], file_name_buf[MAX_PATH]; DWORD size; ULONG len; HANDLE file; @@ -1429,15 +1440,17 @@ test_file_protocol_url(buf); memcpy(buf, wszFile2, sizeof(wszFile2)); - len = sizeof(wszFile2)/sizeof(WCHAR)-1; - len += GetCurrentDirectoryW(sizeof(buf)/sizeof(WCHAR)-len, buf+len); - buf[len++] = '\\'; - memcpy(buf+len, wszIndexHtml, sizeof(wszIndexHtml)); - - file_name = buf + sizeof(wszFile2)/sizeof(WCHAR)-1; + len = GetCurrentDirectoryW(sizeof(file_name_buf)/sizeof(WCHAR), file_name_buf); + file_name_buf[len++] = '\\'; + memcpy(file_name_buf+len, wszIndexHtml, sizeof(wszIndexHtml)); + lstrcpyW(buf+sizeof(wszFile2)/sizeof(WCHAR)-1, file_name_buf); + file_name = file_name_buf; bindf = 0; test_file_protocol_url(buf); bindf = BINDF_FROMURLMON; + test_file_protocol_url(buf); + + buf[sizeof(wszFile2)/sizeof(WCHAR)] = '|'; test_file_protocol_url(buf); memcpy(buf, wszFile3, sizeof(wszFile3)); Modified: trunk/rostests/winetests/urlmon/urlmon.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/urlmon/urlmon.r… ============================================================================== --- trunk/rostests/winetests/urlmon/urlmon.rbuild [iso-8859-1] (original) +++ trunk/rostests/winetests/urlmon/urlmon.rbuild [iso-8859-1] Sat May 17 17:29:12 2008 @@ -12,12 +12,12 @@ <file>url.c</file> <file>testlist.c</file> <library>wine</library> + <library>uuid</library> <library>urlmon</library> <library>ole32</library> <library>user32</library> <library>advapi32</library> <library>kernel32</library> - <library>uuid</library> <library>ntdll</library> </module> </group>

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