Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
mirrors
rufus
Rufus
提交
40d2f02f
R
Rufus
项目概览
mirrors
/
rufus
/
Rufus
通知
0
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
Rufus
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
40d2f02f
编写于
7月 02, 2013
作者:
P
Pete Batard
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' into localization
上级
d8d12731
9925cc94
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
21 addition
and
10 deletion
+21
-10
src/msapi_utf8.h
src/msapi_utf8.h
+9
-0
src/net.c
src/net.c
+1
-1
src/rufus.c
src/rufus.c
+6
-4
src/rufus.rc
src/rufus.rc
+5
-5
未找到文件。
src/msapi_utf8.h
浏览文件 @
40d2f02f
...
...
@@ -616,6 +616,15 @@ out:
return
ret
;
}
static
__inline
int
_chdirU
(
const
char
*
dirname
)
{
int
ret
;
wconvert
(
dirname
);
ret
=
_wchdir
(
wdirname
);
wfree
(
dirname
);
return
ret
;
}
static
__inline
FILE
*
fopenU
(
const
char
*
filename
,
const
char
*
mode
)
{
FILE
*
ret
=
NULL
;
...
...
src/net.c
浏览文件 @
40d2f02f
...
...
@@ -324,7 +324,7 @@ BOOL DownloadFile(const char* url, const char* file, HWND hProgressDialog)
}
uprintf
(
"File length: %d bytes
\n
"
,
dwTotalSize
);
fd
=
fopen
(
file
,
"wb"
);
fd
=
fopen
U
(
file
,
"wb"
);
if
(
fd
==
NULL
)
{
uprintf
(
"Unable to create file '%s': %s
\n
"
,
file
,
WinInetErrorString
());
goto
out
;
...
...
src/rufus.c
浏览文件 @
40d2f02f
...
...
@@ -1047,6 +1047,7 @@ DWORD WINAPI ISOScanThread(LPVOID param)
safe_free
(
iso_path
);
SetMBRProps
();
}
else
if
(
!
iso_report
.
has_syslinux_v5
)
{
// This check is for Syslinux v4.x or earlier
_chdirU
(
app_dir
);
for
(
i
=
0
;
i
<
NB_OLD_C32
;
i
++
)
{
if
(
iso_report
.
has_old_c32
[
i
])
{
fd
=
fopen
(
old_c32_name
[
i
],
"rb"
);
...
...
@@ -1058,9 +1059,9 @@ DWORD WINAPI ISOScanThread(LPVOID param)
}
else
{
PrintStatus
(
0
,
FALSE
,
"Obsolete %s detected"
,
old_c32_name
[
i
]);
safe_sprintf
(
msgbox
,
sizeof
(
msgbox
),
"This ISO image seems to use an obsolete version of '%s'.
\n
"
"B
ecause of this, boot menus may not display properly
.
\n\n
"
APPLICATION_NAME
" can fix this issue by downloading a newer version for you
:
\n
"
"- Choose 'Yes' to connect to the internet and
replace
the file
\n
"
"B
oot menus may not may not display properly because of this
.
\n\n
"
"A newer version can be downloaded by "
APPLICATION_NAME
" to fix this issue
:
\n
"
"- Choose 'Yes' to connect to the internet and
download
the file
\n
"
"- Choose 'No' to leave the existing ISO file unmodified
\n
"
"If you don't know what to do, you should select 'Yes'.
\n\n
"
"Note: The new file will be downloaded in the current directory and once a "
...
...
@@ -1232,6 +1233,7 @@ static BOOL BootCheck(void)
return
FALSE
;
}
}
else
if
(
dt
==
DT_SYSLINUX_V5
)
{
_chdirU
(
app_dir
);
fd
=
fopen
(
ldlinux_c32
,
"rb"
);
if
(
fd
!=
NULL
)
{
uprintf
(
"Will reuse '%s' for Syslinux v5
\n
"
,
ldlinux_c32
);
...
...
@@ -1243,7 +1245,7 @@ static BOOL BootCheck(void)
"it is not embedded in "
APPLICATION_NAME
".
\n\n
"
APPLICATION_NAME
" can download the missing file for you:
\n
"
"- Select 'Yes' to connect to the internet and download the file
\n
"
"- Select 'No' if you w
ill
manually copy this file on the drive later
\n\n
"
"- Select 'No' if you w
ant to
manually copy this file on the drive later
\n\n
"
"Note: The file will be downloaded in the current directory and once a "
"'%s' exists there, it will be reused automatically.
\n
"
,
ldlinux_c32
,
ldlinux_c32
);
safe_sprintf
(
msgbox_title
,
sizeof
(
msgbox_title
),
"Download %s?"
,
ldlinux_c32
);
...
...
src/rufus.rc
浏览文件 @
40d2f02f
...
...
@@ -30,7 +30,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDD_DIALOG DIALOGEX 12, 12, 206, 329
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_APPWINDOW
CAPTION "Rufus v1.3.4.26
2
"
CAPTION "Rufus v1.3.4.26
3
"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
DEFPUSHBUTTON "Start",IDC_START,94,291,50,14
...
...
@@ -277,8 +277,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,3,4,26
2
PRODUCTVERSION 1,3,4,26
2
FILEVERSION 1,3,4,26
3
PRODUCTVERSION 1,3,4,26
3
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
...
...
@@ -295,13 +295,13 @@ BEGIN
BEGIN
VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)"
VALUE "FileDescription", "Rufus"
VALUE "FileVersion", "1.3.4.26
2
"
VALUE "FileVersion", "1.3.4.26
3
"
VALUE "InternalName", "Rufus"
VALUE "LegalCopyright", " 2011-2013 Pete Batard (GPL v3)"
VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
VALUE "OriginalFilename", "rufus.exe"
VALUE "ProductName", "Rufus"
VALUE "ProductVersion", "1.3.4.26
2
"
VALUE "ProductVersion", "1.3.4.26
3
"
END
END
BLOCK "VarFileInfo"
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录