Sync WinFile to Wine 1.1.30

svn path=/trunk/; revision=43185
This commit is contained in:
Daniel Reimer 2009-09-27 12:09:24 +00:00
parent ae1fbc5ade
commit c4214a9722
4 changed files with 467 additions and 635 deletions

View file

@ -164,7 +164,7 @@ FONT 8, "MS Shell Dlg"
IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Select destination"
CAPTION "Seleziona destinazione"
FONT 8, "MS Shell Dlg"
{
CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10
@ -177,6 +177,6 @@ FONT 8, "MS Shell Dlg"
STRINGTABLE
{
IDS_FONT_SEL_DLG_NAME "Applica le impostazioni dei font"
IDS_FONT_SEL_ERROR "Si è verificato un errore durante la selezione del nuovo font."
IDS_FONT_SEL_DLG_NAME "Applica le impostazioni dei caratteri"
IDS_FONT_SEL_ERROR "Si è verificato un errore durante la selezione del nuovo carattere."
}

View file

@ -19,9 +19,6 @@
#include "winefile.h"
#ifdef __WINE__
#ifdef UNICODE
void _wsplitpath(const WCHAR* path, WCHAR* drv, WCHAR* dir, WCHAR* name, WCHAR* ext)
{
const WCHAR* end; /* end of processed string */
@ -75,81 +72,23 @@ void _wsplitpath(const WCHAR* path, WCHAR* drv, WCHAR* dir, WCHAR* name, WCHAR*
}
}
#else /* UNICODE */
void _splitpath(const CHAR* path, CHAR* drv, CHAR* dir, CHAR* name, CHAR* ext)
{
const CHAR* end; /* end of processed string */
const CHAR* p; /* search pointer */
const CHAR* s; /* copy pointer */
/* extract drive name */
if (path[0] && path[1]==':') {
if (drv) {
*drv++ = *path++;
*drv++ = *path++;
*drv = '\0';
}
} else if (drv)
*drv = '\0';
/* search for end of string or stream separator */
for(end=path; *end && *end!=':'; )
end++;
/* search for begin of file extension */
for(p=end; p>path && *--p!='\\' && *p!='/'; )
if (*p == '.') {
end = p;
break;
}
if (ext)
for(s=end; (*ext=*s++); )
ext++;
/* search for end of directory name */
for(p=end; p>path; )
if (*--p=='\\' || *p=='/') {
p++;
break;
}
if (name) {
for(s=p; s<end; )
*name++ = *s++;
*name = '\0';
}
if (dir) {
for(s=path; s<p; )
*dir++ = *s++;
*dir = '\0';
}
}
#endif /* UNICODE */
#endif /* __WINE__ */
/*
void main() // test splipath()
{
TCHAR drv[_MAX_DRIVE+1], dir[_MAX_DIR], name[_MAX_FNAME], ext[_MAX_EXT];
WCHAR drv[_MAX_DRIVE+1], dir[_MAX_DIR], name[_MAX_FNAME], ext[_MAX_EXT];
_tsplitpath(L"x\\y", drv, dir, name, ext);
_tsplitpath(L"x\\", drv, dir, name, ext);
_tsplitpath(L"\\x", drv, dir, name, ext);
_tsplitpath(L"x", drv, dir, name, ext);
_tsplitpath(L"", drv, dir, name, ext);
_tsplitpath(L".x", drv, dir, name, ext);
_tsplitpath(L":x", drv, dir, name, ext);
_tsplitpath(L"a:x", drv, dir, name, ext);
_tsplitpath(L"a.b:x", drv, dir, name, ext);
_tsplitpath(L"W:\\/\\abc/Z:~", drv, dir, name, ext);
_tsplitpath(L"abc.EFGH:12345", drv, dir, name, ext);
_tsplitpath(L"C:/dos/command.com", drv, dir, name, ext);
_wsplitpath(L"x\\y", drv, dir, name, ext);
_wsplitpath(L"x\\", drv, dir, name, ext);
_wsplitpath(L"\\x", drv, dir, name, ext);
_wsplitpath(L"x", drv, dir, name, ext);
_wsplitpath(L"", drv, dir, name, ext);
_wsplitpath(L".x", drv, dir, name, ext);
_wsplitpath(L":x", drv, dir, name, ext);
_wsplitpath(L"a:x", drv, dir, name, ext);
_wsplitpath(L"a.b:x", drv, dir, name, ext);
_wsplitpath(L"W:\\/\\abc/Z:~", drv, dir, name, ext);
_wsplitpath(L"abc.EFGH:12345", drv, dir, name, ext);
_wsplitpath(L"C:/dos/command.com", drv, dir, name, ext);
}
*/

File diff suppressed because it is too large Load diff

View file

@ -43,7 +43,7 @@
#include <locale.h>
#include <time.h>
#include <shellapi.h> /* for ShellExecute() */
#include <shellapi.h> /* for ShellExecuteW() */
#include <shlobj.h> /* for SHFormatDrive() */
#ifndef _NO_EXTENSIONS
@ -128,11 +128,11 @@ typedef struct
HWND hdrivebar;
HFONT hfont;
TCHAR num_sep;
WCHAR num_sep;
SIZE spaceSize;
HIMAGELIST himl;
TCHAR drives[BUFFER_LEN];
WCHAR drives[BUFFER_LEN];
BOOL prescan_node; /*TODO*/
BOOL saveSettings;
@ -145,18 +145,4 @@ typedef struct
extern WINEFILE_GLOBALS Globals;
#ifdef __WINE__
#ifdef UNICODE
extern void _wsplitpath(const WCHAR* path, WCHAR* drv, WCHAR* dir, WCHAR* name, WCHAR* ext);
#define _tsplitpath _wsplitpath
#else
extern void _splitpath(const CHAR* path, CHAR* drv, CHAR* dir, CHAR* name, CHAR* ext);
#define _tsplitpath _splitpath
#endif
#else
#include <tchar.h> /* for _tsplitpath() */
#endif