Mercurial > HandyFTP
changeset 136:90e15db9bc85
Win: Remove winmain.c.. it isn't necessary with DW 3.2.
author | Brian Smith <brian@dbsoft.org> |
---|---|
date | Thu, 25 Mar 2021 16:54:03 -0500 |
parents | a0e49cbbf1e0 |
children | 6e68b08bc608 |
files | src/handyftp.c src/makefile.vc src/winmain.c |
diffstat | 3 files changed, 2 insertions(+), 120 deletions(-) [+] |
line wrap: on
line diff
--- a/src/handyftp.c Tue Feb 23 17:52:27 2021 -0600 +++ b/src/handyftp.c Thu Mar 25 16:54:03 2021 -0500 @@ -6963,7 +6963,7 @@ } /* The main entry point. Notice we don't use WinMain() on Windows */ -int main(int argc, char *argv[]) +int dwmain(int argc, char *argv[]) { int cx, cy;
--- a/src/makefile.vc Tue Feb 23 17:52:27 2021 -0600 +++ b/src/makefile.vc Thu Mar 25 16:54:03 2021 -0500 @@ -73,8 +73,7 @@ DEFFILE = handyftp.def OBJS = handyftp.obj \ - datetime.obj \ - winmain.obj + datetime.obj all: handyftp.exe
--- a/src/winmain.c Tue Feb 23 17:52:27 2021 -0600 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,117 +0,0 @@ -/* Dynamic Windows stub file to allow Win32 applications - * to use the main() entry point instead of WinMain(). - * - * (C) 2000-2012 Brian Smith <brian@dbsoft.org> - */ - -#include <windows.h> -#include <stdlib.h> -#include <string.h> -#include <stdio.h> -#include <process.h> - -#ifndef NODW -void Win32_Set_Instance(HINSTANCE hInstance); -#endif - -char **_convertargs(int *count, char *start, HINSTANCE DWInstance) -{ - char *tmp, *argstart, **argv; - int loc = 0, inquotes = 0; - - (*count) = 1; - - tmp = start; - - /* Count the number of entries */ - if(*start) - { - (*count)++; - - while(*tmp) - { - if(*tmp == '"' && inquotes) - inquotes = 0; - else if(*tmp == '"' && !inquotes) - inquotes = 1; - else if(*tmp == ' ' && !inquotes) - { - /* Push past any white space */ - while(*(tmp+1) == ' ') - tmp++; - /* If we aren't at the end of the command - * line increment the count. - */ - if(*(tmp+1)) - (*count)++; - } - tmp++; - } - } - - argv = (char **)malloc(sizeof(char *) * ((*count)+1)); - argv[0] = malloc(260); - GetModuleFileNameA(DWInstance, argv[0], 260); - - argstart = tmp = start; - - if(*start) - { - loc = 1; - - while(*tmp) - { - if(*tmp == '"' && inquotes) - { - *tmp = 0; - inquotes = 0; - } - else if(*tmp == '"' && !inquotes) - { - argstart = tmp+1; - inquotes = 1; - } - else if(*tmp == ' ' && !inquotes) - { - *tmp = 0; - argv[loc] = _strdup(argstart); - - /* Push past any white space */ - while(*(tmp+1) == ' ') - tmp++; - - /* Move the start pointer */ - argstart = tmp+1; - - /* If we aren't at the end of the command - * line increment the count. - */ - if(*(tmp+1)) - loc++; - } - tmp++; - } - if(*argstart) - argv[loc] = _strdup(argstart); - } - argv[loc+1] = NULL; - return argv; -} - -/* Protoype for the application entrypoint */ -int main(int argc, char **argv); - -/* Ok this is a really big hack but what the hell ;) */ -int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) -{ - char **argv; - int argc; - -#ifndef NODW - Win32_Set_Instance(hInstance); -#endif - - argv = _convertargs(&argc, lpCmdLine, hInstance); - - return main(argc, argv); -}