Changeset 212


Ignore:
Timestamp:
05/26/07 19:03:13 (13 years ago)
Author:
Eoin
Message:

Translation DLL Identification improved.

Files:
13 edited

Legend:

Unmodified
Added
Removed
  • Halite.pnproj

    r211 r212  
    1 <Project name="Halite"><MagicFolder excludeFolders="CVS;.svn" filter="*.*" name="res" path="res\"><File path="1337.rc"></File><File path="afxres.h"></File><File path="CVTRES.EXE"></File><File path="German.rc"></File><File path="GoLink.exe"></File><File path="GoRC.exe"></File><File path="Halite.dll"></File><File path="Halite.ico"></File><File path="Halite.rc"></File><File path="Halite.RES"></File><File path="LINK.EXE"></File><File path="Manifest.xml"></File><File path="MSPDB50.DLL"></File><File path="RC.EXE"></File><File path="RCDLL.DLL"></File><File path="RcTextExt.rb"></File><File path="resource.h"></File><File path="Template.rc"></File><File path="toolbar.bmp"></File><File path="Turkish.rc"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*.*" name="src" path="src\"><MagicFolder excludeFolders="CVS;.svn" filter="*.*" name="advtabs" path="advtabs\"><File path="Debug.cpp"></File><File path="Debug.hpp"></File><File path="Peers.cpp"></File><File path="Peers.hpp"></File><File path="ThemeTestDialog.hpp"></File><File path="Torrent.cpp"></File><File path="Torrent.hpp"></File><File path="Tracker.cpp"></File><File path="Tracker.hpp"></File><File path="TrackerAddDialog.hpp"></File><File path="TrackerListView.cpp"></File><File path="TrackerListView.hpp"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*.*" name="global" path="global\"><File path="ini.cpp"></File><File path="ini.hpp"></File><File path="ini_adapter.cpp"></File><File path="ini_adapter.hpp"></File><File path="logger.cpp"></File><File path="logger.hpp"></File><File path="string_conv.cpp"></File><File path="string_conv.hpp"></File><File path="tinyxml.cpp"></File><File path="tinyxml.hpp"></File><File path="tinyxmlerror.cpp"></File><File path="tinyxmlparser.cpp"></File><File path="unicode.hpp"></File><File path="utf8.hpp"></File><File path="wtl_app.cpp"></File><File path="wtl_app.hpp"></File></MagicFolder><File path="AdvHaliteDialog.cpp"></File><File path="AdvHaliteDialog.hpp"></File><File path="ConfigOptions.cpp"></File><File path="ConfigOptions.hpp"></File><File path="CSSFileDialog.hpp"></File><File path="DdxEx.hpp"></File><File path="DebugDialog.hpp"></File><File path="DropFileTarget.h"></File><File path="halConfig.cpp"></File><File path="halConfig.hpp"></File><File path="halEvent.cpp"></File><File path="halEvent.hpp"></File><File path="Halite.cpp"></File><File path="Halite.hpp"></File><File path="HaliteDialog.cpp"></File><File path="HaliteDialog.hpp"></File><File path="HaliteDialogBase.hpp"></File><File path="HaliteEditCtrl.hpp"></File><File path="HaliteIni.hpp"></File><File path="HaliteListManager.hpp"></File><File path="HaliteListView.cpp"></File><File path="HaliteListView.hpp"></File><File path="HaliteListViewCtrl.hpp"></File><File path="HaliteTabCtrl.hpp"></File><File path="HaliteTabPage.hpp"></File><File path="HaliteWindow.cpp"></File><File path="HaliteWindow.hpp"></File><File path="halTorrent.cpp"></File><File path="halTorrent.hpp"></File><File path="halXmlRpc.cpp"></File><File path="halXmlRpc.hpp"></File><File path="NTray.cpp"></File><File path="NTray.hpp"></File><File path="ProgressDialog.hpp"></File><File path="SimpleHtml.h"></File><File path="SplashDialog.hpp"></File><File path="SSFileDialog.hpp"></File><File path="stdAfx.cpp"></File><File path="stdAfx.hpp"></File><File path="TranslationDll.cpp"></File><File path="UxthemeWrapper.cpp"></File><File path="UxthemeWrapper.hpp"></File><File path="WinAPIMutex.hpp"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="Lang" path="lang\"><File path="1337.txt"></File><File path="Dutch.txt"></File><File path="French.txt"></File><File path="German.txt"></File><File path="NewLang.txt"></File><File path="Polish.txt"></File><File path="Template.txt"></File><File path="Turkish.txt"></File></MagicFolder><File path="Jamfile"></File></Project> 
     1<Project name="Halite"><MagicFolder excludeFolders="CVS;.svn" filter="*.*" name="res" path="res\"><File path="afxres.h"></File><File path="Halite.ico"></File><File path="Halite.rc"></File><File path="Manifest.xml"></File><File path="RcTextExt.rb"></File><File path="resource.h"></File><File path="toolbar.bmp"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*.*" name="src" path="src\"><MagicFolder excludeFolders="CVS;.svn" filter="*.*" name="advtabs" path="advtabs\"><File path="Debug.cpp"></File><File path="Debug.hpp"></File><File path="Peers.cpp"></File><File path="Peers.hpp"></File><File path="ThemeTestDialog.hpp"></File><File path="Torrent.cpp"></File><File path="Torrent.hpp"></File><File path="Tracker.cpp"></File><File path="Tracker.hpp"></File><File path="TrackerAddDialog.hpp"></File><File path="TrackerListView.cpp"></File><File path="TrackerListView.hpp"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*.*" name="global" path="global\"><File path="ini.cpp"></File><File path="ini.hpp"></File><File path="ini_adapter.cpp"></File><File path="ini_adapter.hpp"></File><File path="logger.cpp"></File><File path="logger.hpp"></File><File path="string_conv.cpp"></File><File path="string_conv.hpp"></File><File path="tinyxml.cpp"></File><File path="tinyxml.hpp"></File><File path="tinyxmlerror.cpp"></File><File path="tinyxmlparser.cpp"></File><File path="unicode.hpp"></File><File path="utf8.hpp"></File><File path="wtl_app.cpp"></File><File path="wtl_app.hpp"></File></MagicFolder><File path="AdvHaliteDialog.cpp"></File><File path="AdvHaliteDialog.hpp"></File><File path="ConfigOptions.cpp"></File><File path="ConfigOptions.hpp"></File><File path="CSSFileDialog.hpp"></File><File path="DdxEx.hpp"></File><File path="DebugDialog.hpp"></File><File path="DropFileTarget.h"></File><File path="halConfig.cpp"></File><File path="halConfig.hpp"></File><File path="halEvent.cpp"></File><File path="halEvent.hpp"></File><File path="Halite.cpp"></File><File path="Halite.hpp"></File><File path="HaliteDialog.cpp"></File><File path="HaliteDialog.hpp"></File><File path="HaliteDialogBase.hpp"></File><File path="HaliteEditCtrl.hpp"></File><File path="HaliteIni.hpp"></File><File path="HaliteListManager.hpp"></File><File path="HaliteListView.cpp"></File><File path="HaliteListView.hpp"></File><File path="HaliteListViewCtrl.hpp"></File><File path="HaliteTabCtrl.hpp"></File><File path="HaliteTabPage.hpp"></File><File path="HaliteWindow.cpp"></File><File path="HaliteWindow.hpp"></File><File path="halTorrent.cpp"></File><File path="halTorrent.hpp"></File><File path="halXmlRpc.cpp"></File><File path="halXmlRpc.hpp"></File><File path="NTray.cpp"></File><File path="NTray.hpp"></File><File path="ProgressDialog.hpp"></File><File path="SimpleHtml.h"></File><File path="SplashDialog.hpp"></File><File path="SSFileDialog.hpp"></File><File path="stdAfx.cpp"></File><File path="stdAfx.hpp"></File><File path="TranslationDll.cpp"></File><File path="UxthemeWrapper.cpp"></File><File path="UxthemeWrapper.hpp"></File><File path="WinAPIMutex.hpp"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="Lang" path="lang\"><File path="1337.txt"></File><File path="convert.bat"></File><File path="cvtres.exe"></File><File path="Dutch.dll"></File><File path="Dutch.txt"></File><File path="French.dll"></File><File path="French.txt"></File><File path="from_utf16.bat"></File><File path="German.dll"></File><File path="German.txt"></File><File path="link.exe"></File><File path="mspdb80.dll"></File><File path="NewLang.txt"></File><File path="Polish.dll"></File><File path="Polish.txt"></File><File path="rc.exe"></File><File path="rcdll.dll"></File><File path="rubyscript2exe.rb"></File><File path="Russian.dll"></File><File path="Russian.txt"></File><File path="Slovenian.dll"></File><File path="Slovenian.txt"></File><File path="Template.txt"></File><File path="textextractor.exe"></File><File path="textextractor.rb"></File><File path="to_utf16.bat"></File><File path="Turkish.dll"></File><File path="Turkish.txt"></File><File path="uniconv.exe"></File></MagicFolder><File path="Jamfile"></File></Project> 
  • res/Halite.rc

    r211 r212  
    33// http://www.resedit.net 
    44 
    5 #include "../res/resource.h" 
     5#include "resource.h" 
    66#include "afxres.h" 
    77 
     8IDR_APP_ICON        ICON          "Halite.ico" 
     9IDR_MAINFRAME       BITMAP        "toolbar.bmp" 
    810 
    911STRINGTABLE  
     
    4345END 
    4446 
    45 IDD_CONFIGBIT DIALOGEX 0,0,283,152 
    46 STYLE DS_MODALFRAME | DS_SETFONT | DS_FIXEDSYS | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SYSMENU 
     47IDD_CONFIGBIT DIALOGEX 0, 0, 283, 152 
     48STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU 
    4749CAPTION "BitTorrent" 
    48 FONT 8,"MS Shell Dlg",400,0,1 
     50FONT 8, "MS Shell Dlg", 400, 0, 0x1 
    4951BEGIN 
    5052    GROUPBOX        "Global Options",IDC_STATIC,6,6,271,77 
    51     RTEXT           "Open a (single) port between : ",IDC_STATIC,22,66,115,12 
    52     EDITTEXT        IDC_BC_PORTFROM,138,64,54,12,ES_AUTOHSCROLL 
     53    RTEXT           "Open a (single) port between : ",IDC_STATIC,12,66,114,12 
     54    EDITTEXT        IDC_BC_PORTFROM,126,64,54,12,ES_AUTOHSCROLL 
    5355    EDITTEXT        IDC_BC_PORTTO,217,64,54,12,ES_AUTOHSCROLL 
    54     AUTOCHECKBOX    "Enable DHT. (Note neither DHT nor PEX will apply to private torrents)",IDC_BC_DHT,12,98,252,12 
    55     AUTOCHECKBOX    "Enable IP filtering.",IDC_BC_FILTERCHECK,12,128,76,12 
     56    CONTROL         "Enable DHT. (Note neither DHT nor PEX will apply to private torrents)",IDC_BC_DHT, 
     57                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,98,258,12 
     58    CONTROL         "Enable IP filtering.",IDC_BC_FILTERCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,128,102,12 
    5659    PUSHBUTTON      "Import ipfilter.dat",IDC_BC_FILTERLOAD,196,127,75,14,WS_DISABLED 
    5760    PUSHBUTTON      "Clear IP database",IDC_BC_FILTERCLEAR,115,127,75,14,WS_DISABLED 
    5861    EDITTEXT        IDC_BC_PROXYIP,124,17,77,12,ES_AUTOHSCROLL 
    5962    RTEXT           "Proxy Host/IP : ",IDC_BC_PROXYIP_S,68,19,55,12 
    60     AUTOCHECKBOX    "Use a proxy.",IDC_BC_PROXYCHECK,12,19,59,8 
     63    CONTROL         "Use a proxy.",IDC_BC_PROXYCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,19,59,8 
    6164    RTEXT           "Port : ",IDC_BC_PROXYPORT_S,204,19,24,12 
    6265    EDITTEXT        IDC_BC_PROXYPORT,229,17,42,12,ES_AUTOHSCROLL | ES_NUMBER 
     
    6467    RTEXT           "Username : ",IDC_BC_PROXYUSER_S,8,35,44,12 
    6568    RTEXT           "Password : ",IDC_BC_PROXYPASS_S,146,35,39,12 
    66     EDITTEXT        IDC_BC_PROXYPASS,188,33,83,12,ES_AUTOHSCROLL | ES_PASSWORD 
    67     AUTOCHECKBOX    "to",IDC_BC_PORTCHECK,195,64,20,12 
    68     LTEXT           "Select a (TCP) port (or range of ports) to listen for incomming connections.",IDC_STATIC,13,52,252,11 
     69    EDITTEXT        IDC_BC_PROXYPASS,188,33,83,12,ES_PASSWORD | ES_AUTOHSCROLL 
     70    CONTROL         "to",IDC_BC_PORTCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,182,64,32,12 
     71    LTEXT           "Select a (TCP) port (or range of ports) to listen for incomming connections.",IDC_STATIC,12,52,258,11 
    6972    GROUPBOX        "Global Options",IDC_STATIC,6,86,271,59 
    70     EDITTEXT        IDC_BC_DHTPORT,67,112,77,12,ES_AUTOHSCROLL 
    71     RTEXT           "Port (UDP) : ",IDC_BC_DHTPORT_S,30,114,35,12 
    72 END 
    73  
    74 IDD_CONFIGREMOTE DIALOGEX 0,0,283,94 
    75 STYLE DS_MODALFRAME | DS_SETFONT | DS_FIXEDSYS | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SYSMENU 
     73    EDITTEXT        IDC_BC_DHTPORT,78,112,77,12,ES_AUTOHSCROLL 
     74    RTEXT           "Port (UDP) : ",IDC_BC_DHTPORT_S,12,114,66,12 
     75END 
     76 
     77IDD_CONFIGREMOTE DIALOGEX 0, 0, 283, 94 
     78STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU 
    7679CAPTION "Remote Control" 
    77 FONT 8,"MS Shell Dlg",400,0,1 
     80FONT 8, "MS Shell Dlg", 400, 0, 0x1 
    7881BEGIN 
    7982    GROUPBOX        "Remote Control Options",IDC_STATIC,6,6,271,30 
    80     AUTOCHECKBOX    "Enable Remote Control",IDC_REMOTECTRL,12,18,96,12,WS_DISABLED 
     83    CONTROL         "Enable Remote Control",IDC_REMOTECTRL,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,12,18,96,12 
    8184    RTEXT           "Port to listen on : ",IDC_STATIC,159,19,66,11,WS_DISABLED 
    82     EDITTEXT        IDC_REMOTEPORT,229,18,42,12,WS_DISABLED | ES_AUTOHSCROLL 
    83     LTEXT           "*** Disabled ***",IDC_STATIC,104,19,59,11 
     85    EDITTEXT        IDC_REMOTEPORT,229,18,42,12,ES_AUTOHSCROLL | WS_DISABLED 
     86    CTEXT           "*** Disabled ***",IDC_STATIC,32,44,217,11 
    8487END 
    8588 
     
    178181END 
    179182 
    180 IDD_HALITEDLG DIALOGEX 0,0,362,73 
     183IDD_HALITEDLG DIALOGEX 0,0,370,73 
    181184STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILDWINDOW | WS_CLIPCHILDREN 
    182185FONT 8,"MS Shell Dlg",400,0,1 
    183186BEGIN 
    184     PUSHBUTTON      "Pause",BTNPAUSE,306,3,51,14,BS_DEFPUSHBUTTON 
    185     PUSHBUTTON      "Reannounce",BTNREANNOUNCE,306,19,51,14 
    186     PUSHBUTTON      "Remove",BTNREMOVE,306,35,51,14 
    187     CONTROL         "",LISTPEERS,"SysListView32",WS_TABSTOP | WS_BORDER | LVS_ALIGNLEFT | LVS_REPORT,4,64,353,6 
    188     EDITTEXT        IDC_EDITTLU,267,36,34,12,ES_AUTOHSCROLL 
    189     EDITTEXT        IDC_EDITTLD,216,36,34,12,ES_AUTOHSCROLL 
    190     EDITTEXT        IDC_EDITNCD,216,12,34,12,ES_AUTOHSCROLL 
    191     EDITTEXT        IDC_EDITNCU,267,12,34,12,ES_AUTOHSCROLL 
    192     CONTROL         "",TORRENTPROG,"msctls_progress32",WS_BORDER,4,52,353,8 
    193     RTEXT           "Name:",IDC_STATIC,8,3,30,8 
    194     LTEXT           "N/A",IDC_AVAIL,40,39,36,8,SS_WORDELLIPSIS 
    195     RTEXT           "Status:",IDC_STATIC,8,27,30,8 
    196     RTEXT           "Time left:",IDC_STATIC,2,39,36,8 
    197     RTEXT           "Tracker:",IDC_STATIC,8,15,30,8 
    198     LTEXT           "N/A",IDC_STATUS,40,27,145,8,SS_WORDELLIPSIS 
    199     LTEXT           "N/A",IDC_TRACKER,40,15,144,8,SS_WORDELLIPSIS 
    200     LTEXT           "N/A",IDC_NAME,40,3,144,10,SS_WORDELLIPSIS 
    201     LTEXT           "Torrent connection limits:",IDC_NC,192,3,82,8 
    202     LTEXT           "Torrent transfer rates (KB/s):",IDC_TL,192,27,97,8 
    203     RTEXT           "Total",IDC_NCD,192,15,18,8 
    204     RTEXT           "Up",IDC_NCU,251,15,12,8 
    205     RTEXT           "Up",IDC_TLU,252,39,11,8 
    206     RTEXT           "Down",IDC_TLD,192,39,20,8 
    207     RTEXT           "Completed:",IDC_STATIC,84,39,39,8 
    208     LTEXT           "N/A",IDC_COMPLETE,125,39,59,8,SS_WORDELLIPSIS 
    209     GROUPBOX        "",IDC_DETAILS_GROUP,1,-4,359,77,0,WS_EX_TRANSPARENT 
     187    PUSHBUTTON      "Pause",BTNPAUSE,314,3,52,14,BS_DEFPUSHBUTTON 
     188    PUSHBUTTON      "Reannounce",BTNREANNOUNCE,314,19,52,14 
     189    PUSHBUTTON      "Remove",BTNREMOVE,314,35,52,14 
     190    CONTROL         "",LISTPEERS,"SysListView32",WS_TABSTOP | WS_BORDER | LVS_ALIGNLEFT | LVS_REPORT,4,64,362,6 
     191    EDITTEXT        IDC_EDITTLU,277,36,34,12,ES_AUTOHSCROLL 
     192    EDITTEXT        IDC_EDITTLD,220,36,34,12,ES_AUTOHSCROLL 
     193    EDITTEXT        IDC_EDITNCD,220,12,34,12,ES_AUTOHSCROLL 
     194    EDITTEXT        IDC_EDITNCU,277,12,34,12,ES_AUTOHSCROLL 
     195    CONTROL         "",TORRENTPROG,"msctls_progress32",WS_BORDER,4,52,362,8 
     196    RTEXT           "Name:",IDC_STATIC,4,3,40,8 
     197    RTEXT           "Tracker:",IDC_STATIC,4,15,40,8 
     198    RTEXT           "Status:",IDC_STATIC,4,27,40,8 
     199    RTEXT           "Time left:",IDC_STATIC,4,39,40,8 
     200    LTEXT           "N/A",IDC_NAME,45,3,145,10,SS_WORDELLIPSIS 
     201    LTEXT           "N/A",IDC_TRACKER,45,15,145,8,SS_WORDELLIPSIS 
     202    LTEXT           "N/A",IDC_STATUS,45,27,145,8,SS_WORDELLIPSIS 
     203    LTEXT           "N/A",IDC_AVAIL,45,39,36,8,SS_WORDELLIPSIS 
     204    LTEXT           "Torrent connection limits:",IDC_NC,195,3,115,8 
     205    LTEXT           "Torrent transfer rates (KB/s):",IDC_TL,195,27,115,8 
     206    RTEXT           "Total",IDC_NCD,192,15,25,8 
     207    RTEXT           "Up",IDC_NCU,255,15,20,8 
     208    RTEXT           "Up",IDC_TLU,255,39,20,8 
     209    RTEXT           "Down",IDC_TLD,192,39,25,8 
     210    RTEXT           "Completed:",IDC_STATIC,85,39,44,8 
     211    LTEXT           "N/A",IDC_COMPLETE,132,39,58,8,SS_WORDELLIPSIS 
     212    GROUPBOX        "",IDC_DETAILS_GROUP,1,-4,368,77,0,WS_EX_TRANSPARENT 
    210213END 
    211214 
     
    232235END 
    233236 
    234 IDD_CONFIGGENERAL DIALOGEX 0,0,283,90 
    235 STYLE DS_MODALFRAME | DS_SETFONT | DS_FIXEDSYS | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SYSMENU 
     237IDD_CONFIGGENERAL DIALOGEX 0, 0, 283, 90 
     238STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU 
    236239CAPTION "General" 
    237 FONT 8,"MS Shell Dlg",400,0,1 
    238 BEGIN 
    239     AUTOCHECKBOX    "Allow only one instance to run.",IDC_GENERAL_ONEINST,14,16,114,14 
     240FONT 8, "MS Shell Dlg", 400, 0, 0x1 
     241BEGIN 
     242    CONTROL         "Allow only one instance to run.",IDC_GENERAL_ONEINST, 
     243                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,16,136,14 
    240244    GROUPBOX        "General Settings",IDC_STATIC,7,6,271,77 
    241     AUTOCHECKBOX    "Advanced GUI",IDC_GENERAL_ADVGUI,14,42,118,14 
    242     AUTOCHECKBOX    "Minimize to tray.",IDC_GENERAL_TRAY,14,29,98,14 
    243     LISTBOX         IDC_LANGLIST,174,24,96,54,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP 
    244     CTEXT           "Language (requires restart)",IDC_STATIC,174,12,96,8 
     245    CONTROL         "Advanced GUI",IDC_GENERAL_ADVGUI,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,42,136,14 
     246    CONTROL         "Minimize to tray.",IDC_GENERAL_TRAY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,29,136,14 
     247    LISTBOX         IDC_LANGLIST,156,24,114,54,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP 
     248    CTEXT           "Language (requires restart)",IDC_STATIC,156,12,114,8 
    245249END 
    246250 
     
    330334    END 
    331335END 
    332  
    333 IDR_APP_ICON        ICON          "Halite.ico" 
    334  
    335 IDR_MAINFRAME       BITMAP        "toolbar.bmp" 
    336  
    337 //1                   RT_MANIFEST   "Manifest.xml" 
    338336 
    3393371 VERSIONINFO 
     
    363361    END 
    364362END 
    365  
    366  
    367 IDR_MAINFRAME ACCELERATORS 
    368 BEGIN 
    369     "N",            ID_FILE_NEW, VIRTKEY, CONTROL 
    370     "O",            ID_FILE_OPEN, VIRTKEY, CONTROL 
    371     "S",            ID_FILE_SAVE, VIRTKEY, CONTROL 
    372     "P",            ID_FILE_PRINT, VIRTKEY, CONTROL 
    373     "Z",            ID_EDIT_UNDO, VIRTKEY, CONTROL 
    374     "X",            ID_EDIT_CUT, VIRTKEY, CONTROL 
    375     "C",            ID_EDIT_COPY, VIRTKEY, CONTROL 
    376     "V",            ID_EDIT_PASTE, VIRTKEY, CONTROL 
    377     VK_BACK,        ID_EDIT_UNDO, VIRTKEY, ALT 
    378     VK_DELETE,      ID_EDIT_CUT, VIRTKEY, SHIFT 
    379     VK_INSERT,      ID_EDIT_COPY, VIRTKEY, CONTROL 
    380     VK_INSERT,      ID_EDIT_PASTE, VIRTKEY, SHIFT 
    381     VK_F6,          ID_NEXT_PANE, VIRTKEY 
    382     VK_F6,          ID_PREV_PANE, VIRTKEY, SHIFT 
    383 END 
    384  
    385363 
    386364STRINGTABLE 
  • src/ConfigOptions.cpp

    r211 r212  
    4242                                        HMODULE hMod = ::LoadLibraryEx(dir_itr->path().string().c_str(), 0, LOAD_LIBRARY_AS_DATAFILE); 
    4343 
     44                                        // The upper size limit ain't nice, but at least it's safe from buffer overflow 
    4445                                        const int buffer_size = 512; 
    4546                                        boost::array<wchar_t, buffer_size> buffer; 
    46                                         ::LoadString(hMod, HALITE_LANGUAGE, buffer.elems, buffer_size); 
     47                                        int length = ::LoadString(hMod, HALITE_LANGUAGE, buffer.elems, buffer_size); 
    4748                                         
    48                                         wstring lang_name(buffer.elems); 
    49                                         lang_map_[lang_name] = dir_itr->path().leaf(); 
    50                                         int index = lang_list_.AddString(lang_name.c_str()); 
    51                                          
    52                                         if (dir_itr->path().leaf() == halite().dll_) lang_list_.SetCurSel(index); 
    53                                          
     49                                        if (length) 
     50                                        { 
     51                                                wstring lang_name(buffer.elems); 
     52                                                lang_map_[lang_name] = dir_itr->path().leaf(); 
     53                                                int index = lang_list_.AddString(lang_name.c_str()); 
     54                                                 
     55                                                if (dir_itr->path().leaf() == halite().dll_)  
     56                                                        lang_list_.SetCurSel(index); 
     57                                        } 
    5458                                        ::FreeLibrary(hMod); 
    5559                                } 
  • src/ConfigOptions.hpp

    r211 r212  
    3939    int OnApply() 
    4040        {        
    41                 const int buffer_size = 512; 
    42                 boost::array<wchar_t, buffer_size> buffer; 
     41                size_t length = lang_list_.GetTextLen(lang_list_.GetCurSel()); 
     42                boost::scoped_array<wchar_t> buffer(new wchar_t[length+1]); 
    4343                 
    44                 lang_list_.GetText(lang_list_.GetCurSel(), buffer.elems); 
    45                 std::wstring language(buffer.elems); 
     44                lang_list_.GetText(lang_list_.GetCurSel(), buffer.get()); 
     45                std::wstring language(buffer.get(), length); 
    4646                 
    4747                if (language == L"English") 
  • src/global/wtl_app.cpp

    r211 r212  
    7171std::wstring app_module::res_wstr(unsigned uID) 
    7272{ 
    73         const int buffer_size = 512; 
     73        // The upper size limit ain't nice, but at least it's safe from buffer overflow 
     74        const int buffer_size = 2048; 
    7475        boost::array<wchar_t, buffer_size> buffer; 
    7576        ::LoadString(_Module.GetResourceInstance(), uID, buffer.elems, buffer_size); 
Note: See TracChangeset for help on using the changeset viewer.