Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 21:42:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

- dont allow creating a link to a shortcut

Browse source 
See issue #2735 for more details.

svn path=/trunk/; revision=29542
This commit is contained in:
Johannes Anderwald 2007-10-12 16:07:41 +00:00
parent 2f452c335b
commit 6fda4d5f57
3 changed files with 21 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
reactos/dll/win32/shell32/shell32_De.rc
View file

@ -175,15 +175,15 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0
LTEXT "Zielpfad:", 14006, 10, 40, 70, 10 LTEXT "Zielpfad:", 14006, 10, 40, 70, 10
LTEXT "", 14007, 70, 40, 150, 10 LTEXT "", 14007, 70, 40, 150, 10
LTEXT "Ziel:", 14008, 10, 55, 45, 10 LTEXT "Ziel:", 14008, 10, 55, 45, 10
EDITTEXT 14009, 70, 55, 150, 10, ES_LEFT EDITTEXT 14009, 70, 55, 150, 10, ES_LEFT | ES_AUTOHSCROLL
LTEXT "&Starten in:",14010, 10, 65, 57, 10 LTEXT "&Starten in:",14010, 10, 65, 57, 10
EDITTEXT 14011, 70, 65, 150, 10, ES_LEFT EDITTEXT 14011, 70, 65, 150, 10, ES_LEFT | ES_AUTOHSCROLL
LTEXT "&Kurztasten:", 14014, 10, 80, 57, 10 LTEXT "&Kurztasten:", 14014, 10, 80, 57, 10
EDITTEXT 14015, 70, 80, 150, 10, ES_LEFT EDITTEXT 14015, 70, 80, 150, 10, ES_LEFT
LTEXT "Ausführen:", 14016, 10, 90, 57, 10 LTEXT "Ausführen:", 14016, 10, 90, 57, 10
EDITTEXT 14017, 70, 90, 150, 10 EDITTEXT 14017, 70, 90, 150, 10, ES_AUTOHSCROLL
LTEXT "K&ommentar:", 14018, 10, 100, 57, 10 LTEXT "K&ommentar:", 14018, 10, 100, 57, 10
EDITTEXT 14019, 70, 100, 150, 10, ES_LEFT EDITTEXT 14019, 70, 100, 150, 10, ES_LEFT | ES_AUTOHSCROLL
PUSHBUTTON "&Ziel finden...", 14020, 10, 115, 63, 14, ES_LEFT PUSHBUTTON "&Ziel finden...", 14020, 10, 115, 63, 14, ES_LEFT
PUSHBUTTON "I&con wechseln...", 14021, 83, 115, 63, 14, ES_LEFT PUSHBUTTON "I&con wechseln...", 14021, 83, 115, 63, 14, ES_LEFT
PUSHBUTTON "Er&weitert...", 14022, 156, 115, 63, 14, ES_LEFT PUSHBUTTON "Er&weitert...", 14022, 156, 115, 63, 14, ES_LEFT
@ -335,7 +335,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0
CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 10, 10, 220, 50 CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 10, 10, 220, 50
GROUPBOX "Settings for selected location", -1, 10, 80, 220, 70 GROUPBOX "Settings for selected location", -1, 10, 80, 220, 70
RADIOBUTTON "&Custom size:", 14001, 20, 90, 80, 10 RADIOBUTTON "&Custom size:", 14001, 20, 90, 80, 10
EDITTEXT 14002, 90, 90, 50, 10, WS_TABSTOP EDITTEXT 14002, 90, 90, 50, 10, WS_TABSTOP | ES_NUMBER
LTEXT "M&aximum size(MB):", -1, 20, 100, 70, 10 LTEXT "M&aximum size(MB):", -1, 20, 100, 70, 10
RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediately when deleted.", 14003, 20, 115, 170, 20, BS_MULTILINE | WS_TABSTOP RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediately when deleted.", 14003, 20, 115, 170, 20, BS_MULTILINE | WS_TABSTOP
RADIOBUTTON"&Display delete confirmation dialog", 14004, 20, 155, 140, 10, WS_TABSTOP RADIOBUTTON"&Display delete confirmation dialog", 14004, 20, 155, 140, 10, WS_TABSTOP

10
reactos/dll/win32/shell32/shell32_En.rc
View file

@ -173,15 +173,15 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0
LTEXT "Target location:", 14006, 10, 40, 70, 10 LTEXT "Target location:", 14006, 10, 40, 70, 10
LTEXT "", 14007, 70, 40, 150, 10 LTEXT "", 14007, 70, 40, 150, 10
LTEXT "Target:", 14008, 10, 55, 45, 10 LTEXT "Target:", 14008, 10, 55, 45, 10
EDITTEXT 14009, 70, 55, 150, 10, ES_LEFT EDITTEXT 14009, 70, 55, 150, 10, ES_LEFT | ES_AUTOHSCROLL
LTEXT "&Start in:",14010, 10, 65, 57, 10 LTEXT "&Start in:",14010, 10, 65, 57, 10
EDITTEXT 14011, 70, 65, 150, 10, ES_LEFT EDITTEXT 14011, 70, 65, 150, 10, ES_LEFT | ES_AUTOHSCROLL
LTEXT "Shortcut &key:", 14014, 10, 80, 57, 10 LTEXT "Shortcut &key:", 14014, 10, 80, 57, 10
EDITTEXT 14015, 70, 80, 150, 10, ES_LEFT EDITTEXT 14015, 70, 80, 150, 10, ES_LEFT
LTEXT "Run:", 14016, 10, 90, 57, 10 LTEXT "Run:", 14016, 10, 90, 57, 10
EDITTEXT 14017, 70, 90, 150, 10 EDITTEXT 14017, 70, 90, 150, 10, ES_AUTOHSCROLL
LTEXT "C&omment:", 14018, 10, 100, 57, 10 LTEXT "C&omment:", 14018, 10, 100, 57, 10
EDITTEXT 14019, 70, 100, 150, 10, ES_LEFT EDITTEXT 14019, 70, 100, 150, 10, ES_LEFT | ES_AUTOHSCROLL
PUSHBUTTON "&Find Target...", 14020, 10, 115, 63, 14, ES_LEFT PUSHBUTTON "&Find Target...", 14020, 10, 115, 63, 14, ES_LEFT
PUSHBUTTON "&Change Icon...", 14021, 83, 115, 63, 14, ES_LEFT PUSHBUTTON "&Change Icon...", 14021, 83, 115, 63, 14, ES_LEFT
PUSHBUTTON "A&dvanced...", 14022, 156, 115, 63, 14, ES_LEFT PUSHBUTTON "A&dvanced...", 14022, 156, 115, 63, 14, ES_LEFT
@ -335,7 +335,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0
CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 10, 10, 220, 50 CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 10, 10, 220, 50
GROUPBOX "Settings for selected location", -1, 10, 80, 220, 70 GROUPBOX "Settings for selected location", -1, 10, 80, 220, 70
RADIOBUTTON "&Custom size:", 14001, 20, 90, 80, 10 RADIOBUTTON "&Custom size:", 14001, 20, 90, 80, 10
EDITTEXT 14002, 90, 90, 50, 10, WS_TABSTOP EDITTEXT 14002, 90, 90, 50, 10, WS_TABSTOP | ES_NUMBER
LTEXT "M&aximum size(MB):", -1, 20, 100, 70, 10 LTEXT "M&aximum size(MB):", -1, 20, 100, 70, 10
RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediately when deleted.", 14003, 20, 115, 170, 20, BS_MULTILINE | WS_TABSTOP RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediately when deleted.", 14003, 20, 115, 170, 20, BS_MULTILINE | WS_TABSTOP
RADIOBUTTON"&Display delete confirmation dialog", 14004, 20, 155, 140, 10, WS_TABSTOP RADIOBUTTON"&Display delete confirmation dialog", 14004, 20, 155, 140, 10, WS_TABSTOP

11
reactos/dll/win32/shell32/shelllink.c
View file

@ -2595,6 +2595,7 @@ SH_ShellLinkDlgProc(
IShellLinkImpl *This; IShellLinkImpl *This;
HWND hDlgCtrl; HWND hDlgCtrl;
WCHAR szBuffer[MAX_PATH]; WCHAR szBuffer[MAX_PATH];
WCHAR * ptr;
int IconIndex; int IconIndex;
INT_PTR result; INT_PTR result;
@ -2643,10 +2644,20 @@ SH_ShellLinkDlgProc(
SendMessageW( hDlgCtrl, WM_GETTEXT, (WPARAM)MAX_PATH, (LPARAM)szBuffer); SendMessageW( hDlgCtrl, WM_GETTEXT, (WPARAM)MAX_PATH, (LPARAM)szBuffer);
if ( !SHELL_ExistsFileW(szBuffer) ) if ( !SHELL_ExistsFileW(szBuffer) )
{ {
//FIXME load localized error msg
MessageBoxW( hwndDlg, L"file not existing", szBuffer, MB_OK ); MessageBoxW( hwndDlg, L"file not existing", szBuffer, MB_OK );
SetWindowLong( hwndDlg, DWL_MSGRESULT, PSNRET_INVALID_NOCHANGEPAGE ); SetWindowLong( hwndDlg, DWL_MSGRESULT, PSNRET_INVALID_NOCHANGEPAGE );
return TRUE; return TRUE;
} }
ptr = wcsrchr(szBuffer, L'.');
if (ptr && !wcsnicmp(ptr, L".lnk", 4))
{
// FIXME load localized error msg
MessageBoxW( hwndDlg, L"You cannot create a link to a shortcut", L"Error", MB_ICONERROR );
SetWindowLong( hwndDlg, DWL_MSGRESULT, PSNRET_INVALID_NOCHANGEPAGE );
return TRUE;
}
IShellLinkW_fnSetPath((IShellLinkW*)&This->lpvtblw, szBuffer); IShellLinkW_fnSetPath((IShellLinkW*)&This->lpvtblw, szBuffer);
TRACE("This %p sLinkPath %S\n", This, This->sLinkPath); TRACE("This %p sLinkPath %S\n", This, This->sLinkPath);