diff --git a/reactos/subsys/system/winefile/Makefile b/reactos/subsys/system/winefile/Makefile index 914e2965154..ee30c23c7f4 100644 --- a/reactos/subsys/system/winefile/Makefile +++ b/reactos/subsys/system/winefile/Makefile @@ -28,7 +28,8 @@ TARGET_SDKLIBS = \ comdlg32.a \ ole32.a \ oleaut32.a \ - shell32.a + shell32.a \ + mpr.a TARGET_GCCLIBS := uuid diff --git a/reactos/subsys/system/winefile/Sv.rc b/reactos/subsys/system/winefile/Sv.rc index 05fc5157a86..3f839c940d5 100644 --- a/reactos/subsys/system/winefile/Sv.rc +++ b/reactos/subsys/system/winefile/Sv.rc @@ -64,8 +64,8 @@ IDM_WINEFILE MENU FIXED IMPURE MENUITEM "&Skapa systemdisk...", -1 /*TODO*/ #endif MENUITEM SEPARATOR - MENUITEM "Anslut &Nätverksenhet", 252 - MENUITEM "&Koppla ifrĺn Nätverksenhet", 253 + MENUITEM "Anslut &Nätverksenhet", ID_CONNECT_NETWORK_DRIVE + MENUITEM "&Koppla ifrĺn Nätverksenhet", ID_DISCONNECT_NETWORK_DRIVE MENUITEM SEPARATOR MENUITEM "Dela ut...", 254 MENUITEM "&Ta bort utdelning...", 255 diff --git a/reactos/subsys/system/winefile/cz.rc b/reactos/subsys/system/winefile/cz.rc index b59df6bff54..0ee925446ef 100644 --- a/reactos/subsys/system/winefile/cz.rc +++ b/reactos/subsys/system/winefile/cz.rc @@ -63,8 +63,8 @@ IDM_WINEFILE MENU FIXED IMPURE MENUITEM "&Vytvořit systemový disk...", -1 /*TODO*/ #endif MENUITEM SEPARATOR - MENUITEM "Připojit &síťové zařízení" , 252 - MENUITEM "&Odpojit &síťové zařízení" , 253 + MENUITEM "Připojit &síťové zařízení" , ID_CONNECT_NETWORK_DRIVE + MENUITEM "&Odpojit &síťové zařízení" , ID_DISCONNECT_NETWORK_DRIVE MENUITEM SEPARATOR MENUITEM "Sdílet jako..." , 254 MENUITEM "&Odstranit sdílení..." , 255 diff --git a/reactos/subsys/system/winefile/de.rc b/reactos/subsys/system/winefile/de.rc index 2ddc2f3793f..48058e5d02f 100644 --- a/reactos/subsys/system/winefile/de.rc +++ b/reactos/subsys/system/winefile/de.rc @@ -61,8 +61,8 @@ IDM_WINEFILE MENU FIXED IMPURE MENUITEM "...", -1 /*TODO*/ #endif MENUITEM SEPARATOR - MENUITEM "Netzwerklaufwerk &verbinden..." , 252 - MENUITEM "Netzwerklaufwerk &trennen..." , 253 + MENUITEM "Netzwerklaufwerk &verbinden..." , ID_CONNECT_NETWORK_DRIVE + MENUITEM "Netzwerklaufwerk &trennen..." , ID_DISCONNECT_NETWORK_DRIVE MENUITEM SEPARATOR MENUITEM "F&reigeben als..." , 254 MENUITEM "Freigabe been&den..." , 255 diff --git a/reactos/subsys/system/winefile/en.rc b/reactos/subsys/system/winefile/en.rc index 0924cc2d3aa..0596809ade2 100644 --- a/reactos/subsys/system/winefile/en.rc +++ b/reactos/subsys/system/winefile/en.rc @@ -65,8 +65,8 @@ IDM_WINEFILE MENU FIXED IMPURE MENUITEM "&Make System Disk...", -1 /*TODO*/ #endif MENUITEM SEPARATOR - MENUITEM "Connect &Network Drive" , 252 - MENUITEM "&Disconnect Network Drive" , 253 + MENUITEM "Connect &Network Drive" , ID_CONNECT_NETWORK_DRIVE + MENUITEM "&Disconnect Network Drive" , ID_DISCONNECT_NETWORK_DRIVE MENUITEM SEPARATOR MENUITEM "Share as..." , 254 MENUITEM "&Remove Share..." , 255 diff --git a/reactos/subsys/system/winefile/es.rc b/reactos/subsys/system/winefile/es.rc index c48d5b8178e..f800821267f 100644 --- a/reactos/subsys/system/winefile/es.rc +++ b/reactos/subsys/system/winefile/es.rc @@ -61,8 +61,8 @@ IDM_WINEFILE MENU FIXED IMPURE MENUITEM "&Hacer disco de sistema...", -1 /*@@ */ #endif MENUITEM SEPARATOR - MENUITEM "C&onectar unidad de red" , 252 - MENUITEM "&Desconectar unidad de red" , 253 + MENUITEM "C&onectar unidad de red" , ID_CONNECT_NETWORK_DRIVE + MENUITEM "&Desconectar unidad de red" , ID_DISCONNECT_NETWORK_DRIVE MENUITEM SEPARATOR MENUITEM "Co&mpartir como..." , 254 MENUITEM "&Eliminar compartido..." , 255 diff --git a/reactos/subsys/system/winefile/fr.rc b/reactos/subsys/system/winefile/fr.rc index 8e9195c2dbc..967da7a01b3 100644 --- a/reactos/subsys/system/winefile/fr.rc +++ b/reactos/subsys/system/winefile/fr.rc @@ -64,8 +64,8 @@ IDM_WINEFILE MENU FIXED IMPURE MENUITEM "Créer un disque *systčme...", -1 /*@@ */ #endif MENUITEM SEPARATOR - MENUITEM "Connecter un lecteur &réseau" , 252 - MENUITEM "&Déconnecter un lecteur réseau" , 253 + MENUITEM "Connecter un lecteur &réseau" , ID_CONNECT_NETWORK_DRIVE + MENUITEM "&Déconnecter un lecteur réseau" , ID_DISCONNECT_NETWORK_DRIVE MENUITEM SEPARATOR MENUITEM "&Partager..." , 254 MENUITEM "Cesser de parta&ger" , 255 diff --git a/reactos/subsys/system/winefile/hu.rc b/reactos/subsys/system/winefile/hu.rc index be1f9ebadd6..62c0a1c3d7b 100644 --- a/reactos/subsys/system/winefile/hu.rc +++ b/reactos/subsys/system/winefile/hu.rc @@ -64,8 +64,8 @@ IDM_WINEFILE MENU FIXED IMPURE MENUITEM "&Rendszerlemez készítése...", -1 /*@@ */ #endif MENUITEM SEPARATOR - MENUITEM "&Hálózati meghajtó csatlakoztatása" , 252 - MENUITEM "Hálózati meghajtó leválasztása" , 253 + MENUITEM "&Hálózati meghajtó csatlakoztatása" , ID_CONNECT_NETWORK_DRIVE + MENUITEM "Hálózati meghajtó leválasztása" , ID_DISCONNECT_NETWORK_DRIVE MENUITEM SEPARATOR MENUITEM "Megosztás..." , 254 MENUITEM "Megosztás &megszüntetése..." , 255 diff --git a/reactos/subsys/system/winefile/it.rc b/reactos/subsys/system/winefile/it.rc index ec9aeb89920..3230a56ede7 100644 --- a/reactos/subsys/system/winefile/it.rc +++ b/reactos/subsys/system/winefile/it.rc @@ -64,8 +64,8 @@ IDM_WINEFILE MENU FIXED IMPURE MENUITEM "&Crea Disco di Sistema...", -1 /*@@ */ #endif MENUITEM SEPARATOR - MENUITEM "Connetti & Drive di Rete" , 252 - MENUITEM "&Disconnetti Drive di Rete" , 253 + MENUITEM "Connetti & Drive di Rete" , ID_CONNECT_NETWORK_DRIVE + MENUITEM "&Disconnetti Drive di Rete" , ID_DISCONNECT_NETWORK_DRIVE MENUITEM SEPARATOR MENUITEM "Condividi come..." , 254 MENUITEM "&Rimuovi condivisione..." , 255 diff --git a/reactos/subsys/system/winefile/nl.rc b/reactos/subsys/system/winefile/nl.rc index 2f86feae3b6..8dbc15585e9 100644 --- a/reactos/subsys/system/winefile/nl.rc +++ b/reactos/subsys/system/winefile/nl.rc @@ -60,8 +60,8 @@ IDM_WINEFILE MENU FIXED IMPURE MENUITEM "Systeemdisk maken...", -1 /*@@ */ #endif MENUITEM SEPARATOR - MENUITEM "Verbinding &maken met netwerkchijf" , 252 - MENUITEM "Verbinding &verbreken met netwerkschijf" , 253 + MENUITEM "Verbinding &maken met netwerkchijf" , ID_CONNECT_NETWORK_DRIVE + MENUITEM "Verbinding &verbreken met netwerkschijf" , ID_DISCONNECT_NETWORK_DRIVE MENUITEM SEPARATOR MENUITEM "Schijf &delen..." , 254 MENUITEM "Delen &ongedaan maken..." , 255 diff --git a/reactos/subsys/system/winefile/pt.rc b/reactos/subsys/system/winefile/pt.rc index 9fa9203a5ef..13a811b2b93 100644 --- a/reactos/subsys/system/winefile/pt.rc +++ b/reactos/subsys/system/winefile/pt.rc @@ -63,8 +63,8 @@ IDM_WINEFILE MENU FIXED IMPURE MENUITEM "&Gerar disco de sistema...", -1 /*@@ */ #endif MENUITEM SEPARATOR - MENUITEM "Conecta&r unidade de rede" , 252 - MENUITEM "&Desconectar unidade de rede" , 253 + MENUITEM "Conecta&r unidade de rede" , ID_CONNECT_NETWORK_DRIVE + MENUITEM "&Desconectar unidade de rede" , ID_DISCONNECT_NETWORK_DRIVE MENUITEM SEPARATOR MENUITEM "C&ompartilhar como..." , 254 MENUITEM "&Remover compartilhamento..." , 255 @@ -191,8 +191,8 @@ IDM_WINEFILE MENU FIXED IMPURE MENUITEM "&Gerar disco de sistema...", -1 /*@@ */ #endif MENUITEM SEPARATOR - MENUITEM "Conecta&r unidade de rede" , 252 - MENUITEM "&Desconectar unidade de rede" , 253 + MENUITEM "Conecta&r unidade de rede" , ID_CONNECT_NETWORK_DRIVE + MENUITEM "&Desconectar unidade de rede" , ID_DISCONNECT_NETWORK_DRIVE MENUITEM SEPARATOR MENUITEM "&Partilhar como..." , 254 MENUITEM "&Remover partilha..." , 255 diff --git a/reactos/subsys/system/winefile/resource.h b/reactos/subsys/system/winefile/resource.h index a0a707e3fff..b41f647a934 100644 --- a/reactos/subsys/system/winefile/resource.h +++ b/reactos/subsys/system/winefile/resource.h @@ -43,6 +43,8 @@ #define ID_EXECUTE 105 #define ID_FILE_MOVE 106 #define ID_FILE_EXIT 115 +#define ID_CONNECT_NETWORK_DRIVE 252 +#define ID_DISCONNECT_NETWORK_DRIVE 253 #define ID_VIEW_NAME 401 #define ID_VIEW_ALL_ATTRIBUTES 402 #define ID_VIEW_SELECTED_ATTRIBUTES 403 diff --git a/reactos/subsys/system/winefile/ru.rc b/reactos/subsys/system/winefile/ru.rc index b9a309fc1bf..caa4d2c170c 100644 --- a/reactos/subsys/system/winefile/ru.rc +++ b/reactos/subsys/system/winefile/ru.rc @@ -60,8 +60,8 @@ IDM_WINEFILE MENU FIXED IMPURE MENUITEM "&Ńîçäŕňü ńčńňĺěíűé äčńę...", -1 /*@@ */ #endif MENUITEM SEPARATOR - MENUITEM "Ďîäęëţ&÷čňü ńĺňĺâîé äčńę" , 252 - MENUITEM "Îňę&ëţ÷čňü ńĺňĺâîé äčńę" , 253 + MENUITEM "Ďîäęëţ&÷čňü ńĺňĺâîé äčńę" , ID_CONNECT_NETWORK_DRIVE + MENUITEM "Îňę&ëţ÷čňü ńĺňĺâîé äčńę" , ID_DISCONNECT_NETWORK_DRIVE MENUITEM SEPARATOR MENUITEM "Ńäĺëŕňü î&áůčě ęŕę..." , 254 MENUITEM "&Çŕęđűňü îáůčé äîńňóď..." , 255 diff --git a/reactos/subsys/system/winefile/si.rc b/reactos/subsys/system/winefile/si.rc index c927941e82a..5f014e896f7 100644 --- a/reactos/subsys/system/winefile/si.rc +++ b/reactos/subsys/system/winefile/si.rc @@ -61,8 +61,8 @@ IDM_WINEFILE MENU FIXED IMPURE MENUITEM "&Make System Disk...", -1 /*@@ */ #endif MENUITEM SEPARATOR - MENUITEM "Connect &Network Drive" , 252 - MENUITEM "&Disconnect Network Drive" , 253 + MENUITEM "Connect &Network Drive" , ID_CONNECT_NETWORK_DRIVE + MENUITEM "&Disconnect Network Drive" , ID_DISCONNECT_NETWORK_DRIVE MENUITEM SEPARATOR MENUITEM "Share as..." , 254 MENUITEM "&Remove Share..." , 255 diff --git a/reactos/subsys/system/winefile/winefile.c b/reactos/subsys/system/winefile/winefile.c index 9d2145eaafa..b15cfb3574e 100644 --- a/reactos/subsys/system/winefile/winefile.c +++ b/reactos/subsys/system/winefile/winefile.c @@ -2000,6 +2000,14 @@ LRESULT CALLBACK FrameWndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM lparam } break;} + case ID_CONNECT_NETWORK_DRIVE: + WNetConnectionDialog(hwnd, RESOURCETYPE_DISK); + break; + + case ID_DISCONNECT_NETWORK_DRIVE: + WNetDisconnectDialog(hwnd, RESOURCETYPE_DISK); + break; + case ID_HELP: WinHelp(hwnd, RS(b1,IDS_WINEFILE), HELP_INDEX, 0); break; diff --git a/reactos/subsys/system/winefile/winefile.dsp b/reactos/subsys/system/winefile/winefile.dsp index 30afb745aa5..3a11586970e 100644 --- a/reactos/subsys/system/winefile/winefile.dsp +++ b/reactos/subsys/system/winefile/winefile.dsp @@ -55,7 +55,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 user32.lib gdi32.lib advapi32.lib comctl32.lib shell32.lib comdlg32.lib ole32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept +# ADD LINK32 user32.lib gdi32.lib advapi32.lib comctl32.lib shell32.lib comdlg32.lib ole32.lib mpr.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept !ELSEIF "$(CFG)" == "winefile - Win32 Unicode Debug" @@ -81,7 +81,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 user32.lib gdi32.lib advapi32.lib comctl32.lib shell32.lib comdlg32.lib ole32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept +# ADD LINK32 user32.lib gdi32.lib advapi32.lib comctl32.lib shell32.lib comdlg32.lib ole32.lib mpr.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept !ELSEIF "$(CFG)" == "winefile - Win32 UNICODE Release" @@ -108,7 +108,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 user32.lib gdi32.lib advapi32.lib comctl32.lib shell32.lib comdlg32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 user32.lib gdi32.lib advapi32.lib comctl32.lib shell32.lib comdlg32.lib ole32.lib /nologo /subsystem:windows /machine:I386 +# ADD LINK32 user32.lib gdi32.lib advapi32.lib comctl32.lib shell32.lib comdlg32.lib ole32.lib mpr.lib /nologo /subsystem:windows /machine:I386 !ELSEIF "$(CFG)" == "winefile - Win32 Release" @@ -135,7 +135,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 user32.lib gdi32.lib advapi32.lib comctl32.lib shell32.lib comdlg32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 user32.lib gdi32.lib advapi32.lib comctl32.lib shell32.lib comdlg32.lib ole32.lib /nologo /subsystem:windows /machine:I386 +# ADD LINK32 user32.lib gdi32.lib advapi32.lib comctl32.lib shell32.lib comdlg32.lib ole32.lib mpr.lib /nologo /subsystem:windows /machine:I386 !ENDIF diff --git a/reactos/subsys/system/winefile/zh.rc b/reactos/subsys/system/winefile/zh.rc index c5ec4919200..95a1ef4b3a1 100644 --- a/reactos/subsys/system/winefile/zh.rc +++ b/reactos/subsys/system/winefile/zh.rc @@ -61,8 +61,8 @@ IDM_WINEFILE MENU FIXED IMPURE MENUITEM "˝¨Á˘ĎµÍłĹĚŁ¨&MŁ©...", -1 /*@@ */ #endif MENUITEM SEPARATOR - MENUITEM "Á¬˝ÓÍřÂçÇý¶ŻĆ÷Ł¨&NŁ©" , 252 - MENUITEM "¶ĎżŞÍřÂçÇý¶ŻĆ÷Á¬˝ÓŁ¨&DŁ©" , 253 + MENUITEM "Á¬˝ÓÍřÂçÇý¶ŻĆ÷Ł¨&NŁ©" , ID_CONNECT_NETWORK_DRIVE + MENUITEM "¶ĎżŞÍřÂçÇý¶ŻĆ÷Á¬˝ÓŁ¨&DŁ©" , ID_DISCONNECT_NETWORK_DRIVE MENUITEM SEPARATOR MENUITEM "ą˛ĎíÎŞ..." , 254 MENUITEM "Éľłýą˛ĎíŁ¨&RŁ©..." , 255