diff --git a/Contrib/zip2exe/icon.ico b/Contrib/zip2exe/icon.ico index b755e000..6a5de183 100644 Binary files a/Contrib/zip2exe/icon.ico and b/Contrib/zip2exe/icon.ico differ diff --git a/Contrib/zip2exe/main.cpp b/Contrib/zip2exe/main.cpp index e0d55e33..56e9cf0a 100644 --- a/Contrib/zip2exe/main.cpp +++ b/Contrib/zip2exe/main.cpp @@ -1,6 +1,6 @@ #include #include - +#include // portions Copyright © 1999-2001 Miguel Garrido (mgarrido01@hotmail.com) extern "C" @@ -29,7 +29,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInst, { g_hInstance=hInstance; - + InitCommonControls(); return DialogBox(hInstance,MAKEINTRESOURCE(IDD_DIALOG1),GetDesktopWindow(),DlgProc); } char tempzip_path[1024]; diff --git a/Contrib/zip2exe/res.rc b/Contrib/zip2exe/res.rc index 29d38512..d9ea58fb 100644 --- a/Contrib/zip2exe/res.rc +++ b/Contrib/zip2exe/res.rc @@ -28,28 +28,28 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 361, 234 STYLE DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Nullsoft ZIP2EXE v0.16" +CAPTION "Nullsoft ZIP2EXE v0.17" FONT 8, "MS Sans Serif" BEGIN PUSHBUTTON "Open &ZIP",IDC_BROWSE,13,17,49,14 EDITTEXT IDC_ZIPFILE,66,18,284,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_TABSTOP - LISTBOX IDC_ZIPINFO_FILES,13,45,335,56,LBS_NOINTEGRALHEIGHT | + LISTBOX IDC_ZIPINFO_FILES,13,43,335,62,LBS_NOINTEGRALHEIGHT | LBS_NOSEL | WS_VSCROLL - EDITTEXT IDC_INSTNAME,81,113,267,12,ES_AUTOHSCROLL - EDITTEXT IDC_DESCTEXT,81,129,267,12,ES_AUTOHSCROLL - COMBOBOX IDC_INSTPATH,81,144,268,126,CBS_DROPDOWN | WS_VSCROLL | + EDITTEXT IDC_INSTNAME,81,124,267,12,ES_AUTOHSCROLL + EDITTEXT IDC_DESCTEXT,81,139,267,12,ES_AUTOHSCROLL + COMBOBOX IDC_INSTPATH,81,154,268,126,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP - EDITTEXT IDC_OUTFILE,13,169,292,12,ES_AUTOHSCROLL - PUSHBUTTON "Browse",IDC_BROWSE2,307,168,41,14 + EDITTEXT IDC_OUTFILE,81,169,224,12,ES_AUTOHSCROLL + PUSHBUTTON "Browse",IDC_BROWSE2,309,169,41,14 DEFPUSHBUTTON "Convert",IDOK,304,213,50,14,WS_DISABLED - GROUPBOX "Source ZIP file",IDC_SZIPFRAME,7,7,347,180 + GROUPBOX "Source ZIP File",IDC_SZIPFRAME,7,7,347,102 LTEXT "",IDC_ZIPINFO_SUMMARY,13,33,245,8 - GROUPBOX "Output",IDC_OFRAME,7,102,347,85 - LTEXT "Default extract path:",IDC_DEPST,13,145,66,8 - LTEXT "Description text:",IDC_DTEXTST,13,131,66,8 - LTEXT "Output EXE file:",IDC_OEFST,14,157,51,8 - LTEXT "Installer name",IDC_INAMEST,13,116,66,8 + GROUPBOX "Output",IDC_OFRAME,7,110,347,77 + LTEXT "Default extract path:",IDC_DEPST,13,156,66,8 + LTEXT "Description text:",IDC_DTEXTST,13,142,66,8 + LTEXT "Output EXE file:",IDC_OEFST,13,171,51,8 + LTEXT "Installer name",IDC_INAMEST,13,126,66,8 PUSHBUTTON "Test",IDC_TEST,251,213,50,14,NOT WS_VISIBLE PUSHBUTTON "< Back",IDC_BACK,7,213,50,14,NOT WS_VISIBLE CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,210,347,1 @@ -115,6 +115,13 @@ END // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. IDI_ICON1 ICON DISCARDABLE "icon.ico" + +///////////////////////////////////////////////////////////////////////////// +// +// 24 +// + +1 24 MOVEABLE PURE "zip2exe.xml" #endif // English (U.S.) resources ///////////////////////////////////////////////////////////////////////////// diff --git a/Contrib/zip2exe/zip2exe.dsp b/Contrib/zip2exe/zip2exe.dsp index 8f6401d8..d3d9c6f5 100644 --- a/Contrib/zip2exe/zip2exe.dsp +++ b/Contrib/zip2exe/zip2exe.dsp @@ -54,7 +54,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 /out:"../../Bin/zip2exe.exe" /opt:nowin98 +# ADD LINK32 comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 /out:"../../Bin/zip2exe.exe" /opt:nowin98 # SUBTRACT LINK32 /pdb:none !ELSEIF "$(CFG)" == "zip2exe - Win32 Debug" @@ -68,6 +68,7 @@ LINK32=link.exe # PROP Use_Debug_Libraries 1 # PROP Output_Dir "Debug" # PROP Intermediate_Dir "Debug" +# PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c # ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c @@ -80,7 +81,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept +# ADD LINK32 comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept !ENDIF @@ -156,5 +157,9 @@ SOURCE=.\icon.ico SOURCE=.\res.rc # End Source File # End Group +# Begin Source File + +SOURCE=.\zip2exe.xml +# End Source File # End Target # End Project diff --git a/Contrib/zip2exe/zip2exe.xml b/Contrib/zip2exe/zip2exe.xml new file mode 100644 index 00000000..2c8a61d9 --- /dev/null +++ b/Contrib/zip2exe/zip2exe.xml @@ -0,0 +1,10 @@ + + + +Zip2Exe + + + + + +