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

- error handling for network connection dialogs

Browse source 
- implement "format disk" dialog

svn path=/trunk/; revision=15263
This commit is contained in:
Martin Fuchs 2005-05-13 15:32:04 +00:00
parent bccd9d6a2c
commit a0cb9c83ab
15 changed files with 49 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
reactos/subsys/system/winefile/Sv.rc
View file

@ -59,7 +59,7 @@ IDM_WINEFILE MENU FIXED IMPURE
MENUITEM "&Kopiera disk...", 201 MENUITEM "&Kopiera disk...", 201
MENUITEM "&Namnge disk...", 202 MENUITEM "&Namnge disk...", 202
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&Formatera disk...", 203 MENUITEM "&Formatera disk...", ID_FORMAT_DISK
#ifdef _WIN95 #ifdef _WIN95
MENUITEM "&Skapa systemdisk...", -1 /*TODO*/ MENUITEM "&Skapa systemdisk...", -1 /*TODO*/
#endif #endif

2
reactos/subsys/system/winefile/cz.rc
View file

@ -58,7 +58,7 @@ IDM_WINEFILE MENU FIXED IMPURE
MENUITEM "&Kopírovat disk..." , 201 MENUITEM "&Kopírovat disk..." , 201
MENUITEM "&Jmenovka disk..." , 202 MENUITEM "&Jmenovka disk..." , 202
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&Formátovat disk..." , 203 MENUITEM "&Formátovat disk..." , ID_FORMAT_DISK
#ifdef _WIN95 #ifdef _WIN95
MENUITEM "&Vytvoøit systemový disk...", -1 /*TODO*/ MENUITEM "&Vytvoøit systemový disk...", -1 /*TODO*/
#endif #endif

2
reactos/subsys/system/winefile/de.rc
View file

@ -56,7 +56,7 @@ IDM_WINEFILE MENU FIXED IMPURE
MENUITEM "Datenträger &kopieren..." , 201 MENUITEM "Datenträger &kopieren..." , 201
MENUITEM "Datenträger &benennen..." , 202 MENUITEM "Datenträger &benennen..." , 202
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "Datenträger &formatieren..." , 203 MENUITEM "Datenträger &formatieren..." , ID_FORMAT_DISK
#ifdef _WIN95 #ifdef _WIN95
MENUITEM "...", -1 /*TODO*/ MENUITEM "...", -1 /*TODO*/
#endif #endif

2
reactos/subsys/system/winefile/en.rc
View file

@ -60,7 +60,7 @@ IDM_WINEFILE MENU FIXED IMPURE
MENUITEM "&Copy Disk..." , 201 MENUITEM "&Copy Disk..." , 201
MENUITEM "&Label Disk..." , 202 MENUITEM "&Label Disk..." , 202
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&Format Disk..." , 203 MENUITEM "&Format Disk..." , ID_FORMAT_DISK
#ifdef _WIN95 #ifdef _WIN95
MENUITEM "&Make System Disk...", -1 /*TODO*/ MENUITEM "&Make System Disk...", -1 /*TODO*/
#endif #endif

2
reactos/subsys/system/winefile/es.rc
View file

@ -56,7 +56,7 @@ IDM_WINEFILE MENU FIXED IMPURE
MENUITEM "&Copiar disco..." , 201 MENUITEM "&Copiar disco..." , 201
MENUITEM "E&tiquetar disco..." , 202 MENUITEM "E&tiquetar disco..." , 202
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&Formatear disco..." , 203 MENUITEM "&Formatear disco..." , ID_FORMAT_DISK
#ifdef _WIN95 #ifdef _WIN95
MENUITEM "&Hacer disco de sistema...", -1 /*@@ */ MENUITEM "&Hacer disco de sistema...", -1 /*@@ */
#endif #endif

2
reactos/subsys/system/winefile/fr.rc
View file

@ -59,7 +59,7 @@ IDM_WINEFILE MENU FIXED IMPURE
MENUITEM "&Copier Disque..." , 201 MENUITEM "&Copier Disque..." , 201
MENUITEM "&Nommer Disque..." , 202 MENUITEM "&Nommer Disque..." , 202
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&Formater Disque..." , 203 MENUITEM "&Formater Disque..." , ID_FORMAT_DISK
#ifdef _WIN95 #ifdef _WIN95
MENUITEM "Créer un disque *système...", -1 /*@@ */ MENUITEM "Créer un disque *système...", -1 /*@@ */
#endif #endif

2
reactos/subsys/system/winefile/hu.rc
View file

@ -59,7 +59,7 @@ IDM_WINEFILE MENU FIXED IMPURE
MENUITEM "Lemez &másolása..." , 201 MENUITEM "Lemez &másolása..." , 201
MENUITEM "&Lemezcimke..." , 202 MENUITEM "&Lemezcimke..." , 202
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&Formatálás..." , 203 MENUITEM "&Formatálás..." , ID_FORMAT_DISK
#ifdef _WIN95 #ifdef _WIN95
MENUITEM "&Rendszerlemez készítése...", -1 /*@@ */ MENUITEM "&Rendszerlemez készítése...", -1 /*@@ */
#endif #endif

2
reactos/subsys/system/winefile/it.rc
View file

@ -59,7 +59,7 @@ IDM_WINEFILE MENU FIXED IMPURE
MENUITEM "&Copia Disco..." , 201 MENUITEM "&Copia Disco..." , 201
MENUITEM "&Etichetta Disco..." , 202 MENUITEM "&Etichetta Disco..." , 202
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&Formatta Disco..." , 203 MENUITEM "&Formatta Disco..." , ID_FORMAT_DISK
#ifdef _WIN95 #ifdef _WIN95
MENUITEM "&Crea Disco di Sistema...", -1 /*@@ */ MENUITEM "&Crea Disco di Sistema...", -1 /*@@ */
#endif #endif

2
reactos/subsys/system/winefile/nl.rc
View file

@ -55,7 +55,7 @@ IDM_WINEFILE MENU FIXED IMPURE
MENUITEM "Disk &kopiëren..." , 201 MENUITEM "Disk &kopiëren..." , 201
MENUITEM "Disklabel maken..." , 202 MENUITEM "Disklabel maken..." , 202
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "Disk &formatteren..." , 203 MENUITEM "Disk &formatteren..." , ID_FORMAT_DISK
#ifdef _WIN95 #ifdef _WIN95
MENUITEM "Systeemdisk maken...", -1 /*@@ */ MENUITEM "Systeemdisk maken...", -1 /*@@ */
#endif #endif

4
reactos/subsys/system/winefile/pt.rc
View file

@ -58,7 +58,7 @@ IDM_WINEFILE MENU FIXED IMPURE
MENUITEM "&Copiar disco..." , 201 MENUITEM "&Copiar disco..." , 201
MENUITEM "&Nomear disco..." , 202 MENUITEM "&Nomear disco..." , 202
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&Formatar disco..." , 203 MENUITEM "&Formatar disco..." , ID_FORMAT_DISK
#ifdef _WIN95 #ifdef _WIN95
MENUITEM "&Gerar disco de sistema...", -1 /*@@ */ MENUITEM "&Gerar disco de sistema...", -1 /*@@ */
#endif #endif
@ -186,7 +186,7 @@ IDM_WINEFILE MENU FIXED IMPURE
MENUITEM "&Copiar disco..." , 201 MENUITEM "&Copiar disco..." , 201
MENUITEM "&Nomear disco..." , 202 MENUITEM "&Nomear disco..." , 202
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&Formatar disco..." , 203 MENUITEM "&Formatar disco..." , ID_FORMAT_DISK
#ifdef _WIN95 #ifdef _WIN95
MENUITEM "&Gerar disco de sistema...", -1 /*@@ */ MENUITEM "&Gerar disco de sistema...", -1 /*@@ */
#endif #endif

1
reactos/subsys/system/winefile/resource.h
View file

@ -43,6 +43,7 @@
#define ID_EXECUTE 105 #define ID_EXECUTE 105
#define ID_FILE_MOVE 106 #define ID_FILE_MOVE 106
#define ID_FILE_EXIT 115 #define ID_FILE_EXIT 115
#define ID_FORMAT_DISK 203
#define ID_CONNECT_NETWORK_DRIVE 252 #define ID_CONNECT_NETWORK_DRIVE 252
#define ID_DISCONNECT_NETWORK_DRIVE 253 #define ID_DISCONNECT_NETWORK_DRIVE 253
#define ID_VIEW_NAME 401 #define ID_VIEW_NAME 401

2
reactos/subsys/system/winefile/ru.rc
View file

@ -55,7 +55,7 @@ IDM_WINEFILE MENU FIXED IMPURE
MENUITEM "&Êîïèðîâàòü äèñê..." , 201 MENUITEM "&Êîïèðîâàòü äèñê..." , 201
MENUITEM "&Ìåòêà òîìà..." , 202 MENUITEM "&Ìåòêà òîìà..." , 202
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&Форматировать..." , 203 MENUITEM "&Ôîðìàòèðîâàòü..." , ID_FORMAT_DISK
#ifdef _WIN95 #ifdef _WIN95
MENUITEM "&Ñîçäàòü ñèñòåìíûé äèñê...", -1 /*@@ */ MENUITEM "&Ñîçäàòü ñèñòåìíûé äèñê...", -1 /*@@ */
#endif #endif

2
reactos/subsys/system/winefile/si.rc
View file

@ -56,7 +56,7 @@ IDM_WINEFILE MENU FIXED IMPURE
MENUITEM "&Copy Disk..." , 201 MENUITEM "&Copy Disk..." , 201
MENUITEM "&Label Disk..." , 202 MENUITEM "&Label Disk..." , 202
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&Format Disk..." , 203 MENUITEM "&Format Disk..." , ID_FORMAT_DISK
#ifdef _WIN95 #ifdef _WIN95
MENUITEM "&Make System Disk...", -1 /*@@ */ MENUITEM "&Make System Disk...", -1 /*@@ */
#endif #endif

40
reactos/subsys/system/winefile/winefile.c
View file

@ -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 */ /* allocate and initialise a directory entry */
static Entry* alloc_entry() static Entry* alloc_entry()
{ {
@ -2000,13 +2011,30 @@ LRESULT CALLBACK FrameWndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM lparam
} }
break;} break;}
case ID_CONNECT_NETWORK_DRIVE: case ID_CONNECT_NETWORK_DRIVE: {
WNetConnectionDialog(hwnd, RESOURCETYPE_DISK); DWORD ret = WNetConnectionDialog(hwnd, RESOURCETYPE_DISK);
break; 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: case ID_DISCONNECT_NETWORK_DRIVE: {
WNetDisconnectDialog(hwnd, RESOURCETYPE_DISK); DWORD ret = WNetDisconnectDialog(hwnd, RESOURCETYPE_DISK);
break; 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: case ID_HELP:
WinHelp(hwnd, RS(b1,IDS_WINEFILE), HELP_INDEX, 0); WinHelp(hwnd, RS(b1,IDS_WINEFILE), HELP_INDEX, 0);

2
reactos/subsys/system/winefile/zh.rc
View file

@ -56,7 +56,7 @@ IDM_WINEFILE MENU FIXED IMPURE
MENUITEM "复制（&C）..." , 201 MENUITEM "复制（&C）..." , 201
MENUITEM "命名（&L）..." , 202 MENUITEM "命名（&L）..." , 202
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "¸ñʽ»¯£¨&£©..." , 203 MENUITEM "¸ñʽ»¯£¨&£©..." , ID_FORMAT_DISK
#ifdef _WIN95 #ifdef _WIN95
MENUITEM "建立系统盘（&M）...", -1 /*@@ */ MENUITEM "建立系统盘（&M）...", -1 /*@@ */
#endif #endif