winefile: connect network drives
Martin Fuchs
martin-fuchs at gmx.net
Mon May 16 13:50:31 CDT 2005
Changelog:
implement connecting and disconnecting of network drives
Index: winefile.c
===================================================================
RCS file: /home/wine/wine/programs/winefile/winefile.c,v
retrieving revision 1.39
diff -u -p -d -r1.39 winefile.c
--- winefile.c 16 May 2005 14:08:41 -0000 1.39
+++ winefile.c 16 May 2005 18:48:57 -0000
@@ -170,6 +170,7 @@ extern void WineWarranty(HWND hwnd);
static void read_directory(Entry* dir, LPCTSTR path, SORT_ORDER sortOrder, HWND hwnd);
static void set_curdir(ChildWnd* child, Entry* entry, int idx, HWND hwnd);
static void refresh_child(ChildWnd* child);
+static void refresh_drives();
static void get_path(Entry* dir, PTSTR path);
LRESULT CALLBACK FrameWndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM lparam);
@@ -226,7 +227,19 @@ static void display_error(HWND hwnd, DWO
LocalFree(msg);
}
+
+/* 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()
{
@@ -1880,6 +1893,10 @@ LRESULT CALLBACK FrameWndProc(HWND hwnd,
free(child);
break;}
+ case ID_REFRESH:
+ refresh_drives();
+ break;
+
case ID_WINDOW_CASCADE:
SendMessage(Globals.hmdiclient, WM_MDICASCADE, 0, 0);
break;
@@ -1970,6 +1987,30 @@ LRESULT CALLBACK FrameWndProc(HWND hwnd,
}
break;}
+ case ID_CONNECT_NETWORK_DRIVE: {
+ DWORD ret = WNetConnectionDialog(hwnd, RESOURCETYPE_DISK);
+ if (ret == NO_ERROR)
+ refresh_drives();
+ else if (ret != (DWORD)-1) {
+ if (ret == ERROR_EXTENDED_ERROR)
+ display_network_error(hwnd);
+ else
+ display_error(hwnd, ret);
+ }
+ break;}
+
+ case ID_DISCONNECT_NETWORK_DRIVE: {
+ DWORD ret = WNetDisconnectDialog(hwnd, RESOURCETYPE_DISK);
+ if (ret == NO_ERROR)
+ refresh_drives();
+ else if (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 */
@@ -3289,6 +3330,87 @@ static void refresh_child(ChildWnd* chil
}
+static void create_drive_bar()
+{
+ TBBUTTON drivebarBtn = {0, 0, TBSTATE_ENABLED, BTNS_BUTTON, {0, 0}, 0, 0};
+ TCHAR b1[BUFFER_LEN];
+ int btn = 1;
+ PTSTR p;
+
+ GetLogicalDriveStrings(BUFFER_LEN, Globals.drives);
+
+ Globals.hdrivebar = CreateToolbarEx(Globals.hMainWnd, WS_CHILD|WS_VISIBLE|CCS_NOMOVEY|TBSTYLE_LIST,
+ IDW_DRIVEBAR, 2, Globals.hInstance, IDB_DRIVEBAR, &drivebarBtn,
+ 1, 16, 13, 16, 13, sizeof(TBBUTTON));
+
+#ifndef _NO_EXTENSIONS
+#ifdef __WINE__
+ /* insert unix file system button */
+ b1[0] = '/';
+ b1[1] = '\0';
+ b1[2] = '\0';
+ SendMessage(Globals.hdrivebar, TB_ADDSTRING, 0, (LPARAM)b1);
+
+ drivebarBtn.idCommand = ID_DRIVE_UNIX_FS;
+ SendMessage(Globals.hdrivebar, TB_INSERTBUTTON, btn++, (LPARAM)&drivebarBtn);
+ drivebarBtn.iString++;
+#endif
+#ifdef _SHELL_FOLDERS
+ /* insert shell namespace button */
+ load_string(b1, IDS_SHELL);
+ b1[lstrlen(b1)+1] = '\0';
+ SendMessage(Globals.hdrivebar, TB_ADDSTRING, 0, (LPARAM)b1);
+
+ drivebarBtn.idCommand = ID_DRIVE_SHELL_NS;
+ SendMessage(Globals.hdrivebar, TB_INSERTBUTTON, btn++, (LPARAM)&drivebarBtn);
+ drivebarBtn.iString++;
+#endif
+
+ /* register windows drive root strings */
+ SendMessage(Globals.hdrivebar, TB_ADDSTRING, 0, (LPARAM)Globals.drives);
+#endif
+
+ drivebarBtn.idCommand = ID_DRIVE_FIRST;
+
+ for(p=Globals.drives; *p; ) {
+#ifdef _NO_EXTENSIONS
+ /* insert drive letter */
+ TCHAR b[3] = {tolower(*p)};
+ SendMessage(Globals.hdrivebar, TB_ADDSTRING, 0, (LPARAM)b);
+#endif
+ switch(GetDriveType(p)) {
+ case DRIVE_REMOVABLE: drivebarBtn.iBitmap = 1; break;
+ case DRIVE_CDROM: drivebarBtn.iBitmap = 3; break;
+ case DRIVE_REMOTE: drivebarBtn.iBitmap = 4; break;
+ case DRIVE_RAMDISK: drivebarBtn.iBitmap = 5; break;
+ default:/*DRIVE_FIXED*/ drivebarBtn.iBitmap = 2;
+ }
+
+ SendMessage(Globals.hdrivebar, TB_INSERTBUTTON, btn++, (LPARAM)&drivebarBtn);
+ drivebarBtn.idCommand++;
+ drivebarBtn.iString++;
+
+ while(*p++);
+ }
+}
+
+static void refresh_drives()
+{
+ RECT rect;
+
+ /* destroy drive bar */
+ DestroyWindow(Globals.hdrivebar);
+ Globals.hdrivebar = 0;
+
+ /* re-create drive bar */
+ create_drive_bar();
+
+ /* update window layout */
+ GetClientRect(Globals.hMainWnd, &rect);
+ SendMessage(Globals.hMainWnd, WM_SIZE, 0, MAKELONG(rect.right, rect.bottom));
+}
+
+
BOOL launch_file(HWND hwnd, LPCTSTR cmd, UINT nCmdShow)
{
HINSTANCE hinst = ShellExecute(hwnd, NULL/*operation*/, cmd, NULL/*parameters*/, NULL/*dir*/, nCmdShow);
@@ -3737,6 +3859,7 @@ LRESULT CALLBACK ChildWndProc(HWND hwnd,
break;}
case ID_REFRESH:
+ refresh_drives();
refresh_child(child);
break;
@@ -4074,70 +4197,9 @@ void show_frame(HWND hwndParent, int cmd
Globals.hMainWnd, 0, Globals.hInstance, &ccs);
- {
- TBBUTTON drivebarBtn = {0, 0, TBSTATE_ENABLED, BTNS_SEP, {0, 0}, 0, 0};
- int btn = 1;
- PTSTR p;
-
- Globals.hdrivebar = CreateToolbarEx(Globals.hMainWnd, WS_CHILD|WS_VISIBLE|CCS_NOMOVEY|TBSTYLE_LIST,
- IDW_DRIVEBAR, 2, Globals.hInstance, IDB_DRIVEBAR, &drivebarBtn,
- 1, 16, 13, 16, 13, sizeof(TBBUTTON));
- CheckMenuItem(Globals.hMenuOptions, ID_VIEW_DRIVE_BAR, MF_BYCOMMAND|MF_CHECKED);
-
- GetLogicalDriveStrings(BUFFER_LEN, Globals.drives);
-
- drivebarBtn.fsStyle = BTNS_BUTTON;
-
-#ifndef _NO_EXTENSIONS
-#ifdef __WINE__
- /* insert unix file system button */
- b1[0] = '/';
- b1[1] = '\0';
- b1[2] = '\0';
- SendMessage(Globals.hdrivebar, TB_ADDSTRING, 0, (LPARAM)b1);
-
- drivebarBtn.idCommand = ID_DRIVE_UNIX_FS;
- SendMessage(Globals.hdrivebar, TB_INSERTBUTTON, btn++, (LPARAM)&drivebarBtn);
- drivebarBtn.iString++;
-#endif
-#ifdef _SHELL_FOLDERS
- /* insert shell namespace button */
- load_string(b1, IDS_SHELL);
- b1[lstrlen(b1)+1] = '\0';
- SendMessage(Globals.hdrivebar, TB_ADDSTRING, 0, (LPARAM)b1);
-
- drivebarBtn.idCommand = ID_DRIVE_SHELL_NS;
- SendMessage(Globals.hdrivebar, TB_INSERTBUTTON, btn++, (LPARAM)&drivebarBtn);
- drivebarBtn.iString++;
-#endif
-
- /* register windows drive root strings */
- SendMessage(Globals.hdrivebar, TB_ADDSTRING, 0, (LPARAM)Globals.drives);
-#endif
-
- drivebarBtn.idCommand = ID_DRIVE_FIRST;
-
- for(p=Globals.drives; *p; ) {
-#ifdef _NO_EXTENSIONS
- /* insert drive letter */
- TCHAR b[3] = {tolower(*p)};
- SendMessage(Globals.hdrivebar, TB_ADDSTRING, 0, (LPARAM)b);
-#endif
- switch(GetDriveType(p)) {
- case DRIVE_REMOVABLE: drivebarBtn.iBitmap = 1; break;
- case DRIVE_CDROM: drivebarBtn.iBitmap = 3; break;
- case DRIVE_REMOTE: drivebarBtn.iBitmap = 4; break;
- case DRIVE_RAMDISK: drivebarBtn.iBitmap = 5; break;
- default:/*DRIVE_FIXED*/ drivebarBtn.iBitmap = 2;
- }
-
- SendMessage(Globals.hdrivebar, TB_INSERTBUTTON, btn++, (LPARAM)&drivebarBtn);
- drivebarBtn.idCommand++;
- drivebarBtn.iString++;
+ CheckMenuItem(Globals.hMenuOptions, ID_VIEW_DRIVE_BAR, MF_BYCOMMAND|MF_CHECKED);
- while(*p++);
- }
- }
+ create_drive_bar();
{
TBBUTTON toolbarBtns[] = {
Index: resource.h
===================================================================
RCS file: /home/wine/wine/programs/winefile/resource.h,v
retrieving revision 1.11
diff -u -p -d -r1.11 resource.h
--- resource.h 16 May 2005 14:08:41 -0000 1.11
+++ resource.h 16 May 2005 18:43:57 -0000
@@ -42,6 +42,8 @@
#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
#define ID_VIEW_ALL_ATTRIBUTES 402
#define ID_VIEW_SELECTED_ATTRIBUTES 403
Index: Cs.rc
===================================================================
RCS file: /home/wine/wine/programs/winefile/Cs.rc,v
retrieving revision 1.3
diff -u -p -d -r1.3 Cs.rc
--- Cs.rc 16 May 2005 14:08:41 -0000 1.3
+++ Cs.rc 16 May 2005 18:43:56 -0000
@@ -64,8 +64,8 @@ IDM_WINEFILE MENU FIXED IMPURE
MENUITEM "Vytvoøit systé&mový disk...", -1 /*@@ */
#endif
MENUITEM SEPARATOR
- MENUITEM "Pøipojit sí»ový &disk" , 252
- MENUITEM "&Odpojit sí»ový disk" , 253
+ MENUITEM "Pøipojit sí»ový &disk" , ID_CONNECT_NETWORK_DRIVE
+ MENUITEM "&Odpojit sí»ový disk" , ID_DISCONNECT_NETWORK_DRIVE
MENUITEM SEPARATOR
MENUITEM "Sdílet jako..." , 254
MENUITEM "Odst&ranit sdílení..." , 255
Index: De.rc
===================================================================
RCS file: /home/wine/wine/programs/winefile/De.rc,v
retrieving revision 1.9
diff -u -p -d -r1.9 De.rc
--- De.rc 16 May 2005 14:08:41 -0000 1.9
+++ De.rc 16 May 2005 18:43:56 -0000
@@ -63,8 +63,8 @@ IDM_WINEFILE MENU FIXED IMPURE
MENUITEM "...", -1 /*@@ */
#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
Index: En.rc
===================================================================
RCS file: /home/wine/wine/programs/winefile/En.rc,v
retrieving revision 1.14
diff -u -p -d -r1.14 En.rc
--- En.rc 16 May 2005 14:08:41 -0000 1.14
+++ En.rc 16 May 2005 18:43:56 -0000
@@ -63,8 +63,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
Index: Es.rc
===================================================================
RCS file: /home/wine/wine/programs/winefile/Es.rc,v
retrieving revision 1.7
diff -u -p -d -r1.7 Es.rc
--- Es.rc 16 May 2005 14:08:41 -0000 1.7
+++ Es.rc 16 May 2005 18:43:56 -0000
@@ -61,8 +61,8 @@ IDM_WINEFILE MENU FIXED IMPURE
MENUITEM "&Hacer disco de sistema...", -1 /*TODO*/
#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
Index: Fr.rc
===================================================================
RCS file: /home/wine/wine/programs/winefile/Fr.rc,v
retrieving revision 1.7
diff -u -p -d -r1.7 Fr.rc
--- Fr.rc 16 May 2005 14:08:41 -0000 1.7
+++ Fr.rc 16 May 2005 18:43:56 -0000
@@ -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
Index: Hu.rc
===================================================================
RCS file: /home/wine/wine/programs/winefile/Hu.rc,v
retrieving revision 1.5
diff -u -p -d -r1.5 Hu.rc
--- Hu.rc 16 May 2005 14:08:41 -0000 1.5
+++ Hu.rc 16 May 2005 18:43:56 -0000
@@ -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
Index: It.rc
===================================================================
RCS file: /home/wine/wine/programs/winefile/It.rc,v
retrieving revision 1.8
diff -u -p -d -r1.8 It.rc
--- It.rc 16 May 2005 14:08:41 -0000 1.8
+++ It.rc 16 May 2005 18:43:56 -0000
@@ -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
Index: Nl.rc
===================================================================
RCS file: /home/wine/wine/programs/winefile/Nl.rc,v
retrieving revision 1.5
diff -u -p -d -r1.5 Nl.rc
--- Nl.rc 16 May 2005 14:08:41 -0000 1.5
+++ Nl.rc 16 May 2005 18:43:56 -0000
@@ -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
Index: Pl.rc
===================================================================
RCS file: /home/wine/wine/programs/winefile/Pl.rc,v
retrieving revision 1.6
diff -u -p -d -r1.6 Pl.rc
--- Pl.rc 16 May 2005 14:08:41 -0000 1.6
+++ Pl.rc 16 May 2005 18:43:56 -0000
@@ -64,8 +64,8 @@ IDM_WINEFILE MENU FIXED IMPURE
MENUITEM "&Stwórz dysk systemowy...", -1 /*@@ */
#endif
MENUITEM SEPARATOR
- MENUITEM "&Pod³¹cz Dysk Sieciowy" , 252
- MENUITEM "&Od³¹cz Dysk Sieciowy" , 253
+ MENUITEM "&Pod³¹cz Dysk Sieciowy" , ID_CONNECT_NETWORK_DRIVE
+ MENUITEM "&Od³¹cz Dysk Sieciowy" , ID_DISCONNECT_NETWORK_DRIVE
MENUITEM SEPARATOR
MENUITEM "Udostêpnij jako..." , 254
MENUITEM "&Nie udostêpniaj..." , 255
Index: Pt.rc
===================================================================
RCS file: /home/wine/wine/programs/winefile/Pt.rc,v
retrieving revision 1.7
diff -u -p -d -r1.7 Pt.rc
--- Pt.rc 16 May 2005 14:08:41 -0000 1.7
+++ Pt.rc 16 May 2005 18:43:56 -0000
@@ -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
@@ -190,8 +190,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
Index: Ru.rc
===================================================================
RCS file: /home/wine/wine/programs/winefile/Ru.rc,v
retrieving revision 1.5
diff -u -p -d -r1.5 Ru.rc
--- Ru.rc 16 May 2005 14:08:41 -0000 1.5
+++ Ru.rc 16 May 2005 18:43:56 -0000
@@ -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
Index: Si.rc
===================================================================
RCS file: /home/wine/wine/programs/winefile/Si.rc,v
retrieving revision 1.5
diff -u -p -d -r1.5 Si.rc
--- Si.rc 16 May 2005 14:08:41 -0000 1.5
+++ Si.rc 16 May 2005 18:43:56 -0000
@@ -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
Index: Sv.rc
===================================================================
RCS file: /home/wine/wine/programs/winefile/Sv.rc,v
retrieving revision 1.1
diff -u -p -d -r1.1 Sv.rc
--- Sv.rc 16 May 2005 08:49:06 -0000 1.1
+++ Sv.rc 16 May 2005 18:43:57 -0000
@@ -59,13 +59,13 @@ 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
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
Index: Zh.rc
===================================================================
RCS file: /home/wine/wine/programs/winefile/Zh.rc,v
retrieving revision 1.5
diff -u -p -d -r1.5 Zh.rc
--- Zh.rc 16 May 2005 14:08:41 -0000 1.5
+++ Zh.rc 16 May 2005 18:43:57 -0000
@@ -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
Index: Makefile.in
===================================================================
RCS file: /home/wine/wine/programs/winefile/Makefile.in,v
retrieving revision 1.9
diff -u -p -d -r1.9 Makefile.in
--- Makefile.in 27 Sep 2004 20:35:53 -0000 1.9
+++ Makefile.in 16 May 2005 18:45:38 -0000
@@ -5,7 +5,7 @@ SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = winefile.exe
APPMODE = -mwindows
-IMPORTS = shell32 comdlg32 comctl32 ole32 user32 gdi32 kernel32
+IMPORTS = shell32 comdlg32 comctl32 ole32 user32 gdi32 kernel32 mpr
EXTRALIBS = -luuid
C_SRCS = \
More information about the wine-patches
mailing list