Skip to content

Commit 2e7d29f

Browse files
katahiromzkatahiromz
committed
Fix #241 
1 parent 85251d6 commit 2e7d29f

21 files changed

+72
-25
lines changed

‎HISTORY-ID.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -309,3 +309,4 @@
309309
- Added ES_AUTOHSCROLL style to some text boxes.
310310
- Fixed loading failure of Win2k3 ieframe.dll BITMAP 214.
311311
- Centering "Edit Dialog" window.
312+
- Supported exporting RES file.

‎HISTORY-ITA.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -309,3 +309,4 @@
309309
- Aggiunto lo stile ES_AUTOHSCROLL ad alcune caselle di testo.
310310
- Fixed loading failure of Win2k3 ieframe.dll BITMAP 214.
311311
- Centering "Edit Dialog" window.
312+
- Supported exporting RES file.

‎HISTORY-JPN.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -653,3 +653,4 @@
653653
- Added ES_AUTOHSCROLL style to some text boxes.
654654
- Fixed loading failure of Win2k3 ieframe.dll BITMAP 214.
655655
- Centering "Edit Dialog" window.
656+
- Supported exporting RES file.

‎HISTORY-KOR.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -310,3 +310,4 @@
310310
- Added ES_AUTOHSCROLL style to some text boxes.
311311
- Fixed loading failure of Win2k3 ieframe.dll BITMAP 214.
312312
- Centering "Edit Dialog" window.
313+
- Supported exporting RES file.

‎HISTORY-PTB.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -309,3 +309,4 @@
309309
- Added ES_AUTOHSCROLL style to some text boxes.
310310
- Fixed loading failure of Win2k3 ieframe.dll BITMAP 214.
311311
- Centering "Edit Dialog" window.
312+
- Supported exporting RES file.

‎HISTORY.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -309,3 +309,4 @@
309309
- Added ES_AUTOHSCROLL style to some text boxes.
310310
- Fixed loading failure of Win2k3 ieframe.dll BITMAP 214.
311311
- Centering "Edit Dialog" window.
312+
- Supported exporting RES file.

‎src/RisohEditor.cpp‎

Lines changed: 45 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2370,8 +2370,9 @@ class MMainWnd : public MWindowBase
23702370
BOOL DoLoadFile(HWND hwnd, LPCWSTR pszFileName, DWORD nFilterIndex = 0, BOOL bForceDecompress = FALSE);
23712371
BOOL DoLoadRC(HWND hwnd, LPCWSTR szRCFile, EntrySet& res);
23722372
BOOL DoExtract(const EntryBase *entry, BOOL bExporting);
2373-
BOOL DoExport(LPCWSTR pszRCFile, LPWSTR pszResHFile = NULL);
2374-
BOOL DoExport(LPCWSTR pszRCFile, LPWSTR pszResHFile, const EntrySet& found);
2373+
BOOL DoExportRC(LPCWSTR pszRCFile, LPWSTR pszResHFile = NULL);
2374+
BOOL DoExportRC(LPCWSTR pszRCFile, LPWSTR pszResHFile, const EntrySet& found);
2375+
BOOL DoExportRes(LPCWSTR pszResFile);
23752376
void DoIDStat(UINT anValues[5]);
23762377
BOOL DoBackupFile(LPCWSTR pszFileName, UINT nCount = 0);
23772378
BOOL DoBackupFolder(LPCWSTR pszFileName, UINT nCount = 0);
@@ -3207,7 +3208,7 @@ void MMainWnd::OnExtractRC(HWND hwnd)
32073208
if (dialog.DialogBoxDx(hwnd) != IDOK)
32083209
return;
32093210

3210-
if (!DoExport(szFile, NULL, found))
3211+
if (!DoExportRC(szFile, NULL, found))
32113212
{
32123213
ErrorBoxDx(IDS_CANTEXPORT);
32133214
}
@@ -3466,7 +3467,7 @@ void MMainWnd::OnExport(HWND hwnd)
34663467
// initialize OPENFILENAME structure
34673468
WCHAR file[MAX_PATH] = TEXT("");
34683469
OPENFILENAMEW ofn = { OPENFILENAME_SIZE_VERSION_400W, hwnd };
3469-
ofn.lpstrFilter = MakeFilterDx(LoadStringDx(IDS_RCFILTER));
3470+
ofn.lpstrFilter = MakeFilterDx(LoadStringDx(IDS_EXPORTFILTER));
34703471
ofn.lpstrFile = file;
34713472
ofn.nMaxFile = _countof(file);
34723473
ofn.lpstrTitle = LoadStringDx(IDS_EXPORT);
@@ -3477,15 +3478,25 @@ void MMainWnd::OnExport(HWND hwnd)
34773478
// let the user choose the path
34783479
if (GetSaveFileNameW(&ofn))
34793480
{
3480-
// show the "export options" dialog
3481-
MExportOptionsDlg dialog;
3482-
if (dialog.DialogBoxDx(hwnd) != IDOK)
3483-
return;
3484-
34853481
// do export!
3486-
if (!DoExport(file))
3482+
if (ofn.nFilterIndex == 2) // .res
34873483
{
3488-
ErrorBoxDx(IDS_CANTEXPORT);
3484+
if (!DoExportRes(file))
3485+
{
3486+
ErrorBoxDx(IDS_CANTEXPORT);
3487+
}
3488+
}
3489+
else // .rc
3490+
{
3491+
// show the "export options" dialog
3492+
MExportOptionsDlg dialog;
3493+
if (dialog.DialogBoxDx(hwnd) != IDOK)
3494+
return;
3495+
3496+
if (!DoExportRC(file))
3497+
{
3498+
ErrorBoxDx(IDS_CANTEXPORT);
3499+
}
34893500
}
34903501
}
34913502
}
@@ -3822,7 +3833,7 @@ BOOL MMainWnd::OnSaveAs(HWND hwnd)
38223833

38233834
// export
38243835
WCHAR szResH[MAX_PATH] = L"";
3825-
if (DoExport(szFile, szResH)) // succeeded
3836+
if (DoExportRC(szFile, szResH)) // succeeded
38263837
{
38273838
// save the resource.h path
38283839
StringCchCopyW(m_szResourceH, _countof(m_szResourceH), szResH);
@@ -3981,7 +3992,7 @@ BOOL MMainWnd::OnSave(HWND hwnd)
39813992

39823993
// export
39833994
WCHAR szResH[MAX_PATH] = L"";
3984-
if (DoExport(m_szFile, szResH)) // succeeded
3995+
if (DoExportRC(m_szFile, szResH)) // succeeded
39853996
{
39863997
// save the resource.h path
39873998
StringCchCopyW(m_szResourceH, _countof(m_szResourceH), szResH);
@@ -9273,17 +9284,33 @@ inline BOOL MMainWnd::DoExtract(const EntryBase *entry, BOOL bExporting)
92739284
}
92749285

92759286
// do export the resource data to an RC file and related files
9276-
BOOL MMainWnd::DoExport(LPCWSTR pszRCFile, LPWSTR pszResHFile)
9287+
BOOL MMainWnd::DoExportRC(LPCWSTR pszRCFile, LPWSTR pszResHFile)
92779288
{
92789289
// search the language entries
92799290
EntrySet found;
92809291
g_res.search(found, ET_LANG);
92819292

9282-
return DoExport(pszRCFile, pszResHFile, found);
9293+
return DoExportRC(pszRCFile, pszResHFile, found);
9294+
}
9295+
9296+
BOOL MMainWnd::DoExportRes(LPCWSTR pszResFile)
9297+
{
9298+
// search the language entries
9299+
EntrySet found;
9300+
g_res.search(found, ET_LANG);
9301+
9302+
if (found.empty())
9303+
{
9304+
// unable to export the empty data
9305+
ErrorBoxDx(IDS_DATAISEMPTY);
9306+
return FALSE;
9307+
}
9308+
9309+
return g_res.extract_res(pszResFile, g_res);
92839310
}
92849311

92859312
// do export the resource data to an RC file and related files
9286-
BOOL MMainWnd::DoExport(LPCWSTR pszRCFile, LPWSTR pszResHFile, const EntrySet& found)
9313+
BOOL MMainWnd::DoExportRC(LPCWSTR pszRCFile, LPWSTR pszResHFile, const EntrySet& found)
92879314
{
92889315
if (found.empty())
92899316
{
@@ -9415,15 +9442,15 @@ BOOL MMainWnd::DoSaveFile(HWND hwnd, LPCWSTR pszFile)
94159442
if (lstrcmpiW(pchDotExt, L".exe") == 0)
94169443
return DoSaveExeAs(pszFile);
94179444
if (lstrcmpiW(pchDotExt, L".rc") == 0)
9418-
return DoExport(pszFile, NULL);
9445+
return DoExportRC(pszFile, NULL);
94199446
if (lstrcmpiW(pchDotExt, L".res") == 0)
94209447
return DoSaveResAs(pszFile);
94219448
if (*pchDotExt == 0)
94229449
{
94239450
WCHAR szPath[MAX_PATH];
94249451
StringCbCopyW(szPath, sizeof(szPath), pszFile);
94259452
PathAddExtensionW(szPath, L".rc");
9426-
return DoExport(szPath, NULL);
9453+
return DoExportRC(szPath, NULL);
94279454
}
94289455
return FALSE;
94299456
}

‎src/lang/de_DE.rc‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1632,10 +1632,11 @@ STRINGTABLE
16321632
IDS_CODEPAGE65001, "65001 (UTF-8)"
16331633
IDS_EXTRACTTLB, "Extract TYPELIB data"
16341634
IDS_CANTEXTRACTTLB, "Unable to extract the TYPELIB data."
1635-
IDS_TLBRESBINFILTER, "TYPELIB data (*.tlb)|*.tlb|Binary Resources (*.res)|*.res|Text Files (*.txt)|*.txt|MIDL Files (*.idl)|*.idl|All Files (*.*)|*.*|"
1635+
IDS_TLBRESBINFILTER, "TYPELIB data (*.tlb)|*.tlb|Binäre Ressourcen (*.res)|*.res|Textdateien (*.txt)|*.txt|MIDL Files (*.idl)|*.idl|Alle Dateien (*.*)|*.*|"
16361636
IDS_USAGE, "Usage: RisohEditor [options | ""file""]\n\nOptions:\n--help Show this message.\n--version Show version info.\n--load ""your-file.rc"" Load the file (without GUI)\n--save ""your-file.res"" Save the file (without GUI)\n--log-file ""log-file.txt"" Specify the log file.\n--load-options OPTIONS Set load options.\n--save-options OPTIONS Set save options.\n\nLoad options: (no-load-res-h)\nSave options: (idc-static)(compress)(sep-lang)(no-res-folder)(lang-macro)(less-comments)(wrap-manifest)(begin-end)(utf-16)(backup)(ms-msgtbl)"
16371637
IDS_NOSELECTION, "Es gibt keine Auswahl."
16381638
IDS_TRANSLATORS, "[Translators]\r\nEnglish: Katayama Hirofumi MZ\r\nFinnish: Veikko Muurikainen\r\nIndonesian: Mas Ahmad Muhammad\r\nItalian: R.B.\r\nJapanese: Katayama Hirofumi MZ\r\nKorean: VenusGirl (비너스걸)\r\nPolish: Piotr Hetnarowicz\r\nPortuguese: JNylson\r\nRussian: Dmitry Yerokhin\r\nSimplified Chinese: 林鸿湘\r\n"
1639+
IDS_EXPORTFILTER, "RC-Dateien (*.rc)|*.rc|Binäre Ressourcen (*.res)|*.res|"
16391640
}
16401641

16411642
//////////////////////////////////////////////////////////////////////////////

‎src/lang/en_US.rc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1637,6 +1637,7 @@ STRINGTABLE
16371637
IDS_USAGE, "Usage: RisohEditor [options | ""file""]\n\nOptions:\n--help Show this message.\n--version Show version info.\n--load ""your-file.rc"" Load the file (without GUI)\n--save ""your-file.res"" Save the file (without GUI)\n--log-file ""log-file.txt"" Specify the log file.\n--load-options OPTIONS Set load options.\n--save-options OPTIONS Set save options.\n\nLoad options: (no-load-res-h)\nSave options: (idc-static)(compress)(sep-lang)(no-res-folder)(lang-macro)(less-comments)(wrap-manifest)(begin-end)(utf-16)(backup)(ms-msgtbl)"
16381638
IDS_NOSELECTION, "There is no selection."
16391639
IDS_TRANSLATORS, "[Translators]\r\nEnglish: Katayama Hirofumi MZ\r\nFinnish: Veikko Muurikainen\r\nIndonesian: Mas Ahmad Muhammad\r\nItalian: R.B.\r\nJapanese: Katayama Hirofumi MZ\r\nKorean: VenusGirl (비너스걸)\r\nPolish: Piotr Hetnarowicz\r\nPortuguese: JNylson\r\nRussian: Dmitry Yerokhin\r\nSimplified Chinese: 林鸿湘\r\n"
1640+
IDS_EXPORTFILTER, "RC Files (*.rc)|*.rc|Binary Resources (*.res)|*.res|"
16401641
}
16411642

16421643
//////////////////////////////////////////////////////////////////////////////

‎src/lang/fi_FI.rc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1636,6 +1636,7 @@ STRINGTABLE
16361636
IDS_USAGE, "Usage: RisohEditor [options | ""file""]\n\nOptions:\n--help Show this message.\n--version Show version info.\n--load ""your-file.rc"" Load the file (without GUI)\n--save ""your-file.res"" Save the file (without GUI)\n--log-file ""log-file.txt"" Specify the log file.\n--load-options OPTIONS Set load options.\n--save-options OPTIONS Set save options.\n\nLoad options: (no-load-res-h)\nSave options: (idc-static)(compress)(sep-lang)(no-res-folder)(lang-macro)(less-comments)(wrap-manifest)(begin-end)(utf-16)(backup)(ms-msgtbl)"
16371637
IDS_NOSELECTION, "Ei ole valintaa."
16381638
IDS_TRANSLATORS, "[Translators]\r\nEnglish: Katayama Hirofumi MZ\r\nFinnish: Veikko Muurikainen\r\nIndonesian: Mas Ahmad Muhammad\r\nItalian: R.B.\r\nJapanese: Katayama Hirofumi MZ\r\nKorean: VenusGirl (비너스걸)\r\nPolish: Piotr Hetnarowicz\r\nPortuguese: JNylson\r\nRussian: Dmitry Yerokhin\r\nSimplified Chinese: 林鸿湘\r\n"
1639+
IDS_EXPORTFILTER, "RC Files (*.rc)|*.rc|Binary Resources (*.res)|*.res|"
16391640
}
16401641

16411642
//////////////////////////////////////////////////////////////////////////////

0 commit comments

Comments
 (0)