mirror of
https://github.com/reactos/reactos.git
synced 2024-12-28 10:04:49 +00:00
- error handling for network connection dialogs
- implement "format disk" dialog svn path=/trunk/; revision=15263
This commit is contained in:
parent
bccd9d6a2c
commit
a0cb9c83ab
15 changed files with 49 additions and 20 deletions
|
@ -59,7 +59,7 @@ IDM_WINEFILE MENU FIXED IMPURE
|
|||
MENUITEM "&Kopiera disk...", 201
|
||||
MENUITEM "&Namnge disk...", 202
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "&Formatera disk...", 203
|
||||
MENUITEM "&Formatera disk...", ID_FORMAT_DISK
|
||||
#ifdef _WIN95
|
||||
MENUITEM "&Skapa systemdisk...", -1 /*TODO*/
|
||||
#endif
|
||||
|
|
|
@ -58,7 +58,7 @@ IDM_WINEFILE MENU FIXED IMPURE
|
|||
MENUITEM "&Kopírovat disk..." , 201
|
||||
MENUITEM "&Jmenovka disk..." , 202
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "&Formátovat disk..." , 203
|
||||
MENUITEM "&Formátovat disk..." , ID_FORMAT_DISK
|
||||
#ifdef _WIN95
|
||||
MENUITEM "&Vytvoøit systemový disk...", -1 /*TODO*/
|
||||
#endif
|
||||
|
|
|
@ -56,7 +56,7 @@ IDM_WINEFILE MENU FIXED IMPURE
|
|||
MENUITEM "Datenträger &kopieren..." , 201
|
||||
MENUITEM "Datenträger &benennen..." , 202
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "Datenträger &formatieren..." , 203
|
||||
MENUITEM "Datenträger &formatieren..." , ID_FORMAT_DISK
|
||||
#ifdef _WIN95
|
||||
MENUITEM "...", -1 /*TODO*/
|
||||
#endif
|
||||
|
|
|
@ -60,7 +60,7 @@ IDM_WINEFILE MENU FIXED IMPURE
|
|||
MENUITEM "&Copy Disk..." , 201
|
||||
MENUITEM "&Label Disk..." , 202
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "&Format Disk..." , 203
|
||||
MENUITEM "&Format Disk..." , ID_FORMAT_DISK
|
||||
#ifdef _WIN95
|
||||
MENUITEM "&Make System Disk...", -1 /*TODO*/
|
||||
#endif
|
||||
|
|
|
@ -56,7 +56,7 @@ IDM_WINEFILE MENU FIXED IMPURE
|
|||
MENUITEM "&Copiar disco..." , 201
|
||||
MENUITEM "E&tiquetar disco..." , 202
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "&Formatear disco..." , 203
|
||||
MENUITEM "&Formatear disco..." , ID_FORMAT_DISK
|
||||
#ifdef _WIN95
|
||||
MENUITEM "&Hacer disco de sistema...", -1 /*@@ */
|
||||
#endif
|
||||
|
|
|
@ -59,7 +59,7 @@ IDM_WINEFILE MENU FIXED IMPURE
|
|||
MENUITEM "&Copier Disque..." , 201
|
||||
MENUITEM "&Nommer Disque..." , 202
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "&Formater Disque..." , 203
|
||||
MENUITEM "&Formater Disque..." , ID_FORMAT_DISK
|
||||
#ifdef _WIN95
|
||||
MENUITEM "Créer un disque *système...", -1 /*@@ */
|
||||
#endif
|
||||
|
|
|
@ -59,7 +59,7 @@ IDM_WINEFILE MENU FIXED IMPURE
|
|||
MENUITEM "Lemez &másolása..." , 201
|
||||
MENUITEM "&Lemezcimke..." , 202
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "&Formatálás..." , 203
|
||||
MENUITEM "&Formatálás..." , ID_FORMAT_DISK
|
||||
#ifdef _WIN95
|
||||
MENUITEM "&Rendszerlemez készítése...", -1 /*@@ */
|
||||
#endif
|
||||
|
|
|
@ -59,7 +59,7 @@ IDM_WINEFILE MENU FIXED IMPURE
|
|||
MENUITEM "&Copia Disco..." , 201
|
||||
MENUITEM "&Etichetta Disco..." , 202
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "&Formatta Disco..." , 203
|
||||
MENUITEM "&Formatta Disco..." , ID_FORMAT_DISK
|
||||
#ifdef _WIN95
|
||||
MENUITEM "&Crea Disco di Sistema...", -1 /*@@ */
|
||||
#endif
|
||||
|
|
|
@ -55,7 +55,7 @@ IDM_WINEFILE MENU FIXED IMPURE
|
|||
MENUITEM "Disk &kopiëren..." , 201
|
||||
MENUITEM "Disklabel maken..." , 202
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "Disk &formatteren..." , 203
|
||||
MENUITEM "Disk &formatteren..." , ID_FORMAT_DISK
|
||||
#ifdef _WIN95
|
||||
MENUITEM "Systeemdisk maken...", -1 /*@@ */
|
||||
#endif
|
||||
|
|
|
@ -58,7 +58,7 @@ IDM_WINEFILE MENU FIXED IMPURE
|
|||
MENUITEM "&Copiar disco..." , 201
|
||||
MENUITEM "&Nomear disco..." , 202
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "&Formatar disco..." , 203
|
||||
MENUITEM "&Formatar disco..." , ID_FORMAT_DISK
|
||||
#ifdef _WIN95
|
||||
MENUITEM "&Gerar disco de sistema...", -1 /*@@ */
|
||||
#endif
|
||||
|
@ -186,7 +186,7 @@ IDM_WINEFILE MENU FIXED IMPURE
|
|||
MENUITEM "&Copiar disco..." , 201
|
||||
MENUITEM "&Nomear disco..." , 202
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "&Formatar disco..." , 203
|
||||
MENUITEM "&Formatar disco..." , ID_FORMAT_DISK
|
||||
#ifdef _WIN95
|
||||
MENUITEM "&Gerar disco de sistema...", -1 /*@@ */
|
||||
#endif
|
||||
|
|
|
@ -43,6 +43,7 @@
|
|||
#define ID_EXECUTE 105
|
||||
#define ID_FILE_MOVE 106
|
||||
#define ID_FILE_EXIT 115
|
||||
#define ID_FORMAT_DISK 203
|
||||
#define ID_CONNECT_NETWORK_DRIVE 252
|
||||
#define ID_DISCONNECT_NETWORK_DRIVE 253
|
||||
#define ID_VIEW_NAME 401
|
||||
|
|
|
@ -55,7 +55,7 @@ IDM_WINEFILE MENU FIXED IMPURE
|
|||
MENUITEM "&Êîïèðîâàòü äèñê..." , 201
|
||||
MENUITEM "&Ìåòêà òîìà..." , 202
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "&Форматировать..." , 203
|
||||
MENUITEM "&Ôîðìàòèðîâàòü..." , ID_FORMAT_DISK
|
||||
#ifdef _WIN95
|
||||
MENUITEM "&Ñîçäàòü ñèñòåìíûé äèñê...", -1 /*@@ */
|
||||
#endif
|
||||
|
|
|
@ -56,7 +56,7 @@ IDM_WINEFILE MENU FIXED IMPURE
|
|||
MENUITEM "&Copy Disk..." , 201
|
||||
MENUITEM "&Label Disk..." , 202
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "&Format Disk..." , 203
|
||||
MENUITEM "&Format Disk..." , ID_FORMAT_DISK
|
||||
#ifdef _WIN95
|
||||
MENUITEM "&Make System Disk...", -1 /*@@ */
|
||||
#endif
|
||||
|
|
|
@ -260,6 +260,17 @@ static void display_error(HWND hwnd, DWORD error)
|
|||
}
|
||||
|
||||
|
||||
/* display network error message using WNetGetLastError() */
|
||||
static void display_network_error(HWND hwnd)
|
||||
{
|
||||
TCHAR msg[BUFFER_LEN], provider[BUFFER_LEN], b2[BUFFER_LEN];
|
||||
DWORD error;
|
||||
|
||||
if (WNetGetLastError(&error, msg, BUFFER_LEN, provider, BUFFER_LEN) == NO_ERROR)
|
||||
MessageBox(hwnd, msg, RS(b2,IDS_WINEFILE), MB_OK);
|
||||
}
|
||||
|
||||
|
||||
/* allocate and initialise a directory entry */
|
||||
static Entry* alloc_entry()
|
||||
{
|
||||
|
@ -2000,13 +2011,30 @@ LRESULT CALLBACK FrameWndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM lparam
|
|||
}
|
||||
break;}
|
||||
|
||||
case ID_CONNECT_NETWORK_DRIVE:
|
||||
WNetConnectionDialog(hwnd, RESOURCETYPE_DISK);
|
||||
break;
|
||||
case ID_CONNECT_NETWORK_DRIVE: {
|
||||
DWORD ret = WNetConnectionDialog(hwnd, RESOURCETYPE_DISK);
|
||||
if (ret!=NO_ERROR && ret!=(DWORD)-1)
|
||||
if (ret == ERROR_EXTENDED_ERROR)
|
||||
display_network_error(hwnd);
|
||||
else
|
||||
display_error(hwnd, ret);
|
||||
break;}
|
||||
|
||||
case ID_DISCONNECT_NETWORK_DRIVE:
|
||||
WNetDisconnectDialog(hwnd, RESOURCETYPE_DISK);
|
||||
break;
|
||||
case ID_DISCONNECT_NETWORK_DRIVE: {
|
||||
DWORD ret = WNetDisconnectDialog(hwnd, RESOURCETYPE_DISK);
|
||||
if (ret!=NO_ERROR && ret!=(DWORD)-1)
|
||||
if (ret == ERROR_EXTENDED_ERROR)
|
||||
display_network_error(hwnd);
|
||||
else
|
||||
display_error(hwnd, ret);
|
||||
break;}
|
||||
|
||||
case ID_FORMAT_DISK: {
|
||||
UINT sem_org = SetErrorMode(0); /* Get the current Error Mode settings. */
|
||||
SetErrorMode(sem_org & ~SEM_FAILCRITICALERRORS); /* Force O/S to handle */
|
||||
SHFormatDrive(hwnd, 0 /* A: */, SHFMT_ID_DEFAULT, 0);
|
||||
SetErrorMode(sem_org); /* Put it back the way it was. */
|
||||
break;}
|
||||
|
||||
case ID_HELP:
|
||||
WinHelp(hwnd, RS(b1,IDS_WINEFILE), HELP_INDEX, 0);
|
||||
|
|
|
@ -56,7 +56,7 @@ IDM_WINEFILE MENU FIXED IMPURE
|
|||
MENUITEM "复制(&C)..." , 201
|
||||
MENUITEM "命名(&L)..." , 202
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "¸ñʽ»¯£¨&£©..." , 203
|
||||
MENUITEM "¸ñʽ»¯£¨&£©..." , ID_FORMAT_DISK
|
||||
#ifdef _WIN95
|
||||
MENUITEM "建立系统盘(&M)...", -1 /*@@ */
|
||||
#endif
|
||||
|
|
Loading…
Reference in a new issue